diff --git a/.flipcorg/gallery/5.png b/.flipcorg/gallery/5.png
new file mode 100644
index 00000000000..e6a4b3e82d9
Binary files /dev/null and b/.flipcorg/gallery/5.png differ
diff --git a/.flipcorg/gallery/6.png b/.flipcorg/gallery/6.png
new file mode 100644
index 00000000000..ee00e7337d7
Binary files /dev/null and b/.flipcorg/gallery/6.png differ
diff --git a/.flipcorg/gallery/7.png b/.flipcorg/gallery/7.png
new file mode 100644
index 00000000000..09b572f0ecc
Binary files /dev/null and b/.flipcorg/gallery/7.png differ
diff --git a/.ofwcatalog/CHANGELOG.md b/.ofwcatalog/CHANGELOG.md
index bb649f59d79..e344a34a7ac 100644
--- a/.ofwcatalog/CHANGELOG.md
+++ b/.ofwcatalog/CHANGELOG.md
@@ -1,46 +1,46 @@
 # Changelog
 
-## [v2.3.0](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v2.3.0) - 18 Jul 2023
+## v2.3.0 - 18 Jul 2023
 
 * Implemented [#165](https://github.com/akopachov/flipper-zero_authenticator/issues/165)
 * Just a bit of refactoring
 
 
-## [v2.2.3](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v2.2.3) - 10 Jul 2023
+## v2.2.3 - 10 Jul 2023
 
 * Refactoring [#162](https://github.com/akopachov/flipper-zero_authenticator/issues/158) 
 * Updated repo to match [OFW catalog](https://github.com/flipperdevices/flipper-application-catalog/) requirements
 
 
-## [v2.2.2](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v2.2.2) - 19 Jun 2023
+## v2.2.2 - 19 Jun 2023
 
 * Fixed [#158](https://github.com/akopachov/flipper-zero_authenticator/issues/158) 
 * Cosmetic refactoring
 
 
 
-## [v2.2.1](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v2.2.1) - 06 Jun 2023
+## v2.2.1 - 06 Jun 2023
 
 * Fixed [#155](https://github.com/akopachov/flipper-zero_authenticator/issues/155) 
 * Refactoring
 
 
 
-## [v2.2.0](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v2.2.0) - 05 Jun 2023
+## v2.2.0 - 05 Jun 2023
 
 * Fixed [#153](https://github.com/akopachov/flipper-zero_authenticator/issues/153) 
 * Updated firmware submodules
 
 
 
-## [v2.1.1](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v2.1.1) - 30 May 2023
+## v2.1.1 - 30 May 2023
 
 * Updated firmware submodules
 * Added some new fonts for supporters 
 
 
 
-## [v2.1.0](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v2.1.0) - 24 May 2023
+## v2.1.0 - 24 May 2023
 
 * Implemented [#148](https://github.com/akopachov/flipper-zero_authenticator/issues/148) 
 * 🧹 Refactoring
@@ -48,20 +48,20 @@
 
 
 
-## [v2.0.3](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v2.0.3) - 29 Apr 2023
+## v2.0.3 - 29 Apr 2023
 
 * Fixed [#146](https://github.com/akopachov/flipper-zero_authenticator/issues/146) 
 * Updated firmware references
 
 
 
-## [v2.0.2](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v2.0.2) - 28 Apr 2023
+## v2.0.2 - 28 Apr 2023
 
 * Refactoring & minor improvements
 
 
 
-## [v2.0.1](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v2.0.1) - 26 Apr 2023
+## v2.0.1 - 26 Apr 2023
 
 * Fixed few bugs I found during day 1 of v2.0.0
 * Refactoring
@@ -69,7 +69,7 @@
 
 
 
-## [v2.0.0](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v2.0.0) - 25 Apr 2023
+## v2.0.0 - 25 Apr 2023
 
 * Reworked token list to make app work smooth with bigger lists of tokens. So right now you can add as much tokens as you need.
 * Improved token list operations to make them more reliable
@@ -78,53 +78,53 @@
 
 
 
-## [v1.9.2](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v1.9.2) - 13 Apr 2023
+## v1.9.2 - 13 Apr 2023
 
 * Updated firmware submodules
 
 
 
-## [v1.9.1](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v1.9.1) - 13 Apr 2023
+## v1.9.1 - 13 Apr 2023
 
 * Improved TOTP code rendering method
 * Added "--clean" flag to custom FBT
 
 
 
-## [v1.9.0](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v1.9.0) - 12 Apr 2023
+## v1.9.0 - 12 Apr 2023
 
 * Moved token generation into separate thread
 * Refactoring and code cleanup
 
 
 
-## [v1.8.8](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v1.8.8) - 11 Apr 2023
+## v1.8.8 - 11 Apr 2023
 
 * Xtreme: fixed BT name length according to latest XFW changes (by [@Willy-JL](https://github.com/Willy-JL))
 * Updated firmware submodules
 
 
 
-## [v1.8.7](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v1.8.7) - 07 Apr 2023
+## v1.8.7 - 07 Apr 2023
 
 * Backup conf file before running "totp pin set" and "totp pin remove" CLI commands ([#123](https://github.com/akopachov/flipper-zero_authenticator/issues/123))
 * Some refactoring ([#120](https://github.com/akopachov/flipper-zero_authenticator/issues/120))
 
 
 
-## [v1.8.6](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v1.8.6) - 06 Apr 2023
+## v1.8.6 - 06 Apr 2023
 
 * Updated firmware submodules [#118](https://github.com/akopachov/flipper-zero_authenticator/issues/118) 
 
 
 
-## [v1.8.5](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v1.8.5) - 05 Apr 2023
+## v1.8.5 - 05 Apr 2023
 
 * Fixed [#116](https://github.com/akopachov/flipper-zero_authenticator/issues/116) 
 
 
 
-## [v1.8.4](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v1.8.4) - 05 Apr 2023
+## v1.8.4 - 05 Apr 2023
 
 * Added Steam guard token support ([#111](https://github.com/akopachov/flipper-zero_authenticator/issues/111))
 * Added Base64-encoded token support
@@ -133,20 +133,20 @@
 
 
 
-## [v1.8.3](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v1.8.3) - 03 Apr 2023
+## v1.8.3 - 03 Apr 2023
 
 * Build artifact for [Xtreme](https://github.com/ClaraCrazy/Flipper-Xtreme) firmware ([#113](https://github.com/akopachov/flipper-zero_authenticator/issues/113))
 * Xtreme: custom BT name & MAC which should resolve [#98](https://github.com/akopachov/flipper-zero_authenticator/issues/98)
 
 
 
-## [v1.8.2](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v1.8.2) - 31 Mar 2023
+## v1.8.2 - 31 Mar 2023
 
 * Implemented [#106](https://github.com/akopachov/flipper-zero_authenticator/issues/106) 
 
 
 
-## [v1.8.1](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v1.8.1) - 31 Mar 2023
+## v1.8.1 - 31 Mar 2023
 
 * Implemented [#102](https://github.com/akopachov/flipper-zero_authenticator/issues/102) 
 * Implemented [#103](https://github.com/akopachov/flipper-zero_authenticator/issues/103) 
@@ -155,7 +155,7 @@
 
 
 
-## [v1.8.0](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v1.8.0) - 30 Mar 2023
+## v1.8.0 - 30 Mar 2023
 
 * Implemented [#95](https://github.com/akopachov/flipper-zero_authenticator/issues/95) 
 * New CLI commands "totp update", "totp lsattr"
@@ -163,33 +163,33 @@
 
 
 
-## [v1.7.1](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v1.7.1) - 22 Mar 2023
+## v1.7.1 - 22 Mar 2023
 
 * Updated firmware submodules
 
 
 
-## [v1.7.0](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v1.7.0) - 21 Mar 2023
+## v1.7.0 - 21 Mar 2023
 
 * Implemented [#89](https://github.com/akopachov/flipper-zero_authenticator/issues/89) 
 * Refactoring
 
 
 
-## [v1.6.5](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v1.6.5) - 09 Mar 2023
+## v1.6.5 - 09 Mar 2023
 
 * Updated firmware references
 * Updated code to make it compatible with latest firmware changes
 
 
 
-## [v1.6.4](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v1.6.4) - 01 Mar 2023
+## v1.6.4 - 01 Mar 2023
 
 * Updated firmware references
 
 
 
-## [v1.6.3](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v1.6.3) - 16 Feb 2023
+## v1.6.3 - 16 Feb 2023
 
 * Fixed [#76](https://github.com/akopachov/flipper-zero_authenticator/issues/76) 
 * Fixed [#77](https://github.com/akopachov/flipper-zero_authenticator/issues/77)
@@ -198,51 +198,51 @@
 
 
 
-## [v1.6.2](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v1.6.2) - 13 Feb 2023
+## v1.6.2 - 13 Feb 2023
 
 * Updated submodules to make app compatible with latest firmware
 * Cosmetic code changes
 
 
 
-## [v1.6.1](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v1.6.1) - 07 Feb 2023
+## v1.6.1 - 07 Feb 2023
 
 * Implemented [#70](https://github.com/akopachov/flipper-zero_authenticator/issues/70) 
 
 
 
-## [v1.6.0](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v1.6.0) - 18 Jan 2023
+## v1.6.0 - 18 Jan 2023
 
 * Implemented [#65](https://github.com/akopachov/flipper-zero_authenticator/issues/65) 
 
 
 
-## [v1.5.6](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v1.5.6) - 09 Jan 2023
+## v1.5.6 - 09 Jan 2023
 
 * Updated firmwares
 
 
 
-## [v1.5.5](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v1.5.5) - 04 Jan 2023
+## v1.5.5 - 04 Jan 2023
 
 * Implemented [#58](https://github.com/akopachov/flipper-zero_authenticator/issues/58) 
 * A bit of refactoring
 
 
 
-## [v1.5.4](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v1.5.4) - 02 Jan 2023
+## v1.5.4 - 02 Jan 2023
 
 * Fixed [#53](https://github.com/akopachov/flipper-zero_authenticator/issues/53) 
 
 
 
-## [v1.5.3](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v1.5.3) - 30 Dec 2022
+## v1.5.3 - 30 Dec 2022
 
 * Fixed [#51](https://github.com/akopachov/flipper-zero_authenticator/issues/51) 
 
 
 
-## [v1.5.2](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v1.5.2) - 21 Dec 2022
+## v1.5.2 - 21 Dec 2022
 
 * Config file moved to "/ext/authenticator/totp.conf"
 * Improved the way how config file is getting handled
@@ -250,34 +250,34 @@
 
 
 
-## [v1.5.1](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v1.5.1) - 01 Dec 2022
+## v1.5.1 - 01 Dec 2022
 
 * Implemented [#44](https://github.com/akopachov/flipper-zero_authenticator/issues/44) to be compatible with latest API changes
 
 
 
-## [v1.5.0](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v1.5.0) - 23 Nov 2022
+## v1.5.0 - 23 Nov 2022
 
 * Implemented [#36](https://github.com/akopachov/flipper-zero_authenticator/issues/36) 
 * Refactoring
 
 
 
-## [v1.4.0](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v1.4.0) - 21 Nov 2022
+## v1.4.0 - 21 Nov 2022
 
 * Implemented [#10](https://github.com/akopachov/flipper-zero_authenticator/issues/10) 
 * Refactoring
 
 
 
-## [v1.3.1](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v1.3.1) - 18 Nov 2022
+## v1.3.1 - 18 Nov 2022
 
 * Implemented [#30](https://github.com/akopachov/flipper-zero_authenticator/issues/30) 
 * Cosmetic improvements
 
 
 
-## [v1.3.0](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v1.3.0) - 17 Nov 2022
+## v1.3.0 - 17 Nov 2022
 
 * Implemented [#26](https://github.com/akopachov/flipper-zero_authenticator/issues/26) 
 * Implemented [#28](https://github.com/akopachov/flipper-zero_authenticator/issues/28) 
@@ -287,20 +287,20 @@
 
 
 
-## [v1.2.1](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v1.2.1) - 10 Nov 2022
+## v1.2.1 - 10 Nov 2022
 
 * Fixed [#24](https://github.com/akopachov/flipper-zero_authenticator/issues/24)
 * Small improvement to the USB mode restore code
 
 
 
-## [v1.2.0](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v1.2.0) - 10 Nov 2022
+## v1.2.0 - 10 Nov 2022
 
 * Implemented [#21](https://github.com/akopachov/flipper-zero_authenticator/issues/21) 
 
 
 
-## [v1.1.2](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v1.1.2) - 07 Nov 2022
+## v1.1.2 - 07 Nov 2022
 
 * Integrated PVS Studio scanner and fixed all its complains
 * Updated firmwares
@@ -310,7 +310,7 @@
 
 
 
-## [v1.1.1](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v1.1.1) - 02 Nov 2022
+## v1.1.1 - 02 Nov 2022
 
 * Latest firmwares
 * Refactoring
@@ -318,7 +318,7 @@
 
 
 
-## [v1.1.0](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v1.1.0) - 26 Oct 2022
+## v1.1.0 - 26 Oct 2022
 
 * CLI added (thanks to [@br0ziliy](https://github.com/br0ziliy)). [#11](https://github.com/akopachov/flipper-zero_authenticator/issues/11) 
 * Updated firmware submodules to latest
@@ -326,14 +326,14 @@
 
 
 
-## [v1.0.1](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v1.0.1) - 21 Oct 2022
+## v1.0.1 - 21 Oct 2022
 
 * Fixed issue [#8](https://github.com/akopachov/flipper-zero_authenticator/issues/8) 
 * Refactoring
 
 
 
-## [v1.0.0](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v1.0.0) - 17 Oct 2022
+## v1.0.0 - 17 Oct 2022
 
 * Made PIN optional
 * Submodules updated
@@ -342,7 +342,7 @@
 
 
 
-## [v0.0.6](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v0.0.6) - 13 Oct 2022
+## v0.0.6 - 13 Oct 2022
 
 * Added timezone configuration UI
 * Removed CLI app POC
@@ -350,14 +350,14 @@
 
 
 
-## [v0.0.5](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v0.0.5) - 10 Oct 2022
+## v0.0.5 - 10 Oct 2022
 
 * Separate builds for Official and Unleashed firmwares
 * Updated code to FuriString
 
 
 
-## [v0.0.4](https://github.com/akopachov/flipper-zero_authenticator/releases/tag/v0.0.4) - 05 Oct 2022
+## v0.0.4 - 05 Oct 2022
 
 * Moved TOTP app to separate folder to segregate it from flipper_firmware code and make it clearer
 * Code refactoring
diff --git a/.ofwcatalog/DESCRIPTION.md b/.ofwcatalog/DESCRIPTION.md
index 98ca97773a8..fa5b44fbc2e 100644
--- a/.ofwcatalog/DESCRIPTION.md
+++ b/.ofwcatalog/DESCRIPTION.md
@@ -1,7 +1,3 @@
-# Flipper Authenticator
-
-## Description
-
 Flipper Authenticator is a software-based authenticator that implements two-step verification services using the Time-based One-time Password (TOTP; specified in [RFC 6238](https://www.rfc-editor.org/rfc/rfc6238)) and HMAC-based One-time Password algorithm.
 
 It is like [Google Authenticator](https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2), but for [Flipper Zero](https://flipperzero.one/) device.