diff --git a/speaker/Properties/AssemblyInfo.cs b/speaker/Properties/AssemblyInfo.cs
index fd4fa3954..17e104028 100644
--- a/speaker/Properties/AssemblyInfo.cs
+++ b/speaker/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.7")]
-[assembly: AssemblyFileVersion("0.7")]
+[assembly: AssemblyVersion("1.0")]
+[assembly: AssemblyFileVersion("1.0")]
diff --git a/speaker/installvoices.xaml b/speaker/installvoices.xaml
index efb9272dc..2cb0e2d83 100644
--- a/speaker/installvoices.xaml
+++ b/speaker/installvoices.xaml
@@ -5,13 +5,13 @@
     <Grid>
         <StackPanel Orientation="Vertical" >
             <TextBlock  Margin="5,5,0,0" HorizontalAlignment="Left"  VerticalAlignment="Top" TextWrapping="Wrap"
-                        Text="The English default voice (Microsoft Anna) is quite good. Microsoft does however not provide free voices for all languages. If there is no voice available for your language, you must install one on your your own. Any MS SAPI voice should work."/>
+                        Text="The English default voice (Microsoft Anna) is quite good. Microsoft does however not provide free voices for all languages. If there is no voice available for your language, you must install one on your own. Any MS SAPI voice should work."/>
             <TextBlock  Margin="5,5,0,0" HorizontalAlignment="Left"  VerticalAlignment="Top" TextWrapping="Wrap"
-                        Text="Use the phrases SAPI and TTS to look for voices. TTS is the general term for synthetic speech and SAPI is Microsoft's voice interface."  />
+                        Text="Use the phrases SAPI and TTS to search for voices. TTS is the general term for synthetic speech and SAPI is Microsoft's voice interface."  />
             <TextBlock  Margin="5,5,0,0" HorizontalAlignment="Left"  VerticalAlignment="Top" TextWrapping="Wrap"
                         Text="There are several commercial alternatives available. These are high quility, but also expensive. There are also free open source alternatives. The downside to these is that the voices sound robotic. But they are clearly understandable."  />
             <StackPanel Orientation="Horizontal">
-                <TextBlock  Margin="5,5,10,0" Width="380" HorizontalAlignment="Left"  VerticalAlignment="Top" TextWrapping="Wrap"
+                <TextBlock  Margin="5,5,10,0" Width="370" HorizontalAlignment="Left"  VerticalAlignment="Top" TextWrapping="Wrap"
                         Text="The author of this application used the free eSpeak voices to test voice generation. Many languages are supported. Click the image on the right to go to eSpeaks project page. There you can find out if your language is supported and download the voice package."  />
                 <TextBlock>
                     <Hyperlink NavigateUri="http://espeak.sourceforge.net/" RequestNavigate="Hyperlink_RequestNavigate">
diff --git a/speaker/sentencetables.cs b/speaker/sentencetables.cs
index e83e67b4e..c1a9a6cfd 100644
--- a/speaker/sentencetables.cs
+++ b/speaker/sentencetables.cs
@@ -11,18 +11,534 @@ namespace OpenTXspeak
     {
         private static string[] default_sk_system_strings =  
         { 
+          "0000;0;0",
+          "0001;1;1",
+          "0002;2;2",
+          "0003;3;3",
+          "0004;4;4",
+          "0005;5;5",
+          "0006;6;6",
+          "0007;7;7",
+          "0008;8;8",
+          "0009;9;9",
+          "0010;10;10",
+          "0011;11;11",
+          "0012;12;12",
+          "0013;13;13",
+          "0014;14;14",
+          "0015;15;15",
+          "0016;16;16",
+          "0017;17;17",
+          "0018;18;18",
+          "0019;19;19",
+          "0020;20;20",
+          "0021;21;21",
+          "0022;22;24",
+          "0023;23;23",
+          "0024;24;24",
+          "0025;25;25",
+          "0026;26;26",
+          "0027;27;27",
+          "0028;28;28",
+          "0029;29;29",
+          "0030;30;30",
+          "0031;31;31",
+          "0032;32;32",
+          "0033;33;33",
+          "0034;34;34",
+          "0035;35;35",
+          "0036;36;36",
+          "0037;37;37",
+          "0038;38;38",
+          "0039;39;39",
+          "0040;40;40",
+          "0041;41;41",
+          "0042;42;42",
+          "0043;43;43",
+          "0044;44;44",
+          "0045;45;45",
+          "0046;46;46",
+          "0047;47;47",
+          "0048;48;48",
+          "0049;49;49",
+          "0050;50;50",
+          "0051;51;51",
+          "0052;52;52",
+          "0053;53;53",
+          "0054;54;54",
+          "0055;55;55",
+          "0056;56;56",
+          "0057;57;57",
+          "0058;58;58",
+          "0059;59;59",
+          "0060;60;60",
+          "0061;61;61",
+          "0062;62;62",
+          "0063;63;63",
+          "0064;64;64",
+          "0065;65;65",
+          "0066;66;66",
+          "0067;67;67",
+          "0068;68;68",
+          "0069;69;69",
+          "0070;70;70",
+          "0071;71;71",
+          "0072;72;72",
+          "0073;73;73",
+          "0074;74;74",
+          "0075;75;75",
+          "0076;76;76",
+          "0077;77;77",
+          "0078;78;78",
+          "0079;79;79",
+          "0080;80;80",
+          "0081;81;81",
+          "0082;82;82",
+          "0083;83;83",
+          "0084;84;84",
+          "0085;85;85",
+          "0086;86;86",
+          "0087;87;87",
+          "0088;88;88",
+          "0089;89;89",
+          "0090;90;90",
+          "0091;91;91",
+          "0092;92;92",
+          "0093;93;93",
+          "0094;94;94",
+          "0095;95;95",
+          "0096;96;96",
+          "0097;97;97",
+          "0098;98;98",
+          "0099;99;99",
+          "0100;100;100",
+          "0101;200;200", 
+          "0102;300;300", 
+          "0103;400;400",
+          "0104;500;500",
+          "0105;600;600",
+          "0106;700;700",
+          "0107;800;800",
+          "0108;900;900",
+          "0109;;1000",
+          "0110;TISIACE;tisiace",
+          "0111;JEDNA;jedna",
+          "0112;JEDNO;jedno",
+          "0113;DWIE;dwie", 
+          "0114;CALA;cela",
+          "0115;CALE;cale", 
+          "0116;CALYCH;calych",
+          "0117;MINUS;minus", 
+
+          "0120;Female number;", 
+          "0121;Female number;", 
+          "0122;Female number;", 
+          "0123;Female number;", 
+          "0124;Female number;", 
+          "0125;Female number;", 
+          "0126;Female number;", 
+          "0127;Female number;", 
+          "0128;Female number;", 
+          "0129;Female number;", 
+
+          "0160;volt 1;wolt", 
+          "0161;volt 2;wolty",
+          "0162;volt 3;", 
+          "0163;volt 4;",
+          "0164;amps 1;", 
+          "0165;amps 2;", 
+          "0166;amps 3;", 
+          "0167;amps 4;", 
+          "0168;mps 1;", 
+          "0169;mps 2;", 
+          "0170;mps 3;", 
+          "0171;mps 4;", 
+          "0172;spare 1;", 
+          "0173;spare 2;", 
+          "0174;spare 3;", 
+          "0175;spare 4;", 
+          "0176;kmh 1;", 
+          "0177;kmh 2;", 
+          "0178;kmh 3;", 
+          "0179;kmh 4;", 
+          "0180;meter 1;", 
+          "0181;meter 2;", 
+          "0182;meter 3;",
+          "0183;meter 4;", 
+          "0184;degrees 1;", 
+          "0185;degrees 2;", 
+          "0186;degrees 3;", 
+          "0187;degrees 4;", 
+          "0188;percent 1;", 
+          "0189;percent 2;", 
+          "0190;percent 3;",
+          "0191;percent 4;", 
+          "0192;milliamps 1;", 
+          "0193;milliamps 2;", 
+          "0194;milliamps 3;",
+          "0195;milliamps 4;",
+          "0196;mAh 1;", 
+          "0197;mAh 2;",
+          "0198;mAh 3;", 
+          "0199;mAh 4;", 
+          "0200;watt 1;", 
+          "0201;watt 2;", 
+          "0202;watt 3;", 
+          "0203;watt 4;", 
+          "0204;db 1;", 
+          "0205;db 2;",
+          "0206;db 3;", 
+          "0207;db 4;", 
+          "0208;feet 1;", 
+          "0209;feet 2;", 
+          "0210;feet 3;", 
+          "0211;feet 4;",
+          "0212;knot 1;", 
+          "0213;knot 2;", 
+          "0214;knot 3;", 
+          "0215;knot 4;",
+          "0216;hours 1;", 
+          "0217;hours 2;", 
+          "0218;hours 3;", 
+          "0219;hours 4;",
+          "0220;minutes 1;", 
+          "0221;minutes 2;", 
+          "0222;minutes 3;", 
+          "0223;minutes 4;",
+          "0224;secondds 1;", 
+          "0225;secondds 2;", 
+          "0226;secondds 3;", 
+          "0227;secondds 4;",
+          "0228;rpm 1;", 
+          "0229;rpm 2;", 
+          "0230;rpm 3;", 
+          "0231;rpm 4;",
+          "0232;g 1;", 
+          "0233;g 2;", 
+          "0234;g 3;", 
+          "0235;g 4;", 
+          "0250;Timer1;", 
+          "0251;Timer2;", 
+          "0252;RSSI Tx;", 
+          "0253;RSSI Rx;", 
+          "0254;A1;", 
+          "0255;A2;", 
+          "0256;Altitude;",
+          "0257;RPM;", 
+          "0258;Fuel;", 
+          "0259;T1;", 
+          "0260;T2;",
+          "0261;Speed;", 
+          "0262;Distance;", 
+          "0263;GPS Altitude;", 
+          "0264;LiPo Elements;",
+          "0265;LiPo Total;", 
+          "0266;VFAS;", 
+          "0267;Current;", 
+          "0268;Consumption;", 
+          "0269;Telemetry Power;", 
+          "0270;Accel X;",
+          "0271;Accel Y;", 
+          "0272;Accel Z;", 
+          "0217;HDG;", 
+          "0218;Vario;",
         };
 
         private static string[] default_sk_other_strings = 
         { 
+          "atti;attitude;",
+          "batcrit;battery critical;",
+          "batlow;low battery;",
+          "camcenter;camera center;",
+          "camfix;camera fixed;",
+          "cammanual;camera manual;",
+          "flapsdn;flaps down;",
+          "flapsup;flaps up;",
+          "fltmode1;flight mode 1;",
+          "fltmode2;flight mode 2;",
+          "fltmode3;flight mode 3;",
+          "fltmode4;flight mode 4;",
+          "fltmode5;flight mode 5;",
+          "fltmode6;flight mode 6;",
+          "fltmode7;flight mode 7;",
+          "fltmode8;flight mode 8;",
+          "fltmode9;flight mode 9;",
+          "fsoff;failsafe off;",
+          "fson;failsafe on;",
+          "geardn;gear down;",
+          "gearup;gear upp;",
+          "gps;gps;",
+          "hirates;hi rates;",
+          "htoff;head tracker off;",
+          "hton;head tracker on;",
+          "ioc;ioc;",
+          "iocoff;ioc off;",
+          "lowrates;lowrates;",
+          "manual;manual;",
+          "normal;normal;",
+          "nrmmod;normal mode;",
+          "thrhold;throttle locked;",
+          "thrrel;throttle released;",
         };
 
         private static string[] default_pl_system_strings =  
         { 
+          "0000;0;0",
+          "0001;1;1",
+          "0002;2;2",
+          "0003;3;3",
+          "0004;4;4",
+          "0005;5;5",
+          "0006;6;6",
+          "0007;7;7",
+          "0008;8;8",
+          "0009;9;9",
+          "0010;10;10",
+          "0011;11;11",
+          "0012;12;12",
+          "0013;13;13",
+          "0014;14;14",
+          "0015;15;15",
+          "0016;16;16",
+          "0017;17;17",
+          "0018;18;18",
+          "0019;19;19",
+          "0020;20;20",
+          "0021;21;21",
+          "0022;22;24",
+          "0023;23;23",
+          "0024;24;24",
+          "0025;25;25",
+          "0026;26;26",
+          "0027;27;27",
+          "0028;28;28",
+          "0029;29;29",
+          "0030;30;30",
+          "0031;31;31",
+          "0032;32;32",
+          "0033;33;33",
+          "0034;34;34",
+          "0035;35;35",
+          "0036;36;36",
+          "0037;37;37",
+          "0038;38;38",
+          "0039;39;39",
+          "0040;40;40",
+          "0041;41;41",
+          "0042;42;42",
+          "0043;43;43",
+          "0044;44;44",
+          "0045;45;45",
+          "0046;46;46",
+          "0047;47;47",
+          "0048;48;48",
+          "0049;49;49",
+          "0050;50;50",
+          "0051;51;51",
+          "0052;52;52",
+          "0053;53;53",
+          "0054;54;54",
+          "0055;55;55",
+          "0056;56;56",
+          "0057;57;57",
+          "0058;58;58",
+          "0059;59;59",
+          "0060;60;60",
+          "0061;61;61",
+          "0062;62;62",
+          "0063;63;63",
+          "0064;64;64",
+          "0065;65;65",
+          "0066;66;66",
+          "0067;67;67",
+          "0068;68;68",
+          "0069;69;69",
+          "0070;70;70",
+          "0071;71;71",
+          "0072;72;72",
+          "0073;73;73",
+          "0074;74;74",
+          "0075;75;75",
+          "0076;76;76",
+          "0077;77;77",
+          "0078;78;78",
+          "0079;79;79",
+          "0080;80;80",
+          "0081;81;81",
+          "0082;82;82",
+          "0083;83;83",
+          "0084;84;84",
+          "0085;85;85",
+          "0086;86;86",
+          "0087;87;87",
+          "0088;88;88",
+          "0089;89;89",
+          "0090;90;90",
+          "0091;91;91",
+          "0092;92;92",
+          "0093;93;93",
+          "0094;94;94",
+          "0095;95;95",
+          "0096;96;96",
+          "0097;97;97",
+          "0098;98;98",
+          "0099;99;99",
+          "0100;100;100",
+          "0101;200;200", 
+          "0102;300;300", 
+          "0103;400;400",
+          "0104;500;500",
+          "0105;600;600",
+          "0106;700;700",
+          "0107;800;800",
+          "0108;900;900",
+          "0109;;1000",
+          "0110;DVETISIC;",
+          "0111;JEDEN;jeden",
+          "0112;JEDNO;jedno",
+          "0113;DVE;dve", 
+          "0114;CELA;cela",
+          "0115;CELE;cele", 
+          "0116;CELYCH;celynch",
+          "0117;MINUS;minus", 
+          "0118;volt;volt", 
+          "0119;volty;volty",
+          "0120;voltu;voltu", 
+          "0121;voltu;voltu",
+          "0122;amps 1;", 
+          "0123;amps 2;", 
+          "0124;amps 3;", 
+          "0125;amps 4;", 
+          "0126;mps 1;", 
+          "0127;mps 2;", 
+          "0128;mps 3;", 
+          "0129;mps 4;", 
+          "0130;spare 1;", 
+          "0131;spare 2;", 
+          "0132;spare 3;", 
+          "0133;spare 4;", 
+          "0134;kmh 1;", 
+          "0135;kmh 2;", 
+          "0136;kmh 3;", 
+          "0137;kmh 4;", 
+          "0138;meter 1;", 
+          "0139;meter 2;", 
+          "0140;meter 3;",
+          "0141;meter 4;", 
+          "0142;degrees 1;", 
+          "0143;degrees 2;", 
+          "0144;degrees 3;", 
+          "0145;degrees 4;", 
+          "0146;percent 1;", 
+          "0147;percent 2;", 
+          "0148;percent 3;",
+          "0149;percent 4;", 
+          "0150;milliamps 1;", 
+          "0151;milliamps 2;", 
+          "0152;milliamps 3;",
+          "0153;milliamps 4;",
+          "0154;mAh 1;", 
+          "0155;mAh 2;",
+          "0156;mAh 3;", 
+          "0157;mAh 4;", 
+          "0158;watt 1;", 
+          "0159;watt 2;", 
+          "0160;watt 3;", 
+          "0161;watt 4;", 
+          "0162;db 1;", 
+          "0163;db 2;",
+          "0164;db 3;", 
+          "0165;db 4;", 
+          "0166;feet 1;", 
+          "0167;feet 2;", 
+          "0168;feet 3;", 
+          "0169;feet 4;",
+          "0170;knot 1;", 
+          "0171;knot 2;", 
+          "0172;knot 3;", 
+          "0173;knot 4;",
+          "0174;hours 1;", 
+          "0175;hours 2;", 
+          "0176;hours 3;", 
+          "0177;hours 4;",
+          "0178;minutes 1;", 
+          "0179;minutes 2;", 
+          "0180;minutes 3;", 
+          "0181;minutes 4;",
+          "0182;secondds 1;", 
+          "0183;secondds 2;", 
+          "0184;secondds 3;", 
+          "0185;secondds 4;",
+          "0186;rpm 1;", 
+          "0187;rpm 2;", 
+          "0188;rpm 3;", 
+          "0189;rpm 4;",
+          "0190;g 1;", 
+          "0191;g 2;", 
+          "0192;g 3;", 
+          "0193;g 4;",  
+          "0194;Timer1;", 
+          "0195;Timer2;", 
+          "0196;RSSI Tx;", 
+          "0197;RSSI Rx;", 
+          "0198;A1;", 
+          "0199;A2;", 
+          "0200;Altitude;",
+          "0201;RPM;", 
+          "0202;Fuel;", 
+          "0203;T1;", 
+          "0204;T2;",
+          "0205;Speed;", 
+          "0206;Distance;", 
+          "0207;GPS Altitude;", 
+          "0208;LiPo Elements;",
+          "0209;LiPo Total;", 
+          "0210;VFAS;", 
+          "0211;Current;", 
+          "0212;Consumption;", 
+          "0213;Telemetry Power;", 
+          "0214;Accel X;",
+          "0215;Accel Y;", 
+          "0216;Accel Z;", 
+          "0217;HDG;", 
+          "0218;Vario;",
         };
 
         private static string[] default_pl_other_strings = 
         { 
+          "atti;attitude;",
+          "batcrit;battery critical;",
+          "batlow;low battery;",
+          "camcenter;camera center;",
+          "camfix;camera fixed;",
+          "cammanual;camera manual;",
+          "flapsdn;flaps down;",
+          "flapsup;flaps up;",
+          "fltmode1;flight mode 1;",
+          "fltmode2;flight mode 2;",
+          "fltmode3;flight mode 3;",
+          "fltmode4;flight mode 4;",
+          "fltmode5;flight mode 5;",
+          "fltmode6;flight mode 6;",
+          "fltmode7;flight mode 7;",
+          "fltmode8;flight mode 8;",
+          "fltmode9;flight mode 9;",
+          "fsoff;failsafe off;",
+          "fson;failsafe on;",
+          "geardn;gear down;",
+          "gearup;gear upp;",
+          "gps;gps;",
+          "hirates;hi rates;",
+          "htoff;head tracker off;",
+          "hton;head tracker on;",
+          "ioc;ioc;",
+          "iocoff;ioc off;",
+          "lowrates;lowrates;",
+          "manual;manual;",
+          "normal;normal;",
+          "nrmmod;normal mode;",
+          "thrhold;throttle locked;",
+          "thrrel;throttle released;",
         };
 
         private static string[] default_es_system_strings =