Implement new themes; fixes