2.3.2
Move contents back to src
Fix basic table theme
Adds @normal usage for non default themes #6227
spelling: additional
Adjusting themes to match with changes in 2.0