Simplified controllers. Added themes.