Added initial Theme Selector and moved colors to singleton