Added new theme handling