Initial cleanup of UBC theme