Merge theme_base and theme