added base16 colors, small changes