Fixes for problems with mobility support in the theme