Restructure and preparation of theming.