Consoildate and reorganize funcitons to proper files

Noticing that a lot of theming functions are spread out through various files. Some of which should probably be moved to more appropriate files.