diff --git a/BuildTools/windows/installer/32bit/GeoDa-win7+.iss b/BuildTools/windows/installer/32bit/GeoDa-win7+.iss
index 1485c80a6..c29628400 100644
--- a/BuildTools/windows/installer/32bit/GeoDa-win7+.iss
+++ b/BuildTools/windows/installer/32bit/GeoDa-win7+.iss
@@ -6,12 +6,12 @@ AppSupportURL=https://spatial.uchiago.edu/
 AppUpdatesURL=https://spatial.uchiago.edu/
 AppSupportPhone=(480)965-7533
 AppVersion=1.20
-DefaultDirName={localappdata}\GeoDa
+DefaultDirName={pf}\GeoDa
 DefaultGroupName=GeoDa Software
 ; Since no icons will be created in "{group}", we don't need the wizard
 ; to ask for a Start Menu folder name:
 ;DisableProgramGroupPage=yes
-UninstallDisplayIcon={localappdata}\GeoDa\GeoDa.exe
+UninstallDisplayIcon={app}\GeoDa.exe
 Compression=lzma2
 SolidCompression=yes
 OutputDir=..\..
@@ -26,75 +26,76 @@ ShowLanguageDialog=yes
 Name: "en"; MessagesFile: "compiler:Default.isl"
 
 [dirs]
-Name: "{localappdata}\GeoDa";  Permissions: users-full; Check: InitializeSetup
-Name: "{localappdata}\GeoDa\basemap_cache";  Permissions: users-full
-Name: "{localappdata}\GeoDa\lang";  Permissions: users-full
-Name: "{localappdata}\GeoDa\proj";  Permissions: users-full
+Name: "{app}"; Check: InitializeSetup
+Name: "{userappdata}\GeoDa\basemap_cache";  Permissions: users-modify
+Name: "{userappdata}\GeoDa\lang";  Permissions: users-modify
 
 [Files]
-Source: "..\..\Release\GeoDa.exe"; DestDir: "{localappdata}\GeoDa"; DestName: "GeoDa.exe"
-Source: "..\..\..\CommonDistFiles\GeoDa.ico"; DestDir: "{localappdata}\GeoDa"
-Source: "..\..\..\CommonDistFiles\copyright.txt"; DestDir: "{localappdata}\GeoDa"
-Source: "..\..\..\CommonDistFiles\GPLv3.txt"; DestDir: "{localappdata}\GeoDa"
-Source: "..\..\..\CommonDistFiles\cache.sqlite"; DestDir: "{localappdata}\GeoDa"
-Source: "..\..\..\CommonDistFiles\geoda_prefs.sqlite"; DestDir: "{localappdata}\GeoDa"
-Source: "..\..\..\CommonDistFiles\geoda_prefs.json"; DestDir: "{localappdata}\GeoDa"
-Source: "..\..\..\CommonDistFiles\web_plugins\*"; DestDir: "{localappdata}\GeoDa\web_plugins"; Flags: recursesubdirs
-Source: "..\..\..\CommonDistFiles\proj\*"; DestDir: "{localappdata}\GeoDa\proj"; Flags: recursesubdirs
-
-
-Source: "VC_redist.x86.exe"; DestDir: "{localappdata}\GeoDa"
-Source: "..\..\temp\OpenCL\sdk\bin\x86\OpenCL.dll"; DestDir: "{localappdata}\GeoDa"
-Source: "..\..\temp\wxWidgets\lib\vc_dll\wxmsw314u_vc_custom.dll"; DestDir: "{localappdata}\GeoDa"
-Source: "..\..\temp\wxWidgets\lib\vc_dll\wxmsw314u_gl_vc_custom.dll"; DestDir: "{localappdata}\GeoDa"
-Source: "..\..\libraries\bin\expat.dll"; DestDir: "{localappdata}\GeoDa"
-Source: "..\..\libraries\bin\freexl.dll"; DestDir: "{localappdata}\GeoDa"
-Source: "..\..\libraries\bin\gdal302.dll"; DestDir: "{localappdata}\GeoDa"
-Source: "..\..\libraries\bin\geos.dll"; DestDir: "{localappdata}\GeoDa"
-Source: "..\..\libraries\bin\geos_c.dll"; DestDir: "{localappdata}\GeoDa"
-Source: "..\..\libraries\bin\iconv.dll"; DestDir: "{localappdata}\GeoDa"
-Source: "..\..\libraries\bin\libcrypto-1_1.dll"; DestDir: "{localappdata}\GeoDa"
-Source: "..\..\libraries\bin\libcurl.dll"; DestDir: "{localappdata}\GeoDa"
-Source: "..\..\libraries\bin\libmysql.dll"; DestDir: "{localappdata}\GeoDa"
-Source: "..\..\libraries\bin\libpq.dll"; DestDir: "{localappdata}\GeoDa"
-Source: "..\..\libraries\bin\libssl-1_1.dll"; DestDir: "{localappdata}\GeoDa"
-Source: "..\..\libraries\bin\libxml2.dll"; DestDir: "{localappdata}\GeoDa"
-Source: "..\..\libraries\bin\openjp2.dll"; DestDir: "{localappdata}\GeoDa"
-Source: "..\..\libraries\bin\proj.dll"; DestDir: "{localappdata}\GeoDa"
-Source: "..\..\libraries\bin\proj_6_1.dll"; DestDir: "{localappdata}\GeoDa"
-Source: "..\..\libraries\bin\spatialite.dll"; DestDir: "{localappdata}\GeoDa"
-Source: "..\..\libraries\bin\sqlite3.dll"; DestDir: "{localappdata}\GeoDa"
-Source: "..\..\libraries\bin\xerces-c_3_2.dll"; DestDir: "{localappdata}\GeoDa"
-Source: "..\..\libraries\bin\zlib1.dll"; DestDir: "{localappdata}\GeoDa"
-Source: "..\..\libraries\bin\gdal\plugins\ogr_OCI.dll"; DestDir: "{localappdata}\GeoDa"
-Source: "..\..\libraries\bin\gdal\plugins-optional\ogr_PG.dll"; DestDir: "{localappdata}\GeoDa"
-Source: "..\..\libraries\bin\gdal\plugins-optional\ogr_MSSQLSpatial.dll"; DestDir: "{localappdata}\GeoDa"
-Source: "..\..\libraries\bin\gdal\plugins-external\ogr_FileGDB.dll"; DestDir: "{localappdata}\GeoDa"
-Source: "..\..\..\..\Algorithms\lisa_kernel.cl"; DestDir: "{localappdata}\GeoDa"
-Source: "..\..\..\..\internationalization\lang\*"; DestDir: "{localappdata}\GeoDa\lang"; Flags: recursesubdirs
-Source: "..\..\libraries\bin\gdal-data\*"; DestDir: "{localappdata}\GeoDa\data"; Flags: recursesubdirs
-
-;Source: "Readme.txt"; DestDir: "{localappdata}\GeoDa"; Flags: isreadme
+Source: "..\..\Release\GeoDa.exe"; DestDir: "{app}"; DestName: "GeoDa.exe"
+Source: "..\..\..\CommonDistFiles\GeoDa.ico"; DestDir: "{app}"
+Source: "..\..\..\CommonDistFiles\copyright.txt"; DestDir: "{app}"
+Source: "..\..\..\CommonDistFiles\GPLv3.txt"; DestDir: "{app}"
+Source: "..\..\..\CommonDistFiles\cache.sqlite"; DestDir: "{userappdata}\GeoDa"
+Source: "..\..\..\CommonDistFiles\cache.sqlite"; DestDir: "{app}"
+Source: "..\..\..\CommonDistFiles\geoda_prefs.sqlite"; DestDir: "{app}"
+Source: "..\..\..\CommonDistFiles\geoda_prefs.json"; DestDir: "{app}"
+Source: "..\..\..\CommonDistFiles\web_plugins\*"; DestDir: "{app}\web_plugins"; Flags: recursesubdirs
+Source: "..\..\..\CommonDistFiles\proj\*"; DestDir: "{app}\proj"; Flags: recursesubdirs
+
+
+Source: "VC_redist.x86.exe"; DestDir: "{app}"
+Source: "..\..\temp\OpenCL\sdk\bin\x86\OpenCL.dll"; DestDir: "{app}"
+Source: "..\..\temp\wxWidgets\lib\vc_dll\wxmsw314u_vc_custom.dll"; DestDir: "{app}"
+Source: "..\..\temp\wxWidgets\lib\vc_dll\wxmsw314u_gl_vc_custom.dll"; DestDir: "{app}"
+Source: "..\..\libraries\bin\expat.dll"; DestDir: "{app}"
+Source: "..\..\libraries\bin\freexl.dll"; DestDir: "{app}"
+Source: "..\..\libraries\bin\gdal302.dll"; DestDir: "{app}"
+Source: "..\..\libraries\bin\geos.dll"; DestDir: "{app}"
+Source: "..\..\libraries\bin\geos_c.dll"; DestDir: "{app}"
+Source: "..\..\libraries\bin\iconv.dll"; DestDir: "{app}"
+Source: "..\..\libraries\bin\libcrypto-1_1.dll"; DestDir: "{app}"
+Source: "..\..\libraries\bin\libcurl.dll"; DestDir: "{app}"
+Source: "..\..\libraries\bin\libmysql.dll"; DestDir: "{app}"
+Source: "..\..\libraries\bin\libpq.dll"; DestDir: "{app}"
+Source: "..\..\libraries\bin\libssl-1_1.dll"; DestDir: "{app}"
+Source: "..\..\libraries\bin\libxml2.dll"; DestDir: "{app}"
+Source: "..\..\libraries\bin\openjp2.dll"; DestDir: "{app}"
+Source: "..\..\libraries\bin\proj.dll"; DestDir: "{app}"
+Source: "..\..\libraries\bin\proj_6_1.dll"; DestDir: "{app}"
+Source: "..\..\libraries\bin\spatialite.dll"; DestDir: "{app}"
+Source: "..\..\libraries\bin\sqlite3.dll"; DestDir: "{app}"
+Source: "..\..\libraries\bin\xerces-c_3_2.dll"; DestDir: "{app}"
+Source: "..\..\libraries\bin\zlib1.dll"; DestDir: "{app}"
+Source: "..\..\libraries\bin\gdal\plugins\ogr_OCI.dll"; DestDir: "{app}"
+Source: "..\..\libraries\bin\gdal\plugins-optional\ogr_PG.dll"; DestDir: "{app}"
+Source: "..\..\libraries\bin\gdal\plugins-optional\ogr_MSSQLSpatial.dll"; DestDir: "{app}"
+Source: "..\..\libraries\bin\gdal\plugins-external\ogr_FileGDB.dll"; DestDir: "{app}"
+Source: "..\..\..\..\Algorithms\lisa_kernel.cl"; DestDir: "{app}"
+Source: "..\..\..\..\internationalization\lang\*"; DestDir: "{app}\lang"; Flags: recursesubdirs
+Source: "..\..\..\..\internationalization\lang\config.ini"; DestDir: "{userappdata}\GeoDa\lang"
+Source: "..\..\libraries\bin\gdal-data\*"; DestDir: "{app}\data"; Flags: recursesubdirs
+
+;Source: "Readme.txt"; DestDir: "{app}"; Flags: isreadme
 
 [Icons]
-Name: "{group}\GeoDa"; Filename: "{localappdata}\GeoDa\GeoDa.exe"
-;Name: "{group}\GeoDa"; Filename: "{localappdata}\GeoDa\run_geoda.bat"; IconFilename: "{localappdata}\GeoDa\GeoDa.ico"
+Name: "{group}\GeoDa"; Filename: "{app}\GeoDa.exe"
+;Name: "{group}\GeoDa"; Filename: "{app}\run_geoda.bat"; IconFilename: "{app}\GeoDa.ico"
 Name: "{group}\Uninstall"; Filename: "{uninstallexe}"
-Name: "{commondesktop}\GeoDa"; Filename: "{localappdata}\GeoDa\GeoDa.exe"
-;Name: "{commondesktop}\GeoDa"; Filename: "{localappdata}\GeoDa\run_geoda.bat"; IconFilename: "{localappdata}\GeoDa\GeoDa.ico"
+Name: "{commondesktop}\GeoDa"; Filename: "{app}\GeoDa.exe"
+;Name: "{commondesktop}\GeoDa"; Filename: "{app}\run_geoda.bat"; IconFilename: "{app}\GeoDa.ico"
 
 [Registry]
 ; set PATH
 ; set GEODA_GDAL_DATA
-Root: HKCU; Subkey: "Environment"; ValueType:string; ValueName:"GDAL_DATA"; ValueData:"{localappdata}\GeoDa\data"; Flags: preservestringtype uninsdeletevalue
+Root: HKCU; Subkey: "Environment"; ValueType:string; ValueName:"GDAL_DATA"; ValueData:"{app}\data"; Flags: preservestringtype uninsdeletevalue
 ; set GEODA_OGR_DRIVER_PATH
-Root: HKCU; Subkey: "Environment"; ValueType:string; ValueName:"OGR_DRIVER_PATH"; ValueData:"{localappdata}\GeoDa"; Flags: preservestringtype uninsdeletevalue
-Root: HKCU; Subkey: "Environment"; ValueType:string; ValueName:"PROJ_LIB"; ValueData:"{localappdata}\GeoDa\proj"; Flags: preservestringtype uninsdeletevalue
+Root: HKCU; Subkey: "Environment"; ValueType:string; ValueName:"OGR_DRIVER_PATH"; ValueData:"{app}"; Flags: preservestringtype uninsdeletevalue
+Root: HKCU; Subkey: "Environment"; ValueType:string; ValueName:"PROJ_LIB"; ValueData:"{app}\proj"; Flags: preservestringtype uninsdeletevalue
 
 Root: HKCR; Subkey: ".gda"; ValueType: string; ValueName: ""; ValueData: "GeoDaProjectFile"; Flags: uninsdeletevalue
 Root: HKCR; Subkey: "GeoDaProjectFile"; ValueType: string; ValueName: ""; ValueData: "GeoDa Project File"; Flags: uninsdeletekey
-Root: HKCR; Subkey: "GeoDaProjectFile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{localappdata}\GeoDa\GeoDa.exe,0"
-Root: HKCR; Subkey: "GeoDaProjectFile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{localappdata}\GeoDa\GeoDa.exe"" ""%1"""
+Root: HKCR; Subkey: "GeoDaProjectFile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\GeoDa.exe,0"
+Root: HKCR; Subkey: "GeoDaProjectFile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\GeoDa.exe"" ""%1"""
 
 ; set Browser Emulation for wxWebView to IE 11.  IE 10 or earlier does not work with current D3
 Root: "HKCU"; Subkey: "Software\Microsoft\Internet Explorer\Main\FeatureControl\FEATURE_BROWSER_EMULATION"; ValueType: dword; ValueName:"GeoDa.exe"; ValueData:"$2AF9"
@@ -103,7 +104,7 @@ Root: "HKCU"; Subkey: "Software\Microsoft\Internet Explorer\Main\FeatureControl\
 Root: "HKLM"; Subkey: "SOFTWARE\Microsoft\Internet Explorer\MAIN\FeatureControl\FEATURE_BROWSER_EMULATION"; ValueType: dword; ValueName: "GeoDa.exe"; ValueData: "$2AF9"
 
 ;run as admin
-;Root: "HKLM"; Subkey: "SOFTWARE\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers\"; ValueType: String; ValueName: "{localappdata}\GeoDa\GeoDa.exe"; ValueData: "RUNASADMIN"; Flags: uninsdeletekeyifempty uninsdeletevalue; MinVersion: 0,6.1
+;Root: "HKLM"; Subkey: "SOFTWARE\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers\"; ValueType: String; ValueName: "{app}\GeoDa.exe"; ValueData: "RUNASADMIN"; Flags: uninsdeletekeyifempty uninsdeletevalue; MinVersion: 0,6.1
 
 [Code]
 function IsX64: Boolean;
@@ -228,7 +229,7 @@ begin
 end;
 
 [INI]
-Filename: "{localappdata}\GeoDa\lang\config.ini"; Section: "Translation"; Key: "Language"; String: {code:getLangCode|{localappdata}\GeoDa}
+Filename: "{userappdata}\GeoDa\lang\config.ini"; Section: "Translation"; Key: "Language"; String: {code:getLangCode|{userappdata}\GeoDa}
 
 [Run]
-Filename: {localappdata}\GeoDa\VC_redist.x86.exe; StatusMsg: Installing Visual C++ Redistributable for Visual Studio 2019 (14.28.29913.0)...; Check: VCRedistNeedsInstall
+Filename: {app}\VC_redist.x86.exe; StatusMsg: Installing Visual C++ Redistributable for Visual Studio 2019 (14.28.29913.0)...; Check: VCRedistNeedsInstall