Updated to Master Nina + ColorButtons

Master Nina Branch after removal of merging comments. Also added the
colored buttons.