Handle themes more elegantly