remoded theme specific code