rebase theme