Moved theme to conditional