Fix the theme directory conventions