Swith to using a central colourstrap set of files.
Just keep the theme related files in the themes directory