Fixing merge conflicts, moving stuff out of default.html which should be vanilla.
Col3 here