fixed a couple of bugs I introduced in gallois theme
merged with master