added base16 color theme and merged neo* pieces