diff --git a/INSTALLATION.md b/INSTALLATION.md
index da4b7cc..17a60f7 100644
--- a/INSTALLATION.md
+++ b/INSTALLATION.md
@@ -151,3 +151,7 @@ docker-compose pull
 # Start a new container, automatically removes old one
 docker-compose up -d
 ```
+
+## More options 
+
+You can find more options available [here](https://github.com/NicolasConstant/BirdsiteLive/blob/master/VARIABLES.md)
\ No newline at end of file
diff --git a/README.md b/README.md
index 916a8a0..241316e 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ You can find an official (and temporary) instance here: [beta.birdsite.live](htt
 
 ## Installation
 
-I'm providing a [Docker build](https://hub.docker.com/r/nicolasconstant/birdsitelive), to install it on your own server, please follow [those instructions](https://github.com/NicolasConstant/BirdsiteLive/blob/master/INSTALLATION.md).
+I'm providing a [docker build](https://hub.docker.com/r/nicolasconstant/birdsitelive). To install it on your own server, please follow [those instructions](https://github.com/NicolasConstant/BirdsiteLive/blob/master/INSTALLATION.md). More [options](https://github.com/NicolasConstant/BirdsiteLive/blob/master/VARIABLES.md) are also available.
 
 ## License
 
diff --git a/VARIABLES.md b/VARIABLES.md
new file mode 100644
index 0000000..3536069
--- /dev/null
+++ b/VARIABLES.md
@@ -0,0 +1,13 @@
+# Environment variables
+
+You can configure some of BirdsiteLIVE's settings via environment variables (those are optionnals):
+
+## Logging
+
+* `Logging:Type` (default: none) set the type of the logging and monitoring system, currently the only type supported is `insights` for *Azure Application Insights* (PR welcome to support other types)
+* `Logging:InstrumentationKey` the instrumentation key for Azure Application Insights
+
+## Instance customization 
+
+* `Instance:Name` (default: BirdsiteLIVE) the name of the instance
+* `Instance:ResolveMentionsInProfiles` (default: true) to enable or disable mentions parsing in profile's description. Resolving it will consume more User's API calls since newly discovered account can also contain references to others accounts as well. On a big instance it is recommended to disable it.
\ No newline at end of file
diff --git a/src/BirdsiteLive.Common/Settings/InstanceSettings.cs b/src/BirdsiteLive.Common/Settings/InstanceSettings.cs
index 2ce9715..fe303a7 100644
--- a/src/BirdsiteLive.Common/Settings/InstanceSettings.cs
+++ b/src/BirdsiteLive.Common/Settings/InstanceSettings.cs
@@ -2,6 +2,7 @@
 {
     public class InstanceSettings
     {
+        public string Name { get; set; }
         public string Domain { get; set; }
         public string AdminEmail { get; set; }
         public bool ResolveMentionsInProfiles { get; set; }
diff --git a/src/BirdsiteLive.Twitter/Extractors/TweetExtractor.cs b/src/BirdsiteLive.Twitter/Extractors/TweetExtractor.cs
index 1d27ddb..f4bb8d1 100644
--- a/src/BirdsiteLive.Twitter/Extractors/TweetExtractor.cs
+++ b/src/BirdsiteLive.Twitter/Extractors/TweetExtractor.cs
@@ -89,8 +89,8 @@ namespace BirdsiteLive.Twitter.Extractors
             switch (mediaType)
             {
                 case "photo":
-                    var ext = Path.GetExtension(mediaUrl);
-                    switch (ext)
+                    var pExt = Path.GetExtension(mediaUrl);
+                    switch (pExt)
                     {
                         case ".jpg":
                         case ".jpeg":
@@ -101,8 +101,15 @@ namespace BirdsiteLive.Twitter.Extractors
                     return null;
 
                 case "animated_gif":
+                    var vExt = Path.GetExtension(mediaUrl);
+                    switch (vExt)
+                    {
+                        case ".gif":
+                            return "image/gif";
+                        case ".mp4":
+                            return "video/mp4";
+                    }
                     return "image/gif";
-
                 case "video":
                     return "video/mp4";
             }
diff --git a/src/BirdsiteLive/BirdsiteLive.csproj b/src/BirdsiteLive/BirdsiteLive.csproj
index 01e0094..4729487 100644
--- a/src/BirdsiteLive/BirdsiteLive.csproj
+++ b/src/BirdsiteLive/BirdsiteLive.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <UserSecretsId>d21486de-a812-47eb-a419-05682bb68856</UserSecretsId>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <Version>0.10.0</Version>
+    <Version>0.10.1</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BirdsiteLive/Views/Shared/_Layout.cshtml b/src/BirdsiteLive/Views/Shared/_Layout.cshtml
index 5275267..f9f571a 100644
--- a/src/BirdsiteLive/Views/Shared/_Layout.cshtml
+++ b/src/BirdsiteLive/Views/Shared/_Layout.cshtml
@@ -1,9 +1,11 @@
-<!DOCTYPE html>
+@using Microsoft.Extensions.Configuration
+@inject IConfiguration Configuration
+<!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>@ViewData["Title"] - BirdsiteLIVE</title>
+    <title>@Configuration.GetSection("Instance")["Name"] - @ViewData["Title"]</title>
     <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
     <link rel="stylesheet" href="~/css/site.css" />
     <link rel="stylesheet" href="~/css/birdsite.css" />
@@ -12,21 +14,21 @@
     <header>
         <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
             <div class="container">
-                <a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">BirdsiteLIVE</a>
+                <a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">@Configuration.GetSection("Instance")["Name"]</a>
                 @*<button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarSupportedContent"
-                        aria-expanded="false" aria-label="Toggle navigation">
-                    <span class="navbar-toggler-icon"></span>
-                </button>
-                <div class="navbar-collapse collapse d-sm-inline-flex flex-sm-row-reverse">
-                    <ul class="navbar-nav flex-grow-1">
-                        <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Home</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
-                        </li>
-                    </ul>
-                </div>*@
+                            aria-expanded="false" aria-label="Toggle navigation">
+                        <span class="navbar-toggler-icon"></span>
+                    </button>
+                    <div class="navbar-collapse collapse d-sm-inline-flex flex-sm-row-reverse">
+                        <ul class="navbar-nav flex-grow-1">
+                            <li class="nav-item">
+                                <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Home</a>
+                            </li>
+                            <li class="nav-item">
+                                <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
+                            </li>
+                        </ul>
+                    </div>*@
             </div>
         </nav>
     </header>
@@ -36,14 +38,14 @@
         </main>
     </div>
 
-<footer class="border-top footer text-muted">
-    <div class="container">
+    <footer class="border-top footer text-muted">
+        <div class="container">
 
-        <a href="https://github.com/NicolasConstant/BirdsiteLive">Github</a> @*<a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>*@
+            <a href="https://github.com/NicolasConstant/BirdsiteLive">Github</a> @*<a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>*@
 
-        <span style="float: right;">BirdsiteLIVE @System.Reflection.Assembly.GetEntryAssembly().GetName().Version.ToString(3)</span>
-    </div>
-</footer>
+            <span style="float: right;">BirdsiteLIVE @System.Reflection.Assembly.GetEntryAssembly().GetName().Version.ToString(3)</span>
+        </div>
+    </footer>
     <script src="~/lib/jquery/dist/jquery.min.js"></script>
     <script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
     <script src="~/js/site.js" asp-append-version="true"></script>
diff --git a/src/BirdsiteLive/Views/Statistics/Index.cshtml b/src/BirdsiteLive/Views/Statistics/Index.cshtml
index 9a0b536..c3dd57f 100644
--- a/src/BirdsiteLive/Views/Statistics/Index.cshtml
+++ b/src/BirdsiteLive/Views/Statistics/Index.cshtml
@@ -21,8 +21,8 @@
 
 <h4>Mentions Extraction</h4>
 <ul>
-    <li>Current day in descriptions:  @Model.ExtractionStatistics.MentionsInDescriptionsExtraction</li>
-    <li>Current day in statuses: @Model.ExtractionStatistics.MentionsInStatusesExtraction</li>
-    <li>Last day in descriptions: @Model.ExtractionStatistics.LastMentionsInDescriptionsExtraction</li>
-    <li>Last day in statuses: @Model.ExtractionStatistics.LastMentionsInStatusesExtraction</li>
+    <li>In descriptions (current day): @Model.ExtractionStatistics.MentionsInDescriptionsExtraction</li>
+    <li>In statuses (current day): @Model.ExtractionStatistics.MentionsInStatusesExtraction</li>
+    <li>In descriptions (last day): @Model.ExtractionStatistics.LastMentionsInDescriptionsExtraction</li>
+    <li>In statuses (last day): @Model.ExtractionStatistics.LastMentionsInStatusesExtraction</li>
 </ul>
\ No newline at end of file
diff --git a/src/BirdsiteLive/appsettings.json b/src/BirdsiteLive/appsettings.json
index d0c49bf..57bf945 100644
--- a/src/BirdsiteLive/appsettings.json
+++ b/src/BirdsiteLive/appsettings.json
@@ -10,6 +10,7 @@
   },
   "AllowedHosts": "*",
   "Instance": {
+    "Name":  "BirdsiteLIVE",
     "Domain": "domain.name",
     "AdminEmail": "me@domain.name",
     "ResolveMentionsInProfiles": true
diff --git a/src/BirdsiteLive/wwwroot/favicon.ico b/src/BirdsiteLive/wwwroot/favicon.ico
index a3a7999..508b109 100644
Binary files a/src/BirdsiteLive/wwwroot/favicon.ico and b/src/BirdsiteLive/wwwroot/favicon.ico differ