cleaned up soem dirty code and added a swatch block for themes fonts and spacing