Tweak theme implementation for better understandability