Fixing theme name convention and cleanup