Move remaining style information into CSS file