fix: Consolidating theme/trans lookup