First changes for the FO theme