diff --git a/README.md b/README.md
index d215e38..043f835 100644
--- a/README.md
+++ b/README.md
@@ -35,10 +35,15 @@ So, without further ado, here's the current list:
- [Textpattern](https://docs.textpattern.com/installation/) [external]
- [WriteFreely](https://github.com/writeas/writefreely) [external]
-# Bookmarks
+# Bookmarks & Read Later
- [Shaarli](apps/bookmarks/shaarli.md)
- [Shiori](apps/bookmarks/shiori.md)
- [Shaark](apps/bookmarks/shaark.md)
+- [Wallabag](apps/bookmarks/wallabag.md)
+
+### Other
+- [Nunux Keeper](https://keeper.nunux.org/) [external] - similar to wallabag, but not as good (more complicated, less usable and doesn't have mobile apps).
+
# Cloud & File Sharing
- [FileRun](apps/cloud/filerun.md)
@@ -190,10 +195,14 @@ So, without further ado, here's the current list:
# Social
-- Monica CRM
-- Etesync
-- HumHub
-- IM
+- [Monica](apps/social/monica.md)
+- [Etesync](apps/social/etesync.md)
+
+### Other untested
+- [HumHub](https://www.humhub.com/en) [external] - Free social network software and framework.
+- [RocketChat](https://docs.rocket.chat/installation/docker-containers/) [external] - The Ultimate Communication Hub.
+- [Snikket](https://snikket.org/) [external] - Chat that is simple, secure, and private.
+- [Jami](https://jami.net/) [external] - Audio & video calls, screen sharing, IM.
# Wiki
@@ -202,8 +211,9 @@ So, without further ado, here's the current list:
- [Wiki.js](apps/wiki/wikijs.md)
- [XWiki](apps/wiki/xwiki.md)
+
### Other
-- [Pepperminty Wiki ](https://peppermint.mooncarrot.space/) [external] -
+- [Pepperminty Wiki](https://peppermint.mooncarrot.space/) [external] - wiki engine contained in a single file. Doesn't seem to have a structured navigation (tree-like menu). Subpages are supported though.
- [Wreeto](https://github.com/chrisvel/wreeto_official) [external] - impossible to install
- [Outline](https://github.com/chsasank/outline-wiki-docker-compose) [external] (Original docker was impossible to use. This one allegedly works.) - It looks cool, but requires Slack to use...
- [Gollum](https://github.com/gollum/gollum) [external] - A simple, Git-powered wiki with a sweet API and local frontend.
diff --git a/apps/bookmarks/material.css.zip b/apps/bookmarks/material.css.zip
new file mode 100644
index 0000000..beb156f
Binary files /dev/null and b/apps/bookmarks/material.css.zip differ
diff --git a/apps/bookmarks/wallabag.jpg b/apps/bookmarks/wallabag.jpg
new file mode 100644
index 0000000..90ce89c
Binary files /dev/null and b/apps/bookmarks/wallabag.jpg differ
diff --git a/apps/bookmarks/wallabag.md b/apps/bookmarks/wallabag.md
new file mode 100644
index 0000000..514e48c
--- /dev/null
+++ b/apps/bookmarks/wallabag.md
@@ -0,0 +1,62 @@
+# Wallabag
+
+- A self hostable application for saving web pages, freely.
+- Alternative to Pocket.
+- Has mobile apps
+
+
+
+- [Homepage](https://www.wallabag.it/en)
+- [Github repo](https://github.com/wallabag/docker)
+
+
+
+
+## docker-compose.yml
+```yml
+version: '3'
+services:
+ wallabag:
+ image: wallabag/wallabag
+ environment:
+ - MYSQL_ROOT_PASSWORD=wallaroot
+ - SYMFONY__ENV__DATABASE_DRIVER=pdo_mysql
+ - SYMFONY__ENV__DATABASE_HOST=db
+ - SYMFONY__ENV__DATABASE_PORT=3306
+ - SYMFONY__ENV__DATABASE_NAME=wallabag
+ - SYMFONY__ENV__DATABASE_USER=wallabag
+ - SYMFONY__ENV__DATABASE_PASSWORD=wallapass
+ - SYMFONY__ENV__DATABASE_CHARSET=utf8mb4
+ - SYMFONY__ENV__MAILER_HOST=127.0.0.1
+ - SYMFONY__ENV__MAILER_USER=~
+ - SYMFONY__ENV__MAILER_PASSWORD=~
+ - SYMFONY__ENV__FROM_EMAIL=wallabag@example.com
+ - SYMFONY__ENV__DOMAIN_NAME=https://your-wallabag-url-instance.com
+ ports:
+ - "3123:80"
+ volumes:
+ - ./images:/var/www/wallabag/web/assets/images
+ - ./material.css:/var/www/wallabag/web/wallassets/material.css # dark theme hack
+ db:
+ image: mariadb
+ environment:
+ - MYSQL_ROOT_PASSWORD=wallaroot
+ volumes:
+ - ./data:/var/lib/mysql
+ redis:
+ image: redis:alpine
+```
+
+Default login is `wallabag`:`wallabag`.
+
+
+## Tips & Tricks
+
+#### [A hack to get the dark theme](https://github.com/wallabag/wallabag/issues/1521#issuecomment-720541571):
+
+1. Create a file `material.css` containing the original material theme CSS + the CSS provided by @STaRDoGG (in the link above) - [material.css.zip](material.css.zip).
+2. In docker-compose mount the file like so:
+ ```yml
+ - ./material.css:/var/www/wallabag/web/wallassets/material.css
+ ```
+3. Once the app starts - reload browser without cache (cmd/ctrl+r)
diff --git a/apps/social/etesync.md b/apps/social/etesync.md
new file mode 100644
index 0000000..ff6b49a
--- /dev/null
+++ b/apps/social/etesync.md
@@ -0,0 +1,33 @@
+# Etesync
+
+CalDAV & CardDav server & client.
+Not terrible, but not great.
+
+
+
+- [Homepage](https://www.etesync.com/)
+- [Github repo](https://github.com/etesync)
+
+
+## docker-compose.yml
+```yml
+---
+version: '3'
+services:
+ etesync:
+ image: dsaier/etesync
+ container_name: etesync
+ restart: unless-stopped
+ environment:
+ - TIME_ZONE=Europe/Dublin
+ - AUTO_MIGRATE=true
+ - SUPER_USER=admin
+ - SUPER_PASS=admin
+ - SUPER_EMAIL=admin@example.com
+ ports:
+ - "8001:8080"
+ volumes:
+ - ./data:/data
+```
+Then go to: http://localhost:8001/admin/logout/
+and login with `admin`:`admin`
diff --git a/apps/social/monica.md b/apps/social/monica.md
new file mode 100644
index 0000000..0256789
--- /dev/null
+++ b/apps/social/monica.md
@@ -0,0 +1,116 @@
+# Monica
+
+- Probably the only one in its kind :wink:
+- Has a very nice feature: CardDAV, but it doesn't work with MacOS contacts :sad:
+
+
+
+- [Homepage](https://www.monicahq.com/)
+- [Github repo](https://github.com/monicahq/monica)
+
+
+## Post-setup
+Run this after starting the container for the first time:
+```sh
+docker-compose exec monicahq php artisan setup:production
+```
+
+## .env
+```ini
+APP_ENV=production
+APP_DEBUG=false
+
+# Must be 32 characters long exactly.
+# Use `php artisan key:generate` or `pwgen -s 32 1` to generate a random key.
+APP_KEY=ddDR0t8E666HH29tL2Fj281sJ2uh1WRQ
+HASH_SALT=ddDRs8HH29t1UF2t8Evd
+HASH_LENGTH=18
+APP_URL=https://monica.example.com
+APP_FORCE_URL=false
+DB_CONNECTION=mysql
+DB_HOST=db
+DB_PORT=3306
+DB_DATABASE=monica
+DB_USERNAME=monica
+DB_PASSWORD=monica01
+DB_PREFIX=
+DB_USE_UTF8MB4=true
+
+# Mail credentials used to send emails from the application.
+MAIL_MAILER=smtp
+MAIL_HOST=
+MAIL_PORT=25
+MAIL_USERNAME=
+MAIL_PASSWORD=
+MAIL_ENCRYPTION=tls
+MAIL_FROM_ADDRESS=
+MAIL_FROM_NAME="CRM"
+APP_EMAIL_NEW_USERS_NOTIFICATION=
+APP_DISABLE_SIGNUP=true
+APP_SIGNUP_DOUBLE_OPTIN=false
+APP_TRUSTED_PROXIES= # use a comma separated list of IP addresses.
+APP_TRUSTED_CLOUDFLARE=false
+LOG_CHANNEL=daily
+SENTRY_SUPPORT=false
+SENTRY_LARAVEL_DSN=
+CHECK_VERSION=false
+REDIS_HOST=redis
+CACHE_DRIVER=redis # database, file, memcached, redis, dynamodb
+SESSION_DRIVER=redis # file, cookie, database, apc, memcached, redis, array
+SESSION_LIFETIME=120
+QUEUE_CONNECTION=sync
+DEFAULT_FILESYSTEM=public
+DEFAULT_MAX_STORAGE_SIZE=512
+DEFAULT_MAX_UPLOAD_SIZE=10240
+MFA_ENABLED=true
+DAV_ENABLED=true
+ALLOW_STATISTICS_THROUGH_PUBLIC_API_ACCESS=false
+POLICY_COMPLIANT=true
+ENABLE_GEOLOCATION=false
+LOCATION_IQ_API_KEY=
+ENABLE_WEATHER=false
+DARKSKY_API_KEY=
+```
+
+## docker-compose.yml
+```yml
+---
+version: '3'
+services:
+ monicahq:
+ image: monica
+ container_name: monica
+ restart: unless-stopped
+ depends_on:
+ - db
+ env_file:
+ - ./.env
+ environment:
+ - TZ=Europe/Dublin
+ - APP_KEY=ddDR0t8E4s8HH19t333jt81sJNuh1WRQ
+ - APP_ENV=production
+ - DB_HOST=db
+ ports:
+ - "5020:80"
+ volumes:
+ - ./data:/var/www/html/storage
+# - ./html:/var/www/monica:ro
+ db:
+ image: mysql:5.7
+ container_name: monica-db
+ restart: unless-stopped
+ environment:
+ - MYSQL_RANDOM_ROOT_PASSWORD=true
+ - MYSQL_DATABASE=monica
+ - MYSQL_USER=monica
+ - MYSQL_PASSWORD=monica01
+ volumes:
+ - ./mysql:/var/lib/mysql
+
+ redis:
+ image: redis:alpine
+ container_name: monica-redis
+ restart: unless-stopped
+ volumes:
+ - ./redis:/data
+```