diff --git a/Toolkit.Foundation.Avalonia/Markups/CompositeExtension.cs b/Toolkit.Foundation.Avalonia/Markups/CompositeExtension.cs
index 1b01e49..f051363 100644
--- a/Toolkit.Foundation.Avalonia/Markups/CompositeExtension.cs
+++ b/Toolkit.Foundation.Avalonia/Markups/CompositeExtension.cs
@@ -1,5 +1,4 @@
 using Avalonia.Markup.Xaml;
-using Kromek.Framework.Avalonia;
 
 namespace Toolkit.Foundation.Avalonia
 {
diff --git a/Toolkit.Foundation.Avalonia/Markups/NavigateExtension.cs b/Toolkit.Foundation.Avalonia/Markups/NavigateExtension.cs
index 02eac98..6d2c29a 100644
--- a/Toolkit.Foundation.Avalonia/Markups/NavigateExtension.cs
+++ b/Toolkit.Foundation.Avalonia/Markups/NavigateExtension.cs
@@ -2,10 +2,6 @@
 using Avalonia.Controls;
 using Avalonia.Data;
 using Avalonia.Markup.Xaml;
-using Kromek.Framework.Core.Extensions;
-using Kromek.Framework.Core;
-using System;
-using System.Collections.Generic;
 
 namespace Toolkit.Foundation.Avalonia
 {
diff --git a/Toolkit.Foundation.Avalonia/Navigation/ContentDialogHandler.cs b/Toolkit.Foundation.Avalonia/Navigation/ContentDialogHandler.cs
index c86e99d..caa7b08 100644
--- a/Toolkit.Foundation.Avalonia/Navigation/ContentDialogHandler.cs
+++ b/Toolkit.Foundation.Avalonia/Navigation/ContentDialogHandler.cs
@@ -1,8 +1,6 @@
 using FluentAvalonia.UI.Controls;
-using Kromek.Framework.Core.Extensions;
-using Toolkit.Foundation.Avalonia;
 
-namespace Kromek.Framework.Avalonia
+namespace Toolkit.Foundation.Avalonia
 {
     public class ContentDialogHandler : NavigationRouteHandler<ContentDialog>
     {
diff --git a/Toolkit.Foundation.Avalonia/Navigation/FrameHandler.cs b/Toolkit.Foundation.Avalonia/Navigation/FrameHandler.cs
index 3df1bcb..b79f2c2 100644
--- a/Toolkit.Foundation.Avalonia/Navigation/FrameHandler.cs
+++ b/Toolkit.Foundation.Avalonia/Navigation/FrameHandler.cs
@@ -1,9 +1,8 @@
 using Avalonia.Controls.Primitives;
 using FluentAvalonia.UI.Controls;
 using FluentAvalonia.UI.Navigation;
-using Toolkit.Foundation.Avalonia;
 
-namespace Kromek.Framework.Avalonia
+namespace Toolkit.Foundation.Avalonia
 {
     public class FrameHandler : NavigationRouteHandler<Frame>
     {
diff --git a/Toolkit.Foundation/Navigation/INavigationConfirmation.cs b/Toolkit.Foundation/Navigation/INavigationConfirmation.cs
index 864cb3e..251d699 100644
--- a/Toolkit.Foundation/Navigation/INavigationConfirmation.cs
+++ b/Toolkit.Foundation/Navigation/INavigationConfirmation.cs
@@ -1,4 +1,4 @@
-namespace Kromek.Framework.Core.Extensions
+namespace Toolkit.Foundation
 {
     public interface INavigationConfirmation
     {
diff --git a/Toolkit.Foundation/Navigation/INavigationConfirmationAsync.cs b/Toolkit.Foundation/Navigation/INavigationConfirmationAsync.cs
index 4a9c6d3..a41f0cb 100644
--- a/Toolkit.Foundation/Navigation/INavigationConfirmationAsync.cs
+++ b/Toolkit.Foundation/Navigation/INavigationConfirmationAsync.cs
@@ -1,5 +1,5 @@
 
-namespace Kromek.Framework.Core.Extensions
+namespace Toolkit.Foundation
 {
     public interface INavigationConfirmationAsync
     {
diff --git a/Toolkit.Foundation/Navigation/IParameter.cs b/Toolkit.Foundation/Navigation/IParameter.cs
index aea666d..07588fa 100644
--- a/Toolkit.Foundation/Navigation/IParameter.cs
+++ b/Toolkit.Foundation/Navigation/IParameter.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace Toolkit.Foundation
+namespace Toolkit.Foundation
 {
     public interface IParameter
     {