Minor theme and extension fixes to work with 1.19