Further fixed theme integration