Added helper function for checking current theme
Removed double Geneis prefix