Split-up theme-specific styles

Change-Id: I48c19640a287f443f07dfac926240851bc2d85d0