color tweaks and other misc. bullshit
Merge branch 'ui'