diff --git a/CHANGELOG.md b/CHANGELOG.md
index 205d0b2..b1b12af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,11 +4,43 @@
 - [ ] Configuration page: Dark mode
 
 ##### Long term
-- See cited posts (if any).
 - Share a tweet.
 - Play tweet videos from Parasitter.
 - Create following lists.
 
+## [0.2.5] - 2020.09.10
+### How to update
+1. `sudo supervisorctl stop yotter`
+2. `cd </path/to>/Yotter`
+3. `git pull`
+4. `source venv/bin/activate`
+5. `pip install -r requirements.txt`
+6. `sudo nano /etc/nginx/sites-enabled/yotter`
+  * Add the following lines right below the `location /static {.....}` block:
+    ```
+      location /videoplayback {
+        proxy_buffering off;
+          resolver 1.1.1.1;
+          proxy_pass https://$arg_hostname;
+          proxy_set_header Host $arg_hostname;
+          add_header Access-Control-Allow-Origin *;
+      }
+    ```
+    
+   > Your `/etc/nginx/sites-enabled/yotter` file should look something [like this](https://bin.nixnet.services/?d319d06feb1f5756#HgsMgpN9kob7vB5GpUtdTtqZeCdb5SEggLzwr4YAaYo).
+7. Edit your `yotter-config.json` file and enable the `nginxVideoStream` option.
+8. `sudo service nginx reload`
+9. `sudo supervisorctl start yotter`
+`
+
+#### Added
+- [x] Nginx video streaming for better experience - [See how to activate it]()
+- [x] New data extractor module for videos.
+- [x] Show deleted tweets as deleted instead of error.
+
+#### Fixed
+- [x] Youtube feed not loading due to datetime not found
+
 ## [0.2.4] - 2020.09.07
 ### Changed
 - [x] Remove non implemented settings from settings page.
diff --git a/README.md b/README.md
index 5da15a4..a6333c4 100644
--- a/README.md
+++ b/README.md
@@ -77,7 +77,7 @@ I always recommend self-hosting, as you will be the only person with access to t
 # Public Instances
 | name |server location|registrations?|
 | ------------ | ------------ | ------------ |
-| https://yotter.xyz  |Germany| Limited (30 users)|
+| https://yotter.xyz  |Germany| Limited (45 users)|
 
 # Self hosting
 
@@ -184,11 +184,14 @@ If you want to set up a Yotter public instance, follow this instructions.
 You will find in the root folder of the project a file named `yotter-config.json`. This is the global config file for the Yotter server.
 
 Currently available config is:
-* **serverName**: Name of the server. It will be shown along the interface.
+* **serverName**: Name of the server. Format: `example.com`
 * **nitterInstance**: Nitter instance that will be used when fetching Twitter content. Format must be `https://<NitterInstance.tld>/`
 * **maxInstanceUsers**: Max users on the instance. When set to `0` it closes registrations.
-* **location**: Location of the server.
+* **serverLocation**: Location of the server.
 * **restrictPublicUsage**: When set to `false` the instance allows non-registered users to use some routes (i.e /watch?v=..., /ytsearch, /channel...). See [this section](https://github.com/pluja/Yotter/blob/dev-indep/SELF-HOSTING.md#removing-log-in-restrictions)
+* **nginxVideoStream**: Wether or not to use Nginx as streaming engine. It is recommended for public instances. [See this link]()
+* **maintenance_mode**: Activates a message on the server warning users of maintenance mode.
+* **show_admin_message**: Shows a message from the admin with title as `admin_message_title` and body as `admin_message`
 
 # Contributing
 Contributors are always welcome. You can help in many ways: Coding, organizing, designing, [donating](#donate), maintaining... You choose what you want to help with!
diff --git a/SELF-HOSTING.md b/SELF-HOSTING.md
index 9df3302..0c99747 100644
--- a/SELF-HOSTING.md
+++ b/SELF-HOSTING.md
@@ -181,9 +181,17 @@ server {
         alias </path/to>/Yotter/app/static;
         expires 30d;
     }
+    
+    location /videoplayback {
+       proxy_buffering off;
+       resolver 1.1.1.1;
+       proxy_pass https://$arg_hostname;
+       proxy_set_header Host $arg_hostname;
+       add_header Access-Control-Allow-Origin *;
+     }
 }
 ```
-Make sure to replace `<yourdomain>` by the domain you are willing to use for your instance (i.e example.com). 
+Make sure to replace `<yourdomain>` by the domain you are willing to use for your instance (i.e example.com). You can now edit `yotter-config.json` and set `nginxVideoStream` to `true`.
 
 You will also need to change the `</path/to>` after `alias` to fit your system. You have to point to the Yotter folder, in this set up it would be `/home/ubuntu` as it is the location where we cloned the Yotter app. This alias is created to handle static files directly, without forwarding to the application.