2.1.2
Move contents back to src
Fix basic table theme
Fix basic step theme
Adjusting themes to match with changes in 2.0