Clean up subject layout
Remove unused models
Massive xml rework
Change name of sound utility
Clean up xml
Use color utility