Cleanup more messed up stuff
Support links on square theme in tagline