Merge hydra and hydra-themes