Divide into separate files
Create new theme