Fix current_theme