Consolidate styles
Die, theme system