diff --git a/Oqtane.Package/Oqtane.Framework.nuspec b/Oqtane.Package/Oqtane.Framework.nuspec
index d20c4cfb..d02d4578 100644
--- a/Oqtane.Package/Oqtane.Framework.nuspec
+++ b/Oqtane.Package/Oqtane.Framework.nuspec
@@ -21,5 +21,7 @@
     <file src="..\Oqtane.Server\bin\Release\netcoreapp3.1\Oqtane.Server.dll" target="lib" /> 
     <file src="..\Oqtane.Shared\bin\Release\netstandard2.1\Oqtane.Shared.dll" target="lib" /> 
     <file src="..\Oqtane.Server\bin\Release\netcoreapp3.1\Oqtane.Upgrade.dll" target="lib" /> 
+    <file src="..\Oqtane.Server\bin\Release\netcoreapp3.1\Oqtane.Upgrade.dll" target="lib" /> 
+    <file src="..\Oqtane.Server\wwwroot\**\*.*" target="wwwroot" /> 
   </files>
 </package>
\ No newline at end of file
diff --git a/Oqtane.Server/Infrastructure/InstallationManager.cs b/Oqtane.Server/Infrastructure/InstallationManager.cs
index b92541bc..efbed7c5 100644
--- a/Oqtane.Server/Infrastructure/InstallationManager.cs
+++ b/Oqtane.Server/Infrastructure/InstallationManager.cs
@@ -52,10 +52,6 @@ namespace Oqtane.Infrastructure
                 // iterate through Nuget packages in source folder
                 foreach (string packagename in Directory.GetFiles(sourceFolder, "*.nupkg"))
                 {
-                    string name = Path.GetFileNameWithoutExtension(packagename);
-                    string[] segments = name?.Split('.');
-                    if (segments != null) name = string.Join('.', segments, 0, segments.Length - 3);
-
                     // iterate through files
                     using (ZipArchive archive = ZipFile.OpenRead(packagename))
                     {
@@ -84,6 +80,15 @@ namespace Oqtane.Infrastructure
                         // if compatible with framework version
                         if (frameworkversion == "" || Version.Parse(Constants.Version).CompareTo(Version.Parse(frameworkversion)) >= 0)
                         {
+                            string name = "";
+                            if (folder != "Framework")
+                            {
+                                // module and theme packages must be in form of name.1.0.0.nupkg
+                                name = Path.GetFileNameWithoutExtension(packagename);
+                                string[] segments = name?.Split('.');
+                                if (segments != null) name = string.Join('.', segments, 0, segments.Length - 3);
+                            }
+
                             // deploy to appropriate locations
                             foreach (ZipArchiveEntry entry in archive.Entries)
                             {
diff --git a/Oqtane.Server/app_offline.bak b/Oqtane.Server/wwwroot/app_offline.bak
similarity index 100%
rename from Oqtane.Server/app_offline.bak
rename to Oqtane.Server/wwwroot/app_offline.bak
diff --git a/Oqtane.Upgrade/Program.cs b/Oqtane.Upgrade/Program.cs
index 6c8fb1df..d10c9821 100644
--- a/Oqtane.Upgrade/Program.cs
+++ b/Oqtane.Upgrade/Program.cs
@@ -14,8 +14,9 @@ namespace Oqtane.Upgrade
             if (args.Length == 2)
             {
                 string binfolder = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
-                string rootfolder = args[0];
-                string deployfolder = Path.Combine(args[1], "Framework");
+                string contentrootfolder = args[0];
+                string webrootfolder = args[1];
+                string deployfolder = Path.Combine(webrootfolder, "Framework");
 
                 if (Directory.Exists(deployfolder))
                 {
@@ -29,9 +30,9 @@ namespace Oqtane.Upgrade
                     if (packagename != "")
                     {
                         // take the app offline
-                        if (File.Exists(Path.Combine(rootfolder, "app_offline.bak")))
+                        if (File.Exists(Path.Combine(webrootfolder, "app_offline.bak")))
                         {
-                            File.Move(Path.Combine(rootfolder, "app_offline.bak"), Path.Combine(rootfolder, "app_offline.htm"));
+                            File.Move(Path.Combine(webrootfolder, "app_offline.bak"), Path.Combine(contentrootfolder, "app_offline.htm"));
                         }
 
                         // get list of files in package
@@ -116,9 +117,9 @@ namespace Oqtane.Upgrade
                         }
 
                         // bring the app back online
-                        if (File.Exists(Path.Combine(rootfolder, "app_offline.htm")))
+                        if (File.Exists(Path.Combine(contentrootfolder, "app_offline.htm")))
                         {
-                            File.Move(Path.Combine(rootfolder, "app_offline.htm"), Path.Combine(rootfolder, "app_offline.bak"));
+                            File.Delete(Path.Combine(contentrootfolder, "app_offline.htm"));
                         }
                     }
                 }
diff --git a/screenshots/Installer.png b/screenshots/Installer.png
new file mode 100644
index 00000000..6fad9be6
Binary files /dev/null and b/screenshots/Installer.png differ
diff --git a/screenshots/screenshot0.png b/screenshots/screenshot0.png
index deded505..7205a3c5 100644
Binary files a/screenshots/screenshot0.png and b/screenshots/screenshot0.png differ
diff --git a/screenshots/screenshot1.png b/screenshots/screenshot1.png
index d1c857ca..4aef06c9 100644
Binary files a/screenshots/screenshot1.png and b/screenshots/screenshot1.png differ
diff --git a/screenshots/screenshot2.png b/screenshots/screenshot2.png
index 3e500528..4958b175 100644
Binary files a/screenshots/screenshot2.png and b/screenshots/screenshot2.png differ
diff --git a/screenshots/screenshot3.png b/screenshots/screenshot3.png
index ed75c107..70150a94 100644
Binary files a/screenshots/screenshot3.png and b/screenshots/screenshot3.png differ
diff --git a/screenshots/screenshot4.png b/screenshots/screenshot4.png
index 39d85539..782ab447 100644
Binary files a/screenshots/screenshot4.png and b/screenshots/screenshot4.png differ
diff --git a/screenshots/screenshot5.png b/screenshots/screenshot5.png
index af6c290f..7830f9cb 100644
Binary files a/screenshots/screenshot5.png and b/screenshots/screenshot5.png differ
diff --git a/screenshots/screenshot6.png b/screenshots/screenshot6.png
index df206652..f124488e 100644
Binary files a/screenshots/screenshot6.png and b/screenshots/screenshot6.png differ
diff --git a/screenshots/screenshot7.png b/screenshots/screenshot7.png
new file mode 100644
index 00000000..0d21177d
Binary files /dev/null and b/screenshots/screenshot7.png differ