Fixes to the base theme

Did some fixes on the base theme to make it work on 2.2