diff --git a/TODO.md b/TODO.md
index b3ea1086..c2fc90cd 100644
--- a/TODO.md
+++ b/TODO.md
@@ -19,6 +19,11 @@
 
 |Name|GitHub issue|Component(s)|Priority|
 |---|---|---|---|
+|Add custom connection|N/A|Core, GUI|High|
+|Export known hosts|N/A|Core, GUI|High|
+|Rewrite download peristence|167|Core|High|
+|Redesign options window|N/A|GUI|Medium|
+|Free space check before dnwnload|N/A|Core, GUI|Medium|
 |"Edit File Details" frame|N/A|GUI|High|
 |Fix reproducible build on Windows| N/A| Build scripts | Low|
 |Option to disable saving of search tabs| N/A | GUI | Medium |
@@ -26,12 +31,10 @@
 |Mark collections as inconsistent if file missing/unshared | 70? | GUI | Low|
 |Magic tree expansion + expand fully in collection view | 70 | GUI | Low |
 |Text on collections wizard is squished in GTK | N/A | GUI | Medium |
-|Make sure file exists on server before sharing | N/A | Plugin | Low |
 |Create shortcuts optional in windows installer | N/A | Installers | Medium |
 |Bloom filters| N/A | Network, Core | Optional |
 |Two-tier topology | N/A | Network, Core | Optional |
 |Pings with bloom filter | N/A | Network, Core | Optional |
-|Rewrite of javascript to enable strictest CSP policy | N/A | Plugin | Blocker |
 |Metadata parsing and search | N/A | Core, Network? | Optional |
 |Automatic adjustment of I2P tunnels | N/A | Core | Optional |
 |Option to share contact list only with trusted users | N/A | Core, GUI|, Low |
@@ -41,9 +44,9 @@
 |Chat - enforce # in room names | N/A | GUI | Low |
 |Chat - jump from notification window to room | N/A | GUI | Optional |
 |Chat - emoji support | 113 | GUI | Low |
+|Chat - save chat history | N/A | GUI | Low |
 |I2P Status panel for external router | N/A | GUI | Low |
 |Option to disable switching of tabs on actions | N/A | GUI | Low |
-|HTML 5 media players | N/A | Plugin | Optional |
 |Ability to change language after install| 109 | GUI | Medium |
 |On-demand browse host|104|Network, Core, GUI | Low |
 |Diacritics-insensitive filtering | 103 | GUI | Low |