Development

Most of the changes in this PR involve separating layout-impacting styles from color-impacting styles; should make coloring/theming a bit simpler later on