More commits for Settings Theming