rename styles and theming + sizing and layout to just theming and layout