#36: Updated theme