Merge general settings and theme settings because there is only one tab in there.  No need for single tabbed views
Another style change