2.2.5
Move contents back to src
Fix basic table theme
Fix basic step theme
spelling: additional
Adjusting themes to match with changes in 2.0