diff --git a/CHANGELOG.md b/CHANGELOG.md
index 616841510..af6341753 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2523,6 +2523,8 @@ Remove /v/ from stable Foolz archive.
 ## v1.7.0 
 *2014-04-06*
 
+Based on v1.5.2. The changes of v1.6.x were completely reverted, except those relisted below.
+
 **Zixaphir** 
 - Reload captcha if there are posts in the queue.
 
@@ -2533,6 +2535,87 @@ Remove /v/ from stable Foolz archive.
 **duckness**
 - Allow disabling upgrade nag message.
 
+### v1.6.1 
+*2014-04-06*
+
+- Restore `Quoted Title` (had been removed in 1.6.0 but option left)
+- Fixed auto-hide permanently hiding the header
+
+## v1.6.0 
+*2014-04-06*
+
+**MayhemYDG**:
+- Thread and post hiding changes:
+ - The posts' menu now has a label entry listing the reasons why a post got hidden or highlighted.
+ - `Thread Hiding` and `Reply Hiding` settings are merged into one: `Post Hiding`.
+ - `Thread Hiding Link` and `Reply Hiding Link` settings are merged into one: `Post Hiding Link`.
+ - Hiding a thread removes it from the index in `Paged` or `All threads` modes.
+ <ul>
+  <li> Hidden threads can be seen by clicking the `[Show]` button the the top of the index.
+  <li> The `Anchor Hidden Threads` setting has been removed.
+ </ul>
+- Added `Image Size` setting for the catalog.
+- Added `Open threads in a new tab` setting for the catalog.
+- Added `board-mode:"type"` and `board-sort:"type"` parameters to custom board navigation.
+- Added OP name/date tooltip in the catalog.
+- Added a keybind to cycle through index sort types, `Ctrl+x` by default.
+- Added keybindings for index modes, `Ctrl+{1,2,3}` by default.
+- `Index Mode` and `Index Sort` have been moved out of the header's menu into the index page.
+- Minor captcha fixes.
+- Backlinks now also get quote markers.
+- Multiple markers are now more compact, for example `>>123 (You/OP)` instead of `>>123 (You) (OP)`.
+- New setting: `Image Hover in Catalog`
+ - Like `Image Hover`, but for the catalog only.
+- Added `Archive link` to the Custom Board Navigation Rice
+- Added a setting to configure the number of threads per page for the paged mode of the index.
+- Dropped support for the official catalog.
+- More index navigation improvements:
+ - Threads in catalog mode have the usual menu.
+ - When in catalog mode, the menu now also allows to pin/unpin threads.
+ - The index will now display how many threads are hidden.
+ - When in catalog mode, you can toggle between hidden/non-hidden threads.
+ - New index mode: `catalog`<br>
+  ![catalog mode](img/1.6.0.png)
+ - When in catalog mode, use `Shift+Click` to hide, and `Alt+Click` to pin threads.
+ - Existing features affect the catalog mode such as:
+ <ul>
+  <li> Filter (hiding, highlighting)
+  <li> Thread Hiding
+  <li> Linkify
+  <li> Thumbnail Replacemenu
+  <li> Image Hover
+ </ul>
+ - Support for the official catalog will be removed in the future, once the catalog mode for the index is deemed satisfactory.
+- Added `Original filename` variable to Sauce panel.
+- Fixed a bug which prevented QR cooldowns from being pruned from storage.
+ - On Chrome, the storage could reach the quota and prevent 4chan X from saving data like QR name/mail or auto-watch for example.
+- Clicking on the border of the Header will not toggle `Header auto-hide` anymore.
+  You can still change the setting in the Header menu &rarr; Header.
+- Bugfixes
+- WebM support fixes.
+
+**Vampiricwulf**
+- Flash embedding and other Flash features.
+
+**Zixaphir** 
+- Update Custom Navigation legend to reflect index mode changes.
+- JSON Navigation now works for backlinks (when Quote Inlining is disabled) and backlink hashlinks.
+- JSON Navigation (Index, Catalog) performance improvements.
+- Added a nifty bread-crumb for the JSON Navigation.
+- Added a return button to the JSON Navigation that will switch you back to non-catalog view (requires NavLinks not to be hidden).
+- Rewrote "Scroll to post quoting you" functionality, solving several small issues with it.
+- Improved Linkifier link detection.
+- Fixed an issue with Thread Updater intervals not saving correctly.
+- Many spiffy performance, state awareness, and sanity improvements to JSON Navigation.
+- Reload captcha if there are posts in the queue.
+
+**ccd0**
+- In v1.5.1, image/video hover was changed to hide and re-use the images/videos to avoid crashes.
+  Fixing bugs caused by this change.
+
+**duckness**
+- Allow disabling upgrade nag message.
+
 ### v1.5.2 
 *2014-04-04*
 
diff --git a/img/1.6.0.png b/img/1.6.0.png
new file mode 100644
index 000000000..c7fe125f4
Binary files /dev/null and b/img/1.6.0.png differ