moved font back to theme
Merge pull request #262 from daeks/patch3

moved font back to theme
Merge remote-tracking branch 'upstream/master' into patch1
fixed minor issues