Maintaining two themes was redundant