* theme override fix

* add lerp condition and tests

* remove unwanted changes

* resolve app_bar token version

* update test names