Updated theme system
Updated to work with new theme system
Updated theme to work with new theme system
Reflect updates