#2 Theme/lr - fixes