Improvements to the ffos theme