Separated out colors into DefaultTheme.xaml and cleaned up various files