remove tomorrow and add base16