diff --git a/Apps/FileBrowser/appfile.json b/Apps/FileBrowser/appfile.json
new file mode 100644
index 0000000..d7db097
--- /dev/null
+++ b/Apps/FileBrowser/appfile.json
@@ -0,0 +1,110 @@
+{
+    "version": "2.0",
+    "title": "FileBrowser",
+    "name": "filebrowser",
+    "icon": "https://cdn.jsdelivr.net/gh/IceWhaleTech/CasaOS-AppStore@main/Apps/FileBrowser/icon.png",
+    "tagline": "Upload, delete, preview, rename, edit and share your files.",
+    "overview": "File Browser - Webbased File Browser including sharing functions etc.",
+    "thumbnail": "https://cdn.jsdelivr.net/gh/IceWhaleTech/CasaOS-AppStore@main/Apps/FileBrowser/thumbnail.png",
+    "screenshots": [
+        "https://cdn.jsdelivr.net/gh/IceWhaleTech/CasaOS-AppStore@main/Apps/FileBrowser/snapshot-1.gif",
+        "https://cdn.jsdelivr.net/gh/IceWhaleTech/CasaOS-AppStore@main/Apps/FileBrowser/snapshot-2.png",
+        "https://cdn.jsdelivr.net/gh/IceWhaleTech/CasaOS-AppStore@main/Apps/FileBrowser/snapshot-3.png"
+    ],
+    "category": [
+        "Cloud",
+        "Utilities",
+        "Documents"
+    ],
+    "author":{
+        "name": "CasaOS Team",
+        "role": "Adaptor",
+        "website": "https://www.casaos.io",
+        "donate_text": "",
+        "donate_link": ""
+    },
+    "support": "https://discord.gg/knqAbbBbeX",
+    "website": "https://www.casaos.io",
+    "container": {
+        "image": "filebrowser/filebrowser:latest",
+        "shell": "sh",
+        "privileged": false,
+        "network_model": "bridge",
+        "webui": {
+            "http": "80",
+            "path": "/"
+        },
+        "envs": [
+            {
+                "key": "TZ",
+                "value": "$TZ",
+                "description": "TimeZone",
+                "configurable": "no"
+            },
+            {
+                "key": "PUID",
+                "value": "$PUID",
+                "description": "Run FileBrowser as specified uid.",
+                "configurable": "no"
+            },
+            {
+                "key": "PGID",
+                "value": "$PGID",
+                "description": "Run FileBrowser as specified gid.",
+                "configurable": "no"
+            }
+        ],
+        "ports": [
+            {
+                "container": "80",
+                "host": "1080",
+                "description": "WebUI Port",
+                "type": "tcp",
+                "allocation": "automatic",
+                "configurable": "advanced"
+            }
+        ],
+        "volumes": [
+            {
+                "container": "/db",
+                "host": "$AppData/db",
+                "mode": "rw",
+                "allocation": "auto",
+                "configurable": "no",
+                "description": "FileBrowser database directory."
+            },
+            {
+                "container": "/srv",
+                "host": "$DATA",
+                "mode": "rw",
+                "allocation": "auto",
+                "configurable": "advanced",
+                "description": "FileBrowser managed directory."
+            }
+        ],
+        "devices": [],
+        "constraints": {
+            "min_memery": "64",
+            "min_storage": "128"
+        },
+        "restart_policy": "always",
+        "sysctls": [],
+        "cap_add": {},
+        "labels": []
+    },
+    "abilities": {
+        "notification": false,
+        "widgets": false,
+        "authentication": false,
+        "search": false,
+        "upnp": false
+    },
+    "tips": {
+        "before_install": "Default Account</br>Username:<span style='color:red'>admin</span></br>Password:<span style='color:red'>admin</span>"
+    },
+    "changelog":{
+        "latest_updates": "",
+        "url": "https://cdn.jsdelivr.net/gh/IceWhaleTech/CasaOS-AppStore@main/Apps/FileBrowser/changelog.txt"
+    },
+    "latest_update_date": "1640072737"
+}
\ No newline at end of file
diff --git a/Apps/FileBrowser/changelog.txt b/Apps/FileBrowser/changelog.txt
new file mode 100644
index 0000000..588d6e0
--- /dev/null
+++ b/Apps/FileBrowser/changelog.txt
@@ -0,0 +1,261 @@
+2.20.1 (2021-12-21)
+Build
+revert to using the default alpine based docker image (46d8046)
+
+2.20.0 (2021-12-20)
+Features
+detect multiple subtitle languages (#1723) (c2e03bb)
+use linuxserver based docker image (b8f35ce)
+Bug Fixes
+set correct default database path in the config (988d3e5)
+upgrade vulnerable versions of the library (6eb3ab0)
+Build
+refactor makefile (f81857a)
+remove deprecated goreleaser use_buildx param (4d1b9dd)
+
+2.19.0 (2021-11-24)
+Features
+prefetch previous and next images in preview. (#1627) (7401d16)
+Bug Fixes
+empty file listing on share (e082397)
+relative font sizes (c29698d)
+
+2.18.0 (2021-10-31)
+Features
+add ability to select file modified time format (#1536) (0426629)
+add manifest theme color param (#1542) (0358e42)
+Bug Fixes
+back button behaviour in preview (#1573) (deabc80)
+fix sidebar navigation on mobile devices (#1618) (f09bf3e)
+search box is misaligned when the browser preferred font size is other than 16px (#1613) (6f345be)
+security issue in command runner (closes #1621) (74b7cd8)
+set correct editor height regardless of preferred font size (#1614) (ddd4ffa)
+zoom pics when dlclick at first time (#1561) (b6a51be)
+
+2.17.2 (2021-08-27)
+Bug Fixes
+bug with inlineLink not creating url properly (#1515) (43a4609)
+
+2.17.1 (2021-08-23)
+Bug Fixes
+internal server error if --disable-preview-resize flag is set (closes #1510) (4c3099a)
+
+2.17.0 (2021-08-21)
+Features
+open file option on preview (76add9e)
+Bug Fixes
+401 error in share view open file button (#1495) (25c8788)
+escape quote on index template (23d646c), closes #1501
+file caching directive (c63cc5a)
+
+2.16.1 (2021-08-04)
+Bug Fixes
+check symlink target type (closes #1488) (76b466f)
+
+2.16.0 (2021-07-26)
+Features
+browser cache directives (190cb99)
+display error messages on settings (6032038)
+file name on page title (16a34de)
+gzip encoding for static js files (aa172b8)
+loading spinner on views navigation (976eb55)
+message for connection error (5e6f14b)
+mod time title on file info (7d1e030)
+open file option on share (1c25f6e)
+show more button on share (ba8c09f)
+support for IE11 browser (7ec24d9)
+Bug Fixes
+break resource create/update handlers on error (closes #1464) (5072bbb)
+copying files with special characters (20ebbf6)
+delete image cache when moving (8973c45)
+don't remove files on unsuccessful updates (closes #1456) (6b19ab6)
+failure on broken symlink deletion (8650d2f)
+inconsistent double click on listing item (ba7e71a)
+no items displayed on file listing (18889ad)
+omit file content (209f9fa)
+short commit sha and typo fix in Makefile (#1411) (46ee595)
+
+2.15.0 (2021-04-06)
+Features
+add EXIF thumbnail support for JPEG files (#1234) (7dd5b34)
+dynamic autoplay on previewer (a76e01d)
+dynamic item count on file listing (6c8ee96)
+dynamic zoom limit on previewer (e410272)
+Bug Fixes
+buttons without permission on header (1516d99)
+check modify permission on file overwrite (59f9964)
+empty archive name on directory download (2697093)
+empty text file on editor (e9baf0c)
+error causes panic on upload (e1a6f59)
+hidden editor header on Safari (b521dec)
+image quality switch on previewer (c0d85f3)
+list item interactions on share (87f1881)
+missing bold variation for Roboto font (98d79b8)
+mouse wheel zoom on previewer (fcb115f)
+no header button animations on file listing (fe80730)
+
+2.14.1 (2021-03-21)
+Bug Fixes
+display public routes with header proxy auth (da54bd6)
+
+2.14.0 (2021-03-21)
+Features
+add health check handler (a721dc1)
+Bug Fixes
+hide dotfile error on share (5f4a031)
+prefix handling on http router (93a35ad)
+qr code url on share (22f4be8)
+text file detection on editor (eeadc53)
+
+2.13.0 (2021-03-14)
+Features
+dual pane settings view (db5aad8)
+improved settings navbar (5b28aa0)
+improved sharing prompt (1819377)
+increased header button counter size (4fb832c)
+larger previewer content (62fff5c)
+Bug Fixes
+archive contains parent path on Windows (54f3570)
+check rules on http resource handlers (5bf1554)
+download current dir on file listing (488d980)
+encoded file path on share (7955e07)
+full file path on share (e017a19)
+header dropdown icon color on previewer (f8df76f)
+item dragging on file listing (326b35a)
+modified time on info prompt (11ebaec)
+root path name on archive (426b38b)
+stuck icon on header button (6a734c0)
+update image cache when replacing (81b6f4d)
+wait for async command exit (#1326) (6d5ceae)
+Refactorings
+migrate from rice to embed.FS (fc55061)
+
+2.12.1 (2021-03-07)
+Bug Fixes
+add missing default config into the docker image (7358b3f)
+
+2.12.0 (2021-03-04)
+Features
+add homebrew tap (2d2c598)
+added tiff files preview support (#1222) (e8c9d1c)
+allow disabling file detections by reading header (#1175) (6914063)
+allow to password protect shares (#1252) (d8f415f)
+build multi-arch docker images (cf4836d)
+share management delete confirm (#1212) (b600b11)
+Bug Fixes
+don't allow to remove root user (019ce80)
+double click to zoom pics in phone's browser (#1274) (f1b7bd5)
+environmental variables not expanded in command (#1241) (f3afd5c)
+fetch resource api once when sorting (closes #1172) (#1202) (05bb7c8)
+Build
+use make for building the project (#1304) (23f8464)
+
+2.11.0 (2020-12-28)
+Features
+add sharing management (#1178) (closes #1000) (677bce3)
+download shared subdirectory (#1184) (fb5b28d)
+Bug Fixes
+check user input to prevent permission elevation (#1196) (closes #1195) (f62806f)
+delete extra remove prefix (#1186) (7a5298a)
+move files between different volumes (closes #1177) (58835b7)
+recaptcha race condition (#1176) (ac3673e)
+
+2.10.0 (2020-11-24)
+Features
+add hide dotfiles param (#1148) (10e399b)
+add single click mode (#1139) (e8b4e9a)
+automatically jump to the next photo when deleting while previewing (#1143) (9515cee)
+shared folder file listing (e119bc5)
+shared item information (36cacdf)
+Bug Fixes
+empty folder in archive (7096b3d)
+fix hanging when reading a named pipe file (closes #1155) (586d198)
+previewer title overflow (4e48ffc)
+resource rename action invalid path (1ce3068)
+
+2.9.0 (2020-10-21)
+Features
+support WKWebview custom protocol (#1113) (0ac80e8)
+Bug Fixes
+allow start from Windows explorer (f2c4e78)
+file upload missing path slash (5e27ba5)
+preview case sensitive file extension (05bff54)
+search missing path slash (2bd163d)
+
+2.8.0 (2020-10-05)
+Features
+add disable exec flag (#1090) (97693cc)
+Bug Fixes
+empty commands setting (c6d4fcd)
+file upload path encoding (babd778)
+fix empty command name (#1106) (36fb9f5)
+fix panic when accessing nonexistent .js file in static path (#1105) (ad99bf1)
+preview key shortcut conflict (dd7b9dd)
+search results absolute url (26d62e4)
+
+2.7.0 (2020-09-11)
+Features
+add --socket-perm flag to control unix socket file permissions (closes #1060) (65ac734)
+preview mobile dropdown (7787344)
+preview size button (3d2cb83)
+put selected files in the root of the archive (closes #1065) (8142b32)
+
+2.6.2 (2020-08-05)
+2.6.1 (2020-07-28)
+Bug Fixes
+delete cached previews when deleting file (f5d02cd)
+escape special characters in preview url (closes #1002) (c9340af)
+
+2.6.0 (2020-07-27)
+Features
+add lazy load of image thumbnails (bc00165)
+add param to disable img resizing (aa78e3a)
+cache resized images (95bc929)
+limit image resize workers (94ef596)
+Bug Fixes
+conflict handling on upload button (f228fa5)
+drop feedback (f2d2c1c)
+missing error message (d9be370)
+parent verification on copy (727c63b)
+path separator inconsistency on rename (34dfb49)
+
+2.5.0 (2020-07-17)
+Features
+add previewer title and loading indicator (716396a)
+duplicate files in the same directory (43526d9)
+file copy, move and paste conflict checking (eed9da1)
+rename option on replace prompt (2636f87)
+upload queue (6ec6a23)
+Bug Fixes
+blinking previewer (9a2ebba)
+dark theme colors (b3b6445)
+directory conflict checking (7e5beef)
+prompt before closing window (194030f)
+remove incomplete uploaded files (0727496)
+reset clipboard after pasting cutted files (10570ad)
+
+2.4.0 (2020-07-07)
+Features
+full screen editor (0d665e5)
+Bug Fixes
+add preview bypass for .gif files (#1012) (453636d)
+prompt key shortcut conflict (0d69fbd)
+
+2.3.0 (2020-06-26)
+Features
+add image thumbnails support (#980) (6b0d49b)
+Bug Fixes
+typo in image_templates (apline -> alpine) (#1005) (84da110)
+
+2.2.0 (2020-06-22)
+Features
+add alpine and debian docker images (66863b7)
+add folder upload (#981) (8977344), closes filebrowser/filebrowser#741
+add key shortcuts (95316cb)
+upload progress based on total size (#993) (cd454ba)
+Bug Fixes
+add a workaround to fix window freezing when viewing a large file #992 (2412016)
+apply all fs user rulles (68f8348)
+frontend token validation (dd40b0d), closes filebrowser/filebrowser#638
+multiple selection count (963837e)
+save event hook (82c883f), closes filebrowser/filebrowser#696
\ No newline at end of file
diff --git a/Apps/FileBrowser/icon.png b/Apps/FileBrowser/icon.png
new file mode 100644
index 0000000..2222560
Binary files /dev/null and b/Apps/FileBrowser/icon.png differ
diff --git a/Apps/FileBrowser/snapshot-1.gif b/Apps/FileBrowser/snapshot-1.gif
new file mode 100644
index 0000000..1387a0c
Binary files /dev/null and b/Apps/FileBrowser/snapshot-1.gif differ
diff --git a/Apps/FileBrowser/snapshot-2.png b/Apps/FileBrowser/snapshot-2.png
new file mode 100644
index 0000000..1215e65
Binary files /dev/null and b/Apps/FileBrowser/snapshot-2.png differ
diff --git a/Apps/FileBrowser/snapshot-3.png b/Apps/FileBrowser/snapshot-3.png
new file mode 100644
index 0000000..6208569
Binary files /dev/null and b/Apps/FileBrowser/snapshot-3.png differ