SQL & PL/SQL

Sorry, I know I will probably get shot down in flames for posting this.

I have already sought help via the TOAD community forums via:
http://toadfororacle.com/thread.jspa?threadID=37857&tstart=0

I am using TOAD 10.6.1.3

This is my query:

I've moved to a new job and didn't copy the "FmtPlus.opt" format options file when I left the old job.

On my old TOAD, if I did CTRL + SHIFT + F, the following SQL would look like this:

SELECT DISTINCT fat.application_name
              , fdfv.title
              , fdfcv.descriptive_flexfield_name
           FROM apps.fnd_descriptive_flexs_vl fdfv
              , apps.fnd_descr_flex_contexts_vl fdfcv
              , applsys.fnd_application_tl fat
          WHERE fdfv.application_id = fdfcv.application_id
            AND fdfv.descriptive_flexfield_name = fdfcv.descriptive_flexfield_name
            AND fdfv.application_id = fat.application_id
            AND fat.application_name = 'Receivables'
            AND fdfv.title = 'Address';

But on the new install, it comes out as:

SELECT DISTINCT fat.application_name
              , fdfv.title
              , fdfcv.descriptive_flexfield_name
  FROM apps.fnd_descriptive_flexs_vl fdfv
     , apps.fnd_descr_flex_contexts_vl fdfcv
     , applsys.fnd_application_tl fat
 WHERE fdfv.application_id = fdfcv.application_id
   AND fdfv.descriptive_flexfield_name = fdfcv.descriptive_flexfield_name
   AND fdfv.application_id = fat.application_id
   AND fat.application_name = 'Receivables'
   AND fdfv.title = 'Address';

I've changed lots of settings in the formatting options in TOAD, but can't work out how to get the SQL to align as per my old version.

Any advice on how to get the formatter to generate output like in the first example would be much appreciated.

Thanks