diff --git a/.gitignore b/.gitignore
index debc383..73a00b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,102 +1,16 @@
-
-TightWiki/bin/
-
-TightWiki/obj/
-
 *.user
-
-TightWiki.Library/obj/
-
 .vs/
-
-TightWiki.Library/bin/
-
 DatabaseMigration/bin/
-
 DatabaseMigration/obj/
-
-TightWiki.DataModel/bin/
-
-TightWiki.DataModel/obj/
-
-TightWiki.Shared/bin/
-
-TightWiki.Shared/obj/
-
-TightWiki.Repository/bin/
-
-TightWiki.Repository/obj/
-
 Mssql2Sqlite/bin/
-
 Mssql2Sqlite/obj/
-
-TightWiki.Caching/bin/
-
-TightWiki.Caching/obj/
-
-TightWiki.Configuration/bin/
-
-TightWiki.Configuration/obj/
-
-TightWiki.Email/bin/
-
-TightWiki.Email/obj/
-
-TightWiki.Engine/bin/
-
-TightWiki.Engine/obj/
-
-TightWiki.Interfaces/bin/
-
-TightWiki.Interfaces/obj/
-
-TightWiki.Models/bin/
-
-TightWiki.Models/obj/
-
-TightWiki.Security/bin/
-
-TightWiki.Security/obj/
-
 DummyPageGenerator/bin/
-
 DummyPageGenerator/obj/
-
-TightWiki.Engine.Function/bin/
-
-TightWiki.Engine.Function/obj/
-
 MarkdigTester/
-
-TightWiki.Engine.Types/obj/
-
-TightWiki.Engine.Types/bin/
-
-TightWiki.Engine.Implementation/bin/
-
-TightWiki.Engine.Implementation/obj/
-
-TightWiki.Engine.Factory/bin/
-
-TightWiki.Engine.Factory/obj/
-
-TightWiki.Engine.Function.Handlers/obj/
-
-TightWiki.Engine.Handlers/bin/
-
-TightWiki.Engine.Handlers/obj/
-
-TightWiki.Engine.Library/bin/
-
-TightWiki.Engine.Library/obj/
-
-TightWiki.Wiki/bin/
-
-TightWiki.Wiki/obj/
-
 DumpConfiguration/bin/
-
 DumpConfiguration/obj/
 /ZelWiki/bin
 /ZelWiki/obj
+.idea
+obj
+bin
diff --git a/DummyPageGenerator/PageGenerator.cs b/DummyPageGenerator/PageGenerator.cs
index ba2cf1a..26ca2e0 100644
--- a/DummyPageGenerator/PageGenerator.cs
+++ b/DummyPageGenerator/PageGenerator.cs
@@ -202,7 +202,7 @@ namespace DummyPageGenerator
         /// Creates a random page on the wiki.
         /// </summary>
         /// <param name="userId"></param>
-        public void GeneratePage(ITightEngine engine, Guid userId)
+        public void GeneratePage(IZelEngine engine, Guid userId)
         {
             try
             {
@@ -291,7 +291,7 @@ namespace DummyPageGenerator
         /// Modifies a random page on the wiki.
         /// </summary>
         /// <param name="userId"></param>
-        public void ModifyRandomPages(ITightEngine engine, Guid userId)
+        public void ModifyRandomPages(IZelEngine engine, Guid userId)
         {
             var pageToModify = GetRandomPage();
 
diff --git a/DummyPageGenerator/Program.cs b/DummyPageGenerator/Program.cs
index 36717d2..82d2946 100644
--- a/DummyPageGenerator/Program.cs
+++ b/DummyPageGenerator/Program.cs
@@ -19,7 +19,7 @@ namespace DummyPageGenerator
     {
         public class NoOpCompletionHandler : ICompletionHandler
         {
-            public void Complete(ITightEngineState state)
+            public void Complete(IZelEngineState state)
             {
             }
         }
@@ -50,7 +50,7 @@ namespace DummyPageGenerator
                            containerBuilder.RegisterType<ExceptionHandler>().As<IExceptionHandler>().SingleInstance();
                            containerBuilder.RegisterType<NoOpCompletionHandler>().As<ICompletionHandler>().SingleInstance();
 
-                           containerBuilder.RegisterType<TightEngine>();
+                           containerBuilder.RegisterType<ZelEngine>();
                        }).Build();
 
 
@@ -99,7 +99,7 @@ namespace DummyPageGenerator
                     workload.Enqueue(() =>
                     {
                         using var scope = host.Services.CreateScope();
-                        var engine = scope.ServiceProvider.GetRequiredService<TightEngine>();
+                        var engine = scope.ServiceProvider.GetRequiredService<ZelEngine>();
 
                         //Create a new page:
                         pg.GeneratePage(engine, user.UserId);
diff --git a/ZelWiki/Views/Admin/Metrics.cshtml b/ZelWiki/Views/Admin/Metrics.cshtml
index 185863e..379ea37 100644
--- a/ZelWiki/Views/Admin/Metrics.cshtml
+++ b/ZelWiki/Views/Admin/Metrics.cshtml
@@ -61,7 +61,7 @@
 
     <tr>
         <td><a href="@GlobalConfiguration.BasePath/Admin/Accounts">@Model.Metrics.Users.ToString("N0")</a></td>
-        <td>&nbsp;</a></td>
+        <td>&nbsp;</td>
         <td><a href="@GlobalConfiguration.BasePath/Admin/Exceptions">@Model.Metrics.Exceptions.ToString("N0")</a></td>
         <td>&nbsp;</td>
     </tr>