lang updates
more themer friendly