Separated theming out from control