#2 Theme/lr - global fix