Added style stuff
constants to defines
fixed merge conflicts
WIP port to SDL2
Various other ui tweaks
local fixes