Reworked drawer themes