rebase from code with new working theme, hyde