Move to using cadair theme as base in submodule