updated theme-settings
* added theme-settings route
* updated themeSettings.json
* updated theme-settings view & controller
Merge conflicts?
fixed test