Merge "CologneBlue rewrite: finally a proper sidebar using standard functions"