diff --git a/Mods/Forms/MainForm.Designer.cs b/Mods/Forms/MainForm.Designer.cs
index ca608d5..ce582ac 100644
--- a/Mods/Forms/MainForm.Designer.cs
+++ b/Mods/Forms/MainForm.Designer.cs
@@ -172,6 +172,7 @@ private void InitializeComponent()
             this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
             this.menuInstallerScript = new System.Windows.Forms.ToolStripMenuItem();
             this.menuStartScriptShell = new System.Windows.Forms.ToolStripMenuItem();
+            this.menuOthers = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
             this.menuWizardInstallUI = new System.Windows.Forms.ToolStripMenuItem();
             this.menuWizardUpgradeUI = new System.Windows.Forms.ToolStripMenuItem();
@@ -199,7 +200,6 @@ private void InitializeComponent()
             this.menuAbout = new System.Windows.Forms.ToolStripMenuItem();
             this.groupBoxTip = new System.Windows.Forms.GroupBox();
             this.labelToolTip = new System.Windows.Forms.Label();
-            this.menuOthers = new System.Windows.Forms.ToolStripMenuItem();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox_256)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox_128)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox_96)).BeginInit();
@@ -1929,6 +1929,16 @@ private void InitializeComponent()
             this.menuStartScriptShell.ToolTipText = "Edit a Start-Stop shell script if used within your Scripts";
             this.menuStartScriptShell.Click += new System.EventHandler(this.scriptEditMenuItem_Click);
             // 
+            // menuOthers
+            // 
+            this.menuOthers.Name = "menuOthers";
+            this.menuOthers.ShortcutKeys = System.Windows.Forms.Keys.F12;
+            this.menuOthers.Size = new System.Drawing.Size(227, 22);
+            this.menuOthers.Tag = "scripts\\*";
+            this.menuOthers.Text = "Others...";
+            this.menuOthers.ToolTipText = "Edit other files available next to your scripts ";
+            this.menuOthers.Click += new System.EventHandler(this.scriptEditMenuItem_Click);
+            // 
             // toolStripSeparator2
             // 
             this.toolStripSeparator2.Name = "toolStripSeparator2";
@@ -2167,16 +2177,6 @@ private void InitializeComponent()
             this.labelToolTip.TabIndex = 24;
             this.labelToolTip.UseMnemonic = false;
             // 
-            // menuOthers
-            // 
-            this.menuOthers.Name = "menuOthers";
-            this.menuOthers.ShortcutKeys = System.Windows.Forms.Keys.F12;
-            this.menuOthers.Size = new System.Drawing.Size(227, 22);
-            this.menuOthers.Tag = "scripts\\*";
-            this.menuOthers.Text = "Others...";
-            this.menuOthers.ToolTipText = "Edit other files available next to your scripts ";
-            this.menuOthers.Click += new System.EventHandler(this.scriptEditMenuItem_Click);
-            // 
             // MainForm
             // 
             this.AllowDrop = true;
diff --git a/Mods/Forms/MainForm.cs b/Mods/Forms/MainForm.cs
index f27946b..9d06e80 100644
--- a/Mods/Forms/MainForm.cs
+++ b/Mods/Forms/MainForm.cs
@@ -692,14 +692,22 @@ private void LoadPackageInfo(string path)
                     var lineText = line.Trim();
                     if (!string.IsNullOrEmpty(lineText))
                     {
-                        var key = lineText.Substring(0, lineText.IndexOf('='));
-                        var value = lineText.Substring(lineText.IndexOf('=') + 1);
-                        value = value.Trim(new char[] { '"' });
-                        value = value.Replace("<br>", "\r\n");
-                        if (info.ContainsKey(key))
-                            info.Remove(key);
-                        if (key != "checksum")
-                            info.Add(key, value);
+                        if (lineText.StartsWith("#"))
+                        {
+                            //Comments will be lost as not supported by MODS
+                        }
+                        else if (lineText.Contains('='))
+                        {
+
+                            var key = lineText.Substring(0, lineText.IndexOf('='));
+                            var value = lineText.Substring(lineText.IndexOf('=') + 1);
+                            value = value.Trim(new char[] { '"' });
+                            value = value.Replace("<br>", "\r\n");
+                            if (info.ContainsKey(key))
+                                info.Remove(key);
+                            if (key != "checksum")
+                                info.Add(key, value);
+                        }
                     }
                 }
 
@@ -710,6 +718,8 @@ private void LoadPackageInfo(string path)
 
                 groupBoxPackage.Enabled = false;
 
+                //lastBuild.Text = "";
+
                 SavePackageSettings(path);
                 CreateRecentsMenu();
 
@@ -754,12 +764,19 @@ private string GetUIDir(string path)
                     var lineText = line.Trim();
                     if (!string.IsNullOrEmpty(lineText))
                     {
-                        var key = lineText.Substring(0, lineText.IndexOf('='));
-                        if (key == "dsmuidir")
+                        if (lineText.StartsWith("#"))
                         {
-                            value = lineText.Substring(lineText.IndexOf('=') + 1);
-                            value = value.Trim(new char[] { '"' });
-                            break;
+                            //Comments will be lost as not supported by MODS
+                        }
+                        else if (lineText.Contains('='))
+                        {
+                            var key = lineText.Substring(0, lineText.IndexOf('='));
+                            if (key == "dsmuidir")
+                            {
+                                value = lineText.Substring(lineText.IndexOf('=') + 1);
+                                value = value.Trim(new char[] { '"' });
+                                break;
+                            }
                         }
                     }
                 }
@@ -1709,21 +1726,24 @@ private DialogResult EditScript(string scriptPath, string runnerPath)
         {
             string inputScript = null;
             string inputRunner = null;
-            if (File.Exists(scriptPath))
+            if (currentScript == null && File.Exists(scriptPath))
                 inputScript = File.ReadAllText(scriptPath);
             else
             {
                 //When creating a new script, the script can be edited several times but is not yet saved in a file.
-                if (state == State.Add)
-                {
-                    inputScript = currentScript;
-                }
+                inputScript = currentScript;
             }
 
-            if (File.Exists(runnerPath))
+            if (currentRunner == null && File.Exists(runnerPath))
                 inputRunner = File.ReadAllText(runnerPath);
-            else
+            else if (currentRunner == null)
+            {
                 inputRunner = File.ReadAllText(Path.Combine(Helper.ResourcesDirectory, "default.runner"));
+            }
+            else
+            {
+                inputRunner = currentRunner;
+            }
 
             var script = new ScriptInfo(inputScript, "Script Editor", new Uri("https://www.shellscript.sh/"), "Shell Scripting Tutorial");
             var runner = new ScriptInfo(inputRunner, "Runner Editor", new Uri("https://stackoverflow.com/questions/20107147/php-reading-shell-exec-live-output"), "Reading shell_exec live output in PHP");
@@ -1939,26 +1959,19 @@ private bool CreateScript(KeyValuePair<string, AppsData> current, string script,
 
                 if (Directory.Exists(target))
                 {
-                    var ex = Helper.DeleteDirectory(target);
-                    if (ex != null)
-                    {
-                        MessageBoxEx.Show(this, string.Format("The operation cannot be completed because a fatal error occured while trying to delete {0}: {1}", target, ex.Message), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error, MessageBoxDefaultButton.Button1);
-                        succeed = false;
-                    }
-                    else
-                    {
-                        if (string.IsNullOrEmpty(cleanedCurrent)) Directory.CreateDirectory(target);
-                    }
+                    if (File.Exists(targetRunner))
+                        Helper.DeleteFile(targetRunner);
+                    if (File.Exists(targetScript))
+                        Helper.DeleteFile(targetScript);
                 }
-
-                if (succeed)
+                else
                 {
                     Directory.CreateDirectory(target);
-
-                    // Create sh script (ANSI) to be executed by the php runner script
-                    Helper.WriteAnsiFile(targetScript, script);
-                    Helper.WriteAnsiFile(targetRunner, runner);
                 }
+
+                // Create sh script (ANSI) to be executed by the php runner script
+                Helper.WriteAnsiFile(targetScript, script);
+                Helper.WriteAnsiFile(targetRunner, runner);
             }
 
             return succeed; //TODO: handle this return value
@@ -1990,15 +2003,18 @@ private void SaveItemsConfig()
                 Properties.Settings.Default.Packages = json;
                 Properties.Settings.Default.Save();
 
-                var config = Path.Combine(CurrentPackageFolder, string.Format(CONFIGFILE, info["dsmuidir"]));
-                if (Directory.Exists(Path.GetDirectoryName(config)))
-                {
-                    // Save Config as Ansi
-                    Helper.WriteAnsiFile(config, json);
-                }
-                else
+                if (info.ContainsKey("dsmuidir"))
                 {
-                    MessageBoxEx.Show(this, "For some reason, required resource files are missing. You will have to reconfigure your destination path", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button1);
+                    var config = Path.Combine(CurrentPackageFolder, string.Format(CONFIGFILE, info["dsmuidir"]));
+                    if (Directory.Exists(Path.GetDirectoryName(config)))
+                    {
+                        // Save Config as Ansi
+                        Helper.WriteAnsiFile(config, json);
+                    }
+                    else
+                    {
+                        MessageBoxEx.Show(this, "For some reason, required resource files are missing. You will have to reconfigure your destination path", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button1);
+                    }
                 }
             }
         }
@@ -2168,7 +2184,8 @@ private void EnableItemDetails()
 
                 // Enable the detail and package zone depending on the current state (view, new, edit or none)
                 enabling = (state != State.View && state != State.None);
-                packaging = listViewItems.Items.Count > 0 && !enabling;
+                //packaging = listViewItems.Items.Count > 0 && !enabling;
+                packaging = true; //A package can be published even without any item
 
                 EnableItemFieldDetails(!enabling && list != null, enabling);
                 switch (state)
@@ -3439,6 +3456,7 @@ private void BuildPackage(string path)
                     try
                     {
                         File.Move(tmpName, packName);
+                        //lastBuild.Text = string.Format("Build on {0:dd/MM/yyyy HH:mm:ss}", DateTime.Now);
                     }
                     catch (Exception ex)
                     {
@@ -3456,10 +3474,12 @@ private void BuildPackage(string path)
         private void PublishPackage(string PackagePath, string PackageRepo)
         {
             var packName = info["package"];
+            var archname = info["arch"];
 
             try
             {
-                publishFile(Path.Combine(PackagePath, packName + ".spk"), Path.Combine(PackageRepo, packName + ".spk"));
+                var flavour = archname.Equals("noarch", StringComparison.InvariantCultureIgnoreCase) ? "" : "[" + archname.Replace(" ", "-") + "]";
+                publishFile(Path.Combine(PackagePath, packName + ".spk"), Path.Combine(PackageRepo, packName + flavour + ".spk"));
                 MessageBoxEx.Show(this, "The package has been successfuly published.", "Notification", MessageBoxButtons.OK, MessageBoxIcon.Information, MessageBoxDefaultButton.Button1);
             }
             catch (Exception ex)
@@ -3556,8 +3576,11 @@ private void ShowIconOnScriptMenu(ToolStripItem menu)
                         {
                             if (file.Contains("*"))
                             {
-                                var files = Directory.GetFiles(CurrentPackageFolder, file, SearchOption.TopDirectoryOnly);
-                                if (files.Length > 0) file = files[0]; else file = null;
+                                if (Directory.Exists(Path.Combine(CurrentPackageFolder, file)))
+                                {
+                                    var files = Directory.GetFiles(CurrentPackageFolder, file, SearchOption.TopDirectoryOnly);
+                                    if (files.Length > 0) file = files[0]; else file = null;
+                                }
                             }
                             else
                             {
@@ -5381,7 +5404,7 @@ private void menuDefaultRouterScript_Click(object sender, EventArgs e)
 
             var content = File.ReadAllText(file);
             var routercgi = new ScriptInfo(content, "Default Router Script", new Uri("https://github.com/vletroye/SynoPackages/wiki/MODS-Advanced-Test-CGI"), "CGI Router handling calls to php");
-            DialogResult result = Helper.ScriptEditor(routercgi,null,  null);
+            DialogResult result = Helper.ScriptEditor(routercgi, null, null);
             if (result == DialogResult.OK)
             {
                 Helper.WriteAnsiFile(file, routercgi.Code);
diff --git a/Mods/Forms/ScriptForm.cs b/Mods/Forms/ScriptForm.cs
index 9ee9b96..0c90116 100644
--- a/Mods/Forms/ScriptForm.cs
+++ b/Mods/Forms/ScriptForm.cs
@@ -43,6 +43,14 @@ public ScriptForm(ScriptInfo script1, ScriptInfo script2, List<Tuple<string, str
                 SetHelpToolTip(this.scriptTab1.Help);
             }
 
+            if (this.scriptTab1 !=null &&  this.scriptTab1.Code != null && this.scriptTab1.Code.Contains("\r") && this.scriptTab1.Title != "INFO Editor")
+            {
+                if (MessageBox.Show("WARNING: your script contains 'Carriage Returns' (\\r) which are not supported on Linux. Do you want to clean them up ?", "WARNING", MessageBoxButtons.YesNo, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button1) == DialogResult.Yes)
+                {
+                    this.scriptTab1.Code = this.scriptTab1.Code.Replace("\r", "");
+                }
+            }
+
 
             this.scriptTab2 = script2;
             if (this.scriptTab2 != null)
diff --git a/Mods/Workers/Linker.cs b/Mods/Workers/Linker.cs
index aa59e0b..2c9dde5 100644
--- a/Mods/Workers/Linker.cs
+++ b/Mods/Workers/Linker.cs
@@ -56,6 +56,12 @@ public Linker(JToken linker, string targetPath, string ui)
 
             textboxLinkerPath.AutoCompleteCustomSource = new AutoCompleteStringCollection();
 
+            if (Directory.Exists(Path.Combine(targetPath, "bin")))
+            {
+                //structure "old style" with app, bin, etc, lib in the target director.
+                ui = "";
+            }
+
             var dir = string.IsNullOrEmpty(ui) ? new DirectoryInfo(targetPath) : new DirectoryInfo(Path.Combine(targetPath, ui));
             textboxLinkerPath.AutoCompleteCustomSource.Clear();
             var excludes = new string[] { "images", "config", "dsm.cgi.conf", "router.cgi" };
diff --git a/Mods/Workers/Privilege.cs b/Mods/Workers/Privilege.cs
index f41f72e..1c839fc 100644
--- a/Mods/Workers/Privilege.cs
+++ b/Mods/Workers/Privilege.cs
@@ -73,7 +73,7 @@ public Privilege(JToken privilege, SortedDictionary<string, string> info)
         private void SetPrivilege(JToken privilege)
         {
             origPrivilege = privilege;
-            Specification = privilege == null ? JsonConvert.DeserializeObject<JObject>(@"{""defaults"":{""run-as"":""system""}}") : privilege.DeepClone();
+            Specification = privilege == null ? JsonConvert.DeserializeObject<JObject>(@"{""defaults"":{""run-as"":""package""}}") : privilege.DeepClone();
 
             DisplayPrivilege();
         }