add main theme class for customizing ui-controls
fix merge conflicts