Move object creation outside of class include logic
Add custom theme block (commented out)