colors and shit
more design shit
merge fix
gui