[pacman-dev] Color patch rebase