Worked with the models

Themes now uses more theme files.