Simplify stylesheet by migrating things to themes