Some changes to settings layout, as well as fixing theme settings
Merge remote-tracking branch 'origin/master'