diff --git a/libsodium b/libsodium
index 012e892..8cbcc3c 160000
--- a/libsodium
+++ b/libsodium
@@ -1 +1 @@
-Subproject commit 012e892841ed6edc521f88a23b55863c7afe4622
+Subproject commit 8cbcc3ccccb035b1a976c053ab4de47b7f0b9352
diff --git a/src/app.cpp b/src/app.cpp
index 07b88e7..224c8e1 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -19,12 +19,10 @@ App::~App()
 
 bool App::OnInit()
 {	if (wxApp::OnInit()) {
-	SetVendorName(wxT("rho"));  /*	This causes the non volatile config data to be stored under the rho on
-		windows.*/
-	SetAppName(wxT("wallet")); /*	This causes the non volatile config data to be stored under rho\wallet
+	pConfig = std::unique_ptr<wxConfig>(new wxConfig("wallet", "rho"));
+	/*	This causes the non volatile config data to be stored under rho\wallet
 		We will generally place data in the database, and if additional executables need their own data
 		in the config, they will create their own subkey under Computer\HKEY_CURRENT_USER\Software\rho	 */
-	pConfig = std::unique_ptr<wxConfigBase>(wxConfigBase::Get());
 	pConfig->SetRecordDefaults(false);
 	/*	pConfig corresponds to the Windows Registry entry
 	Computer\HKEY_CURRENT_USER\Software\rho\wallet
diff --git a/src/app.h b/src/app.h
index 69e26bd..3ccc13f 100644
--- a/src/app.h
+++ b/src/app.h
@@ -3,7 +3,7 @@
 class App :	public wxApp
 {
 public:
-	std::unique_ptr<wxConfigBase>pConfig;
+	std::unique_ptr<wxConfig>pConfig;
 	//	pConfig corresponds to the Windows Registry entry Computer\HKEY_CURRENT_USER\Software\ro\wallet
 	//	Don't use the registry for stuff better served by wxStandardPaths and sqlit3 files located
 	//	in locations specified by wxStandardPaths
diff --git a/src/stdafx.h b/src/stdafx.h
index c348c77..633c3f9 100644
--- a/src/stdafx.h
+++ b/src/stdafx.h
@@ -62,7 +62,7 @@ constexpr bool b_WINDOWS = false;
 static_assert(wxUSE_UNSAFE_WXSTRING_CONV == 1,
 R"(In fully utf environment, (wallet.manifest plus
 /utf-8 compile option) all string conversions are safe.)");
-static_assert(wxMAJOR_VERSION == 3 && wxMINOR_VERSION == 1 && wxRELEASE_NUMBER == 7 && wxSUBRELEASE_NUMBER == 0, "expecting wxWidgets 3.1.7");
+static_assert(wxMAJOR_VERSION == 3 && wxMINOR_VERSION == 2 && wxRELEASE_NUMBER == 0 && wxSUBRELEASE_NUMBER == 1, "expecting wxWidgets 3.1.7");
 static_assert(wxUSE_IPV6 == 1, "IP6 unavailable in wxWidgets");
 static_assert(WXWIN_COMPATIBILITY_3_0 == 0, "wxWidgets api out of date");
 static_assert(wxUSE_COMPILER_TLS == (b_WINDOWS ? 2 : 1), "out of date workarounds in wxWidgets for windows bugs");
diff --git a/wxWidgets b/wxWidgets
index a8e46b7..2648eb4 160000
--- a/wxWidgets
+++ b/wxWidgets
@@ -1 +1 @@
-Subproject commit a8e46b7fdd0c3554bb4a55d729415c91c59d4cba
+Subproject commit 2648eb4da156a751a377cfe96b91faa03e535c10