Refactoring
Refactoring autoloadThemes step
Refactoring
Typo