if statement is unnecesary
changing output icons
removing some things, adding some back. tweaking some of the regexes.
Merge branch 'master' into fontchange