Final touch before theming