font awesome working
mergefix
variables fix