Cleanup

more cleanup and sync up themes