merged theming changes into main side