SETTINGS: Improved theming ( WIP )