These were split between two files before, making them
harder to manage and occasionally meaning they were overridden
by app styles. This is a simple way to fix that