Cleaner way to adapt to different themes