Tweak to logging format
Move themes into their own directories