diff --git a/BASINS/modBasinsPlugin.vb b/BASINS/modBasinsPlugin.vb
index db7fa45cc..37ae587db 100644
--- a/BASINS/modBasinsPlugin.vb
+++ b/BASINS/modBasinsPlugin.vb
@@ -98,6 +98,10 @@ Public Module modBasinsPlugin
         If g_BasinsDataDirs.Count = 0 Then
             If g_AppNameShort = "GW Toolbox" Then
                 g_BasinsDataDirs.Add("C:\USGS-GWToolbox\data\")
+            ElseIf g_AppNameShort = "SW Toolbox" Then
+                g_BasinsDataDirs.Add("C:\USGS-SWToolbox\data\")
+            ElseIf g_AppNameShort = "Hydro Toolbox" Then
+                g_BasinsDataDirs.Add("C:\USGS-HydroToolbox\data\")
             End If
             Dim lSavedPaths As String = GetSetting(g_AppNameRegistry, "Folders", "DataPaths")
             If lSavedPaths.Length > 0 Then
diff --git a/BASINS/modDownload.vb b/BASINS/modDownload.vb
index 4cfafc44c..2379f75e1 100644
--- a/BASINS/modDownload.vb
+++ b/BASINS/modDownload.vb
@@ -672,7 +672,7 @@ StartOver:
 
         Dim lBasinsDataTypes As String = "<DataType>core31</DataType>"
         Select Case g_AppNameShort
-            Case "SW Toolbox", "GW Toolbox"
+            Case "SW Toolbox", "GW Toolbox", "Hydro Toolbox"
                 lBasinsDataTypes &= "<DataType>nhd</DataType>"
         End Select
 
@@ -752,7 +752,7 @@ StartOver:
                            & aRegion _
                            & "<clip>False</clip> <merge>False</merge>" _
                            & "</arguments></function>"
-                    Case "GW Toolbox"
+                    Case "GW Toolbox", "Hydro Toolbox"
                         'Dim lRegion As D4EMDataManager.Region 'Use the view extents to include some stations in a buffer outside the original region
                         'With g_MapWin.View.Extents
                         '    lRegion = New D4EMDataManager.Region(.yMax, .yMin, .xMin, .xMax, g_MapWin.Project.ProjectProjection)