No longer doing checks on theme files, removing complex code and logic