More theme stuff and some ffap changes