Removed theme, added templates