Fixed few themes/Initializer