#1 finish theming