Finished theming
Merge branch 'working'