Rebase for holodark theme