Bugfix: colors are swapped
Improve appearance
Bugfix
Formatting and naming improvements