considerable theme work for Paideia
Merged new theming into master branch