Implemented theme handling