Wip/cleanup

assorted theme cleanup