diff --git a/dictsource/cs_list b/dictsource/cs_list
index 9595a24e..88ad7790 100644
--- a/dictsource/cs_list
+++ b/dictsource/cs_list
@@ -31,15 +31,15 @@ _o    o:
 ô     uo:
 p     pe:
 q     kve:
-r     er
-ř     eR
+r     eR
+ř     eR^
 _s    es
 š     eS
 t     te:
 ť     ce:
 u     u:
 ú     dl'oUhe:,u:
-ů     'u:s_k@-r'oUZkem
+ů     'u:s_kR'oUZkem
 _v    ve:
 w     dv'ojve:
 x     iks
@@ -49,43 +49,43 @@ _z    zet
 ž     Zet
 
 :     dv'ojtetSka
-%     p@-*otsento
+%     pRotsento
 +     plus
-€     eU*o
+€     eURo
 @     zavina:tS
 &     ampr-sent
-#     gRi:Zek
+#     gR^i:Zek
 /     lomeno
 \\    beksleS
-!     vigRitSn^i:k
+!     vigR^itSn^i:k
 °     stupen^
-×     kra:t
+×     kRa:t
 ÷     Jeleno
-§     pa*ag@-*af
+§     paRagRaf
 ~     tilda
-^     zdRi:Ska
-©     k'opi*ajt
+^     zdR^i:Ska
+©     k'opiRajt
 
-_$    dola:r
-_'    apost@-*of
+_$    dola:R
+_'    apostRof
 _"    uvozovki
-_,    tSa:rka
+_,    tSa:Rka
 _-    mi:nus
-_;    zdRedn^i:k
-_=    rovno
+_;    zdR^edn^i:k
+_=    Rovno
 _*    hvjezJitSka
 _?    otazn^i:k
 __    pottr-Zen^i:
-_`    'ob@-*a:ts,ena:||tS'a:rka
-_(    za:vorka
-_)    za:vorkazavRi:t
-_[    h@-*'anata:||z'a:vorka
-_]    h@-*'anata:||z'avRi:t
-_{    sl'oZena:||z'a:vorka
-_}    sl'oZena:||z'avRi:t
+_`    'obRa:ts,ena:||tS'a:Rka
+_(    za:voRka
+_)    za:vorkazavR^i:t
+_[    hR'anata:||z'a:voRka
+_]    hR'anata:||z'avR^i:t
+_{    sl'oZena:||z'a:voRka
+_}    sl'oZena:||z'avR^i:t
 _<    menSi:
 _>    vjetSi:
-_|    sv'isla:||tS'a:*a
+_|    sv'isla:||tS'a:Ra
 _??   simbol
 _?A   znak
 
@@ -95,8 +95,8 @@ _0    n'ula
 _1    j'eden
 _2    dv'a
 _2f   dvj'e
-_3    tRi
-_4    tSt'iRi
+_3    tR^i
+_4    tSt'iR^i
 _5    p'jet
 _6    S'est
 _7    s'edum
@@ -105,7 +105,7 @@ _9    d'evjet
 _10   d'eset
 _11   j'edena:tst
 _12   dv'ana:tst
-_13   tR'ina:tst
+_13   tR^'ina:tst
 _14   tSt'r-na:tst
 _15   p'atna:tst
 _16   S'estna:tst
@@ -113,8 +113,8 @@ _17   s'edumna:tst
 _18   'osumna:tst
 _19   d'evatena:tst
 _2X   dv'atset
-_3X   tR'itset
-_4X   tSt'iRitset
+_3X   tR^'itset
+_4X   tSt'iR^itset
 _5X   p'adesa:t
 _6X   S'edesa:t
 _7X   s'edumdesa:t
@@ -123,8 +123,8 @@ _9X   d'evadesa:t
 _0C   s'et
 _1C   st'o
 _2C   dvj'esc'e
-_3C   tR'ist'a
-_4C   tStiRist'a
+_3C   tR^'ist'a
+_4C   tStiR^ist'a
 
 _1M1  c'isi:ts
 _0MA1 c'isi:tse
@@ -134,15 +134,15 @@ _1M2  m'ilio:n
 _0MA2 m'ilio:ni
 _0M2  m'ilio:nu:
 
-_1M3  m'iliarda
-_0MA3 m'iliardi
-_0M3  m'iliard
+_1M3  m'iliaRda
+_0MA3 m'iliaRdi
+_0M3  m'iliaRd
 
 _1M4  b'ilio:n
 _0MA4 b'ilio:ni
 _0M4  b'ilio:nu:
 
-_dpt  _:tSa:rka_
+_dpt  _:tSa:Rka_
 _.    tetSka
 
 
@@ -301,7 +301,7 @@ gn       gigan^utn
 gpa      $abbrev
 gw       gigavat
 (http ://)  ha:tetepe:
-hz       herts
+hz       heRts
 ibm      $abbrev
 ip       $abbrev
 khz      kiloherts
@@ -310,7 +310,7 @@ km       kilometr-
 kn       kilon^utn
 kpa      $abbrev
 kw       kilovat
-mhz      megaherts
+mhz      megaheRts
 mkr      $abbrev
 mlr      $abbrev
 mpa      $abbrev
@@ -334,6 +334,7 @@ rc       $abbrev
 rlc      $abbrev
 rlr      $abbrev
 rs       $abbrev
+rss      $abbrev
 rx       $abbrev
 scsi     $abbrev
 sr       $abbrev
@@ -364,7 +365,7 @@ delete     dili:t
 down       daUn
 exchange   ikstSeIndZ
 home       hoUm
-insert     inzert
+insert     inzeRt
 lazer      leIzr-
 newton     n^u:tn
 num        nam
@@ -372,9 +373,8 @@ outlook    aUtlu:k
 page       peIdZ
 power      paUr-
 scroll     skro:l
-search     sertS
+search     seRtS
 size       sajz
-this       Dis
 unie       unije
 untitled   antitl-
 up         ap
diff --git a/dictsource/cs_rules b/dictsource/cs_rules
index 898f58d8..684182cf 100644
--- a/dictsource/cs_rules
+++ b/dictsource/cs_rules
@@ -201,7 +201,7 @@
         iu (_    ijo
      _) i (on    j
 
-        ight     ajt   // right, night
+     C) ight     ajt   // right, night
 
 
 .group í
@@ -376,21 +376,24 @@ _mícha) ni       n^i
         pě       pje
 
 .group q
-        q        k
+        q        kv
         qu       kv
 
 .group r
-        r        r
-     A) r (A     *
-     C) r (A     @-*
-        rr       *r
-     K) r (K     r-
+//        r        r
+//     A) r (A     *
+//     C) r (A     @-*
+//        rr       *r
+       K) r (K     r-
 
-        right    rajt
+//        right    rajt
+
+        r        R
+        right    Rajt
 
 
 .group ř
-        ř        R
+        ř        R^
 
 .group s
         s        s
@@ -398,7 +401,6 @@ _mícha) ni       n^i
         ss (A_   s
 
         scape    skeIp
-     _) sch      S
         shift    Sift
   _pre) s (id    z
         selec (t silek
@@ -626,7 +628,7 @@ _flegma) ti      ti
         ŕ        r-
         ü        i
 
-        $        dola:r
+        $        dola:R
 
         .        tetSka
         . (.     _:
diff --git a/dictsource/en_list b/dictsource/en_list
index 838f7c77..333be10c 100644
--- a/dictsource/en_list
+++ b/dictsource/en_list
@@ -72,7 +72,7 @@ _,   k0m@
 _-   h,aIf@n
 _.   st0p
 _/   stroUk
-_:   koUl0n
+_:   koUl@n
 _;   sEmIk'oUl0n
 _<   ElaNg@L
 _=   i:kw@Lz
@@ -1262,6 +1262,7 @@ omelet           0ml@t
 omelette         0ml@t
 opaque           oUp'eIk
 opine            oUp'aIn
+opossum          @p0s@m
 opponent         @poUn@nt
 oppose           @poUz
 opposer          @poUz3
@@ -2216,6 +2217,7 @@ Neville          nEvIl
 Nicholas         nIk@l@s
 Nicosia          nIk@s'i:@
 Nigel            naIdZ@L
+Nguyen           nu:jEn
 Omar             oUmA@
 Oscar            0sk3
 Ottawa           0ta2w@
@@ -2376,7 +2378,7 @@ be               %bi:          $pastf $only
 been             ,bi:n         $pastf $only
 being            ,bi:IN        $pastf $only $strend2
 is               I2z            $pastf $only // use contraction for 'is a'
-am               %am            $nounf $only
+// am               %am            $nounf $only  // now in en_rules
 are              %A@            $pastf $only
 was              %w0z           $pastf $only
 wast             %w0st         $only $pastf $only
diff --git a/dictsource/en_rules b/dictsource/en_rules
index 7622d859..349ed165 100644
--- a/dictsource/en_rules
+++ b/dictsource/en_rules
@@ -590,6 +590,9 @@
          m)  al (no       %al
 
 .group am
+          _) am (_        %am
+         D_) am (_        ,eI'Em
+        D__) am (_        ,eI'Em
          C)  am (d        aam
          C)  am (pl       aam
          l)  am (pl       am
@@ -1816,7 +1819,7 @@
         @d)  ed (_$2dvei   I2d
        &ch)  ed (_$2vei    t
        &sh)  ed (_$2vei    t
-       Csh)  ed (_         Ed
+      @Csh)  ed (_         Ed
         @f)  ed (_$2vdei   t
         @g)  ed (_$1vi     d
         @k)  ed (_$2vdei   t
@@ -4624,7 +4627,7 @@
          r)  u (th        u:
          _)  u (til       ju:
              u (tion      'ju:
-         n)  u (tri       ju:
+         K)  u (tri       ju:
              u (ty        ju:
        min)  u (te        I
        vac)  uu           ju:
@@ -5107,14 +5110,16 @@
 
              \\           bakstroUk
              /            stroUk
+?3           \\           bakslaS
+?3           /            slaS
              '
              £            paUnd
              !           _:Ekskl@meIS@n_:
           !) !
              ? (?         kwEstS@nmA@ks
           ?) ?
-             :            koUl0n
-             $            d0l@
+             :            koUl@n
+             $            d0l3
              %            p3sEnt
 ?5           %            pVRs'Ent
              @            at_:
diff --git a/phsource/compile_report b/phsource/compile_report
index 14e8e042..c5110806 100644
--- a/phsource/compile_report
+++ b/phsource/compile_report
@@ -1,38 +1,39 @@
-33 phoneme tables
+34 phoneme tables
           new total
-    base  91   91
-      en  52  138
-    en_n  29  138
-   en_us  36  138
-   en_sc  39  140
-   en_rp  34  138
-   en_wm  30  138
-      af  37  122
-      cy  30  117
-      de  28  114
-      eo  15  103
-      fi  40  122
+    base  92   92
+      en  52  139
+    en_n  29  139
+   en_us  36  139
+   en_sc  39  141
+   en_rp  34  139
+   en_wm  30  139
+      af  37  123
+      cy  30  118
+      de  28  115
+      eo  15  104
+      fi  40  123
       fr  33  115
    fr_ca  11  115
-      hi  50  127
-      hu  24  108
-      nl  25  111
-      pl  17  102
-      sk  22  117
-      cs   6  118
-      hr  16  121
-      ru  36  119
+      hi  50  128
+      hu  24  109
+      nl  25  112
+      pl  17  103
+      sk  22  118
+      cs   7  119
+      hr  16  122
+      ru  36  120
       it  28  111
       es   7  111
       pt  25  126
    pt_pt  17  126
       ro  36  135
       el   7  111
-      sv  25  113
-      no  29  117
-      vi  41  128
-  zh_yue  32  119
-      sw  14  100
+      sv  25  114
+      no  29  118
+      is  27  113
+      vi  41  129
+  zh_yue  32  120
+      sw  14  101
 
   3  b/b            base hi ro
   2  b/b_           base hi
@@ -132,6 +133,7 @@
   2  m/_m           base ro
   2  m/m_           base ro
   1  m/m@           base
+  1  m/m#_          is
   1  m/ma           base
   1  m/me           base
   1  m/mi           base
@@ -144,6 +146,7 @@
   6  n/_n           base ro
   3  n/n_           base ro
   1  n/n@           base
+  1  n/n#_          is
   1  n^/n^a         base
   1  n/na           base
   1  n^/n^e         base
@@ -155,6 +158,7 @@
   3  nn/_nn         base en zh_yue
   3  nn/nn_         base en zh_yue
   1  nn/nn@         base
+  1  nn/nn#_        is
   1  nn/nna         base
   1  nn/nne         base
   1  nn/nni         base
@@ -174,13 +178,17 @@
   1  r2/r2u         base
   8  r3/r_          base af cy eo fr pl ru it
   1  r3/r_@         base
+  1  r3/r#_         is
   1  r3/r_a         base
   1  r3/r_e         base
   1  r3/r_i         base
   7  r3/r_n         base cy eo fr pl ru it
   1  r3/r_o         base
+  2  r3/r_trill     base cs
+  2  r3/r_trill.wav base cs
   1  r3/r_u         base
- 28  r3/rx          base af cy eo fr fr_ca pl ru it pt_pt ro
+ 30  r3/rx          base af cy eo fr fr_ca pl ru it pt_pt ro is
+  1  r3/rz_cs       cs
   2  r3/@tap        base
   2  r3/@tap_i      base
   7  r/r            base en_sc de fr hu it
@@ -207,7 +215,7 @@
   3  ufric/ho       base hi
   3  ufric/hu       base hi
   2  ufric/hu_fi    fi
-  1  ufric/ll       base
+  2  ufric/ll       base is
   2  ufric/s        base es
  10  ufric/s_       base fi fr hu es ro
  12  ufric/s!       base fi hu es
@@ -230,13 +238,13 @@
   9  ustop/k_       base en fi fr hi hu it el sw
  11  ustop/ki       base en af fi fr hi hu it sw
  10  ustop/kl       base en fi fr hi hu it el sw
- 10  ustop/kr       base en fi fr hi hu it el sw
+ 11  ustop/kr       base en fi fr hi hu it el sw
   9  ustop/k_unasp  base fi hi hu it el
   2  ustop/p        base hi
   2  ustop/p_       base hi
   1  ustop/percus10 base
   8  ustop/pl       base fi hi hu hr it ro
-  8  ustop/pr       base fi hi hu hr it ro
+  9  ustop/pr       base fi hi hu hr it ro
   7  ustop/p_unasp  base fi hi hu hr it ro
   6  ustop/p_unasp_ fi hi hu hr it ro
   2  ustop/t        base hi
@@ -244,7 +252,7 @@
  26  ustop/t_dnt    base fi fr hi hu pl hr ru it ro vi sw
   2  ustop/t_dnt2   hi vi
   4  ustop/t_pzd    pl ru
-  6  ustop/tr       base hi ru el
+  7  ustop/tr       base hi ru el
   8  ustop/ts       de eo hu pl ru it ro zh_yue
   2  ustop/tsh      base zh_yue
   2  ustop/tsh_     base zh_yue
@@ -270,6 +278,7 @@
   1  vdiph2/iy      fi
   1  vdiph2/o@      af
   1  vdiph2/oa      ro
+  1  vdiph2/o_oo    is
   1  vdiph2/u-@     vi
   1  vdiph2/u#@     en_sc
   1  vdiph2/uo      fi
@@ -292,13 +301,13 @@
   1  vdiph/ai_4     af
   1  vdiph/ai_5     de
   1  vdiph/ai_6     en_rp
-  4  vdiph/ai_7     en_sc
+  5  vdiph/ai_7     en_sc is
   1  vdiph/ai_en    en
   3  vdiph/au       en af vi
   1  vdiph/au#      en_sc
   2  vdiph/au_2     en_us zh_yue
   1  vdiph/au_3     en_rp
-  4  vdiph/au_4     cy eo sk it
+  5  vdiph/au_4     cy eo sk it is
   1  vdiph/ee-e     hi
   3  vdiph/eei      en pt vi
   2  vdiph/eei_2    eo fi
@@ -308,7 +317,7 @@
   1  vdiph/eeu_2    pt_pt
   2  vdiph/eeu_3    en_n en_wm
   1  vdiph/eey      fi
-  5  vdiph/ei       nl it pt vi zh_yue
+  6  vdiph/ei       nl it pt is vi zh_yue
   8  vdiph/eu       en cy eo nl sk it pt vi
   1  vdiph/eu_2     fi
   2  vdiph/&i       fi hi
@@ -326,6 +335,7 @@
   1  vdiph/ooi_3    en_wm
   2  vdiph/ou       fi zh_yue
   2  vdiph/ou_2     sk ro
+  1  vdiph/ou_3     is
   1  vdiph/@u       en_wm
   1  vdiph/@u_2     en_rp
   1  vdiph/@u_3     ro
@@ -341,6 +351,7 @@
   2  vdiph/&y       fi nl
   2  vdiph/yi       fi no
   1  vdiph/y#i      fi
+  1  vdiph/y#i_2    is
   1  vdiph/yi_fr    fr
   1  vdiph/y#y      fi
   2  vdiph/y#y_2    af zh_yue
@@ -378,12 +389,11 @@
   1  vocw/Q2        nl
   6  vocw/v         base ro
   4  vocw/zh        base ro
-  3  vocw/zh_rfx    base cs
+  2  vocw/zh_rfx    base
   3  voc/z          base fr ro
   3  voc/z_         base fr ro
-  3  voc/zh         base ro
+  4  voc/zh         base cs ro
   3  voc/zh_        base ro
-  1  voc/zh_2       cs
   2  voc/z_pzd      base
   2  voc/z_pzd_     base
  14  vowel/@        base en en_us en_rp cy hi hr
@@ -403,8 +413,8 @@
  10  vowel/a        en_n cy de hu nl pl sk hr
   4  vowel/a#       en_sc it pt
   5  vowel/a_2      eo it pt_pt ro vi
-  3  vowel/a#_2     hr sv sw
-  5  vowel/a_3      en_sc cs
+  4  vowel/a#_2     hr sv is sw
+  6  vowel/a_3      en_sc cs is
  12  vowel/a#_3     en en_n en_us en_wm de hi ru pt_pt vi zh_yue
   4  vowel/a_4      en_wm el vi
   2  vowel/a_5      sv sw
@@ -423,13 +433,13 @@
   7  vowel/e_2      en_sc de hi hu sv no
   1  vowel/e_5      en_sc
   3  vowel/ee       fr pl sv
-  1  vowel/e_e      en_sc
+  2  vowel/e_e      en_sc is
   7  vowel/ee_1     en en_n pl it sv no zh_yue
   4  vowel/ee_2     en cy hu nl
   1  vowel/ee#_2    sv
   3  vowel/ee_3     af pt vi
   3  vowel/ee_6     en_n sk sv
- 10  vowel/e_mid    en_rp en_wm fr_ca hi sk cs hr es pt_pt no
+ 11  vowel/e_mid    en_rp en_wm fr_ca hi sk cs hr es pt_pt no is
  10  vowel/e_mid2   af de fi nl sk ro el sw
   1  vowel/@_fnt    hr
   1  vowel/@_hgh    no
@@ -437,12 +447,12 @@
   1  vowel/i#       cy
   3  vowel/i_2      de nl sv
   3  vowel/i_3      af sk hr
-  3  vowel/i_4      fi hu it
+  4  vowel/i_4      fi hu it is
   5  vowel/i_5      en_sc
   3  vowel/i#_5     pt_pt ro
   3  vowel/i_en     en en_us vi
   2  vowel/i_fnt    hi
-  9  vowel/ii       en_wm cy de fr_ca nl zh_yue
+ 10  vowel/ii       en_wm cy de fr_ca nl is zh_yue
   3  vowel/ii#      cy pl ru
   7  vowel/ii_3     en_rp fi hi sk hr sv no
   2  vowel/ii_4     en_rp
@@ -464,6 +474,7 @@
   3  vowel/oo_2     en_sc cy cs
   1  vowel/oo_3     af
   2  vowel/oo_4     hi pl
+  1  vowel/oo_5     is
   6  vowel/oo_en    en en_n en_rp
   2  vowelr/aa_r    en_sc
   1  vowelr/oo_r    en_sc
@@ -482,7 +493,7 @@
   1  vowel/u_5      sw
   3  vowel/u_6      en_rp pt_pt
   1  vowel/u_7      vi
- 14  vowel/u_bck    cy fi fr_ca hi hu nl pl sk hr it pt sv ++
+ 15  vowel/u_bck    cy fi fr_ca hi hu nl pl sk hr it pt sv ++
   2  vowel/uu       en en_wm
   2  vowel/uu_2     de it
   1  vowel/uu_3     af
@@ -497,12 +508,13 @@
   2  vowel/y_2      fr
   2  vowel/y#_2     hu sv
   1  vowel/y_3      af
+  1  vowel/y#_3     is
   1  vowel/y_4      no
   1  vowel/y_5      sv
   1  vowel/yy       fr_ca
   1  vowel/yy_2     no
   1  vowel/yy_3     sv
-  2  vowel/yy_4     de hu
+  3  vowel/yy_4     de hu is
   1  vwl_af/@       af
   1  vwl_af/I       af
   2  vwl_af/r@      af
@@ -584,16 +596,16 @@
   1  w/wo           base
   1  w/wu           base
   5  w/xw           base
- 19  x/b            base hi ro
-  1  x/b_           base
-  6  x/d            base hi el
- 13  x/d_           base fi fr hi hu pl ru it ro el sw
+ 20  x/b            base hi ro is
+  2  x/b_           base is
+  7  x/d            base hi el is
+ 14  x/d_           base fi fr hi hu pl ru it ro el is sw
  22  x/d_dnt        base fi fr hi hu pl ru it ro sw
   6  x/d_pzd        pl ru
   3  x/dzh          base hi
   5  x/dzh_         base hi ru
   4  x/dz_pzd       base hi ru
   2  x/dz_pzd_      base hi
-  3  x/g_           base cy es
-  4  x/g2           base cy hi es
+  4  x/g_           base cy es is
+  5  x/g2           base cy hi es is
   3  x/g2_          base hi
diff --git a/phsource/n/n#_ b/phsource/n/n#_
new file mode 100644
index 00000000..e4813be6
Binary files /dev/null and b/phsource/n/n#_ differ
diff --git a/phsource/nn/nn#_ b/phsource/nn/nn#_
new file mode 100644
index 00000000..86bde9b0
Binary files /dev/null and b/phsource/nn/nn#_ differ
diff --git a/phsource/ph_czech b/phsource/ph_czech
index 20ebfb06..27a88549 100644
--- a/phsource/ph_czech
+++ b/phsource/ph_czech
@@ -23,16 +23,22 @@ phoneme u:
 endphoneme
 
 
-phoneme R
+phoneme R^
   vcd pla frc sibilant
   vowelin  f1=0  f2=1700 -300 300  f3=-300 80
   vowelout f1=2  f2=1700 -300 300  f3=-300 80 brk
-  formants voc/zh_2+vocw/zh_rfx%130
+  formants voc/zh+r3/rz_cs%60
+  lengthmod 6
+endphoneme
+
+phoneme R
+  liquid
+  vowelin  f1=0  f2=1700 -300 300  f3=-300 80
+  vowelout f1=2  f2=1700 -300 300  f3=-300 80 brk
+  formants r3/r_trill+r3/r_trill.wav%60
   lengthmod 6
-//  switchvoicing S
 endphoneme
 
 
 
 
-
diff --git a/phsource/phonemes b/phsource/phonemes
index 2aedc0fe..2f1f2a76 100644
--- a/phsource/phonemes
+++ b/phsource/phonemes
@@ -379,6 +379,14 @@ phoneme r-   // linking r, used between certain vowels and a following vowel
 endphoneme
 
 
+phoneme R
+  liquid
+  vowelin  f1=0  f2=1700 -300 300  f3=-300 80
+  vowelout f1=2  f2=1700 -300 300  f3=-300 80 brk
+  formants r3/r_trill+r3/r_trill.wav%60
+  lengthmod 6
+endphoneme
+
 phoneme l
   liquid
   length 100
@@ -847,6 +855,7 @@ phoneme p
   wave ustop/p
   before _ ustop/p_
   before r ustop/pr
+  before R ustop/pr
   before @- ustop/p_unasp
   before l ustop/pl
   switchvoicing b
@@ -862,6 +871,7 @@ phoneme t
   before _ ustop/t_
   before @- ustop/t_dnt%50
   before r ustop/tr
+  before R ustop/tr
   switchvoicing d
 endphoneme
 
@@ -929,6 +939,7 @@ phoneme k
   wave ustop/k
   before _ ustop/k_
   before r ustop/kr
+  before R ustop/kr
   before @- ustop/k_unasp%70
   before l ustop/kl
   before (i) ustop/ki
@@ -1174,6 +1185,9 @@ include ph_swedish
 phonemetable no base
 include ph_norwegian
 
+phonemetable is base
+include ph_icelandic
+
 phonemetable vi base
 include ph_vi
 
diff --git a/phsource/r3/r#_ b/phsource/r3/r#_
new file mode 100644
index 00000000..52ee162e
Binary files /dev/null and b/phsource/r3/r#_ differ
diff --git a/phsource/r3/r_trill b/phsource/r3/r_trill
new file mode 100644
index 00000000..cc9efda4
Binary files /dev/null and b/phsource/r3/r_trill differ
diff --git a/phsource/r3/r_trill.wav b/phsource/r3/r_trill.wav
new file mode 100644
index 00000000..6fa3ac82
Binary files /dev/null and b/phsource/r3/r_trill.wav differ
diff --git a/phsource/r3/rz_cs.wav b/phsource/r3/rz_cs.wav
new file mode 100644
index 00000000..4cb8287f
Binary files /dev/null and b/phsource/r3/rz_cs.wav differ
diff --git a/phsource/vdiph/ou_3 b/phsource/vdiph/ou_3
new file mode 100644
index 00000000..e8d554dc
Binary files /dev/null and b/phsource/vdiph/ou_3 differ
diff --git a/phsource/vdiph/y#i_2 b/phsource/vdiph/y#i_2
new file mode 100644
index 00000000..47821923
Binary files /dev/null and b/phsource/vdiph/y#i_2 differ
diff --git a/phsource/vdiph2/o_oo b/phsource/vdiph2/o_oo
new file mode 100644
index 00000000..b6ad4959
Binary files /dev/null and b/phsource/vdiph2/o_oo differ
diff --git a/phsource/voc/zh b/phsource/voc/zh
index 8db5bb7b..f0eadd57 100644
Binary files a/phsource/voc/zh and b/phsource/voc/zh differ
diff --git a/phsource/vowel/y#_3 b/phsource/vowel/y#_3
new file mode 100644
index 00000000..decc2bb8
Binary files /dev/null and b/phsource/vowel/y#_3 differ
diff --git a/phsource/vowelcharts/af b/phsource/vowelcharts/af
deleted file mode 100644
index 730c79b5..00000000
--- a/phsource/vowelcharts/af
+++ /dev/null
@@ -1,32 +0,0 @@
-@	 536 1420 2420   536 1420 2420
-@-	 525 1441 2340   525 1441 2340
-a	 659 1278 2583   659 1278 2583
-E	 504 1900 2544   496 1920 2552
-I	 527 1461 2480   527 1461 2480
-O	 552  780 2760   552  780 2760
-W	 525 1320 2200   525 1320 2200
-u	 352 1000 2240   352 1000 2200
-&	 735 1760 2420   675 1738 2420
-@L	 485  891 2780   450  792 2980
-A:	 664 1040 2800   648 1060 2840
-e@	 264 2180 3040   488 1700 2600
-i	 272 2247 3100   288 2247 3100
-o@	 336 1060 2360   480 1480 2500
-y	 328 2100 2580   304 2160 2640
-iu	 280 2180 3040   272  900 2300
-@U	 620 1245 2298   376  880 2280
-aI	 768 1200 2820   312 2240 2940
-AI	 664 1040 2800   312 2240 2940
-eI	 640 1562 2400   355 2222 2720
-OI	 504  780 2660   328 2140 2780
-oI	 336 1040 2360   304 2360 2680
-uI	 352  960 2240   296 2247 3100
-Yy	 496 1220 2340   296 2020 2400
-Y@	 296 1980 2480   480 1580 2420
-aU	 830 1364 2440   488  900 2240
-e:	 464 1980 2520   464 1980 2520
-O:	 512  860 2648   512  860 2648
-3:	 480 1408 2320   545 1419 2320
-A~	 600 1060 2640   600 1060 2640
-e~	 456 2000 2520   456 2000 2520
-o~	 392  700 2720   392  700 2720
diff --git a/phsource/vowelcharts/af.png b/phsource/vowelcharts/af.png
deleted file mode 100644
index d0632273..00000000
Binary files a/phsource/vowelcharts/af.png and /dev/null differ
diff --git a/phsource/vowelcharts/base b/phsource/vowelcharts/base
deleted file mode 100644
index 2a8c948b..00000000
--- a/phsource/vowelcharts/base
+++ /dev/null
@@ -1,2 +0,0 @@
-@	 525 1441 2340   525 1441 2340
-@-	 525 1441 2340   525 1441 2340
diff --git a/phsource/vowelcharts/base.png b/phsource/vowelcharts/base.png
deleted file mode 100644
index d97d43b2..00000000
Binary files a/phsource/vowelcharts/base.png and /dev/null differ
diff --git a/phsource/vowelcharts/cs b/phsource/vowelcharts/cs
deleted file mode 100644
index b8c1b1fe..00000000
--- a/phsource/vowelcharts/cs
+++ /dev/null
@@ -1,26 +0,0 @@
-@	 525 1441 2340   525 1441 2340
-@-	 525 1441 2340   525 1441 2340
-r-	 648 1200 2300   640 1200 2260
-a	 925 1320 2700   896 1340 2660
-E	 647 1778 2530   647 1778 2530
-i	 360 2120 2680   360 2120 2660
-O	 584  940 2580   584  940 2580
-u	 344  800 2360   344  800 2360
-y	 452 1709 2460   452 1709 2460
-E~	 670 1719 2556   710 1672 2671
-O~	 540  896 2632   512  900 2620
-i:	 272 2247 3100   288 2247 3100
-&	 680 1660 2520   680 1660 2520
-e	 584 1820 2560   584 1820 2560
-e:	 584 1820 2560   584 1820 2560
-a:	 784 1180 2680   768 1220 2680
-o	 566  890 2641   566  890 2641
-o:	 512  860 2648   512  860 2648
-u:	 320  860 2360   320  860 2360
-aU	 847 1383 2510   360  800 2360
-eU	 460 1929 2512   327  947 2367
-oU	 496  900 2520   360  800 2140
-eI	 608 1800 2529   408 1960 2520
-r:	 648 1200 2300   640 1200 2260
-l-	 352 1240 3020   352 1200 3020
-l:	 352 1240 3020   352 1200 3020
diff --git a/phsource/vowelcharts/cs.png b/phsource/vowelcharts/cs.png
deleted file mode 100644
index a9b3c999..00000000
Binary files a/phsource/vowelcharts/cs.png and /dev/null differ
diff --git a/phsource/vowelcharts/cy b/phsource/vowelcharts/cy
deleted file mode 100644
index 746db0b9..00000000
--- a/phsource/vowelcharts/cy
+++ /dev/null
@@ -1,28 +0,0 @@
-@	 525 1441 2340   525 1441 2340
-@-	 525 1441 2340   525 1441 2340
-a	 925 1320 2700   896 1340 2660
-E	 645 1705 2520   645 1705 2520
-I	 384 2030 2610   384 2030 2610
-Y	 452 1709 2460   452 1709 2460
-O	 566  890 2641   566  890 2641
-U	 320  740 2400   320  740 2400
-V	 525 1441 2340   525 1441 2340
-i:	 280 2280 2820   200 2398 2820
-y:	 300 2020 2597   300 2020 2597
-u:	 320  860 2360   320  860 2360
-e:	 464 1980 2520   464 1980 2520
-o:	 424  800 2580   408  780 2600
-A:	 775 1067 2800   795 1122 2580
-AY	 664 1040 2800   312 2240 2940
-aI	 848 1260 2820   440 1969 2500
-aY	 848 1260 2820   440 1969 2500
-aU	 847 1383 2510   360  800 2360
-@I	 640 1562 2400   355 2222 2720
-@Y	 640 1562 2400   355 2222 2720
-eU	 460 1929 2512   327  947 2367
-Iu	 405 1790 2442   344 1080 2200
-Yu	 405 1790 2442   344 1080 2200
-OI	 545  780 2780   310 2002 2300
-OY	 545  780 2780   310 2002 2300
-uI	 352  960 2340   343 1911 2586
-uY	 352  960 2340   343 1911 2586
diff --git a/phsource/vowelcharts/cy.png b/phsource/vowelcharts/cy.png
deleted file mode 100644
index 213ade32..00000000
Binary files a/phsource/vowelcharts/cy.png and /dev/null differ
diff --git a/phsource/vowelcharts/de b/phsource/vowelcharts/de
deleted file mode 100644
index 2134a05f..00000000
--- a/phsource/vowelcharts/de
+++ /dev/null
@@ -1,23 +0,0 @@
-@	 528 1500 2380   528 1500 2380
-@-	 525 1441 2340   525 1441 2340
-3	 658 1408 2460   658 1408 2460
-a	 925 1320 2700   896 1340 2660
-E	 504 1900 2544   496 1920 2552
-E2	 504 1900 2544   496 1920 2552
-I	 384 2030 2610   384 2030 2610
-I:	 384 2030 2610   384 2030 2610
-O	 552  860 2660   552  860 2660
-U	 388  940 2420   394  980 2360
-A:	 800 1240 2720   781 1280 2580
-i:	 280 2247 3100   280 2220 3040
-u:	 320  860 2360   320  860 2360
-aU	 724 1130 2760   472  780 2500
-aI	 925 1320 2700   355 2222 2720
-OI	 469  864 2440   310 2040 2440
-E:	 504 1900 2544   496 1920 2552
-e:	 416 2140 2660   416 2140 2660
-o:	 454  812 2559   432  824 2520
-y:	 280 1720 2340   280 1720 2340
-y	 305 1692 2340   305 1692 2340
-Y:	 448 1520 2420   463 1520 2400
-W	 525 1320 2200   525 1320 2200
diff --git a/phsource/vowelcharts/de.png b/phsource/vowelcharts/de.png
deleted file mode 100644
index f057cd51..00000000
Binary files a/phsource/vowelcharts/de.png and /dev/null differ
diff --git a/phsource/vowelcharts/el b/phsource/vowelcharts/el
deleted file mode 100644
index 7f980aa8..00000000
--- a/phsource/vowelcharts/el
+++ /dev/null
@@ -1,19 +0,0 @@
-@	 525 1441 2340   525 1441 2340
-@-	 525 1441 2340   525 1441 2340
-a	 896 1440 2720   880 1440 2700
-a/	 841 1409 2550   841 1409 2550
-e	 504 1900 2544   496 1920 2552
-E	 720 1760 2420   672 1562 2520
-i	 280 2280 2820   200 2398 2820
-i2	 312 2300 2820   312 2300 2820
-o	 552  860 2660   552  860 2660
-O	 670  946 2620   630  902 2700
-U	 388  940 2420   394  980 2360
-u	 320  740 2400   320  740 2400
-aU	 847 1383 2510   360  800 2360
-eU	 460 1929 2512   327  947 2367
-iU	 280 2280 2820   328  957 2140
-aI	 912 1320 2740   360 2200 2820
-eI	 464 1980 2520   328 2280 2720
-oI	 469  864 2440   310 2040 2440
-uI	 321  965 2377   328 2160 2720
diff --git a/phsource/vowelcharts/el.png b/phsource/vowelcharts/el.png
deleted file mode 100644
index 45b43ee3..00000000
Binary files a/phsource/vowelcharts/el.png and /dev/null differ
diff --git a/phsource/vowelcharts/en b/phsource/vowelcharts/en
deleted file mode 100644
index a5fbdf0c..00000000
--- a/phsource/vowelcharts/en
+++ /dev/null
@@ -1,49 +0,0 @@
-@	 525 1441 2340   525 1441 2340
-@-	 525 1441 2340   525 1441 2340
-i:	 296 2220 2820   200 2398 2820
-i@	 368 2156 2720   528 1595 2460
-3	 525 1441 2340   525 1441 2340
-@2	 525 1441 2340   525 1441 2340
-I2	 440 1837 2520   440 1837 2520
-@5	 525 1441 2340   525 1441 2340
-U	 445  902 2620   445  902 2620
-@L	 485  891 2780   450  792 2980
-a	 925 1342 2700   925 1342 2700
-a2	 658 1408 2460   658 1408 2460
-aa	 925 1342 2700   925 1342 2700
-E	 645 1705 2520   645 1705 2520
-I	 440 1837 2520   440 1837 2520
-i	 440 1837 2520   440 1837 2520
-0	 670  946 2620   630  902 2700
-V	 605 1232 2620   605 1276 2620
-A:	 775 1067 2800   795 1122 2580
-A@	 775 1067 2800   795 1122 2580
-3:	 480 1408 2320   545 1419 2320
-O:	 465  836 2660   530 1001 2620
-O@	 465  836 2660   530 1001 2620
-o@	 465  836 2660   530 1001 2620
-O	 465  836 2660   530 1001 2620
-u:	 360 1562 2260   290 1023 2220
-aU	 830 1364 2440   488  900 2240
-oU	 630 1353 2340   390  957 2140
-aI	 860 1133 2820   440 1969 2500
-eI	 755 1683 2460   355 2222 2720
-OI	 545  780 2780   310 2002 2300
-e@	 720 1760 2420   672 1562 2520
-U@	 430  960 2340   590 1287 2260
-aI@	 860 1133 2820   640 1518 2400
-aU@	 945 1485 2620   705 1342 2300
-e:	 464 1980 2520   464 1980 2520
-o:	 454  812 2559   432  824 2520
-eU	 460 1929 2512   327  947 2367
-uI	 321  965 2377   328 2160 2720
-IR	 544 1340 2460   616 1190 2450
-VR	 648 1180 2595   640 1140 2460
-A~	 640 1120 2640   640 1120 2640
-E~	 672 1660 2624   672 1660 2624
-O~	 480  839 2760   480  839 2780
-W~	 694 1360 2624   694 1360 2624
-y:	 280 1720 2340   280 1720 2340
-Y:	 448 1520 2420   463 1520 2400
-W	 525 1320 2200   525 1320 2200
-u-	 392 1700 2240   392 1700 2240
diff --git a/phsource/vowelcharts/en.png b/phsource/vowelcharts/en.png
deleted file mode 100644
index 935ec068..00000000
Binary files a/phsource/vowelcharts/en.png and /dev/null differ
diff --git a/phsource/vowelcharts/en_n b/phsource/vowelcharts/en_n
deleted file mode 100644
index 4af8b49d..00000000
--- a/phsource/vowelcharts/en_n
+++ /dev/null
@@ -1,49 +0,0 @@
-@	 525 1441 2340   525 1441 2340
-@-	 525 1441 2340   525 1441 2340
-i:	 280 2280 2820   200 2398 2820
-i@	 328 2190 2770   515 1520 2360
-3	 525 1441 2340   525 1441 2340
-@2	 525 1441 2340   525 1441 2340
-I2	 440 1837 2520   440 1837 2520
-@5	 525 1441 2340   525 1441 2340
-U	 320  860 2360   320  860 2360
-@L	 485  891 2780   450  792 2980
-a	 925 1320 2700   896 1340 2660
-a2	 658 1408 2460   658 1408 2460
-aa	 925 1320 2700   896 1340 2660
-E	 680 1660 2520   680 1660 2520
-I	 440 1837 2520   440 1837 2520
-i	 440 1837 2520   440 1837 2520
-0	 630  920 2627   630  920 2627
-V	 477  968 2620   477  968 2620
-A:	 915 1243 2620   895 1276 2340
-A@	 915 1243 2620   895 1276 2340
-3:	 525 1320 2200   529 1340 2140
-O:	 512  860 2648   512  860 2648
-O@	 575  891 2640   580 1023 2480
-o@	 465  836 2660   530 1001 2620
-O	 465  836 2660   530 1001 2620
-u:	 384 1800 2320   344 1660 2300
-aU	 660 1562 2360   340  990 2360
-oU	 464  820 2559   440  820 2600
-aI	 860 1360 2660   488 1840 2440
-eI	 464 1980 2520   464 1980 2520
-OI	 545  780 2780   310 2002 2300
-e@	 720 1760 2420   672 1562 2520
-U@	 430  960 2340   590 1287 2260
-aI@	 860 1133 2820   640 1518 2400
-aU@	 945 1485 2620   705 1342 2300
-e:	 464 1980 2520   464 1980 2520
-o:	 454  812 2559   432  824 2520
-eU	 460 1929 2512   327  947 2367
-uI	 321  965 2377   328 2160 2720
-IR	 544 1340 2460   616 1190 2450
-VR	 648 1180 2595   640 1140 2460
-A~	 640 1120 2640   640 1120 2640
-E~	 672 1660 2624   672 1660 2624
-O~	 480  839 2760   480  839 2780
-W~	 694 1360 2624   694 1360 2624
-y:	 280 1720 2340   280 1720 2340
-Y:	 448 1520 2420   463 1520 2400
-W	 525 1320 2200   525 1320 2200
-u-	 392 1700 2240   392 1700 2240
diff --git a/phsource/vowelcharts/en_n.png b/phsource/vowelcharts/en_n.png
deleted file mode 100644
index 93203725..00000000
Binary files a/phsource/vowelcharts/en_n.png and /dev/null differ
diff --git a/phsource/vowelcharts/en_rp b/phsource/vowelcharts/en_rp
deleted file mode 100644
index 9b0931d5..00000000
--- a/phsource/vowelcharts/en_rp
+++ /dev/null
@@ -1,49 +0,0 @@
-@	 525 1441 2340   525 1441 2340
-@-	 525 1441 2340   525 1441 2340
-i:	 280 2280 2820   200 2398 2820
-i@	 416 2068 2720   653 1430 2328
-3	 525 1441 2340   525 1441 2340
-@2	 584 1427 2393   584 1427 2393
-I2	 416 1920 2520   432 1900 2520
-@5	 584 1427 2393   584 1427 2393
-U	 464 1000 2480   464 1000 2480
-@L	 485  891 2780   450  792 2980
-a	 744 1560 2500   736 1580 2500
-a2	 525 1441 2340   525 1441 2340
-aa	 648 1108 2880   632 1140 2880
-E	 584 1820 2560   584 1820 2560
-I	 416 1920 2520   432 1900 2520
-i	 360 2120 2680   360 2120 2660
-0	 656 1000 2620   630  960 2700
-V	 686 1280 2595   686 1280 2595
-A:	 648 1108 2880   632 1140 2880
-A@	 648 1108 2880   632 1140 2880
-3:	 536 1408 2320   545 1419 2320
-O:	 512  860 2648   512  860 2648
-O@	 512  860 2648   512  860 2648
-o@	 465  836 2660   530 1001 2620
-O	 465  836 2660   530 1001 2620
-u:	 328  940 2380   328  920 2380
-aU	 912 1420 2440   536  940 2300
-oU	 568 1620 2340   376 1255 2243
-aI	 925 1342 2700   440 1969 2500
-eI	 608 1800 2529   408 1960 2520
-OI	 545  780 2780   310 2002 2300
-e@	 688 1820 2440   735 1562 2540
-U@	 432  840 2620   440  860 2680
-aI@	 860 1133 2820   640 1518 2400
-aU@	 945 1485 2620   705 1220 2300
-e:	 464 1980 2520   464 1980 2520
-o:	 454  812 2559   432  824 2520
-eU	 460 1929 2512   327  947 2367
-uI	 321  965 2377   328 2160 2720
-IR	 544 1340 2460   616 1190 2450
-VR	 648 1180 2595   640 1140 2460
-A~	 640 1120 2640   640 1120 2640
-E~	 672 1660 2624   672 1660 2624
-O~	 480  839 2760   480  839 2780
-W~	 694 1360 2624   694 1360 2624
-y:	 280 1720 2340   280 1720 2340
-Y:	 448 1520 2420   463 1520 2400
-W	 525 1320 2200   525 1320 2200
-u-	 392 1700 2240   392 1700 2240
diff --git a/phsource/vowelcharts/en_rp.png b/phsource/vowelcharts/en_rp.png
deleted file mode 100644
index f9259895..00000000
Binary files a/phsource/vowelcharts/en_rp.png and /dev/null differ
diff --git a/phsource/vowelcharts/en_sc b/phsource/vowelcharts/en_sc
deleted file mode 100644
index 37b71435..00000000
--- a/phsource/vowelcharts/en_sc
+++ /dev/null
@@ -1,51 +0,0 @@
-@	 528 1500 2380   528 1500 2380
-@-	 525 1441 2340   525 1441 2340
-i:	 328 2380 2940   280 2440 2980
-i@	 384 2030 2610   520 1460 1900
-3	 605 1232 2620   605 1276 2620
-@2	 528 1500 2380   528 1500 2380
-I2	 504 1700 2560   504 1700 2560
-@5	 528 1500 2380   528 1500 2380
-U	 407 1500 2160   392 1500 2160
-@L	 560  900 2780   450  792 2980
-a	 784 1180 2680   768 1220 2680
-a2	 760 1420 2600   736 1380 2540
-aa	 784 1180 2680   768 1220 2680
-E	 518 1920 2540   581 1810 2540
-I	 504 1700 2560   504 1700 2560
-i	 520 2000 2540   520 2000 2540
-0	 566  890 2641   566  890 2641
-V	 664 1180 2595   664 1180 2595
-A:	 784 1180 2680   768 1220 2680
-A@	 752 1190 2640   688 1320 2480
-3:	 464 1980 2520   658 1408 2460
-O:	 552  860 2660   552  860 2660
-O@	 552  880 2660   552 1080 2560
-o@	 424  780 2680   504  940 1820
-O	 656 1000 2620   630  960 2700
-u:	 392 1700 2240   392 1700 2240
-aU	 698 1320 2484   280 1600 2340
-oU	 412  760 2660   400  760 2740
-aI	 760 1200 2680   352 2280 2780
-eI	 416 2140 2660   416 2140 2660
-OI	 624  980 2620   328 2127 2940
-e@	 464 1980 2520   658 1408 2460
-U@	 344 1740 2240   592 1220 2400
-aI@	 892 1340 2684   552 1800 2480
-aU@	 945 1485 2620   705 1342 2300
-e:	 464 1980 2520   464 1980 2520
-o:	 454  812 2559   432  824 2520
-eU	 460 1929 2512   327  947 2367
-uI	 321  965 2377   328 2160 2720
-IR	 544 1340 2460   616 1190 2450
-VR	 648 1180 2595   640 1140 2460
-A~	 640 1120 2640   640 1120 2640
-E~	 672 1660 2624   672 1660 2624
-O~	 480  839 2760   480  839 2780
-W~	 694 1360 2624   694 1360 2624
-y:	 280 1720 2340   280 1720 2340
-Y:	 448 1520 2420   463 1520 2400
-W	 525 1320 2200   525 1320 2200
-u-	 392 1700 2240   392 1700 2240
-a/	 784 1180 2680   768 1220 2680
-aI2	 760 1200 2680   352 2280 2780
diff --git a/phsource/vowelcharts/en_sc.png b/phsource/vowelcharts/en_sc.png
deleted file mode 100644
index 485bcd46..00000000
Binary files a/phsource/vowelcharts/en_sc.png and /dev/null differ
diff --git a/phsource/vowelcharts/en_us b/phsource/vowelcharts/en_us
deleted file mode 100644
index e70414d6..00000000
--- a/phsource/vowelcharts/en_us
+++ /dev/null
@@ -1,49 +0,0 @@
-@	 525 1441 2340   525 1441 2340
-@-	 525 1441 2340   525 1441 2340
-i:	 296 2220 2820   200 2398 2820
-i@	 384 2030 2610   520 1460 1900
-3	 504 1380 1800   504 1360 1700
-@2	 525 1441 2340   525 1441 2340
-I2	 386 2029 2605   440 1801 2502
-@5	 525 1441 2340   525 1441 2340
-U	 496 1040 2560   496 1040 2560
-@L	 485  891 2780   450  792 2980
-a	 856 1540 2690   680 1503 2520
-a2	 658 1408 2460   658 1408 2460
-aa	 856 1540 2690   680 1503 2520
-E	 645 1740 2520   597 1600 2448
-I	 386 2029 2605   440 1801 2502
-i	 424 1960 2540   416 1960 2540
-0	 688 1064 2806   672 1100 2806
-V	 659 1278 2583   592 1359 2462
-A:	 688 1064 2806   672 1100 2806
-A@	 751 1090 2716   520 1240 1900
-3:	 480 1408 2320   552 1400 2160
-O:	 656 1000 2620   630  960 2700
-O@	 465  840 2660   520 1160 1900
-o@	 465  840 2660   520 1160 1900
-O	 656 1000 2620   630  960 2700
-u:	 352 1527 2256   290 1023 2220
-aU	 745 1480 2400   456  920 2240
-oU	 616 1220 2380   390  957 2140
-aI	 848 1260 2820   440 1969 2500
-eI	 608 1800 2529   408 1960 2520
-OI	 545  780 2780   310 2002 2300
-e@	 552 1800 2529   520 1460 1900
-U@	 496 1040 2560   520 1160 1900
-aI@	 860 1133 2820   640 1518 2400
-aU@	 945 1485 2620   705 1342 2300
-e:	 464 1980 2520   464 1980 2520
-o:	 454  812 2559   432  824 2520
-eU	 460 1929 2512   327  947 2367
-uI	 321  965 2377   328 2160 2720
-IR	 544 1340 2460   616 1190 2450
-VR	 648 1180 2595   640 1140 2460
-A~	 640 1120 2640   640 1120 2640
-E~	 672 1660 2624   672 1660 2624
-O~	 480  839 2760   480  839 2780
-W~	 694 1360 2624   694 1360 2624
-y:	 280 1720 2340   280 1720 2340
-Y:	 448 1520 2420   463 1520 2400
-W	 525 1320 2200   525 1320 2200
-u-	 392 1700 2240   392 1700 2240
diff --git a/phsource/vowelcharts/en_us.png b/phsource/vowelcharts/en_us.png
deleted file mode 100644
index acec1800..00000000
Binary files a/phsource/vowelcharts/en_us.png and /dev/null differ
diff --git a/phsource/vowelcharts/en_wm b/phsource/vowelcharts/en_wm
deleted file mode 100644
index f9fff599..00000000
--- a/phsource/vowelcharts/en_wm
+++ /dev/null
@@ -1,49 +0,0 @@
-@	 525 1441 2340   525 1441 2340
-@-	 525 1441 2340   525 1441 2340
-i:	 304 2020 2700   200 2398 2820
-i@	 395 2068 2720   515 1595 2460
-3	 525 1441 2340   525 1441 2340
-@2	 525 1441 2340   525 1441 2340
-I2	 312 2213 2775   312 2213 2775
-@5	 525 1441 2340   525 1441 2340
-U	 445  902 2620   445  902 2620
-@L	 485  891 2780   450  792 2980
-a	 841 1409 2550   841 1409 2550
-a2	 658 1408 2460   658 1408 2460
-aa	 841 1409 2550   841 1409 2550
-E	 584 1820 2560   584 1820 2560
-I	 312 2213 2775   312 2213 2775
-i	 280 2280 2820   200 2398 2820
-0	 630  920 2627   630  920 2627
-V	 477  968 2620   477  968 2620
-A:	 915 1243 2620   895 1244 2460
-A@	 915 1243 2620   895 1244 2460
-3:	 448 1520 2420   463 1520 2400
-O:	 512  860 2648   512  860 2648
-O@	 454  812 2559   432  824 2520
-o@	 465  836 2660   530 1001 2620
-O	 454  812 2559   432  824 2520
-u:	 525 1441 2340   340  990 2360
-aU	 660 1562 2360   340  990 2360
-oU	 616 1220 2380   390  957 2140
-aI	 584  940 2820   352 1920 2480
-eI	 649 1485 2430   355 2222 2720
-OI	 469  864 2440   310 2040 2440
-e@	 480 1408 2320   545 1419 2320
-U@	 430  960 2340   590 1287 2260
-aI@	 860 1133 2820   640 1518 2400
-aU@	 945 1485 2620   705 1342 2300
-e:	 464 1980 2520   464 1980 2520
-o:	 454  812 2559   432  824 2520
-eU	 460 1929 2512   327  947 2367
-uI	 321  965 2377   328 2160 2720
-IR	 544 1340 2460   616 1190 2450
-VR	 648 1180 2595   640 1140 2460
-A~	 640 1120 2640   640 1120 2640
-E~	 672 1660 2624   672 1660 2624
-O~	 480  839 2760   480  839 2780
-W~	 694 1360 2624   694 1360 2624
-y:	 280 1720 2340   280 1720 2340
-Y:	 448 1520 2420   463 1520 2400
-W	 525 1320 2200   525 1320 2200
-u-	 392 1700 2240   392 1700 2240
diff --git a/phsource/vowelcharts/en_wm.png b/phsource/vowelcharts/en_wm.png
deleted file mode 100644
index daaf19f3..00000000
Binary files a/phsource/vowelcharts/en_wm.png and /dev/null differ
diff --git a/phsource/vowelcharts/eo b/phsource/vowelcharts/eo
deleted file mode 100644
index bea95a08..00000000
--- a/phsource/vowelcharts/eo
+++ /dev/null
@@ -1,13 +0,0 @@
-@	 525 1441 2340   525 1441 2340
-@-	 525 1441 2340   525 1441 2340
-a	 896 1440 2720   880 1440 2700
-e	 464 1980 2520   464 1980 2520
-i	 280 2280 2820   200 2398 2820
-o	 552  860 2660   552  860 2660
-u	 320  860 2360   320  860 2360
-aU	 847 1383 2510   360  800 2360
-eU	 460 1929 2512   327  947 2367
-aI	 912 1320 2740   360 2200 2820
-eI	 547 1855 2536   320 2300 2740
-OI	 545  780 2780   310 2002 2300
-uI	 321  965 2377   328 2160 2720
diff --git a/phsource/vowelcharts/eo.png b/phsource/vowelcharts/eo.png
deleted file mode 100644
index 9fe8d0db..00000000
Binary files a/phsource/vowelcharts/eo.png and /dev/null differ
diff --git a/phsource/vowelcharts/es b/phsource/vowelcharts/es
deleted file mode 100644
index a983ca6a..00000000
--- a/phsource/vowelcharts/es
+++ /dev/null
@@ -1,19 +0,0 @@
-@	 525 1441 2340   525 1441 2340
-@-	 525 1441 2340   525 1441 2340
-a	 896 1440 2720   880 1440 2700
-a/	 760 1420 2600   736 1380 2540
-e	 464 1980 2520   464 1980 2520
-E	 584 1820 2560   584 1820 2560
-i	 280 2280 2820   200 2398 2820
-i2	 312 2300 2820   312 2300 2820
-o	 552  860 2660   552  860 2660
-O	 670  946 2620   630  902 2700
-U	 388  940 2420   394  980 2360
-u	 320  740 2400   320  740 2400
-aU	 847 1383 2510   360  800 2360
-eU	 460 1929 2512   327  947 2367
-iU	 280 2280 2820   328  957 2140
-aI	 912 1320 2740   360 2200 2820
-eI	 464 1980 2520   328 2280 2720
-oI	 469  864 2440   310 2040 2440
-uI	 321  965 2377   328 2160 2720
diff --git a/phsource/vowelcharts/es.png b/phsource/vowelcharts/es.png
deleted file mode 100644
index 31a88e56..00000000
Binary files a/phsource/vowelcharts/es.png and /dev/null differ
diff --git a/phsource/vowelcharts/fi b/phsource/vowelcharts/fi
deleted file mode 100644
index 3abdcda6..00000000
--- a/phsource/vowelcharts/fi
+++ /dev/null
@@ -1,32 +0,0 @@
-@	 525 1441 2340   525 1441 2340
-@-	 525 1441 2340   525 1441 2340
-i	 312 2300 2820   312 2300 2820
-I	 360 2120 2680   360 2120 2660
-e	 504 1900 2544   496 1920 2552
-&	 744 1560 2500   736 1580 2500
-a	 688 1064 2806   672 1100 2806
-a2	 657 1100 2703   657 1120 2703
-o	 512  860 2648   512  860 2648
-Y	 448 1520 2420   463 1520 2400
-u	 320  740 2400   320  740 2400
-u1	 344  800 2360   344  800 2360
-U	 368  800 2660   368  800 2660
-y	 280 1720 2340   280 1720 2340
-ai	 688 1064 2806   312 2300 2820
-&i	 744 1540 2500   328 2280 2720
-oi	 545  780 2780   310 2002 2300
-ei	 547 1855 2536   320 2300 2740
-Yi	 448 1520 2420   355 2222 2720
-ui	 321  965 2377   328 2160 2720
-yi	 280 1720 2340   355 2222 2720
-au	 688 1060 2580   368  900 2540
-ou	 516  860 2648   312  860 2360
-eu	 460 1929 2512   327  947 2367
-iu	 296 2180 2820   320  920 2360
-&y	 744 1520 2500   296 1720 2340
-ey	 547 1855 2536   280 1720 2340
-Yy	 448 1520 2420   280 1720 2340
-iy	 280 2280 2820   280 1720 2340
-uo	 344  896 2375   494  864 2468
-ie	 280 2280 2820   735 1562 2520
-yY	 280 1720 2340   448 1520 2420
diff --git a/phsource/vowelcharts/fi.png b/phsource/vowelcharts/fi.png
deleted file mode 100644
index 18b392fd..00000000
Binary files a/phsource/vowelcharts/fi.png and /dev/null differ
diff --git a/phsource/vowelcharts/fr b/phsource/vowelcharts/fr
deleted file mode 100644
index 5430eba8..00000000
--- a/phsource/vowelcharts/fr
+++ /dev/null
@@ -1,22 +0,0 @@
-@	 500 1412 2320   500 1412 2340
-@-	 525 1441 2340   525 1441 2340
-a	 925 1342 2700   925 1342 2700
-e	 464 1980 2520   464 1980 2520
-E	 647 1778 2530   647 1778 2530
-i	 280 2280 2820   200 2398 2820
-o	 464  820 2559   440  820 2600
-O	 480  800 2700   480  800 2700
-u	 320  860 2360   320  860 2360
-y	 272 1820 2280   272 1800 2260
-Y	 448 1520 2420   463 1520 2400
-W	 525 1320 2200   525 1320 2200
-w^i	 280 1832 2436   200 2398 2820
-A~	 600 1060 2640   600 1060 2640
-E~	 694 1360 2624   694 1360 2624
-O~	 381  700 2960   381  700 2960
-W~	 694 1360 2624   694 1360 2624
-I	 280 2280 2820   200 2398 2820
-U	 320  860 2360   320  860 2360
-y"	 272 1820 2280   272 1800 2260
-E:	 464 1980 2520   464 1980 2520
-A	 925 1342 2700   925 1342 2700
diff --git a/phsource/vowelcharts/fr.png b/phsource/vowelcharts/fr.png
deleted file mode 100644
index 998d2bb5..00000000
Binary files a/phsource/vowelcharts/fr.png and /dev/null differ
diff --git a/phsource/vowelcharts/fr_ca b/phsource/vowelcharts/fr_ca
deleted file mode 100644
index c4c683f6..00000000
--- a/phsource/vowelcharts/fr_ca
+++ /dev/null
@@ -1,22 +0,0 @@
-@	 500 1412 2320   500 1412 2340
-@-	 525 1441 2340   525 1441 2340
-a	 925 1342 2700   925 1342 2700
-e	 464 1980 2520   464 1980 2520
-E	 584 1820 2560   584 1820 2560
-i	 280 2280 2820   200 2398 2820
-o	 464  820 2559   440  820 2600
-O	 480  800 2700   480  800 2700
-u	 320  740 2400   320  740 2400
-y	 272 1820 2280   272 1800 2260
-Y	 448 1520 2420   463 1520 2400
-W	 525 1320 2200   525 1320 2200
-w^i	 280 1832 2436   200 2398 2820
-A~	 600 1060 2640   600 1060 2640
-E~	 672 1660 2624   672 1660 2624
-O~	 381  700 2960   381  700 2960
-W~	 694 1360 2624   694 1360 2624
-I	 384 2030 2610   384 2030 2610
-U	 368  880 2440   368  900 2440
-y"	 353 1860 2438   353 1860 2438
-E:	 863 1474 2664   545 1864 2518
-A	 688 1064 2806   672 1100 2806
diff --git a/phsource/vowelcharts/fr_ca.png b/phsource/vowelcharts/fr_ca.png
deleted file mode 100644
index 3cb90229..00000000
Binary files a/phsource/vowelcharts/fr_ca.png and /dev/null differ
diff --git a/phsource/vowelcharts/hi b/phsource/vowelcharts/hi
deleted file mode 100644
index c7aa2035..00000000
--- a/phsource/vowelcharts/hi
+++ /dev/null
@@ -1,30 +0,0 @@
-@	 544 1220 2460   544 1220 2460
-@-	 525 1441 2340   525 1441 2340
-r-	 648 1200 2300   640 1200 2260
-V	 686 1280 2595   686 1280 2595
-@2	 584 1440 2460   600 1440 2460
-@3	 528 1500 2380   528 1500 2380
-@4	 525 1441 2340   525 1441 2340
-i:	 304 2440 3020   304 2440 3020
-i	 304 2440 3020   304 2440 3020
-I	 360 2120 2680   360 2120 2660
-e:	 416 2140 2660   416 2140 2660
-e	 416 2140 2660   416 2140 2660
-E:	 656 1740 2500   504 1900 2620
-E	 584 1820 2560   584 1820 2560
-E~	 670 1719 2556   710 1672 2671
-&:	 744 1560 2500   736 1580 2500
-a:	 712 1160 2780   696 1160 2780
-a	 658 1408 2460   658 1408 2460
-o:	 424  800 2580   408  780 2600
-o	 454  812 2559   432  824 2520
-O:	 584  940 2580   584  940 2580
-o~	 448  840 2598   448  840 2598
-O~	 540  896 2632   512  900 2620
-O	 670  946 2620   630  902 2700
-U	 368  880 2440   368  900 2440
-u:	 320  740 2400   320  740 2400
-u2:	 320  860 2360   320  860 2360
-l-	 352 1240 3020   352 1200 3020
-aI	 744 1540 2500   328 2280 2720
-aU	 724 1130 2760   472  780 2500
diff --git a/phsource/vowelcharts/hi.png b/phsource/vowelcharts/hi.png
deleted file mode 100644
index 1044e495..00000000
Binary files a/phsource/vowelcharts/hi.png and /dev/null differ
diff --git a/phsource/vowelcharts/hr b/phsource/vowelcharts/hr
deleted file mode 100644
index e7cc0c64..00000000
--- a/phsource/vowelcharts/hr
+++ /dev/null
@@ -1,30 +0,0 @@
-@	 525 1441 2340   525 1441 2340
-@-	 525 1441 2340   525 1441 2340
-r-	 648 1200 2300   640 1200 2260
-a	 925 1320 2700   896 1340 2660
-E	 584 1820 2560   584 1820 2560
-i	 272 2247 3100   288 2247 3100
-O	 584  940 2580   584  940 2580
-u	 320  740 2400   320  740 2400
-y	 452 1709 2460   452 1709 2460
-E~	 670 1719 2556   710 1672 2671
-O~	 540  896 2632   512  900 2620
-i:	 272 2247 3100   288 2247 3100
-&	 728 1300 2595   736 1300 2595
-e	 464 1980 2520   464 1980 2520
-e:	 584 1820 2560   584 1820 2560
-a:	 925 1320 2700   896 1340 2660
-o	 512  860 2648   512  860 2648
-o:	 512  860 2648   512  860 2648
-u:	 320  740 2400   320  740 2400
-aU	 847 1383 2510   360  800 2360
-eU	 460 1929 2512   327  947 2367
-oU	 496  900 2520   360  800 2140
-eI	 608 1800 2529   408 1960 2520
-r:	 648 1200 2300   640 1200 2260
-l-	 352 1240 3020   352 1200 3020
-l:	 352 1240 3020   352 1200 3020
-@2	 512 1620 2560   512 1620 2560
-aI	 912 1320 2740   360 2200 2820
-I	 360 2120 2680   360 2120 2660
-U	 368  880 2440   368  900 2440
diff --git a/phsource/vowelcharts/hr.png b/phsource/vowelcharts/hr.png
deleted file mode 100644
index b18f1d91..00000000
Binary files a/phsource/vowelcharts/hr.png and /dev/null differ
diff --git a/phsource/vowelcharts/hu b/phsource/vowelcharts/hu
deleted file mode 100644
index 45b88dfb..00000000
--- a/phsource/vowelcharts/hu
+++ /dev/null
@@ -1,17 +0,0 @@
-@	 525 1441 2340   525 1441 2340
-@-	 525 1441 2340   525 1441 2340
-i	 312 2300 2820   312 2300 2820
-i:	 280 2280 2820   200 2398 2820
-E	 645 1705 2520   645 1705 2520
-e	 464 1980 2520   464 1980 2520
-e:	 416 2140 2660   416 2140 2660
-A	 656 1000 2620   630  960 2700
-a:	 925 1320 2700   896 1340 2660
-o	 488  900 2520   488  900 2520
-o:	 424  800 2580   408  780 2600
-u	 368  880 2440   368  900 2440
-u:	 320  740 2400   320  740 2400
-y	 305 1692 2340   305 1692 2340
-y:	 280 1720 2340   280 1720 2340
-Y	 480 1560 2420   516 1520 2340
-Y:	 448 1520 2420   463 1520 2400
diff --git a/phsource/vowelcharts/hu.png b/phsource/vowelcharts/hu.png
deleted file mode 100644
index 906633df..00000000
Binary files a/phsource/vowelcharts/hu.png and /dev/null differ
diff --git a/phsource/vowelcharts/it b/phsource/vowelcharts/it
deleted file mode 100644
index 82e38719..00000000
--- a/phsource/vowelcharts/it
+++ /dev/null
@@ -1,19 +0,0 @@
-@	 525 1441 2340   525 1441 2340
-@-	 525 1441 2340   525 1441 2340
-a	 896 1440 2720   880 1440 2700
-a/	 760 1420 2600   736 1380 2540
-e	 464 1980 2520   464 1980 2520
-E	 720 1760 2420   672 1562 2520
-i	 280 2280 2820   200 2398 2820
-i2	 312 2300 2820   312 2300 2820
-o	 454  812 2559   432  824 2520
-O	 670  946 2620   630  902 2700
-U	 388  940 2420   394  980 2360
-u	 320  740 2400   320  740 2400
-aU	 847 1383 2510   360  800 2360
-eU	 460 1929 2512   327  947 2367
-iU	 280 2280 2820   328  957 2140
-aI	 912 1320 2740   360 2200 2820
-eI	 464 1980 2520   328 2280 2720
-oI	 469  864 2440   310 2040 2440
-uI	 321  965 2377   328 2160 2720
diff --git a/phsource/vowelcharts/it.png b/phsource/vowelcharts/it.png
deleted file mode 100644
index 4c43d77b..00000000
Binary files a/phsource/vowelcharts/it.png and /dev/null differ
diff --git a/phsource/vowelcharts/nl b/phsource/vowelcharts/nl
deleted file mode 100644
index dca61d2b..00000000
--- a/phsource/vowelcharts/nl
+++ /dev/null
@@ -1,20 +0,0 @@
-@	 496 1500 2420   496 1500 2420
-@-	 525 1441 2340   525 1441 2340
-i	 280 2247 3100   280 2220 3040
-I	 384 2030 2610   384 2030 2610
-y	 280 1720 2340   280 1720 2340
-8	 448 1520 2420   463 1520 2400
-u	 320  740 2400   320  740 2400
-E	 504 1900 2544   496 1920 2552
-E2	 645 1705 2520   645 1705 2520
-O	 480  800 2700   480  800 2700
-a:	 925 1320 2700   896 1340 2660
-A	 744 1120 2680   744 1120 2680
-e:	 464 1980 2520   328 2280 2720
-Y:	 480 1540 2340   400 1620 2120
-o:	 560 1020 2460   390  780 2140
-EI	 672 1800 2440   400 2120 2660
-Wy	 744 1520 2500   296 1720 2340
-VU	 724 1130 2760   472  780 2500
-eU	 460 1929 2512   327  947 2367
-yU	 280 1720 2340   394  980 2360
diff --git a/phsource/vowelcharts/nl.png b/phsource/vowelcharts/nl.png
deleted file mode 100644
index 55b9ee57..00000000
Binary files a/phsource/vowelcharts/nl.png and /dev/null differ
diff --git a/phsource/vowelcharts/no b/phsource/vowelcharts/no
deleted file mode 100644
index fec5a430..00000000
--- a/phsource/vowelcharts/no
+++ /dev/null
@@ -1,28 +0,0 @@
-@	 456 1460 2391   456 1460 2391
-@-	 525 1441 2340   525 1441 2340
-@2	 584 1440 2460   600 1440 2460
-I	 360 2120 2680   360 2120 2660
-i:	 280 2280 2820   200 2398 2820
-y	 353 1860 2438   353 1860 2438
-y:	 278 2030 2490   278 2030 2490
-W	 504 1340 2220   504 1340 2220
-Y:	 392 1460 2180   408 1359 2201
-E	 584 1820 2560   584 1820 2560
-E:	 720 1760 2420   672 1562 2520
-e:	 416 2140 2660   416 2140 2660
-a	 760 1260 2500   760 1320 2500
-a:	 760 1260 2500   760 1320 2500
-A	 688 1064 2806   672 1100 2806
-A:	 688 1064 2806   672 1100 2806
-O	 552  860 2660   552  860 2660
-o:	 424  800 2580   408  780 2600
-U	 368  880 2440   368  900 2440
-u:	 320  740 2400   320  740 2400
-u-	 323 1520 2140   323 1520 2160
-u-:	 272 1520 2100   280 1560 2120
-AI	 624  980 2620   328 2127 2940
-aI	 776 1340 2540   355 2222 2720
-OI	 545  780 2780   310 2002 2300
-u-I	 280 1720 2340   355 2222 2720
-Yy	 496 1420 2180   267 2160 2772
-aU	 744 1420 2500   320 1300 2338
diff --git a/phsource/vowelcharts/no.png b/phsource/vowelcharts/no.png
deleted file mode 100644
index ff1c0b7d..00000000
Binary files a/phsource/vowelcharts/no.png and /dev/null differ
diff --git a/phsource/vowelcharts/pl b/phsource/vowelcharts/pl
deleted file mode 100644
index b34a8de3..00000000
--- a/phsource/vowelcharts/pl
+++ /dev/null
@@ -1,10 +0,0 @@
-@	 525 1441 2340   525 1441 2340
-@-	 525 1441 2340   525 1441 2340
-a	 925 1320 2700   896 1340 2660
-E	 647 1778 2530   647 1778 2530
-i	 280 2280 2820   200 2398 2820
-O	 584  940 2580   584  940 2580
-u	 320  740 2400   320  740 2400
-y	 452 1709 2460   452 1709 2460
-E~	 670 1719 2556   710 1672 2671
-O~	 540  896 2632   512  900 2620
diff --git a/phsource/vowelcharts/pl.png b/phsource/vowelcharts/pl.png
deleted file mode 100644
index 92a013e4..00000000
Binary files a/phsource/vowelcharts/pl.png and /dev/null differ
diff --git a/phsource/vowelcharts/pt b/phsource/vowelcharts/pt
deleted file mode 100644
index 8dc28a17..00000000
--- a/phsource/vowelcharts/pt
+++ /dev/null
@@ -1,34 +0,0 @@
-@	 525 1441 2340   525 1441 2340
-@-	 525 1441 2340   525 1441 2340
-a	 896 1440 2720   880 1440 2700
-a/	 760 1420 2600   736 1380 2540
-e	 464 1980 2520   464 1980 2520
-E	 735 1760 2420   675 1738 2420
-i	 280 2280 2820   200 2398 2820
-i2	 312 2300 2820   312 2300 2820
-o	 454  812 2559   432  824 2520
-O	 670  946 2620   630  902 2700
-U	 388  940 2420   394  980 2360
-u	 320  740 2400   320  740 2400
-aU	 847 1383 2510   360  800 2360
-eU	 460 1929 2512   327  947 2367
-iU	 280 2280 2820   328  957 2140
-aI	 912 1320 2740   360 2200 2820
-eI	 464 1980 2520   328 2280 2720
-oI	 469  864 2440   310 2040 2440
-uI	 321  965 2377   328 2160 2720
-e~	 456 2000 2520   456 2000 2520
-i~	 296 2280 2820   240 2398 2820
-o~	 448  840 2598   448  840 2598
-u~	 328  900 2360   328  900 2360
-&~	 760 1420 2600   738 1360 2540
-&U~	 773 1420 2600   392  520 2580
-oI~	 456  840 2598   312 2040 2780
-&	 760 1420 2600   736 1380 2540
-&/	 760 1420 2600   736 1380 2540
-A	 744 1120 2680   744 1120 2680
-y	 280 2280 2820   200 2398 2820
-i/	 280 2280 2820   200 2398 2820
-EI	 755 1683 2460   355 2222 2720
-OI	 670  946 2620   310 2002 2300
-EU	 645 1705 2520   390  957 2140
diff --git a/phsource/vowelcharts/pt.png b/phsource/vowelcharts/pt.png
deleted file mode 100644
index 30705ee1..00000000
Binary files a/phsource/vowelcharts/pt.png and /dev/null differ
diff --git a/phsource/vowelcharts/pt_pt b/phsource/vowelcharts/pt_pt
deleted file mode 100644
index dce28118..00000000
--- a/phsource/vowelcharts/pt_pt
+++ /dev/null
@@ -1,34 +0,0 @@
-@	 525 1441 2340   525 1441 2340
-@-	 525 1441 2340   525 1441 2340
-a	 896 1440 2720   880 1440 2700
-a/	 760 1420 2600   736 1380 2540
-e	 464 1980 2520   464 1980 2520
-E	 584 1820 2560   584 1820 2560
-i	 280 2280 2820   200 2398 2820
-i2	 312 2300 2820   312 2300 2820
-o	 454  812 2559   432  824 2520
-O	 630  920 2627   630  920 2627
-U	 328  940 2380   328  920 2380
-u	 328  940 2380   328  920 2380
-aU	 847 1383 2510   360  800 2360
-eU	 460 1929 2512   327  947 2367
-iU	 280 2280 2820   328  957 2140
-aI	 912 1320 2740   360 2200 2820
-eI	 464 1980 2520   328 2280 2720
-oI	 469  864 2440   310 2040 2440
-uI	 321  965 2377   328 2160 2720
-e~	 456 2000 2520   456 2000 2520
-i~	 296 2280 2820   240 2398 2820
-o~	 448  840 2598   448  840 2598
-u~	 328  900 2360   328  900 2360
-&~	 670 1719 2556   710 1672 2671
-&U~	 773 1420 2600   392  520 2580
-oI~	 456  840 2598   312 2040 2780
-&	 658 1408 2460   658 1408 2460
-&/	 658 1408 2460   658 1408 2460
-A	 744 1120 2680   744 1120 2680
-y	 376 1515 2440   376 1515 2440
-i/	 376 1515 2440   376 1515 2440
-EI	 755 1683 2460   355 2222 2720
-OI	 670  946 2620   310 2002 2300
-EU	 547 1840 2536   376  980 2360
diff --git a/phsource/vowelcharts/pt_pt.png b/phsource/vowelcharts/pt_pt.png
deleted file mode 100644
index 98a732fe..00000000
Binary files a/phsource/vowelcharts/pt_pt.png and /dev/null differ
diff --git a/phsource/vowelcharts/qaa b/phsource/vowelcharts/qaa
deleted file mode 100644
index 87e94be5..00000000
--- a/phsource/vowelcharts/qaa
+++ /dev/null
@@ -1,45 +0,0 @@
-@	 525 1441 2340   525 1441 2340
-@-	 525 1441 2340   525 1441 2340
-i:	 296 2220 2820   200 2398 2820
-i@	 375 2156 2720   515 1595 2460
-@2	 525 1441 2340   525 1441 2340
-I2	 440 1837 2520   440 1837 2520
-@5	 525 1441 2340   525 1441 2340
-U	 445  902 2620   445  902 2620
-@L	 485  891 2780   450  792 2980
-a	 925 1342 2700   925 1342 2700
-a2	 658 1408 2460   658 1408 2460
-aa	 925 1342 2700   925 1342 2700
-E	 645 1705 2520   645 1705 2520
-I	 440 1837 2520   440 1837 2520
-i	 440 1837 2520   440 1837 2520
-0	 670  946 2620   630  902 2700
-V	 605 1232 2620   605 1276 2620
-A:	 775 1067 2800   795 1122 2580
-A@	 775 1067 2800   795 1122 2580
-3:	 480 1408 2320   545 1419 2320
-O:	 465  836 2660   530 1001 2620
-O@	 465  836 2660   530 1001 2620
-O	 465  836 2660   530 1001 2620
-u:	 360 1562 2260   290 1023 2220
-aU	 830 1364 2440   488  900 2240
-oU	 630 1353 2340   390  957 2140
-aI	 860 1133 2820   440 1969 2500
-eI	 755 1683 2460   355 2222 2720
-OI	 545  780 2780   310 2002 2300
-e@	 720 1760 2420   672 1562 2520
-U@	 430  960 2340   590 1287 2260
-aI@	 860 1133 2820   640 1518 2400
-aU@	 945 1485 2620   705 1342 2300
-e:	 464 1980 2520   464 1980 2520
-o:	 454  812 2559   432  824 2520
-eU	 460 1929 2512   327  947 2367
-uI	 321  965 2377   328 2160 2720
-A~	 592 1000 2640   592 1000 2640
-E~	 672 1660 2624   672 1660 2624
-O~	 512  880 2624   512  880 2620
-W~	 694 1360 2624   694 1360 2624
-y:	 280 1720 2340   280 1720 2340
-Y:	 448 1520 2420   463 1520 2400
-W	 525 1320 2200   525 1320 2200
-u-	 352 1674 2372   336 1674 2372
diff --git a/phsource/vowelcharts/qaa.png b/phsource/vowelcharts/qaa.png
deleted file mode 100644
index dba5cf28..00000000
Binary files a/phsource/vowelcharts/qaa.png and /dev/null differ
diff --git a/phsource/vowelcharts/ro b/phsource/vowelcharts/ro
deleted file mode 100644
index aaa1cb6b..00000000
--- a/phsource/vowelcharts/ro
+++ /dev/null
@@ -1,33 +0,0 @@
-@	 584 1440 2460   600 1440 2460
-@-	 525 1441 2340   525 1441 2340
-a	 896 1440 2720   880 1440 2700
-a/	 760 1420 2600   736 1380 2540
-e	 504 1900 2544   496 1920 2552
-E	 720 1760 2420   672 1562 2520
-i	 280 2280 2820   200 2398 2820
-i2	 312 2300 2820   312 2300 2820
-o	 488  900 2520   488  900 2520
-O	 670  946 2620   630  902 2700
-U	 388  940 2420   394  980 2360
-u	 344  800 2360   344  800 2360
-aU	 847 1383 2510   360  800 2360
-eU	 460 1929 2512   327  947 2367
-iU	 280 2280 2820   328  957 2140
-aI	 912 1320 2740   360 2200 2820
-eI	 464 1980 2520   328 2280 2720
-oI	 469  864 2440   310 2040 2440
-uI	 321  965 2377   328 2160 2720
-I^	 384 2080 2620   384 2080 2620
-i/	 280 2280 2820   200 2398 2820
-y	 376 1515 2440   376 1515 2440
-Y	 448 1520 2420   463 1520 2400
-@I	 649 1485 2430   355 2222 2720
-@U	 584 1400 2460   348  800 2294
-oU	 496  900 2520   360  800 2140
-iI	 280 2280 2820   200 2398 2820
-yI	 336 1780 2540   200 2398 2820
-yU	 360 1420 2260   290 1023 2220
-ea	 672 1740 2559   896 1440 2700
-eo	 555 1521 2547   520  880 2590
-e[u	 452 1710 2506   344  800 2360
-Oa	 668 1092 2668   896 1440 2700
diff --git a/phsource/vowelcharts/ro.png b/phsource/vowelcharts/ro.png
deleted file mode 100644
index 606ea808..00000000
Binary files a/phsource/vowelcharts/ro.png and /dev/null differ
diff --git a/phsource/vowelcharts/ru b/phsource/vowelcharts/ru
deleted file mode 100644
index 189af4dd..00000000
--- a/phsource/vowelcharts/ru
+++ /dev/null
@@ -1,27 +0,0 @@
-@	 525 1441 2340   525 1441 2340
-@-	 525 1441 2340   525 1441 2340
-i	 280 2280 2820   200 2398 2820
-I#	 408 1940 2540   408 1960 2540
-y	 340 1680 2320   340 1680 2320
-I	 360 2120 2680   360 2120 2660
-I2	 360 2120 2680   360 2120 2660
-I3	 360 2120 2680   360 2120 2660
-E	 589 1791 2529   589 1791 2529
-E#	 440 1791 2529   424 1791 2529
-E2	 589 1791 2529   589 1791 2529
-E3	 589 1791 2529   589 1791 2529
-A	 925 1320 2700   896 1340 2660
-o	 454  812 2559   432  824 2520
-O	 605 1232 2620   605 1276 2620
-u	 320  900 2360   320  900 2360
-u#	 352 1674 2372   336 1674 2372
-u"	 360 1562 2260   290 1023 2220
-8	 525 1441 2340   525 1441 2340
-V	 659 1278 2583   659 1278 2583
-e	 376 1980 2680   544 1800 2440
-ju	 280 2222 2500   400 1848 2260
-ja	 485 1672 2340   795 1122 2580
-V#	 659 1278 2583   659 1278 2583
-Y	 452 1709 2460   452 1709 2460
-a	 925 1320 2700   896 1340 2660
-a#	 658 1408 2460   658 1408 2460
diff --git a/phsource/vowelcharts/ru.png b/phsource/vowelcharts/ru.png
deleted file mode 100644
index 49a2c39c..00000000
Binary files a/phsource/vowelcharts/ru.png and /dev/null differ
diff --git a/phsource/vowelcharts/sk b/phsource/vowelcharts/sk
deleted file mode 100644
index 3d3d1f2a..00000000
--- a/phsource/vowelcharts/sk
+++ /dev/null
@@ -1,26 +0,0 @@
-@	 525 1441 2340   525 1441 2340
-@-	 525 1441 2340   525 1441 2340
-r-	 648 1200 2300   640 1200 2260
-a	 925 1320 2700   896 1340 2660
-E	 647 1778 2530   647 1778 2530
-i	 360 2120 2680   360 2120 2660
-O	 584  940 2580   584  940 2580
-u	 344  800 2360   344  800 2360
-y	 452 1709 2460   452 1709 2460
-E~	 670 1719 2556   710 1672 2671
-O~	 540  896 2632   512  900 2620
-i:	 272 2247 3100   288 2247 3100
-&	 680 1660 2520   680 1660 2520
-e	 504 1900 2544   496 1920 2552
-e:	 584 1820 2560   584 1820 2560
-a:	 925 1320 2700   896 1340 2660
-o	 512  860 2648   512  860 2648
-o:	 512  860 2648   512  860 2648
-u:	 320  740 2400   320  740 2400
-aU	 847 1383 2510   360  800 2360
-eU	 460 1929 2512   327  947 2367
-oU	 496  900 2520   360  800 2140
-eI	 608 1800 2529   408 1960 2520
-r:	 648 1200 2300   640 1200 2260
-l-	 352 1240 3020   352 1200 3020
-l:	 352 1240 3020   352 1200 3020
diff --git a/phsource/vowelcharts/sk.png b/phsource/vowelcharts/sk.png
deleted file mode 100644
index 0e24f9a5..00000000
Binary files a/phsource/vowelcharts/sk.png and /dev/null differ
diff --git a/phsource/vowelcharts/sv b/phsource/vowelcharts/sv
deleted file mode 100644
index 470b9254..00000000
--- a/phsource/vowelcharts/sv
+++ /dev/null
@@ -1,23 +0,0 @@
-@	 525 1441 2340   525 1441 2340
-@-	 525 1441 2340   525 1441 2340
-i:	 280 2247 3100   280 2220 3040
-I	 360 2120 2680   360 2120 2660
-e:	 416 2140 2660   416 2140 2660
-E	 647 1778 2530   647 1778 2530
-E:	 720 1760 2420   672 1562 2520
-E3	 680 1660 2520   680 1660 2520
-E-	 592 1580 2460   592 1580 2460
-y:	 280 1980 2340   280 1980 2340
-y	 384 1920 2480   384 1920 2440
-u-	 360 1540 2220   360 1560 2280
-Y:	 480 1560 2420   516 1520 2340
-W	 587 1500 2300   587 1500 2300
-8	 496 1040 2560   496 1040 2560
-a	 834 1220 2690   834 1220 2690
-a2	 728 1300 2595   736 1300 2595
-&	 744 1560 2500   736 1580 2500
-A:	 664 1000 2731   664 1020 2731
-O	 552  860 2660   552  860 2660
-o:	 454  812 2559   432  824 2520
-U	 368  800 2660   368  800 2660
-u:	 320  740 2400   320  740 2400
diff --git a/phsource/vowelcharts/sv.png b/phsource/vowelcharts/sv.png
deleted file mode 100644
index 05500ab4..00000000
Binary files a/phsource/vowelcharts/sv.png and /dev/null differ
diff --git a/phsource/vowelcharts/sw b/phsource/vowelcharts/sw
deleted file mode 100644
index 361e319b..00000000
--- a/phsource/vowelcharts/sw
+++ /dev/null
@@ -1,11 +0,0 @@
-@	 525 1441 2340   525 1441 2340
-@-	 525 1441 2340   525 1441 2340
-i	 280 2280 2820   200 2398 2820
-e	 504 1900 2544   496 1920 2552
-a/	 728 1300 2595   736 1300 2595
-a	 834 1220 2690   834 1220 2690
-o	 630  920 2627   630  920 2627
-u	 360  860 2360   360  860 2360
-m-	 370 1120 2320   370 1040 2300
-n-	 380 1804 2540   380 1804 2540
-N-	 525 2552 2940   525 2552 2940
diff --git a/phsource/vowelcharts/sw.png b/phsource/vowelcharts/sw.png
deleted file mode 100644
index 8acb1b74..00000000
Binary files a/phsource/vowelcharts/sw.png and /dev/null differ
diff --git a/phsource/vowelcharts/vi b/phsource/vowelcharts/vi
deleted file mode 100644
index 4b64de9a..00000000
--- a/phsource/vowelcharts/vi
+++ /dev/null
@@ -1,32 +0,0 @@
-@	 658 1408 2460   658 1408 2460
-@-	 525 1441 2340   525 1441 2340
-a	 841 1409 2550   841 1409 2550
-a:	 896 1440 2720   880 1440 2700
-E	 735 1760 2420   675 1738 2420
-e	 464 1980 2520   464 1980 2520
-i	 296 2220 2820   200 2398 2820
-O	 664 1000 2731   664 1020 2731
-o	 512  860 2648   512  860 2648
-u	 392  736 2760   392  736 2760
-y	 448 1520 2420   463 1520 2400
-@:	 686 1280 2595   686 1280 2595
-aI	 672 1460 2430   400 2000 2700
-a:I	 912 1320 2740   360 2200 2820
-@I	 680 1360 2460   355 2222 2720
-@:I	 605 1232 2620   400 2222 2720
-eI	 464 1980 2520   328 2280 2720
-EI	 755 1683 2460   355 2222 2720
-OI	 670  946 2620   310 2002 2300
-oI	 469  864 2440   310 2040 2440
-uI	 321  965 2377   328 2160 2720
-yI	 344 1500 2180   328 2160 2720
-aU	 776 1240 2540   408  700 2240
-a:U	 830 1364 2440   488  900 2240
-eU	 460 1929 2512   327  947 2367
-EU	 645 1705 2520   390  957 2140
-iU	 280 2280 2820   328  957 2140
-@U	 630 1353 2340   390  957 2140
-@:U	 630 1353 2340   390  957 2140
-i@	 400 2180 2720   640 1500 2460
-y@	 400 1380 2140   584 1320 2342
-u@	 430  960 2340   590 1287 2260
diff --git a/phsource/vowelcharts/vi.png b/phsource/vowelcharts/vi.png
deleted file mode 100644
index 9bc320b5..00000000
Binary files a/phsource/vowelcharts/vi.png and /dev/null differ
diff --git a/phsource/vowelcharts/zh_yue b/phsource/vowelcharts/zh_yue
deleted file mode 100644
index 5d6bcb78..00000000
--- a/phsource/vowelcharts/zh_yue
+++ /dev/null
@@ -1,24 +0,0 @@
-@	 525 1441 2340   525 1441 2340
-@-	 525 1441 2340   525 1441 2340
-aa	 688 1064 2806   672 1100 2806
-aai	 768 1140 2820   440 1969 2500
-aau	 724 1130 2760   472  780 2500
-aan	 688 1064 2806   328  720 2880
-a	 658 1408 2460   658 1408 2460
-ai	 649 1485 2430   355 2222 2720
-au	 745 1480 2400   456  920 2240
-e	 720 1760 2420   672 1562 2520
-ei	 464 1980 2520   328 2280 2720
-eu	 645 1705 2520   390  957 2140
-i	 280 2280 2820   200 2398 2820
-iu	 280 2280 2820   328  957 2140
-o	 552  860 2660   552  860 2660
-oi	 545  780 2780   310 2002 2300
-ou	 516  860 2648   312  860 2360
-ong	 568  900 2860   328  720 2960
-u	 320  740 2400   320  740 2400
-ui	 321  965 2377   328 2160 2720
-oe	 448 1520 2420   463 1520 2400
-eo	 488 1160 2540   488 1160 2540
-eoi	 496 1220 2340   296 2020 2400
-yu	 280 1720 2340   280 1720 2340
diff --git a/phsource/vowelcharts/zh_yue.png b/phsource/vowelcharts/zh_yue.png
deleted file mode 100644
index e07af31a..00000000
Binary files a/phsource/vowelcharts/zh_yue.png and /dev/null differ
diff --git a/src/phonemelist.cpp b/src/phonemelist.cpp
index 53e04937..3de5f7e8 100755
--- a/src/phonemelist.cpp
+++ b/src/phonemelist.cpp
@@ -249,8 +249,8 @@ void Translator::MakePhonemeList(int post_pause, int start_sentence)
 
 			if(regression & 0x2)
 			{
-				// LANG=Russian, [v] amd [v;] don't cause regression
-				if((ph->mnemonic == 'v') || (ph->mnemonic == ((';'<<8)+'v')))
+				// LANG=Russian, [v] amd [v;] don't cause regression, or [R^]
+				if((ph->mnemonic == 'v') || (ph->mnemonic == ((';'<<8)+'v')) || (ph->mnemonic == (('^'<<8)+'R')))
 					type = phLIQUID;
 			}
 
diff --git a/src/synthdata.cpp b/src/synthdata.cpp
index 1e6e6c78..fbd22810 100755
--- a/src/synthdata.cpp
+++ b/src/synthdata.cpp
@@ -35,7 +35,7 @@
 #include "translate.h"
 #include "wave.h"
 
-const char *version_string = "1.24.06  10.May.07";
+const char *version_string = "1.24.07  11.May.07";
 const int version_phdata  = 0x012201;
 
 int option_device_number = -1;
diff --git a/src/translate.cpp b/src/translate.cpp
index f1dc2a91..c4895cee 100755
--- a/src/translate.cpp
+++ b/src/translate.cpp
@@ -1476,21 +1476,32 @@ int Translator::TranslateChar(char *ptr, int prev_in, int c, int next_in, int *i
 
 	const wchar_t *p;
 	unsigned int new_c;
+	int upper_case = 0;
 
 	if(c == 0) return(0);
 
 	if(langopts.replace_chars != NULL)
 	{
 		// there is a list of character codes to be substituted with alternative codes
-		if((p = wcschr(langopts.replace_chars,c)) != NULL)
+
+		if((p = wcschr(langopts.replace_chars,c)) == NULL)
+		{
+			// Try converting to lower case
+			if((p = wcschr(langopts.replace_chars,towlower(c))) != NULL)
+				upper_case =1;
+		}
+
+		if(p != NULL)
 		{
 			new_c = langopts.replacement_chars[p - langopts.replace_chars];
 			if(new_c & 0xffe00000)
 			{
-				// there is a second character to be inserted
+				// there is a second character to be inserted (don't convert the case of the second character)
 				*insert = (new_c >> 16);
 				new_c &= 0xffff;
 			}
+			if(upper_case)
+				new_c = towupper(new_c);
 			return(new_c);
 		}
 	}
@@ -1636,6 +1647,10 @@ void *Translator::TranslateClause(FILE *f_text, const void *vp_input, int *tone_
 		{
 			utf8_in(&prev_in,&source[source_index-1],1);  //  prev_in = source[source_index-1];
 		}
+
+		if(prev_source_index == source_index)
+			char_inserted = 0;   // have done an unget, so discard any character to be inserted
+
 		prev_source_index = source_index;
 
 		if(char_inserted)