merged themes, configurable colors
code tidying for readability.