diff --git a/include/Common.props b/include/Common.props
index bc66cc0..3e6d223 100644
--- a/include/Common.props
+++ b/include/Common.props
@@ -44,7 +44,7 @@
     </Link>
     <ResourceCompile />
     <POCompile>
-      <LocaleRepoDir>$(OutDir)..\locale\%(Filename)\</LocaleRepoDir>
+      <OutputFile>$(OutDir)..\locale\%(Filename)\$(ProjectName).mo</OutputFile>
     </POCompile>
   </ItemDefinitionGroup>
   <ItemGroup />
diff --git a/include/xgettext.props b/include/xgettext.props
index f6c4bb7..5a55c6d 100644
--- a/include/xgettext.props
+++ b/include/xgettext.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     Copyright 1991-2016 Amebis
-	Copyright 2016 GÉANT
+    Copyright 2016 GÉANT
 
     This file is part of GÉANTLink.
 
@@ -35,8 +35,7 @@
       <CheckDomain>false</CheckDomain>
       <CheckCompat>false</CheckCompat>
       <CheckAccel>None</CheckAccel>
-      <LocaleRepoDir>$(OutDir)</LocaleRepoDir>
-      <OutputFile>%(LocaleRepoDir)$(ProjectName).mo</OutputFile>
+      <OutputFile>$(OutDir)%(Filename).mo</OutputFile>
       <UseFuzzy>false</UseFuzzy>
       <Alignment>1</Alignment>
       <Endianess>LSB</Endianess>
diff --git a/include/xgettext.targets b/include/xgettext.targets
index 289c3fa..cdef0ff 100644
--- a/include/xgettext.targets
+++ b/include/xgettext.targets
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     Copyright 1991-2016 Amebis
-	Copyright 2016 GÉANT
+    Copyright 2016 GÉANT
 
     This file is part of GÉANTLink.
 
@@ -39,7 +39,7 @@
     <ItemGroup Condition="'@(SelectedFiles)' != ''">
       <POCompile Remove="@(POCompile)" Condition="'%(Identity)' != '@(SelectedFiles)'" />
     </ItemGroup>
-    <MakeDir Directories="%(POCompile.LocaleRepoDir)"/>
+    <MakeDir Directories="$([System.IO.Path]::GetDirectoryName('%(POCompile.OutputFile)'))"/>
     <POCompile
       Condition="'@(POCompile)' != '' and '%(POCompile.ExcludedFromBuild)' != 'true'"
       Inputs="@(POCompile)"
diff --git a/include/xgettext.xml b/include/xgettext.xml
index 8d84027..0f8b562 100644
--- a/include/xgettext.xml
+++ b/include/xgettext.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     Copyright 1991-2016 Amebis
-	Copyright 2016 GÉANT
+    Copyright 2016 GÉANT
 
     This file is part of GÉANTLink.
 
@@ -48,11 +48,10 @@
       <EnumValue Name="None"                                                       DisplayName="None"       Description="No check" />
       <EnumValue Name="Amperstand"   Switch="check-accelerators=&quot;&amp;&quot;" DisplayName="Amperstand" Description="Check keyborad accellerator marked with an amperstand &amp;." />
     </EnumProperty>
-    <StringProperty Category="Output"  Name="LocaleRepoDir"                       DisplayName="Locale Repository Directory" Description="Location of the locale repository directory." Subtype="folder" IncludeInCommandLine="False" />
-    <StringProperty Category="Output"  Name="OutputFile"    Switch="output-file=" DisplayName="Output File"                 Description="The name and location of the output file that compiler creates." Subtype="file" />
-    <BoolProperty   Category="Output"  Name="UseFuzzy"      Switch="use-fuzzy"    DisplayName="Use Fuzzy Entries"           Description="Use fuzzy entries in output." />
-    <IntProperty    Category="Output"  Name="Alignment"     Switch="alignment="   DisplayName="Align Strings"               Description="Align strings to given bytes (default: 1)." />
-    <EnumProperty   Category="Output"  Name="Endianess"                           DisplayName="Endianess"                   Description="Write out 32-bit numbers in the given byte order (default: platform specific).">
+    <StringProperty Category="Output"  Name="OutputFile"  Switch="output-file="        DisplayName="Output File"         Description="The name and location of the output file that compiler creates." Subtype="file" />
+    <BoolProperty   Category="Output"  Name="UseFuzzy"    Switch="use-fuzzy"           DisplayName="Use Fuzzy Entries"   Description="Use fuzzy entries in output." />
+    <IntProperty    Category="Output"  Name="Alignment"   Switch="alignment="          DisplayName="Align Strings"       Description="Align strings to given bytes (default: 1)." />
+    <EnumProperty   Category="Output"  Name="Endianess"                                DisplayName="Endianess"           Description="Write out 32-bit numbers in the given byte order (default: platform specific).">
       <EnumValue Name="LSB" Switch="endianness=little" DisplayName="LSB" Description="Least significant byte first" />
       <EnumValue Name="MSB" Switch="endianness=big"    DisplayName="MSB" Description="Most significant byte first" />
     </EnumProperty>
diff --git a/lib/wxExtend b/lib/wxExtend
index f730285..a906f50 160000
--- a/lib/wxExtend
+++ b/lib/wxExtend
@@ -1 +1 @@
-Subproject commit f730285400d0ac7038ee49a4c86ce55e6068c4e0
+Subproject commit a906f5073dbc4f7220007cb43ecd4f7dd6b0b645