Merged
delete some crap, add a new theme