diff --git a/DesktopEdge/App.xaml b/DesktopEdge/App.xaml
index 648aca77e..ec2c9a66f 100644
--- a/DesktopEdge/App.xaml
+++ b/DesktopEdge/App.xaml
@@ -1,4 +1,19 @@
-<Application
+<!--
+	Copyright NetFoundry Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+<Application
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:ZitiDesktopEdge"
diff --git a/DesktopEdge/MainWindow.xaml b/DesktopEdge/MainWindow.xaml
index e11791a04..7e759911f 100644
--- a/DesktopEdge/MainWindow.xaml
+++ b/DesktopEdge/MainWindow.xaml
@@ -1,4 +1,19 @@
-<Window x:Class="ZitiDesktopEdge.MainWindow"
+<!--
+	Copyright NetFoundry Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+<Window x:Class="ZitiDesktopEdge.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
diff --git a/DesktopEdge/Models/ZitiIdentity.cs b/DesktopEdge/Models/ZitiIdentity.cs
index a36cbbf71..ae9052c3b 100644
--- a/DesktopEdge/Models/ZitiIdentity.cs
+++ b/DesktopEdge/Models/ZitiIdentity.cs
@@ -277,7 +277,7 @@ internal async Task PerformExternalAuthEvent(DataClient client, string provider)
                 ExternalAuthLoginResponse resp = await client.ExternalAuthLogin(Identifier, provider);
                 if (resp?.Error == null) {
                     if (resp?.Data?.url != null) {
-                        Console.WriteLine(resp.Data?.url);
+                        logger.Info("beginning external auth using url: {}", resp.Data?.url);
                         Process.Start(resp.Data.url);
                     } else {
                         throw new Exception("External authentication could not start. No URL was returned to login. Inform your network administrator.");
diff --git a/DesktopEdge/Views/Controls/AddIdentityCA.xaml b/DesktopEdge/Views/Controls/AddIdentityCA.xaml
index 12215a024..4c64c98e9 100644
--- a/DesktopEdge/Views/Controls/AddIdentityCA.xaml
+++ b/DesktopEdge/Views/Controls/AddIdentityCA.xaml
@@ -1,4 +1,19 @@
-<UserControl x:Class="ZitiDesktopEdge.AddIdentityCA"
+<!--
+	Copyright NetFoundry Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+<UserControl x:Class="ZitiDesktopEdge.AddIdentityCA"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/DesktopEdge/Views/Controls/AddIdentityCA.xaml.cs b/DesktopEdge/Views/Controls/AddIdentityCA.xaml.cs
index 1e9192a97..0335b7b04 100644
--- a/DesktopEdge/Views/Controls/AddIdentityCA.xaml.cs
+++ b/DesktopEdge/Views/Controls/AddIdentityCA.xaml.cs
@@ -1,4 +1,19 @@
-using System.Windows.Controls;
+/*
+	Copyright NetFoundry Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+*/
+using System.Windows.Controls;
 using Microsoft.Win32;
 using System.Windows;
 using System.Windows.Input;
diff --git a/DesktopEdge/Views/Controls/AddIdentityUrl.xaml b/DesktopEdge/Views/Controls/AddIdentityUrl.xaml
index 054bd888b..08195bff3 100644
--- a/DesktopEdge/Views/Controls/AddIdentityUrl.xaml
+++ b/DesktopEdge/Views/Controls/AddIdentityUrl.xaml
@@ -1,4 +1,19 @@
-<UserControl x:Class="ZitiDesktopEdge.AddIdentityUrl"
+<!--
+	Copyright NetFoundry Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+<UserControl x:Class="ZitiDesktopEdge.AddIdentityUrl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
diff --git a/DesktopEdge/Views/Controls/AddIdentityUrl.xaml.cs b/DesktopEdge/Views/Controls/AddIdentityUrl.xaml.cs
index 47d34f72d..370aa6978 100644
--- a/DesktopEdge/Views/Controls/AddIdentityUrl.xaml.cs
+++ b/DesktopEdge/Views/Controls/AddIdentityUrl.xaml.cs
@@ -1,4 +1,19 @@
-using NLog;
+/*
+	Copyright NetFoundry Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+*/
+using NLog;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
@@ -34,13 +49,14 @@ private async void JoinNetworkUrl(object sender, MouseButtonEventArgs e) {
             Mouse.OverrideCursor = Cursors.Wait;
             try {
                 var result = client.GetAsync(ControllerURL.Text).Result;
+                Mouse.OverrideCursor = null;
                 OnAddIdentity(payload, this);
             } catch {
+                Mouse.OverrideCursor = null;
                 this.OnClose?.Invoke(false, this);
                 await ((MainWindow)Application.Current.MainWindow).ShowBlurbAsync("Timed out accessing URL", "");
                 logger.Warn("could not connect to url");
             }
-            Mouse.OverrideCursor = null;
         }
 
         private void ExecuteClose(object sender, MouseButtonEventArgs e) {
diff --git a/DesktopEdge/Views/Controls/ConfirmationDialog.xaml b/DesktopEdge/Views/Controls/ConfirmationDialog.xaml
index ed3d65cbf..d7f4d3eff 100644
--- a/DesktopEdge/Views/Controls/ConfirmationDialog.xaml
+++ b/DesktopEdge/Views/Controls/ConfirmationDialog.xaml
@@ -1,4 +1,19 @@
-<UserControl x:Class="ZitiDesktopEdge.ConfirmationDialog"
+<!--
+	Copyright NetFoundry Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+<UserControl x:Class="ZitiDesktopEdge.ConfirmationDialog"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/DesktopEdge/Views/Controls/ConfirmationDialog.xaml.cs b/DesktopEdge/Views/Controls/ConfirmationDialog.xaml.cs
index 3852a3241..0197c6757 100644
--- a/DesktopEdge/Views/Controls/ConfirmationDialog.xaml.cs
+++ b/DesktopEdge/Views/Controls/ConfirmationDialog.xaml.cs
@@ -1,4 +1,20 @@
-using System.Windows.Controls;
+/*
+	Copyright NetFoundry Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+*/
+
+using System.Windows.Controls;
 using System.Windows;
 using System.Windows.Input;
 using System.Threading.Tasks;
diff --git a/DesktopEdge/Views/Controls/ExternalProviderSelector.xaml b/DesktopEdge/Views/Controls/ExternalProviderSelector.xaml
index e29af26a7..92f441ddd 100644
--- a/DesktopEdge/Views/Controls/ExternalProviderSelector.xaml
+++ b/DesktopEdge/Views/Controls/ExternalProviderSelector.xaml
@@ -1,4 +1,19 @@
-<UserControl x:Class="ZitiDesktopEdge.ExternalProviderSelector"
+<!--
+	Copyright NetFoundry Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+<UserControl x:Class="ZitiDesktopEdge.ExternalProviderSelector"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
diff --git a/DesktopEdge/Views/Controls/ExternalProviderSelector.xaml.cs b/DesktopEdge/Views/Controls/ExternalProviderSelector.xaml.cs
index b980a7211..609347ced 100644
--- a/DesktopEdge/Views/Controls/ExternalProviderSelector.xaml.cs
+++ b/DesktopEdge/Views/Controls/ExternalProviderSelector.xaml.cs
@@ -1,4 +1,19 @@
-using System;
+/*
+	Copyright NetFoundry Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+*/
+using System;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Diagnostics;
diff --git a/DesktopEdge/Views/Controls/FilePicker.xaml b/DesktopEdge/Views/Controls/FilePicker.xaml
index 43faccdde..b9bd33418 100644
--- a/DesktopEdge/Views/Controls/FilePicker.xaml
+++ b/DesktopEdge/Views/Controls/FilePicker.xaml
@@ -1,4 +1,19 @@
-<UserControl x:Class="ZitiDesktopEdge.FilePicker"
+<!--
+	Copyright NetFoundry Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+<UserControl x:Class="ZitiDesktopEdge.FilePicker"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
diff --git a/DesktopEdge/Views/Controls/FilePicker.xaml.cs b/DesktopEdge/Views/Controls/FilePicker.xaml.cs
index 0acd1251f..74cb7001c 100644
--- a/DesktopEdge/Views/Controls/FilePicker.xaml.cs
+++ b/DesktopEdge/Views/Controls/FilePicker.xaml.cs
@@ -1,4 +1,19 @@
-using System;
+/*
+	Copyright NetFoundry Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+*/
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/DesktopEdge/Views/Controls/StyledButton.xaml b/DesktopEdge/Views/Controls/StyledButton.xaml
index 9ea450fce..f0f5404ca 100644
--- a/DesktopEdge/Views/Controls/StyledButton.xaml
+++ b/DesktopEdge/Views/Controls/StyledButton.xaml
@@ -1,4 +1,19 @@
-<UserControl x:Class="ZitiDesktopEdge.StyledButton"
+<!--
+	Copyright NetFoundry Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+<UserControl x:Class="ZitiDesktopEdge.StyledButton"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
diff --git a/DesktopEdge/Views/Controls/StyledButton.xaml.cs b/DesktopEdge/Views/Controls/StyledButton.xaml.cs
index d78bee613..6a4043438 100644
--- a/DesktopEdge/Views/Controls/StyledButton.xaml.cs
+++ b/DesktopEdge/Views/Controls/StyledButton.xaml.cs
@@ -1,4 +1,19 @@
-using System;
+/*
+	Copyright NetFoundry Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+*/
+using System;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
diff --git a/DesktopEdge/Views/Controls/Toggler.xaml b/DesktopEdge/Views/Controls/Toggler.xaml
index dc07fd02d..31e20204e 100644
--- a/DesktopEdge/Views/Controls/Toggler.xaml
+++ b/DesktopEdge/Views/Controls/Toggler.xaml
@@ -1,4 +1,19 @@
-<UserControl x:Class="ZitiDesktopEdge.Toggler"
+<!--
+	Copyright NetFoundry Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+<UserControl x:Class="ZitiDesktopEdge.Toggler"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
diff --git a/DesktopEdge/Views/Controls/Toggler.xaml.cs b/DesktopEdge/Views/Controls/Toggler.xaml.cs
index 74c8ed83a..fbc334e75 100644
--- a/DesktopEdge/Views/Controls/Toggler.xaml.cs
+++ b/DesktopEdge/Views/Controls/Toggler.xaml.cs
@@ -1,4 +1,19 @@
-using System;
+/*
+	Copyright NetFoundry Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+*/
+using System;
 using System.Windows;
 using System.Windows.Controls;
 using ZitiDesktopEdge.DataStructures;
diff --git a/DesktopEdge/Views/ItemRenderers/Filter.xaml b/DesktopEdge/Views/ItemRenderers/Filter.xaml
index f44575bf3..006e81791 100644
--- a/DesktopEdge/Views/ItemRenderers/Filter.xaml
+++ b/DesktopEdge/Views/ItemRenderers/Filter.xaml
@@ -1,4 +1,19 @@
-<UserControl x:Class="ZitiDesktopEdge.Filter"
+<!--
+	Copyright NetFoundry Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+<UserControl x:Class="ZitiDesktopEdge.Filter"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
diff --git a/DesktopEdge/Views/ItemRenderers/Filter.xaml.cs b/DesktopEdge/Views/ItemRenderers/Filter.xaml.cs
index 4ccf671bb..9c8e0f9e5 100644
--- a/DesktopEdge/Views/ItemRenderers/Filter.xaml.cs
+++ b/DesktopEdge/Views/ItemRenderers/Filter.xaml.cs
@@ -1,4 +1,19 @@
-using System;
+/*
+	Copyright NetFoundry Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+*/
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/DesktopEdge/Views/ItemRenderers/IdentityItem.xaml b/DesktopEdge/Views/ItemRenderers/IdentityItem.xaml
index bb6c9275c..1dfd94c7f 100644
--- a/DesktopEdge/Views/ItemRenderers/IdentityItem.xaml
+++ b/DesktopEdge/Views/ItemRenderers/IdentityItem.xaml
@@ -1,4 +1,19 @@
-<UserControl x:Class="ZitiDesktopEdge.IdentityItem"
+<!--
+	Copyright NetFoundry Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+<UserControl x:Class="ZitiDesktopEdge.IdentityItem"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/DesktopEdge/Views/ItemRenderers/IdentityItem.xaml.cs b/DesktopEdge/Views/ItemRenderers/IdentityItem.xaml.cs
index c09364141..af295c296 100644
--- a/DesktopEdge/Views/ItemRenderers/IdentityItem.xaml.cs
+++ b/DesktopEdge/Views/ItemRenderers/IdentityItem.xaml.cs
@@ -411,10 +411,6 @@ private async void CompleteDefaultExtAuth(object sender, System.Windows.Input.Mo
                             await _identity.PerformExternalAuthEvent(client, defaultProvider);
                         } catch (Exception ex) {
                             logger.Error("external auth failed: [{}]", ex.Message);
-                            // possibly add this back some day. right now this triggers when the ext-auth-url is a valid looking url
-                            // but the url is invalid. for example if the user copy/pastes the proper url without the terminating char
-                            // or http not https etc.
-                            // ShowError("Failed to Authenticate", ex.Message);
                         }
                     }
                 } else {
diff --git a/DesktopEdge/Views/ItemRenderers/MenuEditItem.xaml b/DesktopEdge/Views/ItemRenderers/MenuEditItem.xaml
index c418997de..06c21bd3d 100644
--- a/DesktopEdge/Views/ItemRenderers/MenuEditItem.xaml
+++ b/DesktopEdge/Views/ItemRenderers/MenuEditItem.xaml
@@ -1,4 +1,19 @@
-<UserControl x:Class="ZitiDesktopEdge.MenuEditItem"
+<!--
+	Copyright NetFoundry Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+<UserControl x:Class="ZitiDesktopEdge.MenuEditItem"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
diff --git a/DesktopEdge/Views/ItemRenderers/MenuEditItem.xaml.cs b/DesktopEdge/Views/ItemRenderers/MenuEditItem.xaml.cs
index 657b811d6..51bc30b83 100644
--- a/DesktopEdge/Views/ItemRenderers/MenuEditItem.xaml.cs
+++ b/DesktopEdge/Views/ItemRenderers/MenuEditItem.xaml.cs
@@ -1,4 +1,19 @@
-using System;
+/*
+	Copyright NetFoundry Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+*/
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/DesktopEdge/Views/ItemRenderers/MenuEditSearch.xaml b/DesktopEdge/Views/ItemRenderers/MenuEditSearch.xaml
index 02d1bc3fa..3afcae2d1 100644
--- a/DesktopEdge/Views/ItemRenderers/MenuEditSearch.xaml
+++ b/DesktopEdge/Views/ItemRenderers/MenuEditSearch.xaml
@@ -1,4 +1,19 @@
-<UserControl x:Class="ZitiDesktopEdge.MenuEditSearch"
+<!--
+	Copyright NetFoundry Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+<UserControl x:Class="ZitiDesktopEdge.MenuEditSearch"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
diff --git a/DesktopEdge/Views/ItemRenderers/MenuEditSearch.xaml.cs b/DesktopEdge/Views/ItemRenderers/MenuEditSearch.xaml.cs
index 06a5bb972..079034d62 100644
--- a/DesktopEdge/Views/ItemRenderers/MenuEditSearch.xaml.cs
+++ b/DesktopEdge/Views/ItemRenderers/MenuEditSearch.xaml.cs
@@ -1,4 +1,19 @@
-using System;
+/*
+	Copyright NetFoundry Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+*/
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/DesktopEdge/Views/ItemRenderers/MenuEditToggle.xaml b/DesktopEdge/Views/ItemRenderers/MenuEditToggle.xaml
index 6b54ca421..6f435bfc0 100644
--- a/DesktopEdge/Views/ItemRenderers/MenuEditToggle.xaml
+++ b/DesktopEdge/Views/ItemRenderers/MenuEditToggle.xaml
@@ -1,4 +1,19 @@
-<UserControl x:Class="ZitiDesktopEdge.MenuEditToggle"
+<!--
+	Copyright NetFoundry Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+<UserControl x:Class="ZitiDesktopEdge.MenuEditToggle"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
diff --git a/DesktopEdge/Views/ItemRenderers/MenuEditToggle.xaml.cs b/DesktopEdge/Views/ItemRenderers/MenuEditToggle.xaml.cs
index 31795893f..7e59646fc 100644
--- a/DesktopEdge/Views/ItemRenderers/MenuEditToggle.xaml.cs
+++ b/DesktopEdge/Views/ItemRenderers/MenuEditToggle.xaml.cs
@@ -1,4 +1,19 @@
-using System;
+/*
+	Copyright NetFoundry Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+*/
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/DesktopEdge/Views/ItemRenderers/MenuIdentityItem.xaml b/DesktopEdge/Views/ItemRenderers/MenuIdentityItem.xaml
index b9bb4717a..540b09efb 100644
--- a/DesktopEdge/Views/ItemRenderers/MenuIdentityItem.xaml
+++ b/DesktopEdge/Views/ItemRenderers/MenuIdentityItem.xaml
@@ -1,4 +1,19 @@
-<UserControl x:Class="ZitiDesktopEdge.MenuIdentityItem"
+<!--
+	Copyright NetFoundry Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+<UserControl x:Class="ZitiDesktopEdge.MenuIdentityItem"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
diff --git a/DesktopEdge/Views/ItemRenderers/MenuIdentityItem.xaml.cs b/DesktopEdge/Views/ItemRenderers/MenuIdentityItem.xaml.cs
index d8f3e30c1..37f1335d4 100644
--- a/DesktopEdge/Views/ItemRenderers/MenuIdentityItem.xaml.cs
+++ b/DesktopEdge/Views/ItemRenderers/MenuIdentityItem.xaml.cs
@@ -1,4 +1,19 @@
-using System;
+/*
+	Copyright NetFoundry Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+*/
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/DesktopEdge/Views/ItemRenderers/MenuItem.xaml b/DesktopEdge/Views/ItemRenderers/MenuItem.xaml
index ad7f59b30..6c7cc6caa 100644
--- a/DesktopEdge/Views/ItemRenderers/MenuItem.xaml
+++ b/DesktopEdge/Views/ItemRenderers/MenuItem.xaml
@@ -1,4 +1,19 @@
-<UserControl x:Class="ZitiDesktopEdge.OZMenuItem"
+<!--
+	Copyright NetFoundry Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+<UserControl x:Class="ZitiDesktopEdge.OZMenuItem"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
diff --git a/DesktopEdge/Views/ItemRenderers/MenuItem.xaml.cs b/DesktopEdge/Views/ItemRenderers/MenuItem.xaml.cs
index 1b5fdb6d5..02cc34ffc 100644
--- a/DesktopEdge/Views/ItemRenderers/MenuItem.xaml.cs
+++ b/DesktopEdge/Views/ItemRenderers/MenuItem.xaml.cs
@@ -1,4 +1,19 @@
-using System;
+/*
+	Copyright NetFoundry Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+*/
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/DesktopEdge/Views/ItemRenderers/SubMenuItem.xaml b/DesktopEdge/Views/ItemRenderers/SubMenuItem.xaml
index 540283844..695b85a23 100644
--- a/DesktopEdge/Views/ItemRenderers/SubMenuItem.xaml
+++ b/DesktopEdge/Views/ItemRenderers/SubMenuItem.xaml
@@ -1,4 +1,19 @@
-<UserControl x:Class="ZitiDesktopEdge.SubMenuItem"
+<!--
+	Copyright NetFoundry Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+<UserControl x:Class="ZitiDesktopEdge.SubMenuItem"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -45,4 +60,3 @@
         </StackPanel>
     </Grid>
 </UserControl>
- 
\ No newline at end of file
diff --git a/DesktopEdge/Views/ItemRenderers/SubMenuItem.xaml.cs b/DesktopEdge/Views/ItemRenderers/SubMenuItem.xaml.cs
index a9c1f3794..a78f39349 100644
--- a/DesktopEdge/Views/ItemRenderers/SubMenuItem.xaml.cs
+++ b/DesktopEdge/Views/ItemRenderers/SubMenuItem.xaml.cs
@@ -1,4 +1,19 @@
-using System;
+/*
+	Copyright NetFoundry Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+*/
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/DesktopEdge/Views/ItemRenderers/SubOptionItem.xaml b/DesktopEdge/Views/ItemRenderers/SubOptionItem.xaml
index 070882562..b4d200f11 100644
--- a/DesktopEdge/Views/ItemRenderers/SubOptionItem.xaml
+++ b/DesktopEdge/Views/ItemRenderers/SubOptionItem.xaml
@@ -1,4 +1,19 @@
-<UserControl x:Class="ZitiDesktopEdge.SubOptionItem"
+<!--
+	Copyright NetFoundry Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+<UserControl x:Class="ZitiDesktopEdge.SubOptionItem"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -45,4 +60,3 @@
         </StackPanel>
     </Grid>
 </UserControl>
- 
\ No newline at end of file
diff --git a/DesktopEdge/Views/ItemRenderers/SubOptionItem.xaml.cs b/DesktopEdge/Views/ItemRenderers/SubOptionItem.xaml.cs
index b567804e9..cd9fa6387 100644
--- a/DesktopEdge/Views/ItemRenderers/SubOptionItem.xaml.cs
+++ b/DesktopEdge/Views/ItemRenderers/SubOptionItem.xaml.cs
@@ -1,4 +1,19 @@
-using System;
+/*
+	Copyright NetFoundry Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+*/
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/DesktopEdge/Views/Screens/CommonDelegates.cs b/DesktopEdge/Views/Screens/CommonDelegates.cs
index d7185c413..ff71424ae 100644
--- a/DesktopEdge/Views/Screens/CommonDelegates.cs
+++ b/DesktopEdge/Views/Screens/CommonDelegates.cs
@@ -1,4 +1,19 @@
-using System;
+/*
+	Copyright NetFoundry Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+*/
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Globalization;
diff --git a/DesktopEdge/Views/Screens/Debugging.xaml b/DesktopEdge/Views/Screens/Debugging.xaml
index e84a7a93c..adca8ae5b 100644
--- a/DesktopEdge/Views/Screens/Debugging.xaml
+++ b/DesktopEdge/Views/Screens/Debugging.xaml
@@ -1,4 +1,19 @@
-<UserControl x:Class="Ziti.Desktop.Edge.Views.Screens.Debugging"
+<!--
+	Copyright NetFoundry Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+<UserControl x:Class="Ziti.Desktop.Edge.Views.Screens.Debugging"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
diff --git a/DesktopEdge/Views/Screens/IdentityDetails.xaml b/DesktopEdge/Views/Screens/IdentityDetails.xaml
index c0394b0a2..df04ff171 100644
--- a/DesktopEdge/Views/Screens/IdentityDetails.xaml
+++ b/DesktopEdge/Views/Screens/IdentityDetails.xaml
@@ -1,4 +1,19 @@
-<UserControl x:Class="ZitiDesktopEdge.IdentityDetails"
+<!--
+	Copyright NetFoundry Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+<UserControl x:Class="ZitiDesktopEdge.IdentityDetails"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
diff --git a/DesktopEdge/Views/Screens/MFAScreen.xaml b/DesktopEdge/Views/Screens/MFAScreen.xaml
index 7e1836387..f94892316 100644
--- a/DesktopEdge/Views/Screens/MFAScreen.xaml
+++ b/DesktopEdge/Views/Screens/MFAScreen.xaml
@@ -1,4 +1,19 @@
-<UserControl x:Class="ZitiDesktopEdge.MFAScreen"
+<!--
+	Copyright NetFoundry Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+<UserControl x:Class="ZitiDesktopEdge.MFAScreen"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/DesktopEdge/Views/Screens/MainMenu.xaml b/DesktopEdge/Views/Screens/MainMenu.xaml
index 9e23e0756..a6112aae5 100644
--- a/DesktopEdge/Views/Screens/MainMenu.xaml
+++ b/DesktopEdge/Views/Screens/MainMenu.xaml
@@ -1,4 +1,19 @@
-<UserControl x:Class="ZitiDesktopEdge.MainMenu"
+<!--
+	Copyright NetFoundry Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+<UserControl x:Class="ZitiDesktopEdge.MainMenu"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/Installer/build.ps1 b/Installer/build.ps1
index 17803806d..a5b2999b2 100644
--- a/Installer/build.ps1
+++ b/Installer/build.ps1
@@ -28,7 +28,7 @@ $ADV_INST_HOME = "C:\Program Files (x86)\Caphyon\Advanced Installer ${ADV_INST_V
 $SIGNTOOL="${ADV_INST_HOME}\third-party\winsdk\x64\signtool.exe"
 $ADVINST = "${ADV_INST_HOME}\bin\x86\AdvancedInstaller.com"
 $ADVPROJECT = "${scriptPath}\ZitiDesktopEdge.aip"
-$ZITI_EDGE_TUNNEL_VERSION="v1.5.0"
+$ZITI_EDGE_TUNNEL_VERSION="v1.5.1"
 
 echo "Cleaning previous build folder if it exists"
 Remove-Item "${buildPath}" -r -ErrorAction Ignore
diff --git a/release-notes.md b/release-notes.md
index de2a7fe6a..7246c8bfa 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -12,7 +12,7 @@ Bug fixes
 * jwt with invalid content no longer crashes the UI
 
 ## Dependencies
-* ziti-tunneler: v1.5.0
+* ziti-tunneler: v1.5.1
 * ziti-sdk:      1.5.0
 * tlsuv:         v0.33.6[OpenSSL 3.3.1 4 Jun 2024]
 
diff --git a/release-streams/beta.json b/release-streams/beta.json
index 78eff8c03..ea91355b7 100644
--- a/release-streams/beta.json
+++ b/release-streams/beta.json
@@ -1,7 +1,7 @@
 {
   "name": "2.6.0.0",
   "tag_name": "2.6.0.0",
-  "published_at": "2025-03-03T14:28:24Z",
+  "published_at": "2025-03-05T05:43:04Z",
   "installation_critical": false,
   "assets": [
     {