Merge pull request #1 from wekan/devel

ldap changes

660 files changed, 77480 insertions, 4984 deletions

diff --git a/.eslintrc.json b/.eslintrc.json
index 0a9f3c90..364f82a9 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -6,7 +6,7 @@
     "browser": true
   },
   "parserOptions": {
-    "ecmaVersion": 6,
+    "ecmaVersion": 2017,
     "sourceType": "module",
     "ecmaFeatures": {
       "experimentalObjectRestSpread": true
@@ -14,7 +14,7 @@
   },
   "rules": {
     "strict": 0,
-    "no-undef": 2,
+    "no-undef": 0,
     "accessor-pairs": 2,
     "comma-dangle": [2, "always-multiline"],
     "consistent-return": 2,
@@ -100,7 +100,9 @@
     "Attachments": true,
     "Boards": true,
     "CardComments": true,
+    "DatePicker" : true,
     "Cards": true,
+    "CustomFields": true,
     "Lists": true,
     "UnsavedEditCollection": true,
     "Users": true,
@@ -119,7 +121,8 @@
     "allowIsBoardAdmin": true,
     "allowIsBoardMember": true,
     "allowIsBoardMemberByCard": true,
-    "allowIsBoardMemberNonComment": true,
+    "allowIsBoardMemberCommentOnly": true,
+    "allowIsBoardMemberNoComments": true,
     "Emoji": true,
     "Checklists": true,
     "Settings": true,
@@ -132,6 +135,7 @@
     "Announcements": true,
     "Swimlanes": true,
     "ChecklistItems": true,
+    "Subtasks": true,
     "Npm": true
   }
 }
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 4610f2f8..658116dc 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,16 +1,27 @@
 ## Issue
 
+Add these issues to elsewhere:
+- Snap: https://github.com/wekan/wekan-snap/issues
+
+Other Wekan issues can be added here.
+
 **Server Setup Information**:
 
+* Did you test in newest Wekan?:
+* For new Wekan install, did you configure root-url correctly https://github.com/wekan/wekan/wiki/Settings ?
+* Wekan version:
+* If this is about old version of Wekan, what upgrade problem you have?:
 * Operating System:
-* Deployment Method(snap/sandstorm/mongodb bundle):
-* Http frontend (Caddy, Nginx, Apache, see config examples from Wekan GitHub wiki first):
+* Deployment Method(snap/docker/sandstorm/mongodb bundle/source):
+* Http frontend if any (Caddy, Nginx, Apache, see config examples from Wekan GitHub wiki first):
 * Node Version:
 * MongoDB Version:
 * ROOT_URL environment variable http(s)://(subdomain).example.com(/suburl):
 
 **Problem description**:
-- *be as explicit as you can*
-- *describe the problem and its symptoms*
-- *explain how to reproduce*
-- *attach whatever information that can help understanding the context (screen capture, log files in .zip file)*
+- *REQUIRED: Add recorded animated gif about how it works currently, and screenshot mockups how it should work. Use peek to record animgif in Linux https://github.com/phw/peek*
+- *Explain steps how to reproduce*
+- *In webbrowser, what does show Right Click / Inspect / Console ? Chrome shows more detailed info than Firefox.*
+- *If using Snap, what does show command `sudo snap logs wekan.wekan` ?*
+- *If using Docker, what does show command `sudo docker logs wekan-app` ?*
+- *If logs are very long, attach them in .zip file*
diff --git a/.gitignore b/.gitignore
index acb9bcc7..6e7a26dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,14 +4,28 @@
 *.sublime-workspace
 tmp/
 node_modules/
+npm-debug.log
 .vscode/
 .idea/
 .build/*
-packages/kadira-flow-router/
-packages/meteor-useraccounts-core/
 package-lock.json
 **/parts/
 **/stage
 **/prime
 **/*.snap
 snap/.snapcraft/
+.idea
+.DS_Store
+.DS_Store?
+.build*
+*.browserify.js.cached
+*.browserify.js.map
+.build*
+versions.json
+.versions
+.npm
+.build*
+._*
+.Trashes
+Thumbs.db
+ehthumbs.db
diff --git a/.meteor/packages b/.meteor/packages
index c1b8ab88..6b771809 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -6,7 +6,7 @@
 meteor-base@1.2.0
 
 # Build system
-ecmascript@0.9.0
+ecmascript
 stylus@2.513.13
 standard-minifier-css@1.3.5
 standard-minifier-js@2.2.0
@@ -31,6 +31,9 @@ kenton:accounts-sandstorm
 service-configuration@1.0.11
 useraccounts:unstyled
 useraccounts:flow-routing
+wekan-ldap
+wekan-accounts-cas
+wekan-accounts-oidc
 
 # Utilities
 check@1.2.5
@@ -49,7 +52,6 @@ kadira:dochead
 meteorhacks:picker
 meteorhacks:subs-manager
 mquandalle:autofocus
-mquandalle:moment
 ongoworks:speakingurl
 raix:handlebar-helpers
 tap:i18n
@@ -63,9 +65,7 @@ mousetrap:mousetrap
 mquandalle:jquery-textcomplete
 mquandalle:jquery-ui-drag-drop-sort
 mquandalle:mousetrap-bindglobal
-mquandalle:perfect-scrollbar
 peerlibrary:blaze-components@=0.15.1
-perak:markdown
 templates:tabs
 verron:autosize
 simple:json-routes
@@ -77,10 +77,18 @@ email@1.2.3
 horka:swipebox
 dynamic-import@0.2.0
 staringatlights:fast-render
-staringatlights:flow-router
 
 mixmax:smart-disconnect
 accounts-password@1.5.0
 cfs:gridfs
-browser-policy
-eluck:accounts-lockout
+rzymek:fullcalendar
+momentjs:moment@2.22.2
+browser-policy-framing
+mquandalle:moment
+msavin:usercache
+wekan-scrollbar
+mquandalle:perfect-scrollbar
+mdg:meteor-apm-agent
+meteorhacks:unblock
+lucasantoniassi:accounts-lockout
+wekan-markdown
diff --git a/.meteor/versions b/.meteor/versions
index 2ab1af11..187d92c5 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -1,5 +1,6 @@
 3stack:presence@1.1.2
 accounts-base@1.4.0
+accounts-oauth@1.1.15
 accounts-password@1.5.0
 aldeed:collection2@2.10.0
 aldeed:collection2-core@1.2.0
@@ -18,9 +19,7 @@ binary-heap@1.0.10
 blaze@2.3.2
 blaze-tools@1.0.10
 boilerplate-generator@1.3.1
-browser-policy@1.1.0
 browser-policy-common@1.0.11
-browser-policy-content@1.1.0
 browser-policy-framing@1.1.0
 caching-compiler@1.1.9
 caching-html-compiler@1.1.2
@@ -61,7 +60,6 @@ ecmascript-runtime@0.5.0
 ecmascript-runtime-client@0.5.0
 ecmascript-runtime-server@0.5.0
 ejson@1.1.0
-eluck:accounts-lockout@0.9.0
 email@1.2.3
 es5-shim@4.6.15
 fastclick@1.0.13
@@ -83,8 +81,10 @@ launch-screen@1.1.1
 livedata@1.0.18
 localstorage@1.2.0
 logging@1.1.19
+lucasantoniassi:accounts-lockout@1.0.0
 matb33:collection-hooks@0.8.4
 matteodem:easy-search@1.6.4
+mdg:meteor-apm-agent@3.1.2
 mdg:validation-error@0.5.1
 meteor@1.8.2
 meteor-base@1.2.0
@@ -94,6 +94,7 @@ meteorhacks:collection-utils@1.2.0
 meteorhacks:meteorx@1.4.1
 meteorhacks:picker@1.0.3
 meteorhacks:subs-manager@1.6.4
+meteorhacks:unblock@1.1.0
 meteorspark:util@0.2.0
 minifier-css@1.2.16
 minifier-js@2.2.2
@@ -103,6 +104,7 @@ mixmax:smart-disconnect@0.0.4
 mobile-status-bar@1.0.14
 modules@0.11.0
 modules-runtime@0.9.1
+momentjs:moment@2.22.2
 mongo@1.3.1
 mongo-dev-server@1.1.0
 mongo-id@1.0.6
@@ -117,8 +119,11 @@ mquandalle:jquery-ui-drag-drop-sort@0.2.0
 mquandalle:moment@1.0.1
 mquandalle:mousetrap-bindglobal@0.0.1
 mquandalle:perfect-scrollbar@0.6.5_2
+msavin:usercache@1.0.0
 npm-bcrypt@0.9.3
 npm-mongo@2.2.33
+oauth@1.2.1
+oauth2@1.2.0
 observe-sequence@1.0.16
 ongoworks:speakingurl@1.1.0
 ordered-dict@1.0.9
@@ -127,7 +132,6 @@ peerlibrary:base-component@0.16.0
 peerlibrary:blaze-components@0.15.1
 peerlibrary:computed-field@0.7.0
 peerlibrary:reactive-field@0.3.0
-perak:markdown@1.0.5
 promise@0.10.0
 raix:eventemitter@0.1.3
 raix:handlebar-helpers@0.2.5
@@ -139,6 +143,7 @@ reactive-var@1.0.11
 reload@1.1.11
 retry@1.0.9
 routepolicy@1.0.12
+rzymek:fullcalendar@3.8.0
 service-configuration@1.0.11
 session@1.1.7
 sha@1.0.9
@@ -155,7 +160,6 @@ srp@1.0.10
 standard-minifier-css@1.3.5
 standard-minifier-js@2.2.3
 staringatlights:fast-render@2.16.5
-staringatlights:flow-router@2.12.2
 staringatlights:inject-data@2.0.5
 stylus@2.513.13
 tap:i18n@1.8.2
@@ -174,4 +178,11 @@ useraccounts:unstyled@1.14.2
 verron:autosize@3.0.8
 webapp@1.4.0
 webapp-hashing@1.0.9
+wekan-accounts-oidc@1.0.10
+wekan-markdown@1.0.7
+wekan-oidc@1.0.12
+wekan-scrollbar@3.1.3
+wekan-accounts-cas@0.1.0
+wekan-ldap@0.0.2
+yasaricli:slugify@0.0.7
 zimme:active-route@2.3.2
diff --git a/.tx/config b/.tx/config
index 1813b45e..347e88cd 100644
--- a/.tx/config
+++ b/.tx/config
@@ -39,7 +39,7 @@ host = https://www.transifex.com
 # tap:i18n requires us to use `-` separator in the language identifiers whereas
 # Transifex uses a `_` separator, without an option to customize it on one side
 # or the other, so we need to do a Manual mapping.
-lang_map = bg_BG:bg, en_GB:en-GB, es_AR:es-AR, el_GR:el, fi_FI:fi, hu_HU:hu, id_ID:id, mn_MN:mn, no:nb, lv_LV:lv, pt_BR:pt-BR, ro_RO:ro, zh_CN:zh-CN, zh_TW:zh-TW
+lang_map = bg_BG:bg, en_GB:en-GB, es_AR:es-AR, el_GR:el, fi_FI:fi, hu_HU:hu, id_ID:id, mn_MN:mn, no:nb, lv_LV:lv, pt_BR:pt-BR, ro_RO:ro, zh_CN:zh-CN, zh_TW:zh-TW, zh_HK:zh-HK
 
 [wekan.application]
 file_filter = i18n/<lang>.i18n.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34c1b50d..66442ebc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,2152 @@
+# v2.66 2019-05-09 Wekan release
+
+This release adds the following new features:
+
+- [Delete user feature](https://github.com/wekan/wekan/pull/2384).
+  Thanks to Akuket.
+- Change to Delete user feature: [When last board admin is removed, board is not deleted, other board users can
+  still use it](https://github.com/wekan/wekan/commit/e1b016cf3d4ff93e9e0fe1feb96372e3e1625233).
+  Thanks to xet7.
+
+and adds the following new translations:
+
+- Add Chinese (Hong Kong).
+  Thanks to translators.
+
+and fixes the following bugs:
+
+- [Fix OIDC login](https://github.com/wekan/wekan/pull/2385). Related [#2383](https://github.com/wekan/wekan/issues/2383).
+  Thanks to faust64.
+- [Fix missing profile checks](https://github.com/wekan/wekan/pull/2396).
+  Thanks to justinr1234.
+- [Fix RTL issue #884, part 1](https://github.com/wekan/wekan/pull/2395).
+  Thanks to guyzyl.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v2.65 2019-04-24 Wekan release
+
+This release adds the following new features:
+
+- [Now a loading animation is displayed when the authentication is performed. This allows users
+  to know that it's in progress](https://github.com/wekan/wekan/pull/2379).
+  Thanks to Akuket.
+
+and removes the following UI duplicates:
+
+- [Remove from card menu, because they also exist at card:
+  members, labels, attachments, dates received/start/due/end](https://github.com/wekan/wekan/issues/2242).
+  Thanks to sfahrenholz, jrsupplee and xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v2.64 2019-04-23 Wekan release
+
+This release adds the following new features:
+
+- [Board Archive: Restore All/Delete All of Cards/Lists/Swimlanes](https://github.com/wekan/wekan/pull/2376).
+  Thanks to Akuket.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v2.63 2019-04-23 Wekan release
+
+This release removes the following Caddy plugins:
+
+- [Remove Caddy plugins http.filter, http.ipfilter and http.realip from Caddy](https://github.com/wekan/wekan/commot/6a94500170509d2d82bd9a0fdc94a7ce66215b3d)
+  because they are currently broken, preventing download of Caddy during Wekan Snap build.
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v2.62 2019-04-23 Wekan release
+
+This release fixes the following bugs:
+
+- [Mobile UI: Center cards in list view](https://github.com/wekan/wekan/issues/2371).
+  Thanks to hupptechnologies.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v2.61 2019-04-20 Wekan release
+
+This release adds the following new features:
+
+- Admin Panel/People: Can now search users by username, full name or email and using regex to find them.
+  Display the number of users. All registered users by default else the number of users selected by the search.
+  Thanks to Akuket.
+
+and adds the following updates:
+
+- [Update to use newest GitHub flawored markdown](https://github.com/wekan/wekan/commit/fea2ad3d7d09b44c3de1dbcdd3f8750aaa6776d5),
+  because [it was found old version was in use](https://github.com/wekan/wekan/issues/2334).
+  Thanks to shaygover and xet7.
+- [Upgrade to Node 8.16.0](https://github.com/wekan/wekan/commit/6117097a93bfb11c8bd4c87a23c44a50e22ceb87).
+  Thanks to Node developers and xet7.    
+- [Upgrade Docker base image to ubuntu:disco](https://github.com/wekan/wekan/commit/bd14ee3b1f450ddc6dec26ccc8da702b839942e5).
+  Thanks to Ubuntu developers and xet7.
+
+and fixes the following bugs:
+
+- [Fix Full width of lists and space before first list](https://github.com/wekan/wekan/pull/2343).
+  Thanks to hupptehcnologies.
+- Remove [extra](https://github.com/wekan/wekan/pull/2332) [quotes](https://github.com/wekan/wekan/pull/2333) from docker-compose.yml.
+  Thanks to hibare.
+- Fix Docker builds by moving all separately cloned wekan/packages/* repos like ldap, oidc, etc code to wekan repo code,
+  so that in build scripts it's not needed to clone those. Also archived those wekan repos and moved issues
+  to https://github.com/wekan/wekan/issues because changes and development to those packages now happends on wekan/wekan repo.
+  There was also fixes to repo urls etc. Thanks to xet7.
+- [Additional updates](https://github.com/wekan/wekan/pull/2347) to meteor-1.8 branch, that contains
+  Meteor 1.8.1 version that works in Docker but not yet at Snap and Sandstorm. Thanks to justinr1234.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v2.60 2019-04-08 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix: Description of Board is out of visible after Feature "Duplicate Board"](https://github.com/wekan/wekan/issues/2324).
+  Thanks to sfahrenholz and xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v2.59 2019-04-06 Wekan release
+
+This release fixes the following bugs:
+
+- [Add variables for activity notifications, Fixes #2285](https://github.com/wekan/wekan/pull/2320).
+  Thanks to rinnaz.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v2.58 2019-04-06 Wekan release
+
+This release adds the following new features:
+
+- [Duplicate Board](https://github.com/wekan/wekan/issues/2257). Related #2225.
+  Thanks to Angtrim.
+- [Add Duplicate Board tooltip, and remove adding text "Copy" to duplicated board](https://github.com/wekan/wekan/commit/0f15b6d1982c383f76e8411cb501ff27e8febd42).
+  Thanks to xet7.
+
+and fixes the following bugs:
+
+- [Add proper variables for unjoin card](https://github.com/wekan/wekan/pull/2313).
+  Thanks to chotaire.
+- [Center reduce left margin in card view on mobile browser](https://github.com/wekan/wekan/pull/2314).
+  Thanks to hupptechnologies.
+- [Remove not needed ARGS from Dockerfile to reduce amount of Docker layers](https://github.com/wekan/wekan/issues/2301).
+  Thanks to folhabranca and xet7.
+- [Fix Swimlane Rules don't work](https://github.com/wekan/wekan/issues/2225).
+  Thanks to Angtrim.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v2.57 2019-04-02 Wekan release
+
+This release fixes the following bugs, thanks to justinr1234:
+
+- [Add proper variables for join card](https://github.com/wekan/wekan/commit/289f1fe1340c85eb2af19825f4972e9057a86b7a),
+  fixes [Incorrect variable replacement on email notifications](https://github.com/wekan/wekan/issues/2285).
+
+and fixes the following bugs with Apache I-CLA, thanks to bentiss:
+
+- [List: Do not use IntersectionObserver to reduce CPU usage](https://github.com/wekan/wekan/pull/2302).
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v2.56 2019-03-27 Wekan release
+
+This release [fixes the following bugs](https://github.com/wekan/wekan/pull/2287), thanks to bentiss with Apache I-CLA:
+
+- [#2250 -> the spinner could be shown on startup and never goes away](https://github.com/wekan/wekan/issues/2250).
+- The code will now only load extra cards that will be in the current viewport.
+- When 2 users were interacting on the same board, there was a situation where the spinner could show up on the other user, without being able to load the extra cards.
+- The code is now much simpler, thanks to the IntersectionObserver, and all of this for fewer lines of code :)
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v2.55 2019-03-25 Wekan release
+
+This release fixes the following bugs, thanks to bentiss with Apache I-CLA:
+
+- [Use older api2html@0.3.0](https://github.com/wekan/wekan/commit/625682a4dab43c525494af10121edbfd547786d7)
+  to fix [broken snap and docker build](https://github.com/wekan/wekan/issues/2286),
+  because newer api2html caused
+  [breaking change](https://github.com/tobilg/api2html/commit/a9a41bca18db3f9ec61395d7262eff071a995783)
+  at api2html/bin/api2html.js:23 has error about "php": "PHP".
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v2.54 2019-03-25 Wekan release
+
+This release fixes the following bugs:
+
+- Fix typos.
+- [Fix Outgoing Webhook message about created new swimlane](https://github.com/wekan/wekan/issues/1969).
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v2.53 2019-03-23 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix filename and URLs](https://github.com/wekan/wekan/ccommit/994314cfa339e52a2ad124194af4e89f57ddd213).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v2.52 2019-03-22 Wekan release
+
+This release adds the following new features:
+
+- [More whitelabeling: Hide Wekan logo and title by default, and don't show separate option to hide logo at
+  Admin Panel/Layout](https://github.com/wekan/wekan/commit/2969161afbe60a1aa2e7da6cedc3ab48941faf3e).
+  Thanks to xet7.
+- Added and then reverted option to redirect OIDC OAuth2 login [part1](https://github.com/wekan/wekan-ldap/commit/82a894ac20ba9e7c6fdf053cff1721cab709bf8a),
+  [part 2](https://github.com/wekan/wekan-ldap/commit/36900cc360d0d406f8fba5e43378f85c92747870) and
+  [part3](https://github.com/wekan/wekan/commit/7919ae362866c0cacf2a486bf91b12e4d25807d7).
+  This does not work yet. In Progress.
+  Thanks to xet7.
+- [Add LDAP config example, remove extra text](https://github.com/wekan/wekan/commit/506acda70b5e78737c52455e5eee9c8758243196).
+  Thanks to xet7.
+
+and fixes the following bugs:
+
+- [Fix IFTTT email sending](https://github.com/wekan/wekan/pull/2279).
+  Thanks to justinr1234.
+
+Thanks to above GitHub users for their contributions.
+
+# v2.51 2019-03-21 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix Unable to change board card title (=Board name) at Templates page](https://github.com/wekan/wekan/issues/2275).
+  and [Unable to change card title in Template](https://github.com/wekan/wekan/issues/2268) part 2.
+  Thanks to andresmanelli.
+
+Thanks to above GitHub users for their contributions.
+
+# v2.50 2019-03-21 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix](https://github.com/wekan/wekan/pull/2269) [Unable to change card title in Template](https://github.com/wekan/wekan/issues/2268)
+  and [Fix Unable to create a new board from a template](https://github.com/wekan/wekan/issues/2267).
+  Thanks to andresmanelli.
+
+Thanks to above GitHub users for their contributions.
+
+# v2.49 2019-03-21 Wekan release
+
+This release fixes the following bugs:
+
+- [The invitation code doesn't exist - case-sensitive eMail](https://github.com/wekan/wekan/issues/1384). Thanks to neurolabs.
+- [Don't swallow email errors](https://github.com/wekan/wekan/pull/2272). Thanks to justinr1234.
+- [Migrate customFields model](https://github.com/wekan/wekan/pull/2264).
+  Modifies the customFields model to keep an array of boardIds where the customField can be used.
+  Adds name matching for labels when copying/moving cards between boards.
+  This way, customFields are not lost when copying/moving a card. Particularly useful when templates have customFields or labels with specific names (not tested for templates yet).
+  Thanks to andresmanelli.
+- [Fix dissapearing subtasks](https://github.com/wekan/wekan/pull/2265). Thanks to andresmanelli.
+- [Cards disappear when rearranged on template board](https://github.com/wekan/wekan/issues/2266). Thanks to andresmanelli.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v2.48 2019-03-15 Wekan release
+
+This release fixes the following bugs, thanks to GitHub user xet7:
+
+- [Fix LDAP login](https://github.com/wekan/wekan/commit/216b3cfe0121aa026139536c383aa27db0353411).
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v2.47 2019-03-14 Wekan release
+
+This release fixes the following bugs, thanks to GitHub user xet7:
+
+- [Remove ordering of cards by starred/color/description, so that cards would not reorder all the time](https://github.com/wekan/wekan/issues/2241).
+- Try to fix [LDAP Login: "Login forbidden", ReferenceError: req is not defined](https://github.com/wekan/wekan-ldap/44).
+
+# v2.46 2019-03-13 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix watchers undefined](https://github.com/wekan/wekan/pull/2253).
+  Thanks to justinr1234.
+- [Revert hiding of Subtask boards](https://github.com/wekan/wekan/commit/1968b7da31d75757fd6383417d729ff6af6bbc5b)
+  because of feedback from Wekan users, that need Subtask boards to be visible.
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v2.45 2019-03-11 Wekan release
+
+This release fixes the following bugs, thanks to andresmanelli:
+
+- [Rename circular card migration to re run the fix](https://github.com/wekan/wekan/commit/a347ae367654258b7768e7571831ed8f75fb5b84).
+
+# v2.44 2019-03-11 Wekan release
+
+This release adds the following new features and fixes with Apache I-CLA, thanks to bentiss:
+
+- [Activities: register customFields changes in the activities](https://github.com/wekan/wekan/pull/2239).
+- [customFields: fix leftover from lint](https://github.com/wekan/wekan/commit/4c72479d1206850d436261dc5c6a4127f246f6da).
+  Looks like I forgot to use the camelCase notation here, and this leads to an exception while updating a custom field.
+- [Fix imports](https://github.com/wekan/wekan/pull/2245).
+
+and adds the following new features:
+
+- Add language: Occitan. Thanks to translators.
+
+and fixes the following bugs:
+
+- [Fix removed checklistItem activity => dangling activities created](https://github.com/wekan/wekan/commit/2ec1664408d9515b5ca77fbb46ef99208eb8cff0).
+  Closes #2240. Thanks to andresmanelli.
+- [Avoid set self as parent card to cause circular reference, for real](https://github.com/wekan/commit/97822f35fd6365e5631c5488e8ee595f76ab4e34).
+  Thanks to andresmanelli.
+- Try to fix [Order All Boards by starred, color, board name and board description. Part 2](https://github.com/wekan/wekan/commit/8f337f17e45f8af8d96b6043d54466e5878b7e0b).
+  Works on new Wekan install. Could still have boards keeping reording happening all the time on old Wekan installs.
+  Thanks to xet7. Note: Ordering by starred/color/description was removed at Wekan v2.47.
+- [Changed brute force protection package from eluck:accounts-lockout to lucasantoniassi:accounts-lockout that is maintained and works.
+  Added Snap/Docker/Source settings](https://github.com/wekan/wekan/commit/b7c000b78b9af253fb115bbfa5ef0d4c0681abbb).
+  Thanks to xet7.
+
+Thanks to above Wekan contributors for their contributions.
+
+# v2.43 2019-03-08 Wekan release
+
+This release adds the following new features, thanks to xet7:
+
+- [Hide Subtask boards from All Boards](https://github.com/wekan/wekan/issues/1990). This was reverted in Wekan v2.46 to make Subtask boards visible again.
+- [Order All Boards by Starred, Color, Title and Description](https://github.com/wekan/wekan/commit/856872815292590e0c4eff2848ea1b857a318dc4).
+  This was removed at Wekan v2.47.
+- [HTTP header automatic login](https://github.com/wekan/wekan/commit/ff825d6123ecfd033ccb08ce97c11cefee676104)
+  for [3rd party authentication server method](https://github.com/wekan/wekan/issues/2019) like siteminder, and any webserver that
+  handles authentication and based on it adds HTTP headers to be used for login. Please test.
+
+and adds the following partial fix, thanks to andresmanelli:
+
+- [Add migration to fix circular references](https://github.com/wekan/wekan/commit/a338e937e508568d1f6a15c5464126d30ef69a7d).
+  This [runs only once](https://github.com/wekan/wekan/issues/2209#issuecomment-470445989),
+  so later there will be another fix to make it run every time.
+
+and reverts the following change of v2.42, because they did not fix anything, thanks to xet7:
+
+- [Revert: Tried to fix snap mongodb-control not starting database](https://github.com/wekan/wekan/commit/4055f451fdadfbfdef9a10be29a0eb6aed91182c).
+
+Thanks to above GitHub users for their contributions, and translators for their translations.
+
+# v2.42 2019-03-07 Wekan release
+
+This release tried to fix the following bugs:
+
+- [Tried to fix snap mongodb-control not starting database](https://github.com/wekan/wekan/commit/2c5628b5fbcc25427021d0b22e74577a71149c21).
+  Reverted in v2.43, because it did not fix anything.
+
+Thanks to xet7 and qurqar[m] at IRC #wekan.
+
+# v2.41 2019-03-07 Wekan release
+
+This release tried to fix the following bugs:
+
+- [Partial Fix: Card was selected as parent card (circular reference) and now board can be not opened anymore](https://github.com/wekan/wekan/issues/2202)
+  with [Avoid setting same card as parentCard. Avoid listing templates board in copy/move/more menus](https://github.com/wekan/wekan/commit/745f39ed20169f56b99c0339f2043f8c4ed43873).
+  This does not fully work yet, it will be fixed later.
+  Thanks to andresmanelli.
+
+Thanks to above GitHub users for their contributions, and translators for their translations.
+
+# v2.40 2019-03-06 Wekan release
+
+This release fixes the following bugs:
+
+- Part 2: [Fix](https://github.com/wekan/wekan/commit/e845fe3e7130d111be4c3a73e2551738c980ff7b)
+  [manifest](https://github.com/wekan/wekan/issues/2168) and
+  [icon](https://github.com/wekan/wekan/issues/1692) paths. Thanks to xet7.
+
+Thanks to above GitHub users for their contributions, and translators for their translations.
+
+# v2.39 2019-03-06 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix](https://github.com/wekan/wekan/commit/e845fe3e7130d111be4c3a73e2551738c980ff7b)
+  [manifest](https://github.com/wekan/wekan/issues/2168) and
+  [icon](https://github.com/wekan/wekan/issues/1692) paths. Thanks to xet7.
+
+Thanks to above GitHub users for their contributions, and translators for their translations.
+
+# v2.38 2019-03-06 Wekan release
+
+This release adds the following new features:
+
+- [Added a Helm Chart to the project](https://github.com/wekan/wekan/pull/2227), thanks to TechnoTaff.
+- [Added support for LDAP admin status sync](https://github.com/wekan/wekan-ldap/pull/40).
+  Examples: [LDAP_SYNC_ADMIN_STATUS=true, LDAP_SYNC_ADMIN_GROUP=group1,group2](https://github.com/wekan/wekan/commit/7e451d9033eb6162cd37de3e5ffabdc22e272948).
+  Thanks to JulianJacobi and xet7.
+
+and fixes the following bugs:
+
+- [Fix card deletion from archive](https://github.com/wekan/wekan/commit/77754cf32f28498e550a46325d90eb41f08f8552). Thanks to andresmanelli.
+- [Fix card move with wrong swimlaneId](https://github.com/wekan/wekan/commit/1bef3a3f8ff4eac43bf97cc8b86d85e618b0e2ef). Thanks to andresmanelli.
+  NOTE: This does not yet fix card move [with Custom Field](https://github.com/wekan/wekan/issues/2233), it will be fixed later.
+- [Fix: LDAP Authentication with Recursive Group Filtering Does Not Work on Snap](https://github.com/wekan/wekan/issues/2228). Thanks to apages2.
+- [Use ubuntu:cosmic base in Dockerfile](https://github.com/wekan/wekan/commit/df00776e6ca47080435eca9a31a16fd24c0770ed). Thanks to xet7.
+- [Remove phantomjs binary from Docker/Snap/Stackerfile to reduce size](https://github.com/wekan/wekan/issues/2229). Thanks to soohwa.
+
+Thanks to above GitHub users for their contributions, and translators for their translations.
+
+# v2.37 2019-03-04 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix Adding Labels to cards is not possible anymore](https://github.com/wekan/wekan/issues/2223).
+
+Thanks to GitHub user xet7 for contributions.
+
+# v2.36 2019-03-03 Wekan release
+
+This release adds the following UI changes:
+
+- [Combine hamburger menus at right](https://github.com/wekan/wekan/issues/2219):
+  - Hamburger button open sidebar;
+  - Sidebar has at top right Cog icon that opens Board Settings;
+  - Hide sidebar arrows.
+
+and fixes the following bugs:
+
+- [Add more Webhook translations](https://github.com/wekan/wekan/issues/1969).
+  In progress.
+
+and moved the following code around:
+
+- [Forked salleman-oidc](https://github.com/wekan/wekan/commit/8867bec8e65f1ef6be0c731918e8eefcacb7acb0)
+  to https://github.com/wekan/meteor-accounts-oidc where salleman also has write access,
+  xet7 can make changes directly and GitHub issues are enabled.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v2.35 2019-03-01 Wekan release
+
+This release fixes the following bugs:
+
+- [Add Filter fix back](https://github.com/wekan/wekan/issues/2213),
+  because there was no bug in filter fix.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v2.34 2019-03-01 Wekan release
+
+This release tried to fix following bugs, but did not fix anything:
+
+- Revert [Filter fix](https://github.com/wekan/wekan/issues/2213) because of
+  [mongodb data tampered](https://github.com/wekan/wekan-snap/issues/83).
+  This was added back at Wekan v2.35.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v2.33 2019-02-28 Wekan release
+
+This release adds the following upgrades:
+
+- [Upgrade Node.js to v8.15.1](https://github.com/wekan/wekan/commit/5cafdd9878ab4b6123024ec33279ccdae75f554f).
+
+Thanks to Node.js developers and GitHub user xet7 for contributions.
+
+# v2.32 2019-02-28 Wekan release
+
+This release adds the following [performance improvements](https://github.com/wekan/wekan/pull/2214), thanks to justinr1234:
+
+- New indexes for queries that were missing an index;
+- Bulk querying documents to reduce the number of mongo queries when loading a board;
+- Ensure oplog is being used to query the database by providing a `sort` key when `limit` is used querying the `boards` collection.
+
+and fixes the following bugs related to [Template features](https://github.com/wekan/wekan/issues/2209), thanks to andresmanelli:
+
+- [Fix filtering in swimlane view](https://github.com/wekan/wekan/commit/49229e1723de14cdc66dc6480624bba426d35e36) that was [broken since v2.29](https://github.com/wekan/wekan/issues/2213).
+
+Thanks to above GitHub users for their contributions.
+
+# v2.31 2019-02-28 Wekan release
+
+This release fixes the following bugs related to [Template features](https://github.com/wekan/wekan/issues/2209), thanks to GitHub user andresmanelli:
+
+- [Fix copy card](https://github.com/wekan/wekan/issues/2210).
+
+# v2.30 2019-02-28 Wekan release
+
+This release adds the following new [Template features](https://github.com/wekan/wekan/issues/2209), thanks to GitHub user andresmanelli:
+
+- [Fix popup title. Add element title modification](https://github.com/wekan/wekan/commit/888e1ad5d3e32be53283aa32198057f669f3d706);
+- [Copy template attachments](https://github.com/wekan/wekan/commit/abb71083215462d91b084c4de13af0b130638e4d);
+- [Standarize copy functions. Match labels by name](https://github.com/wekan/wekan/commit/da21a2a410c9b905de89d66236748e0c8f5357ea).
+
+# v2.29 2019-02-27 Wekan release
+
+This release adds the following new features:
+
+- Swimlane/List/Board/Card templates. In Progress, please test and [add comment if you find not listed bugs](https://github.com/wekan/wekan/issues/2165).
+  Thanks to GitHub user andresmanelli.
+
+# v2.28 2019-02-27 Wekan release
+
+This release adds the following new Sandstorm features and fixes:
+
+- All Boards page [so it's possible to go back from subtask board](https://github.com/wekan/wekan/issues/2082).
+- Board favorites.
+- New Sandstorm board first user is Admin and [has IFTTT Rules](https://github.com/wekan/wekan/issues/2125) and Standalone Wekan Admin Panel.
+  Probably some Admin Panel features do not work yet. Please keep backup of your grains before testing Admin Panel.
+- Linked Cards and Linked Boards.
+- Some not needed options like Logout etc have been hidden from top bar right menu.
+- [Import board now works. "Board not found" is not problem anymore](https://github.com/wekan/wekan/issues/1430), because you can go to All Boards page to change to imported board.
+
+and removes the following features:
+
+- Remove Welcome Board from Standalone Wekan, [to fix Welcome board not translated](https://github.com/wekan/wekan/issues/1601).
+  Sandstorm Wekan does not have Welcome Board.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v2.27 2019-02-27 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix OIDC error "a.join is not a function"](https://github.com/wekan/wekan/issues/2206)
+  by reverting configurable OAUTH2_ID_TOKEN_WHITELIST_FIELDS and
+  OAUTH2_REQUEST_PERMISSIONS from Wekan v2.22-2.26.
+  Thanks to GitHub user xet7.
+
+# v2.26 2019-02-25 Wekan release
+
+This release adds the following new features:
+
+- Add setting [EMAIL_NOTIFICATION_TIMEOUT](https://github.com/wekan/wekan/issues/2203).
+  Defaut 30000 ms (30s). Thanks to GitHub users ngru and xet7.
+
+and fixes the following bugs:
+
+- REVERTED in v2.27 ([Fix OAuth2 requestPermissions](https://github.com/wekan/wekan/commit/5e238bfbfea16940ae29647ae347bbdc0d78efb0).
+  This makes [Auth0 login possible](https://github.com/wekan/wekan/issues/1722)
+  with [OIDC](https://github.com/wekan/wekan/wiki/OAuth2#auth0). Needs testing.
+  Thanks to GitHub user xet7.)
+
+# v2.25 2019-02-23 Wekan release
+
+This release fixes the following bugs:
+
+- Revert file permission changes from v2.24 LDAP changes that
+  caused snap version to not build.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v2.24 2019-02-23 Wekan release
+
+This release adds the following new features:
+
+- [Add LDAP email] matching support](https://github.com/wekan/wekan-ldap/pull/39) and
+  [related env variables](https://github.com/wekan/wekan/pull/2198).
+  Thanks to GitHub user stevenpwaters.
+
+and fixes the following bugs:
+
+- REVERTED in v2.27 ([Add missing text .env to wekan/server/authentication.js](https://github.com/wekan/wekan/commit/4e6e78ccd216045e6ad41bcdab4e524f715a7eb5).
+  Thanks to Vanila Chat user .gitignore.)
+
+Thanks to above contributors, and translators for their translation.
+
+# v2.23 2019-02-17 Wekan relase
+
+This release fixes the following bugs:
+
+- [Fix authentication dropdown](https://github.com/wekan/wekan/pull/2191).
+  Thanks to Akuket.
+
+Thanks to above GitHub users for their contributions, and translators for their translations.
+
+# v2.22 2019-02-13 Wekan release
+
+This release adds the following new features:
+
+- [Kadira integration](https://github.com/wekan/wekan/issues/2152). Thanks to GavinLilly.
+- REVERTED in v2.27 (Add [configurable](https://github.com/wekan/wekan/issues/1874#issuecomment-462759627)
+  settings [OAUTH2_ID_TOKEN_WHITELIST_FIELDS and
+  OAUTH2_REQUEST_PERMISSIONS](https://github.com/wekan/wekan/commit/b66f471e530d41a3f12e4bfc29548313e9a73c35).
+  Thanks to xet7.)
+
+and fixes the following bugs:
+
+- [Fix: Remove overlap of side bar button with card/list menu button on
+   mobile browser](https://github.com/wekan/wekan/issues/2183). Thanks to xet7.
+
+Thanks to above GitHub users for their contributions, and translators for their translations.
+
+# v2.21 2019-02-12 Wekan release
+
+This release adds the following new features:
+
+- [Bump salleman-oidc to 1.0.12](https://github.com/wekan/wekan/commit/352e5c6cb07b1a09ef692af6f6c49c3b1f3e91c1). Thanks to danpatdav.
+- [Added parameters for OIDC claim mapping](https://github.com/wekan/wekan/commit/bdbbb12f967f7e4f605e6c3310290180f6c8c6d1).
+  These mapping parameters take advantage of new code in salleman-oidc 1.0.12 to override the default claim names provided by the userinfo endpoint.
+  Thanks to danpatdav.
+- [Add OIDC claim mapping parameters to docker-compose.yml/Snap/Source](https://github.com/wekan/wekan/commit/59314ab17d65e9579d2f29b32685b7777f2a06a1).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions.
+
+# v2.20 2019-02-11 Wekan release
+
+This release adds the following new features:
+
+- [Add OIDC / OAuth2 optional setting DEBUG=true to salleman-oidc and Dockerfile](https://github.com/wekan/wekan/pull/2181).
+  Thanks to danpatdav.
+- [Add OIDC / OAuth2 optional setting DEBUG=true to docker-compose.yml/Snap/Source](https://github.com/wekan/wekan/commits/8e02170dd1d5a638ba47dcca910e6eecbfd03baf).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v2.19 2019-02-09 Wekan release
+
+This release removes the following new features:
+
+- [Remove oplog from snap](https://github.com/wekan/wekan/commit/f1bd36a3b87f97927dfe60572646a457e1f7ef66). Need to think how to do it properly.
+
+Thanks to GitHub user xet7 for conrtibutions.
+
+# v2.18 2019-02-08 Wekan release
+
+This release adds the folloging new features:
+
+- [Improve Authentication: Admin Panel / Layout / Set Default Authentication / Password/LDAP](https://github.com/wekan/wekan/pull/2172). Thanks to Akuket.
+- [Add oplog to snap mongodb](https://github.com/wekan/wekan/commit/79ffb7d50202471c7b7f297286f13e66ce30922e). Thanks to xet7.
+
+and fixes the following bugs with Apache I-CLA, thanks to bentiss:
+
+- [Fix swimlanes sorting](https://github.com/wekan/wekan/pull/2174)
+  since "[Properly fix horizontal rendering on Chrome and Firefox](https://github.com/wekan/wekan/commit/7cc185ac)".
+  The rendering of the new design of the swimlanes was correct, but this
+  commit broke the reordering capability. Having the swimlane header at
+  the same level than the lists of cards makes the whole sortable
+  pattern fail.
+  - 2 solutions:
+    - revert to only have 1 div per swimlane. But this introduces [the firefox
+      bug mentioned](https://github.com/wekan/wekan/commit/7cc185ac), so not ideal
+    - force the sortable pattern to do what we want.
+  - To force the sortable pattern, we need:
+    - add in the helper a clone of the list of cards (to not just move the
+      header)
+    - make sure the placeholder never get placed between the header and the
+      list of cards in a swimlane
+    - fix the finding of the next and previous list of cards.
+    For all of this to be successful, we need to resize the swimlanes to a
+    known value. This can lead to some visual jumps with scrolling when you
+    drag or drop the swimlanea. I tried to remedy that by computing the new
+    scroll value. Still not ideal however, as there are still some jumps when
+    dropping.
+    Fixes [#2159](https://github.com/wekan/wekan/issues/2159).
+
+Thanks to above GitHub users and translators for contributions.
+
+# v2.17 2019-02-04 Wekan release
+
+This release fixes the following bugs:
+
+- [OIDC/OAuth2 BoardView Fix](https://github.com/wekan/wekan/issues/1874).
+
+Thanks to GitHub gil0109 for contributions, and translator for their translations.
+
+# v2.16 2019-02-03 Wekan release
+
+This release fixes the following bugs:
+
+- [Part 2](https://github.com/ChronikEwok/wekan/commit/9a6ac544dd5618e58ce107352124fd9b495e5c30):
+  [Fix: Not displaying card content of public board: Snap, Docker and Sandstorm Shared Wekan Board
+  Link](https://github.com/wekan/wekan/issues/1623) with
+  [code from ChronikEwok](https://github.com/ChronikEwok/wekan/commit/cad9b20451bb6149bfb527a99b5001873b06c3de).
+
+Thanks to GitHub user ChronikEwok for contributions.
+
+# v2.15 2019-02-03 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix: Not displaying card content of public board: Snap, Docker and Sandstorm Shared Wekan Board
+  Link](https://github.com/wekan/wekan/issues/1623) with
+  [code from ChronikEwok](https://github.com/ChronikEwok/wekan/commit/cad9b20451bb6149bfb527a99b5001873b06c3de).
+
+Thanks to GitHub user ChronikEwok for contributions.
+
+# v2.14 2019-02-02 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix Sandstorm export board from web](https://github.com/wekan/wekan/issues/2157).
+- [Fix Error when logging in to Wekan REST API when using Sandstorm Wekan](https://github.com/wekan/wekan/issues/1279).
+  Sandstorm API works this way: Make API key, and from that key copy API URL and API KEY to below. It saves Wekan board to file.
+  `curl http://Bearer:APIKEY@api-12345.local.sandstorm.io:6080/api/boards/sandstorm/export?authToken=#APIKEY > wekanboard.json`
+  If later API key does not work, you need to remove it and make a new one.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v2.13 2019-02-01 Wekan release
+
+This release adds the following new features with Apache I-CLA, thanks to bentiss:
+
+- [Use infinite-scrolling on lists](https://github.com/wekan/wekan/pull/2144).
+  This allows to reduce the loading time of a big board.
+  Note that there is an infinite scroll implementation in the mixins,
+  but this doesn't fit well as the cards in the list can have arbitrary
+  height.
+  The idea to rely on the visibility of a spinner is based on
+  http://www.meteorpedia.com/read/Infinite_Scrolling
+- [When writing to minicard, press Shift-Enter on minicard to go to next line
+  below](https://github.com/wekan/wekan/commit/7a35099fb9778d5f3656a57c74af426cfb20fba3),
+  to continue writing on same minicard 2nd line.
+
+Thanks to GitHub user bentiss for contributions.
+
+# v2.12 2019-01-31 Wekan release
+
+This release fixes the following bugs:
+
+- [Bumped the salleman oidc packages versions to include an upstream bug fix](https://github.com/wekan/wekan/commit/361faa6646556de68ad78dc90d9eb9f78956ce0f).
+
+Thanks to GitHub user danpatdav for contributions.
+
+# v2.11 2019-01-31 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix: Bug: Not logged in public board page has calendar](https://github.com/wekan/wekan/issues/2061). Thanks to xet7.
+
+Thanks to above GitHub users and translators for contributions.
+
+# v2.10 2019-01-30 Wekan release
+
+This release adds the following new features:
+
+- Translations: Add Macedonian. [Copied Bulgarian to Macedonian](https://github.com/wekan/wekan/commit/6e4a6515e00fe68b8615d850cfb3cb290418e176)
+  so that required changes will be faster to add. Thanks to translators and therampagerado;
+
+and fixes the following bugs:
+
+- Revert [Sandstorm API changes](https://github.com/wekan/wekan/commit/be03a191c4321c2f80116c0ee1ae6c826d882535)
+  that were done at [Wekan v2.05](https://github.com/wekan/wekan/blob/devel/CHANGELOG.md#v205-2019-01-27-wekan-release)
+  to fix #2143. Thanks to pantraining and xet7.
+
+Thanks to above GitHub users and translators for contributions.
+
+# v2.09 2019-01-28 Wekan release
+
+This release fixes the following bugs with Apache I-CLA, thanks to bentiss:
+
+- [Fix vertical automatic scrolling when opening a card](https://github.com/wekan/wekan/commit/820d3270935dc89f046144a7bbf2c8277e2484bc).
+
+Thanks to GitHub user bentiss for contributions.
+
+# v2.08 2019-01-28 Wekan release
+
+This release fixes the following bugs with Apache I-CLA, thanks to bentiss:
+
+- Make the max height of the swimlane not too big](https://github.com/wekan/wekan/commit/ae82f43078546902e199d985a922ebf7041a4917).
+  We take a full screen minus the header height;
+- [Properly fix horizontal rendering on Chrome and Firefox](https://github.com/wekan/wekan/commit/7cc185ac57c77be85178f92b1d01d46e20218948).
+  This reverts [commit 74cf9e2573](https://github.com/wekan/wekan/commit/74cf9e2573) "- Fix Firefox left-rigth scrollbar."
+  This reverts [commit 9dd8216dfb](https://github.com/wekan/wekan/commit/9dd8216dfb)
+  "- Fix cards below swimlane title in Firefox" by making
+  [previous fix](https://github.com/wekan/wekan/pull/2132/commits/f7c6b7fce237a6dbdbbd6d728cfb11ad3f4378eb)"
+  And this partially reverts [commit dd88eb4cc](https://github.com/wekan/wekan/commit/dd88eb4cc).
+  The root of the issue was that I was adding a new div and nesting
+  the list of lists in this new list. This resulted in some
+  weird behavior that Firefox could not handled properly
+  Revert to a code colser to v2.02, by just having the
+  swimlane header in a separate line, and keep only one
+  flex element.
+  Fixes #2137
+
+Thanks to GitHub user bentiss for contributions, and translators for their translations.
+
+# v2.07 2019-01-28 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix Firefox left-rigth scrollbar](https://github.com/wekan/wekan/issues/2137).
+
+Thanks to GitHub user xet7 for contributions.
+
+# v2.06 2019-01-27 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix cards below swimlane title in Firefox](https://github.com/wekan/wekan/commit/9dd8216dfb80855999998ed76d8a3c06a954a002)
+  by making [previous fix](https://github.com/wekan/wekan/pull/2132/commits/f7c6b7fce237a6dbdbbd6d728cfb11ad3f4378eb)
+  Firefox-only.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v2.05 2019-01-27 Wekan release
+
+This release fixes the following bugs partially:
+
+- Add back scrollbars that [were hidden when trying to fix another
+  bug](https://github.com/wekan/wekan/pull/2132/commits/f7c6b7fce237a6dbdbbd6d728cfb11ad3f4378eb).
+  This makes scrollbars work in Chromium/Chrome, but adds back bug to Firefox
+  that cards are below of swimlane title - this Firefox bug is fixed in Wekan v2.06.
+- [Try to have some progress on Wekan Sandstorm API](https://github.com/wekan/wekan/commit/be03a191c4321c2f80116c0ee1ae6c826d882535).
+  I did not get it fully working yet.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v2.04 2019-01-26 Wekan release
+
+This release fixes the following bugs with Apache I-CLA, thanks to bentiss:
+
+- [Bugfix for swimlanes, simplify setting color, fix rendering on Firefox](https://github.com/wekan/wekan/pull/2132).
+
+Thanks to GitHub user bentiss for contributions, and translators for their translations.
+
+# v2.03 2019-01-25 Wekan NOT RELEASED because of [bug](https://github.com/wekan/wekan/pull/2126#issuecomment-457723923) that was fixed in v2.04 above
+
+This release adds the following new features with Apache I-CLA, thanks to bentiss:
+
+- Change [Swimlane](https://github.com/wekan/wekan/issues/1688)/[List](https://github.com/wekan/wekan/issues/328)/[Card](https://github.com/wekan/wekan/issues/428)
+  color with color picker at webbrowser and [REST API](https://github.com/wekan/wekan/commit/5769d438a05d01bd5f35cd5830b7ad3c03a21ed2);
+- Lists-Color: [Only colorize the bottom border](https://github.com/wekan/wekan/commit/33977b2282d8891bf507c4d9a1502c644afd6352),
+  and make the background clearer to visually separate the header from the list of cards;
+- [Change Swimlane to Horizontal](https://github.com/wekan/wekan/commit/dd88eb4cc191a06f7eb84213b026dfb93546f245);
+- [Change IFTTT wizard color names to color picker](https://github.com/wekan/wekan/commit/4a2576fbc200d397bcf7cede45316d9fb7e520dd);
+- REST API: [Add new card to the end of the list](https://github.com/wekan/wekan/commit/6c3dbc3c6f52a42ddbeeaec9bbfcc82c1c839f7d).
+  If we keep the `0` value, the card might be inserted in the middle of the list, making it hard to find it later on.
+  Always append the card at the end of the list by setting a sort value based on the number of cards in the list.
+
+and fixes the following bugs with Apache I-CLA, thanks to bentiss:
+
+- [Fix set_board_member_permission](https://github.com/wekan/wekan/commit/082aabc7353d1fe75ccef1a7d942331be56f0838);
+- [Fix the sort field when inserting a swimlane or a list](https://github.com/wekan/wekan/commit/b5411841cf6aa33b2c0d29d85cbc795e3faa7f4f).
+  This has the side effect of always inserting the element at the end;
+- [Make sure Swimlanes and Lists have a populated sort field](https://github.com/wekan/wekan/commit/5c6a725712a443b4d03b4f86262033ddfb66bc3d).
+  When moving around the swimlanes or the lists, if one element has a sort
+  with a null value, the computation of the new sort value is aborted,
+  meaning that there are glitches in the UI.
+  This happens on the first swimlane created with the new board, or when
+  a swimlane or a list gets added through the API;
+- UI: Lists: [Make sure all lists boxes are the same height](https://github.com/wekan/wekan/commit/97d95b4bcbcab86629e368ea41bb9f00450b21f6).
+  When `Show card count` is enabled, the lists with the card counts have
+  two lines of text while the lists without have only one.
+  This results in the box around the list headers are not of the same size
+  and this is visible when setting a color to the list.
+
+Thanks to GitHub user bentiss for contributions, and translators for their translations.
+
+# v2.02 2019-01-22 Wekan release
+
+This release adds the following new features with Apache I-CLA, thanks to bentiss:
+
+- [Add per card color: Card / Hamburger menu / Set Color](https://github.com/wekan/wekan/pull/2116) with [color picker](https://github.com/wekan/wekan/pull/2117);
+- [OpenAPI and generating of REST API Docs](https://github.com/wekan/wekan/pull/1965);
+- [Allow to retrieve full export of board from the REST API](https://github.com/wekan/wekan/pull/2118) through generic authentication.
+  When the board is big, retrieving individual cards is heavy for both the server and the number of requests.
+  Allowing the API to directly call on export and then treat the data makes the whole process smoother.
+
+and adds the following new features with Apache I-CLA, thanks to xet7 and bentiss:
+
+- [Translate and add color names to IFTTT Rules dropdown](https://github.com/wekan/wekan/commit/44e4df2492b95226f1297e7f556d61b1afaab714), thanks to xet7.
+  [Fix to this feature blank item](https://github.com/wekan/wekan/pull/2119), thanks to bentiss.
+
+and adds these updates:
+
+- Update translations. Thanks to translators.
+- Added missing translation for 'days'. Thanks to Chartman123.
+
+and fixes these typos;
+
+- Fix typo, changelog year to 2019. Thanks to xorander00.
+- Fix License to 2019. Thanks to ajRiverav.
+
+Thanks to above GitHub users for their contributions.
+
+# v2.01 2019-01-06 Wekan release
+
+Update translations. Thanks to translators.
+
+# v2.00 2019-01-04 Wekan release
+
+Update translations. Thanks to translators.
+
+# v1.99 2019-01-04 Wekan release
+
+This release adds the following new features:
+
+- [IFTTT Rules improvements](https://github.com/wekan/wekan/pull/2088). Thanks to Angtrim.
+- Add [find.sh](https://github.com/wekan/wekan/blob/devel/find.sh) bash script that ignores
+  extra directories when searching. xet7 uses this a lot when developing. Thanks to xet7.
+
+Thanks to above GitHub users for their contributions.
+
+# v1.98 2019-01-01 Wekan release
+
+This release adds the following new features:
+
+- Add optional Nginx reverse proxy config to docker-compose.yml and nginx directory. Thanks to MyTheValentinus.
+
+and fixes the following bugs:
+
+- docker-compose.yml back to MongoDB 3.2.21 because 3.2.22 MongoDB container does not exist yet. Thanks to xet7.
+- [Mobile fixes](https://github.com/wekan/wekan/pull/2084), thanks to hupptechnologies:
+  - Move home button / avatar bar from bottom to top. So at top first is home button / avatar, then others.
+  - When clicking Move Card, go to correct page position. Currently it's at empty page position, and there is
+    need to scroll page up to see Move Card options. It should work similarly like Copy Card, that is visible.
+  - Also check that other buttons go to visible page.
+
+Thanks to above GitHub users for their contributions.
+
+# v1.97 2018-12-26 Wekan release
+
+This release adds the following new features:
+
+- Upgrade to Node 8.15.0 and MongoDB 3.2.22.
+- Stacksmith: back to Meteor 1.6.x based Wekan, because Meteor 1.8.x based is currently broken.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.96 2018-12-24 Wekan release
+
+This release adds the following new features:
+
+- [Combine all docker-compose.yml files](https://github.com/wekan/wekan/commit/3f948ba49ba7266c436ff138716bdcae9e879903).
+
+and tries to fix following bugs:
+
+- Revert "Improve authentication", remove login dropdown and "Default Authentication Method" that were added
+  in Wekan v1.95 because login did not work with email address.
+  It was later found that login did work with username, so later this could be fixed and added back.
+- Fixes to docker-compose.yml so that Wekan Meteor 1.6.x version would work.
+  Most likely Meteor 1.8.x version is still broken.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.95 2018-12-21 Wekan release
+
+This release adds the following new features:
+
+- [Improve authentication](https://github.com/wekan/wekan/pull/2065): remove login dropdown,
+  and add setting `DEFAULT_AUTHENTICATION_METHOD=ldap` or
+  `sudo snap set wekan default-authentication-method='ldap'`. Thanks to Akuket. Closes wekan/wekan-ldap#31
+  NOTE: This was reverted in Wekan v1.96 because login did not work with email address.
+  It was later found that login did work with username, so later this could be fixed and added back.
+- [Drag handles and long press on mobile when using desktop mode of mobile
+  browser](https://github.com/wekan/wekan/pull/2067). Thanks to hupptechnologies.
+- Upgrade to node v8.14.1 . Thanks to xet7.
+
+Thanks to above GitHub users for their contributions.
+
+# v1.94 2018-12-18 Wekan release
+
+This release adds the following new features:
+
+- Admin Panel / Layout / Custom HTML after `<body>` start, and Custom HTML before `</body>` end.
+  In progress, does not work yet. Thanks to xet7.
+- Add Bitnami Stacksmith. In progress test version, that does work, but is not released yet. Thanks to j-fuentes.
+
+Thanks to above GitHub users for their contributions.
+
+# v1.93 2018-12-16 Wekan release
+
+This release adds the following new features:
+
+- In translations, only show name "Wekan" in Admin Panel Wekan version.
+  Elsewhere use general descriptions for whitelabeling.
+
+Thanks to GitHub user xet7 and translators for their contributions.
+
+# v1.92 2018-12-16 Wekan release
+
+This release fixes the following bugs:
+
+- Fix [Popup class declares member name _current but use current instead](https://github.com/wekan/wekan/issues/2059). Thanks to peishaofeng.
+- Fix [Card scrollbar ignores mousewheel](https://github.com/wekan/wekan-scrollbar/commit/94a40da51627c6322afca50a5b1f4aa55c7ce7bf). Thanks to rinnaz and xet7. Closes #2058
+- Fix [favicon paths for non-suburl cases](https://github.com/wekan/wekan/commit/c1733fc89c4c73a1ab3f4054d0a9ebff7741a804). Thanks to xet7. Related #1692
+
+Thanks to above GitHub users for their contributions.
+
+# v1.91 2018-12-15 Wekan release
+
+This release fixes the following bugs:
+
+- [Add back mquandalle:perfect-scrollbar package](https://github.com/wekan/wekan/issues/2057)
+  so that Firefox and Chrome stop complaining in browser dev tools console.
+
+Thanks to GitHub users uusijani and xet7 for their contributions.
+
+# v1.90 2018-12-15 Wekan release
+
+This release fixes the following bugs:
+
+- [Remove not working duplicate saveMailServerInfo](https://github.com/wekan/wekan/commit/ab031d9da134aa13490a26dbe97ad2d7d01d534a),
+  to remove error from browser dev tools console.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.89 2018-12-15 Wekan release
+
+This release adds the following new features:
+
+- Admin Panel / Layout / Custom Product Name [now changes webpage title](https://github.com/wekan/wekan/commit/dbb1a86ca377e551063cc04c5189fad4aa9148c0).
+  Related #1196
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.88 2018-12-14 Wekan release
+
+This release fixes the following bugs:
+
+- Fix: [Scrollbar used](https://github.com/wekan/wekan/issues/2056) [remote file from CDN](https://github.com/MaazAli/Meteor-Malihu-Custom-Scrollbar/blob/master/jquery.mCustomScrollbar.js#L50),
+  so forked package to https://github.com/wekan/wekan-scrollbar and included
+  non-minified file locally to Wekan, so that using scrollbar works without direct connection
+  to Internet. Wekan should not load any external files by default, as was case before
+  new scrollbar, and is again now [after this fix](https://github.com/wekan/wekan/commit/c546464d9f56117a8bf580512cd62fc1102559c3).
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.87 2018-12-13 Wekan release
+
+This release fixes the following bugs:
+
+- Fix Reference error.
+
+Thanks to GitHub user Akuket for contributions.
+
+# v1.86 2018-12-13 Wekan release
+
+This release fixes the following bugs:
+
+- Fix [Cannot login with new LDAP account when auto-registration disabled (request invitation code)](https://github.com/wekan/wekan-ldap/issues/29);
+- Fix [Unable to create new account from LDAP](https://github.com/wekan/wekan-ldap/issues/32).
+
+Thanks to GitHub user Akuket for contributions.
+
+# v1.85 2018-12-09 Wekan release
+
+This release fixes the following bugs:
+
+- Fix [Clicking the scrollbar closes the card on Chrome](https://github.com/wekan/wekan/issues/1404)
+  by changing [mquandalle:perfect-scrollbar to malihu-jquery-custom-scrollbar](https://github.com/wekan/wekan/pull/2050).
+  that works also when clicking scrollbar in Chrome. Also added back required packages that were removed in PR.
+
+Thanks to GitHub users hupptechnologies and xet7 for their contributions.
+
+# v1.84 2018-12-07 Wekan release
+
+This release fixes the following bugs:
+
+- Fix 2/8: IFTTT Rule action/trigger ["Remove all members from the card"](https://github.com/wekan/wekan/issues/1972).
+
+Thanks to GitHub user BurakTuran9 for contributions.
+
+# v1.83 2018-12-06 Wekan release
+
+This release fixes the following bugs:
+
+- Fix 1/8: IFTTT Rule action/trigger [When a checklist is completed](https://github.com/wekan/wekan/issues/1972).
+  And partial incomplete fix to when all of checklist is set as uncompleted. Help in fixing welcome.
+
+Thanks to GitHub users BurakTuran9 and xet7 for their contributions.
+
+# v1.82 2018-12-05 Wekan release
+
+This release fixes the following bugs:
+
+- Partially #2045 revert [Improve authentication](https://github.com/wekan/wekan/issues/2016),
+  adding back password/LDAP dropdown, because login did now work.
+  NOTE: This was added in v1.71, reverted at v1.73 because login did not work, added back at v1.79,
+  and then reverted partially at v1.82 because login did not work.
+  Related LDAP logout timer does not work yet.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.81 2018-12-04 Wekan release
+
+This release fixes the following bugs:
+
+- Remove extra commas `,` and add missing backslash `\`.
+  Maybe after that login, logout and CORS works.
+
+Thanks to GitHub user xet7 for contributions.
+
+Related #2045,
+related wekan/wekan-snap#69
+
+# v1.80 2018-12-03 Wekan release
+
+This release adds the following new features:
+
+- Upgrade Node from v8.12 to v8.14
+
+and fixes the following bugs:
+
+- Revert non-working architectures that were added at v1.79, so now Wekan is just amd64 as before.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.79 2018-12-03 Wekan release
+
+This release adds the following new features:
+
+- [Improve authentication, removing Login password/LDAP dropdown](https://github.com/wekan/wekan/issues/2016).
+  NOTE: This was added in v1.71, then reverted at v1.73 because login did not work, and after fix added back at v1.79.
+  Thanks to Akuket.
+- Thanks to xet7:
+  - Build snap also on i386, armhf and arm64. Ignore if it fails. More fixes will be added later.
+  - Add CORS https://enable-cors.org/server_meteor.html to Standalone Wekan settings.
+  - Add missing LDAP and TIMER environment variables.
+
+and fixes the following bugs:
+
+- Fix: Message box for deleting subtask unreachable.
+  Thanks to hupptechnologies. Closes #1800
+- Fix wrong dates in ChangeLog. Thanks to kelvinhammond.
+
+Thanks to above GitHub users for their contributions.
+
+# v1.78 2018-11-20 Wekan release
+
+- Update translations (de).
+
+# v1.77 2018-11-20 Wekan release
+
+- Update version number. Trying to get Snap automatic review working, so that
+  it would accept new Wekan release.
+
+# v1.76 2018-11-20 Wekan release
+
+This release adds the following new features:
+
+- Add [LDAP_FULLNAME_FIELD](https://github.com/wekan/wekan-ldap/issues/10) to
+  [configs](https://github.com/wekan/wekan/commit/8e3f53021775069dba125efd4b7200d0d70a1ed1)
+  and other options that were not in all config files. Thanks to alkemyst and xet7.
+
+and fixes the following bugs:
+
+- Fix: When saving Custom Layout, save also SMTP settings. Thanks to xet7.
+
+Thanks to above GitHub users for their contributions.
+
+# v1.75 2018-11-20 Wekan release
+
+This release adds the following new features:
+
+- Admin Panel / Layout: Hide Logo: Yes / No. This does hide Wekan logo on Login page and Board page. Thanks to xet7.
+
+and fixes the following bugs:
+
+- [Fix Snap database-list-backups command](https://github.com/wekan/wekan-snap/issues/26). Thanks to WaryWolf.
+
+Thanks to above GitHub users for their contributions.
+
+# v1.74.1 2018-11-18 Wekan Edge release
+
+This release adds the following new features:
+
+- [Full Name from LDAP server via environment variable](https://github.com/wekan/wekan-ldap/pull/18).
+
+Thanks to GitHub user alkemyst for contributions.
+
+# v1.74 2018-11-17 Wekan release
+
+- Update version number to get this released to snap. Thanks to xet7.
+
+# v1.73 2018-11-17 Wekan release
+
+This release fixes the following bugs:
+
+- Revert Improve authentication to [fix Login failure](https://github.com/wekan/wekan/issues/2004).
+  NOTE: This was added in v1.71, then reverted at v1.73 because login did not work, and after fix added back at v1.79.
+
+Thanks to GitHub users Broxxx3 and xet7 for their contributions.
+
+# v1.72 2018-11-17 Wekan release
+
+- Update translations (fi).
+
+# v1.71 2018-11-17 Wekan release
+
+This release adds the following new features and bugfixes:
+
+- Add languages, thanks to translators:
+  - Danish
+  - Swahili / Kiswahili
+- Rename Recycle Bin to Archive. Thanks to xet7.
+- Update readme for clarity. Thanks to xet7.
+- [Improve authentication](https://github.com/wekan/wekan/pull/2003), thanks to Akuket:
+  - Removing the select box: Now it just checks the user.authenticationMethod value to choose the authentication method.
+  - Adding an option to choose the default authentication method with env var.
+  - Bug fix that allowed a user to connect with the password method while his user.authenticationMethod is "ldap" for example.
+  - Adding a server-side method which allows disconnecting a user after a delay defined by env vars.
+  - NOTE: This was added in v1.71, then reverted at v1.73 because login did not work, and after fix added back at v1.79.
+- [Improve shell scripts](https://github.com/wekan/wekan/pull/2002). Thanks to warnerjon12.
+
+Thanks to above GitHub users and translators for their contributions.
+
+# v1.70 2018-11-09 Wekan release
+
+This release adds the following new features:
+
+- [Auto create Custom Field to all cards. Show Custom Field Label on
+   minicard](https://github.com/wekan/wekan/pull/1987).
+
+and fixes the following bugs:
+
+- Some fixes to Wekan import, thanks to xet7:
+  - isCommentOnly and isNoComments are now optional
+  - Turn off import error checking, so something is imported anyway, and import does not stop at error.
+  - Now most of Sandstorm export do import to Standalone Wekan, but some of imported cards, dates etc are missing.
+  - Sandstorm Import Wekan board warning messages are now translateable. But bug "Board not found" still exists.
+- LDAP: Added INTERNAL_LOG_LEVEL. Fix lint and ldap group filter options. Thanks to Akuket.
+
+Thanks to above mentioned GitHub users for their contributions.
+
+# v1.69 2018-11-03 Wekan release
+
+- Update translations.
+
+# v1.68 2018-11-03 Wekan release
+
+- Update translations.
+
+# v1.67 2018-11-03 Wekan release
+
+This release adds the following new features to all Wekan platforms:
+
+- Add Hindi language. Thanks to saurabharch.
+
+and hides the following features at Sandstorm:
+
+- Hide Linked Card and Linked Board on Sandstorm, because they are only
+  useful when having multiple boards, and at Sandstorm
+  there is only one board per grain. Thanks to ocdtrekkie and xet7. Closes #1982
+
+Thanks to above mentioned GitHub users for their contributions.
+
+# v1.66 2018-10-31 Wekan release
+
+This release fixes the following bugs:
+
+- docker-compose.yml and docker-compose-build.yml, thanks to xet7:
+  - Remove single quotes, because settings are quoted automatically.
+  - Comment out most settings that have default values.
+- Fix typos in CHANGELOG.md, thanks to Hillside502 and loginKing.
+- [Fix typo about ldaps](https://github.com/wekan/wekan/pull/1980).
+  Documentation said to set LDAP_ENCRYPTION to true if we want to use
+  ldaps, but the code in wekan-ldap does not check if it is set to true,
+  but if the value equals to 'ssl' instead. Thanks to imkwx.
+
+Thanks to above mentioned GitHub users for their contributions.
+
+# v1.65 2018-10-25 Wekan release
+
+This release adds the [following new features](https://github.com/wekan/wekan/pull/1967), with Apache I-CLA:
+
+- UI: list headers: show the card count smaller in grey color below list name
+- UI: lists: only output the number of cards for each swimlane
+
+Thanks to GitHub user bentiss for contributions.
+
+# v1.64.2 2018-10-25 Wekan Edge release
+
+This release fixes the following bugs:
+
+- Additional fix to [Impossible to connect to LDAP if UserDN contain space(s)](https://github.com/wekan/wekan/issues/1970).
+
+Thanks to GitHub users Akuket and xet7 for their contributions.
+
+# v1.64.1 2018-10-25 Wekan Edge release
+
+This release fixes the following bugs:
+
+- [Impossible to connect to LDAP if UserDN contain space(s)](https://github.com/wekan/wekan/issues/1970).
+
+Thanks to GitHub users Akuket and xet7 for their contributions.
+
+# v1.64 2018-10-24 Wekan release
+
+- Update translations.
+
+# v1.63 2018-10-24 Wekan release
+
+This release adds the following new features:
+
+REST API: [Allow to remove the full list of labels/members through the API](https://github.com/wekan/wekan/pull/1968), with Apache I-CLA:
+
+- [Models: Cards: an empty string in members or label deletes the list](https://github.com/wekan/wekan/commit/e5949504b7ed42ad59742d2a0aa001fe6c762873).
+  There is currently no way to remove all members or all labels attached
+  to a card. If an empty string is provided, we can consider as a hint to
+  remove the list from the card.
+- [Models: Cards: allow singletons to be assigned to members and labelIds](https://github.com/wekan/wekan/commit/2ce1ba37a1d0a09f8b3d2a1db4c8a11d1f98caa0).
+  If we need to set only one member or one label, the data provided will
+  not give us an array, but the only element as a string.
+  We need to detect that and convert the parameter into an array.
+
+Thanks to GitHub user bentiss for contributions.
+
+# v1.62 2018-10-24 Wekan release
+
+- Fix missing dropdown arrow on Chrome. Thanks to xet7. Closes #1964
+
+# v1.61 2018-10-24 Wekan release
+
+- Fix lint error. Thanks to xet7.
+
+# v1.60 2018-10-24 Wekan release
+
+- Update translations.
+
+# v1.59 2018-10-24 Wekan release
+
+This release adds the beginning of following new features:
+
+- Custom Product Name in Admin Panel / Layout. In Progress, setting does not affect change UI yet. Thanks to xet7.
+
+and fixes the following bugs:
+
+- Fix LDAP User Search Scope. Thanks to Vnimos and Akuket. Related #119
+- Fix Save Admin Panel SMTP password. Thanks to saurabharch and xet7. Closes #1856
+
+Thanks to above mentioned GitHub users for contributions.
+
+# v1.58 2018-10-23 Wekan release
+
+This release adds the [following new features and fixes](https://github.com/wekan/wekan/pull/1962), with Apache I-CLA:
+
+- Also export the cards created with an older wekan instance (without linked cards) (related to #1873);
+- Fix the GET customFields API that was failing;
+- Allow to directly overwrite the members of cards and boards with a PUT call (this avoids to do multiple calls to add and remove users);
+- Allow to change the swimlane of a card from the API.
+
+Thanks to GitHub user bentiss for contributions.
+
+# v1.57 2018-10-23 Wekan release
+
+This release adds the following new features:
+
+- Merge edge into stable. This brings LDAP, Rules, Role "No Comments", etc.
+- Go back to Meteor 1.6.x and MongoDB 3.2.21 that works in Snap etc.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.55.1 2018-10-16 Wekan Edge release
+
+This release adds the following new features:
+
+- [Automatically close the sidebar](https://github.com/wekan/wekan/pull/1954).
+
+and fixes the following bugs:
+
+- [LDAP: Include missing LDAP PR so that LDAP works](https://github.com/wekan/wekan-ldap/pull/6);
+- [Improve notifications](https://github.com/wekan/wekan/pull/1948);
+- [Fix deleting Custom Fields, removing broken references](https://github.com/wekan/wekan/issues/1872);
+- [Fix vertical text for swimlanes in IE11](https://github.com/wekan/wekan/issues/1798);
+- [Update broke the ability to mute notifications](https://github.com/wekan/wekan/pull/1954).
+
+Thanks to GitHub users Akuket, Clement87 and tomodwyer for their contributions.
+
+# v1.53.9 2018-10-11 Wekan Edge release
+
+This release adds the following new features:
+
+- docker-compose.yml in this Edge branch now works with Wekan Edge + Meteor 1.8.1-beta.0 + MongoDB 4.0.3;
+- [Snap is still broken](https://forum.snapcraft.io/t/how-to-connect-to-localhost-mongodb-in-snap-apparmor-prevents/7793/2). Please use latest Snap release on Edge branch, until this is fixed.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.53.8 2018-10-10 Wekan Edge release
+
+This release tries to fix the following bugs:
+
+- Try to fix Docker.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.53.7 2018-10-10 Wekan Edge release
+
+This release adds the following new features:
+
+- Try MongoDB 4.0.3
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.53.6 2018-10-10 Wekan Edge release
+
+This release adds the following new features:
+
+- [Add LDAP to Snap Help](https://github.com/wekan/wekan/commit/809c8f64f69721d51b7d963248a77585867fac53).
+
+and tries to fix the following bugs:
+
+- Try to fix snap.
+
+Thanks to GitHub users Akuket and xet7 for their contributions.
+
+# v1.53.5 2018-10-10 Wekan Edge relase
+
+This release tries to fix the following bugs:
+
+- Try to fix snap.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.53.4 2018-10-10 Wekan Edge release
+
+This release adds the following new features:
+
+- [Upgrade Hoek](https://github.com/wekan/wekan/commit/0b971b6ddb1ffc4adad6b6b09ae7f42dd376fe2c).
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.53.3 2018-10-10 Wekan Edge release
+
+This release adds the following new features:
+
+- [Upgrade](https://github.com/wekan/wekan/issues/1522) to [Meteor](https://blog.meteor.com/meteor-1-8-erases-the-debts-of-1-7-77af4c931fe3) [1.8.1-beta.0](https://github.com/meteor/meteor/issues/10216).
+  with [these](https://github.com/wekan/wekan/commit/079e45eb52a0f62ddb6051bf2ea80fac8860d3d5)
+  [commits](https://github.com/wekan/wekan/commit/dd47d46f4341a8c4ced05749633f783e88623e1b). So now it's possible to use MongoDB 2.6 - 4.0.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.53.2 2018-10-10 Wekan Edge release
+
+This release adds the following new features:
+
+- [Add LDAP package to Docker and Snap](https://github.com/wekan/wekan/commit/f599391419bc7422a6ead52cdefc7d380e787897).
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.53.1 2018-10-10 Wekan Edge release
+
+This release adds the following new features:
+
+- [LDAP](https://github.com/wekan/wekan/commit/288800eafc91d07f859c4f59588e0b646137ccb9).
+  Please test and [add info about bugs](https://github.com/wekan/wekan/issues/119);
+- [Add LDAP support and authentications dropdown menu on login page](https://github.com/wekan/wekan/pull/1943);
+- [REST API: Get cards by swimlane id](https://github.com/wekan/wekan/pull/1944). Please [add docs](https://github.com/wekan/wekan/wiki/REST-API-Swimlanes).
+
+and fixes the following bugs:
+
+- [OpenShift: Drop default namespace value and duplicate WEKAN_SERVICE_NAME parameter.commit](https://github.com/wekan/wekan/commit/fcc3560df4dbcc418c63470776376238af4f6ddc);
+- [Fix Card URL](https://github.com/wekan/wekan/pull/1932);
+- [Add info about root-url to GitHub issue template](https://github.com/wekan/wekan/commit/4c0eb7dcc19ca9ae8c5d2d0276e0d024269de236);
+- [Feature rules: fixes and enhancements](https://github.com/wekan/wekan/pull/1936).
+
+Thanks to GitHub users Akuket, Angtrim, dcmcand, lberk, maximest-pierre, InfoSec812, schulz and xet7 for their contributions.
+
+# v1.52.1 2018-10-02 Wekan Edge release
+
+This release adds the following new features:
+
+- REST API: [Add member with role to board. Remove member from board](https://github.com/wekan/wekan/commit/33caf1809a459b136b671f7061f08eb5e8d5e920).
+  [Docs](https://github.com/wekan/wekan/wiki/REST-API-Role). Related to [role issue](https://github.com/wekan/wekan/issues/1861).
+
+and reverts previous change:
+
+- OAuth2: [Revert Oidc preferred_username back to username](https://github.com/wekan/wekan/commit/33caf1809a459b136b671f7061f08eb5e8d5e920).
+  This [does not fix or break anything](https://github.com/wekan/wekan/issues/1874#issuecomment-425179291),
+  Oidc already works with [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper-provider-app).
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.51.2 2018-09-30 Wekan Edge release
+
+This release adds the following new features:
+
+- [REST API: Change role of board member](https://github.com/wekan/wekan/commit/51ac6c839ecf2226b2a81b0d4f985d3b942f0938).
+  Docs: https://github.com/wekan/wekan/wiki/REST-API-Role
+
+Thanks to GitHub users entrptaher and xet7 for their contributions.
+
+# v1.51.1 2018-09-28 Wekan Edge release
+
+This release adds the following new features:
+
+- [Add CAS with attributes](https://github.com/wekan/wekan/commit/bd6e4a351b984b032e17c57793a70923eb17d8f5);
+- [Move Add Board button to top left, so there is no need to scroll to bottom when there is a lot of boards](https://github.com/wekan/wekan/commit/fb46a88a0f01f7f74ae6b941dd6f2060e020f09d).
+
+Thanks to GitHub users ppoulard and xet7 for their contributions.
+
+# v1.50.3 2018-09-23 Wekan Edge release
+
+This release tries to fix the following bugs:
+
+- [Remove "Fix Cannot setup mail server via snap variables"](https://github.com/wekan/wekan/commit/6d88baebc7e297ffdbbd5bb6971190b18f79d21f)
+  to see does Wekan Snap start correctly after removing it.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.50.2 2018-09-23 Wekan Edge release
+
+This release tries to fix the following bugs:
+
+- Build Wekan and release again, to see does it work.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.50.1 2018-09-22 Wekan Edge release
+
+This release adds the following new features:
+
+- [Change from Node v8.12.0 prerelease to use official Node v8.12.0](https://github.com/wekan/wekan/commit/7ec7a5f27c381e90f3da6bddc3773ed87b1c1a1f).
+
+and fixes the following bugs:
+
+- [Fix Dockerfile Meteor install by changing tar to bsdtar](https://github.com/wekan/wekan/commit/1bad81ca86ca87c02148764cc03a3070882a8a33);
+- Add [npm-debug.log and .DS_Store](https://github.com/wekan/wekan/commit/44f4a1c3bf8033b6b658703a0ccaed5fdb183ab4) to .gitignore;
+- [Add more debug log requirements to GitHub issue template](https://github.com/wekan/wekan/commit/1c4ce56b0f18e00e01b54c7059cbbf8d3e196154);
+- [Add default Wekan Snap MongoDB bind IP 127.0.0.1](https://github.com/wekan/wekan/commit/6ac726e198933ee41c129d22a7118fcfbf4ca9a2);
+- [Fix Feature Rules](https://github.com/wekan/wekan/pull/1909);
+- [Fix Cannot setup mail server via snap variables](https://github.com/wekan/wekan/issues/1906);
+- [Try to fix OAuth2: Change oidc username to preferred_username](https://github.com/wekan/wekan/commit/734e4e5f3ff2c3dabf94c0fbfca561db066c4565).
+
+Thanks to GitHub users Angtrim, maurice-schleussinger, suprovsky and xet7 for their contributions.
+
+# v1.49.1 2018-09-17 Wekan Edge release
+
+This release adds the following new features:
+
+- Change from Node v8.12.0 prerelease to use official Node v8.12.0.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.49 2018-09-17 Wekan release
+
+This release fixes the following bugs:
+
+- Fix lint errors.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.48 2018-09-17 Wekan release
+
+This release removes the following new features:
+
+- Remove IFTTT rules, until they are fixed.
+- Remove OAuth2, until it is fixed.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.47 2018-09-16 Wekan release
+
+This release adds the following new features:
+
+- [IFTTT Rules](https://github.com/wekan/wekan/pull/1896). Useful to automate things like
+  [adding labels, members, moving card, archiving them, checking checklists etc](https://github.com/wekan/wekan/issues/1160).
+  Please test and report bugs. Later colors need to be made translatable.
+
+Thanks to GitHub users Angtrim and xet7 for their contributions.
+
+# v1.46 2018-09-15 Wekan release
+
+This release adds the following new features:
+
+- [Upgrade MongoDB to 3.2.21](https://github.com/wekan/wekan/commit/0cb3aee803781e4241c38a3e1e700703d063035a);
+- [Add source-map-support](https://github.com/wekan/wekan/issues/1889);
+- [Allow Announcement to be markdown](https://github.com/wekan/wekan/issues/1892).
+  Note: xet7 did not yet figure out how to keep announcement on one line
+  when markdown was added, so now Font Awesome icons are above and below.
+
+and fixes the following bugs:
+
+- [Turn of http/2 in Caddyfile](https://github.com/wekan/wekan/commit/f1ab46d5178b6fb7e9c4e43628eec358026d287a)
+  so that Firefox Inspect Console does not [show errors about wss](https://github.com/wekan/wekan/issues/934)
+  websocket config. Chrome web console supports http/2.
+  Note: If you are already using Caddy and have modified your Caddyfile, you need to edit your Caddyfile manually.
+- [Partially fix: Cannot move card from one swimline to the other if moving in the same list](https://github.com/wekan/wekan/issues/1887);
+- [Fix: Linking cards from empty board is possible and makes current board not load anymore](https://github.com/wekan/wekan/issues/1885).
+
+Thanks to GitHub users andresmanelli, HLFH and xet7 for their contributions.
+
+# v1.45 2018-09-09 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix lint error](https://github.com/wekan/wekan/commit/45c0343f45b4cfc06d83cf357ffb50d6fca2f23b).
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.44 2018-09-09 Wekan release
+
+This release adds the following new features:
+
+- REST API: [Add startAt/dueAt/endAt etc](https://github.com/wekan/wekan/commit/1e0fdf8abc10130ea3c50b13ae97396223ce7fa9).
+  Docs at https://github.com/wekan/wekan/wiki/REST-API-Cards
+- [Fix cards export and add customFields export](https://github.com/wekan/wekan/pull/1886).
+
+Thanks to GitHub users ymeramees and xet7 for their contributions.
+
+# v1.43 2018-09-06 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix "No Comments" permission on Wekan and Trello import](https://github.com/wekan/wekan/commit/0a001d505d81961e6bd6715d885fffee0adb702d).
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.42 2018-09-06 Wekan release
+
+This release adds the following new features:
+
+- REST API: [Create board options to be modifiable](https://github.com/wekan/wekan/commit/9cea76e4efaacaebcb2e9f0690dfeb4ef6d62527),
+  like permissions, public/private board - now private by default,
+  and board background color.
+  Docs at https://github.com/wekan/wekan/wiki/REST-API-Boards
+- [Add swimlaneId in activity. Create default swimlaneId in API](https://github.com/wekan/wekan/pull/1876).
+
+Thanks to GitHub users andresmanelli and xet7 for their contributions.
+
+# v1.41 2018-09-05 Wekan release
+
+This release tries to fix the following bugs:
+
+- [Try to fix Wekan Sandstorm API](https://github.com/wekan/wekan/issues/1279#issuecomment-418440401).
+
+Thanks to GitHub users ocdtrekkie and xet7 for their contributions.
+
+# v1.40 2018-09-04 Wekan release
+
+This release adds the following new features:
+
+- [Add permission "No comments"](https://github.com/wekan/wekan/commit/77efcf71376d3da6c19ad1a4910567263e83c0ca).
+  It is like normal user, but [does not show comments and activities](https://github.com/wekan/wekan/issues/1861).
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.39 2018-08-29 Wekan release
+
+This release fixes the following bugs:
+
+- [Only allow ifCanModify users to add dates on cards](https://github.com/wekan/wekan/pull/1867).
+
+Thanks to GitHub user rjevnikar for contributions.
+
+# v1.38 2018-08-29 Wekan release
+
+This release adds the following new features:
+
+- Add [msavin:userCache](https://github.com/msavin/userCache) to speedup Wekan.
+  See [meteor forums post](https://forums.meteor.com/t/introducing-a-new-approach-to-meteor-user-this-simple-trick-can-save-you-millions-of-database-requests/45336/7).
+
+and fixes the following bugs:
+
+- [Fix Delete Board](https://github.com/wekan/wekan/commit/534b20fedac9162d2d316bd74eff743d636f2b3d).
+
+Thanks to GitHub users msavin, rjevnikar and xet7 for their contributions.
+
+# v1.37 2018-08-28 Wekan release
+
+This release fixes the following bugs:
+
+- [Add Missing Index on cards.parentId since Swimlane integration
+  to speedup Wekan](https://github.com/wekan/wekan/issues/1863);
+- [Update OpenShift template to add Route and parameterize](https://github.com/wekan/wekan/pull/1865);
+- [Fix typos in Wekan snap help](https://github.com/wekan/wekan/commit/0c5fc6d7fd899a6bc67a446ab43e53290d8571e4).
+
+Thanks to GitHub users Clement87, InfoSec812 and xet7 for their contributions.
+
+# v1.36 2018-08-25 Wekan release
+
+This release adds the following new features:
+
+- [OAuth2 Login on Standalone Wekan](https://github.com/wekan/wekan/wiki/OAuth2). For example, Rocket.Chat can provide OAuth2 login to Wekan.
+  Also, if you have Rocket.Chat using LDAP/SAML/Google/etc for logging into Rocket.Chat, then same users can login to Wekan when
+  Rocket.Chat is providing OAuth2 login to Wekan.
+
+and fixes the following bugs:
+
+- [Move labels back to original place at minicard](https://github.com/wekan/wekan/issues/1842);
+- [Fix typos in security documentation](https://github.com/wekan/wekan/pull/1857).
+
+Thanks to GitHub users hever, salleman33, tlevine and xet7 for their contributions.
+
+# v1.35 2018-08-23 Wekan release
+
+This release adds the following new features:
+
+Add Caddy plugins:
+- [http.filter](https://caddyserver.com/docs/http.filter)
+  for changing Wekan UI on the fly, for example custom logo,
+  or changing to all different CSS file to have custom theme;
+- [http.ipfilter](https://caddyserver.com/docs/http.ipfilter)
+  to block requests by ip address;
+- [http.realip](https://caddyserver.com/docs/http.realip)
+  for showing real X-Forwarded-For IP to behind proxy;
+- Turn off Caddy telemetry.
+
+Add configuring webhooks:
+- [Make the attributes that the webhook sends configurable](https://github.com/wekan/wekan/pull/1852).
+
+Thanks to Caddy contributors, and Github users omarsy and xet7 for their contributions.
+
+# v1.34 2018-08-22 Wekan release
+
+This release add the following new features:
+
+- [Add Favicon for pinned tab on Safari browser](https://github.com/wekan/wekan/issues/1795).
+
+and fixes the following bugs:
+
+- [Restored SMTP settings at Admin Panel, and disabled showing password](https://github.com/wekan/wekan/issues/1790);
+- [Move color labels on minicard to bottom of minicard](https://github.com/wekan/wekan/issues/1842);
+- [Fix and improve linked cards](https://github.com/wekan/wekan/pull/1849);
+- [Allow Sandstorm to serve Wekan HTTP API](https://github.com/wekan/wekan/pull/1851);
+
+Thanks to GitHub users andresmanelli, ocdtrekkie, therampagerado, woodyart and xet7 for their contributions.
+
+# v1.33 2018-08-16 Wekan release
+
+This release fixes the following bugs:
+
+- [Change default value of label ids](https://github.com/wekan/wekan/pull/1837).
+
+Thanks to GitHub user omarsy for contributions.
+
+# v1.32 2018-08-16 Wekan release
+
+This release fixes the following bugs:
+
+- [Content Policy: Allow inline scripts, otherwise there is errors in browser/inspect/console](https://github.com/wekan/wekan/commit/807c6ce09e4b5d49049d343d73bbca24fa84d527);
+- [Use only framing policy, not all of content policy](https://github.com/wekan/wekan/commit/b3005f828dbf69bdf174d4bcd7654310fa9e0968);
+- [Set default matomo settings to disabled](https://github.com/wekan/wekan/commit/807c6ce09e4b5d49049d343d73bbca24fa84d527);
+- Fix [hidden](https://github.com/wekan/wekan/commit/be00465e67931f2a5655ed47f6e075ed1c589f54)
+  [system](https://github.com/wekan/wekan/commit/9fc3de8502919f9aeb18c9f8ea3b0678b66ce176) [messages](https://github.com/wekan/wekan/issues/1830);
+- Fix [Requested By](https://github.com/wekan/wekan/commit/e55d7e4f72a4b425c4aca5ba04a7be1fc642649b) and
+  [Assigned By](https://github.com/wekan/wekan/commit/5c33a8534186920be642be8e2ac17743a54f16db) [fields](https://github.com/wekan/wekan/issues/1830);
+- [Fix Date and Time Formats are only US in every language](https://github.com/wekan/wekan/commit/b3005f828dbf69bdf174d4bcd7654310fa9e0968).
+
+Thanks to GitHub users andresmanelli and xet7 for their contributions.
+
+# v1.31 2018-08-14 Wekan release
+
+This release fixes the following bugs:
+
+- [Export of Board does not work on Docker](https://github.com/wekan/wekan/issues/1820).
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.30 2018-08-14 Wekan release
+
+This release add the following new features:
+
+- [When Content Policy is enabled, allow one URL to have iframe that embeds Wekan](https://github.com/wekan/wekan/commit/b9929dc68297539a94d21950995e26e06745a263);
+- [Add option to turn off Content Policy](https://github.com/wekan/wekan/commit/b9929dc68297539a94d21950995e26e06745a263);
+- [Allow always in Wekan markdown `<img src="any-image-url-here">`](https://github.com/wekan/wekan/commit/b9929dc68297539a94d21950995e26e06745a263).
+
+and fixes the following bugs:
+
+- [Fix Import from Trello error 400](https://github.com/wekan/wekan/commit/2f557ae3a558c654cc6f3befff22f5ee4ea6c3d9).
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.29 2018-08-12 Wekan release
+
+This release fixes the following bugs:
+
+- [Revert Fix lint errors, that caused breakage](https://github.com/wekan/wekan/commit/b015b5b7240f5fb5a715843dce5d35907345eb4a).
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.28 2018-08-12 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix lint errors](https://github.com/wekan/wekan/commit/f5515cb95fc93882e5e1098d6043267b9260b9d7).
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.27 2018-08-12 Wekan release
+
+This release add the following new features:
+
+- [Linked Cards and Linked Boards](https://github.com/wekan/wekan/pull/1592).
+
+Thanks to GitHub user andresmanelli for contributions.
+
+# v1.26 2018-08-09 Wekan release
+
+This release fixes the following bugs:
+
+- [Set WITH_API=true setting on Sandstorm, and so that export works](https://github.com/wekan/wekan/commit/a300b73d56750a1a5645767d375be60839314e84);
+- [Set Matomo blank settings on Sandstorm](https://github.com/wekan/wekan/commit/acd105e61b9dca5a78354047bbc23b0a01e71d8c).
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.25 2018-08-09 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix showing only the cards of the current board in calendar view](https://github.com/wekan/wekan/pull/1822).
+
+Thanks to GitHub user Yanonix for contributions.
+
+# v1.24 2018-08-09 Wekan release
+
+This release add the following new features:
+
+- [Update node to v8.12.0 prerelease build](https://github.com/wekan/wekan/commit/04d7c47f4ca990311079be8dd6dc383448ee342f).
+
+and fixes the following bugs:
+
+- [Enable Wekan API by default, so that Export Board to JSON works](https://github.com/wekan/wekan/commit/b2eeff96977592deaeb23a8171fc3b13f8c6c5dc);
+- [Fix the flagging of dates](https://github.com/wekan/wekan/pull/1814);
+- [Use new WITH_API and Matomo env variables at Dockerfile](https://github.com/wekan/wekan/issues/1820);
+- For OpenShift compliance, [change](https://github.com/wekan/wekan/commit/53d545eeef7e796bd910f7cce666686ca05de544)
+  [run user](https://github.com/wekan/wekan/pull/1816)
+  and [Docker internal port to 8080](https://github.com/wekan/wekan/commit/95b21943ee7a9fa5a27efe5276307febc2fbad94).
+
+Thanks to GitHub users rjevnikar, tdemaret, xadagaras and xet7 for their contributions.
+
+# v1.23 2018-07-30 Wekan release
+
+This release tries to fix the following bugs:
+
+- Checking for [existing](https://github.com/wekan/wekan/commit/a48f560a85860451914dbaad8cae6ff5120a0c38)
+  [directories](https://github.com/wekan/wekan/commit/5bfb6c6411c928bfffa7ed6fe829f030e3ea57da) when
+  building snap etc, trying to [get snap to build somehow](https://github.com/wekan/wekan-snap/issues/58).
+  This is just a test, does it build this time correctly.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.22 2018-07-30 Wekan release
+
+This release adds the following new features:
+
+- [Backup script now uses mongodump from snap to
+   do backups](https://github.com/wekan/wekan/wiki/Backup);
+- [Integration of Matomo](https://github.com/wekan/wekan/pull/1806);
+- [Enable/Disable API with env var](https://github.com/wekan/wekan/pull/1799).
+
+Thanks to GitHub user Akuket and xet7 for their contributions.
+
+# v1.21 2018-07-18 Wekan release
+
+This release adds the following new features:
+
+- [Add logo from Wekan website to login logo](https://github.com/wekan/wekan/commit/4eed23afe06d5fab8d45ba3decc7c1d3b85efbd8).
+
+and fixes the following bugs:
+
+- [Allow to resend invites](https://github.com/wekan/wekan/pull/1785).
+
+Thanks to GitHub users Akuket and xet7 for their contributions.
+
+# v1.20 2018-07-18 Wekan release
+
+This release fixes the following bugs:
+
+- [Remove SMTP settings from Admin Panel, because they are set in environment
+   variable settings like source/snap/docker already, and password was
+   exposed in plain text](https://github.com/wekan/wekan/issues/1783);
+- [Added info how to limit snap to root
+   user](https://github.com/wekan/wekan-snap/wiki/Limit-snap-to-root-user-only);
+- [Add scrolling to long cards](https://github.com/wekan/wekan/pull/1782).
+
+Thanks to GitHub users jnso, LyR33x and xet7 for their contributions.
+
+# v1.19 2018-07-16 Wekan release
+
+This release adds the following new features:
+
+- [Build from source on macOS](https://github.com/wekan/wekan/wiki/Mac);
+- [Wekan integration with OpenShift](https://github.com/wekan/wekan/pull/1765);
+- [Snap Caddy: set -agree flag for Let's Encrypt](https://github.com/wekan/wekan-snap/issues/54).
+
+and fixes the following mobile bugs:
+
+- [Fix missing utility function](https://github.com/wekan/wekan/commit/5c774070617357c25c7bb35b43f4b122eb4b3e34);
+- [Avoid default behavior](https://github.com/wekan/wekan/commit/9c204d9bbe4845bc3e352e839615dfb782a753f4);
+- [Hotfix more sortable elements](https://github.com/wekan/wekan/commit/616dade81c25b10fc409aee1bcc9a93ddbfee81b);
+- [Hotfix for mobile device](https://github.com/wekan/wekan/commit/43d86d7d5d3f3b34b0500f6d5d3afe7bd86b0060).
+
+and fixes the following bugs:
+
+- [Fix invitation code](https://github.com/wekan/wekan/pull/1777).
+
+Thanks to GitHub users adyachok, Akuket, halunk3, Haocen and xet7 for their contributions.
+
+# v1.18 2018-07-06 Wekan release
+
+This release fixes the following bugs:
+
+- Fix [Title is required](https://github.com/wekan/wekan/issues/1576)
+  by [setting Checklist title during migration](https://github.com/wekan/wekan/issues/1753).
+
+Thanks to GitHub users centigrade-kdk and xet7 for their contributions.
+
+# v1.17 2018-07-06 Wekan release
+
+This release adds the following new features:
+
+- [Made Subtask Settings visible at Board menu at Sandstorm](https://github.com/wekan/wekan/commit/884cd0e6b888edc9752cbed80e7ac75e2ce232de).
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.16 2018-07-06 Wekan release
+
+This release fixes the following bugs:
+
+- Fix: [Boards.forEach is not function](https://github.com/wekan/wekan/commit/a41190cdf024df65ad1c9931b3065c6ababeaf25).
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.15 2018-07-06 Wekan release
+
+This release fixes the following bugs:
+
+- Fix [Title is required](https://github.com/wekan/wekan/issues/1576)
+  by making [Checklist title optional](https://github.com/wekan/wekan/issues/1753).
+
+Thanks to GitHub users centigrade-kdk and xet7 for their contributions.
+
+# v1.14 2018-07-06 Wekan release
+
+This release fixes the following bugs:
+
+- Fix [Checklists.forEach is not a function](https://github.com/wekan/wekan/issues/1753).
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.13 2018-07-06 Wekan release
+
+This release adds the following new features:
+
+- Added snapcraft.yml new node version changes, that were missing from v1.12.
+
+Thanks to GitHub user xet7 for contibutions.
+
+# v1.12 2018-07-06 Wekan release
+
+This release adds the following new features:
+
+- [Nested tasks](https://github.com/wekan/wekan/pull/1723);
+- [Calendar improvements](https://github.com/wekan/wekan/pull/1752);
+- [SSO CAS](https://github.com/wekan/wekan/pull/1742).
+
+and fixes the following bugs:
+
+- [Fix warning about missing space in jade file](https://github.com/wekan/wekan/commit/067aef9de948ef0cb6037d52602100b00d214706);
+- Revert [Fix vertical align of user avatar initials](https://github.com/wekan/wekan/pull/1714), so that [initials are again
+  visible](https://github.com/wekan/wekan/commit/122a61b3333fb77c0f08bbdc6fe0d3c2f6db97df);
+- Fix lint warning: [EditCardDate is assigned a value but never used
+  no-unused-vars](https://github.com/wekan/wekan/commit/dd324aa581bed7ea31f20968c6b596f373e7054f);
+- Fix [Minimize board sidebar actually just moves it over](https://github.com/wekan/wekan/issues/1589).
+
+Thanks to GitHub users dagomar, ppoulard, pravdomil, TNick and xet7 for their contributions.
+
+# v1.11 2018-06-30 Wekan release
+
+This release fixes the following bugs:
+
+* [Remove card shadow](https://github.com/wekan/wekan/pull/1726), Wekan users now prefer not to have it;
+* [Revert](https://github.com/wekan/wekan/commit/928d88cfe1da4187797519c929cd2fdd9ffe9c2e) previous
+  [Less margin-bottom after minicard](https://github.com/wekan/wekan/pull/1713).
+
+Thanks to GitHub users pravdomil and xet7 for their contributions.
+
+# v1.10 2018-06-28 Wekan release
+
+This release fixes the following bugs:
+
+* Fix migration error "TypeError: Checklists.foreach" at [Snap](https://github.com/wekan/wekan-snap/issues/51),
+  [Docker](https://github.com/wekan/wekan/issues/1736) etc.
+
+Thanks to GitHub users Jubi94, kestrelhawk and xet7 for their contributions.
+
+# v1.09 2018-06-28 Wekan release
+
+This release adds the following new features:
+
+* [Calendar](https://github.com/wekan/wekan/pull/1728). Click Lists / Swimlanes / Calendar.
+
+and fixes the following bugs:
+
+* To fix ["title is required"](https://github.com/wekan/wekan/issues/1576) fix only
+  [add-checklist-items and revert all other migration changes](https://github.com/wekan/wekan/issues/1734);
+* [Restore invitation code logic](https://github.com/wekan/wekan/pull/1732). Please test and add comment
+  to those invitation code issues that this fixes.
+
+Thanks to GitHub users TNick and xet7 for their contributions.
+
+# v1.08 2018-06-27 Wekan release
+
+This release adds the following new features:
+
+* [Add more card inner shadow](https://github.com/wekan/wekan/commit/6a587299b80a49fce0789628ff65885b5ed2c837);
+* [Less margin-bottom after minicard](https://github.com/wekan/wekan/pull/1713);
+* Updated newest node fork binary from Sandstorm to Wekan, see https://releases.wekan.team/node.txt
+* Add Georgian language.
+
+and fixes the following bugs:
+
+* [Fix typo in English translation](https://github.com/wekan/wekan/pull/1710);
+* [Fix vertical align of user avatar initials](https://github.com/wekan/wekan/pull/1714);
+* [Submit inline form on click outside](https://github.com/wekan/wekan/pull/1717), fixes
+  ["You have an unsaved description" doesn't go away after saving](https://github.com/wekan/wekan/issues/1287);
+* [Fix "Error: title is required" by removing find() from all of migrations](https://github.com/wekan/wekan/commit/97922c90cb42be6c6615639bb164173748982f56).
+
+Thanks to GitHub users pravdomil, xet7 and zypA13510 for their contributions.
+
+# v1.07 2018-06-14 Wekan release
+
+This release adds the following new features:
+
+* [Regex for Advanced filter. It aims to solve search in bigger text fields, and using wildcards.
+   A change to translations was made for adding info about regex and escaping characters
+   with \\](https://github.com/wekan/wekan/pull/1702).
+
+Thanks to GitHub users feuerball11 and xet7 for their contributions.
+
+# v1.06 2018-06-14 Wekan release
+
+This release fixes the following bugs:
+
+* [Fix CardDetail of Mobile View](https://github.com/wekan/wekan/pull/1701).
+
+Thanks to GitHub users feuerball11 and xet7 for their contributions.
+
+# v1.05 2018-06-14 Wekan release
+
+This release adds the following new features:
+
+* [Markdown support in Custom Fields, and view on minicard](https://github.com/wekan/wekan/pull/1699);
+* [Fixes to Advanced Filter, you are now able to filter for Dropdown and Numbers,
+   also Dropdown are now correctly displayed on minicard](https://github.com/wekan/wekan/pull/1699).
+
+and fixes the following bugs:
+
+* [Fix data colour changes on cards](https://github.com/wekan/wekan/pull/1698);
+* [Fix for migration error "title is required" and breaking of Standalone and
+   Sandstorm Wekan](https://github.com/wekan/wekan/commit/8d5cbf1e6c2b6d467fe1c0708cd794fd11b98a2e#commitcomment-29362180);
+* [Fix Issue with custom fields shown on card](https://github.com/wekan/wekan/issues/1659);
+* [Fix showing public board in list mode](https://github.com/wekan/wekan/issues/1623);
+* [Fix for not able to remove Custom Field "Show on Card"](https://github.com/wekan/wekan/pull/1699);
+* [Fix minicardReceivedDate typo in 1.04 regression: Socket connection error and boards
+   not loading](https://github.com/wekan/wekan/issues/1694).
+
+Thanks to GitHub users feuerball11, Fran-KTA, oec, rjevnikar and xet7 for their contributions.
+
+# v1.04 2018-06-12 Wekan release
+
+This release adds the following new features:
+
+* [Add Khmer language](https://github.com/wekan/wekan/commit/2156e458690d0dc34a761a48fd7fa3b54af79031);
+* [Change label text colour to black for specific label colours for better
+   visibility](https://github.com/wekan/wekan/pull/1689).
+
+and fixes the following bugs:
+
+* [SECURITY FIX: Do not publish all of people collection. This bug has probably been present
+   since addition of Admin Panel](https://github.com/wekan/wekan/commit/dda49d2f07f9c50d5d57acfd5c7eee6492f93b33);
+* [Modify card covers/mini-cards so that: 1) received date is shown unless there is a start date
+   2) due date is shown, unless there is an end date](https://github.com/wekan/wekan/pull/1685).
+
+Thanks to GitHub users rjevnikar and xet7 for their contributions.
+Thanks to Adrian Genaid for security fix, he's now added to [Hall of Fame](https://wekan.github.io/hall-of-fame/).
+Thanks to translators.
+
+# v1.03 2018-06-08 Wekan release
+
+This release adds the following new features:
+
+* [Update to newest Sandstorm fork of Node.js that includes performance
+   etc fixes](https://github.com/wekan/wekan/commit/90d55777f7298d243ed0de03c934cea239a31272);
+* [Additional label colors. Assigned By and Requested By text fields
+   on card. Delete board from Recycle Bin](https://github.com/wekan/wekan/pull/1679).
+
+and possibly fixes the following bugs, please test:
+
+* [Try to fix: Missing board-view-lists Field after DB updated to
+   Wekan 1.02](https://github.com/wekan/wekan/issues/1675).
+
+Thanks to GitHub users JamesLavin, rjevnikar and xet7 for their contributions.
+
+# v1.02 2018-05-26 Wekan release
+
+This release fixes the following bugs:
+
+* [Remove binary version of bcrypt](https://github.com/wekan/wekan/commit/4b2010213907c61b0e0482ab55abb06f6a668eac)
+  because of [vulnerability](https://nodesecurity.io/advisories/612) that has [issue that is not fixed
+  yet](https://github.com/kelektiv/node.bcrypt.js/issues/604)
+  and [not yet merged pull request](https://github.com/kelektiv/node.bcrypt.js/pull/606).
+  This may cause some slowdown;
+* [Snap: Filtering out swap file created at build time, adding stage package](https://github.com/wekan/wekan/pull/1660);
+* [Fix Received Date and End Date on Cards](https://github.com/wekan/wekan/issues/1654).
+
+Thanks to GitHub users kubiko, xadagaras and xet7 for their contributions.
+
+# v1.01 2018-05-23 Wekan release
+
+This release possibly fixes the following bugs, please test:
+
+* [Possible quickfix for all customFields Import errors, please test](https://github.com/wekan/wekan/pull/1653).
+
+Thanks to GitHub users feuerball11 and xet7 for their contributions.
+
+# v1.00 2018-05-21 Wekan release
+
+This release fixes the following bugs:
+
+* [Typo in English translation: brakets to brackets](https://github.com/wekan/wekan/issues/1647).
+
+Thanks to GitHub user yarons for contributions.
+
+# v0.99 2018-05-21 Wekan release
+
+This release adds the following new features:
+
+* [Advanced Filter for Custom Fields](https://github.com/wekan/wekan/pull/1646).
+
+Thanks to GitHub users feuerball11 and xet7 for their contributions.
+
+# v0.98 2018-05-19 Wekan release
+
+This release adds the following new features:
+
+* [Filtering by Custom Field](https://github.com/wekan/wekan/pull/1645);
+* Update to NPM 6.0.1 and MongoDB 3.2.20.
+
+Thanks to GitHub users feuerball11 and xet7 for their contributions.
+
+# v0.97 2018-05-19 Wekan release
+
+Updated translations.
+
+# v0.96 2018-05-19 Wekan release
+
+This release adds the following new features:
+
+* [Custom Fields](https://github.com/wekan/wekan/issues/807). Note: Import/Export is not implemented yet.
+
+and fixes the following bugs:
+
+* [Fix: checklistItems broken after upgrade](https://github.com/wekan/wekan/issues/1636).
+
+Thanks to GitHub users feuerball11, franksiler, papoola and xet7 for their contributions.
+
+# v0.95 2018-05-08 Wekan release
+
+This release adds the following new features:
+
+* [REST API Edit Card Labels](https://github.com/wekan/wekan/pull/1626);
+* [Add a new API route to create a new label in a given board](https://github.com/wekan/wekan/pull/1630);
+* [Admin Panel: Option to block username change](https://github.com/wekan/wekan/pull/1627).
+
+and fixes the following bugs:
+
+* [Error: title is required](https://github.com/wekan/wekan/issues/1576).
+
+Thanks to GitHub users Shahar-Y, thiagofernando and ThisNeko for their contributions.
+
 # v0.94 2018-05-03 Wekan release
 
 This release adds the following new features:
 
-* [REST API POST /cards: allow setting card members](https://github.com/wekan/wekan/commit/e576e0f9cfc4f61e54da8920a8e29fe43227c266).
+* [REST API POST /cards: allow setting card members](https://github.com/wekan/wekan/pull/1622).
 
 Thanks to GitHub user couscous3 for contributions.
 
@@ -44,8 +2188,7 @@ Thanks to GitHub user xet7 for contributions.
 
 This release fixes the following bugs:
 
-- [Fix Wekan import / Export for
-   ChecklistItems](https://github.com/wekan/wekan/commit/30b17ff6c92df07922f875071e864cf688902293).
+- [Fix Wekan import / Export for ChecklistItems](https://github.com/wekan/wekan/pull/1613).
 
 Thanks to GitHub user zebby76 for contributions.
 
@@ -85,7 +2228,7 @@ This release fixes the following bugs:
 
 - [Fix Switch List/swimlane view only working with admin privileges](https://github.com/wekan/wekan/issues/1567);
 - [Fix Wekan logo positioning](https://github.com/wekan/wekan/issues/1378);
-- [Fix checklists items migration error "title is required"](https://github.com/wekan/wekan/issues/1576);
+- [Tried to fix, but fix did not work: Fix checklists items migration error "title is required"](https://github.com/wekan/wekan/issues/1576);
 - [Removed paxctl alpine fix #1303 , because it did not work anymore, so Docker container
    did not build correctly](https://github.com/wekan/wekan/commit/ce659632174ba25ca9b5e85b053fde02fd9c3928);
 - [Use curl to download 100% CPU fibers fixed node in snap, and remove paxctl from
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 00000000..3ae99519
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,4 @@
+To get started, [please sign the Contributor License Agreement](https://www.clahub.com/agreements/wekan/wekan).
+
+[Then, please read documentation at wiki](https://github.com/wekan/wekan/wiki).
+
diff --git a/Contributing.md b/Contributing.md
deleted file mode 100644
index 82440260..00000000
--- a/Contributing.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Contributing
-
-Please see wiki for all documentation:
-
-<https://github.com/wekan/wekan/wiki>
diff --git a/Dockerfile b/Dockerfile
index c794f6dc..213b6ae6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,42 +1,123 @@
-FROM debian:buster-slim
-MAINTAINER wekan
-
-# Declare Arguments
-ARG NODE_VERSION
-ARG METEOR_RELEASE
-ARG METEOR_EDGE
-ARG USE_EDGE
-ARG NPM_VERSION
-ARG FIBERS_VERSION
-ARG ARCHITECTURE
-ARG SRC_PATH
+FROM ubuntu:disco
+LABEL maintainer="wekan"
 
 # Set the environment variables (defaults where required)
 # DOES NOT WORK: paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303
 # ENV BUILD_DEPS="paxctl"
-ENV BUILD_DEPS="apt-utils gnupg gosu wget curl bzip2 build-essential python git ca-certificates gcc-7"
-ENV NODE_VERSION ${NODE_VERSION:-v8.11.1}
-ENV METEOR_RELEASE ${METEOR_RELEASE:-1.6.0.1}
-ENV USE_EDGE ${USE_EDGE:-false}
-ENV METEOR_EDGE ${METEOR_EDGE:-1.5-beta.17}
-ENV NPM_VERSION ${NPM_VERSION:-5.5.1}
-ENV FIBERS_VERSION ${FIBERS_VERSION:-2.0.0}
-ENV ARCHITECTURE ${ARCHITECTURE:-linux-x64}
-ENV SRC_PATH ${SRC_PATH:-./}
+ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential python3 python3-pip git ca-certificates gcc-8" \
+    DEBUG=false \
+    NODE_VERSION=v8.16.0 \
+    METEOR_RELEASE=1.6.0.1 \
+    USE_EDGE=false \
+    METEOR_EDGE=1.5-beta.17 \
+    NPM_VERSION=latest \
+    FIBERS_VERSION=2.0.0 \
+    ARCHITECTURE=linux-x64 \
+    SRC_PATH=./ \
+    WITH_API=true \
+    ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE=3 \
+    ACCOUNTS_LOCKOUT_KNOWN_USERS_PERIOD=60 \
+    ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURE_WINDOW=15 \
+    ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURES_BERORE=3 \
+    ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD=60 \
+    ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW=15 \
+    EMAIL_NOTIFICATION_TIMEOUT=30000 \
+    MATOMO_ADDRESS="" \
+    MATOMO_SITE_ID="" \
+    MATOMO_DO_NOT_TRACK=true \
+    MATOMO_WITH_USERNAME=false \
+    BROWSER_POLICY_ENABLED=true \
+    TRUSTED_URL="" \
+    WEBHOOKS_ATTRIBUTES="" \
+    OAUTH2_ENABLED=false \
+    OAUTH2_LOGIN_STYLE=redirect \
+    OAUTH2_CLIENT_ID="" \
+    OAUTH2_SECRET="" \
+    OAUTH2_SERVER_URL="" \
+    OAUTH2_AUTH_ENDPOINT="" \
+    OAUTH2_USERINFO_ENDPOINT="" \
+    OAUTH2_TOKEN_ENDPOINT="" \
+    OAUTH2_ID_MAP="" \
+    OAUTH2_USERNAME_MAP="" \
+    OAUTH2_FULLNAME_MAP="" \
+    OAUTH2_EMAIL_MAP="" \
+    LDAP_ENABLE=false \
+    LDAP_PORT=389 \
+    LDAP_HOST="" \
+    LDAP_BASEDN="" \
+    LDAP_LOGIN_FALLBACK=false \
+    LDAP_RECONNECT=true \
+    LDAP_TIMEOUT=10000 \
+    LDAP_IDLE_TIMEOUT=10000 \
+    LDAP_CONNECT_TIMEOUT=10000 \
+    LDAP_AUTHENTIFICATION=false \
+    LDAP_AUTHENTIFICATION_USERDN="" \
+    LDAP_AUTHENTIFICATION_PASSWORD="" \
+    LDAP_LOG_ENABLED=false \
+    LDAP_BACKGROUND_SYNC=false \
+    LDAP_BACKGROUND_SYNC_INTERVAL=100 \
+    LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED=false \
+    LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=false \
+    LDAP_ENCRYPTION=false \
+    LDAP_CA_CERT="" \
+    LDAP_REJECT_UNAUTHORIZED=false \
+    LDAP_USER_SEARCH_FILTER="" \
+    LDAP_USER_SEARCH_SCOPE="" \
+    LDAP_USER_SEARCH_FIELD="" \
+    LDAP_SEARCH_PAGE_SIZE=0 \
+    LDAP_SEARCH_SIZE_LIMIT=0 \
+    LDAP_GROUP_FILTER_ENABLE=false \
+    LDAP_GROUP_FILTER_OBJECTCLASS="" \
+    LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE="" \
+    LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE="" \
+    LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT="" \
+    LDAP_GROUP_FILTER_GROUP_NAME="" \
+    LDAP_UNIQUE_IDENTIFIER_FIELD="" \
+    LDAP_UTF8_NAMES_SLUGIFY=true \
+    LDAP_USERNAME_FIELD="" \
+    LDAP_FULLNAME_FIELD="" \
+    LDAP_MERGE_EXISTING_USERS=false \
+    LDAP_EMAIL_FIELD="" \
+    LDAP_EMAIL_MATCH_ENABLE=false \
+    LDAP_EMAIL_MATCH_REQUIRE=false \
+    LDAP_EMAIL_MATCH_VERIFIED=false \
+    LDAP_SYNC_USER_DATA=false \
+    LDAP_SYNC_USER_DATA_FIELDMAP="" \
+    LDAP_SYNC_GROUP_ROLES="" \
+    LDAP_DEFAULT_DOMAIN="" \
+    LDAP_SYNC_ADMIN_STATUS="" \
+    LDAP_SYNC_ADMIN_GROUPS="" \
+    HEADER_LOGIN_ID="" \
+    HEADER_LOGIN_FIRSTNAME="" \
+    HEADER_LOGIN_LASTNAME="" \
+    HEADER_LOGIN_EMAIL="" \
+    LOGOUT_WITH_TIMER=false \
+    LOGOUT_IN="" \
+    LOGOUT_ON_HOURS="" \
+    LOGOUT_ON_MINUTES="" \
+    CORS="" \
+    DEFAULT_AUTHENTICATION_METHOD=""
 
 # Copy the app to the image
 COPY ${SRC_PATH} /home/wekan/app
 
 RUN \
+    set -o xtrace && \
     # Add non-root user wekan
     useradd --user-group --system --home-dir /home/wekan wekan && \
     \
     # OS dependencies
     apt-get update -y && apt-get install -y --no-install-recommends ${BUILD_DEPS} && \
+    pip3 install -U pip setuptools wheel && \
+    \
+    # Meteor installer doesn't work with the default tar binary, so using bsdtar while installing.
+    # https://github.com/coreos/bugs/issues/1095#issuecomment-350574389
+    cp $(which tar) $(which tar)~ && \
+    ln -sf $(which bsdtar) $(which tar) && \
     \
     # Download nodejs
-    #wget https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \
-    #wget https://nodejs.org/dist/${NODE_VERSION}/SHASUMS256.txt.asc && \
+    wget https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \
+    wget https://nodejs.org/dist/${NODE_VERSION}/SHASUMS256.txt.asc && \
     #---------------------------------------------------------------------------------------------
     # Node Fibers 100% CPU usage issue:
     # https://github.com/wekan/wekan-mongodb/issues/2#issuecomment-381453161
@@ -45,11 +126,10 @@ RUN \
     # Also see beginning of wekan/server/authentication.js
     #   import Fiber from "fibers";
     #   Fiber.poolSize = 1e9;
-    # Download node version 8.11.1 that has fix included, node binary copied from Sandstorm
+    # OLD: Download node version 8.12.0 prerelease that has fix included, => Official 8.12.0 has been released
     # Description at https://releases.wekan.team/node.txt
-    # SHA256SUM: 18c99d5e79e2fe91e75157a31be30e5420787213684d4048eb91e602e092725d
-    wget https://releases.wekan.team/node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \
-    echo "c85ed210a360c50d55baaf7b49419236e5241515ed21410d716f4c1f5deedb12  node-v8.11.1-linux-x64.tar.gz" >> SHASUMS256.txt.asc && \
+    #wget https://releases.wekan.team/node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \
+    #echo "1ed54adb8497ad8967075a0b5d03dd5d0a502be43d4a4d84e5af489c613d7795  node-v8.12.0-linux-x64.tar.gz" >> SHASUMS256.txt.asc && \
     \
     # Verify nodejs authenticity
     grep ${NODE_VERSION}-${ARCHITECTURE}.tar.gz SHASUMS256.txt.asc | shasum -a 256 -c - && \
@@ -96,8 +176,11 @@ RUN \
     # Change user to wekan and install meteor
     cd /home/wekan/ && \
     chown wekan:wekan --recursive /home/wekan && \
-    curl https://install.meteor.com -o /home/wekan/install_meteor.sh && \
-    sed -i "s|RELEASE=.*|RELEASE=${METEOR_RELEASE}\"\"|g" ./install_meteor.sh && \
+    curl "https://install.meteor.com" -o /home/wekan/install_meteor.sh && \
+    #curl "https://install.meteor.com/?release=${METEOR_RELEASE}" -o /home/wekan/install_meteor.sh && \
+    # OLD: sed -i "s|RELEASE=.*|RELEASE=${METEOR_RELEASE}\"\"|g" ./install_meteor.sh && \
+    # Install Meteor forcing its progress
+    sed -i 's/VERBOSITY="--silent"/VERBOSITY="--progress-bar"/' ./install_meteor.sh && \
     echo "Starting meteor ${METEOR_RELEASE} installation...   \n" && \
     chown wekan:wekan /home/wekan/install_meteor.sh && \
     \
@@ -109,40 +192,72 @@ RUN \
     fi; \
     \
     # Get additional packages
-    mkdir -p /home/wekan/app/packages && \
+    #mkdir -p /home/wekan/app/packages && \
     chown wekan:wekan --recursive /home/wekan && \
-    cd /home/wekan/app/packages && \
-    gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/flow-router.git kadira-flow-router && \
-    gosu wekan:wekan git clone --depth 1 -b master git://github.com/meteor-useraccounts/core.git meteor-useraccounts-core && \
+    # REPOS BELOW ARE INCLUDED TO WEKAN REPO
+    #cd /home/wekan/app/packages && \
+    #gosu wekan:wekan git clone --depth 1 -b master https://github.com/wekan/flow-router.git kadira-flow-router && \
+    #gosu wekan:wekan git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core && \
+    #gosu wekan:wekan git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git && \
+    #gosu wekan:wekan git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git && \
+    #gosu wekan:wekan git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git && \
+    #gosu wekan:wekan git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-oidc.git && \
+    #gosu wekan:wekan git clone --depth 1 -b master --recurse-submodules https://github.com/wekan/markdown.git && \
+    #gosu wekan:wekan mv meteor-accounts-oidc/packages/switch_accounts-oidc wekan-accounts-oidc && \
+    #gosu wekan:wekan mv meteor-accounts-oidc/packages/switch_oidc wekan-oidc && \
+    #gosu wekan:wekan rm -rf meteor-accounts-oidc && \
     sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' /home/wekan/app/packages/meteor-useraccounts-core/package.js && \
     cd /home/wekan/.meteor && \
     gosu wekan:wekan /home/wekan/.meteor/meteor -- help; \
     \
+    # extract the OpenAPI specification
+    npm install -g api2html@0.3.0 && \
+    mkdir -p /home/wekan/python && \
+    chown wekan:wekan --recursive /home/wekan/python && \
+    cd /home/wekan/python && \
+    gosu wekan:wekan git clone --depth 1 -b master https://github.com/Kronuz/esprima-python && \
+    cd /home/wekan/python/esprima-python && \
+    python3 setup.py install --record files.txt && \
+    cd /home/wekan/app &&\
+    mkdir -p ./public/api && \
+    python3 ./openapi/generate_openapi.py --release $(git describe --tags --abbrev=0) > ./public/api/wekan.yml && \
+    /opt/nodejs/bin/api2html -c ./public/logo-header.png -o ./public/api/wekan.html ./public/api/wekan.yml; \
     # Build app
     cd /home/wekan/app && \
     gosu wekan:wekan /home/wekan/.meteor/meteor add standard-minifier-js && \
     gosu wekan:wekan /home/wekan/.meteor/meteor npm install && \
     gosu wekan:wekan /home/wekan/.meteor/meteor build --directory /home/wekan/app_build && \
     cp /home/wekan/app/fix-download-unicode/cfs_access-point.txt /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js && \
+    rm /home/wekan/app_build/bundle/programs/server/npm/node_modules/meteor/rajit_bootstrap3-datepicker/lib/bootstrap-datepicker/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs && \
     chown wekan:wekan /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js && \
-    cd /home/wekan/app_build/bundle/programs/server/npm/node_modules/meteor/npm-bcrypt && \
-    gosu wekan:wekan rm -rf node_modules/bcrypt && \
-    gosu wekan:wekan npm install bcrypt && \
+    #Removed binary version of bcrypt because of security vulnerability that is not fixed yet.
+    #https://github.com/wekan/wekan/commit/4b2010213907c61b0e0482ab55abb06f6a668eac
+    #https://github.com/wekan/wekan/commit/7eeabf14be3c63fae2226e561ef8a0c1390c8d3c
+    #cd /home/wekan/app_build/bundle/programs/server/npm/node_modules/meteor/npm-bcrypt && \
+    #gosu wekan:wekan rm -rf node_modules/bcrypt && \
+    #gosu wekan:wekan npm install bcrypt && \
     cd /home/wekan/app_build/bundle/programs/server/ && \
     gosu wekan:wekan npm install && \
-    gosu wekan:wekan npm install bcrypt && \
+    #gosu wekan:wekan npm install bcrypt && \
     mv /home/wekan/app_build/bundle /build && \
     \
+    # Put back the original tar
+    mv $(which tar)~ $(which tar) && \
+    \
     # Cleanup
     apt-get remove --purge -y ${BUILD_DEPS} && \
     apt-get autoremove -y && \
+    npm uninstall -g api2html &&\
     rm -R /var/lib/apt/lists/* && \
     rm -R /home/wekan/.meteor && \
     rm -R /home/wekan/app && \
     rm -R /home/wekan/app_build && \
+    cat /home/wekan/python/esprima-python/files.txt | xargs rm -R && \
+    rm -R /home/wekan/python && \
     rm /home/wekan/install_meteor.sh
 
-ENV PORT=80
+ENV PORT=8080
 EXPOSE $PORT
+USER wekan
 
 CMD ["node", "/build/main.js"]
diff --git a/LICENSE b/LICENSE
index 04faa72e..c2d69158 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2018 The Wekan Team
+Copyright (c) 2014-2019 The Wekan Team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index ba9a3a10..324d310b 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,4 @@
-# Wekan
-
-[![Translate Wekan at Transifex](https://img.shields.io/badge/Translate%20Wekan-at%20Transifex-brightgreen.svg "Freenode IRC")](https://transifex.com/wekan/wekan)
-
-[![Wekan Vanila Chat][vanila_badge]][vanila_chat] 
-[![IRC #wekan](https://img.shields.io/badge/IRC%20%23wekan-on%20Freenode-brightgreen.svg "Freenode IRC")](http://webchat.freenode.net?channels=%23wekan&uio=d4)
+# Wekan - Open Source kanban
 
 [![Contributors](https://img.shields.io/github/contributors/wekan/wekan.svg "Contributors")](https://github.com/wekan/wekan/graphs/contributors)
 [![Docker Repository on Quay](https://quay.io/repository/wekan/wekan/status "Docker Repository on Quay")](https://quay.io/repository/wekan/wekan)
@@ -14,54 +9,85 @@
 [![Code Climate](https://codeclimate.com/github/wekan/wekan/badges/gpa.svg "Code Climate")](https://codeclimate.com/github/wekan/wekan)
 [![Project Dependencies](https://david-dm.org/wekan/wekan.svg "Project Dependencies")](https://david-dm.org/wekan/wekan)
 [![Code analysis at Open Hub](https://img.shields.io/badge/code%20analysis-at%20Open%20Hub-brightgreen.svg "Code analysis at Open Hub")](https://www.openhub.net/p/wekan)
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fwekan%2Fwekan.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fwekan%2Fwekan?ref=badge_shield)
 
-Please read [FAQ](https://github.com/wekan/wekan/wiki/FAQ).
-Please don't feed the trolls and spammers that are mentioned in the FAQ :)
+## [Translate Wekan at Transifex](https://transifex.com/wekan/wekan)
 
-Wekan is an completely [Open Source][open_source] and [Free software][free_software]
-collaborative kanban board application with MIT license.
+Translations to non-English languages are accepted only at [Transifex](https://transifex.com/wekan/wekan) using webbrowser.
+New English strings of new features can be added as PRs to edge branch file wekan/i18n/en.i18n.json .
 
-Whether you’re maintaining a personal todo list, planning your holidays with
-some friends, or working in a team on your next revolutionary idea, Kanban
-boards are an unbeatable tool to keep your things organized. They give you a
-visual overview of the current state of your project, and make you productive by
-allowing you to focus on the few items that matter the most.
+## [Wekan feature requests and bugs](https://github.com/wekan/wekan/issues)
 
-Wekan has real-time user interface. Not all features are implemented.
+Please add most of your questions as GitHub issue: [Wekan feature requests and bugs](https://github.com/wekan/wekan/issues).
+It's better than at chat where details get lost when chat scrolls up.
 
-[Features][features]
+## Chat
 
-Wekan supports many [Platforms][platforms], and plan is to add more.
+[![Wekan Chat][vanila_badge]][wekan_chat] - Most Wekan community and developers are here. Works on webbrowser
+and PWA app that can be added as icon on Android and bookmark on iOS, used like native app.
 
-[Integrations][integrations]
+[Wekan IRC FAQ](https://github.com/wekan/wekan/wiki/IRC-FAQ)
 
-[Team](https://github.com/wekan/wekan/wiki/Team)
+## FAQ
 
-You don’t have to trust us with your data and can install Wekan on your own
-computer or server. In fact we encourage you to do that by providing
-one-click installation on various platforms.
+**NOTE**: 
+- Please read the [FAQ](https://github.com/wekan/wekan/wiki/FAQ) first
+- Please don't feed the trolls and spammers that are mentioned in the FAQ :)
 
-## Roadmap
+## About Wekan
+
+Wekan is an completely [Open Source][open_source] and [Free software][free_software]
+collaborative kanban board application with MIT license.
 
-[Roadmap](https://github.com/wekan/wekan/wiki/Roadmap)
+Whether you’re maintaining a personal todo list, planning your holidays with some friends,
+or working in a team on your next revolutionary idea, Kanban boards are an unbeatable tool
+to keep your things organized. They give you a visual overview of the current state of your project,
+and make you productive by allowing you to focus on the few items that matter the most.
 
-Upcoming Wekan App Development Platform will make possible
-many use cases. If you don't find your feature or integration in
-GitHub issues and [Features][features] or [Integrations][integrations]
-page at wiki, please add them.
+Since Wekan is a free software, you don’t have to trust us with your data and can
+install Wekan on your own computer or server. In fact we encourage you to do
+that by providing one-click installation on various platforms.
 
-We are very welcoming to new developers and teams to submit new pull
-requests to devel branch to make this Wekan App Development Platform possible
-faster. Please see [Developer Documentation][dev_docs] to get started.
-We also welcome sponsors for features, although we don't have any yet.
-By working directly with Wekan you get the benefit of active maintenance
-and new features added by growing Wekan developer community.
+- Wekan is used in [most countries of the world](https://snapcraft.io/wekan).
+- Wekan largest user has 13k users using Wekan in their company.
+- Wekan has been [translated](https://transifex.com/wekan/wekan) to about 50 languages.
+- [Features][features]: Wekan has real-time user interface.
+- [Platforms][platforms]: Wekan supports many platforms.
+  Wekan is critical part of new platforms Wekan is currently being integrated to.
+- [Integrations][integrations]: Current possible integrations and future plans.
+
+## Requirements
+
+- 64bit: Linux [Snap](https://github.com/wekan/wekan-snap/wiki/Install) or [Sandstorm](https://sandstorm.io) /
+  [Mac](https://github.com/wekan/wekan/wiki/Mac) / [Windows](https://github.com/wekan/wekan/wiki/Install-Wekan-from-source-on-Windows).
+  [More Platforms](https://github.com/wekan/wekan/wiki/Platforms). [ARM progress](https://github.com/wekan/wekan/issues/1053#issuecomment-410919264).
+- 1 GB RAM minimum free for Wekan. Production server should have miminum total 4 GB RAM.
+  For thousands of users, for example with [Docker](https://github.com/wekan/wekan/blob/devel/docker-compose.yml): 3 frontend servers,
+  each having 2 CPU and 2 wekan-app containers. One backend wekan-db server with many CPUs.  
+- Enough disk space and alerts about low disk space. If you run out disk space, MongoDB database gets corrupted.
+- SECURITY: Updating to newest Wekan version very often. Please check you do not have automatic updates of Sandstorm or Snap turned off.
+  Old versions have security issues because of old versions Node.js etc. Only newest Wekan is supported.
+  Wekan on Sandstorm is not usually affected by any Standalone Wekan (Snap/Docker/Source) security issues.
+- [Reporting all new bugs immediately](https://github.com/wekan/wekan/issues).
+  New features and fixes are added to Wekan [many times a day](https://github.com/wekan/wekan/blob/devel/CHANGELOG.md).
+- [Backups](https://github.com/wekan/wekan/wiki/Backup) of Wekan database once a day miminum.
+  Bugs, updates, users deleting list or card, harddrive full, harddrive crash etc can eat your data. There is no undo yet.
+  Some bug can cause Wekan board to not load at all, requiring manual fixing of database content.
 
-Actual work happens at [Wekan GitHub issues][wekan_issues].
+## Roadmap
 
-See [Development links on Wekan
-wiki](https://github.com/wekan/wekan/wiki#Development)
-bottom of the page for more info.
+[Roadmap Milestones](https://github.com/wekan/wekan/milestones)
+
+[Developer Documentation][dev_docs]
+
+- There is many companies and individuals contributing code to Wekan, to add features and bugfixes
+  [many times a day](https://github.com/wekan/wekan/blob/devel/CHANGELOG.md).
+- [Please add Add new Feature Requests and Bug Reports immediately](https://github.com/wekan/wekan/issues).
+- [Commercial Support](https://wekan.team).
+- [Bounties](https://wekan.team/bounties/index.html).
+
+We also welcome sponsors for features and bugfixes.
+By working directly with Wekan you get the benefit of active maintenance and new features added by growing Wekan developer community.
 
 ## Demo
 
@@ -73,9 +99,16 @@ bottom of the page for more info.
 
 [![Screenshot of Wekan][screenshot_wefork]][roadmap_wefork]
 
-Since Wekan is a free software, you don’t have to trust us with your data and can
-install Wekan on your own computer or server. In fact we encourage you to do
-that by providing one-click installation on various platforms.
+## Stable
+
+- master+devel branch. At release, devel is merged to master.
+- Receives fixes and features that have been tested at edge that they work.
+- If you want automatic updates, [use Snap](https://github.com/wekan/wekan-snap/wiki/Install).
+- If you want to test before update, [use Docker quay.io release tags](https://github.com/wekan/wekan/wiki/Docker).
+
+## Edge
+
+- edge branch. All new fixes and features are added to here first. [Testing Edge](https://github.com/wekan/wekan-snap/wiki/Snap-Developer-Docs).
 
 ## License
 
@@ -100,4 +133,7 @@ with [Meteor](https://www.meteor.com).
 [open_source]: https://en.wikipedia.org/wiki/Open-source_software
 [free_software]: https://en.wikipedia.org/wiki/Free_software
 [vanila_badge]: https://vanila.io/img/join-chat-button2.png
-[vanila_chat]: https://chat.vanila.io/channel/wekan
+[wekan_chat]: https://community.vanila.io/wekan
+
+
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fwekan%2Fwekan.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fwekan%2Fwekan?ref=badge_large)
\ No newline at end of file
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 00000000..03f5e7da
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,129 @@
+Security is very important to us. If you discover any issue regarding security, please disclose
+the information responsibly by sending an email to security (at) wekan.team and not by
+creating a GitHub issue. We will respond swiftly to fix verifiable security issues.
+
+We thank you with a place at our hall of fame page, that is
+at https://wekan.github.io/hall-of-fame . Others have just posted public GitHub issue,
+so they are not at that hall-of-fame page.
+
+## How should reports be formatted?
+
+```
+Name: %name
+Twitter: %twitter
+Bug type: %bugtype
+Domain: %domain
+Severity: %severity
+URL: %url
+PoC: %poc
+CVSS (optional): %cvss
+CWSS (optional): %cwss
+```
+
+## Who can participate in the program
+
+Anyone who reports a unique security issue in scope and does not disclose it to
+a third party before we have patched and updated may be upon their approval
+added to the Wekan Hall of Fame.
+
+## Which domains are in scope?
+
+No public domains, because all those are donated to Wekan Open Source project,
+and we don't have any permissions to do security scans on those donated servers
+
+Please don't perform research that could impact other users. Secondly, please keep
+the reports short and succinct. If we fail to understand the logics of your bug, we will tell you.
+
+You can [Install Wekan](https://github.com/wekan/wekan/releases) to your own computer
+and scan it's vulnerabilities there.
+
+## About Wekan versions
+
+There are only 2 versions of Wekan: Standalone Wekan, and Sandstorm Wekan.
+
+### Standalone Wekan Security
+
+Standalone Wekan includes all non-Sandstorm platforms. Some Standalone Wekan platforms
+like Snap and Docker have their own specific sandboxing etc features.
+
+Standalone Wekan by default does not load any files from Internet, like fonts, CSS, etc.
+This also means all Standalone Wekan functionality works in offline local networks.
+Wekan is used by companies that have [thousands of users](https://github.com/wekan/wekan/wiki/AWS) and at healthcare.
+
+Wekan uses xss package for input fields like cards, as you can see from
+[package.json](https://github.com/wekan/wekan/blob/devel/package.json). Other used versions can be seen from
+[Meteor versions file](https://github.com/wekan/wekan/blob/devel/.meteor/versions).
+Forms can include markdown links, html, image tags etc like you see at https://wekan.github.io .
+It's possible to add attachments to cards, and markdown/html links to files.
+
+Wekan attachments are not accessible without logging in. Import from Trello works by copying
+Trello export JSON to Wekan Trello import page, and in Trello JSON file there is direct links to all publicly
+accessible Trello attachment files, that Standalone Wekan downloads directly to Wekan MongoDB database in
+[CollectionFS](https://github.com/wekan/wekan/pull/875) format. When Wekan board is exported in
+Wekan JSON format, all board attachments are included in Wekan JSON file as base64 encoded text.
+That Wekan JSON format file can be imported to Sandstorm Wekan with all the attachments, when we get
+latest Wekan version working on Sandstorm, only couple of bugs are left before that. In Sandstorm it's not
+possible yet to import from Trello with attachments, because Wekan does not implement Sandstorm-compatible
+access to outside of Wekan grain.
+
+Standalone Wekan only has password auth currently, there is work in progress to add
+[oauth2](https://github.com/wekan/wekan/pull/1578), [Openid](https://github.com/wekan/wekan/issues/538),
+[LDAP](https://github.com/wekan/wekan/issues/119) etc. If you need more login security for Standalone Wekan now,
+it's possible add additional [Google Auth proxybouncer](https://github.com/wekan/wekan/wiki/Let's-Encrypt-and-Google-Auth) in front of password auth, and then use Google Authenticator for Google Auth. Standalone Wekan does have [brute force protection with eluck:accounts-lockout and browser-policy clickjacking protection](https://github.com/wekan/wekan/blob/devel/CHANGELOG.md#v080-2018-04-04-wekan-release). You can also optionally use some [WAF](https://en.wikipedia.org/wiki/Web_application_firewall)
+like for example [AWS WAF](https://aws.amazon.com/waf/).
+
+[All Wekan Platforms](https://github.com/wekan/wekan/wiki/Platforms)
+
+### Sandstorm Wekan Security
+
+On Sandstorm platform using environment variable Standalone Wekan features like Admin Panel etc are
+turned off, because Sandstorm platform provides SSO for all apps running on Sandstorm. 
+
+[Sandstorm](https://sandstorm.io) is separate Open Source platform that has been
+[security audited](https://sandstorm.io/news/2017-03-02-security-review) and found bugs fixed.
+Sandstorm also has passwordless login, LDAP, SAML, Google etc auth options already.
+At Sandstorm code is read-only and signed by app maintainers, only grain content can be modified.
+Wekan at Sandstorm runs in sandboxed grain, it does not have access elsewhere without user-visible
+PowerBox request or opening randomly-generated API key URL.
+Also read [Sandstorm Security Practices](https://docs.sandstorm.io/en/latest/using/security-practices/) and
+[Sandstorm Security non-events](https://docs.sandstorm.io/en/latest/using/security-non-events/).
+For Sandstorm specific security issues you can contact [kentonv](https://github.com/kentonv) by email. 
+
+## What Wekan bugs are eligible?
+
+Any typical web security bugs. If any of the previously mentioned is somehow problematic and
+a security issue, we'd like to know about it, and also how to fix it:
+
+- Cross-site Scripting
+- Open redirect
+- Cross-site request forgery
+- File inclusion
+- Authentication bypass
+- Server-side code execution
+
+## What Wekan bugs are NOT eligible?
+
+Typical already known or "no impact" bugs such as:
+
+- Brute force password guessign. Currently there is
+  [brute force protection with eluck:accounts-lockout](https://github.com/wekan/wekan/blob/devel/CHANGELOG.md#v080-2018-04-04-wekan-release).
+- Security issues related to that Wekan uses Meteor 1.6.0.1 related packages, and upgrading to newer
+  Meteor 1.6.1 is complicated process that requires lots of changes to many dependency packages.
+  Upgrading [has been tried many times, spending a lot of time](https://github.com/meteor/meteor/issues/9609)
+  but there still is issues. Helping with package upgrades is very welcome.
+- [Wekan API old tokens not replaced correctly](https://github.com/wekan/wekan/issues/1437)
+- Missing Cookie flags on non-session cookies or 3rd party cookies
+- Logout CSRF
+- Social engineering
+- Denial of service
+- SSL BEAST/CRIME/etc. Wekan does not have SSL built-in, it uses Caddy/Nginx/Apache etc at front.
+  Integrated Caddy support is updated often.
+- Email spoofing, SPF, DMARC & DKIM. Wekan does not include email server.
+
+Wekan is Open Source with MIT license, and free to use also for commercial use.
+We welcome all fixes to improve security by email to security (at) wekan.team .
+
+## Bonus Points
+
+If your Responsible Security Disclosure includes code for fixing security issue,
+you get bonus points, as seen on [Hall of Fame](https://wekan.github.io/hall-of-fame).
diff --git a/Stackerfile.yml b/Stackerfile.yml
new file mode 100644
index 00000000..3e25f0e8
--- /dev/null
+++ b/Stackerfile.yml
@@ -0,0 +1,9 @@
+appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
+appVersion: "v2.66.0"
+files:
+  userUploads:
+    - README.md
+  userScripts:
+    build: stacksmith/user-scripts/build.sh
+    boot: stacksmith/user-scripts/boot.sh
+    run: stacksmith/user-scripts/run.sh
diff --git a/app.json b/app.json
index 6d3ce917..3921dec9 100644
--- a/app.json
+++ b/app.json
@@ -1,6 +1,6 @@
 {
   "name": "Wekan",
-  "description": "The open-source Trello-like kanban",
+  "description": "The open-source kanban",
   "repository": "https://github.com/wekan/wekan",
   "logo": "https://raw.githubusercontent.com/wekan/wekan/master/meta/icons/wekan-150.png",
   "keywords": ["productivity", "tool", "team", "kanban"],
diff --git a/client/components/activities/activities.jade b/client/components/activities/activities.jade
index 2054777a..54066da8 100644
--- a/client/components/activities/activities.jade
+++ b/client/components/activities/activities.jade
@@ -14,6 +14,9 @@ template(name="boardActivities")
       p.activity-desc
         +memberName(user=user)
 
+        if($eq activityType 'deleteAttachment')
+          | {{{_ 'activity-delete-attach' cardLink}}}.
+
         if($eq activityType 'addAttachment')
           | {{{_ 'activity-attached' attachmentLink cardLink}}}.
 
@@ -31,12 +34,28 @@ template(name="boardActivities")
           .activity-checklist(href="{{ card.absoluteUrl }}")
             +viewer
               = checklist.title
+        if($eq activityType 'removeChecklist')
+          | {{{_ 'activity-checklist-removed' cardLink}}}.
+
+        if($eq activityType 'checkedItem')
+          | {{{_ 'activity-checked-item' checkItem checklist.title cardLink}}}.
+
+        if($eq activityType 'uncheckedItem')
+          | {{{_ 'activity-unchecked-item' checkItem checklist.title cardLink}}}.
+
+        if($eq activityType 'checklistCompleted')
+          | {{{_ 'activity-checklist-completed' checklist.title cardLink}}}.
+
+        if($eq activityType 'checklistUncompleted')
+          | {{{_ 'activity-checklist-uncompleted' checklist.title cardLink}}}.
 
         if($eq activityType 'addChecklistItem')
           | {{{_ 'activity-checklist-item-added' checklist.title cardLink}}}.
           .activity-checklist(href="{{ card.absoluteUrl }}")
             +viewer
               = checklistItem.title
+        if($eq activityType 'removedChecklistItem')
+          | {{{_ 'activity-checklist-item-removed' checklist.title cardLink}}}.
 
         if($eq activityType 'archivedCard')
           | {{{_ 'activity-archived' cardLink}}}.
@@ -53,6 +72,9 @@ template(name="boardActivities")
         if($eq activityType 'createCard')
           | {{{_ 'activity-added' cardLink boardLabel}}}.
 
+        if($eq activityType 'createCustomField')
+          | {{_ 'activity-customfield-created' customField}}.
+
         if($eq activityType 'createList')
           | {{_ 'activity-added' list.title boardLabel}}.
 
@@ -77,6 +99,9 @@ template(name="boardActivities")
           else
             | {{{_ 'activity-added' memberLink cardLink}}}.
 
+        if($eq activityType 'moveCardBoard')
+          | {{{_ 'activity-moved' cardLink oldBoardName boardName}}}.
+
         if($eq activityType 'moveCard')
           | {{{_ 'activity-moved' cardLink oldList.title list.title}}}.
 
@@ -86,6 +111,18 @@ template(name="boardActivities")
         if($eq activityType 'restoredCard')
           | {{{_ 'activity-sent' cardLink boardLabel}}}.
 
+        if($eq activityType 'addedLabel')
+          | {{{_ 'activity-added-label' lastLabel cardLink}}}.
+
+        if($eq activityType 'removedLabel')
+          | {{{_ 'activity-removed-label' lastLabel cardLink}}}.
+
+        if($eq activityType 'setCustomField')
+          | {{{_ 'activity-set-customfield' lastCustomField lastCustomFieldValue cardLink}}}.
+
+        if($eq activityType 'unsetCustomField')
+          | {{{_ 'activity-unset-customfield' lastCustomField cardLink}}}.
+
         if($eq activityType 'unjoinMember')
           if($eq user._id member._id)
             | {{{_ 'activity-unjoined' cardLink}}}.
@@ -101,7 +138,7 @@ template(name="cardActivities")
       p.activity-desc
         +memberName(user=user)
         if($eq activityType 'createCard')
-          | {{_ 'activity-added' cardLabel list.title}}.
+          | {{_ 'activity-added' cardLabel listName}}.
         if($eq activityType 'importCard')
           | {{{_ 'activity-imported' cardLabel list.title sourceLink}}}.
         if($eq activityType 'joinMember')
@@ -116,14 +153,44 @@ template(name="cardActivities")
             | {{{_ 'activity-removed' cardLabel memberLink}}}.
         if($eq activityType 'archivedCard')
           | {{_ 'activity-archived' cardLabel}}.
+
+        if($eq activityType 'addedLabel')
+          | {{{_ 'activity-added-label-card' lastLabel }}}.
+
+        if($eq activityType 'removedLabel')
+          | {{{_ 'activity-removed-label-card' lastLabel }}}.
+
+        if($eq activityType 'removeChecklist')
+          | {{{_ 'activity-checklist-removed' cardLabel}}}.
+
+        if($eq activityType 'checkedItem')
+          | {{{_ 'activity-checked-item-card' checkItem checklist.title }}}.
+
+        if($eq activityType 'uncheckedItem')
+          | {{{_ 'activity-unchecked-item-card' checkItem checklist.title }}}.
+
+        if($eq activityType 'checklistCompleted')
+          | {{{_ 'activity-checklist-completed-card' checklist.title }}}.
+
+        if($eq activityType 'checklistUncompleted')
+          | {{{_ 'activity-checklist-uncompleted-card' checklist.title }}}.
+
         if($eq activityType 'restoredCard')
           | {{_ 'activity-sent' cardLabel boardLabel}}.
         if($eq activityType 'moveCard')
           | {{_ 'activity-moved' cardLabel oldList.title list.title}}.
+
+        if($eq activityType 'moveCardBoard')
+          | {{{_ 'activity-moved' cardLink oldBoardName boardName}}}.
+
         if($eq activityType 'addAttachment')
           | {{{_ 'activity-attached' attachmentLink cardLabel}}}.
           if attachment.isImage
             img.attachment-image-preview(src=attachment.url)
+        if($eq activityType 'deleteAttachment')
+          | {{{_ 'activity-delete-attach'  cardLabel}}}.
+        if($eq activityType 'removedChecklist')
+          | {{{_ 'activity-checklist-removed' cardLabel}}}.
         if($eq activityType 'addChecklist')
           | {{{_ 'activity-checklist-added' cardLabel}}}.
           .activity-checklist
diff --git a/client/components/activities/activities.js b/client/components/activities/activities.js
index ccb064f3..0476897f 100644
--- a/client/components/activities/activities.js
+++ b/client/components/activities/activities.js
@@ -8,16 +8,24 @@ BlazeComponent.extendComponent({
     const sidebar = this.parentComponent(); // XXX for some reason not working
     sidebar.callFirstWith(null, 'resetNextPeak');
     this.autorun(() => {
-      const mode = this.data().mode;
+      let mode = this.data().mode;
       const capitalizedMode = Utils.capitalize(mode);
-      const id = Session.get(`current${capitalizedMode}`);
+      let thisId, searchId;
+      if (mode === 'linkedcard' || mode === 'linkedboard') {
+        thisId = Session.get('currentCard');
+        searchId = Cards.findOne({_id: thisId}).linkedId;
+        mode = mode.replace('linked', '');
+      } else {
+        thisId = Session.get(`current${capitalizedMode}`);
+        searchId = thisId;
+      }
       const limit = this.page.get() * activitiesPerPage;
       const user = Meteor.user();
       const hideSystem = user ? user.hasHiddenSystemMessages() : false;
-      if (id === null)
+      if (searchId === null)
         return;
 
-      this.subscribe('activities', mode, id, limit, hideSystem, () => {
+      this.subscribe('activities', mode, searchId, limit, hideSystem, () => {
         this.loadNextPageLocked = false;
 
         // If the sibear peak hasn't increased, that mean that there are no more
@@ -42,6 +50,12 @@ BlazeComponent.extendComponent({
     }
   },
 
+  checkItem(){
+    const checkItemId = this.currentData().checklistItemId;
+    const checkItem = ChecklistItems.findOne({_id:checkItemId});
+    return checkItem.title;
+  },
+
   boardLabel() {
     return TAPi18n.__('this-board');
   },
@@ -58,6 +72,40 @@ BlazeComponent.extendComponent({
     }, card.title));
   },
 
+  lastLabel(){
+    const lastLabelId = this.currentData().labelId;
+    if (!lastLabelId)
+      return null;
+    const lastLabel = Boards.findOne(Session.get('currentBoard')).getLabelById(lastLabelId);
+    if(lastLabel.name === undefined || lastLabel.name === ''){
+      return lastLabel.color;
+    }else{
+      return lastLabel.name;
+    }
+  },
+
+  lastCustomField(){
+    const lastCustomField = CustomFields.findOne(this.currentData().customFieldId);
+    if (!lastCustomField)
+      return null;
+    return lastCustomField.name;
+  },
+
+  lastCustomFieldValue(){
+    const lastCustomField = CustomFields.findOne(this.currentData().customFieldId);
+    if (!lastCustomField)
+      return null;
+    const value = this.currentData().value;
+    if (lastCustomField.settings.dropdownItems && lastCustomField.settings.dropdownItems.length > 0) {
+      const dropDownValue = _.find(lastCustomField.settings.dropdownItems, (item) => {
+        return item._id === value;
+      });
+      if (dropDownValue)
+        return dropDownValue.name;
+    }
+    return value;
+  },
+
   listLabel() {
     return this.currentData().list().title;
   },
@@ -91,6 +139,13 @@ BlazeComponent.extendComponent({
     }, attachment.name()));
   },
 
+  customField() {
+    const customField = this.currentData().customField();
+    if (!customField)
+      return null;
+    return customField.name;
+  },
+
   events() {
     return [{
       // XXX We should use Popup.afterConfirmation here
diff --git a/client/components/activities/comments.js b/client/components/activities/comments.js
index 9b6aedd6..34b6402c 100644
--- a/client/components/activities/comments.js
+++ b/client/components/activities/comments.js
@@ -21,11 +21,18 @@ BlazeComponent.extendComponent({
       'submit .js-new-comment-form'(evt) {
         const input = this.getInput();
         const text = input.val().trim();
+        const card = this.currentData();
+        let boardId = card.boardId;
+        let cardId = card._id;
+        if (card.isLinkedCard()) {
+          boardId = Cards.findOne(card.linkedId).boardId;
+          cardId = card.linkedId;
+        }
         if (text) {
           CardComments.insert({
             text,
-            boardId: this.currentData().boardId,
-            cardId: this.currentData()._id,
+            boardId,
+            cardId,
           });
           resetCommentInput(input);
           Tracker.flush();
diff --git a/client/components/boards/boardArchive.jade b/client/components/boards/boardArchive.jade
index 6576f742..5d291f00 100644
--- a/client/components/boards/boardArchive.jade
+++ b/client/components/boards/boardArchive.jade
@@ -6,9 +6,17 @@ template(name="archivedBoards")
   ul.archived-lists
     each archivedBoards
       li.archived-lists-item
-        button.js-restore-board
-          i.fa.fa-undo
-          | {{_ 'restore-board'}}
-        = title
+        div.board-header-btns
+          button.board-header-btn.js-delete-board
+            i.fa.fa-trash-o
+            | {{_ 'delete-board'}}
+          button.board-header-btn.js-restore-board
+            i.fa.fa-undo
+            | {{_ 'restore-board'}}
+          = title
     else
       li.no-items-message {{_ 'no-archived-boards'}}
+
+template(name="boardDeletePopup")
+  p {{_ 'delete-board-confirm-popup'}}
+  button.js-confirm.negate.full(type="submit") {{_ 'delete'}}
diff --git a/client/components/boards/boardArchive.js b/client/components/boards/boardArchive.js
index acb53149..c8bbb341 100644
--- a/client/components/boards/boardArchive.js
+++ b/client/components/boards/boardArchive.js
@@ -1,9 +1,3 @@
-Template.boardListHeaderBar.events({
-  'click .js-open-archived-board'() {
-    Modal.open('archivedBoards');
-  },
-});
-
 BlazeComponent.extendComponent({
   onCreated() {
     this.subscribe('archivedBoards');
@@ -29,6 +23,17 @@ BlazeComponent.extendComponent({
         board.restore();
         Utils.goBoardId(board._id);
       },
+      'click .js-delete-board': Popup.afterConfirm('boardDelete', function() {
+        Popup.close();
+        const isSandstorm = Meteor.settings && Meteor.settings.public &&
+          Meteor.settings.public.sandstorm;
+        if (isSandstorm && Session.get('currentBoard')) {
+          const currentBoard = Boards.findOne(Session.get('currentBoard'));
+          Boards.remove(currentBoard._id);
+        }
+        Boards.remove(this._id);
+        FlowRouter.go('home');
+      }),
     }];
   },
 }).register('archivedBoards');
diff --git a/client/components/boards/boardBody.jade b/client/components/boards/boardBody.jade
index 29a613b9..017d0b0a 100644
--- a/client/components/boards/boardBody.jade
+++ b/client/components/boards/boardBody.jade
@@ -20,8 +20,22 @@ template(name="boardBody")
       class="{{#if draggingActive.get}}is-dragging-active{{/if}}")
       if showOverlay.get
         .board-overlay
-      if isViewSwimlanes
+      if currentBoard.isTemplatesBoard
         each currentBoard.swimlanes
           +swimlane(this)
-      if isViewLists
-        +listsGroup
+      else if isViewSwimlanes
+        each currentBoard.swimlanes
+          +swimlane(this)
+      else if isViewLists
+        +listsGroup(currentBoard)
+      else if isViewCalendar
+        +calendarView
+      else
+        +listsGroup(currentBoard)
+
+template(name="calendarView")
+  if isViewCalendar
+    .calendar-view.swimlane
+      if currentCard
+        +cardDetails(currentCard)
+      +fullcalendar(calendarOptions)
diff --git a/client/components/boards/boardBody.js b/client/components/boards/boardBody.js
index 456bf9b3..301c0742 100644
--- a/client/components/boards/boardBody.js
+++ b/client/components/boards/boardBody.js
@@ -1,5 +1,6 @@
 const subManager = new SubsManager();
-const { calculateIndex } = Utils;
+const { calculateIndex, enableClickOnTouch } = Utils;
+const swimlaneWhileSortingHeight = 150;
 
 BlazeComponent.extendComponent({
   onCreated() {
@@ -35,6 +36,37 @@ BlazeComponent.extendComponent({
     this._isDragging = false;
     // Used to set the overlay
     this.mouseHasEnterCardDetails = false;
+
+    // fix swimlanes sort field if there are null values
+    const currentBoardData = Boards.findOne(Session.get('currentBoard'));
+    const nullSortSwimlanes = currentBoardData.nullSortSwimlanes();
+    if (nullSortSwimlanes.count() > 0) {
+      const swimlanes = currentBoardData.swimlanes();
+      let count = 0;
+      swimlanes.forEach((s) => {
+        Swimlanes.update(s._id, {
+          $set: {
+            sort: count,
+          },
+        });
+        count += 1;
+      });
+    }
+
+    // fix lists sort field if there are null values
+    const nullSortLists = currentBoardData.nullSortLists();
+    if (nullSortLists.count() > 0) {
+      const lists = currentBoardData.lists();
+      let count = 0;
+      lists.forEach((l) => {
+        Lists.update(l._id, {
+          $set: {
+            sort: count,
+          },
+        });
+        count += 1;
+      });
+    }
   },
   onRendered() {
     const boardComponent = this;
@@ -43,21 +75,64 @@ BlazeComponent.extendComponent({
     $swimlanesDom.sortable({
       tolerance: 'pointer',
       appendTo: '.board-canvas',
-      helper: 'clone',
+      helper(evt, item) {
+        const helper = $(`<div class="swimlane"
+                               style="flex-direction: column;
+                                      height: ${swimlaneWhileSortingHeight}px;
+                                      width: $(boardComponent.width)px;
+                                      overflow: hidden;"/>`);
+        helper.append(item.clone());
+        // Also grab the list of lists of cards
+        const list = item.next();
+        helper.append(list.clone());
+        return helper;
+      },
       handle: '.js-swimlane-header',
-      items: '.js-swimlane:not(.placeholder)',
+      items: '.swimlane:not(.placeholder)',
       placeholder: 'swimlane placeholder',
       distance: 7,
       start(evt, ui) {
+        const listDom = ui.placeholder.next('.js-swimlane');
+        const parentOffset = ui.item.parent().offset();
+
         ui.placeholder.height(ui.helper.height());
         EscapeActions.executeUpTo('popup-close');
+        listDom.addClass('moving-swimlane');
         boardComponent.setIsDragging(true);
+
+        ui.placeholder.insertAfter(ui.placeholder.next());
+        boardComponent.origPlaceholderIndex = ui.placeholder.index();
+
+        // resize all swimlanes + headers to be a total of 150 px per row
+        // this could be achieved by setIsDragging(true) but we want immediate
+        // result
+        ui.item.siblings('.js-swimlane').css('height', `${swimlaneWhileSortingHeight - 26}px`);
+
+        // set the new scroll height after the resize and insertion of
+        // the placeholder. We want the element under the cursor to stay
+        // at the same place on the screen
+        ui.item.parent().get(0).scrollTop = ui.placeholder.get(0).offsetTop + parentOffset.top - evt.pageY;
+      },
+      beforeStop(evt, ui) {
+        const parentOffset = ui.item.parent().offset();
+        const siblings = ui.item.siblings('.js-swimlane');
+        siblings.css('height', '');
+
+        // compute the new scroll height after the resize and removal of
+        // the placeholder
+        const scrollTop = ui.placeholder.get(0).offsetTop + parentOffset.top - evt.pageY;
+
+        // then reset the original view of the swimlane
+        siblings.removeClass('moving-swimlane');
+
+        // and apply the computed scrollheight
+        ui.item.parent().get(0).scrollTop = scrollTop;
       },
       stop(evt, ui) {
         // To attribute the new index number, we need to get the DOM element
         // of the previous and the following card -- if any.
-        const prevSwimlaneDom = ui.item.prev('.js-swimlane').get(0);
-        const nextSwimlaneDom = ui.item.next('.js-swimlane').get(0);
+        const prevSwimlaneDom = ui.item.prevAll('.js-swimlane').get(0);
+        const nextSwimlaneDom = ui.item.nextAll('.js-swimlane').get(0);
         const sortIndex = calculateIndex(prevSwimlaneDom, nextSwimlaneDom, 1);
 
         $swimlanesDom.sortable('cancel');
@@ -72,8 +147,35 @@ BlazeComponent.extendComponent({
 
         boardComponent.setIsDragging(false);
       },
+      sort(evt, ui) {
+        // get the mouse position in the sortable
+        const parentOffset = ui.item.parent().offset();
+        const cursorY = evt.pageY - parentOffset.top + ui.item.parent().scrollTop();
+
+        // compute the intended index of the placeholder (we need to skip the
+        // slots between the headers and the list of cards)
+        const newplaceholderIndex = Math.floor(cursorY / swimlaneWhileSortingHeight);
+        let destPlaceholderIndex = (newplaceholderIndex + 1) * 2;
+
+        // if we are scrolling far away from the bottom of the list
+        if (destPlaceholderIndex >= ui.item.parent().get(0).childElementCount) {
+          destPlaceholderIndex = ui.item.parent().get(0).childElementCount - 1;
+        }
+
+        // update the placeholder position in the DOM tree
+        if (destPlaceholderIndex !== ui.placeholder.index()) {
+          if (destPlaceholderIndex < boardComponent.origPlaceholderIndex) {
+            ui.placeholder.insertBefore(ui.placeholder.siblings().slice(destPlaceholderIndex - 2, destPlaceholderIndex - 1));
+          } else {
+            ui.placeholder.insertAfter(ui.placeholder.siblings().slice(destPlaceholderIndex - 1, destPlaceholderIndex));
+          }
+        }
+      },
     });
 
+    // ugly touch event hotfix
+    enableClickOnTouch('.js-swimlane:not(.placeholder)');
+
     function userIsMember() {
       return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
     }
@@ -88,12 +190,20 @@ BlazeComponent.extendComponent({
 
   isViewSwimlanes() {
     const currentUser = Meteor.user();
-    return (currentUser.profile.boardView === 'board-view-swimlanes');
+    if (!currentUser) return false;
+    return ((currentUser.profile || {}).boardView === 'board-view-swimlanes');
   },
 
   isViewLists() {
     const currentUser = Meteor.user();
-    return (currentUser.profile.boardView === 'board-view-lists');
+    if (!currentUser) return true;
+    return ((currentUser.profile || {}).boardView === 'board-view-lists');
+  },
+
+  isViewCalendar() {
+    const currentUser = Meteor.user();
+    if (!currentUser) return false;
+    return ((currentUser.profile || {}).boardView === 'board-view-cal');
   },
 
   openNewListForm() {
@@ -105,7 +215,6 @@ BlazeComponent.extendComponent({
         .childComponents('addListForm')[0].open();
     }
   },
-
   events() {
     return [{
       // XXX The board-overlay div should probably be moved to the parent
@@ -137,4 +246,95 @@ BlazeComponent.extendComponent({
     });
   },
 
+  scrollTop(position = 0) {
+    const swimlanes = this.$('.js-swimlanes');
+    swimlanes && swimlanes.animate({
+      scrollTop: position,
+    });
+  },
+
 }).register('boardBody');
+
+BlazeComponent.extendComponent({
+  onRendered() {
+    this.autorun(function(){
+      $('#calendar-view').fullCalendar('refetchEvents');
+    });
+  },
+  calendarOptions() {
+    return {
+      id: 'calendar-view',
+      defaultView: 'agendaDay',
+      editable: true,
+      timezone: 'local',
+      header: {
+        left: 'title   today prev,next',
+        center: 'agendaDay,listDay,timelineDay agendaWeek,listWeek,timelineWeek month,timelineMonth timelineYear',
+        right: '',
+      },
+      // height: 'parent', nope, doesn't work as the parent might be small
+      height: 'auto',
+      /* TODO: lists as resources: https://fullcalendar.io/docs/vertical-resource-view */
+      navLinks: true,
+      nowIndicator: true,
+      businessHours: {
+        // days of week. an array of zero-based day of week integers (0=Sunday)
+        dow: [ 1, 2, 3, 4, 5 ], // Monday - Friday
+        start: '8:00',
+        end: '18:00',
+      },
+      locale: TAPi18n.getLanguage(),
+      events(start, end, timezone, callback) {
+        const currentBoard = Boards.findOne(Session.get('currentBoard'));
+        const events = [];
+        currentBoard.cardsInInterval(start.toDate(), end.toDate()).forEach(function(card){
+          events.push({
+            id: card._id,
+            title: card.title,
+            start: card.startAt,
+            end: card.endAt,
+            allDay: Math.abs(card.endAt.getTime() - card.startAt.getTime()) / 1000 === 24*3600,
+            url: FlowRouter.url('card', {
+              boardId: currentBoard._id,
+              slug: currentBoard.slug,
+              cardId: card._id,
+            }),
+          });
+        });
+        callback(events);
+      },
+      eventResize(event, delta, revertFunc) {
+        let isOk = false;
+        const card = Cards.findOne(event.id);
+
+        if (card) {
+          card.setEnd(event.end.toDate());
+          isOk = true;
+        }
+        if (!isOk) {
+          revertFunc();
+        }
+      },
+      eventDrop(event, delta, revertFunc) {
+        let isOk = false;
+        const card = Cards.findOne(event.id);
+        if (card) {
+          // TODO: add a flag for allDay events
+          if (!event.allDay) {
+            card.setStart(event.start.toDate());
+            card.setEnd(event.end.toDate());
+            isOk = true;
+          }
+        }
+        if (!isOk) {
+          revertFunc();
+        }
+      },
+    };
+  },
+  isViewCalendar() {
+    const currentUser = Meteor.user();
+    if (!currentUser) return false;
+    return ((currentUser.profile || {}).boardView === 'board-view-cal');
+  },
+}).register('calendarView');
diff --git a/client/components/boards/boardBody.styl b/client/components/boards/boardBody.styl
index a614c7ed..dfaaa050 100644
--- a/client/components/boards/boardBody.styl
+++ b/client/components/boards/boardBody.styl
@@ -15,12 +15,13 @@ position()
 
 .board-wrapper
   position: cover
-  overflow-y: hidden;
+  overflow-x: hidden
+  overflow-y: hidden
 
   .board-canvas
     position: cover
     transition: margin .1s
-    overflow-y: auto;
+    overflow-y: auto
 
     &.is-sibling-sidebar-open
       margin-right: 248px
@@ -49,6 +50,6 @@ position()
         display: flex
         flex-direction: column
         margin: 0
-        padding: 0 40px 0px 0
+        padding: 0 0px 0px 0
         overflow-x: hidden
         overflow-y: auto
diff --git a/client/components/boards/boardHeader.jade b/client/components/boards/boardHeader.jade
index fe0771cb..8bc61975 100644
--- a/client/components/boards/boardHeader.jade
+++ b/client/components/boards/boardHeader.jade
@@ -7,71 +7,69 @@ template(name="boardHeaderBar")
 
   .board-header-btns.left
     unless isMiniScreen
-      unless isSandstorm
-        if currentBoard
-          if currentUser
-            a.board-header-btn.js-star-board(class="{{#if isStarred}}is-active{{/if}}"
-              title="{{#if isStarred}}{{_ 'click-to-unstar'}}{{else}}{{_ 'click-to-star'}}{{/if}} {{_ 'starred-boards-description'}}")
-              i.fa(class="fa-star{{#unless isStarred}}-o{{/unless}}")
-              if showStarCounter
-                span
-                  = currentBoard.stars
-
-            a.board-header-btn(
-              class="{{#if currentUser.isBoardAdmin}}js-change-visibility{{else}}is-disabled{{/if}}"
-              title="{{_ currentBoard.permission}}")
-              i.fa(class="{{#if currentBoard.isPublic}}fa-globe{{else}}fa-lock{{/if}}")
-              span {{_ currentBoard.permission}}
-
-            a.board-header-btn.js-watch-board(
-              title="{{_ watchLevel }}")
-              if $eq watchLevel "watching"
-                i.fa.fa-eye
-              if $eq watchLevel "tracking"
-                i.fa.fa-bell
-              if $eq watchLevel "muted"
-                i.fa.fa-bell-slash
-              span {{_ watchLevel}}
+      if currentBoard
+        if currentUser
+          a.board-header-btn.js-star-board(class="{{#if isStarred}}is-active{{/if}}"
+            title="{{#if isStarred}}{{_ 'click-to-unstar'}}{{else}}{{_ 'click-to-star'}}{{/if}} {{_ 'starred-boards-description'}}")
+            i.fa(class="fa-star{{#unless isStarred}}-o{{/unless}}")
+            if showStarCounter
+              span
+                = currentBoard.stars
+
+          a.board-header-btn(
+            class="{{#if currentUser.isBoardAdmin}}js-change-visibility{{else}}is-disabled{{/if}}"
+            title="{{_ currentBoard.permission}}")
+            i.fa(class="{{#if currentBoard.isPublic}}fa-globe{{else}}fa-lock{{/if}}")
+            span {{_ currentBoard.permission}}
+
+          a.board-header-btn.js-watch-board(
+            title="{{_ watchLevel }}")
+            if $eq watchLevel "watching"
+              i.fa.fa-eye
+            if $eq watchLevel "tracking"
+              i.fa.fa-bell
+            if $eq watchLevel "muted"
+              i.fa.fa-bell-slash
+            span {{_ watchLevel}}
 
-          else
-            a.board-header-btn.js-log-in(
-              title="{{_ 'log-in'}}")
-              i.fa.fa-sign-in
-              span {{_ 'log-in'}}
+        else
+          a.board-header-btn.js-log-in(
+            title="{{_ 'log-in'}}")
+            i.fa.fa-sign-in
+            span {{_ 'log-in'}}
 
   .board-header-btns.right
     if currentBoard
       if isMiniScreen
-        unless isSandstorm
-          if currentUser
-            a.board-header-btn.js-star-board(class="{{#if isStarred}}is-active{{/if}}"
-              title="{{#if isStarred}}{{_ 'click-to-unstar'}}{{else}}{{_ 'click-to-star'}}{{/if}} {{_ 'starred-boards-description'}}")
-              i.fa(class="fa-star{{#unless isStarred}}-o{{/unless}}")
-              if showStarCounter
-                span
-                  = currentBoard.stars
-
-            a.board-header-btn(
-              class="{{#if currentUser.isBoardAdmin}}js-change-visibility{{else}}is-disabled{{/if}}"
-              title="{{_ currentBoard.permission}}")
-              i.fa(class="{{#if currentBoard.isPublic}}fa-globe{{else}}fa-lock{{/if}}")
-              span {{_ currentBoard.permission}}
-
-            a.board-header-btn.js-watch-board(
-              title="{{_ watchLevel }}")
-              if $eq watchLevel "watching"
-                i.fa.fa-eye
-              if $eq watchLevel "tracking"
-                i.fa.fa-bell
-              if $eq watchLevel "muted"
-                i.fa.fa-bell-slash
-              span {{_ watchLevel}}
+        if currentUser
+          a.board-header-btn.js-star-board(class="{{#if isStarred}}is-active{{/if}}"
+            title="{{#if isStarred}}{{_ 'click-to-unstar'}}{{else}}{{_ 'click-to-star'}}{{/if}} {{_ 'starred-boards-description'}}")
+            i.fa(class="fa-star{{#unless isStarred}}-o{{/unless}}")
+            if showStarCounter
+              span
+                = currentBoard.stars
+
+          a.board-header-btn(
+            class="{{#if currentUser.isBoardAdmin}}js-change-visibility{{else}}is-disabled{{/if}}"
+            title="{{_ currentBoard.permission}}")
+            i.fa(class="{{#if currentBoard.isPublic}}fa-globe{{else}}fa-lock{{/if}}")
+            span {{_ currentBoard.permission}}
+
+          a.board-header-btn.js-watch-board(
+            title="{{_ watchLevel }}")
+            if $eq watchLevel "watching"
+              i.fa.fa-eye
+            if $eq watchLevel "tracking"
+              i.fa.fa-bell
+            if $eq watchLevel "muted"
+              i.fa.fa-bell-slash
+            span {{_ watchLevel}}
 
-          else
-            a.board-header-btn.js-log-in(
-              title="{{_ 'log-in'}}")
-              i.fa.fa-sign-in
-              span {{_ 'log-in'}}
+        else
+          a.board-header-btn.js-log-in(
+            title="{{_ 'log-in'}}")
+            i.fa.fa-sign-in
+            span {{_ 'log-in'}}
 
       if isSandstorm
         if currentUser
@@ -87,15 +85,20 @@ template(name="boardHeaderBar")
         if Filter.isActive
           a.board-header-btn-close.js-filter-reset(title="{{_ 'filter-clear'}}")
             i.fa.fa-times-thin
+      if currentUser.isAdmin
+        a.board-header-btn.js-open-rules-view(title="{{_ 'rules'}}")
+          i.fa.fa-magic
+          span {{_ 'rules'}}
 
       a.board-header-btn.js-open-search-view(title="{{_ 'search'}}")
         i.fa.fa-search
         span {{_ 'search'}}
 
-      a.board-header-btn.js-toggle-board-view(
-        title="{{_ 'board-view'}}")
-        i.fa.fa-th-large
-        span {{_ currentUser.profile.boardView}}
+      unless currentBoard.isTemplatesBoard
+        a.board-header-btn.js-toggle-board-view(
+          title="{{_ 'board-view'}}")
+          i.fa.fa-th-large
+          span {{#if currentUser.profile.boardView}}{{_ currentUser.profile.boardView}}{{else}}{{_ 'board-view-lists'}}{{/if}}
 
       if canModifyBoard
         a.board-header-btn.js-multiselection-activate(
@@ -108,32 +111,8 @@ template(name="boardHeaderBar")
               i.fa.fa-times-thin
 
       .separator
-      a.board-header-btn.js-open-board-menu(title="{{_ 'boardMenuPopup-title'}}")
-        i.board-header-btn-icon.fa.fa-navicon
-
-template(name="boardMenuPopup")
-  ul.pop-over-list
-    li: a.js-open-archives {{_ 'archived-items'}}
-    if currentUser.isBoardAdmin
-      li: a.js-change-board-color {{_ 'board-change-color'}}
-    //-
-      XXX Language should be handled by sandstorm, but for now display a
-      language selection link in the board menu. This link is normally present
-      in the header bar that is not displayed on sandstorm.
-    if isSandstorm
-      li: a.js-change-language {{_ 'language'}}
-  unless isSandstorm
-    if currentUser.isBoardAdmin
-      hr
-      ul.pop-over-list
-        li: a(href="{{exportUrl}}", download="{{exportFilename}}") {{_ 'export-board'}}
-        li: a.js-archive-board {{_ 'archive-board'}}
-        li: a.js-outgoing-webhooks {{_ 'outgoing-webhooks'}}
-  if isSandstorm
-    hr
-    ul.pop-over-list
-      li: a(href="{{exportUrl}}", download="{{exportFilename}}") {{_ 'export-board'}}
-      li: a.js-import-board {{_ 'import-board-c'}}
+      a.board-header-btn.js-toggle-sidebar
+        i.fa.fa-navicon
 
 template(name="boardVisibilityList")
   ul.pop-over-list
@@ -184,14 +163,6 @@ template(name="boardChangeWatchPopup")
             i.fa.fa-check
           span.sub-name {{_ 'muted-info'}}
 
-template(name="boardChangeColorPopup")
-  .board-backgrounds-list.clearfix
-    each backgroundColors
-      .board-background-select.js-select-background
-        span.background-box(class="board-color-{{this}}")
-          if isSelected
-            i.fa.fa-check
-
 template(name="createBoard")
   form
     label
@@ -213,45 +184,21 @@ template(name="createBoard")
     input.primary.wide(type="submit" value="{{_ 'create'}}")
     span.quiet
       | {{_ 'or'}}
-      a.js-import-board {{_ 'import-board'}}
-
-template(name="chooseBoardSource")
-  ul.pop-over-list
-    li
-      a(href="{{pathFor '/import/trello'}}") {{_ 'from-trello'}}
-    li
-      a(href="{{pathFor '/import/wekan'}}") {{_ 'from-wekan'}}
+      a.js-import-board {{_ 'import'}}
+    span.quiet
+      | /
+      a.js-board-template {{_ 'template'}}
 
 template(name="boardChangeTitlePopup")
   form
     label
       | {{_ 'title'}}
-      input.js-board-name(type="text" value=title autofocus)
+      input.js-board-name(type="text" value=title autofocus dir="auto")
     label
       | {{_ 'description'}}
-      textarea.js-board-desc= description
+      textarea.js-board-desc(dir="auto")= description
     input.primary.wide(type="submit" value="{{_ 'rename'}}")
 
-template(name="archiveBoardPopup")
+template(name="boardCreateRulePopup")
   p {{_ 'close-board-pop'}}
   button.js-confirm.negate.full(type="submit") {{_ 'archive'}}
-
-template(name="outgoingWebhooksPopup")
-  each integrations
-    form.integration-form
-      if title
-        h4 {{title}}
-      else
-        h4 {{_ 'no-name'}}
-      label
-        | URL
-        input.js-outgoing-webhooks-url(type="text" name="url" value=url)
-        input(type="hidden" value=_id name="id")
-      input.primary.wide(type="submit" value="{{_ 'save'}}")
-  form.integration-form
-    h4
-      | {{_ 'new-outgoing-webhook'}}
-    label
-      | URL
-      input.js-outgoing-webhooks-url(type="text" name="url" autofocus)
-    input.primary.wide(type="submit" value="{{_ 'save'}}")
diff --git a/client/components/boards/boardHeader.js b/client/components/boards/boardHeader.js
index 2b587831..f2b5c4f5 100644
--- a/client/components/boards/boardHeader.js
+++ b/client/components/boards/boardHeader.js
@@ -1,5 +1,9 @@
 Template.boardMenuPopup.events({
   'click .js-rename-board': Popup.open('boardChangeTitle'),
+  'click .js-custom-fields'() {
+    Sidebar.setView('customFields');
+    Popup.close();
+  },
   'click .js-open-archives'() {
     Sidebar.setView('archives');
     Popup.close();
@@ -13,8 +17,15 @@ Template.boardMenuPopup.events({
     // confirm that the board was successfully archived.
     FlowRouter.go('home');
   }),
+  'click .js-delete-board': Popup.afterConfirm('deleteBoard', function() {
+    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    Popup.close();
+    Boards.remove(currentBoard._id);
+    FlowRouter.go('home');
+  }),
   'click .js-outgoing-webhooks': Popup.open('outgoingWebhooks'),
   'click .js-import-board': Popup.open('chooseBoardSource'),
+  'click .js-subtask-settings': Popup.open('boardSubtaskSettings'),
 });
 
 Template.boardMenuPopup.helpers({
@@ -78,12 +89,19 @@ BlazeComponent.extendComponent({
       },
       'click .js-toggle-board-view'() {
         const currentUser = Meteor.user();
-        if (currentUser.profile.boardView === 'board-view-swimlanes') {
+        if ((currentUser.profile || {}).boardView === 'board-view-swimlanes') {
+          currentUser.setBoardView('board-view-cal');
+        } else if ((currentUser.profile || {}).boardView === 'board-view-lists') {
+          currentUser.setBoardView('board-view-swimlanes');
+        } else if ((currentUser.profile || {}).boardView === 'board-view-cal') {
           currentUser.setBoardView('board-view-lists');
-        } else if (currentUser.profile.boardView === 'board-view-lists') {
+        } else {
           currentUser.setBoardView('board-view-swimlanes');
         }
       },
+      'click .js-toggle-sidebar'() {
+        Sidebar.toggle();
+      },
       'click .js-open-filter-view'() {
         Sidebar.setView('filter');
       },
@@ -95,6 +113,9 @@ BlazeComponent.extendComponent({
       'click .js-open-search-view'() {
         Sidebar.setView('search');
       },
+      'click .js-open-rules-view'() {
+        Modal.openWide('rulesMain');
+      },
       'click .js-multiselection-activate'() {
         const currentCard = Session.get('currentCard');
         MultiSelection.activate();
@@ -119,28 +140,6 @@ Template.boardHeaderBar.helpers({
   },
 });
 
-BlazeComponent.extendComponent({
-  backgroundColors() {
-    return Boards.simpleSchema()._schema.color.allowedValues;
-  },
-
-  isSelected() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
-    return currentBoard.color === this.currentData().toString();
-  },
-
-  events() {
-    return [{
-      'click .js-select-background'(evt) {
-        const currentBoard = Boards.findOne(Session.get('currentBoard'));
-        const newColor = this.currentData().toString();
-        currentBoard.setColor(newColor);
-        evt.preventDefault();
-      },
-    }];
-  },
-}).register('boardChangeColorPopup');
-
 const CreateBoard = BlazeComponent.extendComponent({
   template() {
     return 'createBoard';
@@ -192,16 +191,11 @@ const CreateBoard = BlazeComponent.extendComponent({
       'click .js-import': Popup.open('boardImportBoard'),
       submit: this.onSubmit,
       'click .js-import-board': Popup.open('chooseBoardSource'),
+      'click .js-board-template': Popup.open('searchElement'),
     }];
   },
 }).register('createBoardPopup');
 
-BlazeComponent.extendComponent({
-  template() {
-    return 'chooseBoardSource';
-  },
-}).register('chooseBoardSourcePopup');
-
 (class HeaderBarCreateBoard extends CreateBoard {
   onSubmit(evt) {
     super.onSubmit(evt);
@@ -251,50 +245,3 @@ BlazeComponent.extendComponent({
     }];
   },
 }).register('boardChangeWatchPopup');
-
-BlazeComponent.extendComponent({
-  integrations() {
-    const boardId = Session.get('currentBoard');
-    return Integrations.find({ boardId: `${boardId}` }).fetch();
-  },
-
-  integration(id) {
-    const boardId = Session.get('currentBoard');
-    return Integrations.findOne({ _id: id, boardId: `${boardId}` });
-  },
-
-  events() {
-    return [{
-      'submit'(evt) {
-        evt.preventDefault();
-        const url = evt.target.url.value;
-        const boardId = Session.get('currentBoard');
-        let id = null;
-        let integration = null;
-        if (evt.target.id) {
-          id = evt.target.id.value;
-          integration = this.integration(id);
-          if (url) {
-            Integrations.update(integration._id, {
-              $set: {
-                url: `${url}`,
-              },
-            });
-          } else {
-            Integrations.remove(integration._id);
-          }
-        } else if (url) {
-          Integrations.insert({
-            userId: Meteor.userId(),
-            enabled: true,
-            type: 'outgoing-webhooks',
-            url: `${url}`,
-            boardId: `${boardId}`,
-            activities: ['all'],
-          });
-        }
-        Popup.close();
-      },
-    }];
-  },
-}).register('outgoingWebhooksPopup');
diff --git a/client/components/boards/boardHeader.styl b/client/components/boards/boardHeader.styl
index 0abdb5bd..402b4f1e 100644
--- a/client/components/boards/boardHeader.styl
+++ b/client/components/boards/boardHeader.styl
@@ -1,3 +1,22 @@
 .integration-form
   padding: 5px
   border-bottom: 1px solid #ccc
+
+.flex
+  display: -webkit-box
+  display: -moz-box
+  display: -webkit-flex
+  display: -moz-flex
+  display: -ms-flexbox
+  display: flex
+
+.option
+  @extends .flex
+  -webkit-border-radius: 3px;
+  border-radius: 3px;
+  background: #fff;
+  text-decoration: none;
+  -webkit-box-shadow: 0 1px 2px rgba(0,0,0,0.2);
+  box-shadow: 0 1px 2px rgba(0,0,0,0.2);
+  margin-top: 5px;
+  padding: 5px;
diff --git a/client/components/boards/boardsList.jade b/client/components/boards/boardsList.jade
index 95ce3678..70b29c49 100644
--- a/client/components/boards/boardsList.jade
+++ b/client/components/boards/boardsList.jade
@@ -1,6 +1,8 @@
 template(name="boardList")
   .wrapper
     ul.board-list.clearfix
+      li.js-add-board
+        a.board-list-item.label {{_ 'add-board'}}
       each boards
         li(class="{{#if isStarred}}starred{{/if}}" class=colorClass)
           if isInvited
@@ -20,15 +22,15 @@ template(name="boardList")
                 i.fa.js-star-board(
                   class="fa-star{{#if isStarred}} is-star-active{{else}}-o{{/if}}"
                   title="{{_ 'star-board-title'}}")
-
+                p.board-list-item-desc= description
                 if hasSpentTimeCards
                   i.fa.js-has-spenttime-cards(
                     class="fa-circle{{#if hasOvertimeCards}} has-overtime-card-active{{else}} no-overtime-card-active{{/if}}"
                     title="{{#if hasOvertimeCards}}{{_ 'has-overtime-cards'}}{{else}}{{_ 'has-spenttime-cards'}}{{/if}}")
+                i.fa.js-clone-board(
+                    class="fa-clone"
+                    title="{{_ 'duplicate-board'}}")
 
-                p.board-list-item-desc= description
-      li.js-add-board
-        a.board-list-item.label {{_ 'add-board'}}
 
 
 template(name="boardListHeaderBar")
@@ -37,3 +39,6 @@ template(name="boardListHeaderBar")
     a.board-header-btn.js-open-archived-board
       i.fa.fa-archive
       span {{_ 'archives'}}
+    a.board-header-btn(href="{{pathFor 'board' id=templatesBoardId slug=templatesBoardSlug}}")
+      i.fa.fa-clone
+      span {{_ 'templates'}}
diff --git a/client/components/boards/boardsList.js b/client/components/boards/boardsList.js
index 1ed88146..8c45fbe2 100644
--- a/client/components/boards/boardsList.js
+++ b/client/components/boards/boardsList.js
@@ -1,5 +1,20 @@
 const subManager = new SubsManager();
 
+Template.boardListHeaderBar.events({
+  'click .js-open-archived-board'() {
+    Modal.open('archivedBoards');
+  },
+});
+
+Template.boardListHeaderBar.helpers({
+  templatesBoardId() {
+    return Meteor.user().getTemplatesBoardId();
+  },
+  templatesBoardSlug() {
+    return Meteor.user().getTemplatesBoardSlug();
+  },
+});
+
 BlazeComponent.extendComponent({
   onCreated() {
     Meteor.subscribe('setting');
@@ -9,11 +24,9 @@ BlazeComponent.extendComponent({
     return Boards.find({
       archived: false,
       'members.userId': Meteor.userId(),
-    }, {
-      sort: ['title'],
-    });
+      type: 'board',
+    }, { sort: ['title'] });
   },
-
   isStarred() {
     const user = Meteor.user();
     return user && user.hasStarred(this.currentData()._id);
@@ -42,6 +55,21 @@ BlazeComponent.extendComponent({
         Meteor.user().toggleBoardStar(boardId);
         evt.preventDefault();
       },
+      'click .js-clone-board'(evt) {
+        Meteor.call('cloneBoard',
+          this.currentData()._id,
+          Session.get('fromBoard'),
+          (err, res) => {
+            if (err) {
+              this.setError(err.error);
+            } else {
+              Session.set('fromBoard', null);
+              Utils.goBoardId(res);
+            }
+          }
+        );
+        evt.preventDefault();
+      },
       'click .js-accept-invite'() {
         const boardId = this.currentData()._id;
         Meteor.user().removeInvite(boardId);
diff --git a/client/components/boards/boardsList.styl b/client/components/boards/boardsList.styl
index 80e47685..7e834411 100644
--- a/client/components/boards/boardsList.styl
+++ b/client/components/boards/boardsList.styl
@@ -94,13 +94,27 @@ $spaceBetweenTiles = 16px
   .is-star-active
     color: white
 
+  .fa-clone
+    position: absolute;
+    bottom: 0
+    font-size: 14px
+    height: 18px
+    line-height: 18px
+    opacity: 0
+    right: 0
+    padding: 9px 9px
+    transition-duration: .15s
+    transition-property: color, font-size, background
+
   li:hover a
     &:hover
       .fa-star,
+      .fa-clone,
       .fa-star-o
         color: white
 
     .fa-star,
+    .fa-clone,
     .fa-star-o
       color: white
       opacity: .75
diff --git a/client/components/boards/miniboard.jade b/client/components/boards/miniboard.jade
new file mode 100644
index 00000000..d1fb0b07
--- /dev/null
+++ b/client/components/boards/miniboard.jade
@@ -0,0 +1,8 @@
+template(name="miniboard")
+  .minicard(
+    class="minicard-{{colorClass}}")
+    .minicard-title
+      .handle
+        .fa.fa-arrows
+      +viewer
+        = title
diff --git a/client/components/cards/attachments.js b/client/components/cards/attachments.js
index bc7d3979..5cac930d 100644
--- a/client/components/cards/attachments.js
+++ b/client/components/cards/attachments.js
@@ -57,8 +57,13 @@ Template.cardAttachmentsPopup.events({
     const card = this;
     FS.Utility.eachFile(evt, (f) => {
       const file = new FS.File(f);
-      file.boardId = card.boardId;
-      file.cardId = card._id;
+      if (card.isLinkedCard()) {
+        file.boardId = Cards.findOne(card.linkedId).boardId;
+        file.cardId = card.linkedId;
+      } else {
+        file.boardId = card.boardId;
+        file.cardId = card._id;
+      }
       file.userId = Meteor.userId();
 
       const attachment = Attachments.insert(file);
diff --git a/client/components/cards/cardCustomFields.jade b/client/components/cards/cardCustomFields.jade
new file mode 100644
index 00000000..65081e3b
--- /dev/null
+++ b/client/components/cards/cardCustomFields.jade
@@ -0,0 +1,76 @@
+template(name="cardCustomFieldsPopup")
+    ul.pop-over-list
+        each board.customFields
+            li.item(class="")
+                a.name.js-select-field(href="#")
+                    span.full-name
+                        = name
+                    if hasCustomField
+                        i.fa.fa-check
+    hr
+    a.quiet-button.full.js-settings
+        i.fa.fa-cog
+        span {{_ 'settings'}}
+
+template(name="cardCustomField")
+    +Template.dynamic(template=getTemplate)
+
+template(name="cardCustomField-text")
+    if canModifyCard
+        +inlinedForm(classNames="js-card-customfield-text")
+            +editor(autofocus=true)
+                = value
+            .edit-controls.clearfix
+                button.primary(type="submit") {{_ 'save'}}
+                a.fa.fa-times-thin.js-close-inlined-form
+        else
+            a.js-open-inlined-form
+                if value
+                    +viewer
+                        = value
+                else
+                    | {{_ 'edit'}}
+
+template(name="cardCustomField-number")
+    if canModifyCard
+        +inlinedForm(classNames="js-card-customfield-number")
+            input(type="number" value=data.value)
+            .edit-controls.clearfix
+                button.primary(type="submit") {{_ 'save'}}
+                a.fa.fa-times-thin.js-close-inlined-form
+        else
+            a.js-open-inlined-form
+                if value
+                    = value
+                else
+                    | {{_ 'edit'}}
+
+template(name="cardCustomField-date")
+    if canModifyCard
+        a.js-edit-date(title="{{showTitle}}" class="{{classes}}")
+            if value
+                div.card-date
+                    time(datetime="{{showISODate}}")
+                        | {{showDate}}
+            else
+                | {{_ 'edit'}}
+
+template(name="cardCustomField-dropdown")
+    if canModifyCard
+        +inlinedForm(classNames="js-card-customfield-dropdown")
+            select.inline
+                each items
+                    if($eq data.value this._id)
+                        option(value=_id selected="selected") {{name}}
+                    else
+                        option(value=_id) {{name}}
+            .edit-controls.clearfix
+                button.primary(type="submit") {{_ 'save'}}
+                a.fa.fa-times-thin.js-close-inlined-form
+        else
+            a.js-open-inlined-form
+                if value
+                    +viewer
+                        = selectedItem
+                else
+                    | {{_ 'edit'}}
\ No newline at end of file
diff --git a/client/components/cards/cardCustomFields.js b/client/components/cards/cardCustomFields.js
new file mode 100644
index 00000000..aa50caec
--- /dev/null
+++ b/client/components/cards/cardCustomFields.js
@@ -0,0 +1,179 @@
+Template.cardCustomFieldsPopup.helpers({
+  hasCustomField() {
+    const card = Cards.findOne(Session.get('currentCard'));
+    const customFieldId = this._id;
+    return card.customFieldIndex(customFieldId) > -1;
+  },
+});
+
+Template.cardCustomFieldsPopup.events({
+  'click .js-select-field'(evt) {
+    const card = Cards.findOne(Session.get('currentCard'));
+    const customFieldId = this._id;
+    card.toggleCustomField(customFieldId);
+    evt.preventDefault();
+  },
+  'click .js-settings'(evt) {
+    EscapeActions.executeUpTo('detailsPane');
+    Sidebar.setView('customFields');
+    evt.preventDefault();
+  },
+});
+
+// cardCustomField
+const CardCustomField = BlazeComponent.extendComponent({
+
+  getTemplate() {
+    return `cardCustomField-${this.data().definition.type}`;
+  },
+
+  onCreated() {
+    const self = this;
+    self.card = Cards.findOne(Session.get('currentCard'));
+    self.customFieldId = this.data()._id;
+  },
+
+  canModifyCard() {
+    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
+  },
+});
+CardCustomField.register('cardCustomField');
+
+// cardCustomField-text
+(class extends CardCustomField {
+
+  onCreated() {
+    super.onCreated();
+  }
+
+  events() {
+    return [{
+      'submit .js-card-customfield-text'(evt) {
+        evt.preventDefault();
+        const value = this.currentComponent().getValue();
+        this.card.setCustomField(this.customFieldId, value);
+      },
+    }];
+  }
+
+}).register('cardCustomField-text');
+
+// cardCustomField-number
+(class extends CardCustomField {
+
+  onCreated() {
+    super.onCreated();
+  }
+
+  events() {
+    return [{
+      'submit .js-card-customfield-number'(evt) {
+        evt.preventDefault();
+        const value = parseInt(this.find('input').value, 10);
+        this.card.setCustomField(this.customFieldId, value);
+      },
+    }];
+  }
+
+}).register('cardCustomField-number');
+
+// cardCustomField-date
+(class extends CardCustomField {
+
+  onCreated() {
+    super.onCreated();
+    const self = this;
+    self.date = ReactiveVar();
+    self.now = ReactiveVar(moment());
+    window.setInterval(() => {
+      self.now.set(moment());
+    }, 60000);
+
+    self.autorun(() => {
+      self.date.set(moment(self.data().value));
+    });
+  }
+
+  showDate() {
+    // this will start working once mquandalle:moment
+    // is updated to at least moment.js 2.10.5
+    // until then, the date is displayed in the "L" format
+    return this.date.get().calendar(null, {
+      sameElse: 'llll',
+    });
+  }
+
+  showISODate() {
+    return this.date.get().toISOString();
+  }
+
+  classes() {
+    if (this.date.get().isBefore(this.now.get(), 'minute') &&
+            this.now.get().isBefore(this.data().value)) {
+      return 'current';
+    }
+    return '';
+  }
+
+  showTitle() {
+    return `${TAPi18n.__('card-start-on')} ${this.date.get().format('LLLL')}`;
+  }
+
+  events() {
+    return [{
+      'click .js-edit-date': Popup.open('cardCustomField-date'),
+    }];
+  }
+
+}).register('cardCustomField-date');
+
+// cardCustomField-datePopup
+(class extends DatePicker {
+  onCreated() {
+    super.onCreated();
+    const self = this;
+    self.card = Cards.findOne(Session.get('currentCard'));
+    self.customFieldId = this.data()._id;
+    this.data().value && this.date.set(moment(this.data().value));
+  }
+
+  _storeDate(date) {
+    this.card.setCustomField(this.customFieldId, date);
+  }
+
+  _deleteDate() {
+    this.card.setCustomField(this.customFieldId, '');
+  }
+}).register('cardCustomField-datePopup');
+
+// cardCustomField-dropdown
+(class extends CardCustomField {
+
+  onCreated() {
+    super.onCreated();
+    this._items = this.data().definition.settings.dropdownItems;
+    this.items = this._items.slice(0);
+    this.items.unshift({
+      _id: '',
+      name: TAPi18n.__('custom-field-dropdown-none'),
+    });
+  }
+
+  selectedItem() {
+    const selected = this._items.find((item) => {
+      return item._id === this.data().value;
+    });
+    return (selected) ? selected.name : TAPi18n.__('custom-field-dropdown-unknown');
+  }
+
+  events() {
+    return [{
+      'submit .js-card-customfield-dropdown'(evt) {
+        evt.preventDefault();
+        const value = this.find('select').value;
+        this.card.setCustomField(this.customFieldId, value);
+      },
+    }];
+  }
+
+}).register('cardCustomField-dropdown');
diff --git a/client/components/cards/cardDate.jade b/client/components/cards/cardDate.jade
index 525f27ed..2e447506 100644
--- a/client/components/cards/cardDate.jade
+++ b/client/components/cards/cardDate.jade
@@ -1,19 +1,3 @@
-template(name="editCardDate")
-  .edit-card-date
-    form.edit-date
-      .fields
-        .left
-          label(for="date") {{_ 'date'}}
-          input.js-date-field#date(type="text" name="date" value=showDate placeholder=dateFormat autofocus)
-        .right
-          label(for="time") {{_ 'time'}}
-          input.js-time-field#time(type="text" name="time" value=showTime placeholder=timeFormat)
-      .js-datepicker
-      if error.get
-        .warning {{_ error.get}}
-      button.primary.wide.left.js-submit-date(type="submit") {{_ 'save'}}
-      button.js-delete-date.negate.wide.right.js-delete-date {{_ 'delete'}}
-
 template(name="dateBadge")
   if canModifyCard
     a.js-edit-date.card-date(title="{{showTitle}}" class="{{classes}}")
diff --git a/client/components/cards/cardDate.js b/client/components/cards/cardDate.js
index 7c0ad6ab..182705d5 100644
--- a/client/components/cards/cardDate.js
+++ b/client/components/cards/cardDate.js
@@ -1,5 +1,5 @@
 // Edit received, start, due & end dates
-const EditCardDate = BlazeComponent.extendComponent({
+BlazeComponent.extendComponent({
   template() {
     return 'editCardDate';
   },
@@ -93,10 +93,10 @@ Template.dateBadge.helpers({
 });
 
 // editCardReceivedDatePopup
-(class extends EditCardDate {
+(class extends DatePicker {
   onCreated() {
     super.onCreated();
-    this.data().receivedAt && this.date.set(moment(this.data().receivedAt));
+    this.data().getReceived() && this.date.set(moment(this.data().getReceived()));
   }
 
   _storeDate(date) {
@@ -104,22 +104,22 @@ Template.dateBadge.helpers({
   }
 
   _deleteDate() {
-    this.card.unsetReceived();
+    this.card.setReceived(null);
   }
 }).register('editCardReceivedDatePopup');
 
 
 // editCardStartDatePopup
-(class extends EditCardDate {
+(class extends DatePicker {
   onCreated() {
     super.onCreated();
-    this.data().startAt && this.date.set(moment(this.data().startAt));
+    this.data().getStart() && this.date.set(moment(this.data().getStart()));
   }
 
   onRendered() {
     super.onRendered();
-    if (moment.isDate(this.card.receivedAt)) {
-      this.$('.js-datepicker').datepicker('setStartDate', this.card.receivedAt);
+    if (moment.isDate(this.card.getReceived())) {
+      this.$('.js-datepicker').datepicker('setStartDate', this.card.getReceived());
     }
   }
 
@@ -128,21 +128,21 @@ Template.dateBadge.helpers({
   }
 
   _deleteDate() {
-    this.card.unsetStart();
+    this.card.setStart(null);
   }
 }).register('editCardStartDatePopup');
 
 // editCardDueDatePopup
-(class extends EditCardDate {
+(class extends DatePicker {
   onCreated() {
     super.onCreated();
-    this.data().dueAt && this.date.set(moment(this.data().dueAt));
+    this.data().getDue() && this.date.set(moment(this.data().getDue()));
   }
 
   onRendered() {
     super.onRendered();
-    if (moment.isDate(this.card.startAt)) {
-      this.$('.js-datepicker').datepicker('setStartDate', this.card.startAt);
+    if (moment.isDate(this.card.getStart())) {
+      this.$('.js-datepicker').datepicker('setStartDate', this.card.getStart());
     }
   }
 
@@ -151,21 +151,21 @@ Template.dateBadge.helpers({
   }
 
   _deleteDate() {
-    this.card.unsetDue();
+    this.card.setDue(null);
   }
 }).register('editCardDueDatePopup');
 
 // editCardEndDatePopup
-(class extends EditCardDate {
+(class extends DatePicker {
   onCreated() {
     super.onCreated();
-    this.data().endAt && this.date.set(moment(this.data().endAt));
+    this.data().getEnd() && this.date.set(moment(this.data().getEnd()));
   }
 
   onRendered() {
     super.onRendered();
-    if (moment.isDate(this.card.startAt)) {
-      this.$('.js-datepicker').datepicker('setStartDate', this.card.startAt);
+    if (moment.isDate(this.card.getStart())) {
+      this.$('.js-datepicker').datepicker('setStartDate', this.card.getStart());
     }
   }
 
@@ -174,7 +174,7 @@ Template.dateBadge.helpers({
   }
 
   _deleteDate() {
-    this.card.unsetEnd();
+    this.card.setEnd(null);
   }
 }).register('editCardEndDatePopup');
 
@@ -213,16 +213,23 @@ class CardReceivedDate extends CardDate {
     super.onCreated();
     const self = this;
     self.autorun(() => {
-      self.date.set(moment(self.data().receivedAt));
+      self.date.set(moment(self.data().getReceived()));
     });
   }
 
   classes() {
-    let classes = 'received-date' + ' ';
-    if (this.date.get().isBefore(this.now.get(), 'minute') &&
-        this.now.get().isBefore(this.data().dueAt)) {
+    let classes = 'received-date ';
+    const dueAt = this.data().getDue();
+    const endAt = this.data().getEnd();
+    const startAt = this.data().getStart();
+    const theDate = this.date.get();
+    // if dueAt, endAt and startAt exist & are > receivedAt, receivedAt doesn't need to be flagged
+    if (((startAt) && (theDate.isAfter(dueAt))) ||
+       ((endAt) && (theDate.isAfter(endAt))) ||
+       ((dueAt) && (theDate.isAfter(dueAt))))
+      classes += 'long-overdue';
+    else
       classes += 'current';
-    }
     return classes;
   }
 
@@ -243,16 +250,24 @@ class CardStartDate extends CardDate {
     super.onCreated();
     const self = this;
     self.autorun(() => {
-      self.date.set(moment(self.data().startAt));
+      self.date.set(moment(self.data().getStart()));
     });
   }
 
   classes() {
     let classes = 'start-date' + ' ';
-    if (this.date.get().isBefore(this.now.get(), 'minute') &&
-        this.now.get().isBefore(this.data().dueAt)) {
+    const dueAt = this.data().getDue();
+    const endAt = this.data().getEnd();
+    const theDate = this.date.get();
+    const now = this.now.get();
+    // if dueAt or endAt exist & are > startAt, startAt doesn't need to be flagged
+    if (((endAt) && (theDate.isAfter(endAt))) ||
+       ((dueAt) && (theDate.isAfter(dueAt))))
+      classes += 'long-overdue';
+    else if (theDate.isBefore(now, 'minute'))
+      classes += 'almost-due';
+    else
       classes += 'current';
-    }
     return classes;
   }
 
@@ -273,17 +288,26 @@ class CardDueDate extends CardDate {
     super.onCreated();
     const self = this;
     self.autorun(() => {
-      self.date.set(moment(self.data().dueAt));
+      self.date.set(moment(self.data().getDue()));
     });
   }
 
   classes() {
     let classes = 'due-date' + ' ';
-    if (this.now.get().diff(this.date.get(), 'days') >= 2)
+    const endAt = this.data().getEnd();
+    const theDate = this.date.get();
+    const now = this.now.get();
+    // if the due date is after the end date, green - done early
+    if ((endAt) && (theDate.isAfter(endAt)))
+      classes += 'current';
+    // if there is an end date, don't need to flag the due date
+    else if (endAt)
+      classes += '';
+    else if (now.diff(theDate, 'days') >= 2)
       classes += 'long-overdue';
-    else if (this.now.get().diff(this.date.get(), 'minute') >= 0)
+    else if (now.diff(theDate, 'minute') >= 0)
       classes += 'due';
-    else if (this.now.get().diff(this.date.get(), 'days') >= -1)
+    else if (now.diff(theDate, 'days') >= -1)
       classes += 'almost-due';
     return classes;
   }
@@ -305,17 +329,19 @@ class CardEndDate extends CardDate {
     super.onCreated();
     const self = this;
     self.autorun(() => {
-      self.date.set(moment(self.data().endAt));
+      self.date.set(moment(self.data().getEnd()));
     });
   }
 
   classes() {
     let classes = 'end-date' + ' ';
-    if (this.data.dueAt.diff(this.date.get(), 'days') >= 2)
+    const dueAt = this.data().getDue();
+    const theDate = this.date.get();
+    if (theDate.diff(dueAt, 'days') >= 2)
       classes += 'long-overdue';
-    else if (this.data.dueAt.diff(this.date.get(), 'days') >= 0)
+    else if (theDate.diff(dueAt, 'days') >= 0)
       classes += 'due';
-    else if (this.data.dueAt.diff(this.date.get(), 'days') >= -2)
+    else if (theDate.diff(dueAt, 'days') >= -2)
       classes += 'almost-due';
     return classes;
   }
@@ -355,4 +381,3 @@ CardEndDate.register('cardEndDate');
     return this.date.get().format('l');
   }
 }).register('minicardEndDate');
-
diff --git a/client/components/cards/cardDate.styl b/client/components/cards/cardDate.styl
index 1ad3adb3..62cfdcd9 100644
--- a/client/components/cards/cardDate.styl
+++ b/client/components/cards/cardDate.styl
@@ -1,22 +1,3 @@
-.edit-card-date
-  .fields
-    .left
-      width: 56%
-    .right
-      width: 38%
-  .datepicker
-    width: 100%
-    table
-      width: 100%
-      border: none
-      border-spacing: 0
-      border-collapse: collapse
-      thead
-        background: none
-      td, th
-        box-sizing: border-box
-
-
 .card-date
   display: block
   border-radius: 4px
@@ -62,12 +43,12 @@
   &.start-date
     time
       &::before
-        content: "\f08b"  // symbol: fa-sign-out
+        content: "\f251"  // symbol: fa-hourglass-start
 
   &.received-date
     time
       &::before
-        content: "\f251"  // symbol: fa-hourglass-start
+        content: "\f08b"  // symbol: fa-sign-out
 
   time
     &::before
diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade
index 047d7518..88f97adc 100644
--- a/client/components/cards/cardDetails.jade
+++ b/client/components/cards/cardDetails.jade
@@ -1,6 +1,6 @@
 template(name="cardDetails")
   section.card-details.js-card-details.js-perfect-scrollbar: .card-details-canvas
-    .card-details-header
+    .card-details-header(class='{{#if colorClass}}card-details-{{colorClass}}{{/if}}')
       +inlinedForm(classNames="js-card-details-title")
         +editCardTitleForm
       else
@@ -10,46 +10,63 @@ template(name="cardDetails")
         h2.card-details-title.js-card-title(
           class="{{#if canModifyCard}}js-open-inlined-form is-editable{{/if}}")
             +viewer
-              = title
+              = getTitle
               if isWatching
                 i.fa.fa-eye.card-details-watch
+        .card-details-path
+          each parentList
+            | &nbsp; &gt; &nbsp;
+            a.js-parent-card(href=linkForCard) {{title}}
+          // else
+            {{_ 'top-level-card'}}
+        if isLinkedCard
+          h3.linked-card-location
+            +viewer
+              | {{getBoardTitle}} > {{getTitle}}
 
-    if archived
-      p.warning {{_ 'card-archived'}}
+    if getArchived
+      if isLinkedBoard
+        p.warning {{_ 'board-archived'}}
+      else
+        p.warning {{_ 'card-archived'}}
 
     .card-details-items
       .card-details-item.card-details-item-received
         h3.card-details-item-title {{_ 'card-received'}}
-        if receivedAt
+        if getReceived
           +cardReceivedDate
         else
-          a.js-received-date {{_ 'add'}}
+          if canModifyCard
+            a.js-received-date {{_ 'add'}}
 
       .card-details-item.card-details-item-start
         h3.card-details-item-title {{_ 'card-start'}}
-        if startAt
+        if getStart
           +cardStartDate
         else
-          a.js-start-date {{_ 'add'}}
+          if canModifyCard
+            a.js-start-date {{_ 'add'}}
 
       .card-details-item.card-details-item-due
         h3.card-details-item-title {{_ 'card-due'}}
-        if dueAt
+        if getDue
           +cardDueDate
         else
-          a.js-due-date {{_ 'add'}}
+          if canModifyCard
+            a.js-due-date {{_ 'add'}}
 
       .card-details-item.card-details-item-end
         h3.card-details-item-title {{_ 'card-end'}}
-        if endAt
+        if getEnd
           +cardEndDate
         else
-          a.js-end-date {{_ 'add'}}
+          if canModifyCard
+            a.js-end-date {{_ 'add'}}
 
     .card-details-items
       .card-details-item.card-details-item-members
         h3.card-details-item-title {{_ 'members'}}
-        each members
+        each getMembers
           +userAvatar(userId=this cardId=../_id)
           | {{! XXX Hack to hide syntaxic coloration /// }}
         if canModifyCard
@@ -66,9 +83,16 @@ template(name="cardDetails")
             i.fa.fa-plus
 
     .card-details-items
-      if spentTime
+      each customFieldsWD
+        .card-details-item.card-details-item-customfield
+          h3.card-details-item-title
+            = definition.name
+          +cardCustomField
+
+    .card-details-items
+      if getSpentTime
         .card-details-item.card-details-item-spent
-          if isOvertime
+          if getIsOvertime
             h3.card-details-item-title {{_ 'overtime-hours'}}
           else
             h3.card-details-item-title {{_ 'spent-time-hours'}}
@@ -79,15 +103,15 @@ template(name="cardDetails")
       h3.card-details-item-title {{_ 'description'}}
       +inlinedCardDescription(classNames="card-description js-card-description")
         +editor(autofocus=true)
-          | {{getUnsavedValue 'cardDescription' _id description}}
+          | {{getUnsavedValue 'cardDescription' _id getDescription}}
         .edit-controls.clearfix
           button.primary(type="submit") {{_ 'save'}}
           a.fa.fa-times-thin.js-close-inlined-form
       else
         a.js-open-inlined-form
-          if description
+          if getDescription
             +viewer
-              = description
+              = getDescription
           else
             | {{_ 'edit'}}
         if (hasUnsavedValue 'cardDescription' _id)
@@ -96,14 +120,51 @@ template(name="cardDetails")
             a.js-open-inlined-form {{_ 'view-it'}}
             = ' - '
             a.js-close-inlined-form {{_ 'discard'}}
-    else if description
+    else if getDescription
       h3.card-details-item-title {{_ 'description'}}
       +viewer
-        = description
+        = getDescription
+
+    .card-details-items
+      .card-details-item.card-details-item-name
+        h3.card-details-item-title {{_ 'requested-by'}}
+        if canModifyCard
+          +inlinedForm(classNames="js-card-details-requester")
+            +editCardRequesterForm
+          else
+            a.js-open-inlined-form
+              if getRequestedBy
+                +viewer
+                  = getRequestedBy
+              else
+                | {{_ 'add'}}
+        else if getRequestedBy
+          +viewer
+            = getRequestedBy
+
+      .card-details-item.card-details-item-name
+        h3.card-details-item-title {{_ 'assigned-by'}}
+        if canModifyCard
+          +inlinedForm(classNames="js-card-details-assigner")
+            +editCardAssignerForm
+          else
+            a.js-open-inlined-form
+              if getAssignedBy
+                +viewer
+                  = getAssignedBy
+              else
+                | {{_ 'add'}}
+        else if getRequestedBy
+          +viewer
+            = getAssignedBy
 
     hr
     +checklists(cardId = _id)
 
+    if currentBoard.allowsSubtasks
+      hr
+      +subtasks(cardId = _id)
+
     hr
     h3
       i.fa.fa-paperclip
@@ -112,42 +173,64 @@ template(name="cardDetails")
     +attachmentsGalery
 
     hr
-    .activity-title
-      h3 {{ _ 'activity'}}
-      if currentUser.isBoardMember
-        .material-toggle-switch
-          span.toggle-switch-title {{_ 'hide-system-messages'}}
-          if hiddenSystemMessages
-            input.toggle-switch(type="checkbox" id="toggleButton" checked="checked")
-          else
-            input.toggle-switch(type="checkbox" id="toggleButton")
-          label.toggle-label(for="toggleButton")
+    unless currentUser.isNoComments
+      .activity-title
+        h3 {{ _ 'activity'}}
+        if currentUser.isBoardMember
+          .material-toggle-switch
+            span.toggle-switch-title {{_ 'hide-system-messages'}}
+            if hiddenSystemMessages
+              input.toggle-switch(type="checkbox" id="toggleButton" checked="checked")
+            else
+              input.toggle-switch(type="checkbox" id="toggleButton")
+            label.toggle-label(for="toggleButton")
     if currentUser.isBoardMember
-      +commentForm
-    if isLoaded.get
-      +activities(card=this mode="card")
+      unless currentUser.isNoComments
+        +commentForm
+    unless currentUser.isNoComments
+      if isLoaded.get
+        if isLinkedCard
+          +activities(card=this mode="linkedcard")
+        else if isLinkedBoard
+          +activities(card=this mode="linkedboard")
+        else
+          +activities(card=this mode="card")
 
 template(name="editCardTitleForm")
-  textarea.js-edit-card-title(rows='1' autofocus)
-    = title
+  textarea.js-edit-card-title(rows='1' autofocus dir="auto")
+    = getTitle
   .edit-controls.clearfix
     button.primary.confirm.js-submit-edit-card-title-form(type="submit") {{_ 'save'}}
     a.fa.fa-times-thin.js-close-inlined-form
 
+template(name="editCardRequesterForm")
+  input.js-edit-card-requester(type='text' autofocus value=getRequestedBy dir="auto")
+  .edit-controls.clearfix
+    button.primary.confirm.js-submit-edit-card-requester-form(type="submit") {{_ 'save'}}
+    a.fa.fa-times-thin.js-close-inlined-form
+
+template(name="editCardAssignerForm")
+  input.js-edit-card-assigner(type='text' autofocus value=getAssignedBy dir="auto")
+  .edit-controls.clearfix
+    button.primary.confirm.js-submit-edit-card-assigner-form(type="submit") {{_ 'save'}}
+    a.fa.fa-times-thin.js-close-inlined-form
+
 template(name="cardDetailsActionsPopup")
   ul.pop-over-list
     li: a.js-toggle-watch-card {{#if isWatching}}{{_ 'unwatch'}}{{else}}{{_ 'watch'}}{{/if}}
   if canModifyCard
     hr
     ul.pop-over-list
-      li: a.js-members {{_ 'card-edit-members'}}
-      li: a.js-labels {{_ 'card-edit-labels'}}
-      li: a.js-attachments {{_ 'card-edit-attachments'}}
-      li: a.js-received-date {{_ 'editCardReceivedDatePopup-title'}}
-      li: a.js-start-date {{_ 'editCardStartDatePopup-title'}}
-      li: a.js-due-date {{_ 'editCardDueDatePopup-title'}}
-      li: a.js-end-date {{_ 'editCardEndDatePopup-title'}}
+      //li: a.js-members {{_ 'card-edit-members'}}
+      //li: a.js-labels {{_ 'card-edit-labels'}}
+      //li: a.js-attachments {{_ 'card-edit-attachments'}}
+      li: a.js-custom-fields {{_ 'card-edit-custom-fields'}}
+      //li: a.js-received-date {{_ 'editCardReceivedDatePopup-title'}}
+      //li: a.js-start-date {{_ 'editCardStartDatePopup-title'}}
+      //li: a.js-due-date {{_ 'editCardDueDatePopup-title'}}
+      //li: a.js-end-date {{_ 'editCardEndDatePopup-title'}}
       li: a.js-spent-time {{_ 'editCardSpentTimePopup-title'}}
+      li: a.js-set-card-color {{_ 'setCardColorPopup-title'}}
     hr
     ul.pop-over-list
       li: a.js-move-card-to-top {{_ 'moveCardToTop-title'}}
@@ -167,10 +250,9 @@ template(name="moveCardPopup")
 template(name="copyCardPopup")
   label(for='copy-card-title') {{_ 'title'}}:
   textarea#copy-card-title.minicard-composer-textarea.js-card-title(autofocus)
-    = title
+    = getTitle
   +boardsAndLists
 
-
 template(name="copyChecklistToManyCardsPopup")
   label(for='copy-checklist-cards-title') {{_ 'copyChecklistToManyCardsPopup-instructions'}}:
   textarea#copy-card-title.minicard-composer-textarea.js-card-title(autofocus)
@@ -179,7 +261,7 @@ template(name="copyChecklistToManyCardsPopup")
 
 template(name="boardsAndLists")
   label {{_ 'boards'}}:
-  select.js-select-boards
+  select.js-select-boards(autofocus)
     each boards
       if $eq _id currentBoard._id
         option(value="{{_id}}" selected) {{_ 'current'}}
@@ -217,14 +299,49 @@ template(name="cardMorePopup")
       span {{_ 'link-card'}}
       = ' '
       i.fa.colorful(class="{{#if board.isPublic}}fa-globe{{else}}fa-lock{{/if}}")
-      input.inline-input(type="text" id="cardURL" readonly value="{{ absoluteUrl }}")
+      input.inline-input(type="text" id="cardURL" readonly value="{{ absoluteUrl }}" autofocus="autofocus")
       button.js-copy-card-link-to-clipboard(class="btn") {{_ 'copy-card-link-to-clipboard'}}
     span.clearfix
     br
+    h2 {{_ 'change-card-parent'}}
+    label {{_ 'source-board'}}:
+      select.js-field-parent-board
+        if isTopLevel
+          option(value="none" selected) {{_ 'custom-field-dropdown-none'}}
+        else
+          option(value="none") {{_ 'custom-field-dropdown-none'}}
+        each boards
+          if isParentBoard
+            option(value="{{_id}}" selected) {{title}}
+          else
+            option(value="{{_id}}") {{title}}
+
+    label {{_ 'parent-card'}}:
+      select.js-field-parent-card
+        if isTopLevel
+          option(value="none" selected) {{_ 'custom-field-dropdown-none'}}
+        else
+          option(value="none") {{_ 'custom-field-dropdown-none'}}
+          each cards
+            if isParentCard
+              option(value="{{_id}}" selected) {{title}}
+            else
+              option(value="{{_id}}") {{title}}
+    br
     | {{_ 'added'}}
     span.date(title=card.createdAt) {{ moment createdAt 'LLL' }}
     a.js-delete(title="{{_ 'card-delete-notice'}}") {{_ 'delete'}}
 
+template(name="setCardColorPopup")
+  form.edit-label
+    .palette-colors: each colors
+      unless $eq color 'white'
+        span.card-label.palette-color.js-palette-color(class="card-details-{{color}}")
+          if(isSelected color)
+            i.fa.fa-check
+    button.primary.confirm.js-submit {{_ 'save'}}
+    button.js-remove-color.negate.wide.right {{_ 'unset-color'}}
+
 template(name="cardDeletePopup")
   p {{_ "card-delete-pop"}}
   unless archived
diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js
index cdd027e6..79e9e311 100644
--- a/client/components/cards/cardDetails.js
+++ b/client/components/cards/cardDetails.js
@@ -1,5 +1,10 @@
 const subManager = new SubsManager();
-const { calculateIndexData } = Utils;
+const { calculateIndexData, enableClickOnTouch } = Utils;
+
+let cardColors;
+Meteor.startup(() => {
+  cardColors = Cards.simpleSchema()._schema.color.allowedValues;
+});
 
 BlazeComponent.extendComponent({
   mixins() {
@@ -20,9 +25,14 @@ BlazeComponent.extendComponent({
   },
 
   onCreated() {
+    this.currentBoard = Boards.findOne(Session.get('currentBoard'));
     this.isLoaded = new ReactiveVar(false);
-    this.parentComponent().parentComponent().showOverlay.set(true);
-    this.parentComponent().parentComponent().mouseHasEnterCardDetails = false;
+    const boardBody =  this.parentComponent().parentComponent();
+    //in Miniview parent is Board, not BoardBody.
+    if (boardBody !== null) {
+      boardBody.showOverlay.set(true);
+      boardBody.mouseHasEnterCardDetails = false;
+    }
     this.calculateNextPeak();
 
     Meteor.subscribe('unsaved-edits');
@@ -44,7 +54,8 @@ BlazeComponent.extendComponent({
   scrollParentContainer() {
     const cardPanelWidth = 510;
     const bodyBoardComponent = this.parentComponent().parentComponent();
-
+    //On Mobile View Parent is Board, Not Board Body. I cant see how this funciton should work then.
+    if (bodyBoardComponent === null) return;
     const $cardView = this.$(this.firstNode());
     const $cardContainer = bodyBoardComponent.$('.js-swimlanes');
     const cardContainerScroll = $cardContainer.scrollLeft();
@@ -63,10 +74,52 @@ BlazeComponent.extendComponent({
     if (offset) {
       bodyBoardComponent.scrollLeft(cardContainerScroll + offset);
     }
+
+    //Scroll top
+    const cardViewStartTop = $cardView.offset().top;
+    const cardContainerScrollTop = $cardContainer.scrollTop();
+
+    let topOffset = false;
+    if(cardViewStartTop !== 100){
+      topOffset = cardViewStartTop - 100;
+    }
+    if(topOffset !== false) {
+      bodyBoardComponent.scrollTop(cardContainerScrollTop + topOffset);
+    }
+
+  },
+
+  presentParentTask() {
+    let result = this.currentBoard.presentParentTask;
+    if ((result === null) || (result === undefined)) {
+      result = 'no-parent';
+    }
+    return result;
+  },
+
+  linkForCard() {
+    const card = this.currentData();
+    let result = '#';
+    if (card) {
+      const board = Boards.findOne(card.boardId);
+      if (board) {
+        result = FlowRouter.url('card', {
+          boardId: card.boardId,
+          slug: board.slug,
+          cardId: card._id,
+        });
+      }
+    }
+    return result;
   },
 
   onRendered() {
-    if (!Utils.isMiniScreen()) this.scrollParentContainer();
+    if (!Utils.isMiniScreen()) {
+      Meteor.setTimeout(() => {
+        $('.card-details').mCustomScrollbar({theme:'minimal-dark', setWidth: false, setLeft: 0, scrollbarPosition: 'outside', mouseWheel: true });
+        this.scrollParentContainer();
+      }, 500);
+    }
     const $checklistsDom = this.$('.card-checklist-items');
 
     $checklistsDom.sortable({
@@ -102,6 +155,47 @@ BlazeComponent.extendComponent({
       },
     });
 
+    // ugly touch event hotfix
+    enableClickOnTouch('.card-checklist-items .js-checklist');
+
+    const $subtasksDom = this.$('.card-subtasks-items');
+
+    $subtasksDom.sortable({
+      tolerance: 'pointer',
+      helper: 'clone',
+      handle: '.subtask-title',
+      items: '.js-subtasks',
+      placeholder: 'subtasks placeholder',
+      distance: 7,
+      start(evt, ui) {
+        ui.placeholder.height(ui.helper.height());
+        EscapeActions.executeUpTo('popup-close');
+      },
+      stop(evt, ui) {
+        let prevChecklist = ui.item.prev('.js-subtasks').get(0);
+        if (prevChecklist) {
+          prevChecklist = Blaze.getData(prevChecklist).subtask;
+        }
+        let nextChecklist = ui.item.next('.js-subtasks').get(0);
+        if (nextChecklist) {
+          nextChecklist = Blaze.getData(nextChecklist).subtask;
+        }
+        const sortIndex = calculateIndexData(prevChecklist, nextChecklist, 1);
+
+        $subtasksDom.sortable('cancel');
+        const subtask = Blaze.getData(ui.item.get(0)).subtask;
+
+        Subtasks.update(subtask._id, {
+          $set: {
+            subtaskSort: sortIndex.base,
+          },
+        });
+      },
+    });
+
+    // ugly touch event hotfix
+    enableClickOnTouch('.card-subtasks-items .js-subtasks');
+
     function userIsMember() {
       return Meteor.user() && Meteor.user().isBoardMember();
     }
@@ -111,11 +205,17 @@ BlazeComponent.extendComponent({
       if ($checklistsDom.data('sortable')) {
         $checklistsDom.sortable('option', 'disabled', !userIsMember());
       }
+      if ($subtasksDom.data('sortable')) {
+        $subtasksDom.sortable('option', 'disabled', !userIsMember());
+      }
     });
   },
 
   onDestroyed() {
-    this.parentComponent().parentComponent().showOverlay.set(false);
+    const parentComponent =  this.parentComponent().parentComponent();
+    //on mobile view parent is Board, not board body.
+    if (parentComponent === null) return;
+    parentComponent.showOverlay.set(false);
   },
 
   events() {
@@ -146,6 +246,20 @@ BlazeComponent.extendComponent({
           this.data().setTitle(title);
         }
       },
+      'submit .js-card-details-assigner'(evt) {
+        evt.preventDefault();
+        const assigner = this.currentComponent().getValue().trim();
+        if (assigner) {
+          this.data().setAssignedBy(assigner);
+        }
+      },
+      'submit .js-card-details-requester'(evt) {
+        evt.preventDefault();
+        const requester = this.currentComponent().getValue().trim();
+        if (requester) {
+          this.data().setRequestedBy(requester);
+        }
+      },
       'click .js-member': Popup.open('cardMember'),
       'click .js-add-members': Popup.open('cardMembers'),
       'click .js-add-labels': Popup.open('cardLabels'),
@@ -154,8 +268,11 @@ BlazeComponent.extendComponent({
       'click .js-due-date': Popup.open('editCardDueDate'),
       'click .js-end-date': Popup.open('editCardEndDate'),
       'mouseenter .js-card-details' () {
-        this.parentComponent().parentComponent().showOverlay.set(true);
-        this.parentComponent().parentComponent().mouseHasEnterCardDetails = true;
+        const parentComponent =  this.parentComponent().parentComponent();
+        //on mobile view parent is Board, not BoardBody.
+        if (parentComponent === null) return;
+        parentComponent.showOverlay.set(true);
+        parentComponent.mouseHasEnterCardDetails = true;
       },
       'click #toggleButton'() {
         Meteor.call('toggleSystemMessages');
@@ -180,7 +297,7 @@ BlazeComponent.extendComponent({
   close(isReset = false) {
     if (this.isOpen.get() && !isReset) {
       const draft = this.getValue().trim();
-      if (draft !== Cards.findOne(Session.get('currentCard')).description) {
+      if (draft !== Cards.findOne(Session.get('currentCard')).getDescription()) {
         UnsavedEdits.set(this._getUnsavedEditKey(), this.getValue());
       }
     }
@@ -215,6 +332,7 @@ Template.cardDetailsActionsPopup.events({
   'click .js-members': Popup.open('cardMembers'),
   'click .js-labels': Popup.open('cardLabels'),
   'click .js-attachments': Popup.open('cardAttachments'),
+  'click .js-custom-fields': Popup.open('cardCustomFields'),
   'click .js-received-date': Popup.open('editCardReceivedDate'),
   'click .js-start-date': Popup.open('editCardStartDate'),
   'click .js-due-date': Popup.open('editCardDueDate'),
@@ -223,6 +341,7 @@ Template.cardDetailsActionsPopup.events({
   'click .js-move-card': Popup.open('moveCard'),
   'click .js-copy-card': Popup.open('copyCard'),
   'click .js-copy-checklist-cards': Popup.open('copyChecklistToManyCards'),
+  'click .js-set-card-color': Popup.open('setCardColor'),
   'click .js-move-card-to-top' (evt) {
     evt.preventDefault();
     const minOrder = _.min(this.list().cards(this.swimlaneId).map((c) => c.sort));
@@ -262,20 +381,47 @@ Template.editCardTitleForm.events({
   },
 });
 
+Template.editCardRequesterForm.onRendered(function() {
+  autosize(this.$('.js-edit-card-requester'));
+});
+
+Template.editCardRequesterForm.events({
+  'keydown .js-edit-card-requester'(evt) {
+    // If enter key was pressed, submit the data
+    if (evt.keyCode === 13) {
+      $('.js-submit-edit-card-requester-form').click();
+    }
+  },
+});
+
+Template.editCardAssignerForm.onRendered(function() {
+  autosize(this.$('.js-edit-card-assigner'));
+});
+
+Template.editCardAssignerForm.events({
+  'keydown .js-edit-card-assigner'(evt) {
+    // If enter key was pressed, submit the data
+    if (evt.keyCode === 13) {
+      $('.js-submit-edit-card-assigner-form').click();
+    }
+  },
+});
+
 Template.moveCardPopup.events({
   'click .js-done' () {
     // XXX We should *not* get the currentCard from the global state, but
     // instead from a “component” state.
     const card = Cards.findOne(Session.get('currentCard'));
+    const bSelect = $('.js-select-boards')[0];
+    const boardId = bSelect.options[bSelect.selectedIndex].value;
     const lSelect = $('.js-select-lists')[0];
-    const newListId = lSelect.options[lSelect.selectedIndex].value;
+    const listId = lSelect.options[lSelect.selectedIndex].value;
     const slSelect = $('.js-select-swimlanes')[0];
-    card.swimlaneId = slSelect.options[slSelect.selectedIndex].value;
-    card.move(card.swimlaneId, newListId, 0);
+    const swimlaneId = slSelect.options[slSelect.selectedIndex].value;
+    card.move(boardId, swimlaneId, listId, 0);
     Popup.close();
   },
 });
-
 BlazeComponent.extendComponent({
   onCreated() {
     subManager.subscribe('board', Session.get('currentBoard'));
@@ -286,6 +432,7 @@ BlazeComponent.extendComponent({
     const boards = Boards.find({
       archived: false,
       'members.userId': Meteor.userId(),
+      _id: {$ne: Meteor.user().getTemplatesBoardId()},
     }, {
       sort: ['title'],
     });
@@ -315,14 +462,12 @@ BlazeComponent.extendComponent({
 Template.copyCardPopup.events({
   'click .js-done'() {
     const card = Cards.findOne(Session.get('currentCard'));
-    const oldId = card._id;
-    card._id = null;
     const lSelect = $('.js-select-lists')[0];
-    card.listId = lSelect.options[lSelect.selectedIndex].value;
+    listId = lSelect.options[lSelect.selectedIndex].value;
     const slSelect = $('.js-select-swimlanes')[0];
-    card.swimlaneId = slSelect.options[slSelect.selectedIndex].value;
+    const swimlaneId = slSelect.options[slSelect.selectedIndex].value;
     const bSelect = $('.js-select-boards')[0];
-    card.boardId = bSelect.options[bSelect.selectedIndex].value;
+    const boardId = bSelect.options[bSelect.selectedIndex].value;
     const textarea = $('#copy-card-title');
     const title = textarea.val().trim();
     // insert new card to the bottom of new list
@@ -331,39 +476,13 @@ Template.copyCardPopup.events({
     if (title) {
       card.title = title;
       card.coverId = '';
-      const _id = Cards.insert(card);
+      const _id = card.copy(boardId, swimlaneId, listId);
       // In case the filter is active we need to add the newly inserted card in
       // the list of exceptions -- cards that are not filtered. Otherwise the
       // card will disappear instantly.
       // See https://github.com/wekan/wekan/issues/80
       Filter.addException(_id);
 
-      // copy checklists
-      let cursor = Checklists.find({cardId: oldId});
-      cursor.forEach(function() {
-        'use strict';
-        const checklist = arguments[0];
-        const checklistId = checklist._id;
-        checklist.cardId = _id;
-        checklist._id = null;
-        const newChecklistId = Checklists.insert(checklist);
-        ChecklistItems.find({checklistId}).forEach(function(item) {
-          item._id = null;
-          item.checklistId = newChecklistId;
-          item.cardId = _id;
-          ChecklistItems.insert(item);
-        });
-      });
-
-      // copy card comments
-      cursor = CardComments.find({cardId: oldId});
-      cursor.forEach(function () {
-        'use strict';
-        const comment = arguments[0];
-        comment.cardId = _id;
-        comment._id = null;
-        CardComments.insert(comment);
-      });
       Popup.close();
     }
   },
@@ -400,30 +519,23 @@ Template.copyChecklistToManyCardsPopup.events({
         Filter.addException(_id);
 
         // copy checklists
-        let cursor = Checklists.find({cardId: oldId});
+        Checklists.find({cardId: oldId}).forEach((ch) => {
+          ch.copy(_id);
+        });
+
+        // copy subtasks
+        cursor = Cards.find({parentId: oldId});
         cursor.forEach(function() {
           'use strict';
-          const checklist = arguments[0];
-          const checklistId = checklist._id;
-          checklist.cardId = _id;
-          checklist._id = null;
-          const newChecklistId = Checklists.insert(checklist);
-          ChecklistItems.find({checklistId}).forEach(function(item) {
-            item._id = null;
-            item.checklistId = newChecklistId;
-            item.cardId = _id;
-            ChecklistItems.insert(item);
-          });
+          const subtask = arguments[0];
+          subtask.parentId = _id;
+          subtask._id = null;
+          /* const newSubtaskId = */ Cards.insert(subtask);
         });
 
         // copy card comments
-        cursor = CardComments.find({cardId: oldId});
-        cursor.forEach(function () {
-          'use strict';
-          const comment = arguments[0];
-          comment.cardId = _id;
-          comment._id = null;
-          CardComments.insert(comment);
+        CardComments.find({cardId: oldId}).forEach((cmt) => {
+          cmt.copy(_id);
         });
       }
       Popup.close();
@@ -431,36 +543,153 @@ Template.copyChecklistToManyCardsPopup.events({
   },
 });
 
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.currentCard = this.currentData();
+    this.currentColor = new ReactiveVar(this.currentCard.color);
+  },
+
+  colors() {
+    return cardColors.map((color) => ({ color, name: '' }));
+  },
 
-Template.cardMorePopup.events({
-  'click .js-copy-card-link-to-clipboard' () {
-    // Clipboard code from:
-    // https://stackoverflow.com/questions/6300213/copy-selected-text-to-the-clipboard-without-using-flash-must-be-cross-browser
-    const StringToCopyElement = document.getElementById('cardURL');
-    StringToCopyElement.select();
-    if (document.execCommand('copy')) {
-      StringToCopyElement.blur();
+  isSelected(color) {
+    if (this.currentColor.get() === null) {
+      return color === 'white';
+    }
+    return this.currentColor.get() === color;
+  },
+
+  events() {
+    return [{
+      'click .js-palette-color'() {
+        this.currentColor.set(this.currentData().color);
+      },
+      'click .js-submit' () {
+        this.currentCard.setColor(this.currentColor.get());
+        Popup.close();
+      },
+      'click .js-remove-color'() {
+        this.currentCard.setColor(null);
+        Popup.close();
+      },
+    }];
+  },
+}).register('setCardColorPopup');
+
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.currentCard = this.currentData();
+    this.parentBoard = new ReactiveVar(null);
+    this.parentCard = this.currentCard.parentCard();
+    if (this.parentCard) {
+      const list = $('.js-field-parent-card');
+      list.val(this.parentCard._id);
+      this.parentBoard.set(this.parentCard.board()._id);
     } else {
-      document.getElementById('cardURL').selectionStart = 0;
-      document.getElementById('cardURL').selectionEnd = 999;
-      document.execCommand('copy');
-      if (window.getSelection) {
-        if (window.getSelection().empty) { // Chrome
-          window.getSelection().empty();
-        } else if (window.getSelection().removeAllRanges) { // Firefox
-          window.getSelection().removeAllRanges();
-        }
-      } else if (document.selection) { // IE?
-        document.selection.empty();
-      }
+      this.parentBoard.set(null);
     }
   },
-  'click .js-delete': Popup.afterConfirm('cardDelete', function () {
-    Popup.close();
-    Cards.remove(this._id);
-    Utils.goBoardId(this.boardId);
-  }),
-});
+
+  boards() {
+    const boards = Boards.find({
+      archived: false,
+      'members.userId': Meteor.userId(),
+      _id: {
+        $ne: Meteor.user().getTemplatesBoardId(),
+      },
+    }, {
+      sort: ['title'],
+    });
+    return boards;
+  },
+
+  cards() {
+    const currentId = Session.get('currentCard');
+    if (this.parentBoard.get()) {
+      return Cards.find({
+        boardId: this.parentBoard.get(),
+        _id: {$ne: currentId},
+      });
+    } else {
+      return [];
+    }
+  },
+
+  isParentBoard() {
+    const board = this.currentData();
+    if (this.parentBoard.get()) {
+      return board._id === this.parentBoard.get();
+    }
+    return false;
+  },
+
+  isParentCard() {
+    const card = this.currentData();
+    if (this.parentCard) {
+      return card._id === this.parentCard;
+    }
+    return false;
+  },
+
+  setParentCardId(cardId) {
+    if (cardId) {
+      this.parentCard = Cards.findOne(cardId);
+    } else {
+      this.parentCard = null;
+    }
+    this.currentCard.setParentId(cardId);
+  },
+
+  events() {
+    return [{
+      'click .js-copy-card-link-to-clipboard' () {
+        // Clipboard code from:
+        // https://stackoverflow.com/questions/6300213/copy-selected-text-to-the-clipboard-without-using-flash-must-be-cross-browser
+        const StringToCopyElement = document.getElementById('cardURL');
+        StringToCopyElement.select();
+        if (document.execCommand('copy')) {
+          StringToCopyElement.blur();
+        } else {
+          document.getElementById('cardURL').selectionStart = 0;
+          document.getElementById('cardURL').selectionEnd = 999;
+          document.execCommand('copy');
+          if (window.getSelection) {
+            if (window.getSelection().empty) { // Chrome
+              window.getSelection().empty();
+            } else if (window.getSelection().removeAllRanges) { // Firefox
+              window.getSelection().removeAllRanges();
+            }
+          } else if (document.selection) { // IE?
+            document.selection.empty();
+          }
+        }
+      },
+      'click .js-delete': Popup.afterConfirm('cardDelete', function () {
+        Popup.close();
+        Cards.remove(this._id);
+        Utils.goBoardId(this.boardId);
+      }),
+      'change .js-field-parent-board'(evt) {
+        const selection = $(evt.currentTarget).val();
+        const list = $('.js-field-parent-card');
+        if (selection === 'none') {
+          this.parentBoard.set(null);
+        } else {
+          subManager.subscribe('board', $(evt.currentTarget).val());
+          this.parentBoard.set(selection);
+          list.prop('disabled', false);
+        }
+        this.setParentCardId(null);
+      },
+      'change .js-field-parent-card'(evt) {
+        const selection = $(evt.currentTarget).val();
+        this.setParentCardId(selection);
+      },
+    }];
+  },
+}).register('cardMorePopup');
+
 
 // Close the card details pane by pressing escape
 EscapeActions.register('detailsPane',
diff --git a/client/components/cards/cardDetails.styl b/client/components/cards/cardDetails.styl
index e5739a93..c1d6b7e1 100644
--- a/client/components/cards/cardDetails.styl
+++ b/client/components/cards/cardDetails.styl
@@ -1,11 +1,12 @@
 @import 'nib'
 
 .card-details
-  padding: 0 20px
+  padding: 0
   flex-shrink: 0
-  flex-basis: 470px
+  flex-basis: 510px
   will-change: flex-basis
-  overflow: hidden
+  overflow-y: scroll
+  overflow-x: hidden
   background: darken(white, 3%)
   border-radius: bottom 3px
   z-index: 20 !important
@@ -13,8 +14,16 @@
   box-shadow: 0 0 7px 0 darken(white, 30%)
   transition: flex-basis 0.1s
 
+  .mCustomScrollBox
+    padding-left: 0
+
+  .ps-scrollbar-y-rail
+    pointer-event: all
+    position: absolute;
+
   .card-details-canvas
     width: 470px
+    padding-left: 20px;
 
   .card-details-header
     margin: 0 -20px 5px
@@ -46,6 +55,12 @@
       margin: 7px 0 0
       padding: 0
 
+    .linked-card-location
+      font-style: italic
+      font-size: 1em
+      margin-bottom: 0
+      & p
+        margin-bottom: 0
 
     form.inlined-form
       margin-top: 5px
@@ -69,6 +84,7 @@
 
   .card-details-items
     display: flex
+    flex-wrap: wrap
     margin: 15px 0
 
     .card-details-item
@@ -80,9 +96,11 @@
       &.card-details-item-received,
       &.card-details-item-start,
       &.card-details-item-due,
-      &.card-details-item-end
-        width: 50%
-        flex-shrink: 1
+      &.card-details-item-end,
+      &.card-details-item-customfield,
+      &.card-details-item-name
+        max-width: 50%
+        flex-grow: 1
 
   .card-details-item-title
     font-size: 16px
@@ -115,10 +133,92 @@ input[type="submit"].attachment-add-link-submit
 
     .card-details-canvas
       width: 100%
-
+      padding-left: 0px;
+ 
     .card-details-header
       .close-card-details
         margin-right: 0px
 
       .card-details-menu
         margin-right: 10px
+
+card-details-color(background, color...)
+  background: background !important
+  if color
+    color: color !important //overwrite text for better visibility
+
+.card-details-white
+  card-details-color(unset, #000) //Black text for better visibility
+  border: 1px solid #eee
+
+.card-details-green
+  card-details-color(#3cb500, #ffffff) //White text for better visibility
+
+.card-details-yellow
+  card-details-color(#fad900, #000) //Black text for better visibility
+
+.card-details-orange
+  card-details-color(#ff9f19, #000) //Black text for better visibility
+
+.card-details-red
+  card-details-color(#eb4646, #ffffff) //White text for better visibility
+
+.card-details-purple
+  card-details-color(#a632db, #ffffff) //White text for better visibility
+
+.card-details-blue
+  card-details-color(#0079bf, #ffffff) //White text for better visibility
+
+.card-details-pink
+  card-details-color(#ff78cb, #000) //Black text for better visibility
+
+.card-details-sky
+  card-details-color(#00c2e0, #ffffff) //White text for better visibility
+
+.card-details-black
+  card-details-color(#4d4d4d, #ffffff) //White text for better visibility
+
+.card-details-lime
+  card-details-color(#51e898, #000) //Black text for better visibility
+
+.card-details-silver
+  card-details-color(#c0c0c0, #000) //Black text for better visibility
+
+.card-details-peachpuff
+  card-details-color(#ffdab9, #000) //Black text for better visibility
+
+.card-details-crimson
+  card-details-color(#dc143c, #ffffff) //White text for better visibility
+
+.card-details-plum
+  card-details-color(#dda0dd, #000) //Black text for better visibility
+
+.card-details-darkgreen
+  card-details-color(#006400, #ffffff) //White text for better visibility
+
+.card-details-slateblue
+  card-details-color(#6a5acd, #ffffff) //White text for better visibility
+
+.card-details-magenta
+  card-details-color(#ff00ff, #ffffff) //White text for better visibility
+
+.card-details-gold
+  card-details-color(#ffd700, #000) //Black text for better visibility
+
+.card-details-navy
+  card-details-color(#000080, #ffffff) //White text for better visibility
+
+.card-details-gray
+  card-details-color(#808080, #ffffff) //White text for better visibility
+
+.card-details-saddlebrown
+  card-details-color(#8b4513, #ffffff) //White text for better visibility
+
+.card-details-paleturquoise
+  card-details-color(#afeeee, #000) //Black text for better visibility
+
+.card-details-mistyrose
+  card-details-color(#ffe4e1, #000) //Black text for better visibility
+
+.card-details-indigo
+  card-details-color(#4b0082, #ffffff) //White text for better visibility
diff --git a/client/components/cards/cardTime.jade b/client/components/cards/cardTime.jade
index dcfc92f0..8af8c414 100644
--- a/client/components/cards/cardTime.jade
+++ b/client/components/cards/cardTime.jade
@@ -3,10 +3,10 @@ template(name="editCardSpentTime")
     form.edit-time
       .fields
         label(for="time") {{_ 'time'}}
-        input.js-time-field#time(type="number" step="0.01" name="time" value="{{card.spentTime}}" placeholder=timeFormat autofocus)
+        input.js-time-field#time(type="number" step="0.01" name="time" value="{{card.getSpentTime}}" placeholder=timeFormat autofocus)
         label(for="overtime") {{_ 'overtime'}}
         a.js-toggle-overtime
-          .materialCheckBox#overtime(class="{{#if card.isOvertime}}is-checked{{/if}}" name="overtime")
+          .materialCheckBox#overtime(class="{{#if getIsOvertime}}is-checked{{/if}}" name="overtime")
 
       if error.get
         .warning {{_ error.get}}
@@ -15,8 +15,8 @@ template(name="editCardSpentTime")
 
 template(name="timeBadge")
   if canModifyCard
-    a.js-edit-time.card-time(title="{{showTitle}}" class="{{#if isOvertime}}card-label-red{{else}}card-label-green{{/if}}")
+    a.js-edit-time.card-time(title="{{showTitle}}" class="{{#if getIsOvertime}}card-label-red{{else}}card-label-green{{/if}}")
       | {{showTime}}
   else
-    a.card-time(title="{{showTitle}}" class="{{#if isOvertime}}card-label-red{{else}}card-label-green{{/if}}")
+    a.card-time(title="{{showTitle}}" class="{{#if getIsOvertime}}card-label-red{{else}}card-label-green{{/if}}")
       | {{showTime}}
diff --git a/client/components/cards/cardTime.js b/client/components/cards/cardTime.js
index eadcc88e..80b7fc84 100644
--- a/client/components/cards/cardTime.js
+++ b/client/components/cards/cardTime.js
@@ -7,17 +7,17 @@ BlazeComponent.extendComponent({
     this.card = this.data();
   },
   toggleOvertime() {
-    this.card.isOvertime = !this.card.isOvertime;
+    this.card.setIsOvertime(!this.card.getIsOvertime());
     $('#overtime .materialCheckBox').toggleClass('is-checked');
 
     $('#overtime').toggleClass('is-checked');
   },
   storeTime(spentTime, isOvertime) {
     this.card.setSpentTime(spentTime);
-    this.card.setOvertime(isOvertime);
+    this.card.setIsOvertime(isOvertime);
   },
   deleteTime() {
-    this.card.unsetSpentTime();
+    this.card.setSpentTime(null);
   },
   events() {
     return [{
@@ -26,7 +26,7 @@ BlazeComponent.extendComponent({
         evt.preventDefault();
 
         const spentTime = parseFloat(evt.target.time.value);
-        const isOvertime = this.card.isOvertime;
+        const isOvertime = this.card.getIsOvertime();
 
         if (spentTime >= 0) {
           this.storeTime(spentTime, isOvertime);
@@ -55,17 +55,14 @@ BlazeComponent.extendComponent({
     self.time = ReactiveVar();
   },
   showTitle() {
-    if (this.data().isOvertime) {
-      return `${TAPi18n.__('overtime')} ${this.data().spentTime} ${TAPi18n.__('hours')}`;
+    if (this.data().getIsOvertime()) {
+      return `${TAPi18n.__('overtime')} ${this.data().getSpentTime()} ${TAPi18n.__('hours')}`;
     } else {
-      return `${TAPi18n.__('card-spent')} ${this.data().spentTime} ${TAPi18n.__('hours')}`;
+      return `${TAPi18n.__('card-spent')} ${this.data().getSpentTime()} ${TAPi18n.__('hours')}`;
     }
   },
   showTime() {
-    return this.data().spentTime;
-  },
-  isOvertime() {
-    return this.data().isOvertime;
+    return this.data().getSpentTime();
   },
   events() {
     return [{
diff --git a/client/components/cards/checklists.jade b/client/components/cards/checklists.jade
index ae680bd5..279d3671 100644
--- a/client/components/cards/checklists.jade
+++ b/client/components/cards/checklists.jade
@@ -27,7 +27,6 @@ template(name="checklistDetail")
         if canModifyCard
           a.js-delete-checklist.toggle-delete-checklist-dialog {{_ "delete"}}...
 
-        span.checklist-stat(class="{{#if checklist.isFinished}}is-finished{{/if}}") {{checklist.finishedCount}}/{{checklist.itemCount}}
         if canModifyCard
           h2.title.js-open-inlined-form.is-editable
             +viewer
@@ -57,7 +56,7 @@ template(name="addChecklistItemForm")
     a.fa.fa-times-thin.js-close-inlined-form
 
 template(name="editChecklistItemForm")
-  textarea.js-edit-checklist-item(rows='1' autofocus)
+  textarea.js-edit-checklist-item(rows='1' autofocus dir="auto")
     if $eq type 'item'
       = item.title
     else
@@ -75,7 +74,7 @@ template(name="checklistItems")
       +inlinedForm(classNames="js-edit-checklist-item" item = item checklist = checklist)
         +editChecklistItemForm(type = 'item' item = item checklist = checklist)
       else
-        +itemDetail(item = item checklist = checklist)
+        +checklistItemDetail(item = item checklist = checklist)
     if canModifyCard
       +inlinedForm(autoclose=false classNames="js-add-checklist-item" checklist = checklist)
         +addChecklistItemForm
@@ -84,7 +83,7 @@ template(name="checklistItems")
           i.fa.fa-plus
           | {{_ 'add-checklist-item'}}...
 
-template(name='itemDetail')
+template(name='checklistItemDetail')
   .js-checklist-item.checklist-item
     if canModifyCard
       .check-box.materialCheckBox(class="{{#if item.isFinished }}is-checked{{/if}}")
diff --git a/client/components/cards/checklists.js b/client/components/cards/checklists.js
index 1f05aded..5d789351 100644
--- a/client/components/cards/checklists.js
+++ b/client/components/cards/checklists.js
@@ -1,4 +1,4 @@
-const { calculateIndexData } = Utils;
+const { calculateIndexData, enableClickOnTouch } = Utils;
 
 function initSorting(items) {
   items.sortable({
@@ -36,6 +36,9 @@ function initSorting(items) {
       checklistItem.move(checklistId, sortIndex.base);
     },
   });
+
+  // ugly touch event hotfix
+  enableClickOnTouch('.js-checklist-item:not(.placeholder)');
 }
 
 BlazeComponent.extendComponent({
@@ -71,8 +74,10 @@ BlazeComponent.extendComponent({
     event.preventDefault();
     const textarea = this.find('textarea.js-add-checklist-item');
     const title = textarea.value.trim();
-    const cardId = this.currentData().cardId;
+    let cardId = this.currentData().cardId;
     const card = Cards.findOne(cardId);
+    if (card.isLinked())
+      cardId = card.linkedId;
 
     if (title) {
       Checklists.insert({
@@ -204,7 +209,7 @@ Template.checklistDeleteDialog.onDestroyed(() => {
   $cardDetails.animate( { scrollTop: this.scrollState.position });
 });
 
-Template.itemDetail.helpers({
+Template.checklistItemDetail.helpers({
   canModifyCard() {
     return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
   },
@@ -223,4 +228,4 @@ BlazeComponent.extendComponent({
       'click .js-checklist-item .check-box': this.toggleItem,
     }];
   },
-}).register('itemDetail');
+}).register('checklistItemDetail');
diff --git a/client/components/cards/labels.styl b/client/components/cards/labels.styl
index 361a17ae..3b481d93 100644
--- a/client/components/cards/labels.styl
+++ b/client/components/cards/labels.styl
@@ -3,7 +3,7 @@
 // XXX Use .board-widget-labels as a flexbox container
 .card-label
   border-radius: 4px
-  color: white
+  color: white  //Default white text, in select cases,  changed to black to improve contrast between label colour and text
   display: inline-block
   font-weight: 700
   font-size: 13px
@@ -48,9 +48,11 @@
 
 .card-label-yellow
   background-color: #fad900
+  color: #000000 //Black text for better visibility
 
 .card-label-orange
   background-color: #ff9f19
+  color: #000000 //Black text for better visibility
 
 .card-label-red
   background-color: #eb4646
@@ -63,6 +65,7 @@
 
 .card-label-pink
   background-color: #ff78cb
+  color: #000000 //Black text for better visibility
 
 .card-label-sky
   background-color: #00c2e0
@@ -72,6 +75,55 @@
 
 .card-label-lime
   background-color: #51e898
+  color: #000000 //Black text for better visibility
+
+.card-label-silver
+  background-color: #c0c0c0
+  color: #000000 //Black text for better visibility
+
+.card-label-peachpuff
+  background-color: #ffdab9
+  color: #000000 //Black text for better visibility
+
+.card-label-crimson
+  background-color: #dc143c
+
+.card-label-plum
+  background-color: #dda0dd
+  color: #000000 //Black text for better visibility
+
+.card-label-darkgreen
+  background-color: #006400
+
+.card-label-slateblue
+  background-color: #6a5acd
+
+.card-label-magenta
+  background-color: #ff00ff
+
+.card-label-gold
+  background-color: #ffd700
+  color: #000000 //Black text for better visibility
+
+.card-label-navy
+  background-color: #000080
+
+.card-label-gray
+  background-color: #808080
+
+.card-label-saddlebrown
+  background-color: #8b4513
+
+.card-label-paleturquoise
+  background-color: #afeeee
+  color: #000000 //Black text for better visibility
+
+.card-label-mistyrose
+  background-color: #ffe4e1
+  color: #000000 //Black text for better visibility
+
+.card-label-indigo
+  background-color: #4b0082
 
 .edit-label,
 .create-label
diff --git a/client/components/cards/minicard.jade b/client/components/cards/minicard.jade
index 9fa4dd57..f47ae0c9 100644
--- a/client/components/cards/minicard.jade
+++ b/client/components/cards/minicard.jade
@@ -1,5 +1,8 @@
 template(name="minicard")
-  .minicard
+  .minicard(
+    class="{{#if isLinkedCard}}linked-card{{/if}}"
+    class="{{#if isLinkedBoard}}linked-board{{/if}}"
+    class="minicard-{{colorClass}}")
     if cover
       .minicard-cover(style="background-image: url('{{cover.url}}');")
     if labels
@@ -7,30 +10,72 @@ template(name="minicard")
         each labels
           .minicard-label(class="card-label-{{color}}" title="{{name}}")
     .minicard-title
+      .handle
+        .fa.fa-arrows
+      if $eq 'prefix-with-full-path' currentBoard.presentParentTask
+        .parent-prefix
+          | {{ parentString ' > ' }}
+      if $eq 'prefix-with-parent' currentBoard.presentParentTask
+        .parent-prefix
+          | {{ parentCardName }}
+      if isLinkedBoard
+        a.js-linked-link
+          span.linked-icon.fa.fa-folder
+      else if isLinkedCard
+        a.js-linked-link
+          span.linked-icon.fa.fa-id-card
+      if getArchived
+        span.linked-icon.linked-archived.fa.fa-archive
       +viewer
-        = title
+        = getTitle
+      if $eq 'subtext-with-full-path' currentBoard.presentParentTask
+        .parent-subtext
+          | {{ parentString ' > ' }}
+      if $eq 'subtext-with-parent' currentBoard.presentParentTask
+        .parent-subtext
+          | {{ parentCardName }}
+
     .dates
-      if startAt
+      if getReceived
+        unless getStart
+          unless getDue
+            unless getEnd
+              .date
+                +minicardReceivedDate
+      if getStart
         .date
           +minicardStartDate
-      if dueAt
+      if getDue
         .date
           +minicardDueDate
-      if spentTime
+      if getSpentTime
         .date
           +cardSpentTime
 
-    if members
+    .minicard-custom-fields
+      each customFieldsWD
+        if definition.showOnCard
+          .minicard-custom-field
+            if definition.showLabelOnMiniCard
+              .minicard-custom-field-item
+                = definition.name
+            .minicard-custom-field-item
+              +viewer
+                = trueValue
+
+    if getMembers
       .minicard-members.js-minicard-members
-        each members
+        each getMembers
           +userAvatar(userId=this)
+
     .badges
-      if comments.count
-        .badge(title="{{_ 'card-comments-title' comments.count }}")
-          span.badge-icon.fa.fa-comment-o.badge-comment
-          span.badge-text= comments.count
-      if description
-        .badge.badge-state-image-only(title=description)
+      unless currentUser.isNoComments
+        if comments.count
+          .badge(title="{{_ 'card-comments-title' comments.count }}")
+            span.badge-icon.fa.fa-comment-o.badge-comment
+            span.badge-text= comments.count
+      if getDescription
+        .badge.badge-state-image-only(title=getDescription)
           span.badge-icon.fa.fa-align-left
       if attachments.count
         .badge
diff --git a/client/components/cards/minicard.js b/client/components/cards/minicard.js
index a98b5730..da7f9e01 100644
--- a/client/components/cards/minicard.js
+++ b/client/components/cards/minicard.js
@@ -6,4 +6,15 @@ BlazeComponent.extendComponent({
   template() {
     return 'minicard';
   },
+
+  events() {
+    return [{
+      'click .js-linked-link' () {
+        if (this.data().isLinkedCard())
+          Utils.goCardId(this.data().linkedId);
+        else if (this.data().isLinkedBoard())
+          Utils.goBoardId(this.data().linkedId);
+      },
+    }];
+  },
 }).register('minicard');
diff --git a/client/components/cards/minicard.styl b/client/components/cards/minicard.styl
index d59f1f63..e3d1ff20 100644
--- a/client/components/cards/minicard.styl
+++ b/client/components/cards/minicard.styl
@@ -9,7 +9,7 @@
 
   &.placeholder
     background: darken(white, 20%)
-    border-radius: 2px
+    border-radius: 9px
 
   &.ui-sortable-helper
     cursor: grabbing
@@ -44,6 +44,16 @@
   transition: transform 0.2s,
               border-radius 0.2s
 
+  &.linked-board
+  &.linked-card
+    .linked-icon
+      display: inline-block
+      margin-right: 11px
+      vertical-align: baseline
+      font-size: 0.9em
+    .linked-archived
+      color: #937760
+
   .is-selected &
     transform: translateX(11px)
     border-bottom-right-radius: 0
@@ -77,9 +87,31 @@
       height: @width
       border-radius: 2px
       margin-left: 3px
+  .minicard-custom-fields
+    display:block;
+  .minicard-custom-field
+    display:flex;
+  .minicard-custom-field-item
+    max-width:50%;
+    flex-grow:1;
+  .handle
+    width: 20px;
+    height: 20px;
+    position: absolute;
+    right: 5px;
+    top: 5px;
+    display:none;
+    @media only screen and (max-width: 1199px) {
+      display:block;
+    }
+    .fa-arrows
+      font-size:20px;
+      color: #ccc;
   .minicard-title
     p:last-child
       margin-bottom: 0
+    .viewer
+      display: inline-block
   .dates
     display: flex;
     flex-direction: row;
@@ -155,6 +187,13 @@
       margin-bottom: 20px
       overflow-y: auto
 
+.parent-prefix
+  color: darken(white, 30%)
+  font-size: 0.9em
+.parent-subtext
+  color: darken(white, 30%)
+  font-size: 0.9em
+
 @media screen and (max-width: 800px)
   .minicard
     .is-selected &
@@ -163,3 +202,86 @@
       border-top-right-radius: 0
       z-index: 15
       box-shadow: 0 1px 2px rgba(0,0,0,.15)
+
+minicard-color(background, color...)
+  background-color: background
+  if color
+    color: color //overwrite text for better visibility
+  &:hover:not(.minicard-composer),
+  .is-selected &,
+  .draggable-hover-card &
+    background: darken(background, 3%)
+  .draggable-hover-card &
+    background: darken(background, 7%)
+
+.minicard-green
+  minicard-color(#3cb500, #ffffff) //White text for better visibility
+
+.minicard-yellow
+  minicard-color(#fad900)
+
+.minicard-orange
+  minicard-color(#ff9f19)
+
+.minicard-red
+  minicard-color(#eb4646, #ffffff) //White text for better visibility
+
+.minicard-purple
+  minicard-color(#a632db, #ffffff) //White text for better visibility
+
+.minicard-blue
+  minicard-color(#0079bf, #ffffff) //White text for better visibility
+
+.minicard-pink
+  minicard-color(#ff78cb)
+
+.minicard-sky
+  minicard-color(#00c2e0, #ffffff) //White text for better visibility
+
+.minicard-black
+  minicard-color(#4d4d4d, #ffffff) //White text for better visibility
+
+.minicard-lime
+  minicard-color(#51e898)
+
+.minicard-silver
+  minicard-color(#c0c0c0)
+
+.minicard-peachpuff
+  minicard-color(#ffdab9)
+
+.minicard-crimson
+  minicard-color(#dc143c, #ffffff) //White text for better visibility
+
+.minicard-plum
+  minicard-color(#dda0dd)
+
+.minicard-darkgreen
+  minicard-color(#006400, #ffffff) //White text for better visibility
+
+.minicard-slateblue
+  minicard-color(#6a5acd, #ffffff) //White text for better visibility
+
+.minicard-magenta
+  minicard-color(#ff00ff, #ffffff) //White text for better visibility
+
+.minicard-gold
+  minicard-color(#ffd700)
+
+.minicard-navy
+  minicard-color(#000080, #ffffff) //White text for better visibility
+
+.minicard-gray
+  minicard-color(#808080, #ffffff) //White text for better visibility
+
+.minicard-saddlebrown
+  minicard-color(#8b4513, #ffffff) //White text for better visibility
+
+.minicard-paleturquoise
+  minicard-color(#afeeee)
+
+.minicard-mistyrose
+  minicard-color(#ffe4e1)
+
+.minicard-indigo
+  minicard-color(#4b0082, #ffffff) //White text for better visibility
diff --git a/client/components/cards/subtasks.jade b/client/components/cards/subtasks.jade
new file mode 100644
index 00000000..7e64e23f
--- /dev/null
+++ b/client/components/cards/subtasks.jade
@@ -0,0 +1,97 @@
+template(name="subtasks")
+  h3 {{_ 'subtasks'}}
+  if toggleDeleteDialog.get
+    .board-overlay#card-details-overlay
+    +subtaskDeleteDialog(subtask = subtaskToDelete)
+
+
+  .card-subtasks-items
+    each subtask in currentCard.subtasks
+      +subtaskDetail(subtask = subtask)
+
+  if canModifyCard
+    +inlinedForm(autoclose=false classNames="js-add-subtask" cardId = cardId)
+      +addSubtaskItemForm
+    else
+      a.js-open-inlined-form
+        i.fa.fa-plus
+        | {{_ 'add-subtask'}}...
+
+template(name="subtaskDetail")
+  .js-subtasks.subtask
+    +inlinedForm(classNames="js-edit-subtask-title" subtask = subtask)
+      +editSubtaskItemForm(subtask = subtask)
+    else
+      .subtask-title
+        span
+        a.js-view-subtask(title="{{ subtask.title }}") {{_ "view-it"}}
+        if canModifyCard
+          a.js-delete-subtask.toggle-delete-subtask-dialog {{_ "delete"}}...
+
+        if canModifyCard
+          h2.title.js-open-inlined-form.is-editable
+            +viewer
+              = subtask.title
+        else
+          h2.title
+            +viewer
+                = subtask.title
+
+template(name="subtaskDeleteDialog")
+  .js-confirm-subtask-delete
+    p
+      i(class="fa fa-exclamation-triangle" aria-hidden="true")
+    p
+      | {{_ 'confirm-subtask-delete-dialog'}}
+      span {{subtask.title}}
+      | ?
+    .js-subtask-delete-buttons
+      button.confirm-subtask-delete(type="button") {{_ 'delete'}}
+      button.toggle-delete-subtask-dialog(type="button") {{_ 'cancel'}}
+
+template(name="addSubtaskItemForm")
+  textarea.js-add-subtask-item(rows='1' autofocus dir="auto")
+  .edit-controls.clearfix
+    button.primary.confirm.js-submit-add-subtask-item-form(type="submit") {{_ 'save'}}
+    a.fa.fa-times-thin.js-close-inlined-form
+
+template(name="editSubtaskItemForm")
+  textarea.js-edit-subtask-item(rows='1' autofocus dir="auto")
+    if $eq type 'item'
+      = item.title
+    else
+      = subtask.title
+  .edit-controls.clearfix
+    button.primary.confirm.js-submit-edit-subtask-item-form(type="submit") {{_ 'save'}}
+    a.fa.fa-times-thin.js-close-inlined-form
+    span(title=createdAt) {{ moment createdAt }}
+    if canModifyCard
+      a.js-delete-subtask-item {{_ "delete"}}...
+
+template(name="subtasksItems")
+  .subtasks-items.js-subtasks-items
+    each item in subtasks.items
+      +inlinedForm(classNames="js-edit-subtask-item" item = item subtasks = subtasks)
+        +editSubtaskItemForm(type = 'item' item = item subtasks = subtasks)
+      else
+        +subtaskItemDetail(item = item subtasks = subtasks)
+    if canModifyCard
+      +inlinedForm(autoclose=false classNames="js-add-subtask-item" subtasks = subtasks dir="auto")
+        +addSubtaskItemForm
+      else
+        a.add-subtask-item.js-open-inlined-form
+          i.fa.fa-plus
+          | {{_ 'add-subtask-item'}}...
+
+template(name='subtaskItemDetail')
+  .js-subtasks-item.subtasks-item
+    if canModifyCard
+      .check-box.materialCheckBox(class="{{#if item.isFinished }}is-checked{{/if}}")
+      .item-title.js-open-inlined-form.is-editable(class="{{#if item.isFinished }}is-checked{{/if}}")
+        +viewer
+          = item.title
+    else
+      .materialCheckBox(class="{{#if item.isFinished }}is-checked{{/if}}")
+      .item-title(class="{{#if item.isFinished }}is-checked{{/if}}")
+        +viewer
+          = item.title
diff --git a/client/components/cards/subtasks.js b/client/components/cards/subtasks.js
new file mode 100644
index 00000000..1651d449
--- /dev/null
+++ b/client/components/cards/subtasks.js
@@ -0,0 +1,146 @@
+BlazeComponent.extendComponent({
+  canModifyCard() {
+    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
+  },
+}).register('subtaskDetail');
+
+BlazeComponent.extendComponent({
+
+  addSubtask(event) {
+    event.preventDefault();
+    const textarea = this.find('textarea.js-add-subtask-item');
+    const title = textarea.value.trim();
+    const cardId = this.currentData().cardId;
+    const card = Cards.findOne(cardId);
+    const sortIndex = -1;
+    const crtBoard = Boards.findOne(card.boardId);
+    const targetBoard = crtBoard.getDefaultSubtasksBoard();
+    const listId = targetBoard.getDefaultSubtasksListId();
+    const swimlaneId = targetBoard.getDefaultSwimline()._id;
+
+    if (title) {
+      const _id = Cards.insert({
+        title,
+        parentId: cardId,
+        members: [],
+        labelIds: [],
+        customFields: [],
+        listId,
+        boardId: targetBoard._id,
+        sort: sortIndex,
+        swimlaneId,
+        type: 'cardType-card',
+      });
+
+      // In case the filter is active we need to add the newly inserted card in
+      // the list of exceptions -- cards that are not filtered. Otherwise the
+      // card will disappear instantly.
+      // See https://github.com/wekan/wekan/issues/80
+      Filter.addException(_id);
+
+
+      setTimeout(() => {
+        this.$('.add-subtask-item').last().click();
+      }, 100);
+    }
+    textarea.value = '';
+    textarea.focus();
+  },
+
+  canModifyCard() {
+    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
+  },
+
+  deleteSubtask() {
+    const subtask = this.currentData().subtask;
+    if (subtask && subtask._id) {
+      subtask.archive();
+      this.toggleDeleteDialog.set(false);
+    }
+  },
+
+  editSubtask(event) {
+    event.preventDefault();
+    const textarea = this.find('textarea.js-edit-subtask-item');
+    const title = textarea.value.trim();
+    const subtask = this.currentData().subtask;
+    subtask.setTitle(title);
+  },
+
+  onCreated() {
+    this.toggleDeleteDialog = new ReactiveVar(false);
+    this.subtaskToDelete = null; //Store data context to pass to subtaskDeleteDialog template
+  },
+
+  pressKey(event) {
+    //If user press enter key inside a form, submit it
+    //Unless the user is also holding down the 'shift' key
+    if (event.keyCode === 13 && !event.shiftKey) {
+      event.preventDefault();
+      const $form = $(event.currentTarget).closest('form');
+      $form.find('button[type=submit]').click();
+    }
+  },
+
+  events() {
+    const events = {
+      'click .toggle-delete-subtask-dialog'(event) {
+        if($(event.target).hasClass('js-delete-subtask')){
+          this.subtaskToDelete = this.currentData().subtask; //Store data context
+        }
+        this.toggleDeleteDialog.set(!this.toggleDeleteDialog.get());
+      },
+      'click .js-view-subtask'(event) {
+        if($(event.target).hasClass('js-view-subtask')){
+          const subtask = this.currentData().subtask;
+          const board = subtask.board();
+          FlowRouter.go('card', {
+            boardId: board._id,
+            slug: board.slug,
+            cardId: subtask._id,
+          });
+        }
+      },
+    };
+
+    return [{
+      ...events,
+      'submit .js-add-subtask': this.addSubtask,
+      'submit .js-edit-subtask-title': this.editSubtask,
+      'click .confirm-subtask-delete': this.deleteSubtask,
+      keydown: this.pressKey,
+    }];
+  },
+}).register('subtasks');
+
+Template.subtaskDeleteDialog.onCreated(() => {
+  const $cardDetails = this.$('.card-details');
+  this.scrollState = { position: $cardDetails.scrollTop(), //save current scroll position
+    top: false, //required for smooth scroll animation
+  };
+  //Callback's purpose is to only prevent scrolling after animation is complete
+  $cardDetails.animate({ scrollTop: 0 }, 500, () => { this.scrollState.top = true; });
+
+  //Prevent scrolling while dialog is open
+  $cardDetails.on('scroll', () => {
+    if(this.scrollState.top) { //If it's already in position, keep it there. Otherwise let animation scroll
+      $cardDetails.scrollTop(0);
+    }
+  });
+});
+
+Template.subtaskDeleteDialog.onDestroyed(() => {
+  const $cardDetails = this.$('.card-details');
+  $cardDetails.off('scroll'); //Reactivate scrolling
+  $cardDetails.animate( { scrollTop: this.scrollState.position });
+});
+
+Template.subtaskItemDetail.helpers({
+  canModifyCard() {
+    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
+  },
+});
+
+BlazeComponent.extendComponent({
+  // ...
+}).register('subtaskItemDetail');
diff --git a/client/components/cards/subtasks.styl b/client/components/cards/subtasks.styl
new file mode 100644
index 00000000..c2f09aa1
--- /dev/null
+++ b/client/components/cards/subtasks.styl
@@ -0,0 +1,142 @@
+.js-add-subtask
+  color: #8c8c8c
+
+textarea.js-add-subtask-item, textarea.js-edit-subtask-item
+  overflow: hidden
+  word-wrap: break-word
+  resize: none
+  height: 34px
+
+.delete-text
+  color: #8c8c8c
+  text-decoration: underline
+  word-wrap: break-word
+  float: right
+  padding-top: 6px
+  &:hover
+    color: inherit
+
+.subtask-title
+  .checkbox
+    float: left
+    width: 30px
+    height 30px
+    font-size: 18px
+    line-height: 30px
+
+  .title
+    font-size: 18px
+    line-height: 25px
+
+  .subtasks-stat
+    margin: 0 0.5em
+    float: right
+    padding-top: 6px
+    &.is-finished
+      color: #3cb500
+
+  .js-delete-subtask
+    @extends .delete-text
+    margin: 0 0.5em
+
+  .js-view-subtask
+    @extends .delete-text
+
+.js-confirm-subtask-delete
+  background-color: darken(white, 3%)
+  position: absolute
+  float: left;
+  width: 60%
+  margin-top: 0
+  margin-left: 13%
+  padding-bottom: 2%
+  padding-left: 3%
+  padding-right: 3%
+  z-index: 17
+  border-radius: 3px
+
+  p
+    position: relative
+    margin-top: 3%
+    width: 100%
+    text-align: center
+    span
+      font-weight: bold
+
+    i
+      font-size: 2em
+
+  .js-subtask-delete-buttons
+    position: relative
+    padding: left 2% right 2%
+    .confirm-subtask-delete
+      margin-left: 12%
+      float: left
+    .toggle-delete-subtask-dialog
+      margin-right: 12%
+      float: right
+
+#card-details-overlay
+  top: 0
+  bottom: -600px
+  right: 0
+
+.subtasks
+  background: darken(white, 3%)
+
+  &.placeholder
+    background: darken(white, 20%)
+    border-radius: 2px
+
+  &.ui-sortable-helper
+    box-shadow: -2px 2px 8px rgba(0, 0, 0, .3),
+                0 0 1px rgba(0, 0, 0, .5)
+    transform: rotate(4deg)
+    cursor: grabbing
+
+
+.subtasks-item
+  margin: 0 0 0 0.1em
+  line-height: 18px
+  font-size: 1.1em
+  margin-top: 3px
+  display: flex
+  background: darken(white, 3%)
+
+  &.placeholder
+    background: darken(white, 20%)
+    border-radius: 2px
+
+  &.ui-sortable-helper
+    box-shadow: -2px 2px 8px rgba(0, 0, 0, .3),
+                0 0 1px rgba(0, 0, 0, .5)
+    transform: rotate(4deg)
+    cursor: grabbing
+
+  &:hover
+    background-color: darken(white, 8%)
+
+  .check-box
+    margin: 0.1em 0 0 0;
+    &.is-checked
+      border-bottom: 2px solid #3cb500
+      border-right: 2px solid #3cb500
+
+  .item-title
+    flex: 1
+    padding-left: 10px;
+    &.is-checked
+      color: #8c8c8c
+      font-style: italic
+    & .viewer
+      p
+        margin-bottom: 2px
+
+.js-delete-subtask-item
+  margin: 0 0 0.5em 1.33em
+  @extends .delete-text
+  padding: 12px 0 0 0
+
+.add-subtask-item
+  margin: 0.2em 0 0.5em 1.33em
+  display: inline-block
diff --git a/client/components/forms/datepicker.jade b/client/components/forms/datepicker.jade
new file mode 100644
index 00000000..96f63bc4
--- /dev/null
+++ b/client/components/forms/datepicker.jade
@@ -0,0 +1,15 @@
+template(name="datepicker")
+    .datepicker-container
+        form.edit-date
+            .fields
+                .left
+                    label(for="date") {{_ 'date'}}
+                    input.js-date-field#date(type="text" name="date" value=showDate placeholder=dateFormat autofocus)
+                .right
+                    label(for="time") {{_ 'time'}}
+                    input.js-time-field#time(type="text" name="time" value=showTime placeholder=timeFormat)
+            .js-datepicker
+            if error.get
+                .warning {{_ error.get}}
+            button.primary.wide.left.js-submit-date(type="submit") {{_ 'save'}}
+            button.js-delete-date.negate.wide.right.js-delete-date {{_ 'delete'}}
\ No newline at end of file
diff --git a/client/components/forms/datepicker.styl b/client/components/forms/datepicker.styl
new file mode 100644
index 00000000..a2558094
--- /dev/null
+++ b/client/components/forms/datepicker.styl
@@ -0,0 +1,17 @@
+.datepicker-container
+  .fields
+    .left
+      width: 56%
+    .right
+      width: 38%
+  .datepicker
+    width: 100%
+    table
+      width: 100%
+      border: none
+      border-spacing: 0
+      border-collapse: collapse
+      thead
+        background: none
+      td, th
+        box-sizing: border-box
\ No newline at end of file
diff --git a/client/components/forms/forms.styl b/client/components/forms/forms.styl
index 1947c11d..bfae2e7c 100644
--- a/client/components/forms/forms.styl
+++ b/client/components/forms/forms.styl
@@ -1,10 +1,10 @@
 @import 'nib'
 
+select,
 textarea,
 input:not([type=file]),
 button
   box-sizing: border-box
-  -webkit-appearance: none
   background-color: #ebebeb
   border: 1px solid #ccc
   border-radius: 3px
@@ -85,6 +85,9 @@ select
   width: 256px
   margin-bottom: 8px
 
+  &.inline
+  	width: 100%
+
 option[disabled]
   color: #8c8c8c
 
@@ -222,9 +225,12 @@ textarea
 
 .edit-controls,
 .add-controls
+  display: flex
+  align-items: baseline
   margin-top: 0
 
   button[type=submit]
+  input[type=button]
     float: left
     height: 32px
     margin-top: -2px
diff --git a/client/components/import/import.jade b/client/components/import/import.jade
index a1fbd83b..5b52f417 100644
--- a/client/components/import/import.jade
+++ b/client/components/import/import.jade
@@ -12,11 +12,11 @@ template(name="import")
 
 template(name="importTextarea")
   form
-    p: label(for='import-textarea') {{_ instruction}}
+    p: label(for='import-textarea') {{_ instruction}} {{_ 'import-board-instruction-about-errors'}}
     textarea.js-import-json(placeholder="{{_ 'import-json-placeholder'}}" autofocus)
       | {{jsonText}}
     if isSandstorm
-      h1.warning DANGER !!! THIS DESTROYS YOUR IMPORTED DATA, CAUSES BOARD NOT FOUND ERROR WHEN YOU OPEN THIS GRAIN AGAIN https://github.com/wekan/wekan/issues/1430
+      h1.warning {{_ 'import-sandstorm-backup-warning'}}
       p.warning {{_ 'import-sandstorm-warning'}}
     input.primary.wide(type="submit" value="{{_ 'import'}}")
 
diff --git a/client/components/lists/list.js b/client/components/lists/list.js
index 38a87674..ea0068eb 100644
--- a/client/components/lists/list.js
+++ b/client/components/lists/list.js
@@ -1,4 +1,4 @@
-const { calculateIndex } = Utils;
+const { calculateIndex, enableClickOnTouch } = Utils;
 
 BlazeComponent.extendComponent({
   // Proxy
@@ -26,6 +26,13 @@ BlazeComponent.extendComponent({
 
     const itemsSelector = '.js-minicard:not(.placeholder, .js-card-composer)';
     const $cards = this.$('.js-minicards');
+
+    if(window.matchMedia('(max-width: 1199px)').matches) {
+      $( '.js-minicards' ).sortable({
+        handle: '.handle',
+      });
+    }
+
     $cards.sortable({
       connectWith: '.js-minicards:not(.js-list-full)',
       tolerance: 'pointer',
@@ -47,6 +54,7 @@ BlazeComponent.extendComponent({
       items: itemsSelector,
       placeholder: 'minicard-wrapper placeholder',
       start(evt, ui) {
+        ui.helper.css('z-index', 1000);
         ui.placeholder.height(ui.helper.height());
         EscapeActions.executeUpTo('popup-close');
         boardComponent.setIsDragging(true);
@@ -59,7 +67,13 @@ BlazeComponent.extendComponent({
         const nCards = MultiSelection.isActive() ? MultiSelection.count() : 1;
         const sortIndex = calculateIndex(prevCardDom, nextCardDom, nCards);
         const listId = Blaze.getData(ui.item.parents('.list').get(0))._id;
-        const swimlaneId = Blaze.getData(ui.item.parents('.swimlane').get(0))._id;
+        const currentBoard = Boards.findOne(Session.get('currentBoard'));
+        let swimlaneId = '';
+        const boardView = (Meteor.user().profile || {}).boardView;
+        if (boardView === 'board-view-swimlanes' || currentBoard.isTemplatesBoard())
+          swimlaneId = Blaze.getData(ui.item.parents('.swimlane').get(0))._id;
+        else if ((boardView === 'board-view-lists') || (boardView === 'board-view-cal') || !boardView)
+          swimlaneId = currentBoard.getDefaultSwimline()._id;
 
         // Normally the jquery-ui sortable library moves the dragged DOM element
         // to its new position, which disrupts Blaze reactive updates mechanism
@@ -72,17 +86,20 @@ BlazeComponent.extendComponent({
 
         if (MultiSelection.isActive()) {
           Cards.find(MultiSelection.getMongoSelector()).forEach((card, i) => {
-            card.move(swimlaneId, listId, sortIndex.base + i * sortIndex.increment);
+            card.move(currentBoard._id, swimlaneId, listId, sortIndex.base + i * sortIndex.increment);
           });
         } else {
           const cardDomElement = ui.item.get(0);
           const card = Blaze.getData(cardDomElement);
-          card.move(swimlaneId, listId, sortIndex.base);
+          card.move(currentBoard._id, swimlaneId, listId, sortIndex.base);
         }
         boardComponent.setIsDragging(false);
       },
     });
 
+    // ugly touch event hotfix
+    enableClickOnTouch(itemsSelector);
+
     // Disable drag-dropping if the current user is not a board member or is comment only
     this.autorun(() => {
       $cards.sortable('option', 'disabled', !userIsMember());
diff --git a/client/components/lists/list.styl b/client/components/lists/list.styl
index fa32ff6d..dcbeb93f 100644
--- a/client/components/lists/list.styl
+++ b/client/components/lists/list.styl
@@ -10,7 +10,6 @@
   // transparent, because that won't work during a list drag.
   background: darken(white, 13%)
   border-left: 1px solid darken(white, 20%)
-  border-bottom: 1px solid #CCC
   padding: 0
   float: left
 
@@ -44,11 +43,23 @@
       background: white
       margin: -3px 0 8px
 
+.list-header-card-count
+  height: 35px
+
+.list-header-add
+  flex: 0 0 auto
+  padding: 20px 12px 4px
+  position: relative
+  min-height: 20px
+
 .list-header
   flex: 0 0 auto
-  margin: 20px 12px 4px
+  padding: 20px 12px 4px
   position: relative
   min-height: 20px
+  background-color: #e4e4e4;
+  border-bottom: 6px solid #e4e4e4;
+
 
   &.ui-sortable-handle
     cursor: grab
@@ -68,16 +79,18 @@
     text-overflow: ellipsis
     word-wrap: break-word
 
+
   .list-header-watch-icon
     padding-left: 10px
     color: #a6a6a6
 
+
   .list-header-menu
     position: absolute
-    padding: 7px
+    padding: 27px 19px
     margin-top: 1px
-    top: -@padding
-    right: -@padding
+    top: -7px
+    right: -7px
 
   .list-header-plus-icon
     color: #a6a6a6
@@ -143,9 +156,12 @@
     float: left
 
 @media screen and (max-width: 800px)
+  .list-header-menu
+    margin-right: 30px
+
   .mini-list
     flex: 0 0 60px
-    height: 60px
+    height: auto
     width: 100%
     border-left: 0px
     border-bottom: 1px solid darken(white, 20%)
@@ -154,6 +170,8 @@
     display: block
     width: 100%
     border-left: 0px
+    &:first-child
+      margin-left: 0px
 
     &.ui-sortable-helper
       flex: 0 0 60px
@@ -172,8 +190,16 @@
       border-left: 0px
       border-bottom: 1px solid darken(white, 20%)
 
-  .list-header
+  .list-body
+    padding: 15px 19px;
 
+  .list-header
+    padding: 0 12px 0px
+    border-bottom: 0px solid #e4e4e4
+    height: 60px
+    margin-top: 10px
+    display: flex
+    align-items: center
     .list-header-left-icon
       display: inline
       padding: 7px
@@ -185,5 +211,100 @@
     .list-header-menu-icon
       position: absolute
       padding: 7px
-      top: -@padding
+      top: 50%
+      transform: translateY(-50%)
       right: 17px
+      font-size: 20px
+
+.link-board-wrapper
+  display: flex
+  align-items: baseline
+
+  .js-link-board
+    margin-left: 15px
+
+.search-card-results
+  max-height: 250px
+  overflow: hidden
+
+.sk-spinner-list
+  margin-top: unset !important
+
+list-header-color(background, color...)
+  border-bottom: 6px solid background
+
+.list-header-white
+  list-header-color(#ffffff, #4d4d4d) //Black text for better visibility
+  border: 1px solid #eee
+
+.list-header-green
+  list-header-color(#3cb500, #ffffff) //White text for better visibility
+
+.list-header-yellow
+  list-header-color(#fad900, #4d4d4d) //Black text for better visibility
+
+.list-header-orange
+  list-header-color(#ff9f19, #4d4d4d) //Black text for better visibility
+
+.list-header-red
+  list-header-color(#eb4646, #ffffff) //White text for better visibility
+
+.list-header-purple
+  list-header-color(#a632db, #ffffff) //White text for better visibility
+
+.list-header-blue
+  list-header-color(#0079bf, #ffffff) //White text for better visibility
+
+.list-header-pink
+  list-header-color(#ff78cb, #4d4d4d) //Black text for better visibility
+
+.list-header-sky
+  list-header-color(#00c2e0, #ffffff) //White text for better visibility
+
+.list-header-black
+  list-header-color(#4d4d4d, #ffffff) //White text for better visibility
+
+.list-header-lime
+  list-header-color(#51e898, #4d4d4d) //Black text for better visibility
+
+.list-header-silver
+  list-header-color(unset, #4d4d4d) //Black text for better visibility
+
+.list-header-peachpuff
+  list-header-color(#ffdab9, #4d4d4d) //Black text for better visibility
+
+.list-header-crimson
+  list-header-color(#dc143c, #ffffff) //White text for better visibility
+
+.list-header-plum
+  list-header-color(#dda0dd, #4d4d4d) //Black text for better visibility
+
+.list-header-darkgreen
+  list-header-color(#006400, #ffffff) //White text for better visibility
+
+.list-header-slateblue
+  list-header-color(#6a5acd, #ffffff) //White text for better visibility
+
+.list-header-magenta
+  list-header-color(#ff00ff, #ffffff) //White text for better visibility
+
+.list-header-gold
+  list-header-color(#ffd700, #4d4d4d) //Black text for better visibility
+
+.list-header-navy
+  list-header-color(#000080, #ffffff) //White text for better visibility
+
+.list-header-gray
+  list-header-color(#808080, #ffffff) //White text for better visibility
+
+.list-header-saddlebrown
+  list-header-color(#8b4513, #ffffff) //White text for better visibility
+
+.list-header-paleturquoise
+  list-header-color(#afeeee, #4d4d4d) //Black text for better visibility
+
+.list-header-mistyrose
+  list-header-color(#ffe4e1, #4d4d4d) //Black text for better visibility
+
+.list-header-indigo
+  list-header-color(#4b0082, #ffffff) //White text for better visibility
diff --git a/client/components/lists/listBody.jade b/client/components/lists/listBody.jade
index 32c6b278..71ad7f90 100644
--- a/client/components/lists/listBody.jade
+++ b/client/components/lists/listBody.jade
@@ -4,7 +4,7 @@ template(name="listBody")
       if cards.count
         +inlinedForm(autoclose=false position="top")
           +addCardForm(listId=_id position="top")
-      each (cards (idOrNull ../../_id))
+      each (cardsWithLimit (idOrNull ../../_id))
         a.minicard-wrapper.js-minicard(href=absoluteUrl
           class="{{#if cardIsSelected}}is-selected{{/if}}"
           class="{{#if MultiSelection.isSelected _id}}is-checked{{/if}}")
@@ -12,6 +12,9 @@ template(name="listBody")
             .materialCheckBox.multi-selection-checkbox.js-toggle-multi-selection(
               class="{{#if MultiSelection.isSelected _id}}is-checked{{/if}}")
           +minicard(this)
+      if (showSpinner (idOrNull ../../_id))
+        +spinnerList
+
       if canSeeAddCard
         +inlinedForm(autoclose=false position="bottom")
           +addCardForm(listId=_id position="bottom")
@@ -20,6 +23,16 @@ template(name="listBody")
             i.fa.fa-plus
             | {{_ 'add-card'}}
 
+template(name="spinnerList")
+  .sk-spinner.sk-spinner-wave.sk-spinner-list(
+    class=currentBoard.colorClass
+    id="showMoreResults")
+    .sk-rect1
+    .sk-rect2
+    .sk-rect3
+    .sk-rect4
+    .sk-rect5
+
 template(name="addCardForm")
   .minicard.minicard-composer.js-composer
     if getLabels
@@ -34,8 +47,84 @@ template(name="addCardForm")
 
   .add-controls.clearfix
     button.primary.confirm(type="submit") {{_ 'add'}}
-    a.fa.fa-times-thin.js-close-inlined-form
+    unless currentBoard.isTemplatesBoard
+      unless currentBoard.isTemplateBoard
+        span.quiet
+          | {{_ 'or'}}
+          a.js-link {{_ 'link'}}
+        span.quiet
+          | &nbsp;
+          | /
+          a.js-search {{_ 'search'}}
+        span.quiet
+          | &nbsp;
+          | /
+          a.js-card-template {{_ 'template'}}
 
 template(name="autocompleteLabelLine")
   .minicard-label(class="card-label-{{colorName}}" title=labelName)
   span(class="{{#if hasNoName}}quiet{{/if}}")= labelName
+
+template(name="linkCardPopup")
+  label {{_ 'boards'}}:
+  .link-board-wrapper
+    select.js-select-boards
+      option(value="")
+      each boards
+        option(value="{{_id}}") {{title}}
+    input.primary.confirm.js-link-board(type="button" value="{{_ 'link'}}")
+
+  label {{_ 'swimlanes'}}:
+  select.js-select-swimlanes
+    each swimlanes
+      option(value="{{_id}}") {{title}}
+
+  label {{_ 'lists'}}:
+  select.js-select-lists
+    each lists
+      option(value="{{_id}}") {{title}}
+
+  label {{_ 'cards'}}:
+  select.js-select-cards
+    each cards
+      option(value="{{getId}}") {{getTitle}}
+
+  .edit-controls.clearfix
+    input.primary.confirm.js-done(type="button" value="{{_ 'link'}}")
+
+template(name="searchElementPopup")
+  form
+    label
+      | {{_ 'title'}}
+      input.js-element-title(type="text" placeholder="{{_ 'title'}}" autofocus required)
+  unless isTemplateSearch
+    label {{_ 'boards'}}:
+    .link-board-wrapper
+      select.js-select-boards
+        option(value="")
+        each boards
+          option(value="{{_id}}") {{title}}
+  form.js-search-term-form
+    input(type="text" name="searchTerm" placeholder="{{_ 'search-example'}}" autofocus dir="auto")
+  .list-body.js-perfect-scrollbar.search-card-results
+    .minicards.clearfix.js-minicards
+      if isBoardTemplateSearch
+        each results
+          a.minicard-wrapper.js-minicard
+            +miniboard(this)
+      if isListTemplateSearch
+        each results
+          a.minicard-wrapper.js-minicard
+            +minilist(this)
+      if isSwimlaneTemplateSearch
+        each results
+          a.minicard-wrapper.js-minicard
+            +miniswimlane(this)
+      if isCardTemplateSearch
+        each results
+          a.minicard-wrapper.js-minicard
+            +minicard(this)
+      unless isTemplateSearch
+        each results
+          a.minicard-wrapper.js-minicard
+            +minicard(this)
diff --git a/client/components/lists/listBody.js b/client/components/lists/listBody.js
index 52f34fab..a5ccba3f 100644
--- a/client/components/lists/listBody.js
+++ b/client/components/lists/listBody.js
@@ -1,4 +1,12 @@
+const subManager = new SubsManager();
+const InfiniteScrollIter = 10;
+
 BlazeComponent.extendComponent({
+  onCreated() {
+    // for infinite scrolling
+    this.cardlimit = new ReactiveVar(InfiniteScrollIter);
+  },
+
   mixins() {
     return [Mixins.PerfectScrollbar];
   },
@@ -35,25 +43,59 @@ BlazeComponent.extendComponent({
 
     const members = formComponent.members.get();
     const labelIds = formComponent.labels.get();
+    const customFields = formComponent.customFields.get();
 
-    const boardId = this.data().board()._id;
+    const board = this.data().board();
+    let linkedId = '';
     let swimlaneId = '';
-    const boardView = Meteor.user().profile.boardView;
-    if (boardView === 'board-view-swimlanes')
-      swimlaneId = this.parentComponent().parentComponent().data()._id;
-    else if (boardView === 'board-view-lists')
-      swimlaneId = Swimlanes.findOne({boardId})._id;
-
+    const boardView = (Meteor.user().profile || {}).boardView;
+    let cardType = 'cardType-card';
     if (title) {
+      if (board.isTemplatesBoard()) {
+        swimlaneId = this.parentComponent().parentComponent().data()._id; // Always swimlanes view
+        const swimlane = Swimlanes.findOne(swimlaneId);
+        // If this is the card templates swimlane, insert a card template
+        if (swimlane.isCardTemplatesSwimlane())
+          cardType = 'template-card';
+        // If this is the board templates swimlane, insert a board template and a linked card
+        else if (swimlane.isBoardTemplatesSwimlane()) {
+          linkedId = Boards.insert({
+            title,
+            permission: 'private',
+            type: 'template-board',
+          });
+          Swimlanes.insert({
+            title: TAPi18n.__('default'),
+            boardId: linkedId,
+          });
+          cardType = 'cardType-linkedBoard';
+        }
+      } else if (boardView === 'board-view-swimlanes')
+        swimlaneId = this.parentComponent().parentComponent().data()._id;
+      else if ((boardView === 'board-view-lists') || (boardView === 'board-view-cal') || !boardView)
+        swimlaneId = board.getDefaultSwimline()._id;
+
       const _id = Cards.insert({
         title,
         members,
         labelIds,
+        customFields,
         listId: this.data()._id,
-        boardId: this.data().board()._id,
+        boardId: board._id,
         sort: sortIndex,
         swimlaneId,
+        type: cardType,
+        linkedId,
       });
+
+      // if the displayed card count is less than the total cards in the list,
+      // we need to increment the displayed card count to prevent the spinner
+      // to appear
+      const cardCount = this.data().cards(this.idOrNull(swimlaneId)).count();
+      if (this.cardlimit.get() < cardCount) {
+        this.cardlimit.set(this.cardlimit.get() + InfiniteScrollIter);
+      }
+
       // In case the filter is active we need to add the newly inserted card in
       // the list of exceptions -- cards that are not filtered. Otherwise the
       // card will disappear instantly.
@@ -85,9 +127,9 @@ BlazeComponent.extendComponent({
       const methodName = evt.shiftKey ? 'toggleRange' : 'toggle';
       MultiSelection[methodName](this.currentData()._id);
 
-    // If the card is already selected, we want to de-select it.
-    // XXX We should probably modify the minicard href attribute instead of
-    // overwriting the event in case the card is already selected.
+      // If the card is already selected, we want to de-select it.
+      // XXX We should probably modify the minicard href attribute instead of
+      // overwriting the event in case the card is already selected.
     } else if (Session.equals('currentCard', this.currentData()._id)) {
       evt.stopImmediatePropagation();
       evt.preventDefault();
@@ -107,11 +149,31 @@ BlazeComponent.extendComponent({
 
   idOrNull(swimlaneId) {
     const currentUser = Meteor.user();
-    if (currentUser.profile.boardView === 'board-view-swimlanes')
+    if ((currentUser.profile || {}).boardView === 'board-view-swimlanes' ||
+        this.data().board().isTemplatesBoard())
       return swimlaneId;
     return undefined;
   },
 
+  cardsWithLimit(swimlaneId) {
+    const limit = this.cardlimit.get();
+    const selector = {
+      listId: this.currentData()._id,
+      archived: false,
+    };
+    if (swimlaneId)
+      selector.swimlaneId = swimlaneId;
+    return Cards.find(Filter.mongoSelector(selector), {
+      sort: ['sort'],
+      limit,
+    });
+  },
+
+  showSpinner(swimlaneId) {
+    const list = Template.currentData();
+    return list.cards(swimlaneId).count() > this.cardlimit.get();
+  },
+
   canSeeAddCard() {
     return !this.reachedWipLimit() && Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
   },
@@ -146,11 +208,21 @@ BlazeComponent.extendComponent({
   onCreated() {
     this.labels = new ReactiveVar([]);
     this.members = new ReactiveVar([]);
+    this.customFields = new ReactiveVar([]);
+
+    const currentBoardId = Session.get('currentBoard');
+    arr = [];
+    _.forEach(Boards.findOne(currentBoardId).customFields().fetch(), function(field){
+      if(field.automaticallyOnCard)
+        arr.push({_id: field._id, value: null});
+    });
+    this.customFields.set(arr);
   },
 
   reset() {
     this.labels.set([]);
     this.members.set([]);
+    this.customFields.set([]);
   },
 
   getLabels() {
@@ -162,7 +234,7 @@ BlazeComponent.extendComponent({
 
   pressKey(evt) {
     // Pressing Enter should submit the card
-    if (evt.keyCode === 13) {
+    if (evt.keyCode === 13 && !evt.shiftKey) {
       evt.preventDefault();
       const $form = $(evt.currentTarget).closest('form');
       // XXX For some reason $form.submit() does not work (it's probably a bug
@@ -171,8 +243,8 @@ BlazeComponent.extendComponent({
       // work.
       $form.find('button[type=submit]').click();
 
-    // Pressing Tab should open the form of the next column, and Maj+Tab go
-    // in the reverse order
+      // Pressing Tab should open the form of the next column, and Maj+Tab go
+      // in the reverse order
     } else if (evt.keyCode === 9) {
       evt.preventDefault();
       const isReverse = evt.shiftKey;
@@ -193,6 +265,9 @@ BlazeComponent.extendComponent({
   events() {
     return [{
       keydown: this.pressKey,
+      'click .js-link': Popup.open('linkCard'),
+      'click .js-search': Popup.open('searchElement'),
+      'click .js-card-template': Popup.open('searchElement'),
     }];
   },
 
@@ -230,7 +305,7 @@ BlazeComponent.extendComponent({
           const currentBoard = Boards.findOne(Session.get('currentBoard'));
           callback($.map(currentBoard.labels, (label) => {
             if (label.name.indexOf(term) > -1 ||
-                label.color.indexOf(term) > -1) {
+              label.color.indexOf(term) > -1) {
               return label;
             }
             return null;
@@ -264,3 +339,326 @@ BlazeComponent.extendComponent({
     });
   },
 }).register('addCardForm');
+
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.selectedBoardId = new ReactiveVar('');
+    this.selectedSwimlaneId = new ReactiveVar('');
+    this.selectedListId = new ReactiveVar('');
+
+    this.boardId = Session.get('currentBoard');
+    // In order to get current board info
+    subManager.subscribe('board', this.boardId);
+    this.board = Boards.findOne(this.boardId);
+    // List where to insert card
+    const list = $(Popup._getTopStack().openerElement).closest('.js-list');
+    this.listId = Blaze.getData(list[0])._id;
+    // Swimlane where to insert card
+    const swimlane = $(Popup._getTopStack().openerElement).closest('.js-swimlane');
+    this.swimlaneId = '';
+    const boardView = (Meteor.user().profile || {}).boardView;
+    if (boardView === 'board-view-swimlanes')
+      this.swimlaneId = Blaze.getData(swimlane[0])._id;
+    else if (boardView === 'board-view-lists' || !boardView)
+      this.swimlaneId = Swimlanes.findOne({boardId: this.boardId})._id;
+  },
+
+  boards() {
+    const boards = Boards.find({
+      archived: false,
+      'members.userId': Meteor.userId(),
+      _id: {$ne: Session.get('currentBoard')},
+      type: 'board',
+    }, {
+      sort: ['title'],
+    });
+    return boards;
+  },
+
+  swimlanes() {
+    if (!this.selectedBoardId.get()) {
+      return [];
+    }
+    const swimlanes = Swimlanes.find({boardId: this.selectedBoardId.get()});
+    if (swimlanes.count())
+      this.selectedSwimlaneId.set(swimlanes.fetch()[0]._id);
+    return swimlanes;
+  },
+
+  lists() {
+    if (!this.selectedBoardId.get()) {
+      return [];
+    }
+    const lists = Lists.find({boardId: this.selectedBoardId.get()});
+    if (lists.count())
+      this.selectedListId.set(lists.fetch()[0]._id);
+    return lists;
+  },
+
+  cards() {
+    if (!this.board) {
+      return [];
+    }
+    const ownCardsIds = this.board.cards().map((card) => { return card.linkedId || card._id; });
+    return Cards.find({
+      boardId: this.selectedBoardId.get(),
+      swimlaneId: this.selectedSwimlaneId.get(),
+      listId: this.selectedListId.get(),
+      archived: false,
+      linkedId: {$nin: ownCardsIds},
+      _id: {$nin: ownCardsIds},
+      type: {$nin: ['template-card']},
+    });
+  },
+
+  events() {
+    return [{
+      'change .js-select-boards'(evt) {
+        subManager.subscribe('board', $(evt.currentTarget).val());
+        this.selectedBoardId.set($(evt.currentTarget).val());
+      },
+      'change .js-select-swimlanes'(evt) {
+        this.selectedSwimlaneId.set($(evt.currentTarget).val());
+      },
+      'change .js-select-lists'(evt) {
+        this.selectedListId.set($(evt.currentTarget).val());
+      },
+      'click .js-done' (evt) {
+        // LINK CARD
+        evt.stopPropagation();
+        evt.preventDefault();
+        const linkedId = $('.js-select-cards option:selected').val();
+        if (!linkedId) {
+          Popup.close();
+          return;
+        }
+        const _id = Cards.insert({
+          title: $('.js-select-cards option:selected').text(), //dummy
+          listId: this.listId,
+          swimlaneId: this.swimlaneId,
+          boardId: this.boardId,
+          sort: Lists.findOne(this.listId).cards().count(),
+          type: 'cardType-linkedCard',
+          linkedId,
+        });
+        Filter.addException(_id);
+        Popup.close();
+      },
+      'click .js-link-board' (evt) {
+        //LINK BOARD
+        evt.stopPropagation();
+        evt.preventDefault();
+        const impBoardId = $('.js-select-boards option:selected').val();
+        if (!impBoardId || Cards.findOne({linkedId: impBoardId, archived: false})) {
+          Popup.close();
+          return;
+        }
+        const _id = Cards.insert({
+          title: $('.js-select-boards option:selected').text(), //dummy
+          listId: this.listId,
+          swimlaneId: this.swimlaneId,
+          boardId: this.boardId,
+          sort: Lists.findOne(this.listId).cards().count(),
+          type: 'cardType-linkedBoard',
+          linkedId: impBoardId,
+        });
+        Filter.addException(_id);
+        Popup.close();
+      },
+    }];
+  },
+}).register('linkCardPopup');
+
+BlazeComponent.extendComponent({
+  mixins() {
+    return [Mixins.PerfectScrollbar];
+  },
+
+  onCreated() {
+    this.isCardTemplateSearch = $(Popup._getTopStack().openerElement).hasClass('js-card-template');
+    this.isListTemplateSearch = $(Popup._getTopStack().openerElement).hasClass('js-list-template');
+    this.isSwimlaneTemplateSearch = $(Popup._getTopStack().openerElement).hasClass('js-open-add-swimlane-menu');
+    this.isBoardTemplateSearch = $(Popup._getTopStack().openerElement).hasClass('js-add-board');
+    this.isTemplateSearch = this.isCardTemplateSearch ||
+      this.isListTemplateSearch ||
+      this.isSwimlaneTemplateSearch ||
+      this.isBoardTemplateSearch;
+    let board = {};
+    if (this.isTemplateSearch) {
+      board = Boards.findOne((Meteor.user().profile || {}).templatesBoardId);
+    } else {
+      // Prefetch first non-current board id
+      board = Boards.findOne({
+        archived: false,
+        'members.userId': Meteor.userId(),
+        _id: {$nin: [Session.get('currentBoard'), (Meteor.user().profile || {}).templatesBoardId]},
+      });
+    }
+    if (!board) {
+      Popup.close();
+      return;
+    }
+    const boardId = board._id;
+    // Subscribe to this board
+    subManager.subscribe('board', boardId);
+    this.selectedBoardId = new ReactiveVar(boardId);
+
+    if (!this.isBoardTemplateSearch) {
+      this.boardId = Session.get('currentBoard');
+      // In order to get current board info
+      subManager.subscribe('board', this.boardId);
+      this.swimlaneId = '';
+      // Swimlane where to insert card
+      const swimlane = $(Popup._getTopStack().openerElement).parents('.js-swimlane');
+      if ((Meteor.user().profile || {}).boardView === 'board-view-swimlanes')
+        this.swimlaneId = Blaze.getData(swimlane[0])._id;
+      else
+        this.swimlaneId = Swimlanes.findOne({boardId: this.boardId})._id;
+      // List where to insert card
+      const list = $(Popup._getTopStack().openerElement).closest('.js-list');
+      this.listId = Blaze.getData(list[0])._id;
+    }
+    this.term = new ReactiveVar('');
+  },
+
+  boards() {
+    const boards = Boards.find({
+      archived: false,
+      'members.userId': Meteor.userId(),
+      _id: {$ne: Session.get('currentBoard')},
+      type: 'board',
+    }, {
+      sort: ['title'],
+    });
+    return boards;
+  },
+
+  results() {
+    if (!this.selectedBoardId) {
+      return [];
+    }
+    const board = Boards.findOne(this.selectedBoardId.get());
+    if (!this.isTemplateSearch || this.isCardTemplateSearch) {
+      return board.searchCards(this.term.get(), false);
+    } else if (this.isListTemplateSearch) {
+      return board.searchLists(this.term.get());
+    } else if (this.isSwimlaneTemplateSearch) {
+      return board.searchSwimlanes(this.term.get());
+    } else if (this.isBoardTemplateSearch) {
+      const boards = board.searchBoards(this.term.get());
+      boards.forEach((board) => {
+        subManager.subscribe('board', board.linkedId);
+      });
+      return boards;
+    } else {
+      return [];
+    }
+  },
+
+  events() {
+    return [{
+      'change .js-select-boards'(evt) {
+        subManager.subscribe('board', $(evt.currentTarget).val());
+        this.selectedBoardId.set($(evt.currentTarget).val());
+      },
+      'submit .js-search-term-form'(evt) {
+        evt.preventDefault();
+        this.term.set(evt.target.searchTerm.value);
+      },
+      'click .js-minicard'(evt) {
+        // 0. Common
+        const title = $('.js-element-title').val().trim();
+        if (!title)
+          return;
+        const element = Blaze.getData(evt.currentTarget);
+        element.title = title;
+        let _id = '';
+        if (!this.isTemplateSearch || this.isCardTemplateSearch) {
+          // Card insertion
+          // 1. Common
+          element.sort = Lists.findOne(this.listId).cards().count();
+          // 1.A From template
+          if (this.isTemplateSearch) {
+            element.type = 'cardType-card';
+            element.linkedId = '';
+            _id = element.copy(this.boardId, this.swimlaneId, this.listId);
+            // 1.B Linked card
+          } else {
+            delete element._id;
+            element.type = 'cardType-linkedCard';
+            element.linkedId = element.linkedId || element._id;
+            _id = Cards.insert(element);
+          }
+          Filter.addException(_id);
+          // List insertion
+        } else if (this.isListTemplateSearch) {
+          element.sort = Swimlanes.findOne(this.swimlaneId).lists().count();
+          element.type = 'list';
+          _id = element.copy(this.boardId, this.swimlaneId);
+        } else if (this.isSwimlaneTemplateSearch) {
+          element.sort = Boards.findOne(this.boardId).swimlanes().count();
+          element.type = 'swimlalne';
+          _id = element.copy(this.boardId);
+        } else if (this.isBoardTemplateSearch) {
+          board = Boards.findOne(element.linkedId);
+          board.sort = Boards.find({archived: false}).count();
+          board.type = 'board';
+          board.title = element.title;
+          delete board.slug;
+          _id = board.copy();
+        }
+        Popup.close();
+      },
+    }];
+  },
+}).register('searchElementPopup');
+
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.cardlimit = this.parentComponent().cardlimit;
+
+    this.listId = this.parentComponent().data()._id;
+    this.swimlaneId = '';
+
+    const boardView = (Meteor.user().profile || {}).boardView;
+    if (boardView === 'board-view-swimlanes')
+      this.swimlaneId = this.parentComponent().parentComponent().parentComponent().data()._id;
+  },
+
+  onRendered() {
+    this.spinner = this.find('.sk-spinner-list');
+    this.container = this.$(this.spinner).parents('.js-perfect-scrollbar')[0];
+
+    $(this.container).on(`scroll.spinner_${this.swimlaneId}_${this.listId}`, () => this.updateList());
+    $(window).on(`resize.spinner_${this.swimlaneId}_${this.listId}`, () => this.updateList());
+
+    this.updateList();
+  },
+
+  onDestroyed() {
+    $(this.container).off(`scroll.spinner_${this.swimlaneId}_${this.listId}`);
+    $(window).off(`resize.spinner_${this.swimlaneId}_${this.listId}`);
+  },
+
+  updateList() {
+    if (this.spinnerInView()) {
+      this.cardlimit.set(this.cardlimit.get() + InfiniteScrollIter);
+      window.requestIdleCallback(() => this.updateList());
+    }
+  },
+
+  spinnerInView() {
+    const parentViewHeight = this.container.clientHeight;
+    const bottomViewPosition = this.container.scrollTop + parentViewHeight;
+
+    const threshold = this.spinner.offsetTop;
+
+    // spinner deleted
+    if (!this.spinner.offsetTop) {
+      return false;
+    }
+
+    return bottomViewPosition > threshold;
+  },
+
+}).register('spinnerList');
diff --git a/client/components/lists/listHeader.jade b/client/components/lists/listHeader.jade
index 61771449..aa6d3786 100644
--- a/client/components/lists/listHeader.jade
+++ b/client/components/lists/listHeader.jade
@@ -1,5 +1,7 @@
 template(name="listHeader")
-  .list-header.js-list-header
+  .list-header.js-list-header(
+    class="{{#if limitToShowCardsCount}}list-header-card-count{{/if}}"
+    class="{{#if colorClass}}list-header-{{colorClass}}{{/if}}")
     +inlinedForm
       +editListTitleForm
     else
@@ -15,9 +17,8 @@ template(name="listHeader")
          |/#{wipLimit.value})
 
         if showCardsCountForList cards.count
-          = cards.count
-          span
-            |  {{_ 'cards-count'}}
+          |&nbsp;
+          p.quiet.small {{cardsCount}} {{_ 'cards-count'}}
       if isMiniScreen
         if currentList
           if isWatching
@@ -51,6 +52,9 @@ template(name="listActionPopup")
   unless currentUser.isCommentOnly
     hr
     ul.pop-over-list
+      li: a.js-set-color-list {{_ 'set-color-list'}}
+    hr
+    ul.pop-over-list
       if cards.count
         li: a.js-select-cards {{_ 'list-select-cards'}}
         hr
@@ -112,3 +116,13 @@ template(name="wipLimitErrorPopup")
     p {{_ 'wipLimitErrorPopup-dialog-pt1'}}
     p {{_ 'wipLimitErrorPopup-dialog-pt2'}}
     button.full.js-back-view(type="submit") {{_ 'cancel'}}
+
+template(name="setListColorPopup")
+  form.edit-label
+    .palette-colors: each colors
+      // note: we use the swimlane palette to have more than just the border
+      span.card-label.palette-color.js-palette-color(class="swimlane-{{color}}")
+        if(isSelected color)
+          i.fa.fa-check
+    button.primary.confirm.js-submit {{_ 'save'}}
+    button.js-remove-color.negate.wide.right {{_ 'unset-color'}}
diff --git a/client/components/lists/listHeader.js b/client/components/lists/listHeader.js
index 4b6bf196..923d6063 100644
--- a/client/components/lists/listHeader.js
+++ b/client/components/lists/listHeader.js
@@ -1,3 +1,8 @@
+let listsColors;
+Meteor.startup(() => {
+  listsColors = Lists.simpleSchema()._schema.color.allowedValues;
+});
+
 BlazeComponent.extendComponent({
   canSeeAddCard() {
     const list = Template.currentData();
@@ -22,6 +27,16 @@ BlazeComponent.extendComponent({
     return Meteor.user().getLimitToShowCardsCount();
   },
 
+  cardsCount() {
+    const list = Template.currentData();
+    let swimlaneId = '';
+    const boardView = (Meteor.user().profile || {}).boardView;
+    if (boardView === 'board-view-swimlanes')
+      swimlaneId = this.parentComponent().parentComponent().data()._id;
+
+    return list.cards(swimlaneId).count();
+  },
+
   reachedWipLimit() {
     const list = Template.currentData();
     return list.getWipLimit('enabled') && list.getWipLimit('value') <= list.cards().count();
@@ -62,6 +77,7 @@ Template.listActionPopup.helpers({
 
 Template.listActionPopup.events({
   'click .js-list-subscribe' () {},
+  'click .js-set-color-list': Popup.open('setListColor'),
   'click .js-select-cards' () {
     const cardIds = this.allCards().map((card) => card._id);
     MultiSelection.add(cardIds);
@@ -144,3 +160,34 @@ Template.listMorePopup.events({
     Utils.goBoardId(this.boardId);
   }),
 });
+
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.currentList = this.currentData();
+    this.currentColor = new ReactiveVar(this.currentList.color);
+  },
+
+  colors() {
+    return listsColors.map((color) => ({ color, name: '' }));
+  },
+
+  isSelected(color) {
+    return this.currentColor.get() === color;
+  },
+
+  events() {
+    return [{
+      'click .js-palette-color'() {
+        this.currentColor.set(this.currentData().color);
+      },
+      'click .js-submit' () {
+        this.currentList.setColor(this.currentColor.get());
+        Popup.close();
+      },
+      'click .js-remove-color'() {
+        this.currentList.setColor(null);
+        Popup.close();
+      },
+    }];
+  },
+}).register('setListColorPopup');
diff --git a/client/components/lists/minilist.jade b/client/components/lists/minilist.jade
new file mode 100644
index 00000000..e34214c4
--- /dev/null
+++ b/client/components/lists/minilist.jade
@@ -0,0 +1,8 @@
+template(name="minilist")
+  .minicard(
+    class="minicard-{{colorClass}}")
+    .minicard-title
+      .handle
+        .fa.fa-arrows
+      +viewer
+        = title
diff --git a/client/components/main/editor.jade b/client/components/main/editor.jade
index 31f533e6..dbd61715 100644
--- a/client/components/main/editor.jade
+++ b/client/components/main/editor.jade
@@ -1,5 +1,6 @@
 template(name="editor")
   textarea.editor(
+    dir="auto"
     class="{{class}}"
     id=id
     autofocus=autofocus
@@ -7,7 +8,7 @@ template(name="editor")
     +Template.contentBlock
 
 template(name="viewer")
-  .viewer
+  .viewer(dir="auto")
     +mentions
       +markdown
         {{> UI.contentBlock }}
diff --git a/client/components/main/editor.js b/client/components/main/editor.js
index 888fbe00..88d8abf0 100755
--- a/client/components/main/editor.js
+++ b/client/components/main/editor.js
@@ -36,13 +36,18 @@ import sanitizeXss from 'xss';
 const at = HTML.CharRef({html: '&commat;', str: '@'});
 Blaze.Template.registerHelper('mentions', new Template('mentions', function() {
   const view = this;
+  let content = Blaze.toHTML(view.templateContentBlock);
   const currentBoard = Boards.findOne(Session.get('currentBoard'));
+  if (!currentBoard)
+    return HTML.Raw(sanitizeXss(content));
   const knowedUsers = currentBoard.members.map((member) => {
-    member.username = Users.findOne(member.userId).username;
+    const u = Users.findOne(member.userId);
+    if(u){
+      member.username = u.username;
+    }
     return member;
   });
   const mentionRegex = /\B@([\w.]*)/gi;
-  let content = Blaze.toHTML(view.templateContentBlock);
 
   let currentMention;
   while ((currentMention = mentionRegex.exec(content)) !== null) {
diff --git a/client/components/main/header.jade b/client/components/main/header.jade
index dd071b3e..75e84c0c 100644
--- a/client/components/main/header.jade
+++ b/client/components/main/header.jade
@@ -4,39 +4,38 @@ template(name="header")
     list all starred boards with a link to go there. This is inspired by the
     Reddit "subreddit" bar.
     The first link goes to the boards page.
-  unless isSandstorm
-    if currentUser
-      #header-quick-access(class=currentBoard.colorClass)
-        if isMiniScreen
-          ul
-            li
-              a(href="{{pathFor 'home'}}")
-                span.fa.fa-home
+  if currentUser
+    #header-quick-access(class=currentBoard.colorClass)
+      if isMiniScreen
+        ul
+          li
+            a(href="{{pathFor 'home'}}")
+              span.fa.fa-home
 
-            if currentList
-              each currentBoard.lists
-                li(class="{{#if $.Session.equals 'currentList' _id}}current{{/if}}")
-                  a.js-select-list
-                    = title
-          #header-new-board-icon
-        else
-          ul
-            li
-              a(href="{{pathFor 'home'}}")
-                span.fa.fa-home
-                | {{_ 'all-boards'}}
-            each currentUser.starredBoards
-              li.separator -
-              li(class="{{#if $.Session.equals 'currentBoard' _id}}current{{/if}}")
-                a(href="{{pathFor 'board' id=_id slug=slug}}")
+          if currentList
+            each currentBoard.lists
+              li(class="{{#if $.Session.equals 'currentList' _id}}current{{/if}}")
+                a.js-select-list
                   = title
-            else
-              li.current {{_ 'quick-access-description'}}
+        #header-new-board-icon
+      else
+        ul
+          li
+            a(href="{{pathFor 'home'}}")
+              span.fa.fa-home
+              | {{_ 'all-boards'}}
+          each currentUser.starredBoards
+            li.separator -
+            li(class="{{#if $.Session.equals 'currentBoard' _id}}current{{/if}}")
+              a(href="{{pathFor 'board' id=_id slug=slug}}")
+                = title
+          else
+            li.current {{_ 'quick-access-description'}}
 
-        a#header-new-board-icon.js-create-board
-          i.fa.fa-plus(title="Create a new board")
+      a#header-new-board-icon.js-create-board
+        i.fa.fa-plus(title="Create a new board")
 
-        +headerUserBar
+      +headerUserBar
 
   #header(class=currentBoard.colorClass)
     //-
@@ -46,17 +45,16 @@ template(name="header")
     #header-main-bar(class="{{#if wrappedHeader}}wrapper{{/if}}")
       +Template.dynamic(template=headerBar)
 
-      unless hideLogo
+      //unless hideLogo
+
         //-
           On sandstorm, the logo shouldn't be clickable, because we only have one
           page/document on it, and we don't want to see the home page containing
           the list of all boards.
-        if isSandstorm
-          .wekan-logo
-            img(src="{{pathFor '/wekan-logo-header.png'}}" alt="Wekan")
-        else
-          a.wekan-logo(href="{{pathFor 'home'}}" title="{{_ 'header-logo-title'}}")
-            img(src="{{pathFor '/wekan-logo-header.png'}}" alt="Wekan")
+
+      //  unless currentSetting.hideLogo
+      //    a.wekan-logo(href="{{pathFor 'home'}}" title="{{_ 'header-logo-title'}}")
+      //    img(src="{{pathFor '/logo-header.png'}}" alt="")
 
   if appIsOffline
     +offlineWarning
@@ -66,7 +64,8 @@ template(name="header")
       .announcement
         p
           i.fa.fa-bullhorn
-          | #{announcement}
+          +viewer
+            | #{announcement}
           i.fa.fa-times-circle.js-close-announcement
 
 template(name="offlineWarning")
diff --git a/client/components/main/header.js b/client/components/main/header.js
index 7fbc5716..c05b1c3c 100644
--- a/client/components/main/header.js
+++ b/client/components/main/header.js
@@ -1,11 +1,16 @@
 Meteor.subscribe('user-admin');
 Meteor.subscribe('boards');
+Meteor.subscribe('setting');
 
 Template.header.helpers({
   wrappedHeader() {
     return !Session.get('currentBoard');
   },
 
+  currentSetting() {
+    return Settings.findOne();
+  },
+
   hideLogo() {
     return Utils.isMiniScreen() && Session.get('currentBoard');
   },
diff --git a/client/components/main/header.styl b/client/components/main/header.styl
index f9455f8e..e3c7618d 100644
--- a/client/components/main/header.styl
+++ b/client/components/main/header.styl
@@ -188,8 +188,6 @@
     width: 100%
     padding: 10px 0px
     z-index: 30
-    position: absolute
-    bottom: 0px
 
     ul
       width: calc(100% - 60px)
@@ -218,7 +216,7 @@
       position: absolute
       right: 0px
       padding: 10px
-      margin: -10px
+      margin: -10px 0 -10px -10px
 
 .announcement,
 .offline-warning
diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade
index 4d76aabb..9543c5c5 100644
--- a/client/components/main/layouts.jade
+++ b/client/components/main/layouts.jade
@@ -1,7 +1,6 @@
 head
-  title Wekan
-  meta(name="viewport"
-   content="maximum-scale=1.0,width=device-width,initial-scale=1.0,user-scalable=0")
+  title
+  meta(name="viewport" content="maximum-scale=1.0,width=device-width,initial-scale=1.0,user-scalable=0")
   meta(http-equiv="X-UA-Compatible" content="IE=edge")
   //- XXX We should use pathFor in the following `href` to support the case
     where the application is deployed with a path prefix, but it seems to be
@@ -9,34 +8,47 @@ head
     packages.
   link(rel="shortcut icon" href="/wekan-favicon.png")
   link(rel="apple-touch-icon" href="/wekan-favicon.png")
+  link(rel="mask-icon" href="/wekan-logo-150.svg")
   link(rel="manifest" href="/wekan-manifest.json")
 
 template(name="userFormsLayout")
   section.auth-layout
-    h1.at-form-landing-logo
-      img(src="{{pathFor '/wekan-logo.png'}}" alt="Wekan")
     section.auth-dialog
-      +Template.dynamic(template=content)
-      div.at-form-lang
-        select.select-lang.js-userform-set-language
-          each languages
-            if isCurrentLanguage
-              option(value="{{tag}}" selected="selected") {{name}}
-            else
-              option(value="{{tag}}") {{name}}
+      if isLoading
+        +loader
+      else
+        +Template.dynamic(template=content)
+        if currentSetting.displayAuthenticationMethod
+          +connectionMethod(authenticationMethod=currentSetting.defaultAuthenticationMethod)
+        div.at-form-lang
+          select.select-lang.js-userform-set-language
+            each languages
+              if isCurrentLanguage
+                option(value="{{tag}}" selected="selected") {{name}}
+              else
+                option(value="{{tag}}") {{name}}
 
 template(name="defaultLayout")
   +header
   #content
+    | {{{afterBodyStart}}}
     +Template.dynamic(template=content)
+    | {{{beforeBodyEnd}}}
   if (Modal.isOpen)
     #modal
       .overlay
-      .modal-content
-        a.modal-close-btn.js-close-modal
-          i.fa.fa-times-thin
-        +Template.dynamic(template=Modal.getHeaderName)
-        +Template.dynamic(template=Modal.getTemplateName)
+      if (Modal.isWide)
+        .modal-content-wide.modal-container
+          a.modal-close-btn.js-close-modal
+            i.fa.fa-times-thin
+          +Template.dynamic(template=Modal.getHeaderName)
+          +Template.dynamic(template=Modal.getTemplateName)
+      else
+        .modal-content.modal-container
+          a.modal-close-btn.js-close-modal
+            i.fa.fa-times-thin
+          +Template.dynamic(template=Modal.getHeaderName)
+          +Template.dynamic(template=Modal.getTemplateName)
 
 template(name="notFound")
   +message(label='page-not-found')
@@ -47,3 +59,14 @@ template(name="message")
     unless currentUser
       with(pathFor route='atSignIn')
         p {{{_ 'page-maybe-private' this}}}
+
+template(name="loader")
+  h1.loadingText {{_ 'loading'}}
+  .lds-roller
+    div
+    div
+    div
+    div
+    div
+    div
+    div
diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js
index f12718a7..d5113a25 100644
--- a/client/components/main/layouts.js
+++ b/client/components/main/layouts.js
@@ -6,7 +6,36 @@ const i18nTagToT9n = (i18nTag) => {
   return i18nTag;
 };
 
+const validator = {
+  set(obj, prop, value) {
+    if (prop === 'state' && value !== 'signIn') {
+      $('.at-form-authentication').hide();
+    } else if (prop === 'state' && value === 'signIn') {
+      $('.at-form-authentication').show();
+    }
+    // The default behavior to store the value
+    obj[prop] = value;
+    // Indicate success
+    return true;
+  },
+};
+
+Template.userFormsLayout.onCreated(function() {
+  const instance = this;
+  instance.currentSetting = new ReactiveVar();
+  instance.isLoading = new ReactiveVar(false);
+
+  Meteor.subscribe('setting', {
+    onReady() {
+      instance.currentSetting.set(Settings.findOne());
+      return this.stop();
+    },
+  });
+});
+
 Template.userFormsLayout.onRendered(() => {
+  AccountsTemplates.state.form.keys = new Proxy(AccountsTemplates.state.form.keys, validator);
+
   const i18nTag = navigator.language;
   if (i18nTag) {
     T9n.setLanguage(i18nTagToT9n(i18nTag));
@@ -15,6 +44,22 @@ Template.userFormsLayout.onRendered(() => {
 });
 
 Template.userFormsLayout.helpers({
+  currentSetting() {
+    return Template.instance().currentSetting.get();
+  },
+
+  isLoading() {
+    return Template.instance().isLoading.get();
+  },
+
+  afterBodyStart() {
+    return currentSetting.customHTMLafterBodyStart;
+  },
+
+  beforeBodyEnd() {
+    return currentSetting.customHTMLbeforeBodyEnd;
+  },
+
   languages() {
     return _.map(TAPi18n.getLanguages(), (lang, code) => {
       const tag = code;
@@ -47,6 +92,15 @@ Template.userFormsLayout.events({
     T9n.setLanguage(i18nTagToT9n(i18nTag));
     evt.preventDefault();
   },
+  'click #at-btn'(event, instance) {
+    if (FlowRouter.getRouteName() === 'atSignIn') {
+      instance.isLoading.set(true);
+      authentication(event, instance)
+        .then(() => {
+          instance.isLoading.set(false);
+        });
+    }
+  },
 });
 
 Template.defaultLayout.events({
@@ -54,3 +108,64 @@ Template.defaultLayout.events({
     Modal.close();
   },
 });
+
+async function authentication(event, instance) {
+  const match = $('#at-field-username_and_email').val();
+  const password = $('#at-field-password').val();
+
+  if (!match || !password) return undefined;
+
+  const result = await getAuthenticationMethod(instance.currentSetting.get(), match);
+
+  if (result === 'password') return undefined;
+
+  // Stop submit #at-pwd-form
+  event.preventDefault();
+  event.stopImmediatePropagation();
+
+  switch (result) {
+  case 'ldap':
+    return new Promise((resolve) => {
+      Meteor.loginWithLDAP(match, password, function() {
+        resolve(FlowRouter.go('/'));
+      });
+    });
+
+  case 'cas':
+    return new Promise((resolve) => {
+      Meteor.loginWithCas(match, password, function() {
+        resolve(FlowRouter.go('/'));
+      });
+    });
+
+  default:
+    return undefined;
+  }
+}
+
+function getAuthenticationMethod({displayAuthenticationMethod, defaultAuthenticationMethod}, match) {
+  if (displayAuthenticationMethod) {
+    return $('.select-authentication').val();
+  }
+  return getUserAuthenticationMethod(defaultAuthenticationMethod, match);
+}
+
+function getUserAuthenticationMethod(defaultAuthenticationMethod, match) {
+  return new Promise((resolve) => {
+    try {
+      Meteor.subscribe('user-authenticationMethod', match, {
+        onReady() {
+          const user = Users.findOne();
+
+          const authenticationMethod = user
+            ? user.authenticationMethod
+            : defaultAuthenticationMethod;
+
+          resolve(authenticationMethod);
+        },
+      });
+    } catch(error) {
+      resolve(defaultAuthenticationMethod);
+    }
+  });
+}
diff --git a/client/components/main/layouts.styl b/client/components/main/layouts.styl
index a79ff337..46ee720c 100644
--- a/client/components/main/layouts.styl
+++ b/client/components/main/layouts.styl
@@ -62,6 +62,23 @@ body
       float: right
       font-size: 24px
 
+  .modal-content-wide
+    width: 800px
+    min-height: 0px
+    margin: 42px auto
+    padding: 12px
+    border-radius: 4px
+    background: darken(white, 13%)
+    z-index: 110
+
+    h2
+      margin-bottom: 25px
+
+    .modal-close-btn
+      display: block
+      float: right
+      font-size: 24px
+
 h1
   font-size: 22px
   line-height: 1.2em
@@ -273,7 +290,7 @@ kbd
 // Implement a thiner close icon as suggested in
 // https://github.com/FortAwesome/Font-Awesome/issues/1540#issuecomment-68689950
 .fa.fa-times-thin:before
-  content: '\00d7';
+  content: '\00d7'
 
 .fa.fa-globe.colorful, .fa.fa-bell.colorful
   color: #4caf50
@@ -368,8 +385,8 @@ a
 
 @media screen and (max-width: 800px)
   #content
-    margin: 1px 0px 49px 0px
-    height: calc(100% - 96px)
+    margin: 1px 0px 0px 0px
+    height: calc(100% - 0px)
 
     > .wrapper
       margin-top: 0px
@@ -382,3 +399,103 @@ a
   height: 37px
   margin: 8px 10px 0 0
   width: 50px
+
+.select-authentication
+  width: 100%
+
+.auth-layout
+  display: flex
+  flex-direction: column
+  align-items: center
+  justify-content: center
+  height: 100%
+
+  .auth-dialog
+    margin: 0 !important
+
+.loadingText
+  text-align: center
+
+.lds-roller
+  display: block
+  margin: auto
+  position: relative
+  width: 64px
+  height: 64px
+
+  div
+    animation: lds-roller 1.2s cubic-bezier(0.5, 0, 0.5, 1) infinite
+    transform-origin: 32px 32px
+
+  div:after
+    content: " "
+    display: block
+    position: absolute
+    width: 6px
+    height: 6px
+    border-radius: 50%
+    background: #dedede
+    margin: -3px 0 0 -3px
+
+  div:nth-child(1)
+    animation-delay: -0.036s
+
+  div:nth-child(1):after
+    top: 50px
+    left: 50px
+
+  div:nth-child(2)
+    animation-delay: -0.072s
+
+  div:nth-child(2):after
+    top: 54px
+    left: 45px
+
+  div:nth-child(3)
+    animation-delay: -0.108s
+
+  div:nth-child(3):after
+    top: 57px
+    left: 39px
+
+  div:nth-child(4)
+    animation-delay: -0.144s
+
+  div:nth-child(4):after
+    top: 58px
+    left: 32px
+
+  div:nth-child(5)
+    animation-delay: -0.18s
+
+  div:nth-child(5):after
+    top: 57px
+    left: 25px
+
+  div:nth-child(6)
+    animation-delay: -0.216s
+
+  div:nth-child(6):after
+    top: 54px
+    left: 19px
+
+  div:nth-child(7)
+    animation-delay: -0.252s
+
+  div:nth-child(7):after
+    top: 50px
+    left: 14px
+
+  div:nth-child(8)
+    animation-delay: -0.288s
+
+  div:nth-child(8):after
+    top: 45px
+    left: 10px
+
+@keyframes lds-roller
+  0%
+    transform: rotate(0deg)
+
+  100%
+    transform: rotate(360deg)
diff --git a/client/components/main/popup.styl b/client/components/main/popup.styl
index b7c9e264..ff00eef3 100644
--- a/client/components/main/popup.styl
+++ b/client/components/main/popup.styl
@@ -33,6 +33,9 @@ $popupWidth = 300px
   textarea
     height: 72px
 
+  form a span
+    padding: 0 0.5rem
+
   .header
     height: 36px
     position: relative
diff --git a/client/components/mixins/perfectScrollbar.js b/client/components/mixins/perfectScrollbar.js
index f652f043..12f8a892 100644
--- a/client/components/mixins/perfectScrollbar.js
+++ b/client/components/mixins/perfectScrollbar.js
@@ -1,12 +1,16 @@
+const { isTouchDevice } = Utils;
+
 Mixins.PerfectScrollbar = BlazeComponent.extendComponent({
   onRendered() {
-    const component = this.mixinParent();
-    const domElement = component.find('.js-perfect-scrollbar');
-    Ps.initialize(domElement);
+    if (!isTouchDevice()) {
+      const component = this.mixinParent();
+      const domElement = component.find('.js-perfect-scrollbar');
+      Ps.initialize(domElement);
 
-    // XXX We should create an event map to be consistent with other components
-    // but since BlazeComponent doesn't merge Mixins events transparently I
-    // prefered to use a jQuery event (which is what an event map ends up doing)
-    component.$(domElement).on('mouseenter', () => Ps.update(domElement));
+      // XXX We should create an event map to be consistent with other components
+      // but since BlazeComponent doesn't merge Mixins events transparently I
+      // prefered to use a jQuery event (which is what an event map ends up doing)
+      component.$(domElement).on('mouseenter', () => Ps.update(domElement));
+    }
   },
 });
diff --git a/client/components/rules/.DS_Store b/client/components/rules/.DS_Store
new file mode 100644
index 00000000..5008ddfc
--- /dev/null
+++ b/client/components/rules/.DS_Store
diff --git a/client/components/rules/actions/boardActions.jade b/client/components/rules/actions/boardActions.jade
new file mode 100644
index 00000000..6034184c
--- /dev/null
+++ b/client/components/rules/actions/boardActions.jade
@@ -0,0 +1,72 @@
+template(name="boardActions")
+  div.trigger-item
+    div.trigger-content
+      div.trigger-text 
+        | {{_'r-move-card-to'}}
+      div.trigger-dropdown
+        select(id="move-gen-action")
+          option(value="top") {{_'r-top-of'}}
+          option(value="bottom") {{_'r-bottom-of'}}
+      div.trigger-text 
+        | {{_'r-its-list'}}
+    div.trigger-button.js-add-gen-move-action.js-goto-rules
+      i.fa.fa-plus
+
+  div.trigger-item
+    div.trigger-content
+      div.trigger-text 
+        | {{_'r-move-card-to'}}
+      div.trigger-dropdown
+        select(id="move-spec-action")
+          option(value="top") {{_'r-top-of'}}
+          option(value="bottom") {{_'r-bottom-of'}}
+      div.trigger-text 
+        | {{_'r-list'}}
+      div.trigger-dropdown
+        input(id="listName",type=text,placeholder="{{_'r-name'}}")
+    div.trigger-button.js-add-spec-move-action.js-goto-rules
+      i.fa.fa-plus
+
+  div.trigger-item
+    div.trigger-content
+      div.trigger-dropdown
+        select(id="arch-action")
+          option(value="archive") {{_'r-archive'}}
+          option(value="unarchive") {{_'r-unarchive'}}
+      div.trigger-text 
+        | {{_'r-card'}}
+    div.trigger-button.js-add-arch-action.js-goto-rules
+      i.fa.fa-plus
+
+  div.trigger-item
+    div.trigger-content
+      div.trigger-text 
+        | {{_'r-add-swimlane'}}
+      div.trigger-dropdown
+        input(id="swimlane-name",type=text,placeholder="{{_'r-name'}}")
+    div.trigger-button.js-add-swimlane-action.js-goto-rules
+      i.fa.fa-plus
+
+  div.trigger-item
+    div.trigger-content
+      div.trigger-text 
+        | {{_'r-create-card'}}
+      div.trigger-dropdown
+        input(id="card-name",type=text,placeholder="{{_'r-name'}}")
+      div.trigger-text 
+        | {{_'r-in-list'}}
+      div.trigger-dropdown
+        input(id="list-name",type=text,placeholder="{{_'r-name'}}")
+      div.trigger-text 
+        | {{_'r-in-swimlane'}}
+      div.trigger-dropdown
+        input(id="swimlane-name2",type=text,placeholder="{{_'r-name'}}")
+    div.trigger-button.js-create-card-action.js-goto-rules
+      i.fa.fa-plus
+
+
+   
+  
+
+
+
diff --git a/client/components/rules/actions/boardActions.js b/client/components/rules/actions/boardActions.js
new file mode 100644
index 00000000..e0b8edc9
--- /dev/null
+++ b/client/components/rules/actions/boardActions.js
@@ -0,0 +1,168 @@
+BlazeComponent.extendComponent({
+  onCreated() {
+
+  },
+
+  events() {
+    return [{
+      'click .js-create-card-action' (event) {
+        const ruleName = this.data().ruleName.get();
+        const trigger = this.data().triggerVar.get();
+        const cardName = this.find('#card-name').value;
+        const listName = this.find('#list-name').value;
+        const swimlaneName = this.find('#swimlane-name2').value;
+        const boardId = Session.get('currentBoard');
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const triggerId = Triggers.insert(trigger);
+        const actionId = Actions.insert({
+          actionType: 'createCard',
+          swimlaneName,
+          cardName,
+          listName,
+          boardId,
+          desc,
+        });
+        Rules.insert({
+          title: ruleName,
+          triggerId,
+          actionId,
+          boardId,
+        });
+
+      },
+      'click .js-add-swimlane-action' (event) {
+        const ruleName = this.data().ruleName.get();
+        const trigger = this.data().triggerVar.get();
+        const swimlaneName = this.find('#swimlane-name').value;
+        const boardId = Session.get('currentBoard');
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const triggerId = Triggers.insert(trigger);
+        const actionId = Actions.insert({
+          actionType: 'addSwimlane',
+          swimlaneName,
+          boardId,
+          desc,
+        });
+        Rules.insert({
+          title: ruleName,
+          triggerId,
+          actionId,
+          boardId,
+        });
+
+      },
+      'click .js-add-spec-move-action' (event) {
+        const ruleName = this.data().ruleName.get();
+        const trigger = this.data().triggerVar.get();
+        const actionSelected = this.find('#move-spec-action').value;
+        const listTitle = this.find('#listName').value;
+        const boardId = Session.get('currentBoard');
+        const desc = Utils.getTriggerActionDesc(event, this);
+        if (actionSelected === 'top') {
+          const triggerId = Triggers.insert(trigger);
+          const actionId = Actions.insert({
+            actionType: 'moveCardToTop',
+            listTitle,
+            boardId,
+            desc,
+          });
+          Rules.insert({
+            title: ruleName,
+            triggerId,
+            actionId,
+            boardId,
+          });
+        }
+        if (actionSelected === 'bottom') {
+          const triggerId = Triggers.insert(trigger);
+          const actionId = Actions.insert({
+            actionType: 'moveCardToBottom',
+            listTitle,
+            boardId,
+            desc,
+          });
+          Rules.insert({
+            title: ruleName,
+            triggerId,
+            actionId,
+            boardId,
+          });
+        }
+      },
+      'click .js-add-gen-move-action' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const boardId = Session.get('currentBoard');
+        const ruleName = this.data().ruleName.get();
+        const trigger = this.data().triggerVar.get();
+        const actionSelected = this.find('#move-gen-action').value;
+        if (actionSelected === 'top') {
+          const triggerId = Triggers.insert(trigger);
+          const actionId = Actions.insert({
+            actionType: 'moveCardToTop',
+            'listTitle': '*',
+            boardId,
+            desc,
+          });
+          Rules.insert({
+            title: ruleName,
+            triggerId,
+            actionId,
+            boardId,
+          });
+        }
+        if (actionSelected === 'bottom') {
+          const triggerId = Triggers.insert(trigger);
+          const actionId = Actions.insert({
+            actionType: 'moveCardToBottom',
+            'listTitle': '*',
+            boardId,
+            desc,
+          });
+          Rules.insert({
+            title: ruleName,
+            triggerId,
+            actionId,
+            boardId,
+          });
+        }
+      },
+      'click .js-add-arch-action' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const boardId = Session.get('currentBoard');
+        const ruleName = this.data().ruleName.get();
+        const trigger = this.data().triggerVar.get();
+        const actionSelected = this.find('#arch-action').value;
+        if (actionSelected === 'archive') {
+          const triggerId = Triggers.insert(trigger);
+          const actionId = Actions.insert({
+            actionType: 'archive',
+            boardId,
+            desc,
+          });
+          Rules.insert({
+            title: ruleName,
+            triggerId,
+            actionId,
+            boardId,
+          });
+        }
+        if (actionSelected === 'unarchive') {
+          const triggerId = Triggers.insert(trigger);
+          const actionId = Actions.insert({
+            actionType: 'unarchive',
+            boardId,
+            desc,
+          });
+          Rules.insert({
+            title: ruleName,
+            triggerId,
+            actionId,
+            boardId,
+          });
+        }
+      },
+    }];
+  },
+
+}).register('boardActions');
+/* eslint-no-undef */
diff --git a/client/components/rules/actions/cardActions.jade b/client/components/rules/actions/cardActions.jade
new file mode 100644
index 00000000..8c6defc6
--- /dev/null
+++ b/client/components/rules/actions/cardActions.jade
@@ -0,0 +1,55 @@
+template(name="cardActions")
+  div.trigger-item
+    div.trigger-content
+      div.trigger-dropdown
+        select(id="label-action")
+          option(value="add") {{{_'r-add'}}}
+          option(value="remove") {{{_'r-remove'}}}
+      div.trigger-text 
+        | {{{_'r-label'}}}
+      div.trigger-dropdown
+        select(id="label-id")
+          each labels
+            option(value="#{_id}")
+              = name
+    div.trigger-button.js-add-label-action.js-goto-rules
+      i.fa.fa-plus
+
+  div.trigger-item
+    div.trigger-content
+      div.trigger-dropdown
+        select(id="member-action")
+          option(value="add") {{{_'r-add'}}}
+          option(value="remove") {{{_'r-remove'}}}
+      div.trigger-text 
+        | {{{_'r-member'}}}
+      div.trigger-dropdown
+        input(id="member-name",type=text,placeholder="{{{_'r-name'}}}")  
+    div.trigger-button.js-add-member-action.js-goto-rules
+      i.fa.fa-plus
+
+  div.trigger-item
+    div.trigger-content
+      div.trigger-text 
+        | {{{_'r-remove-all'}}}
+    div.trigger-button.js-add-removeall-action.js-goto-rules
+      i.fa.fa-plus
+
+  div.trigger-item
+    div.trigger-content
+      div.trigger-text
+        | {{{_'r-set-color'}}}
+        button.trigger-button.trigger-button-color.js-show-color-palette(
+          id="color-action"
+          class="card-details-{{cardColorButton}}")
+          | {{{_ cardColorButtonText }}}
+    div.trigger-button.js-set-color-action.js-goto-rules
+      i.fa.fa-plus
+
+template(name="setCardActionsColorPopup")
+  form.edit-label
+    .palette-colors: each colors
+      span.card-label.palette-color.js-palette-color(class="card-details-{{color}}")
+        if(isSelected color)
+          i.fa.fa-check
+    button.primary.confirm.js-submit {{_ 'save'}}
diff --git a/client/components/rules/actions/cardActions.js b/client/components/rules/actions/cardActions.js
new file mode 100644
index 00000000..a1e43c38
--- /dev/null
+++ b/client/components/rules/actions/cardActions.js
@@ -0,0 +1,188 @@
+let cardColors;
+Meteor.startup(() => {
+  cardColors = Cards.simpleSchema()._schema.color.allowedValues;
+});
+
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.subscribe('allRules');
+    this.cardColorButtonValue = new ReactiveVar('green');
+  },
+
+  cardColorButton() {
+    return this.cardColorButtonValue.get();
+  },
+
+  cardColorButtonText() {
+    return `color-${ this.cardColorButtonValue.get() }`;
+  },
+
+  labels() {
+    const labels = Boards.findOne(Session.get('currentBoard')).labels;
+    for (let i = 0; i < labels.length; i++) {
+      if (labels[i].name === '' || labels[i].name === undefined) {
+        labels[i].name = labels[i].color.toUpperCase();
+      }
+    }
+    return labels;
+  },
+
+  events() {
+    return [{
+      'click .js-add-label-action' (event) {
+        const ruleName = this.data().ruleName.get();
+        const trigger = this.data().triggerVar.get();
+        const actionSelected = this.find('#label-action').value;
+        const labelId = this.find('#label-id').value;
+        const boardId = Session.get('currentBoard');
+        const desc = Utils.getTriggerActionDesc(event, this);
+        if (actionSelected === 'add') {
+          const triggerId = Triggers.insert(trigger);
+          const actionId = Actions.insert({
+            actionType: 'addLabel',
+            labelId,
+            boardId,
+            desc,
+          });
+          Rules.insert({
+            title: ruleName,
+            triggerId,
+            actionId,
+            boardId,
+          });
+        }
+        if (actionSelected === 'remove') {
+          const triggerId = Triggers.insert(trigger);
+          const actionId = Actions.insert({
+            actionType: 'removeLabel',
+            labelId,
+            boardId,
+            desc,
+          });
+          Rules.insert({
+            title: ruleName,
+            triggerId,
+            actionId,
+            boardId,
+          });
+        }
+
+      },
+      'click .js-add-member-action' (event) {
+        const ruleName = this.data().ruleName.get();
+        const trigger = this.data().triggerVar.get();
+        const actionSelected = this.find('#member-action').value;
+        const username = this.find('#member-name').value;
+        const boardId = Session.get('currentBoard');
+        const desc = Utils.getTriggerActionDesc(event, this);
+        if (actionSelected === 'add') {
+          const triggerId = Triggers.insert(trigger);
+          const actionId = Actions.insert({
+            actionType: 'addMember',
+            username,
+            boardId,
+            desc,
+          });
+          Rules.insert({
+            title: ruleName,
+            triggerId,
+            actionId,
+            boardId,
+            desc,
+          });
+        }
+        if (actionSelected === 'remove') {
+          const triggerId = Triggers.insert(trigger);
+          const actionId = Actions.insert({
+            actionType: 'removeMember',
+            username,
+            boardId,
+            desc,
+          });
+          Rules.insert({
+            title: ruleName,
+            triggerId,
+            actionId,
+            boardId,
+          });
+        }
+      },
+      'click .js-add-removeall-action' (event) {
+        const ruleName = this.data().ruleName.get();
+        const trigger = this.data().triggerVar.get();
+        const triggerId = Triggers.insert(trigger);
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const boardId = Session.get('currentBoard');
+        const actionId = Actions.insert({
+          actionType: 'removeMember',
+          'username': '*',
+          boardId,
+          desc,
+        });
+        Rules.insert({
+          title: ruleName,
+          triggerId,
+          actionId,
+          boardId,
+        });
+      },
+      'click .js-show-color-palette'(event){
+        const funct = Popup.open('setCardActionsColor');
+        const colorButton = this.find('#color-action');
+        if (colorButton.value === '') {
+          colorButton.value = 'green';
+        }
+        funct.call(this, event);
+      },
+      'click .js-set-color-action' (event) {
+        const ruleName = this.data().ruleName.get();
+        const trigger = this.data().triggerVar.get();
+        const selectedColor = this.cardColorButtonValue.get();
+        const boardId = Session.get('currentBoard');
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const triggerId = Triggers.insert(trigger);
+        const actionId = Actions.insert({
+          actionType: 'setColor',
+          selectedColor,
+          boardId,
+          desc,
+        });
+        Rules.insert({
+          title: ruleName,
+          triggerId,
+          actionId,
+          boardId,
+        });
+      },
+    }];
+  },
+
+}).register('cardActions');
+
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.currentAction = this.currentData();
+    this.colorButtonValue = Popup.getOpenerComponent().cardColorButtonValue;
+    this.currentColor = new ReactiveVar(this.colorButtonValue.get());
+  },
+
+  colors() {
+    return cardColors.map((color) => ({ color, name: '' }));
+  },
+
+  isSelected(color) {
+    return this.currentColor.get() === color;
+  },
+
+  events() {
+    return [{
+      'click .js-palette-color'() {
+        this.currentColor.set(this.currentData().color);
+      },
+      'click .js-submit' () {
+        this.colorButtonValue.set(this.currentColor.get());
+        Popup.close();
+      },
+    }];
+  },
+}).register('setCardActionsColorPopup');
diff --git a/client/components/rules/actions/checklistActions.jade b/client/components/rules/actions/checklistActions.jade
new file mode 100644
index 00000000..94c63557
--- /dev/null
+++ b/client/components/rules/actions/checklistActions.jade
@@ -0,0 +1,70 @@
+template(name="checklistActions")
+  div.trigger-item
+    div.trigger-content
+      div.trigger-dropdown
+        select(id="check-action")
+          option(value="add") {{{_'r-add'}}}
+          option(value="remove") {{{_'r-remove'}}}
+      div.trigger-text 
+        | {{{_'r-checklist'}}}
+      div.trigger-dropdown
+        input(id="checklist-name",type=text,placeholder="{{{_'r-name'}}}")  
+    div.trigger-button.js-add-checklist-action.js-goto-rules
+      i.fa.fa-plus  
+
+  div.trigger-item
+    div.trigger-content
+      div.trigger-dropdown
+        select(id="checkall-action")
+          option(value="check") {{{_'r-check-all'}}}
+          option(value="uncheck") {{{_'r-uncheck-all'}}}
+      div.trigger-text 
+        | {{{_'r-items-check'}}}
+      div.trigger-dropdown
+        input(id="checklist-name2",type=text,placeholder="{{{_'r-name'}}}")  
+    div.trigger-button.js-add-checkall-action.js-goto-rules
+      i.fa.fa-plus
+
+
+  div.trigger-item
+    div.trigger-content
+      div.trigger-dropdown
+        select(id="check-item-action")
+          option(value="check") {{{_'r-check'}}}
+          option(value="uncheck") {{{_'r-uncheck'}}}
+      div.trigger-text 
+        | {{{_'r-item'}}}
+      div.trigger-dropdown
+        input(id="checkitem-name",type=text,placeholder="{{{_'r-name'}}}")
+      div.trigger-text 
+        | {{{_'r-of-checklist'}}}
+      div.trigger-dropdown
+        input(id="checklist-name3",type=text,placeholder="{{{_'r-name'}}}")  
+    div.trigger-button.js-add-check-item-action.js-goto-rules
+      i.fa.fa-plus
+
+  div.trigger-item
+      div.trigger-content
+        div.trigger-text 
+          | {{{_'r-add-checklist'}}}
+        div.trigger-dropdown
+          input(id="checklist-name-3",type=text,placeholder="{{{_'r-name'}}}")
+        div.trigger-text 
+          | {{{_'r-with-items'}}}
+        div.trigger-dropdown
+          input(id="checklist-items",type=text,placeholder="{{{_'r-items-list'}}}")    
+      div.trigger-button.js-add-checklist-items-action.js-goto-rules
+        i.fa.fa-plus  
+
+  div.trigger-item
+      div.trigger-content
+        div.trigger-text 
+          | {{{_'r-checklist-note'}}}
+
+
+
+   
+  
+
+
+
diff --git a/client/components/rules/actions/checklistActions.js b/client/components/rules/actions/checklistActions.js
new file mode 100644
index 00000000..3e79b075
--- /dev/null
+++ b/client/components/rules/actions/checklistActions.js
@@ -0,0 +1,151 @@
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.subscribe('allRules');
+  },
+  events() {
+    return [{
+      'click .js-add-checklist-items-action' (event) {
+        const ruleName = this.data().ruleName.get();
+        const trigger = this.data().triggerVar.get();
+        const checklistName = this.find('#checklist-name-3').value;
+        const checklistItems = this.find('#checklist-items').value;
+        const boardId = Session.get('currentBoard');
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const triggerId = Triggers.insert(trigger);
+        const actionId = Actions.insert({
+          actionType: 'addChecklistWithItems',
+          checklistName,
+          checklistItems,
+          boardId,
+          desc,
+        });
+        Rules.insert({
+          title: ruleName,
+          triggerId,
+          actionId,
+          boardId,
+        });
+
+      },
+      'click .js-add-checklist-action' (event) {
+        const ruleName = this.data().ruleName.get();
+        const trigger = this.data().triggerVar.get();
+        const actionSelected = this.find('#check-action').value;
+        const checklistName = this.find('#checklist-name').value;
+        const boardId = Session.get('currentBoard');
+        const desc = Utils.getTriggerActionDesc(event, this);
+        if (actionSelected === 'add') {
+          const triggerId = Triggers.insert(trigger);
+          const actionId = Actions.insert({
+            actionType: 'addChecklist',
+            checklistName,
+            boardId,
+            desc,
+          });
+          Rules.insert({
+            title: ruleName,
+            triggerId,
+            actionId,
+            boardId,
+          });
+        }
+        if (actionSelected === 'remove') {
+          const triggerId = Triggers.insert(trigger);
+          const actionId = Actions.insert({
+            actionType: 'removeChecklist',
+            checklistName,
+            boardId,
+            desc,
+          });
+          Rules.insert({
+            title: ruleName,
+            triggerId,
+            actionId,
+            boardId,
+          });
+        }
+
+      },
+      'click .js-add-checkall-action' (event) {
+        const ruleName = this.data().ruleName.get();
+        const trigger = this.data().triggerVar.get();
+        const actionSelected = this.find('#checkall-action').value;
+        const checklistName = this.find('#checklist-name2').value;
+        const boardId = Session.get('currentBoard');
+        const desc = Utils.getTriggerActionDesc(event, this);
+        if (actionSelected === 'check') {
+          const triggerId = Triggers.insert(trigger);
+          const actionId = Actions.insert({
+            actionType: 'checkAll',
+            checklistName,
+            boardId,
+            desc,
+          });
+          Rules.insert({
+            title: ruleName,
+            triggerId,
+            actionId,
+            boardId,
+          });
+        }
+        if (actionSelected === 'uncheck') {
+          const triggerId = Triggers.insert(trigger);
+          const actionId = Actions.insert({
+            actionType: 'uncheckAll',
+            checklistName,
+            boardId,
+            desc,
+          });
+          Rules.insert({
+            title: ruleName,
+            triggerId,
+            actionId,
+            boardId,
+          });
+        }
+      },
+      'click .js-add-check-item-action' (event) {
+        const ruleName = this.data().ruleName.get();
+        const trigger = this.data().triggerVar.get();
+        const checkItemName = this.find('#checkitem-name');
+        const checklistName = this.find('#checklist-name3');
+        const actionSelected = this.find('#check-item-action').value;
+        const boardId = Session.get('currentBoard');
+        const desc = Utils.getTriggerActionDesc(event, this);
+        if (actionSelected === 'check') {
+          const triggerId = Triggers.insert(trigger);
+          const actionId = Actions.insert({
+            actionType: 'checkItem',
+            checklistName,
+            checkItemName,
+            boardId,
+            desc,
+          });
+          Rules.insert({
+            title: ruleName,
+            triggerId,
+            actionId,
+            boardId,
+          });
+        }
+        if (actionSelected === 'uncheck') {
+          const triggerId = Triggers.insert(trigger);
+          const actionId = Actions.insert({
+            actionType: 'uncheckItem',
+            checklistName,
+            checkItemName,
+            boardId,
+            desc,
+          });
+          Rules.insert({
+            title: ruleName,
+            triggerId,
+            actionId,
+            boardId,
+          });
+        }
+      },
+    }];
+  },
+
+}).register('checklistActions');
diff --git a/client/components/rules/actions/mailActions.jade b/client/components/rules/actions/mailActions.jade
new file mode 100644
index 00000000..7be78c75
--- /dev/null
+++ b/client/components/rules/actions/mailActions.jade
@@ -0,0 +1,11 @@
+template(name="mailActions")
+  div.trigger-item.trigger-item-mail
+    div.trigger-content.trigger-content-mail
+      div.trigger-text.trigger-text-email
+        | {{_'r-send-email'}}
+      div.trigger-dropdown-mail
+        input(id="email-to",type=text,placeholder="{{_'r-to'}}")
+      input(id="email-subject",type=text,placeholder="{{_'r-subject'}}")
+      textarea(id="email-msg")  
+    div.trigger-button.trigger-button-email.js-mail-action.js-goto-rules
+      i.fa.fa-plus
diff --git a/client/components/rules/actions/mailActions.js b/client/components/rules/actions/mailActions.js
new file mode 100644
index 00000000..40cbc280
--- /dev/null
+++ b/client/components/rules/actions/mailActions.js
@@ -0,0 +1,35 @@
+BlazeComponent.extendComponent({
+  onCreated() {
+
+  },
+
+  events() {
+    return [{
+      'click .js-mail-action' (event) {
+        const emailTo = this.find('#email-to').value;
+        const emailSubject = this.find('#email-subject').value;
+        const emailMsg = this.find('#email-msg').value;
+        const trigger = this.data().triggerVar.get();
+        const ruleName = this.data().ruleName.get();
+        const triggerId = Triggers.insert(trigger);
+        const boardId = Session.get('currentBoard');
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const actionId = Actions.insert({
+          actionType: 'sendEmail',
+          emailTo,
+          emailSubject,
+          emailMsg,
+          boardId,
+          desc,
+        });
+        Rules.insert({
+          title: ruleName,
+          triggerId,
+          actionId,
+          boardId,
+        });
+      },
+    }];
+  },
+
+}).register('mailActions');
diff --git a/client/components/rules/ruleDetails.jade b/client/components/rules/ruleDetails.jade
new file mode 100644
index 00000000..7183cf96
--- /dev/null
+++ b/client/components/rules/ruleDetails.jade
@@ -0,0 +1,20 @@
+template(name="ruleDetails")
+  .rules
+    h2
+      i.fa.fa-magic
+      | {{{_ 'r-rule-details' }}}
+    .triggers-content
+        .triggers-body
+            .triggers-main-body
+                div.trigger-item
+                    div.trigger-content
+                        div.trigger-text 
+                        = trigger 
+                div.trigger-item
+                    div.trigger-content
+                        div.trigger-text 
+                        = action 
+    div.rules-back
+        button.js-goback
+          i.fa.fa-chevron-left
+          | {{{_ 'back'}}}
diff --git a/client/components/rules/ruleDetails.js b/client/components/rules/ruleDetails.js
new file mode 100644
index 00000000..17c86dc3
--- /dev/null
+++ b/client/components/rules/ruleDetails.js
@@ -0,0 +1,38 @@
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.subscribe('allRules');
+    this.subscribe('allTriggers');
+    this.subscribe('allActions');
+
+  },
+
+  trigger() {
+    const ruleId = this.data().ruleId;
+    const rule = Rules.findOne({
+      _id: ruleId.get(),
+    });
+    const trigger = Triggers.findOne({
+      _id: rule.triggerId,
+    });
+    const desc = trigger.description();
+    const upperdesc = desc.charAt(0).toUpperCase() + desc.substr(1);
+    return upperdesc;
+  },
+  action() {
+    const ruleId = this.data().ruleId;
+    const rule = Rules.findOne({
+      _id: ruleId.get(),
+    });
+    const action = Actions.findOne({
+      _id: rule.actionId,
+    });
+    const desc = action.description();
+    const upperdesc = desc.charAt(0).toUpperCase() + desc.substr(1);
+    return upperdesc;
+  },
+
+  events() {
+    return [{}];
+  },
+
+}).register('ruleDetails');
diff --git a/client/components/rules/rules.styl b/client/components/rules/rules.styl
new file mode 100644
index 00000000..05302f7f
--- /dev/null
+++ b/client/components/rules/rules.styl
@@ -0,0 +1,190 @@
+.rules-list
+  overflow:hidden
+  overflow-y:scroll
+  max-height: 400px
+.rules-lists-item
+  display: block
+  position: relative
+  overflow: auto
+  p
+  	display: inline-block
+  	float: left
+  	margin: revert
+.hide-element
+  display:none !important
+.user-details
+  display:inline-block 
+.rules-btns-group
+  position: absolute
+  right: 0
+  top: 50%
+  transform: translateY(-50%)
+  button
+  	margin: auto
+.rules-add
+  display: block
+  overflow: auto
+  margin-top: 15px
+  margin-bottom: 5px
+  input
+  	display: inline-block
+  	float: right
+  	margin: auto
+  	margin-right: 10px
+  button
+  	display: inline-block
+  	float: right
+  	margin: auto
+.rules-back
+  display: block
+  overflow: auto
+  margin-top: 15px
+  margin-bottom: 5px
+  button
+    display: inline-block
+    float: right
+    margin: auto
+    margin-right:14px
+   
+.flex
+  display: -webkit-box
+  display: -moz-box
+  display: -webkit-flex
+  display: -moz-flex
+  display: -ms-flexbox
+  display: flex
+
+
+
+.triggers-content
+  color: #727479
+  background: #dedede
+  .triggers-body
+    display flex
+    padding-top 15px
+    height 100%
+
+    .triggers-side-menu
+      background-color: #f7f7f7
+      border: 1px solid #f0f0f0
+      border-radius: 4px
+      height: intrinsic
+      box-shadow: inset -1px -1px 3px rgba(0,0,0,.05)
+
+      ul
+
+        li
+          margin: 0.1rem 0.2rem;
+          width:50px
+          height:50px
+          text-align:center
+          font-size: 25px
+          position: relative
+          
+          i
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            box-shadow: none
+            transform: translate(-50%,-50%);
+
+
+          &.active
+            background #fff
+            box-shadow 0 1px 2px rgba(0,0,0,0.15);
+
+          &:hover
+            background #fff
+            box-shadow 0 1px 2px rgba(0,0,0,0.15);
+          a
+            @extends .flex
+            padding: 1rem 0 1rem 1rem
+            width: 100% - 5rem
+
+
+            span
+              font-size: 13px
+    .triggers-main-body
+      padding: 0.1em 1em
+      width:100%
+      .trigger-item
+        overflow:auto
+        padding:10px
+        height:40px
+        margin-bottom:5px
+        border-radius: 3px
+        position: relative
+        background-color: white
+        .trigger-content
+            position:absolute
+            top:50%
+            transform: translateY(-50%)
+            left:10px
+            .trigger-text
+              font-size: 16px
+              display:inline-block
+            .trigger-inline-button
+              font-size: 16px
+              display: inline;
+              padding: 6px;
+              border: 1px solid #eee
+              border-radius: 4px
+              box-shadow: inset -1px -1px 3px rgba(0,0,0,.05) 
+              &:hover, &.is-active
+                box-shadow: 0 0 0 2px darken(white, 60%) inset
+            .trigger-text.trigger-text-email
+              margin-left: 5px;
+              margin-top: 10px;
+              margin-bottom: 10px;
+            .trigger-dropdown
+              display:inline-block
+              select
+                width:auto
+                height:30px
+                margin:0px
+                margin-left:5px
+              input
+                display: inline-block
+                width: 80px;
+                margin: 0;
+        .trigger-content-mail
+          left:20px
+          right:100px
+        .trigger-button
+          position:absolute
+          top:50%
+          transform: translateY(-50%)
+          width:30px
+          height:30px
+          border: 1px solid #eee
+          border-radius: 4px
+          box-shadow: inset -1px -1px 3px rgba(0,0,0,.05)
+          text-align:center
+          font-size: 20px
+          right:10px
+          i
+            position: absolute
+            top: 50%
+            left: 50%
+            box-shadow: none
+            transform: translate(-50%,-50%)
+          &:hover, &.is-active
+            box-shadow: 0 0 0 2px darken(white, 60%) inset
+        .trigger-button.trigger-button-email
+          top:30px
+        .trigger-button.trigger-button-person
+          right:-40px
+        .trigger-button.trigger-button-color
+          top: unset
+          position: unset
+          transform: unset
+          font-size: 16px
+          width:auto
+          padding-left: 10px
+          padding-right: 10px
+          height:40px
+      .trigger-item.trigger-item-mail
+        height:300px
+  
+
+
diff --git a/client/components/rules/rulesActions.jade b/client/components/rules/rulesActions.jade
new file mode 100644
index 00000000..3ac04e1c
--- /dev/null
+++ b/client/components/rules/rulesActions.jade
@@ -0,0 +1,29 @@
+template(name="rulesActions")
+  h2
+    i.fa.fa-magic
+    | {{{_ 'r-rule' }}} "#{data.ruleName.get}" - {{{_ 'r-add-action'}}}
+  .triggers-content
+    .triggers-body
+      .triggers-side-menu
+        ul
+          li.active.js-set-board-actions
+            i.fa.fa-columns
+          li.js-set-card-actions
+            i.fa.fa-sticky-note
+          li.js-set-checklist-actions
+            i.fa.fa-check
+          li.js-set-mail-actions
+            i.fa.fa-at
+      .triggers-main-body
+        if ($eq currentActions.get 'board')
+          +boardActions(ruleName=data.ruleName triggerVar=data.triggerVar)
+        else if ($eq currentActions.get 'card')
+          +cardActions(ruleName=data.ruleName triggerVar=data.triggerVar)
+        else if ($eq currentActions.get 'checklist')
+          +checklistActions(ruleName=data.ruleName triggerVar=data.triggerVar)
+        else if ($eq currentActions.get 'mail')
+          +mailActions(ruleName=data.ruleName triggerVar=data.triggerVar)
+  div.rules-back
+        button.js-goback
+          i.fa.fa-chevron-left
+          | {{{_ 'back'}}}
diff --git a/client/components/rules/rulesActions.js b/client/components/rules/rulesActions.js
new file mode 100644
index 00000000..64a5c70e
--- /dev/null
+++ b/client/components/rules/rulesActions.js
@@ -0,0 +1,58 @@
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.currentActions = new ReactiveVar('board');
+  },
+
+  setBoardActions() {
+    this.currentActions.set('board');
+    $('.js-set-card-actions').removeClass('active');
+    $('.js-set-board-actions').addClass('active');
+    $('.js-set-checklist-actions').removeClass('active');
+    $('.js-set-mail-actions').removeClass('active');
+  },
+  setCardActions() {
+    this.currentActions.set('card');
+    $('.js-set-card-actions').addClass('active');
+    $('.js-set-board-actions').removeClass('active');
+    $('.js-set-checklist-actions').removeClass('active');
+    $('.js-set-mail-actions').removeClass('active');
+  },
+  setChecklistActions() {
+    this.currentActions.set('checklist');
+    $('.js-set-card-actions').removeClass('active');
+    $('.js-set-board-actions').removeClass('active');
+    $('.js-set-checklist-actions').addClass('active');
+    $('.js-set-mail-actions').removeClass('active');
+  },
+  setMailActions() {
+    this.currentActions.set('mail');
+    $('.js-set-card-actions').removeClass('active');
+    $('.js-set-board-actions').removeClass('active');
+    $('.js-set-checklist-actions').removeClass('active');
+    $('.js-set-mail-actions').addClass('active');
+  },
+
+  rules() {
+    return Rules.find({});
+  },
+
+  name() {
+    // console.log(this.data());
+  },
+  events() {
+    return [{
+      'click .js-set-board-actions'(){
+        this.setBoardActions();
+      },
+      'click .js-set-card-actions'() {
+        this.setCardActions();
+      },
+      'click .js-set-mail-actions'() {
+        this.setMailActions();
+      },
+      'click .js-set-checklist-actions'() {
+        this.setChecklistActions();
+      },
+    }];
+  },
+}).register('rulesActions');
diff --git a/client/components/rules/rulesList.jade b/client/components/rules/rulesList.jade
new file mode 100644
index 00000000..c2676aa7
--- /dev/null
+++ b/client/components/rules/rulesList.jade
@@ -0,0 +1,27 @@
+template(name="rulesList")
+  .rules
+    h2
+      i.fa.fa-magic
+      | {{{_ 'r-board-rules' }}}
+
+    ul.rules-list
+      each rules
+        li.rules-lists-item
+          p 
+            = title
+          div.rules-btns-group
+            button.js-goto-details
+              i.fa.fa-eye
+              | {{{_ 'r-view-rule'}}}
+            if currentUser.isAdmin
+              button.js-delete-rule
+                i.fa.fa-trash-o
+                | {{{_ 'r-delete-rule'}}}
+      else
+        li.no-items-message {{{_ 'r-no-rules' }}}
+    if currentUser.isAdmin
+      div.rules-add
+        button.js-goto-trigger
+          i.fa.fa-plus
+          | {{{_ 'r-add-rule'}}}
+        input(type=text,placeholder="{{{_ 'r-new-rule-name' }}}",id="ruleTitle")
\ No newline at end of file
diff --git a/client/components/rules/rulesList.js b/client/components/rules/rulesList.js
new file mode 100644
index 00000000..d3923bf9
--- /dev/null
+++ b/client/components/rules/rulesList.js
@@ -0,0 +1,15 @@
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.subscribe('allRules');
+  },
+
+  rules() {
+    const boardId = Session.get('currentBoard');
+    return Rules.find({
+      boardId,
+    });
+  },
+  events() {
+    return [{}];
+  },
+}).register('rulesList');
diff --git a/client/components/rules/rulesMain.jade b/client/components/rules/rulesMain.jade
new file mode 100644
index 00000000..dc33ee4e
--- /dev/null
+++ b/client/components/rules/rulesMain.jade
@@ -0,0 +1,9 @@
+template(name="rulesMain")
+  if($eq rulesCurrentTab.get 'rulesList')
+    +rulesList
+  if($eq rulesCurrentTab.get 'trigger')
+    +rulesTriggers(ruleName=ruleName triggerVar=triggerVar)
+  if($eq rulesCurrentTab.get 'action')
+    +rulesActions(ruleName=ruleName triggerVar=triggerVar)
+  if($eq rulesCurrentTab.get 'ruleDetails')
+    +ruleDetails(ruleId=ruleId)
\ No newline at end of file
diff --git a/client/components/rules/rulesMain.js b/client/components/rules/rulesMain.js
new file mode 100644
index 00000000..d4af38f4
--- /dev/null
+++ b/client/components/rules/rulesMain.js
@@ -0,0 +1,97 @@
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.rulesCurrentTab = new ReactiveVar('rulesList');
+    this.ruleName = new ReactiveVar('');
+    this.triggerVar = new ReactiveVar();
+    this.ruleId = new ReactiveVar();
+  },
+
+  setTrigger() {
+    this.rulesCurrentTab.set('trigger');
+  },
+  sanitizeObject(obj){
+    Object.keys(obj).forEach((key) => {
+      if(obj[key] === '' || obj[key] === undefined){
+        obj[key] = '*';
+      }}
+    );
+  },
+  setRulesList() {
+    this.rulesCurrentTab.set('rulesList');
+  },
+
+  setAction() {
+    this.rulesCurrentTab.set('action');
+  },
+
+  setRuleDetails() {
+    this.rulesCurrentTab.set('ruleDetails');
+  },
+
+  events() {
+    return [{
+      'click .js-delete-rule' () {
+        const rule = this.currentData();
+        Rules.remove(rule._id);
+        Actions.remove(rule.actionId);
+        Triggers.remove(rule.triggerId);
+
+      },
+      'click .js-goto-trigger' (event) {
+        event.preventDefault();
+        const ruleTitle = this.find('#ruleTitle').value;
+        if(ruleTitle !== undefined && ruleTitle !== ''){
+          this.find('#ruleTitle').value = '';
+          this.ruleName.set(ruleTitle);
+          this.setTrigger();
+        }
+      },
+      'click .js-goto-action' (event) {
+        event.preventDefault();
+        // Add user to the trigger
+        const username = $(event.currentTarget.offsetParent).find('.user-name').val();
+        let trigger = this.triggerVar.get();
+        trigger.userId = '*';
+        if(username !== undefined ){
+          const userFound = Users.findOne({username});
+          if(userFound !== undefined){
+            trigger.userId = userFound._id;
+            this.triggerVar.set(trigger);
+          }
+        }
+        // Sanitize trigger
+        trigger = this.triggerVar.get();
+        this.sanitizeObject(trigger);
+        this.triggerVar.set(trigger);
+        this.setAction();
+      },
+      'click .js-show-user-field' (event) {
+        event.preventDefault();
+        $(event.currentTarget.offsetParent).find('.user-details').removeClass('hide-element');
+      },
+      'click .js-goto-rules' (event) {
+        event.preventDefault();
+        this.setRulesList();
+      },
+      'click .js-goback' (event) {
+        event.preventDefault();
+        if(this.rulesCurrentTab.get() === 'trigger' || this.rulesCurrentTab.get() === 'ruleDetails' ){
+          this.setRulesList();
+        }
+        if(this.rulesCurrentTab.get() === 'action'){
+          this.setTrigger();
+        }
+      },
+      'click .js-goto-details' (event) {
+        event.preventDefault();
+        const rule = this.currentData();
+        this.ruleId.set(rule._id);
+        this.setRuleDetails();
+      },
+
+    }];
+  },
+
+}).register('rulesMain');
+
+
diff --git a/client/components/rules/rulesTriggers.jade b/client/components/rules/rulesTriggers.jade
new file mode 100644
index 00000000..79d9d98e
--- /dev/null
+++ b/client/components/rules/rulesTriggers.jade
@@ -0,0 +1,25 @@
+template(name="rulesTriggers")
+  h2
+    i.fa.fa-magic
+    | {{{_ 'r-rule' }}} "#{data.ruleName.get}" - {{{_ 'r-add-trigger'}}}
+  .triggers-content
+    .triggers-body
+      .triggers-side-menu
+        ul
+          li.active.js-set-board-triggers
+            i.fa.fa-columns
+          li.js-set-card-triggers
+            i.fa.fa-sticky-note
+          li.js-set-checklist-triggers
+            i.fa.fa-check
+      .triggers-main-body
+        if showBoardTrigger.get
+          +boardTriggers
+        else if showCardTrigger.get
+          +cardTriggers
+        else if showChecklistTrigger.get
+          +checklistTriggers
+  div.rules-back
+        button.js-goback
+          i.fa.fa-chevron-left
+          | {{{_ 'back'}}}
diff --git a/client/components/rules/rulesTriggers.js b/client/components/rules/rulesTriggers.js
new file mode 100644
index 00000000..e3c16221
--- /dev/null
+++ b/client/components/rules/rulesTriggers.js
@@ -0,0 +1,53 @@
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.showBoardTrigger = new ReactiveVar(true);
+    this.showCardTrigger = new ReactiveVar(false);
+    this.showChecklistTrigger = new ReactiveVar(false);
+  },
+
+  setBoardTriggers() {
+    this.showBoardTrigger.set(true);
+    this.showCardTrigger.set(false);
+    this.showChecklistTrigger.set(false);
+    $('.js-set-card-triggers').removeClass('active');
+    $('.js-set-board-triggers').addClass('active');
+    $('.js-set-checklist-triggers').removeClass('active');
+  },
+  setCardTriggers() {
+    this.showBoardTrigger.set(false);
+    this.showCardTrigger.set(true);
+    this.showChecklistTrigger.set(false);
+    $('.js-set-card-triggers').addClass('active');
+    $('.js-set-board-triggers').removeClass('active');
+    $('.js-set-checklist-triggers').removeClass('active');
+  },
+  setChecklistTriggers() {
+    this.showBoardTrigger.set(false);
+    this.showCardTrigger.set(false);
+    this.showChecklistTrigger.set(true);
+    $('.js-set-card-triggers').removeClass('active');
+    $('.js-set-board-triggers').removeClass('active');
+    $('.js-set-checklist-triggers').addClass('active');
+  },
+
+  rules() {
+    return Rules.find({});
+  },
+
+  name() {
+    // console.log(this.data());
+  },
+  events() {
+    return [{
+      'click .js-set-board-triggers' () {
+        this.setBoardTriggers();
+      },
+      'click .js-set-card-triggers' () {
+        this.setCardTriggers();
+      },
+      'click .js-set-checklist-triggers' () {
+        this.setChecklistTriggers();
+      },
+    }];
+  },
+}).register('rulesTriggers');
diff --git a/client/components/rules/triggers/boardTriggers.jade b/client/components/rules/triggers/boardTriggers.jade
new file mode 100644
index 00000000..ff1406f6
--- /dev/null
+++ b/client/components/rules/triggers/boardTriggers.jade
@@ -0,0 +1,116 @@
+template(name="boardTriggers")
+  div.trigger-item#trigger-two
+    div.trigger-content
+      div.trigger-text 
+        | {{_'r-when-a-card'}}
+      div.trigger-inline-button.js-open-card-title-popup 
+        i.fa.fa-filter
+      div.trigger-text 
+        | {{_'r-is'}}
+      div.trigger-text 
+        | {{_'r-added-to'}}
+      div.trigger-text 
+        | {{_'r-list'}}
+      div.trigger-dropdown
+        input(id="create-list-name",type=text,placeholder="{{_'r-list-name'}}")
+      div.trigger-text 
+        | {{_'r-in-swimlane'}}
+      div.trigger-dropdown
+        input(id="create-swimlane-name",type=text,placeholder="{{_'r-swimlane-name'}}") 
+      div.trigger-button.trigger-button-person.js-show-user-field
+        i.fa.fa-user
+      div.user-details.hide-element
+        div.trigger-text
+          | {{_'r-by'}}
+        div.trigger-dropdown
+          input(class="user-name",type=text,placeholder="{{_'username'}}")
+    div.trigger-button.js-add-create-trigger.js-goto-action
+      i.fa.fa-plus
+
+  div.trigger-item#trigger-three
+    div.trigger-content
+      div.trigger-text 
+        | {{_'r-when-a-card'}}
+      div.trigger-inline-button.js-open-card-title-popup 
+        i.fa.fa-filter
+      div.trigger-text 
+        | {{_'r-is-moved'}}
+      div.trigger-button.trigger-button-person.js-show-user-field
+        i.fa.fa-user
+      div.user-details.hide-element
+        div.trigger-text
+          | {{_'r-by'}}
+        div.trigger-dropdown
+          input(class="user-name",type=text,placeholder="{{_'username'}}")
+    div.trigger-button.js-add-gen-moved-trigger.js-goto-action
+      i.fa.fa-plus
+
+  div.trigger-item#trigger-four
+    div.trigger-content
+      div.trigger-text 
+        | {{_'r-when-a-card'}}
+      div.trigger-inline-button.js-open-card-title-popup 
+        i.fa.fa-filter
+      div.trigger-text 
+        | {{_'r-is'}}
+      div.trigger-dropdown
+        select(id="move-action")
+          option(value="moved-to") {{_'r-moved-to'}}
+          option(value="moved-from") {{_'r-moved-from'}}
+      div.trigger-text 
+        | {{_'r-list'}}
+      div.trigger-dropdown
+        input(id="move-list-name",type=text,placeholder="{{_'r-list-name'}}")
+      div.trigger-text 
+        | {{_'r-in-swimlane'}}
+      div.trigger-dropdown
+        input(id="create-swimlane-name-2",type=text,placeholder="{{_'r-swimlane-name'}}") 
+      div.trigger-button.trigger-button-person.js-show-user-field
+        i.fa.fa-user
+      div.user-details.hide-element
+        div.trigger-text
+          | {{_'r-by'}}
+        div.trigger-dropdown
+          input(class="user-name",type=text,placeholder="{{_'username'}}")
+    div.trigger-button.js-add-moved-trigger.js-goto-action
+      i.fa.fa-plus
+
+  div.trigger-item#trigger-five
+    div.trigger-content
+      div.trigger-text 
+        | {{_'r-when-a-card'}}
+      div.trigger-inline-button.js-open-card-title-popup 
+        i.fa.fa-filter
+      div.trigger-text 
+        | {{_'r-is'}}
+      div.trigger-dropdown
+        select(id="arch-action")
+          option(value="archived") {{_'r-archived'}}
+          option(value="unarchived") {{_'r-unarchived'}}
+      div.trigger-button.trigger-button-person.js-show-user-field
+        i.fa.fa-user
+      div.user-details.hide-element
+        div.trigger-text
+          | {{_'r-by'}}
+        div.trigger-dropdown
+          input(class="user-name",type=text,placeholder="{{_'username'}}")
+    div.trigger-button.js-add-arch-trigger.js-goto-action
+      i.fa.fa-plus
+
+  div.trigger-item
+      div.trigger-content
+        div.trigger-text 
+          | {{{_'r-board-note'}}}
+
+template(name="boardCardTitlePopup")
+    form
+      label
+        | Card Title Filter
+        input.js-card-filter-name(type="text" value=title autofocus)
+      input.js-card-filter-button.primary.wide(type="submit" value="{{_ 'set-filter'}}")
+
+   
+  
+
+
+
diff --git a/client/components/rules/triggers/boardTriggers.js b/client/components/rules/triggers/boardTriggers.js
new file mode 100644
index 00000000..1dc5c437
--- /dev/null
+++ b/client/components/rules/triggers/boardTriggers.js
@@ -0,0 +1,119 @@
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.provaVar = new ReactiveVar('');
+    this.currentPopupTriggerId = 'def';
+    this.cardTitleFilters = {};
+  },
+  setNameFilter(name){
+    this.cardTitleFilters[this.currentPopupTriggerId] =  name;
+  },
+
+  events() {
+    return [{
+      'click .js-open-card-title-popup'(event){
+        const funct = Popup.open('boardCardTitle');
+        const divId = $(event.currentTarget.parentNode.parentNode).attr('id');
+        //console.log('current popup');
+        //console.log(this.currentPopupTriggerId);
+        this.currentPopupTriggerId = divId;
+        funct.call(this, event);
+      },
+      'click .js-add-create-trigger' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const datas = this.data();
+        const listName = this.find('#create-list-name').value;
+        const swimlaneName = this.find('#create-swimlane-name').value;
+        const boardId = Session.get('currentBoard');
+        const divId = $(event.currentTarget.parentNode).attr('id');
+        const cardTitle = this.cardTitleFilters[divId];
+        // move to generic funciont
+        datas.triggerVar.set({
+          activityType: 'createCard',
+          boardId,
+          cardTitle,
+          swimlaneName,
+          listName,
+          desc,
+        });
+      },
+      'click .js-add-moved-trigger' (event) {
+        const datas = this.data();
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const swimlaneName = this.find('#create-swimlane-name-2').value;
+        const actionSelected = this.find('#move-action').value;
+        const listName = this.find('#move-list-name').value;
+        const boardId = Session.get('currentBoard');
+        const divId = $(event.currentTarget.parentNode).attr('id');
+        const cardTitle = this.cardTitleFilters[divId];
+        if (actionSelected === 'moved-to') {
+          datas.triggerVar.set({
+            activityType: 'moveCard',
+            boardId,
+            listName,
+            cardTitle,
+            swimlaneName,
+            'oldListName': '*',
+            desc,
+          });
+        }
+        if (actionSelected === 'moved-from') {
+          datas.triggerVar.set({
+            activityType: 'moveCard',
+            boardId,
+            cardTitle,
+            swimlaneName,
+            'listName': '*',
+            'oldListName': listName,
+            desc,
+          });
+        }
+      },
+      'click .js-add-gen-moved-trigger' (event){
+        const datas = this.data();
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const boardId = Session.get('currentBoard');
+
+        datas.triggerVar.set({
+          'activityType': 'moveCard',
+          boardId,
+          'swimlaneName': '*',
+          'listName':'*',
+          'oldListName': '*',
+          desc,
+        });
+      },
+      'click .js-add-arc-trigger' (event) {
+        const datas = this.data();
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const actionSelected = this.find('#arch-action').value;
+        const boardId = Session.get('currentBoard');
+        if (actionSelected === 'archived') {
+          datas.triggerVar.set({
+            activityType: 'archivedCard',
+            boardId,
+            desc,
+          });
+        }
+        if (actionSelected === 'unarchived') {
+          datas.triggerVar.set({
+            activityType: 'restoredCard',
+            boardId,
+            desc,
+          });
+        }
+      },
+
+    }];
+  },
+
+}).register('boardTriggers');
+
+
+Template.boardCardTitlePopup.events({
+  submit(evt, tpl) {
+    const title = tpl.$('.js-card-filter-name').val().trim();
+    Popup.getOpenerComponent().setNameFilter(title);
+    evt.preventDefault();
+    Popup.close();
+  },
+});
diff --git a/client/components/rules/triggers/cardTriggers.jade b/client/components/rules/triggers/cardTriggers.jade
new file mode 100644
index 00000000..72c4b8db
--- /dev/null
+++ b/client/components/rules/triggers/cardTriggers.jade
@@ -0,0 +1,114 @@
+template(name="cardTriggers")
+  div.trigger-item
+    div.trigger-content
+      div.trigger-text
+        | {{_'r-when-a-label-is'}}
+      div.trigger-dropdown
+        select(id="label-action")
+          option(value="added") {{_'r-added-to'}}
+          option(value="removed") {{_'r-removed-from'}}
+      div.trigger-text
+        | {{_'r-a-card'}}
+      div.trigger-button.trigger-button-person.js-show-user-field
+        i.fa.fa-user
+      div.user-details.hide-element
+        div.trigger-text
+          | {{_'r-by'}}
+        div.trigger-dropdown
+          input(class="user-name",type=text,placeholder="{{_'username'}}")
+    div.trigger-button.js-add-gen-label-trigger.js-goto-action
+      i.fa.fa-plus
+
+  div.trigger-item
+    div.trigger-content
+      div.trigger-text
+        | {{_'r-when-the-label-is'}}
+      div.trigger-dropdown
+        select(id="spec-label")
+          each labels
+            option(value="#{_id}" style="background-color: #{name}")
+              = translatedname
+      div.trigger-text
+        | {{_'r-is'}}
+      div.trigger-dropdown
+        select(id="spec-label-action")
+          option(value="added") {{_'r-added-to'}}
+          option(value="removed") {{_'r-removed-from'}}
+      div.trigger-text
+        | {{_'r-a-card'}}
+      div.trigger-button.trigger-button-person.js-show-user-field
+        i.fa.fa-user
+      div.user-details.hide-element
+        div.trigger-text
+          | {{_'r-by'}}
+        div.trigger-dropdown
+          input(class="user-name",type=text,placeholder="{{_'username'}}")
+    div.trigger-button.js-add-spec-label-trigger.js-goto-action
+      i.fa.fa-plus
+
+  div.trigger-item
+    div.trigger-content
+      div.trigger-text
+        | {{_'r-when-a-member'}}
+      div.trigger-dropdown
+        select(id="gen-member-action")
+          option(value="added") {{_'r-added-to'}}
+          option(value="removed") {{_'r-removed-from'}}
+      div.trigger-text
+        | {{_'r-a-card'}}
+      div.trigger-button.trigger-button-person.js-show-user-field
+        i.fa.fa-user
+      div.user-details.hide-element
+        div.trigger-text
+          | {{_'r-by'}}
+        div.trigger-dropdown
+          input(class="user-name",type=text,placeholder="{{_'username'}}")
+    div.trigger-button.js-add-gen-member-trigger.js-goto-action
+      i.fa.fa-plus
+
+
+  div.trigger-item
+    div.trigger-content
+      div.trigger-text
+        | {{_'r-when-the-member'}}
+      div.trigger-dropdown
+        input(id="spec-member",type=text,placeholder="{{_'r-name'}}")
+      div.trigger-text
+        | {{_'r-is'}}
+      div.trigger-dropdown
+        select(id="spec-member-action")
+          option(value="added") {{_'r-added-to'}}
+          option(value="removed") {{_'r-removed-from'}}
+      div.trigger-text
+        | {{_'r-a-card'}}
+      div.trigger-button.trigger-button-person.js-show-user-field
+        i.fa.fa-user
+      div.user-details.hide-element
+        div.trigger-text
+          | {{_'r-by'}}
+        div.trigger-dropdown
+          input(class="user-name",type=text,placeholder="{{_'username'}}")
+    div.trigger-button.js-add-spec-member-trigger.js-goto-action
+      i.fa.fa-plus
+
+  div.trigger-item
+    div.trigger-content
+      div.trigger-text
+        | {{_'r-when-a-attach'}}
+      div.trigger-text
+        | {{_'r-is'}}
+      div.trigger-dropdown
+        select(id="attach-action")
+          option(value="added") {{_'r-added-to'}}
+          option(value="removed") {{_'r-removed-from'}}
+      div.trigger-text
+        | {{_'r-a-card'}}
+      div.trigger-button.trigger-button-person.js-show-user-field
+        i.fa.fa-user
+      div.user-details.hide-element
+        div.trigger-text
+          | {{_'r-by'}}
+        div.trigger-dropdown
+          input(class="user-name",type=text,placeholder="{{_'username'}}")
+    div.trigger-button.js-add-attachment-trigger.js-goto-action
+      i.fa.fa-plus
diff --git a/client/components/rules/triggers/cardTriggers.js b/client/components/rules/triggers/cardTriggers.js
new file mode 100644
index 00000000..82b21d61
--- /dev/null
+++ b/client/components/rules/triggers/cardTriggers.js
@@ -0,0 +1,131 @@
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.subscribe('allRules');
+  },
+  labels() {
+    const labels = Boards.findOne(Session.get('currentBoard')).labels;
+    for (let i = 0; i < labels.length; i++) {
+      if (labels[i].name === '' || labels[i].name === undefined) {
+        labels[i].name = labels[i].color;
+        labels[i].translatedname = `${TAPi18n.__(`color-${  labels[i].color}`)}`;
+      } else {
+        labels[i].translatedname = labels[i].name;
+      }
+    }
+    return labels;
+  },
+  events() {
+    return [{
+      'click .js-add-gen-label-trigger' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const datas = this.data();
+        const actionSelected = this.find('#label-action').value;
+        const boardId = Session.get('currentBoard');
+        if (actionSelected === 'added') {
+          datas.triggerVar.set({
+            activityType: 'addedLabel',
+            boardId,
+            'labelId': '*',
+            desc,
+          });
+        }
+        if (actionSelected === 'removed') {
+          datas.triggerVar.set({
+            activityType: 'removedLabel',
+            boardId,
+            'labelId': '*',
+            desc,
+          });
+        }
+      },
+      'click .js-add-spec-label-trigger' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const datas = this.data();
+        const actionSelected = this.find('#spec-label-action').value;
+        const labelId = this.find('#spec-label').value;
+        const boardId = Session.get('currentBoard');
+        if (actionSelected === 'added') {
+          datas.triggerVar.set({
+            activityType: 'addedLabel',
+            boardId,
+            labelId,
+            desc,
+          });
+        }
+        if (actionSelected === 'removed') {
+          datas.triggerVar.set({
+            activityType: 'removedLabel',
+            boardId,
+            labelId,
+            desc,
+          });
+        }
+      },
+      'click .js-add-gen-member-trigger' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const datas = this.data();
+        const actionSelected = this.find('#gen-member-action').value;
+        const boardId = Session.get('currentBoard');
+        if (actionSelected === 'added') {
+          datas.triggerVar.set({
+            activityType: 'joinMember',
+            boardId,
+            'username': '*',
+            desc,
+          });
+        }
+        if (actionSelected === 'removed') {
+          datas.triggerVar.set({
+            activityType: 'unjoinMember',
+            boardId,
+            'username': '*',
+            desc,
+          });
+        }
+      },
+      'click .js-add-spec-member-trigger' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const datas = this.data();
+        const actionSelected = this.find('#spec-member-action').value;
+        const username = this.find('#spec-member').value;
+        const boardId = Session.get('currentBoard');
+        if (actionSelected === 'added') {
+          datas.triggerVar.set({
+            activityType: 'joinMember',
+            boardId,
+            username,
+            desc,
+          });
+        }
+        if (actionSelected === 'removed') {
+          datas.triggerVar.set({
+            activityType: 'unjoinMember',
+            boardId,
+            username,
+            desc,
+          });
+        }
+      },
+      'click .js-add-attachment-trigger' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const datas = this.data();
+        const actionSelected = this.find('#attach-action').value;
+        const boardId = Session.get('currentBoard');
+        if (actionSelected === 'added') {
+          datas.triggerVar.set({
+            activityType: 'addAttachment',
+            boardId,
+            desc,
+          });
+        }
+        if (actionSelected === 'removed') {
+          datas.triggerVar.set({
+            activityType: 'deleteAttachment',
+            boardId,
+            desc,
+          });
+        }
+      },
+    }];
+  },
+}).register('cardTriggers');
diff --git a/client/components/rules/triggers/checklistTriggers.jade b/client/components/rules/triggers/checklistTriggers.jade
new file mode 100644
index 00000000..841ec6f7
--- /dev/null
+++ b/client/components/rules/triggers/checklistTriggers.jade
@@ -0,0 +1,125 @@
+template(name="checklistTriggers")
+  div.trigger-item
+    div.trigger-content
+      div.trigger-text 
+        | {{_'r-when-a-checklist'}}
+      div.trigger-dropdown
+        select(id="gen-check-action")
+          option(value="created") {{_'r-added-to'}}
+          option(value="removed") {{_'r-removed-from'}}
+      div.trigger-text 
+        | {{_'r-a-card'}}
+      div.trigger-button.trigger-button-person.js-show-user-field
+        i.fa.fa-user
+      div.user-details.hide-element
+        div.trigger-text
+          | {{_'r-by'}}
+        div.trigger-dropdown
+          input(class="user-name",type=text,placeholder="{{_'username'}}")
+    div.trigger-button.js-add-gen-check-trigger.js-goto-action
+      i.fa.fa-plus
+
+
+  div.trigger-item
+    div.trigger-content
+      div.trigger-text 
+        | {{_'r-when-the-checklist'}}
+      div.trigger-dropdown
+        input(id="check-name",type=text,placeholder="{{_'r-name'}}") 
+      div.trigger-text 
+        | {{_'r-is'}}
+      div.trigger-dropdown
+        select(id="spec-check-action")
+          option(value="created") {{_'r-added-to'}}
+          option(value="removed") {{_'r-removed-from'}}
+      div.trigger-text 
+        | {{_'r-a-card'}}
+      div.trigger-button.trigger-button-person.js-show-user-field
+        i.fa.fa-user
+      div.user-details.hide-element
+        div.trigger-text
+          | {{_'r-by'}}
+        div.trigger-dropdown
+          input(class="user-name",type=text,placeholder="{{_'username'}}")
+    div.trigger-button.js-add-spec-check-trigger.js-goto-action
+      i.fa.fa-plus
+
+  div.trigger-item
+    div.trigger-content
+      div.trigger-text 
+        | {{_'r-when-a-checklist'}}
+      div.trigger-dropdown
+        select(id="gen-comp-check-action")
+          option(value="completed") {{_'r-completed'}}
+          option(value="uncompleted") {{_'r-made-incomplete'}}
+      div.trigger-button.trigger-button-person.js-show-user-field
+        i.fa.fa-user
+      div.user-details.hide-element
+        div.trigger-text
+          | {{_'r-by'}}
+        div.trigger-dropdown
+          input(class="user-name",type=text,placeholder="{{_'username'}}")
+    div.trigger-button.js-add-gen-comp-trigger.js-goto-action
+      i.fa.fa-plus
+
+  div.trigger-item
+    div.trigger-content
+      div.trigger-text 
+        | {{_'r-when-the-checklist'}}
+      div.trigger-dropdown
+        input(id="spec-comp-check-name",type=text,placeholder="{{_'r-name'}}") 
+      div.trigger-text 
+        | {{_'r-is'}}
+      div.trigger-dropdown
+        select(id="spec-comp-check-action")
+          option(value="completed") {{_'r-completed'}}
+          option(value="uncompleted") {{_'r-made-incomplete'}}
+      div.trigger-button.trigger-button-person.js-show-user-field
+        i.fa.fa-user
+      div.user-details.hide-element
+        div.trigger-text
+          | {{_'r-by'}}
+        div.trigger-dropdown
+          input(class="user-name",type=text,placeholder="{{_'username'}}")
+    div.trigger-button.js-add-spec-comp-trigger.js-goto-action
+      i.fa.fa-plus
+
+  div.trigger-item
+    div.trigger-content
+      div.trigger-text 
+        | {{_'r-when-a-item'}}
+      div.trigger-dropdown
+        select(id="check-item-gen-action")
+          option(value="checked") {{_'r-checked'}}
+          option(value="unchecked") {{_'r-unchecked'}}
+      div.trigger-button.trigger-button-person.js-show-user-field
+        i.fa.fa-user
+      div.user-details.hide-element
+        div.trigger-text
+          | {{_'r-by'}}
+        div.trigger-dropdown
+          input(class="user-name",type=text,placeholder="{{_'username'}}")
+    div.trigger-button.js-add-gen-check-item-trigger.js-goto-action
+      i.fa.fa-plus
+
+  div.trigger-item
+    div.trigger-content
+      div.trigger-text 
+        | {{_'r-when-the-item'}}
+      div.trigger-dropdown
+        input(id="check-item-name",type=text,placeholder="{{_'r-name'}}") 
+      div.trigger-text 
+        | {{_'r-is'}}
+      div.trigger-dropdown
+        select(id="check-item-spec-action")
+          option(value="checked") {{_'r-checked'}}
+          option(value="unchecked") {{_'r-unchecked'}}
+      div.trigger-button.trigger-button-person.js-show-user-field
+        i.fa.fa-user
+      div.user-details.hide-element
+        div.trigger-text
+          | {{_'r-by'}}
+        div.trigger-dropdown
+          input(class="user-name",type=text,placeholder="{{_'username'}}")
+    div.trigger-button.js-add-spec-check-item-trigger.js-goto-action
+      i.fa.fa-plus
diff --git a/client/components/rules/triggers/checklistTriggers.js b/client/components/rules/triggers/checklistTriggers.js
new file mode 100644
index 00000000..2272be29
--- /dev/null
+++ b/client/components/rules/triggers/checklistTriggers.js
@@ -0,0 +1,146 @@
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.subscribe('allRules');
+  },
+  events() {
+    return [{
+      'click .js-add-gen-check-trigger' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const datas = this.data();
+        const actionSelected = this.find('#gen-check-action').value;
+        const boardId = Session.get('currentBoard');
+        if (actionSelected === 'created') {
+          datas.triggerVar.set({
+            activityType: 'addChecklist',
+            boardId,
+            'checklistName': '*',
+            desc,
+          });
+        }
+        if (actionSelected === 'removed') {
+          datas.triggerVar.set({
+            activityType: 'removeChecklist',
+            boardId,
+            'checklistName': '*',
+            desc,
+          });
+        }
+      },
+      'click .js-add-spec-check-trigger' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const datas = this.data();
+        const actionSelected = this.find('#spec-check-action').value;
+        const checklistId = this.find('#check-name').value;
+        const boardId = Session.get('currentBoard');
+        if (actionSelected === 'created') {
+          datas.triggerVar.set({
+            activityType: 'addChecklist',
+            boardId,
+            'checklistName': checklistId,
+            desc,
+          });
+        }
+        if (actionSelected === 'removed') {
+          datas.triggerVar.set({
+            activityType: 'removeChecklist',
+            boardId,
+            'checklistName': checklistId,
+            desc,
+          });
+        }
+      },
+      'click .js-add-gen-comp-trigger' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+
+        const datas = this.data();
+        const actionSelected = this.find('#gen-comp-check-action').value;
+        const boardId = Session.get('currentBoard');
+        if (actionSelected === 'completed') {
+          datas.triggerVar.set({
+            activityType: 'completeChecklist',
+            boardId,
+            'checklistName': '*',
+            desc,
+          });
+        }
+        if (actionSelected === 'uncompleted') {
+          datas.triggerVar.set({
+            activityType: 'uncompleteChecklist',
+            boardId,
+            'checklistName': '*',
+            desc,
+          });
+        }
+      },
+      'click .js-add-spec-comp-trigger' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const datas = this.data();
+        const actionSelected = this.find('#spec-comp-check-action').value;
+        const checklistId = this.find('#spec-comp-check-name').value;
+        const boardId = Session.get('currentBoard');
+        if (actionSelected === 'completed') {
+          datas.triggerVar.set({
+            activityType: 'completeChecklist',
+            boardId,
+            'checklistName': checklistId,
+            desc,
+          });
+        }
+        if (actionSelected === 'uncompleted') {
+          datas.triggerVar.set({
+            activityType: 'uncompleteChecklist',
+            boardId,
+            'checklistName': checklistId,
+            desc,
+          });
+        }
+      },
+      'click .js-add-gen-check-item-trigger' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const datas = this.data();
+        const actionSelected = this.find('#check-item-gen-action').value;
+        const boardId = Session.get('currentBoard');
+        if (actionSelected === 'checked') {
+          datas.triggerVar.set({
+            activityType: 'checkedItem',
+            boardId,
+            'checklistItemName': '*',
+            desc,
+          });
+        }
+        if (actionSelected === 'unchecked') {
+          datas.triggerVar.set({
+            activityType: 'uncheckedItem',
+            boardId,
+            'checklistItemName': '*',
+            desc,
+          });
+        }
+      },
+      'click .js-add-spec-check-item-trigger' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const datas = this.data();
+        const actionSelected = this.find('#check-item-spec-action').value;
+        const checklistItemId = this.find('#check-item-name').value;
+        const boardId = Session.get('currentBoard');
+        if (actionSelected === 'checked') {
+          datas.triggerVar.set({
+            activityType: 'checkedItem',
+            boardId,
+            'checklistItemName': checklistItemId,
+            desc,
+          });
+        }
+        if (actionSelected === 'unchecked') {
+          datas.triggerVar.set({
+            activityType: 'uncheckedItem',
+            boardId,
+            'checklistItemName': checklistItemId,
+            desc,
+          });
+        }
+      },
+    }];
+  },
+
+}).register('checklistTriggers');
diff --git a/client/components/settings/connectionMethod.jade b/client/components/settings/connectionMethod.jade
new file mode 100644
index 00000000..d191929f
--- /dev/null
+++ b/client/components/settings/connectionMethod.jade
@@ -0,0 +1,9 @@
+template(name='connectionMethod')
+  div.at-form-authentication
+    label {{_ 'authentication-method'}}
+    select.select-authentication
+      each authentications
+        if isSelected value
+          option(value="{{value}}" selected) {{_ value}}
+        else
+          option(value="{{value}}") {{_ value}}
\ No newline at end of file
diff --git a/client/components/settings/connectionMethod.js b/client/components/settings/connectionMethod.js
new file mode 100644
index 00000000..db9da25f
--- /dev/null
+++ b/client/components/settings/connectionMethod.js
@@ -0,0 +1,37 @@
+Template.connectionMethod.onCreated(function() {
+  this.authenticationMethods = new ReactiveVar([]);
+
+  Meteor.call('getAuthenticationsEnabled', (_, result) => {
+    if (result) {
+      // TODO : add a management of different languages
+      // (ex {value: ldap, text: TAPi18n.__('ldap', {}, T9n.getLanguage() || 'en')})
+      this.authenticationMethods.set([
+        {value: 'password'},
+        // Gets only the authentication methods availables
+        ...Object.entries(result).filter((e) => e[1]).map((e) => ({value: e[0]})),
+      ]);
+    }
+
+    // If only the default authentication available, hides the select boxe
+    const content = $('.at-form-authentication');
+    if (!(this.authenticationMethods.get().length > 1)) {
+      content.hide();
+    } else {
+      content.show();
+    }
+  });
+});
+
+Template.connectionMethod.onRendered(() => {
+  // Moves the select boxe in the first place of the at-pwd-form div
+  $('.at-form-authentication').detach().prependTo('.at-pwd-form');
+});
+
+Template.connectionMethod.helpers({
+  authentications() {
+    return Template.instance().authenticationMethods.get();
+  },
+  isSelected(match) {
+    return Template.instance().data.authenticationMethod === match;
+  },
+});
diff --git a/client/components/settings/informationBody.jade b/client/components/settings/informationBody.jade
index 53907513..feb7c0dc 100644
--- a/client/components/settings/informationBody.jade
+++ b/client/components/settings/informationBody.jade
@@ -17,7 +17,7 @@ template(name='statistics')
     table
       tbody
         tr
-          th {{_ 'Wekan_version'}}
+          th Wekan {{_ 'info'}}
           td {{statistics.version}}
         tr
           th {{_ 'Node_version'}}
diff --git a/client/components/settings/invitationCode.js b/client/components/settings/invitationCode.js
index c02f860f..fa355179 100644
--- a/client/components/settings/invitationCode.js
+++ b/client/components/settings/invitationCode.js
@@ -1,6 +1,13 @@
-Template.invitationCode.onRendered(() => {
-  const setting = Settings.findOne();
-  if (setting || setting.disableRegistration) {
-    $('#invitationcode').hide();
-  }
+Template.invitationCode.onRendered(function() {
+  Meteor.subscribe('setting', {
+    onReady() {
+      const setting = Settings.findOne();
+
+      if (!setting || !setting.disableRegistration) {
+        $('#invitationcode').hide();
+      }
+
+      return this.stop();
+    },
+  });
 });
diff --git a/client/components/settings/peopleBody.jade b/client/components/settings/peopleBody.jade
index a3506a24..15deb005 100644
--- a/client/components/settings/peopleBody.jade
+++ b/client/components/settings/peopleBody.jade
@@ -3,8 +3,13 @@ template(name="people")
     unless currentUser.isAdmin
       | {{_ 'error-notAuthorized'}}
     else
-      .content-title
-        span {{_ 'people'}}
+      .content-title.ext-box
+        .ext-box-left
+          span {{_ 'people'}}
+          input#searchInput(placeholder="{{_ 'search'}}")
+          button#searchButton {{_ 'search'}}
+        .ext-box-right
+          span {{_ 'people-number'}} #{peopleNumber}
       .content-body
         .side-menu
           ul
@@ -27,6 +32,7 @@ template(name="peopleGeneral")
         th {{_ 'verified'}}
         th {{_ 'createdAt'}}
         th {{_ 'active'}}
+        th {{_ 'authentication-method'}}
         th
       each user in peopleList
         +peopleRow(userId=user._id)
@@ -52,6 +58,7 @@ template(name="peopleRow")
         | {{_ 'no'}}
       else
         | {{_ 'yes'}}
+    td {{_ userData.authenticationMethod }}
     td
       a.edit-user
         | {{_ 'edit'}}
@@ -66,12 +73,18 @@ template(name="editUserPopup")
       | {{_ 'username'}}
       span.error.hide.username-taken
         | {{_ 'error-username-taken'}}
-      input.js-profile-username(type="text" value=user.username)
+      if isLdap
+        input.js-profile-username(type="text" value=user.username readonly)
+      else
+        input.js-profile-username(type="text" value=user.username)
     label
       | {{_ 'email'}}
       span.error.hide.email-taken
         | {{_ 'error-email-taken'}}
-      input.js-profile-email(type="email" value="{{user.emails.[0].address}}")
+      if isLdap
+        input.js-profile-email(type="email" value="{{user.emails.[0].address}}" readonly)
+      else
+        input.js-profile-email(type="email" value="{{user.emails.[0].address}}")
     label
       | {{_ 'admin'}}
       select.select-role.js-profile-isadmin
@@ -82,9 +95,20 @@ template(name="editUserPopup")
       select.select-active.js-profile-isactive
         option(value="false") {{_ 'yes'}}
         option(value="true" selected="{{user.loginDisabled}}") {{_ 'no'}}
+    label
+      | {{_ 'authentication-type'}}
+      select.select-authenticationMethod.js-authenticationMethod
+        each authentications
+          if isSelected value
+            option(value="{{value}}" selected) {{_ value}}
+          else
+            option(value="{{value}}") {{_ value}}
     hr
     label
       | {{_ 'password'}}
       input.js-profile-password(type="password")
+    div.buttonsContainer
+      input.primary.wide(type="submit" value="{{_ 'save'}}")
+      div
+      input#deleteButton.primary.wide(type="button" value="{{_ 'delete'}}")
 
-    input.primary.wide(type="submit" value="{{_ 'save'}}")
diff --git a/client/components/settings/peopleBody.js b/client/components/settings/peopleBody.js
index 7cc992f2..83cf14fa 100644
--- a/client/components/settings/peopleBody.js
+++ b/client/components/settings/peopleBody.js
@@ -8,6 +8,8 @@ BlazeComponent.extendComponent({
     this.error = new ReactiveVar('');
     this.loading = new ReactiveVar(false);
     this.people = new ReactiveVar(true);
+    this.findUsersOptions = new ReactiveVar({});
+    this.number = new ReactiveVar(0);
 
     this.page = new ReactiveVar(1);
     this.loadNextPageLocked = false;
@@ -26,6 +28,33 @@ BlazeComponent.extendComponent({
       });
     });
   },
+  events() {
+    return [{
+      'click #searchButton'() {
+        this.filterPeople();
+      },
+      'keydown #searchInput'(event) {
+        if (event.keyCode === 13 && !event.shiftKey) {
+          this.filterPeople();
+        }
+      },
+    }];
+  },
+  filterPeople() {
+    const value = $('#searchInput').first().val();
+    if (value === '') {
+      this.findUsersOptions.set({});
+    } else {
+      const regex = new RegExp(value, 'i');
+      this.findUsersOptions.set({
+        $or: [
+          { username: regex },
+          { 'profile.fullname': regex },
+          { 'emails.address': regex },
+        ],
+      });
+    }
+  },
   loadNextPage() {
     if (this.loadNextPageLocked === false) {
       this.page.set(this.page.get() + 1);
@@ -49,9 +78,14 @@ BlazeComponent.extendComponent({
     this.loading.set(w);
   },
   peopleList() {
-    return Users.find({}, {
+    const users = Users.find(this.findUsersOptions.get(), {
       fields: {_id: true},
     });
+    this.number.set(users.count());
+    return users;
+  },
+  peopleNumber() {
+    return this.number.get();
   },
 }).register('people');
 
@@ -62,10 +96,43 @@ Template.peopleRow.helpers({
   },
 });
 
+Template.editUserPopup.onCreated(function() {
+  this.authenticationMethods = new ReactiveVar([]);
+  this.errorMessage = new ReactiveVar('');
+
+  Meteor.call('getAuthenticationsEnabled', (_, result) => {
+    if (result) {
+      // TODO : add a management of different languages
+      // (ex {value: ldap, text: TAPi18n.__('ldap', {}, T9n.getLanguage() || 'en')})
+      this.authenticationMethods.set([
+        {value: 'password'},
+        // Gets only the authentication methods availables
+        ...Object.entries(result).filter((e) => e[1]).map((e) => ({value: e[0]})),
+      ]);
+    }
+  });
+});
+
 Template.editUserPopup.helpers({
   user() {
     return Users.findOne(this.userId);
   },
+  authentications() {
+    return Template.instance().authenticationMethods.get();
+  },
+  isSelected(match) {
+    const userId = Template.instance().data.userId;
+    const selected = Users.findOne(userId).authenticationMethod;
+    return selected === match;
+  },
+  isLdap() {
+    const userId = Template.instance().data.userId;
+    const selected = Users.findOne(userId).authenticationMethod;
+    return selected === 'ldap';
+  },
+  errorMessage() {
+    return Template.instance().errorMessage.get();
+  },
 });
 
 BlazeComponent.extendComponent({
@@ -91,6 +158,7 @@ Template.editUserPopup.events({
     const isAdmin = tpl.find('.js-profile-isadmin').value.trim();
     const isActive = tpl.find('.js-profile-isactive').value.trim();
     const email = tpl.find('.js-profile-email').value.trim();
+    const authentication = tpl.find('.js-authenticationMethod').value.trim();
 
     const isChangePassword = password.length > 0;
     const isChangeUserName = username !== user.username;
@@ -101,6 +169,7 @@ Template.editUserPopup.events({
         'profile.fullname': fullname,
         'isAdmin': isAdmin === 'true',
         'loginDisabled': isActive === 'true',
+        'authenticationMethod': authentication,
       },
     });
 
@@ -155,4 +224,9 @@ Template.editUserPopup.events({
       });
     } else Popup.close();
   },
+
+  'click #deleteButton'() {
+    Users.remove(this.userId);
+    Popup.close();
+  },
 });
diff --git a/client/components/settings/peopleBody.styl b/client/components/settings/peopleBody.styl
index 84db44a7..80387611 100644
--- a/client/components/settings/peopleBody.styl
+++ b/client/components/settings/peopleBody.styl
@@ -13,3 +13,36 @@ table
 
   tr:nth-child(even)
     background-color: #dddddd;
+
+.ext-box
+  display: flex;
+  flex-direction: row;
+  height: 34px;
+
+  .ext-box-left
+    display: flex;
+    width: 40%
+
+  span
+    vertical-align: center;
+    line-height: 34px;
+    margin-right: 10px;
+
+  input, button
+    margin: 0 10px 0 0;
+    padding: 0;
+
+  button
+    min-width: 60px;
+
+.content-wrapper
+  margin-top: 10px
+
+.buttonsContainer
+  display: flex
+
+  input
+    margin: 0
+
+  div
+    margin: auto
diff --git a/client/components/settings/settingBody.jade b/client/components/settings/settingBody.jade
index 5bc7972d..89911e09 100644
--- a/client/components/settings/settingBody.jade
+++ b/client/components/settings/settingBody.jade
@@ -16,6 +16,8 @@ template(name="setting")
               a.js-setting-menu(data-id="account-setting") {{_ 'accounts'}}
             li
               a.js-setting-menu(data-id="announcement-setting") {{_ 'admin-announcement'}}
+            li
+              a.js-setting-menu(data-id="layout-setting") {{_ 'layout'}}
         .main-body
           if loading.get
             +spinner
@@ -27,6 +29,8 @@ template(name="setting")
             +accountSettings
           else if announcementSetting.get
             +announcementSettings
+          else if layoutSetting.get
+            +layoutSettings
 
 template(name="general")
   ul#registration-setting.setting-detail
@@ -72,7 +76,7 @@ template(name='email')
     li.smtp-form
       .title {{_ 'smtp-password'}}
       .form-group
-        input.form-control#mail-server-password(type="text", placeholder="{{_ 'password'}}" value="{{currentSetting.mailServer.password}}")
+        input.form-control#mail-server-password(type="password", placeholder="{{_ 'password'}}" value="{{currentSetting.mailServer.password}}")
     li.smtp-form
       .title {{_ 'smtp-tls'}}
       .form-group
@@ -127,3 +131,44 @@ template(name='announcementSettings')
             textarea#admin-announcement.form-control= currentSetting.body
           li
             button.js-announcement-save.primary {{_ 'save'}}
+
+template(name='layoutSettings')
+  ul#layout-setting.setting-detail
+    //li.layout-form
+      .title {{_ 'hide-logo'}}
+      .form-group.flex
+        input.form-control#hide-logo(type="radio" name="hideLogo" value="true" checked="{{#if currentSetting.hideLogo}}checked{{/if}}")
+        span {{_ 'yes'}}
+        input.form-control#hide-logo(type="radio" name="hideLogo" value="false" checked="{{#unless currentSetting.hideLogo}}checked{{/unless}}")
+        span {{_ 'no'}}
+    li.layout-form
+      .title {{_ 'display-authentication-method'}}
+      .form-group.flex
+        input.form-control#display-authentication-method(type="radio" name="displayAuthenticationMethod" value="true" checked="{{#if currentSetting.displayAuthenticationMethod}}checked{{/if}}")
+        span {{_ 'yes'}}
+        input.form-control#display-authentication-method(type="radio" name="displayAuthenticationMethod" value="false" checked="{{#unless currentSetting.displayAuthenticationMethod}}checked{{/unless}}")
+        span {{_ 'no'}}
+    li.layout-form
+      .title {{_ 'default-authentication-method'}}
+      +selectAuthenticationMethod(authenticationMethod=currentSetting.defaultAuthenticationMethod)
+    li.layout-form
+      .title {{_ 'custom-product-name'}}
+      .form-group
+        input.form-control#product-name(type="text", placeholder="" value="{{currentSetting.productName}}")
+    li.layout-form
+      .title {{_ 'add-custom-html-after-body-start'}}
+      textarea#customHTMLafterBodyStart.form-control= currentSetting.customHTMLafterBodyStart
+    li.layout-form
+      .title {{_ 'add-custom-html-before-body-end'}}
+      textarea#customHTMLbeforeBodyEnd.form-control= currentSetting.customHTMLbeforeBodyEnd
+    li
+      button.js-save-layout.primary {{_ 'save'}}
+
+
+template(name='selectAuthenticationMethod')
+  select#defaultAuthenticationMethod
+    each authentications
+      if isSelected value
+        option(value="{{value}}" selected) {{_ value}}
+      else
+        option(value="{{value}}") {{_ value}}
diff --git a/client/components/settings/settingBody.js b/client/components/settings/settingBody.js
index 7230d893..8279a092 100644
--- a/client/components/settings/settingBody.js
+++ b/client/components/settings/settingBody.js
@@ -6,6 +6,7 @@ BlazeComponent.extendComponent({
     this.emailSetting = new ReactiveVar(false);
     this.accountSetting = new ReactiveVar(false);
     this.announcementSetting = new ReactiveVar(false);
+    this.layoutSetting = new ReactiveVar(false);
 
     Meteor.subscribe('setting');
     Meteor.subscribe('mailServer');
@@ -58,6 +59,12 @@ BlazeComponent.extendComponent({
   toggleTLS() {
     $('#mail-server-tls').toggleClass('is-checked');
   },
+  toggleHideLogo() {
+    $('#hide-logo').toggleClass('is-checked');
+  },
+  toggleDisplayAuthenticationMethod() {
+    $('#display-authentication-method').toggleClass('is-checked');
+  },
   switchMenu(event) {
     const target = $(event.target);
     if (!target.hasClass('active')) {
@@ -68,6 +75,7 @@ BlazeComponent.extendComponent({
       this.emailSetting.set('email-setting' === targetID);
       this.accountSetting.set('account-setting' === targetID);
       this.announcementSetting.set('announcement-setting' === targetID);
+      this.layoutSetting.set('layout-setting' === targetID);
     }
   },
 
@@ -82,7 +90,7 @@ BlazeComponent.extendComponent({
   },
 
   inviteThroughEmail() {
-    const emails = $('#email-to-invite').val().trim().split('\n').join(',').split(',');
+    const emails = $('#email-to-invite').val().toLowerCase().trim().split('\n').join(',').split(',');
     const boardsToInvite = [];
     $('.js-toggle-board-choose .materialCheckBox.is-checked').each(function () {
       boardsToInvite.push($(this).data('id'));
@@ -129,19 +137,48 @@ BlazeComponent.extendComponent({
 
   },
 
+  saveLayout() {
+    this.setLoading(true);
+    $('li').removeClass('has-error');
+
+    const productName = $('#product-name').val().trim();
+    const hideLogoChange = ($('input[name=hideLogo]:checked').val() === 'true');
+    const displayAuthenticationMethod = ($('input[name=displayAuthenticationMethod]:checked').val() === 'true');
+    const defaultAuthenticationMethod = $('#defaultAuthenticationMethod').val();
+    const customHTMLafterBodyStart = $('#customHTMLafterBodyStart').val().trim();
+    const customHTMLbeforeBodyEnd = $('#customHTMLbeforeBodyEnd').val().trim();
+
+    try {
+      Settings.update(Settings.findOne()._id, {
+        $set: {
+          productName,
+          hideLogo: hideLogoChange,
+          customHTMLafterBodyStart,
+          customHTMLbeforeBodyEnd,
+          displayAuthenticationMethod,
+          defaultAuthenticationMethod,
+        },
+      });
+    } catch (e) {
+      return;
+    } finally {
+      this.setLoading(false);
+    }
+
+    DocHead.setTitle(productName);
+
+  },
+
   sendSMTPTestEmail() {
     Meteor.call('sendSMTPTestEmail', (err, ret) => {
-      if (!err && ret) { /* eslint-disable no-console */
+      if (!err && ret) {
         const message = `${TAPi18n.__(ret.message)}: ${ret.email}`;
-        console.log(message);
         alert(message);
       } else {
         const reason = err.reason || '';
         const message = `${TAPi18n.__(err.error)}\n${reason}`;
-        console.log(message, err);
         alert(message);
       }
-      /* eslint-enable no-console */
     });
   },
 
@@ -154,6 +191,9 @@ BlazeComponent.extendComponent({
       'click button.js-email-invite': this.inviteThroughEmail,
       'click button.js-save': this.saveMailServerInfo,
       'click button.js-send-smtp-test-email': this.sendSMTPTestEmail,
+      'click a.js-toggle-hide-logo': this.toggleHideLogo,
+      'click button.js-save-layout': this.saveLayout,
+      'click a.js-toggle-display-authentication-method': this.toggleDisplayAuthenticationMethod,
     }];
   },
 }).register('setting');
@@ -226,3 +266,29 @@ BlazeComponent.extendComponent({
     }];
   },
 }).register('announcementSettings');
+
+
+Template.selectAuthenticationMethod.onCreated(function() {
+  this.authenticationMethods = new ReactiveVar([]);
+
+  Meteor.call('getAuthenticationsEnabled', (_, result) => {
+    if (result) {
+      // TODO : add a management of different languages
+      // (ex {value: ldap, text: TAPi18n.__('ldap', {}, T9n.getLanguage() || 'en')})
+      this.authenticationMethods.set([
+        {value: 'password'},
+        // Gets only the authentication methods availables
+        ...Object.entries(result).filter((e) => e[1]).map((e) => ({value: e[0]})),
+      ]);
+    }
+  });
+});
+
+Template.selectAuthenticationMethod.helpers({
+  authentications() {
+    return Template.instance().authenticationMethods.get();
+  },
+  isSelected(match) {
+    return Template.instance().data.authenticationMethod === match;
+  },
+});
diff --git a/client/components/settings/settingBody.styl b/client/components/settings/settingBody.styl
index fec64cee..dbf91a6c 100644
--- a/client/components/settings/settingBody.styl
+++ b/client/components/settings/settingBody.styl
@@ -52,6 +52,10 @@
 
     .main-body
       padding: 0.1em 1em
+      -webkit-user-select: auto // Safari 3.1+
+      -moz-user-select: auto // Firefox 2+
+      -ms-user-select: auto // IE 10+
+      user-select: auto // Standard syntax
 
       ul
         li
@@ -66,7 +70,8 @@
               padding: 0 0.5rem
 
           .admin-announcement,
-          .invite-people
+          .invite-people,
+          .layout
             padding-left 20px;
             li
               min-width: 500px;
diff --git a/client/components/settings/settingHeader.jade b/client/components/settings/settingHeader.jade
index c2d4db3a..221c1b79 100644
--- a/client/components/settings/settingHeader.jade
+++ b/client/components/settings/settingHeader.jade
@@ -4,22 +4,21 @@ template(name="settingHeaderBar")
 
   .setting-header-btns.left
     unless isMiniScreen
-      unless isSandstorm
-        if currentUser
-          a.setting-header-btn.settings(href="{{pathFor 'setting'}}")
-            i.fa(class="fa-cog")
-            span {{_ 'settings'}}
+      if currentUser
+        a.setting-header-btn.settings(href="{{pathFor 'setting'}}")
+          i.fa(class="fa-cog")
+          span {{_ 'settings'}}
 
-          a.setting-header-btn.people(href="{{pathFor 'people'}}")
-            i.fa(class="fa-users")
-            span {{_ 'people'}}
+        a.setting-header-btn.people(href="{{pathFor 'people'}}")
+          i.fa(class="fa-users")
+          span {{_ 'people'}}
 
-          a.setting-header-btn.informations(href="{{pathFor 'information'}}")
-            i.fa(class="fa-info-circle")
-            span {{_ 'info'}}
+        a.setting-header-btn.informations(href="{{pathFor 'information'}}")
+          i.fa(class="fa-info-circle")
+          span {{_ 'info'}}
 
-        else
-          a.setting-header-btn.js-log-in(
-            title="{{_ 'log-in'}}")
-            i.fa.fa-sign-in
-            span {{_ 'log-in'}}
+      else
+        a.setting-header-btn.js-log-in(
+          title="{{_ 'log-in'}}")
+          i.fa.fa-sign-in
+          span {{_ 'log-in'}}
diff --git a/client/components/sidebar/sidebar.jade b/client/components/sidebar/sidebar.jade
index 6085c2ad..4e4d355c 100644
--- a/client/components/sidebar/sidebar.jade
+++ b/client/components/sidebar/sidebar.jade
@@ -1,9 +1,9 @@
 template(name="sidebar")
   .board-sidebar.sidebar(class="{{#if isOpen}}is-open{{/if}}")
-    a.sidebar-tongue.js-toggle-sidebar(
-      class="{{#if isTongueHidden}}is-hidden{{/if}}",
-      title="{{showTongueTitle}}")
-      i.fa.fa-angle-left
+    //a.sidebar-tongue.js-toggle-sidebar(
+    //  class="{{#if isTongueHidden}}is-hidden{{/if}}",
+    //  title="{{showTongueTitle}}")
+    //  i.fa.fa-navicon
     .sidebar-shadow
       .sidebar-content.sidebar-shortcuts
         a.board-header-btn.js-shortcuts
@@ -11,7 +11,7 @@ template(name="sidebar")
           span {{_ 'keyboard-shortcuts' }}
       .sidebar-content.js-board-sidebar-content.js-perfect-scrollbar
         a.hide-btn.js-hide-sidebar
-          i.fa.fa-angle-right
+          i.fa.fa-navicon
         unless isDefaultView
           h2
             a.fa.fa-chevron-left.js-back-home
@@ -23,16 +23,20 @@ template(name='homeSidebar')
   hr
   +labelsWidget
   hr
-  h3
-    i.fa.fa-comments-o
-    | {{_ 'activities'}}
-  +activities(mode="board")
+  unless currentUser.isNoComments
+    h3
+      i.fa.fa-comments-o
+      | {{_ 'activities'}}
+    +activities(mode="board")
 
 template(name="membersWidget")
   .board-widget.board-widget-members
     h3
       i.fa.fa-user
       | {{_ 'members'}}
+      a.board-header-btn.js-open-board-menu(title="{{_ 'boardMenuPopup-title'}}").right
+        i.board-header-btn-icon.fa.fa-cog
+
     .board-widget-content
       each currentBoard.activeMembers
         +userAvatar(userId=this.userId showStatus=true)
@@ -52,6 +56,130 @@ template(name="membersWidget")
     button.js-member-invite-accept.primary {{_ 'accept'}}
     button.js-member-invite-decline {{_ 'decline'}}
 
+template(name="boardChangeColorPopup")
+  .board-backgrounds-list.clearfix
+    each backgroundColors
+      .board-background-select.js-select-background
+        span.background-box(class="board-color-{{this}}")
+          if isSelected
+            i.fa.fa-check
+
+template(name="boardSubtaskSettingsPopup")
+  form.board-subtask-settings
+    h3 {{_ 'show-parent-in-minicard'}}
+      a#prefix-with-full-path.flex.js-field-show-parent-in-minicard(class="{{#if $eq presentParentTask 'prefix-with-full-path'}}is-checked{{/if}}")
+        .materialCheckBox(class="{{#if $eq presentParentTask 'prefix-with-full-path'}}is-checked{{/if}}")
+        span {{_ 'prefix-with-full-path'}}
+      a#prefix-with-parent.flex.js-field-show-parent-in-minicard(class="{{#if $eq presentParentTask 'prefix-with-parent'}}is-checked{{/if}}")
+        .materialCheckBox(class="{{#if $eq presentParentTask 'prefix-with-parent'}}is-checked{{/if}}")
+        span {{_ 'prefix-with-parent'}}
+      a#subtext-with-full-path.flex.js-field-show-parent-in-minicard(class="{{#if $eq presentParentTask 'subtext-with-full-path'}}is-checked{{/if}}")
+        .materialCheckBox(class="{{#if $eq presentParentTask 'subtext-with-full-path'}}is-checked{{/if}}")
+        span {{_ 'subtext-with-full-path'}}
+      a#subtext-with-parent.flex.js-field-show-parent-in-minicard(class="{{#if $eq presentParentTask 'subtext-with-parent'}}is-checked{{/if}}")
+        .materialCheckBox(class="{{#if $eq presentParentTask 'subtext-with-parent'}}is-checked{{/if}}")
+        span {{_ 'subtext-with-parent'}}
+      a#no-parent.flex.js-field-show-parent-in-minicard(class="{{#if $eq presentParentTask 'no-parent'}}is-checked{{/if}}")
+        .materialCheckBox(class="{{#if $eq presentParentTask 'no-parent'}}is-checked{{/if}}")
+        span {{_ 'no-parent'}}
+    div
+      hr
+
+    div.check-div
+      a.flex.js-field-has-subtasks(class="{{#if allowsSubtasks}}is-checked{{/if}}")
+        .materialCheckBox(class="{{#if allowsSubtasks}}is-checked{{/if}}")
+        span {{_ 'show-subtasks-field'}}
+
+    label
+      | {{_ 'deposit-subtasks-board'}}
+      select.js-field-deposit-board(disabled="{{#unless allowsSubtasks}}disabled{{/unless}}")
+          each boards
+            if isBoardSelected
+              option(value=_id selected="selected") {{title}}
+            else
+              option(value=_id) {{title}}
+          if isNullBoardSelected
+            option(value='null' selected="selected") {{_ 'custom-field-dropdown-none'}}
+          else
+            option(value='null') {{_ 'custom-field-dropdown-none'}}
+    div
+      hr
+
+    label
+      | {{_ 'deposit-subtasks-list'}}
+      select.js-field-deposit-list(disabled="{{#unless hasLists}}disabled{{/unless}}")
+          each lists
+            if isListSelected
+              option(value=_id selected="selected") {{title}}
+            else
+              option(value=_id) {{title}}
+
+template(name="chooseBoardSource")
+  ul.pop-over-list
+    li
+      a(href="{{pathFor '/import/trello'}}") {{_ 'from-trello'}}
+    li
+      a(href="{{pathFor '/import/wekan'}}") {{_ 'from-wekan'}}
+
+template(name="archiveBoardPopup")
+  p {{_ 'close-board-pop'}}
+  button.js-confirm.negate.full(type="submit") {{_ 'archive'}}
+
+template(name="outgoingWebhooksPopup")
+  each integrations
+    form.integration-form
+      if title
+        h4 {{title}}
+      else
+        h4 {{_ 'no-name'}}
+      label
+        | URL
+        input.js-outgoing-webhooks-url(type="text" name="url" value=url)
+        input(type="hidden" value=_id name="id")
+      input.primary.wide(type="submit" value="{{_ 'save'}}")
+  form.integration-form
+    h4
+      | {{_ 'new-outgoing-webhook'}}
+    label
+      | URL
+      input.js-outgoing-webhooks-url(type="text" name="url" autofocus)
+    input.primary.wide(type="submit" value="{{_ 'save'}}")
+
+template(name="boardMenuPopup")
+  ul.pop-over-list
+    li: a.js-custom-fields {{_ 'custom-fields'}}
+    li: a.js-open-archives {{_ 'archived-items'}}
+    if currentUser.isBoardAdmin
+      li: a.js-change-board-color {{_ 'board-change-color'}}
+    //-
+      XXX Language should be handled by sandstorm, but for now display a
+      language selection link in the board menu. This link is normally present
+      in the header bar that is not displayed on sandstorm.
+    if isSandstorm
+      li: a.js-change-language {{_ 'language'}}
+  unless isSandstorm
+    if currentUser.isBoardAdmin
+      hr
+      ul.pop-over-list
+        li: a(href="{{exportUrl}}", download="{{exportFilename}}") {{_ 'export-board'}}
+        unless currentBoard.isTemplatesBoard
+          li: a.js-archive-board {{_ 'archive-board'}}
+        li: a.js-outgoing-webhooks {{_ 'outgoing-webhooks'}}
+      hr
+      ul.pop-over-list
+        li: a.js-subtask-settings {{_ 'subtask-settings'}}
+
+  if isSandstorm
+    hr
+    ul.pop-over-list
+      li: a(href="{{exportUrl}}", download="{{exportFilename}}") {{_ 'export-board'}}
+      li: a.js-import-board {{_ 'import-board-c'}}
+      li: a.js-archive-board {{_ 'archive-board'}}
+      li: a.js-outgoing-webhooks {{_ 'outgoing-webhooks'}}
+    hr
+    ul.pop-over-list
+      li: a.js-subtask-settings {{_ 'subtask-settings'}}
+
 template(name="labelsWidget")
   .board-widget.board-widget-labels
     h3
@@ -82,17 +210,16 @@ template(name="memberPopup")
     ul.pop-over-list
       li
         a.js-filter-member {{_ 'filter-cards'}}
-      unless isSandstorm
-        if currentUser.isBoardAdmin
-          li
-            a.js-change-role
-              | {{_ 'change-permissions'}}
-              span.quiet (#{memberType})
+      if currentUser.isBoardAdmin
         li
-          if $eq currentUser._id userId
-            a.js-leave-member {{_ 'leave-board'}}
-          else if currentUser.isBoardAdmin
-            a.js-remove-member {{_ 'remove-from-board'}}
+          a.js-change-role
+            | {{_ 'change-permissions'}}
+            span.quiet (#{memberType})
+      li
+        if $eq currentUser._id userId
+          a.js-leave-member {{_ 'leave-board'}}
+        else if currentUser.isBoardAdmin
+          a.js-remove-member {{_ 'remove-from-board'}}
 
 
 template(name="removeMemberPopup")
@@ -146,6 +273,12 @@ template(name="changePermissionsPopup")
           i.fa.fa-check
         span.sub-name {{_ 'normal-desc'}}
     li
+      a(class="{{#if isLastAdmin}}disabled{{else}}js-set-no-comments{{/if}}")
+        | {{_ 'no-comments'}}
+        if isNoComments
+          i.fa.fa-check
+        span.sub-name {{_ 'no-comments-desc'}}
+    li
       a(class="{{#if isLastAdmin}}disabled{{else}}js-set-comment-only{{/if}}")
         | {{_ 'comment-only'}}
         if isCommentOnly
diff --git a/client/components/sidebar/sidebar.js b/client/components/sidebar/sidebar.js
index bff96dcb..e8de3c96 100644
--- a/client/components/sidebar/sidebar.js
+++ b/client/components/sidebar/sidebar.js
@@ -6,6 +6,7 @@ const viewTitles = {
   filter: 'filter-cards',
   search: 'search-cards',
   multiselection: 'multi-selection',
+  customFields: 'custom-fields',
   archives: 'archives',
 };
 
@@ -15,8 +16,7 @@ BlazeComponent.extendComponent({
   },
 
   onCreated() {
-    const initOpen = Utils.isMiniScreen() ? false : (!Session.get('currentCard'));
-    this._isOpen = new ReactiveVar(initOpen);
+    this._isOpen = new ReactiveVar(false);
     this._view = new ReactiveVar(defaultView);
     Sidebar = this;
   },
@@ -125,8 +125,11 @@ Template.memberPopup.helpers({
     if(type === 'normal'){
       const currentBoard = Boards.findOne(Session.get('currentBoard'));
       const commentOnly = currentBoard.hasCommentOnly(this.userId);
+      const noComments = currentBoard.hasNoComments(this.userId);
       if(commentOnly){
         return TAPi18n.__('comment-only').toLowerCase();
+      } else if(noComments) {
+        return TAPi18n.__('no-comments').toLowerCase();
       } else {
         return TAPi18n.__(type).toLowerCase();
       }
@@ -139,6 +142,52 @@ Template.memberPopup.helpers({
   },
 });
 
+Template.boardMenuPopup.events({
+  'click .js-rename-board': Popup.open('boardChangeTitle'),
+  'click .js-custom-fields'() {
+    Sidebar.setView('customFields');
+    Popup.close();
+  },
+  'click .js-open-archives'() {
+    Sidebar.setView('archives');
+    Popup.close();
+  },
+  'click .js-change-board-color': Popup.open('boardChangeColor'),
+  'click .js-change-language': Popup.open('changeLanguage'),
+  'click .js-archive-board ': Popup.afterConfirm('archiveBoard', function() {
+    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    currentBoard.archive();
+    // XXX We should have some kind of notification on top of the page to
+    // confirm that the board was successfully archived.
+    FlowRouter.go('home');
+  }),
+  'click .js-delete-board': Popup.afterConfirm('deleteBoard', function() {
+    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    Popup.close();
+    Boards.remove(currentBoard._id);
+    FlowRouter.go('home');
+  }),
+  'click .js-outgoing-webhooks': Popup.open('outgoingWebhooks'),
+  'click .js-import-board': Popup.open('chooseBoardSource'),
+  'click .js-subtask-settings': Popup.open('boardSubtaskSettings'),
+});
+
+Template.boardMenuPopup.helpers({
+  exportUrl() {
+    const params = {
+      boardId: Session.get('currentBoard'),
+    };
+    const queryParams = {
+      authToken: Accounts._storedLoginToken(),
+    };
+    return FlowRouter.path('/api/boards/:boardId/export', params, queryParams);
+  },
+  exportFilename() {
+    const boardId = Session.get('currentBoard');
+    return `wekan-export-board-${boardId}.json`;
+  },
+});
+
 Template.memberPopup.events({
   'click .js-filter-member'() {
     Filter.members.toggle(this.userId);
@@ -187,7 +236,14 @@ Template.membersWidget.helpers({
 
 Template.membersWidget.events({
   'click .js-member': Popup.open('member'),
+  'click .js-open-board-menu': Popup.open('boardMenu'),
   'click .js-manage-board-members': Popup.open('addMember'),
+  'click .js-import': Popup.open('boardImportBoard'),
+  submit: this.onSubmit,
+  'click .js-import-board': Popup.open('chooseBoardSource'),
+  'click .js-open-archived-board'() {
+    Modal.open('archivedBoards');
+  },
   'click .sandstorm-powerbox-request-identity'() {
     window.sandstormRequestIdentity();
   },
@@ -206,6 +262,59 @@ Template.membersWidget.events({
   },
 });
 
+BlazeComponent.extendComponent({
+  integrations() {
+    const boardId = Session.get('currentBoard');
+    return Integrations.find({ boardId: `${boardId}` }).fetch();
+  },
+
+  integration(id) {
+    const boardId = Session.get('currentBoard');
+    return Integrations.findOne({ _id: id, boardId: `${boardId}` });
+  },
+
+  events() {
+    return [{
+      'submit'(evt) {
+        evt.preventDefault();
+        const url = evt.target.url.value;
+        const boardId = Session.get('currentBoard');
+        let id = null;
+        let integration = null;
+        if (evt.target.id) {
+          id = evt.target.id.value;
+          integration = this.integration(id);
+          if (url) {
+            Integrations.update(integration._id, {
+              $set: {
+                url: `${url}`,
+              },
+            });
+          } else {
+            Integrations.remove(integration._id);
+          }
+        } else if (url) {
+          Integrations.insert({
+            userId: Meteor.userId(),
+            enabled: true,
+            type: 'outgoing-webhooks',
+            url: `${url}`,
+            boardId: `${boardId}`,
+            activities: ['all'],
+          });
+        }
+        Popup.close();
+      },
+    }];
+  },
+}).register('outgoingWebhooksPopup');
+
+BlazeComponent.extendComponent({
+  template() {
+    return 'chooseBoardSource';
+  },
+}).register('chooseBoardSourcePopup');
+
 Template.labelsWidget.events({
   'click .js-label': Popup.open('editLabel'),
   'click .js-add-label': Popup.open('createLabel'),
@@ -256,6 +365,124 @@ Template.membersWidget.onRendered(draggableMembersLabelsWidgets);
 Template.labelsWidget.onRendered(draggableMembersLabelsWidgets);
 
 BlazeComponent.extendComponent({
+  backgroundColors() {
+    return Boards.simpleSchema()._schema.color.allowedValues;
+  },
+
+  isSelected() {
+    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    return currentBoard.color === this.currentData().toString();
+  },
+
+  events() {
+    return [{
+      'click .js-select-background'(evt) {
+        const currentBoard = Boards.findOne(Session.get('currentBoard'));
+        const newColor = this.currentData().toString();
+        currentBoard.setColor(newColor);
+        evt.preventDefault();
+      },
+    }];
+  },
+}).register('boardChangeColorPopup');
+
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.currentBoard = Boards.findOne(Session.get('currentBoard'));
+  },
+
+  allowsSubtasks() {
+    return this.currentBoard.allowsSubtasks;
+  },
+
+  isBoardSelected() {
+    return this.currentBoard.subtasksDefaultBoardId === this.currentData()._id;
+  },
+
+  isNullBoardSelected() {
+    return (this.currentBoard.subtasksDefaultBoardId === null) || (this.currentBoard.subtasksDefaultBoardId === undefined);
+  },
+
+  boards() {
+    return Boards.find({
+      archived: false,
+      'members.userId': Meteor.userId(),
+    }, {
+      sort: ['title'],
+    });
+  },
+
+  lists() {
+    return Lists.find({
+      boardId: this.currentBoard._id,
+      archived: false,
+    }, {
+      sort: ['title'],
+    });
+  },
+
+  hasLists() {
+    return this.lists().count() > 0;
+  },
+
+  isListSelected() {
+    return this.currentBoard.subtasksDefaultBoardId === this.currentData()._id;
+  },
+
+  presentParentTask() {
+    let result = this.currentBoard.presentParentTask;
+    if ((result === null) || (result === undefined)) {
+      result = 'no-parent';
+    }
+    return result;
+  },
+
+  events() {
+    return [{
+      'click .js-field-has-subtasks'(evt) {
+        evt.preventDefault();
+        this.currentBoard.allowsSubtasks = !this.currentBoard.allowsSubtasks;
+        this.currentBoard.setAllowsSubtasks(this.currentBoard.allowsSubtasks);
+        $('.js-field-has-subtasks .materialCheckBox').toggleClass('is-checked', this.currentBoard.allowsSubtasks);
+        $('.js-field-has-subtasks').toggleClass('is-checked', this.currentBoard.allowsSubtasks);
+        $('.js-field-deposit-board').prop('disabled', !this.currentBoard.allowsSubtasks);
+      },
+      'change .js-field-deposit-board'(evt) {
+        let value = evt.target.value;
+        if (value === 'null') {
+          value = null;
+        }
+        this.currentBoard.setSubtasksDefaultBoardId(value);
+        evt.preventDefault();
+      },
+      'change .js-field-deposit-list'(evt) {
+        this.currentBoard.setSubtasksDefaultListId(evt.target.value);
+        evt.preventDefault();
+      },
+      'click .js-field-show-parent-in-minicard'(evt) {
+        const value = evt.target.id || $(evt.target).parent()[0].id ||  $(evt.target).parent()[0].parent()[0].id;
+        const options = [
+          'prefix-with-full-path',
+          'prefix-with-parent',
+          'subtext-with-full-path',
+          'subtext-with-parent',
+          'no-parent'];
+        options.forEach(function(element) {
+          if (element !== value) {
+            $(`#${element} .materialCheckBox`).toggleClass('is-checked', false);
+            $(`#${element}`).toggleClass('is-checked', false);
+          }
+        });
+        $(`#${value} .materialCheckBox`).toggleClass('is-checked', true);
+        $(`#${value}`).toggleClass('is-checked', true);
+        this.currentBoard.setPresentParentTask(value);
+        evt.preventDefault();
+      },
+    }];
+  },
+}).register('boardSubtaskSettingsPopup');
+
+BlazeComponent.extendComponent({
   onCreated() {
     this.error = new ReactiveVar('');
     this.loading = new ReactiveVar(false);
@@ -323,12 +550,13 @@ BlazeComponent.extendComponent({
 }).register('addMemberPopup');
 
 Template.changePermissionsPopup.events({
-  'click .js-set-admin, click .js-set-normal, click .js-set-comment-only'(event) {
+  'click .js-set-admin, click .js-set-normal, click .js-set-no-comments, click .js-set-comment-only'(event) {
     const currentBoard = Boards.findOne(Session.get('currentBoard'));
     const memberId = this.userId;
     const isAdmin = $(event.currentTarget).hasClass('js-set-admin');
     const isCommentOnly = $(event.currentTarget).hasClass('js-set-comment-only');
-    currentBoard.setMemberPermission(memberId, isAdmin, isCommentOnly);
+    const isNoComments = $(event.currentTarget).hasClass('js-set-no-comments');
+    currentBoard.setMemberPermission(memberId, isAdmin, isNoComments, isCommentOnly);
     Popup.back(1);
   },
 });
@@ -341,7 +569,12 @@ Template.changePermissionsPopup.helpers({
 
   isNormal() {
     const currentBoard = Boards.findOne(Session.get('currentBoard'));
-    return !currentBoard.hasAdmin(this.userId) && !currentBoard.hasCommentOnly(this.userId);
+    return !currentBoard.hasAdmin(this.userId) && !currentBoard.hasNoComments(this.userId) && !currentBoard.hasCommentOnly(this.userId);
+  },
+
+  isNoComments() {
+    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    return !currentBoard.hasAdmin(this.userId) && currentBoard.hasNoComments(this.userId);
   },
 
   isCommentOnly() {
diff --git a/client/components/sidebar/sidebar.styl b/client/components/sidebar/sidebar.styl
index 8f2f493e..740186b5 100644
--- a/client/components/sidebar/sidebar.styl
+++ b/client/components/sidebar/sidebar.styl
@@ -45,28 +45,45 @@
       display: flex
       flex-direction: column
 
-      li > a
-        display: flex
-        height: 30px
-        margin: 0
-        padding: 4px
-        border-radius: 3px
-        align-items: center
-
-        &:hover
-          &, i, .quiet
-            color white
-
-        .member, .card-label
-          margin-right: 7px
-          margin-top: 5px
-
-        .sidebar-list-item-description
-          flex: 1
-          overflow: ellipsis
-
-        .fa.fa-check
-          margin: 0 4px
+      li
+        & > a
+          display: flex
+          height: 30px
+          margin: 0
+          padding: 4px
+          border-radius: 3px
+          align-items: center
+
+          &:hover
+            &, i, .quiet
+              color white
+
+          .member, .card-label
+            margin-right: 7px
+            margin-top: 5px
+
+          .minicard-edit-button
+            float: right
+            padding: 8px
+            border-radius: 3px
+
+          .sidebar-list-item-description
+            flex: 1
+            overflow: ellipsis
+
+          .fa.fa-check
+            margin: 0 4px
+
+        .minicard
+          padding: 6px 8px 4px
+
+          .minicard-edit-button
+            float: right
+            padding: 4px
+            border-radius: 3px
+
+            &:hover
+              background: #dbdbdb
 
     .sidebar-btn
       display: block
diff --git a/client/components/sidebar/sidebarArchives.jade b/client/components/sidebar/sidebarArchives.jade
index ee6cac01..e2f3e395 100644
--- a/client/components/sidebar/sidebarArchives.jade
+++ b/client/components/sidebar/sidebarArchives.jade
@@ -2,6 +2,10 @@ template(name="archivesSidebar")
   +basicTabs(tabs=tabs)
 
    +tabContent(slug="cards")
+    p.quiet
+      a.js-restore-all-cards {{_ 'restore-all'}}
+      | -
+      a.js-delete-all-cards {{_ 'delete-all'}}
     each archivedCards
       .minicard-wrapper.js-minicard
         +minicard(this)
@@ -16,23 +20,35 @@ template(name="archivesSidebar")
       p.no-items-message {{_ 'no-archived-cards'}}
 
    +tabContent(slug="lists")
+    p.quiet
+      a.js-restore-all-lists {{_ 'restore-all'}}
+      | -
+      a.js-delete-all-lists {{_ 'delete-all'}}
     ul.archived-lists
       each archivedLists
         li.archived-lists-item
-          if currentUser.isBoardMember
-            button.js-restore-list
-              i.fa.fa-undo
           = title
+          if currentUser.isBoardMember
+            p.quiet
+              a.js-restore-list {{_ 'restore'}}
+              | -
+              a.js-delete-list {{_ 'delete'}}
       else
         li.no-items-message {{_ 'no-archived-lists'}}
 
    +tabContent(slug="swimlanes")
+    p.quiet
+      a.js-restore-all-swimlanes {{_ 'restore-all'}}
+      | -
+      a.js-delete-all-swimlanes {{_ 'delete-all'}}
     ul.archived-lists
       each archivedSwimlanes
         li.archived-lists-item
-          if currentUser.isBoardMember
-            button.js-restore-swimlane
-              i.fa.fa-undo
           = title
+          if currentUser.isBoardMember
+            p.quiet
+              a.js-restore-swimlane {{_ 'restore'}}
+              | -
+              a.js-delete-swimlane {{_ 'delete'}}
       else
         li.no-items-message {{_ 'no-archived-swimlanes'}}
diff --git a/client/components/sidebar/sidebarArchives.js b/client/components/sidebar/sidebarArchives.js
index 6102bf11..b50043fd 100644
--- a/client/components/sidebar/sidebarArchives.js
+++ b/client/components/sidebar/sidebarArchives.js
@@ -44,19 +44,67 @@ BlazeComponent.extendComponent({
           card.restore();
         }
       },
+      'click .js-restore-all-cards'() {
+        this.archivedCards().forEach((card) => {
+          if(card.canBeRestored()){
+            card.restore();
+          }
+        });
+      },
+
       'click .js-delete-card': Popup.afterConfirm('cardDelete', function() {
         const cardId = this._id;
         Cards.remove(cardId);
         Popup.close();
       }),
+      'click .js-delete-all-cards': Popup.afterConfirm('cardDelete', () => {
+        this.archivedCards().forEach((card) => {
+          Cards.remove(card._id);
+        });
+        Popup.close();
+      }),
+
       'click .js-restore-list'() {
         const list = this.currentData();
         list.restore();
       },
+      'click .js-restore-all-lists'() {
+        this.archivedLists().forEach((list) => {
+          list.restore();
+        });
+      },
+
+      'click .js-delete-list': Popup.afterConfirm('listDelete', function() {
+        this.remove();
+        Popup.close();
+      }),
+      'click .js-delete-all-lists': Popup.afterConfirm('listDelete', () => {
+        this.archivedLists().forEach((list) => {
+          list.remove();
+        });
+        Popup.close();
+      }),
+
       'click .js-restore-swimlane'() {
         const swimlane = this.currentData();
         swimlane.restore();
       },
+      'click .js-restore-all-swimlanes'() {
+        this.archivedSwimlanes().forEach((swimlane) => {
+          swimlane.restore();
+        });
+      },
+
+      'click .js-delete-swimlane': Popup.afterConfirm('swimlaneDelete', function() {
+        this.remove();
+        Popup.close();
+      }),
+      'click .js-delete-all-swimlanes': Popup.afterConfirm('swimlaneDelete', () => {
+        this.archivedSwimlanes().forEach((swimlane) => {
+          swimlane.remove();
+        });
+        Popup.close();
+      }),
     }];
   },
 }).register('archivesSidebar');
diff --git a/client/components/sidebar/sidebarCustomFields.jade b/client/components/sidebar/sidebarCustomFields.jade
new file mode 100644
index 00000000..f0a17773
--- /dev/null
+++ b/client/components/sidebar/sidebarCustomFields.jade
@@ -0,0 +1,62 @@
+template(name="customFieldsSidebar")
+    ul.sidebar-list
+        each customFields
+            li
+                div.minicard-wrapper.js-minicard
+                    div.minicard
+                        a.fa.fa-pencil.js-edit-custom-field.minicard-edit-button
+                        div.minicard-title
+                            | {{ name }} ({{ type }})
+
+    if currentUser.isBoardMember
+        hr
+        a.sidebar-btn.js-open-create-custom-field
+            i.fa.fa-plus
+            span {{_ 'createCustomField'}}
+
+template(name="createCustomFieldPopup")
+    form
+        label
+            | {{_ 'name'}}
+            unless _id
+                input.js-field-name(type="text" autofocus)
+            else
+                input.js-field-name(type="text" value=name)
+
+        label
+            | {{_ 'type'}}
+            select.js-field-type(disabled="{{#if _id}}disabled{{/if}}")
+                each types
+                    if selected
+                        option(value=value selected="selected") {{name}}
+                    else
+                        option(value=value) {{name}}
+        div.js-field-settings.js-field-settings-dropdown(class="{{#if isTypeNotSelected 'dropdown'}}hide{{/if}}")
+            label
+                | {{_ 'custom-field-dropdown-options'}}
+            each dropdownItems.get
+                input.js-dropdown-item(type="text" value=name placeholder="")
+            input.js-dropdown-item.last(type="text" value="" placeholder="{{_ 'custom-field-dropdown-options-placeholder'}}")
+        a.flex.js-field-show-on-card(class="{{#if showOnCard}}is-checked{{/if}}")
+            .materialCheckBox(class="{{#if showOnCard}}is-checked{{/if}}")
+
+            span {{_ 'show-field-on-card'}}
+        a.flex.js-field-automatically-on-card(class="{{#if automaticallyOnCard}}is-checked{{/if}}")
+            .materialCheckBox(class="{{#if automaticallyOnCard}}is-checked{{/if}}")
+
+            span {{_ 'automatically-field-on-card'}}
+
+        a.flex.js-field-showLabel-on-card(class="{{#if showLabelOnMiniCard}}is-checked{{/if}}")
+            .materialCheckBox(class="{{#if showLabelOnMiniCard}}is-checked{{/if}}")
+
+            span {{_ 'showLabel-field-on-card'}}
+
+        button.primary.wide.left(type="button")
+            | {{_ 'save'}}
+        if _id
+            button.negate.wide.right.js-delete-custom-field(type="button")
+                | {{_ 'delete'}}
+
+template(name="deleteCustomFieldPopup")
+    p {{_ "custom-field-delete-pop"}}
+    button.js-confirm.negate.full(type="submit") {{_ 'delete'}}
diff --git a/client/components/sidebar/sidebarCustomFields.js b/client/components/sidebar/sidebarCustomFields.js
new file mode 100644
index 00000000..28af973b
--- /dev/null
+++ b/client/components/sidebar/sidebarCustomFields.js
@@ -0,0 +1,157 @@
+BlazeComponent.extendComponent({
+
+  customFields() {
+    return CustomFields.find({
+      boardIds: {$in: [Session.get('currentBoard')]},
+    });
+  },
+
+  events() {
+    return [{
+      'click .js-open-create-custom-field': Popup.open('createCustomField'),
+      'click .js-edit-custom-field': Popup.open('editCustomField'),
+    }];
+  },
+
+}).register('customFieldsSidebar');
+
+const CreateCustomFieldPopup = BlazeComponent.extendComponent({
+
+  _types: ['text', 'number', 'date', 'dropdown'],
+
+  onCreated() {
+    this.type = new ReactiveVar((this.data().type) ? this.data().type : this._types[0]);
+    this.dropdownItems = new ReactiveVar((this.data().settings && this.data().settings.dropdownItems) ? this.data().settings.dropdownItems : []);
+  },
+
+  types() {
+    const currentType = this.data().type;
+    return this._types.
+      map((type) => {return {
+        value: type,
+        name: TAPi18n.__(`custom-field-${type}`),
+        selected: type === currentType,
+      };});
+  },
+
+  isTypeNotSelected(type) {
+    return this.type.get() !== type;
+  },
+
+  getDropdownItems() {
+    const items = this.dropdownItems.get();
+    Array.from(this.findAll('.js-field-settings-dropdown input')).forEach((el, index) => {
+      //console.log('each item!', index, el.value);
+      if (!items[index]) items[index] = {
+        _id: Random.id(6),
+      };
+      items[index].name = el.value.trim();
+    });
+    return items;
+  },
+
+  getSettings() {
+    const settings = {};
+    switch (this.type.get()) {
+    case 'dropdown': {
+      const dropdownItems = this.getDropdownItems().filter((item) => !!item.name.trim());
+      settings.dropdownItems = dropdownItems;
+      break;
+    }
+    }
+    return settings;
+  },
+
+  events() {
+    return [{
+      'change .js-field-type'(evt) {
+        const value = evt.target.value;
+        this.type.set(value);
+      },
+      'keydown .js-dropdown-item.last'(evt) {
+        if (evt.target.value.trim() && evt.keyCode === 13) {
+          const items = this.getDropdownItems();
+          this.dropdownItems.set(items);
+          evt.target.value = '';
+        }
+      },
+      'click .js-field-show-on-card'(evt) {
+        let $target = $(evt.target);
+        if(!$target.hasClass('js-field-show-on-card')){
+          $target = $target.parent();
+        }
+        $target.find('.materialCheckBox').toggleClass('is-checked');
+        $target.toggleClass('is-checked');
+      },
+      'click .js-field-automatically-on-card'(evt) {
+        let $target = $(evt.target);
+        if(!$target.hasClass('js-field-automatically-on-card')){
+          $target = $target.parent();
+        }
+        $target.find('.materialCheckBox').toggleClass('is-checked');
+        $target.toggleClass('is-checked');
+      },
+      'click .js-field-showLabel-on-card'(evt) {
+        let $target = $(evt.target);
+        if(!$target.hasClass('js-field-showLabel-on-card')){
+          $target = $target.parent();
+        }
+        $target.find('.materialCheckBox').toggleClass('is-checked');
+        $target.toggleClass('is-checked');
+      },
+      'click .primary'(evt) {
+        evt.preventDefault();
+
+        const data = {
+          name: this.find('.js-field-name').value.trim(),
+          type: this.type.get(),
+          settings: this.getSettings(),
+          showOnCard: this.find('.js-field-show-on-card.is-checked') !== null,
+          showLabelOnMiniCard: this.find('.js-field-showLabel-on-card.is-checked') !== null,
+          automaticallyOnCard: this.find('.js-field-automatically-on-card.is-checked') !== null,
+        };
+
+        // insert or update
+        if (!this.data()._id) {
+          data.boardIds = [Session.get('currentBoard')];
+          CustomFields.insert(data);
+        } else {
+          CustomFields.update(this.data()._id, {$set: data});
+        }
+
+        Popup.back();
+      },
+      'click .js-delete-custom-field': Popup.afterConfirm('deleteCustomField', function() {
+        const customField = CustomFields.findOne(this._id);
+        if (customField.boardIds.length > 1) {
+          CustomFields.update(customField._id, {
+            $pull: {
+              boardIds: Session.get('currentBoard'),
+            },
+          });
+        } else {
+          CustomFields.remove(customField._id);
+        }
+        Popup.close();
+      }),
+    }];
+  },
+
+});
+CreateCustomFieldPopup.register('createCustomFieldPopup');
+
+(class extends CreateCustomFieldPopup {
+
+  template() {
+    return 'createCustomFieldPopup';
+  }
+
+}).register('editCustomFieldPopup');
+
+/*Template.deleteCustomFieldPopup.events({
+  'submit'(evt) {
+    const customFieldId = this._id;
+    CustomFields.remove(customFieldId);
+    Popup.close();
+  }
+});*/
diff --git a/client/components/sidebar/sidebarFilters.jade b/client/components/sidebar/sidebarFilters.jade
index 273df8c2..f11528b1 100644
--- a/client/components/sidebar/sidebarFilters.jade
+++ b/client/components/sidebar/sidebarFilters.jade
@@ -40,6 +40,25 @@ template(name="filterSidebar")
               | (<span class="username">{{ username }}</span>)
             if Filter.members.isSelected _id
               i.fa.fa-check
+  hr
+  ul.sidebar-list
+    li(class="{{#if Filter.customFields.isSelected undefined}}active{{/if}}")
+          a.name.js-toggle-custom-fields-filter
+            span.sidebar-list-item-description
+              | {{_ 'filter-no-custom-fields'}}
+            if Filter.customFields.isSelected undefined
+              i.fa.fa-check
+    each currentBoard.customFields
+      li(class="{{#if Filter.customFields.isSelected _id}}active{{/if}}")
+        a.name.js-toggle-custom-fields-filter
+          span.sidebar-list-item-description
+            | {{ name }}
+          if Filter.customFields.isSelected _id
+            i.fa.fa-check
+  hr
+  span {{_ 'advanced-filter-label'}}
+  input.js-field-advanced-filter(type="text")
+  span {{_ 'advanced-filter-description'}}
   if Filter.isActive
     hr
     a.sidebar-btn.js-clear-all
diff --git a/client/components/sidebar/sidebarFilters.js b/client/components/sidebar/sidebarFilters.js
index f02d3a4a..fd8229e4 100644
--- a/client/components/sidebar/sidebarFilters.js
+++ b/client/components/sidebar/sidebarFilters.js
@@ -11,6 +11,16 @@ BlazeComponent.extendComponent({
         Filter.members.toggle(this.currentData()._id);
         Filter.resetExceptions();
       },
+      'click .js-toggle-custom-fields-filter'(evt) {
+        evt.preventDefault();
+        Filter.customFields.toggle(this.currentData()._id);
+        Filter.resetExceptions();
+      },
+      'change .js-field-advanced-filter'(evt) {
+        evt.preventDefault();
+        Filter.advanced.set(this.find('.js-field-advanced-filter').value.trim());
+        Filter.resetExceptions();
+      },
       'click .js-clear-all'(evt) {
         evt.preventDefault();
         Filter.reset();
diff --git a/client/components/sidebar/sidebarSearches.jade b/client/components/sidebar/sidebarSearches.jade
index 2ad5b00f..96877c50 100644
--- a/client/components/sidebar/sidebarSearches.jade
+++ b/client/components/sidebar/sidebarSearches.jade
@@ -1,6 +1,6 @@
 template(name="searchSidebar")
   form.js-search-term-form
-    input(type="text" name="searchTerm" placeholder="{{_ 'search-example'}}" autofocus)
+    input(type="text" name="searchTerm" placeholder="{{_ 'search-example'}}" autofocus dir="auto")
   .list-body.js-perfect-scrollbar
     .minicards.clearfix.js-minicards
       each (results)
diff --git a/client/components/swimlanes/miniswimlane.jade b/client/components/swimlanes/miniswimlane.jade
new file mode 100644
index 00000000..d4be8599
--- /dev/null
+++ b/client/components/swimlanes/miniswimlane.jade
@@ -0,0 +1,8 @@
+template(name="miniswimlane")
+  .minicard(
+    class="minicard-{{colorClass}}")
+    .minicard-title
+      .handle
+        .fa.fa-arrows
+      +viewer
+        = title
diff --git a/client/components/swimlanes/swimlaneHeader.jade b/client/components/swimlanes/swimlaneHeader.jade
index 483de06f..8c6aa5a3 100644
--- a/client/components/swimlanes/swimlaneHeader.jade
+++ b/client/components/swimlanes/swimlaneHeader.jade
@@ -1,14 +1,21 @@
 template(name="swimlaneHeader")
-  .swimlane-header-wrap.js-swimlane-header
-    +inlinedForm
-      +editSwimlaneTitleForm
+  .swimlane-header-wrap.js-swimlane-header(class='{{#if colorClass}}swimlane-{{colorClass}}{{/if}}')
+    if this.isTemplateContainer
+        +swimlaneFixedHeader(this)
     else
-      .swimlane-header(
-        class="{{#if currentUser.isBoardMember}}js-open-inlined-form is-editable{{/if}}")
-        = title
-      .swimlane-header-menu
-        unless currentUser.isCommentOnly
-          a.fa.fa-navicon.js-open-swimlane-menu
+      +inlinedForm
+        +editSwimlaneTitleForm
+      else
+        +swimlaneFixedHeader(this)
+
+template(name="swimlaneFixedHeader")
+  .swimlane-header(
+    class="{{#if currentUser.isBoardMember}}js-open-inlined-form is-editable{{/if}}")
+    = title
+  .swimlane-header-menu
+    unless currentUser.isCommentOnly
+      a.fa.fa-plus.js-open-add-swimlane-menu.swimlane-header-plus-icon
+      a.fa.fa-navicon.js-open-swimlane-menu
 
 template(name="editSwimlaneTitleForm")
   .list-composer
@@ -20,4 +27,34 @@ template(name="editSwimlaneTitleForm")
 template(name="swimlaneActionPopup")
   unless currentUser.isCommentOnly
     ul.pop-over-list
-      li: a.js-close-swimlane {{_ 'archive-swimlane'}}
+       li: a.js-set-swimlane-color {{_ 'select-color'}}
+    unless this.isTemplateContainer
+      hr
+      ul.pop-over-list
+        li: a.js-close-swimlane {{_ 'archive-swimlane'}}
+
+template(name="swimlaneAddPopup")
+  unless currentUser.isCommentOnly
+    form
+      input.swimlane-name-input.full-line(type="text" placeholder="{{_ 'add-swimlane'}}"
+        autocomplete="off" autofocus)
+      .edit-controls.clearfix
+        button.primary.confirm(type="submit") {{_ 'add'}}
+        unless currentBoard.isTemplatesBoard
+          unless currentBoard.isTemplateBoard
+            span.quiet
+              | {{_ 'or'}}
+              a.js-swimlane-template {{_ 'template'}}
+
+template(name="setSwimlaneColorPopup")
+  form.edit-label
+    .palette-colors: each colors
+      span.card-label.palette-color.js-palette-color(class="card-details-{{color}}")
+        if(isSelected color)
+          i.fa.fa-check
+    button.primary.confirm.js-submit {{_ 'save'}}
+    button.js-remove-color.negate.wide.right {{_ 'unset-color'}}
+
+template(name="swimlaneDeletePopup")
+  p {{_ "swimlane-delete-pop"}}
+  button.js-confirm.negate.full(type="submit") {{_ 'delete'}}
diff --git a/client/components/swimlanes/swimlaneHeader.js b/client/components/swimlanes/swimlaneHeader.js
index 50635f86..e7f3cc76 100644
--- a/client/components/swimlanes/swimlaneHeader.js
+++ b/client/components/swimlanes/swimlaneHeader.js
@@ -1,3 +1,10 @@
+const { calculateIndexData } = Utils;
+
+let swimlaneColors;
+Meteor.startup(() => {
+  swimlaneColors = Swimlanes.simpleSchema()._schema.color.allowedValues;
+});
+
 BlazeComponent.extendComponent({
   editTitle(evt) {
     evt.preventDefault();
@@ -11,15 +18,85 @@ BlazeComponent.extendComponent({
   events() {
     return [{
       'click .js-open-swimlane-menu': Popup.open('swimlaneAction'),
+      'click .js-open-add-swimlane-menu': Popup.open('swimlaneAdd'),
       submit: this.editTitle,
     }];
   },
 }).register('swimlaneHeader');
 
 Template.swimlaneActionPopup.events({
+  'click .js-set-swimlane-color': Popup.open('setSwimlaneColor'),
   'click .js-close-swimlane' (evt) {
     evt.preventDefault();
     this.archive();
     Popup.close();
   },
 });
+
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.currentSwimlane = this.currentData();
+  },
+
+  events() {
+    return [{
+      submit(evt) {
+        evt.preventDefault();
+        const currentBoard = Boards.findOne(Session.get('currentBoard'));
+        const nextSwimlane = currentBoard.nextSwimlane(this.currentSwimlane);
+        const titleInput = this.find('.swimlane-name-input');
+        const title = titleInput.value.trim();
+        const sortValue = calculateIndexData(this.currentSwimlane, nextSwimlane, 1);
+        const swimlaneType = (currentBoard.isTemplatesBoard())?'template-swimlane':'swimlane';
+
+        if (title) {
+          Swimlanes.insert({
+            title,
+            boardId: Session.get('currentBoard'),
+            sort: sortValue.base,
+            type: swimlaneType,
+          });
+
+          titleInput.value = '';
+          titleInput.focus();
+        }
+        // XXX ideally, we should move the popup to the newly
+        // created swimlane so a user can add more than one swimlane
+        // with a minimum of interactions
+        Popup.close();
+      },
+      'click .js-swimlane-template': Popup.open('searchElement'),
+    }];
+  },
+}).register('swimlaneAddPopup');
+
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.currentSwimlane = this.currentData();
+    this.currentColor = new ReactiveVar(this.currentSwimlane.color);
+  },
+
+  colors() {
+    return swimlaneColors.map((color) => ({ color, name: '' }));
+  },
+
+  isSelected(color) {
+    return this.currentColor.get() === color;
+  },
+
+  events() {
+    return [{
+      'click .js-palette-color'() {
+        this.currentColor.set(this.currentData().color);
+      },
+      'click .js-submit' () {
+        this.currentSwimlane.setColor(this.currentColor.get());
+        Popup.close();
+      },
+      'click .js-remove-color'() {
+        this.currentSwimlane.setColor(null);
+        Popup.close();
+      },
+    }];
+  },
+}).register('setSwimlaneColorPopup');
diff --git a/client/components/swimlanes/swimlanes.jade b/client/components/swimlanes/swimlanes.jade
index 76f54c66..c56834df 100644
--- a/client/components/swimlanes/swimlanes.jade
+++ b/client/components/swimlanes/swimlanes.jade
@@ -1,21 +1,22 @@
 template(name="swimlane")
-  .swimlane.js-lists.js-swimlane
+  .swimlane
     +swimlaneHeader
+  .swimlane.js-lists.js-swimlane
     if isMiniScreen
-      if currentList
+      if currentListIsInThisSwimlane _id
         +list(currentList)
-      else
-        each currentBoard.lists
+      unless currentList
+        each lists
           +miniList(this)
         if currentUser.isBoardMember
           +addListForm
     else
-      each currentBoard.lists
+      each lists
         +list(this)
         if currentCardIsInThisList _id ../_id
           +cardDetails(currentCard)
       if currentUser.isBoardMember
-        +addListAndSwimlaneForm
+        +addListForm
 
 template(name="listsGroup")
   .swimlane.list-group.js-lists
@@ -23,52 +24,31 @@ template(name="listsGroup")
       if currentList
         +list(currentList)
       else
-        each currentBoard.lists
+        each lists
           +miniList(this)
         if currentUser.isBoardMember
           +addListForm
     else
-      each currentBoard.lists
+      each lists
         +list(this)
         if currentCardIsInThisList _id null
           +cardDetails(currentCard)
       if currentUser.isBoardMember
         +addListForm
 
-template(name="addListAndSwimlaneForm")
-  .list.list-composer.js-list-composer
-    .list-header
-      +inlinedForm(autoclose=false)
-        input.list-name-input.full-line(type="text" placeholder="{{_ 'add-list'}}"
-          autocomplete="off" autofocus)
-        .edit-controls.clearfix
-          button.primary.confirm(type="submit") {{_ 'save'}}
-          a.fa.fa-times-thin.js-close-inlined-form
-      else
-        a.open-list-composer.js-open-inlined-form
-          i.fa.fa-plus
-          | {{_ 'add-list'}}
-    .list-header
-      +inlinedForm(autoclose=false)
-        input.swimlane-name-input.full-line(type="text" placeholder="{{_ 'add-swimlane'}}"
-          autocomplete="off" autofocus)
-        .edit-controls.clearfix
-          button.primary.confirm(type="submit") {{_ 'save'}}
-          a.fa.fa-times-thin.js-close-inlined-form
-      else
-        a.open-list-composer.js-open-inlined-form
-          i.fa.fa-plus
-          | {{_ 'add-swimlane'}}
-
 template(name="addListForm")
   .list.list-composer.js-list-composer
-    .list-header
+    .list-header-add
       +inlinedForm(autoclose=false)
         input.list-name-input.full-line(type="text" placeholder="{{_ 'add-list'}}"
           autocomplete="off" autofocus)
         .edit-controls.clearfix
           button.primary.confirm(type="submit") {{_ 'save'}}
-          a.fa.fa-times-thin.js-close-inlined-form
+          unless currentBoard.isTemplatesBoard
+            unless currentBoard.isTemplateBoard
+              span.quiet
+                | {{_ 'or'}}
+                a.js-list-template {{_ 'template'}}
       else
         a.open-list-composer.js-open-inlined-form
           i.fa.fa-plus
diff --git a/client/components/swimlanes/swimlanes.js b/client/components/swimlanes/swimlanes.js
index 7965c2bc..d0ec3f4a 100644
--- a/client/components/swimlanes/swimlanes.js
+++ b/client/components/swimlanes/swimlanes.js
@@ -1,14 +1,25 @@
-const { calculateIndex } = Utils;
+const { calculateIndex, enableClickOnTouch } = Utils;
+
+function currentListIsInThisSwimlane(swimlaneId) {
+  const currentList = Lists.findOne(Session.get('currentList'));
+  return currentList && (currentList.swimlaneId === swimlaneId || currentList.swimlaneId === '');
+}
 
 function currentCardIsInThisList(listId, swimlaneId) {
   const currentCard = Cards.findOne(Session.get('currentCard'));
   const currentUser = Meteor.user();
-  if (currentUser.profile.boardView === 'board-view-lists')
-    return currentCard && currentCard.listId === listId;
-  else if (currentUser.profile.boardView === 'board-view-swimlanes')
+  if (currentUser && currentUser.profile && currentUser.profile.boardView === 'board-view-swimlanes')
     return currentCard && currentCard.listId === listId && currentCard.swimlaneId === swimlaneId;
-  else
-    return false;
+  else // Default view: board-view-lists
+    return currentCard && currentCard.listId === listId;
+  // https://github.com/wekan/wekan/issues/1623
+  // https://github.com/ChronikEwok/wekan/commit/cad9b20451bb6149bfb527a99b5001873b06c3de
+  // TODO: In public board, if you would like to switch between List/Swimlane view, you could
+  //       1) If there is no view cookie, save to cookie board-view-lists
+  //          board-view-lists / board-view-swimlanes / board-view-cal
+  //       2) If public user changes clicks board-view-lists then change view and
+  //          then change view and save cookie with view value
+  //          without using currentuser above, because currentuser is null.
 }
 
 function initSortable(boardComponent, $listsDom) {
@@ -64,6 +75,9 @@ function initSortable(boardComponent, $listsDom) {
     },
   });
 
+  // ugly touch event hotfix
+  enableClickOnTouch('.js-list:not(.js-list-composer)');
+
   function userIsMember() {
     return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
   }
@@ -105,6 +119,10 @@ BlazeComponent.extendComponent({
     return currentCardIsInThisList(listId, swimlaneId);
   },
 
+  currentListIsInThisSwimlane(swimlaneId) {
+    return currentListIsInThisSwimlane(swimlaneId);
+  },
+
   events() {
     return [{
       // Click-and-drag action
@@ -144,6 +162,12 @@ BlazeComponent.extendComponent({
 }).register('swimlane');
 
 BlazeComponent.extendComponent({
+  onCreated() {
+    this.currentBoard = Boards.findOne(Session.get('currentBoard'));
+    this.isListTemplatesSwimlane = this.currentBoard.isTemplatesBoard() && this.currentData().isListTemplatesSwimlane();
+    this.currentSwimlane = this.currentData();
+  },
+
   // Proxy
   open() {
     this.childComponents('inlinedForm')[0].open();
@@ -160,58 +184,19 @@ BlazeComponent.extendComponent({
             title,
             boardId: Session.get('currentBoard'),
             sort: $('.list').length,
+            type: (this.isListTemplatesSwimlane)?'template-list':'list',
+            swimlaneId: (this.currentBoard.isTemplatesBoard())?this.currentSwimlane._id:'',
           });
 
           titleInput.value = '';
           titleInput.focus();
         }
       },
+      'click .js-list-template': Popup.open('searchElement'),
     }];
   },
 }).register('addListForm');
 
-BlazeComponent.extendComponent({
-  // Proxy
-  open() {
-    this.childComponents('inlinedForm')[0].open();
-  },
-
-  events() {
-    return [{
-      submit(evt) {
-        evt.preventDefault();
-        let titleInput = this.find('.list-name-input');
-        if (titleInput) {
-          const title = titleInput.value.trim();
-          if (title) {
-            Lists.insert({
-              title,
-              boardId: Session.get('currentBoard'),
-              sort: $('.list').length,
-            });
-
-            titleInput.value = '';
-            titleInput.focus();
-          }
-        } else {
-          titleInput = this.find('.swimlane-name-input');
-          const title = titleInput.value.trim();
-          if (title) {
-            Swimlanes.insert({
-              title,
-              boardId: Session.get('currentBoard'),
-              sort: $('.swimlane').length,
-            });
-
-            titleInput.value = '';
-            titleInput.focus();
-          }
-        }
-      },
-    }];
-  },
-}).register('addListAndSwimlaneForm');
-
 Template.swimlane.helpers({
   canSeeAddList() {
     return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
diff --git a/client/components/swimlanes/swimlanes.styl b/client/components/swimlanes/swimlanes.styl
index dce298b0..1056e1e3 100644
--- a/client/components/swimlanes/swimlanes.styl
+++ b/client/components/swimlanes/swimlanes.styl
@@ -7,7 +7,7 @@
   display: flex
   flex-direction: row
   overflow: 0;
-  max-height: 100%
+  max-height: calc(100% - 26px)
 
   &.placeholder
     background-color: rgba(0, 0, 0, .2)
@@ -27,19 +27,15 @@
   .swimlane-header-wrap
     display: flex;
     flex-direction: row;
-    flex: 0 0 50px;
-    padding-bottom: 30px;
-    border-bottom: 1px solid #CCC
+    flex: 1 0 100%;
+    background-color: #ccc;
 
     .swimlane-header
-      writing-mode: vertical-rl;
-      transform: rotate(180deg);
       font-size: 14px;
-      line-height: 50px;
-      margin-top: 50px;
+      padding: 5px 5px
       font-weight: bold;
       min-height: 9px;
-      width: 50px;
+      width: 100%;
       overflow: hidden;
       -o-text-overflow: ellipsis;
       text-overflow: ellipsis;
@@ -48,7 +44,95 @@
 
     .swimlane-header-menu
       position: absolute
-      padding: 20px 20px
+      padding: 5px 5px
+
+    .swimlane-header-plus-icon
+      margin-left: 5px
+      margin-right: 10px
 
 .list-group
   height: 100%
+
+.moving-swimlane
+  display: none
+
+swimlane-color(background, color...)
+  background: background !important
+  if color
+    color: color !important //overwrite text for better visibility
+
+.swimlane-white
+  swimlane-color(#ffffff, #4d4d4d) //Black text for better visibility
+  border: 1px solid #eee
+
+.swimlane-green
+  swimlane-color(#3cb500, #ffffff) //White text for better visibility
+
+.swimlane-yellow
+  swimlane-color(#fad900, #4d4d4d) //Black text for better visibility
+
+.swimlane-orange
+  swimlane-color(#ff9f19, #4d4d4d) //Black text for better visibility
+
+.swimlane-red
+  swimlane-color(#eb4646, #ffffff) //White text for better visibility
+
+.swimlane-purple
+  swimlane-color(#a632db, #ffffff) //White text for better visibility
+
+.swimlane-blue
+  swimlane-color(#0079bf, #ffffff) //White text for better visibility
+
+.swimlane-pink
+  swimlane-color(#ff78cb, #4d4d4d) //Black text for better visibility
+
+.swimlane-sky
+  swimlane-color(#00c2e0, #ffffff) //White text for better visibility
+
+.swimlane-black
+  swimlane-color(#4d4d4d, #ffffff) //White text for better visibility
+
+.swimlane-lime
+  swimlane-color(#51e898, #4d4d4d) //Black text for better visibility
+
+.swimlane-silver
+  swimlane-color(unset, #4d4d4d) //Black text for better visibility
+
+.swimlane-peachpuff
+  swimlane-color(#ffdab9, #4d4d4d) //Black text for better visibility
+
+.swimlane-crimson
+  swimlane-color(#dc143c, #ffffff) //White text for better visibility
+
+.swimlane-plum
+  swimlane-color(#dda0dd, #4d4d4d) //Black text for better visibility
+
+.swimlane-darkgreen
+  swimlane-color(#006400, #ffffff) //White text for better visibility
+
+.swimlane-slateblue
+  swimlane-color(#6a5acd, #ffffff) //White text for better visibility
+
+.swimlane-magenta
+  swimlane-color(#ff00ff, #ffffff) //White text for better visibility
+
+.swimlane-gold
+  swimlane-color(#ffd700, #4d4d4d) //Black text for better visibility
+
+.swimlane-navy
+  swimlane-color(#000080, #ffffff) //White text for better visibility
+
+.swimlane-gray
+  swimlane-color(#808080, #ffffff) //White text for better visibility
+
+.swimlane-saddlebrown
+  swimlane-color(#8b4513, #ffffff) //White text for better visibility
+
+.swimlane-paleturquoise
+  swimlane-color(#afeeee, #4d4d4d) //Black text for better visibility
+
+.swimlane-mistyrose
+  swimlane-color(#ffe4e1, #4d4d4d) //Black text for better visibility
+
+.swimlane-indigo
+  swimlane-color(#4b0082, #ffffff) //White text for better visibility
diff --git a/client/components/users/userAvatar.jade b/client/components/users/userAvatar.jade
index 83e2c8d0..ebfa48ba 100644
--- a/client/components/users/userAvatar.jade
+++ b/client/components/users/userAvatar.jade
@@ -1,7 +1,7 @@
 template(name="userAvatar")
   a.member.js-member(title="{{userData.profile.fullname}} ({{userData.username}})")
     if userData.profile.avatarUrl
-      img.avatar.avatar-image(src=userData.profile.avatarUrl)
+      img.avatar.avatar-image(src="{{userData.profile.avatarUrl}}")
     else
       +userAvatarInitials(userId=userData._id)
 
diff --git a/client/components/users/userAvatar.js b/client/components/users/userAvatar.js
index be7a85d2..91cad237 100644
--- a/client/components/users/userAvatar.js
+++ b/client/components/users/userAvatar.js
@@ -134,8 +134,9 @@ BlazeComponent.extendComponent({
 
 Template.cardMembersPopup.helpers({
   isCardMember() {
-    const cardId = Template.parentData()._id;
-    const cardMembers = Cards.findOne(cardId).members || [];
+    const card = Template.parentData();
+    const cardMembers = card.getMembers();
+
     return _.contains(cardMembers, this.userId);
   },
 
diff --git a/client/components/users/userHeader.jade b/client/components/users/userHeader.jade
index a8fdb143..2a3d04cc 100644
--- a/client/components/users/userHeader.jade
+++ b/client/components/users/userHeader.jade
@@ -4,10 +4,11 @@ template(name="headerUserBar")
       .header-user-bar-avatar
         +userAvatar(userId=currentUser._id)
       unless isMiniScreen
-        if currentUser.profile.fullname
-          = currentUser.profile.fullname
-        else
-          = currentUser.username
+        unless isSandstorm
+          if currentUser.profile.fullname
+            = currentUser.profile.fullname
+          else
+            = currentUser.username
 
 template(name="memberMenuPopup")
   ul.pop-over-list
@@ -15,14 +16,18 @@ template(name="memberMenuPopup")
       li: a.js-edit-profile {{_ 'edit-profile'}}
       li: a.js-change-settings {{_ 'change-settings'}}
       li: a.js-change-avatar {{_ 'edit-avatar'}}
-      li: a.js-change-password {{_ 'changePasswordPopup-title'}}
-      li: a.js-change-language {{_ 'changeLanguagePopup-title'}}
-      li: a.js-edit-notification {{_ 'editNotificationPopup-title'}}
+      unless isSandstorm
+        li: a.js-change-password {{_ 'changePasswordPopup-title'}}
+        li: a.js-change-language {{_ 'changeLanguagePopup-title'}}
     if currentUser.isAdmin
       li: a.js-go-setting(href="{{pathFor 'setting'}}") {{_ 'admin-panel'}}
   hr
   ul.pop-over-list
-    li: a.js-logout {{_ 'log-out'}}
+    li: a(href="{{pathFor 'board' id=templatesBoardId slug=templatesBoardSlug}}") {{_ 'templates'}}
+  unless isSandstorm
+    hr
+    ul.pop-over-list
+      li: a.js-logout {{_ 'log-out'}}
 
 template(name="editProfilePopup")
   form
@@ -48,24 +53,10 @@ template(name="editProfilePopup")
         input.js-profile-email(type="email" value="{{emails.[0].address}}")
       else
         input.js-profile-email(type="email" value="{{emails.[0].address}}" readonly)
-    input.primary.wide(type="submit" value="{{_ 'save'}}")
-
-template(name="editNotificationPopup")
-  ul.pop-over-list
-    li
-      a.js-toggle-tag-notify-watch
-        i.fa.fa-eye.colorful
-        | {{_ 'watching'}}
-        if hasTag "notify-watch"
-          i.fa.fa-check
-        span.sub-name {{_ 'notify-watch'}}
-    li
-      a.js-toggle-tag-notify-participate
-        i.fa.fa-bell.colorful
-        | {{_ 'tracking'}}
-        if hasTag "notify-participate"
-          i.fa.fa-check
-        span.sub-name {{_ 'notify-participate'}}
+    div.buttonsContainer
+      input.primary.wide(type="submit" value="{{_ 'save'}}")
+      div
+      input#deleteButton.primary.wide(type="button" value="{{_ 'delete'}}")
 
 template(name="changePasswordPopup")
   +atForm(state='changePwd')
diff --git a/client/components/users/userHeader.js b/client/components/users/userHeader.js
index d96a9b3d..869c9d15 100644
--- a/client/components/users/userHeader.js
+++ b/client/components/users/userHeader.js
@@ -3,13 +3,21 @@ Template.headerUserBar.events({
   'click .js-change-avatar': Popup.open('changeAvatar'),
 });
 
+Template.memberMenuPopup.helpers({
+  templatesBoardId() {
+    return Meteor.user().getTemplatesBoardId();
+  },
+  templatesBoardSlug() {
+    return Meteor.user().getTemplatesBoardSlug();
+  },
+});
+
 Template.memberMenuPopup.events({
   'click .js-edit-profile': Popup.open('editProfile'),
   'click .js-change-settings': Popup.open('changeSettings'),
   'click .js-change-avatar': Popup.open('changeAvatar'),
   'click .js-change-password': Popup.open('changePassword'),
   'click .js-change-language': Popup.open('changeLanguage'),
-  'click .js-edit-notification': Popup.open('editNotification'),
   'click .js-logout'(evt) {
     evt.preventDefault();
 
@@ -87,24 +95,10 @@ Template.editProfilePopup.events({
       });
     } else Popup.back();
   },
-});
-
-Template.editNotificationPopup.helpers({
-  hasTag(tag) {
-    const user = Meteor.user();
-    return user && user.hasTag(tag);
-  },
-});
-
-// we defined github like rules, see: https://github.com/settings/notifications
-Template.editNotificationPopup.events({
-  'click .js-toggle-tag-notify-participate'() {
-    const user = Meteor.user();
-    if (user) user.toggleTag('notify-participate');
-  },
-  'click .js-toggle-tag-notify-watch'() {
-    const user = Meteor.user();
-    if (user) user.toggleTag('notify-watch');
+  'click #deleteButton'() {
+    Users.remove(Meteor.userId());
+    Popup.close();
+    AccountsTemplates.logout();
   },
 });
 
diff --git a/client/lib/datepicker.js b/client/lib/datepicker.js
new file mode 100644
index 00000000..ab2da0bd
--- /dev/null
+++ b/client/lib/datepicker.js
@@ -0,0 +1,86 @@
+DatePicker = BlazeComponent.extendComponent({
+  template() {
+    return 'datepicker';
+  },
+
+  onCreated() {
+    this.error = new ReactiveVar('');
+    this.card = this.data();
+    this.date = new ReactiveVar(moment.invalid());
+  },
+
+  onRendered() {
+    const $picker = this.$('.js-datepicker').datepicker({
+      todayHighlight: true,
+      todayBtn: 'linked',
+      language: TAPi18n.getLanguage(),
+    }).on('changeDate', function(evt) {
+      this.find('#date').value = moment(evt.date).format('L');
+      this.error.set('');
+      this.find('#time').focus();
+    }.bind(this));
+
+    if (this.date.get().isValid()) {
+      $picker.datepicker('update', this.date.get().toDate());
+    }
+  },
+
+  showDate() {
+    if (this.date.get().isValid())
+      return this.date.get().format('L');
+    return '';
+  },
+  showTime() {
+    if (this.date.get().isValid())
+      return this.date.get().format('LT');
+    return '';
+  },
+  dateFormat() {
+    return moment.localeData().longDateFormat('L');
+  },
+  timeFormat() {
+    return moment.localeData().longDateFormat('LT');
+  },
+
+  events() {
+    return [{
+      'keyup .js-date-field'() {
+        // parse for localized date format in strict mode
+        const dateMoment = moment(this.find('#date').value, 'L', true);
+        if (dateMoment.isValid()) {
+          this.error.set('');
+          this.$('.js-datepicker').datepicker('update', dateMoment.toDate());
+        }
+      },
+      'keyup .js-time-field'() {
+        // parse for localized time format in strict mode
+        const dateMoment = moment(this.find('#time').value, 'LT', true);
+        if (dateMoment.isValid()) {
+          this.error.set('');
+        }
+      },
+      'submit .edit-date'(evt) {
+        evt.preventDefault();
+
+        // if no time was given, init with 12:00
+        const time = evt.target.time.value || moment(new Date().setHours(12, 0, 0)).format('LT');
+
+        const dateString = `${evt.target.date.value} ${time}`;
+        const newDate = moment(dateString, 'L LT', true);
+        if (newDate.isValid()) {
+          this._storeDate(newDate.toDate());
+          Popup.close();
+        }
+        else {
+          this.error.set('invalid-date');
+          evt.target.date.focus();
+        }
+      },
+      'click .js-delete-date'(evt) {
+        evt.preventDefault();
+        this._deleteDate();
+        Popup.close();
+      },
+    }];
+  },
+});
diff --git a/client/lib/escapeActions.js b/client/lib/escapeActions.js
index 666e33e0..0757ae46 100644
--- a/client/lib/escapeActions.js
+++ b/client/lib/escapeActions.js
@@ -135,6 +135,6 @@ $(document).on('click', (evt) => {
   }
 });
 
-$(document).on('click', 'a[href=#]',  (evt) => {
+$(document).on('click', 'a[href=\\#]',  (evt) => {
   evt.preventDefault();
 });
diff --git a/client/lib/filter.js b/client/lib/filter.js
index 8129776b..c3c1b070 100644
--- a/client/lib/filter.js
+++ b/client/lib/filter.js
@@ -3,17 +3,19 @@
 // RangeFilter, dateFilter, etc.). We then define a global `Filter` object whose
 // goal is to filter complete documents by using the local filters for each
 // fields.
-
 function showFilterSidebar() {
   Sidebar.setView('filter');
 }
 
 // Use a "set" filter for a field that is a set of documents uniquely
 // identified. For instance `{ labels: ['labelA', 'labelC', 'labelD'] }`.
+// use "subField" for searching inside object Fields.
+// For instance '{ 'customFields._id': ['field1','field2']} (subField would be: _id)
 class SetFilter {
-  constructor() {
+  constructor(subField = '') {
     this._dep = new Tracker.Dependency();
     this._selectedElements = [];
+    this.subField = subField;
   }
 
   isSelected(val) {
@@ -61,7 +63,9 @@ class SetFilter {
 
   _getMongoSelector() {
     this._dep.depend();
-    return { $in: this._selectedElements };
+    return {
+      $in: this._selectedElements,
+    };
   }
 
   _getEmptySelector() {
@@ -72,10 +76,385 @@ class SetFilter {
         includeEmpty = true;
       }
     });
-    return includeEmpty ? { $eq: [] } : null;
+    return includeEmpty ? {
+      $eq: [],
+    } : null;
   }
 }
 
+
+// Advanced filter forms a MongoSelector from a users String.
+// Build by: Ignatz 19.05.2018 (github feuerball11)
+class AdvancedFilter {
+  constructor() {
+    this._dep = new Tracker.Dependency();
+    this._filter = '';
+    this._lastValide = {};
+  }
+
+  set(str) {
+    this._filter = str;
+    this._dep.changed();
+  }
+
+  reset() {
+    this._filter = '';
+    this._lastValide = {};
+    this._dep.changed();
+  }
+
+  _isActive() {
+    this._dep.depend();
+    return this._filter !== '';
+  }
+
+  _filterToCommands() {
+    const commands = [];
+    let current = '';
+    let string = false;
+    let regex = false;
+    let wasString = false;
+    let ignore = false;
+    for (let i = 0; i < this._filter.length; i++) {
+      const char = this._filter.charAt(i);
+      if (ignore) {
+        ignore = false;
+        current += char;
+        continue;
+      }
+      if (char === '/') {
+        string = !string;
+        if (string) regex = true;
+        current += char;
+        continue;
+      }
+      if (char === '\'') {
+        string = !string;
+        if (string) wasString = true;
+        continue;
+      }
+      if (char === '\\' && !string) {
+        ignore = true;
+        continue;
+      }
+      if (char === ' ' && !string) {
+        commands.push({
+          'cmd': current,
+          'string': wasString,
+          regex,
+        });
+        wasString = false;
+        current = '';
+        continue;
+      }
+      current += char;
+    }
+    if (current !== '') {
+      commands.push({
+        'cmd': current,
+        'string': wasString,
+        regex,
+      });
+    }
+    return commands;
+  }
+
+  _fieldNameToId(field) {
+    const found = CustomFields.findOne({
+      'name': field,
+    });
+    return found._id;
+  }
+
+  _fieldValueToId(field, value) {
+    const found = CustomFields.findOne({
+      'name': field,
+    });
+    if (found.settings.dropdownItems && found.settings.dropdownItems.length > 0) {
+      for (let i = 0; i < found.settings.dropdownItems.length; i++) {
+        if (found.settings.dropdownItems[i].name === value) {
+          return found.settings.dropdownItems[i]._id;
+        }
+      }
+    }
+    return value;
+  }
+
+  _arrayToSelector(commands) {
+    try {
+      //let changed = false;
+      this._processSubCommands(commands);
+    } catch (e) {
+      return this._lastValide;
+    }
+    this._lastValide = {
+      $or: commands,
+    };
+    return {
+      $or: commands,
+    };
+  }
+
+  _processSubCommands(commands) {
+    const subcommands = [];
+    let level = 0;
+    let start = -1;
+    for (let i = 0; i < commands.length; i++) {
+      if (commands[i].cmd) {
+        switch (commands[i].cmd) {
+        case '(':
+        {
+          level++;
+          if (start === -1) start = i;
+          continue;
+        }
+        case ')':
+        {
+          level--;
+          commands.splice(i, 1);
+          i--;
+          continue;
+        }
+        default:
+        {
+          if (level > 0) {
+            subcommands.push(commands[i]);
+            commands.splice(i, 1);
+            i--;
+            continue;
+          }
+        }
+        }
+      }
+    }
+    if (start !== -1) {
+      this._processSubCommands(subcommands);
+      if (subcommands.length === 1)
+        commands.splice(start, 0, subcommands[0]);
+      else
+        commands.splice(start, 0, subcommands);
+    }
+    this._processConditions(commands);
+    this._processLogicalOperators(commands);
+  }
+
+  _processConditions(commands) {
+    for (let i = 0; i < commands.length; i++) {
+      if (!commands[i].string && commands[i].cmd) {
+        switch (commands[i].cmd) {
+        case '=':
+        case '==':
+        case '===':
+        {
+          const field = commands[i - 1].cmd;
+          const str = commands[i + 1].cmd;
+          if (commands[i + 1].regex) {
+            const match = str.match(new RegExp('^/(.*?)/([gimy]*)$'));
+            let regex = null;
+            if (match.length > 2)
+              regex = new RegExp(match[1], match[2]);
+            else
+              regex = new RegExp(match[1]);
+            commands[i] = {
+              'customFields._id': this._fieldNameToId(field),
+              'customFields.value': regex,
+            };
+          } else {
+            commands[i] = {
+              'customFields._id': this._fieldNameToId(field),
+              'customFields.value': {
+                $in: [this._fieldValueToId(field, str), parseInt(str, 10)],
+              },
+            };
+          }
+          commands.splice(i - 1, 1);
+          commands.splice(i, 1);
+          //changed = true;
+          i--;
+          break;
+        }
+        case '!=':
+        case '!==':
+        {
+          const field = commands[i - 1].cmd;
+          const str = commands[i + 1].cmd;
+          if (commands[i + 1].regex) {
+            const match = str.match(new RegExp('^/(.*?)/([gimy]*)$'));
+            let regex = null;
+            if (match.length > 2)
+              regex = new RegExp(match[1], match[2]);
+            else
+              regex = new RegExp(match[1]);
+            commands[i] = {
+              'customFields._id': this._fieldNameToId(field),
+              'customFields.value': {
+                $not: regex,
+              },
+            };
+          } else {
+            commands[i] = {
+              'customFields._id': this._fieldNameToId(field),
+              'customFields.value': {
+                $not: {
+                  $in: [this._fieldValueToId(field, str), parseInt(str, 10)],
+                },
+              },
+            };
+          }
+          commands.splice(i - 1, 1);
+          commands.splice(i, 1);
+          //changed = true;
+          i--;
+          break;
+        }
+        case '>':
+        case 'gt':
+        case 'Gt':
+        case 'GT':
+        {
+          const field = commands[i - 1].cmd;
+          const str = commands[i + 1].cmd;
+          commands[i] = {
+            'customFields._id': this._fieldNameToId(field),
+            'customFields.value': {
+              $gt: parseInt(str, 10),
+            },
+          };
+          commands.splice(i - 1, 1);
+          commands.splice(i, 1);
+          //changed = true;
+          i--;
+          break;
+        }
+        case '>=':
+        case '>==':
+        case 'gte':
+        case 'Gte':
+        case 'GTE':
+        {
+          const field = commands[i - 1].cmd;
+          const str = commands[i + 1].cmd;
+          commands[i] = {
+            'customFields._id': this._fieldNameToId(field),
+            'customFields.value': {
+              $gte: parseInt(str, 10),
+            },
+          };
+          commands.splice(i - 1, 1);
+          commands.splice(i, 1);
+          //changed = true;
+          i--;
+          break;
+        }
+        case '<':
+        case 'lt':
+        case 'Lt':
+        case 'LT':
+        {
+          const field = commands[i - 1].cmd;
+          const str = commands[i + 1].cmd;
+          commands[i] = {
+            'customFields._id': this._fieldNameToId(field),
+            'customFields.value': {
+              $lt: parseInt(str, 10),
+            },
+          };
+          commands.splice(i - 1, 1);
+          commands.splice(i, 1);
+          //changed = true;
+          i--;
+          break;
+        }
+        case '<=':
+        case '<==':
+        case 'lte':
+        case 'Lte':
+        case 'LTE':
+        {
+          const field = commands[i - 1].cmd;
+          const str = commands[i + 1].cmd;
+          commands[i] = {
+            'customFields._id': this._fieldNameToId(field),
+            'customFields.value': {
+              $lte: parseInt(str, 10),
+            },
+          };
+          commands.splice(i - 1, 1);
+          commands.splice(i, 1);
+          //changed = true;
+          i--;
+          break;
+        }
+        }
+      }
+    }
+  }
+
+  _processLogicalOperators(commands) {
+    for (let i = 0; i < commands.length; i++) {
+      if (!commands[i].string && commands[i].cmd) {
+        switch (commands[i].cmd) {
+        case 'or':
+        case 'Or':
+        case 'OR':
+        case '|':
+        case '||':
+        {
+          const op1 = commands[i - 1];
+          const op2 = commands[i + 1];
+          commands[i] = {
+            $or: [op1, op2],
+          };
+          commands.splice(i - 1, 1);
+          commands.splice(i, 1);
+          //changed = true;
+          i--;
+          break;
+        }
+        case 'and':
+        case 'And':
+        case 'AND':
+        case '&':
+        case '&&':
+        {
+          const op1 = commands[i - 1];
+          const op2 = commands[i + 1];
+          commands[i] = {
+            $and: [op1, op2],
+          };
+          commands.splice(i - 1, 1);
+          commands.splice(i, 1);
+          //changed = true;
+          i--;
+          break;
+        }
+        case 'not':
+        case 'Not':
+        case 'NOT':
+        case '!':
+        {
+          const op1 = commands[i + 1];
+          commands[i] = {
+            $not: op1,
+          };
+          commands.splice(i + 1, 1);
+          //changed = true;
+          i--;
+          break;
+        }
+        }
+      }
+    }
+  }
+
+  _getMongoSelector() {
+    this._dep.depend();
+    const commands = this._filterToCommands();
+    return this._arrayToSelector(commands);
+  }
+
+}
+
 // The global Filter object.
 // XXX It would be possible to re-write this object more elegantly, and removing
 // the need to provide a list of `_fields`. We also should move methods into the
@@ -86,8 +465,10 @@ Filter = {
   // before changing the schema.
   labelIds: new SetFilter(),
   members: new SetFilter(),
+  customFields: new SetFilter('_id'),
+  advanced: new AdvancedFilter(),
 
-  _fields: ['labelIds', 'members'],
+  _fields: ['labelIds', 'members', 'customFields'],
 
   // We don't filter cards that have been added after the last filter change. To
   // implement this we keep the id of these cards in this `_exceptions` fields
@@ -98,7 +479,7 @@ Filter = {
   isActive() {
     return _.any(this._fields, (fieldName) => {
       return this[fieldName]._isActive();
-    });
+    }) || this.advanced._isActive();
   },
 
   _getMongoSelector() {
@@ -111,7 +492,11 @@ Filter = {
     this._fields.forEach((fieldName) => {
       const filter = this[fieldName];
       if (filter._isActive()) {
-        filterSelector[fieldName] = filter._getMongoSelector();
+        if (filter.subField !== '') {
+          filterSelector[`${fieldName}.${filter.subField}`] = filter._getMongoSelector();
+        } else {
+          filterSelector[fieldName] = filter._getMongoSelector();
+        }
         emptySelector[fieldName] = filter._getEmptySelector();
         if (emptySelector[fieldName] !== null) {
           includeEmptySelectors = true;
@@ -119,13 +504,24 @@ Filter = {
       }
     });
 
-    const exceptionsSelector = {_id: {$in: this._exceptions}};
+    const exceptionsSelector = {
+      _id: {
+        $in: this._exceptions,
+      },
+    };
     this._exceptionsDep.depend();
 
-    if (includeEmptySelectors)
-      return {$or: [filterSelector, exceptionsSelector, emptySelector]};
-    else
-      return {$or: [filterSelector, exceptionsSelector]};
+    const selectors = [exceptionsSelector];
+
+    if (_.any(this._fields, (fieldName) => {
+      return this[fieldName]._isActive();
+    })) selectors.push(filterSelector);
+    if (includeEmptySelectors) selectors.push(emptySelector);
+    if (this.advanced._isActive()) selectors.push(this.advanced._getMongoSelector());
+
+    return {
+      $or: selectors,
+    };
   },
 
   mongoSelector(additionalSelector) {
@@ -133,7 +529,9 @@ Filter = {
     if (_.isUndefined(additionalSelector))
       return filterSelector;
     else
-      return {$and: [filterSelector, additionalSelector]};
+      return {
+        $and: [filterSelector, additionalSelector],
+      };
   },
 
   reset() {
@@ -141,6 +539,7 @@ Filter = {
       const filter = this[fieldName];
       filter.reset();
     });
+    this.advanced.reset();
     this.resetExceptions();
   },
 
diff --git a/client/lib/inlinedform.js b/client/lib/inlinedform.js
index 56768a13..e5e4d4ed 100644
--- a/client/lib/inlinedform.js
+++ b/client/lib/inlinedform.js
@@ -75,6 +75,16 @@ InlinedForm = BlazeComponent.extendComponent({
 EscapeActions.register('inlinedForm',
   () => { currentlyOpenedForm.get().close(); },
   () => { return currentlyOpenedForm.get() !== null; }, {
-    noClickEscapeOn: '.js-inlined-form',
+    enabledOnClick: false,
   }
 );
+
+// submit on click outside
+document.addEventListener('click', function(evt) {
+  const openedForm = currentlyOpenedForm.get();
+  const isClickOutside = $(evt.target).closest('.js-inlined-form').length === 0;
+  if (openedForm && isClickOutside) {
+    $('.js-inlined-form button[type=submit]').click();
+    openedForm.close();
+  }
+}, true);
diff --git a/client/lib/modal.js b/client/lib/modal.js
index d5350264..3c27a179 100644
--- a/client/lib/modal.js
+++ b/client/lib/modal.js
@@ -4,6 +4,7 @@ window.Modal = new class {
   constructor() {
     this._currentModal = new ReactiveVar(closedValue);
     this._onCloseGoTo = '';
+    this._isWideModal = false;
   }
 
   getHeaderName() {
@@ -20,6 +21,10 @@ window.Modal = new class {
     return this.getTemplateName() !== closedValue;
   }
 
+  isWide(){
+    return this._isWideModal;
+  }
+
   close() {
     this._currentModal.set(closedValue);
     if (this._onCloseGoTo) {
@@ -27,9 +32,16 @@ window.Modal = new class {
     }
   }
 
+  openWide(modalName, { header = '', onCloseGoTo = ''} = {}) {
+    this._currentModal.set({ header, modalName });
+    this._onCloseGoTo = onCloseGoTo;
+    this._isWideModal = true;
+  }
+
   open(modalName, { header = '', onCloseGoTo = ''} = {}) {
     this._currentModal.set({ header, modalName });
     this._onCloseGoTo = onCloseGoTo;
+
   }
 }();
 
@@ -38,5 +50,5 @@ Blaze.registerHelper('Modal', Modal);
 EscapeActions.register('modalWindow',
   () => Modal.close(),
   () => Modal.isOpen(),
-  { noClickEscapeOn: '.modal-content' }
+  { noClickEscapeOn: '.modal-container' }
 );
diff --git a/client/lib/popup.js b/client/lib/popup.js
index 0a700f82..9abe48aa 100644
--- a/client/lib/popup.js
+++ b/client/lib/popup.js
@@ -4,9 +4,9 @@ window.Popup = new class {
     this.template = Template.popup;
 
     // We only want to display one popup at a time and we keep the view object
-    // in this `Popup._current` variable. If there is no popup currently opened
+    // in this `Popup.current` variable. If there is no popup currently opened
     // the value is `null`.
-    this._current = null;
+    this.current = null;
 
     // It's possible to open a sub-popup B from a popup A. In that case we keep
     // the data of popup A so we can return back to it. Every time we open a new
@@ -27,11 +27,9 @@ window.Popup = new class {
   open(name) {
     const self = this;
     const popupName = `${name}Popup`;
-
     function clickFromPopup(evt) {
       return $(evt.target).closest('.js-pop-over').length !== 0;
     }
-
     return function(evt) {
       // If a popup is already opened, clicking again on the opener element
       // should close it -- and interrupt the current `open` function.
@@ -57,7 +55,6 @@ window.Popup = new class {
         self._stack = [];
         openerElement = evt.currentTarget;
       }
-
       $(openerElement).addClass('is-active');
       evt.preventDefault();
 
@@ -139,6 +136,7 @@ window.Popup = new class {
       const openerElement = this._getTopStack().openerElement;
       $(openerElement).removeClass('is-active');
 
+
       this._stack = [];
     }
   }
@@ -186,7 +184,7 @@ window.Popup = new class {
       // positives.
       const title = TAPi18n.__(translationKey);
       // when popup showed as full of small screen, we need a default header to clearly see [X] button
-      const defaultTitle = Utils.isMiniScreen() ? 'Wekan' : false;
+      const defaultTitle = Utils.isMiniScreen() ? '' : false;
       return title !== translationKey ? title : defaultTitle;
     };
   }
@@ -200,7 +198,7 @@ escapeActions.forEach((actionName) => {
     () => Popup[actionName](),
     () => Popup.isOpen(),
     {
-      noClickEscapeOn: '.js-pop-over',
+      noClickEscapeOn: '.js-pop-over,.js-open-card-title-popup',
       enabledOnClick: actionName === 'close',
     }
   );
diff --git a/client/lib/utils.js b/client/lib/utils.js
index 1f44c60d..e2339763 100644
--- a/client/lib/utils.js
+++ b/client/lib/utils.js
@@ -39,11 +39,11 @@ Utils = {
     if (!prevData && !nextData) {
       base = 0;
       increment = 1;
-    // If we drop the card in the first position
+      // If we drop the card in the first position
     } else if (!prevData) {
       base = nextData.sort - 1;
       increment = -1;
-    // If we drop the card in the last position
+      // If we drop the card in the last position
     } else if (!nextData) {
       base = prevData.sort + 1;
       increment = 1;
@@ -71,11 +71,11 @@ Utils = {
     if (!prevCardDomElement && !nextCardDomElement) {
       base = 0;
       increment = 1;
-    // If we drop the card in the first position
+      // If we drop the card in the first position
     } else if (!prevCardDomElement) {
       base = Blaze.getData(nextCardDomElement).sort - 1;
       increment = -1;
-    // If we drop the card in the last position
+      // If we drop the card in the last position
     } else if (!nextCardDomElement) {
       base = Blaze.getData(prevCardDomElement).sort + 1;
       increment = 1;
@@ -95,6 +95,151 @@ Utils = {
       increment,
     };
   },
+
+  // Detect touch device
+  isTouchDevice() {
+    const isTouchable = (() => {
+      const prefixes = ' -webkit- -moz- -o- -ms- '.split(' ');
+      const mq = function(query) {
+        return window.matchMedia(query).matches;
+      };
+
+      if (('ontouchstart' in window) || window.DocumentTouch && document instanceof window.DocumentTouch) {
+        return true;
+      }
+
+      // include the 'heartz' as a way to have a non matching MQ to help terminate the join
+      // https://git.io/vznFH
+      const query = ['(', prefixes.join('touch-enabled),('), 'heartz', ')'].join('');
+      return mq(query);
+    })();
+    Utils.isTouchDevice = () => isTouchable;
+    return isTouchable;
+  },
+
+  calculateTouchDistance(touchA, touchB) {
+    return Math.sqrt(
+      Math.pow(touchA.screenX - touchB.screenX, 2) +
+      Math.pow(touchA.screenY - touchB.screenY, 2)
+    );
+  },
+
+  enableClickOnTouch(selector) {
+    let touchStart = null;
+    let lastTouch = null;
+
+    $(document).on('touchstart', selector, function(e) {
+      touchStart = e.originalEvent.touches[0];
+    });
+    $(document).on('touchmove', selector, function(e) {
+      const touches = e.originalEvent.touches;
+      lastTouch = touches[touches.length - 1];
+    });
+    $(document).on('touchend', selector, function(e) {
+      if (touchStart && lastTouch && Utils.calculateTouchDistance(touchStart, lastTouch) <= 20) {
+        e.preventDefault();
+        const clickEvent = document.createEvent('MouseEvents');
+        clickEvent.initEvent('click', true, true);
+        e.target.dispatchEvent(clickEvent);
+      }
+    });
+  },
+
+  manageCustomUI(){
+    Meteor.call('getCustomUI', (err, data) => {
+      if (err && err.error[0] === 'var-not-exist'){
+        Session.set('customUI', false); // siteId || address server not defined
+      }
+      if (!err){
+        Utils.setCustomUI(data);
+      }
+    });
+  },
+
+  setCustomUI(data){
+    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    if (currentBoard) {
+      DocHead.setTitle(`${currentBoard.title  } - ${  data.productName}`);
+    } else {
+      DocHead.setTitle(`${data.productName}`);
+    }
+  },
+
+  setMatomo(data){
+    window._paq = window._paq || [];
+    window._paq.push(['setDoNotTrack', data.doNotTrack]);
+    if (data.withUserName){
+      window._paq.push(['setUserId', Meteor.user().username]);
+    }
+    window._paq.push(['trackPageView']);
+    window._paq.push(['enableLinkTracking']);
+
+    (function() {
+      window._paq.push(['setTrackerUrl', `${data.address}piwik.php`]);
+      window._paq.push(['setSiteId', data.siteId]);
+
+      const script = document.createElement('script');
+      Object.assign(script, {
+        id: 'scriptMatomo',
+        type: 'text/javascript',
+        async: 'true',
+        defer: 'true',
+        src: `${data.address}piwik.js`,
+      });
+
+      const s = document.getElementsByTagName('script')[0];
+      s.parentNode.insertBefore(script, s);
+    })();
+
+    Session.set('matomo', true);
+  },
+
+  manageMatomo() {
+    const matomo = Session.get('matomo');
+    if (matomo === undefined){
+      Meteor.call('getMatomoConf', (err, data) => {
+        if (err && err.error[0] === 'var-not-exist'){
+          Session.set('matomo', false); // siteId || address server not defined
+        }
+        if (!err){
+          Utils.setMatomo(data);
+        }
+      });
+    } else if (matomo) {
+      window._paq.push(['trackPageView']);
+    }
+  },
+
+  getTriggerActionDesc(event, tempInstance) {
+    const jqueryEl = tempInstance.$(event.currentTarget.parentNode);
+    const triggerEls = jqueryEl.find('.trigger-content').children();
+    let finalString = '';
+    for (let i = 0; i < triggerEls.length; i++) {
+      const element = tempInstance.$(triggerEls[i]);
+      if (element.hasClass('trigger-text')) {
+        finalString += element.text().toLowerCase();
+      } else if (element.hasClass('user-details')) {
+        let username = element.find('input').val();
+        if(username === undefined || username === ''){
+          username = '*';
+        }
+        finalString += `${element.find('.trigger-text').text().toLowerCase() } ${  username}`;
+      } else if (element.find('select').length > 0) {
+        finalString += element.find('select option:selected').text().toLowerCase();
+      } else if (element.find('input').length > 0) {
+        let inputvalue = element.find('input').val();
+        if(inputvalue === undefined || inputvalue === ''){
+          inputvalue = '*';
+        }
+        finalString += inputvalue;
+      }
+      // Add space
+      if (i !== length - 1) {
+        finalString += ' ';
+      }
+    }
+    return finalString;
+  },
 };
 
 // A simple tracker dependency that we invalidate every time the window is
diff --git a/config/models.js b/config/models.js
new file mode 100644
index 00000000..f70faae3
--- /dev/null
+++ b/config/models.js
@@ -0,0 +1,4 @@
+module.exports.models = {
+  connection: 'mongodb',
+  migrate: 'safe',
+};
diff --git a/config/router.js b/config/router.js
index 1f80004a..80e89e4c 100644
--- a/config/router.js
+++ b/config/router.js
@@ -14,6 +14,9 @@ FlowRouter.route('/', {
     Filter.reset();
     EscapeActions.executeAll();
 
+    Utils.manageCustomUI();
+    Utils.manageMatomo();
+
     BlazeLayout.render('defaultLayout', {
       headerBar: 'boardListHeaderBar',
       content: 'boardList',
@@ -38,6 +41,9 @@ FlowRouter.route('/b/:id/:slug', {
       EscapeActions.executeUpTo('popup-close');
     }
 
+    Utils.manageCustomUI();
+    Utils.manageMatomo();
+
     BlazeLayout.render('defaultLayout', {
       headerBar: 'boardHeaderBar',
       content: 'board',
@@ -53,6 +59,9 @@ FlowRouter.route('/b/:boardId/:slug/:cardId', {
     Session.set('currentBoard', params.boardId);
     Session.set('currentCard', params.cardId);
 
+    Utils.manageCustomUI();
+    Utils.manageMatomo();
+
     BlazeLayout.render('defaultLayout', {
       headerBar: 'boardHeaderBar',
       content: 'board',
@@ -116,6 +125,7 @@ FlowRouter.route('/setting', {
     },
   ],
   action() {
+    Utils.manageCustomUI();
     BlazeLayout.render('defaultLayout', {
       headerBar: 'settingHeaderBar',
       content: 'setting',
@@ -193,20 +203,21 @@ _.each(redirections, (newPath, oldPath) => {
 // using the `kadira:dochead` package. Currently we only use it to display the
 // board title if we are in a board page (see #364) but we may want to support
 // some <meta> tags in the future.
-const appTitle = 'Wekan';
+//const appTitle = Utils.manageCustomUI();
 
 // XXX The `Meteor.startup` should not be necessary -- we don't need to wait for
 // the complete DOM to be ready to call `DocHead.setTitle`. But the problem is
 // that the global variable `Boards` is undefined when this file loads so we
 // wait a bit until hopefully all files are loaded. This will be fixed in a
 // clean way once Meteor will support ES6 modules -- hopefully in Meteor 1.3.
-Meteor.isClient && Meteor.startup(() => {
-  Tracker.autorun(() => {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
-    const titleStack = [appTitle];
-    if (currentBoard) {
-      titleStack.push(currentBoard.title);
-    }
-    DocHead.setTitle(titleStack.reverse().join(' - '));
-  });
-});
+//Meteor.isClient && Meteor.startup(() => {
+//  Tracker.autorun(() => {
+
+//    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+//    const titleStack = [appTitle];
+//    if (currentBoard) {
+//      titleStack.push(currentBoard.title);
+//    }
+//    DocHead.setTitle(titleStack.reverse().join(' - '));
+//  });
+//});
diff --git a/docker-compose.yml b/docker-compose.yml
index 0f03055b..cb8f5b6d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,9 +1,101 @@
 version: '2'
 
+# Note: Do not add single quotes '' to variables. Having spaces still works without quotes where required.
+#---------------------------------------------------------------------------------------------------------
+# ==== CREATING USERS AND LOGGING IN TO WEKAN ====
+# https://github.com/wekan/wekan/wiki/Adding-users
+#---------------------------------------------------------------------------------------------------------
+# ==== FORGOT PASSWORD ====
+# https://github.com/wekan/wekan/wiki/Forgot-Password
+#---------------------------------------------------------------------------------------------------------
+# ==== Upgrading Wekan to new version =====
+# 1) Stop Wekan:
+#      docker-compose stop
+# 2) Download new version:
+#      docker-compose pull wekan
+# 3) If you have more networks for VPN etc as described at bottom of
+#    this config, download for them too:
+#      docker-compose pull wekan2
+# 4) Start Wekan:
+#      docker-compose start
+#----------------------------------------------------------------------------------
+# ==== OPTIONAL: DEDICATED DOCKER USER ====
+# 1) Optionally create a dedicated user for Wekan, for example:
+#      sudo useradd -d /home/wekan -m -s /bin/bash wekan
+# 2) Add this user to the docker group, then logout+login or reboot:
+#      sudo usermod -aG docker wekan
+# 3) Then login as user wekan.
+# 4) Create this file /home/wekan/docker-compose.yml with your modifications.
+#----------------------------------------------------------------------------------
+# ==== RUN DOCKER AS SERVICE ====
+# 1a) Running Docker as service, on Systemd like Debian 9, Ubuntu 16.04, CentOS 7:
+#      sudo systemctl enable docker
+#      sudo systemctl start docker
+# 1b) Running Docker as service, on init.d like Debian 8, Ubuntu 14.04, CentOS 6:
+#      sudo update-rc.d docker defaults
+#      sudo service docker start
+# ----------------------------------------------------------------------------------
+# ==== USAGE OF THIS docker-compose.yml ====
+# 1) For seeing does Wekan work, try this and check with your webbroser:
+#      docker-compose up
+# 2) Stop Wekan and start Wekan in background:
+#     docker-compose stop
+#     docker-compose up -d
+# 3) See running Docker containers:
+#     docker ps
+# 4) Stop Docker containers:
+#     docker-compose stop
+# ----------------------------------------------------------------------------------
+# ===== INSIDE DOCKER CONTAINERS, AND BACKUP/RESTORE ====
+# https://github.com/wekan/wekan/wiki/Backup
+# If really necessary, repair MongoDB: https://github.com/wekan/wekan-mongodb/issues/6#issuecomment-424004116
+# 1) Going inside containers:
+#    a) Wekan app, does not contain data
+#         docker exec -it wekan-app bash
+#    b) MongoDB, contains all data
+#         docker exec -it wekan-db bash
+# 2) Copying database to outside of container:
+#      docker exec -it wekan-db bash
+#      cd /data
+#      mongodump
+#      exit
+#      docker cp wekan-db:/data/dump .
+# 3) Restoring database
+#      # 1) Stop wekan
+#             docker stop wekan-app
+#      # 2) Go inside database container
+#             docker exec -it wekan-db bash
+#      # 3) and data directory
+#             cd /data
+#      # 4) Remove previos dump
+#             rm -rf dump
+#      # 5) Exit db container
+#             exit
+#      # 6) Copy dump to inside docker container
+#             docker cp dump wekan-db:/data/
+#      # 7) Go inside database container
+#             docker exec -it wekan-db bash
+#      # 8) and data directory
+#             cd /data
+#      # 9) Restore
+#             mongorestore --drop
+#      # 10) Exit db container
+#             exit
+#      # 11) Start wekan
+#             docker start wekan-app
+#-------------------------------------------------------------------------
+
 services:
 
   wekandb:
-    image: mongo:3.2.19
+    #-------------------------------------------------------------------------------------
+    # ==== MONGODB AND METEOR VERSION ====
+    # a) For Wekan Meteor 1.8.x version at meteor-1.8 branch, use mongo 4.x
+    #image: mongo:4.0.4
+    # b) For Wekan Meteor 1.6.x version at master/devel/edge branches.
+    # Only for Snap and Sandstorm while they are not upgraded yet to Meteor 1.8.x
+    image: mongo:3.2.21
+    #-------------------------------------------------------------------------------------
     container_name: wekan-db
     restart: always
     command: mongod --smallfiles --oplogSize 128
@@ -16,30 +108,446 @@ services:
       - wekan-db-dump:/dump
 
   wekan:
-    image: quay.io/wekan/wekan
+    #-------------------------------------------------------------------------------------
+    # ==== MONGODB AND METEOR VERSION ====
+    # a) For Wekan Meteor 1.8.x version at meteor-1.8 branch,
+    #    using https://quay.io/wekan/wekan automatic builds
+    #image: quay.io/wekan/wekan:meteor-1.8
+    # b) For Wekan Meteor 1.6.x version at master/devel/edge branches.
+    # Only for Snap and Sandstorm while they are not upgraded yet to Meteor 1.8.x
+    image: quay.io/wekan/wekan:master
+    # c) Using specific Meteor 1.6.x version tag:
+    # image: quay.io/wekan/wekan:v1.95
+    # c) Using Docker Hub automatic builds https://hub.docker.com/r/wekanteam/wekan
+    # image: wekanteam/wekan:meteor-1.8
+    # image: wekanteam/wekan:v1.95
+    #-------------------------------------------------------------------------------------
     container_name: wekan-app
     restart: always
     networks:
       - wekan-tier
-    build:
-      context: .
-      dockerfile: Dockerfile
-      args:
-        - NODE_VERSION=${NODE_VERSION}
-        - METEOR_RELEASE=${METEOR_RELEASE}
-        - NPM_VERSION=${NPM_VERSION}
-        - ARCHITECTURE=${ARCHITECTURE}
-        - SRC_PATH=${SRC_PATH}
-        - METEOR_EDGE=${METEOR_EDGE}
-        - USE_EDGE=${USE_EDGE}
+    #-------------------------------------------------------------------------------------
+    # ==== BUILD wekan-app DOCKER CONTAINER FROM SOURCE, if you uncomment these ====
+    # ==== and use commands: docker-compose up -d --build
+    #build:
+    #  context: .
+    #  dockerfile: Dockerfile
+    #  args:
+    #    - NODE_VERSION=${NODE_VERSION}
+    #    - METEOR_RELEASE=${METEOR_RELEASE}
+    #    - NPM_VERSION=${NPM_VERSION}
+    #    - ARCHITECTURE=${ARCHITECTURE}
+    #    - SRC_PATH=${SRC_PATH}
+    #    - METEOR_EDGE=${METEOR_EDGE}
+    #    - USE_EDGE=${USE_EDGE}
+    #-------------------------------------------------------------------------------------
     ports:
-      - 80:80
+      # Docker outsideport:insideport. Do not add anything extra here.
+      # For example, if you want to have wekan on port 3001,
+      # use 3001:8080 . Do not add any extra address etc here, that way it does not work.
+      # remove port mapping if you use nginx reverse proxy, port 8080 is already exposed to wekan-tier network
+      - 80:8080
     environment:
       - MONGO_URL=mongodb://wekandb:27017/wekan
-      - ROOT_URL=http://localhost
+      #---------------------------------------------------------------
+      # ==== ROOT_URL SETTING ====
+      # Change ROOT_URL to your real Wekan URL, for example:
+      # If you have Caddy/Nginx/Apache providing SSL
+      #  - https://example.com
+      #  - https://boards.example.com
+      # This can be problematic with avatars https://github.com/wekan/wekan/issues/1776
+      #  - https://example.com/wekan
+      # If without https, can be only wekan node, no need for Caddy/Nginx/Apache if you don't need them
+      #  - http://example.com
+      #  - http://boards.example.com
+      #  - http://192.168.1.100    <=== using at local LAN
+      - ROOT_URL=http://localhost  #   <=== using only at same laptop/desktop where Wekan is installed
+      #---------------------------------------------------------------
+      # ==== EMAIL SETTINGS ====
+      # Email settings are required in both MAIL_URL and Admin Panel,
+      #   see https://github.com/wekan/wekan/wiki/Troubleshooting-Mail
+      #   For SSL in email, change smtp:// to smtps://
+      # NOTE: Special characters need to be url-encoded in MAIL_URL.
+      #       You can encode those characters for example at: https://www.urlencoder.org
+      #- MAIL_URL=smtp://user:pass@mailserver.example.com:25/
+      - MAIL_URL=smtp://<mail_url>:25/?ignoreTLS=true&tls={rejectUnauthorized:false}
+      - MAIL_FROM=Wekan Notifications <noreply.wekan@mydomain.com>
+      #---------------------------------------------------------------
+      # ==== OPTIONAL: MONGO OPLOG SETTINGS =====
+      # https://github.com/wekan/wekan-mongodb/issues/2#issuecomment-378343587
+      # We've fixed our CPU usage problem today with an environment
+      # change around Wekan. I wasn't aware during implementation
+      # that if you're using more than 1 instance of Wekan
+      # (or any MeteorJS based tool) you're supposed to set
+      # MONGO_OPLOG_URL as an environment variable.
+      # Without setting it, Meteor will perform a pull-and-diff
+      # update of it's dataset. With it, Meteor will update from
+      # the OPLOG. See here
+      #   https://blog.meteor.com/tuning-meteor-mongo-livedata-for-scalability-13fe9deb8908
+      # After setting
+      # MONGO_OPLOG_URL=mongodb://<username>:<password>@<mongoDbURL>/local?authSource=admin&replicaSet=rsWekan
+      # the CPU usage for all Wekan instances dropped to an average
+      # of less than 10% with only occasional spikes to high usage
+      # (I guess when someone is doing a lot of work)
+      # - MONGO_OPLOG_URL=mongodb://<username>:<password>@<mongoDbURL>/local?authSource=admin&replicaSet=rsWekan
+      #---------------------------------------------------------------
+      # ==== OPTIONAL: KADIRA PERFORMANCE MONITORING FOR METEOR ====
+      # https://github.com/edemaine/kadira-compose
+      # https://github.com/meteor/meteor-apm-agent
+      # https://blog.meteor.com/kadira-apm-is-now-open-source-490469ffc85f
+      #- APM_OPTIONS_ENDPOINT=http://<kadira-ip>:11011
+      #- APM_APP_ID=
+      #- APM_APP_SECRET=
+      #---------------------------------------------------------------
+      # ==== OPTIONAL: LOGS AND STATS ====
+      # https://github.com/wekan/wekan/wiki/Logs
+      #
+      # Daily export of Wekan changes as JSON to Logstash and ElasticSearch / Kibana (ELK)
+      # https://github.com/wekan/wekan-logstash
+      #
+      # Statistics Python script for Wekan Dashboard
+      # https://github.com/wekan/wekan-stats
+      #
+      # Console, file, and zulip logger on database changes https://github.com/wekan/wekan/pull/1010
+      # with fix to replace console.log by winston logger https://github.com/wekan/wekan/pull/1033
+      # but there could be bug https://github.com/wekan/wekan/issues/1094
+      #
+      # There is Feature Request: Logging date and time of all activity with summary reports,
+      # and requesting reason for changing card to other column https://github.com/wekan/wekan/issues/1598
+      #---------------------------------------------------------------
+      # ==== WEKAN API AND EXPORT BOARD ====
+      # Wekan Export Board works when WITH_API=true.
+      # https://github.com/wekan/wekan/wiki/REST-API
+      # https://github.com/wekan/wekan-gogs
+      # If you disable Wekan API with false, Export Board does not work.
+      - WITH_API=true
+      #---------------------------------------------------------------
+      # ==== PASSWORD BRUTE FORCE PROTECTION ====
+      #https://atmospherejs.com/lucasantoniassi/accounts-lockout
+      #Defaults below. Uncomment to change. wekan/server/accounts-lockout.js
+      #- ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE=3
+      #- ACCOUNTS_LOCKOUT_KNOWN_USERS_PERIOD=60
+      #- ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURE_WINDOW=15
+      #- ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURES_BERORE=3
+      #- ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD=60
+      #- ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW=15
+      #---------------------------------------------------------------
+      # ==== EMAIL NOTIFICATION TIMEOUT, ms =====
+      # Defaut: 30000 ms = 30s
+      #- EMAIL_NOTIFICATION_TIMEOUT=30000
+      #-----------------------------------------------------------------
+      # ==== CORS =====
+      # CORS: Set Access-Control-Allow-Origin header.
+      #- CORS=*
+      #-----------------------------------------------------------------
+      # ==== MATOMO INTEGRATION ====
+      # Optional: Integration with Matomo https://matomo.org that is installed to your server
+      # The address of the server where Matomo is hosted.
+      #- MATOMO_ADDRESS=https://example.com/matomo
+      # The value of the site ID given in Matomo server for Wekan
+      #- MATOMO_SITE_ID=1
+      # The option do not track which enables users to not be tracked by matomo
+      #- MATOMO_DO_NOT_TRACK=true
+      # The option that allows matomo to retrieve the username:
+      #- MATOMO_WITH_USERNAME=true
+      #-----------------------------------------------------------------
+      # ==== BROWSER POLICY AND TRUSTED IFRAME URL ====
+      # Enable browser policy and allow one trusted URL that can have iframe that has Wekan embedded inside.
+      # Setting this to false is not recommended, it also disables all other browser policy protections
+      # and allows all iframing etc. See wekan/server/policy.js
+      - BROWSER_POLICY_ENABLED=true
+      # When browser policy is enabled, HTML code at this Trusted URL can have iframe that embeds Wekan inside.
+      #- TRUSTED_URL=https://intra.example.com
+      #-----------------------------------------------------------------
+      # ==== OUTGOING WEBHOOKS ====
+      # What to send to Outgoing Webhook, or leave out. Example, that includes all that are default: cardId,listId,oldListId,boardId,comment,user,card,commentId .
+      #- WEBHOOKS_ATTRIBUTES=cardId,listId,oldListId,boardId,comment,user,card,commentId
+      #-----------------------------------------------------------------
+      # ==== Debug OIDC OAuth2 etc ====
+      #- DEBUG=true
+      #-----------------------------------------------------------------
+      # ==== OAUTH2 AZURE ====
+      # https://github.com/wekan/wekan/wiki/Azure
+      # 1) Register the application with Azure. Make sure you capture
+      #    the application ID as well as generate a secret key.
+      # 2) Configure the environment variables. This differs slightly
+      #     by installation type, but make sure you have the following:
+      #- OAUTH2_ENABLED=true
+      # OAuth2 login style: popup or redirect.
+      #- OAUTH2_LOGIN_STYLE=redirect
+      # Application GUID captured during app registration:
+      #- OAUTH2_CLIENT_ID=xxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxx
+      # Secret key generated during app registration:
+      #- OAUTH2_SECRET=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+      #- OAUTH2_SERVER_URL=https://login.microsoftonline.com/
+      #- OAUTH2_AUTH_ENDPOINT=/oauth2/v2.0/authorize
+      #- OAUTH2_USERINFO_ENDPOINT=https://graph.microsoft.com/oidc/userinfo
+      #- OAUTH2_TOKEN_ENDPOINT=/oauth2/v2.0/token
+      # The claim name you want to map to the unique ID field:
+      #- OAUTH2_ID_MAP=email
+      # The claim name you want to map to the username field:
+      #- OAUTH2_USERNAME_MAP=email
+      # The claim name you want to map to the full name field:
+      #- OAUTH2_FULLNAME_MAP=name
+      # Tthe claim name you want to map to the email field:
+      #- OAUTH2_EMAIL_MAP=email
+      #-----------------------------------------------------------------
+      # ==== OAUTH2 KEYCLOAK ====
+      # https://github.com/wekan/wekan/wiki/Keycloak  <== MAPPING INFO, REQUIRED
+      #- OAUTH2_ENABLED=true
+      # OAuth2 login style: popup or redirect.
+      #- OAUTH2_LOGIN_STYLE=redirect
+      #- OAUTH2_CLIENT_ID=<Keycloak create Client ID>
+      #- OAUTH2_SERVER_URL=<Keycloak server name>/auth
+      #- OAUTH2_AUTH_ENDPOINT=/realms/<keycloak realm>/protocol/openid-connect/auth
+      #- OAUTH2_USERINFO_ENDPOINT=/realms/<keycloak realm>/protocol/openid-connect/userinfo
+      #- OAUTH2_TOKEN_ENDPOINT=/realms/<keycloak realm>/protocol/openid-connect/token
+      #- OAUTH2_SECRET=<keycloak client secret>
+      #-----------------------------------------------------------------
+      # ==== OAUTH2 DOORKEEPER ====
+      # https://github.com/wekan/wekan/issues/1874
+      # https://github.com/wekan/wekan/wiki/OAuth2
+      # Enable the OAuth2 connection
+      #- OAUTH2_ENABLED=true
+      # OAuth2 docs: https://github.com/wekan/wekan/wiki/OAuth2
+      # OAuth2 login style: popup or redirect.
+      #- OAUTH2_LOGIN_STYLE=redirect
+      # OAuth2 Client ID.
+      #- OAUTH2_CLIENT_ID=abcde12345
+      # OAuth2 Secret.
+      #- OAUTH2_SECRET=54321abcde
+      # OAuth2 Server URL.
+      #- OAUTH2_SERVER_URL=https://chat.example.com
+      # OAuth2 Authorization Endpoint.
+      #- OAUTH2_AUTH_ENDPOINT=/oauth/authorize
+      # OAuth2 Userinfo Endpoint.
+      #- OAUTH2_USERINFO_ENDPOINT=/oauth/userinfo
+      # OAuth2 Token Endpoint.
+      #- OAUTH2_TOKEN_ENDPOINT=/oauth/token
+      # OAuth2 ID Mapping
+      #- OAUTH2_ID_MAP=
+      # OAuth2 Username Mapping
+      #- OAUTH2_USERNAME_MAP=
+      # OAuth2 Fullname Mapping
+      #- OAUTH2_FULLNAME_MAP=
+      # OAuth2 Email Mapping
+      #- OAUTH2_EMAIL_MAP=
+      #-----------------------------------------------------------------
+      # ==== LDAP: UNCOMMENT ALL TO ENABLE LDAP ====
+      # https://github.com/wekan/wekan/wiki/LDAP
+      # For Snap settings see https://github.com/wekan/wekan-snap/wiki/Supported-settings-keys
+      # Most settings work both on Snap and Docker below.
+      # Note: Do not add single quotes '' to variables. Having spaces still works without quotes where required.
+      #
+      # The default authentication method used if a user does not exist to create and authenticate. Can be set as ldap.
+      #- DEFAULT_AUTHENTICATION_METHOD=ldap
+      #
+      # Enable or not the connection by the LDAP
+      #- LDAP_ENABLE=true
+      #
+      # The port of the LDAP server
+      #- LDAP_PORT=389
+      #
+      # The host server for the LDAP server
+      #- LDAP_HOST=localhost
+      #
+      # The base DN for the LDAP Tree
+      #- LDAP_BASEDN=ou=user,dc=example,dc=org
+      #
+      # Fallback on the default authentication method
+      #- LDAP_LOGIN_FALLBACK=false
+      #
+      # Reconnect to the server if the connection is lost
+      #- LDAP_RECONNECT=true
+      #
+      # Overall timeout, in milliseconds
+      #- LDAP_TIMEOUT=10000
+      #
+      # Specifies the timeout for idle LDAP connections in milliseconds
+      #- LDAP_IDLE_TIMEOUT=10000
+      #
+      # Connection timeout, in milliseconds
+      #- LDAP_CONNECT_TIMEOUT=10000
+      #
+      # If the LDAP needs a user account to search
+      #- LDAP_AUTHENTIFICATION=true
+      #
+      # The search user DN
+      #- LDAP_AUTHENTIFICATION_USERDN=cn=wekan_adm,ou=serviceaccounts,ou=admin,ou=prod,dc=mydomain,dc=com
+      #
+      # The password for the search user
+      #- LDAP_AUTHENTIFICATION_PASSWORD=pwd
+      #
+      # Enable logs for the module
+      #- LDAP_LOG_ENABLED=true
+      #
+      # If the sync of the users should be done in the background
+      #- LDAP_BACKGROUND_SYNC=false
+      #
+      # At which interval does the background task sync in milliseconds
+      #- LDAP_BACKGROUND_SYNC_INTERVAL=100
+      #
+      #- LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED=false
+      #
+      #- LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=false
+      #
+      # If using LDAPS: LDAP_ENCRYPTION=ssl
+      #- LDAP_ENCRYPTION=false
+      #
+      # The certification for the LDAPS server. Certificate needs to be included in this docker-compose.yml file.
+      #- LDAP_CA_CERT=-----BEGIN CERTIFICATE-----MIIE+G2FIdAgIC...-----END CERTIFICATE-----
+      #
+      # Reject Unauthorized Certificate
+      #- LDAP_REJECT_UNAUTHORIZED=false
+      #
+      # Optional extra LDAP filters. Don't forget the outmost enclosing parentheses if needed
+      #- LDAP_USER_SEARCH_FILTER=
+      #
+      # base (search only in the provided DN), one (search only in the provided DN and one level deep), or sub (search the whole subtree)
+      #- LDAP_USER_SEARCH_SCOPE=one
+      #
+      # Which field is used to find the user, like uid / sAMAccountName
+      #- LDAP_USER_SEARCH_FIELD=sAMAccountName
+      #
+      # Used for pagination (0=unlimited)
+      #- LDAP_SEARCH_PAGE_SIZE=0
+      #
+      # The limit number of entries (0=unlimited)
+      #- LDAP_SEARCH_SIZE_LIMIT=0
+      #
+      # Enable group filtering
+      #- LDAP_GROUP_FILTER_ENABLE=false
+      #
+      # The object class for filtering. Example: group
+      #- LDAP_GROUP_FILTER_OBJECTCLASS=
+      #
+      #- LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE=
+      #
+      #- LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE=
+      #
+      #- LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT=
+      #
+      #- LDAP_GROUP_FILTER_GROUP_NAME=
+      #
+      # LDAP_UNIQUE_IDENTIFIER_FIELD : This field is sometimes class GUID (Globally Unique Identifier). Example: guid
+      #- LDAP_UNIQUE_IDENTIFIER_FIELD=
+      #
+      # LDAP_UTF8_NAMES_SLUGIFY : Convert the username to utf8
+      #- LDAP_UTF8_NAMES_SLUGIFY=true
+      #
+      # LDAP_USERNAME_FIELD : Which field contains the ldap username. username / sAMAccountName
+      #- LDAP_USERNAME_FIELD=sAMAccountName
+      #
+      # LDAP_FULLNAME_FIELD : Which field contains the ldap fullname. fullname / sAMAccountName
+      #- LDAP_FULLNAME_FIELD=fullname
+      #
+      #- LDAP_MERGE_EXISTING_USERS=false
+      #
+      # Allow existing account matching by e-mail address when username does not match
+      #- LDAP_EMAIL_MATCH_ENABLE=true
+      #
+      # LDAP_EMAIL_MATCH_REQUIRE : require existing account matching by e-mail address when username does match
+      #- LDAP_EMAIL_MATCH_REQUIRE=true
+      #
+      # LDAP_EMAIL_MATCH_VERIFIED : require existing account email address to be verified for matching
+      #- LDAP_EMAIL_MATCH_VERIFIED=true
+      #
+      # LDAP_EMAIL_FIELD : which field contains the LDAP e-mail address
+      #- LDAP_EMAIL_FIELD=mail
+      #-----------------------------------------------------------------
+      #- LDAP_SYNC_USER_DATA=false
+      #
+      #- LDAP_SYNC_USER_DATA_FIELDMAP={"cn":"name", "mail":"email"}
+      #
+      #- LDAP_SYNC_GROUP_ROLES=''
+      #
+      # The default domain of the ldap it is used to create email if the field is not map correctly with the LDAP_SYNC_USER_DATA_FIELDMAP
+      # example :
+      #- LDAP_DEFAULT_DOMAIN=mydomain.com
+      #
+      # Enable/Disable syncing of admin status based on ldap groups:
+      #- LDAP_SYNC_ADMIN_STATUS=true
+      #
+      # Comma separated list of admin group names to sync.
+      #- LDAP_SYNC_ADMIN_GROUPS=group1,group2
+      #---------------------------------------------------------------------
+      # Login to LDAP automatically with HTTP header.
+      # In below example for siteminder, at right side of = is header name.
+      #- HEADER_LOGIN_ID=HEADERUID
+      #- HEADER_LOGIN_FIRSTNAME=HEADERFIRSTNAME
+      #- HEADER_LOGIN_LASTNAME=HEADERLASTNAME
+      #- HEADER_LOGIN_EMAIL=HEADEREMAILADDRESS
+      #---------------------------------------------------------------------
+      # ==== LOGOUT TIMER, probably does not work yet ====
+      # LOGOUT_WITH_TIMER : Enables or not the option logout with timer
+      # example : LOGOUT_WITH_TIMER=true
+      #- LOGOUT_WITH_TIMER=
+      #
+      # LOGOUT_IN : The number of days
+      # example : LOGOUT_IN=1
+      #- LOGOUT_IN=
+      #
+      # LOGOUT_ON_HOURS : The number of hours
+      # example : LOGOUT_ON_HOURS=9
+      #- LOGOUT_ON_HOURS=
+      #
+      # LOGOUT_ON_MINUTES : The number of minutes
+      # example : LOGOUT_ON_MINUTES=55
+      #- LOGOUT_ON_MINUTES=
+      #-------------------------------------------------------------------
+
     depends_on:
       - wekandb
 
+#---------------------------------------------------------------------------------
+# ==== OPTIONAL: SHARE DATABASE TO OFFICE LAN AND REMOTE VPN ====
+#  When using Wekan both at office LAN and remote VPN:
+#    1) Have above Wekan docker container config with LAN IP address
+#    2) Copy all of above wekan container config below, look above of this part above and all config below it,
+#       before above depends_on: part:
+#
+#         wekan:
+#            #-------------------------------------------------------------------------------------
+#            # ==== MONGODB AND METEOR VERSION ====
+#            # a) For Wekan Meteor 1.8.x version at meteor-1.8 branch, .....
+#
+#
+#       and change name to different name like wekan2 or wekanvpn, and change ROOT_URL to server VPN IP
+#       address.
+#    3) This way both Wekan containers can use same MongoDB database
+#       and see the same Wekan boards.
+#    4) You could also add 3rd Wekan container for 3rd network etc.
+# EXAMPLE:
+#  wekan2:
+#    ....COPY CONFIG FROM ABOVE TO HERE...
+#    environment:
+#      - ROOT_URL='http://10.10.10.10'
+#      ...COPY CONFIG FROM ABOVE TO HERE...
+#---------------------------------------------------------------------------------
+
+# OPTIONAL NGINX CONFIG FOR REVERSE PROXY
+#  nginx:
+#    image: nginx
+#    container_name: nginx
+#    restart: always
+#    networks:
+#      - wekan-tier
+#    depends_on:
+#      - wekan
+#    ports:
+#      - 80:80
+#      - 443:443
+#    volumes:
+#      - ./nginx/ssl:/etc/nginx/ssl/:ro
+#      - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro
+## Alternative volume config:
+##   volumes:
+##     - ./nginx/nginx.conf:/etc/nginx/conf.d/default.conf:ro
+##     - ./nginx/ssl/ssl.conf:/etc/nginx/conf.d/ssl/ssl.conf:ro
+##     - ./nginx/ssl/testvm-ehu.crt:/etc/nginx/conf.d/ssl/certs/mycert.crt:ro
+##     - ./nginx/ssl/testvm-ehu.key:/etc/nginx/conf.d/ssl/certs/mykey.key:ro
+##     - ./nginx/ssl/pphrase:/etc/nginx/conf.d/ssl/pphrase:ro
+
 volumes:
   wekan-db:
     driver: local
diff --git a/find.sh b/find.sh
new file mode 100755
index 00000000..b552866e
--- /dev/null
+++ b/find.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# Find text from all subdirectories
+# and ignore all temporary directories:
+# - node-modules = installed node modules
+# - .build = Wekan bundle that is combined from source. Do not edit these, these are deleted and recreated.
+# - .meteor = Meteor version, packages etc at .meteor/local
+# - .git = git history
+
+# If less or more that 1 parameter, show usage.
+if (( $# != 1 )); then
+    echo 'Usage: ./find.sh text-to-find'
+    exit 0
+fi
+
+find . | grep -v node_modules | grep -v .build | grep -v .meteor | grep -v .git | xargs grep --no-messages $1 | less
diff --git a/helm/wekan/.helmignore b/helm/wekan/.helmignore
new file mode 100644
index 00000000..7c04072e
--- /dev/null
+++ b/helm/wekan/.helmignore
@@ -0,0 +1,22 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+OWNERS
diff --git a/helm/wekan/Chart.yaml b/helm/wekan/Chart.yaml
new file mode 100644
index 00000000..ffd164bf
--- /dev/null
+++ b/helm/wekan/Chart.yaml
@@ -0,0 +1,13 @@
+name: wekan
+version: 1.0.0
+appVersion: 2.x.x
+kubeVersion: "^1.8.0-0"
+description: Open Source kanban
+home: https://wekan.github.io/
+icon: https://wekan.github.io/wekan-logo.svg
+sources:
+  - https://github.com/wekan/wekan
+maintainers:
+  - name: technotaff
+    email: github@randall.cc
+engine: gotpl
diff --git a/helm/wekan/OWNERS b/helm/wekan/OWNERS
new file mode 100644
index 00000000..08f7d5dd
--- /dev/null
+++ b/helm/wekan/OWNERS
@@ -0,0 +1,4 @@
+approvers:
+- technotaff
+reviewers:
+- technotaff
diff --git a/helm/wekan/README.md b/helm/wekan/README.md
new file mode 100644
index 00000000..d3af930c
--- /dev/null
+++ b/helm/wekan/README.md
@@ -0,0 +1,58 @@
+# Helm Chart for Wekan
+
+## Features
+
+o Uses a MongoDB replica set by default - this allows fault-tolerant
+  and scalable MongoDB deployment (or just set the replicas to 1 for
+  a single server install)
+
+o Optional Horizontal Pod Autoscaler (HPA), so that your Wekan pods
+  will scale automatically with increased CPU load.
+
+## The configurable values (values.yaml)
+
+Scaling Wekan:
+
+```yaml
+## Configuration for wekan component
+##
+
+replicaCount: 1
+```
+**replicaCount** Will set the initial number of replicas for the Wekan pod (and container)
+
+```yaml
+## Configure an horizontal pod autoscaler
+##
+autoscaling:
+  enabled: true
+  config:
+    minReplicas: 1
+    maxReplicas: 16
+    ## Note: when setting this, a `resources.request.cpu` is required. You
+    ## likely want to set it to `1` or some lower value.
+    ##
+    targetCPUUtilizationPercentage: 80
+```
+This section (if *enabled* is set to **true**) will enable the Kubernetes Horizontal Pod Autoscaler (HPA).
+
+**minReplicas:** this is the minimum number of pods to scale down to (We recommend setting this to the same value as **replicaCount**).
+
+**maxReplicas:** this is the maximum number of pods to scale up to.
+
+**targetCPUUtilizationPercentage:** This is the CPU at which the HPA will scale-out the number of Wekan pods.
+
+```yaml
+mongodb-replicaset:
+  enabled: true
+  replicas: 3
+  replicaSetName: rs0
+  securityContext:
+    runAsUser: 1000
+    fsGroup: 1000
+    runAsNonRoot: true
+```
+
+This section controls the scale of the MongoDB redundant Replica Set.
+
+**replicas:** This is the number of MongoDB instances to include in the set. You can set this to 1 for a single server - this will still allow you to scale-up later with a helm upgrade.
diff --git a/helm/wekan/charts/.gitkeep b/helm/wekan/charts/.gitkeep
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/helm/wekan/charts/.gitkeep
@@ -0,0 +1 @@
+
diff --git a/helm/wekan/requirements.yaml b/helm/wekan/requirements.yaml
new file mode 100644
index 00000000..e2492a91
--- /dev/null
+++ b/helm/wekan/requirements.yaml
@@ -0,0 +1,5 @@
+dependencies:
+- name: mongodb-replicaset
+  version: 3.6.x
+  repository: "https://kubernetes-charts.storage.googleapis.com/"
+  condition: mongodb-replicaset.enabled
diff --git a/helm/wekan/templates/NOTES.txt b/helm/wekan/templates/NOTES.txt
new file mode 100644
index 00000000..8aa2e27b
--- /dev/null
+++ b/helm/wekan/templates/NOTES.txt
@@ -0,0 +1,19 @@
+1. Get the application URL by running these commands:
+{{- if .Values.ingress.enabled }}
+{{- range .Values.ingress.hosts }}
+  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.ingress.path }}
+{{- end }}
+{{- else if contains "NodePort" .Values.service.type }}
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "wekan.fullname" . }})
+  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+  echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" .Values.service.type }}
+     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+           You can watch the status of by running 'kubectl get svc -w {{ template "wekan.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "wekan.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+  echo http://$SERVICE_IP:{{ .Values.service.port }}
+{{- else if contains "ClusterIP" .Values.service.type }}
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "wekan.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  echo "Visit http://127.0.0.1:8080 to use your application"
+  kubectl port-forward $POD_NAME 8080:8080
+{{- end }}
diff --git a/helm/wekan/templates/_helpers.tpl b/helm/wekan/templates/_helpers.tpl
new file mode 100644
index 00000000..68f71ef7
--- /dev/null
+++ b/helm/wekan/templates/_helpers.tpl
@@ -0,0 +1,82 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "wekan.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "wekan.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified name for the wekan data app.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "wekan.localdata.fullname" -}}
+{{- if .Values.localdata.fullnameOverride -}}
+{{- .Values.localdata.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- printf "%s-localdata" .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s-localdata" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "wekan.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create the name of the service account to use for the api component
+*/}}
+{{- define "wekan.serviceAccountName" -}}
+{{- if .Values.serviceAccounts.create -}}
+    {{ default (include "wekan.fullname" .) .Values.serviceAccounts.name }}
+{{- else -}}
+    {{ default "default" .Values.serviceAccounts.name }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified mongodb-replicaset name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "wekan.mongodb-replicaset.fullname" -}}
+{{- $name := default "mongodb-replicaset" (index .Values "mongodb-replicaset" "nameOverride") -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create the MongoDB URL. If MongoDB is installed as part of this chart, use k8s service discovery,
+else use user-provided URL.
+*/}}
+{{- define "mongodb-replicaset.url" -}}
+{{- if (index .Values "mongodb-replicaset" "enabled") -}}
+{{- $count := (int (index .Values "mongodb-replicaset" "replicas")) -}}
+{{- $release := .Release.Name -}}
+mongodb://{{- range $v := until $count }}{{ $release }}-mongodb-replicaset-{{ $v }}.{{ $release }}-mongodb-replicaset:27017{{ if ne $v (sub $count 1) }},{{- end -}}{{- end -}}?replicaSet={{ index .Values "mongodb-replicaset" "replicaSetName" }}
+{{- else -}}
+{{- index .Values "mongodb-replicaset" "url" -}}
+{{- end -}}
+{{- end -}}
diff --git a/helm/wekan/templates/deployment.yaml b/helm/wekan/templates/deployment.yaml
new file mode 100644
index 00000000..e5bf2018
--- /dev/null
+++ b/helm/wekan/templates/deployment.yaml
@@ -0,0 +1,58 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ template "wekan.fullname" . }}
+  labels:
+    app: {{ template "wekan.name" . }}
+    chart: {{ template "wekan.chart" . }}
+    component: wekan
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "wekan.name" . }}
+      component: wekan
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      annotations:
+      labels:
+        app: {{ template "wekan.name" . }}
+        component: wekan
+        release: {{ .Release.Name }}
+    spec:
+      serviceAccountName: {{ template "wekan.serviceAccountName" . }}
+      containers:
+        - name: {{ .Chart.Name }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          terminationMessagePolicy: FallbackToLogsOnError
+          ports:
+            - name: http
+              containerPort: 8080
+          env:
+            - name: ROOT_URL
+              value: {{ .Values.root_url | default "https://wekan.local" | quote }}
+            - name: MONGO_URL
+              value: "{{ template "mongodb-replicaset.url" . }}"
+          livenessProbe:
+            httpGet:
+              path: /
+              port: 8080
+            initialDelaySeconds: 60
+          resources:
+{{ toYaml .Values.resources | indent 12 }}
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+{{- if .Values.affinity }}
+      affinity:
+{{ toYaml .Values.affinity | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
diff --git a/helm/wekan/templates/hpa.yaml b/helm/wekan/templates/hpa.yaml
new file mode 100644
index 00000000..5c8017c3
--- /dev/null
+++ b/helm/wekan/templates/hpa.yaml
@@ -0,0 +1,18 @@
+{{- if .Values.autoscaling.enabled -}}
+apiVersion: autoscaling/v1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ template "wekan.fullname" . }}
+  labels:
+    app: {{ template "wekan.name" . }}
+    chart: {{ template "wekan.chart" . }}
+    component: wekan
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ template "wekan.fullname" . }}
+{{ toYaml .Values.autoscaling.config | indent 2 }}
+{{- end -}}
diff --git a/helm/wekan/templates/ingress.yaml b/helm/wekan/templates/ingress.yaml
new file mode 100644
index 00000000..d63c21c3
--- /dev/null
+++ b/helm/wekan/templates/ingress.yaml
@@ -0,0 +1,40 @@
+{{- if .Values.ingress.enabled -}}
+{{- $fullName := include "wekan.fullname" . -}}
+{{- $servicePort := .Values.service.port -}}
+{{- $ingressPath := .Values.ingress.path -}}
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: {{ $fullName }}
+  labels:
+    app: {{ template "wekan.name" . }}
+    chart: {{ template "wekan.chart" . }}
+    component: wekan
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+{{- with .Values.ingress.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+spec:
+{{- if .Values.ingress.tls }}
+  tls:
+  {{- range .Values.ingress.tls }}
+    - hosts:
+      {{- range .hosts }}
+        - {{ . }}
+      {{- end }}
+      secretName: {{ .secretName }}
+  {{- end }}
+{{- end }}
+  rules:
+  {{- range .Values.ingress.hosts }}
+    - host: {{ . }}
+      http:
+        paths:
+          - path: {{ $ingressPath }}
+            backend:
+              serviceName: {{ $fullName }}
+              servicePort: http
+  {{- end }}
+{{- end }}
diff --git a/helm/wekan/templates/secrets.yaml b/helm/wekan/templates/secrets.yaml
new file mode 100644
index 00000000..79ae3d48
--- /dev/null
+++ b/helm/wekan/templates/secrets.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "wekan.fullname" . }}
+  labels:
+    app: {{ template "wekan.name" . }}
+    chart: {{ template "wekan.chart" . }}
+    component: wekan
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+type: Opaque
+data:
+  accessKey: {{ .Values.credentials.accessKey | b64enc }}
+  secretKey: {{ .Values.credentials.secretKey | b64enc }}
diff --git a/helm/wekan/templates/service.yaml b/helm/wekan/templates/service.yaml
new file mode 100644
index 00000000..6099faec
--- /dev/null
+++ b/helm/wekan/templates/service.yaml
@@ -0,0 +1,25 @@
+apiVersion: v1
+kind: Service
+metadata:
+  {{- if .Values.service.annotations }}
+  annotations:
+{{ toYaml .Values.service.annotations | indent 4 }}
+  {{- end }}
+  name: {{ template "wekan.fullname" . }}
+  labels:
+    app: {{ template "wekan.name" . }}
+    chart: {{ template "wekan.chart" . }}
+    component: wekan
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    app: {{ template "wekan.name" . }}
+    component: wekan
+    release: {{ .Release.Name }}
diff --git a/helm/wekan/templates/serviceaccount.yaml b/helm/wekan/templates/serviceaccount.yaml
new file mode 100644
index 00000000..58696cb6
--- /dev/null
+++ b/helm/wekan/templates/serviceaccount.yaml
@@ -0,0 +1,12 @@
+{{- if .Values.serviceAccounts.create }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+    app: {{ template "wekan.name" . }}
+    chart: {{ template "wekan.chart" . }}
+    component: wekan
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+  name: {{ template "wekan.serviceAccountName" . }}
+{{- end }}
diff --git a/helm/wekan/templates/tests/test-cloudserver.yaml b/helm/wekan/templates/tests/test-cloudserver.yaml
new file mode 100644
index 00000000..a1db7289
--- /dev/null
+++ b/helm/wekan/templates/tests/test-cloudserver.yaml
@@ -0,0 +1,27 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: {{ template "wekan.fullname" . }}-test
+  annotations:
+    "helm.sh/hook": test-success
+spec:
+  containers:
+  - name: {{ template "wekan.fullname" . }}-test
+    imagePullPolicy: IfNotPresent
+    image: "docker.io/mesosphere/aws-cli:1.14.5"
+    command:
+      - sh
+      - -c
+      - aws s3 --endpoint-url=http://{{ include "wekan.fullname" . }} --region=us-east-1 ls
+    env:
+      - name: AWS_ACCESS_KEY_ID
+        valueFrom:
+          secretKeyRef:
+            name: {{ template "wekan.fullname" . }}
+            key: accessKey
+      - name: AWS_SECRET_ACCESS_KEY
+        valueFrom:
+          secretKeyRef:
+            name: {{ template "wekan.fullname" . }}
+            key: secretKey
+  restartPolicy: Never
diff --git a/helm/wekan/values.yaml b/helm/wekan/values.yaml
new file mode 100644
index 00000000..adc2c855
--- /dev/null
+++ b/helm/wekan/values.yaml
@@ -0,0 +1,110 @@
+# ------------------------------------------------------------------------------
+# Wekan:
+# ------------------------------------------------------------------------------
+
+## Define serviceAccount names to create or use. Defaults to component's fully
+## qualified name.
+##
+serviceAccounts:
+  create: true
+  name: ""
+
+## Wekan image configuration
+##
+image:
+  repository: quay.io/wekan/wekan
+  tag: latest
+  pullPolicy: IfNotPresent
+
+## Configuration for wekan component
+##
+
+replicaCount: 1
+
+## Specify wekan credentials
+##
+credentials:
+  accessKey: access-key
+  secretKey: secret-key
+
+## Specify additional environmental variables for the Deployment
+##
+env: {}
+
+service:
+  type: NodePort
+  port: 80
+  annotations: {}
+    # prometheus.io/scrape: "true"
+    # prometheus.io/port: "8000"
+    # prometheus.io/path: "/_/monitoring/metrics"
+
+## Comma-separated string of allowed virtual hosts for external access.
+## This should match the ingress hosts
+##
+endpoint: wekan.local
+
+ingress:
+  enabled: true
+  annotations: {}
+    # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
+  path: /*
+  # This must match 'endpoint', unless your client supports different
+  # hostnames.
+  hosts: [ wekan.local ]
+    # - wekan.local
+  tls: []
+  #  - secretName: wekan-example-tls
+  #    hosts:
+  #      - wekan-example.local
+
+resources: 
+  requests:
+    memory: 128Mi
+    cpu: 300m
+  limits:
+    memory: 1Gi
+    cpu: 500m
+
+## Node labels for pod assignment
+## ref: https://kubernetes.io/docs/user-guide/node-selection/
+##
+nodeSelector: {}
+
+## Tolerations for pod assignment
+## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+##
+tolerations: []
+
+## Affinity for pod assignment
+## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+##
+affinity: {}
+
+## Configure an horizontal pod autoscaler
+##
+autoscaling:
+  enabled: true
+  config:
+    minReplicas: 1
+    maxReplicas: 16
+    ## Note: when setting this, a `resources.request.cpu` is required. You
+    ## likely want to set it to `1` or some lower value.
+    ##
+    targetCPUUtilizationPercentage: 80
+
+# ------------------------------------------------------------------------------
+# MongoDB:
+# ------------------------------------------------------------------------------
+
+mongodb-replicaset:
+  enabled: true
+  replicas: 3
+  replicaSetName: rs0
+  securityContext:
+    runAsUser: 1000
+    fsGroup: 1000
+    runAsNonRoot: true
+  #image:
+  #  tag: 3.2.21
diff --git a/i18n/ar.i18n.json b/i18n/ar.i18n.json
index a9e4edbd..f871749d 100644
--- a/i18n/ar.i18n.json
+++ b/i18n/ar.i18n.json
@@ -1,35 +1,51 @@
 {
-    "accept": "اقبلboard",
-    "act-activity-notify": "[Wekan] اشعار عن نشاط",
-    "act-addAttachment": "ربط __attachment__ الى __card__",
-    "act-addChecklist": "added checklist __checklist__ to __card__",
-    "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__",
-    "act-addComment": "علق على __comment__ : __card__",
-    "act-createBoard": "احدث __board__",
-    "act-createCard": "اضاف __card__ الى __list__",
-    "act-createList": "اضاف __list__ الى __board__",
-    "act-addBoardMember": "اضاف __member__ الى __board__",
-    "act-archivedBoard": "__board__ moved to Recycle Bin",
-    "act-archivedCard": "__card__ moved to Recycle Bin",
-    "act-archivedList": "__list__ moved to Recycle Bin",
-    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
-    "act-importBoard": "إستورد __board__",
-    "act-importCard": "إستورد __card__",
-    "act-importList": "إستورد __list__",
-    "act-joinMember": "اضاف __member__ الى __card__",
-    "act-moveCard": "حوّل __card__ من __oldList__ إلى __list__",
-    "act-removeBoardMember": "أزال __member__ من __board__",
-    "act-restoredCard": "أعاد __card__ إلى __board__",
-    "act-unjoinMember": "أزال __member__ من __card__",
-    "act-withBoardTitle": "[Wekan] __board__",
+    "accept": "قبول",
+    "act-activity-notify": "اشعارات النشاط",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__لوح__",
     "act-withCardTitle": "[__board__] __card__",
     "actions": "الإجراءات",
     "activities": "الأنشطة",
     "activity": "النشاط",
     "activity-added": "تمت إضافة %s ل %s",
-    "activity-archived": "%s moved to Recycle Bin",
+    "activity-archived": "%s انتقل الى الارشيف",
     "activity-attached": "إرفاق %s ل %s",
     "activity-created": "أنشأ %s",
+    "activity-customfield-created": "%s احدت حقل مخصص",
     "activity-excluded": "استبعاد %s عن %s",
     "activity-imported": "imported %s into %s from %s",
     "activity-imported-board": "imported %s from %s",
@@ -39,13 +55,25 @@
     "activity-removed": "حذف %s إلى %s",
     "activity-sent": "إرسال %s إلى %s",
     "activity-unjoined": "غادر %s",
+    "activity-subtask-added": "تم اضافة مهمة فرعية الى %s",
+    "activity-checked-item": "تحقق %s في قائمة التحقق %s من %s",
+    "activity-unchecked-item": "ازالة تحقق %s من قائمة التحقق %s من %s",
     "activity-checklist-added": "أضاف قائمة تحقق إلى %s",
-    "activity-checklist-item-added": "added checklist item to '%s' in %s",
+    "activity-checklist-removed": "ازالة قائمة التحقق من %s",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted": "لم يتم انجاز قائمة التحقق %s من %s",
+    "activity-checklist-item-added": "تم اضافة عنصر قائمة التحقق الى '%s' في %s",
+    "activity-checklist-item-removed": "تم ازالة عنصر قائمة التحقق الى '%s' في %s",
     "add": "أضف",
+    "activity-checked-item-card": "checked %s in checklist %s",
+    "activity-unchecked-item-card": "unchecked %s in checklist %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
     "add-attachment": "إضافة مرفق",
     "add-board": "إضافة لوحة",
     "add-card": "إضافة بطاقة",
     "add-swimlane": "Add Swimlane",
+    "add-subtask": "Add Subtask",
     "add-checklist": "إضافة قائمة تدقيق",
     "add-checklist-item": "إضافة عنصر إلى قائمة التحقق",
     "add-cover": "إضافة غلاف",
@@ -63,20 +91,22 @@
     "and-n-other-card": "And __count__ other بطاقة",
     "and-n-other-card_plural": "And __count__ other بطاقات",
     "apply": "طبق",
-    "app-is-offline": "يتمّ تحميل ويكان، يرجى الانتظار. سيؤدي تحديث الصفحة إلى فقدان البيانات. إذا لم يتم تحميل ويكان، يرجى التحقق من أن خادم ويكان لم يتوقف. ",
-    "archive": "Move to Recycle Bin",
-    "archive-all": "Move All to Recycle Bin",
-    "archive-board": "Move Board to Recycle Bin",
-    "archive-card": "Move Card to Recycle Bin",
-    "archive-list": "Move List to Recycle Bin",
-    "archive-swimlane": "Move Swimlane to Recycle Bin",
-    "archive-selection": "Move selection to Recycle Bin",
-    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
-    "archived-items": "Recycle Bin",
-    "archived-boards": "Boards in Recycle Bin",
+    "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
+    "archive": "نقل الى الارشيف",
+    "archive-all": "نقل الكل الى الارشيف",
+    "archive-board": "نقل اللوح الى الارشيف",
+    "archive-card": "نقل البطاقة الى الارشيف",
+    "archive-list": "نقل القائمة الى الارشيف",
+    "archive-swimlane": "نقل خط السباحة الى الارشيف",
+    "archive-selection": "نقل التحديد إلى الأرشيف",
+    "archiveBoardPopup-title": "نقل الوح إلى الأرشيف",
+    "archived-items": "أرشيف",
+    "archived-boards": "الالواح في الأرشيف",
     "restore-board": "استعادة اللوحة",
-    "no-archived-boards": "No Boards in Recycle Bin.",
-    "archives": "Recycle Bin",
+    "no-archived-boards": "لا توجد لوحات في الأرشيف.",
+    "archives": "أرشيف",
+    "template": "Template",
+    "templates": "Templates",
     "assign-member": "تعيين عضو",
     "attached": "أُرفق)",
     "attachment": "مرفق",
@@ -95,22 +125,25 @@
     "boardChangeTitlePopup-title": "إعادة تسمية اللوحة",
     "boardChangeVisibilityPopup-title": "تعديل وضوح الرؤية",
     "boardChangeWatchPopup-title": "تغيير المتابعة",
-    "boardMenuPopup-title": "قائمة اللوحة",
+    "boardMenuPopup-title": "Board Settings",
     "boards": "لوحات",
-    "board-view": "Board View",
-    "board-view-swimlanes": "Swimlanes",
+    "board-view": "عرض اللوحات",
+    "board-view-cal": "التقويم",
+    "board-view-swimlanes": "خطوط السباحة",
     "board-view-lists": "القائمات",
     "bucket-example": "مثل « todo list » على سبيل المثال",
     "cancel": "إلغاء",
-    "card-archived": "This card is moved to Recycle Bin.",
+    "card-archived": "البطاقة منقولة الى الارشيف",
+    "board-archived": "اللوحات منقولة الى الارشيف",
     "card-comments-title": "%s تعليقات لهذه البطاقة",
     "card-delete-notice": "هذا حذف أبديّ . سوف تفقد كل الإجراءات المنوطة بهذه البطاقة",
     "card-delete-pop": "سيتم إزالة جميع الإجراءات من تبعات النشاط، وأنك لن تكون قادرا على إعادة فتح البطاقة. لا يوجد التراجع.",
-    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "يمكنك نقل بطاقة إلى الأرشيف لإزالتها من اللوحة والمحافظة على النشاط.",
     "card-due": "مستحق",
     "card-due-on": "مستحق في",
-    "card-spent": "Spent Time",
+    "card-spent": "امضى وقتا",
     "card-edit-attachments": "تعديل المرفقات",
+    "card-edit-custom-fields": "تعديل الحقل المعدل",
     "card-edit-labels": "تعديل العلامات",
     "card-edit-members": "تعديل الأعضاء",
     "card-labels-title": "تعديل علامات البطاقة.",
@@ -118,13 +151,20 @@
     "card-start": "بداية",
     "card-start-on": "يبدأ في",
     "cardAttachmentsPopup-title": "إرفاق من",
+    "cardCustomField-datePopup-title": "تغير التاريخ",
+    "cardCustomFieldsPopup-title": "تعديل الحقل المعدل",
     "cardDeletePopup-title": "حذف البطاقة ?",
     "cardDetailsActionsPopup-title": "إجراءات على البطاقة",
     "cardLabelsPopup-title": "علامات",
     "cardMembersPopup-title": "أعضاء",
     "cardMorePopup-title": "المزيد",
+    "cardTemplatePopup-title": "Create template",
     "cards": "بطاقات",
     "cards-count": "بطاقات",
+    "casSignIn": "تسجيل الدخول مع  CAS",
+    "cardType-card": "بطاقة",
+    "cardType-linkedCard": "البطاقة المرتبطة",
+    "cardType-linkedBoard": "Linked Board",
     "change": "Change",
     "change-avatar": "تعديل الصورة الشخصية",
     "change-password": "تغيير كلمة المرور",
@@ -135,30 +175,52 @@
     "changePasswordPopup-title": "تغيير كلمة المرور",
     "changePermissionsPopup-title": "تعديل الصلاحيات",
     "changeSettingsPopup-title": "تغيير الاعدادات",
+    "subtasks": "Subtasks",
     "checklists": "قوائم التّدقيق",
     "click-to-star": "اضغط لإضافة اللوحة للمفضلة.",
     "click-to-unstar": "اضغط لحذف اللوحة من المفضلة.",
     "clipboard": "Clipboard or drag & drop",
     "close": "غلق",
     "close-board": "غلق اللوحة",
-    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
     "color-black": "black",
     "color-blue": "blue",
+    "color-crimson": "crimson",
+    "color-darkgreen": "darkgreen",
+    "color-gold": "gold",
+    "color-gray": "gray",
     "color-green": "green",
+    "color-indigo": "indigo",
     "color-lime": "lime",
+    "color-magenta": "magenta",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "navy",
     "color-orange": "orange",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
     "color-pink": "pink",
+    "color-plum": "plum",
     "color-purple": "purple",
     "color-red": "red",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "silver",
     "color-sky": "sky",
+    "color-slateblue": "slateblue",
+    "color-white": "white",
     "color-yellow": "yellow",
+    "unset-color": "Unset",
     "comment": "تعليق",
     "comment-placeholder": "أكتب تعليق",
     "comment-only": "التعليق فقط",
     "comment-only-desc": "يمكن التعليق على بطاقات فقط.",
+    "no-comments": "No comments",
+    "no-comments-desc": "Can not see comments and activities.",
     "computer": "حاسوب",
-    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist",
+    "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?",
+    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
     "copy-card-link-to-clipboard": "نسخ رابط البطاقة إلى الحافظة",
+    "linkCardPopup-title": "ربط البطاقة",
+    "searchElementPopup-title": "بحث",
     "copyCardPopup-title": "نسخ البطاقة",
     "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
     "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
@@ -167,11 +229,25 @@
     "createBoardPopup-title": "إنشاء لوحة",
     "chooseBoardSourcePopup-title": "استيراد لوحة",
     "createLabelPopup-title": "إنشاء علامة",
+    "createCustomField": "Create Field",
+    "createCustomFieldPopup-title": "Create Field",
     "current": "الحالي",
+    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
+    "custom-field-checkbox": "Checkbox",
+    "custom-field-date": "تاريخ",
+    "custom-field-dropdown": "Dropdown List",
+    "custom-field-dropdown-none": "(none)",
+    "custom-field-dropdown-options": "List Options",
+    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
+    "custom-field-dropdown-unknown": "(unknown)",
+    "custom-field-number": "Number",
+    "custom-field-text": "Text",
+    "custom-fields": "Custom Fields",
     "date": "تاريخ",
     "decline": "Decline",
     "default-avatar": "صورة شخصية افتراضية",
     "delete": "حذف",
+    "deleteCustomFieldPopup-title": "Delete Custom Field?",
     "deleteLabelPopup-title": "حذف العلامة ?",
     "description": "وصف",
     "disambiguateMultiLabelPopup-title": "تحديد الإجراء على العلامة",
@@ -186,6 +262,7 @@
     "soft-wip-limit": "Soft WIP Limit",
     "editCardStartDatePopup-title": "تغيير تاريخ البدء",
     "editCardDueDatePopup-title": "تغيير تاريخ الاستحقاق",
+    "editCustomFieldPopup-title": "Edit Field",
     "editCardSpentTimePopup-title": "Change spent time",
     "editLabelPopup-title": "تعديل العلامة",
     "editNotificationPopup-title": "تصحيح الإشعار",
@@ -222,30 +299,36 @@
     "filter-clear": "مسح التصفية",
     "filter-no-label": "لا يوجد ملصق",
     "filter-no-member": "ليس هناك أي عضو",
+    "filter-no-custom-fields": "No Custom Fields",
     "filter-on": "التصفية تشتغل",
     "filter-on-desc": "أنت بصدد تصفية بطاقات هذه اللوحة. اضغط هنا لتعديل التصفية.",
     "filter-to-selection": "تصفية بالتحديد",
+    "advanced-filter-label": "Advanced Filter",
+    "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) to be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
     "fullname": "الإسم الكامل",
     "header-logo-title": "الرجوع إلى صفحة اللوحات",
     "hide-system-messages": "إخفاء رسائل النظام",
     "headerBarCreateBoardPopup-title": "إنشاء لوحة",
     "home": "الرئيسية",
     "import": "Import",
+    "link": "Link",
     "import-board": "استيراد لوحة",
     "import-board-c": "استيراد لوحة",
     "import-board-title-trello": "Import board from Trello",
-    "import-board-title-wekan": "استيراد لوحة من ويكان",
+    "import-board-title-wekan": "Import board from previous export",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
     "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
     "from-trello": "من تريلو",
-    "from-wekan": "من ويكان",
+    "from-wekan": "From previous export",
     "import-board-instruction-trello": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text",
-    "import-board-instruction-wekan": "في لوحة ويكان الخاصة بك، انتقل إلى 'القائمة'، ثم 'تصدير اللوحة'، ونسخ النص في الملف الذي تم تنزيله.",
+    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
     "import-json-placeholder": "Paste your valid JSON data here",
     "import-map-members": "رسم خريطة الأعضاء",
-    "import-members-map": "Your imported board has some members. Please map the members you want to import to Wekan users",
+    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
     "import-show-user-mapping": "Review members mapping",
-    "import-user-select": "Pick the Wekan user you want to use as this member",
-    "importMapMembersAddPopup-title": "حدّد عضو ويكان",
+    "import-user-select": "Pick your existing user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select member",
     "info": "الإصدار",
     "initials": "أولية",
     "invalid-date": "تاريخ غير صالح",
@@ -264,19 +347,21 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "مغادرة اللوحة ؟",
     "link-card": "ربط هذه البطاقة",
-    "list-archive-cards": "Move all cards in this list to Recycle Bin",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
+    "list-archive-cards": "Move all cards in this list to Archive",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "نقل بطاقات هذه القائمة",
     "list-select-cards": "تحديد بطاقات هذه القائمة",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "قائمة الإجراءات",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Import a Trello card",
     "listMorePopup-title": "المزيد",
     "link-list": "رابط إلى هذه القائمة",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
     "lists": "القائمات",
-    "swimlanes": "Swimlanes",
+    "swimlanes": "خطوط السباحة",
     "log-out": "تسجيل الخروج",
     "log-in": "تسجيل الدخول",
     "loginPopup-title": "تسجيل الدخول",
@@ -294,9 +379,9 @@
     "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "لوحاتي",
     "name": "اسم",
-    "no-archived-cards": "No cards in Recycle Bin.",
-    "no-archived-lists": "No lists in Recycle Bin.",
-    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
+    "no-archived-cards": "No cards in Archive.",
+    "no-archived-lists": "No lists in Archive.",
+    "no-archived-swimlanes": "No swimlanes in Archive.",
     "no-results": "لا توجد نتائج",
     "normal": "عادي",
     "normal-desc": "يمكن مشاهدة و تعديل  البطاقات. لا يمكن تغيير إعدادات الضبط.",
@@ -332,6 +417,7 @@
     "restore": "استعادة",
     "save": "حفظ",
     "search": "بحث",
+    "rules": "Rules",
     "search-cards": "Search from card titles and descriptions on this board",
     "search-example": "Text to search for?",
     "select-color": "اختيار اللون",
@@ -366,6 +452,7 @@
     "title": "عنوان",
     "tracking": "تتبع",
     "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
+    "type": "Type",
     "unassign-member": "إلغاء تعيين العضو",
     "unsaved-description": "لديك وصف غير محفوظ",
     "unwatch": "غير مُشاهد",
@@ -374,7 +461,7 @@
     "uploaded-avatar": "تم رفع الصورة الشخصية",
     "username": "اسم المستخدم",
     "view-it": "شاهدها",
-    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
+    "warn-list-archived": "warning: this card is in an list at Archive",
     "watch": "مُشاهد",
     "watching": "مشاهدة",
     "watching-info": "You will be notified of any change in this board",
@@ -382,6 +469,9 @@
     "welcome-swimlane": "Milestone 1",
     "welcome-list1": "المبادئ",
     "welcome-list2": "متقدم",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
     "what-to-do": "ماذا تريد أن تنجز?",
     "wipLimitErrorPopup-title": "Invalid WIP Limit",
     "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
@@ -407,16 +497,16 @@
     "send-smtp-test": "Send a test email to yourself",
     "invitation-code": "رمز الدعوة",
     "email-invite-register-subject": "__inviter__ أرسل دعوة لك",
-    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to Wekan for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
-    "email-smtp-test-subject": "SMTP Test Email From Wekan",
+    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email",
     "email-smtp-test-text": "You have successfully sent an email",
     "error-invitation-code-not-exist": "رمز الدعوة غير موجود",
     "error-notAuthorized": "أنتَ لا تملك الصلاحيات لرؤية هذه الصفحة.",
     "outgoing-webhooks": "الويبهوك الصادرة",
     "outgoingWebhooksPopup-title": "الويبهوك الصادرة",
+    "boardCardTitlePopup-title": "Card Title Filter",
     "new-outgoing-webhook": "ويبهوك جديدة ",
     "no-name": "(غير معروف)",
-    "Wekan_version": "إصدار ويكان",
     "Node_version": "إصدار النود",
     "OS_Arch": "معمارية نظام التشغيل",
     "OS_Cpus": "استهلاك وحدة المعالجة المركزية لنظام التشغيل",
@@ -427,13 +517,18 @@
     "OS_Totalmem": "الذاكرة الكلية لنظام التشغيل",
     "OS_Type": "نوع نظام التشغيل",
     "OS_Uptime": "مدة تشغيل نظام التشغيل",
+    "days": "days",
     "hours": "الساعات",
     "minutes": "الدقائق",
     "seconds": "الثواني",
+    "show-field-on-card": "Show this field on card",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
     "yes": "نعم",
     "no": "لا",
     "accounts": "الحسابات",
     "accounts-allowEmailChange": "السماح بتغيير البريد الإلكتروني",
+    "accounts-allowUserNameChange": "Allow Username Change",
     "createdAt": "Created at",
     "verified": "Verified",
     "active": "Active",
@@ -442,5 +537,157 @@
     "card-end": "End",
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
-    "editCardEndDatePopup-title": "Change end date"
-}
+    "editCardEndDatePopup-title": "Change end date",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "Assigned By",
+    "requested-by": "Requested By",
+    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
+    "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
+    "boardDeletePopup-title": "Delete Board?",
+    "delete-board": "Delete Board",
+    "default-subtasks-board": "Subtasks for __board__ board",
+    "default": "Default",
+    "queue": "Queue",
+    "subtask-settings": "Subtasks Settings",
+    "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
+    "show-subtasks-field": "Cards can have subtasks",
+    "deposit-subtasks-board": "Deposit subtasks to this board:",
+    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
+    "show-parent-in-minicard": "Show parent in minicard:",
+    "prefix-with-full-path": "Prefix with full path",
+    "prefix-with-parent": "Prefix with parent",
+    "subtext-with-full-path": "Subtext with full path",
+    "subtext-with-parent": "Subtext with parent",
+    "change-card-parent": "Change card's parent",
+    "parent-card": "Parent card",
+    "source-board": "Source board",
+    "no-parent": "Don't show parent",
+    "activity-added-label": "added label '%s' to %s",
+    "activity-removed-label": "removed label '%s' from %s",
+    "activity-delete-attach": "deleted an attachment from %s",
+    "activity-added-label-card": "added label '%s'",
+    "activity-removed-label-card": "removed label '%s'",
+    "activity-delete-attach-card": "deleted an attachment",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "r-rule": "Rule",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "Add action",
+    "r-board-rules": "Board rules",
+    "r-add-rule": "Add rule",
+    "r-view-rule": "View rule",
+    "r-delete-rule": "Delete rule",
+    "r-new-rule-name": "New rule title",
+    "r-no-rules": "No rules",
+    "r-when-a-card": "When a card",
+    "r-is": "is",
+    "r-is-moved": "is moved",
+    "r-added-to": "added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "the board",
+    "r-list": "list",
+    "set-filter": "Set Filter",
+    "r-moved-to": "Moved to",
+    "r-moved-from": "Moved from",
+    "r-archived": "Moved to Archive",
+    "r-unarchived": "Restored from Archive",
+    "r-a-card": "a card",
+    "r-when-a-label-is": "When a label is",
+    "r-when-the-label-is": "When the label is",
+    "r-list-name": "list name",
+    "r-when-a-member": "When a member is",
+    "r-when-the-member": "When the member",
+    "r-name": "name",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "r-when-the-item": "When the checklist item",
+    "r-checked": "Checked",
+    "r-unchecked": "Unchecked",
+    "r-move-card-to": "Move card to",
+    "r-top-of": "Top of",
+    "r-bottom-of": "Bottom of",
+    "r-its-list": "its list",
+    "r-archive": "نقل الى الارشيف",
+    "r-unarchive": "Restore from Archive",
+    "r-card": "card",
+    "r-add": "أضف",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-set-color": "Set color to",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "subject",
+    "r-rule-details": "Rule details",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Move card to top of list",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Move card to bottom of list",
+    "r-d-send-email": "Send email",
+    "r-d-send-email-to": "to",
+    "r-d-send-email-subject": "subject",
+    "r-d-send-email-message": "message",
+    "r-d-archive": "Move card to Archive",
+    "r-d-unarchive": "Restore card from Archive",
+    "r-d-add-label": "Add label",
+    "r-d-remove-label": "Remove label",
+    "r-create-card": "Create new card",
+    "r-in-list": "in list",
+    "r-in-swimlane": "in swimlane",
+    "r-d-add-member": "Add member",
+    "r-d-remove-member": "Remove member",
+    "r-d-remove-all-member": "Remove all member",
+    "r-d-check-all": "Check all items of a list",
+    "r-d-uncheck-all": "Uncheck all items of a list",
+    "r-d-check-one": "Check item",
+    "r-d-uncheck-one": "Uncheck item",
+    "r-d-check-of-list": "of checklist",
+    "r-d-add-checklist": "Add checklist",
+    "r-d-remove-checklist": "Remove checklist",
+    "r-by": "by",
+    "r-add-checklist": "Add checklist",
+    "r-with-items": "with items",
+    "r-items-list": "item1,item2,item3",
+    "r-add-swimlane": "Add swimlane",
+    "r-swimlane-name": "swimlane name",
+    "r-board-note": "Note: leave a field empty to match every possible value.",
+    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout",
+    "hide-logo": "Hide Logo",
+    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
+    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
+    "error-undefined": "Something went wrong",
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
+}
\ No newline at end of file
diff --git a/i18n/bg.i18n.json b/i18n/bg.i18n.json
index 998bc2cb..1ea4a84e 100644
--- a/i18n/bg.i18n.json
+++ b/i18n/bg.i18n.json
@@ -1,51 +1,79 @@
 {
-    "accept": "Accept",
-    "act-activity-notify": "[Wekan] Известия за дейности",
-    "act-addAttachment": "attached __attachment__ to __card__",
-    "act-addChecklist": "added checklist __checklist__ to __card__",
-    "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__",
-    "act-addComment": "Коментира в __card__: __comment__",
-    "act-createBoard": "created __board__",
-    "act-createCard": "added __card__ to __list__",
-    "act-createList": "added __list__ to __board__",
-    "act-addBoardMember": "added __member__ to __board__",
-    "act-archivedBoard": "__board__ moved to Recycle Bin",
-    "act-archivedCard": "__card__ moved to Recycle Bin",
-    "act-archivedList": "__list__ moved to Recycle Bin",
-    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
-    "act-importBoard": "imported __board__",
-    "act-importCard": "imported __card__",
-    "act-importList": "imported __list__",
-    "act-joinMember": "added __member__ to __card__",
-    "act-moveCard": "moved __card__ from __oldList__ to __list__",
-    "act-removeBoardMember": "removed __member__ from __board__",
-    "act-restoredCard": "restored __card__ to __board__",
-    "act-unjoinMember": "removed __member__ from __card__",
-    "act-withBoardTitle": "[Wekan] __board__",
+    "accept": "Приемам",
+    "act-activity-notify": "Activity Notification",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__board__    ",
     "act-withCardTitle": "[__board__] __card__",
-    "actions": "Actions",
+    "actions": "Действия",
     "activities": "Действия",
     "activity": "Дейности",
     "activity-added": "добави %s към %s",
-    "activity-archived": "%s moved to Recycle Bin",
+    "activity-archived": "%s е преместена в Архива",
     "activity-attached": "прикачи %s към %s",
     "activity-created": "създаде %s",
+    "activity-customfield-created": "създаде собствено поле %s",
     "activity-excluded": "изключи %s от %s",
     "activity-imported": "импортира %s в/във %s от %s",
     "activity-imported-board": "импортира %s от %s",
-    "activity-joined": "joined %s",
+    "activity-joined": "се присъедини към %s",
     "activity-moved": "премести %s от %s в/във %s",
     "activity-on": "на %s",
     "activity-removed": "премахна %s от %s",
     "activity-sent": "изпрати %s до %s",
-    "activity-unjoined": "unjoined %s",
+    "activity-unjoined": "вече не е част от %s",
+    "activity-subtask-added": "добави задача към %s",
+    "activity-checked-item": "отбеляза%s в списък със задачи %s на %s",
+    "activity-unchecked-item": "размаркира %s от списък със задачи %s на %s",
     "activity-checklist-added": "добави списък със задачи към %s",
+    "activity-checklist-removed": "премахна списък със задачи от %s",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted": "\"отзавърши\" чеклистта %s в %s",
     "activity-checklist-item-added": "добави точка към '%s' в/във %s",
+    "activity-checklist-item-removed": "премахна точка от '%s' в %s",
     "add": "Добави",
+    "activity-checked-item-card": "отбеляза %s в чеклист %s",
+    "activity-unchecked-item-card": "размаркира %s в чеклист %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted-card": "\"отзавърши\" чеклистта %s",
     "add-attachment": "Добави прикачен файл",
-    "add-board": "Добави дъска",
+    "add-board": "Добави Табло",
     "add-card": "Добави карта",
     "add-swimlane": "Добави коридор",
+    "add-subtask": "Добави подзадача",
     "add-checklist": "Добави списък със задачи",
     "add-checklist-item": "Добави точка към списъка със задачи",
     "add-cover": "Добави корица",
@@ -58,140 +86,189 @@
     "admin-desc": "Can view and edit cards, remove members, and change settings for the board.",
     "admin-announcement": "Съобщение",
     "admin-announcement-active": "Active System-Wide Announcement",
-    "admin-announcement-title": "Announcement from Administrator",
-    "all-boards": "Всички дъски",
-    "and-n-other-card": "And __count__ other card",
-    "and-n-other-card_plural": "And __count__ other cards",
+    "admin-announcement-title": "Съобщение от администратора",
+    "all-boards": "Всички табла",
+    "and-n-other-card": "И __count__ друга карта",
+    "and-n-other-card_plural": "И __count__ други карти",
     "apply": "Приложи",
-    "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Move to Recycle Bin",
-    "archive-all": "Move All to Recycle Bin",
-    "archive-board": "Move Board to Recycle Bin",
-    "archive-card": "Move Card to Recycle Bin",
-    "archive-list": "Move List to Recycle Bin",
-    "archive-swimlane": "Move Swimlane to Recycle Bin",
-    "archive-selection": "Move selection to Recycle Bin",
-    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
-    "archived-items": "Recycle Bin",
-    "archived-boards": "Boards in Recycle Bin",
-    "restore-board": "Restore Board",
-    "no-archived-boards": "No Boards in Recycle Bin.",
-    "archives": "Recycle Bin",
-    "assign-member": "Assign member",
+    "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
+    "archive": "Премести в Архива",
+    "archive-all": "Премести всички в Архива",
+    "archive-board": "Премести Таблото в Архива",
+    "archive-card": "Премести Картата в Архива",
+    "archive-list": "Премести Списъка в Архива",
+    "archive-swimlane": "Премести Коридора в Архива",
+    "archive-selection": "Премести избраното в Архива",
+    "archiveBoardPopup-title": "Да преместя ли Таблото в Архива?",
+    "archived-items": "Архив",
+    "archived-boards": "Табла в Архива",
+    "restore-board": "Възстанови Таблото",
+    "no-archived-boards": "Няма Табла в Архива.",
+    "archives": "Архив",
+    "template": "Template",
+    "templates": "Templates",
+    "assign-member": "Възложи на член от екипа",
     "attached": "прикачен",
     "attachment": "Прикаченн файл",
-    "attachment-delete-pop": "Deleting an attachment is permanent. There is no undo.",
+    "attachment-delete-pop": "Изтриването на прикачен файл е завинаги. Няма как да бъде възстановен.",
     "attachmentDeletePopup-title": "Желаете ли да изтриете прикачения файл?",
     "attachments": "Прикачени файлове",
-    "auto-watch": "Автоматично наблюдаване на дъските, когато са създадени",
+    "auto-watch": "Автоматично наблюдаване на таблата, когато са създадени",
     "avatar-too-big": "Аватарът е прекалено голям (максимум 70KB)",
     "back": "Назад",
     "board-change-color": "Промени цвета",
     "board-nb-stars": "%s звезди",
-    "board-not-found": "Board not found",
+    "board-not-found": "Таблото не е намерено",
     "board-private-info": "This board will be <strong>private</strong>.",
     "board-public-info": "This board will be <strong>public</strong>.",
     "boardChangeColorPopup-title": "Change Board Background",
-    "boardChangeTitlePopup-title": "Rename Board",
+    "boardChangeTitlePopup-title": "Промени името на Таблото",
     "boardChangeVisibilityPopup-title": "Change Visibility",
     "boardChangeWatchPopup-title": "Промени наблюдаването",
-    "boardMenuPopup-title": "Board Menu",
-    "boards": "Дъски",
+    "boardMenuPopup-title": "Board Settings",
+    "boards": "Табла",
     "board-view": "Board View",
+    "board-view-cal": "Календар",
     "board-view-swimlanes": "Коридори",
     "board-view-lists": "Списъци",
     "bucket-example": "Like “Bucket List” for example",
     "cancel": "Cancel",
-    "card-archived": "This card is moved to Recycle Bin.",
+    "card-archived": "Тази карта е преместена в Архива.",
+    "board-archived": "Това табло е преместено в Архива.",
     "card-comments-title": "Тази карта има %s коментар.",
     "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
     "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "Можете да преместите картата в Архива, за да я премахнете от Таблото и така да запазите активността в него.",
     "card-due": "Готова за",
     "card-due-on": "Готова за",
     "card-spent": "Изработено време",
     "card-edit-attachments": "Промени прикачените файлове",
+    "card-edit-custom-fields": "Промени собствените полета",
     "card-edit-labels": "Промени етикетите",
     "card-edit-members": "Промени членовете",
-    "card-labels-title": "Променете етикетите за тази карта",
-    "card-members-title": "Add or remove members of the board from the card.",
+    "card-labels-title": "Промени етикетите за картата.",
+    "card-members-title": "Добави или премахни членове на Таблото от тази карта.",
     "card-start": "Начало",
-    "card-start-on": "Starts on",
-    "cardAttachmentsPopup-title": "Attach From",
+    "card-start-on": "Започва на",
+    "cardAttachmentsPopup-title": "Прикачи от",
+    "cardCustomField-datePopup-title": "Промени датата",
+    "cardCustomFieldsPopup-title": "Промени собствените полета",
     "cardDeletePopup-title": "Желаете да изтриете картата?",
     "cardDetailsActionsPopup-title": "Опции",
     "cardLabelsPopup-title": "Етикети",
     "cardMembersPopup-title": "Членове",
     "cardMorePopup-title": "Още",
+    "cardTemplatePopup-title": "Create template",
     "cards": "Карти",
     "cards-count": "Карти",
-    "change": "Change",
+    "casSignIn": "Sign In with CAS",
+    "cardType-card": "Карта",
+    "cardType-linkedCard": "Свързана карта",
+    "cardType-linkedBoard": "Свързано табло",
+    "change": "Промени",
     "change-avatar": "Промени аватара",
     "change-password": "Промени паролата",
-    "change-permissions": "Change permissions",
+    "change-permissions": "Промени правата",
     "change-settings": "Промени настройките",
     "changeAvatarPopup-title": "Промени аватара",
     "changeLanguagePopup-title": "Промени езика",
     "changePasswordPopup-title": "Промени паролата",
-    "changePermissionsPopup-title": "Change Permissions",
+    "changePermissionsPopup-title": "Промени правата",
     "changeSettingsPopup-title": "Промяна на настройките",
+    "subtasks": "Подзадачи",
     "checklists": "Списъци със задачи",
     "click-to-star": "Click to star this board.",
-    "click-to-unstar": "Натиснете, за да премахнете тази дъска от любими.",
-    "clipboard": "Clipboard or drag & drop",
-    "close": "Close",
-    "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
-    "color-black": "black",
-    "color-blue": "blue",
-    "color-green": "green",
-    "color-lime": "lime",
-    "color-orange": "orange",
-    "color-pink": "pink",
-    "color-purple": "purple",
-    "color-red": "red",
-    "color-sky": "sky",
-    "color-yellow": "yellow",
+    "click-to-unstar": "Натиснете, за да премахнете това табло от любими.",
+    "clipboard": "Клипборда или с драг & дроп",
+    "close": "Затвори",
+    "close-board": "Затвори Таблото",
+    "close-board-pop": "Ще можете да възстановите Таблото като натиснете на бутона \"Архив\" в началото на хедъра.",
+    "color-black": "черно",
+    "color-blue": "синьо",
+    "color-crimson": "crimson",
+    "color-darkgreen": "darkgreen",
+    "color-gold": "gold",
+    "color-gray": "gray",
+    "color-green": "зелено",
+    "color-indigo": "indigo",
+    "color-lime": "лайм",
+    "color-magenta": "magenta",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "navy",
+    "color-orange": "оранжево",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
+    "color-pink": "розово",
+    "color-plum": "plum",
+    "color-purple": "пурпурно",
+    "color-red": "червено",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "silver",
+    "color-sky": "светло синьо",
+    "color-slateblue": "slateblue",
+    "color-white": "бяло",
+    "color-yellow": "жълто",
+    "unset-color": "Unset",
     "comment": "Коментирай",
     "comment-placeholder": "Напиши коментар",
     "comment-only": "Само коментар",
     "comment-only-desc": "Може да коментира само в карти.",
-    "computer": "Computer",
-    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist",
+    "no-comments": "Няма коментари",
+    "no-comments-desc": "Can not see comments and activities.",
+    "computer": "Компютър",
+    "confirm-subtask-delete-dialog": "Сигурен ли сте, че искате да изтриете подзадачата?",
+    "confirm-checklist-delete-dialog": "Сигурни ли сте, че искате да изтриете този чеклист?",
     "copy-card-link-to-clipboard": "Копирай връзката на картата в клипборда",
+    "linkCardPopup-title": "Свържи картата",
+    "searchElementPopup-title": "Търсене",
     "copyCardPopup-title": "Копирай картата",
-    "copyChecklistToManyCardsPopup-title": "Копирай шаблона за чеклисти в много карти",
+    "copyChecklistToManyCardsPopup-title": "Копирай чеклисти в други карти",
     "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
     "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"First card title\", \"description\":\"First card description\"}, {\"title\":\"Second card title\",\"description\":\"Second card description\"},{\"title\":\"Last card title\",\"description\":\"Last card description\"} ]",
-    "create": "Create",
-    "createBoardPopup-title": "Create Board",
-    "chooseBoardSourcePopup-title": "Import board",
-    "createLabelPopup-title": "Create Label",
-    "current": "current",
+    "create": "Създай",
+    "createBoardPopup-title": "Създай Табло",
+    "chooseBoardSourcePopup-title": "Импортирай Табло",
+    "createLabelPopup-title": "Създай Табло",
+    "createCustomField": "Създай Поле",
+    "createCustomFieldPopup-title": "Създай Поле",
+    "current": "сегашен",
+    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
+    "custom-field-checkbox": "Чекбокс",
+    "custom-field-date": "Дата",
+    "custom-field-dropdown": "Падащо меню",
+    "custom-field-dropdown-none": "(няма)",
+    "custom-field-dropdown-options": "List Options",
+    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
+    "custom-field-dropdown-unknown": "(unknown)",
+    "custom-field-number": "Номер",
+    "custom-field-text": "Текст",
+    "custom-fields": "Собствени полета",
     "date": "Дата",
-    "decline": "Decline",
+    "decline": "Отказ",
     "default-avatar": "Основен аватар",
     "delete": "Изтрий",
+    "deleteCustomFieldPopup-title": "Изтриване на Собственото поле?",
     "deleteLabelPopup-title": "Желаете да изтриете етикета?",
     "description": "Описание",
     "disambiguateMultiLabelPopup-title": "Disambiguate Label Action",
     "disambiguateMultiMemberPopup-title": "Disambiguate Member Action",
-    "discard": "Discard",
-    "done": "Done",
+    "discard": "Отказ",
+    "done": "Готово",
     "download": "Сваляне",
     "edit": "Промени",
     "edit-avatar": "Промени аватара",
     "edit-profile": "Промяна на профила",
     "edit-wip-limit": "Промени WIP лимита",
-    "soft-wip-limit": "Soft WIP Limit",
+    "soft-wip-limit": "\"Мек\" WIP лимит",
     "editCardStartDatePopup-title": "Промени началната дата",
     "editCardDueDatePopup-title": "Промени датата за готовност",
+    "editCustomFieldPopup-title": "Промени Полето",
     "editCardSpentTimePopup-title": "Промени изработеното време",
-    "editLabelPopup-title": "Change Label",
+    "editLabelPopup-title": "Промяна на Етикета",
     "editNotificationPopup-title": "Промени известията",
     "editProfilePopup-title": "Промяна на профила",
     "email": "Имейл",
-    "email-enrollAccount-subject": "An account created for you on __siteName__",
+    "email-enrollAccount-subject": "Ваш профил беше създаден на __siteName__",
     "email-enrollAccount-text": "Hello __user__,\n\nTo start using the service, simply click the link below.\n\n__url__\n\nThanks.",
     "email-fail": "Неуспешно изпращане на имейла",
     "email-fail-text": "Възникна грешка при изпращането на имейла",
@@ -204,58 +281,64 @@
     "email-sent": "Имейлът е изпратен",
     "email-verifyEmail-subject": "Verify your email address on __siteName__",
     "email-verifyEmail-text": "Hello __user__,\n\nTo verify your account email, simply click the link below.\n\n__url__\n\nThanks.",
-    "enable-wip-limit": "Enable WIP Limit",
-    "error-board-doesNotExist": "This board does not exist",
-    "error-board-notAdmin": "You need to be admin of this board to do that",
-    "error-board-notAMember": "You need to be a member of this board to do that",
-    "error-json-malformed": "Your text is not valid JSON",
-    "error-json-schema": "Your JSON data does not include the proper information in the correct format",
-    "error-list-doesNotExist": "This list does not exist",
-    "error-user-doesNotExist": "This user does not exist",
-    "error-user-notAllowSelf": "You can not invite yourself",
-    "error-user-notCreated": "This user is not created",
-    "error-username-taken": "This username is already taken",
+    "enable-wip-limit": "Включи WIP лимита",
+    "error-board-doesNotExist": "Това табло не съществува",
+    "error-board-notAdmin": "За да направите това трябва да сте администратор на това табло",
+    "error-board-notAMember": "За да направите това трябва да сте член на това табло",
+    "error-json-malformed": "Текстът Ви не е валиден JSON",
+    "error-json-schema": "JSON информацията Ви не съдържа информация във валиден формат",
+    "error-list-doesNotExist": "Този списък не съществува",
+    "error-user-doesNotExist": "Този потребител не съществува",
+    "error-user-notAllowSelf": "Не можете да поканите себе си",
+    "error-user-notCreated": "Този потребител не е създаден",
+    "error-username-taken": "Това потребителско име е вече заето",
     "error-email-taken": "Имейлът е вече зает",
-    "export-board": "Export board",
+    "export-board": "Експортиране на Табло",
     "filter": "Филтър",
     "filter-cards": "Филтрирай картите",
     "filter-clear": "Премахване на филтрите",
-    "filter-no-label": "No label",
-    "filter-no-member": "No member",
+    "filter-no-label": "без етикет",
+    "filter-no-member": "без член",
+    "filter-no-custom-fields": "Няма Собствени полета",
     "filter-on": "Има приложени филтри",
-    "filter-on-desc": "В момента филтрирате картите в тази дъска. Моля, натиснете тук, за да промените филтъра.",
+    "filter-on-desc": "В момента филтрирате картите в това табло. Моля, натиснете тук, за да промените филтъра.",
     "filter-to-selection": "Филтрирай избраните",
+    "advanced-filter-label": "Advanced Filter",
+    "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) to be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
     "fullname": "Име",
-    "header-logo-title": "Go back to your boards page.",
+    "header-logo-title": "Назад към страницата с Вашите табла.",
     "hide-system-messages": "Скриване на системните съобщения",
-    "headerBarCreateBoardPopup-title": "Create Board",
-    "home": "Home",
-    "import": "Import",
-    "import-board": "import board",
-    "import-board-c": "Import board",
-    "import-board-title-trello": "Import board from Trello",
-    "import-board-title-wekan": "Import board from Wekan",
-    "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
-    "from-trello": "From Trello",
-    "from-wekan": "From Wekan",
+    "headerBarCreateBoardPopup-title": "Създай Табло",
+    "home": "Начало",
+    "import": "Импорт",
+    "link": "Връзка",
+    "import-board": "Импортирай Табло",
+    "import-board-c": "Импортирай Табло",
+    "import-board-title-trello": "Импорт на табло от Trello",
+    "import-board-title-wekan": "Import board from previous export",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
+    "import-sandstorm-warning": "Импортирането ще изтрие всичката налична информация в таблото и ще я замени с нова.",
+    "from-trello": "От Trello",
+    "from-wekan": "From previous export",
     "import-board-instruction-trello": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text.",
-    "import-board-instruction-wekan": "In your Wekan board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
-    "import-json-placeholder": "Paste your valid JSON data here",
+    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
+    "import-json-placeholder": "Копирайте валидната Ви JSON информация тук",
     "import-map-members": "Map members",
-    "import-members-map": "Your imported board has some members. Please map the members you want to import to Wekan users",
+    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
     "import-show-user-mapping": "Review members mapping",
-    "import-user-select": "Pick the Wekan user you want to use as this member",
-    "importMapMembersAddPopup-title": "Select Wekan member",
+    "import-user-select": "Pick your existing user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select member",
     "info": "Версия",
     "initials": "Инициали",
     "invalid-date": "Невалидна дата",
     "invalid-time": "Невалиден час",
     "invalid-user": "Невалиден потребител",
-    "joined": "joined",
-    "just-invited": "You are just invited to this board",
-    "keyboard-shortcuts": "Keyboard shortcuts",
+    "joined": "присъедини ",
+    "just-invited": "Бяхте поканени в това табло",
+    "keyboard-shortcuts": "Преки пътища с клавиатурата",
     "label-create": "Създай етикет",
-    "label-default": "%s label (default)",
+    "label-default": "%s етикет (по подразбиране)",
     "label-delete-pop": "There is no undo. This will remove this label from all cards and destroy its history.",
     "labels": "Етикети",
     "language": "Език",
@@ -264,17 +347,19 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "Връзка към тази карта",
-    "list-archive-cards": "Move all cards in this list to Recycle Bin",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
+    "list-archive-cards": "Премести всички карти от този списък в Архива",
+    "list-archive-cards-pop": "Това ще премахне всички карти от този Списък от Таблото. За да видите картите в Архива и да ги върнете натиснете на \"Меню\" > \"Архив\".",
     "list-move-cards": "Премести всички карти в този списък",
     "list-select-cards": "Избери всички карти в този списък",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "List Actions",
     "swimlaneActionPopup-title": "Swimlane Actions",
-    "listImportCardPopup-title": "Import a Trello card",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
+    "listImportCardPopup-title": "Импорт на карта от Trello",
     "listMorePopup-title": "Още",
     "link-list": "Връзка към този списък",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "Можете да преместите списъка в Архива, за да го премахнете от Таблото и така да запазите активността в него.",
     "lists": "Списъци",
     "swimlanes": "Коридори",
     "log-out": "Изход",
@@ -292,19 +377,19 @@
     "multi-selection-on": "Множественият избор е приложен",
     "muted": "Muted",
     "muted-info": "You will never be notified of any changes in this board",
-    "my-boards": "Моите дъски",
+    "my-boards": "Моите табла",
     "name": "Име",
-    "no-archived-cards": "No cards in Recycle Bin.",
-    "no-archived-lists": "No lists in Recycle Bin.",
-    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
+    "no-archived-cards": "Няма карти в Архива.",
+    "no-archived-lists": "Няма списъци в Архива.",
+    "no-archived-swimlanes": "Няма коридори в Архива.",
     "no-results": "No results",
     "normal": "Normal",
     "normal-desc": "Can view and edit cards. Can't change settings.",
     "not-accepted-yet": "Invitation not accepted yet",
     "notify-participate": "Получавате информация за всички карти, в които сте отбелязани или сте създали",
-    "notify-watch": "Получавате информация за всички дъски, списъци и карти, които наблюдавате",
+    "notify-watch": "Получавате информация за всички табла, списъци и карти, които наблюдавате",
     "optional": "optional",
-    "or": "or",
+    "or": "или",
     "page-maybe-private": "This page may be private. You may be able to view it by <a href='%s'>logging in</a>.",
     "page-not-found": "Page not found.",
     "password": "Парола",
@@ -323,21 +408,22 @@
     "remove-from-board": "Remove from Board",
     "remove-label": "Remove Label",
     "listDeletePopup-title": "Желаете да изтриете списъка?",
-    "remove-member": "Remove Member",
-    "remove-member-from-card": "Remove from Card",
+    "remove-member": "Премахни член",
+    "remove-member-from-card": "Премахни от картата",
     "remove-member-pop": "Remove __name__ (__username__) from __boardTitle__? The member will be removed from all cards on this board. They will receive a notification.",
     "removeMemberPopup-title": "Remove Member?",
     "rename": "Rename",
-    "rename-board": "Rename Board",
+    "rename-board": "Промени името на Таблото",
     "restore": "Възстанови",
     "save": "Запази",
     "search": "Търсене",
+    "rules": "Правила",
     "search-cards": "Search from card titles and descriptions on this board",
     "search-example": "Text to search for?",
     "select-color": "Избери цвят",
     "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
-    "setWipLimitPopup-title": "Set WIP Limit",
-    "shortcut-assign-self": "Assign yourself to current card",
+    "setWipLimitPopup-title": "Въведи WIP лимит",
+    "shortcut-assign-self": "Добави себе си към тази карта",
     "shortcut-autocomplete-emoji": "Autocomplete emoji",
     "shortcut-autocomplete-members": "Autocomplete members",
     "shortcut-clear-filters": "Изчистване на всички филтри",
@@ -351,12 +437,12 @@
     "sidebar-close": "Close Sidebar",
     "signupPopup-title": "Create an Account",
     "star-board-title": "Click to star this board. It will show up at top of your boards list.",
-    "starred-boards": "Любими дъски",
-    "starred-boards-description": "Любимите дъски се показват в началото на списъка Ви.",
+    "starred-boards": "Любими табла",
+    "starred-boards-description": "Любимите табла се показват в началото на списъка Ви.",
     "subscribe": "Subscribe",
     "team": "Team",
-    "this-board": "this board",
-    "this-card": "тази карта",
+    "this-board": "това табло",
+    "this-card": "картата",
     "spent-time-hours": "Изработено време (часа)",
     "overtime-hours": "Оувъртайм (часа)",
     "overtime": "Оувъртайм",
@@ -366,6 +452,7 @@
     "title": "Title",
     "tracking": "Следене",
     "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
+    "type": "Type",
     "unassign-member": "Unassign member",
     "unsaved-description": "You have an unsaved description.",
     "unwatch": "Спри наблюдаването",
@@ -374,7 +461,7 @@
     "uploaded-avatar": "Качихте аватар",
     "username": "Потребителско име",
     "view-it": "View it",
-    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
+    "warn-list-archived": "внимание: тази карта е в списък в Архива",
     "watch": "Наблюдавай",
     "watching": "Наблюдава",
     "watching-info": "You will be notified of any change in this board",
@@ -382,10 +469,13 @@
     "welcome-swimlane": "Milestone 1",
     "welcome-list1": "Basics",
     "welcome-list2": "Advanced",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
     "what-to-do": "What do you want to do?",
-    "wipLimitErrorPopup-title": "Invalid WIP Limit",
+    "wipLimitErrorPopup-title": "Невалиден WIP лимит",
     "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
-    "wipLimitErrorPopup-dialog-pt2": "Please move some tasks out of this list, or set a higher WIP limit.",
+    "wipLimitErrorPopup-dialog-pt2": "Моля, преместете някои от задачите от този списък или въведете по-висок WIP лимит.",
     "admin-panel": "Администраторски панел",
     "settings": "Настройки",
     "people": "Хора",
@@ -393,7 +483,7 @@
     "disable-self-registration": "Disable Self-Registration",
     "invite": "Покани",
     "invite-people": "Покани хора",
-    "to-boards": "To board(s)",
+    "to-boards": "в табло/а",
     "email-addresses": "Имейл адреси",
     "smtp-host-description": "Адресът на SMTP сървъра, който обслужва Вашите имейли.",
     "smtp-port-description": "Портът, който Вашият SMTP сървър използва за изходящи имейли.",
@@ -407,16 +497,16 @@
     "send-smtp-test": "Изпрати тестов имейл на себе си",
     "invitation-code": "Invitation Code",
     "email-invite-register-subject": "__inviter__ sent you an invitation",
-    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to Wekan for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
-    "email-smtp-test-subject": "SMTP тестов имейл, изпратен от Wekan",
+    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email",
     "email-smtp-test-text": "Успешно изпратихте имейл",
     "error-invitation-code-not-exist": "Invitation code doesn't exist",
     "error-notAuthorized": "You are not authorized to view this page.",
     "outgoing-webhooks": "Outgoing Webhooks",
     "outgoingWebhooksPopup-title": "Outgoing Webhooks",
+    "boardCardTitlePopup-title": "Card Title Filter",
     "new-outgoing-webhook": "New Outgoing Webhook",
     "no-name": "(Unknown)",
-    "Wekan_version": "Версия на Wekan",
     "Node_version": "Версия на Node",
     "OS_Arch": "Архитектура на ОС",
     "OS_Cpus": "Брой CPU ядра",
@@ -427,20 +517,177 @@
     "OS_Totalmem": "ОС Общо памет",
     "OS_Type": "Тип ОС",
     "OS_Uptime": "OS Ъптайм",
+    "days": "дни",
     "hours": "часа",
     "minutes": "минути",
     "seconds": "секунди",
+    "show-field-on-card": "Покажи това поле в картата",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
     "yes": "Да",
     "no": "Не",
     "accounts": "Профили",
     "accounts-allowEmailChange": "Разреши промяна на имейла",
+    "accounts-allowUserNameChange": "Allow Username Change",
     "createdAt": "Създаден на",
     "verified": "Потвърден",
     "active": "Активен",
-    "card-received": "Received",
-    "card-received-on": "Received on",
-    "card-end": "End",
-    "card-end-on": "Ends on",
-    "editCardReceivedDatePopup-title": "Change received date",
-    "editCardEndDatePopup-title": "Change end date"
-}
+    "card-received": "Получена",
+    "card-received-on": "Получена на",
+    "card-end": "Завършена",
+    "card-end-on": "Завършена на",
+    "editCardReceivedDatePopup-title": "Промени датата на получаване",
+    "editCardEndDatePopup-title": "Промени датата на завършване",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "Разпределена от",
+    "requested-by": "Поискан от",
+    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
+    "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
+    "boardDeletePopup-title": "Изтриване на Таблото?",
+    "delete-board": "Изтрий таблото",
+    "default-subtasks-board": "Подзадачи за табло __board__",
+    "default": "по подразбиране",
+    "queue": "Опашка",
+    "subtask-settings": "Настройки на Подзадачите",
+    "boardSubtaskSettingsPopup-title": "Настройки за Подзадачите за това Табло",
+    "show-subtasks-field": "Картата може да има подзадачи",
+    "deposit-subtasks-board": "Deposit subtasks to this board:",
+    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
+    "show-parent-in-minicard": "Show parent in minicard:",
+    "prefix-with-full-path": "Prefix with full path",
+    "prefix-with-parent": "Prefix with parent",
+    "subtext-with-full-path": "Subtext with full path",
+    "subtext-with-parent": "Subtext with parent",
+    "change-card-parent": "Промени източника на картата",
+    "parent-card": "Карта-източник",
+    "source-board": "Source board",
+    "no-parent": "Не показвай източника",
+    "activity-added-label": "добави етикет '%s' към %s",
+    "activity-removed-label": "премахна етикет '%s' от %s",
+    "activity-delete-attach": "изтри прикачен файл от %s",
+    "activity-added-label-card": "добави етикет '%s'",
+    "activity-removed-label-card": "премахна етикет '%s'",
+    "activity-delete-attach-card": "изтри прикачения файл",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "r-rule": "Правило",
+    "r-add-trigger": "Добави спусък",
+    "r-add-action": "Добави действие",
+    "r-board-rules": "Правила за таблото",
+    "r-add-rule": "Добави правилото",
+    "r-view-rule": "Виж правилото",
+    "r-delete-rule": "Изтрий правилото",
+    "r-new-rule-name": "Заглавие за новото правило",
+    "r-no-rules": "Няма правила",
+    "r-when-a-card": "Когато карта",
+    "r-is": "е",
+    "r-is-moved": "преместена",
+    "r-added-to": "добавена в",
+    "r-removed-from": "премахната от",
+    "r-the-board": "таблото",
+    "r-list": "списък",
+    "set-filter": "Set Filter",
+    "r-moved-to": "Moved to",
+    "r-moved-from": "Moved from",
+    "r-archived": "Преместено в Архива",
+    "r-unarchived": "Възстановено от Архива",
+    "r-a-card": "карта",
+    "r-when-a-label-is": "When a label is",
+    "r-when-the-label-is": "When the label is",
+    "r-list-name": "list name",
+    "r-when-a-member": "When a member is",
+    "r-when-the-member": "When the member",
+    "r-name": "име",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "r-when-the-item": "When the checklist item",
+    "r-checked": "Checked",
+    "r-unchecked": "Unchecked",
+    "r-move-card-to": "Премести картата в",
+    "r-top-of": "началото на",
+    "r-bottom-of": "края на",
+    "r-its-list": "списъка й",
+    "r-archive": "Премести в Архива",
+    "r-unarchive": "Възстанови от Архива",
+    "r-card": "карта",
+    "r-add": "Добави",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-set-color": "Set color to",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "subject",
+    "r-rule-details": "Детайли за правилото",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Move card to top of list",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Move card to bottom of list",
+    "r-d-send-email": "Send email",
+    "r-d-send-email-to": "to",
+    "r-d-send-email-subject": "subject",
+    "r-d-send-email-message": "message",
+    "r-d-archive": "Премести картата в Архива",
+    "r-d-unarchive": "Възстанови картата от Архива",
+    "r-d-add-label": "Add label",
+    "r-d-remove-label": "Remove label",
+    "r-create-card": "Create new card",
+    "r-in-list": "in list",
+    "r-in-swimlane": "in swimlane",
+    "r-d-add-member": "Add member",
+    "r-d-remove-member": "Remove member",
+    "r-d-remove-all-member": "Remove all member",
+    "r-d-check-all": "Check all items of a list",
+    "r-d-uncheck-all": "Uncheck all items of a list",
+    "r-d-check-one": "Check item",
+    "r-d-uncheck-one": "Uncheck item",
+    "r-d-check-of-list": "of checklist",
+    "r-d-add-checklist": "Добави чеклист",
+    "r-d-remove-checklist": "Премахни чеклист",
+    "r-by": "by",
+    "r-add-checklist": "Добави чеклист",
+    "r-with-items": "с точки",
+    "r-items-list": "точка1,точка2,точка3",
+    "r-add-swimlane": "Добави коридор",
+    "r-swimlane-name": "име на коридора",
+    "r-board-note": "Note: leave a field empty to match every possible value.",
+    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout",
+    "hide-logo": "Hide Logo",
+    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
+    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
+    "error-undefined": "Something went wrong",
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
+}
\ No newline at end of file
diff --git a/i18n/br.i18n.json b/i18n/br.i18n.json
index 51d90051..e52b6d81 100644
--- a/i18n/br.i18n.json
+++ b/i18n/br.i18n.json
@@ -1,35 +1,51 @@
 {
     "accept": "Asantiñ",
-    "act-activity-notify": "[Wekan] Activity Notification",
-    "act-addAttachment": "attached __attachment__ to __card__",
-    "act-addChecklist": "added checklist __checklist__ to __card__",
-    "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__",
-    "act-addComment": "commented on __card__: __comment__",
-    "act-createBoard": "created __board__",
-    "act-createCard": "added __card__ to __list__",
-    "act-createList": "added __list__ to __board__",
-    "act-addBoardMember": "added __member__ to __board__",
-    "act-archivedBoard": "__board__ moved to Recycle Bin",
-    "act-archivedCard": "__card__ moved to Recycle Bin",
-    "act-archivedList": "__list__ moved to Recycle Bin",
-    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
-    "act-importBoard": "imported __board__",
-    "act-importCard": "imported __card__",
-    "act-importList": "imported __list__",
-    "act-joinMember": "added __member__ to __card__",
-    "act-moveCard": "moved __card__ from __oldList__ to __list__",
-    "act-removeBoardMember": "removed __member__ from __board__",
-    "act-restoredCard": "restored __card__ to __board__",
-    "act-unjoinMember": "removed __member__ from __card__",
-    "act-withBoardTitle": "[Wekan] __board__",
+    "act-activity-notify": "Activity Notification",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__board__",
     "act-withCardTitle": "[__board__] __card__",
     "actions": "Oberoù",
     "activities": "Oberiantizoù",
     "activity": "Oberiantiz",
     "activity-added": "%s ouzhpennet da %s",
-    "activity-archived": "%s moved to Recycle Bin",
+    "activity-archived": "%s moved to Archive",
     "activity-attached": "%s liammet ouzh %s",
     "activity-created": "%s krouet",
+    "activity-customfield-created": "created custom field %s",
     "activity-excluded": "excluded %s from %s",
     "activity-imported": "%s enporzhiet eus %s da %s",
     "activity-imported-board": "%s enporzhiet da %s",
@@ -39,13 +55,25 @@
     "activity-removed": "removed %s from %s",
     "activity-sent": "sent %s to %s",
     "activity-unjoined": "unjoined %s",
+    "activity-subtask-added": "added subtask to %s",
+    "activity-checked-item": "checked %s in checklist %s of %s",
+    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
     "activity-checklist-added": "added checklist to %s",
+    "activity-checklist-removed": "removed a checklist from %s",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
     "activity-checklist-item-added": "added checklist item to '%s' in %s",
+    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
     "add": "Ouzhpenn",
+    "activity-checked-item-card": "checked %s in checklist %s",
+    "activity-unchecked-item-card": "unchecked %s in checklist %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
     "add-attachment": "Add Attachment",
     "add-board": "Add Board",
     "add-card": "Add Card",
     "add-swimlane": "Add Swimlane",
+    "add-subtask": "Add Subtask",
     "add-checklist": "Add Checklist",
     "add-checklist-item": "Add an item to checklist",
     "add-cover": "Ouzphenn ur golo",
@@ -63,20 +91,22 @@
     "and-n-other-card": "And __count__ other card",
     "and-n-other-card_plural": "And __count__ other cards",
     "apply": "Apply",
-    "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Move to Recycle Bin",
-    "archive-all": "Move All to Recycle Bin",
-    "archive-board": "Move Board to Recycle Bin",
-    "archive-card": "Move Card to Recycle Bin",
-    "archive-list": "Move List to Recycle Bin",
-    "archive-swimlane": "Move Swimlane to Recycle Bin",
-    "archive-selection": "Move selection to Recycle Bin",
-    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
-    "archived-items": "Recycle Bin",
-    "archived-boards": "Boards in Recycle Bin",
+    "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
+    "archive": "Move to Archive",
+    "archive-all": "Move All to Archive",
+    "archive-board": "Move Board to Archive",
+    "archive-card": "Move Card to Archive",
+    "archive-list": "Move List to Archive",
+    "archive-swimlane": "Move Swimlane to Archive",
+    "archive-selection": "Move selection to Archive",
+    "archiveBoardPopup-title": "Move Board to Archive?",
+    "archived-items": "Archive",
+    "archived-boards": "Boards in Archive",
     "restore-board": "Restore Board",
-    "no-archived-boards": "No Boards in Recycle Bin.",
-    "archives": "Recycle Bin",
+    "no-archived-boards": "No Boards in Archive.",
+    "archives": "Archive",
+    "template": "Template",
+    "templates": "Templates",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Attachment",
@@ -95,22 +125,25 @@
     "boardChangeTitlePopup-title": "Rename Board",
     "boardChangeVisibilityPopup-title": "Change Visibility",
     "boardChangeWatchPopup-title": "Change Watch",
-    "boardMenuPopup-title": "Board Menu",
+    "boardMenuPopup-title": "Board Settings",
     "boards": "Boards",
     "board-view": "Board View",
+    "board-view-cal": "Calendar",
     "board-view-swimlanes": "Swimlanes",
     "board-view-lists": "Lists",
     "bucket-example": "Like “Bucket List” for example",
     "cancel": "Cancel",
-    "card-archived": "This card is moved to Recycle Bin.",
+    "card-archived": "This card is moved to Archive.",
+    "board-archived": "This board is moved to Archive.",
     "card-comments-title": "This card has %s comment.",
     "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
     "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
     "card-due": "Due",
     "card-due-on": "Due on",
     "card-spent": "Spent Time",
     "card-edit-attachments": "Edit attachments",
+    "card-edit-custom-fields": "Edit custom fields",
     "card-edit-labels": "Edit labels",
     "card-edit-members": "Edit members",
     "card-labels-title": "Change the labels for the card.",
@@ -118,13 +151,20 @@
     "card-start": "Start",
     "card-start-on": "Starts on",
     "cardAttachmentsPopup-title": "Attach From",
+    "cardCustomField-datePopup-title": "Change date",
+    "cardCustomFieldsPopup-title": "Edit custom fields",
     "cardDeletePopup-title": "Diverkañ ar gartenn ?",
     "cardDetailsActionsPopup-title": "Card Actions",
     "cardLabelsPopup-title": "Labels",
     "cardMembersPopup-title": "Izili",
     "cardMorePopup-title": "Muioc’h",
+    "cardTemplatePopup-title": "Create template",
     "cards": "Kartennoù",
     "cards-count": "Kartennoù",
+    "casSignIn": "Sign In with CAS",
+    "cardType-card": "Card",
+    "cardType-linkedCard": "Linked Card",
+    "cardType-linkedBoard": "Linked Board",
     "change": "Change",
     "change-avatar": "Change Avatar",
     "change-password": "Kemmañ ger-tremen",
@@ -135,30 +175,52 @@
     "changePasswordPopup-title": "Kemmañ ger-tremen",
     "changePermissionsPopup-title": "Change Permissions",
     "changeSettingsPopup-title": "Change Settings",
+    "subtasks": "Subtasks",
     "checklists": "Checklists",
     "click-to-star": "Click to star this board.",
     "click-to-unstar": "Click to unstar this board.",
     "clipboard": "Clipboard or drag & drop",
     "close": "Close",
     "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
     "color-black": "du",
     "color-blue": "glas",
+    "color-crimson": "crimson",
+    "color-darkgreen": "darkgreen",
+    "color-gold": "gold",
+    "color-gray": "gray",
     "color-green": "gwer",
+    "color-indigo": "indigo",
     "color-lime": "melen sitroñs",
+    "color-magenta": "magenta",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "navy",
     "color-orange": "orañjez",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
     "color-pink": "roz",
+    "color-plum": "plum",
     "color-purple": "mouk",
     "color-red": "ruz",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "silver",
     "color-sky": "pers",
+    "color-slateblue": "slateblue",
+    "color-white": "white",
     "color-yellow": "melen",
+    "unset-color": "Unset",
     "comment": "Comment",
     "comment-placeholder": "Write Comment",
     "comment-only": "Comment only",
     "comment-only-desc": "Can comment on cards only.",
+    "no-comments": "No comments",
+    "no-comments-desc": "Can not see comments and activities.",
     "computer": "Computer",
-    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist",
+    "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?",
+    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
     "copy-card-link-to-clipboard": "Copy card link to clipboard",
+    "linkCardPopup-title": "Link Card",
+    "searchElementPopup-title": "Search",
     "copyCardPopup-title": "Copy Card",
     "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
     "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
@@ -167,11 +229,25 @@
     "createBoardPopup-title": "Create Board",
     "chooseBoardSourcePopup-title": "Import board",
     "createLabelPopup-title": "Create Label",
+    "createCustomField": "Create Field",
+    "createCustomFieldPopup-title": "Create Field",
     "current": "current",
+    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
+    "custom-field-checkbox": "Checkbox",
+    "custom-field-date": "Date",
+    "custom-field-dropdown": "Dropdown List",
+    "custom-field-dropdown-none": "(none)",
+    "custom-field-dropdown-options": "List Options",
+    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
+    "custom-field-dropdown-unknown": "(unknown)",
+    "custom-field-number": "Number",
+    "custom-field-text": "Text",
+    "custom-fields": "Custom Fields",
     "date": "Date",
     "decline": "Decline",
     "default-avatar": "Default avatar",
     "delete": "Diverkañ",
+    "deleteCustomFieldPopup-title": "Delete Custom Field?",
     "deleteLabelPopup-title": "Delete Label?",
     "description": "Description",
     "disambiguateMultiLabelPopup-title": "Disambiguate Label Action",
@@ -186,6 +262,7 @@
     "soft-wip-limit": "Soft WIP Limit",
     "editCardStartDatePopup-title": "Change start date",
     "editCardDueDatePopup-title": "Change due date",
+    "editCustomFieldPopup-title": "Edit Field",
     "editCardSpentTimePopup-title": "Change spent time",
     "editLabelPopup-title": "Change Label",
     "editNotificationPopup-title": "Edit Notification",
@@ -222,30 +299,36 @@
     "filter-clear": "Clear filter",
     "filter-no-label": "No label",
     "filter-no-member": "No member",
+    "filter-no-custom-fields": "No Custom Fields",
     "filter-on": "Filter is on",
     "filter-on-desc": "You are filtering cards on this board. Click here to edit filter.",
     "filter-to-selection": "Filter to selection",
+    "advanced-filter-label": "Advanced Filter",
+    "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) to be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
     "fullname": "Full Name",
     "header-logo-title": "Go back to your boards page.",
     "hide-system-messages": "Hide system messages",
     "headerBarCreateBoardPopup-title": "Create Board",
     "home": "Home",
     "import": "Import",
+    "link": "Link",
     "import-board": "import board",
     "import-board-c": "Import board",
     "import-board-title-trello": "Import board from Trello",
-    "import-board-title-wekan": "Import board from Wekan",
+    "import-board-title-wekan": "Import board from previous export",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
     "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
     "from-trello": "From Trello",
-    "from-wekan": "From Wekan",
+    "from-wekan": "From previous export",
     "import-board-instruction-trello": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text",
-    "import-board-instruction-wekan": "In your Wekan board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
     "import-json-placeholder": "Paste your valid JSON data here",
     "import-map-members": "Map members",
-    "import-members-map": "Your imported board has some members. Please map the members you want to import to Wekan users",
+    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
     "import-show-user-mapping": "Review members mapping",
-    "import-user-select": "Pick the Wekan user you want to use as this member",
-    "importMapMembersAddPopup-title": "Select Wekan member",
+    "import-user-select": "Pick your existing user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select member",
     "info": "Version",
     "initials": "Initials",
     "invalid-date": "Invalid date",
@@ -264,17 +347,19 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "Link to this card",
-    "list-archive-cards": "Move all cards in this list to Recycle Bin",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
+    "list-archive-cards": "Move all cards in this list to Archive",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "List Actions",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Import a Trello card",
     "listMorePopup-title": "Muioc’h",
     "link-list": "Link to this list",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
     "lists": "Lists",
     "swimlanes": "Swimlanes",
     "log-out": "Log Out",
@@ -294,9 +379,9 @@
     "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "My Boards",
     "name": "Name",
-    "no-archived-cards": "No cards in Recycle Bin.",
-    "no-archived-lists": "No lists in Recycle Bin.",
-    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
+    "no-archived-cards": "No cards in Archive.",
+    "no-archived-lists": "No lists in Archive.",
+    "no-archived-swimlanes": "No swimlanes in Archive.",
     "no-results": "No results",
     "normal": "Normal",
     "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -332,6 +417,7 @@
     "restore": "Restore",
     "save": "Save",
     "search": "Search",
+    "rules": "Rules",
     "search-cards": "Search from card titles and descriptions on this board",
     "search-example": "Text to search for?",
     "select-color": "Select Color",
@@ -366,6 +452,7 @@
     "title": "Title",
     "tracking": "Tracking",
     "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
+    "type": "Type",
     "unassign-member": "Unassign member",
     "unsaved-description": "You have an unsaved description.",
     "unwatch": "Unwatch",
@@ -374,7 +461,7 @@
     "uploaded-avatar": "Uploaded an avatar",
     "username": "Username",
     "view-it": "View it",
-    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
+    "warn-list-archived": "warning: this card is in an list at Archive",
     "watch": "Watch",
     "watching": "Watching",
     "watching-info": "You will be notified of any change in this board",
@@ -382,6 +469,9 @@
     "welcome-swimlane": "Milestone 1",
     "welcome-list1": "Basics",
     "welcome-list2": "Advanced",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
     "what-to-do": "What do you want to do?",
     "wipLimitErrorPopup-title": "Invalid WIP Limit",
     "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
@@ -407,16 +497,16 @@
     "send-smtp-test": "Send a test email to yourself",
     "invitation-code": "Invitation Code",
     "email-invite-register-subject": "__inviter__ sent you an invitation",
-    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to Wekan for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
-    "email-smtp-test-subject": "SMTP Test Email From Wekan",
+    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email",
     "email-smtp-test-text": "You have successfully sent an email",
     "error-invitation-code-not-exist": "Invitation code doesn't exist",
     "error-notAuthorized": "You are not authorized to view this page.",
     "outgoing-webhooks": "Outgoing Webhooks",
     "outgoingWebhooksPopup-title": "Outgoing Webhooks",
+    "boardCardTitlePopup-title": "Card Title Filter",
     "new-outgoing-webhook": "New Outgoing Webhook",
     "no-name": "(Unknown)",
-    "Wekan_version": "Wekan version",
     "Node_version": "Node version",
     "OS_Arch": "OS Arch",
     "OS_Cpus": "OS CPU Count",
@@ -427,13 +517,18 @@
     "OS_Totalmem": "OS Total Memory",
     "OS_Type": "OS Type",
     "OS_Uptime": "OS Uptime",
+    "days": "days",
     "hours": "hours",
     "minutes": "minutes",
     "seconds": "seconds",
+    "show-field-on-card": "Show this field on card",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
     "yes": "Yes",
     "no": "No",
     "accounts": "Accounts",
     "accounts-allowEmailChange": "Allow Email Change",
+    "accounts-allowUserNameChange": "Allow Username Change",
     "createdAt": "Created at",
     "verified": "Verified",
     "active": "Active",
@@ -442,5 +537,157 @@
     "card-end": "End",
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
-    "editCardEndDatePopup-title": "Change end date"
-}
+    "editCardEndDatePopup-title": "Change end date",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "Assigned By",
+    "requested-by": "Requested By",
+    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
+    "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
+    "boardDeletePopup-title": "Delete Board?",
+    "delete-board": "Delete Board",
+    "default-subtasks-board": "Subtasks for __board__ board",
+    "default": "Default",
+    "queue": "Queue",
+    "subtask-settings": "Subtasks Settings",
+    "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
+    "show-subtasks-field": "Cards can have subtasks",
+    "deposit-subtasks-board": "Deposit subtasks to this board:",
+    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
+    "show-parent-in-minicard": "Show parent in minicard:",
+    "prefix-with-full-path": "Prefix with full path",
+    "prefix-with-parent": "Prefix with parent",
+    "subtext-with-full-path": "Subtext with full path",
+    "subtext-with-parent": "Subtext with parent",
+    "change-card-parent": "Change card's parent",
+    "parent-card": "Parent card",
+    "source-board": "Source board",
+    "no-parent": "Don't show parent",
+    "activity-added-label": "added label '%s' to %s",
+    "activity-removed-label": "removed label '%s' from %s",
+    "activity-delete-attach": "deleted an attachment from %s",
+    "activity-added-label-card": "added label '%s'",
+    "activity-removed-label-card": "removed label '%s'",
+    "activity-delete-attach-card": "deleted an attachment",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "r-rule": "Rule",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "Add action",
+    "r-board-rules": "Board rules",
+    "r-add-rule": "Add rule",
+    "r-view-rule": "View rule",
+    "r-delete-rule": "Delete rule",
+    "r-new-rule-name": "New rule title",
+    "r-no-rules": "No rules",
+    "r-when-a-card": "When a card",
+    "r-is": "is",
+    "r-is-moved": "is moved",
+    "r-added-to": "added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "the board",
+    "r-list": "list",
+    "set-filter": "Set Filter",
+    "r-moved-to": "Moved to",
+    "r-moved-from": "Moved from",
+    "r-archived": "Moved to Archive",
+    "r-unarchived": "Restored from Archive",
+    "r-a-card": "a card",
+    "r-when-a-label-is": "When a label is",
+    "r-when-the-label-is": "When the label is",
+    "r-list-name": "list name",
+    "r-when-a-member": "When a member is",
+    "r-when-the-member": "When the member",
+    "r-name": "name",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "r-when-the-item": "When the checklist item",
+    "r-checked": "Checked",
+    "r-unchecked": "Unchecked",
+    "r-move-card-to": "Move card to",
+    "r-top-of": "Top of",
+    "r-bottom-of": "Bottom of",
+    "r-its-list": "its list",
+    "r-archive": "Move to Archive",
+    "r-unarchive": "Restore from Archive",
+    "r-card": "card",
+    "r-add": "Ouzhpenn",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-set-color": "Set color to",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "subject",
+    "r-rule-details": "Rule details",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Move card to top of list",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Move card to bottom of list",
+    "r-d-send-email": "Send email",
+    "r-d-send-email-to": "to",
+    "r-d-send-email-subject": "subject",
+    "r-d-send-email-message": "message",
+    "r-d-archive": "Move card to Archive",
+    "r-d-unarchive": "Restore card from Archive",
+    "r-d-add-label": "Add label",
+    "r-d-remove-label": "Remove label",
+    "r-create-card": "Create new card",
+    "r-in-list": "in list",
+    "r-in-swimlane": "in swimlane",
+    "r-d-add-member": "Add member",
+    "r-d-remove-member": "Remove member",
+    "r-d-remove-all-member": "Remove all member",
+    "r-d-check-all": "Check all items of a list",
+    "r-d-uncheck-all": "Uncheck all items of a list",
+    "r-d-check-one": "Check item",
+    "r-d-uncheck-one": "Uncheck item",
+    "r-d-check-of-list": "of checklist",
+    "r-d-add-checklist": "Add checklist",
+    "r-d-remove-checklist": "Remove checklist",
+    "r-by": "by",
+    "r-add-checklist": "Add checklist",
+    "r-with-items": "with items",
+    "r-items-list": "item1,item2,item3",
+    "r-add-swimlane": "Add swimlane",
+    "r-swimlane-name": "swimlane name",
+    "r-board-note": "Note: leave a field empty to match every possible value.",
+    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout",
+    "hide-logo": "Hide Logo",
+    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
+    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
+    "error-undefined": "Something went wrong",
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
+}
\ No newline at end of file
diff --git a/i18n/ca.i18n.json b/i18n/ca.i18n.json
index 4379081b..8169a547 100644
--- a/i18n/ca.i18n.json
+++ b/i18n/ca.i18n.json
@@ -1,35 +1,51 @@
 {
     "accept": "Accepta",
-    "act-activity-notify": "[Wekan] Notificació d'activitat",
-    "act-addAttachment": "adjuntat __attachment__ a __card__",
-    "act-addChecklist": "afegida la checklist _checklist__ a __card__",
-    "act-addChecklistItem": "afegit __checklistItem__ a la checklist __checklist__ on __card__",
-    "act-addComment": "comentat a __card__: __comment__",
-    "act-createBoard": "creat __board__",
-    "act-createCard": "afegit/da __card__ a __list__",
-    "act-createList": "afegit/da __list__ a __board__",
-    "act-addBoardMember": "afegit/da __member__ a __board__",
-    "act-archivedBoard": "__board__ moved to Recycle Bin",
-    "act-archivedCard": "__card__ moved to Recycle Bin",
-    "act-archivedList": "__list__ moved to Recycle Bin",
-    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
-    "act-importBoard": "__board__ importat",
-    "act-importCard": "__card__ importat",
-    "act-importList": "__list__ importat",
-    "act-joinMember": "afegit/da __member__ a __card__",
-    "act-moveCard": "mou __card__ de __oldList__ a __list__",
-    "act-removeBoardMember": "elimina __member__ de __board__",
-    "act-restoredCard": "recupera __card__ a __board__",
-    "act-unjoinMember": "elimina __member__ de __card__",
-    "act-withBoardTitle": "[Wekan] __board__",
-    "act-withCardTitle": "[__board__] __card__",
+    "act-activity-notify": "Notificació d'activitat",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__tauler__",
+    "act-withCardTitle": "[__tauler__] __fitxa__",
     "actions": "Accions",
     "activities": "Activitats",
     "activity": "Activitat",
     "activity-added": "ha afegit %s a %s",
-    "activity-archived": "%s moved to Recycle Bin",
+    "activity-archived": "%s mogut al Arxiu",
     "activity-attached": "ha adjuntat %s a %s",
     "activity-created": "ha creat %s",
+    "activity-customfield-created": "camp personalitzat creat %s",
     "activity-excluded": "ha exclòs %s de %s",
     "activity-imported": "importat %s dins %s des de %s",
     "activity-imported-board": "importat %s des de %s",
@@ -39,15 +55,27 @@
     "activity-removed": "ha eliminat %s de %s",
     "activity-sent": "ha enviat %s %s",
     "activity-unjoined": "desassignat %s",
+    "activity-subtask-added": "added subtask to %s",
+    "activity-checked-item": "checked %s in checklist %s of %s",
+    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
     "activity-checklist-added": "Checklist afegida a %s",
+    "activity-checklist-removed": "removed a checklist from %s",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
     "activity-checklist-item-added": "afegida entrada de checklist de '%s' a %s",
+    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
     "add": "Afegeix",
+    "activity-checked-item-card": "checked %s in checklist %s",
+    "activity-unchecked-item-card": "unchecked %s in checklist %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
     "add-attachment": "Afegeix adjunt",
     "add-board": "Afegeix Tauler",
-    "add-card": "Afegeix fitxa",
+    "add-card": "Afegeix Fitxa",
     "add-swimlane": "Afegix Carril de Natació",
+    "add-subtask": "Afegir Subtasca",
     "add-checklist": "Afegeix checklist",
-    "add-checklist-item": "Afegeix un ítem",
+    "add-checklist-item": "Afegeix un ítem al checklist",
     "add-cover": "Afegeix coberta",
     "add-label": "Afegeix etiqueta",
     "add-list": "Afegeix llista",
@@ -55,62 +83,67 @@
     "added": "Afegit",
     "addMemberPopup-title": "Membres",
     "admin": "Administrador",
-    "admin-desc": "Pots veure i editar fitxes, eliminar membres, i canviar la configuració del tauler",
-    "admin-announcement": "Bàndol",
-    "admin-announcement-active": "Activar bàndol del Sistema",
-    "admin-announcement-title": "Bàndol de l'administració",
+    "admin-desc": "Pots veure i editar fitxes, eliminar usuaris, i canviar la configuració del tauler.",
+    "admin-announcement": "Alertes",
+    "admin-announcement-active": "Activar alertes del Sistema",
+    "admin-announcement-title": "Alertes d'administració",
     "all-boards": "Tots els taulers",
     "and-n-other-card": "And __count__ other card",
     "and-n-other-card_plural": "And __count__ other cards",
     "apply": "Aplica",
-    "app-is-offline": "Wekan s'està carregant, esperau si us plau. Refrescar la pàgina causarà la pérdua de les dades. Si Wekan no carrega, verificau que el servei de Wekan no estigui aturat",
-    "archive": "Move to Recycle Bin",
-    "archive-all": "Move All to Recycle Bin",
-    "archive-board": "Move Board to Recycle Bin",
-    "archive-card": "Move Card to Recycle Bin",
-    "archive-list": "Move List to Recycle Bin",
-    "archive-swimlane": "Move Swimlane to Recycle Bin",
-    "archive-selection": "Move selection to Recycle Bin",
-    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
-    "archived-items": "Recycle Bin",
-    "archived-boards": "Boards in Recycle Bin",
+    "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
+    "archive": "Moure al arxiu",
+    "archive-all": "Moure tot al arxiu",
+    "archive-board": "Moure Tauler al Arxiu",
+    "archive-card": "Moure Fitxa al Arxiu",
+    "archive-list": "Moure Llista al Arxiu",
+    "archive-swimlane": "Move Swimlane to Archive",
+    "archive-selection": "Moure selecció al Arxiu",
+    "archiveBoardPopup-title": "Moure el Tauler al Arxiu?",
+    "archived-items": "Desa",
+    "archived-boards": "Taulers al Arxiu",
     "restore-board": "Restaura Tauler",
-    "no-archived-boards": "No Boards in Recycle Bin.",
-    "archives": "Recycle Bin",
+    "no-archived-boards": "No hi han Taulers al Arxiu.",
+    "archives": "Desa",
+    "template": "Template",
+    "templates": "Templates",
     "assign-member": "Assignar membre",
     "attached": "adjuntat",
     "attachment": "Adjunt",
     "attachment-delete-pop": "L'esborrat d'un arxiu adjunt és permanent. No es pot desfer.",
     "attachmentDeletePopup-title": "Esborrar adjunt?",
     "attachments": "Adjunts",
-    "auto-watch": "Automàticament segueix el taulers quan són creats",
+    "auto-watch": "Segueix automàticament el taulers quan són creats",
     "avatar-too-big": "L'avatar es massa gran (70KM max)",
     "back": "Enrere",
     "board-change-color": "Canvia el color",
     "board-nb-stars": "%s estrelles",
     "board-not-found": "No s'ha trobat el tauler",
-    "board-private-info": "Aquest tauler serà <strong> privat </ strong>.",
-    "board-public-info": "Aquest tauler serà <strong> públic </ strong>.",
-    "boardChangeColorPopup-title": "Canvia fons",
+    "board-private-info": "Aquest tauler serà <strong> privat.",
+    "board-public-info": "Aquest tauler serà <strong> públic.",
+    "boardChangeColorPopup-title": "Canvia fons del tauler",
     "boardChangeTitlePopup-title": "Canvia el nom tauler",
     "boardChangeVisibilityPopup-title": "Canvia visibilitat",
     "boardChangeWatchPopup-title": "Canvia seguiment",
-    "boardMenuPopup-title": "Menú del tauler",
+    "boardMenuPopup-title": "Board Settings",
     "boards": "Taulers",
     "board-view": "Visió del tauler",
+    "board-view-cal": "Calendari",
     "board-view-swimlanes": "Carrils de Natació",
     "board-view-lists": "Llistes",
     "bucket-example": "Igual que “Bucket List”,  per exemple",
     "cancel": "Cancel·la",
-    "card-archived": "This card is moved to Recycle Bin.",
+    "card-archived": "Aquesta fitxa ha estat moguda al Arxiu.",
+    "board-archived": "Aquest tauler s'ha mogut al arxiu",
     "card-comments-title": "Aquesta fitxa té %s comentaris.",
     "card-delete-notice": "L'esborrat és permanent. Perdreu totes les accions associades a aquesta fitxa.",
     "card-delete-pop": "Totes les accions s'eliminaran de l'activitat i no podreu tornar a obrir la fitxa. No es pot desfer.",
-    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
     "card-due": "Finalitza",
     "card-due-on": "Finalitza a",
     "card-spent": "Temps Dedicat",
     "card-edit-attachments": "Edita arxius adjunts",
+    "card-edit-custom-fields": "Editar camps personalitzats",
     "card-edit-labels": "Edita etiquetes",
     "card-edit-members": "Edita membres",
     "card-labels-title": "Canvia les etiquetes de la fitxa",
@@ -118,13 +151,20 @@
     "card-start": "Comença",
     "card-start-on": "Comença a",
     "cardAttachmentsPopup-title": "Adjunta des de",
+    "cardCustomField-datePopup-title": "Canviar data",
+    "cardCustomFieldsPopup-title": "Editar camps personalitzats",
     "cardDeletePopup-title": "Esborrar fitxa?",
     "cardDetailsActionsPopup-title": "Accions de fitxes",
     "cardLabelsPopup-title": "Etiquetes",
     "cardMembersPopup-title": "Membres",
     "cardMorePopup-title": "Més",
+    "cardTemplatePopup-title": "Create template",
     "cards": "Fitxes",
     "cards-count": "Fitxes",
+    "casSignIn": "Sign In with CAS",
+    "cardType-card": "Fitxa",
+    "cardType-linkedCard": "Linked Card",
+    "cardType-linkedBoard": "Linked Board",
     "change": "Canvia",
     "change-avatar": "Canvia Avatar",
     "change-password": "Canvia la clau",
@@ -135,30 +175,52 @@
     "changePasswordPopup-title": "Canvia la contrasenya",
     "changePermissionsPopup-title": "Canvia permisos",
     "changeSettingsPopup-title": "Canvia configuració",
+    "subtasks": "Subtasca",
     "checklists": "Checklists",
     "click-to-star": "Fes clic per destacar aquest tauler.",
     "click-to-unstar": "Fes clic per deixar de destacar aquest tauler.",
     "clipboard": "Portaretalls o estirar i amollar",
     "close": "Tanca",
     "close-board": "Tanca tauler",
-    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
     "color-black": "negre",
     "color-blue": "blau",
+    "color-crimson": "carmesí",
+    "color-darkgreen": "verd fosc",
+    "color-gold": "daurat",
+    "color-gray": "gris",
     "color-green": "verd",
+    "color-indigo": "índigo",
     "color-lime": "llima",
+    "color-magenta": "magenta",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "marina",
     "color-orange": "taronja",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
     "color-pink": "rosa",
+    "color-plum": "pruna",
     "color-purple": "púrpura",
     "color-red": "vermell",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "plata",
     "color-sky": "cel",
+    "color-slateblue": "slateblue",
+    "color-white": "blanc",
     "color-yellow": "groc",
+    "unset-color": "Unset",
     "comment": "Comentari",
     "comment-placeholder": "Escriu un comentari",
     "comment-only": "Només comentaris",
     "comment-only-desc": "Només pots fer comentaris a les fitxes",
+    "no-comments": "Sense comentaris",
+    "no-comments-desc": "Can not see comments and activities.",
     "computer": "Ordinador",
-    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist",
+    "confirm-subtask-delete-dialog": "Esteu segur que voleu eliminar la subtasca?",
+    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
     "copy-card-link-to-clipboard": "Copia l'enllaç de la ftixa al porta-retalls",
+    "linkCardPopup-title": "Link Card",
+    "searchElementPopup-title": "Cerca",
     "copyCardPopup-title": "Copia la fitxa",
     "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
     "copyChecklistToManyCardsPopup-instructions": "Títols de fitxa i Descripcions de destí en aquest format JSON",
@@ -167,11 +229,25 @@
     "createBoardPopup-title": "Crea tauler",
     "chooseBoardSourcePopup-title": "Importa Tauler",
     "createLabelPopup-title": "Crea etiqueta",
+    "createCustomField": "Crear camp",
+    "createCustomFieldPopup-title": "Crear camp",
     "current": "Actual",
+    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
+    "custom-field-checkbox": "Checkbox",
+    "custom-field-date": "Data",
+    "custom-field-dropdown": "Dropdown List",
+    "custom-field-dropdown-none": "(none)",
+    "custom-field-dropdown-options": "Llista d'opcions",
+    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
+    "custom-field-dropdown-unknown": "(unknown)",
+    "custom-field-number": "Number",
+    "custom-field-text": "Text",
+    "custom-fields": "Camps Personalitzats",
     "date": "Data",
     "decline": "Declina",
     "default-avatar": "Avatar per defecte",
     "delete": "Esborra",
+    "deleteCustomFieldPopup-title": "Delete Custom Field?",
     "deleteLabelPopup-title": "Esborra etiqueta",
     "description": "Descripció",
     "disambiguateMultiLabelPopup-title": "Desfe l'ambigüitat en les etiquetes",
@@ -186,6 +262,7 @@
     "soft-wip-limit": "Soft WIP Limit",
     "editCardStartDatePopup-title": "Canvia data d'inici",
     "editCardDueDatePopup-title": "Canvia data de finalització",
+    "editCustomFieldPopup-title": "Modificar camp",
     "editCardSpentTimePopup-title": "Canvia temps dedicat",
     "editLabelPopup-title": "Canvia etiqueta",
     "editNotificationPopup-title": "Edita la notificació",
@@ -222,30 +299,36 @@
     "filter-clear": "Elimina filtre",
     "filter-no-label": "Sense etiqueta",
     "filter-no-member": "Sense membres",
+    "filter-no-custom-fields": "No Custom Fields",
     "filter-on": "Filtra per",
     "filter-on-desc": "Estau filtrant fitxes en aquest tauler. Feu clic aquí per editar el filtre.",
     "filter-to-selection": "Filtra selecció",
+    "advanced-filter-label": "Filtre avançat",
+    "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) to be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
     "fullname": "Nom complet",
     "header-logo-title": "Torna a la teva pàgina de taulers",
     "hide-system-messages": "Oculta missatges del sistema",
     "headerBarCreateBoardPopup-title": "Crea tauler",
     "home": "Inici",
     "import": "importa",
+    "link": "Enllaç",
     "import-board": "Importa tauler",
     "import-board-c": "Importa tauler",
     "import-board-title-trello": "Importa tauler des de Trello",
-    "import-board-title-wekan": "I",
+    "import-board-title-wekan": "Import board from previous export",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
     "import-sandstorm-warning": "Estau segur que voleu esborrar aquesta checklist?",
     "from-trello": "Des de Trello",
-    "from-wekan": "Des de Wekan",
+    "from-wekan": "From previous export",
     "import-board-instruction-trello": "En el teu tauler Trello, ves a 'Menú', 'Més'.' Imprimir i Exportar', 'Exportar JSON', i copia el text resultant.",
-    "import-board-instruction-wekan": "In your Wekan board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
     "import-json-placeholder": "Aferra codi JSON vàlid aquí",
     "import-map-members": "Mapeja el membres",
-    "import-members-map": "El tauler importat conté membres. Assigna els membres que vulguis importar a usuaris Wekan",
+    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
     "import-show-user-mapping": "Revisa l'assignació de membres",
-    "import-user-select": "Selecciona l'usuari Wekan que vulguis associar a aquest membre",
-    "importMapMembersAddPopup-title": "Selecciona un membre de Wekan",
+    "import-user-select": "Pick your existing user you want to use as this member",
+    "importMapMembersAddPopup-title": "Selecciona un usuari",
     "info": "Versió",
     "initials": "Inicials",
     "invalid-date": "Data invàlida",
@@ -264,17 +347,19 @@
     "leave-board-pop": "De debò voleu abandonar __boardTitle__? Se us eliminarà de totes les fitxes d'aquest tauler.",
     "leaveBoardPopup-title": "Abandonar Tauler?",
     "link-card": "Enllaç a aquesta fitxa",
-    "list-archive-cards": "Move all cards in this list to Recycle Bin",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
+    "list-archive-cards": "Moure totes les fitxes en aquesta llista al Arxiu",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Mou totes les fitxes d'aquesta llista",
     "list-select-cards": "Selecciona totes les fitxes d'aquesta llista",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "Accions de la llista",
     "swimlaneActionPopup-title": "Accions de Carril de Natació",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "importa una fitxa de Trello",
     "listMorePopup-title": "Més",
     "link-list": "Enllaça a aquesta llista",
     "list-delete-pop": "Totes les accions seran esborrades de la llista d'activitats i no serà possible recuperar la llista",
-    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
     "lists": "Llistes",
     "swimlanes": "Carrils de Natació",
     "log-out": "Finalitza la  sessió",
@@ -294,9 +379,9 @@
     "muted-info": "No seràs notificat dels canvis en aquest tauler",
     "my-boards": "Els meus taulers",
     "name": "Nom",
-    "no-archived-cards": "No cards in Recycle Bin.",
-    "no-archived-lists": "No lists in Recycle Bin.",
-    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
+    "no-archived-cards": "No hi ha fitxes a l'arxiu.",
+    "no-archived-lists": "No hi ha llistes al arxiu.",
+    "no-archived-swimlanes": "No swimlanes in Archive.",
     "no-results": "Sense resultats",
     "normal": "Normal",
     "normal-desc": "Podeu veure i editar fitxes. No podeu canviar la configuració.",
@@ -332,6 +417,7 @@
     "restore": "Restaura",
     "save": "Desa",
     "search": "Cerca",
+    "rules": "Regles",
     "search-cards": "Cerca títols de fitxa i descripcions en aquest tauler",
     "search-example": "Text que cercar?",
     "select-color": "Selecciona color",
@@ -366,6 +452,7 @@
     "title": "Títol",
     "tracking": "En seguiment",
     "tracking-info": "Seràs notificat per cada canvi a aquelles fitxes de les que n'eres creador o membre",
+    "type": "Tipus",
     "unassign-member": "Desassignar membre",
     "unsaved-description": "Tens una descripció sense desar.",
     "unwatch": "Suprimeix observació",
@@ -374,7 +461,7 @@
     "uploaded-avatar": "Avatar actualitzat",
     "username": "Nom d'Usuari",
     "view-it": "Vist",
-    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
+    "warn-list-archived": "warning: this card is in an list at Archive",
     "watch": "Observa",
     "watching": "En observació",
     "watching-info": "Seràs notificat de cada canvi en aquest tauler",
@@ -382,6 +469,9 @@
     "welcome-swimlane": "Objectiu 1",
     "welcome-list1": "Bàsics",
     "welcome-list2": "Avançades",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
     "what-to-do": "Què vols fer?",
     "wipLimitErrorPopup-title": "Límit de Treball en Progrès invàlid",
     "wipLimitErrorPopup-dialog-pt1": "El nombre de tasques en esta llista és superior al límit de Treball en Progrès que heu definit.",
@@ -400,23 +490,23 @@
     "smtp-tls-description": "Activa suport TLS pel servidor SMTP",
     "smtp-host": "Servidor SMTP",
     "smtp-port": "Port SMTP",
-    "smtp-username": "Nom d'Usuari",
+    "smtp-username": "Nom d'usuari",
     "smtp-password": "Contrasenya",
     "smtp-tls": "Suport TLS",
     "send-from": "De",
     "send-smtp-test": "Envia't un correu electrònic de prova",
     "invitation-code": "Codi d'invitació",
     "email-invite-register-subject": "__inviter__ t'ha convidat",
-    "email-invite-register-text": " __user__,\n\n __inviter__  us ha convidat a col·laborar a Wekan.\n\n Clicau l'enllaç següent per acceptar l'invitació:\n __url__\n\n El vostre codi d'invitació és: __icode__\n\n Gràcies",
-    "email-smtp-test-subject": "Correu de Prova SMTP de Wekan",
+    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email",
     "email-smtp-test-text": "Has enviat un missatge satisfactòriament",
     "error-invitation-code-not-exist": "El codi d'invitació no existeix",
     "error-notAuthorized": "No estau autoritzats per veure aquesta pàgina",
     "outgoing-webhooks": "Webhooks sortints",
     "outgoingWebhooksPopup-title": "Webhooks sortints",
+    "boardCardTitlePopup-title": "Card Title Filter",
     "new-outgoing-webhook": "Nou Webook sortint",
     "no-name": "Importa tauler des de Wekan",
-    "Wekan_version": "Versió Wekan",
     "Node_version": "Versió Node",
     "OS_Arch": "Arquitectura SO",
     "OS_Cpus": "Plataforma SO",
@@ -427,13 +517,18 @@
     "OS_Totalmem": "Memòria total",
     "OS_Type": "Tipus de SO",
     "OS_Uptime": "Temps d'activitat",
+    "days": "days",
     "hours": "hores",
     "minutes": "minuts",
     "seconds": "segons",
+    "show-field-on-card": "Show this field on card",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
     "yes": "Si",
     "no": "No",
     "accounts": "Comptes",
     "accounts-allowEmailChange": "Permet modificar correu electrònic",
+    "accounts-allowUserNameChange": "Allow Username Change",
     "createdAt": "Creat ",
     "verified": "Verificat",
     "active": "Actiu",
@@ -442,5 +537,157 @@
     "card-end": "End",
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
-    "editCardEndDatePopup-title": "Change end date"
-}
+    "editCardEndDatePopup-title": "Change end date",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "Assignat Per",
+    "requested-by": "Demanat Per",
+    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
+    "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
+    "boardDeletePopup-title": "Delete Board?",
+    "delete-board": "Delete Board",
+    "default-subtasks-board": "Subtasks for __board__ board",
+    "default": "Default",
+    "queue": "Queue",
+    "subtask-settings": "Subtasks Settings",
+    "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
+    "show-subtasks-field": "Cards can have subtasks",
+    "deposit-subtasks-board": "Deposit subtasks to this board:",
+    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
+    "show-parent-in-minicard": "Show parent in minicard:",
+    "prefix-with-full-path": "Prefix with full path",
+    "prefix-with-parent": "Prefix with parent",
+    "subtext-with-full-path": "Subtext with full path",
+    "subtext-with-parent": "Subtext with parent",
+    "change-card-parent": "Change card's parent",
+    "parent-card": "Parent card",
+    "source-board": "Source board",
+    "no-parent": "Don't show parent",
+    "activity-added-label": "added label '%s' to %s",
+    "activity-removed-label": "removed label '%s' from %s",
+    "activity-delete-attach": "deleted an attachment from %s",
+    "activity-added-label-card": "added label '%s'",
+    "activity-removed-label-card": "removed label '%s'",
+    "activity-delete-attach-card": "deleted an attachment",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "r-rule": "Rule",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "Add action",
+    "r-board-rules": "Regles del tauler",
+    "r-add-rule": "Add rule",
+    "r-view-rule": "View rule",
+    "r-delete-rule": "Delete rule",
+    "r-new-rule-name": "New rule title",
+    "r-no-rules": "No hi han regles",
+    "r-when-a-card": "When a card",
+    "r-is": "is",
+    "r-is-moved": "is moved",
+    "r-added-to": "added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "the board",
+    "r-list": "list",
+    "set-filter": "Set Filter",
+    "r-moved-to": "Moved to",
+    "r-moved-from": "Moved from",
+    "r-archived": "Moved to Archive",
+    "r-unarchived": "Restored from Archive",
+    "r-a-card": "a card",
+    "r-when-a-label-is": "When a label is",
+    "r-when-the-label-is": "When the label is",
+    "r-list-name": "list name",
+    "r-when-a-member": "When a member is",
+    "r-when-the-member": "When the member",
+    "r-name": "name",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "r-when-the-item": "When the checklist item",
+    "r-checked": "Checked",
+    "r-unchecked": "Unchecked",
+    "r-move-card-to": "Move card to",
+    "r-top-of": "Top of",
+    "r-bottom-of": "Bottom of",
+    "r-its-list": "its list",
+    "r-archive": "Moure al arxiu",
+    "r-unarchive": "Restore from Archive",
+    "r-card": "card",
+    "r-add": "Afegeix",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-set-color": "Set color to",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "subject",
+    "r-rule-details": "Rule details",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Move card to top of list",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Move card to bottom of list",
+    "r-d-send-email": "Send email",
+    "r-d-send-email-to": "to",
+    "r-d-send-email-subject": "subject",
+    "r-d-send-email-message": "message",
+    "r-d-archive": "Move card to Archive",
+    "r-d-unarchive": "Restore card from Archive",
+    "r-d-add-label": "Add label",
+    "r-d-remove-label": "Remove label",
+    "r-create-card": "Create new card",
+    "r-in-list": "in list",
+    "r-in-swimlane": "in swimlane",
+    "r-d-add-member": "Add member",
+    "r-d-remove-member": "Remove member",
+    "r-d-remove-all-member": "Remove all member",
+    "r-d-check-all": "Check all items of a list",
+    "r-d-uncheck-all": "Uncheck all items of a list",
+    "r-d-check-one": "Check item",
+    "r-d-uncheck-one": "Uncheck item",
+    "r-d-check-of-list": "of checklist",
+    "r-d-add-checklist": "Add checklist",
+    "r-d-remove-checklist": "Remove checklist",
+    "r-by": "by",
+    "r-add-checklist": "Add checklist",
+    "r-with-items": "with items",
+    "r-items-list": "item1,item2,item3",
+    "r-add-swimlane": "Add swimlane",
+    "r-swimlane-name": "swimlane name",
+    "r-board-note": "Note: leave a field empty to match every possible value.",
+    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout",
+    "hide-logo": "Hide Logo",
+    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
+    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
+    "error-undefined": "Something went wrong",
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
+}
\ No newline at end of file
diff --git a/i18n/cs.i18n.json b/i18n/cs.i18n.json
index fc5a0dfb..066ac52a 100644
--- a/i18n/cs.i18n.json
+++ b/i18n/cs.i18n.json
@@ -1,35 +1,51 @@
 {
     "accept": "Přijmout",
-    "act-activity-notify": "[Wekan] Notifikace aktivit",
-    "act-addAttachment": "přiložen __attachment__ do __card__",
-    "act-addChecklist": "přidán checklist __checklist__ do __card__",
-    "act-addChecklistItem": "přidán __checklistItem__ do checklistu __checklist__ v __card__",
-    "act-addComment": "komentář k __card__: __comment__",
-    "act-createBoard": "přidání __board__",
-    "act-createCard": "přidání __card__ do __list__",
-    "act-createList": "přidání __list__ do __board__",
-    "act-addBoardMember": "přidání __member__ do __board__",
-    "act-archivedBoard": "__board__ bylo přesunuto do koše",
-    "act-archivedCard": "__card__ bylo přesunuto do koše",
-    "act-archivedList": "__list__ bylo přesunuto do koše",
-    "act-archivedSwimlane": "__swimlane__ bylo přesunuto do koše",
-    "act-importBoard": "import __board__",
-    "act-importCard": "import __card__",
-    "act-importList": "import __list__",
-    "act-joinMember": "přidání __member__ do __card__",
-    "act-moveCard": "přesun __card__ z __oldList__ do __list__",
-    "act-removeBoardMember": "odstranění __member__ z __board__",
-    "act-restoredCard": "obnovení __card__ do __board__",
-    "act-unjoinMember": "odstranění __member__ z __card__",
-    "act-withBoardTitle": "[Wekan] __board__",
+    "act-activity-notify": "Notifikace aktivit",
+    "act-addAttachment": "přidal(a) přílohu __attachment__ na kartu __card__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-deleteAttachment": "smazal(a) přílohu __attachment__ na kartě __card__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-addSubtask": "přidal(a) podúkol __subtask__ na kartu __card__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-addLabel": "Přídán štítek __label__ na kartu __card__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-addedLabel": "Přídán štítek __label__ na kartu __card__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-removeLabel": "Odstraněn štítek __label__ na kartě __card__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-removedLabel": "Odstraněn štítek __label__ na kartě __card__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-addChecklist": "přidal(a) zaškrtávací seznam __checklist__ na kartu __card__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-addChecklistItem": "přidal(a) položku zaškrtávacího seznamu __checklistItem__ do zaškrtávacího seznamu __checklist__ na kartě __card__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-removeChecklist": "smazal(a) zaškrtávací seznam __checklist__ na kartě __card__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-removeChecklistItem": "smazal(a) položku zaškrtávacího seznamu __checklistItem__ ze zaškrtávacího seznamu __checklist__ na kartě __card__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-checkedItem": "zaškrtl(a) __checklistItem__ na zaškrtávacím seznamu __checklist__ na kartě __card__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-uncheckedItem": "zrušil(a) zaškrtnutí __checklistItem__ na zaškrtávacím seznamu __checklist__ na kartě __card__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-completeChecklist": "dokončil(a) zaškrtávací seznam __checklist__ na kartě __card__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-uncompleteChecklist": "zrušil(a) dokončení zaškrtávacího seznamu __checklist__ na kartě __card__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-addComment": "přidal(a) komentář na kartě __card__: __comment__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-createBoard": "přidal(a) tablo __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "přidal(a) kartu __card__ do sloupce __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-createCustomField": "vytvořil(a) vlastní pole __customField__  na kartu __card__ do sloupce __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-createList": "přidal(a) sloupec __list__ do tabla __board__",
+    "act-addBoardMember": "přidal(a) člena __member__ do tabla __board__",
+    "act-archivedBoard": "Tablo __board__ přesunuto do Archivu",
+    "act-archivedCard": "Karta __card__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__ přesunuta do Archivu",
+    "act-archivedList": "Sloupec __list__ ve swimlane __swimlane__ na tablu __board__ přesunut do Archivu",
+    "act-archivedSwimlane": "Swimlane __swimlane__ na tablu __board__ přesunut do Archivu",
+    "act-importBoard": "importoval(a) tablo __board__",
+    "act-importCard": "importoval(a) karta __card__ do sloupce __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-importList": "importoval(a) sloupec __list__ do swimlane __swimlane__ na tablu __board__",
+    "act-joinMember": "přidal(a) člena __member__ na kartu __card__ v seznamu __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "přesunul(a) kartu __card__ ze sloupce __oldList__ ve swimlane __oldSwimlane__ na tablu __oldBoard__ do sloupce __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-removeBoardMember": "odstranil(a) člena __member__ z tabla __board__",
+    "act-restoredCard": "obnovil(a) kartu __card__ do sloupce __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-unjoinMember": "odstranil(a) člena __member__ z karty __card__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-withBoardTitle": "__board__",
     "act-withCardTitle": "[__board__] __card__",
     "actions": "Akce",
     "activities": "Aktivity",
     "activity": "Aktivita",
     "activity-added": "%s přidáno k %s",
-    "activity-archived": "%s bylo přesunuto do koše",
+    "activity-archived": "%s bylo přesunuto do archivu",
     "activity-attached": "přiloženo %s k %s",
     "activity-created": "%s vytvořeno",
+    "activity-customfield-created": "vytvořeno vlastní pole %s",
     "activity-excluded": "%s vyjmuto z %s",
     "activity-imported": "importován %s do %s z %s",
     "activity-imported-board": "importován %s z %s",
@@ -39,18 +55,30 @@
     "activity-removed": "odstraněn %s z %s",
     "activity-sent": "%s posláno na %s",
     "activity-unjoined": "odpojen %s",
+    "activity-subtask-added": "podúkol přidán do %s",
+    "activity-checked-item": "dokončen %s v seznamu %s z %s",
+    "activity-unchecked-item": "nedokončen %s v seznamu %s z %s",
     "activity-checklist-added": "přidán checklist do %s",
+    "activity-checklist-removed": "odstraněn checklist z %s",
+    "activity-checklist-completed": "dokončil(a) zaškrtávací seznam __checklist__ na kartě __card__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__",
+    "activity-checklist-uncompleted": "nedokončen seznam %s z %s",
     "activity-checklist-item-added": "přidána položka checklist do '%s' v %s",
+    "activity-checklist-item-removed": "odstraněna položka seznamu do '%s' v %s",
     "add": "Přidat",
+    "activity-checked-item-card": "dokončen %s v seznamu %s",
+    "activity-unchecked-item-card": "nedokončen %s v seznamu %s",
+    "activity-checklist-completed-card": "dokončil(a) zaškrtávací seznam __checklist__ na kartě __card__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__",
+    "activity-checklist-uncompleted-card": "nedokončený seznam %s",
     "add-attachment": "Přidat přílohu",
     "add-board": "Přidat tablo",
     "add-card": "Přidat kartu",
     "add-swimlane": "Přidat Swimlane",
+    "add-subtask": "Přidat Podúkol",
     "add-checklist": "Přidat zaškrtávací seznam",
     "add-checklist-item": "Přidat položku do zaškrtávacího seznamu",
     "add-cover": "Přidat obal",
     "add-label": "Přidat štítek",
-    "add-list": "Přidat list",
+    "add-list": "Přidat sloupec",
     "add-members": "Přidat členy",
     "added": "Přidán",
     "addMemberPopup-title": "Členové",
@@ -63,20 +91,22 @@
     "and-n-other-card": "A __count__ další karta(y)",
     "and-n-other-card_plural": "A __count__ dalších karet",
     "apply": "Použít",
-    "app-is-offline": "Wekan se načítá, prosím čekejte. Obnovení stránky způsobí ztrátu dat. Pokud se Wekan nenačte, zkontrolujte prosím, jestli se server s Wekanem nezastavil.",
-    "archive": "Přesunout do koše",
-    "archive-all": "Přesunout všechno do koše",
-    "archive-board": "Přesunout tablo do koše",
-    "archive-card": "Přesunout kartu do koše",
-    "archive-list": "Přesunout seznam do koše",
-    "archive-swimlane": "Přesunout swimlane do koše",
-    "archive-selection": "Přesunout výběr do koše",
-    "archiveBoardPopup-title": "Chcete přesunout tablo do koše?",
-    "archived-items": "Koš",
-    "archived-boards": "Tabla v koši",
+    "app-is-offline": "Načítá se, prosím čekejte. Obnovení stránky způsobí ztrátu dat. Pokud se načítání nedaří, zkontrolujte prosím server.",
+    "archive": "Přesunout do archivu",
+    "archive-all": "Přesunout vše do archivu",
+    "archive-board": "Přesunout tablo do archivu",
+    "archive-card": "Přesunout kartu do archivu",
+    "archive-list": "Přesunout seznam do archivu",
+    "archive-swimlane": "Přesunout swimlane do archivu",
+    "archive-selection": "Přesunout výběr do archivu",
+    "archiveBoardPopup-title": "Přesunout tablo do archivu?",
+    "archived-items": "Archiv",
+    "archived-boards": "Tabla v archivu",
     "restore-board": "Obnovit tablo",
-    "no-archived-boards": "Žádná tabla v koši",
-    "archives": "Koš",
+    "no-archived-boards": "V archivu nejsou žádná tabla.",
+    "archives": "Archiv",
+    "template": "Šablona",
+    "templates": "Šablony",
     "assign-member": "Přiřadit člena",
     "attached": "přiloženo",
     "attachment": "Příloha",
@@ -95,22 +125,25 @@
     "boardChangeTitlePopup-title": "Přejmenovat tablo",
     "boardChangeVisibilityPopup-title": "Upravit viditelnost",
     "boardChangeWatchPopup-title": "Změnit sledování",
-    "boardMenuPopup-title": "Menu tabla",
+    "boardMenuPopup-title": "Nastavení Tabla",
     "boards": "Tabla",
     "board-view": "Náhled tabla",
+    "board-view-cal": "Kalendář",
     "board-view-swimlanes": "Swimlanes",
-    "board-view-lists": "Seznamy",
-    "bucket-example": "Například \"Než mě odvedou\"",
+    "board-view-lists": "Sloupce",
+    "bucket-example": "Například \"O čem sním\"",
     "cancel": "Zrušit",
-    "card-archived": "Karta byla přesunuta do koše.",
+    "card-archived": "Karta byla přesunuta do archivu.",
+    "board-archived": "Toto tablo je přesunuto do archivu.",
     "card-comments-title": "Tato karta má %s komentářů.",
     "card-delete-notice": "Smazání je trvalé. Přijdete o všechny akce asociované s touto kartou.",
-    "card-delete-pop": "Všechny akce budou odstraněny z kanálu aktivity a nebude možné kartu znovu otevřít. Toto nelze vrátit zpět.",
-    "card-delete-suggest-archive": "Kartu můžete přesunout do koše a tím ji odstranit z tabla a přitom zachovat aktivity.",
+    "card-delete-pop": "Všechny akce budou odstraněny z kanálu aktivity a nebude možné kartu obnovit. Toto nelze vrátit zpět.",
+    "card-delete-suggest-archive": "Můžete přesunout kartu do archivu pro odstranění z tabla a zachovat aktivitu.",
     "card-due": "Termín",
     "card-due-on": "Do",
     "card-spent": "Strávený čas",
     "card-edit-attachments": "Upravit přílohy",
+    "card-edit-custom-fields": "Upravit vlastní pole",
     "card-edit-labels": "Upravit štítky",
     "card-edit-members": "Upravit členy",
     "card-labels-title": "Změnit štítky karty.",
@@ -118,13 +151,20 @@
     "card-start": "Start",
     "card-start-on": "Začít dne",
     "cardAttachmentsPopup-title": "Přiložit formulář",
+    "cardCustomField-datePopup-title": "Změnit datum",
+    "cardCustomFieldsPopup-title": "Upravit vlastní pole",
     "cardDeletePopup-title": "Smazat kartu?",
     "cardDetailsActionsPopup-title": "Akce karty",
     "cardLabelsPopup-title": "Štítky",
     "cardMembersPopup-title": "Členové",
     "cardMorePopup-title": "Více",
+    "cardTemplatePopup-title": "Vytvořit šablonu",
     "cards": "Karty",
     "cards-count": "Karty",
+    "casSignIn": "Přihlásit pomocí CAS",
+    "cardType-card": "Karta",
+    "cardType-linkedCard": "Propojená karta",
+    "cardType-linkedBoard": "Propojené tablo",
     "change": "Změnit",
     "change-avatar": "Změnit avatar",
     "change-password": "Změnit heslo",
@@ -135,30 +175,52 @@
     "changePasswordPopup-title": "Změnit heslo",
     "changePermissionsPopup-title": "Změnit oprávnění",
     "changeSettingsPopup-title": "Změnit nastavení",
+    "subtasks": "Podúkol",
     "checklists": "Checklisty",
     "click-to-star": "Kliknutím přidat hvězdičku tomuto tablu.",
     "click-to-unstar": "Kliknutím odebrat hvězdičku tomuto tablu.",
     "clipboard": "Schránka nebo potáhnout a pustit",
     "close": "Zavřít",
     "close-board": "Zavřít tablo",
-    "close-board-pop": "Kliknutím na tlačítko \"Recyklovat\" budete moci obnovit tablo z koše.",
+    "close-board-pop": "Budete moci obnovit tablo kliknutím na tlačítko \"Archiv\" v hlavním menu.",
     "color-black": "černá",
     "color-blue": "modrá",
+    "color-crimson": "karmínová",
+    "color-darkgreen": "tmavě zelená",
+    "color-gold": "zlatá",
+    "color-gray": "šedá",
     "color-green": "zelená",
+    "color-indigo": "indigo",
     "color-lime": "světlezelená",
+    "color-magenta": "purpurová",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "tmavě modrá",
     "color-orange": "oranžová",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
     "color-pink": "růžová",
+    "color-plum": "švestková",
     "color-purple": "fialová",
     "color-red": "červená",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "stříbrná",
     "color-sky": "nebeská",
+    "color-slateblue": "slateblue",
+    "color-white": "bílá",
     "color-yellow": "žlutá",
+    "unset-color": "Nenastaveno",
     "comment": "Komentář",
     "comment-placeholder": "Text komentáře",
     "comment-only": "Pouze komentáře",
     "comment-only-desc": "Může přidávat komentáře pouze do karet.",
+    "no-comments": "Žádné komentáře",
+    "no-comments-desc": "Nemůže vidět komentáře a aktivity",
     "computer": "Počítač",
+    "confirm-subtask-delete-dialog": "Opravdu chcete smazat tento podúkol?",
     "confirm-checklist-delete-dialog": "Opravdu chcete smazat tento checklist?",
     "copy-card-link-to-clipboard": "Kopírovat adresu karty do mezipaměti",
+    "linkCardPopup-title": "Propojit kartu",
+    "searchElementPopup-title": "Hledat",
     "copyCardPopup-title": "Kopírovat kartu",
     "copyChecklistToManyCardsPopup-title": "Kopírovat checklist do více karet",
     "copyChecklistToManyCardsPopup-instructions": "Názvy a popisy cílové karty v tomto formátu JSON",
@@ -167,11 +229,25 @@
     "createBoardPopup-title": "Vytvořit tablo",
     "chooseBoardSourcePopup-title": "Importovat tablo",
     "createLabelPopup-title": "Vytvořit štítek",
+    "createCustomField": "Vytvořit pole",
+    "createCustomFieldPopup-title": "Vytvořit pole",
     "current": "Aktuální",
+    "custom-field-delete-pop": "Nelze vrátit zpět. Toto odebere toto vlastní pole ze všech karet a zničí jeho historii.",
+    "custom-field-checkbox": "Checkbox",
+    "custom-field-date": "Datum",
+    "custom-field-dropdown": "Rozbalovací seznam",
+    "custom-field-dropdown-none": "(prázdné)",
+    "custom-field-dropdown-options": "Seznam možností",
+    "custom-field-dropdown-options-placeholder": "Stiskněte enter pro přidání více možností",
+    "custom-field-dropdown-unknown": "(neznámé)",
+    "custom-field-number": "Číslo",
+    "custom-field-text": "Text",
+    "custom-fields": "Vlastní pole",
     "date": "Datum",
     "decline": "Zamítnout",
     "default-avatar": "Výchozí avatar",
     "delete": "Smazat",
+    "deleteCustomFieldPopup-title": "Smazat vlastní pole",
     "deleteLabelPopup-title": "Smazat štítek?",
     "description": "Popis",
     "disambiguateMultiLabelPopup-title": "Dvojznačný štítek akce",
@@ -186,6 +262,7 @@
     "soft-wip-limit": "Mírný WIP limit",
     "editCardStartDatePopup-title": "Změnit datum startu úkolu",
     "editCardDueDatePopup-title": "Změnit datum dokončení úkolu",
+    "editCustomFieldPopup-title": "Upravit pole",
     "editCardSpentTimePopup-title": "Změnit strávený čas",
     "editLabelPopup-title": "Změnit štítek",
     "editNotificationPopup-title": "Změnit notifikace",
@@ -210,7 +287,7 @@
     "error-board-notAMember": "K provedení změny musíš být členem tohoto tabla",
     "error-json-malformed": "Tvůj text není validní JSON",
     "error-json-schema": "Tato JSON data neobsahují správné informace v platném formátu",
-    "error-list-doesNotExist": "Tento seznam neexistuje",
+    "error-list-doesNotExist": "Tento sloupec ;neexistuje",
     "error-user-doesNotExist": "Tento uživatel neexistuje",
     "error-user-notAllowSelf": "Nemůžeš pozvat sám sebe",
     "error-user-notCreated": "Tento uživatel není vytvořen",
@@ -222,30 +299,36 @@
     "filter-clear": "Vyčistit filtr",
     "filter-no-label": "Žádný štítek",
     "filter-no-member": "Žádný člen",
+    "filter-no-custom-fields": "Žádné vlastní pole",
     "filter-on": "Filtr je zapnut",
     "filter-on-desc": "Filtrujete karty tohoto tabla. Pro úpravu filtru klikni sem.",
     "filter-to-selection": "Filtrovat výběr",
+    "advanced-filter-label": "Pokročilý filtr",
+    "advanced-filter-description": "Pokročilý filtr dovoluje zapsat řetězec následujících operátorů: == != <= >= && || () Operátory jsou odděleny mezerou. Můžete filtrovat všechny vlastní pole zadáním jejich názvů nebo hodnot. Například: Pole1 == Hodnota1. Poznámka: Pokud pole nebo hodnoty obsahují mezery, je potřeba je obalit v jednoduchých uvozovkách. Například: 'Pole 1' == 'Hodnota 1'. Pro ignorovaní kontrolních znaků (' \\ /) je možné použít \\. Například Pole1 == I\\'m. Můžete také kombinovat více podmínek. Například P1 == H1 || P1 == H2. Obvykle jsou operátory interpretovány zleva doprava. Jejich pořadí můžete měnit pomocí závorek. Například: P1 == H1 && ( P2 == H2 || P2 == H3 )",
     "fullname": "Celé jméno",
     "header-logo-title": "Jit zpět na stránku s tably.",
     "hide-system-messages": "Skrýt systémové zprávy",
     "headerBarCreateBoardPopup-title": "Vytvořit tablo",
     "home": "Domů",
     "import": "Import",
+    "link": "Propojit",
     "import-board": "Importovat tablo",
     "import-board-c": "Importovat tablo",
     "import-board-title-trello": "Import board from Trello",
-    "import-board-title-wekan": "Importovat tablo z Wekanu",
+    "import-board-title-wekan": "Importovat tablo z předchozího exportu",
+    "import-sandstorm-backup-warning": "Nemažte data, která importujete z původního exportovaného tabla nebo Trello předtím, nežli zkontrolujete, jestli lze tuto část zavřít a znovu otevřít nebo jestli se Vám nezobrazuje chyba tabla, což znamená ztrátu dat.",
     "import-sandstorm-warning": "Importované tablo spaže všechny existující data v tablu a nahradí je importovaným tablem.",
     "from-trello": "Z Trella",
-    "from-wekan": "Z Wekanu",
+    "from-wekan": "Z předchozího exportu",
     "import-board-instruction-trello": "Na svém Trello tablu, otevři 'Menu', pak 'More', 'Print and Export', 'Export JSON', a zkopíruj výsledný text",
-    "import-board-instruction-wekan": "Ve vašem Wekan tablu jděte do 'Menu', klikněte na 'Exportovat tablo' a zkopírujte text ze staženého souboru.",
+    "import-board-instruction-wekan": "Ve vašem tablu jděte do 'Menu', klikněte na 'Exportovat tablo' a zkopírujte text ze staženého souboru.",
+    "import-board-instruction-about-errors": "Někdy import funguje i přestože dostáváte chyby při importování tabla, které se zobrazí na stránce Všechna tabla.",
     "import-json-placeholder": "Sem vlož validní JSON data",
     "import-map-members": "Mapovat členy",
-    "import-members-map": "Toto importované tablo obsahuje několik členů. Namapuj členy z importu na uživatelské účty Wekan.",
+    "import-members-map": "Toto importované tablo obsahuje několik osob. Prosím namapujte osoby z importu na místní uživatelské účty.",
     "import-show-user-mapping": "Zkontrolovat namapování členů",
-    "import-user-select": "Vyber uživatele Wekan, kterého chceš použít pro tohoto člena",
-    "importMapMembersAddPopup-title": "Vybrat Wekan uživatele",
+    "import-user-select": "Vyberte existující uživatelský účet, kterého chcete použít pro tuto osobu",
+    "importMapMembersAddPopup-title": "Zvolte osobu",
     "info": "Verze",
     "initials": "Iniciály",
     "invalid-date": "Neplatné datum",
@@ -264,18 +347,20 @@
     "leave-board-pop": "Opravdu chcete opustit tablo __boardTitle__? Odstraníte se tím i ze všech karet v tomto tablu.",
     "leaveBoardPopup-title": "Opustit tablo?",
     "link-card": "Odkázat na tuto kartu",
-    "list-archive-cards": "Přesunout všechny karty v tomto seznamu do koše",
-    "list-archive-cards-pop": "Toto odstraní z tabla všechny karty z tohoto seznamu. Pro zobrazení karet v koši a jejich opětovné obnovení, klikni v \"Menu\" > \"Archivované položky\".",
-    "list-move-cards": "Přesunout všechny karty v tomto seznamu",
-    "list-select-cards": "Vybrat všechny karty v tomto seznamu",
+    "list-archive-cards": "Přesunout všechny karty v tomto seznamu do archivu.",
+    "list-archive-cards-pop": "Toto odstraní z tabla všechny karty z tohoto seznamu. Pro zobrazení karet v Archivu a jejich opětovné obnovení, klikni v \"Menu\" > \"Archiv\".",
+    "list-move-cards": "Přesunout všechny karty v tomto sloupci",
+    "list-select-cards": "Vybrat všechny karty v tomto sloupci",
+    "set-color-list": "Nastavit barvu",
     "listActionPopup-title": "Vypsat akce",
     "swimlaneActionPopup-title": "Akce swimlane",
+    "swimlaneAddPopup-title": "Přidat swimlane dolů",
     "listImportCardPopup-title": "Importovat Trello kartu",
     "listMorePopup-title": "Více",
-    "link-list": "Odkaz na tento seznam",
-    "list-delete-pop": "Všechny akce budou odstraněny z kanálu aktivity a nebude možné kartu obnovit. Toto nelze vrátit zpět.",
-    "list-delete-suggest-archive": "Kartu můžete přesunout do koše a tím ji odstranit z tabla a přitom zachovat aktivity.",
-    "lists": "Seznamy",
+    "link-list": "Odkaz na tento sloupec",
+    "list-delete-pop": "Všechny akce budou odstraněny z kanálu aktivity a nebude možné sloupec obnovit. Toto nelze vrátit zpět.",
+    "list-delete-suggest-archive": "Seznam můžete přesunout do archivu, abyste jej odstranili z tabla a zachovali si svou aktivitu.",
+    "lists": "Sloupce",
     "swimlanes": "Swimlanes",
     "log-out": "Odhlásit",
     "log-in": "Přihlásit",
@@ -294,15 +379,15 @@
     "muted-info": "Nikdy nedostanete oznámení o změně v tomto tablu.",
     "my-boards": "Moje tabla",
     "name": "Jméno",
-    "no-archived-cards": "Žádné karty v koši",
-    "no-archived-lists": "Žádné seznamy v koši",
-    "no-archived-swimlanes": "Žádné swimlane v koši",
+    "no-archived-cards": "V archivu nejsou žádné karty.",
+    "no-archived-lists": "V archivu nejsou žádné seznamy.",
+    "no-archived-swimlanes": "V archivu nejsou žádné swimlanes.",
     "no-results": "Žádné výsledky",
     "normal": "Normální",
     "normal-desc": "Může zobrazovat a upravovat karty. Nemůže měnit nastavení.",
     "not-accepted-yet": "Pozvánka ještě nebyla přijmuta",
     "notify-participate": "Dostane aktualizace do všech karet, ve kterých se účastní jako tvůrce nebo člen",
-    "notify-watch": "Dostane aktualitace to všech tabel, seznamů nebo karet, které sledujete",
+    "notify-watch": "Dostane aktualitace to všech tabel, sloupců nebo karet, které sledujete",
     "optional": "volitelný",
     "or": "nebo",
     "page-maybe-private": "Tato stránka může být soukromá. Můžete ji zobrazit po <a href='%s'>přihlášení</a>.",
@@ -322,7 +407,7 @@
     "remove-cover": "Odstranit obal",
     "remove-from-board": "Odstranit z tabla",
     "remove-label": "Odstranit štítek",
-    "listDeletePopup-title": "Smazat seznam?",
+    "listDeletePopup-title": "Smazat sloupec?",
     "remove-member": "Odebrat uživatele",
     "remove-member-from-card": "Odstranit z karty",
     "remove-member-pop": "Odstranit __name__ (__username__) z __boardTitle__? Uživatel bude odebrán ze všech karet na tomto tablu. Na tuto skutečnost bude upozorněn.",
@@ -332,10 +417,11 @@
     "restore": "Obnovit",
     "save": "Uložit",
     "search": "Hledat",
+    "rules": "Pravidla",
     "search-cards": "Hledat nadpisy a popisy karet v tomto tablu",
     "search-example": "Hledaný text",
     "select-color": "Vybrat barvu",
-    "set-wip-limit-value": "Nastaví limit pro maximální počet úkolů v seznamu.",
+    "set-wip-limit-value": "Nastaví limit pro maximální počet úkolů ve sloupci.",
     "setWipLimitPopup-title": "Nastavit WIP Limit",
     "shortcut-assign-self": "Přiřadit sebe k aktuální kartě",
     "shortcut-autocomplete-emoji": "Automatické dokončování emoji",
@@ -346,13 +432,13 @@
     "shortcut-show-shortcuts": "Otevřít tento seznam odkazů",
     "shortcut-toggle-filterbar": "Přepnout lištu filtrování",
     "shortcut-toggle-sidebar": "Přepnout lištu tabla",
-    "show-cards-minimum-count": "Zobrazit počet karet pokud seznam obsahuje více než ",
+    "show-cards-minimum-count": "Zobrazit počet karet pokud sloupec obsahuje více než ",
     "sidebar-open": "Otevřít boční panel",
     "sidebar-close": "Zavřít boční panel",
     "signupPopup-title": "Vytvořit účet",
-    "star-board-title": "Kliknutím přidat tablu hvězdičku. Poté bude zobrazeno navrchu seznamu.",
+    "star-board-title": "Kliknutím přidat tablu hvězdičku. Poté bude zobrazeno nahoře.",
     "starred-boards": "Tabla s hvězdičkou",
-    "starred-boards-description": "Tabla s hvězdičkou jsou zobrazena navrchu seznamu.",
+    "starred-boards-description": "Tabla s hvězdičkou jsou zobrazena nahoře.",
     "subscribe": "Odebírat",
     "team": "Tým",
     "this-board": "toto tablo",
@@ -366,6 +452,7 @@
     "title": "Název",
     "tracking": "Pozorující",
     "tracking-info": "Budete informováni o všech změnách v kartách, u kterých jste tvůrce nebo člen.",
+    "type": "Typ",
     "unassign-member": "Vyřadit člena",
     "unsaved-description": "Popis neni uložen.",
     "unwatch": "Přestat sledovat",
@@ -374,7 +461,7 @@
     "uploaded-avatar": "Avatar nahrán",
     "username": "Uživatelské jméno",
     "view-it": "Zobrazit",
-    "warn-list-archived": "varování: tuto kartu obsahuje seznam v koši",
+    "warn-list-archived": "varování: tato karta je v seznamu v Archivu",
     "watch": "Sledovat",
     "watching": "Sledující",
     "watching-info": "Bude vám oznámena každá změna v tomto tablu",
@@ -382,10 +469,13 @@
     "welcome-swimlane": "Milník 1",
     "welcome-list1": "Základní",
     "welcome-list2": "Pokročilé",
+    "card-templates-swimlane": "Šablony Karty",
+    "list-templates-swimlane": "Šablony Sloupce",
+    "board-templates-swimlane": "Šablony Tabla",
     "what-to-do": "Co chcete dělat?",
     "wipLimitErrorPopup-title": "Neplatný WIP Limit",
-    "wipLimitErrorPopup-dialog-pt1": "Počet úkolů v tomto seznamu je vyšší než definovaný WIP limit.",
-    "wipLimitErrorPopup-dialog-pt2": "Přesuňte prosím některé úkoly mimo tento seznam, nebo nastavte vyšší WIP limit.",
+    "wipLimitErrorPopup-dialog-pt1": "Počet úkolů v tomto sloupci je vyšší než definovaný WIP limit.",
+    "wipLimitErrorPopup-dialog-pt2": "Přesuňte prosím některé úkoly mimo tento sloupec, nebo nastavte vyšší WIP limit.",
     "admin-panel": "Administrátorský panel",
     "settings": "Nastavení",
     "people": "Lidé",
@@ -407,16 +497,16 @@
     "send-smtp-test": "Poslat si zkušební email.",
     "invitation-code": "Kód pozvánky",
     "email-invite-register-subject": "__inviter__ odeslal pozvánku",
-    "email-invite-register-text": "Ahoj __user__,\n\n__inviter__ tě přizval ke spolupráci ve Wekanu.\n\nNásleduj prosím odkaz níže:\n\n__url__\n\nKód Tvé pozvánky je: __icode__\n\nDěkujeme.",
-    "email-smtp-test-subject": "SMTP Testovací email z Wekanu",
+    "email-invite-register-text": "Ahoj __user__,\n\n__inviter__ tě přizval do kanban boardu ke spolupráci.\n\nNásleduj prosím odkaz níže:\n\n__url__\n\nKód Tvé pozvánky je: __icode__\n\nDěkujeme.",
+    "email-smtp-test-subject": "E-mail testující SMTP",
     "email-smtp-test-text": "Email byl úspěšně odeslán",
     "error-invitation-code-not-exist": "Kód pozvánky neexistuje.",
     "error-notAuthorized": "Nejste autorizován k prohlížení této stránky.",
     "outgoing-webhooks": "Odchozí Webhooky",
     "outgoingWebhooksPopup-title": "Odchozí Webhooky",
+    "boardCardTitlePopup-title": "Filtr názvů karet",
     "new-outgoing-webhook": "Nové odchozí Webhooky",
     "no-name": "(Neznámé)",
-    "Wekan_version": "Wekan verze",
     "Node_version": "Node verze",
     "OS_Arch": "OS Architektura",
     "OS_Cpus": "OS Počet CPU",
@@ -427,13 +517,18 @@
     "OS_Totalmem": "OS Celková paměť",
     "OS_Type": "Typ OS",
     "OS_Uptime": "OS Doba běhu systému",
+    "days": "dní",
     "hours": "hodin",
     "minutes": "minut",
     "seconds": "sekund",
+    "show-field-on-card": "Ukázat toto pole na kartě",
+    "automatically-field-on-card": "Automaticky vytvořit pole na všech kartách",
+    "showLabel-field-on-card": "Ukázat štítek pole na minikartě",
     "yes": "Ano",
     "no": "Ne",
     "accounts": "Účty",
     "accounts-allowEmailChange": "Povolit změnu Emailu",
+    "accounts-allowUserNameChange": "Povolit změnu uživatelského jména",
     "createdAt": "Vytvořeno v",
     "verified": "Ověřen",
     "active": "Aktivní",
@@ -442,5 +537,157 @@
     "card-end": "Konec",
     "card-end-on": "Končí v",
     "editCardReceivedDatePopup-title": "Změnit datum přijetí",
-    "editCardEndDatePopup-title": "Změnit datum konce"
-}
+    "editCardEndDatePopup-title": "Změnit datum konce",
+    "setCardColorPopup-title": "Nastav barvu",
+    "setCardActionsColorPopup-title": "Vyber barvu",
+    "setSwimlaneColorPopup-title": "Vyber barvu",
+    "setListColorPopup-title": "Vyber barvu",
+    "assigned-by": "Přidělil(a)",
+    "requested-by": "Vyžádal(a)",
+    "board-delete-notice": "Smazání je trvalé. Přijdete o všechny sloupce, karty a akce spojené s tímto tablem.",
+    "delete-board-confirm-popup": "Všechny sloupce, štítky a aktivity budou smazány a obsah tabla nebude možné obnovit. Toto nelze vrátit zpět.",
+    "boardDeletePopup-title": "Smazat tablo?",
+    "delete-board": "Smazat tablo",
+    "default-subtasks-board": "Podúkoly pro tablo __board__",
+    "default": "Výchozí",
+    "queue": "Fronta",
+    "subtask-settings": "Nastavení podúkolů",
+    "boardSubtaskSettingsPopup-title": "Nastavení podúkolů tabla",
+    "show-subtasks-field": "Karty mohou mít podúkoly",
+    "deposit-subtasks-board": "Vložit podúkoly do tohoto tabla",
+    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
+    "show-parent-in-minicard": "Ukázat předka na minikartě",
+    "prefix-with-full-path": "Prefix s celou cestou",
+    "prefix-with-parent": "Prefix s předkem",
+    "subtext-with-full-path": "Podtext s celou cestou",
+    "subtext-with-parent": "Podtext s předkem",
+    "change-card-parent": "Změnit rodiče karty",
+    "parent-card": "Rodičovská karta",
+    "source-board": "Zdrojové tablo",
+    "no-parent": "Nezobrazovat rodiče",
+    "activity-added-label": "added label '%s' to %s",
+    "activity-removed-label": "removed label '%s' from %s",
+    "activity-delete-attach": "deleted an attachment from %s",
+    "activity-added-label-card": "přidán štítek '%s'",
+    "activity-removed-label-card": "odstraněn štítek '%s'",
+    "activity-delete-attach-card": "odstraněna příloha",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "r-rule": "Pravidlo",
+    "r-add-trigger": "Přidat spoštěč",
+    "r-add-action": "Přidat akci",
+    "r-board-rules": "Pravidla Tabla",
+    "r-add-rule": "Přidat pravidlo",
+    "r-view-rule": "Zobrazit pravidlo",
+    "r-delete-rule": "Smazat pravidlo",
+    "r-new-rule-name": "Nový název pravidla",
+    "r-no-rules": "Žádná pravidla",
+    "r-when-a-card": "Pokud karta",
+    "r-is": "je",
+    "r-is-moved": "je přesunuto",
+    "r-added-to": "přidáno do",
+    "r-removed-from": "Odstraněno z",
+    "r-the-board": "tablo",
+    "r-list": "sloupce",
+    "set-filter": "Nastavit filtr",
+    "r-moved-to": "Přesunuto do",
+    "r-moved-from": "Přesunuto z",
+    "r-archived": "Přesunuto do archivu",
+    "r-unarchived": "Obnoveno z archivu",
+    "r-a-card": "karta",
+    "r-when-a-label-is": "Pokud nějaký štítek je",
+    "r-when-the-label-is": "Pokud tento štítek je",
+    "r-list-name": "název seznamu",
+    "r-when-a-member": "Pokud nějaký člen je",
+    "r-when-the-member": "Pokud tento člen je",
+    "r-name": "jméno",
+    "r-when-a-attach": "Pokud je nějaká příloha",
+    "r-when-a-checklist": "Když zaškrtávací seznam je",
+    "r-when-the-checklist": "Když zaškrtávací seznam",
+    "r-completed": "Dokončeno",
+    "r-made-incomplete": "Vytvořeno nehotové",
+    "r-when-a-item": "Když položka zaškrtávacího seznamu je",
+    "r-when-the-item": "Když položka zaškrtávacího seznamu",
+    "r-checked": "Zaškrtnuto",
+    "r-unchecked": "Odškrtnuto",
+    "r-move-card-to": "Přesunout kartu do",
+    "r-top-of": "Začátek",
+    "r-bottom-of": "Spodek",
+    "r-its-list": "toho sloupce",
+    "r-archive": "Přesunout do archivu",
+    "r-unarchive": "Obnovit z archivu",
+    "r-card": "karta",
+    "r-add": "Přidat",
+    "r-remove": "Odstranit",
+    "r-label": "štítek",
+    "r-member": "člen",
+    "r-remove-all": "Odstranit všechny členy z této karty",
+    "r-set-color": "Nastav barvu na",
+    "r-checklist": "zaškrtávací seznam",
+    "r-check-all": "Zaškrtnout vše",
+    "r-uncheck-all": "Odškrtnout vše",
+    "r-items-check": "položky zaškrtávacího seznamu",
+    "r-check": "Označit",
+    "r-uncheck": "Odznačit",
+    "r-item": "Položka",
+    "r-of-checklist": "ze zaškrtávacího seznamu",
+    "r-send-email": "Odeslat e-mail",
+    "r-to": "komu",
+    "r-subject": "předmět",
+    "r-rule-details": "Podrobnosti pravidla",
+    "r-d-move-to-top-gen": "Přesunout kartu na začátek toho sloupce",
+    "r-d-move-to-top-spec": "Přesunout kartu na začátek sloupce",
+    "r-d-move-to-bottom-gen": "Přesunout kartu na konec sloupce",
+    "r-d-move-to-bottom-spec": "Přesunout kartu na konec sloupce",
+    "r-d-send-email": "Odeslat email",
+    "r-d-send-email-to": "komu",
+    "r-d-send-email-subject": "předmět",
+    "r-d-send-email-message": "zpráva",
+    "r-d-archive": "Přesunout kartu do archivu",
+    "r-d-unarchive": "Obnovit kartu z archivu",
+    "r-d-add-label": "Přidat štítek",
+    "r-d-remove-label": "Odstranit štítek",
+    "r-create-card": "Vytvořit novou kartu",
+    "r-in-list": "v seznamu",
+    "r-in-swimlane": "ve swimlane",
+    "r-d-add-member": "Přidat člena",
+    "r-d-remove-member": "Odstranit člena",
+    "r-d-remove-all-member": "Odstranit všechny členy",
+    "r-d-check-all": "Označit všechny položky na seznamu",
+    "r-d-uncheck-all": "Odznačit všechny položky na seznamu",
+    "r-d-check-one": "Označit položku",
+    "r-d-uncheck-one": "Odznačit položku",
+    "r-d-check-of-list": "ze zaškrtávacího seznamu",
+    "r-d-add-checklist": "Přidat zaškrtávací seznam",
+    "r-d-remove-checklist": "Odstranit zaškrtávací seznam",
+    "r-by": "by",
+    "r-add-checklist": "Přidat zaškrtávací seznam",
+    "r-with-items": "s položkami",
+    "r-items-list": "položka1,položka2,položka3",
+    "r-add-swimlane": "Přidat swimlane",
+    "r-swimlane-name": "Název swimlane",
+    "r-board-note": "Note: leave a field empty to match every possible value.",
+    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-when-a-card-is-moved": "Když je karta přesunuta do jiného sloupce",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Metoda autentizace",
+    "authentication-type": "Typ autentizace",
+    "custom-product-name": "Vlastní název produktu",
+    "layout": "Uspořádání",
+    "hide-logo": "Skrýt logo",
+    "add-custom-html-after-body-start": "Přidej vlastní HTML za <body>",
+    "add-custom-html-before-body-end": "Přidej vlastní HTML před </body>",
+    "error-undefined": "Něco se pokazilo",
+    "error-ldap-login": "Během přihlašování nastala chyba",
+    "display-authentication-method": "Zobraz způsob ověřování",
+    "default-authentication-method": "Zobraz způsob ověřování",
+    "duplicate-board": "Duplikovat tablo",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
+}
\ No newline at end of file
diff --git a/i18n/da.i18n.json b/i18n/da.i18n.json
new file mode 100644
index 00000000..1d39f325
--- /dev/null
+++ b/i18n/da.i18n.json
@@ -0,0 +1,693 @@
+{
+    "accept": "Accepter",
+    "act-activity-notify": "Activity Notification",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__board__",
+    "act-withCardTitle": "[__board__] __card__",
+    "actions": "Actions",
+    "activities": "Activities",
+    "activity": "Activity",
+    "activity-added": "added %s to %s",
+    "activity-archived": "%s moved to Archive",
+    "activity-attached": "attached %s to %s",
+    "activity-created": "created %s",
+    "activity-customfield-created": "created custom field %s",
+    "activity-excluded": "excluded %s from %s",
+    "activity-imported": "imported %s into %s from %s",
+    "activity-imported-board": "imported %s from %s",
+    "activity-joined": "joined %s",
+    "activity-moved": "moved %s from %s to %s",
+    "activity-on": "on %s",
+    "activity-removed": "removed %s from %s",
+    "activity-sent": "sent %s to %s",
+    "activity-unjoined": "unjoined %s",
+    "activity-subtask-added": "added subtask to %s",
+    "activity-checked-item": "checked %s in checklist %s of %s",
+    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
+    "activity-checklist-added": "added checklist to %s",
+    "activity-checklist-removed": "removed a checklist from %s",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
+    "activity-checklist-item-added": "added checklist item to '%s' in %s",
+    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
+    "add": "Add",
+    "activity-checked-item-card": "checked %s in checklist %s",
+    "activity-unchecked-item-card": "unchecked %s in checklist %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
+    "add-attachment": "Add Attachment",
+    "add-board": "Add Board",
+    "add-card": "Add Card",
+    "add-swimlane": "Add Swimlane",
+    "add-subtask": "Add Subtask",
+    "add-checklist": "Add Checklist",
+    "add-checklist-item": "Add an item to checklist",
+    "add-cover": "Add Cover",
+    "add-label": "Add Label",
+    "add-list": "Add List",
+    "add-members": "Add Members",
+    "added": "Added",
+    "addMemberPopup-title": "Members",
+    "admin": "Admin",
+    "admin-desc": "Can view and edit cards, remove members, and change settings for the board.",
+    "admin-announcement": "Announcement",
+    "admin-announcement-active": "Active System-Wide Announcement",
+    "admin-announcement-title": "Announcement from Administrator",
+    "all-boards": "All boards",
+    "and-n-other-card": "And __count__ other card",
+    "and-n-other-card_plural": "And __count__ other cards",
+    "apply": "Apply",
+    "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
+    "archive": "Move to Archive",
+    "archive-all": "Move All to Archive",
+    "archive-board": "Move Board to Archive",
+    "archive-card": "Move Card to Archive",
+    "archive-list": "Move List to Archive",
+    "archive-swimlane": "Move Swimlane to Archive",
+    "archive-selection": "Move selection to Archive",
+    "archiveBoardPopup-title": "Move Board to Archive?",
+    "archived-items": "Archive",
+    "archived-boards": "Boards in Archive",
+    "restore-board": "Restore Board",
+    "no-archived-boards": "No Boards in Archive.",
+    "archives": "Archive",
+    "template": "Template",
+    "templates": "Templates",
+    "assign-member": "Assign member",
+    "attached": "attached",
+    "attachment": "Attachment",
+    "attachment-delete-pop": "Deleting an attachment is permanent. There is no undo.",
+    "attachmentDeletePopup-title": "Delete Attachment?",
+    "attachments": "Attachments",
+    "auto-watch": "Automatically watch boards when they are created",
+    "avatar-too-big": "The avatar is too large (70KB max)",
+    "back": "Back",
+    "board-change-color": "Change color",
+    "board-nb-stars": "%s stars",
+    "board-not-found": "Board not found",
+    "board-private-info": "This board will be <strong>private</strong>.",
+    "board-public-info": "This board will be <strong>public</strong>.",
+    "boardChangeColorPopup-title": "Change Board Background",
+    "boardChangeTitlePopup-title": "Rename Board",
+    "boardChangeVisibilityPopup-title": "Change Visibility",
+    "boardChangeWatchPopup-title": "Change Watch",
+    "boardMenuPopup-title": "Board Settings",
+    "boards": "Boards",
+    "board-view": "Board View",
+    "board-view-cal": "Calendar",
+    "board-view-swimlanes": "Swimlanes",
+    "board-view-lists": "Lists",
+    "bucket-example": "Like “Bucket List” for example",
+    "cancel": "Cancel",
+    "card-archived": "This card is moved to Archive.",
+    "board-archived": "This board is moved to Archive.",
+    "card-comments-title": "This card has %s comment.",
+    "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
+    "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
+    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
+    "card-due": "Due",
+    "card-due-on": "Due on",
+    "card-spent": "Spent Time",
+    "card-edit-attachments": "Edit attachments",
+    "card-edit-custom-fields": "Edit custom fields",
+    "card-edit-labels": "Edit labels",
+    "card-edit-members": "Edit members",
+    "card-labels-title": "Change the labels for the card.",
+    "card-members-title": "Add or remove members of the board from the card.",
+    "card-start": "Start",
+    "card-start-on": "Starts on",
+    "cardAttachmentsPopup-title": "Attach From",
+    "cardCustomField-datePopup-title": "Change date",
+    "cardCustomFieldsPopup-title": "Edit custom fields",
+    "cardDeletePopup-title": "Delete Card?",
+    "cardDetailsActionsPopup-title": "Card Actions",
+    "cardLabelsPopup-title": "Labels",
+    "cardMembersPopup-title": "Members",
+    "cardMorePopup-title": "More",
+    "cardTemplatePopup-title": "Create template",
+    "cards": "Cards",
+    "cards-count": "Cards",
+    "casSignIn": "Sign In with CAS",
+    "cardType-card": "Card",
+    "cardType-linkedCard": "Linked Card",
+    "cardType-linkedBoard": "Linked Board",
+    "change": "Change",
+    "change-avatar": "Change Avatar",
+    "change-password": "Change Password",
+    "change-permissions": "Change permissions",
+    "change-settings": "Change Settings",
+    "changeAvatarPopup-title": "Change Avatar",
+    "changeLanguagePopup-title": "Change Language",
+    "changePasswordPopup-title": "Change Password",
+    "changePermissionsPopup-title": "Change Permissions",
+    "changeSettingsPopup-title": "Change Settings",
+    "subtasks": "Subtasks",
+    "checklists": "Checklists",
+    "click-to-star": "Click to star this board.",
+    "click-to-unstar": "Click to unstar this board.",
+    "clipboard": "Clipboard or drag & drop",
+    "close": "Close",
+    "close-board": "Close Board",
+    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
+    "color-black": "black",
+    "color-blue": "blue",
+    "color-crimson": "crimson",
+    "color-darkgreen": "darkgreen",
+    "color-gold": "gold",
+    "color-gray": "gray",
+    "color-green": "green",
+    "color-indigo": "indigo",
+    "color-lime": "lime",
+    "color-magenta": "magenta",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "navy",
+    "color-orange": "orange",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
+    "color-pink": "pink",
+    "color-plum": "plum",
+    "color-purple": "purple",
+    "color-red": "red",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "silver",
+    "color-sky": "sky",
+    "color-slateblue": "slateblue",
+    "color-white": "white",
+    "color-yellow": "yellow",
+    "unset-color": "Unset",
+    "comment": "Comment",
+    "comment-placeholder": "Write Comment",
+    "comment-only": "Comment only",
+    "comment-only-desc": "Can comment on cards only.",
+    "no-comments": "No comments",
+    "no-comments-desc": "Can not see comments and activities.",
+    "computer": "Computer",
+    "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?",
+    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
+    "copy-card-link-to-clipboard": "Copy card link to clipboard",
+    "linkCardPopup-title": "Link Card",
+    "searchElementPopup-title": "Search",
+    "copyCardPopup-title": "Copy Card",
+    "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
+    "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
+    "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"First card title\", \"description\":\"First card description\"}, {\"title\":\"Second card title\",\"description\":\"Second card description\"},{\"title\":\"Last card title\",\"description\":\"Last card description\"} ]",
+    "create": "Create",
+    "createBoardPopup-title": "Create Board",
+    "chooseBoardSourcePopup-title": "Import board",
+    "createLabelPopup-title": "Create Label",
+    "createCustomField": "Create Field",
+    "createCustomFieldPopup-title": "Create Field",
+    "current": "current",
+    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
+    "custom-field-checkbox": "Checkbox",
+    "custom-field-date": "Date",
+    "custom-field-dropdown": "Dropdown List",
+    "custom-field-dropdown-none": "(none)",
+    "custom-field-dropdown-options": "List Options",
+    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
+    "custom-field-dropdown-unknown": "(unknown)",
+    "custom-field-number": "Number",
+    "custom-field-text": "Text",
+    "custom-fields": "Custom Fields",
+    "date": "Date",
+    "decline": "Decline",
+    "default-avatar": "Default avatar",
+    "delete": "Delete",
+    "deleteCustomFieldPopup-title": "Delete Custom Field?",
+    "deleteLabelPopup-title": "Delete Label?",
+    "description": "Description",
+    "disambiguateMultiLabelPopup-title": "Disambiguate Label Action",
+    "disambiguateMultiMemberPopup-title": "Disambiguate Member Action",
+    "discard": "Discard",
+    "done": "Done",
+    "download": "Download",
+    "edit": "Edit",
+    "edit-avatar": "Change Avatar",
+    "edit-profile": "Edit Profile",
+    "edit-wip-limit": "Edit WIP Limit",
+    "soft-wip-limit": "Soft WIP Limit",
+    "editCardStartDatePopup-title": "Change start date",
+    "editCardDueDatePopup-title": "Change due date",
+    "editCustomFieldPopup-title": "Edit Field",
+    "editCardSpentTimePopup-title": "Change spent time",
+    "editLabelPopup-title": "Change Label",
+    "editNotificationPopup-title": "Edit Notification",
+    "editProfilePopup-title": "Edit Profile",
+    "email": "Email",
+    "email-enrollAccount-subject": "An account created for you on __siteName__",
+    "email-enrollAccount-text": "Hello __user__,\n\nTo start using the service, simply click the link below.\n\n__url__\n\nThanks.",
+    "email-fail": "Sending email failed",
+    "email-fail-text": "Error trying to send email",
+    "email-invalid": "Invalid email",
+    "email-invite": "Invite via Email",
+    "email-invite-subject": "__inviter__ sent you an invitation",
+    "email-invite-text": "Dear __user__,\n\n__inviter__ invites you to join board \"__board__\" for collaborations.\n\nPlease follow the link below:\n\n__url__\n\nThanks.",
+    "email-resetPassword-subject": "Reset your password on __siteName__",
+    "email-resetPassword-text": "Hello __user__,\n\nTo reset your password, simply click the link below.\n\n__url__\n\nThanks.",
+    "email-sent": "Email sent",
+    "email-verifyEmail-subject": "Verify your email address on __siteName__",
+    "email-verifyEmail-text": "Hello __user__,\n\nTo verify your account email, simply click the link below.\n\n__url__\n\nThanks.",
+    "enable-wip-limit": "Enable WIP Limit",
+    "error-board-doesNotExist": "This board does not exist",
+    "error-board-notAdmin": "You need to be admin of this board to do that",
+    "error-board-notAMember": "You need to be a member of this board to do that",
+    "error-json-malformed": "Your text is not valid JSON",
+    "error-json-schema": "Your JSON data does not include the proper information in the correct format",
+    "error-list-doesNotExist": "This list does not exist",
+    "error-user-doesNotExist": "This user does not exist",
+    "error-user-notAllowSelf": "You can not invite yourself",
+    "error-user-notCreated": "This user is not created",
+    "error-username-taken": "This username is already taken",
+    "error-email-taken": "Email has already been taken",
+    "export-board": "Export board",
+    "filter": "Filter",
+    "filter-cards": "Filter Cards",
+    "filter-clear": "Clear filter",
+    "filter-no-label": "No label",
+    "filter-no-member": "No member",
+    "filter-no-custom-fields": "No Custom Fields",
+    "filter-on": "Filter is on",
+    "filter-on-desc": "You are filtering cards on this board. Click here to edit filter.",
+    "filter-to-selection": "Filter to selection",
+    "advanced-filter-label": "Advanced Filter",
+    "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) to be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
+    "fullname": "Full Name",
+    "header-logo-title": "Go back to your boards page.",
+    "hide-system-messages": "Hide system messages",
+    "headerBarCreateBoardPopup-title": "Create Board",
+    "home": "Home",
+    "import": "Import",
+    "link": "Link",
+    "import-board": "import board",
+    "import-board-c": "Import board",
+    "import-board-title-trello": "Import board from Trello",
+    "import-board-title-wekan": "Import board from previous export",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
+    "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
+    "from-trello": "From Trello",
+    "from-wekan": "From previous export",
+    "import-board-instruction-trello": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text.",
+    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
+    "import-json-placeholder": "Paste your valid JSON data here",
+    "import-map-members": "Map members",
+    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
+    "import-show-user-mapping": "Review members mapping",
+    "import-user-select": "Pick your existing user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select member",
+    "info": "Version",
+    "initials": "Initials",
+    "invalid-date": "Invalid date",
+    "invalid-time": "Invalid time",
+    "invalid-user": "Invalid user",
+    "joined": "joined",
+    "just-invited": "You are just invited to this board",
+    "keyboard-shortcuts": "Keyboard shortcuts",
+    "label-create": "Create Label",
+    "label-default": "%s label (default)",
+    "label-delete-pop": "There is no undo. This will remove this label from all cards and destroy its history.",
+    "labels": "Labels",
+    "language": "Language",
+    "last-admin-desc": "You can’t change roles because there must be at least one admin.",
+    "leave-board": "Leave Board",
+    "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
+    "leaveBoardPopup-title": "Leave Board ?",
+    "link-card": "Link to this card",
+    "list-archive-cards": "Move all cards in this list to Archive",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
+    "list-move-cards": "Move all cards in this list",
+    "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
+    "listActionPopup-title": "List Actions",
+    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
+    "listImportCardPopup-title": "Import a Trello card",
+    "listMorePopup-title": "More",
+    "link-list": "Link to this list",
+    "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
+    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
+    "lists": "Lists",
+    "swimlanes": "Swimlanes",
+    "log-out": "Log Out",
+    "log-in": "Log In",
+    "loginPopup-title": "Log In",
+    "memberMenuPopup-title": "Member Settings",
+    "members": "Members",
+    "menu": "Menu",
+    "move-selection": "Move selection",
+    "moveCardPopup-title": "Move Card",
+    "moveCardToBottom-title": "Move to Bottom",
+    "moveCardToTop-title": "Move to Top",
+    "moveSelectionPopup-title": "Move selection",
+    "multi-selection": "Multi-Selection",
+    "multi-selection-on": "Multi-Selection is on",
+    "muted": "Muted",
+    "muted-info": "You will never be notified of any changes in this board",
+    "my-boards": "My Boards",
+    "name": "Name",
+    "no-archived-cards": "No cards in Archive.",
+    "no-archived-lists": "No lists in Archive.",
+    "no-archived-swimlanes": "No swimlanes in Archive.",
+    "no-results": "No results",
+    "normal": "Normal",
+    "normal-desc": "Can view and edit cards. Can't change settings.",
+    "not-accepted-yet": "Invitation not accepted yet",
+    "notify-participate": "Receive updates to any cards you participate as creater or member",
+    "notify-watch": "Receive updates to any boards, lists, or cards you’re watching",
+    "optional": "optional",
+    "or": "or",
+    "page-maybe-private": "This page may be private. You may be able to view it by <a href='%s'>logging in</a>.",
+    "page-not-found": "Page not found.",
+    "password": "Password",
+    "paste-or-dragdrop": "to paste, or drag & drop image file to it (image only)",
+    "participating": "Participating",
+    "preview": "Preview",
+    "previewAttachedImagePopup-title": "Preview",
+    "previewClipboardImagePopup-title": "Preview",
+    "private": "Private",
+    "private-desc": "This board is private. Only people added to the board can view and edit it.",
+    "profile": "Profile",
+    "public": "Public",
+    "public-desc": "This board is public. It's visible to anyone with the link and will show up in search engines like Google. Only people added to the board can edit.",
+    "quick-access-description": "Star a board to add a shortcut in this bar.",
+    "remove-cover": "Remove Cover",
+    "remove-from-board": "Remove from Board",
+    "remove-label": "Remove Label",
+    "listDeletePopup-title": "Delete List ?",
+    "remove-member": "Remove Member",
+    "remove-member-from-card": "Remove from Card",
+    "remove-member-pop": "Remove __name__ (__username__) from __boardTitle__? The member will be removed from all cards on this board. They will receive a notification.",
+    "removeMemberPopup-title": "Remove Member?",
+    "rename": "Rename",
+    "rename-board": "Rename Board",
+    "restore": "Restore",
+    "save": "Save",
+    "search": "Search",
+    "rules": "Rules",
+    "search-cards": "Search from card titles and descriptions on this board",
+    "search-example": "Text to search for?",
+    "select-color": "Select Color",
+    "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
+    "setWipLimitPopup-title": "Set WIP Limit",
+    "shortcut-assign-self": "Assign yourself to current card",
+    "shortcut-autocomplete-emoji": "Autocomplete emoji",
+    "shortcut-autocomplete-members": "Autocomplete members",
+    "shortcut-clear-filters": "Clear all filters",
+    "shortcut-close-dialog": "Close Dialog",
+    "shortcut-filter-my-cards": "Filter my cards",
+    "shortcut-show-shortcuts": "Bring up this shortcuts list",
+    "shortcut-toggle-filterbar": "Toggle Filter Sidebar",
+    "shortcut-toggle-sidebar": "Toggle Board Sidebar",
+    "show-cards-minimum-count": "Show cards count if list contains more than",
+    "sidebar-open": "Open Sidebar",
+    "sidebar-close": "Close Sidebar",
+    "signupPopup-title": "Create an Account",
+    "star-board-title": "Click to star this board. It will show up at top of your boards list.",
+    "starred-boards": "Starred Boards",
+    "starred-boards-description": "Starred boards show up at the top of your boards list.",
+    "subscribe": "Subscribe",
+    "team": "Team",
+    "this-board": "this board",
+    "this-card": "this card",
+    "spent-time-hours": "Spent time (hours)",
+    "overtime-hours": "Overtime (hours)",
+    "overtime": "Overtime",
+    "has-overtime-cards": "Has overtime cards",
+    "has-spenttime-cards": "Has spent time cards",
+    "time": "Time",
+    "title": "Title",
+    "tracking": "Tracking",
+    "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
+    "type": "Type",
+    "unassign-member": "Unassign member",
+    "unsaved-description": "You have an unsaved description.",
+    "unwatch": "Unwatch",
+    "upload": "Upload",
+    "upload-avatar": "Upload an avatar",
+    "uploaded-avatar": "Uploaded an avatar",
+    "username": "Username",
+    "view-it": "View it",
+    "warn-list-archived": "warning: this card is in an list at Archive",
+    "watch": "Watch",
+    "watching": "Watching",
+    "watching-info": "You will be notified of any change in this board",
+    "welcome-board": "Welcome Board",
+    "welcome-swimlane": "Milestone 1",
+    "welcome-list1": "Basics",
+    "welcome-list2": "Advanced",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
+    "what-to-do": "What do you want to do?",
+    "wipLimitErrorPopup-title": "Invalid WIP Limit",
+    "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
+    "wipLimitErrorPopup-dialog-pt2": "Please move some tasks out of this list, or set a higher WIP limit.",
+    "admin-panel": "Admin Panel",
+    "settings": "Settings",
+    "people": "People",
+    "registration": "Registration",
+    "disable-self-registration": "Disable Self-Registration",
+    "invite": "Invite",
+    "invite-people": "Invite People",
+    "to-boards": "To board(s)",
+    "email-addresses": "Email Addresses",
+    "smtp-host-description": "The address of the SMTP server that handles your emails.",
+    "smtp-port-description": "The port your SMTP server uses for outgoing emails.",
+    "smtp-tls-description": "Enable TLS support for SMTP server",
+    "smtp-host": "SMTP Host",
+    "smtp-port": "SMTP Port",
+    "smtp-username": "Username",
+    "smtp-password": "Password",
+    "smtp-tls": "TLS support",
+    "send-from": "From",
+    "send-smtp-test": "Send a test email to yourself",
+    "invitation-code": "Invitation Code",
+    "email-invite-register-subject": "__inviter__ sent you an invitation",
+    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email",
+    "email-smtp-test-text": "You have successfully sent an email",
+    "error-invitation-code-not-exist": "Invitation code doesn't exist",
+    "error-notAuthorized": "You are not authorized to view this page.",
+    "outgoing-webhooks": "Outgoing Webhooks",
+    "outgoingWebhooksPopup-title": "Outgoing Webhooks",
+    "boardCardTitlePopup-title": "Card Title Filter",
+    "new-outgoing-webhook": "New Outgoing Webhook",
+    "no-name": "(Unknown)",
+    "Node_version": "Node version",
+    "OS_Arch": "OS Arch",
+    "OS_Cpus": "OS CPU Count",
+    "OS_Freemem": "OS Free Memory",
+    "OS_Loadavg": "OS Load Average",
+    "OS_Platform": "OS Platform",
+    "OS_Release": "OS Release",
+    "OS_Totalmem": "OS Total Memory",
+    "OS_Type": "OS Type",
+    "OS_Uptime": "OS Uptime",
+    "days": "days",
+    "hours": "hours",
+    "minutes": "minutes",
+    "seconds": "seconds",
+    "show-field-on-card": "Show this field on card",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
+    "yes": "Yes",
+    "no": "No",
+    "accounts": "Accounts",
+    "accounts-allowEmailChange": "Allow Email Change",
+    "accounts-allowUserNameChange": "Allow Username Change",
+    "createdAt": "Created at",
+    "verified": "Verified",
+    "active": "Active",
+    "card-received": "Received",
+    "card-received-on": "Received on",
+    "card-end": "End",
+    "card-end-on": "Ends on",
+    "editCardReceivedDatePopup-title": "Change received date",
+    "editCardEndDatePopup-title": "Change end date",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "Assigned By",
+    "requested-by": "Requested By",
+    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
+    "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
+    "boardDeletePopup-title": "Delete Board?",
+    "delete-board": "Delete Board",
+    "default-subtasks-board": "Subtasks for __board__ board",
+    "default": "Default",
+    "queue": "Queue",
+    "subtask-settings": "Subtasks Settings",
+    "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
+    "show-subtasks-field": "Cards can have subtasks",
+    "deposit-subtasks-board": "Deposit subtasks to this board:",
+    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
+    "show-parent-in-minicard": "Show parent in minicard:",
+    "prefix-with-full-path": "Prefix with full path",
+    "prefix-with-parent": "Prefix with parent",
+    "subtext-with-full-path": "Subtext with full path",
+    "subtext-with-parent": "Subtext with parent",
+    "change-card-parent": "Change card's parent",
+    "parent-card": "Parent card",
+    "source-board": "Source board",
+    "no-parent": "Don't show parent",
+    "activity-added-label": "added label '%s' to %s",
+    "activity-removed-label": "removed label '%s' from %s",
+    "activity-delete-attach": "deleted an attachment from %s",
+    "activity-added-label-card": "added label '%s'",
+    "activity-removed-label-card": "removed label '%s'",
+    "activity-delete-attach-card": "deleted an attachment",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "r-rule": "Rule",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "Add action",
+    "r-board-rules": "Board rules",
+    "r-add-rule": "Add rule",
+    "r-view-rule": "View rule",
+    "r-delete-rule": "Delete rule",
+    "r-new-rule-name": "New rule title",
+    "r-no-rules": "No rules",
+    "r-when-a-card": "When a card",
+    "r-is": "is",
+    "r-is-moved": "is moved",
+    "r-added-to": "added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "the board",
+    "r-list": "list",
+    "set-filter": "Set Filter",
+    "r-moved-to": "Moved to",
+    "r-moved-from": "Moved from",
+    "r-archived": "Moved to Archive",
+    "r-unarchived": "Restored from Archive",
+    "r-a-card": "a card",
+    "r-when-a-label-is": "When a label is",
+    "r-when-the-label-is": "When the label is",
+    "r-list-name": "list name",
+    "r-when-a-member": "When a member is",
+    "r-when-the-member": "When the member",
+    "r-name": "name",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "r-when-the-item": "When the checklist item",
+    "r-checked": "Checked",
+    "r-unchecked": "Unchecked",
+    "r-move-card-to": "Move card to",
+    "r-top-of": "Top of",
+    "r-bottom-of": "Bottom of",
+    "r-its-list": "its list",
+    "r-archive": "Move to Archive",
+    "r-unarchive": "Restore from Archive",
+    "r-card": "card",
+    "r-add": "Add",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-set-color": "Set color to",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "subject",
+    "r-rule-details": "Rule details",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Move card to top of list",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Move card to bottom of list",
+    "r-d-send-email": "Send email",
+    "r-d-send-email-to": "to",
+    "r-d-send-email-subject": "subject",
+    "r-d-send-email-message": "message",
+    "r-d-archive": "Move card to Archive",
+    "r-d-unarchive": "Restore card from Archive",
+    "r-d-add-label": "Add label",
+    "r-d-remove-label": "Remove label",
+    "r-create-card": "Create new card",
+    "r-in-list": "in list",
+    "r-in-swimlane": "in swimlane",
+    "r-d-add-member": "Add member",
+    "r-d-remove-member": "Remove member",
+    "r-d-remove-all-member": "Remove all member",
+    "r-d-check-all": "Check all items of a list",
+    "r-d-uncheck-all": "Uncheck all items of a list",
+    "r-d-check-one": "Check item",
+    "r-d-uncheck-one": "Uncheck item",
+    "r-d-check-of-list": "of checklist",
+    "r-d-add-checklist": "Add checklist",
+    "r-d-remove-checklist": "Remove checklist",
+    "r-by": "by",
+    "r-add-checklist": "Add checklist",
+    "r-with-items": "with items",
+    "r-items-list": "item1,item2,item3",
+    "r-add-swimlane": "Add swimlane",
+    "r-swimlane-name": "swimlane name",
+    "r-board-note": "Note: leave a field empty to match every possible value.",
+    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout",
+    "hide-logo": "Hide Logo",
+    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
+    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
+    "error-undefined": "Something went wrong",
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
+}
\ No newline at end of file
diff --git a/i18n/de.i18n.json b/i18n/de.i18n.json
index fb98a950..05a4e51f 100644
--- a/i18n/de.i18n.json
+++ b/i18n/de.i18n.json
@@ -1,35 +1,51 @@
 {
     "accept": "Akzeptieren",
-    "act-activity-notify": "[Wekan] Aktivitätsbenachrichtigung",
-    "act-addAttachment": "hat __attachment__ an __card__ angehängt",
-    "act-addChecklist": "hat die Checklist __checklist__ zu __card__ hinzugefügt",
-    "act-addChecklistItem": "hat __checklistItem__ zur Checkliste __checklist__ in __card__ hinzugefügt",
-    "act-addComment": "hat __card__ kommentiert: __comment__",
-    "act-createBoard": "hat __board__ erstellt",
-    "act-createCard": "hat __card__ zu __list__ hinzugefügt",
-    "act-createList": "hat __list__ zu __board__ hinzugefügt",
-    "act-addBoardMember": "hat __member__ zu __board__ hinzugefügt",
-    "act-archivedBoard": "__board__ in den Papierkorb verschoben",
-    "act-archivedCard": "__card__ in den Papierkorb verschoben",
-    "act-archivedList": "__list__ in den Papierkorb verschoben",
-    "act-archivedSwimlane": "__swimlane__ in den Papierkorb verschoben",
-    "act-importBoard": "hat __board__ importiert",
-    "act-importCard": "hat __card__ importiert",
-    "act-importList": "hat __list__ importiert",
-    "act-joinMember": "hat __member__ zu __card__ hinzugefügt",
-    "act-moveCard": "hat __card__ von __oldList__ nach __list__ verschoben",
-    "act-removeBoardMember": "hat __member__ von __board__ entfernt",
-    "act-restoredCard": "hat __card__ in __board__ wiederhergestellt",
-    "act-unjoinMember": "hat __member__ von __card__ entfernt",
-    "act-withBoardTitle": "[Wekan] __board__",
+    "act-activity-notify": "Aktivitätsbenachrichtigung",
+    "act-addAttachment": "hat Anhang __attachment__  zur Karte __card__ auf der Liste __list__ in Swimlane __swimlane__ in Board __board__ hinzugefügt",
+    "act-deleteAttachment": "hat Anhang __attachment__ von Karte __card__ auf der Liste __list__ in Swimlane __swimlane__ in Board __board__ gelöscht",
+    "act-addSubtask": "hat Teilaufgabe __subtask__ zur Karte __card__ auf der Liste __list__ in Swimlane __swimlane__ in Board __board__ hinzugefügt",
+    "act-addLabel": "hat Label __label__ zur Karte __card__ auf der Liste __list__ in Swimlane __swimlane__ in Board __board__ hinzugefügt",
+    "act-addedLabel": "hat Label __label__ zur Karte __card__ auf der Liste __list__ in Swimlane __swimlane__ in Board __board__ hinzugefügt",
+    "act-removeLabel": "hat Label __label__ von Karte __card__ auf der Liste __list__ in Swimlane __swimlane__ in Board __board__ entfernt",
+    "act-removedLabel": "hat Label __label__ von Karte __card__ auf der Liste __list__ in Swimlane __swimlane__ in Board __board__ entfernt",
+    "act-addChecklist": "hat Checkliste __checklist__ zur Karte __card__ auf der Liste __list__ in Swimlane __swimlane__ in Board __board__ hinzugefügt",
+    "act-addChecklistItem": "hat Checklistenposition  __checklistItem__ zu Checkliste __checkList__ auf der Karte __card__ auf der Liste __list__ in Swimlane __swimlane__ in Board __board__ hinzugefügt",
+    "act-removeChecklist": "hat Checkliste __checklist__ von Karte __card__ auf der Liste __list__ in Swimlane __swimlane__ in Board __board__ entfernt",
+    "act-removeChecklistItem": "hat Checklistenposition __checklistItem__ von Checkliste __checkList__ auf der Karte __card__ auf der Liste __list__ in Swimlane __swimlane__ in Board __board__ entfernt",
+    "act-checkedItem": "hat __checklistItem__  der Checkliste __checklist__ der Karte __card__ auf der Liste __list__ in Swimlane __swimlane__ in Board __board__ abgehakt",
+    "act-uncheckedItem": "hat Haken von __checklistItem__ der Checkliste __checklist__ der Karte __card__ auf der Liste __list__ in Swimlane __swimlane__ in Board __board__ entfernt",
+    "act-completeChecklist": "hat Checkliste __checklist__ der Karte __card__ auf der Liste __list__ in Swimlane __swimlane__ in Board __board__ vervollständigt",
+    "act-uncompleteChecklist": "hat Checkliste __checklist__ der Karte __card__ auf der Liste __list__ in Swimlane __swimlane__ in Board __board__ unvervollständigt",
+    "act-addComment": "hat Karte __card__ auf der Liste __list__ in Swimlane __swimlane__ in Board __board__ kommentiert: __comment__",
+    "act-createBoard": "hat Board __board__ erstellt",
+    "act-createSwimlane": "hat Swimlane __swimlane__ in Board __board__ erstellt",
+    "act-createCard": "hat Karte __card__ auf der Liste __list__ in Swimlane __swimlane__ in Board __board__ erstellt",
+    "act-createCustomField": "hat das benutzerdefinierte Feld __customField__ auf Karte __card__ auf der Liste __list__ in Swimlane __swimlane__ in Board __board__ erstellt",
+    "act-createList": "hat Liste __list__ zu Board __board__ hinzugefügt",
+    "act-addBoardMember": "hat Mitglied __member__ zu Board __board__ hinzugefügt",
+    "act-archivedBoard": "hat Board __board__ ins Archiv verschoben",
+    "act-archivedCard": "hat Karte __card__ von der Liste __list__ in Swimlane __swimlane__ in Board __board__ ins Archiv verschoben",
+    "act-archivedList": "hat Liste __list__ in Swimlane __swimlane__ in Board __board__ ins Archiv verschoben",
+    "act-archivedSwimlane": "hat Swimlane __swimlane__ von Board __board__ ins Archiv verschoben",
+    "act-importBoard": "hat Board __board__ importiert",
+    "act-importCard": "hat Karte __card__ in Liste __list__ in Swimlane __swimlane__ in Board __board__ importiert",
+    "act-importList": "hat Liste __list__ in Swimlane __swimlane__ in Board __board__ importiert",
+    "act-joinMember": "hat Mitglied __member__ zur Karte __card__ auf der Liste __list__ in Swimlane __swimlane__ in Board __board__ hinzugefügt",
+    "act-moveCard": "hat Karte __card__ in Board __board__ von Liste __oldList__ in Swimlane __oldSwimlane__ zu Liste __list__ in Swimlane __swimlane__ verschoben",
+    "act-moveCardToOtherBoard": "hat Karte __card__ von Liste __oldList__ in Swimlane  __oldSwimlane__ in Board __oldBoard__ zu Liste __list__ in Swimlane __swimlane__ in Board __board__ verschoben",
+    "act-removeBoardMember": "hat Mitglied __member__ von Board __board__ entfernt",
+    "act-restoredCard": "hat Karte __card__ auf der Liste __list__ in Swimlane __swimlane__ in Board __board__ wiederhergestellt",
+    "act-unjoinMember": "hat Mitglied __member__ von Karte __card__ auf der Liste __list__ in Swimlane __swimlane__ in Board __board__ entfernt",
+    "act-withBoardTitle": "__board__",
     "act-withCardTitle": "[__board__] __card__",
     "actions": "Aktionen",
     "activities": "Aktivitäten",
     "activity": "Aktivität",
     "activity-added": "hat %s zu %s hinzugefügt",
-    "activity-archived": "%s in den Papierkorb verschoben",
+    "activity-archived": "hat %s ins Archiv verschoben",
     "activity-attached": "hat %s an %s angehängt",
     "activity-created": "hat %s erstellt",
+    "activity-customfield-created": "hat das benutzerdefinierte Feld %s erstellt",
     "activity-excluded": "hat %s von %s ausgeschlossen",
     "activity-imported": "hat %s in %s von %s importiert",
     "activity-imported-board": "hat %s von %s importiert",
@@ -39,15 +55,27 @@
     "activity-removed": "hat %s von %s entfernt",
     "activity-sent": "hat %s an %s gesendet",
     "activity-unjoined": "hat %s verlassen",
+    "activity-subtask-added": "Teilaufgabe zu %s hinzugefügt",
+    "activity-checked-item": "markierte %s in Checkliste %s von %s",
+    "activity-unchecked-item": "hat %s in Checkliste %s von %s abgewählt",
     "activity-checklist-added": "hat eine Checkliste zu %s hinzugefügt",
-    "activity-checklist-item-added": "hat einen Punkt zur Checkliste '%s' in %s hinzugefügt",
+    "activity-checklist-removed": "entfernte eine Checkliste von %s",
+    "activity-checklist-completed": "hat Checkliste __checklist__ der Karte __card__ auf der Liste __list__ in Swimlane __swimlane__ in Board __board__ vervollständigt",
+    "activity-checklist-uncompleted": "unvervollständigte die Checkliste %s von %s",
+    "activity-checklist-item-added": "hat ein Checklistenelement zu '%s' in %s hinzugefügt",
+    "activity-checklist-item-removed": "hat ein Checklistenelement von '%s' in %s entfernt",
     "add": "Hinzufügen",
+    "activity-checked-item-card": "markiere %s in Checkliste %s",
+    "activity-unchecked-item-card": "hat %s in Checkliste %s abgewählt",
+    "activity-checklist-completed-card": "hat Checkliste __checklist__ der Karte __card__ auf der Liste __list__ in Swimlane __swimlane__ in Board __board__ vervollständigt",
+    "activity-checklist-uncompleted-card": "unvervollständigte die Checkliste %s",
     "add-attachment": "Datei anhängen",
     "add-board": "neues Board",
     "add-card": "Karte hinzufügen",
     "add-swimlane": "Swimlane hinzufügen",
+    "add-subtask": "Teilaufgabe hinzufügen",
     "add-checklist": "Checkliste hinzufügen",
-    "add-checklist-item": "Punkt zu einer Checkliste hinzufügen",
+    "add-checklist-item": "Element zu Checkliste hinzufügen",
     "add-cover": "Cover hinzufügen",
     "add-label": "Label hinzufügen",
     "add-list": "Liste hinzufügen",
@@ -57,26 +85,28 @@
     "admin": "Admin",
     "admin-desc": "Kann Karten anzeigen und bearbeiten, Mitglieder entfernen und Boardeinstellungen ändern.",
     "admin-announcement": "Ankündigung",
-    "admin-announcement-active": "Aktive, systemweite Ankündigungen",
+    "admin-announcement-active": "Aktive systemweite Ankündigungen",
     "admin-announcement-title": "Ankündigung des Administrators",
     "all-boards": "Alle Boards",
     "and-n-other-card": "und eine andere Karte",
     "and-n-other-card_plural": "und __count__ andere Karten",
     "apply": "Übernehmen",
-    "app-is-offline": "Wekan lädt gerade, bitte warten Sie. Wenn Sie die Seite neu laden, gehen nicht übertragene Änderungen verloren. Sollte Wekan nicht geladen werden, überprüfen Sie bitte, ob der Server noch läuft.",
-    "archive": "In den Papierkorb verschieben",
-    "archive-all": "Alles in den Papierkorb verschieben",
-    "archive-board": "Board in den Papierkorb verschieben",
-    "archive-card": "Karte in den Papierkorb verschieben",
-    "archive-list": "Liste in den Papierkorb verschieben",
-    "archive-swimlane": "Swimlane in den Papierkorb verschieben",
-    "archive-selection": "Auswahl in den Papierkorb verschieben",
-    "archiveBoardPopup-title": "Board in den Papierkorb verschieben?",
-    "archived-items": "Papierkorb",
-    "archived-boards": "Boards im Papierkorb",
+    "app-is-offline": "Laden, bitte warten. Das Aktualisieren der Seite führt zu Datenverlust. Wenn das Laden nicht funktioniert, überprüfen Sie bitte, ob der Server nicht angehalten wurde.",
+    "archive": "Ins Archiv verschieben",
+    "archive-all": "Alles ins Archiv verschieben",
+    "archive-board": "Board ins Archiv verschieben",
+    "archive-card": "Karte ins Archiv verschieben",
+    "archive-list": "Liste ins Archiv verschieben",
+    "archive-swimlane": "Swimlane ins Archiv verschieben",
+    "archive-selection": "Auswahl ins Archiv verschieben",
+    "archiveBoardPopup-title": "Board ins Archiv verschieben?",
+    "archived-items": "Archiv",
+    "archived-boards": "Boards im Archiv",
     "restore-board": "Board wiederherstellen",
-    "no-archived-boards": "Keine Boards im Papierkorb.",
-    "archives": "Papierkorb",
+    "no-archived-boards": "Keine Boards im Archiv.",
+    "archives": "Archiv",
+    "template": "Vorlage",
+    "templates": "Vorlagen",
     "assign-member": "Mitglied zuweisen",
     "attached": "angehängt",
     "attachment": "Anhang",
@@ -95,22 +125,25 @@
     "boardChangeTitlePopup-title": "Board umbenennen",
     "boardChangeVisibilityPopup-title": "Sichtbarkeit ändern",
     "boardChangeWatchPopup-title": "Beobachtung ändern",
-    "boardMenuPopup-title": "Boardmenü",
+    "boardMenuPopup-title": "Boardeinstellungen",
     "boards": "Boards",
     "board-view": "Boardansicht",
+    "board-view-cal": "Kalender",
     "board-view-swimlanes": "Swimlanes",
     "board-view-lists": "Listen",
     "bucket-example": "z.B. \"Löffelliste\"",
     "cancel": "Abbrechen",
-    "card-archived": "Diese Karte wurde in den Papierkorb verschoben",
+    "card-archived": "Diese Karte wurde ins Archiv verschoben",
+    "board-archived": "Dieses Board wurde ins Archiv verschoben.",
     "card-comments-title": "Diese Karte hat %s Kommentar(e).",
     "card-delete-notice": "Löschen kann nicht rückgängig gemacht werden. Alle Aktionen, die dieser Karte zugeordnet sind, werden ebenfalls gelöscht.",
     "card-delete-pop": "Alle Aktionen werden aus dem Aktivitätsfeed entfernt und die Karte kann nicht wiedereröffnet werden. Die Aktion kann nicht rückgängig gemacht werden.",
-    "card-delete-suggest-archive": "Sie können eine Karte in den Papierkorb verschieben, um sie vom Board zu entfernen und die Aktivitäten zu behalten.",
+    "card-delete-suggest-archive": "Sie können eine Karte ins Archiv verschieben, um sie vom Board zu entfernen und die Aktivitäten zu behalten.",
     "card-due": "Fällig",
     "card-due-on": "Fällig am",
     "card-spent": "Aufgewendete Zeit",
     "card-edit-attachments": "Anhänge ändern",
+    "card-edit-custom-fields": "Benutzerdefinierte Felder editieren",
     "card-edit-labels": "Labels ändern",
     "card-edit-members": "Mitglieder ändern",
     "card-labels-title": "Labels für diese Karte ändern.",
@@ -118,13 +151,20 @@
     "card-start": "Start",
     "card-start-on": "Start am",
     "cardAttachmentsPopup-title": "Anhängen von",
+    "cardCustomField-datePopup-title": "Datum ändern",
+    "cardCustomFieldsPopup-title": "Benutzerdefinierte Felder editieren",
     "cardDeletePopup-title": "Karte löschen?",
     "cardDetailsActionsPopup-title": "Kartenaktionen",
     "cardLabelsPopup-title": "Labels",
     "cardMembersPopup-title": "Mitglieder",
     "cardMorePopup-title": "Mehr",
+    "cardTemplatePopup-title": "Vorlage erstellen",
     "cards": "Karten",
     "cards-count": "Karten",
+    "casSignIn": "Mit CAS anmelden",
+    "cardType-card": "Karte",
+    "cardType-linkedCard": "Verknüpfte Karte",
+    "cardType-linkedBoard": "Verknüpftes Board",
     "change": "Ändern",
     "change-avatar": "Profilbild ändern",
     "change-password": "Passwort ändern",
@@ -135,30 +175,52 @@
     "changePasswordPopup-title": "Passwort ändern",
     "changePermissionsPopup-title": "Berechtigungen ändern",
     "changeSettingsPopup-title": "Einstellungen ändern",
+    "subtasks": "Teilaufgaben",
     "checklists": "Checklisten",
     "click-to-star": "Klicken Sie, um das Board mit einem Stern zu markieren.",
     "click-to-unstar": "Klicken Sie, um den Stern vom Board zu entfernen.",
     "clipboard": "Zwischenablage oder Drag & Drop",
     "close": "Schließen",
     "close-board": "Board schließen",
-    "close-board-pop": "Sie können das Board wiederherstellen, indem Sie die Schaltfläche \"Papierkorb\" in der Kopfzeile der Startseite anklicken.",
+    "close-board-pop": "Sie können das Board wiederherstellen, indem Sie die Schaltfläche \"Archiv\" in der Kopfzeile der Startseite anklicken.",
     "color-black": "schwarz",
     "color-blue": "blau",
+    "color-crimson": "Karminrot",
+    "color-darkgreen": "Dunkelgrün",
+    "color-gold": "Gold",
+    "color-gray": "Grau",
     "color-green": "grün",
+    "color-indigo": "Indigo",
     "color-lime": "hellgrün",
+    "color-magenta": "Magentarot",
+    "color-mistyrose": "Altrosa",
+    "color-navy": "Marineblau",
     "color-orange": "orange",
+    "color-paleturquoise": "Blasses Türkis",
+    "color-peachpuff": "Pfirsich",
     "color-pink": "pink",
+    "color-plum": "Pflaume",
     "color-purple": "lila",
     "color-red": "rot",
+    "color-saddlebrown": "Sattelbraun",
+    "color-silver": "Silber",
     "color-sky": "himmelblau",
+    "color-slateblue": "Schieferblau",
+    "color-white": "Weiß",
     "color-yellow": "gelb",
+    "unset-color": "Nicht festgelegt",
     "comment": "Kommentar",
     "comment-placeholder": "Kommentar schreiben",
-    "comment-only": "Nur kommentierbar",
-    "comment-only-desc": "Kann Karten nur Kommentieren",
+    "comment-only": "Nur Kommentare",
+    "comment-only-desc": "Kann Karten nur kommentieren.",
+    "no-comments": "Keine Kommentare",
+    "no-comments-desc": "Kann keine Kommentare und Aktivitäten sehen.",
     "computer": "Computer",
-    "confirm-checklist-delete-dialog": "Sind Sie sicher, dass Sie die Checkliste löschen möchten?",
+    "confirm-subtask-delete-dialog": "Wollen Sie die Teilaufgabe wirklich löschen?",
+    "confirm-checklist-delete-dialog": "Wollen Sie die Checkliste wirklich löschen?",
     "copy-card-link-to-clipboard": "Kopiere Link zur Karte in die Zwischenablage",
+    "linkCardPopup-title": "Karte verknüpfen",
+    "searchElementPopup-title": "Suche",
     "copyCardPopup-title": "Karte kopieren",
     "copyChecklistToManyCardsPopup-title": "Checklistenvorlage in mehrere Karten kopieren",
     "copyChecklistToManyCardsPopup-instructions": "Titel und Beschreibungen der Zielkarten im folgenden JSON-Format",
@@ -167,11 +229,25 @@
     "createBoardPopup-title": "Board erstellen",
     "chooseBoardSourcePopup-title": "Board importieren",
     "createLabelPopup-title": "Label erstellen",
+    "createCustomField": "Feld erstellen",
+    "createCustomFieldPopup-title": "Feld erstellen",
     "current": "aktuell",
+    "custom-field-delete-pop": "Dies wird das Feld aus allen Karten entfernen und den dazugehörigen Verlauf löschen. Die Aktion kann nicht rückgängig gemacht werden.",
+    "custom-field-checkbox": "Kontrollkästchen",
+    "custom-field-date": "Datum",
+    "custom-field-dropdown": "Dropdownliste",
+    "custom-field-dropdown-none": "(keiner)",
+    "custom-field-dropdown-options": "Listenoptionen",
+    "custom-field-dropdown-options-placeholder": "Drücken Sie die Eingabetaste, um weitere Optionen hinzuzufügen",
+    "custom-field-dropdown-unknown": "(unbekannt)",
+    "custom-field-number": "Zahl",
+    "custom-field-text": "Text",
+    "custom-fields": "Benutzerdefinierte Felder",
     "date": "Datum",
     "decline": "Ablehnen",
     "default-avatar": "Standard Profilbild",
     "delete": "Löschen",
+    "deleteCustomFieldPopup-title": "Benutzerdefiniertes Feld löschen?",
     "deleteLabelPopup-title": "Label löschen?",
     "description": "Beschreibung",
     "disambiguateMultiLabelPopup-title": "Labels vereinheitlichen",
@@ -186,6 +262,7 @@
     "soft-wip-limit": "Soft WIP-Limit",
     "editCardStartDatePopup-title": "Startdatum ändern",
     "editCardDueDatePopup-title": "Fälligkeitsdatum ändern",
+    "editCustomFieldPopup-title": "Feld bearbeiten",
     "editCardSpentTimePopup-title": "Aufgewendete Zeit ändern",
     "editLabelPopup-title": "Label ändern",
     "editNotificationPopup-title": "Benachrichtigung ändern",
@@ -194,9 +271,9 @@
     "email-enrollAccount-subject": "Ihr Benutzerkonto auf __siteName__ wurde erstellt",
     "email-enrollAccount-text": "Hallo __user__,\n\num den Dienst nutzen zu können, klicken Sie bitte auf folgenden Link:\n\n__url__\n\nDanke.",
     "email-fail": "Senden der E-Mail fehlgeschlagen",
-    "email-fail-text": "Fehler beim Senden des E-Mails",
+    "email-fail-text": "Fehler beim Senden der E-Mail",
     "email-invalid": "Ungültige E-Mail-Adresse",
-    "email-invite": "via E-Mail einladen",
+    "email-invite": "per E-Mail einladen",
     "email-invite-subject": "__inviter__ hat Ihnen eine Einladung geschickt",
     "email-invite-text": "Hallo __user__,\n\n__inviter__ hat Sie zu dem Board \"__board__\" eingeladen.\n\nBitte klicken Sie auf folgenden Link:\n\n__url__\n\nDanke.",
     "email-resetPassword-subject": "Setzten Sie ihr Passwort auf __siteName__ zurück",
@@ -222,30 +299,36 @@
     "filter-clear": "Filter entfernen",
     "filter-no-label": "Kein Label",
     "filter-no-member": "Kein Mitglied",
+    "filter-no-custom-fields": "Keine benutzerdefinierten Felder",
     "filter-on": "Filter ist aktiv",
     "filter-on-desc": "Sie filtern die Karten in diesem Board. Klicken Sie, um den Filter zu bearbeiten.",
     "filter-to-selection": "Ergebnisse auswählen",
+    "advanced-filter-label": "Erweiterter Filter",
+    "advanced-filter-description": "Der erweiterte Filter erlaubt die Eingabe von Zeichenfolgen, die folgende Operatoren enthalten: == != <= >= && || ( ). Ein Leerzeichen wird als Trennzeichen zwischen den Operatoren verwendet. Sie können nach allen benutzerdefinierten Feldern filtern, indem Sie deren Namen und Werte eingeben. Zum Beispiel: Feld1 == Wert1. Hinweis: Wenn Felder oder Werte Leerzeichen enthalten, müssen Sie sie in einfache Anführungszeichen setzen. Zum Beispiel: 'Feld 1' == 'Wert 1'. Um einzelne Steuerzeichen (' \\/) zu überspringen, können Sie \\ verwenden. Zum Beispiel: Feld1 == Ich bin\\'s. Sie können außerdem mehrere Bedingungen kombinieren. Zum Beispiel: F1 == W1 || F1 == W2. Normalerweise werden alle Operatoren von links nach rechts interpretiert. Sie können die Reihenfolge ändern, indem Sie Klammern setzen. Zum Beispiel: F1 == W1 && ( F2 == W2 || F2 == W3 ). Sie können Textfelder auch mithilfe regulärer Ausdrücke durchsuchen: F1 == /Tes.*/i",
     "fullname": "Vollständiger Name",
     "header-logo-title": "Zurück zur Board Seite.",
     "hide-system-messages": "Systemmeldungen ausblenden",
     "headerBarCreateBoardPopup-title": "Board erstellen",
     "home": "Home",
     "import": "Importieren",
+    "link": "Verknüpfung",
     "import-board": "Board importieren",
     "import-board-c": "Board importieren",
     "import-board-title-trello": "Board von Trello importieren",
-    "import-board-title-wekan": "Board von Wekan importieren",
+    "import-board-title-wekan": "Board aus vorherigem Export importieren",
+    "import-sandstorm-backup-warning": "Löschen Sie keine Daten, die Sie aus einem ursprünglich exportierten oder Trelloboard importieren, bevor Sie geprüft haben, ob alles funktioniert. Andernfalls kann es zu Datenverlust kommen, falls es zu einem \"Board nicht gefunden\"-Fehler kommt.",
     "import-sandstorm-warning": "Das importierte Board wird alle bereits existierenden Daten löschen und mit den importierten Daten überschreiben.",
     "from-trello": "Von Trello",
-    "from-wekan": "Von Wekan",
+    "from-wekan": "Aus vorherigem Export",
     "import-board-instruction-trello": "Gehen Sie in ihrem Trello-Board auf 'Menü', dann 'Mehr', 'Drucken und Exportieren', 'JSON-Export' und kopieren Sie den dort angezeigten Text",
-    "import-board-instruction-wekan": "Gehen Sie in Ihrem Wekan board auf 'Menü', und dann auf 'Board exportieren'. Kopieren Sie anschließend den Text aus der heruntergeladenen Datei.",
+    "import-board-instruction-wekan": "Gehen Sie in Ihrem Board auf 'Menü', danach auf 'Board exportieren' und kopieren Sie den Text aus der heruntergeladenen Datei.",
+    "import-board-instruction-about-errors": "Treten beim importieren eines Board Fehler auf, so kann der Import dennoch erfolgreich abgeschlossen sein und das Board ist auf der Seite \"Alle Boards\" zusehen.",
     "import-json-placeholder": "Fügen Sie die korrekten JSON-Daten hier ein",
     "import-map-members": "Mitglieder zuordnen",
-    "import-members-map": "Das importierte Board hat Mitglieder. Bitte ordnen Sie jene, die importiert werden sollen, vorhandenen Wekan-Nutzern zu",
+    "import-members-map": "Das importierte Board hat einige Mitglieder. Bitte ordnen sie die Mitglieder, die Sie importieren wollen, Ihren Benutzern zu.",
     "import-show-user-mapping": "Mitgliederzuordnung überprüfen",
-    "import-user-select": "Wählen Sie den Wekan-Nutzer aus, der dieses Mitglied sein soll",
-    "importMapMembersAddPopup-title": "Wekan-Nutzer auswählen",
+    "import-user-select": "Wählen Sie den bestehenden Benutzer aus, den Sie für dieses Mitglied verwenden wollen.",
+    "importMapMembersAddPopup-title": "Mitglied auswählen",
     "info": "Version",
     "initials": "Initialen",
     "invalid-date": "Ungültiges Datum",
@@ -264,17 +347,19 @@
     "leave-board-pop": "Sind Sie sicher, dass Sie __boardTitle__ verlassen möchten? Sie werden von allen Karten in diesem Board entfernt.",
     "leaveBoardPopup-title": "Board verlassen?",
     "link-card": "Link zu dieser Karte",
-    "list-archive-cards": "Alle Karten dieser Liste in den Papierkorb verschieben",
-    "list-archive-cards-pop": "Alle Karten dieser Liste werden vom Board entfernt. Um Karten im Papierkorb anzuzeigen und wiederherzustellen, klicken Sie auf \"Menü\" > \"Papierkorb\".",
+    "list-archive-cards": "Alle Karten dieser Liste ins Archiv verschieben",
+    "list-archive-cards-pop": "Alle Karten dieser Liste werden vom Board entfernt. Um Karten im Papierkorb anzuzeigen und wiederherzustellen, klicken Sie auf \"Menü\" > \"Archiv\".",
     "list-move-cards": "Alle Karten in dieser Liste verschieben",
     "list-select-cards": "Alle Karten in dieser Liste auswählen",
+    "set-color-list": "Lege Farbe fest",
     "listActionPopup-title": "Listenaktionen",
     "swimlaneActionPopup-title": "Swimlaneaktionen",
+    "swimlaneAddPopup-title": "Swimlane unterhalb einfügen",
     "listImportCardPopup-title": "Eine Trello-Karte importieren",
     "listMorePopup-title": "Mehr",
     "link-list": "Link zu dieser Liste",
     "list-delete-pop": "Alle Aktionen werden aus dem Verlauf gelöscht und die Liste kann nicht wiederhergestellt werden.",
-    "list-delete-suggest-archive": "Listen können in den Papierkorb verschoben werden, um sie aus dem Board zu entfernen und die Aktivitäten zu behalten.",
+    "list-delete-suggest-archive": "Listen können ins Archiv verschoben werden, um sie aus dem Board zu entfernen und die Aktivitäten zu behalten.",
     "lists": "Listen",
     "swimlanes": "Swimlanes",
     "log-out": "Ausloggen",
@@ -294,9 +379,9 @@
     "muted-info": "Sie werden nicht über Änderungen auf diesem Board benachrichtigt",
     "my-boards": "Meine Boards",
     "name": "Name",
-    "no-archived-cards": "Keine Karten im Papierkorb.",
-    "no-archived-lists": "Keine Listen im Papierkorb.",
-    "no-archived-swimlanes": "Keine Swimlanes im Papierkorb.",
+    "no-archived-cards": "Keine Karten im Archiv.",
+    "no-archived-lists": "Keine Listen im Archiv.",
+    "no-archived-swimlanes": "Keine Swimlanes im Archiv.",
     "no-results": "Keine Ergebnisse",
     "normal": "Normal",
     "normal-desc": "Kann Karten anzeigen und bearbeiten, aber keine Einstellungen ändern.",
@@ -332,6 +417,7 @@
     "restore": "Wiederherstellen",
     "save": "Speichern",
     "search": "Suchen",
+    "rules": "Regeln",
     "search-cards": "Suche nach Kartentiteln und Beschreibungen auf diesem Board",
     "search-example": "Suchbegriff",
     "select-color": "Farbe auswählen",
@@ -355,7 +441,7 @@
     "starred-boards-description": "Markierte Boards erscheinen oben in ihrer Boardliste.",
     "subscribe": "Abonnieren",
     "team": "Team",
-    "this-board": "dieses Board",
+    "this-board": "diesem Board",
     "this-card": "diese Karte",
     "spent-time-hours": "Aufgewendete Zeit (Stunden)",
     "overtime-hours": "Mehrarbeit (Stunden)",
@@ -366,6 +452,7 @@
     "title": "Titel",
     "tracking": "Folgen",
     "tracking-info": "Sie werden über alle Änderungen an Karten benachrichtigt, an denen Sie als Ersteller oder Mitglied beteiligt sind.",
+    "type": "Typ",
     "unassign-member": "Mitglied entfernen",
     "unsaved-description": "Sie haben eine nicht gespeicherte Änderung.",
     "unwatch": "Beobachtung entfernen",
@@ -374,7 +461,7 @@
     "uploaded-avatar": "Profilbild hochgeladen",
     "username": "Benutzername",
     "view-it": "Ansehen",
-    "warn-list-archived": "Warnung: Diese Karte befindet sich in einer Liste im Papierkorb!",
+    "warn-list-archived": "Warnung: Diese Karte befindet sich in einer Liste im Archiv",
     "watch": "Beobachten",
     "watching": "Beobachten",
     "watching-info": "Sie werden über alle Änderungen in diesem Board benachrichtigt",
@@ -382,6 +469,9 @@
     "welcome-swimlane": "Meilenstein 1",
     "welcome-list1": "Grundlagen",
     "welcome-list2": "Fortgeschritten",
+    "card-templates-swimlane": "Kartenvorlagen",
+    "list-templates-swimlane": "Listenvorlagen",
+    "board-templates-swimlane": "Boardvorlagen",
     "what-to-do": "Was wollen Sie tun?",
     "wipLimitErrorPopup-title": "Ungültiges WIP-Limit",
     "wipLimitErrorPopup-dialog-pt1": "Die Anzahl von Aufgaben in dieser Liste ist größer als das von Ihnen definierte WIP-Limit.",
@@ -407,16 +497,16 @@
     "send-smtp-test": "Test-E-Mail an sich selbst schicken",
     "invitation-code": "Einladungscode",
     "email-invite-register-subject": "__inviter__ hat Ihnen eine Einladung geschickt",
-    "email-invite-register-text": "Hallo __user__,\n\n__inviter__ hat Sie für Ihre Zusammenarbeit zu Wekan eingeladen.\n\nBitte klicken Sie auf folgenden Link:\n__url__\n\nIhr Einladungscode lautet: __icode__\n\nDanke.",
-    "email-smtp-test-subject": "SMTP-Test-E-Mail von Wekan",
+    "email-invite-register-text": "Sehr geehrte(r) __user__,\n\n__inviter__ hat Sie zur Mitarbeit an einem Kanbanboard eingeladen.\n\nBitte klicken Sie auf folgenden Link:\n__url__\n\nIhr Einladungscode lautet: __icode__\n\nDanke.",
+    "email-smtp-test-subject": "SMTP Test-E-Mail",
     "email-smtp-test-text": "Sie haben erfolgreich eine E-Mail versandt",
     "error-invitation-code-not-exist": "Ungültiger Einladungscode",
     "error-notAuthorized": "Sie sind nicht berechtigt diese Seite zu sehen.",
     "outgoing-webhooks": "Ausgehende Webhooks",
     "outgoingWebhooksPopup-title": "Ausgehende Webhooks",
+    "boardCardTitlePopup-title": "Kartentitelfilter",
     "new-outgoing-webhook": "Neuer ausgehender Webhook",
     "no-name": "(Unbekannt)",
-    "Wekan_version": "Wekan-Version",
     "Node_version": "Node-Version",
     "OS_Arch": "Betriebssystem-Architektur",
     "OS_Cpus": "Anzahl Prozessoren",
@@ -427,13 +517,18 @@
     "OS_Totalmem": "Gesamter Arbeitsspeicher",
     "OS_Type": "Typ des Betriebssystems",
     "OS_Uptime": "Laufzeit des Systems",
+    "days": "Tage",
     "hours": "Stunden",
     "minutes": "Minuten",
     "seconds": "Sekunden",
+    "show-field-on-card": "Zeige dieses Feld auf der Karte",
+    "automatically-field-on-card": "Automatisch Label für alle Karten erzeugen",
+    "showLabel-field-on-card": "Feldbezeichnung auf Minikarte anzeigen",
     "yes": "Ja",
     "no": "Nein",
     "accounts": "Konten",
-    "accounts-allowEmailChange": "Ändern der E-Mailadresse zulassen",
+    "accounts-allowEmailChange": "Ändern der E-Mailadresse erlauben",
+    "accounts-allowUserNameChange": "Ändern des Benutzernamens erlauben",
     "createdAt": "Erstellt am",
     "verified": "Geprüft",
     "active": "Aktiv",
@@ -442,5 +537,157 @@
     "card-end": "Ende",
     "card-end-on": "Endet am",
     "editCardReceivedDatePopup-title": "Empfangsdatum ändern",
-    "editCardEndDatePopup-title": "Enddatum ändern"
-}
+    "editCardEndDatePopup-title": "Enddatum ändern",
+    "setCardColorPopup-title": "Farbe festlegen",
+    "setCardActionsColorPopup-title": "Farbe wählen",
+    "setSwimlaneColorPopup-title": "Farbe wählen",
+    "setListColorPopup-title": "Farbe wählen",
+    "assigned-by": "Zugewiesen von",
+    "requested-by": "Angefordert von",
+    "board-delete-notice": "Löschen kann nicht rückgängig gemacht werden. Sie werden alle Listen, Karten und Aktionen, die mit diesem Board verbunden sind, verlieren.",
+    "delete-board-confirm-popup": "Alle Listen, Karten, Labels und Akivitäten werden gelöscht und Sie können die Inhalte des Boards nicht wiederherstellen! Die Aktion kann nicht rückgängig gemacht werden.",
+    "boardDeletePopup-title": "Board löschen?",
+    "delete-board": "Board löschen",
+    "default-subtasks-board": "Teilaufgabe für __board__ Board",
+    "default": "Standard",
+    "queue": "Warteschlange",
+    "subtask-settings": "Einstellungen für Teilaufgaben",
+    "boardSubtaskSettingsPopup-title": "Boardeinstellungen für Teilaufgaben",
+    "show-subtasks-field": "Karten können Teilaufgaben haben",
+    "deposit-subtasks-board": "Teilaufgaben in diesem Board ablegen:",
+    "deposit-subtasks-list": "Zielliste für hier abgelegte Teilaufgaben:",
+    "show-parent-in-minicard": "Übergeordnetes Element auf Minikarte anzeigen:",
+    "prefix-with-full-path": "Vollständiger Pfad über Titel",
+    "prefix-with-parent": "Über Titel",
+    "subtext-with-full-path": "Vollständiger Pfad unter Titel",
+    "subtext-with-parent": "Unter Titel",
+    "change-card-parent": "Übergeordnete Karte ändern",
+    "parent-card": "Übergeordnete Karte",
+    "source-board": "Quellboard",
+    "no-parent": "Nicht anzeigen",
+    "activity-added-label": "fügte Label '%s' zu %s hinzu",
+    "activity-removed-label": "entfernte Label '%s' von %s",
+    "activity-delete-attach": "löschte ein Anhang von %s",
+    "activity-added-label-card": "Label hinzugefügt '%s'",
+    "activity-removed-label-card": "Label entfernt '%s'",
+    "activity-delete-attach-card": "hat einen Anhang gelöscht",
+    "activity-set-customfield": "setze benutzerdefiniertes Feld '%s' zu '%s' in %s",
+    "activity-unset-customfield": "entferne benutzerdefiniertes Feld '%s' in %s",
+    "r-rule": "Regel",
+    "r-add-trigger": "Auslöser hinzufügen",
+    "r-add-action": "Aktion hinzufügen",
+    "r-board-rules": "Boardregeln",
+    "r-add-rule": "Regel hinzufügen",
+    "r-view-rule": "Regel anzeigen",
+    "r-delete-rule": "Regel löschen",
+    "r-new-rule-name": "Neuer Regeltitel",
+    "r-no-rules": "Keine Regeln",
+    "r-when-a-card": "Wenn Karte",
+    "r-is": "wird",
+    "r-is-moved": "verschoben wird",
+    "r-added-to": "hinzugefügt zu",
+    "r-removed-from": "entfernt von",
+    "r-the-board": "das Board",
+    "r-list": "Liste",
+    "set-filter": "Setze Filter",
+    "r-moved-to": "verschoben nach",
+    "r-moved-from": "verschoben von",
+    "r-archived": "ins Archiv verschoben",
+    "r-unarchived": "aus dem Archiv wiederhergestellt",
+    "r-a-card": "einer Karte",
+    "r-when-a-label-is": "Wenn ein Label",
+    "r-when-the-label-is": " Wenn das Label",
+    "r-list-name": "Listenname",
+    "r-when-a-member": "Wenn ein Mitglied",
+    "r-when-the-member": "Wenn das Mitglied",
+    "r-name": "Name",
+    "r-when-a-attach": "Wenn ein Anhang",
+    "r-when-a-checklist": "Wenn eine Checkliste wird",
+    "r-when-the-checklist": "Wenn die Checkliste",
+    "r-completed": "abgeschlossen",
+    "r-made-incomplete": "unvollständig gemacht",
+    "r-when-a-item": "Wenn eine Checklistenposition",
+    "r-when-the-item": "Wenn die Checklistenposition",
+    "r-checked": "markiert wird",
+    "r-unchecked": "abgewählt wird",
+    "r-move-card-to": "Verschiebe Karte an",
+    "r-top-of": "Anfang von",
+    "r-bottom-of": "Ende von",
+    "r-its-list": "seiner Liste",
+    "r-archive": "Ins Archiv verschieben",
+    "r-unarchive": "Aus dem Archiv wiederherstellen",
+    "r-card": "Karte",
+    "r-add": "Hinzufügen",
+    "r-remove": "entfernen",
+    "r-label": "Label",
+    "r-member": "Mitglied",
+    "r-remove-all": "Entferne alle Mitglieder von der Karte",
+    "r-set-color": "Farbe festlegen auf",
+    "r-checklist": "Checkliste",
+    "r-check-all": "Alle markieren",
+    "r-uncheck-all": "Alle abwählen",
+    "r-items-check": "Elemente der Checkliste",
+    "r-check": "Markieren",
+    "r-uncheck": "Abwählen",
+    "r-item": "Element",
+    "r-of-checklist": "der Checkliste",
+    "r-send-email": "Eine E-Mail senden",
+    "r-to": "an",
+    "r-subject": "Betreff",
+    "r-rule-details": "Regeldetails",
+    "r-d-move-to-top-gen": "Karte nach oben in die Liste verschieben",
+    "r-d-move-to-top-spec": "Karte an den Anfang der Liste verschieben",
+    "r-d-move-to-bottom-gen": "Karte nach unten in die Liste verschieben",
+    "r-d-move-to-bottom-spec": "Karte an das Ende der Liste verschieben",
+    "r-d-send-email": "E-Mail senden",
+    "r-d-send-email-to": "an",
+    "r-d-send-email-subject": "Betreff",
+    "r-d-send-email-message": "Nachricht",
+    "r-d-archive": "Karte ins Archiv verschieben",
+    "r-d-unarchive": "Karte aus dem Archiv wiederherstellen",
+    "r-d-add-label": "Label hinzufügen",
+    "r-d-remove-label": "Label entfernen",
+    "r-create-card": "Neue Karte erstellen",
+    "r-in-list": "in der Liste",
+    "r-in-swimlane": "in Swimlane",
+    "r-d-add-member": "Mitglied hinzufügen",
+    "r-d-remove-member": "Mitglied entfernen",
+    "r-d-remove-all-member": "Entferne alle Mitglieder",
+    "r-d-check-all": "Alle Elemente der Liste markieren",
+    "r-d-uncheck-all": "Alle Element der Liste abwählen",
+    "r-d-check-one": "Element auswählen",
+    "r-d-uncheck-one": "Element abwählen",
+    "r-d-check-of-list": "der Checkliste",
+    "r-d-add-checklist": "Checkliste hinzufügen",
+    "r-d-remove-checklist": "Checkliste entfernen",
+    "r-by": "durch",
+    "r-add-checklist": "Checkliste hinzufügen",
+    "r-with-items": "mit Elementen",
+    "r-items-list": "Element1,Element2,Element3",
+    "r-add-swimlane": "Füge Swimlane hinzu",
+    "r-swimlane-name": "Swimlanename",
+    "r-board-note": "Hinweis: Lassen Sie ein Feld leer, um alle möglichen Werte zu finden.",
+    "r-checklist-note": "Hinweis: Die Elemente der Checkliste müssen als kommagetrennte Werte geschrieben werden.",
+    "r-when-a-card-is-moved": "Wenn eine Karte in eine andere Liste verschoben wird",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Authentifizierungsmethode",
+    "authentication-type": "Authentifizierungstyp",
+    "custom-product-name": "Benutzerdefinierter Produktname",
+    "layout": "Layout",
+    "hide-logo": "Verstecke Logo",
+    "add-custom-html-after-body-start": "Füge benutzerdefiniertes HTML nach <body> Anfang hinzu",
+    "add-custom-html-before-body-end": "Füge benutzerdefiniertes HTML vor </body>Ende hinzu",
+    "error-undefined": "Etwas ist schief gelaufen",
+    "error-ldap-login": "Es ist ein Fehler beim Anmelden aufgetreten",
+    "display-authentication-method": "Anzeige Authentifizierungsverfahren",
+    "default-authentication-method": "Standardauthentifizierungsverfahren",
+    "duplicate-board": "Board duplizieren",
+    "people-number": "Anzahl der Personen:",
+    "swimlaneDeletePopup-title": "Swimlane löschen?",
+    "swimlane-delete-pop": "Alle Aktionen werden aus dem Aktivitätenfeed entfernt und die Swimlane kann nicht wiederhergestellt werden. Es gibt kein Rückgängig!",
+    "restore-all": "Alles wiederherstellen",
+    "delete-all": "Alles löschen",
+    "loading": "Laden, bitte warten."
+}
\ No newline at end of file
diff --git a/i18n/el.i18n.json b/i18n/el.i18n.json
index bf36bcab..1f6f9f94 100644
--- a/i18n/el.i18n.json
+++ b/i18n/el.i18n.json
@@ -1,35 +1,51 @@
 {
     "accept": "Accept",
-    "act-activity-notify": "[Wekan] Activity Notification",
-    "act-addAttachment": "attached __attachment__ to __card__",
-    "act-addChecklist": "added checklist __checklist__ to __card__",
-    "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__",
-    "act-addComment": "commented on __card__: __comment__",
-    "act-createBoard": "created __board__",
-    "act-createCard": "added __card__ to __list__",
-    "act-createList": "added __list__ to __board__",
-    "act-addBoardMember": "added __member__ to __board__",
-    "act-archivedBoard": "__board__ moved to Recycle Bin",
-    "act-archivedCard": "__card__ moved to Recycle Bin",
-    "act-archivedList": "__list__ moved to Recycle Bin",
-    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
-    "act-importBoard": "imported __board__",
-    "act-importCard": "imported __card__",
-    "act-importList": "imported __list__",
-    "act-joinMember": "added __member__ to __card__",
-    "act-moveCard": "moved __card__ from __oldList__ to __list__",
-    "act-removeBoardMember": "removed __member__ from __board__",
-    "act-restoredCard": "restored __card__ to __board__",
-    "act-unjoinMember": "removed __member__ from __card__",
-    "act-withBoardTitle": "[Wekan] __board__",
+    "act-activity-notify": "Activity Notification",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__board__",
     "act-withCardTitle": "[__board__] __card__",
     "actions": "Actions",
     "activities": "Activities",
     "activity": "Activity",
     "activity-added": "added %s to %s",
-    "activity-archived": "%s moved to Recycle Bin",
+    "activity-archived": "%s moved to Archive",
     "activity-attached": "attached %s to %s",
     "activity-created": "created %s",
+    "activity-customfield-created": "created custom field %s",
     "activity-excluded": "excluded %s from %s",
     "activity-imported": "imported %s into %s from %s",
     "activity-imported-board": "imported %s from %s",
@@ -39,13 +55,25 @@
     "activity-removed": "removed %s from %s",
     "activity-sent": "sent %s to %s",
     "activity-unjoined": "unjoined %s",
+    "activity-subtask-added": "added subtask to %s",
+    "activity-checked-item": "checked %s in checklist %s of %s",
+    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
     "activity-checklist-added": "added checklist to %s",
+    "activity-checklist-removed": "removed a checklist from %s",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
     "activity-checklist-item-added": "added checklist item to '%s' in %s",
+    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
     "add": "Προσθήκη",
+    "activity-checked-item-card": "checked %s in checklist %s",
+    "activity-unchecked-item-card": "unchecked %s in checklist %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
     "add-attachment": "Add Attachment",
     "add-board": "Add Board",
     "add-card": "Προσθήκη Κάρτας",
     "add-swimlane": "Add Swimlane",
+    "add-subtask": "Add Subtask",
     "add-checklist": "Add Checklist",
     "add-checklist-item": "Add an item to checklist",
     "add-cover": "Add Cover",
@@ -63,20 +91,22 @@
     "and-n-other-card": "And __count__ other card",
     "and-n-other-card_plural": "And __count__ other cards",
     "apply": "Εφαρμογή",
-    "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Move to Recycle Bin",
-    "archive-all": "Move All to Recycle Bin",
-    "archive-board": "Move Board to Recycle Bin",
-    "archive-card": "Move Card to Recycle Bin",
-    "archive-list": "Move List to Recycle Bin",
-    "archive-swimlane": "Move Swimlane to Recycle Bin",
-    "archive-selection": "Move selection to Recycle Bin",
-    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
-    "archived-items": "Recycle Bin",
-    "archived-boards": "Boards in Recycle Bin",
+    "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
+    "archive": "Move to Archive",
+    "archive-all": "Move All to Archive",
+    "archive-board": "Move Board to Archive",
+    "archive-card": "Move Card to Archive",
+    "archive-list": "Move List to Archive",
+    "archive-swimlane": "Move Swimlane to Archive",
+    "archive-selection": "Move selection to Archive",
+    "archiveBoardPopup-title": "Move Board to Archive?",
+    "archived-items": "Archive",
+    "archived-boards": "Boards in Archive",
     "restore-board": "Restore Board",
-    "no-archived-boards": "No Boards in Recycle Bin.",
-    "archives": "Recycle Bin",
+    "no-archived-boards": "No Boards in Archive.",
+    "archives": "Archive",
+    "template": "Template",
+    "templates": "Templates",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Attachment",
@@ -95,22 +125,25 @@
     "boardChangeTitlePopup-title": "Rename Board",
     "boardChangeVisibilityPopup-title": "Change Visibility",
     "boardChangeWatchPopup-title": "Change Watch",
-    "boardMenuPopup-title": "Board Menu",
+    "boardMenuPopup-title": "Board Settings",
     "boards": "Boards",
     "board-view": "Board View",
+    "board-view-cal": "Calendar",
     "board-view-swimlanes": "Swimlanes",
     "board-view-lists": "Λίστες",
     "bucket-example": "Like “Bucket List” for example",
     "cancel": "Ακύρωση",
-    "card-archived": "This card is moved to Recycle Bin.",
+    "card-archived": "This card is moved to Archive.",
+    "board-archived": "This board is moved to Archive.",
     "card-comments-title": "This card has %s comment.",
     "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
     "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
     "card-due": "Έως",
     "card-due-on": "Έως τις",
     "card-spent": "Spent Time",
     "card-edit-attachments": "Edit attachments",
+    "card-edit-custom-fields": "Edit custom fields",
     "card-edit-labels": "Edit labels",
     "card-edit-members": "Edit members",
     "card-labels-title": "Change the labels for the card.",
@@ -118,13 +151,20 @@
     "card-start": "Start",
     "card-start-on": "Starts on",
     "cardAttachmentsPopup-title": "Attach From",
+    "cardCustomField-datePopup-title": "Change date",
+    "cardCustomFieldsPopup-title": "Edit custom fields",
     "cardDeletePopup-title": "Διαγραφή Κάρτας;",
     "cardDetailsActionsPopup-title": "Card Actions",
     "cardLabelsPopup-title": "Ετικέτες",
     "cardMembersPopup-title": "Μέλοι",
     "cardMorePopup-title": "Περισσότερα",
+    "cardTemplatePopup-title": "Create template",
     "cards": "Κάρτες",
     "cards-count": "Κάρτες",
+    "casSignIn": "Sign In with CAS",
+    "cardType-card": "Card",
+    "cardType-linkedCard": "Linked Card",
+    "cardType-linkedBoard": "Linked Board",
     "change": "Αλλαγή",
     "change-avatar": "Change Avatar",
     "change-password": "Αλλαγή Κωδικού",
@@ -135,30 +175,52 @@
     "changePasswordPopup-title": "Αλλαγή Κωδικού",
     "changePermissionsPopup-title": "Change Permissions",
     "changeSettingsPopup-title": "Αλλαγή Ρυθμίσεων",
+    "subtasks": "Subtasks",
     "checklists": "Checklists",
     "click-to-star": "Click to star this board.",
     "click-to-unstar": "Click to unstar this board.",
     "clipboard": "Clipboard or drag & drop",
     "close": "Κλείσιμο",
     "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
     "color-black": "μαύρο",
     "color-blue": "μπλε",
+    "color-crimson": "crimson",
+    "color-darkgreen": "darkgreen",
+    "color-gold": "gold",
+    "color-gray": "gray",
     "color-green": "πράσινο",
+    "color-indigo": "indigo",
     "color-lime": "λάιμ",
+    "color-magenta": "magenta",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "navy",
     "color-orange": "πορτοκαλί",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
     "color-pink": "ροζ",
+    "color-plum": "plum",
     "color-purple": "μωβ",
     "color-red": "κόκκινο",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "silver",
     "color-sky": "ουρανός",
+    "color-slateblue": "slateblue",
+    "color-white": "white",
     "color-yellow": "κίτρινο",
+    "unset-color": "Unset",
     "comment": "Comment",
     "comment-placeholder": "Write Comment",
     "comment-only": "Comment only",
     "comment-only-desc": "Can comment on cards only.",
+    "no-comments": "No comments",
+    "no-comments-desc": "Can not see comments and activities.",
     "computer": "Υπολογιστής",
-    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist",
+    "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?",
+    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
     "copy-card-link-to-clipboard": "Copy card link to clipboard",
+    "linkCardPopup-title": "Link Card",
+    "searchElementPopup-title": "Αναζήτηση",
     "copyCardPopup-title": "Copy Card",
     "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
     "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
@@ -167,11 +229,25 @@
     "createBoardPopup-title": "Create Board",
     "chooseBoardSourcePopup-title": "Import board",
     "createLabelPopup-title": "Create Label",
+    "createCustomField": "Create Field",
+    "createCustomFieldPopup-title": "Create Field",
     "current": "current",
+    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
+    "custom-field-checkbox": "Checkbox",
+    "custom-field-date": "Ημερομηνία",
+    "custom-field-dropdown": "Dropdown List",
+    "custom-field-dropdown-none": "(none)",
+    "custom-field-dropdown-options": "List Options",
+    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
+    "custom-field-dropdown-unknown": "(unknown)",
+    "custom-field-number": "Number",
+    "custom-field-text": "Text",
+    "custom-fields": "Custom Fields",
     "date": "Ημερομηνία",
     "decline": "Decline",
     "default-avatar": "Default avatar",
     "delete": "Διαγραφή",
+    "deleteCustomFieldPopup-title": "Delete Custom Field?",
     "deleteLabelPopup-title": "Delete Label?",
     "description": "Description",
     "disambiguateMultiLabelPopup-title": "Disambiguate Label Action",
@@ -186,6 +262,7 @@
     "soft-wip-limit": "Soft WIP Limit",
     "editCardStartDatePopup-title": "Change start date",
     "editCardDueDatePopup-title": "Change due date",
+    "editCustomFieldPopup-title": "Edit Field",
     "editCardSpentTimePopup-title": "Change spent time",
     "editLabelPopup-title": "Change Label",
     "editNotificationPopup-title": "Edit Notification",
@@ -222,30 +299,36 @@
     "filter-clear": "Clear filter",
     "filter-no-label": "No label",
     "filter-no-member": "Κανένα μέλος",
+    "filter-no-custom-fields": "No Custom Fields",
     "filter-on": "Filter is on",
     "filter-on-desc": "You are filtering cards on this board. Click here to edit filter.",
     "filter-to-selection": "Filter to selection",
+    "advanced-filter-label": "Advanced Filter",
+    "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) to be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
     "fullname": "Πλήρες Όνομα",
     "header-logo-title": "Go back to your boards page.",
     "hide-system-messages": "Hide system messages",
     "headerBarCreateBoardPopup-title": "Create Board",
     "home": "Home",
     "import": "Εισαγωγή",
+    "link": "Link",
     "import-board": "import board",
     "import-board-c": "Import board",
     "import-board-title-trello": "Import board from Trello",
-    "import-board-title-wekan": "Import board from Wekan",
+    "import-board-title-wekan": "Import board from previous export",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
     "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
     "from-trello": "Από το Trello",
-    "from-wekan": "Από το Wekan",
+    "from-wekan": "From previous export",
     "import-board-instruction-trello": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text.",
-    "import-board-instruction-wekan": "In your Wekan board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
     "import-json-placeholder": "Paste your valid JSON data here",
     "import-map-members": "Map members",
-    "import-members-map": "Your imported board has some members. Please map the members you want to import to Wekan users",
+    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
     "import-show-user-mapping": "Review members mapping",
-    "import-user-select": "Pick the Wekan user you want to use as this member",
-    "importMapMembersAddPopup-title": "Select Wekan member",
+    "import-user-select": "Pick your existing user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select member",
     "info": "Έκδοση",
     "initials": "Initials",
     "invalid-date": "Invalid date",
@@ -264,17 +347,19 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "Link to this card",
-    "list-archive-cards": "Move all cards in this list to Recycle Bin",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
+    "list-archive-cards": "Move all cards in this list to Archive",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "List Actions",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Import a Trello card",
     "listMorePopup-title": "Περισσότερα",
     "link-list": "Link to this list",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
     "lists": "Λίστες",
     "swimlanes": "Swimlanes",
     "log-out": "Αποσύνδεση",
@@ -294,9 +379,9 @@
     "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "My Boards",
     "name": "Όνομα",
-    "no-archived-cards": "No cards in Recycle Bin.",
-    "no-archived-lists": "No lists in Recycle Bin.",
-    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
+    "no-archived-cards": "No cards in Archive.",
+    "no-archived-lists": "No lists in Archive.",
+    "no-archived-swimlanes": "No swimlanes in Archive.",
     "no-results": "Κανένα αποτέλεσμα",
     "normal": "Normal",
     "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -332,6 +417,7 @@
     "restore": "Restore",
     "save": "Αποθήκευση",
     "search": "Αναζήτηση",
+    "rules": "Rules",
     "search-cards": "Search from card titles and descriptions on this board",
     "search-example": "Text to search for?",
     "select-color": "Επιλέξτε Χρώμα",
@@ -366,6 +452,7 @@
     "title": "Τίτλος",
     "tracking": "Tracking",
     "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
+    "type": "Type",
     "unassign-member": "Unassign member",
     "unsaved-description": "You have an unsaved description.",
     "unwatch": "Unwatch",
@@ -374,7 +461,7 @@
     "uploaded-avatar": "Uploaded an avatar",
     "username": "Όνομα Χρήστη",
     "view-it": "View it",
-    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
+    "warn-list-archived": "warning: this card is in an list at Archive",
     "watch": "Watch",
     "watching": "Watching",
     "watching-info": "You will be notified of any change in this board",
@@ -382,6 +469,9 @@
     "welcome-swimlane": "Milestone 1",
     "welcome-list1": "Basics",
     "welcome-list2": "Advanced",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
     "what-to-do": "What do you want to do?",
     "wipLimitErrorPopup-title": "Invalid WIP Limit",
     "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
@@ -407,16 +497,16 @@
     "send-smtp-test": "Send a test email to yourself",
     "invitation-code": "Κωδικός Πρόσκλησης",
     "email-invite-register-subject": "__inviter__ sent you an invitation",
-    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to Wekan for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
-    "email-smtp-test-subject": "SMTP Test Email From Wekan",
+    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email",
     "email-smtp-test-text": "You have successfully sent an email",
     "error-invitation-code-not-exist": "Ο κωδικός πρόσκλησης δεν υπάρχει",
     "error-notAuthorized": "You are not authorized to view this page.",
     "outgoing-webhooks": "Outgoing Webhooks",
     "outgoingWebhooksPopup-title": "Outgoing Webhooks",
+    "boardCardTitlePopup-title": "Card Title Filter",
     "new-outgoing-webhook": "New Outgoing Webhook",
     "no-name": "(Άγνωστο)",
-    "Wekan_version": "Wekan έκδοση",
     "Node_version": "Node version",
     "OS_Arch": "OS Arch",
     "OS_Cpus": "OS CPU Count",
@@ -427,13 +517,18 @@
     "OS_Totalmem": "OS Total Memory",
     "OS_Type": "OS Type",
     "OS_Uptime": "OS Uptime",
+    "days": "days",
     "hours": "ώρες",
     "minutes": "λεπτά",
     "seconds": "δευτερόλεπτα",
+    "show-field-on-card": "Show this field on card",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
     "yes": "Ναι",
     "no": "Όχι",
     "accounts": "Λογαριασμοί",
     "accounts-allowEmailChange": "Allow Email Change",
+    "accounts-allowUserNameChange": "Allow Username Change",
     "createdAt": "Created at",
     "verified": "Verified",
     "active": "Active",
@@ -442,5 +537,157 @@
     "card-end": "End",
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
-    "editCardEndDatePopup-title": "Change end date"
-}
+    "editCardEndDatePopup-title": "Change end date",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "Assigned By",
+    "requested-by": "Requested By",
+    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
+    "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
+    "boardDeletePopup-title": "Delete Board?",
+    "delete-board": "Delete Board",
+    "default-subtasks-board": "Subtasks for __board__ board",
+    "default": "Default",
+    "queue": "Queue",
+    "subtask-settings": "Subtasks Settings",
+    "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
+    "show-subtasks-field": "Cards can have subtasks",
+    "deposit-subtasks-board": "Deposit subtasks to this board:",
+    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
+    "show-parent-in-minicard": "Show parent in minicard:",
+    "prefix-with-full-path": "Prefix with full path",
+    "prefix-with-parent": "Prefix with parent",
+    "subtext-with-full-path": "Subtext with full path",
+    "subtext-with-parent": "Subtext with parent",
+    "change-card-parent": "Change card's parent",
+    "parent-card": "Parent card",
+    "source-board": "Source board",
+    "no-parent": "Don't show parent",
+    "activity-added-label": "added label '%s' to %s",
+    "activity-removed-label": "removed label '%s' from %s",
+    "activity-delete-attach": "deleted an attachment from %s",
+    "activity-added-label-card": "added label '%s'",
+    "activity-removed-label-card": "removed label '%s'",
+    "activity-delete-attach-card": "deleted an attachment",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "r-rule": "Rule",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "Add action",
+    "r-board-rules": "Board rules",
+    "r-add-rule": "Add rule",
+    "r-view-rule": "View rule",
+    "r-delete-rule": "Delete rule",
+    "r-new-rule-name": "New rule title",
+    "r-no-rules": "No rules",
+    "r-when-a-card": "When a card",
+    "r-is": "is",
+    "r-is-moved": "is moved",
+    "r-added-to": "added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "the board",
+    "r-list": "list",
+    "set-filter": "Set Filter",
+    "r-moved-to": "Moved to",
+    "r-moved-from": "Moved from",
+    "r-archived": "Moved to Archive",
+    "r-unarchived": "Restored from Archive",
+    "r-a-card": "a card",
+    "r-when-a-label-is": "When a label is",
+    "r-when-the-label-is": "When the label is",
+    "r-list-name": "list name",
+    "r-when-a-member": "When a member is",
+    "r-when-the-member": "When the member",
+    "r-name": "name",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "r-when-the-item": "When the checklist item",
+    "r-checked": "Checked",
+    "r-unchecked": "Unchecked",
+    "r-move-card-to": "Move card to",
+    "r-top-of": "Top of",
+    "r-bottom-of": "Bottom of",
+    "r-its-list": "its list",
+    "r-archive": "Move to Archive",
+    "r-unarchive": "Restore from Archive",
+    "r-card": "card",
+    "r-add": "Προσθήκη",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-set-color": "Set color to",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "subject",
+    "r-rule-details": "Rule details",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Move card to top of list",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Move card to bottom of list",
+    "r-d-send-email": "Send email",
+    "r-d-send-email-to": "to",
+    "r-d-send-email-subject": "subject",
+    "r-d-send-email-message": "message",
+    "r-d-archive": "Move card to Archive",
+    "r-d-unarchive": "Restore card from Archive",
+    "r-d-add-label": "Add label",
+    "r-d-remove-label": "Remove label",
+    "r-create-card": "Create new card",
+    "r-in-list": "in list",
+    "r-in-swimlane": "in swimlane",
+    "r-d-add-member": "Add member",
+    "r-d-remove-member": "Remove member",
+    "r-d-remove-all-member": "Remove all member",
+    "r-d-check-all": "Check all items of a list",
+    "r-d-uncheck-all": "Uncheck all items of a list",
+    "r-d-check-one": "Check item",
+    "r-d-uncheck-one": "Uncheck item",
+    "r-d-check-of-list": "of checklist",
+    "r-d-add-checklist": "Add checklist",
+    "r-d-remove-checklist": "Remove checklist",
+    "r-by": "by",
+    "r-add-checklist": "Add checklist",
+    "r-with-items": "with items",
+    "r-items-list": "item1,item2,item3",
+    "r-add-swimlane": "Add swimlane",
+    "r-swimlane-name": "swimlane name",
+    "r-board-note": "Note: leave a field empty to match every possible value.",
+    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout",
+    "hide-logo": "Hide Logo",
+    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
+    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
+    "error-undefined": "Something went wrong",
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
+}
\ No newline at end of file
diff --git a/i18n/en-GB.i18n.json b/i18n/en-GB.i18n.json
index d51127d8..b883857f 100644
--- a/i18n/en-GB.i18n.json
+++ b/i18n/en-GB.i18n.json
@@ -1,35 +1,51 @@
 {
     "accept": "Accept",
-    "act-activity-notify": "[Wekan] Activity Notification",
-    "act-addAttachment": "attached _ attachment _ to _ card _",
-    "act-addChecklist": "added checklist __checklist__ to __card__",
-    "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__",
-    "act-addComment": "commented on __card__: __comment__",
-    "act-createBoard": "created __board__",
-    "act-createCard": "added __card__ to __list__",
-    "act-createList": "added __list__ to __board__",
-    "act-addBoardMember": "added __member__ to __board__",
-    "act-archivedBoard": "__board__ moved to Recycle Bin",
-    "act-archivedCard": "__card__ moved to Recycle Bin",
-    "act-archivedList": "__list__ moved to Recycle Bin",
-    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
-    "act-importBoard": "imported __board__",
-    "act-importCard": "imported __card__",
-    "act-importList": "imported __list__",
-    "act-joinMember": "added __member__ to __card__",
-    "act-moveCard": "moved __card__ from __oldList__ to __list__",
-    "act-removeBoardMember": "removed __member__ from __board__",
-    "act-restoredCard": "restored __card__ to __board__",
-    "act-unjoinMember": "removed __member__ from __card__",
-    "act-withBoardTitle": "[Wekan] __board__",
+    "act-activity-notify": "Activity Notification",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__board__",
     "act-withCardTitle": "[__board__] __card__",
     "actions": "Actions",
     "activities": "Activities",
     "activity": "Activity",
     "activity-added": "added %s to %s",
-    "activity-archived": "%s moved to Recycle Bin",
+    "activity-archived": "%s moved to Archive",
     "activity-attached": "attached %s to %s",
     "activity-created": "created %s",
+    "activity-customfield-created": "created custom field %s",
     "activity-excluded": "excluded %s from %s",
     "activity-imported": "imported %s into %s from %s",
     "activity-imported-board": "imported %s from %s",
@@ -39,13 +55,25 @@
     "activity-removed": "removed %s from %s",
     "activity-sent": "sent %s to %s",
     "activity-unjoined": "unjoined %s",
+    "activity-subtask-added": "added subtask to %s",
+    "activity-checked-item": "checked %s in checklist %s of %s",
+    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
     "activity-checklist-added": "added checklist to %s",
+    "activity-checklist-removed": "removed a checklist from %s",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
     "activity-checklist-item-added": "added checklist item to '%s' in %s",
+    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
     "add": "Add",
+    "activity-checked-item-card": "checked %s in checklist %s",
+    "activity-unchecked-item-card": "unchecked %s in checklist %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
     "add-attachment": "Add Attachment",
     "add-board": "Add Board",
     "add-card": "Add Card",
     "add-swimlane": "Add Swimlane",
+    "add-subtask": "Add Subtask",
     "add-checklist": "Add Checklist",
     "add-checklist-item": "Add an item to checklist",
     "add-cover": "Add Cover",
@@ -63,20 +91,22 @@
     "and-n-other-card": "And __count__ other card",
     "and-n-other-card_plural": "And __count__ other cards",
     "apply": "Apply",
-    "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Move to Recycle Bin",
-    "archive-all": "Move All to Recycle Bin",
-    "archive-board": "Move Board to Recycle Bin",
-    "archive-card": "Move Card to Recycle Bin",
-    "archive-list": "Move List to Recycle Bin",
-    "archive-swimlane": "Move Swimlane to Recycle Bin",
-    "archive-selection": "Move selection to Recycle Bin",
-    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
-    "archived-items": "Recycle Bin",
-    "archived-boards": "Boards in Recycle Bin",
+    "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
+    "archive": "Move to Archive",
+    "archive-all": "Move All to Archive",
+    "archive-board": "Move Board to Archive",
+    "archive-card": "Move Card to Archive",
+    "archive-list": "Move List to Archive",
+    "archive-swimlane": "Move Swimlane to Archive",
+    "archive-selection": "Move selection to Archive",
+    "archiveBoardPopup-title": "Move Board to Archive?",
+    "archived-items": "Archive",
+    "archived-boards": "Boards in Archive",
     "restore-board": "Restore Board",
-    "no-archived-boards": "No Boards in Recycle Bin.",
-    "archives": "Recycle Bin",
+    "no-archived-boards": "No Boards in Archive.",
+    "archives": "Archive",
+    "template": "Template",
+    "templates": "Templates",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Attachment",
@@ -95,22 +125,25 @@
     "boardChangeTitlePopup-title": "Rename Board",
     "boardChangeVisibilityPopup-title": "Change Visibility",
     "boardChangeWatchPopup-title": "Change Watch",
-    "boardMenuPopup-title": "Board Menu",
+    "boardMenuPopup-title": "Board Settings",
     "boards": "Boards",
     "board-view": "Board View",
+    "board-view-cal": "Calendar",
     "board-view-swimlanes": "Swimlanes",
     "board-view-lists": "Lists",
     "bucket-example": "Like “Bucket List” for example",
     "cancel": "Cancel",
-    "card-archived": "This card is moved to Recycle Bin.",
+    "card-archived": "This card is moved to Archive.",
+    "board-archived": "This board is moved to Archive.",
     "card-comments-title": "This card has %s comment.",
     "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
     "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can move a card to the Recycle Bin to remove it from the board and preserve its activity.",
+    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
     "card-due": "Due",
     "card-due-on": "Due on",
     "card-spent": "Spent Time",
     "card-edit-attachments": "Edit attachments",
+    "card-edit-custom-fields": "Edit custom fields",
     "card-edit-labels": "Edit labels",
     "card-edit-members": "Edit members",
     "card-labels-title": "Change the labels for the card.",
@@ -118,13 +151,20 @@
     "card-start": "Start",
     "card-start-on": "Starts on",
     "cardAttachmentsPopup-title": "Attach From",
+    "cardCustomField-datePopup-title": "Change date",
+    "cardCustomFieldsPopup-title": "Edit custom fields",
     "cardDeletePopup-title": "Delete Card?",
     "cardDetailsActionsPopup-title": "Card Actions",
     "cardLabelsPopup-title": "Labels",
     "cardMembersPopup-title": "Members",
     "cardMorePopup-title": "More",
+    "cardTemplatePopup-title": "Create template",
     "cards": "Cards",
     "cards-count": "Cards",
+    "casSignIn": "Sign In with CAS",
+    "cardType-card": "Card",
+    "cardType-linkedCard": "Linked Card",
+    "cardType-linkedBoard": "Linked Board",
     "change": "Change",
     "change-avatar": "Change Avatar",
     "change-password": "Change Password",
@@ -135,30 +175,52 @@
     "changePasswordPopup-title": "Change Password",
     "changePermissionsPopup-title": "Change Permissions",
     "changeSettingsPopup-title": "Change Settings",
+    "subtasks": "Subtasks",
     "checklists": "Checklists",
     "click-to-star": "Click to star this board.",
     "click-to-unstar": "Click to unstar this board.",
     "clipboard": "Clipboard or drag & drop",
     "close": "Close",
     "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
     "color-black": "black",
     "color-blue": "blue",
+    "color-crimson": "crimson",
+    "color-darkgreen": "darkgreen",
+    "color-gold": "gold",
+    "color-gray": "gray",
     "color-green": "green",
+    "color-indigo": "indigo",
     "color-lime": "lime",
+    "color-magenta": "magenta",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "navy",
     "color-orange": "orange",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
     "color-pink": "pink",
+    "color-plum": "plum",
     "color-purple": "purple",
     "color-red": "red",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "silver",
     "color-sky": "sky",
+    "color-slateblue": "slateblue",
+    "color-white": "white",
     "color-yellow": "yellow",
+    "unset-color": "Unset",
     "comment": "Comment",
     "comment-placeholder": "Write Comment",
     "comment-only": "Comment only",
     "comment-only-desc": "Can comment on cards only.",
+    "no-comments": "No comments",
+    "no-comments-desc": "Can not see comments and activities.",
     "computer": "Computer",
-    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist",
+    "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?",
+    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
     "copy-card-link-to-clipboard": "Copy card link to clipboard",
+    "linkCardPopup-title": "Link Card",
+    "searchElementPopup-title": "Search",
     "copyCardPopup-title": "Copy Card",
     "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
     "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
@@ -167,11 +229,25 @@
     "createBoardPopup-title": "Create Board",
     "chooseBoardSourcePopup-title": "Import board",
     "createLabelPopup-title": "Create Label",
+    "createCustomField": "Create Field",
+    "createCustomFieldPopup-title": "Create Field",
     "current": "current",
+    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
+    "custom-field-checkbox": "Checkbox",
+    "custom-field-date": "Date",
+    "custom-field-dropdown": "Dropdown List",
+    "custom-field-dropdown-none": "(none)",
+    "custom-field-dropdown-options": "List Options",
+    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
+    "custom-field-dropdown-unknown": "(unknown)",
+    "custom-field-number": "Number",
+    "custom-field-text": "Text",
+    "custom-fields": "Custom Fields",
     "date": "Date",
     "decline": "Decline",
     "default-avatar": "Default avatar",
     "delete": "Delete",
+    "deleteCustomFieldPopup-title": "Delete Custom Field?",
     "deleteLabelPopup-title": "Delete Label?",
     "description": "Description",
     "disambiguateMultiLabelPopup-title": "Disambiguate Label Action",
@@ -186,6 +262,7 @@
     "soft-wip-limit": "Soft WIP Limit",
     "editCardStartDatePopup-title": "Change start date",
     "editCardDueDatePopup-title": "Change due date",
+    "editCustomFieldPopup-title": "Edit Field",
     "editCardSpentTimePopup-title": "Change spent time",
     "editLabelPopup-title": "Change Label",
     "editNotificationPopup-title": "Edit Notification",
@@ -222,30 +299,36 @@
     "filter-clear": "Clear filter",
     "filter-no-label": "No label",
     "filter-no-member": "No member",
+    "filter-no-custom-fields": "No Custom Fields",
     "filter-on": "Filter is on",
     "filter-on-desc": "You are filtering cards on this board. Click here to edit filter.",
     "filter-to-selection": "Filter to selection",
+    "advanced-filter-label": "Advanced Filter",
+    "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) to be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
     "fullname": "Full Name",
     "header-logo-title": "Go back to your boards page.",
     "hide-system-messages": "Hide system messages",
     "headerBarCreateBoardPopup-title": "Create Board",
     "home": "Home",
     "import": "Import",
+    "link": "Link",
     "import-board": "import board",
     "import-board-c": "Import board",
     "import-board-title-trello": "Import board from Trello",
-    "import-board-title-wekan": "Import board from Wekan",
+    "import-board-title-wekan": "Import board from previous export",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
     "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
     "from-trello": "From Trello",
-    "from-wekan": "From Wekan",
+    "from-wekan": "From previous export",
     "import-board-instruction-trello": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text.",
-    "import-board-instruction-wekan": "In your Wekan board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
     "import-json-placeholder": "Paste your valid JSON data here",
     "import-map-members": "Map members",
-    "import-members-map": "Your imported board has some members. Please map the members you want to import to Wekan users",
+    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
     "import-show-user-mapping": "Review members mapping",
-    "import-user-select": "Pick the Wekan user you want to use as this member",
-    "importMapMembersAddPopup-title": "Select Wekan member",
+    "import-user-select": "Pick your existing user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select member",
     "info": "Version",
     "initials": "Initials",
     "invalid-date": "Invalid date",
@@ -264,17 +347,19 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "Link to this card",
-    "list-archive-cards": "Move all cards in this list to Recycle Bin",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
+    "list-archive-cards": "Move all cards in this list to Archive",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "List Actions",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Import a Trello card",
     "listMorePopup-title": "More",
     "link-list": "Link to this list",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve its activity.",
+    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve its activity.",
     "lists": "Lists",
     "swimlanes": "Swimlanes",
     "log-out": "Log Out",
@@ -294,9 +379,9 @@
     "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "My Boards",
     "name": "Name",
-    "no-archived-cards": "No cards in Recycle Bin.",
-    "no-archived-lists": "No lists in Recycle Bin.",
-    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
+    "no-archived-cards": "No cards in Archive.",
+    "no-archived-lists": "No lists in Archive.",
+    "no-archived-swimlanes": "No swimlanes in Archive.",
     "no-results": "No results",
     "normal": "Normal",
     "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -332,6 +417,7 @@
     "restore": "Restore",
     "save": "Save",
     "search": "Search",
+    "rules": "Rules",
     "search-cards": "Search from card titles and descriptions on this board",
     "search-example": "Text to search for?",
     "select-color": "Select Colour",
@@ -366,6 +452,7 @@
     "title": "Title",
     "tracking": "Tracking",
     "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
+    "type": "Type",
     "unassign-member": "Unassign member",
     "unsaved-description": "You have an unsaved description.",
     "unwatch": "Unwatch",
@@ -374,7 +461,7 @@
     "uploaded-avatar": "Uploaded an avatar",
     "username": "Username",
     "view-it": "View it",
-    "warn-list-archived": "warning: this card is in a list in the Recycle Bin",
+    "warn-list-archived": "warning: this card is in a list in the Archive",
     "watch": "Watch",
     "watching": "Watching",
     "watching-info": "You will be notified of any changes in this board",
@@ -382,6 +469,9 @@
     "welcome-swimlane": "Milestone 1",
     "welcome-list1": "Basics",
     "welcome-list2": "Advanced",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
     "what-to-do": "What do you want to do?",
     "wipLimitErrorPopup-title": "Invalid WIP Limit",
     "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
@@ -407,16 +497,16 @@
     "send-smtp-test": "Send a test email to yourself",
     "invitation-code": "Invitation Code",
     "email-invite-register-subject": "__inviter__ sent you an invitation",
-    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to Wekan for collaboration.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
-    "email-smtp-test-subject": "SMTP Test Email From Wekan",
+    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email",
     "email-smtp-test-text": "You have successfully sent an email",
     "error-invitation-code-not-exist": "Invitation code doesn't exist",
     "error-notAuthorized": "You are not authorised to view this page.",
     "outgoing-webhooks": "Outgoing Webhooks",
     "outgoingWebhooksPopup-title": "Outgoing Webhooks",
+    "boardCardTitlePopup-title": "Card Title Filter",
     "new-outgoing-webhook": "New Outgoing Webhook",
     "no-name": "(Unknown)",
-    "Wekan_version": "Wekan version",
     "Node_version": "Node version",
     "OS_Arch": "OS Arch",
     "OS_Cpus": "OS CPU Count",
@@ -427,13 +517,18 @@
     "OS_Totalmem": "OS Total Memory",
     "OS_Type": "OS Type",
     "OS_Uptime": "OS Uptime",
+    "days": "days",
     "hours": "hours",
     "minutes": "minutes",
     "seconds": "seconds",
+    "show-field-on-card": "Show this field on card",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
     "yes": "Yes",
     "no": "No",
     "accounts": "Accounts",
     "accounts-allowEmailChange": "Allow Email Change",
+    "accounts-allowUserNameChange": "Allow Username Change",
     "createdAt": "Created at",
     "verified": "Verified",
     "active": "Active",
@@ -442,5 +537,157 @@
     "card-end": "End",
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
-    "editCardEndDatePopup-title": "Change end date"
-}
+    "editCardEndDatePopup-title": "Change end date",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "Assigned By",
+    "requested-by": "Requested By",
+    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
+    "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
+    "boardDeletePopup-title": "Delete Board?",
+    "delete-board": "Delete Board",
+    "default-subtasks-board": "Subtasks for __board__ board",
+    "default": "Default",
+    "queue": "Queue",
+    "subtask-settings": "Subtasks Settings",
+    "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
+    "show-subtasks-field": "Cards can have subtasks",
+    "deposit-subtasks-board": "Deposit subtasks to this board:",
+    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
+    "show-parent-in-minicard": "Show parent in minicard:",
+    "prefix-with-full-path": "Prefix with full path",
+    "prefix-with-parent": "Prefix with parent",
+    "subtext-with-full-path": "Subtext with full path",
+    "subtext-with-parent": "Subtext with parent",
+    "change-card-parent": "Change card's parent",
+    "parent-card": "Parent card",
+    "source-board": "Source board",
+    "no-parent": "Don't show parent",
+    "activity-added-label": "added label '%s' to %s",
+    "activity-removed-label": "removed label '%s' from %s",
+    "activity-delete-attach": "deleted an attachment from %s",
+    "activity-added-label-card": "added label '%s'",
+    "activity-removed-label-card": "removed label '%s'",
+    "activity-delete-attach-card": "deleted an attachment",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "r-rule": "Rule",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "Add action",
+    "r-board-rules": "Board rules",
+    "r-add-rule": "Add rule",
+    "r-view-rule": "View rule",
+    "r-delete-rule": "Delete rule",
+    "r-new-rule-name": "New rule title",
+    "r-no-rules": "No rules",
+    "r-when-a-card": "When a card",
+    "r-is": "is",
+    "r-is-moved": "is moved",
+    "r-added-to": "added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "the board",
+    "r-list": "list",
+    "set-filter": "Set Filter",
+    "r-moved-to": "Moved to",
+    "r-moved-from": "Moved from",
+    "r-archived": "Moved to Archive",
+    "r-unarchived": "Restored from Archive",
+    "r-a-card": "a card",
+    "r-when-a-label-is": "When a label is",
+    "r-when-the-label-is": "When the label is",
+    "r-list-name": "list name",
+    "r-when-a-member": "When a member is",
+    "r-when-the-member": "When the member",
+    "r-name": "name",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "r-when-the-item": "When the checklist item",
+    "r-checked": "Checked",
+    "r-unchecked": "Unchecked",
+    "r-move-card-to": "Move card to",
+    "r-top-of": "Top of",
+    "r-bottom-of": "Bottom of",
+    "r-its-list": "its list",
+    "r-archive": "Move to Archive",
+    "r-unarchive": "Restore from Archive",
+    "r-card": "card",
+    "r-add": "Add",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-set-color": "Set color to",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "subject",
+    "r-rule-details": "Rule details",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Move card to top of list",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Move card to bottom of list",
+    "r-d-send-email": "Send email",
+    "r-d-send-email-to": "to",
+    "r-d-send-email-subject": "subject",
+    "r-d-send-email-message": "message",
+    "r-d-archive": "Move card to Archive",
+    "r-d-unarchive": "Restore card from Archive",
+    "r-d-add-label": "Add label",
+    "r-d-remove-label": "Remove label",
+    "r-create-card": "Create new card",
+    "r-in-list": "in list",
+    "r-in-swimlane": "in swimlane",
+    "r-d-add-member": "Add member",
+    "r-d-remove-member": "Remove member",
+    "r-d-remove-all-member": "Remove all member",
+    "r-d-check-all": "Check all items of a list",
+    "r-d-uncheck-all": "Uncheck all items of a list",
+    "r-d-check-one": "Check item",
+    "r-d-uncheck-one": "Uncheck item",
+    "r-d-check-of-list": "of checklist",
+    "r-d-add-checklist": "Add checklist",
+    "r-d-remove-checklist": "Remove checklist",
+    "r-by": "by",
+    "r-add-checklist": "Add checklist",
+    "r-with-items": "with items",
+    "r-items-list": "item1,item2,item3",
+    "r-add-swimlane": "Add swimlane",
+    "r-swimlane-name": "swimlane name",
+    "r-board-note": "Note: leave a field empty to match every possible value.",
+    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout",
+    "hide-logo": "Hide Logo",
+    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
+    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
+    "error-undefined": "Something went wrong",
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
+}
\ No newline at end of file
diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json
index 6e7d5526..3f35fca2 100644
--- a/i18n/en.i18n.json
+++ b/i18n/en.i18n.json
@@ -1,35 +1,51 @@
 {
     "accept": "Accept",
-    "act-activity-notify": "[Wekan] Activity Notification",
-    "act-addAttachment": "attached __attachment__ to __card__",
-    "act-addChecklist": "added checklist __checklist__ to __card__",
-    "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__",
-    "act-addComment": "commented on __card__: __comment__",
-    "act-createBoard": "created __board__",
-    "act-createCard": "added __card__ to __list__",
-    "act-createList": "added __list__ to __board__",
-    "act-addBoardMember": "added __member__ to __board__",
-    "act-archivedBoard": "__board__ moved to Recycle Bin",
-    "act-archivedCard": "__card__ moved to Recycle Bin",
-    "act-archivedList": "__list__ moved to Recycle Bin",
-    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
-    "act-importBoard": "imported __board__",
-    "act-importCard": "imported __card__",
-    "act-importList": "imported __list__",
-    "act-joinMember": "added __member__ to __card__",
-    "act-moveCard": "moved __card__ from __oldList__ to __list__",
-    "act-removeBoardMember": "removed __member__ from __board__",
-    "act-restoredCard": "restored __card__ to __board__",
-    "act-unjoinMember": "removed __member__ from __card__",
-    "act-withBoardTitle": "[Wekan] __board__",
+    "act-activity-notify": "Activity Notification",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__board__",
     "act-withCardTitle": "[__board__] __card__",
     "actions": "Actions",
     "activities": "Activities",
     "activity": "Activity",
     "activity-added": "added %s to %s",
-    "activity-archived": "%s moved to Recycle Bin",
+    "activity-archived": "%s moved to Archive",
     "activity-attached": "attached %s to %s",
     "activity-created": "created %s",
+    "activity-customfield-created": "created custom field %s",
     "activity-excluded": "excluded %s from %s",
     "activity-imported": "imported %s into %s from %s",
     "activity-imported-board": "imported %s from %s",
@@ -39,13 +55,25 @@
     "activity-removed": "removed %s from %s",
     "activity-sent": "sent %s to %s",
     "activity-unjoined": "unjoined %s",
+    "activity-subtask-added": "added subtask to %s",
+    "activity-checked-item": "checked %s in checklist %s of %s",
+    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
     "activity-checklist-added": "added checklist to %s",
+    "activity-checklist-removed": "removed a checklist from %s",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
     "activity-checklist-item-added": "added checklist item to '%s' in %s",
+    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
     "add": "Add",
+    "activity-checked-item-card": "checked %s in checklist %s",
+    "activity-unchecked-item-card": "unchecked %s in checklist %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
     "add-attachment": "Add Attachment",
     "add-board": "Add Board",
     "add-card": "Add Card",
     "add-swimlane": "Add Swimlane",
+    "add-subtask": "Add Subtask",
     "add-checklist": "Add Checklist",
     "add-checklist-item": "Add an item to checklist",
     "add-cover": "Add Cover",
@@ -63,20 +91,22 @@
     "and-n-other-card": "And __count__ other card",
     "and-n-other-card_plural": "And __count__ other cards",
     "apply": "Apply",
-    "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Move to Recycle Bin",
-    "archive-all": "Move All to Recycle Bin",
-    "archive-board": "Move Board to Recycle Bin",
-    "archive-card": "Move Card to Recycle Bin",
-    "archive-list": "Move List to Recycle Bin",
-    "archive-swimlane": "Move Swimlane to Recycle Bin",
-    "archive-selection": "Move selection to Recycle Bin",
-    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
-    "archived-items": "Recycle Bin",
-    "archived-boards": "Boards in Recycle Bin",
+    "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
+    "archive": "Move to Archive",
+    "archive-all": "Move All to Archive",
+    "archive-board": "Move Board to Archive",
+    "archive-card": "Move Card to Archive",
+    "archive-list": "Move List to Archive",
+    "archive-swimlane": "Move Swimlane to Archive",
+    "archive-selection": "Move selection to Archive",
+    "archiveBoardPopup-title": "Move Board to Archive?",
+    "archived-items": "Archive",
+    "archived-boards": "Boards in Archive",
     "restore-board": "Restore Board",
-    "no-archived-boards": "No Boards in Recycle Bin.",
-    "archives": "Recycle Bin",
+    "no-archived-boards": "No Boards in Archive.",
+    "archives": "Archive",
+    "template": "Template",
+    "templates": "Templates",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Attachment",
@@ -95,22 +125,25 @@
     "boardChangeTitlePopup-title": "Rename Board",
     "boardChangeVisibilityPopup-title": "Change Visibility",
     "boardChangeWatchPopup-title": "Change Watch",
-    "boardMenuPopup-title": "Board Menu",
+    "boardMenuPopup-title": "Board Settings",
     "boards": "Boards",
     "board-view": "Board View",
+    "board-view-cal": "Calendar",
     "board-view-swimlanes": "Swimlanes",
     "board-view-lists": "Lists",
     "bucket-example": "Like “Bucket List” for example",
     "cancel": "Cancel",
-    "card-archived": "This card is moved to Recycle Bin.",
+    "card-archived": "This card is moved to Archive.",
+    "board-archived": "This board is moved to Archive.",
     "card-comments-title": "This card has %s comment.",
     "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
     "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
     "card-due": "Due",
     "card-due-on": "Due on",
     "card-spent": "Spent Time",
     "card-edit-attachments": "Edit attachments",
+    "card-edit-custom-fields": "Edit custom fields",
     "card-edit-labels": "Edit labels",
     "card-edit-members": "Edit members",
     "card-labels-title": "Change the labels for the card.",
@@ -118,13 +151,20 @@
     "card-start": "Start",
     "card-start-on": "Starts on",
     "cardAttachmentsPopup-title": "Attach From",
+    "cardCustomField-datePopup-title": "Change date",
+    "cardCustomFieldsPopup-title": "Edit custom fields",
     "cardDeletePopup-title": "Delete Card?",
     "cardDetailsActionsPopup-title": "Card Actions",
     "cardLabelsPopup-title": "Labels",
     "cardMembersPopup-title": "Members",
     "cardMorePopup-title": "More",
+    "cardTemplatePopup-title": "Create template",
     "cards": "Cards",
     "cards-count": "Cards",
+    "casSignIn" : "Sign In with CAS",
+    "cardType-card": "Card",
+    "cardType-linkedCard": "Linked Card",
+    "cardType-linkedBoard": "Linked Board",
     "change": "Change",
     "change-avatar": "Change Avatar",
     "change-password": "Change Password",
@@ -135,30 +175,52 @@
     "changePasswordPopup-title": "Change Password",
     "changePermissionsPopup-title": "Change Permissions",
     "changeSettingsPopup-title": "Change Settings",
+    "subtasks": "Subtasks",
     "checklists": "Checklists",
     "click-to-star": "Click to star this board.",
     "click-to-unstar": "Click to unstar this board.",
     "clipboard": "Clipboard or drag & drop",
     "close": "Close",
     "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
     "color-black": "black",
     "color-blue": "blue",
+    "color-crimson": "crimson",
+    "color-darkgreen": "darkgreen",
+    "color-gold": "gold",
+    "color-gray": "gray",
     "color-green": "green",
+    "color-indigo": "indigo",
     "color-lime": "lime",
+    "color-magenta": "magenta",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "navy",
     "color-orange": "orange",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
     "color-pink": "pink",
+    "color-plum": "plum",
     "color-purple": "purple",
     "color-red": "red",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "silver",
     "color-sky": "sky",
+    "color-slateblue": "slateblue",
+    "color-white": "white",
     "color-yellow": "yellow",
+    "unset-color": "Unset",
     "comment": "Comment",
     "comment-placeholder": "Write Comment",
     "comment-only": "Comment only",
     "comment-only-desc": "Can comment on cards only.",
+    "no-comments": "No comments",
+    "no-comments-desc": "Can not see comments and activities.",
     "computer": "Computer",
-    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist",
+    "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?",
+    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
     "copy-card-link-to-clipboard": "Copy card link to clipboard",
+    "linkCardPopup-title": "Link Card",
+    "searchElementPopup-title": "Search",
     "copyCardPopup-title": "Copy Card",
     "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
     "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
@@ -167,11 +229,25 @@
     "createBoardPopup-title": "Create Board",
     "chooseBoardSourcePopup-title": "Import board",
     "createLabelPopup-title": "Create Label",
+    "createCustomField": "Create Field",
+    "createCustomFieldPopup-title": "Create Field",
     "current": "current",
+    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
+    "custom-field-checkbox": "Checkbox",
+    "custom-field-date": "Date",
+    "custom-field-dropdown": "Dropdown List",
+    "custom-field-dropdown-none": "(none)",
+    "custom-field-dropdown-options": "List Options",
+    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
+    "custom-field-dropdown-unknown": "(unknown)",
+    "custom-field-number": "Number",
+    "custom-field-text": "Text",
+    "custom-fields": "Custom Fields",
     "date": "Date",
     "decline": "Decline",
     "default-avatar": "Default avatar",
     "delete": "Delete",
+    "deleteCustomFieldPopup-title": "Delete Custom Field?",
     "deleteLabelPopup-title": "Delete Label?",
     "description": "Description",
     "disambiguateMultiLabelPopup-title": "Disambiguate Label Action",
@@ -186,6 +262,7 @@
     "soft-wip-limit": "Soft WIP Limit",
     "editCardStartDatePopup-title": "Change start date",
     "editCardDueDatePopup-title": "Change due date",
+    "editCustomFieldPopup-title": "Edit Field",
     "editCardSpentTimePopup-title": "Change spent time",
     "editLabelPopup-title": "Change Label",
     "editNotificationPopup-title": "Edit Notification",
@@ -222,30 +299,36 @@
     "filter-clear": "Clear filter",
     "filter-no-label": "No label",
     "filter-no-member": "No member",
+    "filter-no-custom-fields": "No Custom Fields",
     "filter-on": "Filter is on",
     "filter-on-desc": "You are filtering cards on this board. Click here to edit filter.",
     "filter-to-selection": "Filter to selection",
+    "advanced-filter-label": "Advanced Filter",
+    "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) to be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
     "fullname": "Full Name",
     "header-logo-title": "Go back to your boards page.",
     "hide-system-messages": "Hide system messages",
     "headerBarCreateBoardPopup-title": "Create Board",
     "home": "Home",
     "import": "Import",
+    "link": "Link",
     "import-board": "import board",
     "import-board-c": "Import board",
     "import-board-title-trello": "Import board from Trello",
-    "import-board-title-wekan": "Import board from Wekan",
+    "import-board-title-wekan": "Import board from previous export",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
     "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
     "from-trello": "From Trello",
-    "from-wekan": "From Wekan",
+    "from-wekan": "From previous export",
     "import-board-instruction-trello": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text.",
-    "import-board-instruction-wekan": "In your Wekan board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
     "import-json-placeholder": "Paste your valid JSON data here",
     "import-map-members": "Map members",
-    "import-members-map": "Your imported board has some members. Please map the members you want to import to Wekan users",
+    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
     "import-show-user-mapping": "Review members mapping",
-    "import-user-select": "Pick the Wekan user you want to use as this member",
-    "importMapMembersAddPopup-title": "Select Wekan member",
+    "import-user-select": "Pick your existing user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select member",
     "info": "Version",
     "initials": "Initials",
     "invalid-date": "Invalid date",
@@ -264,17 +347,19 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "Link to this card",
-    "list-archive-cards": "Move all cards in this list to Recycle Bin",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
+    "list-archive-cards": "Move all cards in this list to Archive",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "List Actions",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Import a Trello card",
     "listMorePopup-title": "More",
     "link-list": "Link to this list",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
     "lists": "Lists",
     "swimlanes": "Swimlanes",
     "log-out": "Log Out",
@@ -294,9 +379,9 @@
     "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "My Boards",
     "name": "Name",
-    "no-archived-cards": "No cards in Recycle Bin.",
-    "no-archived-lists": "No lists in Recycle Bin.",
-    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
+    "no-archived-cards": "No cards in Archive.",
+    "no-archived-lists": "No lists in Archive.",
+    "no-archived-swimlanes": "No swimlanes in Archive.",
     "no-results": "No results",
     "normal": "Normal",
     "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -332,6 +417,7 @@
     "restore": "Restore",
     "save": "Save",
     "search": "Search",
+    "rules": "Rules",
     "search-cards": "Search from card titles and descriptions on this board",
     "search-example": "Text to search for?",
     "select-color": "Select Color",
@@ -366,6 +452,7 @@
     "title": "Title",
     "tracking": "Tracking",
     "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
+    "type": "Type",
     "unassign-member": "Unassign member",
     "unsaved-description": "You have an unsaved description.",
     "unwatch": "Unwatch",
@@ -374,7 +461,7 @@
     "uploaded-avatar": "Uploaded an avatar",
     "username": "Username",
     "view-it": "View it",
-    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
+    "warn-list-archived": "warning: this card is in an list at Archive",
     "watch": "Watch",
     "watching": "Watching",
     "watching-info": "You will be notified of any change in this board",
@@ -382,6 +469,9 @@
     "welcome-swimlane": "Milestone 1",
     "welcome-list1": "Basics",
     "welcome-list2": "Advanced",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
     "what-to-do": "What do you want to do?",
     "wipLimitErrorPopup-title": "Invalid WIP Limit",
     "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
@@ -407,16 +497,16 @@
     "send-smtp-test": "Send a test email to yourself",
     "invitation-code": "Invitation Code",
     "email-invite-register-subject": "__inviter__ sent you an invitation",
-    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to Wekan for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
-    "email-smtp-test-subject": "SMTP Test Email From Wekan",
+    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email",
     "email-smtp-test-text": "You have successfully sent an email",
     "error-invitation-code-not-exist": "Invitation code doesn't exist",
     "error-notAuthorized": "You are not authorized to view this page.",
     "outgoing-webhooks": "Outgoing Webhooks",
     "outgoingWebhooksPopup-title": "Outgoing Webhooks",
+    "boardCardTitlePopup-title": "Card Title Filter",
     "new-outgoing-webhook": "New Outgoing Webhook",
     "no-name": "(Unknown)",
-    "Wekan_version": "Wekan version",
     "Node_version": "Node version",
     "OS_Arch": "OS Arch",
     "OS_Cpus": "OS CPU Count",
@@ -427,9 +517,13 @@
     "OS_Totalmem": "OS Total Memory",
     "OS_Type": "OS Type",
     "OS_Uptime": "OS Uptime",
+    "days": "days",
     "hours": "hours",
     "minutes": "minutes",
     "seconds": "seconds",
+    "show-field-on-card": "Show this field on card",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
     "yes": "Yes",
     "no": "No",
     "accounts": "Accounts",
@@ -443,5 +537,160 @@
     "card-end": "End",
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
-    "editCardEndDatePopup-title": "Change end date"
+    "editCardEndDatePopup-title": "Change end date",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "Assigned By",
+    "requested-by": "Requested By",
+    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
+    "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
+    "boardDeletePopup-title": "Delete Board?",
+    "delete-board": "Delete Board",
+    "default-subtasks-board": "Subtasks for __board__ board",
+    "default": "Default",
+    "queue": "Queue",
+    "subtask-settings": "Subtasks Settings",
+    "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
+    "show-subtasks-field": "Cards can have subtasks",
+    "deposit-subtasks-board": "Deposit subtasks to this board:",
+    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
+    "show-parent-in-minicard": "Show parent in minicard:",
+    "prefix-with-full-path": "Prefix with full path",
+    "prefix-with-parent": "Prefix with parent",
+    "subtext-with-full-path": "Subtext with full path",
+    "subtext-with-parent": "Subtext with parent",
+    "change-card-parent": "Change card's parent",
+    "parent-card": "Parent card",
+    "source-board": "Source board",
+    "no-parent": "Don't show parent",
+    "activity-added-label": "added label '%s' to %s",
+    "activity-removed-label": "removed label '%s' from %s",
+    "activity-delete-attach": "deleted an attachment from %s",
+    "activity-added-label-card": "added label '%s'",
+    "activity-removed-label-card": "removed label '%s'",
+    "activity-delete-attach-card": "deleted an attachment",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "r-rule": "Rule",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "Add action",
+    "r-board-rules": "Board rules",
+    "r-add-rule": "Add rule",
+    "r-view-rule": "View rule",
+    "r-delete-rule": "Delete rule",
+    "r-new-rule-name": "New rule title",
+    "r-no-rules": "No rules",
+    "r-when-a-card": "When a card",
+    "r-is": "is",
+    "r-is-moved": "is moved",
+    "r-added-to": "Added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "the board",
+    "r-list": "list",
+    "set-filter":"Set Filter",
+    "r-moved-to": "Moved to",
+    "r-moved-from": "Moved from",
+    "r-archived": "Moved to Archive",
+    "r-unarchived": "Restored from Archive",
+    "r-a-card": "a card",
+    "r-when-a-label-is": "When a label is",
+    "r-when-the-label-is": "When the label is",
+    "r-list-name": "list name",
+    "r-when-a-member": "When a member is",
+    "r-when-the-member": "When the member",
+    "r-name": "name",
+    "r-is": "is",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "r-when-the-item": "When the checklist item",
+    "r-checked": "Checked",
+    "r-unchecked": "Unchecked",
+    "r-move-card-to": "Move card to",
+    "r-top-of": "Top of",
+    "r-bottom-of": "Bottom of",
+    "r-its-list": "its list",
+    "r-list": "list",
+    "r-archive": "Move to Archive",
+    "r-unarchive": "Restore from Archive",
+    "r-card": "card",
+    "r-add": "Add",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-set-color": "Set color to",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "subject",
+    "r-rule-details": "Rule details",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Move card to top of list",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Move card to bottom of list",
+    "r-d-send-email": "Send email",
+    "r-d-send-email-to": "to",
+    "r-d-send-email-subject": "subject",
+    "r-d-send-email-message": "message",
+    "r-d-archive": "Move card to Archive",
+    "r-d-unarchive": "Restore card from Archive",
+    "r-d-add-label": "Add label",
+    "r-d-remove-label": "Remove label",
+    "r-create-card": "Create new card",
+    "r-in-list": "in list",
+    "r-in-swimlane": "in swimlane",
+    "r-d-add-member": "Add member",
+    "r-d-remove-member": "Remove member",
+    "r-d-remove-all-member": "Remove all member",
+    "r-d-check-all": "Check all items of a list",
+    "r-d-uncheck-all": "Uncheck all items of a list",
+    "r-d-check-one": "Check item",
+    "r-d-uncheck-one": "Uncheck item",
+    "r-d-check-of-list": "of checklist",
+    "r-d-add-checklist": "Add checklist",
+    "r-d-remove-checklist": "Remove checklist",
+    "r-by": "by",
+    "r-add-checklist": "Add checklist",
+    "r-with-items": "with items",
+    "r-items-list": "item1,item2,item3",
+    "r-add-swimlane": "Add swimlane",
+    "r-swimlane-name": "swimlane name",
+    "r-board-note": "Note: leave a field empty to match every possible value. ",
+    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-added-to": "added to",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout",
+    "hide-logo": "Hide Logo",
+    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
+    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
+    "error-undefined": "Something went wrong",
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is: ",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
diff --git a/i18n/eo.i18n.json b/i18n/eo.i18n.json
index b5fa9a39..7343e1f1 100644
--- a/i18n/eo.i18n.json
+++ b/i18n/eo.i18n.json
@@ -1,35 +1,51 @@
 {
     "accept": "Akcepti",
-    "act-activity-notify": "[Wekan] Activity Notification",
-    "act-addAttachment": "attached __attachment__ to __card__",
-    "act-addChecklist": "added checklist __checklist__ to __card__",
-    "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__",
-    "act-addComment": "commented on __card__: __comment__",
-    "act-createBoard": "Kreiis __board__",
-    "act-createCard": "Aldonis __card__ al __list__",
-    "act-createList": "Aldonis __card__ al __board__",
-    "act-addBoardMember": "Aldonis __member__ al __board__",
-    "act-archivedBoard": "__board__ moved to Recycle Bin",
-    "act-archivedCard": "__card__ moved to Recycle Bin",
-    "act-archivedList": "__list__ moved to Recycle Bin",
-    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
-    "act-importBoard": "imported __board__",
-    "act-importCard": "imported __card__",
-    "act-importList": "imported __list__",
-    "act-joinMember": "Aldonis __member__ al __card__",
-    "act-moveCard": "moved __card__ from __oldList__ to __list__",
-    "act-removeBoardMember": "removed __member__ from __board__",
-    "act-restoredCard": "restored __card__ to __board__",
-    "act-unjoinMember": "removed __member__ from __card__",
-    "act-withBoardTitle": "[Wekan] __board__",
+    "act-activity-notify": "Activity Notification",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__board__",
     "act-withCardTitle": "[__board__] __card__",
     "actions": "Akcioj",
     "activities": "Aktivaĵoj",
     "activity": "Aktivaĵo",
     "activity-added": "Aldonis %s al %s",
-    "activity-archived": "%s moved to Recycle Bin",
+    "activity-archived": "%s moved to Archive",
     "activity-attached": "attached %s to %s",
     "activity-created": "Kreiis %s",
+    "activity-customfield-created": "created custom field %s",
     "activity-excluded": "excluded %s from %s",
     "activity-imported": "imported %s into %s from %s",
     "activity-imported-board": "imported %s from %s",
@@ -39,13 +55,25 @@
     "activity-removed": "removed %s from %s",
     "activity-sent": "Sendis %s al %s",
     "activity-unjoined": "unjoined %s",
+    "activity-subtask-added": "added subtask to %s",
+    "activity-checked-item": "checked %s in checklist %s of %s",
+    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
     "activity-checklist-added": "added checklist to %s",
+    "activity-checklist-removed": "removed a checklist from %s",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
     "activity-checklist-item-added": "added checklist item to '%s' in %s",
+    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
     "add": "Aldoni",
+    "activity-checked-item-card": "checked %s in checklist %s",
+    "activity-unchecked-item-card": "unchecked %s in checklist %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
     "add-attachment": "Add Attachment",
     "add-board": "Add Board",
     "add-card": "Add Card",
     "add-swimlane": "Add Swimlane",
+    "add-subtask": "Add Subtask",
     "add-checklist": "Add Checklist",
     "add-checklist-item": "Add an item to checklist",
     "add-cover": "Add Cover",
@@ -63,20 +91,22 @@
     "and-n-other-card": "And __count__ other card",
     "and-n-other-card_plural": "And __count__ other cards",
     "apply": "Apliki",
-    "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Move to Recycle Bin",
-    "archive-all": "Move All to Recycle Bin",
-    "archive-board": "Move Board to Recycle Bin",
-    "archive-card": "Move Card to Recycle Bin",
-    "archive-list": "Move List to Recycle Bin",
-    "archive-swimlane": "Move Swimlane to Recycle Bin",
-    "archive-selection": "Move selection to Recycle Bin",
-    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
-    "archived-items": "Recycle Bin",
-    "archived-boards": "Boards in Recycle Bin",
+    "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
+    "archive": "Move to Archive",
+    "archive-all": "Move All to Archive",
+    "archive-board": "Move Board to Archive",
+    "archive-card": "Move Card to Archive",
+    "archive-list": "Move List to Archive",
+    "archive-swimlane": "Move Swimlane to Archive",
+    "archive-selection": "Move selection to Archive",
+    "archiveBoardPopup-title": "Move Board to Archive?",
+    "archived-items": "Arkivi",
+    "archived-boards": "Boards in Archive",
     "restore-board": "Restore Board",
-    "no-archived-boards": "No Boards in Recycle Bin.",
-    "archives": "Recycle Bin",
+    "no-archived-boards": "No Boards in Archive.",
+    "archives": "Arkivi",
+    "template": "Template",
+    "templates": "Templates",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Attachment",
@@ -95,22 +125,25 @@
     "boardChangeTitlePopup-title": "Rename Board",
     "boardChangeVisibilityPopup-title": "Change Visibility",
     "boardChangeWatchPopup-title": "Change Watch",
-    "boardMenuPopup-title": "Board Menu",
+    "boardMenuPopup-title": "Board Settings",
     "boards": "Boards",
     "board-view": "Board View",
+    "board-view-cal": "Calendar",
     "board-view-swimlanes": "Swimlanes",
     "board-view-lists": "Listoj",
     "bucket-example": "Like “Bucket List” for example",
     "cancel": "Cancel",
-    "card-archived": "This card is moved to Recycle Bin.",
+    "card-archived": "This card is moved to Archive.",
+    "board-archived": "This board is moved to Archive.",
     "card-comments-title": "This card has %s comment.",
     "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
     "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
     "card-due": "Due",
     "card-due-on": "Due on",
     "card-spent": "Spent Time",
     "card-edit-attachments": "Edit attachments",
+    "card-edit-custom-fields": "Edit custom fields",
     "card-edit-labels": "Redakti etikedojn",
     "card-edit-members": "Redakti membrojn",
     "card-labels-title": "Change the labels for the card.",
@@ -118,13 +151,20 @@
     "card-start": "Komenco",
     "card-start-on": "Komencas je la",
     "cardAttachmentsPopup-title": "Attach From",
+    "cardCustomField-datePopup-title": "Change date",
+    "cardCustomFieldsPopup-title": "Edit custom fields",
     "cardDeletePopup-title": "Delete Card?",
     "cardDetailsActionsPopup-title": "Card Actions",
     "cardLabelsPopup-title": "Etikedoj",
     "cardMembersPopup-title": "Membroj",
     "cardMorePopup-title": "Pli",
+    "cardTemplatePopup-title": "Create template",
     "cards": "Kartoj",
     "cards-count": "Kartoj",
+    "casSignIn": "Sign In with CAS",
+    "cardType-card": "Card",
+    "cardType-linkedCard": "Linked Card",
+    "cardType-linkedBoard": "Linked Board",
     "change": "Ŝanĝi",
     "change-avatar": "Change Avatar",
     "change-password": "Ŝangi pasvorton",
@@ -135,30 +175,52 @@
     "changePasswordPopup-title": "Ŝangi pasvorton",
     "changePermissionsPopup-title": "Change Permissions",
     "changeSettingsPopup-title": "Ŝanĝi agordojn",
+    "subtasks": "Subtasks",
     "checklists": "Checklists",
     "click-to-star": "Click to star this board.",
     "click-to-unstar": "Click to unstar this board.",
     "clipboard": "Clipboard or drag & drop",
     "close": "Fermi",
     "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
     "color-black": "nigra",
     "color-blue": "blua",
+    "color-crimson": "crimson",
+    "color-darkgreen": "darkgreen",
+    "color-gold": "gold",
+    "color-gray": "gray",
     "color-green": "verda",
+    "color-indigo": "indigo",
     "color-lime": "lime",
+    "color-magenta": "magenta",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "navy",
     "color-orange": "oranĝa",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
     "color-pink": "pink",
+    "color-plum": "plum",
     "color-purple": "purple",
     "color-red": "ruĝa",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "silver",
     "color-sky": "sky",
+    "color-slateblue": "slateblue",
+    "color-white": "white",
     "color-yellow": "flava",
+    "unset-color": "Unset",
     "comment": "Komento",
     "comment-placeholder": "Write Comment",
     "comment-only": "Comment only",
     "comment-only-desc": "Can comment on cards only.",
+    "no-comments": "No comments",
+    "no-comments-desc": "Can not see comments and activities.",
     "computer": "Komputilo",
-    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist",
+    "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?",
+    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
     "copy-card-link-to-clipboard": "Copy card link to clipboard",
+    "linkCardPopup-title": "Link Card",
+    "searchElementPopup-title": "Serĉi",
     "copyCardPopup-title": "Copy Card",
     "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
     "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
@@ -167,11 +229,25 @@
     "createBoardPopup-title": "Krei tavolon",
     "chooseBoardSourcePopup-title": "Import board",
     "createLabelPopup-title": "Create Label",
+    "createCustomField": "Create Field",
+    "createCustomFieldPopup-title": "Create Field",
     "current": "current",
+    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
+    "custom-field-checkbox": "Checkbox",
+    "custom-field-date": "Dato",
+    "custom-field-dropdown": "Dropdown List",
+    "custom-field-dropdown-none": "(none)",
+    "custom-field-dropdown-options": "List Options",
+    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
+    "custom-field-dropdown-unknown": "(unknown)",
+    "custom-field-number": "Number",
+    "custom-field-text": "Text",
+    "custom-fields": "Custom Fields",
     "date": "Dato",
     "decline": "Decline",
     "default-avatar": "Default avatar",
     "delete": "Delete",
+    "deleteCustomFieldPopup-title": "Delete Custom Field?",
     "deleteLabelPopup-title": "Delete Label?",
     "description": "Description",
     "disambiguateMultiLabelPopup-title": "Disambiguate Label Action",
@@ -186,6 +262,7 @@
     "soft-wip-limit": "Soft WIP Limit",
     "editCardStartDatePopup-title": "Redakti komencdaton",
     "editCardDueDatePopup-title": "Change due date",
+    "editCustomFieldPopup-title": "Edit Field",
     "editCardSpentTimePopup-title": "Change spent time",
     "editLabelPopup-title": "Ŝanĝi etikedon",
     "editNotificationPopup-title": "Edit Notification",
@@ -222,30 +299,36 @@
     "filter-clear": "Clear filter",
     "filter-no-label": "Nenia etikedo",
     "filter-no-member": "Nenia membro",
+    "filter-no-custom-fields": "No Custom Fields",
     "filter-on": "Filter is on",
     "filter-on-desc": "You are filtering cards on this board. Click here to edit filter.",
     "filter-to-selection": "Filter to selection",
+    "advanced-filter-label": "Advanced Filter",
+    "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) to be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
     "fullname": "Full Name",
     "header-logo-title": "Go back to your boards page.",
     "hide-system-messages": "Hide system messages",
     "headerBarCreateBoardPopup-title": "Krei tavolon",
     "home": "Hejmo",
     "import": "Importi",
+    "link": "Link",
     "import-board": "import board",
     "import-board-c": "Import board",
     "import-board-title-trello": "Import board from Trello",
-    "import-board-title-wekan": "Import board from Wekan",
+    "import-board-title-wekan": "Import board from previous export",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
     "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
     "from-trello": "From Trello",
-    "from-wekan": "From Wekan",
+    "from-wekan": "From previous export",
     "import-board-instruction-trello": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text.",
-    "import-board-instruction-wekan": "In your Wekan board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
     "import-json-placeholder": "Paste your valid JSON data here",
     "import-map-members": "Map members",
-    "import-members-map": "Your imported board has some members. Please map the members you want to import to Wekan users",
+    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
     "import-show-user-mapping": "Review members mapping",
-    "import-user-select": "Pick the Wekan user you want to use as this member",
-    "importMapMembersAddPopup-title": "Select Wekan member",
+    "import-user-select": "Pick your existing user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select member",
     "info": "Version",
     "initials": "Initials",
     "invalid-date": "Invalid date",
@@ -264,17 +347,19 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "Ligi al ĉitiu karto",
-    "list-archive-cards": "Move all cards in this list to Recycle Bin",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
+    "list-archive-cards": "Move all cards in this list to Archive",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Movu ĉiujn kartojn en tiu listo.",
     "list-select-cards": "Elektu ĉiujn kartojn en tiu listo.",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "List Actions",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Import a Trello card",
     "listMorePopup-title": "Pli",
     "link-list": "Link to this list",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
     "lists": "Listoj",
     "swimlanes": "Swimlanes",
     "log-out": "Elsaluti",
@@ -294,9 +379,9 @@
     "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "My Boards",
     "name": "Nomo",
-    "no-archived-cards": "No cards in Recycle Bin.",
-    "no-archived-lists": "No lists in Recycle Bin.",
-    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
+    "no-archived-cards": "No cards in Archive.",
+    "no-archived-lists": "No lists in Archive.",
+    "no-archived-swimlanes": "No swimlanes in Archive.",
     "no-results": "Neniaj rezultoj",
     "normal": "Normala",
     "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -332,6 +417,7 @@
     "restore": "Forigi",
     "save": "Savi",
     "search": "Serĉi",
+    "rules": "Rules",
     "search-cards": "Search from card titles and descriptions on this board",
     "search-example": "Text to search for?",
     "select-color": "Select Color",
@@ -366,6 +452,7 @@
     "title": "Titolo",
     "tracking": "Tracking",
     "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
+    "type": "Type",
     "unassign-member": "Unassign member",
     "unsaved-description": "You have an unsaved description.",
     "unwatch": "Unwatch",
@@ -374,7 +461,7 @@
     "uploaded-avatar": "Uploaded an avatar",
     "username": "Uzantnomo",
     "view-it": "View it",
-    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
+    "warn-list-archived": "warning: this card is in an list at Archive",
     "watch": "Rigardi",
     "watching": "Rigardante",
     "watching-info": "You will be notified of any change in this board",
@@ -382,6 +469,9 @@
     "welcome-swimlane": "Milestone 1",
     "welcome-list1": "Basics",
     "welcome-list2": "Advanced",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
     "what-to-do": "Kion vi volas fari?",
     "wipLimitErrorPopup-title": "Invalid WIP Limit",
     "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
@@ -407,16 +497,16 @@
     "send-smtp-test": "Send a test email to yourself",
     "invitation-code": "Invitation Code",
     "email-invite-register-subject": "__inviter__ sent you an invitation",
-    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to Wekan for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
-    "email-smtp-test-subject": "SMTP Test Email From Wekan",
+    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email",
     "email-smtp-test-text": "You have successfully sent an email",
     "error-invitation-code-not-exist": "Invitation code doesn't exist",
     "error-notAuthorized": "You are not authorized to view this page.",
     "outgoing-webhooks": "Outgoing Webhooks",
     "outgoingWebhooksPopup-title": "Outgoing Webhooks",
+    "boardCardTitlePopup-title": "Card Title Filter",
     "new-outgoing-webhook": "New Outgoing Webhook",
     "no-name": "(Unknown)",
-    "Wekan_version": "Wekan version",
     "Node_version": "Node version",
     "OS_Arch": "OS Arch",
     "OS_Cpus": "OS CPU Count",
@@ -427,13 +517,18 @@
     "OS_Totalmem": "OS Total Memory",
     "OS_Type": "OS Type",
     "OS_Uptime": "OS Uptime",
+    "days": "days",
     "hours": "hours",
     "minutes": "minutes",
     "seconds": "seconds",
+    "show-field-on-card": "Show this field on card",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
     "yes": "Yes",
     "no": "No",
     "accounts": "Accounts",
     "accounts-allowEmailChange": "Allow Email Change",
+    "accounts-allowUserNameChange": "Allow Username Change",
     "createdAt": "Created at",
     "verified": "Verified",
     "active": "Active",
@@ -442,5 +537,157 @@
     "card-end": "End",
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
-    "editCardEndDatePopup-title": "Change end date"
-}
+    "editCardEndDatePopup-title": "Change end date",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "Assigned By",
+    "requested-by": "Requested By",
+    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
+    "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
+    "boardDeletePopup-title": "Delete Board?",
+    "delete-board": "Delete Board",
+    "default-subtasks-board": "Subtasks for __board__ board",
+    "default": "Default",
+    "queue": "Queue",
+    "subtask-settings": "Subtasks Settings",
+    "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
+    "show-subtasks-field": "Cards can have subtasks",
+    "deposit-subtasks-board": "Deposit subtasks to this board:",
+    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
+    "show-parent-in-minicard": "Show parent in minicard:",
+    "prefix-with-full-path": "Prefix with full path",
+    "prefix-with-parent": "Prefix with parent",
+    "subtext-with-full-path": "Subtext with full path",
+    "subtext-with-parent": "Subtext with parent",
+    "change-card-parent": "Change card's parent",
+    "parent-card": "Parent card",
+    "source-board": "Source board",
+    "no-parent": "Don't show parent",
+    "activity-added-label": "added label '%s' to %s",
+    "activity-removed-label": "removed label '%s' from %s",
+    "activity-delete-attach": "deleted an attachment from %s",
+    "activity-added-label-card": "added label '%s'",
+    "activity-removed-label-card": "removed label '%s'",
+    "activity-delete-attach-card": "deleted an attachment",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "r-rule": "Rule",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "Add action",
+    "r-board-rules": "Board rules",
+    "r-add-rule": "Add rule",
+    "r-view-rule": "View rule",
+    "r-delete-rule": "Delete rule",
+    "r-new-rule-name": "New rule title",
+    "r-no-rules": "No rules",
+    "r-when-a-card": "When a card",
+    "r-is": "is",
+    "r-is-moved": "is moved",
+    "r-added-to": "added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "the board",
+    "r-list": "list",
+    "set-filter": "Set Filter",
+    "r-moved-to": "Moved to",
+    "r-moved-from": "Moved from",
+    "r-archived": "Moved to Archive",
+    "r-unarchived": "Restored from Archive",
+    "r-a-card": "a card",
+    "r-when-a-label-is": "When a label is",
+    "r-when-the-label-is": "When the label is",
+    "r-list-name": "list name",
+    "r-when-a-member": "When a member is",
+    "r-when-the-member": "When the member",
+    "r-name": "name",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "r-when-the-item": "When the checklist item",
+    "r-checked": "Checked",
+    "r-unchecked": "Unchecked",
+    "r-move-card-to": "Move card to",
+    "r-top-of": "Top of",
+    "r-bottom-of": "Bottom of",
+    "r-its-list": "its list",
+    "r-archive": "Move to Archive",
+    "r-unarchive": "Restore from Archive",
+    "r-card": "card",
+    "r-add": "Aldoni",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-set-color": "Set color to",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "subject",
+    "r-rule-details": "Rule details",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Move card to top of list",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Move card to bottom of list",
+    "r-d-send-email": "Send email",
+    "r-d-send-email-to": "to",
+    "r-d-send-email-subject": "subject",
+    "r-d-send-email-message": "message",
+    "r-d-archive": "Move card to Archive",
+    "r-d-unarchive": "Restore card from Archive",
+    "r-d-add-label": "Add label",
+    "r-d-remove-label": "Remove label",
+    "r-create-card": "Create new card",
+    "r-in-list": "in list",
+    "r-in-swimlane": "in swimlane",
+    "r-d-add-member": "Add member",
+    "r-d-remove-member": "Remove member",
+    "r-d-remove-all-member": "Remove all member",
+    "r-d-check-all": "Check all items of a list",
+    "r-d-uncheck-all": "Uncheck all items of a list",
+    "r-d-check-one": "Check item",
+    "r-d-uncheck-one": "Uncheck item",
+    "r-d-check-of-list": "of checklist",
+    "r-d-add-checklist": "Add checklist",
+    "r-d-remove-checklist": "Remove checklist",
+    "r-by": "by",
+    "r-add-checklist": "Add checklist",
+    "r-with-items": "with items",
+    "r-items-list": "item1,item2,item3",
+    "r-add-swimlane": "Add swimlane",
+    "r-swimlane-name": "swimlane name",
+    "r-board-note": "Note: leave a field empty to match every possible value.",
+    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout",
+    "hide-logo": "Hide Logo",
+    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
+    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
+    "error-undefined": "Something went wrong",
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
+}
\ No newline at end of file
diff --git a/i18n/es-AR.i18n.json b/i18n/es-AR.i18n.json
index 60c1c114..9e4b5c35 100644
--- a/i18n/es-AR.i18n.json
+++ b/i18n/es-AR.i18n.json
@@ -1,35 +1,51 @@
 {
     "accept": "Aceptar",
-    "act-activity-notify": "[Wekan] Notificación de Actividad",
-    "act-addAttachment": "adjunto __attachment__ a __card__",
-    "act-addChecklist": "lista de ítems __checklist__ agregada a __card__",
-    "act-addChecklistItem": " __checklistItem__ agregada a lista de ítems __checklist__ en __card__",
-    "act-addComment": "comentado en __card__: __comment__",
-    "act-createBoard": "__board__ creado",
-    "act-createCard": "agregada __card__ a __list__",
-    "act-createList": "agregada __list__ a __board__",
-    "act-addBoardMember": "agregado __member__ a __board__",
-    "act-archivedBoard": "__board__ movido a Papelera de Reciclaje",
-    "act-archivedCard": "__card__ movido a Papelera de Reciclaje",
-    "act-archivedList": "__list__ movido a Papelera de Reciclaje",
-    "act-archivedSwimlane": "__swimlane__ movido a Papelera de Reciclaje",
-    "act-importBoard": "__board__ importado",
-    "act-importCard": "__card__ importada",
-    "act-importList": "__list__ importada",
-    "act-joinMember": "__member__ agregado a __card__",
-    "act-moveCard": "__card__ movida de __oldList__ a __list__",
-    "act-removeBoardMember": "__member__ removido de __board__",
-    "act-restoredCard": "__card__ restaurada a __board__",
-    "act-unjoinMember": "__member__ removido de __card__",
-    "act-withBoardTitle": "__board__ [Wekan]",
+    "act-activity-notify": "Notificación de Actividad",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__board__",
     "act-withCardTitle": "__card__ [__board__] ",
     "actions": "Acciones",
     "activities": "Actividades",
     "activity": "Actividad",
     "activity-added": "agregadas %s a %s",
-    "activity-archived": "%s movido a Papelera de Reciclaje",
+    "activity-archived": "%s moved to Archive",
     "activity-attached": "adjuntadas %s a %s",
     "activity-created": "creadas %s",
+    "activity-customfield-created": "created custom field %s",
     "activity-excluded": "excluidas %s de %s",
     "activity-imported": "importadas %s en %s de %s",
     "activity-imported-board": "importadas %s de %s",
@@ -39,13 +55,25 @@
     "activity-removed": "eliminadas %s de %s",
     "activity-sent": "enviadas %s a %s",
     "activity-unjoined": "separadas %s",
+    "activity-subtask-added": "added subtask to %s",
+    "activity-checked-item": "checked %s in checklist %s of %s",
+    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
     "activity-checklist-added": "agregada lista de tareas a %s",
+    "activity-checklist-removed": "removed a checklist from %s",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
     "activity-checklist-item-added": "agregado item de lista de tareas a '%s' en %s",
+    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
     "add": "Agregar",
+    "activity-checked-item-card": "checked %s in checklist %s",
+    "activity-unchecked-item-card": "unchecked %s in checklist %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
     "add-attachment": "Agregar Adjunto",
     "add-board": "Agregar Tablero",
     "add-card": "Agregar Tarjeta",
     "add-swimlane": "Agregar Calle",
+    "add-subtask": "Add Subtask",
     "add-checklist": "Agregar Lista de Tareas",
     "add-checklist-item": "Agregar ítem a lista de tareas",
     "add-cover": "Agregar Portadas",
@@ -63,20 +91,22 @@
     "and-n-other-card": "Y __count__ otra tarjeta",
     "and-n-other-card_plural": "Y __count__ otras tarjetas",
     "apply": "Aplicar",
-    "app-is-offline": "Wekan está cargándose, por favor espere. Refrescar la página va a causar pérdida de datos. Si Wekan no se carga, por favor revise que el servidor de Wekan no se haya detenido.",
-    "archive": "Mover a Papelera de Reciclaje",
-    "archive-all": "Mover Todo a la Papelera de Reciclaje",
-    "archive-board": "Mover Tablero a la Papelera de Reciclaje",
-    "archive-card": "Mover Tarjeta a la Papelera de Reciclaje",
-    "archive-list": "Mover Lista a la Papelera de Reciclaje",
-    "archive-swimlane": "Mover Calle a la Papelera de Reciclaje",
-    "archive-selection": "Mover selección a la Papelera de Reciclaje",
-    "archiveBoardPopup-title": "¿Mover Tablero a la Papelera de Reciclaje?",
-    "archived-items": "Papelera de Reciclaje",
-    "archived-boards": "Tableros en la Papelera de Reciclaje",
+    "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
+    "archive": "Move to Archive",
+    "archive-all": "Move All to Archive",
+    "archive-board": "Move Board to Archive",
+    "archive-card": "Move Card to Archive",
+    "archive-list": "Move List to Archive",
+    "archive-swimlane": "Move Swimlane to Archive",
+    "archive-selection": "Move selection to Archive",
+    "archiveBoardPopup-title": "Move Board to Archive?",
+    "archived-items": "Archivar",
+    "archived-boards": "Boards in Archive",
     "restore-board": "Restaurar Tablero",
-    "no-archived-boards": "No hay tableros en la Papelera de Reciclaje",
-    "archives": "Papelera de Reciclaje",
+    "no-archived-boards": "No Boards in Archive.",
+    "archives": "Archivar",
+    "template": "Template",
+    "templates": "Templates",
     "assign-member": "Asignar miembro",
     "attached": "adjunto(s)",
     "attachment": "Adjunto",
@@ -95,22 +125,25 @@
     "boardChangeTitlePopup-title": "Renombrar Tablero",
     "boardChangeVisibilityPopup-title": "Cambiar Visibilidad",
     "boardChangeWatchPopup-title": "Alternar Seguimiento",
-    "boardMenuPopup-title": "Menú del Tablero",
+    "boardMenuPopup-title": "Board Settings",
     "boards": "Tableros",
     "board-view": "Vista de Tablero",
+    "board-view-cal": "Calendar",
     "board-view-swimlanes": "Calles",
     "board-view-lists": "Listas",
     "bucket-example": "Como \"Lista de Contenedores\" por ejemplo",
     "cancel": "Cancelar",
-    "card-archived": "Esta tarjeta es movida a la Papelera de Reciclaje",
+    "card-archived": "This card is moved to Archive.",
+    "board-archived": "This board is moved to Archive.",
     "card-comments-title": "Esta tarjeta tiene %s comentario.",
     "card-delete-notice": "Borrar es permanente. Perderás todas las acciones asociadas con esta tarjeta.",
     "card-delete-pop": "Todas las acciones van a ser eliminadas del agregador de actividad y no podrás re-abrir la tarjeta. No hay deshacer.",
-    "card-delete-suggest-archive": "Tu puedes mover una tarjeta a la Papelera de Reciclaje para removerla del tablero y preservar la actividad.",
+    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
     "card-due": "Vence",
     "card-due-on": "Vence en",
     "card-spent": "Tiempo Empleado",
     "card-edit-attachments": "Editar adjuntos",
+    "card-edit-custom-fields": "Edit custom fields",
     "card-edit-labels": "Editar etiquetas",
     "card-edit-members": "Editar miembros",
     "card-labels-title": "Cambiar las etiquetas de la tarjeta.",
@@ -118,13 +151,20 @@
     "card-start": "Empieza",
     "card-start-on": "Empieza el",
     "cardAttachmentsPopup-title": "Adjuntar De",
+    "cardCustomField-datePopup-title": "Change date",
+    "cardCustomFieldsPopup-title": "Edit custom fields",
     "cardDeletePopup-title": "¿Borrar Tarjeta?",
     "cardDetailsActionsPopup-title": "Acciones de la Tarjeta",
     "cardLabelsPopup-title": "Etiquetas",
     "cardMembersPopup-title": "Miembros",
     "cardMorePopup-title": "Mas",
+    "cardTemplatePopup-title": "Create template",
     "cards": "Tarjetas",
     "cards-count": "Tarjetas",
+    "casSignIn": "Sign In with CAS",
+    "cardType-card": "Card",
+    "cardType-linkedCard": "Linked Card",
+    "cardType-linkedBoard": "Linked Board",
     "change": "Cambiar",
     "change-avatar": "Cambiar Avatar",
     "change-password": "Cambiar Contraseña",
@@ -135,30 +175,52 @@
     "changePasswordPopup-title": "Cambiar Contraseña",
     "changePermissionsPopup-title": "Cambiar Permisos",
     "changeSettingsPopup-title": "Cambiar Opciones",
+    "subtasks": "Subtasks",
     "checklists": "Listas de ítems",
     "click-to-star": "Clickeá para darle una estrella a este tablero.",
     "click-to-unstar": "Clickeá para sacarle la estrella al tablero.",
     "clipboard": "Portapapeles o arrastrar y soltar",
     "close": "Cerrar",
     "close-board": "Cerrar Tablero",
-    "close-board-pop": "Podrás restaurar el tablero apretando el botón \"Papelera de Reciclaje\" del encabezado en inicio.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
     "color-black": "negro",
     "color-blue": "azul",
+    "color-crimson": "crimson",
+    "color-darkgreen": "darkgreen",
+    "color-gold": "gold",
+    "color-gray": "gray",
     "color-green": "verde",
+    "color-indigo": "indigo",
     "color-lime": "lima",
+    "color-magenta": "magenta",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "navy",
     "color-orange": "naranja",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
     "color-pink": "rosa",
+    "color-plum": "plum",
     "color-purple": "púrpura",
     "color-red": "rojo",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "silver",
     "color-sky": "cielo",
+    "color-slateblue": "slateblue",
+    "color-white": "white",
     "color-yellow": "amarillo",
+    "unset-color": "Unset",
     "comment": "Comentario",
     "comment-placeholder": "Comentar",
     "comment-only": "Comentar solamente",
     "comment-only-desc": "Puede comentar en tarjetas solamente.",
+    "no-comments": "No comments",
+    "no-comments-desc": "Can not see comments and activities.",
     "computer": "Computadora",
-    "confirm-checklist-delete-dialog": "¿Estás segur@ que querés borrar la lista de ítems?",
+    "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?",
+    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
     "copy-card-link-to-clipboard": "Copiar enlace a tarjeta en el portapapeles",
+    "linkCardPopup-title": "Link Card",
+    "searchElementPopup-title": "Buscar",
     "copyCardPopup-title": "Copiar Tarjeta",
     "copyChecklistToManyCardsPopup-title": "Copiar Plantilla Checklist a Muchas Tarjetas",
     "copyChecklistToManyCardsPopup-instructions": "Títulos y Descripciones de la Tarjeta Destino en este formato JSON",
@@ -167,11 +229,25 @@
     "createBoardPopup-title": "Crear Tablero",
     "chooseBoardSourcePopup-title": "Importar tablero",
     "createLabelPopup-title": "Crear Etiqueta",
+    "createCustomField": "Create Field",
+    "createCustomFieldPopup-title": "Create Field",
     "current": "actual",
+    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
+    "custom-field-checkbox": "Checkbox",
+    "custom-field-date": "Fecha",
+    "custom-field-dropdown": "Dropdown List",
+    "custom-field-dropdown-none": "(none)",
+    "custom-field-dropdown-options": "List Options",
+    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
+    "custom-field-dropdown-unknown": "(unknown)",
+    "custom-field-number": "Number",
+    "custom-field-text": "Text",
+    "custom-fields": "Custom Fields",
     "date": "Fecha",
     "decline": "Rechazar",
     "default-avatar": "Avatar por defecto",
     "delete": "Borrar",
+    "deleteCustomFieldPopup-title": "Delete Custom Field?",
     "deleteLabelPopup-title": "¿Borrar Etiqueta?",
     "description": "Descripción",
     "disambiguateMultiLabelPopup-title": "Desambiguación de Acción de Etiqueta",
@@ -186,6 +262,7 @@
     "soft-wip-limit": "Límite TEP suave",
     "editCardStartDatePopup-title": "Cambiar fecha de inicio",
     "editCardDueDatePopup-title": "Cambiar fecha de vencimiento",
+    "editCustomFieldPopup-title": "Edit Field",
     "editCardSpentTimePopup-title": "Cambiar tiempo empleado",
     "editLabelPopup-title": "Cambiar Etiqueta",
     "editNotificationPopup-title": "Editar Notificación",
@@ -222,30 +299,36 @@
     "filter-clear": "Sacar filtro",
     "filter-no-label": "Sin etiqueta",
     "filter-no-member": "No es miembro",
+    "filter-no-custom-fields": "No Custom Fields",
     "filter-on": "El filtro está activado",
     "filter-on-desc": "Estás filtrando cartas en este tablero. Clickeá acá para editar el filtro.",
     "filter-to-selection": "Filtrar en la selección",
+    "advanced-filter-label": "Advanced Filter",
+    "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) to be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
     "fullname": "Nombre Completo",
     "header-logo-title": "Retroceder a tu página de tableros.",
     "hide-system-messages": "Esconder mensajes del sistema",
     "headerBarCreateBoardPopup-title": "Crear Tablero",
     "home": "Inicio",
     "import": "Importar",
+    "link": "Link",
     "import-board": "importar tablero",
     "import-board-c": "Importar tablero",
     "import-board-title-trello": "Importar tablero de Trello",
-    "import-board-title-wekan": "Importar tablero de Wekan",
+    "import-board-title-wekan": "Import board from previous export",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
     "import-sandstorm-warning": "El tablero importado va a borrar todos los datos existentes en el tablero y reemplazarlos con los del tablero en cuestión.",
     "from-trello": "De Trello",
-    "from-wekan": "De Wekan",
+    "from-wekan": "From previous export",
     "import-board-instruction-trello": "En tu tablero de Trello, ve a 'Menú', luego a 'Más', 'Imprimir y Exportar', 'Exportar JSON', y copia el texto resultante.",
-    "import-board-instruction-wekan": "En tu tablero Wekan, ve a 'Menú', luego a 'Exportar tablero', y copia el texto en el archivo descargado.",
+    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
     "import-json-placeholder": "Pegá tus datos JSON válidos acá",
     "import-map-members": "Mapear Miembros",
-    "import-members-map": "Tu tablero importado tiene algunos miembros. Por favor mapeá los miembros que quieras importar/convertir a usuarios de Wekan.",
+    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
     "import-show-user-mapping": "Revisar mapeo de miembros",
-    "import-user-select": "Elegí el usuario de Wekan que querés usar como éste miembro",
-    "importMapMembersAddPopup-title": "Elegí el miembro de Wekan.",
+    "import-user-select": "Pick your existing user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select member",
     "info": "Versión",
     "initials": "Iniciales",
     "invalid-date": "Fecha inválida",
@@ -264,17 +347,19 @@
     "leave-board-pop": "¿Estás seguro que querés dejar __boardTitle__? Vas a salir de todas las tarjetas en este tablero.",
     "leaveBoardPopup-title": "¿Dejar Tablero?",
     "link-card": "Enlace a esta tarjeta",
-    "list-archive-cards": "Mover todas las tarjetas en esta lista a la Papelera de Reciclaje",
-    "list-archive-cards-pop": "Esto va a remover las tarjetas en esta lista del tablero. Para ver tarjetas en la Papelera de Reciclaje y traerlas de vuelta al tablero, clickeá \"Menú\" > \"Papelera de Reciclaje\".",
+    "list-archive-cards": "Move all cards in this list to Archive",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Mueve todas las tarjetas en esta lista",
     "list-select-cards": "Selecciona todas las tarjetas en esta lista",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "Listar Acciones",
     "swimlaneActionPopup-title": "Acciones de la Calle",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Importar una tarjeta Trello",
     "listMorePopup-title": "Mas",
     "link-list": "Enlace a esta lista",
     "list-delete-pop": "Todas las acciones van a ser eliminadas del agregador de actividad y no podás recuperar la lista. No se puede deshacer.",
-    "list-delete-suggest-archive": "Podés mover la lista a la Papelera de Reciclaje para remvoerla del tablero y preservar la actividad.",
+    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
     "lists": "Listas",
     "swimlanes": "Calles",
     "log-out": "Salir",
@@ -294,9 +379,9 @@
     "muted-info": "No serás notificado de ningún cambio en este tablero",
     "my-boards": "Mis Tableros",
     "name": "Nombre",
-    "no-archived-cards": "No hay tarjetas en la Papelera de Reciclaje",
-    "no-archived-lists": "No hay listas en la Papelera de Reciclaje",
-    "no-archived-swimlanes": "No hay calles en la Papelera de Reciclaje",
+    "no-archived-cards": "No cards in Archive.",
+    "no-archived-lists": "No lists in Archive.",
+    "no-archived-swimlanes": "No swimlanes in Archive.",
     "no-results": "No hay resultados",
     "normal": "Normal",
     "normal-desc": "Puede ver y editar tarjetas. No puede cambiar opciones.",
@@ -332,6 +417,7 @@
     "restore": "Restaurar",
     "save": "Grabar",
     "search": "Buscar",
+    "rules": "Rules",
     "search-cards": "Buscar en títulos y descripciones de tarjeta en este tablero",
     "search-example": "¿Texto a buscar?",
     "select-color": "Seleccionar Color",
@@ -366,6 +452,7 @@
     "title": "Título",
     "tracking": "Seguimiento",
     "tracking-info": "Serás notificado de cualquier cambio a aquellas tarjetas en las que seas creador o miembro.",
+    "type": "Type",
     "unassign-member": "Desasignar miembro",
     "unsaved-description": "Tienes una descripción sin guardar.",
     "unwatch": "Dejar de seguir",
@@ -374,7 +461,7 @@
     "uploaded-avatar": "Cargado un avatar",
     "username": "Nombre de usuario",
     "view-it": "Verlo",
-    "warn-list-archived": "cuidado; esta tarjeta está en la Papelera de Reciclaje",
+    "warn-list-archived": "warning: this card is in an list at Archive",
     "watch": "Seguir",
     "watching": "Siguiendo",
     "watching-info": "Serás notificado de cualquier cambio en este tablero",
@@ -382,6 +469,9 @@
     "welcome-swimlane": "Hito 1",
     "welcome-list1": "Básicos",
     "welcome-list2": "Avanzado",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
     "what-to-do": "¿Qué querés hacer?",
     "wipLimitErrorPopup-title": "Límite TEP Inválido",
     "wipLimitErrorPopup-dialog-pt1": " El número de tareas en esta lista es mayor que el límite TEP que definiste.",
@@ -407,16 +497,16 @@
     "send-smtp-test": "Enviarse un email de prueba",
     "invitation-code": "Código de Invitación",
     "email-invite-register-subject": "__inviter__ te envió una invitación",
-    "email-invite-register-text": "Querido __user__,\n\n__inviter__ te invita a Wekan para colaborar.\n\nPor favor sigue el enlace de abajo:\n__url__\n\nI tu código de invitación es: __icode__\n\nGracias.",
-    "email-smtp-test-subject": "Email de Prueba SMTP de Wekan",
+    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email",
     "email-smtp-test-text": "Enviaste el correo correctamente",
     "error-invitation-code-not-exist": "El código de invitación no existe",
     "error-notAuthorized": "No estás autorizado para ver esta página.",
     "outgoing-webhooks": "Ganchos Web Salientes",
     "outgoingWebhooksPopup-title": "Ganchos Web Salientes",
+    "boardCardTitlePopup-title": "Card Title Filter",
     "new-outgoing-webhook": "Nuevo Gancho Web",
     "no-name": "(desconocido)",
-    "Wekan_version": "Versión de Wekan",
     "Node_version": "Versión de Node",
     "OS_Arch": "Arch del SO",
     "OS_Cpus": "Cantidad de CPU del SO",
@@ -427,13 +517,18 @@
     "OS_Totalmem": "Memoria Total del SO",
     "OS_Type": "Tipo de SO",
     "OS_Uptime": "Tiempo encendido del SO",
+    "days": "days",
     "hours": "horas",
     "minutes": "minutos",
     "seconds": "segundos",
+    "show-field-on-card": "Show this field on card",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
     "yes": "Si",
     "no": "No",
     "accounts": "Cuentas",
     "accounts-allowEmailChange": "Permitir Cambio de Email",
+    "accounts-allowUserNameChange": "Allow Username Change",
     "createdAt": "Creado en",
     "verified": "Verificado",
     "active": "Activo",
@@ -442,5 +537,157 @@
     "card-end": "Termino",
     "card-end-on": "Termina en",
     "editCardReceivedDatePopup-title": "Cambiar fecha de recepción",
-    "editCardEndDatePopup-title": "Cambiar fecha de término"
-}
+    "editCardEndDatePopup-title": "Cambiar fecha de término",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "Assigned By",
+    "requested-by": "Requested By",
+    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
+    "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
+    "boardDeletePopup-title": "Delete Board?",
+    "delete-board": "Delete Board",
+    "default-subtasks-board": "Subtasks for __board__ board",
+    "default": "Default",
+    "queue": "Queue",
+    "subtask-settings": "Subtasks Settings",
+    "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
+    "show-subtasks-field": "Cards can have subtasks",
+    "deposit-subtasks-board": "Deposit subtasks to this board:",
+    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
+    "show-parent-in-minicard": "Show parent in minicard:",
+    "prefix-with-full-path": "Prefix with full path",
+    "prefix-with-parent": "Prefix with parent",
+    "subtext-with-full-path": "Subtext with full path",
+    "subtext-with-parent": "Subtext with parent",
+    "change-card-parent": "Change card's parent",
+    "parent-card": "Parent card",
+    "source-board": "Source board",
+    "no-parent": "Don't show parent",
+    "activity-added-label": "added label '%s' to %s",
+    "activity-removed-label": "removed label '%s' from %s",
+    "activity-delete-attach": "deleted an attachment from %s",
+    "activity-added-label-card": "added label '%s'",
+    "activity-removed-label-card": "removed label '%s'",
+    "activity-delete-attach-card": "deleted an attachment",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "r-rule": "Rule",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "Add action",
+    "r-board-rules": "Board rules",
+    "r-add-rule": "Add rule",
+    "r-view-rule": "View rule",
+    "r-delete-rule": "Delete rule",
+    "r-new-rule-name": "New rule title",
+    "r-no-rules": "No rules",
+    "r-when-a-card": "When a card",
+    "r-is": "is",
+    "r-is-moved": "is moved",
+    "r-added-to": "added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "the board",
+    "r-list": "list",
+    "set-filter": "Set Filter",
+    "r-moved-to": "Moved to",
+    "r-moved-from": "Moved from",
+    "r-archived": "Moved to Archive",
+    "r-unarchived": "Restored from Archive",
+    "r-a-card": "a card",
+    "r-when-a-label-is": "When a label is",
+    "r-when-the-label-is": "When the label is",
+    "r-list-name": "list name",
+    "r-when-a-member": "When a member is",
+    "r-when-the-member": "When the member",
+    "r-name": "name",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "r-when-the-item": "When the checklist item",
+    "r-checked": "Checked",
+    "r-unchecked": "Unchecked",
+    "r-move-card-to": "Move card to",
+    "r-top-of": "Top of",
+    "r-bottom-of": "Bottom of",
+    "r-its-list": "its list",
+    "r-archive": "Move to Archive",
+    "r-unarchive": "Restore from Archive",
+    "r-card": "card",
+    "r-add": "Agregar",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-set-color": "Set color to",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "subject",
+    "r-rule-details": "Rule details",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Move card to top of list",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Move card to bottom of list",
+    "r-d-send-email": "Send email",
+    "r-d-send-email-to": "to",
+    "r-d-send-email-subject": "subject",
+    "r-d-send-email-message": "message",
+    "r-d-archive": "Move card to Archive",
+    "r-d-unarchive": "Restore card from Archive",
+    "r-d-add-label": "Add label",
+    "r-d-remove-label": "Remove label",
+    "r-create-card": "Create new card",
+    "r-in-list": "in list",
+    "r-in-swimlane": "in swimlane",
+    "r-d-add-member": "Add member",
+    "r-d-remove-member": "Remove member",
+    "r-d-remove-all-member": "Remove all member",
+    "r-d-check-all": "Check all items of a list",
+    "r-d-uncheck-all": "Uncheck all items of a list",
+    "r-d-check-one": "Check item",
+    "r-d-uncheck-one": "Uncheck item",
+    "r-d-check-of-list": "of checklist",
+    "r-d-add-checklist": "Add checklist",
+    "r-d-remove-checklist": "Remove checklist",
+    "r-by": "by",
+    "r-add-checklist": "Add checklist",
+    "r-with-items": "with items",
+    "r-items-list": "item1,item2,item3",
+    "r-add-swimlane": "Add swimlane",
+    "r-swimlane-name": "swimlane name",
+    "r-board-note": "Note: leave a field empty to match every possible value.",
+    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout",
+    "hide-logo": "Hide Logo",
+    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
+    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
+    "error-undefined": "Something went wrong",
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
+}
\ No newline at end of file
diff --git a/i18n/es.i18n.json b/i18n/es.i18n.json
index c8b0f422..7529391b 100644
--- a/i18n/es.i18n.json
+++ b/i18n/es.i18n.json
@@ -1,35 +1,51 @@
 {
     "accept": "Aceptar",
-    "act-activity-notify": "[Wekan] Notificación de actividad",
-    "act-addAttachment": "ha adjuntado __attachment__ a __card__",
-    "act-addChecklist": "ha añadido la lista de verificación __checklist__ a __card__",
-    "act-addChecklistItem": "ha añadido __checklistItem__ a la lista de verificación __checklist__ en __card__",
-    "act-addComment": "ha comentado en __card__: __comment__",
-    "act-createBoard": "ha creado __board__",
-    "act-createCard": "ha añadido __card__ a __list__",
-    "act-createList": "ha añadido __list__ a __board__",
-    "act-addBoardMember": "ha añadido a __member__ a __board__",
-    "act-archivedBoard": "__board__ se ha enviado a la papelera de reciclaje",
-    "act-archivedCard": "__card__ se ha enviado a la papelera de reciclaje",
-    "act-archivedList": "__list__ se ha enviado a la papelera de reciclaje",
-    "act-archivedSwimlane": "__swimlane__ se ha enviado a la papelera de reciclaje",
-    "act-importBoard": "ha importado __board__",
-    "act-importCard": "ha importado __card__",
-    "act-importList": "ha importado __list__",
-    "act-joinMember": "ha añadido a __member__ a __card__",
-    "act-moveCard": "ha movido __card__ desde __oldList__ a __list__",
-    "act-removeBoardMember": "ha desvinculado a __member__ de __board__",
-    "act-restoredCard": "ha restaurado __card__ en __board__",
-    "act-unjoinMember": "ha desvinculado a __member__ de __card__",
-    "act-withBoardTitle": "[Wekan] __board__",
+    "act-activity-notify": "Notificación de actividad",
+    "act-addAttachment": "añadido el adjunto __attachment__ a la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-deleteAttachment": "eliminado el adjunto __attachment__ de la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-addSubtask": "añadida la subtarea __subtask__ a la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-addLabel": "añadida la etiqueta __label__ a la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-addedLabel": "añadida la etiqueta __label__ a la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-removeLabel": "eliminada la etiqueta __label__ de la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-removedLabel": "eliminada la etiqueta __label__ de la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-addChecklist": "añadida la lista de verificación __checklist__ a la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-addChecklistItem": "añadido el elemento __checklistItem__ a la lista de verificación __checklist__ de la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-removeChecklist": "eliminada la lista de verificación __checklist__ de la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-removeChecklistItem": "eliminado el elemento __checklistItem__ de la lista de verificación __checkList__ de la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-checkedItem": "marcado el elemento __checklistItem__ de la lista de verificación __checklist__ de la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-uncheckedItem": "desmarcado el elemento __checklistItem__ de la lista de verificación __checklist__ de la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-completeChecklist": "completada la lista de verificación __checklist__ de la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-uncompleteChecklist": "no completada la lista de verificación __checklist__ de la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-addComment": "comentario en la tarjeta__card__: __comment__ de la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-createBoard": "creó el tablero __board__",
+    "act-createSwimlane": "creó el carril de flujo __swimlane__ en el tablero __board__",
+    "act-createCard": "creada la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-createCustomField": "creó el campo personalizado __customField__ en la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-createList": "añadida la lista __list__ al tablero __board__",
+    "act-addBoardMember": "añadido el mimbro __member__ al tablero __board__",
+    "act-archivedBoard": "El tablero __board__ se ha movido a Archivo",
+    "act-archivedCard": "La tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__ se ha movido a Archivo",
+    "act-archivedList": "La lista __list__ del carril __swimlane__ del tablero __board__ se ha movido a Archivo",
+    "act-archivedSwimlane": "El carril __swimlane__ del tablero __board__ se ha movido a Archivo",
+    "act-importBoard": "importado el tablero __board__",
+    "act-importCard": "importada la tarjeta __card__ a la lista __list__ del carrril __swimlane__ del tablero __board__",
+    "act-importList": "importada la lista __list__ al carril __swimlane__ del tablero __board__",
+    "act-joinMember": "añadido el miembro __member__ a la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-moveCard": "movida la tarjeta __card__ del tablero __board__ de la lista __oldList__ del carril __oldSwimlane__ a la lista __list__ del carril __swimlane__",
+    "act-moveCardToOtherBoard": "movida la tarjeta __card__ de la lista __oldList__ del carril __oldSwimlane__ del tablero __oldBoard__ a la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-removeBoardMember": "eliminado el miembro __member__ del tablero __board__",
+    "act-restoredCard": "restaurada la tarjeta __card__ a la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-unjoinMember": "eliminado el miembro __member__ de la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-withBoardTitle": "__board__",
     "act-withCardTitle": "[__board__] __card__",
     "actions": "Acciones",
     "activities": "Actividades",
     "activity": "Actividad",
     "activity-added": "ha añadido %s a %s",
-    "activity-archived": "%s se ha enviado a la papelera de reciclaje",
+    "activity-archived": "%s movido a Archivo",
     "activity-attached": "ha adjuntado %s a %s",
     "activity-created": "ha creado %s",
+    "activity-customfield-created": "creó el campo personalizado %s",
     "activity-excluded": "ha excluido %s de %s",
     "activity-imported": "ha importado %s a %s desde %s",
     "activity-imported-board": "ha importado %s desde %s",
@@ -39,13 +55,25 @@
     "activity-removed": "ha eliminado %s de %s",
     "activity-sent": "ha enviado %s a %s",
     "activity-unjoined": "se ha desvinculado de %s",
+    "activity-subtask-added": "ha añadido la subtarea a %s",
+    "activity-checked-item": "marcado %s en la lista de verificación %s de %s",
+    "activity-unchecked-item": "desmarcado %s en lista  %s de %s",
     "activity-checklist-added": "ha añadido una lista de verificación a %s",
+    "activity-checklist-removed": "eliminada una lista de verificación desde %s ",
+    "activity-checklist-completed": "completada la lista de verificación __checklist__ de la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
+    "activity-checklist-uncompleted": "no completado la lista %s de %s",
     "activity-checklist-item-added": "ha añadido el elemento de la lista de verificación a '%s' en %s",
+    "activity-checklist-item-removed": "eliminado un elemento de la lista de verificación desde '%s' en %s",
     "add": "Añadir",
+    "activity-checked-item-card": "marcado %s en la lista de verificación %s",
+    "activity-unchecked-item-card": "desmarcado %s en la lista de verificación %s",
+    "activity-checklist-completed-card": "completada la lista de verificación __checklist__ de la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
+    "activity-checklist-uncompleted-card": "no completó la lista de verificación %s",
     "add-attachment": "Añadir adjunto",
     "add-board": "Añadir tablero",
     "add-card": "Añadir una tarjeta",
     "add-swimlane": "Añadir un carril de flujo",
+    "add-subtask": "Añadir subtarea",
     "add-checklist": "Añadir una lista de verificación",
     "add-checklist-item": "Añadir un elemento a la lista de verificación",
     "add-cover": "Añadir portada",
@@ -55,7 +83,7 @@
     "added": "Añadida el",
     "addMemberPopup-title": "Miembros",
     "admin": "Administrador",
-    "admin-desc": "Puedes ver y editar tarjetas, eliminar miembros, y cambiar los ajustes del tablero",
+    "admin-desc": "Puedes ver y editar tarjetas, eliminar miembros, y cambiar las preferencias del tablero",
     "admin-announcement": "Aviso",
     "admin-announcement-active": "Activar el aviso para todo el sistema",
     "admin-announcement-title": "Aviso del administrador",
@@ -63,20 +91,22 @@
     "and-n-other-card": "y __count__ tarjeta más",
     "and-n-other-card_plural": "y otras __count__ tarjetas",
     "apply": "Aplicar",
-    "app-is-offline": "Wekan se está cargando, por favor espere. Actualizar la página provocará la pérdida de datos. Si Wekan no se carga, por favor verifique que el servidor de Wekan no está detenido.",
-    "archive": "Enviar a la papelera de reciclaje",
-    "archive-all": "Enviar todo a la papelera de reciclaje",
-    "archive-board": "Enviar el tablero a la papelera de reciclaje",
-    "archive-card": "Enviar la tarjeta a la papelera de reciclaje",
-    "archive-list": "Enviar la lista a la papelera de reciclaje",
-    "archive-swimlane": "Enviar el carril de flujo a la papelera de reciclaje",
-    "archive-selection": "Enviar la selección a la papelera de reciclaje",
-    "archiveBoardPopup-title": "Enviar el tablero a la papelera de reciclaje",
-    "archived-items": "Papelera de reciclaje",
-    "archived-boards": "Tableros en la papelera de reciclaje",
+    "app-is-offline": "Cargando, espera por favor. Refrescar esta página causará pérdida de datos. Si la carga no funciona, por favor comprueba que el servidor no se ha parado.",
+    "archive": "Mover al Archivo",
+    "archive-all": "Mover todo al Archivo",
+    "archive-board": "Mover Tablero al Archivo",
+    "archive-card": "Mover tarjeta al Archivo",
+    "archive-list": "Mover Lista al Archivo",
+    "archive-swimlane": "Mover carril al Archivo",
+    "archive-selection": "Mover selección al Archivo",
+    "archiveBoardPopup-title": "¿Mover Tablero al Archivo?",
+    "archived-items": "Archivar",
+    "archived-boards": "Tableros en Archivo",
     "restore-board": "Restaurar el tablero",
-    "no-archived-boards": "No hay tableros en la papelera de reciclaje",
-    "archives": "Papelera de reciclaje",
+    "no-archived-boards": "No hay Tableros en el Archivo",
+    "archives": "Archivar",
+    "template": "Plantilla",
+    "templates": "Plantillas",
     "assign-member": "Asignar miembros",
     "attached": "adjuntado",
     "attachment": "Adjunto",
@@ -95,22 +125,25 @@
     "boardChangeTitlePopup-title": "Renombrar el tablero",
     "boardChangeVisibilityPopup-title": "Cambiar visibilidad",
     "boardChangeWatchPopup-title": "Cambiar vigilancia",
-    "boardMenuPopup-title": "Menú del tablero",
+    "boardMenuPopup-title": "Preferencias del tablero",
     "boards": "Tableros",
     "board-view": "Vista del tablero",
+    "board-view-cal": "Calendario",
     "board-view-swimlanes": "Carriles",
     "board-view-lists": "Listas",
     "bucket-example": "Como “Cosas por hacer” por ejemplo",
     "cancel": "Cancelar",
-    "card-archived": "Esta tarjeta se ha enviado a la papelera de reciclaje.",
+    "card-archived": "Esta tarjeta se movió al Archivo",
+    "board-archived": "Este tablero se movió al Archivo",
     "card-comments-title": "Esta tarjeta tiene %s comentarios.",
     "card-delete-notice": "la eliminación es permanente. Perderás todas las acciones asociadas a esta tarjeta.",
     "card-delete-pop": "Se eliminarán todas las acciones del historial de actividades y no se podrá volver a abrir la tarjeta. Esta acción no puede deshacerse.",
-    "card-delete-suggest-archive": "Puedes enviar una tarjeta a la papelera de reciclaje para eliminarla del tablero y conservar la actividad.",
+    "card-delete-suggest-archive": "Puedes mover una tarjeta al Archivo para quitarla del tablero y preservar la actividad.",
     "card-due": "Vence",
     "card-due-on": "Vence el",
     "card-spent": "Tiempo consumido",
     "card-edit-attachments": "Editar los adjuntos",
+    "card-edit-custom-fields": "Editar los campos personalizados",
     "card-edit-labels": "Editar las etiquetas",
     "card-edit-members": "Editar los miembros",
     "card-labels-title": "Cambia las etiquetas de la tarjeta",
@@ -118,13 +151,20 @@
     "card-start": "Comienza",
     "card-start-on": "Comienza el",
     "cardAttachmentsPopup-title": "Adjuntar desde",
+    "cardCustomField-datePopup-title": "Cambiar la fecha",
+    "cardCustomFieldsPopup-title": "Editar los campos personalizados",
     "cardDeletePopup-title": "¿Eliminar la tarjeta?",
     "cardDetailsActionsPopup-title": "Acciones de la tarjeta",
     "cardLabelsPopup-title": "Etiquetas",
     "cardMembersPopup-title": "Miembros",
     "cardMorePopup-title": "Más",
+    "cardTemplatePopup-title": "Crear plantilla",
     "cards": "Tarjetas",
     "cards-count": "Tarjetas",
+    "casSignIn": "Iniciar sesión con CAS",
+    "cardType-card": "Tarjeta",
+    "cardType-linkedCard": "Tarjeta enlazada",
+    "cardType-linkedBoard": "Tablero enlazado",
     "change": "Cambiar",
     "change-avatar": "Cambiar el avatar",
     "change-password": "Cambiar la contraseña",
@@ -135,30 +175,52 @@
     "changePasswordPopup-title": "Cambiar la contraseña",
     "changePermissionsPopup-title": "Cambiar los permisos",
     "changeSettingsPopup-title": "Cambiar las preferencias",
+    "subtasks": "Subtareas",
     "checklists": "Lista de verificación",
     "click-to-star": "Haz clic para destacar este tablero.",
     "click-to-unstar": "Haz clic para dejar de destacar este tablero.",
     "clipboard": "el portapapeles o con arrastrar y soltar",
     "close": "Cerrar",
     "close-board": "Cerrar el tablero",
-    "close-board-pop": "Podrás restaurar el tablero haciendo clic en el botón \"Papelera de reciclaje\" en la cabecera.",
+    "close-board-pop": "Podrás restaurar el tablero haciendo clic en el botón \"Archivo\" del encabezado de la pantalla inicial.",
     "color-black": "negra",
     "color-blue": "azul",
+    "color-crimson": "carmesí",
+    "color-darkgreen": "verde oscuro",
+    "color-gold": "oro",
+    "color-gray": "gris",
     "color-green": "verde",
+    "color-indigo": "añil",
     "color-lime": "lima",
+    "color-magenta": "magenta",
+    "color-mistyrose": "rosa claro",
+    "color-navy": "azul marino",
     "color-orange": "naranja",
+    "color-paleturquoise": "turquesa",
+    "color-peachpuff": "melocotón",
     "color-pink": "rosa",
+    "color-plum": "púrpura",
     "color-purple": "violeta",
     "color-red": "roja",
+    "color-saddlebrown": "marrón",
+    "color-silver": "plata",
     "color-sky": "celeste",
+    "color-slateblue": "azul",
+    "color-white": "blanco",
     "color-yellow": "amarilla",
+    "unset-color": "Desmarcar",
     "comment": "Comentar",
     "comment-placeholder": "Escribir comentario",
     "comment-only": "Sólo comentarios",
     "comment-only-desc": "Solo puedes comentar en las tarjetas.",
+    "no-comments": "No hay comentarios",
+    "no-comments-desc": "No se pueden mostrar comentarios ni actividades.",
     "computer": "el ordenador",
-    "confirm-checklist-delete-dialog": "¿Seguro que desea eliminar la lista de verificación?",
+    "confirm-subtask-delete-dialog": "¿Seguro que quieres eliminar la subtarea?",
+    "confirm-checklist-delete-dialog": "¿Seguro que quieres eliminar la lista de verificación?",
     "copy-card-link-to-clipboard": "Copiar el enlace de la tarjeta al portapapeles",
+    "linkCardPopup-title": "Enlazar tarjeta",
+    "searchElementPopup-title": "Buscar",
     "copyCardPopup-title": "Copiar la tarjeta",
     "copyChecklistToManyCardsPopup-title": "Copiar la plantilla de la lista de verificación en varias tarjetas",
     "copyChecklistToManyCardsPopup-instructions": "Títulos y descripciones de las tarjetas de destino en formato JSON",
@@ -167,11 +229,25 @@
     "createBoardPopup-title": "Crear tablero",
     "chooseBoardSourcePopup-title": "Importar un tablero",
     "createLabelPopup-title": "Crear etiqueta",
+    "createCustomField": "Crear un campo",
+    "createCustomFieldPopup-title": "Crear un campo",
     "current": "actual",
+    "custom-field-delete-pop": "Se eliminará este campo personalizado de todas las tarjetas y se destruirá su historial. Esta acción no puede deshacerse.",
+    "custom-field-checkbox": "Casilla de verificación",
+    "custom-field-date": "Fecha",
+    "custom-field-dropdown": "Lista desplegable",
+    "custom-field-dropdown-none": "(nada)",
+    "custom-field-dropdown-options": "Opciones de la lista",
+    "custom-field-dropdown-options-placeholder": "Pulsa Intro para añadir más opciones",
+    "custom-field-dropdown-unknown": "(desconocido)",
+    "custom-field-number": "Número",
+    "custom-field-text": "Texto",
+    "custom-fields": "Campos personalizados",
     "date": "Fecha",
     "decline": "Declinar",
     "default-avatar": "Avatar por defecto",
     "delete": "Eliminar",
+    "deleteCustomFieldPopup-title": "¿Eliminar el campo personalizado?",
     "deleteLabelPopup-title": "¿Eliminar la etiqueta?",
     "description": "Descripción",
     "disambiguateMultiLabelPopup-title": "Desambiguar la acción de etiqueta",
@@ -186,6 +262,7 @@
     "soft-wip-limit": "Límite del trabajo en proceso flexible",
     "editCardStartDatePopup-title": "Cambiar la fecha de comienzo",
     "editCardDueDatePopup-title": "Cambiar la fecha de vencimiento",
+    "editCustomFieldPopup-title": "Editar el campo",
     "editCardSpentTimePopup-title": "Cambiar el tiempo consumido",
     "editLabelPopup-title": "Cambiar la etiqueta",
     "editNotificationPopup-title": "Editar las notificaciones",
@@ -222,30 +299,36 @@
     "filter-clear": "Limpiar el filtro",
     "filter-no-label": "Sin etiqueta",
     "filter-no-member": "Sin miembro",
-    "filter-on": "Filtro activado",
+    "filter-no-custom-fields": "Sin campos personalizados",
+    "filter-on": "Filtrado activado",
     "filter-on-desc": "Estás filtrando tarjetas en este tablero. Haz clic aquí para editar el filtro.",
     "filter-to-selection": "Filtrar la selección",
+    "advanced-filter-label": "Filtrado avanzado",
+    "advanced-filter-description": "El filtrado avanzado permite escribir una cadena que contiene los siguientes operadores: == != <= >= && || ( ) Se utiliza un espacio como separador entre los operadores. Se pueden filtrar todos los campos personalizados escribiendo sus nombres y valores. Por ejemplo: Campo1 == Valor1. Nota: Si los campos o valores contienen espacios, deben encapsularse entre comillas simples. Por ejemplo: 'Campo 1' == 'Valor 1'. Para omitir los caracteres de control único (' \\/), se usa \\. Por ejemplo: Campo1 = I\\'m. También se pueden combinar múltiples condiciones. Por ejemplo: C1 == V1 || C1 == V2. Normalmente todos los operadores se interpretan de izquierda a derecha. Se puede cambiar el orden colocando paréntesis. Por ejemplo: C1 == V1 && ( C2 == V2 || C2 == V3 ). También se puede buscar en campos de texto usando expresiones regulares: C1 == /Tes.*/i",
     "fullname": "Nombre completo",
     "header-logo-title": "Volver a tu página de tableros",
     "hide-system-messages": "Ocultar las notificaciones de actividad",
     "headerBarCreateBoardPopup-title": "Crear tablero",
     "home": "Inicio",
     "import": "Importar",
+    "link": "Enlace",
     "import-board": "importar un tablero",
     "import-board-c": "Importar un tablero",
     "import-board-title-trello": "Importar un tablero desde Trello",
-    "import-board-title-wekan": "Importar un tablero desde Wekan",
+    "import-board-title-wekan": "Importar tablero desde una exportación previa",
+    "import-sandstorm-backup-warning": "No elimine los datos que está importando del tablero o Trello original antes de verificar que la semilla pueda cerrarse y abrirse nuevamente, o que ocurra un error de \"Tablero no encontrado\", de lo contrario perderá sus datos.",
     "import-sandstorm-warning": "El tablero importado eliminará todos los datos existentes en este tablero y los reemplazará con los datos del tablero importado.",
     "from-trello": "Desde Trello",
-    "from-wekan": "Desde Wekan",
+    "from-wekan": "Desde exportación previa",
     "import-board-instruction-trello": "En tu tablero de Trello, ve a 'Menú', luego 'Más' > 'Imprimir y exportar' > 'Exportar JSON', y copia el texto resultante.",
-    "import-board-instruction-wekan": "En tu tablero de Wekan, ve a 'Menú del tablero', luego 'Exportar el tablero', y copia aquí el texto del fichero descargado.",
+    "import-board-instruction-wekan": "En tu tablero, vete a 'Menú', luego 'Exportar tablero', y copia el texto en el archivo descargado.",
+    "import-board-instruction-about-errors": "Aunque obtengas errores cuando importes el tablero, a veces la importación funciona igualmente, y el tablero se encontrará en la página de tableros.",
     "import-json-placeholder": "Pega tus datos JSON válidos aquí",
     "import-map-members": "Mapa de miembros",
-    "import-members-map": "El tablero importado tiene algunos miembros. Por favor mapea los miembros que deseas importar a los usuarios de Wekan",
+    "import-members-map": "Tu tablero importado tiene algunos miembros. Por favor, mapea los miembros que quieres importar con tus usuarios.",
     "import-show-user-mapping": "Revisión de la asignación de miembros",
-    "import-user-select": "Escoge el usuario de Wekan que deseas utilizar como miembro",
-    "importMapMembersAddPopup-title": "Selecciona un miembro de Wekan",
+    "import-user-select": "Selecciona el miembro existe que quieres usar como este miembro.",
+    "importMapMembersAddPopup-title": "Seleccionar miembro",
     "info": "Versión",
     "initials": "Iniciales",
     "invalid-date": "Fecha no válida",
@@ -256,7 +339,7 @@
     "keyboard-shortcuts": "Atajos de teclado",
     "label-create": "Crear una etiqueta",
     "label-default": "etiqueta %s (por defecto)",
-    "label-delete-pop": "Esto eliminará esta etiqueta de todas las tarjetas y destruirá su historial. Esta acción no puede deshacerse.",
+    "label-delete-pop": "Se eliminará esta etiqueta de todas las tarjetas y se destruirá su historial. Esta acción no puede deshacerse.",
     "labels": "Etiquetas",
     "language": "Cambiar el idioma",
     "last-admin-desc": "No puedes cambiar roles porque debe haber al menos un administrador.",
@@ -264,23 +347,25 @@
     "leave-board-pop": "¿Seguro que quieres abandonar __boardTitle__? Serás desvinculado de todas las tarjetas en este tablero.",
     "leaveBoardPopup-title": "¿Abandonar el tablero?",
     "link-card": "Enlazar a esta tarjeta",
-    "list-archive-cards": "Enviar todas las tarjetas de esta lista a la papelera de reciclaje",
-    "list-archive-cards-pop": "Esto eliminará todas las tarjetas de esta lista del tablero. Para ver las tarjetas en la papelera de reciclaje y devolverlas al tablero, haga clic en \"Menú\" > \"Papelera de reciclaje\".",
+    "list-archive-cards": "Mover todas las tarjetas de la lista al Archivo",
+    "list-archive-cards-pop": "Esto eliminará del tablero todas las tarjetas en esta lista. Para ver las tarjetas en el Archivo y recuperarlas al tablero haga click en \"Menu\" > \"Archivo\"",
     "list-move-cards": "Mover todas las tarjetas de esta lista",
     "list-select-cards": "Seleccionar todas las tarjetas de esta lista",
+    "set-color-list": "Cambiar el color",
     "listActionPopup-title": "Acciones de la lista",
     "swimlaneActionPopup-title": "Acciones del carril de flujo",
+    "swimlaneAddPopup-title": "Añadir un carril de flujo debajo",
     "listImportCardPopup-title": "Importar una tarjeta de Trello",
     "listMorePopup-title": "Más",
     "link-list": "Enlazar a esta lista",
     "list-delete-pop": "Todas las acciones serán eliminadas del historial de actividades y no se podrá recuperar la lista. Esta acción no puede deshacerse.",
-    "list-delete-suggest-archive": "Puedes enviar una lista a la papelera de reciclaje para eliminarla del tablero y conservar la actividad.",
+    "list-delete-suggest-archive": "Puedes mover una lista al Archivo para quitarla del tablero y preservar la actividad.",
     "lists": "Listas",
     "swimlanes": "Carriles",
     "log-out": "Finalizar la sesión",
     "log-in": "Iniciar sesión",
     "loginPopup-title": "Iniciar sesión",
-    "memberMenuPopup-title": "Mis preferencias",
+    "memberMenuPopup-title": "Preferencias de miembro",
     "members": "Miembros",
     "menu": "Menú",
     "move-selection": "Mover la selección",
@@ -294,9 +379,9 @@
     "muted-info": "No serás notificado de ningún cambio en este tablero",
     "my-boards": "Mis tableros",
     "name": "Nombre",
-    "no-archived-cards": "No hay tarjetas en la papelera de reciclaje",
-    "no-archived-lists": "No hay listas en la papelera de reciclaje",
-    "no-archived-swimlanes": "No hay carriles de flujo en la papelera de reciclaje",
+    "no-archived-cards": "No hay tarjetas archivadas.",
+    "no-archived-lists": "No hay listas archivadas.",
+    "no-archived-swimlanes": "No hay carriles archivados.",
     "no-results": "Sin resultados",
     "normal": "Normal",
     "normal-desc": "Puedes ver y editar tarjetas. No puedes cambiar la configuración.",
@@ -332,11 +417,12 @@
     "restore": "Restaurar",
     "save": "Añadir",
     "search": "Buscar",
+    "rules": "Reglas",
     "search-cards": "Buscar entre los títulos y las descripciones de las tarjetas en este tablero.",
     "search-example": "¿Texto a buscar?",
-    "select-color": "Selecciona un color",
-    "set-wip-limit-value": "Fija un límite para el número máximo de tareas en esta lista.",
-    "setWipLimitPopup-title": "Fijar el límite del trabajo en proceso",
+    "select-color": "Seleccionar el color",
+    "set-wip-limit-value": "Cambiar el límite para el número máximo de tareas en esta lista.",
+    "setWipLimitPopup-title": "Cambiar el límite del trabajo en proceso",
     "shortcut-assign-self": "Asignarte a ti mismo a la tarjeta actual",
     "shortcut-autocomplete-emoji": "Autocompletar emoji",
     "shortcut-autocomplete-members": "Autocompletar miembros",
@@ -366,6 +452,7 @@
     "title": "Título",
     "tracking": "Siguiendo",
     "tracking-info": "Serás notificado de cualquier cambio en las tarjetas en las que participas como creador o miembro.",
+    "type": "Tipo",
     "unassign-member": "Desvincular al miembro",
     "unsaved-description": "Tienes una descripción por añadir.",
     "unwatch": "Dejar de vigilar",
@@ -374,7 +461,7 @@
     "uploaded-avatar": "Avatar cargado",
     "username": "Nombre de usuario",
     "view-it": "Verla",
-    "warn-list-archived": "advertencia: esta tarjeta está en una lista en la papelera de reciclaje",
+    "warn-list-archived": "advertencia: esta tarjeta está en una lista en el Archivo",
     "watch": "Vigilar",
     "watching": "Vigilando",
     "watching-info": "Serás notificado de cualquier cambio en este tablero",
@@ -382,12 +469,15 @@
     "welcome-swimlane": "Hito 1",
     "welcome-list1": "Básicos",
     "welcome-list2": "Avanzados",
+    "card-templates-swimlane": "Plantilla de tarjeta",
+    "list-templates-swimlane": "Listar plantillas",
+    "board-templates-swimlane": "Plantilla de tablero",
     "what-to-do": "¿Qué deseas hacer?",
     "wipLimitErrorPopup-title": "El límite del trabajo en proceso no es válido.",
     "wipLimitErrorPopup-dialog-pt1": "El número de tareas en esta lista es mayor que el límite del trabajo en proceso que has definido.",
     "wipLimitErrorPopup-dialog-pt2": "Por favor, mueve algunas tareas fuera de esta lista, o fija un límite del trabajo en proceso más alto.",
     "admin-panel": "Panel del administrador",
-    "settings": "Ajustes",
+    "settings": "Preferencias",
     "people": "Personas",
     "registration": "Registro",
     "disable-self-registration": "Deshabilitar autoregistro",
@@ -407,16 +497,16 @@
     "send-smtp-test": "Enviarte un correo de prueba a ti mismo",
     "invitation-code": "Código de Invitación",
     "email-invite-register-subject": "__inviter__ te ha enviado una invitación",
-    "email-invite-register-text": "Estimado __user__,\n\n__inviter__ te invita a unirte a Wekan para colaborar.\n\nPor favor, haz clic en el siguiente enlace:\n__url__\n\nTu código de invitación es: __icode__\n\nGracias.",
-    "email-smtp-test-subject": "Prueba de correo SMTP desde Wekan",
+    "email-invite-register-text": "Querido __user__,\n__inviter__ le invita al tablero kanban para colaborar.\n\nPor favor, siga el siguiente enlace:\n__url__\n\nY tu código de invitación es:  __icode__\n\nGracias.",
+    "email-smtp-test-subject": "Prueba de email SMTP",
     "email-smtp-test-text": "El correo se ha enviado correctamente",
     "error-invitation-code-not-exist": "El código de invitación no existe",
     "error-notAuthorized": "No estás autorizado a ver esta página.",
     "outgoing-webhooks": "Webhooks salientes",
     "outgoingWebhooksPopup-title": "Webhooks salientes",
+    "boardCardTitlePopup-title": "Filtro de títulos de tarjeta ",
     "new-outgoing-webhook": "Nuevo webhook saliente",
     "no-name": "(Desconocido)",
-    "Wekan_version": "Versión de Wekan",
     "Node_version": "Versión de Node",
     "OS_Arch": "Arquitectura del sistema",
     "OS_Cpus": "Número de CPUs del sistema",
@@ -427,13 +517,18 @@
     "OS_Totalmem": "Memoria Total del sistema",
     "OS_Type": "Tipo de sistema",
     "OS_Uptime": "Tiempo activo del sistema",
+    "days": "días",
     "hours": "horas",
     "minutes": "minutos",
     "seconds": "segundos",
+    "show-field-on-card": "Mostrar este campo en la tarjeta",
+    "automatically-field-on-card": "Crear campos automáticamente para todas las tarjetas.",
+    "showLabel-field-on-card": "Mostrar etiquetas de campos en la minitarjeta.",
     "yes": "Sí",
     "no": "No",
     "accounts": "Cuentas",
     "accounts-allowEmailChange": "Permitir cambiar el correo electrónico",
+    "accounts-allowUserNameChange": "Permitir el cambio del nombre de usuario",
     "createdAt": "Creado en",
     "verified": "Verificado",
     "active": "Activo",
@@ -442,5 +537,157 @@
     "card-end": "Finalizado",
     "card-end-on": "Finalizado el",
     "editCardReceivedDatePopup-title": "Cambiar la fecha de recepción",
-    "editCardEndDatePopup-title": "Cambiar la fecha de finalización"
-}
+    "editCardEndDatePopup-title": "Cambiar la fecha de finalización",
+    "setCardColorPopup-title": "Cambiar el color",
+    "setCardActionsColorPopup-title": "Elegir un color",
+    "setSwimlaneColorPopup-title": "Elegir un color",
+    "setListColorPopup-title": "Elegir un color",
+    "assigned-by": "Asignado por",
+    "requested-by": "Solicitado por",
+    "board-delete-notice": "Se eliminarán todas las listas, tarjetas y acciones asociadas a este tablero. Esta acción no puede deshacerse.",
+    "delete-board-confirm-popup": "Se eliminarán todas las listas, tarjetas, etiquetas y actividades, y no podrás recuperar los contenidos del tablero. Esta acción no puede deshacerse.",
+    "boardDeletePopup-title": "¿Eliminar el tablero?",
+    "delete-board": "Eliminar el tablero",
+    "default-subtasks-board": "Subtareas para el tablero __board__",
+    "default": "Por defecto",
+    "queue": "Cola",
+    "subtask-settings": "Preferencias de las subtareas",
+    "boardSubtaskSettingsPopup-title": "Preferencias de las subtareas del tablero",
+    "show-subtasks-field": "Las tarjetas pueden tener subtareas",
+    "deposit-subtasks-board": "Depositar subtareas en este tablero:",
+    "deposit-subtasks-list": "Lista de destino para subtareas depositadas aquí:",
+    "show-parent-in-minicard": "Mostrar el padre en una minitarjeta:",
+    "prefix-with-full-path": "Prefijo con ruta completa",
+    "prefix-with-parent": "Prefijo con el padre",
+    "subtext-with-full-path": "Subtexto con ruta completa",
+    "subtext-with-parent": "Subtexto con el padre",
+    "change-card-parent": "Cambiar la tarjeta padre",
+    "parent-card": "Tarjeta padre",
+    "source-board": "Tablero de origen",
+    "no-parent": "No mostrar la tarjeta padre",
+    "activity-added-label": "añadida etiqueta %s a %s",
+    "activity-removed-label": "eliminada etiqueta '%s' desde %s",
+    "activity-delete-attach": "eliminado un adjunto desde %s",
+    "activity-added-label-card": "añadida etiqueta '%s'",
+    "activity-removed-label-card": "eliminada etiqueta '%s'",
+    "activity-delete-attach-card": "eliminado un adjunto",
+    "activity-set-customfield": "Cambiar el campo personalizado '%s' a '%s' en %s",
+    "activity-unset-customfield": "Desmarcar el campo personalizado '%s' en %s",
+    "r-rule": "Regla",
+    "r-add-trigger": "Añadir disparador",
+    "r-add-action": "Añadir acción",
+    "r-board-rules": "Reglas del tablero",
+    "r-add-rule": "Añadir regla",
+    "r-view-rule": "Ver regla",
+    "r-delete-rule": "Eliminar regla",
+    "r-new-rule-name": "Nueva título de regla",
+    "r-no-rules": "No hay reglas",
+    "r-when-a-card": "Cuando una tarjeta",
+    "r-is": "es",
+    "r-is-moved": "es movida",
+    "r-added-to": "es agregada a",
+    "r-removed-from": "Eliminado de",
+    "r-the-board": "el tablero",
+    "r-list": "lista",
+    "set-filter": "Filtrar",
+    "r-moved-to": "Movido a",
+    "r-moved-from": "Movido desde",
+    "r-archived": "Movido a Archivo",
+    "r-unarchived": "Restaurado del archivo",
+    "r-a-card": "una tarjeta",
+    "r-when-a-label-is": "Cuando una etiqueta es",
+    "r-when-the-label-is": "Cuando la etiqueta es",
+    "r-list-name": "Nombre de lista",
+    "r-when-a-member": "Cuando un miembro es",
+    "r-when-the-member": "Cuando el miembro",
+    "r-name": "nombre",
+    "r-when-a-attach": "Cuando un adjunto",
+    "r-when-a-checklist": "Cuando una lista de verificación es",
+    "r-when-the-checklist": "Cuando la lista de verificación",
+    "r-completed": "Completada",
+    "r-made-incomplete": "Hecha incompleta",
+    "r-when-a-item": "Cuando un elemento de la lista de verificación es",
+    "r-when-the-item": "Cuando el elemento de la lista de verificación es",
+    "r-checked": "Marcado",
+    "r-unchecked": "Desmarcado",
+    "r-move-card-to": "Mover tarjeta a",
+    "r-top-of": "Arriba de",
+    "r-bottom-of": "Abajo de",
+    "r-its-list": "su lista",
+    "r-archive": "Mover al Archivo",
+    "r-unarchive": "Restaurar del Archivo",
+    "r-card": "tarjeta",
+    "r-add": "Añadir",
+    "r-remove": "Eliminar",
+    "r-label": "etiqueta",
+    "r-member": "miembro",
+    "r-remove-all": "Eliminar todos los miembros de la tarjeta",
+    "r-set-color": "Cambiar el color a",
+    "r-checklist": "lista de verificación",
+    "r-check-all": "Marcar todo",
+    "r-uncheck-all": "Desmarcar todo",
+    "r-items-check": "elementos de la lista de verificación",
+    "r-check": "Marcar",
+    "r-uncheck": "Desmarcar",
+    "r-item": "elemento",
+    "r-of-checklist": "de la lista de verificación",
+    "r-send-email": "Enviar un email",
+    "r-to": "a",
+    "r-subject": "asunto",
+    "r-rule-details": "Detalle de la regla",
+    "r-d-move-to-top-gen": "Mover tarjeta arriba de su lista",
+    "r-d-move-to-top-spec": "Mover tarjeta arriba de la lista",
+    "r-d-move-to-bottom-gen": "Mover tarjeta abajo de su lista",
+    "r-d-move-to-bottom-spec": "Mover tarjeta al fondo de la lista",
+    "r-d-send-email": "Enviar email",
+    "r-d-send-email-to": "a",
+    "r-d-send-email-subject": "asunto",
+    "r-d-send-email-message": "mensaje",
+    "r-d-archive": "Mover tarjeta al Archivo",
+    "r-d-unarchive": "Restaurar tarjeta del Archivo",
+    "r-d-add-label": "Añadir etiqueta",
+    "r-d-remove-label": "Eliminar etiqueta",
+    "r-create-card": "Crear nueva tarjeta",
+    "r-in-list": "en la lista",
+    "r-in-swimlane": "en carril ",
+    "r-d-add-member": "Añadir miembro",
+    "r-d-remove-member": "Eliminar miembro",
+    "r-d-remove-all-member": "Eliminar todos los miembros",
+    "r-d-check-all": "Marcar todos los elementos de una lista",
+    "r-d-uncheck-all": "Desmarcar todos los elementos de una lista",
+    "r-d-check-one": "Marcar elemento",
+    "r-d-uncheck-one": "Desmarcar elemento",
+    "r-d-check-of-list": "de la lista de verificación",
+    "r-d-add-checklist": "Añadir una lista de verificación",
+    "r-d-remove-checklist": "Eliminar lista de verificación",
+    "r-by": "por",
+    "r-add-checklist": "Añadir una lista de verificación",
+    "r-with-items": "con items",
+    "r-items-list": "item1,item2,item3",
+    "r-add-swimlane": "Agregar carril",
+    "r-swimlane-name": "nombre del carril",
+    "r-board-note": "Nota: deje un campo vacío para que coincida con todos los valores posibles",
+    "r-checklist-note": "Nota: los ítems de la lista tienen que escribirse como valores separados por coma.",
+    "r-when-a-card-is-moved": "Cuando una tarjeta es movida a otra lista",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Método de autenticación",
+    "authentication-type": "Tipo de autenticación",
+    "custom-product-name": "Nombre de producto personalizado",
+    "layout": "Disñeo",
+    "hide-logo": "Ocultar logo",
+    "add-custom-html-after-body-start": "Añade HTML personalizado después de <body> ",
+    "add-custom-html-before-body-end": "Añade HTML personalizado después de </body>",
+    "error-undefined": "Algo no está bien",
+    "error-ldap-login": "Ocurrió un error al intentar acceder",
+    "display-authentication-method": "Mostrar el método de autenticación",
+    "default-authentication-method": "Método de autenticación por defecto",
+    "duplicate-board": "Duplicar tablero",
+    "people-number": "El número de personas es:",
+    "swimlaneDeletePopup-title": "¿Eliminar el carril de flujo?",
+    "swimlane-delete-pop": "Todas las acciones serán eliminadas del historial de actividades y no se podrá recuperar el carril de flujo. Esta acción no puede deshacerse.",
+    "restore-all": "Restaurar todas",
+    "delete-all": "Borrar todas",
+    "loading": "Cargando. Por favor, espere."
+}
\ No newline at end of file
diff --git a/i18n/eu.i18n.json b/i18n/eu.i18n.json
index 6c692aea..3a60a50d 100644
--- a/i18n/eu.i18n.json
+++ b/i18n/eu.i18n.json
@@ -1,35 +1,51 @@
 {
     "accept": "Onartu",
-    "act-activity-notify": "[Wekan] Jarduera-jakinarazpena",
-    "act-addAttachment": "__attachment__ __card__ txartelera erantsita",
-    "act-addChecklist": "gehituta checklist __checklist__ __card__ -ri",
-    "act-addChecklistItem": "gehituta __checklistItem__ checklist __checklist__ on __card__ -ri",
-    "act-addComment": "__card__ txartelean iruzkina: __comment__",
-    "act-createBoard": "__board__ sortuta",
-    "act-createCard": "__card__ __list__ zerrrendara gehituta",
-    "act-createList": "__list__ __board__ arbelera gehituta",
-    "act-addBoardMember": "__member__ __board__ arbelera gehituta",
-    "act-archivedBoard": "__board__ moved to Recycle Bin",
-    "act-archivedCard": "__card__ moved to Recycle Bin",
-    "act-archivedList": "__list__ moved to Recycle Bin",
-    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
-    "act-importBoard": "__board__ inportatuta",
-    "act-importCard": "__card__ inportatuta",
-    "act-importList": "__list__ inportatuta",
-    "act-joinMember": "__member__ __card__ txartelera gehituta",
-    "act-moveCard": "__card__ __oldList__ zerrendartik __list__ zerrendara eraman da",
-    "act-removeBoardMember": "__member__ __board__ arbeletik kendu da",
-    "act-restoredCard": "__card__ __board__ arbelean berrezarri da",
-    "act-unjoinMember": "__member__ __card__ txarteletik kendu da",
-    "act-withBoardTitle": "[Wekan] __board__",
+    "act-activity-notify": "Activity Notification",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__board__",
     "act-withCardTitle": "[__board__] __card__",
     "actions": "Ekintzak",
     "activities": "Jarduerak",
     "activity": "Jarduera",
     "activity-added": "%s %s(e)ra gehituta",
-    "activity-archived": "%s moved to Recycle Bin",
+    "activity-archived": "%s moved to Archive",
     "activity-attached": "%s %s(e)ra erantsita",
     "activity-created": "%s sortuta",
+    "activity-customfield-created": "created custom field %s",
     "activity-excluded": "%s %s(e)tik kanpo utzita",
     "activity-imported": "%s inportatuta %s(e)ra %s(e)tik",
     "activity-imported-board": "%s inportatuta %s(e)tik",
@@ -39,13 +55,25 @@
     "activity-removed": "%s %s(e)tik kenduta",
     "activity-sent": "%s %s(e)ri bidalita",
     "activity-unjoined": "%s utzita",
+    "activity-subtask-added": "added subtask to %s",
+    "activity-checked-item": "checked %s in checklist %s of %s",
+    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
     "activity-checklist-added": "egiaztaketa zerrenda %s(e)ra gehituta",
+    "activity-checklist-removed": "removed a checklist from %s",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
     "activity-checklist-item-added": "egiaztaketa zerrendako elementuak '%s'(e)ra gehituta %s(e)n",
+    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
     "add": "Gehitu",
+    "activity-checked-item-card": "checked %s in checklist %s",
+    "activity-unchecked-item-card": "unchecked %s in checklist %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
     "add-attachment": "Gehitu eranskina",
     "add-board": "Gehitu arbela",
     "add-card": "Gehitu txartela",
     "add-swimlane": "Add Swimlane",
+    "add-subtask": "Add Subtask",
     "add-checklist": "Gehitu egiaztaketa zerrenda",
     "add-checklist-item": "Gehitu elementu bat egiaztaketa zerrendara",
     "add-cover": "Gehitu azala",
@@ -63,20 +91,22 @@
     "and-n-other-card": "Eta beste txartel __count__",
     "and-n-other-card_plural": "Eta beste  __count__ txartel",
     "apply": "Aplikatu",
-    "app-is-offline": "Wekan kargatzen ari da, itxaron mesedez. Orria freskatzeak datuen galera ekarriko luke. Wekan kargatzen ez bada, egiaztatu Wekan zerbitzaria gelditu ez dela.",
-    "archive": "Move to Recycle Bin",
-    "archive-all": "Move All to Recycle Bin",
-    "archive-board": "Move Board to Recycle Bin",
-    "archive-card": "Move Card to Recycle Bin",
-    "archive-list": "Move List to Recycle Bin",
-    "archive-swimlane": "Move Swimlane to Recycle Bin",
-    "archive-selection": "Move selection to Recycle Bin",
-    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
-    "archived-items": "Recycle Bin",
-    "archived-boards": "Boards in Recycle Bin",
+    "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
+    "archive": "Move to Archive",
+    "archive-all": "Move All to Archive",
+    "archive-board": "Move Board to Archive",
+    "archive-card": "Move Card to Archive",
+    "archive-list": "Move List to Archive",
+    "archive-swimlane": "Move Swimlane to Archive",
+    "archive-selection": "Move selection to Archive",
+    "archiveBoardPopup-title": "Move Board to Archive?",
+    "archived-items": "Artxibatu",
+    "archived-boards": "Boards in Archive",
     "restore-board": "Berreskuratu arbela",
-    "no-archived-boards": "No Boards in Recycle Bin.",
-    "archives": "Recycle Bin",
+    "no-archived-boards": "No Boards in Archive.",
+    "archives": "Artxibatu",
+    "template": "Template",
+    "templates": "Templates",
     "assign-member": "Esleitu kidea",
     "attached": "erantsita",
     "attachment": "Eranskina",
@@ -95,22 +125,25 @@
     "boardChangeTitlePopup-title": "Aldatu izena arbelari",
     "boardChangeVisibilityPopup-title": "Aldatu ikusgaitasuna",
     "boardChangeWatchPopup-title": "Aldatu ikuskatzea",
-    "boardMenuPopup-title": "Arbelaren menua",
+    "boardMenuPopup-title": "Board Settings",
     "boards": "Arbelak",
     "board-view": "Board View",
+    "board-view-cal": "Calendar",
     "board-view-swimlanes": "Swimlanes",
     "board-view-lists": "Zerrendak",
     "bucket-example": "Esaterako \"Pertz zerrenda\"",
     "cancel": "Utzi",
-    "card-archived": "This card is moved to Recycle Bin.",
+    "card-archived": "This card is moved to Archive.",
+    "board-archived": "This board is moved to Archive.",
     "card-comments-title": "Txartel honek iruzkin %s  dauka.",
     "card-delete-notice": "Ezabaketa behin betiko da. Txartel honi lotutako ekintza guztiak galduko dituzu.",
     "card-delete-pop": "Ekintza guztiak ekintza jariotik kenduko dira eta ezin izango duzu txartela berrireki. Ez dago desegiterik.",
-    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
     "card-due": "Epemuga",
     "card-due-on": "Epemuga",
     "card-spent": "Erabilitako denbora",
     "card-edit-attachments": "Editatu eranskinak",
+    "card-edit-custom-fields": "Edit custom fields",
     "card-edit-labels": "Editatu etiketak",
     "card-edit-members": "Editatu kideak",
     "card-labels-title": "Aldatu txartelaren etiketak",
@@ -118,13 +151,20 @@
     "card-start": "Hasiera",
     "card-start-on": "Hasiera",
     "cardAttachmentsPopup-title": "Erantsi hemendik",
+    "cardCustomField-datePopup-title": "Change date",
+    "cardCustomFieldsPopup-title": "Edit custom fields",
     "cardDeletePopup-title": "Ezabatu txartela?",
     "cardDetailsActionsPopup-title": "Txartel-ekintzak",
     "cardLabelsPopup-title": "Etiketak",
     "cardMembersPopup-title": "Kideak",
     "cardMorePopup-title": "Gehiago",
+    "cardTemplatePopup-title": "Create template",
     "cards": "Txartelak",
     "cards-count": "Txartelak",
+    "casSignIn": "Sign In with CAS",
+    "cardType-card": "Card",
+    "cardType-linkedCard": "Linked Card",
+    "cardType-linkedBoard": "Linked Board",
     "change": "Aldatu",
     "change-avatar": "Aldatu avatarra",
     "change-password": "Aldatu pasahitza",
@@ -135,30 +175,52 @@
     "changePasswordPopup-title": "Aldatu pasahitza",
     "changePermissionsPopup-title": "Aldatu baimenak",
     "changeSettingsPopup-title": "Aldatu ezarpenak",
+    "subtasks": "Subtasks",
     "checklists": "Egiaztaketa zerrenda",
     "click-to-star": "Egin klik arbel honi izarra jartzeko",
     "click-to-unstar": "Egin klik arbel honi izarra kentzeko",
     "clipboard": "Kopiatu eta itsatsi edo arrastatu eta jaregin",
     "close": "Itxi",
     "close-board": "Itxi arbela",
-    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
     "color-black": "beltza",
     "color-blue": "urdina",
+    "color-crimson": "crimson",
+    "color-darkgreen": "darkgreen",
+    "color-gold": "gold",
+    "color-gray": "gray",
     "color-green": "berdea",
+    "color-indigo": "indigo",
     "color-lime": "lima",
+    "color-magenta": "magenta",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "navy",
     "color-orange": "laranja",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
     "color-pink": "larrosa",
+    "color-plum": "plum",
     "color-purple": "purpura",
     "color-red": "gorria",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "silver",
     "color-sky": "zerua",
+    "color-slateblue": "slateblue",
+    "color-white": "white",
     "color-yellow": "horia",
+    "unset-color": "Unset",
     "comment": "Iruzkina",
     "comment-placeholder": "Idatzi iruzkin bat",
     "comment-only": "Iruzkinak besterik ez",
     "comment-only-desc": "Iruzkinak txarteletan soilik egin ditzake",
+    "no-comments": "No comments",
+    "no-comments-desc": "Can not see comments and activities.",
     "computer": "Ordenagailua",
-    "confirm-checklist-delete-dialog": "Ziur zaude kontrol-zerrenda ezabatu nahi duzula",
+    "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?",
+    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
     "copy-card-link-to-clipboard": "Kopiatu txartela arbelera",
+    "linkCardPopup-title": "Link Card",
+    "searchElementPopup-title": "Bilatu",
     "copyCardPopup-title": "Kopiatu txartela",
     "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
     "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
@@ -167,11 +229,25 @@
     "createBoardPopup-title": "Sortu arbela",
     "chooseBoardSourcePopup-title": "Inportatu arbela",
     "createLabelPopup-title": "Sortu etiketa",
+    "createCustomField": "Create Field",
+    "createCustomFieldPopup-title": "Create Field",
     "current": "unekoa",
+    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
+    "custom-field-checkbox": "Checkbox",
+    "custom-field-date": "Data",
+    "custom-field-dropdown": "Dropdown List",
+    "custom-field-dropdown-none": "(none)",
+    "custom-field-dropdown-options": "List Options",
+    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
+    "custom-field-dropdown-unknown": "(unknown)",
+    "custom-field-number": "Number",
+    "custom-field-text": "Text",
+    "custom-fields": "Custom Fields",
     "date": "Data",
     "decline": "Ukatu",
     "default-avatar": "Lehenetsitako avatarra",
     "delete": "Ezabatu",
+    "deleteCustomFieldPopup-title": "Delete Custom Field?",
     "deleteLabelPopup-title": "Ezabatu etiketa?",
     "description": "Deskripzioa",
     "disambiguateMultiLabelPopup-title": "Argitu etiketaren ekintza",
@@ -186,6 +262,7 @@
     "soft-wip-limit": "WIP muga malgua",
     "editCardStartDatePopup-title": "Aldatu hasiera data",
     "editCardDueDatePopup-title": "Aldatu epemuga data",
+    "editCustomFieldPopup-title": "Edit Field",
     "editCardSpentTimePopup-title": "Aldatu erabilitako denbora",
     "editLabelPopup-title": "Aldatu etiketa",
     "editNotificationPopup-title": "Editatu jakinarazpena",
@@ -222,30 +299,36 @@
     "filter-clear": "Garbitu iragazkia",
     "filter-no-label": "Etiketarik ez",
     "filter-no-member": "Kiderik ez",
+    "filter-no-custom-fields": "No Custom Fields",
     "filter-on": "Iragazkia gaituta dago",
     "filter-on-desc": "Arbel honetako txartela iragazten ari zara. Egin klik hemen iragazkia editatzeko.",
     "filter-to-selection": "Iragazketa aukerara",
+    "advanced-filter-label": "Advanced Filter",
+    "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) to be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
     "fullname": "Izen abizenak",
     "header-logo-title": "Itzuli zure arbelen orrira.",
     "hide-system-messages": "Ezkutatu sistemako mezuak",
     "headerBarCreateBoardPopup-title": "Sortu arbela",
     "home": "Hasiera",
     "import": "Inportatu",
+    "link": "Link",
     "import-board": "inportatu arbela",
     "import-board-c": "Inportatu arbela",
     "import-board-title-trello": "Inportatu arbela Trellotik",
-    "import-board-title-wekan": "Inportatu arbela Wekanetik",
+    "import-board-title-wekan": "Import board from previous export",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
     "import-sandstorm-warning": "Inportatutako arbelak oraingo arbeleko informazio guztia ezabatuko du eta inportatutako arbeleko informazioarekin ordeztu.",
     "from-trello": "Trellotik",
-    "from-wekan": "Wekanetik",
+    "from-wekan": "From previous export",
     "import-board-instruction-trello": "Zure Trello arbelean, aukeratu 'Menu\", 'More', 'Print and Export', 'Export JSON', eta kopiatu jasotako testua hemen.",
-    "import-board-instruction-wekan": "Zure Wekan arbelean, aukeratu 'Menua' - 'Esportatu arbela', eta kopiatu testua deskargatutako fitxategian.",
+    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
     "import-json-placeholder": "Isatsi baliozko JSON datuak hemen",
     "import-map-members": "Kideen mapa",
-    "import-members-map": "Inportatu duzun arbela kide batzuk ditu, mesedez lotu inportatu nahi dituzun kideak Wekan erabiltzaileekin",
+    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
     "import-show-user-mapping": "Berrikusi kideen mapa",
-    "import-user-select": "Hautatu kide hau bezala erabili nahi duzun Wekan erabiltzailea",
-    "importMapMembersAddPopup-title": "Aukeratu Wekan kidea",
+    "import-user-select": "Pick your existing user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select member",
     "info": "Bertsioa",
     "initials": "Inizialak",
     "invalid-date": "Baliogabeko data",
@@ -264,17 +347,19 @@
     "leave-board-pop": "Ziur zaude __boardTitle__ utzi nahi duzula? Arbel honetako txartel guztietatik ezabatua izango zara.",
     "leaveBoardPopup-title": "Arbela utzi?",
     "link-card": "Lotura txartel honetara",
-    "list-archive-cards": "Move all cards in this list to Recycle Bin",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
+    "list-archive-cards": "Move all cards in this list to Archive",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Lekuz aldatu zerrendako txartel guztiak",
     "list-select-cards": "Aukeratu zerrenda honetako txartel guztiak",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "Zerrendaren ekintzak",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Inportatu Trello txartel bat",
     "listMorePopup-title": "Gehiago",
     "link-list": "Lotura zerrenda honetara",
     "list-delete-pop": "Ekintza guztiak ekintza jariotik kenduko dira eta ezin izango duzu zerrenda berreskuratu. Ez dago desegiterik.",
-    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
     "lists": "Zerrendak",
     "swimlanes": "Swimlanes",
     "log-out": "Itxi saioa",
@@ -294,9 +379,9 @@
     "muted-info": "Ez zaizkizu jakinaraziko arbel honi egindako aldaketak",
     "my-boards": "Nire arbelak",
     "name": "Izena",
-    "no-archived-cards": "No cards in Recycle Bin.",
-    "no-archived-lists": "No lists in Recycle Bin.",
-    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
+    "no-archived-cards": "No cards in Archive.",
+    "no-archived-lists": "No lists in Archive.",
+    "no-archived-swimlanes": "No swimlanes in Archive.",
     "no-results": "Emaitzarik ez",
     "normal": "Arrunta",
     "normal-desc": "Txartelak ikusi eta editatu ditzake. Ezin ditu ezarpenak aldatu.",
@@ -332,6 +417,7 @@
     "restore": "Berrezarri",
     "save": "Gorde",
     "search": "Bilatu",
+    "rules": "Rules",
     "search-cards": "Search from card titles and descriptions on this board",
     "search-example": "Text to search for?",
     "select-color": "Aukeratu kolorea",
@@ -366,6 +452,7 @@
     "title": "Izenburua",
     "tracking": "Jarraitzen",
     "tracking-info": "Sortzaile edo kide gisa parte-hartzen duzun txartelei egindako aldaketak jakinaraziko zaizkizu.",
+    "type": "Type",
     "unassign-member": "Kendu kidea",
     "unsaved-description": "Gorde gabeko deskripzio bat duzu",
     "unwatch": "Utzi ikuskatzeari",
@@ -374,7 +461,7 @@
     "uploaded-avatar": "Avatar bat igo da",
     "username": "Erabiltzaile-izena",
     "view-it": "Ikusi",
-    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
+    "warn-list-archived": "warning: this card is in an list at Archive",
     "watch": "Ikuskatu",
     "watching": "Ikuskatzen",
     "watching-info": "Arbel honi egindako aldaketak jakinaraziko zaizkizu",
@@ -382,6 +469,9 @@
     "welcome-swimlane": "Milestone 1",
     "welcome-list1": "Oinarrizkoa",
     "welcome-list2": "Aurreratua",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
     "what-to-do": "Zer egin nahi duzu?",
     "wipLimitErrorPopup-title": "Baliogabeko WIP muga",
     "wipLimitErrorPopup-dialog-pt1": "Zerrenda honetako atazen muga, WIP-en ezarritakoa baina handiagoa da",
@@ -407,16 +497,16 @@
     "send-smtp-test": "Bidali posta elektroniko mezu bat zure buruari",
     "invitation-code": "Gonbidapen kodea",
     "email-invite-register-subject": "__inviter__ erabiltzaileak gonbidapen bat bidali dizu",
-    "email-invite-register-text": "Kaixo __user__,\n\n__inviter__ erabiltzaileak Wekanera gonbidatu zaitu elkar-lanean aritzeko.\n\nJarraitu mesedez lotura hau:\n__url__\n\nZure gonbidapen kodea hau da: __icode__\n\nEskerrik asko.",
-    "email-smtp-test-subject": "Wekan-etik bidalitako test-mezua",
+    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email",
     "email-smtp-test-text": "Arrakastaz bidali duzu posta elektroniko mezua",
     "error-invitation-code-not-exist": "Gonbidapen kodea ez da existitzen",
     "error-notAuthorized": "Ez duzu orri hau ikusteko baimenik.",
     "outgoing-webhooks": "Irteerako Webhook-ak",
     "outgoingWebhooksPopup-title": "Irteerako Webhook-ak",
+    "boardCardTitlePopup-title": "Card Title Filter",
     "new-outgoing-webhook": "Irteera-webhook berria",
     "no-name": "(Ezezaguna)",
-    "Wekan_version": "Wekan bertsioa",
     "Node_version": "Nodo bertsioa",
     "OS_Arch": "SE Arkitektura",
     "OS_Cpus": "SE PUZ kopurua",
@@ -427,13 +517,18 @@
     "OS_Totalmem": "SE memoria guztira",
     "OS_Type": "SE mota",
     "OS_Uptime": "SE denbora abiatuta",
+    "days": "days",
     "hours": "ordu",
     "minutes": "minutu",
     "seconds": "segundo",
+    "show-field-on-card": "Show this field on card",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
     "yes": "Bai",
     "no": "Ez",
     "accounts": "Kontuak",
     "accounts-allowEmailChange": "Baimendu e-mail aldaketa",
+    "accounts-allowUserNameChange": "Allow Username Change",
     "createdAt": "Noiz sortua",
     "verified": "Egiaztatuta",
     "active": "Gaituta",
@@ -442,5 +537,157 @@
     "card-end": "End",
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
-    "editCardEndDatePopup-title": "Change end date"
-}
+    "editCardEndDatePopup-title": "Change end date",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "Assigned By",
+    "requested-by": "Requested By",
+    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
+    "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
+    "boardDeletePopup-title": "Delete Board?",
+    "delete-board": "Delete Board",
+    "default-subtasks-board": "Subtasks for __board__ board",
+    "default": "Default",
+    "queue": "Queue",
+    "subtask-settings": "Subtasks Settings",
+    "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
+    "show-subtasks-field": "Cards can have subtasks",
+    "deposit-subtasks-board": "Deposit subtasks to this board:",
+    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
+    "show-parent-in-minicard": "Show parent in minicard:",
+    "prefix-with-full-path": "Prefix with full path",
+    "prefix-with-parent": "Prefix with parent",
+    "subtext-with-full-path": "Subtext with full path",
+    "subtext-with-parent": "Subtext with parent",
+    "change-card-parent": "Change card's parent",
+    "parent-card": "Parent card",
+    "source-board": "Source board",
+    "no-parent": "Don't show parent",
+    "activity-added-label": "added label '%s' to %s",
+    "activity-removed-label": "removed label '%s' from %s",
+    "activity-delete-attach": "deleted an attachment from %s",
+    "activity-added-label-card": "added label '%s'",
+    "activity-removed-label-card": "removed label '%s'",
+    "activity-delete-attach-card": "deleted an attachment",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "r-rule": "Rule",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "Add action",
+    "r-board-rules": "Board rules",
+    "r-add-rule": "Add rule",
+    "r-view-rule": "View rule",
+    "r-delete-rule": "Delete rule",
+    "r-new-rule-name": "New rule title",
+    "r-no-rules": "No rules",
+    "r-when-a-card": "When a card",
+    "r-is": "is",
+    "r-is-moved": "is moved",
+    "r-added-to": "added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "the board",
+    "r-list": "list",
+    "set-filter": "Set Filter",
+    "r-moved-to": "Moved to",
+    "r-moved-from": "Moved from",
+    "r-archived": "Moved to Archive",
+    "r-unarchived": "Restored from Archive",
+    "r-a-card": "a card",
+    "r-when-a-label-is": "When a label is",
+    "r-when-the-label-is": "When the label is",
+    "r-list-name": "list name",
+    "r-when-a-member": "When a member is",
+    "r-when-the-member": "When the member",
+    "r-name": "name",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "r-when-the-item": "When the checklist item",
+    "r-checked": "Checked",
+    "r-unchecked": "Unchecked",
+    "r-move-card-to": "Move card to",
+    "r-top-of": "Top of",
+    "r-bottom-of": "Bottom of",
+    "r-its-list": "its list",
+    "r-archive": "Move to Archive",
+    "r-unarchive": "Restore from Archive",
+    "r-card": "card",
+    "r-add": "Gehitu",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-set-color": "Set color to",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "subject",
+    "r-rule-details": "Rule details",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Move card to top of list",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Move card to bottom of list",
+    "r-d-send-email": "Send email",
+    "r-d-send-email-to": "to",
+    "r-d-send-email-subject": "subject",
+    "r-d-send-email-message": "message",
+    "r-d-archive": "Move card to Archive",
+    "r-d-unarchive": "Restore card from Archive",
+    "r-d-add-label": "Add label",
+    "r-d-remove-label": "Remove label",
+    "r-create-card": "Create new card",
+    "r-in-list": "in list",
+    "r-in-swimlane": "in swimlane",
+    "r-d-add-member": "Add member",
+    "r-d-remove-member": "Remove member",
+    "r-d-remove-all-member": "Remove all member",
+    "r-d-check-all": "Check all items of a list",
+    "r-d-uncheck-all": "Uncheck all items of a list",
+    "r-d-check-one": "Check item",
+    "r-d-uncheck-one": "Uncheck item",
+    "r-d-check-of-list": "of checklist",
+    "r-d-add-checklist": "Add checklist",
+    "r-d-remove-checklist": "Remove checklist",
+    "r-by": "by",
+    "r-add-checklist": "Add checklist",
+    "r-with-items": "with items",
+    "r-items-list": "item1,item2,item3",
+    "r-add-swimlane": "Add swimlane",
+    "r-swimlane-name": "swimlane name",
+    "r-board-note": "Note: leave a field empty to match every possible value.",
+    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout",
+    "hide-logo": "Hide Logo",
+    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
+    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
+    "error-undefined": "Something went wrong",
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
+}
\ No newline at end of file
diff --git a/i18n/fa.i18n.json b/i18n/fa.i18n.json
index 4c03a3b7..b35cbb94 100644
--- a/i18n/fa.i18n.json
+++ b/i18n/fa.i18n.json
@@ -1,35 +1,51 @@
 {
     "accept": "پذیرش",
-    "act-activity-notify": "[wekan] اطلاع فعالیت",
-    "act-addAttachment": "پیوست __attachment__ به __card__",
-    "act-addChecklist": "سیاهه __checklist__ به __card__ افزوده شد",
-    "act-addChecklistItem": "__checklistItem__ به سیاهه __checklist__ در __card__ افزوده شد",
-    "act-addComment": "درج نظر برای __card__: __comment__",
-    "act-createBoard": "__board__ ایجاد شد",
-    "act-createCard": "__card__  به __list__ اضافه شد",
-    "act-createList": "__list__ به __board__ اضافه شد",
-    "act-addBoardMember": "__member__ به __board__ اضافه شد",
-    "act-archivedBoard": "__board__ moved to Recycle Bin",
-    "act-archivedCard": "__card__ moved to Recycle Bin",
-    "act-archivedList": "__list__ moved to Recycle Bin",
-    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
-    "act-importBoard": "__board__ وارد شده",
-    "act-importCard": "__card__ وارد شده",
-    "act-importList": "__list__ وارد شده",
-    "act-joinMember": "__member__ به __card__اضافه شد",
-    "act-moveCard": "انتقال __card__ از __oldList__ به __list__",
-    "act-removeBoardMember": "__member__ از __board__ پاک شد",
-    "act-restoredCard": "__card__ به __board__ بازآوری شد",
-    "act-unjoinMember": "__member__ از __card__ پاک شد",
-    "act-withBoardTitle": "[Wekan] __board__",
+    "act-activity-notify": "اعلان فعالیت",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__board__",
     "act-withCardTitle": "[__board__] __card__",
     "actions": "اعمال",
-    "activities": "فعالیت ها",
+    "activities": "فعالیت‌ها",
     "activity": "فعالیت",
     "activity-added": "%s به %s اضافه شد",
-    "activity-archived": "%s moved to Recycle Bin",
+    "activity-archived": "%s به آرشیو انتقال یافت",
     "activity-attached": "%s به %s پیوست شد",
     "activity-created": "%s ایجاد شد",
+    "activity-customfield-created": "%s فیلدشخصی ایجاد شد",
     "activity-excluded": "%s  از %s مستثنی گردید",
     "activity-imported": "%s از %s وارد %s شد",
     "activity-imported-board": "%s از %s وارد شد",
@@ -39,13 +55,25 @@
     "activity-removed": "%s از %s حذف شد",
     "activity-sent": "ارسال %s به %s",
     "activity-unjoined": "قطع اتصال %s",
+    "activity-subtask-added": "زیروظیفه به %s اضافه شد",
+    "activity-checked-item": "چک شده  %s در چک لیست %s از %s",
+    "activity-unchecked-item": "چک نشده  %s در چک لیست %s از %s",
     "activity-checklist-added": "سیاهه به %s اضافه شد",
+    "activity-checklist-removed": "از چک لیست حذف گردید",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted": "تمام نشده ها در چک لیست %s از %s",
     "activity-checklist-item-added": "added checklist item to '%s' in %s",
+    "activity-checklist-item-removed": "حذف شده از چک لیست  '%s' در %s",
     "add": "افزودن",
+    "activity-checked-item-card": "چک شده  %s در چک لیست %s",
+    "activity-unchecked-item-card": "چک نشده  %s در چک لیست %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted-card": "چک لیست تمام نشده %s",
     "add-attachment": "افزودن ضمیمه",
     "add-board": "افزودن برد",
     "add-card": "افزودن کارت",
     "add-swimlane": "Add Swimlane",
+    "add-subtask": "افزودن زیر وظیفه",
     "add-checklist": "افزودن چک لیست",
     "add-checklist-item": "افزودن مورد به سیاهه",
     "add-cover": "جلد کردن",
@@ -63,20 +91,22 @@
     "and-n-other-card": "و __count__ کارت دیگر",
     "and-n-other-card_plural": "و __count__ کارت دیگر",
     "apply": "اعمال",
-    "app-is-offline": "Wekan در حال بارگذاری است. لطفا صبر کنید. نوسازی صفحه، منجر به از دست رفتن داده‌ها می‌شود. اگر Wekan بارگذاری نشد، لطفا بررسی کنید که سرور Wekan متوقف نشده باشد.",
-    "archive": "Move to Recycle Bin",
-    "archive-all": "Move All to Recycle Bin",
-    "archive-board": "Move Board to Recycle Bin",
-    "archive-card": "Move Card to Recycle Bin",
-    "archive-list": "Move List to Recycle Bin",
-    "archive-swimlane": "Move Swimlane to Recycle Bin",
-    "archive-selection": "Move selection to Recycle Bin",
-    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
-    "archived-items": "Recycle Bin",
-    "archived-boards": "Boards in Recycle Bin",
+    "app-is-offline": "در حال بارگزاری لطفا منتظر بمانید. بازخوانی صفحه باعث از بین رفتن اطلاعات می شود. اگر بارگذاری کار نمی کند، لطفا بررسی کنید که این سرور متوقف نشده است.",
+    "archive": "انتقال به آرشیو",
+    "archive-all": "انتقال همه به آرشیو",
+    "archive-board": "انتقال برد به آرشیو",
+    "archive-card": "انتقال کارت به آرشیو",
+    "archive-list": "انتقال لیست به آرشیو",
+    "archive-swimlane": "انتقال مسیر به آرشیو",
+    "archive-selection": "انتقال انتخاب شده ها به آرشیو",
+    "archiveBoardPopup-title": "انتقال برد به آرشیو؟",
+    "archived-items": "بایگانی",
+    "archived-boards": "برد های داخل آرشیو",
     "restore-board": "بازیابی تخته",
-    "no-archived-boards": "No Boards in Recycle Bin.",
-    "archives": "Recycle Bin",
+    "no-archived-boards": "هیچ بردی داخل آرشیو نیست",
+    "archives": "بایگانی",
+    "template": "Template",
+    "templates": "Templates",
     "assign-member": "تعیین عضو",
     "attached": "ضمیمه شده",
     "attachment": "ضمیمه",
@@ -95,22 +125,25 @@
     "boardChangeTitlePopup-title": "تغییر نام تخته",
     "boardChangeVisibilityPopup-title": "تغییر وضعیت نمایش",
     "boardChangeWatchPopup-title": "تغییر دیده بانی",
-    "boardMenuPopup-title": "منوی تخته",
+    "boardMenuPopup-title": "Board Settings",
     "boards": "تخته‌ها",
     "board-view": "نمایش تخته",
+    "board-view-cal": "تقویم",
     "board-view-swimlanes": "Swimlanes",
     "board-view-lists": "فهرست‌ها",
     "bucket-example": "برای مثال چیزی شبیه \"لیست سبدها\"",
     "cancel": "انصراف",
-    "card-archived": "This card is moved to Recycle Bin.",
+    "card-archived": "این کارت به آرشیو انتقال داده شد",
+    "board-archived": "این برد به آرشیو انتقال یافت",
     "card-comments-title": "این کارت دارای %s نظر است.",
     "card-delete-notice": "حذف دائمی. تمامی موارد مرتبط با این کارت از بین خواهند رفت.",
-    "card-delete-pop": "همه اقدامات از این پردازه (خوراک) حذف خواهد شد و امکان بازگرداندن کارت وجود نخواهد داشت.",
-    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
-    "card-due": "ناشی از",
-    "card-due-on": "مقتضی بر",
+    "card-delete-pop": "همه اقدامات از این پردازه  حذف خواهد شد و امکان بازگرداندن کارت وجود نخواهد داشت.",
+    "card-delete-suggest-archive": "شما می توانید کارت را به بایگانی منتقل کنید تا آن را از هیئت مدیره حذف کنید و فعالیت را حفظ کنید.",
+    "card-due": "تا",
+    "card-due-on": "تا",
     "card-spent": "زمان صرف شده",
     "card-edit-attachments": "ویرایش ضمائم",
+    "card-edit-custom-fields": "ویرایش فیلدهای شخصی",
     "card-edit-labels": "ویرایش برچسب",
     "card-edit-members": "ویرایش اعضا",
     "card-labels-title": "تغییر برچسب کارت",
@@ -118,13 +151,20 @@
     "card-start": "شروع",
     "card-start-on": "شروع از",
     "cardAttachmentsPopup-title": "ضمیمه از",
+    "cardCustomField-datePopup-title": "تغییر تاریخ",
+    "cardCustomFieldsPopup-title": "ویرایش فیلدهای شخصی",
     "cardDeletePopup-title": "آیا می خواهید کارت را حذف کنید؟",
     "cardDetailsActionsPopup-title": "اعمال کارت",
     "cardLabelsPopup-title": "برچسب ها",
     "cardMembersPopup-title": "اعضا",
     "cardMorePopup-title": "بیشتر",
+    "cardTemplatePopup-title": "Create template",
     "cards": "کارت‌ها",
     "cards-count": "کارت‌ها",
+    "casSignIn": "ورود با استفاده از CAS",
+    "cardType-card": "کارت",
+    "cardType-linkedCard": "کارت‌های مرتبط",
+    "cardType-linkedBoard": "تخته‌های مرتبط",
     "change": "تغییر",
     "change-avatar": "تغییر تصویر",
     "change-password": "تغییر کلمه عبور",
@@ -135,30 +175,52 @@
     "changePasswordPopup-title": "تغییر کلمه عبور",
     "changePermissionsPopup-title": "تغییر دسترسی‌ها",
     "changeSettingsPopup-title": "تغییر تنظیمات",
+    "subtasks": "زیر وظیفه",
     "checklists": "سیاهه‌ها",
     "click-to-star": "با کلیک کردن ستاره بدهید",
     "click-to-unstar": "با کلیک کردن ستاره را کم کنید",
     "clipboard": "ذخیره در حافظه ویا بردار-رهاکن",
     "close": "بستن",
     "close-board": "بستن برد",
-    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
+    "close-board-pop": "شما می توانید با کلیک کردن بر روی دکمه «بایگانی» از صفحه هدر، صفحه را بازگردانید.",
     "color-black": "مشکی",
     "color-blue": "آبی",
+    "color-crimson": "قرمز",
+    "color-darkgreen": "سبز تیره",
+    "color-gold": "طلایی",
+    "color-gray": "خاکستری",
     "color-green": "سبز",
+    "color-indigo": "نیلی",
     "color-lime": "لیمویی",
+    "color-magenta": "ارغوانی",
+    "color-mistyrose": "صورتی روشن",
+    "color-navy": "لاجوردی",
     "color-orange": "نارنجی",
+    "color-paleturquoise": "فیروزه‌ای کدر",
+    "color-peachpuff": "هلویی",
     "color-pink": "صورتی",
+    "color-plum": "بنفش کدر",
     "color-purple": "بنفش",
     "color-red": "قرمز",
+    "color-saddlebrown": "کاکائویی",
+    "color-silver": "نقره‌ای",
     "color-sky": "آبی آسمانی",
+    "color-slateblue": "آبی فولادی",
+    "color-white": "سفید",
     "color-yellow": "زرد",
+    "unset-color": "بازنشانی",
     "comment": "نظر",
     "comment-placeholder": "درج نظر",
     "comment-only": "فقط نظر",
     "comment-only-desc": "فقط می‌تواند روی کارت‌ها نظر دهد.",
+    "no-comments": "هیچ کامنتی موجود نیست",
+    "no-comments-desc": "نظرات و فعالیت ها را نمی توان دید.",
     "computer": "رایانه",
-    "confirm-checklist-delete-dialog": "مطمئنید که می‌خواهید سیاهه را حذف کنید؟",
+    "confirm-subtask-delete-dialog": "از حذف این زیر وظیفه اطمینان دارید؟",
+    "confirm-checklist-delete-dialog": "مطمئنا چک لیست پاک شود؟",
     "copy-card-link-to-clipboard": "درج پیوند کارت در حافظه",
+    "linkCardPopup-title": "ارتباط دادن کارت",
+    "searchElementPopup-title": "جستجو",
     "copyCardPopup-title": "کپی کارت",
     "copyChecklistToManyCardsPopup-title": "کپی قالب کارت به کارت‌های متعدد",
     "copyChecklistToManyCardsPopup-instructions": "عنوان و توضیحات کارت مقصد در این قالب JSON",
@@ -167,11 +229,25 @@
     "createBoardPopup-title": "ایجاد تخته",
     "chooseBoardSourcePopup-title": "بارگذاری تخته",
     "createLabelPopup-title": "ایجاد برچسب",
+    "createCustomField": "ایجاد فیلد",
+    "createCustomFieldPopup-title": "ایجاد فیلد",
     "current": "جاری",
+    "custom-field-delete-pop": "این اقدام فیلدشخصی را بهمراه تمامی تاریخچه آن از کارت ها پاک می کند و برگشت پذیر نمی باشد",
+    "custom-field-checkbox": "جعبه انتخابی",
+    "custom-field-date": "تاریخ",
+    "custom-field-dropdown": "لیست افتادنی",
+    "custom-field-dropdown-none": "(هیچ)",
+    "custom-field-dropdown-options": "لیست امکانات",
+    "custom-field-dropdown-options-placeholder": "کلید Enter را جهت افزودن امکانات بیشتر فشار دهید",
+    "custom-field-dropdown-unknown": "(ناشناخته)",
+    "custom-field-number": "عدد",
+    "custom-field-text": "متن",
+    "custom-fields": "فیلدهای شخصی",
     "date": "تاریخ",
     "decline": "رد",
     "default-avatar": "تصویر پیش فرض",
     "delete": "حذف",
+    "deleteCustomFieldPopup-title": "آیا فیلدشخصی پاک شود؟",
     "deleteLabelPopup-title": "آیا می خواهید برچسب را حذف کنید؟",
     "description": "توضیحات",
     "disambiguateMultiLabelPopup-title": "عمل ابهام زدایی از برچسب",
@@ -185,7 +261,8 @@
     "edit-wip-limit": "Edit WIP Limit",
     "soft-wip-limit": "Soft WIP Limit",
     "editCardStartDatePopup-title": "تغییر تاریخ آغاز",
-    "editCardDueDatePopup-title": "تغییر تاریخ بدلیل",
+    "editCardDueDatePopup-title": "تغییر تاریخ پایان",
+    "editCustomFieldPopup-title": "ویرایش فیلد",
     "editCardSpentTimePopup-title": "تغییر زمان صرف شده",
     "editLabelPopup-title": "تغیر برچسب",
     "editNotificationPopup-title": "اصلاح اعلان",
@@ -222,30 +299,36 @@
     "filter-clear": "حذف صافی ـFilterـ",
     "filter-no-label": "بدون برچسب",
     "filter-no-member": "بدون عضو",
+    "filter-no-custom-fields": "هیچ فیلدشخصی ای وجود ندارد",
     "filter-on": "صافی ـFilterـ فعال است",
     "filter-on-desc": "شما صافی ـFilterـ برای کارتهای تخته را روشن کرده اید. جهت ویرایش کلیک نمایید.",
     "filter-to-selection": "صافی ـFilterـ برای موارد انتخابی",
+    "advanced-filter-label": "صافی پیشرفته",
+    "advanced-filter-description": "فیلتر پیشرفته اجازه می دهد تا برای نوشتن رشته حاوی اپراتورهای زیر: ==! = <=> = && || () یک فضای به عنوان یک جداساز بین اپراتورها استفاده می شود. با تایپ کردن نام ها و مقادیر آنها می توانید برای تمام زمینه های سفارشی فیلتر کنید. به عنوان مثال: Field1 == Value1. نکته: اگر فیلدها یا مقادیر حاوی فضاها باشند، شما باید آنها را به یک نقل قول کپسول کنید. برای مثال: 'فیلد 1' == 'مقدار 1'. برای تک تک کاراکترهای کنترل (\\\\) که می توانید از آنها استفاده کنید، می توانید از \\ استفاده کنید. به عنوان مثال: Field1 == I \\ 'm. همچنین شما می توانید شرایط مختلف را ترکیب کنید. برای مثال: F1 == V1 || F1 == V2. به طور معمول همه اپراتورها از چپ به راست تفسیر می شوند. شما می توانید سفارش را با قرار دادن براکت تغییر دهید. برای مثال: F1 == V1 && (F2 == V2 || F2 == V3). همچنین می توانید فیلدهای متنی را با استفاده از regex جستجو کنید: F1 == /Tes.*/i",
     "fullname": "نام و نام خانوادگی",
     "header-logo-title": "بازگشت به صفحه تخته.",
     "hide-system-messages": "عدم نمایش پیامهای سیستمی",
     "headerBarCreateBoardPopup-title": "ایجاد تخته",
     "home": "خانه",
     "import": "وارد کردن",
+    "link": "ارتباط",
     "import-board": "وارد کردن تخته",
     "import-board-c": "وارد کردن تخته",
     "import-board-title-trello": "وارد کردن تخته از Trello",
-    "import-board-title-wekan": "وارد کردن تخته از Wekan",
+    "import-board-title-wekan": "بارگذاری برد ها از آخرین خروجی",
+    "import-sandstorm-backup-warning": "قبل از بررسی این داده ها را از صفحه اصلی صادر شده یا Trello وارد نمیکنید این دانه دوباره باز می شود و یا دوباره باز می شود، یا برد را پیدا نمی کنید، این بدان معنی است که از دست دادن اطلاعات.",
     "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
     "from-trello": "از Trello",
-    "from-wekan": "از Wekan",
+    "from-wekan": "از آخرین خروجی",
     "import-board-instruction-trello": "در Trello-ی خود  به 'Menu'، 'More'، 'Print'، 'Export to JSON رفته و متن نهایی را دراینجا وارد نمایید.",
-    "import-board-instruction-wekan": "In your Wekan board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-wekan": "در هیئت مدیره خود، به 'Menu' بروید، سپس 'Export Board'، و متن را در فایل دانلود شده کپی کنید.",
+    "import-board-instruction-about-errors": "اگر هنگام بازگردانی با خطا مواجه شدید بعضی اوقات بازگردانی انجام می شود و تمامی برد ها در داخل صفحه All Boards هستند",
     "import-json-placeholder": "اطلاعات Json معتبر خود را اینجا وارد کنید.",
     "import-map-members": "نگاشت اعضا",
-    "import-members-map": "تعدادی عضو در تخته وارد شده می باشد. لطفا کاربرانی که باید وارد نرم افزار بشوند را مشخص کنید.",
+    "import-members-map": "برد ها بازگردانده شده تعدادی کاربر دارند . لطفا کاربر های که می خواهید را انتخاب نمایید",
     "import-show-user-mapping": "بررسی نقشه کاربران",
-    "import-user-select": "کاربری از نرم افزار را که می خواهید بعنوان این عضو جایگزین شود را انتخاب کنید.",
-    "importMapMembersAddPopup-title": "انتخاب کاربر Wekan",
+    "import-user-select": "کاربر فعلی خود را انتخاب نمایید اگر میخواهیپ بعنوان کاربر باشد",
+    "importMapMembersAddPopup-title": "انتخاب کاربر",
     "info": "نسخه",
     "initials": "تخصیصات اولیه",
     "invalid-date": "تاریخ نامعتبر",
@@ -264,17 +347,19 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "ارجاع به این کارت",
-    "list-archive-cards": "Move all cards in this list to Recycle Bin",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
+    "list-archive-cards": "انتقال تمامی کارت های این لیست به آرشیو",
+    "list-archive-cards-pop": "این کارتباعث حذف تمامی کارت های این لیست از برد می شود . برای مشاهده کارت ها در آرشیو و برگرداندن آنها به برد بر بروی \"Menu\">\"Archive\" کلیک نمایید",
     "list-move-cards": "انتقال تمام کارت های این لیست",
     "list-select-cards": "انتخاب تمام کارت های این لیست",
+    "set-color-list": "انتخاب رنگ",
     "listActionPopup-title": "لیست اقدامات",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "اضافه کردن مسیر شناور",
     "listImportCardPopup-title": "وارد کردن کارت Trello",
     "listMorePopup-title": "بیشتر",
     "link-list": "پیوند به این فهرست",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "شما می توانید لیست را به آرشیو انتقال دهید تا آن را از برد حذف نمایید و فعالیت های خود را حفظ نمایید",
     "lists": "لیست ها",
     "swimlanes": "Swimlanes",
     "log-out": "خروج",
@@ -294,9 +379,9 @@
     "muted-info": "شما هیچگاه از تغییرات این تخته مطلع نخواهید شد",
     "my-boards": "تخته‌های من",
     "name": "نام",
-    "no-archived-cards": "No cards in Recycle Bin.",
-    "no-archived-lists": "No lists in Recycle Bin.",
-    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
+    "no-archived-cards": "هیچ کارتی در آرشیو موجود نمی باشد",
+    "no-archived-lists": "هیچ لیستی در آرشیو موجود نمی باشد",
+    "no-archived-swimlanes": "هیچ مسیری در آرشیو موجود نمی باشد",
     "no-results": "بدون نتیجه",
     "normal": "عادی",
     "normal-desc": "امکان نمایش و تنظیم کارت بدون امکان تغییر تنظیمات",
@@ -332,6 +417,7 @@
     "restore": "بازیابی",
     "save": "ذخیره",
     "search": "جستجو",
+    "rules": "قوانین",
     "search-cards": "جستجو در میان عناوین و توضیحات در این تخته",
     "search-example": "متن مورد جستجو؟",
     "select-color": "انتخاب رنگ",
@@ -366,6 +452,7 @@
     "title": "عنوان",
     "tracking": "پیگردی",
     "tracking-info": "شما از هرگونه تغییر در کارتهایی که بعنوان ایجاد کننده ویا عضو آن هستید، آگاه خواهید شد",
+    "type": "نوع",
     "unassign-member": "عدم انتصاب کاربر",
     "unsaved-description": "شما توضیحات ذخیره نشده دارید.",
     "unwatch": "عدم دیده بانی",
@@ -374,7 +461,7 @@
     "uploaded-avatar": "تصویر ارسال شد",
     "username": "نام کاربری",
     "view-it": "مشاهده",
-    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
+    "warn-list-archived": "اخطار:این کارت در یک لیست در آرشیو موجود می باشد",
     "watch": "دیده بانی",
     "watching": "درحال دیده بانی",
     "watching-info": "شما از هر تغییری دراین تخته آگاه خواهید شد",
@@ -382,6 +469,9 @@
     "welcome-swimlane": "Milestone 1",
     "welcome-list1": "پایه ای ها",
     "welcome-list2": "پیشرفته",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
     "what-to-do": "چه کاری می خواهید انجام دهید؟",
     "wipLimitErrorPopup-title": "Invalid WIP Limit",
     "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
@@ -407,16 +497,16 @@
     "send-smtp-test": "فرستادن رایانامه آزمایشی به خود",
     "invitation-code": "کد دعوت نامه",
     "email-invite-register-subject": "__inviter__ برای شما دعوت نامه ارسال کرده است",
-    "email-invite-register-text": "__User__ عزیز \nکاربر __inviter__ شما را به عضویت در Wekan برای همکاری دعوت کرده است.\nلطفا لینک زیر را دنبال کنید،\n __url__\nکد دعوت شما __icode__ می باشد.\n باتشکر",
-    "email-smtp-test-subject": "رایانامه SMTP آزمایشی از Wekan",
+    "email-invite-register-text": "__user__ عزیز,\n\n__inviter__ شما را به این برد دعوت کرده است.\n\nلطفا روی لینک زیر کلیک نمایید:\n__url__\n\nو کد معرفی شما: __icode__\n\nبا تشکر.",
+    "email-smtp-test-subject": "SMTP تست ایمیل",
     "email-smtp-test-text": "با موفقیت، یک رایانامه را فرستادید",
     "error-invitation-code-not-exist": "چنین کد دعوتی یافت نشد",
     "error-notAuthorized": "شما مجاز به دیدن این صفحه نیستید.",
     "outgoing-webhooks": "Outgoing Webhooks",
     "outgoingWebhooksPopup-title": "Outgoing Webhooks",
+    "boardCardTitlePopup-title": "فیلتر موضوع کارت",
     "new-outgoing-webhook": "New Outgoing Webhook",
     "no-name": "(ناشناخته)",
-    "Wekan_version": "نسخه Wekan",
     "Node_version": "نسخه Node ",
     "OS_Arch": "OS Arch",
     "OS_Cpus": "OS CPU Count",
@@ -427,13 +517,18 @@
     "OS_Totalmem": "OS Total Memory",
     "OS_Type": "OS Type",
     "OS_Uptime": "OS Uptime",
+    "days": "روزه‌ها",
     "hours": "ساعت",
     "minutes": "دقیقه",
     "seconds": "ثانیه",
+    "show-field-on-card": "این رشته را در کارت نمایش بده",
+    "automatically-field-on-card": "اتوماتیک این رشته را در همه ی کارت ها اضافه کن",
+    "showLabel-field-on-card": "نمایش نام رشته در کارت های کوچک",
     "yes": "بله",
     "no": "خیر",
     "accounts": "حساب‌ها",
     "accounts-allowEmailChange": "اجازه تغییر رایانامه",
+    "accounts-allowUserNameChange": "اجازه تغییر نام کاربری",
     "createdAt": "ساخته شده در",
     "verified": "معتبر",
     "active": "فعال",
@@ -442,5 +537,157 @@
     "card-end": "پایان",
     "card-end-on": "پایان در",
     "editCardReceivedDatePopup-title": "تغییر تاریخ رسید",
-    "editCardEndDatePopup-title": "تغییر تاریخ پایان"
-}
+    "editCardEndDatePopup-title": "تغییر تاریخ پایان",
+    "setCardColorPopup-title": "انتخاب رنگ",
+    "setCardActionsColorPopup-title": "انتخاب کردن رنگ",
+    "setSwimlaneColorPopup-title": "انتخاب کردن رنگ",
+    "setListColorPopup-title": "انتخاب کردن رنگ",
+    "assigned-by": "محول شده توسط",
+    "requested-by": "تقاضا شده توسط",
+    "board-delete-notice": "حذف دائمی است شما تمام لیست ها، کارت ها و اقدامات مرتبط با این برد را از دست خواهید داد.",
+    "delete-board-confirm-popup": "تمام لیست ها، کارت ها، برچسب ها و فعالیت ها حذف خواهند شد و شما نمی توانید محتوای برد را بازیابی کنید. هیچ واکنشی وجود ندارد",
+    "boardDeletePopup-title": "حذف تخته؟",
+    "delete-board": "حذف تخته",
+    "default-subtasks-board": "ریزکار برای __board__ برد",
+    "default": "پیش‌فرض",
+    "queue": "صف",
+    "subtask-settings": "تنظیمات ریزکارها",
+    "boardSubtaskSettingsPopup-title": "تنظیمات ریزکار های برد",
+    "show-subtasks-field": "کارت می تواند ریزکار داشته باشد",
+    "deposit-subtasks-board": "افزودن ریزکار به برد:",
+    "deposit-subtasks-list": "لیست برای ریزکار های افزوده شده",
+    "show-parent-in-minicard": "نمایش خانواده در ریز کارت",
+    "prefix-with-full-path": "پیشوند با مسیر کامل",
+    "prefix-with-parent": "پیشوند با خانواده",
+    "subtext-with-full-path": "زیرنویس با مسیر کامل",
+    "subtext-with-parent": "زیرنویس با خانواده",
+    "change-card-parent": "تغییرخانواده کارت",
+    "parent-card": "کارت خانواده",
+    "source-board": "کارت مرجع",
+    "no-parent": "خانواده نمایش داده نشود",
+    "activity-added-label": "افزودن لیبل '%s' به %s",
+    "activity-removed-label": "حذف لیبل '%s' از %s",
+    "activity-delete-attach": "حذف ضمیمه از %s",
+    "activity-added-label-card": "افزودن لیبل '%s'",
+    "activity-removed-label-card": "حذف لیبل '%s'",
+    "activity-delete-attach-card": "حذف ضمیمه",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "r-rule": "نقش",
+    "r-add-trigger": "افزودن گیره",
+    "r-add-action": "افزودن عملیات",
+    "r-board-rules": "قوانین برد",
+    "r-add-rule": "افزودن نقش",
+    "r-view-rule": "نمایش قانون",
+    "r-delete-rule": "حذف قانون",
+    "r-new-rule-name": "تیتر قانون جدید",
+    "r-no-rules": "بدون قانون",
+    "r-when-a-card": "زمانی که کارت",
+    "r-is": "هست",
+    "r-is-moved": "جابه‌جا شده",
+    "r-added-to": "اضافه شد به",
+    "r-removed-from": "حذف از",
+    "r-the-board": "برد",
+    "r-list": "لیست",
+    "set-filter": "اضافه کردن فیلتر",
+    "r-moved-to": "انتقال به",
+    "r-moved-from": "انتقال از",
+    "r-archived": "انتقال به آرشیو",
+    "r-unarchived": "بازگردانی از آرشیو",
+    "r-a-card": "کارت",
+    "r-when-a-label-is": "زمانی که لیبل هست",
+    "r-when-the-label-is": "زمانی که لیبل هست",
+    "r-list-name": "نام لیست",
+    "r-when-a-member": "زمانی که کاربر هست",
+    "r-when-the-member": "زمانی که کاربر",
+    "r-name": "نام",
+    "r-when-a-attach": "زمانی که ضمیمه",
+    "r-when-a-checklist": "زمانی که چک لیست هست",
+    "r-when-the-checklist": "زمانی که چک لیست",
+    "r-completed": "تمام شده",
+    "r-made-incomplete": "تمام نشده",
+    "r-when-a-item": "زمانی که چک لیست ایتم هست",
+    "r-when-the-item": "زمانی که چک لیست ایتم",
+    "r-checked": "انتخاب شده",
+    "r-unchecked": "لغو انتخاب",
+    "r-move-card-to": "انتقال کارت به",
+    "r-top-of": "بالای",
+    "r-bottom-of": "پایین",
+    "r-its-list": "لیست خود",
+    "r-archive": "انتقال به آرشیو",
+    "r-unarchive": "بازگردانی از آرشیو",
+    "r-card": "کارت",
+    "r-add": "افزودن",
+    "r-remove": "حذف",
+    "r-label": "برچسب",
+    "r-member": "عضو",
+    "r-remove-all": "حذف همه کاربران از کارت",
+    "r-set-color": "انتخاب رنگ به",
+    "r-checklist": "چک لیست",
+    "r-check-all": "انتخاب همه",
+    "r-uncheck-all": "لغو انتخاب همه",
+    "r-items-check": "آیتم از چک لیست",
+    "r-check": "انتخاب",
+    "r-uncheck": "لغو انتخاب",
+    "r-item": "آیتم",
+    "r-of-checklist": "از چک لیست",
+    "r-send-email": "ارسال ایمیل",
+    "r-to": "به",
+    "r-subject": "عنوان",
+    "r-rule-details": "جزئیات قوانین",
+    "r-d-move-to-top-gen": "انتقال کارت به ابتدای لیست خود",
+    "r-d-move-to-top-spec": "انتقال کارت به ابتدای لیست",
+    "r-d-move-to-bottom-gen": "انتقال کارت به انتهای لیست خود",
+    "r-d-move-to-bottom-spec": "انتقال کارت به انتهای لیست",
+    "r-d-send-email": "ارسال ایمیل",
+    "r-d-send-email-to": "به",
+    "r-d-send-email-subject": "عنوان",
+    "r-d-send-email-message": "پیام",
+    "r-d-archive": "انتقال کارت به آرشیو",
+    "r-d-unarchive": "بازگردانی کارت از آرشیو",
+    "r-d-add-label": "افزودن برچسب",
+    "r-d-remove-label": "حذف برچسب",
+    "r-create-card": "ساخت کارت جدید",
+    "r-in-list": "در لیست",
+    "r-in-swimlane": "در مسیرِ شناور",
+    "r-d-add-member": "افزودن عضو",
+    "r-d-remove-member": "حذف عضو",
+    "r-d-remove-all-member": "حذف تمامی کاربران",
+    "r-d-check-all": "انتخاب تمام آیتم های لیست",
+    "r-d-uncheck-all": "لغوانتخاب تمام آیتم های لیست",
+    "r-d-check-one": "انتخاب آیتم",
+    "r-d-uncheck-one": "لغو انتخاب آیتم",
+    "r-d-check-of-list": "از چک لیست",
+    "r-d-add-checklist": "افزودن چک لیست",
+    "r-d-remove-checklist": "حذف چک لیست",
+    "r-by": "توسط",
+    "r-add-checklist": "افزودن چک لیست",
+    "r-with-items": "با موارد",
+    "r-items-list": "مورد۱،مورد۲،مورد۳",
+    "r-add-swimlane": "اضافه کردن مسیر شناور",
+    "r-swimlane-name": "نام مسیر شناور",
+    "r-board-note": "نکته: برای نمایش موارد ممکن کادر را خالی بگذارید.",
+    "r-checklist-note": "نکته: چک‌لیست‌ها باید توسط کاما از یک‌دیگر جدا شوند.",
+    "r-when-a-card-is-moved": "دمانی که یک کارت به لیست دیگری منتقل شد",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "متد اعتبارسنجی",
+    "authentication-type": "نوع اعتبارسنجی",
+    "custom-product-name": "نام سفارشی محصول",
+    "layout": "لایه",
+    "hide-logo": "مخفی سازی نماد",
+    "add-custom-html-after-body-start": "افزودن کد های HTML بعد از  <body> شروع",
+    "add-custom-html-before-body-end": "افزودن کد های HTML قبل از  </body> پایان",
+    "error-undefined": "یک اشتباه رخ داده شده است",
+    "error-ldap-login": "هنگام تلاش برای ورود به یک خطا رخ داد",
+    "display-authentication-method": "نمایش نوع اعتبارسنجی",
+    "default-authentication-method": "نوع اعتبارسنجی پیشفرض",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
+}
\ No newline at end of file
diff --git a/i18n/fi.i18n.json b/i18n/fi.i18n.json
index 054e9969..f304ef93 100644
--- a/i18n/fi.i18n.json
+++ b/i18n/fi.i18n.json
@@ -1,35 +1,51 @@
 {
     "accept": "Hyväksy",
-    "act-activity-notify": "[Wekan] Toimintailmoitus",
-    "act-addAttachment": "liitetty __attachment__ kortille __card__",
-    "act-addChecklist": "lisätty tarkistuslista __checklist__ kortille __card__",
-    "act-addChecklistItem": "lisätty kohta __checklistItem__ tarkistuslistaan __checklist__ kortilla __card__",
-    "act-addComment": "kommentoitu __card__: __comment__",
-    "act-createBoard": "luotu __board__",
-    "act-createCard": "lisätty __card__ listalle __list__",
-    "act-createList": "lisätty __list__ taululle __board__",
-    "act-addBoardMember": "lisätty __member__ taululle __board__",
-    "act-archivedBoard": "__board__ siirretty roskakoriin",
-    "act-archivedCard": "__card__ siirretty roskakoriin",
-    "act-archivedList": "__list__ siirretty roskakoriin",
-    "act-archivedSwimlane": "__swimlane__ siirretty roskakoriin",
-    "act-importBoard": "tuotu __board__",
-    "act-importCard": "tuotu __card__",
-    "act-importList": "tuotu __list__",
-    "act-joinMember": "lisätty __member__ kortille __card__",
-    "act-moveCard": "siirretty __card__ listalta __oldList__ listalle __list__",
-    "act-removeBoardMember": "poistettu __member__ taululta __board__",
-    "act-restoredCard": "palautettu __card__ taululle __board__",
-    "act-unjoinMember": "poistettu __member__ kortilta __card__",
-    "act-withBoardTitle": "[Wekan] __board__",
+    "act-activity-notify": "Toimintailmoitus",
+    "act-addAttachment": "lisätty liite __attachment__ kortille __card__ listalla __list__ swimlanella __swimlane__ taululla __board__",
+    "act-deleteAttachment": "poistettu liite __attachment__ kortilla __card__ listalla __list__ swimlanella  __swimlane__ taululla __board__",
+    "act-addSubtask": "lisätty alitehtävä __subtask__ kortille __card__ listalla __list__ swimlanella __swimlane__ taululla __board__",
+    "act-addLabel": "Lisätty tunniste __label__ kortille __card__ listalla __list__ swimlanella __swimlane__ taululla __board__",
+    "act-addedLabel": "Lisätty tunniste __label__ kortille __card__ listalla __list__ swimlanella __swimlane__ taululla __board__",
+    "act-removeLabel": "Poistettu tunniste __label__ kortilta __card__ listalla __list__ swimlanella __swimlane__ taululla __board__",
+    "act-removedLabel": "Poistettu tunniste __label__ kortilta __card__ listalla __list__ swimlanella __swimlane__ taululla __board__",
+    "act-addChecklist": "lisätty tarkistuslista __checklist__ kortille __card__ listalla __list__ swimlanella __swimlane__ taululla __board__",
+    "act-addChecklistItem": "lisätty tarkistuslistan kohta __checklistItem__ tarkistuslistalle __checklist__ kortilla __card__ listalla __list__ swimlanella __swimlane__ taululla __board__",
+    "act-removeChecklist": "poistettu tarkistuslista __checklist__ kortilta __card__ listalla __list__ swimlanella __swimlane__ taululla __board__",
+    "act-removeChecklistItem": "poistettu tarkistuslistan kohta __checklistItem__ tarkistuslistalta __checklist__ kortilla __card__ listalla __list__ swimlanella __swimlane__ taululla __board__",
+    "act-checkedItem": "ruksattu __checklistItem__ tarkistuslistalla __checklist__ kortilla __card__ listalla __list__ swimlanella __swimlane__ taululla __board__",
+    "act-uncheckedItem": "poistettu ruksi __checklistItem__ tarkistuslistalta __checklist__ kortilla __card__ listalla __list__ swimlanella __swimlane__ taululla __board__",
+    "act-completeChecklist": "valmistui tarkistuslista __checklist__ kortilla __card__ listalla __list__ swimlanella __swimlane__ taululla __board__",
+    "act-uncompleteChecklist": "tehty ei valmistuneeksi tarkistuslista __checklist__ kortilla __card__ listalla __list__ swimlanella __swimlane__ taululla __board__",
+    "act-addComment": "kommentoitu kortilla __card__: __comment__ listalla __list__ swimlanella __swimlane__ taululla __board__",
+    "act-createBoard": "luotu taulu __board__",
+    "act-createSwimlane": "loi swimlanen __swimlane__ taululle __board__",
+    "act-createCard": "luotu kortti __card__ listalle __list__ swimlanella __swimlane__ taululla __board__",
+    "act-createCustomField": "luotu mukautettu kenttä __customField__ kortille __card__ listalla __list__ swimlanella __swimlane__ taululla __board__",
+    "act-createList": "lisätty lista __list__ taululle __board__",
+    "act-addBoardMember": "lisätty jäsen __member__ taululle __board__",
+    "act-archivedBoard": "Taulu __board__ siirretty Arkistoon",
+    "act-archivedCard": "Kortti __card__ listalla __list__ swimlanella __swimlane__ taululla __board__ siirretty Arkistoon",
+    "act-archivedList": "Lista __list__ swimlanella __swimlane__ taululla __board__ siirretty Arkistoon",
+    "act-archivedSwimlane": "Swimlane __swimlane__ taululla __board__ siirretty Arkistoon",
+    "act-importBoard": "tuotu taulu __board__",
+    "act-importCard": "tuotu kortti  __card__ listalle __list__ swimlanella __swimlane__ taululla __board__",
+    "act-importList": "tuotu lista __list__ swimlanelle __swimlane__ taululla __board__",
+    "act-joinMember": "lisätty jäsen __member__ kortille __card__ listalla __list__ swimlanella __swimlane__ taululla __board__",
+    "act-moveCard": "siirsi kortin __card__ taululla __board__ listasta __oldList__ swimlanelta __oldSwimlane__ listalle __list__ swimlanelle __swimlane__",
+    "act-moveCardToOtherBoard": "siirretty kortti __card__ listasta __oldList__ swimlanella __oldSwimlane__ taululla __oldBoard__ listalle __list__ swimlanella __swimlane__ taululla __board__",
+    "act-removeBoardMember": "poistettu jäsen __member__ taululta __board__",
+    "act-restoredCard": "palautettu kortti __card__ listalle __list__ swimlanella __swimlane__ taululla __board__",
+    "act-unjoinMember": "poistettu jäsen __member__ kortilta __card__ listalla __list__ swimlanella __swimlane__ taululla __board__",
+    "act-withBoardTitle": "__board__",
     "act-withCardTitle": "[__board__] __card__",
     "actions": "Toimet",
     "activities": "Toimet",
     "activity": "Toiminta",
     "activity-added": "lisätty %s kohteeseen %s",
-    "activity-archived": "%s siirretty roskakoriin",
+    "activity-archived": "%s siirretty Arkistoon",
     "activity-attached": "liitetty %s kohteeseen %s",
     "activity-created": "luotu %s",
+    "activity-customfield-created": "luotu mukautettu kenttä %s",
     "activity-excluded": "poistettu %s kohteesta %s",
     "activity-imported": "tuotu %s kohteeseen %s lähteestä %s",
     "activity-imported-board": "tuotu %s lähteestä %s",
@@ -39,13 +55,25 @@
     "activity-removed": "poistettu %s kohteesta %s",
     "activity-sent": "lähetetty %s kohteeseen %s",
     "activity-unjoined": "peruttu %s liittyminen",
+    "activity-subtask-added": "lisätty alitehtävä kohteeseen %s",
+    "activity-checked-item": "ruksattu %s tarkistuslistassa %s / %s",
+    "activity-unchecked-item": "poistettu ruksi %s tarkistuslistassa %s / %s",
     "activity-checklist-added": "lisätty tarkistuslista kortille %s",
+    "activity-checklist-removed": "poistettu tarkistuslista kohteesta %s",
+    "activity-checklist-completed": "valmistui tarkistuslista __checklist__ kortilla __card__ listalla __list__ swimlanella __swimlane__ taululla __board__",
+    "activity-checklist-uncompleted": "ei saatu valmiiksi tarkistuslista %s / %s",
     "activity-checklist-item-added": "lisäsi kohdan tarkistuslistaan '%s' kortilla %s",
+    "activity-checklist-item-removed": "poistettu tarkistuslistan kohta '%s' / %s",
     "add": "Lisää",
+    "activity-checked-item-card": "ruksattu %s tarkistuslistassa %s",
+    "activity-unchecked-item-card": "poistettu ruksi %s tarkistuslistassa %s",
+    "activity-checklist-completed-card": "valmistui tarkistuslista __checklist__ kortilla __card__ listalla __list__ swimlanella __swimlane__ taululla __board__",
+    "activity-checklist-uncompleted-card": "ei valmistunut tarkistuslista %s",
     "add-attachment": "Lisää liite",
     "add-board": "Lisää taulu",
     "add-card": "Lisää kortti",
     "add-swimlane": "Lisää Swimlane",
+    "add-subtask": "Lisää alitehtävä",
     "add-checklist": "Lisää tarkistuslista",
     "add-checklist-item": "Lisää kohta tarkistuslistaan",
     "add-cover": "Lisää kansi",
@@ -63,20 +91,22 @@
     "and-n-other-card": "Ja __count__ muu kortti",
     "and-n-other-card_plural": "Ja __count__ muuta korttia",
     "apply": "Käytä",
-    "app-is-offline": "Wekan latautuu, odota. Sivun uudelleenlataus aiheuttaa tietojen menettämisen. Jos Wekan ei lataudu, tarkista että Wekan palvelin ei ole pysähtynyt.",
-    "archive": "Siirrä roskakoriin",
-    "archive-all": "Siirrä kaikki roskakoriin",
-    "archive-board": "Siirrä taulu roskakoriin",
-    "archive-card": "Siirrä kortti roskakoriin",
-    "archive-list": "Siirrä lista roskakoriin",
-    "archive-swimlane": "Siirrä Swimlane roskakoriin",
-    "archive-selection": "Siirrä valinta roskakoriin",
-    "archiveBoardPopup-title": "Siirrä taulu roskakoriin?",
-    "archived-items": "Roskakori",
-    "archived-boards": "Taulut roskakorissa",
+    "app-is-offline": "Ladataan, odota. Sivun uudelleenlataus aiheuttaa tietojen menettämisen. Jos lataaminen ei toimi, tarkista että palvelin ei ole pysähtynyt.",
+    "archive": "Siirrä Arkistoon",
+    "archive-all": "Siirrä kaikki Arkistoon",
+    "archive-board": "Siirrä taulu Arkistoon",
+    "archive-card": "Siirrä kortti Arkistoon",
+    "archive-list": "Siirrä lista Arkistoon",
+    "archive-swimlane": "Siirrä Swimlane Arkistoon",
+    "archive-selection": "Siirrä valinta Arkistoon",
+    "archiveBoardPopup-title": "Siirrä taulu Arkistoon?",
+    "archived-items": "Arkisto",
+    "archived-boards": "Taulut Arkistossa",
     "restore-board": "Palauta taulu",
-    "no-archived-boards": "Ei tauluja roskakorissa",
-    "archives": "Roskakori",
+    "no-archived-boards": "Ei tauluja Arkistossa",
+    "archives": "Arkisto",
+    "template": "Malli",
+    "templates": "Mallit",
     "assign-member": "Valitse jäsen",
     "attached": "liitetty",
     "attachment": "Liitetiedosto",
@@ -95,22 +125,25 @@
     "boardChangeTitlePopup-title": "Nimeä taulu uudelleen",
     "boardChangeVisibilityPopup-title": "Muokkaa näkyvyyttä",
     "boardChangeWatchPopup-title": "Muokkaa seuraamista",
-    "boardMenuPopup-title": "Taulu valikko",
+    "boardMenuPopup-title": "Taulu asetukset",
     "boards": "Taulut",
     "board-view": "Taulu näkymä",
+    "board-view-cal": "Kalenteri",
     "board-view-swimlanes": "Swimlanet",
     "board-view-lists": "Listat",
     "bucket-example": "Kuten “Laatikko lista” esimerkiksi",
     "cancel": "Peruuta",
-    "card-archived": "Tämä kortti on siirretty roskakoriin.",
+    "card-archived": "Tämä kortti on siirretty Arkistoon.",
+    "board-archived": "Tämä taulu on siirretty Arkistoon.",
     "card-comments-title": "Tässä kortissa on %s kommenttia.",
     "card-delete-notice": "Poistaminen on lopullista. Menetät kaikki toimet jotka on liitetty tähän korttiin.",
     "card-delete-pop": "Kaikki toimet poistetaan toimintasyötteestä ja et tule pystymään uudelleenavaamaan korttia. Tätä ei voi peruuttaa.",
-    "card-delete-suggest-archive": "Voit siirtää kortin roskakoriin poistaaksesi sen taululta ja säilyttääksesi toimintalokin.",
+    "card-delete-suggest-archive": "Voit siirtää kortin Arkistoon poistaaksesi sen taululta ja säilyttääksesi toimintalokin.",
     "card-due": "Erääntyy",
     "card-due-on": "Erääntyy",
     "card-spent": "Käytetty aika",
     "card-edit-attachments": "Muokkaa liitetiedostoja",
+    "card-edit-custom-fields": "Muokkaa mukautettuja kenttiä",
     "card-edit-labels": "Muokkaa tunnisteita",
     "card-edit-members": "Muokkaa jäseniä",
     "card-labels-title": "Muokkaa kortin tunnisteita.",
@@ -118,13 +151,20 @@
     "card-start": "Alkaa",
     "card-start-on": "Alkaa",
     "cardAttachmentsPopup-title": "Liitä mistä",
+    "cardCustomField-datePopup-title": "Muokkaa päivää",
+    "cardCustomFieldsPopup-title": "Muokkaa mukautettuja kenttiä",
     "cardDeletePopup-title": "Poista kortti?",
     "cardDetailsActionsPopup-title": "Kortti toimet",
     "cardLabelsPopup-title": "Tunnisteet",
     "cardMembersPopup-title": "Jäsenet",
     "cardMorePopup-title": "Lisää",
+    "cardTemplatePopup-title": "Luo malli",
     "cards": "Kortit",
     "cards-count": "korttia",
+    "casSignIn": "CAS kirjautuminen",
+    "cardType-card": "Kortti",
+    "cardType-linkedCard": "Linkitetty kortti",
+    "cardType-linkedBoard": "Linkitetty taulu",
     "change": "Muokkaa",
     "change-avatar": "Muokkaa profiilikuvaa",
     "change-password": "Vaihda salasana",
@@ -135,30 +175,52 @@
     "changePasswordPopup-title": "Vaihda salasana",
     "changePermissionsPopup-title": "Muokkaa oikeuksia",
     "changeSettingsPopup-title": "Muokkaa asetuksia",
+    "subtasks": "Alitehtävät",
     "checklists": "Tarkistuslistat",
     "click-to-star": "Klikkaa merkataksesi tämä taulu tähdellä.",
     "click-to-unstar": "Klikkaa poistaaksesi tähtimerkintä taululta.",
     "clipboard": "Leikepöytä tai raahaa ja pudota",
     "close": "Sulje",
     "close-board": "Sulje taulu",
-    "close-board-pop": "Voit palauttaa taulun klikkaamalla “Roskakori” painiketta taululistan yläpalkista.",
+    "close-board-pop": "Voit palauttaa taulun klikkaamalla “Arkisto” painiketta taululistan yläpalkista.",
     "color-black": "musta",
     "color-blue": "sininen",
+    "color-crimson": "karmiininpunainen",
+    "color-darkgreen": "tummanvihreä",
+    "color-gold": "kulta",
+    "color-gray": "harmaa",
     "color-green": "vihreä",
+    "color-indigo": "syvän sininen",
     "color-lime": "lime",
+    "color-magenta": "magenta",
+    "color-mistyrose": "vaaleanpunainen ruusu",
+    "color-navy": "laivastonsininen",
     "color-orange": "oranssi",
+    "color-paleturquoise": "vaalean turkoosi",
+    "color-peachpuff": "persikanpunainen",
     "color-pink": "vaaleanpunainen",
+    "color-plum": "luumunvärinen",
     "color-purple": "violetti",
     "color-red": "punainen",
+    "color-saddlebrown": "satulanruskea",
+    "color-silver": "hopea",
     "color-sky": "taivas",
+    "color-slateblue": "liuskekivi sininen",
+    "color-white": "valkoinen",
     "color-yellow": "keltainen",
+    "unset-color": "Peru väri",
     "comment": "Kommentti",
     "comment-placeholder": "Kirjoita kommentti",
     "comment-only": "Vain kommentointi",
     "comment-only-desc": "Voi vain kommentoida kortteja",
+    "no-comments": "Ei kommentteja",
+    "no-comments-desc": "Ei voi nähdä kommentteja ja toimintaa.",
     "computer": "Tietokone",
-    "confirm-checklist-delete-dialog": "Haluatko varmasti poistaa tarkistuslistan",
+    "confirm-subtask-delete-dialog": "Oletko varma että haluat poistaa alitehtävän?",
+    "confirm-checklist-delete-dialog": "Oletko varma että haluat poistaa tarkistuslistan?",
     "copy-card-link-to-clipboard": "Kopioi kortin linkki leikepöydälle",
+    "linkCardPopup-title": "Linkitä kortti",
+    "searchElementPopup-title": "Etsi",
     "copyCardPopup-title": "Kopioi kortti",
     "copyChecklistToManyCardsPopup-title": "Kopioi tarkistuslistan malli monille korteille",
     "copyChecklistToManyCardsPopup-instructions": "Kohde korttien otsikot ja kuvaukset JSON muodossa",
@@ -167,11 +229,25 @@
     "createBoardPopup-title": "Luo taulu",
     "chooseBoardSourcePopup-title": "Tuo taulu",
     "createLabelPopup-title": "Luo tunniste",
+    "createCustomField": "Luo kenttä",
+    "createCustomFieldPopup-title": "Luo kenttä",
     "current": "nykyinen",
+    "custom-field-delete-pop": "Tätä ei voi peruuttaa. Tämä poistaa tämän mukautetun kentän kaikista korteista ja poistaa sen historian.",
+    "custom-field-checkbox": "Valintaruutu",
+    "custom-field-date": "Päivämäärä",
+    "custom-field-dropdown": "Pudotusvalikko",
+    "custom-field-dropdown-none": "(ei mitään)",
+    "custom-field-dropdown-options": "Luettelon vaihtoehdot",
+    "custom-field-dropdown-options-placeholder": "Paina Enter lisätäksesi lisää vaihtoehtoja",
+    "custom-field-dropdown-unknown": "(tuntematon)",
+    "custom-field-number": "Numero",
+    "custom-field-text": "Teksti",
+    "custom-fields": "Mukautetut kentät",
     "date": "Päivämäärä",
     "decline": "Kieltäydy",
     "default-avatar": "Oletus profiilikuva",
     "delete": "Poista",
+    "deleteCustomFieldPopup-title": "Poista mukautettu kenttä?",
     "deleteLabelPopup-title": "Poista tunniste?",
     "description": "Kuvaus",
     "disambiguateMultiLabelPopup-title": "Yksikäsitteistä tunniste toiminta",
@@ -186,6 +262,7 @@
     "soft-wip-limit": "Pehmeä WIP raja",
     "editCardStartDatePopup-title": "Muokkaa aloituspäivää",
     "editCardDueDatePopup-title": "Muokkaa eräpäivää",
+    "editCustomFieldPopup-title": "Muokkaa kenttää",
     "editCardSpentTimePopup-title": "Muuta käytettyä aikaa",
     "editLabelPopup-title": "Muokkaa tunnistetta",
     "editNotificationPopup-title": "Muokkaa ilmoituksia",
@@ -222,30 +299,36 @@
     "filter-clear": "Poista suodatin",
     "filter-no-label": "Ei tunnistetta",
     "filter-no-member": "Ei jäseniä",
+    "filter-no-custom-fields": "Ei mukautettuja kenttiä",
     "filter-on": "Suodatus on päällä",
     "filter-on-desc": "Suodatat kortteja tällä taululla. Klikkaa tästä muokataksesi suodatinta.",
     "filter-to-selection": "Suodata valintaan",
+    "advanced-filter-label": "Edistynyt suodatin",
+    "advanced-filter-description": "Edistynyt suodatin mahdollistaa merkkijonon, joka sisältää seuraavat operaattorit: == != <= >= && || ( ) Operaattorien välissä käytetään välilyöntiä. Voit suodattaa kaikki mukautetut kentät kirjoittamalla niiden nimet ja arvot. Esimerkiksi: Field1 == Value1. Huom: Jos kentillä tai arvoilla on välilyöntejä, sinun on sijoitettava ne yksittäisiin lainausmerkkeihin. Esimerkki: 'Kenttä 1' == 'Arvo 1'. Voit hypätä yksittäisen kontrollimerkkien (' \\/) yli käyttämällä \\. Esimerkki: Field1 = I\\'m. Voit myös yhdistää useita ehtoja. Esimerkiksi: F1 == V1 || F1 == V2. Yleensä kaikki operaattorit tulkitaan vasemmalta oikealle. Voit muuttaa järjestystä asettamalla sulkuja. Esimerkiksi: F1 == V1 && (F2 == V2 || F2 == V3). Voit myös etsiä tekstikentistä regexillä: F1 == /Tes.*/i",
     "fullname": "Koko nimi",
     "header-logo-title": "Palaa taulut sivullesi.",
     "hide-system-messages": "Piilota järjestelmäviestit",
     "headerBarCreateBoardPopup-title": "Luo taulu",
     "home": "Koti",
     "import": "Tuo",
+    "link": "Linkitä",
     "import-board": "tuo taulu",
     "import-board-c": "Tuo taulu",
     "import-board-title-trello": "Tuo taulu Trellosta",
-    "import-board-title-wekan": "Tuo taulu Wekanista",
+    "import-board-title-wekan": "Tuo taulu edellisestä viennistä",
+    "import-sandstorm-backup-warning": "Älä poista tietoja joita toit alkuperäisestä viennistä tai Trellosta ennenkuin tarkistat onnistuuko sulkea ja avata tämä jyvä uudelleen, vai näkyykö Board not found virhe, joka tarkoittaa tietojen häviämistä.",
     "import-sandstorm-warning": "Tuotu taulu poistaa kaikki olemassaolevan taulun tiedot ja korvaa ne tuodulla taululla.",
     "from-trello": "Trellosta",
-    "from-wekan": "Wekanista",
+    "from-wekan": "Edellisestä viennistä",
     "import-board-instruction-trello": "Trello taulullasi, mene 'Menu', sitten 'More', 'Print and Export', 'Export JSON', ja kopioi tuloksena saamasi teksti",
-    "import-board-instruction-wekan": "Wekan taulullasi, mene 'Valikko', sitten 'Vie taulu', ja kopioi teksti ladatusta tiedostosta.",
+    "import-board-instruction-wekan": "Taulullasi, mene 'Valikko', sitten 'Vie taulu', ja kopioi teksti ladatusta tiedostosta.",
+    "import-board-instruction-about-errors": "Jos virheitä tulee taulua tuotaessa, joskus tuonti silti toimii, ja taulu on Kaikki taulut sivulla.",
     "import-json-placeholder": "Liitä kelvollinen JSON tietosi tähän",
     "import-map-members": "Vastaavat jäsenet",
-    "import-members-map": "Tuomallasi taululla on muutamia jäseniä. Ole hyvä ja valitse tuomiasi jäseniä vastaavat  Wekan käyttäjät",
+    "import-members-map": "Tuomallasi taululla on muutamia jäseniä. Ole hyvä ja valitse tuomiasi jäseniä vastaavat käyttäjäsi",
     "import-show-user-mapping": "Tarkasta vastaavat jäsenet",
-    "import-user-select": "Valitse Wekan käyttäjä jota haluat käyttää tänä käyttäjänä",
-    "importMapMembersAddPopup-title": "Valitse Wekan käyttäjä",
+    "import-user-select": "Valitse olemassaoleva käyttäjä jota haluat käyttää tänä käyttäjänä",
+    "importMapMembersAddPopup-title": "Valitse käyttäjä",
     "info": "Versio",
     "initials": "Nimikirjaimet",
     "invalid-date": "Virheellinen päivämäärä",
@@ -264,17 +347,19 @@
     "leave-board-pop": "Haluatko varmasti poistua taululta __boardTitle__? Sinut poistetaan kaikista tämän taulun korteista.",
     "leaveBoardPopup-title": "Jää pois taululta ?",
     "link-card": "Linkki tähän korttiin",
-    "list-archive-cards": "Siirrä kaikki tämän listan kortit roskakoriin",
-    "list-archive-cards-pop": "Tämä poistaa kaikki tämän listan kortit taululta. Nähdäksesi roskakorissa olevat kortit ja tuodaksesi ne takaisin taululle, klikkaa “Valikko” > “Roskakori”.",
+    "list-archive-cards": "Siirrä kaikki tämän listan kortit Arkistoon",
+    "list-archive-cards-pop": "Tämä poistaa kaikki tämän listan kortit taululta. Nähdäksesi Arkistossa olevat kortit ja tuodaksesi ne takaisin taululle, klikkaa “Valikko” > “Arkisto”.",
     "list-move-cards": "Siirrä kaikki kortit tässä listassa",
     "list-select-cards": "Valitse kaikki kortit tässä listassa",
+    "set-color-list": "Aseta väri",
     "listActionPopup-title": "Listaa toimet",
     "swimlaneActionPopup-title": "Swimlane toimet",
+    "swimlaneAddPopup-title": "Lisää Swimlane alle",
     "listImportCardPopup-title": "Tuo Trello kortti",
     "listMorePopup-title": "Lisää",
     "link-list": "Linkki tähän listaan",
     "list-delete-pop": "Kaikki toimet poistetaan toimintasyötteestä ja listan poistaminen on lopullista. Tätä ei pysty peruuttamaan.",
-    "list-delete-suggest-archive": "Voit siirtää listan roskakoriin poistaaksesi sen taululta ja säilyttääksesi toimintalokin.",
+    "list-delete-suggest-archive": "Voit siirtää listan Arkistoon poistaaksesi sen taululta ja säilyttääksesi toimintalokin.",
     "lists": "Listat",
     "swimlanes": "Swimlanet",
     "log-out": "Kirjaudu ulos",
@@ -294,9 +379,9 @@
     "muted-info": "Et saa koskaan ilmoituksia tämän taulun muutoksista",
     "my-boards": "Tauluni",
     "name": "Nimi",
-    "no-archived-cards": "Ei kortteja roskakorissa.",
-    "no-archived-lists": "Ei listoja roskakorissa.",
-    "no-archived-swimlanes": "Ei Swimlaneja roskakorissa.",
+    "no-archived-cards": "Ei kortteja Arkistossa.",
+    "no-archived-lists": "Ei listoja Arkistossa.",
+    "no-archived-swimlanes": "Ei Swimlaneja Arkistossa.",
     "no-results": "Ei tuloksia",
     "normal": "Normaali",
     "normal-desc": "Voi nähdä ja muokata kortteja. Ei voi muokata asetuksia.",
@@ -332,6 +417,7 @@
     "restore": "Palauta",
     "save": "Tallenna",
     "search": "Etsi",
+    "rules": "Säännöt",
     "search-cards": "Etsi korttien otsikoista ja kuvauksista tällä taululla",
     "search-example": "Teksti jota etsitään?",
     "select-color": "Valitse väri",
@@ -366,15 +452,16 @@
     "title": "Otsikko",
     "tracking": "Ilmoitukset",
     "tracking-info": "Sinulle ilmoitetaan muutoksista korteissa joihin olet osallistunut luojana tai jäsenenä.",
+    "type": "Tyyppi",
     "unassign-member": "Peru jäsenvalinta",
     "unsaved-description": "Sinulla on tallentamaton kuvaus.",
     "unwatch": "Lopeta seuraaminen",
     "upload": "Lähetä",
     "upload-avatar": "Lähetä profiilikuva",
     "uploaded-avatar": "Profiilikuva lähetetty",
-    "username": "Käyttäjänimi",
+    "username": "Käyttäjätunnus",
     "view-it": "Näytä se",
-    "warn-list-archived": "varoitus: tämä kortti on roskakorissa olevassa listassa",
+    "warn-list-archived": "varoitus: tämä kortti on Arkistossa olevassa listassa",
     "watch": "Seuraa",
     "watching": "Seurataan",
     "watching-info": "Sinulle ilmoitetaan tämän taulun muutoksista",
@@ -382,6 +469,9 @@
     "welcome-swimlane": "Merkkipaalu 1",
     "welcome-list1": "Perusasiat",
     "welcome-list2": "Edistynyt",
+    "card-templates-swimlane": "Kortti mallit",
+    "list-templates-swimlane": "Lista mallit",
+    "board-templates-swimlane": "Taulu mallit",
     "what-to-do": "Mitä haluat tehdä?",
     "wipLimitErrorPopup-title": "Virheellinen WIP-raja",
     "wipLimitErrorPopup-dialog-pt1": "Tässä listassa olevien tehtävien määrä on korkeampi kuin asettamasi WIP-raja.",
@@ -400,23 +490,23 @@
     "smtp-tls-description": "Ota käyttöön TLS tuki SMTP palvelimelle",
     "smtp-host": "SMTP isäntä",
     "smtp-port": "SMTP portti",
-    "smtp-username": "Käyttäjänimi",
+    "smtp-username": "Käyttäjätunnus",
     "smtp-password": "Salasana",
     "smtp-tls": "TLS tuki",
     "send-from": "Lähettäjä",
     "send-smtp-test": "Lähetä testi sähköposti itsellesi",
     "invitation-code": "Kutsukoodi",
     "email-invite-register-subject": "__inviter__ lähetti sinulle kutsun",
-    "email-invite-register-text": "Hei __user__,\n\n__inviter__ kutsuu sinut mukaan Wekan ohjelman käyttöön.\n\nOle hyvä ja seuraa allaolevaa linkkiä:\n__url__\n\nJa kutsukoodisi on: __icode__\n\nKiitos.",
-    "email-smtp-test-subject": "SMTP testi sähköposti Wekanista",
+    "email-invite-register-text": "Hei __user__,\n\n__inviter__ kutsuu sinut mukaan kanban taulun käyttöön.\n\nOle hyvä ja seuraa allaolevaa linkkiä:\n__url__\n\nJa kutsukoodisi on: __icode__\n\nKiitos.",
+    "email-smtp-test-subject": "SMTP testi sähköposti",
     "email-smtp-test-text": "Olet onnistuneesti lähettänyt sähköpostin",
     "error-invitation-code-not-exist": "Kutsukoodi ei ole olemassa",
     "error-notAuthorized": "Sinulla ei ole oikeutta tarkastella tätä sivua.",
     "outgoing-webhooks": "Lähtevät Webkoukut",
     "outgoingWebhooksPopup-title": "Lähtevät Webkoukut",
+    "boardCardTitlePopup-title": "Kortin otsikko suodatin",
     "new-outgoing-webhook": "Uusi lähtevä Webkoukku",
     "no-name": "(Tuntematon)",
-    "Wekan_version": "Wekan versio",
     "Node_version": "Node versio",
     "OS_Arch": "Käyttöjärjestelmän arkkitehtuuri",
     "OS_Cpus": "Käyttöjärjestelmän CPU määrä",
@@ -427,13 +517,18 @@
     "OS_Totalmem": "Käyttöjärjestelmän muistin kokonaismäärä",
     "OS_Type": "Käyttöjärjestelmän tyyppi",
     "OS_Uptime": "Käyttöjärjestelmä ollut käynnissä",
+    "days": "päivää",
     "hours": "tuntia",
     "minutes": "minuuttia",
     "seconds": "sekuntia",
+    "show-field-on-card": "Näytä tämä kenttä kortilla",
+    "automatically-field-on-card": "Luo kenttä automaattisesti kaikille korteille",
+    "showLabel-field-on-card": "Näytä kentän tunniste minikortilla",
     "yes": "Kyllä",
     "no": "Ei",
     "accounts": "Tilit",
     "accounts-allowEmailChange": "Salli sähköpostiosoitteen muuttaminen",
+    "accounts-allowUserNameChange": "Salli käyttäjätunnuksen muuttaminen",
     "createdAt": "Luotu",
     "verified": "Varmistettu",
     "active": "Aktiivinen",
@@ -442,5 +537,157 @@
     "card-end": "Loppuu",
     "card-end-on": "Loppuu",
     "editCardReceivedDatePopup-title": "Vaihda vastaanottamispäivää",
-    "editCardEndDatePopup-title": "Vaihda loppumispäivää"
-}
+    "editCardEndDatePopup-title": "Vaihda loppumispäivää",
+    "setCardColorPopup-title": "Aseta väri",
+    "setCardActionsColorPopup-title": "Valitse väri",
+    "setSwimlaneColorPopup-title": "Valitse väri",
+    "setListColorPopup-title": "Valitse väri",
+    "assigned-by": "Tehtävänantaja",
+    "requested-by": "Pyytäjä",
+    "board-delete-notice": "Poistaminen on lopullista. Menetät kaikki listat, kortit ja toimet tällä taululla.",
+    "delete-board-confirm-popup": "Kaikki listat, kortit, tunnisteet ja toimet poistetaan ja et pysty palauttamaan taulun sisältöä. Tätä ei voi peruuttaa.",
+    "boardDeletePopup-title": "Poista taulu?",
+    "delete-board": "Poista taulu",
+    "default-subtasks-board": "Alitehtävät __board__ taululle",
+    "default": "Oletus",
+    "queue": "Jono",
+    "subtask-settings": "Alitehtävä asetukset",
+    "boardSubtaskSettingsPopup-title": "Taulu alitehtävien asetukset",
+    "show-subtasks-field": "Korteilla voi olla alitehtäviä",
+    "deposit-subtasks-board": "Tallenta alitehtävät tälle taululle:",
+    "deposit-subtasks-list": "Laskeutumislista alatehtäville tallennettu tänne:",
+    "show-parent-in-minicard": "Näytä ylätehtävä minikortilla:",
+    "prefix-with-full-path": "Etuliite koko polulla",
+    "prefix-with-parent": "Etuliite ylätehtävällä",
+    "subtext-with-full-path": "Aliteksti koko polulla",
+    "subtext-with-parent": "Aliteksti ylätehtävällä",
+    "change-card-parent": "Muuta kortin ylätehtävää",
+    "parent-card": "Ylätehtävä kortti",
+    "source-board": "Lähdetaulu",
+    "no-parent": "Älä näytä ylätehtävää",
+    "activity-added-label": "lisätty tunniste '%s' kohteeseen %s",
+    "activity-removed-label": "poistettu tunniste '%s' kohteesta %s",
+    "activity-delete-attach": "poistettu liitetiedosto kohteesta %s",
+    "activity-added-label-card": "lisätty tunniste '%s'",
+    "activity-removed-label-card": "poistettu tunniste '%s'",
+    "activity-delete-attach-card": "poistettu liitetiedosto",
+    "activity-set-customfield": "asetettu mukautettu kentän '%s' sisällöksi '%s' kortilla %s",
+    "activity-unset-customfield": "poistettu mukautettu kenttä '%s' kortilla %s",
+    "r-rule": "Sääntö",
+    "r-add-trigger": "Lisää liipaisin",
+    "r-add-action": "Lisää toimi",
+    "r-board-rules": "Taulu säännöt",
+    "r-add-rule": "Lisää sääntö",
+    "r-view-rule": "Näytä sääntö",
+    "r-delete-rule": "Poista sääntö",
+    "r-new-rule-name": "Uuden säännön otsikko",
+    "r-no-rules": "Ei sääntöjä",
+    "r-when-a-card": "Kun kortti",
+    "r-is": "on",
+    "r-is-moved": "on siirretty",
+    "r-added-to": "lisätty kohteeseen",
+    "r-removed-from": "Poistettu kohteesta",
+    "r-the-board": "taulu",
+    "r-list": "lista",
+    "set-filter": "Aseta suodatin",
+    "r-moved-to": "Siirretty kohteeseen",
+    "r-moved-from": "Siirretty kohteesta",
+    "r-archived": "Siirretty Arkistoon",
+    "r-unarchived": "Palautettu Arkistosta",
+    "r-a-card": "kortti",
+    "r-when-a-label-is": "Kun tunniste on",
+    "r-when-the-label-is": "Kun tunniste on",
+    "r-list-name": "listan nimi",
+    "r-when-a-member": "Kun jäsen on",
+    "r-when-the-member": "Kun käyttäjä",
+    "r-name": "nimi",
+    "r-when-a-attach": "Kun liitetiedosto",
+    "r-when-a-checklist": "Kun tarkistuslista on",
+    "r-when-the-checklist": "Kun tarkistuslista",
+    "r-completed": "Valmistunut",
+    "r-made-incomplete": "Tehty ei valmistuneeksi",
+    "r-when-a-item": "Kun tarkistuslistan kohta on",
+    "r-when-the-item": "Kun tarkistuslistan kohta",
+    "r-checked": "Ruksattu",
+    "r-unchecked": "Poistettu ruksi",
+    "r-move-card-to": "Siirrä kortti kohteeseen",
+    "r-top-of": "Ylimmäiseksi",
+    "r-bottom-of": "Alimmaiseksi",
+    "r-its-list": "sen lista",
+    "r-archive": "Siirrä Arkistoon",
+    "r-unarchive": "Palauta Arkistosta",
+    "r-card": "kortti",
+    "r-add": "Lisää",
+    "r-remove": "Poista",
+    "r-label": "tunniste",
+    "r-member": "jäsen",
+    "r-remove-all": "Poista kaikki jäsenet kortilta",
+    "r-set-color": "Aseta väriksi",
+    "r-checklist": "tarkistuslista",
+    "r-check-all": "Ruksaa kaikki",
+    "r-uncheck-all": "Poista ruksi kaikista",
+    "r-items-check": "kohtaa tarkistuslistassa",
+    "r-check": "Ruksaa",
+    "r-uncheck": "Poista ruksi",
+    "r-item": "kohta",
+    "r-of-checklist": "tarkistuslistasta",
+    "r-send-email": "Lähetä sähköposti",
+    "r-to": "vastaanottajalle",
+    "r-subject": "aihe",
+    "r-rule-details": "Säännön yksityiskohdat",
+    "r-d-move-to-top-gen": "Siirrä kortti listansa alkuun",
+    "r-d-move-to-top-spec": "Siirrä kortti listan alkuun",
+    "r-d-move-to-bottom-gen": "Siirrä kortti listansa loppuun",
+    "r-d-move-to-bottom-spec": "Siirrä kortti listan loppuun",
+    "r-d-send-email": "Lähetä sähköposti",
+    "r-d-send-email-to": "vastaanottajalle",
+    "r-d-send-email-subject": "aihe",
+    "r-d-send-email-message": "viesti",
+    "r-d-archive": "Siirrä kortti Arkistoon",
+    "r-d-unarchive": "Palauta kortti Arkistosta",
+    "r-d-add-label": "Lisää tunniste",
+    "r-d-remove-label": "Poista tunniste",
+    "r-create-card": "Luo uusi kortti",
+    "r-in-list": "listassa",
+    "r-in-swimlane": "swimlanessa",
+    "r-d-add-member": "Lisää jäsen",
+    "r-d-remove-member": "Poista jäsen",
+    "r-d-remove-all-member": "Poista kaikki jäsenet",
+    "r-d-check-all": "Ruksaa kaikki listan kohdat",
+    "r-d-uncheck-all": "Poista ruksi kaikista listan kohdista",
+    "r-d-check-one": "Ruksaa kohta",
+    "r-d-uncheck-one": "Poista ruksi kohdasta",
+    "r-d-check-of-list": "tarkistuslistasta",
+    "r-d-add-checklist": "Lisää tarkistuslista",
+    "r-d-remove-checklist": "Poista tarkistuslista",
+    "r-by": "mennessä",
+    "r-add-checklist": "Lisää tarkistuslista",
+    "r-with-items": "kohteiden kanssa",
+    "r-items-list": "kohde1,kohde2,kohde3",
+    "r-add-swimlane": "Lisää swimlane",
+    "r-swimlane-name": "swimlanen nimi",
+    "r-board-note": "Huom: jätä kenttä tyhjäksi täsmätäksesi jokaiseen mahdolliseen arvoon.",
+    "r-checklist-note": "Huom: tarkistuslistan kohteet täytyy kirjoittaa pilkulla eroteltuina.",
+    "r-when-a-card-is-moved": "Kun kortti on siirretty toiseen listaan",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Kirjautumistapa",
+    "authentication-type": "Kirjautumistyyppi",
+    "custom-product-name": "Mukautettu tuotenimi",
+    "layout": "Ulkoasu",
+    "hide-logo": "Piilota Logo",
+    "add-custom-html-after-body-start": "Lisää HTML <body> alun jälkeen",
+    "add-custom-html-before-body-end": "Lisä HTML ennen </body> loppua",
+    "error-undefined": "Jotain meni pieleen",
+    "error-ldap-login": "Virhe tapahtui yrittäessä kirjautua sisään",
+    "display-authentication-method": "Näytä kirjautumistapa",
+    "default-authentication-method": "Oletus kirjautumistapa",
+    "duplicate-board": "Tee kaksoiskappale taulusta",
+    "people-number": "Ihmisten määrä on:",
+    "swimlaneDeletePopup-title": "Poista Swimlane ?",
+    "swimlane-delete-pop": "Kaikki toimet poistetaan toimintasyötteestä ja swimlanen poistaminen on lopullista. Tätä ei pysty peruuttamaan.",
+    "restore-all": "Palauta kaikki",
+    "delete-all": "Poista kaikki",
+    "loading": "Ladataan, odota hetki."
+}
\ No newline at end of file
diff --git a/i18n/fr.i18n.json b/i18n/fr.i18n.json
index ce8034b0..59a31155 100644
--- a/i18n/fr.i18n.json
+++ b/i18n/fr.i18n.json
@@ -1,35 +1,51 @@
 {
     "accept": "Accepter",
-    "act-activity-notify": "[Wekan] Notification d'activité",
-    "act-addAttachment": "a joint __attachment__ à __card__",
-    "act-addChecklist": "a ajouté la checklist __checklist__ à __card__",
-    "act-addChecklistItem": "a ajouté l'élément __checklistItem__ à la checklist __checklist__ de __card__",
-    "act-addComment": "a commenté __card__ : __comment__",
-    "act-createBoard": "a créé __board__",
-    "act-createCard": "a ajouté __card__ à __list__",
-    "act-createList": "a ajouté __list__ à __board__",
-    "act-addBoardMember": "a ajouté __member__ à __board__",
-    "act-archivedBoard": "__board__ a été déplacé vers la corbeille",
-    "act-archivedCard": "__card__ a été déplacée vers la corbeille",
-    "act-archivedList": "__list__ a été déplacée vers la corbeille",
-    "act-archivedSwimlane": "__swimlane__ a été déplacé vers la corbeille",
-    "act-importBoard": "a importé __board__",
-    "act-importCard": "a importé __card__",
-    "act-importList": "a importé __list__",
-    "act-joinMember": "a ajouté __member__ à __card__",
-    "act-moveCard": "a déplacé __card__ de __oldList__ à __list__",
-    "act-removeBoardMember": "a retiré __member__ de __board__",
-    "act-restoredCard": "a restauré __card__ dans __board__",
-    "act-unjoinMember": "a retiré __member__ de __card__",
-    "act-withBoardTitle": "[Wekan] __board__",
+    "act-activity-notify": "Notification d'activité",
+    "act-addAttachment": "a ajouté la pièce jointe __attachment__ à la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
+    "act-deleteAttachment": "a supprimé la pièce jointe __attachment__ de la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
+    "act-addSubtask": "a ajouté la sous-tâche __checklist__ à la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
+    "act-addLabel": "a ajouté l'étiquette __label__ à la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
+    "act-addedLabel": "a ajouté l'étiquette __label__ à la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
+    "act-removeLabel": "a enlevé l'étiquette __label__ de la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
+    "act-removedLabel": "a enlevé l'étiquette __label__ de la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
+    "act-addChecklist": "a ajouté la checklist __checklist__ à la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
+    "act-addChecklistItem": "a ajouté l'élément __checklistItem__ à la checklist __checklist__ de la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
+    "act-removeChecklist": "a supprimé la checklist __checklist__ de la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
+    "act-removeChecklistItem": "a supprimé l'élément __checklistItem__ de la checklist __checklist__ de la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
+    "act-checkedItem": "a coché __checklistItem__ de la checklist __checklist__ de la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
+    "act-uncheckedItem": "a décoché __checklistItem__ de la checklist __checklist__ de la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
+    "act-completeChecklist": "a complété la checklist __checklist__ de la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
+    "act-uncompleteChecklist": "a rendu incomplet la checklist __checklist__ de la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
+    "act-addComment": "a commenté la carte __card__ : __comment__ dans la liste __list__ du couloir __swimlane__ du tableau __board__",
+    "act-createBoard": "a créé le tableau __board__",
+    "act-createSwimlane": "a créé le couloir __swimlane__ dans le tableau __board__",
+    "act-createCard": "a créé la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
+    "act-createCustomField": "a créé le champ personnalisé __customField__ pour la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
+    "act-createList": "a ajouté la liste __list__ au tableau __board__",
+    "act-addBoardMember": "a ajouté le participant __member__ au tableau __board__",
+    "act-archivedBoard": "Le tableau __board__ a été déplacé vers les archives",
+    "act-archivedCard": "Carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__ archivée",
+    "act-archivedList": "Liste __list__ du couloir __swimlane__ du tableau __board__ archivée",
+    "act-archivedSwimlane": "Couloir __swimlane__ du tableau __board__ archivé",
+    "act-importBoard": "a importé le tableau __board__",
+    "act-importCard": "a importé la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
+    "act-importList": "a importé la liste __list__ du couloir __swimlane__ du tableau __board__",
+    "act-joinMember": "a ajouté le participant __member__ à la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
+    "act-moveCard": "a déplacé la carte __card__ du tableau __board__ de la liste __oldList__ du couloir __oldSwimlane__ vers la liste __list__ du couloir __swimlane__",
+    "act-moveCardToOtherBoard": "a déplacé la carte __card__ de la liste __oldList__ du couloir __oldSwimlane__ du tableau __oldBoard__ vers la liste __list__ du couloir __swimlane__ du tableau __board__",
+    "act-removeBoardMember": "a supprimé le participant __member__ du tableau __board__",
+    "act-restoredCard": "a restauré la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
+    "act-unjoinMember": "a supprimé le participant __member__ de la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
+    "act-withBoardTitle": "__board__",
     "act-withCardTitle": "[__board__] __card__",
     "actions": "Actions",
     "activities": "Activités",
     "activity": "Activité",
     "activity-added": "a ajouté %s à %s",
-    "activity-archived": "%s a été déplacé vers la corbeille",
+    "activity-archived": "%s a été archivé",
     "activity-attached": "a attaché %s à %s",
     "activity-created": "a créé %s",
+    "activity-customfield-created": "a créé le champ personnalisé %s",
     "activity-excluded": "a exclu %s de %s",
     "activity-imported": "a importé %s vers %s depuis %s",
     "activity-imported-board": "a importé %s depuis %s",
@@ -39,23 +55,35 @@
     "activity-removed": "a supprimé %s de %s",
     "activity-sent": "a envoyé %s vers %s",
     "activity-unjoined": "a quitté %s",
+    "activity-subtask-added": "a ajouté une sous-tâche à %s",
+    "activity-checked-item": "a coché %s dans la checklist %s de %s",
+    "activity-unchecked-item": "a décoché %s dans la checklist %s de %s",
     "activity-checklist-added": "a ajouté une checklist à %s",
+    "activity-checklist-removed": "a supprimé une checklist de %s",
+    "activity-checklist-completed": "a complété la checklist __checklist__ de la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
+    "activity-checklist-uncompleted": "a rendu incomplète la checklist %s de %s",
     "activity-checklist-item-added": "a ajouté un élément à la checklist '%s' dans %s",
+    "activity-checklist-item-removed": "a supprimé une checklist de '%s' dans %s",
     "add": "Ajouter",
+    "activity-checked-item-card": "a coché %s dans la checklist %s",
+    "activity-unchecked-item-card": "a décoché %s dans la checklist %s",
+    "activity-checklist-completed-card": "a complété la checklist __checklist__ de la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
+    "activity-checklist-uncompleted-card": "a rendu incomplète la checklist %s",
     "add-attachment": "Ajouter une pièce jointe",
     "add-board": "Ajouter un tableau",
     "add-card": "Ajouter une carte",
     "add-swimlane": "Ajouter un couloir",
+    "add-subtask": "Ajouter une sous-tâche",
     "add-checklist": "Ajouter une checklist",
     "add-checklist-item": "Ajouter un élément à la checklist",
     "add-cover": "Ajouter la couverture",
     "add-label": "Ajouter une étiquette",
     "add-list": "Ajouter une liste",
-    "add-members": "Assigner des membres",
+    "add-members": "Assigner des participants",
     "added": "Ajouté le",
-    "addMemberPopup-title": "Membres",
+    "addMemberPopup-title": "Participants",
     "admin": "Admin",
-    "admin-desc": "Peut voir et éditer les cartes, supprimer des membres et changer les paramètres du tableau.",
+    "admin-desc": "Peut voir et éditer les cartes, supprimer des participants et changer les paramètres du tableau.",
     "admin-announcement": "Annonce",
     "admin-announcement-active": "Annonce destinée à tous",
     "admin-announcement-title": "Annonce de l'administrateur",
@@ -63,21 +91,23 @@
     "and-n-other-card": "Et __count__ autre carte",
     "and-n-other-card_plural": "Et __count__ autres cartes",
     "apply": "Appliquer",
-    "app-is-offline": "Chargement en cours, veuillez patienter. Vous risquez de perdre des données si vous rechargez la page. Si le chargement échoue, veuillez vérifier l'état du serveur Wekan.",
-    "archive": "Déplacer vers la corbeille",
-    "archive-all": "Tout déplacer vers la corbeille",
-    "archive-board": "Déplacer le tableau vers la corbeille",
-    "archive-card": "Déplacer la carte vers la corbeille",
-    "archive-list": "Déplacer la liste vers la corbeille",
-    "archive-swimlane": "Déplacer le couloir vers la corbeille",
-    "archive-selection": "Déplacer la sélection vers la corbeille",
-    "archiveBoardPopup-title": "Déplacer le tableau vers la corbeille ?",
-    "archived-items": "Corbeille",
-    "archived-boards": "Tableaux dans la corbeille",
+    "app-is-offline": "Chargement en cours, veuillez patienter. Vous risquez de perdre des données si vous rechargez la page. Si le chargement échoue, veuillez vérifier que le serveur n'est pas arrêté.",
+    "archive": "Archiver",
+    "archive-all": "Tout archiver",
+    "archive-board": "Archiver le tableau",
+    "archive-card": "Archiver la carte",
+    "archive-list": "Archiver la liste",
+    "archive-swimlane": "Archiver le couloir",
+    "archive-selection": "Archiver la sélection",
+    "archiveBoardPopup-title": "Archiver le tableau ?",
+    "archived-items": "Archiver",
+    "archived-boards": "Tableaux archivés",
     "restore-board": "Restaurer le tableau",
-    "no-archived-boards": "Aucun tableau dans la corbeille.",
-    "archives": "Corbeille",
-    "assign-member": "Affecter un membre",
+    "no-archived-boards": "Aucun tableau archivé.",
+    "archives": "Archiver",
+    "template": "Modèle",
+    "templates": "Modèles",
+    "assign-member": "Affecter un participant",
     "attached": "joint",
     "attachment": "Pièce jointe",
     "attachment-delete-pop": "La suppression d'une pièce jointe est définitive. Elle ne peut être annulée.",
@@ -95,36 +125,46 @@
     "boardChangeTitlePopup-title": "Renommer le tableau",
     "boardChangeVisibilityPopup-title": "Changer la visibilité",
     "boardChangeWatchPopup-title": "Modifier le suivi",
-    "boardMenuPopup-title": "Menu du tableau",
+    "boardMenuPopup-title": "Paramètres du tableau",
     "boards": "Tableaux",
     "board-view": "Vue du tableau",
+    "board-view-cal": "Calendrier",
     "board-view-swimlanes": "Couloirs",
     "board-view-lists": "Listes",
     "bucket-example": "Comme « todo list » par exemple",
     "cancel": "Annuler",
-    "card-archived": "Cette carte est déplacée vers la corbeille.",
+    "card-archived": "Cette carte est archivée",
+    "board-archived": "Ce tableau est archivé",
     "card-comments-title": "Cette carte a %s commentaires.",
     "card-delete-notice": "La suppression est permanente. Vous perdrez toutes les actions associées à cette carte.",
     "card-delete-pop": "Toutes les actions vont être supprimées du suivi d'activités et vous ne pourrez plus utiliser cette carte. Cette action est irréversible.",
-    "card-delete-suggest-archive": "Vous pouvez déplacer une carte vers la corbeille afin de l'enlever du tableau tout en préservant l'activité.",
+    "card-delete-suggest-archive": "Vous pouvez déplacer une carte vers les archives afin de l'enlever du tableau tout en préservant l'activité.",
     "card-due": "À échéance",
     "card-due-on": "Échéance le",
     "card-spent": "Temps passé",
     "card-edit-attachments": "Modifier les pièces jointes",
-    "card-edit-labels": "Modifier les étiquettes",
-    "card-edit-members": "Modifier les membres",
+    "card-edit-custom-fields": "Éditer les champs personnalisés",
+    "card-edit-labels": "Gérer les étiquettes",
+    "card-edit-members": "Gérer les participants",
     "card-labels-title": "Modifier les étiquettes de la carte.",
-    "card-members-title": "Ajouter ou supprimer des membres à la carte.",
+    "card-members-title": "Assigner ou supprimer des participants à la carte.",
     "card-start": "Début",
     "card-start-on": "Commence le",
-    "cardAttachmentsPopup-title": "Joindre depuis",
+    "cardAttachmentsPopup-title": "Ajouter depuis",
+    "cardCustomField-datePopup-title": "Modifier la date",
+    "cardCustomFieldsPopup-title": "Éditer les champs personnalisés",
     "cardDeletePopup-title": "Supprimer la carte ?",
     "cardDetailsActionsPopup-title": "Actions sur la carte",
     "cardLabelsPopup-title": "Étiquettes",
-    "cardMembersPopup-title": "Membres",
+    "cardMembersPopup-title": "Participants",
     "cardMorePopup-title": "Plus",
+    "cardTemplatePopup-title": "Créer un modèle",
     "cards": "Cartes",
     "cards-count": "Cartes",
+    "casSignIn": "Se connecter avec CAS",
+    "cardType-card": "Carte",
+    "cardType-linkedCard": "Carte liée",
+    "cardType-linkedBoard": "Tableau lié",
     "change": "Modifier",
     "change-avatar": "Modifier l'avatar",
     "change-password": "Modifier le mot de passe",
@@ -135,30 +175,52 @@
     "changePasswordPopup-title": "Modifier le mot de passe",
     "changePermissionsPopup-title": "Modifier les permissions",
     "changeSettingsPopup-title": "Modifier les paramètres",
+    "subtasks": "Sous-tâches",
     "checklists": "Checklists",
     "click-to-star": "Cliquez pour ajouter ce tableau aux favoris.",
     "click-to-unstar": "Cliquez pour retirer ce tableau des favoris.",
     "clipboard": "Presse-papier ou glisser-déposer",
     "close": "Fermer",
     "close-board": "Fermer le tableau",
-    "close-board-pop": "Vous pourrez restaurer le tableau en cliquant le bouton « Corbeille » en entête.",
+    "close-board-pop": "Vous pouvez restaurer le tableau en cliquant sur le bouton « Archives » depuis le menu en entête.",
     "color-black": "noir",
     "color-blue": "bleu",
+    "color-crimson": "rouge cramoisi",
+    "color-darkgreen": "vert foncé",
+    "color-gold": "or",
+    "color-gray": "gris",
     "color-green": "vert",
+    "color-indigo": "indigo",
     "color-lime": "citron vert",
+    "color-magenta": "magenta",
+    "color-mistyrose": "rose brumeux",
+    "color-navy": "bleu marin",
     "color-orange": "orange",
+    "color-paleturquoise": "azurin",
+    "color-peachpuff": "beige pêche",
     "color-pink": "rose",
+    "color-plum": "prune",
     "color-purple": "violet",
     "color-red": "rouge",
+    "color-saddlebrown": "brun cuir",
+    "color-silver": "argent",
     "color-sky": "ciel",
+    "color-slateblue": "bleu ardoise",
+    "color-white": "blanc",
     "color-yellow": "jaune",
+    "unset-color": "Enlever",
     "comment": "Commenter",
     "comment-placeholder": "Écrire un commentaire",
     "comment-only": "Commentaire uniquement",
     "comment-only-desc": "Ne peut que commenter des cartes.",
+    "no-comments": "Aucun commentaire",
+    "no-comments-desc": "Ne peut pas voir les commentaires et les activités.",
     "computer": "Ordinateur",
-    "confirm-checklist-delete-dialog": "Êtes-vous sûr de vouloir supprimer la checklist",
+    "confirm-subtask-delete-dialog": "Êtes-vous sûr de vouloir supprimer la sous-tâche ?",
+    "confirm-checklist-delete-dialog": "Êtes-vous sûr de vouloir supprimer la checklist ?",
     "copy-card-link-to-clipboard": "Copier le lien vers la carte dans le presse-papier",
+    "linkCardPopup-title": "Lier une Carte",
+    "searchElementPopup-title": "Chercher",
     "copyCardPopup-title": "Copier la carte",
     "copyChecklistToManyCardsPopup-title": "Copier le modèle de checklist vers plusieurs cartes",
     "copyChecklistToManyCardsPopup-instructions": "Titres et descriptions des cartes de destination dans ce format JSON",
@@ -167,15 +229,29 @@
     "createBoardPopup-title": "Créer un tableau",
     "chooseBoardSourcePopup-title": "Importer un tableau",
     "createLabelPopup-title": "Créer une étiquette",
+    "createCustomField": "Créer un champ personnalisé",
+    "createCustomFieldPopup-title": "Créer un champ personnalisé",
     "current": "actuel",
+    "custom-field-delete-pop": "Cette action n'est pas réversible. Elle supprimera ce champ personnalisé de toutes les cartes et détruira son historique.",
+    "custom-field-checkbox": "Case à cocher",
+    "custom-field-date": "Date",
+    "custom-field-dropdown": "Liste de choix",
+    "custom-field-dropdown-none": "(aucun)",
+    "custom-field-dropdown-options": "Options de liste",
+    "custom-field-dropdown-options-placeholder": "Appuyez sur Entrée pour ajouter d'autres options",
+    "custom-field-dropdown-unknown": "(inconnu)",
+    "custom-field-number": "Nombre",
+    "custom-field-text": "Texte",
+    "custom-fields": "Champs personnalisés",
     "date": "Date",
     "decline": "Refuser",
     "default-avatar": "Avatar par défaut",
     "delete": "Supprimer",
+    "deleteCustomFieldPopup-title": "Supprimer le champ personnalisé ?",
     "deleteLabelPopup-title": "Supprimer l'étiquette ?",
     "description": "Description",
     "disambiguateMultiLabelPopup-title": "Préciser l'action sur l'étiquette",
-    "disambiguateMultiMemberPopup-title": "Préciser l'action sur le membre",
+    "disambiguateMultiMemberPopup-title": "Préciser l'action sur le participant",
     "discard": "Mettre à la corbeille",
     "done": "Fait",
     "download": "Télécharger",
@@ -186,17 +262,18 @@
     "soft-wip-limit": "Limite WIP douce",
     "editCardStartDatePopup-title": "Modifier la date de début",
     "editCardDueDatePopup-title": "Modifier la date d'échéance",
-    "editCardSpentTimePopup-title": "Changer le temps passé",
+    "editCustomFieldPopup-title": "Éditer le champ personnalisé",
+    "editCardSpentTimePopup-title": "Modifier le temps passé",
     "editLabelPopup-title": "Modifier l'étiquette",
     "editNotificationPopup-title": "Modifier la notification",
     "editProfilePopup-title": "Modifier le profil",
-    "email": "Email",
+    "email": "E-mail",
     "email-enrollAccount-subject": "Un compte a été créé pour vous sur __siteName__",
     "email-enrollAccount-text": "Bonjour __user__,\n\nPour commencer à utiliser ce service, il suffit de cliquer sur le lien ci-dessous.\n\n__url__\n\nMerci.",
     "email-fail": "Échec de l'envoi du courriel.",
     "email-fail-text": "Une erreur est survenue en tentant d'envoyer l'email",
-    "email-invalid": "Adresse email incorrecte.",
-    "email-invite": "Inviter par email",
+    "email-invalid": "Adresse e-mail incorrecte.",
+    "email-invite": "Inviter par e-mail",
     "email-invite-subject": "__inviter__ vous a envoyé une invitation",
     "email-invite-text": "Cher __user__,\n\n__inviter__ vous invite à rejoindre le tableau \"__board__\" pour collaborer.\n\nVeuillez suivre le lien ci-dessous :\n\n__url__\n\nMerci.",
     "email-resetPassword-subject": "Réinitialiser votre mot de passe sur __siteName__",
@@ -207,7 +284,7 @@
     "enable-wip-limit": "Activer la limite WIP",
     "error-board-doesNotExist": "Ce tableau n'existe pas",
     "error-board-notAdmin": "Vous devez être administrateur de ce tableau pour faire cela",
-    "error-board-notAMember": "Vous devez être membre de ce tableau pour faire cela",
+    "error-board-notAMember": "Vous devez être participant de ce tableau pour faire cela",
     "error-json-malformed": "Votre texte JSON n'est pas valide",
     "error-json-schema": "Vos données JSON ne contiennent pas l'information appropriée dans un format correct",
     "error-list-doesNotExist": "Cette liste n'existe pas",
@@ -221,35 +298,41 @@
     "filter-cards": "Filtrer les cartes",
     "filter-clear": "Supprimer les filtres",
     "filter-no-label": "Aucune étiquette",
-    "filter-no-member": "Aucun membre",
+    "filter-no-member": "Aucun participant",
+    "filter-no-custom-fields": "Pas de champs personnalisés",
     "filter-on": "Le filtre est actif",
     "filter-on-desc": "Vous êtes en train de filtrer les cartes sur ce tableau. Cliquez ici pour modifier les filtres.",
     "filter-to-selection": "Filtre vers la sélection",
+    "advanced-filter-label": "Filtre avancé",
+    "advanced-filter-description": "Le filtre avancé permet d'écrire une chaîne contenant les opérateur suivants : == != <= >= && || ( ). Les opérateurs doivent être séparés par des espaces. Vous pouvez filtrer tous les champs personnalisés en saisissant leur nom et leur valeur. Par exemple : champ1 == valeur1. Remarque : si des champs ou valeurs contiennent des espaces, vous devez les mettre entre apostrophes. Par exemple : 'champ 1' = 'valeur 1'. Pour échapper un caractère de contrôle (' \\/), vous pouvez utiliser \\. Par exemple : champ1 = I\\'m. Il est également possible de combiner plusieurs conditions. Par exemple : f1 == v1 || f2 == v2. Normalement, tous les opérateurs sont interprétés de gauche à droite. Vous pouvez changer l'ordre à l'aide de parenthèses. Par exemple : f1 == v1 and (f2 == v2 || f2 == v3). Vous pouvez également chercher parmi les champs texte en utilisant des expressions régulières : f1 == /Test.*/i",
     "fullname": "Nom complet",
     "header-logo-title": "Retourner à la page des tableaux",
     "hide-system-messages": "Masquer les messages système",
     "headerBarCreateBoardPopup-title": "Créer un tableau",
     "home": "Accueil",
     "import": "Importer",
+    "link": "Lien",
     "import-board": "importer un tableau",
     "import-board-c": "Importer un tableau",
-    "import-board-title-trello": "Importer le tableau depuis Trello",
-    "import-board-title-wekan": "Importer un tableau depuis Wekan",
+    "import-board-title-trello": "Importer un tableau depuis Trello",
+    "import-board-title-wekan": "Importer un tableau depuis un export précédent",
+    "import-sandstorm-backup-warning": "Ne supprimez pas les données que vous importez d'un tableau exporté d'origine ou de Trello avant de vérifier que la graine peut se fermer et s'ouvrir à nouveau ou qu'une erreur \"Tableau introuvable\" survient, sinon vous perdrez vos données.",
     "import-sandstorm-warning": "Le tableau importé supprimera toutes les données du tableau et les remplacera avec celles du tableau importé.",
     "from-trello": "Depuis Trello",
-    "from-wekan": "Depuis Wekan",
+    "from-wekan": "Depuis un export précédent",
     "import-board-instruction-trello": "Dans votre tableau Trello, allez sur 'Menu', puis sur 'Plus', 'Imprimer et exporter', 'Exporter en JSON' et copiez le texte du résultat",
-    "import-board-instruction-wekan": "Dans votre tableau Wekan, allez dans 'Menu', puis 'Exporter un tableau', et copier le texte du fichier téléchargé.",
+    "import-board-instruction-wekan": "Dans votre tableau, allez dans 'Menu', puis 'Exporter un tableau', et copier le texte du fichier téléchargé.",
+    "import-board-instruction-about-errors": "Si une erreur survient en important le tableau, il se peut que l'import ait fonctionné, et que le tableau se trouve sur la page \"Tous les tableaux\".",
     "import-json-placeholder": "Collez ici les données JSON valides",
-    "import-map-members": "Faire correspondre aux membres",
-    "import-members-map": "Le tableau que vous venez d'importer contient des membres. Veuillez associer les membres que vous souhaitez importer à des utilisateurs de Wekan.",
-    "import-show-user-mapping": "Contrôler l'association des membres",
-    "import-user-select": "Sélectionnez l'utilisateur Wekan que vous voulez associer à ce membre",
-    "importMapMembersAddPopup-title": "Sélectionner le membre Wekan",
+    "import-map-members": "Assigner des participants",
+    "import-members-map": "Le tableau que vous venez d'importer contient des participants. Veuillez assigner les participants que vous souhaitez importer à vos utilisateurs.",
+    "import-show-user-mapping": "Contrôler l'assignation des participants",
+    "import-user-select": "Sélectionnez l'utilisateur existant que vous voulez associer à ce participant",
+    "importMapMembersAddPopup-title": "Sélectionner le participant",
     "info": "Version",
     "initials": "Initiales",
     "invalid-date": "Date invalide",
-    "invalid-time": "Temps invalide",
+    "invalid-time": "Heure invalide",
     "invalid-user": "Utilisateur invalide",
     "joined": "a rejoint",
     "just-invited": "Vous venez d'être invité à ce tableau",
@@ -264,24 +347,26 @@
     "leave-board-pop": "Êtes-vous sur de vouloir quitter __boardTitle__ ? Vous ne serez plus associé aux cartes de ce tableau.",
     "leaveBoardPopup-title": "Quitter le tableau",
     "link-card": "Lier à cette carte",
-    "list-archive-cards": "Déplacer toutes les cartes de la liste vers la corbeille",
-    "list-archive-cards-pop": "Cela supprimera du tableau toutes les cartes de cette liste. Pour voir les cartes dans la corbeille et les renvoyer vers le tableau, cliquez sur « Menu » puis « Corbeille ».",
+    "list-archive-cards": "Déplacer toutes les cartes de cette liste vers les archives",
+    "list-archive-cards-pop": "Cela supprimera du tableau toutes les cartes de cette liste. Pour voir les cartes archivées et les renvoyer vers le tableau, cliquez sur « Menu » puis « Archives ».",
     "list-move-cards": "Déplacer toutes les cartes de cette liste",
     "list-select-cards": "Sélectionner toutes les cartes de cette liste",
+    "set-color-list": "Définir la couleur",
     "listActionPopup-title": "Actions sur la liste",
     "swimlaneActionPopup-title": "Actions du couloir",
+    "swimlaneAddPopup-title": "Ajouter un couloir en dessous",
     "listImportCardPopup-title": "Importer une carte Trello",
     "listMorePopup-title": "Plus",
     "link-list": "Lien vers cette liste",
-    "list-delete-pop": "Toutes les actions seront supprimées du fil d'activité et il ne sera plus possible de les récupérer. Cette action ne peut pas être annulée.",
-    "list-delete-suggest-archive": "Vous pouvez déplacer une liste vers la corbeille pour l'enlever du tableau tout en conservant son activité.",
+    "list-delete-pop": "Toutes les actions seront supprimées du fil d'activité et il ne sera plus possible de les récupérer. Cette action est irréversible.",
+    "list-delete-suggest-archive": "Vous pouvez archiver une liste pour l'enlever du tableau tout en conservant son activité.",
     "lists": "Listes",
     "swimlanes": "Couloirs",
     "log-out": "Déconnexion",
     "log-in": "Connexion",
     "loginPopup-title": "Connexion",
-    "memberMenuPopup-title": "Préférence de membre",
-    "members": "Membres",
+    "memberMenuPopup-title": "Préférence du participant",
+    "members": "Participants",
     "menu": "Menu",
     "move-selection": "Déplacer la sélection",
     "moveCardPopup-title": "Déplacer la carte",
@@ -294,14 +379,14 @@
     "muted-info": "Vous ne serez jamais averti des modifications effectuées dans ce tableau",
     "my-boards": "Mes tableaux",
     "name": "Nom",
-    "no-archived-cards": "Aucune carte dans la corbeille.",
-    "no-archived-lists": "Aucune liste dans la corbeille.",
-    "no-archived-swimlanes": "Aucun couloir dans la corbeille.",
+    "no-archived-cards": "Aucune carte archivée.",
+    "no-archived-lists": "Aucune liste archivée.",
+    "no-archived-swimlanes": "Aucun couloir archivé.",
     "no-results": "Pas de résultats",
     "normal": "Normal",
     "normal-desc": "Peut voir et modifier les cartes. Ne peut pas changer les paramètres.",
     "not-accepted-yet": "L'invitation n'a pas encore été acceptée",
-    "notify-participate": "Recevoir les mises à jour de toutes les cartes auxquelles vous participez en tant que créateur ou que membre ",
+    "notify-participate": "Recevoir les mises à jour de toutes les cartes auxquelles vous participez en tant que créateur ou que participant",
     "notify-watch": "Recevoir les mises à jour de tous les tableaux, listes ou cartes que vous suivez",
     "optional": "optionnel",
     "or": "ou",
@@ -323,15 +408,16 @@
     "remove-from-board": "Retirer du tableau",
     "remove-label": "Retirer l'étiquette",
     "listDeletePopup-title": "Supprimer la liste ?",
-    "remove-member": "Supprimer le membre",
+    "remove-member": "Supprimer le participant",
     "remove-member-from-card": "Supprimer de la carte",
-    "remove-member-pop": "Supprimer __name__ (__username__) de __boardTitle__ ? Ce membre sera supprimé de toutes les cartes du tableau et recevra une notification.",
-    "removeMemberPopup-title": "Supprimer le membre ?",
+    "remove-member-pop": "Supprimer __name__ (__username__) de __boardTitle__ ? Ce participant sera supprimé de toutes les cartes du tableau et recevra une notification.",
+    "removeMemberPopup-title": "Supprimer le participant ?",
     "rename": "Renommer",
     "rename-board": "Renommer le tableau",
     "restore": "Restaurer",
     "save": "Enregistrer",
     "search": "Chercher",
+    "rules": "Règles",
     "search-cards": "Rechercher parmi les titres et descriptions des cartes de ce tableau",
     "search-example": "Texte à rechercher ?",
     "select-color": "Sélectionner une couleur",
@@ -339,14 +425,14 @@
     "setWipLimitPopup-title": "Définir la limite WIP",
     "shortcut-assign-self": "Affecter cette carte à vous-même",
     "shortcut-autocomplete-emoji": "Auto-complétion des emoji",
-    "shortcut-autocomplete-members": "Auto-complétion des membres",
+    "shortcut-autocomplete-members": "Auto-complétion des participants",
     "shortcut-clear-filters": "Retirer tous les filtres",
     "shortcut-close-dialog": "Fermer la boîte de dialogue",
     "shortcut-filter-my-cards": "Filtrer mes cartes",
     "shortcut-show-shortcuts": "Afficher cette liste de raccourcis",
-    "shortcut-toggle-filterbar": "Afficher/Cacher la barre latérale des filtres",
-    "shortcut-toggle-sidebar": "Afficher/Cacher la barre latérale du tableau",
-    "show-cards-minimum-count": "Afficher le nombre de cartes si la liste en contient plus de ",
+    "shortcut-toggle-filterbar": "Afficher/Masquer la barre latérale des filtres",
+    "shortcut-toggle-sidebar": "Afficher/Masquer la barre latérale du tableau",
+    "show-cards-minimum-count": "Afficher le nombre de cartes si la liste en contient plus de",
     "sidebar-open": "Ouvrir le panneau",
     "sidebar-close": "Fermer le panneau",
     "signupPopup-title": "Créer un compte",
@@ -365,8 +451,9 @@
     "time": "Temps",
     "title": "Titre",
     "tracking": "Suivi",
-    "tracking-info": "Vous serez notifié de toute modification concernant les cartes pour lesquelles vous êtes impliqué en tant que créateur ou membre.",
-    "unassign-member": "Retirer le membre",
+    "tracking-info": "Vous serez notifié de toute modification concernant les cartes pour lesquelles vous êtes impliqué en tant que créateur ou participant.",
+    "type": "Type",
+    "unassign-member": "Retirer le participant",
     "unsaved-description": "Vous avez une description non sauvegardée",
     "unwatch": "Arrêter de suivre",
     "upload": "Télécharger",
@@ -374,7 +461,7 @@
     "uploaded-avatar": "Avatar téléchargé",
     "username": "Nom d'utilisateur",
     "view-it": "Le voir",
-    "warn-list-archived": "Attention : cette carte est dans une liste se trouvant dans la corbeille",
+    "warn-list-archived": "attention : cette carte est dans une liste archivée",
     "watch": "Suivre",
     "watching": "Suivi",
     "watching-info": "Vous serez notifié de toute modification dans ce tableau",
@@ -382,6 +469,9 @@
     "welcome-swimlane": "Jalon 1",
     "welcome-list1": "Basiques",
     "welcome-list2": "Avancés",
+    "card-templates-swimlane": "Modèles de cartes",
+    "list-templates-swimlane": "Modèles de listes",
+    "board-templates-swimlane": "Modèles de tableaux",
     "what-to-do": "Que voulez-vous faire ?",
     "wipLimitErrorPopup-title": "Limite WIP invalide",
     "wipLimitErrorPopup-dialog-pt1": "Le nombre de cartes de cette liste est supérieur à la limite WIP que vous avez définie.",
@@ -394,7 +484,7 @@
     "invite": "Inviter",
     "invite-people": "Inviter une personne",
     "to-boards": "Au(x) tableau(x)",
-    "email-addresses": "Adresses email",
+    "email-addresses": "Adresses mail",
     "smtp-host-description": "L'adresse du serveur SMTP qui gère vos mails.",
     "smtp-port-description": "Le port des mails sortants du serveur SMTP.",
     "smtp-tls-description": "Activer la gestion de TLS sur le serveur SMTP",
@@ -407,16 +497,16 @@
     "send-smtp-test": "Envoyer un mail de test à vous-même",
     "invitation-code": "Code d'invitation",
     "email-invite-register-subject": "__inviter__ vous a envoyé une invitation",
-    "email-invite-register-text": "Cher __user__,\n\n__inviter__ vous invite à le rejoindre sur Wekan pour collaborer.\n\nVeuillez suivre le lien ci-dessous :\n__url__\n\nVotre code d'invitation est : __icode__\n\nMerci.",
-    "email-smtp-test-subject": "Email de test SMTP de Wekan",
+    "email-invite-register-text": "Cher __user__,\n\n__inviter__ vous invite à le rejoindre sur le tableau kanban pour collaborer.\n\nVeuillez suivre le lien ci-dessous :\n__url__\n\nVotre code d'invitation est : __icode__\n\nMerci.",
+    "email-smtp-test-subject": "E-mail de test SMTP",
     "email-smtp-test-text": "Vous avez envoyé un mail avec succès",
     "error-invitation-code-not-exist": "Ce code d'invitation n'existe pas.",
     "error-notAuthorized": "Vous n'êtes pas autorisé à accéder à cette page.",
     "outgoing-webhooks": "Webhooks sortants",
     "outgoingWebhooksPopup-title": "Webhooks sortants",
+    "boardCardTitlePopup-title": "Filtre par titre de carte",
     "new-outgoing-webhook": "Nouveau webhook sortant",
     "no-name": "(Inconnu)",
-    "Wekan_version": "Version de Wekan",
     "Node_version": "Version de Node",
     "OS_Arch": "OS Architecture",
     "OS_Cpus": "OS Nombre CPU",
@@ -425,15 +515,20 @@
     "OS_Platform": "OS Plate-forme",
     "OS_Release": "OS Version",
     "OS_Totalmem": "OS Mémoire totale",
-    "OS_Type": "OS Type",
+    "OS_Type": "Type d'OS",
     "OS_Uptime": "OS Durée de fonctionnement",
+    "days": "jours",
     "hours": "heures",
     "minutes": "minutes",
     "seconds": "secondes",
+    "show-field-on-card": "Afficher ce champ sur la carte",
+    "automatically-field-on-card": "Créer automatiquement le champ sur toutes les cartes",
+    "showLabel-field-on-card": "Indiquer l'étiquette du champ sur la mini-carte",
     "yes": "Oui",
     "no": "Non",
     "accounts": "Comptes",
     "accounts-allowEmailChange": "Autoriser le changement d'adresse mail",
+    "accounts-allowUserNameChange": "Autoriser le changement d'identifiant",
     "createdAt": "Créé le",
     "verified": "Vérifié",
     "active": "Actif",
@@ -441,6 +536,158 @@
     "card-received-on": "Reçue le",
     "card-end": "Fin",
     "card-end-on": "Se termine le",
-    "editCardReceivedDatePopup-title": "Changer la date de réception",
-    "editCardEndDatePopup-title": "Changer la date de fin"
-}
+    "editCardReceivedDatePopup-title": "Modifier la date de réception",
+    "editCardEndDatePopup-title": "Modifier la date de fin",
+    "setCardColorPopup-title": "Définir la couleur",
+    "setCardActionsColorPopup-title": "Choisissez une couleur",
+    "setSwimlaneColorPopup-title": "Choisissez une couleur",
+    "setListColorPopup-title": "Choisissez une couleur",
+    "assigned-by": "Assigné par",
+    "requested-by": "Demandé par",
+    "board-delete-notice": "La suppression est définitive. Vous perdrez toutes les listes, cartes et actions associées à ce tableau.",
+    "delete-board-confirm-popup": "Toutes les listes, cartes, étiquettes et activités seront supprimées et vous ne pourrez pas retrouver le contenu du tableau. Il n'y a pas d'annulation possible.",
+    "boardDeletePopup-title": "Supprimer le tableau ?",
+    "delete-board": "Supprimer le tableau",
+    "default-subtasks-board": "Sous-tâches du tableau __board__",
+    "default": "Défaut",
+    "queue": "Queue",
+    "subtask-settings": "Paramètres des sous-tâches",
+    "boardSubtaskSettingsPopup-title": "Paramètres des sous-tâches du tableau",
+    "show-subtasks-field": "Les cartes peuvent avoir des sous-tâches",
+    "deposit-subtasks-board": "Déposer des sous-tâches dans ce tableau :",
+    "deposit-subtasks-list": "Liste de destination pour les sous-tâches déposées ici :",
+    "show-parent-in-minicard": "Voir la carte parente dans la mini-carte :",
+    "prefix-with-full-path": "Préfixer avec le chemin complet",
+    "prefix-with-parent": "Préfixer avec le parent",
+    "subtext-with-full-path": "Sous-titre avec le chemin complet",
+    "subtext-with-parent": "Sous-titre avec le parent",
+    "change-card-parent": "Changer le parent de la carte",
+    "parent-card": "Carte parente",
+    "source-board": "Tableau source",
+    "no-parent": "Ne pas afficher le parent",
+    "activity-added-label": "a ajouté l'étiquette '%s' à %s",
+    "activity-removed-label": "a supprimé l'étiquette '%s' de %s",
+    "activity-delete-attach": "a supprimé une pièce jointe de %s",
+    "activity-added-label-card": "a ajouté l'étiquette '%s'",
+    "activity-removed-label-card": "a supprimé l'étiquette '%s'",
+    "activity-delete-attach-card": "a supprimé une pièce jointe",
+    "activity-set-customfield": "a défini le champ personnalisé '%s' à '%s' dans %s",
+    "activity-unset-customfield": "a effacé le champ personnalisé '%s' dans %s",
+    "r-rule": "Règle",
+    "r-add-trigger": "Ajouter un déclencheur",
+    "r-add-action": "Ajouter une action",
+    "r-board-rules": "Règles du tableau",
+    "r-add-rule": "Ajouter une règle",
+    "r-view-rule": "Voir la règle",
+    "r-delete-rule": "Supprimer la règle",
+    "r-new-rule-name": "Titre de la nouvelle règle",
+    "r-no-rules": "Pas de règles",
+    "r-when-a-card": "Quand une carte",
+    "r-is": "est",
+    "r-is-moved": "est déplacée",
+    "r-added-to": "est ajoutée à",
+    "r-removed-from": "Supprimé de",
+    "r-the-board": "tableau",
+    "r-list": "liste",
+    "set-filter": "Définir un filtre",
+    "r-moved-to": "Déplacé vers",
+    "r-moved-from": "Déplacé depuis",
+    "r-archived": "Archivé",
+    "r-unarchived": "Restauré depuis l'Archive",
+    "r-a-card": "carte",
+    "r-when-a-label-is": "Quand une étiquette est",
+    "r-when-the-label-is": "Quand l'étiquette est",
+    "r-list-name": "Nom de la liste",
+    "r-when-a-member": "Quand un participant est",
+    "r-when-the-member": "Quand le participant",
+    "r-name": "nom",
+    "r-when-a-attach": "Quand une pièce jointe",
+    "r-when-a-checklist": "Quand une checklist est",
+    "r-when-the-checklist": "Quand la checklist",
+    "r-completed": "Terminé",
+    "r-made-incomplete": "Rendu incomplet",
+    "r-when-a-item": "Quand un élément de la checklist est",
+    "r-when-the-item": "Quand l'élément de la checklist",
+    "r-checked": "Coché",
+    "r-unchecked": "Décoché",
+    "r-move-card-to": "Déplacer la carte vers",
+    "r-top-of": "En haut de",
+    "r-bottom-of": "En bas de",
+    "r-its-list": "sa liste",
+    "r-archive": "Archiver",
+    "r-unarchive": "Restaurer depuis l'Archive",
+    "r-card": "carte",
+    "r-add": "Ajouter",
+    "r-remove": "Supprimer",
+    "r-label": "étiquette",
+    "r-member": "participant",
+    "r-remove-all": "Supprimer tous les membres de la carte",
+    "r-set-color": "Définir la couleur à",
+    "r-checklist": "checklist",
+    "r-check-all": "Tout cocher",
+    "r-uncheck-all": "Tout décocher",
+    "r-items-check": "Élément de checklist",
+    "r-check": "Cocher",
+    "r-uncheck": "Décocher",
+    "r-item": "élément",
+    "r-of-checklist": "de la checklist",
+    "r-send-email": "Envoyer un email",
+    "r-to": "à",
+    "r-subject": "sujet",
+    "r-rule-details": "Détails de la règle",
+    "r-d-move-to-top-gen": "Déplacer la carte en haut de sa liste",
+    "r-d-move-to-top-spec": "Déplacer la carte en haut de la liste",
+    "r-d-move-to-bottom-gen": "Déplacer la carte en bas de sa liste",
+    "r-d-move-to-bottom-spec": "Déplacer la carte en bas de la liste",
+    "r-d-send-email": "Envoyer un email",
+    "r-d-send-email-to": "à",
+    "r-d-send-email-subject": "sujet",
+    "r-d-send-email-message": "message",
+    "r-d-archive": "Archiver la carte",
+    "r-d-unarchive": "Restaurer la carte depuis l'Archive",
+    "r-d-add-label": "Ajouter une étiquette",
+    "r-d-remove-label": "Supprimer l'étiquette",
+    "r-create-card": "Créer une nouvelle carte",
+    "r-in-list": "dans la liste",
+    "r-in-swimlane": "Dans le couloir",
+    "r-d-add-member": "Ajouter un participant",
+    "r-d-remove-member": "Supprimer un participant",
+    "r-d-remove-all-member": "Supprimer tous les participants",
+    "r-d-check-all": "Cocher tous les éléments d'une liste",
+    "r-d-uncheck-all": "Décocher tous les éléments d'une liste",
+    "r-d-check-one": "Cocher l'élément",
+    "r-d-uncheck-one": "Décocher l'élément",
+    "r-d-check-of-list": "de la checklist",
+    "r-d-add-checklist": "Ajouter une checklist",
+    "r-d-remove-checklist": "Supprimer la checklist",
+    "r-by": "par",
+    "r-add-checklist": "Ajouter une checklist",
+    "r-with-items": "avec les items",
+    "r-items-list": "item1, item2, item3",
+    "r-add-swimlane": "Ajouter un couloir",
+    "r-swimlane-name": "Nom du couloir",
+    "r-board-note": "Note : laisser le champ vide pour faire correspondre avec toutes les valeurs possibles.",
+    "r-checklist-note": "Note : les items de la checklist doivent être séparés par des virgules.",
+    "r-when-a-card-is-moved": "Quand une carte est déplacée vers une autre liste",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Méthode d'authentification",
+    "authentication-type": "Type d'authentification",
+    "custom-product-name": "Nom personnalisé",
+    "layout": "Interface",
+    "hide-logo": "Cacher le logo",
+    "add-custom-html-after-body-start": "Ajouter le HTML personnalisé après le début du <body>",
+    "add-custom-html-before-body-end": "Ajouter le HTML personnalisé avant la fin du </body>",
+    "error-undefined": "Une erreur inconnue s'est produite",
+    "error-ldap-login": "Une erreur s'est produite lors de la tentative de connexion",
+    "display-authentication-method": "Afficher la méthode d'authentification",
+    "default-authentication-method": "Méthode d'authentification par défaut",
+    "duplicate-board": "Dupliquer le tableau",
+    "people-number": "Le nombre d'utilisateurs est de :",
+    "swimlaneDeletePopup-title": "Supprimer le couloir ?",
+    "swimlane-delete-pop": "Toutes les actions vont être supprimées du suivi d'activités et vous ne pourrez plus utiliser ce couloir. Cette action est irréversible.",
+    "restore-all": "Tout supprimer",
+    "delete-all": "Tout restaurer",
+    "loading": "Chargement, merci de patienter."
+}
\ No newline at end of file
diff --git a/i18n/gl.i18n.json b/i18n/gl.i18n.json
index 9e23ea41..01e63713 100644
--- a/i18n/gl.i18n.json
+++ b/i18n/gl.i18n.json
@@ -1,35 +1,51 @@
 {
     "accept": "Aceptar",
-    "act-activity-notify": "[Wekan] Activity Notification",
-    "act-addAttachment": "attached __attachment__ to __card__",
-    "act-addChecklist": "added checklist __checklist__ to __card__",
-    "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__",
-    "act-addComment": "commented on __card__: __comment__",
-    "act-createBoard": "created __board__",
-    "act-createCard": "added __card__ to __list__",
-    "act-createList": "added __list__ to __board__",
-    "act-addBoardMember": "added __member__ to __board__",
-    "act-archivedBoard": "__board__ moved to Recycle Bin",
-    "act-archivedCard": "__card__ moved to Recycle Bin",
-    "act-archivedList": "__list__ moved to Recycle Bin",
-    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
-    "act-importBoard": "imported __board__",
-    "act-importCard": "imported __card__",
-    "act-importList": "imported __list__",
-    "act-joinMember": "added __member__ to __card__",
-    "act-moveCard": "moved __card__ from __oldList__ to __list__",
-    "act-removeBoardMember": "removed __member__ from __board__",
-    "act-restoredCard": "restored __card__ to __board__",
-    "act-unjoinMember": "removed __member__ from __card__",
-    "act-withBoardTitle": "[Wekan] __board__",
+    "act-activity-notify": "Activity Notification",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__board__",
     "act-withCardTitle": "[__board__] __card__",
     "actions": "Accións",
     "activities": "Actividades",
     "activity": "Actividade",
     "activity-added": "engadiuse %s a %s",
-    "activity-archived": "%s moved to Recycle Bin",
+    "activity-archived": "%s moved to Archive",
     "activity-attached": "attached %s to %s",
     "activity-created": "created %s",
+    "activity-customfield-created": "created custom field %s",
     "activity-excluded": "excluded %s from %s",
     "activity-imported": "imported %s into %s from %s",
     "activity-imported-board": "imported %s from %s",
@@ -39,13 +55,25 @@
     "activity-removed": "removed %s from %s",
     "activity-sent": "sent %s to %s",
     "activity-unjoined": "unjoined %s",
+    "activity-subtask-added": "added subtask to %s",
+    "activity-checked-item": "checked %s in checklist %s of %s",
+    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
     "activity-checklist-added": "added checklist to %s",
+    "activity-checklist-removed": "removed a checklist from %s",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
     "activity-checklist-item-added": "added checklist item to '%s' in %s",
+    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
     "add": "Engadir",
+    "activity-checked-item-card": "checked %s in checklist %s",
+    "activity-unchecked-item-card": "unchecked %s in checklist %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
     "add-attachment": "Engadir anexo",
     "add-board": "Engadir taboleiro",
     "add-card": "Engadir tarxeta",
     "add-swimlane": "Add Swimlane",
+    "add-subtask": "Add Subtask",
     "add-checklist": "Add Checklist",
     "add-checklist-item": "Add an item to checklist",
     "add-cover": "Add Cover",
@@ -63,20 +91,22 @@
     "and-n-other-card": "And __count__ other card",
     "and-n-other-card_plural": "And __count__ other cards",
     "apply": "Apply",
-    "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Move to Recycle Bin",
-    "archive-all": "Move All to Recycle Bin",
-    "archive-board": "Move Board to Recycle Bin",
-    "archive-card": "Move Card to Recycle Bin",
-    "archive-list": "Move List to Recycle Bin",
-    "archive-swimlane": "Move Swimlane to Recycle Bin",
-    "archive-selection": "Move selection to Recycle Bin",
-    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
-    "archived-items": "Recycle Bin",
-    "archived-boards": "Boards in Recycle Bin",
+    "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
+    "archive": "Move to Archive",
+    "archive-all": "Move All to Archive",
+    "archive-board": "Move Board to Archive",
+    "archive-card": "Move Card to Archive",
+    "archive-list": "Move List to Archive",
+    "archive-swimlane": "Move Swimlane to Archive",
+    "archive-selection": "Move selection to Archive",
+    "archiveBoardPopup-title": "Move Board to Archive?",
+    "archived-items": "Arquivar",
+    "archived-boards": "Boards in Archive",
     "restore-board": "Restaurar taboleiro",
-    "no-archived-boards": "No Boards in Recycle Bin.",
-    "archives": "Recycle Bin",
+    "no-archived-boards": "No Boards in Archive.",
+    "archives": "Arquivar",
+    "template": "Template",
+    "templates": "Templates",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Anexo",
@@ -95,22 +125,25 @@
     "boardChangeTitlePopup-title": "Rename Board",
     "boardChangeVisibilityPopup-title": "Change Visibility",
     "boardChangeWatchPopup-title": "Change Watch",
-    "boardMenuPopup-title": "Board Menu",
+    "boardMenuPopup-title": "Board Settings",
     "boards": "Taboleiros",
     "board-view": "Board View",
+    "board-view-cal": "Calendar",
     "board-view-swimlanes": "Swimlanes",
     "board-view-lists": "Listas",
     "bucket-example": "Like “Bucket List” for example",
     "cancel": "Cancelar",
-    "card-archived": "This card is moved to Recycle Bin.",
+    "card-archived": "This card is moved to Archive.",
+    "board-archived": "This board is moved to Archive.",
     "card-comments-title": "This card has %s comment.",
     "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
     "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
     "card-due": "Due",
     "card-due-on": "Due on",
     "card-spent": "Spent Time",
     "card-edit-attachments": "Editar anexos",
+    "card-edit-custom-fields": "Edit custom fields",
     "card-edit-labels": "Editar etiquetas",
     "card-edit-members": "Editar membros",
     "card-labels-title": "Cambiar as etiquetas da tarxeta.",
@@ -118,13 +151,20 @@
     "card-start": "Start",
     "card-start-on": "Starts on",
     "cardAttachmentsPopup-title": "Attach From",
+    "cardCustomField-datePopup-title": "Change date",
+    "cardCustomFieldsPopup-title": "Edit custom fields",
     "cardDeletePopup-title": "Delete Card?",
     "cardDetailsActionsPopup-title": "Card Actions",
     "cardLabelsPopup-title": "Etiquetas",
     "cardMembersPopup-title": "Membros",
     "cardMorePopup-title": "Máis",
+    "cardTemplatePopup-title": "Create template",
     "cards": "Tarxetas",
     "cards-count": "Tarxetas",
+    "casSignIn": "Sign In with CAS",
+    "cardType-card": "Card",
+    "cardType-linkedCard": "Linked Card",
+    "cardType-linkedBoard": "Linked Board",
     "change": "Cambiar",
     "change-avatar": "Cambiar o avatar",
     "change-password": "Cambiar o contrasinal",
@@ -135,30 +175,52 @@
     "changePasswordPopup-title": "Cambiar o contrasinal",
     "changePermissionsPopup-title": "Cambiar os permisos",
     "changeSettingsPopup-title": "Cambiar a configuración",
+    "subtasks": "Subtasks",
     "checklists": "Checklists",
     "click-to-star": "Click to star this board.",
     "click-to-unstar": "Click to unstar this board.",
     "clipboard": "Clipboard or drag & drop",
     "close": "Close",
     "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
     "color-black": "negro",
     "color-blue": "azul",
+    "color-crimson": "crimson",
+    "color-darkgreen": "darkgreen",
+    "color-gold": "gold",
+    "color-gray": "gray",
     "color-green": "verde",
+    "color-indigo": "indigo",
     "color-lime": "lime",
+    "color-magenta": "magenta",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "navy",
     "color-orange": "laranxa",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
     "color-pink": "rosa",
+    "color-plum": "plum",
     "color-purple": "purple",
     "color-red": "vermello",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "silver",
     "color-sky": "celeste",
+    "color-slateblue": "slateblue",
+    "color-white": "white",
     "color-yellow": "amarelo",
+    "unset-color": "Unset",
     "comment": "Comentario",
     "comment-placeholder": "Escribir un comentario",
     "comment-only": "Comment only",
     "comment-only-desc": "Can comment on cards only.",
+    "no-comments": "No comments",
+    "no-comments-desc": "Can not see comments and activities.",
     "computer": "Computador",
-    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist",
+    "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?",
+    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
     "copy-card-link-to-clipboard": "Copy card link to clipboard",
+    "linkCardPopup-title": "Link Card",
+    "searchElementPopup-title": "Search",
     "copyCardPopup-title": "Copy Card",
     "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
     "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
@@ -167,11 +229,25 @@
     "createBoardPopup-title": "Crear taboleiro",
     "chooseBoardSourcePopup-title": "Importar taboleiro",
     "createLabelPopup-title": "Crear etiqueta",
+    "createCustomField": "Create Field",
+    "createCustomFieldPopup-title": "Create Field",
     "current": "actual",
+    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
+    "custom-field-checkbox": "Checkbox",
+    "custom-field-date": "Data",
+    "custom-field-dropdown": "Dropdown List",
+    "custom-field-dropdown-none": "(none)",
+    "custom-field-dropdown-options": "List Options",
+    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
+    "custom-field-dropdown-unknown": "(unknown)",
+    "custom-field-number": "Number",
+    "custom-field-text": "Text",
+    "custom-fields": "Custom Fields",
     "date": "Data",
     "decline": "Rexeitar",
     "default-avatar": "Avatar predeterminado",
     "delete": "Eliminar",
+    "deleteCustomFieldPopup-title": "Delete Custom Field?",
     "deleteLabelPopup-title": "Eliminar a etiqueta?",
     "description": "Descrición",
     "disambiguateMultiLabelPopup-title": "Disambiguate Label Action",
@@ -186,6 +262,7 @@
     "soft-wip-limit": "Soft WIP Limit",
     "editCardStartDatePopup-title": "Cambiar a data de inicio",
     "editCardDueDatePopup-title": "Cambiar a data límite",
+    "editCustomFieldPopup-title": "Edit Field",
     "editCardSpentTimePopup-title": "Change spent time",
     "editLabelPopup-title": "Cambiar a etiqueta",
     "editNotificationPopup-title": "Editar a notificación",
@@ -222,30 +299,36 @@
     "filter-clear": "Limpar filtro",
     "filter-no-label": "Non hai etiquetas",
     "filter-no-member": "Non hai membros",
+    "filter-no-custom-fields": "No Custom Fields",
     "filter-on": "O filtro está activado",
     "filter-on-desc": "You are filtering cards on this board. Click here to edit filter.",
     "filter-to-selection": "Filter to selection",
+    "advanced-filter-label": "Advanced Filter",
+    "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) to be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
     "fullname": "Nome completo",
     "header-logo-title": "Retornar á páxina dos seus taboleiros.",
     "hide-system-messages": "Agochar as mensaxes do sistema",
     "headerBarCreateBoardPopup-title": "Crear taboleiro",
     "home": "Inicio",
     "import": "Importar",
+    "link": "Link",
     "import-board": "importar taboleiro",
     "import-board-c": "Importar taboleiro",
     "import-board-title-trello": "Importar taboleiro de Trello",
-    "import-board-title-wekan": "Importar taboleiro de Wekan",
+    "import-board-title-wekan": "Import board from previous export",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
     "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
     "from-trello": "De Trello",
-    "from-wekan": "De Wekan",
+    "from-wekan": "From previous export",
     "import-board-instruction-trello": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text.",
-    "import-board-instruction-wekan": "In your Wekan board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
     "import-json-placeholder": "Paste your valid JSON data here",
     "import-map-members": "Map members",
-    "import-members-map": "Your imported board has some members. Please map the members you want to import to Wekan users",
+    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
     "import-show-user-mapping": "Review members mapping",
-    "import-user-select": "Pick the Wekan user you want to use as this member",
-    "importMapMembersAddPopup-title": "Select Wekan member",
+    "import-user-select": "Pick your existing user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select member",
     "info": "Version",
     "initials": "Iniciais",
     "invalid-date": "A data é incorrecta",
@@ -264,17 +347,19 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "Link to this card",
-    "list-archive-cards": "Move all cards in this list to Recycle Bin",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
+    "list-archive-cards": "Move all cards in this list to Archive",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "List Actions",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Import a Trello card",
     "listMorePopup-title": "Máis",
     "link-list": "Link to this list",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
     "lists": "Listas",
     "swimlanes": "Swimlanes",
     "log-out": "Pechar a sesión",
@@ -294,9 +379,9 @@
     "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "My Boards",
     "name": "Nome",
-    "no-archived-cards": "No cards in Recycle Bin.",
-    "no-archived-lists": "No lists in Recycle Bin.",
-    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
+    "no-archived-cards": "No cards in Archive.",
+    "no-archived-lists": "No lists in Archive.",
+    "no-archived-swimlanes": "No swimlanes in Archive.",
     "no-results": "Non hai resultados",
     "normal": "Normal",
     "normal-desc": "Pode ver e editar tarxetas. Non pode cambiar a configuración.",
@@ -332,6 +417,7 @@
     "restore": "Restore",
     "save": "Save",
     "search": "Search",
+    "rules": "Rules",
     "search-cards": "Search from card titles and descriptions on this board",
     "search-example": "Text to search for?",
     "select-color": "Select Color",
@@ -366,6 +452,7 @@
     "title": "Título",
     "tracking": "Seguimento",
     "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
+    "type": "Type",
     "unassign-member": "Unassign member",
     "unsaved-description": "You have an unsaved description.",
     "unwatch": "Unwatch",
@@ -374,7 +461,7 @@
     "uploaded-avatar": "Uploaded an avatar",
     "username": "Nome de usuario",
     "view-it": "Velo",
-    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
+    "warn-list-archived": "warning: this card is in an list at Archive",
     "watch": "Vixiar",
     "watching": "Vixiando",
     "watching-info": "Recibirá unha notificación sobre calquera cambio que se produza neste taboleiro",
@@ -382,6 +469,9 @@
     "welcome-swimlane": "Milestone 1",
     "welcome-list1": "Fundamentos",
     "welcome-list2": "Avanzado",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
     "what-to-do": "Que desexa facer?",
     "wipLimitErrorPopup-title": "Invalid WIP Limit",
     "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
@@ -407,16 +497,16 @@
     "send-smtp-test": "Send a test email to yourself",
     "invitation-code": "Invitation Code",
     "email-invite-register-subject": "__inviter__ sent you an invitation",
-    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to Wekan for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
-    "email-smtp-test-subject": "SMTP Test Email From Wekan",
+    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email",
     "email-smtp-test-text": "You have successfully sent an email",
     "error-invitation-code-not-exist": "Invitation code doesn't exist",
     "error-notAuthorized": "You are not authorized to view this page.",
     "outgoing-webhooks": "Outgoing Webhooks",
     "outgoingWebhooksPopup-title": "Outgoing Webhooks",
+    "boardCardTitlePopup-title": "Card Title Filter",
     "new-outgoing-webhook": "New Outgoing Webhook",
     "no-name": "(Unknown)",
-    "Wekan_version": "Wekan version",
     "Node_version": "Node version",
     "OS_Arch": "OS Arch",
     "OS_Cpus": "OS CPU Count",
@@ -427,13 +517,18 @@
     "OS_Totalmem": "OS Total Memory",
     "OS_Type": "OS Type",
     "OS_Uptime": "OS Uptime",
+    "days": "days",
     "hours": "hours",
     "minutes": "minutes",
     "seconds": "seconds",
+    "show-field-on-card": "Show this field on card",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
     "yes": "Yes",
     "no": "No",
     "accounts": "Accounts",
     "accounts-allowEmailChange": "Allow Email Change",
+    "accounts-allowUserNameChange": "Allow Username Change",
     "createdAt": "Created at",
     "verified": "Verified",
     "active": "Active",
@@ -442,5 +537,157 @@
     "card-end": "End",
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
-    "editCardEndDatePopup-title": "Change end date"
-}
+    "editCardEndDatePopup-title": "Change end date",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "Assigned By",
+    "requested-by": "Requested By",
+    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
+    "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
+    "boardDeletePopup-title": "Delete Board?",
+    "delete-board": "Delete Board",
+    "default-subtasks-board": "Subtasks for __board__ board",
+    "default": "Default",
+    "queue": "Queue",
+    "subtask-settings": "Subtasks Settings",
+    "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
+    "show-subtasks-field": "Cards can have subtasks",
+    "deposit-subtasks-board": "Deposit subtasks to this board:",
+    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
+    "show-parent-in-minicard": "Show parent in minicard:",
+    "prefix-with-full-path": "Prefix with full path",
+    "prefix-with-parent": "Prefix with parent",
+    "subtext-with-full-path": "Subtext with full path",
+    "subtext-with-parent": "Subtext with parent",
+    "change-card-parent": "Change card's parent",
+    "parent-card": "Parent card",
+    "source-board": "Source board",
+    "no-parent": "Don't show parent",
+    "activity-added-label": "added label '%s' to %s",
+    "activity-removed-label": "removed label '%s' from %s",
+    "activity-delete-attach": "deleted an attachment from %s",
+    "activity-added-label-card": "added label '%s'",
+    "activity-removed-label-card": "removed label '%s'",
+    "activity-delete-attach-card": "deleted an attachment",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "r-rule": "Rule",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "Add action",
+    "r-board-rules": "Board rules",
+    "r-add-rule": "Add rule",
+    "r-view-rule": "View rule",
+    "r-delete-rule": "Delete rule",
+    "r-new-rule-name": "New rule title",
+    "r-no-rules": "No rules",
+    "r-when-a-card": "When a card",
+    "r-is": "is",
+    "r-is-moved": "is moved",
+    "r-added-to": "added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "the board",
+    "r-list": "list",
+    "set-filter": "Set Filter",
+    "r-moved-to": "Moved to",
+    "r-moved-from": "Moved from",
+    "r-archived": "Moved to Archive",
+    "r-unarchived": "Restored from Archive",
+    "r-a-card": "a card",
+    "r-when-a-label-is": "When a label is",
+    "r-when-the-label-is": "When the label is",
+    "r-list-name": "list name",
+    "r-when-a-member": "When a member is",
+    "r-when-the-member": "When the member",
+    "r-name": "name",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "r-when-the-item": "When the checklist item",
+    "r-checked": "Checked",
+    "r-unchecked": "Unchecked",
+    "r-move-card-to": "Move card to",
+    "r-top-of": "Top of",
+    "r-bottom-of": "Bottom of",
+    "r-its-list": "its list",
+    "r-archive": "Move to Archive",
+    "r-unarchive": "Restore from Archive",
+    "r-card": "card",
+    "r-add": "Engadir",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-set-color": "Set color to",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "subject",
+    "r-rule-details": "Rule details",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Move card to top of list",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Move card to bottom of list",
+    "r-d-send-email": "Send email",
+    "r-d-send-email-to": "to",
+    "r-d-send-email-subject": "subject",
+    "r-d-send-email-message": "message",
+    "r-d-archive": "Move card to Archive",
+    "r-d-unarchive": "Restore card from Archive",
+    "r-d-add-label": "Add label",
+    "r-d-remove-label": "Remove label",
+    "r-create-card": "Create new card",
+    "r-in-list": "in list",
+    "r-in-swimlane": "in swimlane",
+    "r-d-add-member": "Add member",
+    "r-d-remove-member": "Remove member",
+    "r-d-remove-all-member": "Remove all member",
+    "r-d-check-all": "Check all items of a list",
+    "r-d-uncheck-all": "Uncheck all items of a list",
+    "r-d-check-one": "Check item",
+    "r-d-uncheck-one": "Uncheck item",
+    "r-d-check-of-list": "of checklist",
+    "r-d-add-checklist": "Add checklist",
+    "r-d-remove-checklist": "Remove checklist",
+    "r-by": "by",
+    "r-add-checklist": "Add checklist",
+    "r-with-items": "with items",
+    "r-items-list": "item1,item2,item3",
+    "r-add-swimlane": "Add swimlane",
+    "r-swimlane-name": "swimlane name",
+    "r-board-note": "Note: leave a field empty to match every possible value.",
+    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout",
+    "hide-logo": "Hide Logo",
+    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
+    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
+    "error-undefined": "Something went wrong",
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
+}
\ No newline at end of file
diff --git a/i18n/he.i18n.json b/i18n/he.i18n.json
index 5f21384a..36a41105 100644
--- a/i18n/he.i18n.json
+++ b/i18n/he.i18n.json
@@ -1,51 +1,79 @@
 {
     "accept": "אישור",
-    "act-activity-notify": "[Wekan] הודעת פעילות",
-    "act-addAttachment": " __attachment__ צורף לכרטיס __card__",
-    "act-addChecklist": "רשימת משימות __checklist__ נוספה ל __card__",
-    "act-addChecklistItem": " __checklistItem__ נוסף לרשימת משימות __checklist__ בכרטיס __card__",
-    "act-addComment": "התקבלה תגובה על הכרטיס __card__:‏ __comment__",
+    "act-activity-notify": "הודעת פעילות",
+    "act-addAttachment": "הקובץ __attachment__ צורף אל הכרטיס __card__ ברשימה __list__ למסלול __swimlane__ שבלוח __board__",
+    "act-deleteAttachment": "הקובץ __attachment__ נמחק מהכרטיס __card__ ברשימה __list__ מהמסלול __swimlane__ שבלוח __board__",
+    "act-addSubtask": "תת־משימה __attachment__ נוספה אל הכרטיס __card__ ברשימה __list__ למסלול __swimlane__ שבלוח __board__",
+    "act-addLabel": "התווית __label__ נוספה לכרטיס __card__ ברשימה __list__ למסלול __swimlane__ שבלוח __board__",
+    "act-addedLabel": "התווית __label__ נוספה לכרטיס __card__ ברשימה __list__ למסלול __swimlane__ שבלוח __board__",
+    "act-removeLabel": "התווית __label__ הוסרה מהכרטיס __card__ ברשימה __list__ מהמסלול __swimlane__ שבלוח __board__",
+    "act-removedLabel": "התווית __label__ הוסרה מהכרטיס __card__ ברשימה __list__ מהמסלול __swimlane__ שבלוח __board__",
+    "act-addChecklist": "נוספה רשימת מטלות __checklist__ לכרטיס __card__ ברשימה __list__ שבמסלול __swimlane__ בלוח __board__",
+    "act-addChecklistItem": "נוסף פריט סימון __checklistItem__ לרשימת המטלות __checklist__ לכרטיס __card__ ברשימה __list__ במסלול __swimlane__ בלוח __board__",
+    "act-removeChecklist": "הוסרה רשימת מטלות __checklist__ מהכרטיס __card__ ברשימה __list__ שבמסלול __swimlane__ בלוח __board__",
+    "act-removeChecklistItem": "פריט הסימון __checklistItem__ הוסר מרשימת המטלות __checkList__ בכרטיס __card__ ברשימה __list__ מהמסלול __swimlane__ בלוח __board__",
+    "act-checkedItem": "הפריט  __checklistItem__ ששייך לרשימת המשימות  __checklist__ בכרטיס __card__ שברשימת __list__ במסלול __swimlane__ שבלוח __board__ סומן",
+    "act-uncheckedItem": "בוטל הסימון __checklistItem__ ברשימת המטלות __checklist__ בכרטיס __card__ ברשימה __list__ במסלול __swimlane__ בלוח __board__",
+    "act-completeChecklist": "רשימת המטלות __checklist__ בכרטיס __card__ שברשימה __list__ תחת המסלול __swimlane__ בלוח __board__ הושלמה",
+    "act-uncompleteChecklist": "ההשלמה של רשימת המטלות __checklist__ בכרטיס __card__ שברשימה __list__ תחת המסלול __swimlane__ בלוח __board__ בוטלה",
+    "act-addComment": "התקבלה תגובה על הכרטיס __card__:‏ __comment__ ברשימה __list__ במסלול __swimlane__ בלוח __board__",
     "act-createBoard": "הלוח __board__ נוצר",
-    "act-createCard": "הכרטיס __card__ התווסף לרשימה __list__",
-    "act-createList": "הרשימה __list__ התווספה ללוח __board__",
-    "act-addBoardMember": "המשתמש __member__ נוסף ללוח __board__",
-    "act-archivedBoard": "__board__ moved to Recycle Bin",
-    "act-archivedCard": "__card__ moved to Recycle Bin",
-    "act-archivedList": "__list__ moved to Recycle Bin",
-    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
-    "act-importBoard": "הלוח __board__ יובא",
-    "act-importCard": "הכרטיס __card__ יובא",
-    "act-importList": "הרשימה  __list__ יובאה",
-    "act-joinMember": "המשתמש  __member__ נוסף לכרטיס __card__",
-    "act-moveCard": "הכרטיס __card__ הועבר מהרשימה __oldList__ לרשימה __list__",
-    "act-removeBoardMember": "המשתמש __member__ הוסר מהלוח __board__",
-    "act-restoredCard": "הכרטיס __card__ שוחזר ללוח __board__",
-    "act-unjoinMember": "המשתמש __member__ הוסר מהכרטיס __card__",
-    "act-withBoardTitle": "[Wekan] __board__",
+    "act-createSwimlane": "נוצר מסלול __swimlane__ בלוח __board__",
+    "act-createCard": "הכרטיס __card__ נוצר ברשימה __list__ במסלול __swimlane__ שבלוח __board__",
+    "act-createCustomField": "נוצר שדה בהתאמה אישית __customField__ בכרטיס __card__ שברשימה __list__ במסלול __swimlane__ שבלוח __board__",
+    "act-createList": "הרשימה __list__ נוספה ללוח __board__",
+    "act-addBoardMember": "החבר __member__ נוסף אל __board__",
+    "act-archivedBoard": "הלוח __board__ הועבר לארכיון",
+    "act-archivedCard": "הכרטיס __card__ ברשימה __list__ במסלול __swimlane__ בלוח __board__ הועבר לארכיון",
+    "act-archivedList": "הרשימה __list__ במסלול __swimlane__ בלוח __board__ הועברה לארכיון",
+    "act-archivedSwimlane": "המסלול __swimlane__ בלוח __board__ הועבר לארכיון",
+    "act-importBoard": "הייבוא של הלוח __board__ הושלם",
+    "act-importCard": "הייבוא של הכרטיס __card__ לרשימה __list__ למסלול __swimlane__ ללוח __board__ הושלם",
+    "act-importList": "הרשימה __list__ ייובאה למסלול __swimlane__ שבלוח __board__",
+    "act-joinMember": "החבר __member__ נוסף לכרטיס __card__ לרשימה __list__ במסלול __swimlane__ בלוח __board__",
+    "act-moveCard": "הועבר הכרטיס __card__ בלוח __board__ מהרשימה __oldList__ במסלול __oldSwimlane__ לרשימה __list__ במסלול __swimlane__.",
+    "act-moveCardToOtherBoard": "הכרטיס __card__ הועבר מהרשימה __oldList__ במסלול __oldSwimlane__ בלוח __oldBoard__ לרשימה __list__ במסלול __swimlane__ בלוח __board__",
+    "act-removeBoardMember": "החבר __member__ הוסר מהלוח __board__",
+    "act-restoredCard": "הכרטיס __card__ שוחזר לרשימה __list__ למסלול __swimlane__ ללוח __board__",
+    "act-unjoinMember": "החבר __member__ הוסר מהכרטיס __card__ ברשימה __list__ במסלול __swimlane__ בלוח __board__",
+    "act-withBoardTitle": "__board__",
     "act-withCardTitle": "[__board__] __card__",
     "actions": "פעולות",
     "activities": "פעילויות",
     "activity": "פעילות",
     "activity-added": "%s נוסף ל%s",
-    "activity-archived": "%s moved to Recycle Bin",
+    "activity-archived": "%s הועבר לארכיון",
     "activity-attached": "%s צורף ל%s",
     "activity-created": "%s נוצר",
+    "activity-customfield-created": "נוצר שדה בהתאמה אישית %s",
     "activity-excluded": "%s לא נכלל ב%s",
     "activity-imported": "%s ייובא מ%s אל %s",
-    "activity-imported-board": "%s ייובא מ%s",
+    "activity-imported-board": "%s יובא מ%s",
     "activity-joined": "הצטרפות אל %s",
     "activity-moved": "%s עבר מ%s ל%s",
     "activity-on": "ב%s",
     "activity-removed": "%s הוסר מ%s",
     "activity-sent": "%s נשלח ל%s",
-    "activity-unjoined": "בטל צירוף %s",
+    "activity-unjoined": "בוטל צירוף אל %s",
+    "activity-subtask-added": "נוספה תת־משימה אל %s",
+    "activity-checked-item": "%s סומן ברשימת המשימות %s מתוך %s",
+    "activity-unchecked-item": "בוטל הסימון של %s ברשימת המשימות %s מתוך %s",
     "activity-checklist-added": "נוספה רשימת משימות אל %s",
+    "activity-checklist-removed": "הוסרה רשימת משימות מ־%s",
+    "activity-checklist-completed": "רשימת המטלות __checklist__ בכרטיס __card__ שברשימה __list__ תחת המסלול __swimlane__ בלוח __board__ הושלמה",
+    "activity-checklist-uncompleted": "רשימת המשימות %s מתוך %s סומנה כבלתי מושלמת",
     "activity-checklist-item-added": "נוסף פריט רשימת משימות אל ‚%s‘ תחת %s",
+    "activity-checklist-item-removed": "הוסר פריט מרשימת המשימות ‚%s’ תחת %s",
     "add": "הוספה",
+    "activity-checked-item-card": "סומן %s ברשימת המשימות %s",
+    "activity-unchecked-item-card": "הסימון של %s בוטל ברשימת המשימות %s",
+    "activity-checklist-completed-card": "רשימת המטלות __checklist__ בכרטיס __card__ שברשימה __list__ תחת המסלול __swimlane__ בלוח __board__ הושלמה",
+    "activity-checklist-uncompleted-card": "רשימת המשימות %s סומנה כבלתי מושלמת",
     "add-attachment": "הוספת קובץ מצורף",
     "add-board": "הוספת לוח",
     "add-card": "הוספת כרטיס",
-    "add-swimlane": "הוסף מסלול שחייה",
+    "add-swimlane": "הוספת מסלול",
+    "add-subtask": "הוסף תת משימה",
     "add-checklist": "הוספת רשימת מטלות",
     "add-checklist-item": "הוספת פריט לרשימת משימות",
     "add-cover": "הוספת כיסוי",
@@ -60,23 +88,25 @@
     "admin-announcement-active": "הכרזת מערכת פעילה",
     "admin-announcement-title": "הכרזה ממנהל המערכת",
     "all-boards": "כל הלוחות",
-    "and-n-other-card": "וכרטיס אחר",
-    "and-n-other-card_plural": "ו־__count__ כרטיסים אחרים",
+    "and-n-other-card": "וכרטיס נוסף",
+    "and-n-other-card_plural": "ו־__count__ כרטיסים נוספים",
     "apply": "החלה",
-    "app-is-offline": "Wekan בטעינה, נא להמתין. רענון העמוד עשוי להוביל לאובדן מידע. אם הטעינה של Wekan נעצרה, נא לבדוק ששרת ה־Wekan לא נעצר.",
-    "archive": "Move to Recycle Bin",
-    "archive-all": "Move All to Recycle Bin",
-    "archive-board": "Move Board to Recycle Bin",
-    "archive-card": "Move Card to Recycle Bin",
-    "archive-list": "Move List to Recycle Bin",
-    "archive-swimlane": "Move Swimlane to Recycle Bin",
-    "archive-selection": "Move selection to Recycle Bin",
-    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
-    "archived-items": "Recycle Bin",
-    "archived-boards": "Boards in Recycle Bin",
+    "app-is-offline": "בטעינה, נא להמתין. רענון הדף תוביל לאבדן מידע. אם הטעינה אורכת זמן רב מדי, מוטב לבדוק אם השרת מקוון.",
+    "archive": "העברה לארכיון",
+    "archive-all": "אחסן הכל בארכיון",
+    "archive-board": "העברת הלוח לארכיון",
+    "archive-card": "העברת הכרטיס לארכיון",
+    "archive-list": "העברת הרשימה לארכיון",
+    "archive-swimlane": "העברת מסלול לארכיון",
+    "archive-selection": "העברת הבחירה לארכיון",
+    "archiveBoardPopup-title": "להעביר לוח זה לארכיון?",
+    "archived-items": "להעביר לארכיון",
+    "archived-boards": "לוחות שנשמרו בארכיון",
     "restore-board": "שחזור לוח",
-    "no-archived-boards": "No Boards in Recycle Bin.",
-    "archives": "Recycle Bin",
+    "no-archived-boards": "לא נשמרו לוחות בארכיון.",
+    "archives": "להעביר לארכיון",
+    "template": "תבנית",
+    "templates": "תבניות",
     "assign-member": "הקצאת חבר",
     "attached": "מצורף",
     "attachment": "קובץ מצורף",
@@ -95,22 +125,25 @@
     "boardChangeTitlePopup-title": "שינוי שם הלוח",
     "boardChangeVisibilityPopup-title": "שינוי מצב הצגה",
     "boardChangeWatchPopup-title": "שינוי הגדרת המעקב",
-    "boardMenuPopup-title": "תפריט לוח",
+    "boardMenuPopup-title": "הגדרות לוח",
     "boards": "לוחות",
     "board-view": "תצוגת לוח",
-    "board-view-swimlanes": "מסלול שחייה",
+    "board-view-cal": "לוח שנה",
+    "board-view-swimlanes": "מסלולים",
     "board-view-lists": "רשימות",
     "bucket-example": "כמו למשל „רשימת המשימות“",
     "cancel": "ביטול",
-    "card-archived": "This card is moved to Recycle Bin.",
+    "card-archived": "כרטיס זה שמור בארכיון.",
+    "board-archived": "הלוח עבר לארכיון",
     "card-comments-title": "לכרטיס זה %s תגובות.",
     "card-delete-notice": "מחיקה היא סופית. כל הפעולות המשויכות לכרטיס זה תלכנה לאיוד.",
     "card-delete-pop": "כל הפעולות יוסרו מלוח הפעילות ולא תהיה אפשרות לפתוח מחדש את הכרטיס. אין דרך חזרה.",
-    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "על מנת להסיר כרטיסים מהלוח מבלי לאבד את היסטוריית הפעילות שלהם, ניתן לשמור אותם בארכיון.",
     "card-due": "תאריך יעד",
     "card-due-on": "תאריך יעד",
     "card-spent": "זמן שהושקע",
     "card-edit-attachments": "עריכת קבצים מצורפים",
+    "card-edit-custom-fields": "עריכת שדות בהתאמה אישית",
     "card-edit-labels": "עריכת תוויות",
     "card-edit-members": "עריכת חברים",
     "card-labels-title": "שינוי תוויות לכרטיס.",
@@ -118,13 +151,20 @@
     "card-start": "התחלה",
     "card-start-on": "מתחיל ב־",
     "cardAttachmentsPopup-title": "לצרף מ־",
+    "cardCustomField-datePopup-title": "החלפת תאריך",
+    "cardCustomFieldsPopup-title": "עריכת שדות בהתאמה אישית",
     "cardDeletePopup-title": "למחוק כרטיס?",
     "cardDetailsActionsPopup-title": "פעולות על הכרטיס",
     "cardLabelsPopup-title": "תוויות",
     "cardMembersPopup-title": "חברים",
     "cardMorePopup-title": "עוד",
+    "cardTemplatePopup-title": "יצירת תבנית",
     "cards": "כרטיסים",
     "cards-count": "כרטיסים",
+    "casSignIn": "כניסה עם CAS",
+    "cardType-card": "כרטיס",
+    "cardType-linkedCard": "כרטיס מקושר",
+    "cardType-linkedBoard": "לוח מקושר",
     "change": "שינוי",
     "change-avatar": "החלפת תמונת משתמש",
     "change-password": "החלפת ססמה",
@@ -135,43 +175,79 @@
     "changePasswordPopup-title": "החלפת ססמה",
     "changePermissionsPopup-title": "שינוי הרשאות",
     "changeSettingsPopup-title": "שינוי הגדרות",
+    "subtasks": "תת משימות",
     "checklists": "רשימות",
     "click-to-star": "יש ללחוץ להוספת הלוח למועדפים.",
     "click-to-unstar": "יש ללחוץ להסרת הלוח מהמועדפים.",
     "clipboard": "לוח גזירים או גרירה ושחרור",
     "close": "סגירה",
     "close-board": "סגירת לוח",
-    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
+    "close-board-pop": "ניתן לשחזר את הלוח בלחיצה על כפתור „ארכיונים“ מהכותרת העליונה.",
     "color-black": "שחור",
     "color-blue": "כחול",
+    "color-crimson": "שני",
+    "color-darkgreen": "ירוק כהה",
+    "color-gold": "זהב",
+    "color-gray": "אפור",
     "color-green": "ירוק",
+    "color-indigo": "אינדיגו",
     "color-lime": "ליים",
+    "color-magenta": "ארגמן",
+    "color-mistyrose": "ורד",
+    "color-navy": "כחול כהה",
     "color-orange": "כתום",
+    "color-paleturquoise": "טורקיז חיוור",
+    "color-peachpuff": "נשיפת אפרסק",
     "color-pink": "ורוד",
+    "color-plum": "שזיף",
     "color-purple": "סגול",
     "color-red": "אדום",
+    "color-saddlebrown": "חום אוכף",
+    "color-silver": "כסף",
     "color-sky": "תכלת",
+    "color-slateblue": "צפחה כחולה",
+    "color-white": "לבן",
     "color-yellow": "צהוב",
+    "unset-color": "בטל הגדרה",
     "comment": "לפרסם",
     "comment-placeholder": "כתיבת הערה",
     "comment-only": "הערה בלבד",
-    "comment-only-desc": "ניתן להעיר על כרטיסים בלבד.",
+    "comment-only-desc": "ניתן להגיב על כרטיסים בלבד.",
+    "no-comments": " אין הערות",
+    "no-comments-desc": "לא ניתן לצפות בתגובות ובפעילויות.",
     "computer": "מחשב",
-    "confirm-checklist-delete-dialog": "האם אתה בטוח שברצונך למחוק את רשימת המשימות",
+    "confirm-subtask-delete-dialog": "למחוק את תת המשימה?",
+    "confirm-checklist-delete-dialog": "למחוק את רשימת המשימות?",
     "copy-card-link-to-clipboard": "העתקת קישור הכרטיס ללוח הגזירים",
-    "copyCardPopup-title": "העתק כרטיס",
-    "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
-    "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
-    "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"First card title\", \"description\":\"First card description\"}, {\"title\":\"Second card title\",\"description\":\"Second card description\"},{\"title\":\"Last card title\",\"description\":\"Last card description\"} ]",
+    "linkCardPopup-title": "קישור כרטיס",
+    "searchElementPopup-title": "חיפוש",
+    "copyCardPopup-title": "העתקת כרטיס",
+    "copyChecklistToManyCardsPopup-title": "העתקת תבנית רשימת מטלות למגוון כרטיסים",
+    "copyChecklistToManyCardsPopup-instructions": "כותרות ותיאורים של כרטיסי יעד בתצורת JSON זו",
+    "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"כותרת כרטיס ראשון\", \"description\":\"תיאור כרטיס ראשון\"}, {\"title\":\"כותרת כרטיס שני\",\"description\":\"תיאור כרטיס שני\"},{\"title\":\"כותרת כרטיס אחרון\",\"description\":\"תיאור כרטיס אחרון\"} ]",
     "create": "יצירה",
     "createBoardPopup-title": "יצירת לוח",
-    "chooseBoardSourcePopup-title": "ייבוא לוח",
+    "chooseBoardSourcePopup-title": "יבוא לוח",
     "createLabelPopup-title": "יצירת תווית",
+    "createCustomField": "יצירת שדה",
+    "createCustomFieldPopup-title": "יצירת שדה",
     "current": "נוכחי",
+    "custom-field-delete-pop": "אין אפשרות לבטל את הפעולה. הפעולה תסיר את השדה שהותאם אישית מכל הכרטיסים ותשמיד את ההיסטוריה שלו.",
+    "custom-field-checkbox": "תיבת סימון",
+    "custom-field-date": "תאריך",
+    "custom-field-dropdown": "רשימה נגללת",
+    "custom-field-dropdown-none": "(ללא)",
+    "custom-field-dropdown-options": "אפשרויות רשימה",
+    "custom-field-dropdown-options-placeholder": "יש ללחוץ על enter כדי להוסיף עוד אפשרויות",
+    "custom-field-dropdown-unknown": "(לא ידוע)",
+    "custom-field-number": "מספר",
+    "custom-field-text": "טקסט",
+    "custom-fields": "שדות מותאמים אישית",
     "date": "תאריך",
     "decline": "סירוב",
     "default-avatar": "תמונת משתמש כבררת מחדל",
     "delete": "מחיקה",
+    "deleteCustomFieldPopup-title": "למחוק שדה מותאם אישית?",
     "deleteLabelPopup-title": "למחוק תווית?",
     "description": "תיאור",
     "disambiguateMultiLabelPopup-title": "הבהרת פעולת תווית",
@@ -186,6 +262,7 @@
     "soft-wip-limit": "מגבלת „בעבודה” רכה",
     "editCardStartDatePopup-title": "שינוי מועד התחלה",
     "editCardDueDatePopup-title": "שינוי מועד סיום",
+    "editCustomFieldPopup-title": "עריכת שדה",
     "editCardSpentTimePopup-title": "שינוי הזמן שהושקע",
     "editLabelPopup-title": "שינוי תווית",
     "editNotificationPopup-title": "שינוי דיווח",
@@ -215,38 +292,44 @@
     "error-user-notAllowSelf": "אינך יכול להזמין את עצמך",
     "error-user-notCreated": "משתמש זה לא נוצר",
     "error-username-taken": "המשתמש כבר קיים במערכת",
-    "error-email-taken": "כתובת הדוא\"ל כבר נמצאת בשימוש",
+    "error-email-taken": "כתובת הדוא״ל כבר נמצאת בשימוש",
     "export-board": "ייצוא לוח",
     "filter": "מסנן",
     "filter-cards": "סינון כרטיסים",
     "filter-clear": "ניקוי המסנן",
     "filter-no-label": "אין תווית",
     "filter-no-member": "אין חבר כזה",
+    "filter-no-custom-fields": "אין שדות מותאמים אישית",
     "filter-on": "המסנן פועל",
     "filter-on-desc": "מסנן כרטיסים פעיל בלוח זה. יש ללחוץ כאן לעריכת המסנן.",
     "filter-to-selection": "סינון לבחירה",
+    "advanced-filter-label": "מסנן מתקדם",
+    "advanced-filter-description": "המסנן המתקדם מאפשר לך לכתוב מחרוזת שמכילה את הפעולות הבאות: == != <= >= && || ( ) רווח מכהן כמפריד בין הפעולות. ניתן לסנן את כל השדות המותאמים אישית על ידי הקלדת שמם והערך שלהם. למשל: שדה1 == ערך1. לתשומת לבך: אם שדות או ערכים מכילים רווח, יש לעטוף אותם במירכא מכל צד. למשל: 'שדה 1' == 'ערך 1'. ניתן גם לשלב מגוון תנאים. למשל: F1 == V1 || F1 == V2. על פי רוב כל הפעולות מפוענחות משמאל לימין. ניתן לשנות את הסדר על ידי הצבת סוגריים. למשל: ( F1 == V1 && ( F2 == V2 || F2 == V3. כמו כן, ניתן לחפש בשדה טקסט באופן הבא: F1 == /Tes.*/i",
     "fullname": "שם מלא",
     "header-logo-title": "חזרה לדף הלוחות שלך.",
     "hide-system-messages": "הסתרת הודעות מערכת",
     "headerBarCreateBoardPopup-title": "יצירת לוח",
     "home": "בית",
     "import": "יבוא",
+    "link": "קישור",
     "import-board": "ייבוא לוח",
     "import-board-c": "יבוא לוח",
     "import-board-title-trello": "ייבוא לוח מטרלו",
-    "import-board-title-wekan": "ייבוא לוח מ־Wekan",
+    "import-board-title-wekan": "ייבוא לוח מייצוא קודם",
+    "import-sandstorm-backup-warning": "עדיף לא למחוק נתונים שייובאו מייצוא מקורי או מ־Trello בטרם בדיקה האם הגרעין הזה נסגר ונפתח שוב או אם מתקבלת שגיאה על כך שהלוח לא נמצא, משמעות הדבר היא אבדן מידע.",
     "import-sandstorm-warning": "הלוח שייובא ימחק את כל הנתונים הקיימים בלוח ויחליף אותם בלוח שייובא.",
     "from-trello": "מ־Trello",
-    "from-wekan": "מ־Wekan",
+    "from-wekan": "מייצוא קודם",
     "import-board-instruction-trello": "בלוח הטרלו שלך, עליך ללחוץ על ‚תפריט‘, ואז על ‚עוד‘, ‚הדפסה וייצוא‘, ‚יצוא JSON‘ ולהעתיק את הטקסט שנוצר.",
-    "import-board-instruction-wekan": "בלוח ה־Wekan, יש לגשת אל ‚תפריט‘, לאחר מכן ‚יצוא לוח‘ ולהעתיק את הטקסט בקובץ שהתקבל.",
+    "import-board-instruction-wekan": "בלוח שלך עליך לגשת אל ‚תפריט’, לאחר מכן ‚ייצוא לוח’ ואז להעתיק את הטקסט מהקובץ שהתקבל.",
+    "import-board-instruction-about-errors": "גם אם התקבלו שגיאות בעת יבוא לוח, ייתכן שהייבוא עבד. כדי לבדוק זאת, יש להיכנס ל„כל הלוחות”.",
     "import-json-placeholder": "יש להדביק את נתוני ה־JSON התקינים לכאן",
     "import-map-members": "מיפוי חברים",
-    "import-members-map": "הלוחות המיובאים שלך מכילים חברים. נא למפות את החברים שברצונך לייבא למשתמשי Wekan",
+    "import-members-map": "הלוחות המיובאים שלך מכילים חברים. נא למפות את החברים שברצונך לייבא למשתמשים שלך",
     "import-show-user-mapping": "סקירת מיפוי חברים",
-    "import-user-select": "נא לבחור את המשתמש ב־Wekan בו ברצונך להשתמש עבור חבר זה",
-    "importMapMembersAddPopup-title": "בחירת משתמש Wekan",
-    "info": "גרסא",
+    "import-user-select": "נא לבחור את המשתמש ב־Wekan אותו ברצונך למפות אל חבר זה",
+    "importMapMembersAddPopup-title": "בחירת משתמש",
+    "info": "גרסה",
     "initials": "ראשי תיבות",
     "invalid-date": "תאריך שגוי",
     "invalid-time": "זמן שגוי",
@@ -264,19 +347,21 @@
     "leave-board-pop": "לעזוב את __boardTitle__? שמך יוסר מכל הכרטיסים שבלוח זה.",
     "leaveBoardPopup-title": "לעזוב לוח ?",
     "link-card": "קישור לכרטיס זה",
-    "list-archive-cards": "Move all cards in this list to Recycle Bin",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
+    "list-archive-cards": "העברת כל הכרטיסים שברשימה זו לארכיון",
+    "list-archive-cards-pop": "כל הכרטיסים מרשימה זו יוסרו מהלוח. לצפייה בכרטיסים השמורים בארכיון ולהחזירם ללוח, ניתן ללחוץ על „תפריט” > „פריטים בארכיון”.",
     "list-move-cards": "העברת כל הכרטיסים שברשימה זו",
     "list-select-cards": "בחירת כל הכרטיסים שברשימה זו",
+    "set-color-list": "הגדרת צבע",
     "listActionPopup-title": "פעולות רשימה",
-    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneActionPopup-title": "פעולות על מסלול",
+    "swimlaneAddPopup-title": "הוספת מסלול מתחת",
     "listImportCardPopup-title": "יבוא כרטיס מ־Trello",
     "listMorePopup-title": "עוד",
     "link-list": "קישור לרשימה זו",
     "list-delete-pop": "כל הפעולות תוסרנה מרצף הפעילות ולא תהיה לך אפשרות לשחזר את הרשימה. אין ביטול.",
-    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "ניתן לשמור רשימה בארכיון כדי להסיר אותה מהלוח ולשמור על היסטוריית הפעילות.",
     "lists": "רשימות",
-    "swimlanes": "מסלול שחייה",
+    "swimlanes": "מסלולים",
     "log-out": "יציאה",
     "log-in": "כניסה",
     "loginPopup-title": "כניסה",
@@ -285,8 +370,8 @@
     "menu": "תפריט",
     "move-selection": "העברת הבחירה",
     "moveCardPopup-title": "העברת כרטיס",
-    "moveCardToBottom-title": "העברת כרטיס לתחתית הרשימה",
-    "moveCardToTop-title": "העברת כרטיס לראש הרשימה ",
+    "moveCardToBottom-title": "העברה לתחתית הרשימה",
+    "moveCardToTop-title": "העברה לראש הרשימה ",
     "moveSelectionPopup-title": "העברת בחירה",
     "multi-selection": "בחירה מרובה",
     "multi-selection-on": "בחירה מרובה פועלת",
@@ -294,9 +379,9 @@
     "muted-info": "מעתה לא תתקבלנה אצלך התרעות על שינויים בלוח זה",
     "my-boards": "הלוחות שלי",
     "name": "שם",
-    "no-archived-cards": "No cards in Recycle Bin.",
-    "no-archived-lists": "No lists in Recycle Bin.",
-    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
+    "no-archived-cards": "אין כרטיסים בארכיון",
+    "no-archived-lists": "אין רשימות בארכיון",
+    "no-archived-swimlanes": "אין מסלולים בארכיון.",
     "no-results": "אין תוצאות",
     "normal": "רגיל",
     "normal-desc": "הרשאה לצפות ולערוך כרטיסים. לא ניתן לשנות הגדרות.",
@@ -332,8 +417,9 @@
     "restore": "שחזור",
     "save": "שמירה",
     "search": "חיפוש",
-    "search-cards": "Search from card titles and descriptions on this board",
-    "search-example": "Text to search for?",
+    "rules": "כללים",
+    "search-cards": "חיפוש אחר כותרות ותיאורים של כרטיסים בלוח זה",
+    "search-example": "טקסט לחיפוש ?",
     "select-color": "בחירת צבע",
     "set-wip-limit-value": "הגדרת מגבלה למספר המרבי של משימות ברשימה זו",
     "setWipLimitPopup-title": "הגדרת מגבלת „בעבודה”",
@@ -361,11 +447,12 @@
     "overtime-hours": "שעות נוספות",
     "overtime": "שעות נוספות",
     "has-overtime-cards": "יש כרטיסי שעות נוספות",
-    "has-spenttime-cards": "ניצל את כרטיסי הזמן שהושקע",
+    "has-spenttime-cards": "יש כרטיסי זמן שהושקע",
     "time": "זמן",
     "title": "כותרת",
     "tracking": "מעקב",
     "tracking-info": "על כל שינוי בכרטיסים בהם הייתה לך מעורבות ברמת היצירה או כחברות תגיע אליך הודעה.",
+    "type": "סוג",
     "unassign-member": "ביטול הקצאת חבר",
     "unsaved-description": "יש לך תיאור לא שמור.",
     "unwatch": "ביטול מעקב",
@@ -374,14 +461,17 @@
     "uploaded-avatar": "הועלתה תמונה משתמש",
     "username": "שם משתמש",
     "view-it": "הצגה",
-    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
+    "warn-list-archived": "אזהרה: כרטיס זה הוא חלק מרשימה שנמצאת בארכיון",
     "watch": "לעקוב",
     "watching": "במעקב",
     "watching-info": "מעתה יגיעו אליך דיווחים על כל שינוי בלוח זה",
     "welcome-board": "לוח קבלת פנים",
-    "welcome-swimlane": "Milestone 1",
+    "welcome-swimlane": "ציון דרך 1",
     "welcome-list1": "יסודות",
     "welcome-list2": "מתקדם",
+    "card-templates-swimlane": "תבניות כרטיסים",
+    "list-templates-swimlane": "תבניות רשימות",
+    "board-templates-swimlane": "תבניות לוחות",
     "what-to-do": "מה ברצונך לעשות?",
     "wipLimitErrorPopup-title": "מגבלת „בעבודה” שגויה",
     "wipLimitErrorPopup-dialog-pt1": "מספר המשימות ברשימה זו גדולה ממגבלת הפריטים „בעבודה” שהגדרת.",
@@ -407,16 +497,16 @@
     "send-smtp-test": "שליחת דוא״ל בדיקה לעצמך",
     "invitation-code": "קוד הזמנה",
     "email-invite-register-subject": "נשלחה אליך הזמנה מאת __inviter__",
-    "email-invite-register-text": "__user__ יקר,\n\nקיבלת הזמנה מאת __inviter__ לשתף פעולה ב־Wekan.\n\nנא ללחוץ על הקישור:\n__url__\n\nקוד ההזמנה שלך הוא: __icode__\n\nתודה.",
-    "email-smtp-test-subject": "הודעת בדיקה דרך SMTP מאת Wekan",
+    "email-invite-register-text": " __user__, יקר/ה\n\n__inviter__ מזמין/ה אתכם לשיתוף פעולה בלוח הקנבן.\n\nאנא לחצו על הקישור הבא:\n__url__\n\nקוד ההזמנה הוא: __icode__\n\nתודה.",
+    "email-smtp-test-subject": "דוא״ל לבדיקת SMTP",
     "email-smtp-test-text": "שלחת הודעת דוא״ל בהצלחה",
     "error-invitation-code-not-exist": "קוד ההזמנה אינו קיים",
     "error-notAuthorized": "אין לך הרשאה לצפות בעמוד זה.",
     "outgoing-webhooks": "קרסי רשת יוצאים",
     "outgoingWebhooksPopup-title": "קרסי רשת יוצאים",
+    "boardCardTitlePopup-title": "מסנן כותרת כרטיס",
     "new-outgoing-webhook": "קרסי רשת יוצאים חדשים",
     "no-name": "(לא ידוע)",
-    "Wekan_version": "גרסת Wekan",
     "Node_version": "גרסת Node",
     "OS_Arch": "ארכיטקטורת מערכת הפעלה",
     "OS_Cpus": "מספר מעבדים",
@@ -424,23 +514,180 @@
     "OS_Loadavg": "עומס ממוצע ",
     "OS_Platform": "מערכת הפעלה",
     "OS_Release": "גרסת מערכת הפעלה",
-    "OS_Totalmem": "סך הכל זיכרון (RAM)",
+    "OS_Totalmem": "סך כל הזיכרון (RAM)",
     "OS_Type": "סוג מערכת ההפעלה",
     "OS_Uptime": "זמן שעבר מאז האתחול האחרון",
+    "days": "ימים",
     "hours": "שעות",
     "minutes": "דקות",
     "seconds": "שניות",
+    "show-field-on-card": "הצגת שדה זה בכרטיס",
+    "automatically-field-on-card": "הוספת שדה לכל הכרטיסים",
+    "showLabel-field-on-card": "הצגת תווית של השדה בכרטיס מוקטן",
     "yes": "כן",
     "no": "לא",
     "accounts": "חשבונות",
-    "accounts-allowEmailChange": "אפשר שינוי דוא\"ל",
+    "accounts-allowEmailChange": "לאפשר שינוי דוא״ל",
+    "accounts-allowUserNameChange": "לאפשר שינוי שם משתמש",
     "createdAt": "נוצר ב",
     "verified": "עבר אימות",
     "active": "פעיל",
-    "card-received": "Received",
-    "card-received-on": "Received on",
-    "card-end": "End",
-    "card-end-on": "Ends on",
-    "editCardReceivedDatePopup-title": "Change received date",
-    "editCardEndDatePopup-title": "Change end date"
-}
+    "card-received": "התקבל",
+    "card-received-on": "התקבל במועד",
+    "card-end": "סיום",
+    "card-end-on": "מועד הסיום",
+    "editCardReceivedDatePopup-title": "החלפת מועד הקבלה",
+    "editCardEndDatePopup-title": "החלפת מועד הסיום",
+    "setCardColorPopup-title": "הגדרת צבע",
+    "setCardActionsColorPopup-title": "בחירת צבע",
+    "setSwimlaneColorPopup-title": "בחירת צבע",
+    "setListColorPopup-title": "בחירת צבע",
+    "assigned-by": "הוקצה על ידי",
+    "requested-by": "התבקש על ידי",
+    "board-delete-notice": "מחיקה היא לצמיתות. כל הרשימות, הכרטיבים והפעולות שקשורים בלוח הזה ילכו לאיבוד.",
+    "delete-board-confirm-popup": "כל הרשימות, הכרטיסים, התווית והפעולות יימחקו ולא תהיה לך דרך לשחזר את תכני הלוח. אין אפשרות לבטל.",
+    "boardDeletePopup-title": "למחוק את הלוח?",
+    "delete-board": "מחיקת לוח",
+    "default-subtasks-board": "תת־משימות עבור הלוח __board__",
+    "default": "בררת מחדל",
+    "queue": "תור",
+    "subtask-settings": "הגדרות תתי משימות",
+    "boardSubtaskSettingsPopup-title": "הגדרות תת־משימות בלוח",
+    "show-subtasks-field": "לכרטיסים יכולות להיות תת־משימות",
+    "deposit-subtasks-board": "הפקדת תת־משימות ללוח הזה:",
+    "deposit-subtasks-list": "רשימות נחיתה עבור תת־משימות שהופקדו כאן:",
+    "show-parent-in-minicard": "הצגת ההורה במיני כרטיס:",
+    "prefix-with-full-path": "קידומת עם נתיב מלא",
+    "prefix-with-parent": "קידומת עם הורה",
+    "subtext-with-full-path": "טקסט סמוי עם נתיב מלא",
+    "subtext-with-parent": "טקסט סמוי עם הורה",
+    "change-card-parent": "החלפת הורה הכרטיס",
+    "parent-card": "כרטיס הורה",
+    "source-board": "לוח מקור",
+    "no-parent": "לא להציג את ההורה",
+    "activity-added-label": "התווית ‚%s’ נוספה אל %s",
+    "activity-removed-label": "התווית ‚%s’ הוסרה מ־%s",
+    "activity-delete-attach": "הקובץ המצורף נמחק מ־%s",
+    "activity-added-label-card": "התווית ‚%s’ נוספה",
+    "activity-removed-label-card": "התווית ‚%s’ הוסרה",
+    "activity-delete-attach-card": "קובץ מצורף נמחק",
+    "activity-set-customfield": "הגדרת שדה בהתאמה אישית ‚%s’ לערך ‚%s’ תחת %s",
+    "activity-unset-customfield": "ביטול הגדרת שדה בהתאמה אישית ‚%s’ תחת %s",
+    "r-rule": "כלל",
+    "r-add-trigger": "הוספת הקפצה",
+    "r-add-action": "הוספת פעולה",
+    "r-board-rules": "כללי הלוח",
+    "r-add-rule": "הוספת כלל",
+    "r-view-rule": "הצגת כלל",
+    "r-delete-rule": "מחיקת כל",
+    "r-new-rule-name": "שמו של הכלל החדש",
+    "r-no-rules": "אין כללים",
+    "r-when-a-card": "כאשר כרטיס",
+    "r-is": "הוא",
+    "r-is-moved": "מועבר",
+    "r-added-to": "נוסף אל",
+    "r-removed-from": "מוסר מ־",
+    "r-the-board": "הלוח",
+    "r-list": "רשימה",
+    "set-filter": "הגדרת מסנן",
+    "r-moved-to": "מועבר אל",
+    "r-moved-from": "מועבר מ־",
+    "r-archived": "הועבר לארכיון",
+    "r-unarchived": "הוחזר מהארכיון",
+    "r-a-card": "כרטיס",
+    "r-when-a-label-is": "כאשר תווית",
+    "r-when-the-label-is": "כאשר התווית היא",
+    "r-list-name": "שם הרשימה",
+    "r-when-a-member": "כאשר חבר הוא",
+    "r-when-the-member": "כאשר חבר",
+    "r-name": "שם",
+    "r-when-a-attach": "כאשר קובץ מצורף",
+    "r-when-a-checklist": "כאשר רשימת משימות",
+    "r-when-the-checklist": "כאשר רשימת המשימות",
+    "r-completed": "הושלמה",
+    "r-made-incomplete": "סומנה כבלתי מושלמת",
+    "r-when-a-item": "כאשר פריט ברשימת משימות",
+    "r-when-the-item": "כאשר הפריט ברשימת משימות",
+    "r-checked": "מסומן",
+    "r-unchecked": "לא מסומן",
+    "r-move-card-to": "העברת הכרטיס אל",
+    "r-top-of": "ראש",
+    "r-bottom-of": "תחתית",
+    "r-its-list": "הרשימה שלו",
+    "r-archive": "העברה לארכיון",
+    "r-unarchive": "החזרה מהארכיון",
+    "r-card": "כרטיס",
+    "r-add": "הוספה",
+    "r-remove": "הסרה",
+    "r-label": "תווית",
+    "r-member": "חבר",
+    "r-remove-all": "הסרת כל החברים מהכרטיס",
+    "r-set-color": "הגדרת צבע לכדי",
+    "r-checklist": "רשימת משימות",
+    "r-check-all": "לסמן הכול",
+    "r-uncheck-all": "לבטל את הסימון",
+    "r-items-check": "פריטים ברשימת משימות",
+    "r-check": "סימון",
+    "r-uncheck": "ביטול סימון",
+    "r-item": "פריט",
+    "r-of-checklist": "של רשימת משימות",
+    "r-send-email": "שליחת דוא״ל",
+    "r-to": "אל",
+    "r-subject": "נושא",
+    "r-rule-details": "פרטי הכלל",
+    "r-d-move-to-top-gen": "העברת כרטיס לראש הרשימה שלו",
+    "r-d-move-to-top-spec": "העברת כרטיס לראש רשימה",
+    "r-d-move-to-bottom-gen": "העברת כרטיס לתחתית הרשימה שלו",
+    "r-d-move-to-bottom-spec": "העברת כרטיס לתחתית רשימה",
+    "r-d-send-email": "שליחת דוא״ל",
+    "r-d-send-email-to": "אל",
+    "r-d-send-email-subject": "נושא",
+    "r-d-send-email-message": "הודעה",
+    "r-d-archive": "העברת כרטיס לארכיון",
+    "r-d-unarchive": "החזרת כרטיס מהארכיון",
+    "r-d-add-label": "הוספת תווית",
+    "r-d-remove-label": "הסרת תווית",
+    "r-create-card": "יצירת כרטיס חדש",
+    "r-in-list": "ברשימה",
+    "r-in-swimlane": "במסלול",
+    "r-d-add-member": "הוספת חבר",
+    "r-d-remove-member": "הסרת חבר",
+    "r-d-remove-all-member": "הסרת כל החברים",
+    "r-d-check-all": "סימון כל הפריטים ברשימה",
+    "r-d-uncheck-all": "ביטול סימון הפריטים ברשימה",
+    "r-d-check-one": "סימון פריט",
+    "r-d-uncheck-one": "ביטול סימון פריט",
+    "r-d-check-of-list": "של רשימת משימות",
+    "r-d-add-checklist": "הוספת רשימת משימות",
+    "r-d-remove-checklist": "הסרת רשימת משימות",
+    "r-by": "על ידי",
+    "r-add-checklist": "הוספת רשימת משימות",
+    "r-with-items": "עם פריטים",
+    "r-items-list": "פריט1,פריט2,פריט3",
+    "r-add-swimlane": "הוספת מסלול",
+    "r-swimlane-name": "שם המסלול",
+    "r-board-note": "לתשומת לבך: ניתן להשאיר את השדה ריק כדי ללכוד כל ערך אפשרי.",
+    "r-checklist-note": "לתשומת לבך: את פריטי רשימת הביצוע יש לכתוב בתצורת רשימה של ערכים המופרדים בפסיקים.",
+    "r-when-a-card-is-moved": "כאשר כרטיס מועבר לרשימה אחרת",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "שיטת אימות",
+    "authentication-type": "סוג אימות",
+    "custom-product-name": "שם מותאם אישית למוצר",
+    "layout": "פריסה",
+    "hide-logo": "הסתרת לוגו",
+    "add-custom-html-after-body-start": "הוספת קוד HTML מותאם אישית לאחר ה־<body> הפותח.",
+    "add-custom-html-before-body-end": "הוספת קוד HTML מותאם אישית לפני ה־</body> הסוגר.",
+    "error-undefined": "מהו השתבש",
+    "error-ldap-login": "אירעה שגיאה בעת ניסיון הכניסה",
+    "display-authentication-method": "הצגת שיטת אימות",
+    "default-authentication-method": "שיטת אימות כבררת מחדל",
+    "duplicate-board": "שכפול לוח",
+    "people-number": "מספר האנשים הוא:",
+    "swimlaneDeletePopup-title": "למחוק מסלול?",
+    "swimlane-delete-pop": "כל הפעולות יוסרו מהזנת הפעילות ולא תהיה לך אפשרות לשחזר את המסלול. אי אפשר לחזור אחורה.",
+    "restore-all": "לשחזר הכול",
+    "delete-all": "למחוק הכול",
+    "loading": "העמוד בטעינה, אנא המתינו."
+}
\ No newline at end of file
diff --git a/i18n/hi.i18n.json b/i18n/hi.i18n.json
new file mode 100644
index 00000000..a61620f5
--- /dev/null
+++ b/i18n/hi.i18n.json
@@ -0,0 +1,693 @@
+{
+    "accept": "स्वीकार",
+    "act-activity-notify": "गतिविधि अधिसूचना",
+    "act-addAttachment": "अनुलग्नक जोड़ा __attachment__ कार्ड के लिए __card__ सूचि मेें __list__ तैराक में __swimlane__ बोर्ड पर __board__",
+    "act-deleteAttachment": "हटाए गए अनुलग्नक __attachment__ कार्ड पर __card__ सूचि मेें __list__ तैराक में __swimlane__ बोर्ड पर __board__",
+    "act-addSubtask": "जोड़ा उपकार्य __checklist__ को __card__ सूचि मेें __list__ तैराक में __swimlane__ बोर्ड पर __board__",
+    "act-addLabel": "जोड़ा गया लेबल __label__ कार्ड के लिए __card__ सूचि मेें __list__ तैराक में __swimlane__ बोर्ड पर __board__",
+    "act-addedLabel": "जोड़ा गया लेबल __label__ कार्ड के लिए __card__ सूचि मेें __list__ तैराक में __swimlane__ बोर्ड पर __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__board__",
+    "act-withCardTitle": "[__board__] __card__",
+    "actions": "कार्रवाई",
+    "activities": "गतिविधि",
+    "activity": "क्रियाएँ",
+    "activity-added": "जोड़ा गया %s से %s",
+    "activity-archived": "%sसंग्रह में ले जाया गया",
+    "activity-attached": "संलग्न %s से %s",
+    "activity-created": "बनाया %s",
+    "activity-customfield-created": "बनाया रिवाज क्षेत्र %s",
+    "activity-excluded": "छोड़ा %s से %s",
+    "activity-imported": "सूचित कर %s  के अंदर %s से %s",
+    "activity-imported-board": "सूचित कर %s से %s",
+    "activity-joined": "शामिल %s",
+    "activity-moved": "स्थानांतरित %s से %s तक %s",
+    "activity-on": "पर %s",
+    "activity-removed": "हटा दिया %s से %s",
+    "activity-sent": "प्रेषित %s तक %s",
+    "activity-unjoined": "शामिल नहीं %s",
+    "activity-subtask-added": "जोड़ा उप कार्य तक %s",
+    "activity-checked-item": "चिह्नित %s अंदर में चिह्नांकन-सूची %s of %s",
+    "activity-unchecked-item": "अचिह्नित %s अंदर में चिह्नांकन-सूची %s of %s",
+    "activity-checklist-added": "संकलित चिह्नांकन-सूची तक %s",
+    "activity-checklist-removed": "हटा दिया एक चिह्नांकन-सूची से %s",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted": "अपूर्ण चिह्नांकन-सूची %s of %s",
+    "activity-checklist-item-added": "संकलित चिह्नांकन-सूची विषय तक '%s' अंदर में %s",
+    "activity-checklist-item-removed": "हटा दिया एक चिह्नांकन-सूची विषय से '%s' अंदर में %s",
+    "add": "जोड़ें",
+    "activity-checked-item-card": "चिह्नित %s अंदर में चिह्नांकन-सूची %s",
+    "activity-unchecked-item-card": "अचिह्नित %s अंदर में चिह्नांकन-सूची %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted-card": "अपूर्ण चिह्नांकन-सूची %s",
+    "add-attachment": "संलग्न करें",
+    "add-board": "बोर्ड जोड़ें",
+    "add-card": "कार्ड जोड़ें",
+    "add-swimlane": "तैरन जोड़ें",
+    "add-subtask": "उप कार्य जोड़ें",
+    "add-checklist": "चिह्नांकन-सूची जोड़ें",
+    "add-checklist-item": "चिह्नांकन-सूची विषय कोई तक जोड़ें",
+    "add-cover": "आवरण जोड़ें",
+    "add-label": "नामपत्र जोड़ें",
+    "add-list": "सूची जोड़ें",
+    "add-members": "सदस्य जोड़ें",
+    "added": "जोड़ा गया",
+    "addMemberPopup-title": "सदस्य",
+    "admin": "Admin",
+    "admin-desc": "कार्ड देख और संपादित कर सकते हैं, सदस्यों को हटा सकते हैं, और बोर्ड के लिए सेटिंग्स बदल सकते हैं।",
+    "admin-announcement": "घोषणा",
+    "admin-announcement-active": "सक्रिय सिस्टम-व्यापी घोषणा",
+    "admin-announcement-title": "घोषणा प्रशासक से",
+    "all-boards": "सभी बोर्ड",
+    "and-n-other-card": "और __count__ other कार्ड",
+    "and-n-other-card_plural": "और __count__ other कार्ड",
+    "apply": "Apply",
+    "app-is-offline": "लोड हो रहा है, कृपया प्रतीक्षा करें । पृष्ठ को ताज़ा करना डेटा की हानि का कारण होगा । यदि लोड करना कार्य नहीं करता है, तो कृपया जांचें कि सर्वर बंद नहीं हुआ है ।",
+    "archive": "संग्रह में ले जाएं",
+    "archive-all": "सभी को संग्रह में ले जाएं",
+    "archive-board": "संग्रह करने के लिए बोर्ड ले जाएँ",
+    "archive-card": "कार्ड को संग्रह में ले जाएं",
+    "archive-list": "सूची को संग्रह में ले जाएं",
+    "archive-swimlane": "संग्रह करने के लिए स्विमलेन ले जाएँ",
+    "archive-selection": "चयन को संग्रह में ले जाएं",
+    "archiveBoardPopup-title": "बोर्ड को संग्रह में स्थानांतरित करें?",
+    "archived-items": "संग्रह",
+    "archived-boards": "संग्रह में बोर्ड",
+    "restore-board": "पुनर्स्थापना बोर्ड",
+    "no-archived-boards": "संग्रह में कोई बोर्ड नहीं ।",
+    "archives": "पुरालेख",
+    "template": "खाका",
+    "templates": "खाका",
+    "assign-member": "आवंटित सदस्य",
+    "attached": "संलग्न",
+    "attachment": "संलग्नक",
+    "attachment-delete-pop": "किसी संलग्नक को हटाना स्थाई है । कोई पूर्ववत् नहीं है ।",
+    "attachmentDeletePopup-title": "मिटाएँ संलग्नक?",
+    "attachments": "संलग्नक",
+    "auto-watch": "स्वचालित रूप से देखो बोर्डों जब वे बनाए जाते हैं",
+    "avatar-too-big": "अवतार बहुत बड़ा है (70KB अधिकतम)",
+    "back": "वापस",
+    "board-change-color": "रंग बदलना",
+    "board-nb-stars": "%s पसंद होना",
+    "board-not-found": "बोर्ड नहीं मिला",
+    "board-private-info": "यह बोर्ड हो जाएगा <strong>निजी</strong>.",
+    "board-public-info": "यह बोर्ड हो जाएगा <strong>सार्वजनिक</strong>.",
+    "boardChangeColorPopup-title": "बोर्ड पृष्ठभूमि बदलें",
+    "boardChangeTitlePopup-title": "बोर्ड का नाम बदलें",
+    "boardChangeVisibilityPopup-title": "दृश्यता बदलें",
+    "boardChangeWatchPopup-title": "बदलें वॉच",
+    "boardMenuPopup-title": "बोर्ड सेटिंग्स",
+    "boards": "बोर्डों",
+    "board-view": "बोर्ड दृष्टिकोण",
+    "board-view-cal": "तिथि-पत्र",
+    "board-view-swimlanes": "तैरना",
+    "board-view-lists": "सूचियाँ",
+    "bucket-example": "उदाहरण के लिए “बाल्टी सूची” की तरह",
+    "cancel": "रद्द करें",
+    "card-archived": "यह कार्ड संग्रह करने के लिए ले जाया गया है ।",
+    "board-archived": "यह बोर्ड संग्रह करने के लिए ले जाया जाता है ।",
+    "card-comments-title": "इस कार्ड में %s टिप्पणी है।",
+    "card-delete-notice": "हटाना स्थायी है। आप इस कार्ड से जुड़े सभी कार्यों को खो देंगे।",
+    "card-delete-pop": "सभी कार्रवाइयां गतिविधि फ़ीड से निकाल दी जाएंगी और आप कार्ड को फिर से खोलने में सक्षम नहीं होंगे । कोई पूर्ववत् नहीं है ।",
+    "card-delete-suggest-archive": "आप एक कार्ड को बोर्ड से हटाने और गतिविधि को संरक्षित करने के लिए संग्रह में ले जा सकते हैं ।",
+    "card-due": "नियत",
+    "card-due-on": "पर नियत",
+    "card-spent": "समय बिताया",
+    "card-edit-attachments": "संपादित संलग्नक",
+    "card-edit-custom-fields": "संपादित  प्रचलन  क्षेत्र",
+    "card-edit-labels": "संपादित नामपत्र",
+    "card-edit-members": "संपादित सदस्य",
+    "card-labels-title": "कार्ड के लिए नामपत्र परिवर्तित करें ।",
+    "card-members-title": "कार्ड से बोर्ड के सदस्यों को जोड़ें या हटाएं।",
+    "card-start": "प्रारंभ",
+    "card-start-on": "पर शुरू होता है",
+    "cardAttachmentsPopup-title": "से अनुलग्न करें",
+    "cardCustomField-datePopup-title": "तारीख बदलें",
+    "cardCustomFieldsPopup-title": "संपादित करें प्रचलन क्षेत्र",
+    "cardDeletePopup-title": "मिटाएँ कार्ड?",
+    "cardDetailsActionsPopup-title": "कार्ड क्रियाएँ",
+    "cardLabelsPopup-title": "नामपत्र",
+    "cardMembersPopup-title": "सदस्य",
+    "cardMorePopup-title": "अतिरिक्त",
+    "cardTemplatePopup-title": "खाका बनाएं",
+    "cards": "कार्ड्स",
+    "cards-count": "कार्ड्स",
+    "casSignIn": "सीएएस के साथ साइन इन करें",
+    "cardType-card": "कार्ड",
+    "cardType-linkedCard": "जुड़े हुए कार्ड",
+    "cardType-linkedBoard": "जुड़े हुए बोर्ड",
+    "change": "तब्दीली",
+    "change-avatar": "अवतार परिवर्तन करें",
+    "change-password": "गोपनीयता परिवर्तन करें",
+    "change-permissions": "अनुमतियां परिवर्तित करें",
+    "change-settings": "व्यवस्था परिवर्तित करें",
+    "changeAvatarPopup-title": "अवतार परिवर्तन करें",
+    "changeLanguagePopup-title": "भाषा परिवर्तन करें",
+    "changePasswordPopup-title": "गोपनीयता परिवर्तन करें",
+    "changePermissionsPopup-title": "अनुमतियां परिवर्तित करें",
+    "changeSettingsPopup-title": "व्यवस्था परिवर्तित करें",
+    "subtasks": "उप-कार्य",
+    "checklists": "जांच सूची",
+    "click-to-star": "इस बोर्ड को स्टार करने के लिए क्लिक करें ।",
+    "click-to-unstar": "इस बोर्ड को अनस्टार करने के लिए क्लिक करें।",
+    "clipboard": "क्लिपबोर्ड या खींचें और छोड़ें",
+    "close": "बंद करे",
+    "close-board": "बोर्ड बंद करे",
+    "close-board-pop": "आप होम हेडर से \"संग्रह\" बटन पर क्लिक करके बोर्ड को पुनर्स्थापित करने में सक्षम होंगे।",
+    "color-black": "काला",
+    "color-blue": "नीला",
+    "color-crimson": "गहरा लाल",
+    "color-darkgreen": "गहरा हरा",
+    "color-gold": "स्वर्ण",
+    "color-gray": "भूरे",
+    "color-green": "हरा",
+    "color-indigo": "नील",
+    "color-lime": "हल्का हरा",
+    "color-magenta": "मैजंटा",
+    "color-mistyrose": "हल्का गुलाबी",
+    "color-navy": "navy",
+    "color-orange": "नारंगी",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
+    "color-pink": "गुलाबी",
+    "color-plum": "plum",
+    "color-purple": "बैंगनी",
+    "color-red": "लाल",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "silver",
+    "color-sky": "आकाशिया नीला",
+    "color-slateblue": "slateblue",
+    "color-white": "white",
+    "color-yellow": "पीला",
+    "unset-color": "Unset",
+    "comment": "टिप्पणी",
+    "comment-placeholder": "टिप्पणी लिखें",
+    "comment-only": "केवल टिप्पणी करें",
+    "comment-only-desc": "केवल कार्ड पर टिप्पणी कर सकते हैं।",
+    "no-comments": "कोई टिप्पणी नहीं",
+    "no-comments-desc": "टिप्पणियां और गतिविधियां नहीं देख पा रहे हैं।",
+    "computer": "संगणक",
+    "confirm-subtask-delete-dialog": "क्या आप वाकई उपकार्य हटाना चाहते हैं?",
+    "confirm-checklist-delete-dialog": "क्या आप वाकई जांचसूची हटाना चाहते हैं?",
+    "copy-card-link-to-clipboard": "कॉपी कार्ड क्लिपबोर्ड करने के लिए लिंक",
+    "linkCardPopup-title": "कार्ड कड़ी",
+    "searchElementPopup-title": "Search",
+    "copyCardPopup-title": "कार्ड प्रतिलिपि",
+    "copyChecklistToManyCardsPopup-title": "कई कार्ड के लिए जांचसूची खाके की प्रतिलिपि बनाएँ",
+    "copyChecklistToManyCardsPopup-instructions": "इस JSON प्रारूप में गंतव्य कार्ड शीर्षक और विवरण",
+    "copyChecklistToManyCardsPopup-format": "[{\"title\":\"पहला कार्ड शीर्षक\",\"description\":\"पहला कार्ड विवरण\"},{\"title\":\"दूसरा कार्ड शीर्षक\",\"description\":\"दूसरा कार्ड विवरण\"},{\"title\":\"अंतिम कार्ड शीर्षक\",\"description\":\"अंतिम कार्ड विवरण\" }]",
+    "create": "निर्माण करना",
+    "createBoardPopup-title": "बोर्ड निर्माण करना",
+    "chooseBoardSourcePopup-title": "बोर्ड आयात",
+    "createLabelPopup-title": "नामपत्र निर्माण",
+    "createCustomField": "क्षेत्र निर्माण करना",
+    "createCustomFieldPopup-title": "क्षेत्र निर्माण",
+    "current": "वर्तमान",
+    "custom-field-delete-pop": "कोई पूर्ववत् नहीं है । यह सभी कार्ड से इस कस्टम क्षेत्र को हटा दें और इसके इतिहास को नष्ट कर देगा ।",
+    "custom-field-checkbox": "निशानबक्से",
+    "custom-field-date": "दिनांक",
+    "custom-field-dropdown": "ड्रॉपडाउन सूची",
+    "custom-field-dropdown-none": "(कोई नहीं)",
+    "custom-field-dropdown-options": "सूची विकल्प",
+    "custom-field-dropdown-options-placeholder": "Press enter तक जोड़ें more options",
+    "custom-field-dropdown-unknown": "(unknown)",
+    "custom-field-number": "Number",
+    "custom-field-text": "Text",
+    "custom-fields": "प्रचलन  क्षेत्र",
+    "date": "Date",
+    "decline": "Decline",
+    "default-avatar": "Default avatar",
+    "delete": "Delete",
+    "deleteCustomFieldPopup-title": "मिटाएँ  प्रचलन  क्षेत्र?",
+    "deleteLabelPopup-title": "मिटाएँ Label?",
+    "description": "Description",
+    "disambiguateMultiLabelPopup-title": "Disambiguate Label Action",
+    "disambiguateMultiMemberPopup-title": "Disambiguate सदस्य Action",
+    "discard": "Disकार्ड",
+    "done": "Done",
+    "download": "Download",
+    "edit": "Edit",
+    "edit-avatar": "Change Avatar",
+    "edit-profile": "संपादित करें Profile",
+    "edit-wip-limit": "संपादित करें WIP Limit",
+    "soft-wip-limit": "Soft WIP Limit",
+    "editCardStartDatePopup-title": "Change start date",
+    "editCardDueDatePopup-title": "Change due date",
+    "editCustomFieldPopup-title": "संपादित करें Field",
+    "editCardSpentTimePopup-title": "Change spent time",
+    "editLabelPopup-title": "Change Label",
+    "editNotificationPopup-title": "संपादित करें Notification",
+    "editProfilePopup-title": "संपादित करें Profile",
+    "email": "Email",
+    "email-enrollAccount-subject": "An account created for you on __siteName__",
+    "email-enrollAccount-text": "Hello __user__,\n\nTo start using the service, simply click the link below.\n\n__url__\n\nThanks.",
+    "email-fail": "Sending email failed",
+    "email-fail-text": "Error trying तक send email",
+    "email-invalid": "Invalid email",
+    "email-invite": "Invite via Email",
+    "email-invite-subject": "__inviter__ प्रेषित you an invitation",
+    "email-invite-text": "Dear __user__,\n\n__inviter__ invites you तक join बोर्ड \"__board__\" for collaborations.\n\nPlease follow the link below:\n\n__url__\n\nThanks.",
+    "email-resetPassword-subject": "Reset your password on __siteName__",
+    "email-resetPassword-text": "Hello __user__,\n\nTo reset your password, simply click the link below.\n\n__url__\n\nThanks.",
+    "email-sent": "Email sent",
+    "email-verifyEmail-subject": "Verify your email address on __siteName__",
+    "email-verifyEmail-text": "नमस्ते __user __, \n\n अपना खाता ईमेल सत्यापित करने के लिए, बस नीचे दिए गए लिंक पर क्लिक करें। \n\n__url __ \n\n धन्यवाद।",
+    "enable-wip-limit": "Enable WIP Limit",
+    "error-board-doesNotExist": "यह बोर्ड does not exist",
+    "error-board-notAdmin": "You need तक be  व्यवस्थापक of  यह बोर्ड तक do that",
+    "error-board-notAMember": "You need तक be एक सदस्य of  यह बोर्ड तक do that",
+    "error-json-malformed": "Your text is not valid JSON",
+    "error-json-schema": "आपके JSON डेटा में सही प्रारूप में सही जानकारी शामिल नहीं है",
+    "error-list-doesNotExist": "यह सूची does not exist",
+    "error-user-doesNotExist": "यह user does not exist",
+    "error-user-notAllowSelf": "You can not invite yourself",
+    "error-user-notCreated": "यह user is not created",
+    "error-username-taken": "यह username is already taken",
+    "error-email-taken": "Email has already been taken",
+    "export-board": "Export बोर्ड",
+    "filter": "Filter",
+    "filter-cards": "Filter कार्ड",
+    "filter-clear": "Clear filter",
+    "filter-no-label": "No label",
+    "filter-no-member": "No सदस्य",
+    "filter-no-custom-fields": "No  प्रचलन  क्षेत्र",
+    "filter-on": "Filter is on",
+    "filter-on-desc": "You are filtering कार्ड इस पर बोर्ड. Click here तक  संपादित करें filter.",
+    "filter-to-selection": "Filter तक selection",
+    "advanced-filter-label": "Advanced Filter",
+    "advanced-filter-description": "Advanced Filter allows तक write एक string containing following operators: == != <= >= && || ( ) एक space is used as एक separator between the Operators. You can filter for संपूर्ण  प्रचलन  क्षेत्र by typing their names और values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need तक encapsulate them  के अंदर single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) तक be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally संपूर्ण operators are interpreted से left तक right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
+    "fullname": "Full Name",
+    "header-logo-title": "Go back तक your बोर्डों page.",
+    "hide-system-messages": "Hide system messages",
+    "headerBarCreateBoardPopup-title": "Create बोर्ड",
+    "home": "Home",
+    "import": "Import",
+    "link": "Link",
+    "import-board": "import बोर्ड",
+    "import-board-c": "Import बोर्ड",
+    "import-board-title-trello": "Import बोर्ड से Trello",
+    "import-board-title-wekan": "Import board from previous export",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
+    "import-sandstorm-warning": "सूचित कर बोर्ड will मिटाएँ संपूर्ण existing data on बोर्ड और replace it साथ में  सूचित कर बोर्ड.",
+    "from-trello": "From Trello",
+    "from-wekan": "From previous export",
+    "import-board-instruction-trello": "In your Trello बोर्ड, go तक 'Menu', then 'More', 'Print और Export', 'Export JSON', और copy the resulting text.",
+    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
+    "import-json-placeholder": "Paste your valid JSON data here",
+    "import-map-members": "Map सदस्य",
+    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
+    "import-show-user-mapping": "Re आलोकन सदस्य mapping",
+    "import-user-select": "Pick your existing user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select member",
+    "info": "Version",
+    "initials": "Initials",
+    "invalid-date": "Invalid date",
+    "invalid-time": "Invalid time",
+    "invalid-user": "Invalid user",
+    "joined": "joined",
+    "just-invited": "You are just invited तक  यह बोर्ड",
+    "keyboard-shortcuts": "Keyबोर्ड shortcuts",
+    "label-create": "Create Label",
+    "label-default": "%s label (default)",
+    "label-delete-pop": "There is no undo.  यह will हटा  यह label से संपूर्ण कार्ड और destroy its history.",
+    "labels": "नामपत्र",
+    "language": "Language",
+    "last-admin-desc": "You can’t change roles because there must be at least one admin.",
+    "leave-board": "Leave बोर्ड",
+    "leave-board-pop": "Are you sure you want तक leave __boardTitle__? You हो जाएगा हटा दिया से संपूर्ण कार्ड इस पर बोर्ड.",
+    "leaveBoardPopup-title": "Leave बोर्ड ?",
+    "link-card": "Link तक यह कार्ड",
+    "list-archive-cards": "Move all cards in this list to Archive",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
+    "list-move-cards": "स्थानांतरित संपूर्ण कार्ड अंदर में  यह list",
+    "list-select-cards": "Select संपूर्ण कार्ड अंदर में  यह list",
+    "set-color-list": "Set Color",
+    "listActionPopup-title": "सूची Actions",
+    "swimlaneActionPopup-title": "तैरन Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
+    "listImportCardPopup-title": "Import एक Trello कार्ड",
+    "listMorePopup-title": "More",
+    "link-list": "Link तक  यह list",
+    "list-delete-pop": "All actions हो जाएगा हटा दिया से the activity feed और you won't be able तक recover the list. There is no undo.",
+    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
+    "lists": "Lists",
+    "swimlanes": "तैरन",
+    "log-out": "Log Out",
+    "log-in": "Log In",
+    "loginPopup-title": "Log In",
+    "memberMenuPopup-title": "सदस्य  व्यवस्था",
+    "members": "सदस्य",
+    "menu": "Menu",
+    "move-selection": "स्थानांतरित selection",
+    "moveCardPopup-title": "स्थानांतरित कार्ड",
+    "moveCardToBottom-title": "स्थानांतरित तक Bottom",
+    "moveCardToTop-title": "स्थानांतरित तक Top",
+    "moveSelectionPopup-title": "स्थानांतरित selection",
+    "multi-selection": "Multi-Selection",
+    "multi-selection-on": "Multi-Selection is on",
+    "muted": "Muted",
+    "muted-info": "आप किसी भी परिवर्तन के अधिसूचित नहीं किया जाएगा अंदर में  यह बोर्ड",
+    "my-boards": "My बोर्ड",
+    "name": "Name",
+    "no-archived-cards": "No cards in Archive.",
+    "no-archived-lists": "No lists in Archive.",
+    "no-archived-swimlanes": "No swimlanes in Archive.",
+    "no-results": "No results",
+    "normal": "Normal",
+    "normal-desc": "Can  आलोकन और  संपादित करें कार्ड. Can't change  व्यवस्था.",
+    "not-accepted-yet": "Invitation not accepted yet",
+    "notify-participate": "Receive updates तक any कार्ड you participate as creater or सदस्य",
+    "notify-watch": "Receive updates तक any बोर्ड, lists, or कार्ड you’re watching",
+    "optional": "optional",
+    "or": "or",
+    "page-maybe-private": "यह page may be private. You may be able तक  आलोकन it by <a href='%s'>logging in</a>.",
+    "page-not-found": "Page नहीं मिला.",
+    "password": "Password",
+    "paste-or-dragdrop": "to paste, or drag & drop image file तक it (image only)",
+    "participating": "Participating",
+    "preview": "Preview",
+    "previewAttachedImagePopup-title": "Preview",
+    "previewClipboardImagePopup-title": "Preview",
+    "private": "Private",
+    "private-desc": "यह बोर्ड is private. Only people  संकलित तक the बोर्ड can  आलोकन और  संपादित करें it.",
+    "profile": "Profile",
+    "public": "Public",
+    "public-desc": "यह बोर्ड is public. It's visible तक anyone साथ में the link और will show up अंदर में गूगल की तरह खोज इंजन । केवल लोग  संकलित तक बोर्ड संपादित कर सकते हैं.",
+    "quick-access-description": "Star एक बोर्ड तक जोड़ें एक shortcut अंदर में  यह  पट्टी .",
+    "remove-cover": "हटाएँ  Cover",
+    "remove-from-board": "हटाएँ  से बोर्ड",
+    "remove-label": "हटाएँ  Label",
+    "listDeletePopup-title": "मिटाएँ सूची ?",
+    "remove-member": "हटाएँ  सदस्य",
+    "remove-member-from-card": "हटाएँ  से कार्ड",
+    "remove-member-pop": "हटाएँ  __name__ (__username__) से __boardTitle__? इस बोर्ड पर सभी कार्ड से सदस्य हटा दिया जाएगा। उन्हें एक अधिसूचना प्राप्त होगी।",
+    "removeMemberPopup-title": "हटाएँ  सदस्य?",
+    "rename": "Rename",
+    "rename-board": "Rename बोर्ड",
+    "restore": "Restore",
+    "save": "Save",
+    "search": "Search",
+    "rules": "Rules",
+    "search-cards": "Search से कार्ड titles और descriptions इस पर बोर्ड",
+    "search-example": "Text तक search for?",
+    "select-color": "Select Color",
+    "set-wip-limit-value": "Set एक limit for the maximum number of tasks अंदर में  यह list",
+    "setWipLimitPopup-title": "Set WIP Limit",
+    "shortcut-assign-self": "Assign yourself तक current कार्ड",
+    "shortcut-autocomplete-emoji": "Autocomplete emoji",
+    "shortcut-autocomplete-members": "Autocomplete सदस्य",
+    "shortcut-clear-filters": "Clear संपूर्ण filters",
+    "shortcut-close-dialog": "Close Dialog",
+    "shortcut-filter-my-cards": "Filter my कार्ड",
+    "shortcut-show-shortcuts": "Bring up  यह shortcuts list",
+    "shortcut-toggle-filterbar": "Toggle Filter Sidebar",
+    "shortcut-toggle-sidebar": "Toggle बोर्ड Sidebar",
+    "show-cards-minimum-count": "Show कार्ड count if सूची contains more than",
+    "sidebar-open": "Open Sidebar",
+    "sidebar-close": "Close Sidebar",
+    "signupPopup-title": "Create an Account",
+    "star-board-title": "Click तक star  यह बोर्ड. It will show up at top of your बोर्डों list.",
+    "starred-boards": "Starred बोर्ड",
+    "starred-boards-description": "Starred बोर्डों show up at the top of your बोर्डों list.",
+    "subscribe": "Subscribe",
+    "team": "Team",
+    "this-board": "यह बोर्ड",
+    "this-card": "यह कार्ड",
+    "spent-time-hours": "Spent time (hours)",
+    "overtime-hours": "Overtime (hours)",
+    "overtime": "Overtime",
+    "has-overtime-cards": "Has overtime कार्ड",
+    "has-spenttime-cards": "Has spent time कार्ड",
+    "time": "Time",
+    "title": "Title",
+    "tracking": "Tracking",
+    "tracking-info": "You हो जाएगा notified of any changes तक those कार्ड you are involved as creator or सदस्य.",
+    "type": "Type",
+    "unassign-member": "Unassign सदस्य",
+    "unsaved-description": "You have an unsaved description.",
+    "unwatch": "Unwatch",
+    "upload": "Upload",
+    "upload-avatar": "Upload an avatar",
+    "uploaded-avatar": "Uploaded an avatar",
+    "username": "Username",
+    "view-it": "आलोकन it",
+    "warn-list-archived": "warning: this card is in an list at Archive",
+    "watch": "Watch",
+    "watching": "Watching",
+    "watching-info": "You हो जाएगा notified of any change अंदर में  यह बोर्ड",
+    "welcome-board": "Welcome बोर्ड",
+    "welcome-swimlane": "Milestone 1",
+    "welcome-list1": "Basics",
+    "welcome-list2": "Advanced",
+    "card-templates-swimlane": "कार्ड का खाका",
+    "list-templates-swimlane": "सूची का खाका",
+    "board-templates-swimlane": "बोर्ड का खाका",
+    "what-to-do": "What do you want तक do?",
+    "wipLimitErrorPopup-title": "Invalid WIP Limit",
+    "wipLimitErrorPopup-dialog-pt1": "The number of tasks अंदर में  यह सूची is higher than the WIP limit you've defined.",
+    "wipLimitErrorPopup-dialog-pt2": "Please स्थानांतरित some tasks out of  यह list, or set एक higher WIP limit.",
+    "admin-panel": "व्यवस्थापक Panel",
+    "settings": "Settings",
+    "people": "People",
+    "registration": "Registration",
+    "disable-self-registration": "Disable Self-Registration",
+    "invite": "Invite",
+    "invite-people": "Invite People",
+    "to-boards": "To बोर्ड(s)",
+    "email-addresses": "Email Addresses",
+    "smtp-host-description": "The address of the SMTP server that handles your emails.",
+    "smtp-port-description": "The port your SMTP server uses for outgoing emails.",
+    "smtp-tls-description": "Enable TLS support for SMTP server",
+    "smtp-host": "SMTP Host",
+    "smtp-port": "SMTP Port",
+    "smtp-username": "Username",
+    "smtp-password": "Password",
+    "smtp-tls": "TLS support",
+    "send-from": "From",
+    "send-smtp-test": "Send एक test email तक yourself",
+    "invitation-code": "Invitation Code",
+    "email-invite-register-subject": "__inviter__ प्रेषित you an invitation",
+    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email",
+    "email-smtp-test-text": "You have successfully प्रेषित an email",
+    "error-invitation-code-not-exist": "Invitation code doesn't exist",
+    "error-notAuthorized": "You are not authorized तक  आलोकन  यह page.",
+    "outgoing-webhooks": "Outgoing Webhooks",
+    "outgoingWebhooksPopup-title": "Outgoing Webhooks",
+    "boardCardTitlePopup-title": "Card Title Filter",
+    "new-outgoing-webhook": "New Outgoing Webhook",
+    "no-name": "(Unknown)",
+    "Node_version": "Node version",
+    "OS_Arch": "OS Arch",
+    "OS_Cpus": "OS CPU Count",
+    "OS_Freemem": "OS Free Memory",
+    "OS_Loadavg": "OS Load Average",
+    "OS_Platform": "OS Platform",
+    "OS_Release": "OS Release",
+    "OS_Totalmem": "OS Total Memory",
+    "OS_Type": "OS Type",
+    "OS_Uptime": "OS Uptime",
+    "days": "days",
+    "hours": "hours",
+    "minutes": "minutes",
+    "seconds": "seconds",
+    "show-field-on-card": "Show  यह field on कार्ड",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
+    "yes": "Yes",
+    "no": "No",
+    "accounts": "Accounts",
+    "accounts-allowEmailChange": "Allow Email Change",
+    "accounts-allowUserNameChange": "Allow Username Change",
+    "createdAt": "Created at",
+    "verified": "Verified",
+    "active": "Active",
+    "card-received": "Received",
+    "card-received-on": "Received on",
+    "card-end": "End",
+    "card-end-on": "Ends on",
+    "editCardReceivedDatePopup-title": "Change received date",
+    "editCardEndDatePopup-title": "Change end date",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "Assigned By",
+    "requested-by": "Requested By",
+    "board-delete-notice": "Deleting is permanent. You will lose संपूर्ण lists, कार्ड और actions associated साथ में  यह बोर्ड.",
+    "delete-board-confirm-popup": "All lists, कार्ड,नामपत्र , और activities हो जाएगा deleted और you won't be able तक recover the बोर्ड contents. There is no undo.",
+    "boardDeletePopup-title": "मिटाएँ बोर्ड?",
+    "delete-board": "मिटाएँ बोर्ड",
+    "default-subtasks-board": "Subtasks for __board__ बोर्ड",
+    "default": "Default",
+    "queue": "Queue",
+    "subtask-settings": "Subtasks  व्यवस्था",
+    "boardSubtaskSettingsPopup-title": "बोर्ड Subtasks  व्यवस्था",
+    "show-subtasks-field": "Cards can have subtasks",
+    "deposit-subtasks-board": "Deposit subtasks तक  यह बोर्ड:",
+    "deposit-subtasks-list": "Landing सूची for subtasks deposited here:",
+    "show-parent-in-minicard": "Show parent अंदर में minicard:",
+    "prefix-with-full-path": "Prefix साथ में full path",
+    "prefix-with-parent": "Prefix साथ में parent",
+    "subtext-with-full-path": "Subtext साथ में full path",
+    "subtext-with-parent": "Subtext साथ में parent",
+    "change-card-parent": "Change कार्ड's parent",
+    "parent-card": "Parent कार्ड",
+    "source-board": "Source बोर्ड",
+    "no-parent": "Don't show parent",
+    "activity-added-label": "संकलित label '%s' तक %s",
+    "activity-removed-label": "हटा दिया label '%s' से %s",
+    "activity-delete-attach": "deleted an संलग्नक से %s",
+    "activity-added-label-card": "संकलित label '%s'",
+    "activity-removed-label-card": "हटा दिया label '%s'",
+    "activity-delete-attach-card": "deleted an संलग्नक",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "r-rule": "Rule",
+    "r-add-trigger": "जोड़ें trigger",
+    "r-add-action": "जोड़ें action",
+    "r-board-rules": "बोर्ड rules",
+    "r-add-rule": "जोड़ें rule",
+    "r-view-rule": "आलोकन rule",
+    "r-delete-rule": "मिटाएँ rule",
+    "r-new-rule-name": "New rule title",
+    "r-no-rules": "No rules",
+    "r-when-a-card": "When a card",
+    "r-is": "is",
+    "r-is-moved": "is moved",
+    "r-added-to": "added to",
+    "r-removed-from": "हटा दिया from",
+    "r-the-board": "the बोर्ड",
+    "r-list": "list",
+    "set-filter": "Set Filter",
+    "r-moved-to": "स्थानांतरित to",
+    "r-moved-from": "स्थानांतरित from",
+    "r-archived": "Moved to Archive",
+    "r-unarchived": "Restored from Archive",
+    "r-a-card": "a कार्ड",
+    "r-when-a-label-is": "जब एक नामपत्र है",
+    "r-when-the-label-is": "जब नामपत्र है",
+    "r-list-name": "list name",
+    "r-when-a-member": "जब एक सदस्य is",
+    "r-when-the-member": "जब the सदस्य",
+    "r-name": "name",
+    "r-when-a-attach": "जब an संलग्नक",
+    "r-when-a-checklist": "जब एक चिह्नांकन-सूची is",
+    "r-when-the-checklist": "जब the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "जब एक चिह्नांकन-सूची विषय is",
+    "r-when-the-item": "जब the चिह्नांकन-सूची item",
+    "r-checked": "Checked",
+    "r-unchecked": "Unchecked",
+    "r-move-card-to": "स्थानांतरित कार्ड to",
+    "r-top-of": "Top of",
+    "r-bottom-of": "Bottom of",
+    "r-its-list": "its list",
+    "r-archive": "संग्रह में ले जाएं",
+    "r-unarchive": "Restore from Archive",
+    "r-card": "कार्ड",
+    "r-add": "जोड़ें",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "हटाएँ  संपूर्ण सदस्य से the कार्ड",
+    "r-set-color": "Set color to",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "subject",
+    "r-rule-details": "Rule details",
+    "r-d-move-to-top-gen": "स्थानांतरित कार्ड तक top of its list",
+    "r-d-move-to-top-spec": "स्थानांतरित कार्ड तक top of list",
+    "r-d-move-to-bottom-gen": "स्थानांतरित कार्ड तक bottom of its list",
+    "r-d-move-to-bottom-spec": "स्थानांतरित कार्ड तक bottom of list",
+    "r-d-send-email": "Send email",
+    "r-d-send-email-to": "to",
+    "r-d-send-email-subject": "subject",
+    "r-d-send-email-message": "message",
+    "r-d-archive": "Move card to Archive",
+    "r-d-unarchive": "Restore card from Archive",
+    "r-d-add-label": "जोड़ें label",
+    "r-d-remove-label": "हटाएँ  label",
+    "r-create-card": "Create new card",
+    "r-in-list": "in list",
+    "r-in-swimlane": "in swimlane",
+    "r-d-add-member": "जोड़ें सदस्य",
+    "r-d-remove-member": "हटाएँ  सदस्य",
+    "r-d-remove-all-member": "हटाएँ  संपूर्ण सदस्य",
+    "r-d-check-all": "Check संपूर्ण items of एक list",
+    "r-d-uncheck-all": "Uncheck संपूर्ण items of एक list",
+    "r-d-check-one": "Check item",
+    "r-d-uncheck-one": "Uncheck item",
+    "r-d-check-of-list": "of checklist",
+    "r-d-add-checklist": "जोड़ें checklist",
+    "r-d-remove-checklist": "हटाएँ  checklist",
+    "r-by": "by",
+    "r-add-checklist": "जोड़ें checklist",
+    "r-with-items": "with items",
+    "r-items-list": "item1,item2,item3",
+    "r-add-swimlane": "Add swimlane",
+    "r-swimlane-name": "swimlane name",
+    "r-board-note": "Note: leave a field empty to match every possible value.",
+    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-when-a-card-is-moved": "जब एक कार्ड is स्थानांतरित तक another list",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout",
+    "hide-logo": "Hide Logo",
+    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
+    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
+    "error-undefined": "Something went wrong",
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
+}
\ No newline at end of file
diff --git a/i18n/hu.i18n.json b/i18n/hu.i18n.json
index fc1f2e8c..75894ed9 100644
--- a/i18n/hu.i18n.json
+++ b/i18n/hu.i18n.json
@@ -1,35 +1,51 @@
 {
     "accept": "Elfogadás",
-    "act-activity-notify": "[Wekan] Tevékenység értesítés",
-    "act-addAttachment": "__attachment__ mellékletet csatolt a kártyához: __card__",
-    "act-addChecklist": "__checklist__ ellenőrzőlistát adott hozzá a kártyához: __card__",
-    "act-addChecklistItem": "__checklistItem__ elemet adott hozzá a(z) __checklist__ ellenőrzőlistához ezen a kártyán: __card__",
-    "act-addComment": "hozzászólt a(z) __card__ kártyán: __comment__",
-    "act-createBoard": "létrehozta a táblát: __board__",
-    "act-createCard": "__card__ kártyát adott hozzá a listához: __list__",
-    "act-createList": "__list__ listát adott hozzá a táblához: __board__",
-    "act-addBoardMember": "__member__ tagot hozzáadta a táblához: __board__",
-    "act-archivedBoard": "A __board__ tábla a lomtárba került.",
-    "act-archivedCard": "A __card__ kártya a lomtárba került.",
-    "act-archivedList": "A __list__ lista a lomtárba került.",
-    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
-    "act-importBoard": "importálta a táblát: __board__",
-    "act-importCard": "importálta a kártyát: __card__",
-    "act-importList": "importálta a listát: __list__",
-    "act-joinMember": "__member__ tagot hozzáadta a kártyához: __card__",
-    "act-moveCard": "áthelyezte a(z) __card__ kártyát: __oldList__ → __list__",
-    "act-removeBoardMember": "eltávolította __member__ tagot a tábláról: __board__",
-    "act-restoredCard": "visszaállította a(z) __card__ kártyát ide: __board__",
-    "act-unjoinMember": "eltávolította __member__ tagot a kártyáról: __card__",
-    "act-withBoardTitle": "[Wekan] __board__",
+    "act-activity-notify": "Tevékenység értesítés",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__board__",
     "act-withCardTitle": "[__board__] __card__",
     "actions": "Műveletek",
     "activities": "Tevékenységek",
     "activity": "Tevékenység",
     "activity-added": "%s hozzáadva ehhez: %s",
-    "activity-archived": "%s lomtárba helyezve",
+    "activity-archived": "%s moved to Archive",
     "activity-attached": "%s mellékletet csatolt a kártyához: %s",
     "activity-created": "%s létrehozva",
+    "activity-customfield-created": "létrehozta a(z) %s egyéni mezőt",
     "activity-excluded": "%s kizárva innen: %s",
     "activity-imported": "%s importálva ebbe: %s, innen: %s",
     "activity-imported-board": "%s importálva innen: %s",
@@ -39,13 +55,25 @@
     "activity-removed": "%s eltávolítva innen: %s",
     "activity-sent": "%s elküldve ide: %s",
     "activity-unjoined": "%s kilépett a csoportból",
+    "activity-subtask-added": "Alfeladat hozzáadva ehhez: %s",
+    "activity-checked-item": "checked %s in checklist %s of %s",
+    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
     "activity-checklist-added": "ellenőrzőlista hozzáadva ehhez: %s",
+    "activity-checklist-removed": "removed a checklist from %s",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
     "activity-checklist-item-added": "ellenőrzőlista elem hozzáadva ehhez: „%s”, ebben: %s",
+    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
     "add": "Hozzáadás",
+    "activity-checked-item-card": "checked %s in checklist %s",
+    "activity-unchecked-item-card": "unchecked %s in checklist %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
     "add-attachment": "Melléklet hozzáadása",
     "add-board": "Tábla hozzáadása",
     "add-card": "Kártya hozzáadása",
     "add-swimlane": "Add Swimlane",
+    "add-subtask": "Alfeladat hozzáadása",
     "add-checklist": "Ellenőrzőlista hozzáadása",
     "add-checklist-item": "Elem hozzáadása az ellenőrzőlistához",
     "add-cover": "Borító hozzáadása",
@@ -63,20 +91,22 @@
     "and-n-other-card": "És __count__ egyéb kártya",
     "and-n-other-card_plural": "És __count__ egyéb kártya",
     "apply": "Alkalmaz",
-    "app-is-offline": "A Wekan betöltés alatt van, kérem várjon. Az oldal újratöltése adatvesztést okoz. Ha a Wekan nem töltődik be, akkor ellenőrizze, hogy a Wekan kiszolgáló nem állt-e le.",
-    "archive": "Lomtárba",
-    "archive-all": "Összes lomtárba helyezése",
-    "archive-board": "Tábla lomtárba helyezése",
-    "archive-card": "Kártya lomtárba helyezése",
-    "archive-list": "Lista lomtárba helyezése",
-    "archive-swimlane": "Move Swimlane to Recycle Bin",
-    "archive-selection": "Kijelölés lomtárba helyezése",
-    "archiveBoardPopup-title": "Lomtárba helyezi a táblát?",
-    "archived-items": "Lomtár",
-    "archived-boards": "Lomtárban lévő táblák",
+    "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
+    "archive": "Mozgatás az archívumba",
+    "archive-all": "Move All to Archive",
+    "archive-board": "Move Board to Archive",
+    "archive-card": "Move Card to Archive",
+    "archive-list": "Move List to Archive",
+    "archive-swimlane": "Move Swimlane to Archive",
+    "archive-selection": "Move selection to Archive",
+    "archiveBoardPopup-title": "Move Board to Archive?",
+    "archived-items": "Archiválás",
+    "archived-boards": "Boards in Archive",
     "restore-board": "Tábla visszaállítása",
-    "no-archived-boards": "Nincs tábla a lomtárban.",
-    "archives": "Lomtár",
+    "no-archived-boards": "No Boards in Archive.",
+    "archives": "Archiválás",
+    "template": "Template",
+    "templates": "Templates",
     "assign-member": "Tag hozzárendelése",
     "attached": "csatolva",
     "attachment": "Melléklet",
@@ -95,22 +125,25 @@
     "boardChangeTitlePopup-title": "Tábla átnevezése",
     "boardChangeVisibilityPopup-title": "Láthatóság megváltoztatása",
     "boardChangeWatchPopup-title": "Megfigyelés megváltoztatása",
-    "boardMenuPopup-title": "Tábla menü",
+    "boardMenuPopup-title": "Tábla beállítások",
     "boards": "Táblák",
-    "board-view": "Board View",
+    "board-view": "Tábla nézet",
+    "board-view-cal": "Naptár",
     "board-view-swimlanes": "Swimlanes",
     "board-view-lists": "Listák",
     "bucket-example": "Mint például „Bakancslista”",
     "cancel": "Mégse",
-    "card-archived": "Ez a kártya a lomtárba került.",
+    "card-archived": "This card is moved to Archive.",
+    "board-archived": "This board is moved to Archive.",
     "card-comments-title": "Ez a kártya %s hozzászólást tartalmaz.",
     "card-delete-notice": "A törlés végleges. Az összes műveletet elveszíti, amely ehhez a kártyához tartozik.",
     "card-delete-pop": "Az összes művelet el lesz távolítva a tevékenységlistából, és nem lesz képes többé újra megnyitni a kártyát. Nincs visszaállítási lehetőség.",
-    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
     "card-due": "Esedékes",
     "card-due-on": "Esedékes ekkor",
     "card-spent": "Eltöltött idő",
     "card-edit-attachments": "Mellékletek szerkesztése",
+    "card-edit-custom-fields": "Egyéni mezők szerkesztése",
     "card-edit-labels": "Címkék szerkesztése",
     "card-edit-members": "Tagok szerkesztése",
     "card-labels-title": "A kártya címkéinek megváltoztatása.",
@@ -118,13 +151,20 @@
     "card-start": "Kezdés",
     "card-start-on": "Kezdés ekkor",
     "cardAttachmentsPopup-title": "Innen csatolva",
+    "cardCustomField-datePopup-title": "Dátum megváltoztatása",
+    "cardCustomFieldsPopup-title": "Egyéni mezők szerkesztése",
     "cardDeletePopup-title": "Törli a kártyát?",
     "cardDetailsActionsPopup-title": "Kártyaműveletek",
     "cardLabelsPopup-title": "Címkék",
     "cardMembersPopup-title": "Tagok",
     "cardMorePopup-title": "Több",
+    "cardTemplatePopup-title": "Create template",
     "cards": "Kártyák",
     "cards-count": "Kártyák",
+    "casSignIn": "Sign In with CAS",
+    "cardType-card": "Card",
+    "cardType-linkedCard": "Linked Card",
+    "cardType-linkedBoard": "Linked Board",
     "change": "Változtatás",
     "change-avatar": "Avatár megváltoztatása",
     "change-password": "Jelszó megváltoztatása",
@@ -135,43 +175,79 @@
     "changePasswordPopup-title": "Jelszó megváltoztatása",
     "changePermissionsPopup-title": "Jogosultságok megváltoztatása",
     "changeSettingsPopup-title": "Beállítások megváltoztatása",
+    "subtasks": "Alfeladat",
     "checklists": "Ellenőrzőlisták",
     "click-to-star": "Kattintson a tábla csillagozásához.",
     "click-to-unstar": "Kattintson a tábla csillagának eltávolításához.",
     "clipboard": "Vágólap vagy fogd és vidd",
     "close": "Bezárás",
     "close-board": "Tábla bezárása",
-    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
     "color-black": "fekete",
     "color-blue": "kék",
+    "color-crimson": "crimson",
+    "color-darkgreen": "darkgreen",
+    "color-gold": "gold",
+    "color-gray": "gray",
     "color-green": "zöld",
+    "color-indigo": "indigo",
     "color-lime": "citrus",
+    "color-magenta": "magenta",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "navy",
     "color-orange": "narancssárga",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
     "color-pink": "rózsaszín",
+    "color-plum": "plum",
     "color-purple": "lila",
     "color-red": "piros",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "silver",
     "color-sky": "égszínkék",
+    "color-slateblue": "slateblue",
+    "color-white": "white",
     "color-yellow": "sárga",
+    "unset-color": "Unset",
     "comment": "Megjegyzés",
     "comment-placeholder": "Megjegyzés írása",
     "comment-only": "Csak megjegyzés",
     "comment-only-desc": "Csak megjegyzést írhat a kártyákhoz.",
+    "no-comments": "No comments",
+    "no-comments-desc": "Can not see comments and activities.",
     "computer": "Számítógép",
-    "confirm-checklist-delete-dialog": "Biztosan törölni szeretné az ellenőrzőlistát?",
+    "confirm-subtask-delete-dialog": "Biztosan törölni szeretnél az alfeladatot?",
+    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
     "copy-card-link-to-clipboard": "Kártya hivatkozásának másolása a vágólapra",
+    "linkCardPopup-title": "Link Card",
+    "searchElementPopup-title": "Keresés",
     "copyCardPopup-title": "Kártya másolása",
-    "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
-    "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
-    "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"First card title\", \"description\":\"First card description\"}, {\"title\":\"Second card title\",\"description\":\"Second card description\"},{\"title\":\"Last card title\",\"description\":\"Last card description\"} ]",
+    "copyChecklistToManyCardsPopup-title": "Ellenőrzőlista sablon másolása több kártyára",
+    "copyChecklistToManyCardsPopup-instructions": "A célkártyák címe és a leírások ebben a JSON formátumban",
+    "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"Első kártya címe\", \"description\":\"Első kártya leírása\"}, {\"title\":\"Második kártya címe\",\"description\":\"Második kártya leírása\"},{\"title\":\"Utolsó kártya címe\",\"description\":\"Utolsó kártya leírása\"} ]",
     "create": "Létrehozás",
     "createBoardPopup-title": "Tábla létrehozása",
     "chooseBoardSourcePopup-title": "Tábla importálása",
     "createLabelPopup-title": "Címke létrehozása",
+    "createCustomField": "Mező létrehozása",
+    "createCustomFieldPopup-title": "Mező létrehozása",
     "current": "jelenlegi",
+    "custom-field-delete-pop": "Nincs visszavonás. Ez el fogja távolítani az egyéni mezőt az összes kártyáról, és megsemmisíti az előzményeit.",
+    "custom-field-checkbox": "Jelölőnégyzet",
+    "custom-field-date": "Dátum",
+    "custom-field-dropdown": "Legördülő lista",
+    "custom-field-dropdown-none": "(nincs)",
+    "custom-field-dropdown-options": "Lista lehetőségei",
+    "custom-field-dropdown-options-placeholder": "Nyomja meg az Enter billentyűt több lehetőség hozzáadásához",
+    "custom-field-dropdown-unknown": "(ismeretlen)",
+    "custom-field-number": "Szám",
+    "custom-field-text": "Szöveg",
+    "custom-fields": "Egyéni mezők",
     "date": "Dátum",
     "decline": "Elutasítás",
     "default-avatar": "Alapértelmezett avatár",
     "delete": "Törlés",
+    "deleteCustomFieldPopup-title": "Törli az egyéni mezőt?",
     "deleteLabelPopup-title": "Törli a címkét?",
     "description": "Leírás",
     "disambiguateMultiLabelPopup-title": "Címkeművelet egyértelműsítése",
@@ -186,6 +262,7 @@
     "soft-wip-limit": "Gyenge WIP korlát",
     "editCardStartDatePopup-title": "Kezdődátum megváltoztatása",
     "editCardDueDatePopup-title": "Esedékesség dátumának megváltoztatása",
+    "editCustomFieldPopup-title": "Mező szerkesztése",
     "editCardSpentTimePopup-title": "Eltöltött idő megváltoztatása",
     "editLabelPopup-title": "Címke megváltoztatása",
     "editNotificationPopup-title": "Értesítés szerkesztése",
@@ -222,30 +299,36 @@
     "filter-clear": "Szűrő törlése",
     "filter-no-label": "Nincs címke",
     "filter-no-member": "Nincs tag",
+    "filter-no-custom-fields": "Nincsenek egyéni mezők",
     "filter-on": "Szűrő bekapcsolva",
     "filter-on-desc": "A kártyaszűrés be van kapcsolva ezen a táblán. Kattintson ide a szűrő szerkesztéséhez.",
     "filter-to-selection": "Szűrés a kijelöléshez",
+    "advanced-filter-label": "Speciális szűrő",
+    "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) to be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
     "fullname": "Teljes név",
     "header-logo-title": "Vissza a táblák oldalára.",
     "hide-system-messages": "Rendszerüzenetek elrejtése",
     "headerBarCreateBoardPopup-title": "Tábla létrehozása",
     "home": "Kezdőlap",
     "import": "Importálás",
+    "link": "Link",
     "import-board": "tábla importálása",
     "import-board-c": "Tábla importálása",
     "import-board-title-trello": "Tábla importálása a Trello oldalról",
-    "import-board-title-wekan": "Tábla importálása a Wekan oldalról",
+    "import-board-title-wekan": "Import board from previous export",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
     "import-sandstorm-warning": "Az importált tábla törölni fogja a táblán lévő összes meglévő adatot, és kicseréli az importált táblával.",
     "from-trello": "A Trello oldalról",
-    "from-wekan": "A Wekan oldalról",
+    "from-wekan": "From previous export",
     "import-board-instruction-trello": "A Trello tábláján menjen a „Menü”, majd a „Több”, „Nyomtatás és exportálás”, „JSON exportálása” menüpontokra, és másolja ki az eredményül kapott szöveget.",
-    "import-board-instruction-wekan": "A Wekan tábláján menjen a „Menü”, majd a „Tábla exportálás” menüpontra, és másolja ki a letöltött fájlban lévő szöveget.",
+    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
     "import-json-placeholder": "Illessze be ide az érvényes JSON adatokat",
     "import-map-members": "Tagok leképezése",
-    "import-members-map": "Az importált táblának van néhány tagja. Képezze le a tagokat, akiket importálni szeretne a Wekan felhasználókba.",
+    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
     "import-show-user-mapping": "Tagok leképezésének vizsgálata",
-    "import-user-select": "Válassza ki a Wekan felhasználót, akit ezen tagként használni szeretne",
-    "importMapMembersAddPopup-title": "Wekan tag kiválasztása",
+    "import-user-select": "Pick your existing user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select member",
     "info": "Verzió",
     "initials": "Kezdőbetűk",
     "invalid-date": "Érvénytelen dátum",
@@ -264,17 +347,19 @@
     "leave-board-pop": "Biztosan el szeretné hagyni ezt a táblát: __boardTitle__? El lesz távolítva a táblán lévő összes kártyáról.",
     "leaveBoardPopup-title": "Elhagyja a táblát?",
     "link-card": "Összekapcsolás ezzel a kártyával",
-    "list-archive-cards": "Az összes kártya lomtárba helyezése ezen a listán.",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
+    "list-archive-cards": "Move all cards in this list to Archive",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "A listán lévő összes kártya áthelyezése",
     "list-select-cards": "A listán lévő összes kártya kiválasztása",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "Műveletek felsorolása",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Trello kártya importálása",
     "listMorePopup-title": "Több",
     "link-list": "Összekapcsolás ezzel a listával",
     "list-delete-pop": "Az összes művelet el lesz távolítva a tevékenységlistából, és nem lesz lehetősége visszaállítani a listát. Nincs visszavonás.",
-    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
     "lists": "Listák",
     "swimlanes": "Swimlanes",
     "log-out": "Kijelentkezés",
@@ -294,9 +379,9 @@
     "muted-info": "Soha sem lesz értesítve a táblán lévő semmilyen változásról.",
     "my-boards": "Saját tábláim",
     "name": "Név",
-    "no-archived-cards": "Nincs kártya a lomtárban.",
-    "no-archived-lists": "Nincs lista a lomtárban.",
-    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
+    "no-archived-cards": "No cards in Archive.",
+    "no-archived-lists": "No lists in Archive.",
+    "no-archived-swimlanes": "No swimlanes in Archive.",
     "no-results": "Nincs találat",
     "normal": "Normál",
     "normal-desc": "Megtekintheti és szerkesztheti a kártyákat. Nem változtathatja meg a beállításokat.",
@@ -332,6 +417,7 @@
     "restore": "Visszaállítás",
     "save": "Mentés",
     "search": "Keresés",
+    "rules": "Rules",
     "search-cards": "Keresés a táblán lévő kártyák címében illetve leírásában",
     "search-example": "keresőkifejezés",
     "select-color": "Szín kiválasztása",
@@ -366,6 +452,7 @@
     "title": "Cím",
     "tracking": "Követés",
     "tracking-info": "Értesítve lesz az összes olyan kártya változásáról, amelyen létrehozóként vagy tagként vesz részt.",
+    "type": "Típus",
     "unassign-member": "Tag hozzárendelésének megszüntetése",
     "unsaved-description": "Van egy mentetlen leírása.",
     "unwatch": "Megfigyelés megszüntetése",
@@ -374,14 +461,17 @@
     "uploaded-avatar": "Egy avatár feltöltve",
     "username": "Felhasználónév",
     "view-it": "Megtekintés",
-    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
+    "warn-list-archived": "warning: this card is in an list at Archive",
     "watch": "Megfigyelés",
     "watching": "Megfigyelés",
     "watching-info": "Értesítve lesz a táblán lévő összes változásról",
     "welcome-board": "Üdvözlő tábla",
-    "welcome-swimlane": "Milestone 1",
+    "welcome-swimlane": "1. mérföldkő",
     "welcome-list1": "Alapok",
     "welcome-list2": "Speciális",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
     "what-to-do": "Mit szeretne tenni?",
     "wipLimitErrorPopup-title": "Érvénytelen WIP korlát",
     "wipLimitErrorPopup-dialog-pt1": "A listán lévő feladatok száma magasabb a meghatározott WIP korlátnál.",
@@ -407,16 +497,16 @@
     "send-smtp-test": "Teszt e-mail küldése magamnak",
     "invitation-code": "Meghívási kód",
     "email-invite-register-subject": "__inviter__ egy meghívás küldött Önnek",
-    "email-invite-register-text": "Kedves __user__!\n\n__inviter__ meghívta Önt közreműködésre a Wekan oldalra.\n\nKövesse a lenti hivatkozást:\n__url__\n\nÉs a meghívási kódja: __icode__\n\nKöszönjük.",
-    "email-smtp-test-subject": "SMTP teszt e-mail a Wekantól",
+    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email",
     "email-smtp-test-text": "Sikeresen elküldött egy e-mailt",
     "error-invitation-code-not-exist": "A meghívási kód nem létezik",
     "error-notAuthorized": "Nincs jogosultsága az oldal megtekintéséhez.",
     "outgoing-webhooks": "Kimenő webhurkok",
     "outgoingWebhooksPopup-title": "Kimenő webhurkok",
+    "boardCardTitlePopup-title": "Card Title Filter",
     "new-outgoing-webhook": "Új kimenő webhurok",
     "no-name": "(Ismeretlen)",
-    "Wekan_version": "Wekan verzió",
     "Node_version": "Node verzió",
     "OS_Arch": "Operációs rendszer architektúrája",
     "OS_Cpus": "Operációs rendszer CPU száma",
@@ -427,20 +517,177 @@
     "OS_Totalmem": "Operációs rendszer összes memóriája",
     "OS_Type": "Operációs rendszer típusa",
     "OS_Uptime": "Operációs rendszer üzemideje",
+    "days": "days",
     "hours": "óra",
     "minutes": "perc",
     "seconds": "másodperc",
+    "show-field-on-card": "A mező megjelenítése a kártyán",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
     "yes": "Igen",
     "no": "Nem",
     "accounts": "Fiókok",
     "accounts-allowEmailChange": "E-mail megváltoztatásának engedélyezése",
+    "accounts-allowUserNameChange": "Felhasználónév megváltoztatásának engedélyezése",
     "createdAt": "Létrehozva",
     "verified": "Ellenőrizve",
     "active": "Aktív",
-    "card-received": "Received",
-    "card-received-on": "Received on",
-    "card-end": "End",
-    "card-end-on": "Ends on",
-    "editCardReceivedDatePopup-title": "Change received date",
-    "editCardEndDatePopup-title": "Change end date"
-}
+    "card-received": "Érkezett",
+    "card-received-on": "Ekkor érkezett",
+    "card-end": "Befejezés",
+    "card-end-on": "Befejeződik ekkor",
+    "editCardReceivedDatePopup-title": "Érkezési dátum megváltoztatása",
+    "editCardEndDatePopup-title": "Befejezési dátum megváltoztatása",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "Assigned By",
+    "requested-by": "Requested By",
+    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
+    "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
+    "boardDeletePopup-title": "Delete Board?",
+    "delete-board": "Delete Board",
+    "default-subtasks-board": "Subtasks for __board__ board",
+    "default": "Default",
+    "queue": "Queue",
+    "subtask-settings": "Alfeladat beállítások",
+    "boardSubtaskSettingsPopup-title": "Tábla alfeladat beállítások",
+    "show-subtasks-field": "Cards can have subtasks",
+    "deposit-subtasks-board": "Deposit subtasks to this board:",
+    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
+    "show-parent-in-minicard": "Show parent in minicard:",
+    "prefix-with-full-path": "Prefix with full path",
+    "prefix-with-parent": "Prefix with parent",
+    "subtext-with-full-path": "Subtext with full path",
+    "subtext-with-parent": "Subtext with parent",
+    "change-card-parent": "Change card's parent",
+    "parent-card": "Parent card",
+    "source-board": "Source board",
+    "no-parent": "Don't show parent",
+    "activity-added-label": "added label '%s' to %s",
+    "activity-removed-label": "removed label '%s' from %s",
+    "activity-delete-attach": "deleted an attachment from %s",
+    "activity-added-label-card": "added label '%s'",
+    "activity-removed-label-card": "removed label '%s'",
+    "activity-delete-attach-card": "deleted an attachment",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "r-rule": "Rule",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "Add action",
+    "r-board-rules": "Board rules",
+    "r-add-rule": "Add rule",
+    "r-view-rule": "View rule",
+    "r-delete-rule": "Delete rule",
+    "r-new-rule-name": "New rule title",
+    "r-no-rules": "No rules",
+    "r-when-a-card": "When a card",
+    "r-is": "is",
+    "r-is-moved": "is moved",
+    "r-added-to": "added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "the board",
+    "r-list": "list",
+    "set-filter": "Set Filter",
+    "r-moved-to": "Moved to",
+    "r-moved-from": "Moved from",
+    "r-archived": "Archívumba helyezve",
+    "r-unarchived": "Helyreállítva az archívumból",
+    "r-a-card": "a card",
+    "r-when-a-label-is": "When a label is",
+    "r-when-the-label-is": "When the label is",
+    "r-list-name": "list name",
+    "r-when-a-member": "When a member is",
+    "r-when-the-member": "When the member",
+    "r-name": "name",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "r-when-the-item": "When the checklist item",
+    "r-checked": "Checked",
+    "r-unchecked": "Unchecked",
+    "r-move-card-to": "Move card to",
+    "r-top-of": "Top of",
+    "r-bottom-of": "Bottom of",
+    "r-its-list": "its list",
+    "r-archive": "Mozgatás az archívumba",
+    "r-unarchive": "Helyreállítás az archívumból",
+    "r-card": "card",
+    "r-add": "Hozzáadás",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-set-color": "Set color to",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "ellenőrzőlistából",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "subject",
+    "r-rule-details": "Rule details",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Move card to top of list",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Move card to bottom of list",
+    "r-d-send-email": "Send email",
+    "r-d-send-email-to": "to",
+    "r-d-send-email-subject": "subject",
+    "r-d-send-email-message": "message",
+    "r-d-archive": "Move card to Archive",
+    "r-d-unarchive": "Restore card from Archive",
+    "r-d-add-label": "Add label",
+    "r-d-remove-label": "Remove label",
+    "r-create-card": "Create new card",
+    "r-in-list": "in list",
+    "r-in-swimlane": "in swimlane",
+    "r-d-add-member": "Add member",
+    "r-d-remove-member": "Remove member",
+    "r-d-remove-all-member": "Remove all member",
+    "r-d-check-all": "Check all items of a list",
+    "r-d-uncheck-all": "Uncheck all items of a list",
+    "r-d-check-one": "Elem ellenőrzése",
+    "r-d-uncheck-one": "Uncheck item",
+    "r-d-check-of-list": "ellenőrzőlistából",
+    "r-d-add-checklist": "Ellenőrzőlista hozzáadása",
+    "r-d-remove-checklist": "Ellenőrzőlista eltávolítása",
+    "r-by": "által",
+    "r-add-checklist": "Ellenőrzőlista hozzáadása",
+    "r-with-items": "elemekkel",
+    "r-items-list": "item1,item2,item3",
+    "r-add-swimlane": "Add swimlane",
+    "r-swimlane-name": "swimlane name",
+    "r-board-note": "Note: leave a field empty to match every possible value.",
+    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-when-a-card-is-moved": "Amikor egy kártya másik listába kerül",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Hitelesítési mód",
+    "authentication-type": "Hitelesítés típusa",
+    "custom-product-name": "Saját terméknév",
+    "layout": "Elrendezés",
+    "hide-logo": "Logo elrejtése",
+    "add-custom-html-after-body-start": "Egyedi HTML hozzáadása <body> után",
+    "add-custom-html-before-body-end": "1",
+    "error-undefined": "Valami hiba történt",
+    "error-ldap-login": "Hiba történt bejelentkezés közben",
+    "display-authentication-method": "Hitelelesítési mód mutatása",
+    "default-authentication-method": "Alapértelmezett hitelesítési mód",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
+}
\ No newline at end of file
diff --git a/i18n/hy.i18n.json b/i18n/hy.i18n.json
index 42725bbf..ad8122eb 100644
--- a/i18n/hy.i18n.json
+++ b/i18n/hy.i18n.json
@@ -1,35 +1,51 @@
 {
     "accept": "Ընդունել",
-    "act-activity-notify": "[Wekan] Activity Notification",
-    "act-addAttachment": "attached __attachment__ to __card__",
-    "act-addChecklist": "added checklist __checklist__ to __card__",
-    "act-addChecklistItem": "ավելացրել է __checklistItem__ __checklist__ on __card__-ին",
-    "act-addComment": "մեկնաբանել է __card__: __comment__",
-    "act-createBoard": "created __board__",
-    "act-createCard": "added __card__ to __list__",
-    "act-createList": "added __list__ to __board__",
-    "act-addBoardMember": "added __member__ to __board__",
-    "act-archivedBoard": "__board__ moved to Recycle Bin",
-    "act-archivedCard": "__card__ moved to Recycle Bin",
-    "act-archivedList": "__list__ moved to Recycle Bin",
-    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
-    "act-importBoard": "imported __board__",
-    "act-importCard": "imported __card__",
-    "act-importList": "imported __list__",
-    "act-joinMember": "added __member__ to __card__",
-    "act-moveCard": "moved __card__ from __oldList__ to __list__",
-    "act-removeBoardMember": "removed __member__ from __board__",
-    "act-restoredCard": "restored __card__ to __board__",
-    "act-unjoinMember": "removed __member__ from __card__",
-    "act-withBoardTitle": "[Wekan] __board__",
+    "act-activity-notify": "Activity Notification",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__board__",
     "act-withCardTitle": "[__board__] __card__",
     "actions": "Actions",
     "activities": "Activities",
     "activity": "Activity",
     "activity-added": "added %s to %s",
-    "activity-archived": "%s moved to Recycle Bin",
+    "activity-archived": "%s moved to Archive",
     "activity-attached": "attached %s to %s",
     "activity-created": "created %s",
+    "activity-customfield-created": "created custom field %s",
     "activity-excluded": "excluded %s from %s",
     "activity-imported": "imported %s into %s from %s",
     "activity-imported-board": "imported %s from %s",
@@ -39,13 +55,25 @@
     "activity-removed": "removed %s from %s",
     "activity-sent": "sent %s to %s",
     "activity-unjoined": "unjoined %s",
+    "activity-subtask-added": "added subtask to %s",
+    "activity-checked-item": "checked %s in checklist %s of %s",
+    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
     "activity-checklist-added": "added checklist to %s",
+    "activity-checklist-removed": "removed a checklist from %s",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
     "activity-checklist-item-added": "added checklist item to '%s' in %s",
+    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
     "add": "Add",
+    "activity-checked-item-card": "checked %s in checklist %s",
+    "activity-unchecked-item-card": "unchecked %s in checklist %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
     "add-attachment": "Add Attachment",
     "add-board": "Add Board",
     "add-card": "Add Card",
     "add-swimlane": "Add Swimlane",
+    "add-subtask": "Add Subtask",
     "add-checklist": "Add Checklist",
     "add-checklist-item": "Add an item to checklist",
     "add-cover": "Add Cover",
@@ -63,20 +91,22 @@
     "and-n-other-card": "And __count__ other card",
     "and-n-other-card_plural": "And __count__ other cards",
     "apply": "Apply",
-    "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Move to Recycle Bin",
-    "archive-all": "Move All to Recycle Bin",
-    "archive-board": "Move Board to Recycle Bin",
-    "archive-card": "Move Card to Recycle Bin",
-    "archive-list": "Move List to Recycle Bin",
-    "archive-swimlane": "Move Swimlane to Recycle Bin",
-    "archive-selection": "Move selection to Recycle Bin",
-    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
-    "archived-items": "Recycle Bin",
-    "archived-boards": "Boards in Recycle Bin",
+    "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
+    "archive": "Move to Archive",
+    "archive-all": "Move All to Archive",
+    "archive-board": "Move Board to Archive",
+    "archive-card": "Move Card to Archive",
+    "archive-list": "Move List to Archive",
+    "archive-swimlane": "Move Swimlane to Archive",
+    "archive-selection": "Move selection to Archive",
+    "archiveBoardPopup-title": "Move Board to Archive?",
+    "archived-items": "Archive",
+    "archived-boards": "Boards in Archive",
     "restore-board": "Restore Board",
-    "no-archived-boards": "No Boards in Recycle Bin.",
-    "archives": "Recycle Bin",
+    "no-archived-boards": "No Boards in Archive.",
+    "archives": "Archive",
+    "template": "Template",
+    "templates": "Templates",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Attachment",
@@ -95,22 +125,25 @@
     "boardChangeTitlePopup-title": "Rename Board",
     "boardChangeVisibilityPopup-title": "Change Visibility",
     "boardChangeWatchPopup-title": "Change Watch",
-    "boardMenuPopup-title": "Board Menu",
+    "boardMenuPopup-title": "Board Settings",
     "boards": "Boards",
     "board-view": "Board View",
+    "board-view-cal": "Calendar",
     "board-view-swimlanes": "Swimlanes",
     "board-view-lists": "Lists",
     "bucket-example": "Like “Bucket List” for example",
     "cancel": "Cancel",
-    "card-archived": "This card is moved to Recycle Bin.",
+    "card-archived": "This card is moved to Archive.",
+    "board-archived": "This board is moved to Archive.",
     "card-comments-title": "This card has %s comment.",
     "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
     "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
     "card-due": "Due",
     "card-due-on": "Due on",
     "card-spent": "Spent Time",
     "card-edit-attachments": "Edit attachments",
+    "card-edit-custom-fields": "Edit custom fields",
     "card-edit-labels": "Edit labels",
     "card-edit-members": "Edit members",
     "card-labels-title": "Change the labels for the card.",
@@ -118,13 +151,20 @@
     "card-start": "Start",
     "card-start-on": "Starts on",
     "cardAttachmentsPopup-title": "Attach From",
+    "cardCustomField-datePopup-title": "Change date",
+    "cardCustomFieldsPopup-title": "Edit custom fields",
     "cardDeletePopup-title": "Delete Card?",
     "cardDetailsActionsPopup-title": "Card Actions",
     "cardLabelsPopup-title": "Labels",
     "cardMembersPopup-title": "Members",
     "cardMorePopup-title": "More",
+    "cardTemplatePopup-title": "Create template",
     "cards": "Cards",
     "cards-count": "Cards",
+    "casSignIn": "Sign In with CAS",
+    "cardType-card": "Card",
+    "cardType-linkedCard": "Linked Card",
+    "cardType-linkedBoard": "Linked Board",
     "change": "Change",
     "change-avatar": "Change Avatar",
     "change-password": "Change Password",
@@ -135,30 +175,52 @@
     "changePasswordPopup-title": "Change Password",
     "changePermissionsPopup-title": "Change Permissions",
     "changeSettingsPopup-title": "Change Settings",
+    "subtasks": "Subtasks",
     "checklists": "Checklists",
     "click-to-star": "Click to star this board.",
     "click-to-unstar": "Click to unstar this board.",
     "clipboard": "Clipboard or drag & drop",
     "close": "Close",
     "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
     "color-black": "black",
     "color-blue": "blue",
+    "color-crimson": "crimson",
+    "color-darkgreen": "darkgreen",
+    "color-gold": "gold",
+    "color-gray": "gray",
     "color-green": "green",
+    "color-indigo": "indigo",
     "color-lime": "lime",
+    "color-magenta": "magenta",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "navy",
     "color-orange": "orange",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
     "color-pink": "pink",
+    "color-plum": "plum",
     "color-purple": "purple",
     "color-red": "red",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "silver",
     "color-sky": "sky",
+    "color-slateblue": "slateblue",
+    "color-white": "white",
     "color-yellow": "yellow",
+    "unset-color": "Unset",
     "comment": "Comment",
     "comment-placeholder": "Write Comment",
     "comment-only": "Comment only",
     "comment-only-desc": "Can comment on cards only.",
+    "no-comments": "No comments",
+    "no-comments-desc": "Can not see comments and activities.",
     "computer": "Computer",
-    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist",
+    "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?",
+    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
     "copy-card-link-to-clipboard": "Copy card link to clipboard",
+    "linkCardPopup-title": "Link Card",
+    "searchElementPopup-title": "Search",
     "copyCardPopup-title": "Copy Card",
     "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
     "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
@@ -167,11 +229,25 @@
     "createBoardPopup-title": "Create Board",
     "chooseBoardSourcePopup-title": "Import board",
     "createLabelPopup-title": "Create Label",
+    "createCustomField": "Create Field",
+    "createCustomFieldPopup-title": "Create Field",
     "current": "current",
+    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
+    "custom-field-checkbox": "Checkbox",
+    "custom-field-date": "Date",
+    "custom-field-dropdown": "Dropdown List",
+    "custom-field-dropdown-none": "(none)",
+    "custom-field-dropdown-options": "List Options",
+    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
+    "custom-field-dropdown-unknown": "(unknown)",
+    "custom-field-number": "Number",
+    "custom-field-text": "Text",
+    "custom-fields": "Custom Fields",
     "date": "Date",
     "decline": "Decline",
     "default-avatar": "Default avatar",
     "delete": "Delete",
+    "deleteCustomFieldPopup-title": "Delete Custom Field?",
     "deleteLabelPopup-title": "Delete Label?",
     "description": "Description",
     "disambiguateMultiLabelPopup-title": "Disambiguate Label Action",
@@ -186,6 +262,7 @@
     "soft-wip-limit": "Soft WIP Limit",
     "editCardStartDatePopup-title": "Change start date",
     "editCardDueDatePopup-title": "Change due date",
+    "editCustomFieldPopup-title": "Edit Field",
     "editCardSpentTimePopup-title": "Change spent time",
     "editLabelPopup-title": "Change Label",
     "editNotificationPopup-title": "Edit Notification",
@@ -222,30 +299,36 @@
     "filter-clear": "Clear filter",
     "filter-no-label": "No label",
     "filter-no-member": "No member",
+    "filter-no-custom-fields": "No Custom Fields",
     "filter-on": "Filter is on",
     "filter-on-desc": "You are filtering cards on this board. Click here to edit filter.",
     "filter-to-selection": "Filter to selection",
+    "advanced-filter-label": "Advanced Filter",
+    "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) to be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
     "fullname": "Full Name",
     "header-logo-title": "Go back to your boards page.",
     "hide-system-messages": "Hide system messages",
     "headerBarCreateBoardPopup-title": "Create Board",
     "home": "Home",
     "import": "Import",
+    "link": "Link",
     "import-board": "import board",
     "import-board-c": "Import board",
     "import-board-title-trello": "Import board from Trello",
-    "import-board-title-wekan": "Import board from Wekan",
+    "import-board-title-wekan": "Import board from previous export",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
     "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
     "from-trello": "From Trello",
-    "from-wekan": "From Wekan",
+    "from-wekan": "From previous export",
     "import-board-instruction-trello": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text.",
-    "import-board-instruction-wekan": "In your Wekan board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
     "import-json-placeholder": "Paste your valid JSON data here",
     "import-map-members": "Map members",
-    "import-members-map": "Your imported board has some members. Please map the members you want to import to Wekan users",
+    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
     "import-show-user-mapping": "Review members mapping",
-    "import-user-select": "Pick the Wekan user you want to use as this member",
-    "importMapMembersAddPopup-title": "Select Wekan member",
+    "import-user-select": "Pick your existing user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select member",
     "info": "Version",
     "initials": "Initials",
     "invalid-date": "Invalid date",
@@ -264,17 +347,19 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "Link to this card",
-    "list-archive-cards": "Move all cards in this list to Recycle Bin",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
+    "list-archive-cards": "Move all cards in this list to Archive",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "List Actions",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Import a Trello card",
     "listMorePopup-title": "More",
     "link-list": "Link to this list",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
     "lists": "Lists",
     "swimlanes": "Swimlanes",
     "log-out": "Log Out",
@@ -294,9 +379,9 @@
     "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "My Boards",
     "name": "Name",
-    "no-archived-cards": "No cards in Recycle Bin.",
-    "no-archived-lists": "No lists in Recycle Bin.",
-    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
+    "no-archived-cards": "No cards in Archive.",
+    "no-archived-lists": "No lists in Archive.",
+    "no-archived-swimlanes": "No swimlanes in Archive.",
     "no-results": "No results",
     "normal": "Normal",
     "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -332,6 +417,7 @@
     "restore": "Restore",
     "save": "Save",
     "search": "Search",
+    "rules": "Rules",
     "search-cards": "Search from card titles and descriptions on this board",
     "search-example": "Text to search for?",
     "select-color": "Select Color",
@@ -366,6 +452,7 @@
     "title": "Title",
     "tracking": "Tracking",
     "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
+    "type": "Type",
     "unassign-member": "Unassign member",
     "unsaved-description": "You have an unsaved description.",
     "unwatch": "Unwatch",
@@ -374,7 +461,7 @@
     "uploaded-avatar": "Uploaded an avatar",
     "username": "Username",
     "view-it": "View it",
-    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
+    "warn-list-archived": "warning: this card is in an list at Archive",
     "watch": "Watch",
     "watching": "Watching",
     "watching-info": "You will be notified of any change in this board",
@@ -382,6 +469,9 @@
     "welcome-swimlane": "Milestone 1",
     "welcome-list1": "Basics",
     "welcome-list2": "Advanced",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
     "what-to-do": "What do you want to do?",
     "wipLimitErrorPopup-title": "Invalid WIP Limit",
     "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
@@ -407,16 +497,16 @@
     "send-smtp-test": "Send a test email to yourself",
     "invitation-code": "Invitation Code",
     "email-invite-register-subject": "__inviter__ sent you an invitation",
-    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to Wekan for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
-    "email-smtp-test-subject": "SMTP Test Email From Wekan",
+    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email",
     "email-smtp-test-text": "You have successfully sent an email",
     "error-invitation-code-not-exist": "Invitation code doesn't exist",
     "error-notAuthorized": "You are not authorized to view this page.",
     "outgoing-webhooks": "Outgoing Webhooks",
     "outgoingWebhooksPopup-title": "Outgoing Webhooks",
+    "boardCardTitlePopup-title": "Card Title Filter",
     "new-outgoing-webhook": "New Outgoing Webhook",
     "no-name": "(Unknown)",
-    "Wekan_version": "Wekan version",
     "Node_version": "Node version",
     "OS_Arch": "OS Arch",
     "OS_Cpus": "OS CPU Count",
@@ -427,13 +517,18 @@
     "OS_Totalmem": "OS Total Memory",
     "OS_Type": "OS Type",
     "OS_Uptime": "OS Uptime",
+    "days": "days",
     "hours": "hours",
     "minutes": "minutes",
     "seconds": "seconds",
+    "show-field-on-card": "Show this field on card",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
     "yes": "Yes",
     "no": "No",
     "accounts": "Accounts",
     "accounts-allowEmailChange": "Allow Email Change",
+    "accounts-allowUserNameChange": "Allow Username Change",
     "createdAt": "Created at",
     "verified": "Verified",
     "active": "Active",
@@ -442,5 +537,157 @@
     "card-end": "End",
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
-    "editCardEndDatePopup-title": "Change end date"
-}
+    "editCardEndDatePopup-title": "Change end date",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "Assigned By",
+    "requested-by": "Requested By",
+    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
+    "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
+    "boardDeletePopup-title": "Delete Board?",
+    "delete-board": "Delete Board",
+    "default-subtasks-board": "Subtasks for __board__ board",
+    "default": "Default",
+    "queue": "Queue",
+    "subtask-settings": "Subtasks Settings",
+    "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
+    "show-subtasks-field": "Cards can have subtasks",
+    "deposit-subtasks-board": "Deposit subtasks to this board:",
+    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
+    "show-parent-in-minicard": "Show parent in minicard:",
+    "prefix-with-full-path": "Prefix with full path",
+    "prefix-with-parent": "Prefix with parent",
+    "subtext-with-full-path": "Subtext with full path",
+    "subtext-with-parent": "Subtext with parent",
+    "change-card-parent": "Change card's parent",
+    "parent-card": "Parent card",
+    "source-board": "Source board",
+    "no-parent": "Don't show parent",
+    "activity-added-label": "added label '%s' to %s",
+    "activity-removed-label": "removed label '%s' from %s",
+    "activity-delete-attach": "deleted an attachment from %s",
+    "activity-added-label-card": "added label '%s'",
+    "activity-removed-label-card": "removed label '%s'",
+    "activity-delete-attach-card": "deleted an attachment",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "r-rule": "Rule",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "Add action",
+    "r-board-rules": "Board rules",
+    "r-add-rule": "Add rule",
+    "r-view-rule": "View rule",
+    "r-delete-rule": "Delete rule",
+    "r-new-rule-name": "New rule title",
+    "r-no-rules": "No rules",
+    "r-when-a-card": "When a card",
+    "r-is": "is",
+    "r-is-moved": "is moved",
+    "r-added-to": "added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "the board",
+    "r-list": "list",
+    "set-filter": "Set Filter",
+    "r-moved-to": "Moved to",
+    "r-moved-from": "Moved from",
+    "r-archived": "Moved to Archive",
+    "r-unarchived": "Restored from Archive",
+    "r-a-card": "a card",
+    "r-when-a-label-is": "When a label is",
+    "r-when-the-label-is": "When the label is",
+    "r-list-name": "list name",
+    "r-when-a-member": "When a member is",
+    "r-when-the-member": "When the member",
+    "r-name": "name",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "r-when-the-item": "When the checklist item",
+    "r-checked": "Checked",
+    "r-unchecked": "Unchecked",
+    "r-move-card-to": "Move card to",
+    "r-top-of": "Top of",
+    "r-bottom-of": "Bottom of",
+    "r-its-list": "its list",
+    "r-archive": "Move to Archive",
+    "r-unarchive": "Restore from Archive",
+    "r-card": "card",
+    "r-add": "Add",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-set-color": "Set color to",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "subject",
+    "r-rule-details": "Rule details",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Move card to top of list",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Move card to bottom of list",
+    "r-d-send-email": "Send email",
+    "r-d-send-email-to": "to",
+    "r-d-send-email-subject": "subject",
+    "r-d-send-email-message": "message",
+    "r-d-archive": "Move card to Archive",
+    "r-d-unarchive": "Restore card from Archive",
+    "r-d-add-label": "Add label",
+    "r-d-remove-label": "Remove label",
+    "r-create-card": "Create new card",
+    "r-in-list": "in list",
+    "r-in-swimlane": "in swimlane",
+    "r-d-add-member": "Add member",
+    "r-d-remove-member": "Remove member",
+    "r-d-remove-all-member": "Remove all member",
+    "r-d-check-all": "Check all items of a list",
+    "r-d-uncheck-all": "Uncheck all items of a list",
+    "r-d-check-one": "Check item",
+    "r-d-uncheck-one": "Uncheck item",
+    "r-d-check-of-list": "of checklist",
+    "r-d-add-checklist": "Add checklist",
+    "r-d-remove-checklist": "Remove checklist",
+    "r-by": "by",
+    "r-add-checklist": "Add checklist",
+    "r-with-items": "with items",
+    "r-items-list": "item1,item2,item3",
+    "r-add-swimlane": "Add swimlane",
+    "r-swimlane-name": "swimlane name",
+    "r-board-note": "Note: leave a field empty to match every possible value.",
+    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout",
+    "hide-logo": "Hide Logo",
+    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
+    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
+    "error-undefined": "Something went wrong",
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
+}
\ No newline at end of file
diff --git a/i18n/id.i18n.json b/i18n/id.i18n.json
index e3ee3399..fd635703 100644
--- a/i18n/id.i18n.json
+++ b/i18n/id.i18n.json
@@ -1,35 +1,51 @@
 {
     "accept": "Terima",
-    "act-activity-notify": "[Wekan] Pemberitahuan Kegiatan",
-    "act-addAttachment": "Lampirkan__attachment__ke__kartu__",
-    "act-addChecklist": "added checklist __checklist__ to __card__",
-    "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__",
-    "act-addComment": "Dikomentari di__kartu__:__comment__",
-    "act-createBoard": "Panel__dibuat__",
-    "act-createCard": "Kartu__dilampirkan__ke__Daftar",
-    "act-createList": "Daftar__ditambahkan__ke__Panel",
-    "act-addBoardMember": "Partisipan__ditambahkan__ke__Kartu",
-    "act-archivedBoard": "__board__ moved to Recycle Bin",
-    "act-archivedCard": "__card__ moved to Recycle Bin",
-    "act-archivedList": "__list__ moved to Recycle Bin",
-    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
-    "act-importBoard": "Panel__diimpor",
-    "act-importCard": "Kartu__diimpor__",
-    "act-importList": "Daftar__diimpor__",
-    "act-joinMember": "Partisipan__ditambahkan__ke__kartu",
-    "act-moveCard": "Pindahkan__kartu__dari__daftarlama__ke__daftar",
-    "act-removeBoardMember": "Hapus__partisipan__dari__panel",
-    "act-restoredCard": "Kembalikan__kartu__ke__panel",
-    "act-unjoinMember": "hapus__partisipan__dari__kartu__",
-    "act-withBoardTitle": "Panel__[Wekan}__",
+    "act-activity-notify": "Activity Notification",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__board__",
     "act-withCardTitle": "__kartu__[__Panel__]",
     "actions": "Daftar Tindakan",
     "activities": "Daftar Kegiatan",
     "activity": "Kegiatan",
     "activity-added": "ditambahkan %s ke %s",
-    "activity-archived": "%s moved to Recycle Bin",
+    "activity-archived": "%s moved to Archive",
     "activity-attached": "dilampirkan %s ke %s",
     "activity-created": "dibuat %s",
+    "activity-customfield-created": "created custom field %s",
     "activity-excluded": "tidak termasuk %s dari %s",
     "activity-imported": "diimpor %s kedalam %s dari %s",
     "activity-imported-board": "diimpor %s dari %s",
@@ -39,13 +55,25 @@
     "activity-removed": "dihapus %s dari %s",
     "activity-sent": "terkirim %s ke %s",
     "activity-unjoined": "tidak bergabung %s",
+    "activity-subtask-added": "added subtask to %s",
+    "activity-checked-item": "checked %s in checklist %s of %s",
+    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
     "activity-checklist-added": "daftar periksa ditambahkan ke %s",
+    "activity-checklist-removed": "removed a checklist from %s",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
     "activity-checklist-item-added": "added checklist item to '%s' in %s",
+    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
     "add": "Tambah",
+    "activity-checked-item-card": "checked %s in checklist %s",
+    "activity-unchecked-item-card": "unchecked %s in checklist %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
     "add-attachment": "Add Attachment",
     "add-board": "Add Board",
     "add-card": "Add Card",
     "add-swimlane": "Add Swimlane",
+    "add-subtask": "Add Subtask",
     "add-checklist": "Add Checklist",
     "add-checklist-item": "Tambahkan hal ke daftar periksa",
     "add-cover": "Tambahkan Sampul",
@@ -63,20 +91,22 @@
     "and-n-other-card": "Dan__menghitung__kartu lain",
     "and-n-other-card_plural": "Dan__menghitung__kartu lain",
     "apply": "Terapkan",
-    "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Move to Recycle Bin",
-    "archive-all": "Move All to Recycle Bin",
-    "archive-board": "Move Board to Recycle Bin",
-    "archive-card": "Move Card to Recycle Bin",
-    "archive-list": "Move List to Recycle Bin",
-    "archive-swimlane": "Move Swimlane to Recycle Bin",
-    "archive-selection": "Move selection to Recycle Bin",
-    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
-    "archived-items": "Recycle Bin",
-    "archived-boards": "Boards in Recycle Bin",
+    "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
+    "archive": "Move to Archive",
+    "archive-all": "Move All to Archive",
+    "archive-board": "Move Board to Archive",
+    "archive-card": "Move Card to Archive",
+    "archive-list": "Move List to Archive",
+    "archive-swimlane": "Move Swimlane to Archive",
+    "archive-selection": "Move selection to Archive",
+    "archiveBoardPopup-title": "Move Board to Archive?",
+    "archived-items": "Arsip",
+    "archived-boards": "Boards in Archive",
     "restore-board": "Restore Board",
-    "no-archived-boards": "No Boards in Recycle Bin.",
-    "archives": "Recycle Bin",
+    "no-archived-boards": "No Boards in Archive.",
+    "archives": "Arsip",
+    "template": "Template",
+    "templates": "Templates",
     "assign-member": "Tugaskan anggota",
     "attached": "terlampir",
     "attachment": "Lampiran",
@@ -95,22 +125,25 @@
     "boardChangeTitlePopup-title": "Ganti Nama Panel",
     "boardChangeVisibilityPopup-title": "Ubah Penampakan",
     "boardChangeWatchPopup-title": "Ubah Pengamatan",
-    "boardMenuPopup-title": "Menu Panel",
+    "boardMenuPopup-title": "Board Settings",
     "boards": "Panel",
     "board-view": "Board View",
+    "board-view-cal": "Calendar",
     "board-view-swimlanes": "Swimlanes",
     "board-view-lists": "Daftar",
     "bucket-example": "Contohnya seperti “Bucket List” ",
     "cancel": "Batal",
-    "card-archived": "This card is moved to Recycle Bin.",
+    "card-archived": "This card is moved to Archive.",
+    "board-archived": "This board is moved to Archive.",
     "card-comments-title": "Kartu ini punya %s komentar",
     "card-delete-notice": "Menghapus sama dengan permanen. Anda akan kehilangan semua aksi yang terhubung ke kartu ini",
     "card-delete-pop": "Semua aksi akan dihapus dari aktivitas dan anda tidak bisa lagi buka kartu ini",
-    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
     "card-due": "Jatuh Tempo",
     "card-due-on": "Jatuh Tempo pada",
     "card-spent": "Spent Time",
     "card-edit-attachments": "Sunting lampiran",
+    "card-edit-custom-fields": "Edit custom fields",
     "card-edit-labels": "Sunting label",
     "card-edit-members": "Sunting anggota",
     "card-labels-title": "Ubah label kartu",
@@ -118,13 +151,20 @@
     "card-start": "Mulai",
     "card-start-on": "Mulai pada",
     "cardAttachmentsPopup-title": "Lampirkan dari",
+    "cardCustomField-datePopup-title": "Change date",
+    "cardCustomFieldsPopup-title": "Edit custom fields",
     "cardDeletePopup-title": "Hapus kartu",
     "cardDetailsActionsPopup-title": "Aksi Kartu",
     "cardLabelsPopup-title": "Daftar Label",
     "cardMembersPopup-title": "Daftar Anggota",
     "cardMorePopup-title": "Lainnya",
+    "cardTemplatePopup-title": "Create template",
     "cards": "Daftar Kartu",
     "cards-count": "Daftar Kartu",
+    "casSignIn": "Sign In with CAS",
+    "cardType-card": "Card",
+    "cardType-linkedCard": "Linked Card",
+    "cardType-linkedBoard": "Linked Board",
     "change": "Ubah",
     "change-avatar": "Ubah Avatar",
     "change-password": "Ubah Kata Sandi",
@@ -135,30 +175,52 @@
     "changePasswordPopup-title": "Ubah Kata Sandi",
     "changePermissionsPopup-title": "Ubah Hak Akses",
     "changeSettingsPopup-title": "Ubah Setelan",
+    "subtasks": "Subtasks",
     "checklists": "Daftar Periksa",
     "click-to-star": "Klik untuk tandai bintang panel ini",
     "click-to-unstar": "Klik untuk tidak memberi bintang pada panel ini",
     "clipboard": "Clipboard atau drag & drop",
     "close": "Tutup",
     "close-board": "Tutup Panel",
-    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
     "color-black": "hitam",
     "color-blue": "biru",
+    "color-crimson": "crimson",
+    "color-darkgreen": "darkgreen",
+    "color-gold": "gold",
+    "color-gray": "gray",
     "color-green": "hijau",
+    "color-indigo": "indigo",
     "color-lime": "hijau muda",
+    "color-magenta": "magenta",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "navy",
     "color-orange": "jingga",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
     "color-pink": "merah muda",
+    "color-plum": "plum",
     "color-purple": "ungu",
     "color-red": "merah",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "silver",
     "color-sky": "biru muda",
+    "color-slateblue": "slateblue",
+    "color-white": "white",
     "color-yellow": "kuning",
+    "unset-color": "Unset",
     "comment": "Komentar",
     "comment-placeholder": "Write Comment",
     "comment-only": "Hanya komentar",
     "comment-only-desc": "Bisa komen hanya di kartu",
+    "no-comments": "No comments",
+    "no-comments-desc": "Can not see comments and activities.",
     "computer": "Komputer",
-    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist",
+    "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?",
+    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
     "copy-card-link-to-clipboard": "Copy card link to clipboard",
+    "linkCardPopup-title": "Link Card",
+    "searchElementPopup-title": "Cari",
     "copyCardPopup-title": "Copy Card",
     "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
     "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
@@ -167,11 +229,25 @@
     "createBoardPopup-title": "Buat Panel",
     "chooseBoardSourcePopup-title": "Import board",
     "createLabelPopup-title": "Buat Label",
+    "createCustomField": "Create Field",
+    "createCustomFieldPopup-title": "Create Field",
     "current": "sekarang",
+    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
+    "custom-field-checkbox": "Checkbox",
+    "custom-field-date": "Tanggal",
+    "custom-field-dropdown": "Dropdown List",
+    "custom-field-dropdown-none": "(none)",
+    "custom-field-dropdown-options": "List Options",
+    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
+    "custom-field-dropdown-unknown": "(unknown)",
+    "custom-field-number": "Number",
+    "custom-field-text": "Text",
+    "custom-fields": "Custom Fields",
     "date": "Tanggal",
     "decline": "Tolak",
     "default-avatar": "Avatar standar",
     "delete": "Hapus",
+    "deleteCustomFieldPopup-title": "Delete Custom Field?",
     "deleteLabelPopup-title": "Hapus label?",
     "description": "Deskripsi",
     "disambiguateMultiLabelPopup-title": "Abaikan label Aksi",
@@ -186,6 +262,7 @@
     "soft-wip-limit": "Soft WIP Limit",
     "editCardStartDatePopup-title": "Ubah tanggal mulai",
     "editCardDueDatePopup-title": "Ubah tanggal selesai",
+    "editCustomFieldPopup-title": "Edit Field",
     "editCardSpentTimePopup-title": "Change spent time",
     "editLabelPopup-title": "Ubah Label",
     "editNotificationPopup-title": "Sunting Pemberitahuan",
@@ -222,30 +299,36 @@
     "filter-clear": "Bersihkan penyaringan",
     "filter-no-label": "Tidak ada label",
     "filter-no-member": "Tidak ada anggota",
+    "filter-no-custom-fields": "No Custom Fields",
     "filter-on": "Penyaring aktif",
     "filter-on-desc": "Anda memfilter kartu di panel ini. Klik di sini untuk menyunting filter",
     "filter-to-selection": "Saring berdasarkan yang dipilih",
+    "advanced-filter-label": "Advanced Filter",
+    "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) to be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
     "fullname": "Nama Lengkap",
     "header-logo-title": "Kembali ke laman panel anda",
     "hide-system-messages": "Sembunyikan pesan-pesan sistem",
     "headerBarCreateBoardPopup-title": "Buat Panel",
     "home": "Beranda",
     "import": "Impor",
+    "link": "Link",
     "import-board": "import board",
     "import-board-c": "Import board",
     "import-board-title-trello": "Impor panel dari Trello",
-    "import-board-title-wekan": "Import board from Wekan",
+    "import-board-title-wekan": "Import board from previous export",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
     "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
     "from-trello": "From Trello",
-    "from-wekan": "From Wekan",
+    "from-wekan": "From previous export",
     "import-board-instruction-trello": "Di panel Trello anda, ke 'Menu', terus 'More', 'Print and Export','Export JSON', dan salin hasilnya",
-    "import-board-instruction-wekan": "In your Wekan board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
     "import-json-placeholder": "Tempelkan data JSON yang sah disini",
     "import-map-members": "Petakan partisipan",
-    "import-members-map": "Panel yang anda impor punya partisipan. Silahkan petakan anggota yang anda ingin impor ke user [Wekan]",
+    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
     "import-show-user-mapping": "Review pemetaan partisipan",
-    "import-user-select": "Pilih nama pengguna yang Anda mau gunakan sebagai anggota ini",
-    "importMapMembersAddPopup-title": "Pilih anggota Wekan",
+    "import-user-select": "Pick your existing user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select member",
     "info": "Versi",
     "initials": "Inisial",
     "invalid-date": "Tanggal tidak sah",
@@ -264,17 +347,19 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "Link ke kartu ini",
-    "list-archive-cards": "Move all cards in this list to Recycle Bin",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
+    "list-archive-cards": "Move all cards in this list to Archive",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Pindah semua kartu ke daftar ini",
     "list-select-cards": "Pilih semua kartu di daftar ini",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "Daftar Tindakan",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Impor dari Kartu Trello",
     "listMorePopup-title": "Lainnya",
     "link-list": "Link to this list",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
     "lists": "Daftar",
     "swimlanes": "Swimlanes",
     "log-out": "Keluar",
@@ -294,9 +379,9 @@
     "muted-info": "Anda tidak akan pernah dinotifikasi semua perubahan di panel ini",
     "my-boards": "Panel saya",
     "name": "Nama",
-    "no-archived-cards": "No cards in Recycle Bin.",
-    "no-archived-lists": "No lists in Recycle Bin.",
-    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
+    "no-archived-cards": "No cards in Archive.",
+    "no-archived-lists": "No lists in Archive.",
+    "no-archived-swimlanes": "No swimlanes in Archive.",
     "no-results": "Tidak ada hasil",
     "normal": "Normal",
     "normal-desc": "Bisa tampilkan dan edit kartu. Tidak bisa ubah setting",
@@ -332,6 +417,7 @@
     "restore": "Pulihkan",
     "save": "Simpan",
     "search": "Cari",
+    "rules": "Rules",
     "search-cards": "Search from card titles and descriptions on this board",
     "search-example": "Text to search for?",
     "select-color": "Select Color",
@@ -366,6 +452,7 @@
     "title": "Judul",
     "tracking": "Pelacakan",
     "tracking-info": "Anda akan dinotifikasi semua perubahan di kartu tersebut diaman anda terlibat sebagai creator atau partisipan",
+    "type": "Type",
     "unassign-member": "Tidak sertakan partisipan",
     "unsaved-description": "Anda memiliki deskripsi yang belum disimpan.",
     "unwatch": "Tidak mengamati",
@@ -374,7 +461,7 @@
     "uploaded-avatar": "Avatar diunggah",
     "username": "Nama Pengguna",
     "view-it": "Lihat",
-    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
+    "warn-list-archived": "warning: this card is in an list at Archive",
     "watch": "Amati",
     "watching": "Mengamati",
     "watching-info": "Anda akan diberitahu semua perubahan di panel ini",
@@ -382,6 +469,9 @@
     "welcome-swimlane": "Milestone 1",
     "welcome-list1": "Tingkat dasar",
     "welcome-list2": "Tingkat lanjut",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
     "what-to-do": "Apa yang mau Anda lakukan?",
     "wipLimitErrorPopup-title": "Invalid WIP Limit",
     "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
@@ -407,16 +497,16 @@
     "send-smtp-test": "Send a test email to yourself",
     "invitation-code": "Kode Undangan",
     "email-invite-register-subject": "__inviter__ mengirim undangan ke Anda",
-    "email-invite-register-text": "Halo __user__,\n\n__inviter__ mengundang Anda untuk berkolaborasi menggunakan Wekan.\n\nMohon ikuti tautan berikut:\n__url__\n\nDan kode undangan Anda adalah: __icode__\n\nTerima kasih.",
-    "email-smtp-test-subject": "SMTP Test Email From Wekan",
+    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email",
     "email-smtp-test-text": "You have successfully sent an email",
     "error-invitation-code-not-exist": "Kode undangan tidak ada",
     "error-notAuthorized": "You are not authorized to view this page.",
     "outgoing-webhooks": "Outgoing Webhooks",
     "outgoingWebhooksPopup-title": "Outgoing Webhooks",
+    "boardCardTitlePopup-title": "Card Title Filter",
     "new-outgoing-webhook": "New Outgoing Webhook",
     "no-name": "(Unknown)",
-    "Wekan_version": "Wekan version",
     "Node_version": "Node version",
     "OS_Arch": "OS Arch",
     "OS_Cpus": "OS CPU Count",
@@ -427,13 +517,18 @@
     "OS_Totalmem": "OS Total Memory",
     "OS_Type": "OS Type",
     "OS_Uptime": "OS Uptime",
+    "days": "days",
     "hours": "hours",
     "minutes": "minutes",
     "seconds": "seconds",
+    "show-field-on-card": "Show this field on card",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
     "yes": "Yes",
     "no": "No",
     "accounts": "Accounts",
     "accounts-allowEmailChange": "Allow Email Change",
+    "accounts-allowUserNameChange": "Allow Username Change",
     "createdAt": "Created at",
     "verified": "Verified",
     "active": "Active",
@@ -442,5 +537,157 @@
     "card-end": "End",
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
-    "editCardEndDatePopup-title": "Change end date"
-}
+    "editCardEndDatePopup-title": "Change end date",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "Assigned By",
+    "requested-by": "Requested By",
+    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
+    "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
+    "boardDeletePopup-title": "Delete Board?",
+    "delete-board": "Delete Board",
+    "default-subtasks-board": "Subtasks for __board__ board",
+    "default": "Default",
+    "queue": "Queue",
+    "subtask-settings": "Subtasks Settings",
+    "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
+    "show-subtasks-field": "Cards can have subtasks",
+    "deposit-subtasks-board": "Deposit subtasks to this board:",
+    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
+    "show-parent-in-minicard": "Show parent in minicard:",
+    "prefix-with-full-path": "Prefix with full path",
+    "prefix-with-parent": "Prefix with parent",
+    "subtext-with-full-path": "Subtext with full path",
+    "subtext-with-parent": "Subtext with parent",
+    "change-card-parent": "Change card's parent",
+    "parent-card": "Parent card",
+    "source-board": "Source board",
+    "no-parent": "Don't show parent",
+    "activity-added-label": "added label '%s' to %s",
+    "activity-removed-label": "removed label '%s' from %s",
+    "activity-delete-attach": "deleted an attachment from %s",
+    "activity-added-label-card": "added label '%s'",
+    "activity-removed-label-card": "removed label '%s'",
+    "activity-delete-attach-card": "deleted an attachment",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "r-rule": "Rule",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "Add action",
+    "r-board-rules": "Board rules",
+    "r-add-rule": "Add rule",
+    "r-view-rule": "View rule",
+    "r-delete-rule": "Delete rule",
+    "r-new-rule-name": "New rule title",
+    "r-no-rules": "No rules",
+    "r-when-a-card": "When a card",
+    "r-is": "is",
+    "r-is-moved": "is moved",
+    "r-added-to": "added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "the board",
+    "r-list": "list",
+    "set-filter": "Set Filter",
+    "r-moved-to": "Moved to",
+    "r-moved-from": "Moved from",
+    "r-archived": "Moved to Archive",
+    "r-unarchived": "Restored from Archive",
+    "r-a-card": "a card",
+    "r-when-a-label-is": "When a label is",
+    "r-when-the-label-is": "When the label is",
+    "r-list-name": "list name",
+    "r-when-a-member": "When a member is",
+    "r-when-the-member": "When the member",
+    "r-name": "name",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "r-when-the-item": "When the checklist item",
+    "r-checked": "Checked",
+    "r-unchecked": "Unchecked",
+    "r-move-card-to": "Move card to",
+    "r-top-of": "Top of",
+    "r-bottom-of": "Bottom of",
+    "r-its-list": "its list",
+    "r-archive": "Move to Archive",
+    "r-unarchive": "Restore from Archive",
+    "r-card": "card",
+    "r-add": "Tambah",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-set-color": "Set color to",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "subject",
+    "r-rule-details": "Rule details",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Move card to top of list",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Move card to bottom of list",
+    "r-d-send-email": "Send email",
+    "r-d-send-email-to": "to",
+    "r-d-send-email-subject": "subject",
+    "r-d-send-email-message": "message",
+    "r-d-archive": "Move card to Archive",
+    "r-d-unarchive": "Restore card from Archive",
+    "r-d-add-label": "Tambahkan label",
+    "r-d-remove-label": "Remove label",
+    "r-create-card": "Create new card",
+    "r-in-list": "in list",
+    "r-in-swimlane": "in swimlane",
+    "r-d-add-member": "Add member",
+    "r-d-remove-member": "Remove member",
+    "r-d-remove-all-member": "Remove all member",
+    "r-d-check-all": "Check all items of a list",
+    "r-d-uncheck-all": "Uncheck all items of a list",
+    "r-d-check-one": "Check item",
+    "r-d-uncheck-one": "Uncheck item",
+    "r-d-check-of-list": "of checklist",
+    "r-d-add-checklist": "Add checklist",
+    "r-d-remove-checklist": "Remove checklist",
+    "r-by": "by",
+    "r-add-checklist": "Add checklist",
+    "r-with-items": "with items",
+    "r-items-list": "item1,item2,item3",
+    "r-add-swimlane": "Add swimlane",
+    "r-swimlane-name": "swimlane name",
+    "r-board-note": "Note: leave a field empty to match every possible value.",
+    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Metode Autentikasi",
+    "authentication-type": "Tipe Autentikasi",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout",
+    "hide-logo": "Sembunyikan Logo",
+    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
+    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
+    "error-undefined": "Something went wrong",
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
+}
\ No newline at end of file
diff --git a/i18n/ig.i18n.json b/i18n/ig.i18n.json
index e2edbe31..b2ea17d2 100644
--- a/i18n/ig.i18n.json
+++ b/i18n/ig.i18n.json
@@ -1,35 +1,51 @@
 {
     "accept": "Kwere",
-    "act-activity-notify": "[Wekan] Activity Notification",
-    "act-addAttachment": "attached __attachment__ to __card__",
-    "act-addChecklist": "added checklist __checklist__ to __card__",
-    "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__",
-    "act-addComment": "commented on __card__: __comment__",
-    "act-createBoard": "created __board__",
-    "act-createCard": "added __card__ to __list__",
-    "act-createList": "added __list__ to __board__",
-    "act-addBoardMember": "added __member__ to __board__",
-    "act-archivedBoard": "__board__ moved to Recycle Bin",
-    "act-archivedCard": "__card__ moved to Recycle Bin",
-    "act-archivedList": "__list__ moved to Recycle Bin",
-    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
-    "act-importBoard": "imported __board__",
-    "act-importCard": "imported __card__",
-    "act-importList": "imported __list__",
-    "act-joinMember": "added __member__ to __card__",
-    "act-moveCard": "moved __card__ from __oldList__ to __list__",
-    "act-removeBoardMember": "removed __member__ from __board__",
-    "act-restoredCard": "restored __card__ to __board__",
-    "act-unjoinMember": "removed __member__ from __card__",
-    "act-withBoardTitle": "[Wekan] __board__",
+    "act-activity-notify": "Activity Notification",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__board__",
     "act-withCardTitle": "[__board__] __card__",
     "actions": "Actions",
     "activities": "Activities",
     "activity": "Activity",
     "activity-added": "added %s to %s",
-    "activity-archived": "%s moved to Recycle Bin",
+    "activity-archived": "%s moved to Archive",
     "activity-attached": "attached %s to %s",
     "activity-created": "created %s",
+    "activity-customfield-created": "created custom field %s",
     "activity-excluded": "excluded %s from %s",
     "activity-imported": "imported %s into %s from %s",
     "activity-imported-board": "imported %s from %s",
@@ -39,13 +55,25 @@
     "activity-removed": "removed %s from %s",
     "activity-sent": "sent %s to %s",
     "activity-unjoined": "unjoined %s",
+    "activity-subtask-added": "added subtask to %s",
+    "activity-checked-item": "checked %s in checklist %s of %s",
+    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
     "activity-checklist-added": "added checklist to %s",
+    "activity-checklist-removed": "removed a checklist from %s",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
     "activity-checklist-item-added": "added checklist item to '%s' in %s",
+    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
     "add": "Tinye",
+    "activity-checked-item-card": "checked %s in checklist %s",
+    "activity-unchecked-item-card": "unchecked %s in checklist %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
     "add-attachment": "Add Attachment",
     "add-board": "Add Board",
     "add-card": "Add Card",
     "add-swimlane": "Add Swimlane",
+    "add-subtask": "Add Subtask",
     "add-checklist": "Add Checklist",
     "add-checklist-item": "Add an item to checklist",
     "add-cover": "Add Cover",
@@ -63,20 +91,22 @@
     "and-n-other-card": "And __count__ other card",
     "and-n-other-card_plural": "And __count__ other cards",
     "apply": "Apply",
-    "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Move to Recycle Bin",
-    "archive-all": "Move All to Recycle Bin",
-    "archive-board": "Move Board to Recycle Bin",
-    "archive-card": "Move Card to Recycle Bin",
-    "archive-list": "Move List to Recycle Bin",
-    "archive-swimlane": "Move Swimlane to Recycle Bin",
-    "archive-selection": "Move selection to Recycle Bin",
-    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
-    "archived-items": "Recycle Bin",
-    "archived-boards": "Boards in Recycle Bin",
+    "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
+    "archive": "Move to Archive",
+    "archive-all": "Move All to Archive",
+    "archive-board": "Move Board to Archive",
+    "archive-card": "Move Card to Archive",
+    "archive-list": "Move List to Archive",
+    "archive-swimlane": "Move Swimlane to Archive",
+    "archive-selection": "Move selection to Archive",
+    "archiveBoardPopup-title": "Move Board to Archive?",
+    "archived-items": "Archive",
+    "archived-boards": "Boards in Archive",
     "restore-board": "Restore Board",
-    "no-archived-boards": "No Boards in Recycle Bin.",
-    "archives": "Recycle Bin",
+    "no-archived-boards": "No Boards in Archive.",
+    "archives": "Archive",
+    "template": "Template",
+    "templates": "Templates",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Attachment",
@@ -95,22 +125,25 @@
     "boardChangeTitlePopup-title": "Rename Board",
     "boardChangeVisibilityPopup-title": "Change Visibility",
     "boardChangeWatchPopup-title": "Change Watch",
-    "boardMenuPopup-title": "Board Menu",
+    "boardMenuPopup-title": "Board Settings",
     "boards": "Boards",
     "board-view": "Board View",
+    "board-view-cal": "Calendar",
     "board-view-swimlanes": "Swimlanes",
     "board-view-lists": "Lists",
     "bucket-example": "Like “Bucket List” for example",
     "cancel": "Cancel",
-    "card-archived": "This card is moved to Recycle Bin.",
+    "card-archived": "This card is moved to Archive.",
+    "board-archived": "This board is moved to Archive.",
     "card-comments-title": "This card has %s comment.",
     "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
     "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
     "card-due": "Due",
     "card-due-on": "Due on",
     "card-spent": "Spent Time",
     "card-edit-attachments": "Edit attachments",
+    "card-edit-custom-fields": "Edit custom fields",
     "card-edit-labels": "Edit labels",
     "card-edit-members": "Edit members",
     "card-labels-title": "Change the labels for the card.",
@@ -118,13 +151,20 @@
     "card-start": "Bido",
     "card-start-on": "Starts on",
     "cardAttachmentsPopup-title": "Attach From",
+    "cardCustomField-datePopup-title": "Change date",
+    "cardCustomFieldsPopup-title": "Edit custom fields",
     "cardDeletePopup-title": "Delete Card?",
     "cardDetailsActionsPopup-title": "Card Actions",
     "cardLabelsPopup-title": "Aha",
     "cardMembersPopup-title": "Ndị otu",
     "cardMorePopup-title": "More",
+    "cardTemplatePopup-title": "Create template",
     "cards": "Cards",
     "cards-count": "Cards",
+    "casSignIn": "Sign In with CAS",
+    "cardType-card": "Card",
+    "cardType-linkedCard": "Linked Card",
+    "cardType-linkedBoard": "Linked Board",
     "change": "Gbanwe",
     "change-avatar": "Change Avatar",
     "change-password": "Change Password",
@@ -135,30 +175,52 @@
     "changePasswordPopup-title": "Change Password",
     "changePermissionsPopup-title": "Change Permissions",
     "changeSettingsPopup-title": "Change Settings",
+    "subtasks": "Subtasks",
     "checklists": "Checklists",
     "click-to-star": "Click to star this board.",
     "click-to-unstar": "Click to unstar this board.",
     "clipboard": "Clipboard or drag & drop",
     "close": "Close",
     "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
     "color-black": "black",
     "color-blue": "blue",
+    "color-crimson": "crimson",
+    "color-darkgreen": "darkgreen",
+    "color-gold": "gold",
+    "color-gray": "gray",
     "color-green": "green",
+    "color-indigo": "indigo",
     "color-lime": "lime",
+    "color-magenta": "magenta",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "navy",
     "color-orange": "orange",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
     "color-pink": "pink",
+    "color-plum": "plum",
     "color-purple": "purple",
     "color-red": "red",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "silver",
     "color-sky": "sky",
+    "color-slateblue": "slateblue",
+    "color-white": "white",
     "color-yellow": "yellow",
+    "unset-color": "Unset",
     "comment": "Comment",
     "comment-placeholder": "Write Comment",
     "comment-only": "Comment only",
     "comment-only-desc": "Can comment on cards only.",
+    "no-comments": "No comments",
+    "no-comments-desc": "Can not see comments and activities.",
     "computer": "Computer",
-    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist",
+    "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?",
+    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
     "copy-card-link-to-clipboard": "Copy card link to clipboard",
+    "linkCardPopup-title": "Link Card",
+    "searchElementPopup-title": "Search",
     "copyCardPopup-title": "Copy Card",
     "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
     "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
@@ -167,11 +229,25 @@
     "createBoardPopup-title": "Create Board",
     "chooseBoardSourcePopup-title": "Import board",
     "createLabelPopup-title": "Create Label",
+    "createCustomField": "Create Field",
+    "createCustomFieldPopup-title": "Create Field",
     "current": "current",
+    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
+    "custom-field-checkbox": "Checkbox",
+    "custom-field-date": "Date",
+    "custom-field-dropdown": "Dropdown List",
+    "custom-field-dropdown-none": "(none)",
+    "custom-field-dropdown-options": "List Options",
+    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
+    "custom-field-dropdown-unknown": "(unknown)",
+    "custom-field-number": "Number",
+    "custom-field-text": "Text",
+    "custom-fields": "Custom Fields",
     "date": "Date",
     "decline": "Decline",
     "default-avatar": "Default avatar",
     "delete": "Delete",
+    "deleteCustomFieldPopup-title": "Delete Custom Field?",
     "deleteLabelPopup-title": "Delete Label?",
     "description": "Description",
     "disambiguateMultiLabelPopup-title": "Disambiguate Label Action",
@@ -186,6 +262,7 @@
     "soft-wip-limit": "Soft WIP Limit",
     "editCardStartDatePopup-title": "Change start date",
     "editCardDueDatePopup-title": "Change due date",
+    "editCustomFieldPopup-title": "Edit Field",
     "editCardSpentTimePopup-title": "Change spent time",
     "editLabelPopup-title": "Change Label",
     "editNotificationPopup-title": "Edit Notification",
@@ -222,30 +299,36 @@
     "filter-clear": "Clear filter",
     "filter-no-label": "No label",
     "filter-no-member": "No member",
+    "filter-no-custom-fields": "No Custom Fields",
     "filter-on": "Filter is on",
     "filter-on-desc": "You are filtering cards on this board. Click here to edit filter.",
     "filter-to-selection": "Filter to selection",
+    "advanced-filter-label": "Advanced Filter",
+    "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) to be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
     "fullname": "Full Name",
     "header-logo-title": "Go back to your boards page.",
     "hide-system-messages": "Hide system messages",
     "headerBarCreateBoardPopup-title": "Create Board",
     "home": "Home",
     "import": "Import",
+    "link": "Link",
     "import-board": "import board",
     "import-board-c": "Import board",
     "import-board-title-trello": "Import board from Trello",
-    "import-board-title-wekan": "Import board from Wekan",
+    "import-board-title-wekan": "Import board from previous export",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
     "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
     "from-trello": "From Trello",
-    "from-wekan": "From Wekan",
+    "from-wekan": "From previous export",
     "import-board-instruction-trello": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text.",
-    "import-board-instruction-wekan": "In your Wekan board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
     "import-json-placeholder": "Paste your valid JSON data here",
     "import-map-members": "Map members",
-    "import-members-map": "Your imported board has some members. Please map the members you want to import to Wekan users",
+    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
     "import-show-user-mapping": "Review members mapping",
-    "import-user-select": "Pick the Wekan user you want to use as this member",
-    "importMapMembersAddPopup-title": "Select Wekan member",
+    "import-user-select": "Pick your existing user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select member",
     "info": "Version",
     "initials": "Initials",
     "invalid-date": "Invalid date",
@@ -264,17 +347,19 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "Link to this card",
-    "list-archive-cards": "Move all cards in this list to Recycle Bin",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
+    "list-archive-cards": "Move all cards in this list to Archive",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "List Actions",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Import a Trello card",
     "listMorePopup-title": "More",
     "link-list": "Link to this list",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
     "lists": "Lists",
     "swimlanes": "Swimlanes",
     "log-out": "Log Out",
@@ -294,9 +379,9 @@
     "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "My Boards",
     "name": "Name",
-    "no-archived-cards": "No cards in Recycle Bin.",
-    "no-archived-lists": "No lists in Recycle Bin.",
-    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
+    "no-archived-cards": "No cards in Archive.",
+    "no-archived-lists": "No lists in Archive.",
+    "no-archived-swimlanes": "No swimlanes in Archive.",
     "no-results": "No results",
     "normal": "Normal",
     "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -332,6 +417,7 @@
     "restore": "Restore",
     "save": "Save",
     "search": "Search",
+    "rules": "Rules",
     "search-cards": "Search from card titles and descriptions on this board",
     "search-example": "Text to search for?",
     "select-color": "Select Color",
@@ -366,6 +452,7 @@
     "title": "Title",
     "tracking": "Tracking",
     "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
+    "type": "Type",
     "unassign-member": "Unassign member",
     "unsaved-description": "You have an unsaved description.",
     "unwatch": "Unwatch",
@@ -374,7 +461,7 @@
     "uploaded-avatar": "Uploaded an avatar",
     "username": "Username",
     "view-it": "Hụ ya",
-    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
+    "warn-list-archived": "warning: this card is in an list at Archive",
     "watch": "Hụ",
     "watching": "Watching",
     "watching-info": "You will be notified of any change in this board",
@@ -382,6 +469,9 @@
     "welcome-swimlane": "Milestone 1",
     "welcome-list1": "Basics",
     "welcome-list2": "Advanced",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
     "what-to-do": "What do you want to do?",
     "wipLimitErrorPopup-title": "Invalid WIP Limit",
     "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
@@ -407,16 +497,16 @@
     "send-smtp-test": "Send a test email to yourself",
     "invitation-code": "Invitation Code",
     "email-invite-register-subject": "__inviter__ sent you an invitation",
-    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to Wekan for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
-    "email-smtp-test-subject": "SMTP Test Email From Wekan",
+    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email",
     "email-smtp-test-text": "You have successfully sent an email",
     "error-invitation-code-not-exist": "Invitation code doesn't exist",
     "error-notAuthorized": "You are not authorized to view this page.",
     "outgoing-webhooks": "Outgoing Webhooks",
     "outgoingWebhooksPopup-title": "Outgoing Webhooks",
+    "boardCardTitlePopup-title": "Card Title Filter",
     "new-outgoing-webhook": "New Outgoing Webhook",
     "no-name": "(Unknown)",
-    "Wekan_version": "Wekan version",
     "Node_version": "Node version",
     "OS_Arch": "OS Arch",
     "OS_Cpus": "OS CPU Count",
@@ -427,13 +517,18 @@
     "OS_Totalmem": "OS Total Memory",
     "OS_Type": "OS Type",
     "OS_Uptime": "OS Uptime",
+    "days": "days",
     "hours": "elekere",
     "minutes": "nkeji",
     "seconds": "seconds",
+    "show-field-on-card": "Show this field on card",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
     "yes": "Ee",
     "no": "Mba",
     "accounts": "Accounts",
     "accounts-allowEmailChange": "Allow Email Change",
+    "accounts-allowUserNameChange": "Allow Username Change",
     "createdAt": "Ekere na",
     "verified": "Verified",
     "active": "Active",
@@ -442,5 +537,157 @@
     "card-end": "End",
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
-    "editCardEndDatePopup-title": "Change end date"
-}
+    "editCardEndDatePopup-title": "Change end date",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "Assigned By",
+    "requested-by": "Requested By",
+    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
+    "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
+    "boardDeletePopup-title": "Delete Board?",
+    "delete-board": "Delete Board",
+    "default-subtasks-board": "Subtasks for __board__ board",
+    "default": "Default",
+    "queue": "Queue",
+    "subtask-settings": "Subtasks Settings",
+    "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
+    "show-subtasks-field": "Cards can have subtasks",
+    "deposit-subtasks-board": "Deposit subtasks to this board:",
+    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
+    "show-parent-in-minicard": "Show parent in minicard:",
+    "prefix-with-full-path": "Prefix with full path",
+    "prefix-with-parent": "Prefix with parent",
+    "subtext-with-full-path": "Subtext with full path",
+    "subtext-with-parent": "Subtext with parent",
+    "change-card-parent": "Change card's parent",
+    "parent-card": "Parent card",
+    "source-board": "Source board",
+    "no-parent": "Don't show parent",
+    "activity-added-label": "added label '%s' to %s",
+    "activity-removed-label": "removed label '%s' from %s",
+    "activity-delete-attach": "deleted an attachment from %s",
+    "activity-added-label-card": "added label '%s'",
+    "activity-removed-label-card": "removed label '%s'",
+    "activity-delete-attach-card": "deleted an attachment",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "r-rule": "Rule",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "Add action",
+    "r-board-rules": "Board rules",
+    "r-add-rule": "Add rule",
+    "r-view-rule": "View rule",
+    "r-delete-rule": "Delete rule",
+    "r-new-rule-name": "New rule title",
+    "r-no-rules": "No rules",
+    "r-when-a-card": "When a card",
+    "r-is": "is",
+    "r-is-moved": "is moved",
+    "r-added-to": "added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "the board",
+    "r-list": "list",
+    "set-filter": "Set Filter",
+    "r-moved-to": "Moved to",
+    "r-moved-from": "Moved from",
+    "r-archived": "Moved to Archive",
+    "r-unarchived": "Restored from Archive",
+    "r-a-card": "a card",
+    "r-when-a-label-is": "When a label is",
+    "r-when-the-label-is": "When the label is",
+    "r-list-name": "list name",
+    "r-when-a-member": "When a member is",
+    "r-when-the-member": "When the member",
+    "r-name": "name",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "r-when-the-item": "When the checklist item",
+    "r-checked": "Checked",
+    "r-unchecked": "Unchecked",
+    "r-move-card-to": "Move card to",
+    "r-top-of": "Top of",
+    "r-bottom-of": "Bottom of",
+    "r-its-list": "its list",
+    "r-archive": "Move to Archive",
+    "r-unarchive": "Restore from Archive",
+    "r-card": "card",
+    "r-add": "Tinye",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-set-color": "Set color to",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "subject",
+    "r-rule-details": "Rule details",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Move card to top of list",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Move card to bottom of list",
+    "r-d-send-email": "Send email",
+    "r-d-send-email-to": "to",
+    "r-d-send-email-subject": "subject",
+    "r-d-send-email-message": "message",
+    "r-d-archive": "Move card to Archive",
+    "r-d-unarchive": "Restore card from Archive",
+    "r-d-add-label": "Add label",
+    "r-d-remove-label": "Remove label",
+    "r-create-card": "Create new card",
+    "r-in-list": "in list",
+    "r-in-swimlane": "in swimlane",
+    "r-d-add-member": "Add member",
+    "r-d-remove-member": "Remove member",
+    "r-d-remove-all-member": "Remove all member",
+    "r-d-check-all": "Check all items of a list",
+    "r-d-uncheck-all": "Uncheck all items of a list",
+    "r-d-check-one": "Check item",
+    "r-d-uncheck-one": "Uncheck item",
+    "r-d-check-of-list": "of checklist",
+    "r-d-add-checklist": "Add checklist",
+    "r-d-remove-checklist": "Remove checklist",
+    "r-by": "by",
+    "r-add-checklist": "Add checklist",
+    "r-with-items": "with items",
+    "r-items-list": "item1,item2,item3",
+    "r-add-swimlane": "Add swimlane",
+    "r-swimlane-name": "swimlane name",
+    "r-board-note": "Note: leave a field empty to match every possible value.",
+    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout",
+    "hide-logo": "Hide Logo",
+    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
+    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
+    "error-undefined": "Something went wrong",
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
+}
\ No newline at end of file
diff --git a/i18n/it.i18n.json b/i18n/it.i18n.json
index 9229c2e8..fc40233a 100644
--- a/i18n/it.i18n.json
+++ b/i18n/it.i18n.json
@@ -1,35 +1,51 @@
 {
     "accept": "Accetta",
-    "act-activity-notify": "[Wekan] Notifiche attività",
-    "act-addAttachment": "ha allegato __attachment__ a __card__",
-    "act-addChecklist": "aggiunta checklist __checklist__ a __card__",
-    "act-addChecklistItem": "aggiunto __checklistItem__ alla checklist __checklist__ su __card__",
-    "act-addComment": "ha commentato su __card__: __comment__",
-    "act-createBoard": "ha creato __board__",
-    "act-createCard": "ha aggiunto __card__ a __list__",
-    "act-createList": "ha aggiunto __list__ a __board__",
-    "act-addBoardMember": "ha aggiunto __member__ a __board__",
-    "act-archivedBoard": "__board__ spostata nel cestino",
-    "act-archivedCard": "__card__ spostata nel cestino",
-    "act-archivedList": "__list__ spostata nel cestino",
-    "act-archivedSwimlane": "__swimlane__ spostata nel cestino",
-    "act-importBoard": "ha importato __board__",
-    "act-importCard": "ha importato __card__",
-    "act-importList": "ha importato __list__",
-    "act-joinMember": "ha aggiunto __member__ a __card__",
-    "act-moveCard": "ha spostato __card__ da __oldList__ a __list__",
-    "act-removeBoardMember": "ha rimosso __member__ da __board__",
-    "act-restoredCard": "ha ripristinato __card__ su __board__",
-    "act-unjoinMember": "ha rimosso __member__ da __card__",
-    "act-withBoardTitle": "[Wekan] __board__",
+    "act-activity-notify": "Notifica attività",
+    "act-addAttachment": "aggiunto allegato __attachment__ alla scheda __card__ della lista __list__ della corsia __swimlane__  nella bacheca __board__",
+    "act-deleteAttachment": "eliminato allegato __attachment__ dalla scheda __card__ della lista __list__ della corsia __swimlane__  nella bacheca __board__",
+    "act-addSubtask": "aggiunto sottotask __subtask__ alla scheda __card__ della lista __list__ della corsia __swimlane__  nella bacheca __board__",
+    "act-addLabel": "aggiunta etichetta __label__ alla scheda __card__ della lista __list__ della corsia __swimlane__  nella bacheca __board__",
+    "act-addedLabel": "aggiunta etichetta __label__ alla scheda __card__ della lista __list__ della corsia __swimlane__  nella bacheca __board__",
+    "act-removeLabel": "rimossa etichetta __label__ dalla scheda __card__ della lista __list__ della corsia __swimlane__  nella bacheca __board__",
+    "act-removedLabel": "rimossa etichetta __label__ dalla scheda __card__ della lista __list__ della corsia __swimlane__  nella bacheca __board__",
+    "act-addChecklist": "aggiunta lista di controllo __label__ alla scheda __card__ della lista __list__ della corsia __swimlane__  nella bacheca __board__",
+    "act-addChecklistItem": "aggiunto elemento __checklistItem__ alla lista di controllo __checklist__ della scheda __card__ della lista __list__ della corsia __swimlane__  nella bacheca __board__",
+    "act-removeChecklist": "rimossa lista di controllo __checklist__ dalla scheda __card__ della lista __list__ della corsia __swimlane__  nella bacheca __board__",
+    "act-removeChecklistItem": "rimosso elemento __checklistitem__ dalla lista di controllo __checkList__ della scheda __card__ della lista __list__ della corsia __swimlane__  nella bacheca __board__",
+    "act-checkedItem": "attivato __checklistitem__ nella lista di controllo __checklist__ della scheda __card__ della lista __list__ della corsia __swimlane__ nella bacheca __board__",
+    "act-uncheckedItem": "disattivato __checklistItem__ della lista di controllo __checklist__ dalla scheda __card__ della lista __list__ della corsia __swimlane__ nella bacheca __board__",
+    "act-completeChecklist": "completata lista di controllo __checklist__  nella scheda __card__ della lista __list__ della corsia __swimlane__ nella bacheca __board__",
+    "act-uncompleteChecklist": "lista di controllo __checklist__ incompleta nella scheda __card__ della lista __list__ in corsia __swimlane__ della bacheca __board__",
+    "act-addComment": "commento sulla scheda __card__: __comment__ nella lista __list__ della corsia __swimlane__ della bacheca __board__",
+    "act-createBoard": "bacheca __board__ creata",
+    "act-createSwimlane": "creata corsia __swimlane__ alla bacheca __board__",
+    "act-createCard": "scheda __card__ creata nella lista __list__ della corsia __swimlane__ della bacheca __board__",
+    "act-createCustomField": "campo personalizzato __customField__ creato nella scheda __card__ della lista __list__ in corsia __swimlane__ della bacheca __board__",
+    "act-createList": "aggiunta lista __list__ alla bacheca __board__",
+    "act-addBoardMember": "aggiunto membro __member__ alla bacheca __board__",
+    "act-archivedBoard": "Bacheca __board__ archiviata",
+    "act-archivedCard": "Scheda __card__ della lista __list__ della corsia __swimlane__ della bacheca __board__ archiviata",
+    "act-archivedList": "Lista __list__ della corsia __swimlane__ della bacheca __board__ archiviata",
+    "act-archivedSwimlane": "Corsia __swimlane__ della bacheca __board__ archiviata",
+    "act-importBoard": "Bacheca __board__ importata",
+    "act-importCard": "scheda importata  __card__ nella lista __list__ della corsia __swimlane__ della bacheca __board__",
+    "act-importList": "lista __list__ importata nella corsia __swimlane__ della bacheca __board__",
+    "act-joinMember": "aggiunto membro __member__  alla scheda __card__ della list __list__ nella corsia __swimlane__ della bacheca __board__",
+    "act-moveCard": "spostata scheda __card__ della bacheca __board__ dalla lista __oldList__ della corsia  __oldSwimlane__ alla lista __list__ della corsia __swimlane__",
+    "act-moveCardToOtherBoard": "postata scheda __card__ dalla lista __oldList__ della corsia __oldSwimlane__ della bacheca __oldBoard__ alla lista __list__ nella corsia __swimlane__ della bacheca __board__",
+    "act-removeBoardMember": "rimosso membro __member__ dalla bacheca __board__",
+    "act-restoredCard": "scheda ripristinata __card__ della lista __list__ nella corsia __swimlane__ della bacheca __board__",
+    "act-unjoinMember": "rimosso membro __member__ dalla scheda __card__ della lista __list__ della corsia __swimlane__ nella bacheca __board__",
+    "act-withBoardTitle": "__board__",
     "act-withCardTitle": "[__board__] __card__",
     "actions": "Azioni",
     "activities": "Attività",
     "activity": "Attività",
     "activity-added": "ha aggiunto %s a %s",
-    "activity-archived": "%s spostato nel cestino",
+    "activity-archived": "%s spostato nell'archivio",
     "activity-attached": "allegato %s a %s",
     "activity-created": "creato %s",
+    "activity-customfield-created": "%s creato come campo personalizzato",
     "activity-excluded": "escluso %s da %s",
     "activity-imported": "importato %s in %s da %s",
     "activity-imported-board": "importato %s da %s",
@@ -39,13 +55,25 @@
     "activity-removed": "rimosso %s da %s",
     "activity-sent": "inviato %s a %s",
     "activity-unjoined": "ha abbandonato %s",
+    "activity-subtask-added": "aggiunto il sottocompito a 1%s",
+    "activity-checked-item": " selezionata %s nella checklist %s di %s",
+    "activity-unchecked-item": "disattivato %s nella checklist %s di %s",
     "activity-checklist-added": "aggiunta checklist a %s",
+    "activity-checklist-removed": "È stata rimossa una checklist da%s",
+    "activity-checklist-completed": "checklist  __checklist__ completata nella scheda __card__ della lista __list__ della corsia __swimlane__  nella bacheca __board__",
+    "activity-checklist-uncompleted": "La checklist non è stata completata",
     "activity-checklist-item-added": "Aggiunto l'elemento checklist a '%s' in %s",
+    "activity-checklist-item-removed": "è stato rimosso un elemento della checklist da '%s' in %s",
     "add": "Aggiungere",
+    "activity-checked-item-card": "%s è stato selezionato nella checklist %s",
+    "activity-unchecked-item-card": "%s è stato deselezionato nella  checklist %s",
+    "activity-checklist-completed-card": "checklist  __label__ completata nella scheda __card__ della lista __list__ della corsia __swimlane__  nella bacheca __board__",
+    "activity-checklist-uncompleted-card": "La checklist %s non è completa",
     "add-attachment": "Aggiungi Allegato",
     "add-board": "Aggiungi Bacheca",
     "add-card": "Aggiungi Scheda",
-    "add-swimlane": "Aggiungi Corsia",
+    "add-swimlane": "Aggiungi Diagramma Swimlane",
+    "add-subtask": "Aggiungi sotto-compito",
     "add-checklist": "Aggiungi Checklist",
     "add-checklist-item": "Aggiungi un elemento alla checklist",
     "add-cover": "Aggiungi copertina",
@@ -63,20 +91,22 @@
     "and-n-other-card": "E __count__ altra scheda",
     "and-n-other-card_plural": "E __count__ altre schede",
     "apply": "Applica",
-    "app-is-offline": "Wekan è in caricamento, attendi per favore. Ricaricare la pagina causerà una perdita di dati. Se Wekan non si carica, controlla per favore che non ci siano problemi al server.",
-    "archive": "Sposta nel cestino",
-    "archive-all": "Sposta tutto nel cestino",
-    "archive-board": "Sposta la bacheca nel cestino",
-    "archive-card": "Sposta la scheda nel cestino",
-    "archive-list": "Sposta la lista nel cestino",
-    "archive-swimlane": "Sposta la corsia nel cestino",
-    "archive-selection": "Sposta la selezione nel cestino",
-    "archiveBoardPopup-title": "Sposta la bacheca nel cestino",
-    "archived-items": "Cestino",
-    "archived-boards": "Bacheche cestinate",
+    "app-is-offline": "Caricamento, attendere prego. Aggiornare la pagina porterà ad una perdita dei dati. Se il caricamento non dovesse funzionare, per favore controlla che il server non sia stato fermato.",
+    "archive": "Sposta nell'Archivio",
+    "archive-all": "Sposta tutto nell'Archivio",
+    "archive-board": "Sposta la bacheca nell'Archivio",
+    "archive-card": "Sposta la scheda nell'Archivio",
+    "archive-list": "Sposta elenco nell'Archivio",
+    "archive-swimlane": "Sposta diagramma nell'Archivio",
+    "archive-selection": "Sposta la selezione nell'archivio",
+    "archiveBoardPopup-title": "Spostare al bacheca nell'archivio?",
+    "archived-items": "Archivia",
+    "archived-boards": "Bacheche nell'archivio",
     "restore-board": "Ripristina Bacheca",
-    "no-archived-boards": "Nessuna bacheca nel cestino",
-    "archives": "Cestino",
+    "no-archived-boards": "Nessuna bacheca presente nell'archivio",
+    "archives": "Archivia",
+    "template": "Template",
+    "templates": "Templates",
     "assign-member": "Aggiungi membro",
     "attached": "allegato",
     "attachment": "Allegato",
@@ -95,22 +125,25 @@
     "boardChangeTitlePopup-title": "Rinomina bacheca",
     "boardChangeVisibilityPopup-title": "Cambia visibilità",
     "boardChangeWatchPopup-title": "Cambia faccia",
-    "boardMenuPopup-title": "Menu bacheca",
+    "boardMenuPopup-title": "Impostazioni bacheca",
     "boards": "Bacheche",
     "board-view": "Visualizza bacheca",
-    "board-view-swimlanes": "Corsie",
+    "board-view-cal": "Calendario",
+    "board-view-swimlanes": "Diagramma Swimlane",
     "board-view-lists": "Liste",
     "bucket-example": "Per esempio come \"una lista di cose da fare\"",
     "cancel": "Cancella",
-    "card-archived": "Questa scheda è stata spostata nel cestino.",
+    "card-archived": "Questa scheda è stata spostata nell'archivio",
+    "board-archived": "Questa bacheca è stata spostata nell'archivio",
     "card-comments-title": "Questa scheda ha %s commenti.",
     "card-delete-notice": "L'eliminazione è permanente. Tutte le azioni associate a questa scheda andranno perse.",
     "card-delete-pop": "Tutte le azioni saranno rimosse dal flusso attività e non sarai in grado di riaprire la scheda. Non potrai tornare indietro.",
-    "card-delete-suggest-archive": "Puoi cestinare una scheda per rimuoverla dalla bacheca e preservare la sua attività.",
+    "card-delete-suggest-archive": "Puoi spostare una scheda nell'archivio per rimuoverla dalla bacheca e mantenere la sua attività",
     "card-due": "Scadenza",
     "card-due-on": "Scade",
     "card-spent": "Tempo trascorso",
     "card-edit-attachments": "Modifica allegati",
+    "card-edit-custom-fields": "Modifica campo personalizzato",
     "card-edit-labels": "Modifica etichette",
     "card-edit-members": "Modifica membri",
     "card-labels-title": "Cambia le etichette per questa scheda.",
@@ -118,13 +151,20 @@
     "card-start": "Inizio",
     "card-start-on": "Inizia",
     "cardAttachmentsPopup-title": "Allega da",
+    "cardCustomField-datePopup-title": "Cambia data",
+    "cardCustomFieldsPopup-title": "Modifica campo personalizzato",
     "cardDeletePopup-title": "Elimina scheda?",
     "cardDetailsActionsPopup-title": "Azioni scheda",
     "cardLabelsPopup-title": "Etichette",
     "cardMembersPopup-title": "Membri",
     "cardMorePopup-title": "Altro",
+    "cardTemplatePopup-title": "Crea un template",
     "cards": "Schede",
     "cards-count": "Schede",
+    "casSignIn": "Entra con CAS",
+    "cardType-card": "Scheda",
+    "cardType-linkedCard": "Scheda collegata",
+    "cardType-linkedBoard": "Bacheca collegata",
     "change": "Cambia",
     "change-avatar": "Cambia avatar",
     "change-password": "Cambia password",
@@ -135,30 +175,52 @@
     "changePasswordPopup-title": "Cambia password",
     "changePermissionsPopup-title": "Cambia permessi",
     "changeSettingsPopup-title": "Cambia impostazioni",
+    "subtasks": "Sotto-compiti",
     "checklists": "Checklist",
     "click-to-star": "Clicca per stellare questa bacheca",
     "click-to-unstar": "Clicca per togliere la stella da questa bacheca",
     "clipboard": "Clipboard o drag & drop",
     "close": "Chiudi",
     "close-board": "Chiudi bacheca",
-    "close-board-pop": "Sarai in grado di ripristinare la bacheca cliccando il tasto \"Cestino\" dall'intestazione della pagina principale.",
+    "close-board-pop": "Potrai ripristinare la bacheca cliccando sul tasto \"Archivio\"  presente nell'intestazione della home.",
     "color-black": "nero",
     "color-blue": "blu",
+    "color-crimson": "Rosso cremisi",
+    "color-darkgreen": "Verde scuro",
+    "color-gold": "Dorato",
+    "color-gray": "Grigio",
     "color-green": "verde",
+    "color-indigo": "Indaco",
     "color-lime": "lime",
+    "color-magenta": "Magenta",
+    "color-mistyrose": "Mistyrose",
+    "color-navy": "Navy",
     "color-orange": "arancione",
+    "color-paleturquoise": "Turchese chiaro",
+    "color-peachpuff": "Pesca",
     "color-pink": "rosa",
+    "color-plum": "Prugna",
     "color-purple": "viola",
     "color-red": "rosso",
+    "color-saddlebrown": "Saddlebrown",
+    "color-silver": "Argento",
     "color-sky": "azzurro",
+    "color-slateblue": "Ardesia",
+    "color-white": "Bianco",
     "color-yellow": "giallo",
+    "unset-color": "Non impostato",
     "comment": "Commento",
     "comment-placeholder": "Scrivi Commento",
     "comment-only": "Solo commenti",
     "comment-only-desc": "Puoi commentare solo le schede.",
+    "no-comments": "Non ci sono commenti.",
+    "no-comments-desc": "Impossibile visualizzare commenti o attività.",
     "computer": "Computer",
-    "confirm-checklist-delete-dialog": "Sei sicuro di voler cancellare questa checklist?",
+    "confirm-subtask-delete-dialog": "Sei sicuro di voler eliminare il sotto-compito?",
+    "confirm-checklist-delete-dialog": "Sei sicuro di voler eliminare la checklist?",
     "copy-card-link-to-clipboard": "Copia link della scheda sulla clipboard",
+    "linkCardPopup-title": "Collega scheda",
+    "searchElementPopup-title": "Cerca",
     "copyCardPopup-title": "Copia Scheda",
     "copyChecklistToManyCardsPopup-title": "Copia template checklist su più schede",
     "copyChecklistToManyCardsPopup-instructions": "Titolo e la descrizione della scheda di destinazione in questo formato JSON",
@@ -167,11 +229,25 @@
     "createBoardPopup-title": "Crea bacheca",
     "chooseBoardSourcePopup-title": "Importa bacheca",
     "createLabelPopup-title": "Crea etichetta",
+    "createCustomField": "Crea campo",
+    "createCustomFieldPopup-title": "Crea campo",
     "current": "corrente",
+    "custom-field-delete-pop": "Non potrai tornare indietro. Questa azione rimuoverà questo campo personalizzato da tutte le schede ed eliminerà ogni sua traccia.",
+    "custom-field-checkbox": "Casella di scelta",
+    "custom-field-date": "Data",
+    "custom-field-dropdown": "Lista a discesa",
+    "custom-field-dropdown-none": "(niente)",
+    "custom-field-dropdown-options": "Lista opzioni",
+    "custom-field-dropdown-options-placeholder": "Premi invio per aggiungere altre opzioni",
+    "custom-field-dropdown-unknown": "(sconosciuto)",
+    "custom-field-number": "Numero",
+    "custom-field-text": "Testo",
+    "custom-fields": "Campi personalizzati",
     "date": "Data",
     "decline": "Declina",
     "default-avatar": "Avatar predefinito",
     "delete": "Elimina",
+    "deleteCustomFieldPopup-title": "Elimina il campo personalizzato?",
     "deleteLabelPopup-title": "Eliminare etichetta?",
     "description": "Descrizione",
     "disambiguateMultiLabelPopup-title": "Disambiguare l'azione Etichetta",
@@ -186,6 +262,7 @@
     "soft-wip-limit": "Limite Work in progress soft",
     "editCardStartDatePopup-title": "Cambia data di inizio",
     "editCardDueDatePopup-title": "Cambia data di scadenza",
+    "editCustomFieldPopup-title": "Modifica campo",
     "editCardSpentTimePopup-title": "Cambia tempo trascorso",
     "editLabelPopup-title": "Cambia etichetta",
     "editNotificationPopup-title": "Modifica notifiche",
@@ -222,30 +299,36 @@
     "filter-clear": "Pulisci filtri",
     "filter-no-label": "Nessuna etichetta",
     "filter-no-member": "Nessun membro",
+    "filter-no-custom-fields": "Nessun campo personalizzato",
     "filter-on": "Il filtro è attivo",
     "filter-on-desc": "Stai filtrando le schede su questa bacheca. Clicca qui per modificare il filtro,",
     "filter-to-selection": "Seleziona",
+    "advanced-filter-label": "Filtro avanzato",
+    "advanced-filter-description": "Il filtro avanzato permette di scrivere una stringa contenente i seguenti operatori: == != <= >= && || ( ) Uno spazio è usato come separatore tra gli operatori. Si può filtrare per tutti i campi personalizzati, scrivendo i loro nomi e valori. Per esempio: Campo1 == Valore1. Nota: Se i campi o i valori contengono spazi, è necessario incapsularli all'interno di paici singoli. Per esempio: 'Campo 1' == 'Valore 1'. Per i singoli caratteri di controllo (' V) che devono essere ignorati, si può usare \\. Per esempio: C1 == Campo1 == L'\\ho. Si possono anche combinare condizioni multiple. Per esempio: C1 == V1 || C1 ==V2. Di norma tutti gli operatori vengono lettti da sinistra a destra. Si può cambiare l'ordine posizionando delle parentesi. Per esempio: C1 == V1 && ( C2 == V2 || C2 == V3) . Inoltre è possibile cercare nei campi di testo usando le espressioni regolari (n.d.t. regex): F1 ==/Tes.*/i",
     "fullname": "Nome completo",
     "header-logo-title": "Torna alla tua bacheca.",
     "hide-system-messages": "Nascondi i messaggi di sistema",
     "headerBarCreateBoardPopup-title": "Crea bacheca",
     "home": "Home",
     "import": "Importa",
+    "link": "Collegamento",
     "import-board": "Importa bacheca",
     "import-board-c": "Importa bacheca",
     "import-board-title-trello": "Importa una bacheca da Trello",
-    "import-board-title-wekan": "Importa bacheca da Wekan",
+    "import-board-title-wekan": "Importa bacheca dall'esportazione precedente",
+    "import-sandstorm-backup-warning": "Non cancellare i dati che importi dalla bacheca esportata in origine o da Trello prima che il controllo finisca e si riapra ancora, altrimenti otterrai un messaggio di errore Bacheca non trovata, che significa che i dati sono perduti.",
     "import-sandstorm-warning": "La bacheca importata cancellerà tutti i dati esistenti su questa bacheca e li rimpiazzerà con quelli della bacheca importata.",
     "from-trello": "Da Trello",
-    "from-wekan": "Da Wekan",
+    "from-wekan": "Dall'esportazione precedente",
     "import-board-instruction-trello": "Nella tua bacheca Trello vai a 'Menu', poi 'Altro', 'Stampa ed esporta', 'Esporta JSON', e copia il testo che compare.",
-    "import-board-instruction-wekan": "Nella tua bacheca Wekan, vai su 'Menu', poi 'Esporta bacheca', e copia il testo nel file scaricato.",
+    "import-board-instruction-wekan": "Nella tua bacheca vai su \"Menu\", poi \"Esporta la bacheca\", e copia il testo nel file scaricato",
+    "import-board-instruction-about-errors": "Se hai degli errori quando importi una bacheca, qualche volta l'importazione funziona comunque, e la bacheca si trova nella pagina \"Tutte le bacheche\"",
     "import-json-placeholder": "Incolla un JSON valido qui",
     "import-map-members": "Mappatura dei membri",
-    "import-members-map": "La bacheca che hai importato ha alcuni membri. Per favore scegli i membri che vuoi vengano importati negli utenti di Wekan",
+    "import-members-map": "La bacheca che hai importato contiene alcuni membri. Per favore scegli i membri che vuoi importare tra i tuoi utenti",
     "import-show-user-mapping": "Rivedi la mappatura dei membri",
-    "import-user-select": "Scegli l'utente Wekan che vuoi utilizzare come questo membro",
-    "importMapMembersAddPopup-title": "Seleziona i membri di Wekan",
+    "import-user-select": "Scegli l'utente che vuoi venga utilizzato come questo membro",
+    "importMapMembersAddPopup-title": "Scegli membro",
     "info": "Versione",
     "initials": "Iniziali",
     "invalid-date": "Data non valida",
@@ -264,19 +347,21 @@
     "leave-board-pop": "Sei sicuro di voler abbandonare __boardTitle__? Sarai rimosso da tutte le schede in questa bacheca.",
     "leaveBoardPopup-title": "Abbandona Bacheca?",
     "link-card": "Link a questa scheda",
-    "list-archive-cards": "Cestina tutte le schede in questa lista",
-    "list-archive-cards-pop": "Questo rimuoverà dalla bacheca tutte le schede in questa lista. Per vedere le schede cestinate e portarle indietro alla bacheca, clicca “Menu” > “Elementi cestinati”",
+    "list-archive-cards": "Sposta tutte le schede in questo elenco nell'Archivio",
+    "list-archive-cards-pop": "Questo rimuoverà tutte le schede nell'elenco dalla bacheca. Per vedere le schede nell'archivio e portarle dov'erano  nella bacheca, clicca su \"Menu\"  > \"Archivio\". ",
     "list-move-cards": "Sposta tutte le schede in questa lista",
     "list-select-cards": "Selezione tutte le schede in questa lista",
+    "set-color-list": "Imposta un colore",
     "listActionPopup-title": "Azioni disponibili",
-    "swimlaneActionPopup-title": "Azioni corsia",
+    "swimlaneActionPopup-title": "Azioni diagramma Swimlane",
+    "swimlaneAddPopup-title": "Aggiungi un diagramma Swimlane di seguito",
     "listImportCardPopup-title": "Importa una scheda di Trello",
     "listMorePopup-title": "Altro",
     "link-list": "Link a questa lista",
     "list-delete-pop": "Tutte le azioni saranno rimosse dal flusso attività e non sarai in grado di recuperare la lista. Non potrai tornare indietro.",
-    "list-delete-suggest-archive": "Puoi cestinare una scheda per rimuoverla dalla bacheca e preservare la sua attività.",
+    "list-delete-suggest-archive": "Puoi spostare un elenco nell'archivio per rimuoverlo dalla bacheca e mantentere la sua attività.",
     "lists": "Liste",
-    "swimlanes": "Corsie",
+    "swimlanes": "Diagramma Swimlane",
     "log-out": "Log Out",
     "log-in": "Log In",
     "loginPopup-title": "Log In",
@@ -294,9 +379,9 @@
     "muted-info": "Non sarai mai notificato delle modifiche in questa bacheca",
     "my-boards": "Le mie bacheche",
     "name": "Nome",
-    "no-archived-cards": "Nessuna scheda nel cestino",
-    "no-archived-lists": "Nessuna lista nel cestino",
-    "no-archived-swimlanes": "Nessuna corsia nel cestino",
+    "no-archived-cards": "Non ci sono schede nell'archivio.",
+    "no-archived-lists": "Non ci sono elenchi nell'archivio.",
+    "no-archived-swimlanes": "Non ci sono diagrammi Swimlane nell'archivio.",
     "no-results": "Nessun risultato",
     "normal": "Normale",
     "normal-desc": "Può visionare e modificare le schede. Non può cambiare le impostazioni.",
@@ -332,6 +417,7 @@
     "restore": "Ripristina",
     "save": "Salva",
     "search": "Cerca",
+    "rules": "Regole",
     "search-cards": "Ricerca per titolo e descrizione scheda su questa bacheca",
     "search-example": "Testo da ricercare?",
     "select-color": "Seleziona Colore",
@@ -366,6 +452,7 @@
     "title": "Titolo",
     "tracking": "Monitoraggio",
     "tracking-info": "Sarai notificato per tutte le modifiche alle schede delle quali sei creatore o membro.",
+    "type": "Tipo",
     "unassign-member": "Rimuovi membro",
     "unsaved-description": "Hai una descrizione non salvata",
     "unwatch": "Non seguire",
@@ -374,7 +461,7 @@
     "uploaded-avatar": "Avatar caricato",
     "username": "Username",
     "view-it": "Vedi",
-    "warn-list-archived": "attenzione: questa scheda è in una lista cestinata",
+    "warn-list-archived": "Attenzione:questa scheda si trova in un elenco dell'archivio",
     "watch": "Segui",
     "watching": "Stai seguendo",
     "watching-info": "Sarai notificato per tutte le modifiche in questa bacheca",
@@ -382,6 +469,9 @@
     "welcome-swimlane": "Pietra miliare 1",
     "welcome-list1": "Basi",
     "welcome-list2": "Avanzate",
+    "card-templates-swimlane": "Template scheda",
+    "list-templates-swimlane": "Elenca i template",
+    "board-templates-swimlane": "Bacheca dei template",
     "what-to-do": "Cosa vuoi fare?",
     "wipLimitErrorPopup-title": "Limite work in progress non valido. ",
     "wipLimitErrorPopup-dialog-pt1": "Il numero di compiti in questa lista è maggiore del limite di work in progress che hai definito in precedenza. ",
@@ -393,7 +483,7 @@
     "disable-self-registration": "Disabilita Auto-registrazione",
     "invite": "Invita",
     "invite-people": "Invita persone",
-    "to-boards": "torna alle bacheche(a)",
+    "to-boards": "Alla(e) bacheca",
     "email-addresses": "Indirizzi email",
     "smtp-host-description": "L'indirizzo del server SMTP che gestisce le tue email.",
     "smtp-port-description": "La porta che il tuo server SMTP utilizza per le email in uscita.",
@@ -407,16 +497,16 @@
     "send-smtp-test": "Invia un'email di test a te stesso",
     "invitation-code": "Codice d'invito",
     "email-invite-register-subject": "__inviter__ ti ha inviato un invito",
-    "email-invite-register-text": "Gentile __user__,\n\n__inviter__ ti ha invitato su Wekan per collaborare.\n\nPer favore segui il link qui sotto:\n__url__\n\nIl tuo codice d'invito è: __icode__\n\nGrazie.",
-    "email-smtp-test-subject": "Test invio email SMTP per Wekan",
+    "email-invite-register-text": "Gentile __user__,\n\n__inviter__ ti ha invitato a partecipare a questa bacheca kanban per collaborare.\n\nPer favore segui il collegamento qui sotto:\n__url__\n\nIl tuo codice di invito è: __icode__\n\nGrazie.",
+    "email-smtp-test-subject": "E-Mail di prova SMTP",
     "email-smtp-test-text": "Hai inviato un'email con successo",
     "error-invitation-code-not-exist": "Il codice d'invito non esiste",
     "error-notAuthorized": "Non sei autorizzato ad accedere a questa pagina.",
     "outgoing-webhooks": "Server esterni",
     "outgoingWebhooksPopup-title": "Server esterni",
+    "boardCardTitlePopup-title": "Filtro per Titolo Scheda",
     "new-outgoing-webhook": "Nuovo webhook in uscita",
     "no-name": "(Sconosciuto)",
-    "Wekan_version": "Versione di Wekan",
     "Node_version": "Versione di Node",
     "OS_Arch": "Architettura del sistema operativo",
     "OS_Cpus": "Conteggio della CPU del sistema operativo",
@@ -427,13 +517,18 @@
     "OS_Totalmem": "Memoria totale del sistema operativo ",
     "OS_Type": "Tipo di sistema operativo ",
     "OS_Uptime": "Tempo di attività del sistema operativo. ",
+    "days": "giorni",
     "hours": "ore",
     "minutes": "minuti",
     "seconds": "secondi",
+    "show-field-on-card": "Visualizza questo campo sulla scheda",
+    "automatically-field-on-card": "Crea automaticamente i campi per tutte le schede",
+    "showLabel-field-on-card": "Mostra l'etichetta di campo su minischeda",
     "yes": "Sì",
     "no": "No",
     "accounts": "Profili",
     "accounts-allowEmailChange": "Permetti modifica dell'email",
+    "accounts-allowUserNameChange": "Consenti la modifica del nome utente",
     "createdAt": "creato alle",
     "verified": "Verificato",
     "active": "Attivo",
@@ -442,5 +537,157 @@
     "card-end": "Fine",
     "card-end-on": "Termina il",
     "editCardReceivedDatePopup-title": "Cambia data ricezione",
-    "editCardEndDatePopup-title": "Cambia data finale"
-}
+    "editCardEndDatePopup-title": "Cambia data finale",
+    "setCardColorPopup-title": "Imposta il colore",
+    "setCardActionsColorPopup-title": "Scegli un colore",
+    "setSwimlaneColorPopup-title": "Scegli un colore",
+    "setListColorPopup-title": "Scegli un colore",
+    "assigned-by": "Assegnato da",
+    "requested-by": "Richiesto da",
+    "board-delete-notice": "L'eliminazione è permanente. Tutte le azioni, liste e schede associate a questa bacheca andranno perse.",
+    "delete-board-confirm-popup": "Tutte le liste, schede, etichette e azioni saranno rimosse e non sarai più in grado di recuperare il contenuto della bacheca. L'azione non è annullabile.",
+    "boardDeletePopup-title": "Eliminare la bacheca?",
+    "delete-board": "Elimina bacheca",
+    "default-subtasks-board": "Sottocompiti per la bacheca __board__",
+    "default": "Predefinito",
+    "queue": "Coda",
+    "subtask-settings": "Impostazioni sotto-compiti",
+    "boardSubtaskSettingsPopup-title": "Impostazioni sotto-compiti della bacheca",
+    "show-subtasks-field": "Le schede posso avere dei sotto-compiti",
+    "deposit-subtasks-board": "Deposita i sotto compiti in questa bacheca",
+    "deposit-subtasks-list": "Lista di destinaizoni per questi sotto-compiti",
+    "show-parent-in-minicard": "Mostra genirotri nelle mini schede:",
+    "prefix-with-full-path": "Prefisso con percorso completo",
+    "prefix-with-parent": "Prefisso con genitore",
+    "subtext-with-full-path": "Sottotesto con percorso completo",
+    "subtext-with-parent": "Sotto-testo con genitore",
+    "change-card-parent": "Cambia la scheda genitore",
+    "parent-card": "Scheda genitore",
+    "source-board": "Bacheca d'origine",
+    "no-parent": "Non mostrare i genitori",
+    "activity-added-label": "L' etichetta  '%s' è stata aggiunta a %s",
+    "activity-removed-label": "L'etichetta '%s' è stata rimossa da %s",
+    "activity-delete-attach": "Rimosso un allegato da %s",
+    "activity-added-label-card": "aggiunta etichetta '%s'",
+    "activity-removed-label-card": "L' etichetta '%s' è stata rimossa.",
+    "activity-delete-attach-card": "Cancella un allegato",
+    "activity-set-customfield": "imposta campo personalizzato '%s' a '%s' in %s",
+    "activity-unset-customfield": "campo personalizzato non impostato '%s' in %s",
+    "r-rule": "Ruolo",
+    "r-add-trigger": "Aggiungi trigger",
+    "r-add-action": "Aggiungi azione",
+    "r-board-rules": "Regole della bacheca",
+    "r-add-rule": "Aggiungi regola",
+    "r-view-rule": "Visualizza regola",
+    "r-delete-rule": "Cancella regola",
+    "r-new-rule-name": "Titolo nuova regola",
+    "r-no-rules": "Nessuna regola",
+    "r-when-a-card": "Quando una scheda",
+    "r-is": "è",
+    "r-is-moved": "viene spostata",
+    "r-added-to": "Aggiunto/a a ",
+    "r-removed-from": "Rimosso da",
+    "r-the-board": "La bacheca",
+    "r-list": "lista",
+    "set-filter": "Imposta un filtro",
+    "r-moved-to": "Spostato/a a ",
+    "r-moved-from": "Spostato/a da",
+    "r-archived": "Spostato/a nell'archivio",
+    "r-unarchived": "Ripristinato/a dall'archivio",
+    "r-a-card": "una scheda",
+    "r-when-a-label-is": "Quando un'etichetta viene",
+    "r-when-the-label-is": "Quando l'etichetta viene",
+    "r-list-name": "Nome dell'elenco",
+    "r-when-a-member": "Quando un membro viene",
+    "r-when-the-member": "Quando un membro viene",
+    "r-name": "nome",
+    "r-when-a-attach": "Quando un allegato",
+    "r-when-a-checklist": "Quando una checklist è",
+    "r-when-the-checklist": "Quando la checklist",
+    "r-completed": "Completato/a",
+    "r-made-incomplete": "Rendi incompleto",
+    "r-when-a-item": "Quando un elemento della checklist è",
+    "r-when-the-item": "Quando un elemento della checklist",
+    "r-checked": "Selezionato",
+    "r-unchecked": "Deselezionato",
+    "r-move-card-to": "Sposta scheda a",
+    "r-top-of": "Al di sopra di",
+    "r-bottom-of": "Al di sotto di",
+    "r-its-list": "il suo elenco",
+    "r-archive": "Sposta nell'Archivio",
+    "r-unarchive": "Ripristina dall'archivio",
+    "r-card": "scheda",
+    "r-add": "Aggiungere",
+    "r-remove": "Rimuovi",
+    "r-label": "etichetta",
+    "r-member": "membro",
+    "r-remove-all": "Rimuovi tutti i membri dalla scheda",
+    "r-set-color": "Imposta il colore a",
+    "r-checklist": "checklist",
+    "r-check-all": "Spunta tutti",
+    "r-uncheck-all": "Togli la spunta a tutti",
+    "r-items-check": "Elementi della checklist",
+    "r-check": "Spunta",
+    "r-uncheck": "Togli la spunta",
+    "r-item": "elemento",
+    "r-of-checklist": "della lista di cose da fare",
+    "r-send-email": "Invia un e-mail",
+    "r-to": "a",
+    "r-subject": "soggetto",
+    "r-rule-details": "Dettagli della regola",
+    "r-d-move-to-top-gen": "Sposta la scheda al di sopra del suo elenco",
+    "r-d-move-to-top-spec": "Sposta la scheda la di sopra dell'elenco",
+    "r-d-move-to-bottom-gen": "Sposta la scheda in fondo alla sua lista",
+    "r-d-move-to-bottom-spec": "Muovi la scheda in fondo alla lista",
+    "r-d-send-email": "Spedisci email",
+    "r-d-send-email-to": "a",
+    "r-d-send-email-subject": "soggetto",
+    "r-d-send-email-message": "Messaggio",
+    "r-d-archive": "Sposta la scheda nell'archivio",
+    "r-d-unarchive": "Ripristina la scheda dall'archivio",
+    "r-d-add-label": "Aggiungi etichetta",
+    "r-d-remove-label": "Rimuovi Etichetta",
+    "r-create-card": "Crea una nuova scheda",
+    "r-in-list": "in elenco",
+    "r-in-swimlane": "nel diagramma swimlane",
+    "r-d-add-member": "Aggiungi membro",
+    "r-d-remove-member": "Rimuovi membro",
+    "r-d-remove-all-member": "Rimouvi tutti i membri",
+    "r-d-check-all": "Seleziona tutti gli item di una lista",
+    "r-d-uncheck-all": "Deseleziona tutti gli items di una lista",
+    "r-d-check-one": "Seleziona",
+    "r-d-uncheck-one": "Deselezionalo",
+    "r-d-check-of-list": "della lista di cose da fare",
+    "r-d-add-checklist": "Aggiungi lista di cose da fare",
+    "r-d-remove-checklist": "Rimuovi check list",
+    "r-by": "da",
+    "r-add-checklist": "Aggiungi lista di cose da fare",
+    "r-with-items": "con elementi",
+    "r-items-list": "elemento1,elemento2,elemento3",
+    "r-add-swimlane": "Aggiungi un diagramma swimlane",
+    "r-swimlane-name": "Nome diagramma swimlane",
+    "r-board-note": "Nota: Lascia un campo vuoto per abbinare ogni possibile valore",
+    "r-checklist-note": "Nota: Gli elementi della checklist devono essere scritti come valori separati dalla virgola",
+    "r-when-a-card-is-moved": "Quando una scheda viene spostata su un'altra lista",
+    "ldap": "LDAP",
+    "oauth2": "Oauth2",
+    "cas": "CAS",
+    "authentication-method": "Metodo di Autenticazione",
+    "authentication-type": "Tipo Autenticazione",
+    "custom-product-name": "Nome prodotto personalizzato",
+    "layout": "Layout",
+    "hide-logo": "Nascondi il logo",
+    "add-custom-html-after-body-start": "Aggiungi codice HTML personalizzato dopo <body> inzio",
+    "add-custom-html-before-body-end": "Aggiunti il codice HTML prima di </body> fine",
+    "error-undefined": "Qualcosa è andato storto",
+    "error-ldap-login": "C'è stato un errore mentre provavi ad effettuare il login",
+    "display-authentication-method": "Mostra il metodo di autenticazione",
+    "default-authentication-method": "Metodo di autenticazione predefinito",
+    "duplicate-board": "Duplica bacheca",
+    "people-number": "Il numero di persone è:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
+}
\ No newline at end of file
diff --git a/i18n/ja.i18n.json b/i18n/ja.i18n.json
index 7c7db1b4..8891648d 100644
--- a/i18n/ja.i18n.json
+++ b/i18n/ja.i18n.json
@@ -1,35 +1,51 @@
 {
     "accept": "受け入れ",
-    "act-activity-notify": "[Wekan] アクティビティ通知",
-    "act-addAttachment": "__card__ に __attachment__ を添付しました",
-    "act-addChecklist": "added checklist __checklist__ to __card__",
-    "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__",
-    "act-addComment": "__card__: __comment__ をコメントしました",
-    "act-createBoard": "__board__ を作成しました",
-    "act-createCard": "__list__ に __card__ を追加しました",
-    "act-createList": "__board__ に __list__ を追加しました",
-    "act-addBoardMember": "__board__ に __member__ を追加しました",
-    "act-archivedBoard": "__board__ moved to Recycle Bin",
-    "act-archivedCard": "__card__ moved to Recycle Bin",
-    "act-archivedList": "__list__ moved to Recycle Bin",
-    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
-    "act-importBoard": "__board__ をインポートしました",
-    "act-importCard": "__card__ をインポートしました",
-    "act-importList": "__list__ をインポートしました",
-    "act-joinMember": "__card__ に __member__ を追加しました",
-    "act-moveCard": "__card__ を __oldList__ から __list__ に 移動しました",
-    "act-removeBoardMember": "__board__ から __member__ を削除しました",
-    "act-restoredCard": "__card__ を __board__ にリストアしました",
-    "act-unjoinMember": "__card__ から __member__ を削除しました",
-    "act-withBoardTitle": "[Wekan] __board__",
+    "act-activity-notify": "アクティビティ通知",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__board__",
     "act-withCardTitle": "[__board__] __card__",
     "actions": "操作",
     "activities": "アクティビティ",
     "activity": "アクティビティ",
     "activity-added": "%s を %s に追加しました",
-    "activity-archived": "%s moved to Recycle Bin",
+    "activity-archived": "%sをアーカイブしました",
     "activity-attached": "%s を %s に添付しました",
     "activity-created": "%s を作成しました",
+    "activity-customfield-created": "%s を作成しました",
     "activity-excluded": "%s を %s から除外しました",
     "activity-imported": "imported %s into %s from %s",
     "activity-imported-board": "imported %s from %s",
@@ -39,13 +55,25 @@
     "activity-removed": "%s を %s から削除しました",
     "activity-sent": "%s を %s に送りました",
     "activity-unjoined": "%s への参加を止めました",
+    "activity-subtask-added": "%sにサブタスクを追加しました",
+    "activity-checked-item": "checked %s in checklist %s of %s",
+    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
     "activity-checklist-added": "%s にチェックリストを追加しました",
+    "activity-checklist-removed": "removed a checklist from %s",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
     "activity-checklist-item-added": "added checklist item to '%s' in %s",
+    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
     "add": "追加",
+    "activity-checked-item-card": "checked %s in checklist %s",
+    "activity-unchecked-item-card": "unchecked %s in checklist %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
     "add-attachment": "添付ファイルを追加",
     "add-board": "ボードを追加",
     "add-card": "カードを追加",
-    "add-swimlane": "Add Swimlane",
+    "add-swimlane": "スイムレーンを追加",
+    "add-subtask": "Add Subtask",
     "add-checklist": "チェックリストを追加",
     "add-checklist-item": "チェックリストに項目を追加",
     "add-cover": "カバーの追加",
@@ -63,20 +91,22 @@
     "and-n-other-card": "And __count__ other card",
     "and-n-other-card_plural": "And __count__ other cards",
     "apply": "適用",
-    "app-is-offline": "現在オフラインです。ページを更新すると保存していないデータは失われます。",
-    "archive": "Move to Recycle Bin",
-    "archive-all": "Move All to Recycle Bin",
-    "archive-board": "Move Board to Recycle Bin",
-    "archive-card": "Move Card to Recycle Bin",
-    "archive-list": "Move List to Recycle Bin",
-    "archive-swimlane": "Move Swimlane to Recycle Bin",
-    "archive-selection": "Move selection to Recycle Bin",
-    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
-    "archived-items": "Recycle Bin",
-    "archived-boards": "Boards in Recycle Bin",
+    "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
+    "archive": "Move to Archive",
+    "archive-all": "Move All to Archive",
+    "archive-board": "Move Board to Archive",
+    "archive-card": "Move Card to Archive",
+    "archive-list": "Move List to Archive",
+    "archive-swimlane": "Move Swimlane to Archive",
+    "archive-selection": "Move selection to Archive",
+    "archiveBoardPopup-title": "Move Board to Archive?",
+    "archived-items": "アーカイブ",
+    "archived-boards": "Boards in Archive",
     "restore-board": "ボードをリストア",
-    "no-archived-boards": "No Boards in Recycle Bin.",
-    "archives": "Recycle Bin",
+    "no-archived-boards": "No Boards in Archive.",
+    "archives": "アーカイブ",
+    "template": "Template",
+    "templates": "Templates",
     "assign-member": "メンバーの割当",
     "attached": "添付されました",
     "attachment": "添付ファイル",
@@ -95,22 +125,25 @@
     "boardChangeTitlePopup-title": "ボード名の変更",
     "boardChangeVisibilityPopup-title": "公開範囲の変更",
     "boardChangeWatchPopup-title": "ウォッチの変更",
-    "boardMenuPopup-title": "ボードメニュー",
+    "boardMenuPopup-title": "Board Settings",
     "boards": "ボード",
     "board-view": "Board View",
-    "board-view-swimlanes": "Swimlanes",
+    "board-view-cal": "Calendar",
+    "board-view-swimlanes": "スイムレーン",
     "board-view-lists": "リスト",
-    "bucket-example": "Like “Bucket List” for example",
+    "bucket-example": "例：バケットリスト",
     "cancel": "キャンセル",
-    "card-archived": "This card is moved to Recycle Bin.",
+    "card-archived": "This card is moved to Archive.",
+    "board-archived": "This board is moved to Archive.",
     "card-comments-title": "%s 件のコメントがあります。",
     "card-delete-notice": "削除は取り消しできません。このカードに関係するすべてのアクションがなくなります。",
     "card-delete-pop": "すべての内容がアクティビティから削除されます。この削除は元に戻すことができません。",
-    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
     "card-due": "期限",
     "card-due-on": "期限日",
     "card-spent": "Spent Time",
     "card-edit-attachments": "添付ファイルの編集",
+    "card-edit-custom-fields": "カスタムフィールドの編集",
     "card-edit-labels": "ラベルの編集",
     "card-edit-members": "メンバーの編集",
     "card-labels-title": "カードのラベルを変更する",
@@ -118,13 +151,20 @@
     "card-start": "開始",
     "card-start-on": "開始日",
     "cardAttachmentsPopup-title": "Attach From",
+    "cardCustomField-datePopup-title": "Change date",
+    "cardCustomFieldsPopup-title": "カスタムフィールドの編集",
     "cardDeletePopup-title": "カードを削除しますか？",
     "cardDetailsActionsPopup-title": "カード操作",
     "cardLabelsPopup-title": "ラベル",
     "cardMembersPopup-title": "メンバー",
     "cardMorePopup-title": "さらに見る",
+    "cardTemplatePopup-title": "Create template",
     "cards": "カード",
     "cards-count": "カード",
+    "casSignIn": "Sign In with CAS",
+    "cardType-card": "カード",
+    "cardType-linkedCard": "Linked Card",
+    "cardType-linkedBoard": "Linked Board",
     "change": "変更",
     "change-avatar": "アバターの変更",
     "change-password": "パスワードの変更",
@@ -135,43 +175,79 @@
     "changePasswordPopup-title": "パスワードの変更",
     "changePermissionsPopup-title": "パーミッションの変更",
     "changeSettingsPopup-title": "設定の変更",
+    "subtasks": "サブタスク",
     "checklists": "チェックリスト",
     "click-to-star": "ボードにスターをつける",
     "click-to-unstar": "ボードからスターを外す",
     "clipboard": "クリップボードもしくはドラッグ＆ドロップ",
     "close": "閉じる",
     "close-board": "ボードを閉じる",
-    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
     "color-black": "黒",
     "color-blue": "青",
+    "color-crimson": "濃赤",
+    "color-darkgreen": "濃緑",
+    "color-gold": "金",
+    "color-gray": "灰",
     "color-green": "緑",
+    "color-indigo": "藍",
     "color-lime": "ライム",
+    "color-magenta": "マゼンタ",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "navy",
     "color-orange": "オレンジ",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
     "color-pink": "ピンク",
+    "color-plum": "plum",
     "color-purple": "紫",
     "color-red": "赤",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "銀",
     "color-sky": "空",
+    "color-slateblue": "slateblue",
+    "color-white": "白",
     "color-yellow": "黄",
+    "unset-color": "設定しない",
     "comment": "コメント",
     "comment-placeholder": "コメントを書く",
     "comment-only": "コメントのみ",
     "comment-only-desc": "カードにのみコメント可能",
+    "no-comments": "No comments",
+    "no-comments-desc": "Can not see comments and activities.",
     "computer": "コンピューター",
-    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist",
+    "confirm-subtask-delete-dialog": "本当にサブタスクを削除してもよろしいでしょうか？",
+    "confirm-checklist-delete-dialog": "本当にチェックリストを削除してもよろしいでしょうか？",
     "copy-card-link-to-clipboard": "カードへのリンクをクリップボードにコピー",
+    "linkCardPopup-title": "Link Card",
+    "searchElementPopup-title": "検索",
     "copyCardPopup-title": "カードをコピー",
     "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
     "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
-    "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"First card title\", \"description\":\"First card description\"}, {\"title\":\"Second card title\",\"description\":\"Second card description\"},{\"title\":\"Last card title\",\"description\":\"Last card description\"} ]",
+    "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"1つ目のカードタイトル\", \"description\":\"1つ目のカードの説明\"}, {\"title\":\"2つ目のカードタイトル\",\"description\":\"2つ目のカードの説明\"},{\"title\":\"最後のカードタイトル\",\"description\":\"最後のカードの説明\"} ]",
     "create": "作成",
     "createBoardPopup-title": "ボードの作成",
     "chooseBoardSourcePopup-title": "ボードをインポート",
     "createLabelPopup-title": "ラベルの作成",
+    "createCustomField": "フィールドを作成",
+    "createCustomFieldPopup-title": "フィールドを作成",
     "current": "現在",
+    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
+    "custom-field-checkbox": "チェックボックス",
+    "custom-field-date": "日付",
+    "custom-field-dropdown": "ドロップダウンリスト",
+    "custom-field-dropdown-none": "(none)",
+    "custom-field-dropdown-options": "List Options",
+    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
+    "custom-field-dropdown-unknown": "(unknown)",
+    "custom-field-number": "Number",
+    "custom-field-text": "テキスト",
+    "custom-fields": "カスタムフィールド",
     "date": "日付",
     "decline": "拒否",
     "default-avatar": "デフォルトのアバター",
     "delete": "削除",
+    "deleteCustomFieldPopup-title": "カスタムフィールドを削除しますか？",
     "deleteLabelPopup-title": "ラベルを削除しますか？",
     "description": "詳細",
     "disambiguateMultiLabelPopup-title": "不正なラベル操作",
@@ -186,6 +262,7 @@
     "soft-wip-limit": "Soft WIP Limit",
     "editCardStartDatePopup-title": "開始日の変更",
     "editCardDueDatePopup-title": "期限の変更",
+    "editCustomFieldPopup-title": "フィールドを編集",
     "editCardSpentTimePopup-title": "Change spent time",
     "editLabelPopup-title": "ラベルの変更",
     "editNotificationPopup-title": "通知の変更",
@@ -194,7 +271,7 @@
     "email-enrollAccount-subject": "__siteName__であなたのアカウントが作成されました",
     "email-enrollAccount-text": "こんにちは、__user__さん。\n\nサービスを開始するには、以下をクリックしてください。\n\n__url__\n\nよろしくお願いします。",
     "email-fail": "メールの送信に失敗しました",
-    "email-fail-text": "Error trying to send email",
+    "email-fail-text": "メールの送信中にエラーが発生しました",
     "email-invalid": "無効なメールアドレス",
     "email-invite": "メールで招待",
     "email-invite-subject": "__inviter__があなたを招待しています",
@@ -222,35 +299,41 @@
     "filter-clear": "フィルターの解除",
     "filter-no-label": "ラベルなし",
     "filter-no-member": "メンバーなし",
+    "filter-no-custom-fields": "No Custom Fields",
     "filter-on": "フィルター有効",
     "filter-on-desc": "このボードのカードをフィルターしています。フィルターを編集するにはこちらをクリックしてください。",
     "filter-to-selection": "フィルターした項目を全選択",
+    "advanced-filter-label": "高度なフィルター",
+    "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) to be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
     "fullname": "フルネーム",
     "header-logo-title": "自分のボードページに戻る。",
     "hide-system-messages": "システムメッセージを隠す",
     "headerBarCreateBoardPopup-title": "ボードの作成",
     "home": "ホーム",
     "import": "インポート",
+    "link": "リンク",
     "import-board": "ボードをインポート",
     "import-board-c": "ボードをインポート",
     "import-board-title-trello": "Trelloからボードをインポート",
-    "import-board-title-wekan": "Wekanからボードをインポート",
+    "import-board-title-wekan": "Import board from previous export",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
     "import-sandstorm-warning": "ボードのインポートは、既存ボードのすべてのデータを置き換えます。",
     "from-trello": "Trelloから",
-    "from-wekan": "Wekanから",
+    "from-wekan": "From previous export",
     "import-board-instruction-trello": "Trelloボードの、 'Menu' → 'More' → 'Print and Export' → 'Export JSON'を選択し、テキストをコピーしてください。",
-    "import-board-instruction-wekan": "Wekanボードの、'Menu' → 'Export board'を選択し、ダウンロードされたファイルからテキストをコピーしてください。",
+    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
     "import-json-placeholder": "JSONデータをここに貼り付けする",
     "import-map-members": "メンバーを紐付け",
-    "import-members-map": "インポートしたボードにはメンバーが含まれます。これらのメンバーをWekanのメンバーに紐付けしてください。",
+    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
     "import-show-user-mapping": "メンバー紐付けの確認",
-    "import-user-select": "メンバーとして利用したいWekanユーザーを選択",
-    "importMapMembersAddPopup-title": "Wekanメンバーを選択",
+    "import-user-select": "Pick your existing user you want to use as this member",
+    "importMapMembersAddPopup-title": "メンバーを選択",
     "info": "バージョン",
-    "initials": "初期状態",
+    "initials": "イニシャル",
     "invalid-date": "無効な日付",
-    "invalid-time": "Invalid time",
-    "invalid-user": "Invalid user",
+    "invalid-time": "無効な時間",
+    "invalid-user": "無効なユーザ",
     "joined": "参加しました",
     "just-invited": "このボードのメンバーに招待されています",
     "keyboard-shortcuts": "キーボード・ショートカット",
@@ -264,19 +347,21 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "ボードから退出しますか？",
     "link-card": "このカードへのリンク",
-    "list-archive-cards": "Move all cards in this list to Recycle Bin",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
+    "list-archive-cards": "リスト内の全カードをアーカイブする",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "リストの全カードを移動する",
     "list-select-cards": "リストの全カードを選択",
+    "set-color-list": "色を選択",
     "listActionPopup-title": "操作一覧",
-    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneActionPopup-title": "スイムレーン操作",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Trelloのカードをインポート",
     "listMorePopup-title": "さらに見る",
     "link-list": "このリストへのリンク",
     "list-delete-pop": "すべての内容がアクティビティから削除されます。この削除は元に戻すことができません。",
-    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
     "lists": "リスト",
-    "swimlanes": "Swimlanes",
+    "swimlanes": "スイムレーン",
     "log-out": "ログアウト",
     "log-in": "ログイン",
     "loginPopup-title": "ログイン",
@@ -294,9 +379,9 @@
     "muted-info": "このボードの変更は通知されません",
     "my-boards": "自分のボード",
     "name": "名前",
-    "no-archived-cards": "No cards in Recycle Bin.",
-    "no-archived-lists": "No lists in Recycle Bin.",
-    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
+    "no-archived-cards": "No cards in Archive.",
+    "no-archived-lists": "No lists in Archive.",
+    "no-archived-swimlanes": "No swimlanes in Archive.",
     "no-results": "該当するものはありません",
     "normal": "通常",
     "normal-desc": "カードの閲覧と編集が可能。設定変更不可。",
@@ -332,8 +417,9 @@
     "restore": "復元",
     "save": "保存",
     "search": "検索",
-    "search-cards": "Search from card titles and descriptions on this board",
-    "search-example": "Text to search for?",
+    "rules": "Rules",
+    "search-cards": "カードのタイトルと詳細から検索",
+    "search-example": "検索文字",
     "select-color": "色を選択",
     "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
     "setWipLimitPopup-title": "Set WIP Limit",
@@ -366,6 +452,7 @@
     "title": "タイトル",
     "tracking": "トラッキング",
     "tracking-info": "これらのカードへの変更が通知されるようになります。",
+    "type": "Type",
     "unassign-member": "未登録のメンバー",
     "unsaved-description": "未保存の変更があります。",
     "unwatch": "アンウォッチ",
@@ -374,7 +461,7 @@
     "uploaded-avatar": "アップロードされたアバター",
     "username": "ユーザー名",
     "view-it": "見る",
-    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
+    "warn-list-archived": "warning: this card is in an list at Archive",
     "watch": "ウォッチ",
     "watching": "ウォッチしています",
     "watching-info": "このボードの変更が通知されます",
@@ -382,6 +469,9 @@
     "welcome-swimlane": "Milestone 1",
     "welcome-list1": "基本",
     "welcome-list2": "高度",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
     "what-to-do": "何をしたいですか？",
     "wipLimitErrorPopup-title": "Invalid WIP Limit",
     "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
@@ -407,16 +497,16 @@
     "send-smtp-test": "Send a test email to yourself",
     "invitation-code": "招待コード",
     "email-invite-register-subject": "__inviter__さんがあなたを招待しています",
-    "email-invite-register-text": " __user__ さん\n\n__inviter__ があなたをWekanに招待しました。\n\n以下のリンクをクリックしてください。\n__url__\n\nあなたの招待コードは、 __icode__ です。\n\nよろしくお願いします。",
-    "email-smtp-test-subject": "SMTP Test Email From Wekan",
+    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email",
     "email-smtp-test-text": "You have successfully sent an email",
     "error-invitation-code-not-exist": "招待コードが存在しません",
     "error-notAuthorized": "このページを参照する権限がありません。",
-    "outgoing-webhooks": "Outgoing Webhooks",
-    "outgoingWebhooksPopup-title": "Outgoing Webhooks",
-    "new-outgoing-webhook": "New Outgoing Webhook",
+    "outgoing-webhooks": "発信Webフック",
+    "outgoingWebhooksPopup-title": "発信Webフック",
+    "boardCardTitlePopup-title": "Card Title Filter",
+    "new-outgoing-webhook": "発信Webフックの作成",
     "no-name": "(Unknown)",
-    "Wekan_version": "Wekanバージョン",
     "Node_version": "Nodeバージョン",
     "OS_Arch": "OSアーキテクチャ",
     "OS_Cpus": "OS CPU数",
@@ -427,20 +517,177 @@
     "OS_Totalmem": "OSトータルメモリ",
     "OS_Type": "OS種類",
     "OS_Uptime": "OSアップタイム",
+    "days": "days",
     "hours": "時",
     "minutes": "分",
     "seconds": "秒",
+    "show-field-on-card": "Show this field on card",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
     "yes": "はい",
     "no": "いいえ",
     "accounts": "アカウント",
     "accounts-allowEmailChange": "メールアドレスの変更を許可",
+    "accounts-allowUserNameChange": "Allow Username Change",
     "createdAt": "Created at",
     "verified": "Verified",
     "active": "Active",
-    "card-received": "Received",
-    "card-received-on": "Received on",
-    "card-end": "End",
-    "card-end-on": "Ends on",
-    "editCardReceivedDatePopup-title": "Change received date",
-    "editCardEndDatePopup-title": "Change end date"
-}
+    "card-received": "受付",
+    "card-received-on": "受付日",
+    "card-end": "終了",
+    "card-end-on": "終了日",
+    "editCardReceivedDatePopup-title": "受付日の変更",
+    "editCardEndDatePopup-title": "終了日の変更",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "Assigned By",
+    "requested-by": "Requested By",
+    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
+    "delete-board-confirm-popup": "すべてのリスト、カード、ラベル、アクティビティは削除され、ボードの内容を元に戻すことができません。",
+    "boardDeletePopup-title": "ボードを削除しますか？",
+    "delete-board": "ボードを削除",
+    "default-subtasks-board": "Subtasks for __board__ board",
+    "default": "Default",
+    "queue": "Queue",
+    "subtask-settings": "Subtasks Settings",
+    "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
+    "show-subtasks-field": "Cards can have subtasks",
+    "deposit-subtasks-board": "Deposit subtasks to this board:",
+    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
+    "show-parent-in-minicard": "Show parent in minicard:",
+    "prefix-with-full-path": "Prefix with full path",
+    "prefix-with-parent": "Prefix with parent",
+    "subtext-with-full-path": "Subtext with full path",
+    "subtext-with-parent": "Subtext with parent",
+    "change-card-parent": "Change card's parent",
+    "parent-card": "Parent card",
+    "source-board": "Source board",
+    "no-parent": "Don't show parent",
+    "activity-added-label": "added label '%s' to %s",
+    "activity-removed-label": "removed label '%s' from %s",
+    "activity-delete-attach": "deleted an attachment from %s",
+    "activity-added-label-card": "added label '%s'",
+    "activity-removed-label-card": "removed label '%s'",
+    "activity-delete-attach-card": "deleted an attachment",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "r-rule": "Rule",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "Add action",
+    "r-board-rules": "Board rules",
+    "r-add-rule": "Add rule",
+    "r-view-rule": "View rule",
+    "r-delete-rule": "Delete rule",
+    "r-new-rule-name": "New rule title",
+    "r-no-rules": "No rules",
+    "r-when-a-card": "When a card",
+    "r-is": "is",
+    "r-is-moved": "is moved",
+    "r-added-to": "added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "the board",
+    "r-list": "list",
+    "set-filter": "Set Filter",
+    "r-moved-to": "Moved to",
+    "r-moved-from": "Moved from",
+    "r-archived": "Moved to Archive",
+    "r-unarchived": "Restored from Archive",
+    "r-a-card": "a card",
+    "r-when-a-label-is": "When a label is",
+    "r-when-the-label-is": "When the label is",
+    "r-list-name": "list name",
+    "r-when-a-member": "When a member is",
+    "r-when-the-member": "When the member",
+    "r-name": "name",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "r-when-the-item": "When the checklist item",
+    "r-checked": "Checked",
+    "r-unchecked": "Unchecked",
+    "r-move-card-to": "Move card to",
+    "r-top-of": "Top of",
+    "r-bottom-of": "Bottom of",
+    "r-its-list": "its list",
+    "r-archive": "Move to Archive",
+    "r-unarchive": "Restore from Archive",
+    "r-card": "card",
+    "r-add": "追加",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-set-color": "Set color to",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "subject",
+    "r-rule-details": "Rule details",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Move card to top of list",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Move card to bottom of list",
+    "r-d-send-email": "Send email",
+    "r-d-send-email-to": "to",
+    "r-d-send-email-subject": "subject",
+    "r-d-send-email-message": "message",
+    "r-d-archive": "Move card to Archive",
+    "r-d-unarchive": "Restore card from Archive",
+    "r-d-add-label": "Add label",
+    "r-d-remove-label": "Remove label",
+    "r-create-card": "Create new card",
+    "r-in-list": "リスト：",
+    "r-in-swimlane": "in swimlane",
+    "r-d-add-member": "Add member",
+    "r-d-remove-member": "Remove member",
+    "r-d-remove-all-member": "Remove all member",
+    "r-d-check-all": "Check all items of a list",
+    "r-d-uncheck-all": "Uncheck all items of a list",
+    "r-d-check-one": "Check item",
+    "r-d-uncheck-one": "Uncheck item",
+    "r-d-check-of-list": "of checklist",
+    "r-d-add-checklist": "チェックリストを追加",
+    "r-d-remove-checklist": "チェックリストを削除",
+    "r-by": "by",
+    "r-add-checklist": "チェックリストを追加",
+    "r-with-items": "with items",
+    "r-items-list": "アイテム1、アイテム2、アイテム3",
+    "r-add-swimlane": "スイムレーンを追加",
+    "r-swimlane-name": "スイムレーン名",
+    "r-board-note": "Note: leave a field empty to match every possible value.",
+    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-when-a-card-is-moved": "カードが別のリストに移動したとき",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "認証方式",
+    "authentication-type": "認証タイプ",
+    "custom-product-name": "Custom Product Name",
+    "layout": "レイアウト",
+    "hide-logo": "ロゴを隠す",
+    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
+    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
+    "error-undefined": "Something went wrong",
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "ボードの複製",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "スイムレーンを削除しますか？",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "全てをリストアする",
+    "delete-all": "全てを削除する",
+    "loading": "ローディング中です、しばらくお待ちください。"
+}
\ No newline at end of file
diff --git a/i18n/ka.i18n.json b/i18n/ka.i18n.json
new file mode 100644
index 00000000..21899882
--- /dev/null
+++ b/i18n/ka.i18n.json
@@ -0,0 +1,693 @@
+{
+    "accept": "დათანხმება",
+    "act-activity-notify": "Activity Notification",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__board__",
+    "act-withCardTitle": "[__დაფა__] __ბარათი__",
+    "actions": "მოქმედებები",
+    "activities": "აქტივეობები",
+    "activity": "აქტივობები",
+    "activity-added": "დამატებულია %s ზე %s",
+    "activity-archived": "%s moved to Archive",
+    "activity-attached": "მიბმულია %s  %s-დან",
+    "activity-created": "შექმნილია %s",
+    "activity-customfield-created": "created custom field %s",
+    "activity-excluded": "excluded %s from %s",
+    "activity-imported": "imported %s into %s from %s",
+    "activity-imported-board": "იმპორტირებულია%s %s-დან",
+    "activity-joined": "შეუერთდა %s",
+    "activity-moved": "moved %s from %s to %s",
+    "activity-on": " %s-ზე",
+    "activity-removed": "წაიშალა %s  %s-დან",
+    "activity-sent": "გაიგზავნა %s  %s-ში",
+    "activity-unjoined": "არ შემოუერთდა %s",
+    "activity-subtask-added": "დაამატა ქვესაქმიანობა %s",
+    "activity-checked-item": "checked %s in checklist %s of %s",
+    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
+    "activity-checklist-added": "დაემატა ჩამონათვალი %s-ს",
+    "activity-checklist-removed": "removed a checklist from %s",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
+    "activity-checklist-item-added": "დამატებულია ჩამონათვალის ელემენტები '%s'  %s-ში",
+    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
+    "add": "დამატება",
+    "activity-checked-item-card": "checked %s in checklist %s",
+    "activity-unchecked-item-card": "unchecked %s in checklist %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
+    "add-attachment": "მიბმული ფაილის დამატება",
+    "add-board": "დაფის დამატება",
+    "add-card": "ბარათის დამატება",
+    "add-swimlane": "ბილიკის დამატება",
+    "add-subtask": "ქვესაქმიანობის დამატება",
+    "add-checklist": "კატალოგის დამატება",
+    "add-checklist-item": "დაამატეთ საგანი ჩამონათვალს",
+    "add-cover": "გარეკანის დამატება",
+    "add-label": "ნიშნის დამატება",
+    "add-list": "ჩამონათვალის დამატება",
+    "add-members": "წევრების დამატება",
+    "added": "-მა დაამატა",
+    "addMemberPopup-title": "წევრები",
+    "admin": "ადმინი",
+    "admin-desc": "შეუძლია ნახოს და შეასწოროს ბარათები, წაშალოს წევრები და შეცვალოს დაფის პარამეტრები. ",
+    "admin-announcement": "განცხადება",
+    "admin-announcement-active": "აქტიური სისტემა-ფართო განცხადება",
+    "admin-announcement-title": "შეტყობინება ადმინისტრატორისთვის",
+    "all-boards": "ყველა დაფა",
+    "and-n-other-card": "და __count__ სხვა ბარათი",
+    "and-n-other-card_plural": "და __count__ სხვა ბარათები",
+    "apply": "გამოყენება",
+    "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
+    "archive": "Move to Archive",
+    "archive-all": "Move All to Archive",
+    "archive-board": "Move Board to Archive",
+    "archive-card": "Move Card to Archive",
+    "archive-list": "Move List to Archive",
+    "archive-swimlane": "Move Swimlane to Archive",
+    "archive-selection": "Move selection to Archive",
+    "archiveBoardPopup-title": "Move Board to Archive?",
+    "archived-items": "Archive",
+    "archived-boards": "Boards in Archive",
+    "restore-board": "ბარათის აღდგენა",
+    "no-archived-boards": "No Boards in Archive.",
+    "archives": "Archive",
+    "template": "Template",
+    "templates": "Templates",
+    "assign-member": "უფლებამოსილი წევრი",
+    "attached": "მიბმული",
+    "attachment": "მიბმული ფიალი",
+    "attachment-delete-pop": "მიბმული ფაილის წაშლა მუდმივია. შეუძლებელია მისი უკან დაბრუნება. ",
+    "attachmentDeletePopup-title": "გსურთ მიბმული ფაილის წაშლა? ",
+    "attachments": "მიბმული ფაილები",
+    "auto-watch": "დაფის ავტომატური ნახვა მას შემდეგ რაც ის შეიქმნება",
+    "avatar-too-big": "დიდი მოცულობის სურათი (მაქსიმუმ 70KB)",
+    "back": "უკან",
+    "board-change-color": "ფერის შეცვლა",
+    "board-nb-stars": "%s ვარსკვლავი",
+    "board-not-found": "დაფა არ მოიძებნა",
+    "board-private-info": "ეს დაფა იქნება  <strong>პირადი</strong>.",
+    "board-public-info": "ეს დაფა იქნება <strong>საჯარო</strong>.",
+    "boardChangeColorPopup-title": "დაფის ფონის ცვლილება",
+    "boardChangeTitlePopup-title": "დაფის სახელის ცვლილება",
+    "boardChangeVisibilityPopup-title": "ხილვადობის შეცვლა",
+    "boardChangeWatchPopup-title": "საათის შეცვლა",
+    "boardMenuPopup-title": "Board Settings",
+    "boards": "დაფები",
+    "board-view": "დაფის ნახვა",
+    "board-view-cal": "კალენდარი",
+    "board-view-swimlanes": "ბილიკები",
+    "board-view-lists": "ჩამონათვალი",
+    "bucket-example": "მაგალითად “Bucket List” ",
+    "cancel": "გაუქმება",
+    "card-archived": "This card is moved to Archive.",
+    "board-archived": "This board is moved to Archive.",
+    "card-comments-title": "ამ ბარათს ჰქონდა%s კომენტარი.",
+    "card-delete-notice": "წაშლის შემთხვევაში ამ ბარათთან ასცირებული ყველა მოქმედება დაიკარგება.",
+    "card-delete-pop": "ყველა მოქმედება წაიშლება აქტივობების ველიდან და თქვენ აღარ შეგეძლებათ ბარათის ხელახლა გახსნა. დაბრუნება შეუძლებელია.",
+    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
+    "card-due": "საბოლოო ვადა ",
+    "card-due-on": "საბოლოო ვადა",
+    "card-spent": "დახარჯული დრო",
+    "card-edit-attachments": "მიბმული ფაილის შესწორება",
+    "card-edit-custom-fields": "მომხმარებლის ველის შესწორება",
+    "card-edit-labels": "ნიშნის შესწორება",
+    "card-edit-members": "მომხმარებლების შესწორება",
+    "card-labels-title": "ნიშნის შეცვლა ბარათისთვის.",
+    "card-members-title": "დაამატეთ ან წაშალეთ დაფის წევრი ბარათიდან. ",
+    "card-start": "დაწყება",
+    "card-start-on": "დაიწყება",
+    "cardAttachmentsPopup-title": "მიბმა შემდეგი წყაროდან: ",
+    "cardCustomField-datePopup-title": "დროის ცვლილება",
+    "cardCustomFieldsPopup-title": "მომხმარებლის ველის შესწორება",
+    "cardDeletePopup-title": "წავშალოთ ბარათი? ",
+    "cardDetailsActionsPopup-title": "ბარათის მოქმედებები",
+    "cardLabelsPopup-title": "ნიშნები",
+    "cardMembersPopup-title": "წევრები",
+    "cardMorePopup-title": "მეტი",
+    "cardTemplatePopup-title": "Create template",
+    "cards": "ბარათები",
+    "cards-count": "ბარათები",
+    "casSignIn": "შესვლა CAS-ით",
+    "cardType-card": "Card",
+    "cardType-linkedCard": "Linked Card",
+    "cardType-linkedBoard": "Linked Board",
+    "change": "ცვლილება",
+    "change-avatar": "სურათის შეცვლა",
+    "change-password": "პაროლის შეცვლა",
+    "change-permissions": "პარამეტრების შეცვლა",
+    "change-settings": "პარამეტრების შეცვლა",
+    "changeAvatarPopup-title": "სურათის შეცვლა",
+    "changeLanguagePopup-title": "ენის შეცვლა",
+    "changePasswordPopup-title": "პაროლის შეცვლა",
+    "changePermissionsPopup-title": "უფლებების შეცვლა",
+    "changeSettingsPopup-title": "პარამეტრების შეცვლა",
+    "subtasks": "ქვეამოცანა",
+    "checklists": "კატალოგი",
+    "click-to-star": "დააჭირეთ დაფის ვარსკვლავით მოსანიშნად",
+    "click-to-unstar": "დააკლიკეთ დაფიდან ვარსკვლავის მოსახსნელად. ",
+    "clipboard": "Clipboard ან drag & drop",
+    "close": "დახურვა",
+    "close-board": "დაფის დახურვა",
+    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
+    "color-black": "შავი",
+    "color-blue": "ლურჯი",
+    "color-crimson": "crimson",
+    "color-darkgreen": "darkgreen",
+    "color-gold": "gold",
+    "color-gray": "gray",
+    "color-green": "მწვანე",
+    "color-indigo": "indigo",
+    "color-lime": "ღია ყვითელი",
+    "color-magenta": "magenta",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "navy",
+    "color-orange": "ნარინჯისფერი",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
+    "color-pink": "ვარდისფერი",
+    "color-plum": "plum",
+    "color-purple": "იასამნისფერი",
+    "color-red": "წითელი ",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "silver",
+    "color-sky": "ცისფერი",
+    "color-slateblue": "slateblue",
+    "color-white": "white",
+    "color-yellow": "ყვითელი",
+    "unset-color": "Unset",
+    "comment": "კომენტარი",
+    "comment-placeholder": "დაწერეთ კომენტარი",
+    "comment-only": "მხოლოდ კომენტარები",
+    "comment-only-desc": "თქვენ შეგიძლიათ კომენტარის გაკეთება მხოლოდ ბარათებზე.",
+    "no-comments": "No comments",
+    "no-comments-desc": "Can not see comments and activities.",
+    "computer": "კომპიუტერი",
+    "confirm-subtask-delete-dialog": "დარწმუნებული ხართ, რომ გსურთ ქვესაქმიანობის წაშლა? ",
+    "confirm-checklist-delete-dialog": "დარწმუნებული ხართ, რომ გსურთ კატალოგის წაშლა ? ",
+    "copy-card-link-to-clipboard": "დააკოპირეთ ბარათის ბმული clipboard-ზე",
+    "linkCardPopup-title": "Link Card",
+    "searchElementPopup-title": "ძებნა",
+    "copyCardPopup-title": "ბარათის ასლი",
+    "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
+    "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
+    "copyChecklistToManyCardsPopup-format": "[ {\"სათაური\": \"პირველი ბარათის სათაური\", \"აღწერა\":\"პირველი ბარათის აღწერა\"}, {\"სათაური\":\"მეორე ბარათის სათაური\",\"აღწერა\":\"მეორე ბარათის აღწერა\"},{\"სათაური\":\"ბოლო ბარათის სათაური\",\"აღწერა\":\"ბოლო ბარათის აღწერა\"} ]",
+    "create": "შექმნა",
+    "createBoardPopup-title": "დაფის შექმნა",
+    "chooseBoardSourcePopup-title": "დაფის იმპორტი",
+    "createLabelPopup-title": "ნიშნის შექმნა",
+    "createCustomField": "ველის შექმნა",
+    "createCustomFieldPopup-title": "ველის შექმნა",
+    "current": "მიმდინარე",
+    "custom-field-delete-pop": "ქმედება გამოიწვევს მომხმარებლის ველის წაშლას ყველა ბარათიდან და გაანადგურებს მის ისტორიას, რის შემდეგაც შეუძლებელი იქნება მისი უკან დაბრუნება. ",
+    "custom-field-checkbox": "მოსანიშნი გრაფა",
+    "custom-field-date": "თარიღი",
+    "custom-field-dropdown": "ჩამოსაშლელი სია",
+    "custom-field-dropdown-none": "(ცარიელი)",
+    "custom-field-dropdown-options": "პარამეტრების სია",
+    "custom-field-dropdown-options-placeholder": "დამატებითი პარამეტრების სანახავად დააჭირეთ enter-ს.  ",
+    "custom-field-dropdown-unknown": "(უცნობი)",
+    "custom-field-number": "რიცხვი",
+    "custom-field-text": "ტექსტი",
+    "custom-fields": "მომხმარებლის ველი",
+    "date": "თარიღი",
+    "decline": "უარყოფა",
+    "default-avatar": "სტანდარტული ავატარი",
+    "delete": "წაშლა",
+    "deleteCustomFieldPopup-title": "წავშალოთ მომხმარებლის ველი? ",
+    "deleteLabelPopup-title": "ნამდვილად გსურთ ნიშნის წაშლა? ",
+    "description": "აღწერა",
+    "disambiguateMultiLabelPopup-title": "გაუგებარი ნიშნის მოქმედება",
+    "disambiguateMultiMemberPopup-title": "გაუგებარი წევრის მოქმედება",
+    "discard": "უარყოფა",
+    "done": "დასრულებული",
+    "download": "ჩამოტვირთვა",
+    "edit": "შესწორება",
+    "edit-avatar": "სურათის შეცვლა",
+    "edit-profile": "პროფილის შესწორება",
+    "edit-wip-limit": " WIP ლიმიტის შესწორება",
+    "soft-wip-limit": "მსუბუქი WIP  შეზღუდვა ",
+    "editCardStartDatePopup-title": "დაწყების დროის შეცვლა",
+    "editCardDueDatePopup-title": "შეცვალეთ დედლაინი",
+    "editCustomFieldPopup-title": "ველების შესწორება",
+    "editCardSpentTimePopup-title": "დახარჯული დროის შეცვლა",
+    "editLabelPopup-title": "ნიშნის შეცვლა",
+    "editNotificationPopup-title": "შეტყობინებების შესწორება",
+    "editProfilePopup-title": "პროფილის შესწორება",
+    "email": "ელ.ფოსტა",
+    "email-enrollAccount-subject": "An account created for you on __siteName__",
+    "email-enrollAccount-text": "მოგესალმებით __user__,\n\nამ სერვისის გამოსაყენებლად დააკლიკეთ ქვედა ბმულს.\n\n__url__\n\nმადლობა.",
+    "email-fail": "ელ.ფოსტის გაგზავნა ვერ მოხერხდა",
+    "email-fail-text": "ელ.ფოსტის გაგზავნისას დაფიქსირდა შეცდომა",
+    "email-invalid": "არასწორი ელ.ფოსტა",
+    "email-invite": "მოწვევა ელ.ფოსტის მეშვეობით",
+    "email-invite-subject": "__inviter__ გამოგიგზავნათ მოწვევა",
+    "email-invite-text": "ძვირფასო __user__,\n\n__inviter__ გიწვევთ დაფაზე \"__board__\" თანამშრომლობისთვის.\n\nგთხოვთ მიყვეთ ქვემოთ მოცემულ ბმულს:\n\n__url__\n\nმადლობა.",
+    "email-resetPassword-subject": "შეცვალეთ თქვენი პაროლი __siteName-ზე__",
+    "email-resetPassword-text": "გამარჯობა__user__,\n\nპაროლის შესაცვლელად დააკლიკეთ ქვედა ბმულს .\n\n__url__\n\nმადლობა.",
+    "email-sent": "ელ.ფოსტა გაგზავნილია",
+    "email-verifyEmail-subject": "შეამოწმეთ ელ.ფოსტის მისამართი __siteName-ზე__",
+    "email-verifyEmail-text": "გამარჯობა __user__,\n\nანგარიშის ელ.ფოსტის შესამოწმებლად დააკლიკეთ ქვედა ბმულს.\n\n__url__\n\nმადლობა.",
+    "enable-wip-limit": "გავააქტიუროთ WIP ლიმიტი",
+    "error-board-doesNotExist": "მსგავსი დაფა არ არსებობს",
+    "error-board-notAdmin": "ამის გასაკეთებლად საჭიროა იყოთ დაფის ადმინისტრატორი",
+    "error-board-notAMember": "ამის გასაკეთებლად საჭიროა იყოთ დაფის წევრი",
+    "error-json-malformed": "შენი ტექსტი არ არის ვალიდური JSON",
+    "error-json-schema": "თქვენი JSON  მონაცემები არ შეიცავს ზუსტ ინფორმაციას სწორ ფორმატში ",
+    "error-list-doesNotExist": "ეს ცხრილი არ არსებობს",
+    "error-user-doesNotExist": "მსგავსი მომხმარებელი არ არსებობს",
+    "error-user-notAllowSelf": "თქვენ არ შეგიძლიათ საკუთარი თავის მოწვევა",
+    "error-user-notCreated": "მომხმარებელი არ შეიქმნა",
+    "error-username-taken": "არსებობს მსგავსი მომხმარებელი",
+    "error-email-taken": "უკვე არსებობს მსგავსი ელ.ფოსტა",
+    "export-board": "დაფის ექსპორტი",
+    "filter": "ფილტრი",
+    "filter-cards": "ბარათების გაფილტვრა",
+    "filter-clear": "ფილტრის გასუფთავება",
+    "filter-no-label": "ნიშანი არ გვაქვს",
+    "filter-no-member": "არ არის წევრები ",
+    "filter-no-custom-fields": "არა მომხმარებლის ველი",
+    "filter-on": "ფილტრი ჩართულია",
+    "filter-on-desc": "თქვენ ფილტრავთ ბარათებს ამ დაფაზე. დააკლიკეთ აქ ფილტრაციის შესწორებისთვის. ",
+    "filter-to-selection": "მონიშნულის გაფილტვრა",
+    "advanced-filter-label": "გაფართოებული ფილტრაცია",
+    "advanced-filter-description": "გაფართოებული ფილტრაცია, უფლებას გაძლევთ დაწეროთ მწკრივი რომლებიც შეიცავენ შემდეგ ოპერაციებს : == != <= >= && || ( )  space გამოიყენება როგორც გამმიჯნავი ოპერაციებს შორის.  თქვენ შეგიძლიათ გაფილტროთ მომხმარებლის ველი მათი სახელებისა და ღირებულებების მიხედვით. მაგალითად: Field1 == Value1.  გაითვალისწინეთ  რომ თუ ველი ან ღირებულება შეიცავს space-ს თქვენ დაგჭირდებათ მათი მოთავსება ერთ ციტატაში მაგ: 'Field 1' == 'Value 1'. ერთი კონტროლის სიმბოლოებისთვის (' \\/) გამოტოვება, შეგიძლიათ გამოიყენოთ \\. მაგ: Field1 == I\\'m. აგრეთვე თქვენ შეგიძლიათ შეურიოთ რამოდენიმე კომბინაცია. მაგალითად: F1 == V1 || F1 == V2.  როგორც წესი ყველა ოპერაცია ინტერპრეტირებულია მარცხნიდან მარჯვნივ. თქვენ შეგიძლიათ შეცვალოთ რიგითობა ფრჩხილების შეცვლით  მაგალითად:  F1 == V1 && ( F2 == V2 || F2 == V3 ). აგრეთვე შეგიძლიათ მოძებნოთ ტექსტის ველები  რეგექსით  F1 == /Tes.*/i",
+    "fullname": "სახელი და გვარი",
+    "header-logo-title": "დაბრუნდით უკან დაფების გვერდზე.",
+    "hide-system-messages": "დამალეთ სისტემური შეტყობინებები",
+    "headerBarCreateBoardPopup-title": "დაფის შექმნა",
+    "home": "სახლი",
+    "import": "იმპორტირება",
+    "link": "Link",
+    "import-board": " დაფის იმპორტი",
+    "import-board-c": "დაფის იმპორტი",
+    "import-board-title-trello": "დაფის იმპორტი  Trello-დან",
+    "import-board-title-wekan": "Import board from previous export",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
+    "import-sandstorm-warning": "იმპორტირებული დაფა წაშლის ყველა არსებულ მონაცემს დაფაზე და შეანაცვლებს მას იმპორტირებული დაფა. ",
+    "from-trello": "Trello-დან",
+    "from-wekan": "From previous export",
+    "import-board-instruction-trello": "თქვენს Trello დაფაზე, შედით \"მენიუ\"-ში, შემდეგ დააკლიკეთ \"მეტი\", \"ამოპრინტერება და ექსპორტი\",  \"JSON-ის ექსპორტი\" და დააკოპირეთ შედეგი.  ",
+    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
+    "import-json-placeholder": "მოათავსეთ თქვენი ვალიდური JSON მონაცემები აქ.  ",
+    "import-map-members": "რუკის წევრები",
+    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
+    "import-show-user-mapping": "მომხმარებლის რუკების განხილვა",
+    "import-user-select": "Pick your existing user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select member",
+    "info": "ვერსია",
+    "initials": "ინიციალები",
+    "invalid-date": "არასწორი თარიღი",
+    "invalid-time": "არასწორი დრო",
+    "invalid-user": "არასწორი მომხმარებელი",
+    "joined": "შემოუერთდა",
+    "just-invited": "თქვენ მოწვეული ხართ ამ დაფაზე",
+    "keyboard-shortcuts": "კლავიატურის კომბინაციები",
+    "label-create": "ნიშნის შექმნა",
+    "label-default": "%s ნიშანი (default)",
+    "label-delete-pop": "იმ შემთხვევაში თუ წაშლით ნიშანს, ყველა ბარათიდან ისტორია ავტომატურად წაიშლება და შეუძლებელი იქნება მისი უკან დაბრუნება.",
+    "labels": "ნიშნები",
+    "language": "ენა",
+    "last-admin-desc": "თქვენ ვერ შეცვლით როლებს რადგან უნდა არსებობდეს ერთი ადმინი მაინც.",
+    "leave-board": "დატოვეთ დაფა",
+    "leave-board-pop": "დარწმუნებული ხართ, რომ გინდათ დატოვოთ __boardTitle__? თქვენ წაიშლებით ამ დაფის ყველა ბარათიდან. ",
+    "leaveBoardPopup-title": "გსურთ დაფის დატოვება? ",
+    "link-card": "დააკავშირეთ ამ ბარათთან",
+    "list-archive-cards": "Move all cards in this list to Archive",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
+    "list-move-cards": "გადაიტანე ყველა ბარათი ამ სიაში",
+    "list-select-cards": "მონიშნე ყველა ბარათი ამ სიაში",
+    "set-color-list": "Set Color",
+    "listActionPopup-title": "მოქმედებების სია",
+    "swimlaneActionPopup-title": "ბილიკის მოქმედებები",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
+    "listImportCardPopup-title": "Trello ბარათის იმპორტი",
+    "listMorePopup-title": "მეტი",
+    "link-list": "დააკავშირეთ ამ ჩამონათვალთან",
+    "list-delete-pop": "ყველა მოქმედება  წაიშლება აქტივობების ველიდან და თქვენ ვეღარ შეძლებთ მის აღდგენას ჩამონათვალში",
+    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
+    "lists": "ჩამონათვალი",
+    "swimlanes": "ბილიკები",
+    "log-out": "გამოსვლა",
+    "log-in": "შესვლა",
+    "loginPopup-title": "შესვლა",
+    "memberMenuPopup-title": "მომხმარებლის პარამეტრები",
+    "members": "წევრები",
+    "menu": "მენიუ",
+    "move-selection": "მონიშნულის მოძრაობა",
+    "moveCardPopup-title": "ბარათის გადატანა",
+    "moveCardToBottom-title": "ქვევით ჩამოწევა",
+    "moveCardToTop-title": "ზევით აწევა",
+    "moveSelectionPopup-title": "მონიშნულის მოძრაობა",
+    "multi-selection": "რამდენიმეს მონიშვნა",
+    "multi-selection-on": "რამდენიმეს მონიშვნა ჩართულია",
+    "muted": "ხმა გათიშულია",
+    "muted-info": "თქვენ აღარ მიიღებთ შეტყობინებას ამ დაფაზე მიმდინარე ცვლილებების შესახებ. ",
+    "my-boards": "ჩემი დაფები",
+    "name": "სახელი",
+    "no-archived-cards": "No cards in Archive.",
+    "no-archived-lists": "No lists in Archive.",
+    "no-archived-swimlanes": "No swimlanes in Archive.",
+    "no-results": "შედეგის გარეშე",
+    "normal": "ნორმალური",
+    "normal-desc": "შეუძლია ნახოს და შეასწოროს ბარათები. ამ პარამეტრების შეცვლა შეუძლებელია. ",
+    "not-accepted-yet": "მოწვევა ჯერ არ დადასტურებულა",
+    "notify-participate": "მიიღეთ განახლებები ნებისმიერ ბარათზე, რომელშიც მონაწილეობთ, როგორც შემქმნელი ან წევრი. ",
+    "notify-watch": "მიიღეთ განახლებები ყველა დაფაზე, ჩამონათვალზე ან ბარათებზე, რომელსაც თქვენ აკვირდებით",
+    "optional": "არჩევითი",
+    "or": "ან",
+    "page-maybe-private": "ეს გვერდი შესაძლოა იყოს კერძო.  თქვენ შეგეძლებათ მისი ნახვა  <a href='%s'>logging in</a> მეშვეობით.",
+    "page-not-found": "გვერდი არ მოიძებნა.",
+    "password": "პაროლი",
+    "paste-or-dragdrop": "ჩასმისთვის, ან drag & drop-ისთვის ჩააგდეთ სურათი აქ (მხოლოდ სურათი)",
+    "participating": "მონაწილეობა",
+    "preview": "წინასწარ ნახვა",
+    "previewAttachedImagePopup-title": "წინასწარ ნახვა",
+    "previewClipboardImagePopup-title": "წინასწარ ნახვა",
+    "private": "კერძო",
+    "private-desc": "ეს არის კერძო დაფა. დაფაზე წვდომის, ნახვის და რედაქტირების უფლება აქვთ მხოლოდ მასზე დამატებულ წევრებს. ",
+    "profile": "პროფილი",
+    "public": "საჯარო",
+    "public-desc": "ეს დაფა არის საჯარო. ის ხილვადია ყველასთვის და შესაძლოა გამოჩნდეს საძიებო სისტემებში. შესწორების უფლება აქვს მხოლოდ მასზე დამატებულ პირებს. ",
+    "quick-access-description": "მონიშნეთ დაფა ვარსკვლავით იმისთვის, რომ დაამატოთ სწრაფი ბმული ამ ნაწილში.",
+    "remove-cover": "გარეკანის წაშლა",
+    "remove-from-board": "დაფიდან წაშლა",
+    "remove-label": "ნიშნის წაშლა",
+    "listDeletePopup-title": "ნამდვილად გსურთ სიის წაშლა? ",
+    "remove-member": "წევრის წაშლა",
+    "remove-member-from-card": "ბარათიდან წაშლა",
+    "remove-member-pop": "Remove __name__ (__username__) from __boardTitle__? The member will be removed from all cards on this board. They will receive a notification.",
+    "removeMemberPopup-title": "ნამდვილად გსურთ წევრის წაშლა? ",
+    "rename": "სახელის შეცვლა",
+    "rename-board": "დაფის სახელის ცვლილება",
+    "restore": "აღდგენა",
+    "save": "დამახსოვრება",
+    "search": "ძებნა",
+    "rules": "Rules",
+    "search-cards": "მოძებნეთ ბარათის სახელით და აღწერით ამ დაფაზე",
+    "search-example": "საძიებო ტექსტი",
+    "select-color": "ფერის მონიშვნა",
+    "set-wip-limit-value": "დააყენეთ შეზღუდვა  დავალებების მაქსიმალურ რაოდენობაზე ",
+    "setWipLimitPopup-title": "დააყენეთ WIP ლიმიტი",
+    "shortcut-assign-self": "მონიშნეთ საკუთარი თავი აღნიშნულ ბარათზე",
+    "shortcut-autocomplete-emoji": "emoji-ის ავტომატური შევსება",
+    "shortcut-autocomplete-members": "მომხმარებლების ავტომატური შევსება",
+    "shortcut-clear-filters": "ყველა ფილტრის გასუფთავება",
+    "shortcut-close-dialog": "დიალოგის დახურვა",
+    "shortcut-filter-my-cards": "ჩემი ბარათების გაფილტვრა",
+    "shortcut-show-shortcuts": "Bring up this shortcuts list",
+    "shortcut-toggle-filterbar": "ფილტრაციის გვერდითა ღილაკი",
+    "shortcut-toggle-sidebar": "გვერდით მენიუს ჩართვა/გამორთვა",
+    "show-cards-minimum-count": "აჩვენეთ ბარათების დათვლილი რაოდენობა თუ ჩამონათვალი შეიცავს უფრო მეტს ვიდრე ",
+    "sidebar-open": "გახსენით მცირე სტატია",
+    "sidebar-close": "დახურეთ მცირე სტატია",
+    "signupPopup-title": "ანგარიშის შექმნა",
+    "star-board-title": "დააკლიკეთ დაფის ვარსკვლავით მონიშვნისთვის. ეს ქმედება დაგეხმარებათ გამოაჩინოთ დაფა ჩამონათვალში ზედა პოზიციებზე. ",
+    "starred-boards": "ვარსკვლავიანი დაფები",
+    "starred-boards-description": "Starred boards show up at the top of your boards list.",
+    "subscribe": "გამოწერა",
+    "team": "ჯგუფი",
+    "this-board": "ეს დაფა",
+    "this-card": "ეს ბარათი",
+    "spent-time-hours": "დახარჯული დრო (საათები)",
+    "overtime-hours": "ზედმეტი დრო (საათები) ",
+    "overtime": "ზედმეტი დრო",
+    "has-overtime-cards": "აქვს ვადაგადაცდილებული ბარათები",
+    "has-spenttime-cards": "აქვს გახარჯული დროის ბარათები",
+    "time": "დრო",
+    "title": "სათაური",
+    "tracking": "მონიტორინგი",
+    "tracking-info": "თქვენ მოგივათ შეტყობინება ამ ბარათებში განხორციელებული ნებისმიერი ცვლილებების შესახებ, როგორც შემქმნელს ან წევრს. ",
+    "type": "ტიპი",
+    "unassign-member": "არაუფლებამოსილი წევრი",
+    "unsaved-description": "თქვან გაქვთ დაუმახსოვრებელი აღწერა. ",
+    "unwatch": "ნახვის გამორთვა",
+    "upload": "ატვირთვა",
+    "upload-avatar": "სურათის ატვირთვა",
+    "uploaded-avatar": "სურათი ატვირთულია",
+    "username": "მომხმარებლის სახელი",
+    "view-it": "ნახვა",
+    "warn-list-archived": "warning: this card is in an list at Archive",
+    "watch": "ნახვა",
+    "watching": "ნახვის პროცესი",
+    "watching-info": "თქვენ მოგივათ შეტყობინება ამ დაფაზე არსებული ნებისმიერი ცვლილების შესახებ. ",
+    "welcome-board": "მისასალმებელი დაფა",
+    "welcome-swimlane": "ეტაპი 1 ",
+    "welcome-list1": "ბაზისური ",
+    "welcome-list2": "დაწინაურებული",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
+    "what-to-do": "რისი გაკეთება გსურთ? ",
+    "wipLimitErrorPopup-title": "არასწორი WIP ლიმიტი",
+    "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
+    "wipLimitErrorPopup-dialog-pt2": "Please move some tasks out of this list, or set a higher WIP limit.",
+    "admin-panel": "ადმინის პანელი",
+    "settings": "პარამეტრები",
+    "people": "ხალხი",
+    "registration": "რეგისტრაცია",
+    "disable-self-registration": "თვით რეგისტრაციის გამორთვა",
+    "invite": "მოწვევა",
+    "invite-people": "ხალხის მოწვევა",
+    "to-boards": "დაფა(ებ)ზე",
+    "email-addresses": "ელ.ფოსტის მისამართები",
+    "smtp-host-description": "The address of the SMTP server that handles your emails.",
+    "smtp-port-description": "The port your SMTP server uses for outgoing emails.",
+    "smtp-tls-description": "ჩართეთ TLS მხარდაჭერა SMTP სერვერისთვის",
+    "smtp-host": "SMTP Host",
+    "smtp-port": "SMTP Port",
+    "smtp-username": "მომხმარებლის სახელი",
+    "smtp-password": "პაროლი",
+    "smtp-tls": "TLS მხარდაჭერა",
+    "send-from": "დან",
+    "send-smtp-test": "გაუგზავნეთ სატესტო ელ.ფოსტა საკუთარ თავს",
+    "invitation-code": "მოწვევის კოდი",
+    "email-invite-register-subject": "__inviter__ გამოგიგზავნათ მოწვევა",
+    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email",
+    "email-smtp-test-text": "თქვენ წარმატებით გააგზავნეთ ელ.ფოსტა.",
+    "error-invitation-code-not-exist": "მსგავსი მოსაწვევი კოდი არ არსებობს",
+    "error-notAuthorized": "თქვენ არ გაქვთ ამ გვერდის ნახვის უფლება",
+    "outgoing-webhooks": "გამავალი Webhook",
+    "outgoingWebhooksPopup-title": "გამავალი Webhook",
+    "boardCardTitlePopup-title": "Card Title Filter",
+    "new-outgoing-webhook": "New Outgoing Webhook",
+    "no-name": "(უცნობი)",
+    "Node_version": "Node ვერსია",
+    "OS_Arch": "OS Arch",
+    "OS_Cpus": "OS CPU Count",
+    "OS_Freemem": "OS თავისუფალი მეხსიერება",
+    "OS_Loadavg": "OS Load Average",
+    "OS_Platform": "OS პლატფორმა",
+    "OS_Release": "OS რელიზი",
+    "OS_Totalmem": "OS მთლიანი მეხსიერება",
+    "OS_Type": "OS ტიპი",
+    "OS_Uptime": "OS Uptime",
+    "days": "days",
+    "hours": "საათები",
+    "minutes": "წუთები",
+    "seconds": "წამები",
+    "show-field-on-card": "აჩვენეთ ეს ველი ბარათზე",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
+    "yes": "დიახ",
+    "no": "არა",
+    "accounts": "ანგარიშები",
+    "accounts-allowEmailChange": "ელ.ფოსტის ცვლილების უფლების დაშვება",
+    "accounts-allowUserNameChange": "მომხმარებლის სახელის ცვლილების უფლების  დაშვება ",
+    "createdAt": "შექმნილია",
+    "verified": "შემოწმებული",
+    "active": "აქტიური",
+    "card-received": "მიღებული",
+    "card-received-on": "მიღებულია",
+    "card-end": "დასასრული",
+    "card-end-on": "დასრულდება : ",
+    "editCardReceivedDatePopup-title": "Change received date",
+    "editCardEndDatePopup-title": "შეცვალეთ საბოლოო თარიღი",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "უფლებამოსილების გამცემი ",
+    "requested-by": "მომთხოვნი",
+    "board-delete-notice": "წაშლის შემთხვევაში თქვენ დაკარგავთ ამ დაფასთან ასოცირებულ ყველა მონაცემს მათ შორის : ჩამონათვალს, ბარათებს და მოქმედებებს. ",
+    "delete-board-confirm-popup": "ყველა ჩამონათვალი, ბარათი, ნიშანი და აქტივობა წაიშლება და თქვენ ვეღარ შეძლებთ მის აღდგენას. ",
+    "boardDeletePopup-title": "წავშალოთ დაფა? ",
+    "delete-board": "დაფის წაშლა",
+    "default-subtasks-board": "ქვესაქმიანობა __board__  დაფისთვის",
+    "default": "Default",
+    "queue": "რიგი",
+    "subtask-settings": "ქვესაქმიანობების პარამეტრები",
+    "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
+    "show-subtasks-field": "ბარათებს შესაძლოა ჰქონდეს ქვესაქმიანობები",
+    "deposit-subtasks-board": "Deposit subtasks to this board:",
+    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
+    "show-parent-in-minicard": "Show parent in minicard:",
+    "prefix-with-full-path": "Prefix with full path",
+    "prefix-with-parent": "Prefix with parent",
+    "subtext-with-full-path": "Subtext with full path",
+    "subtext-with-parent": "Subtext with parent",
+    "change-card-parent": "Change card's parent",
+    "parent-card": "Parent card",
+    "source-board": "ძირითადი დაფა",
+    "no-parent": "Don't show parent",
+    "activity-added-label": "added label '%s' to %s",
+    "activity-removed-label": "removed label '%s' from %s",
+    "activity-delete-attach": "deleted an attachment from %s",
+    "activity-added-label-card": "added label '%s'",
+    "activity-removed-label-card": "removed label '%s'",
+    "activity-delete-attach-card": "deleted an attachment",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "r-rule": "Rule",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "Add action",
+    "r-board-rules": "Board rules",
+    "r-add-rule": "Add rule",
+    "r-view-rule": "View rule",
+    "r-delete-rule": "Delete rule",
+    "r-new-rule-name": "New rule title",
+    "r-no-rules": "No rules",
+    "r-when-a-card": "When a card",
+    "r-is": "is",
+    "r-is-moved": "is moved",
+    "r-added-to": "added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "the board",
+    "r-list": "list",
+    "set-filter": "Set Filter",
+    "r-moved-to": "Moved to",
+    "r-moved-from": "Moved from",
+    "r-archived": "Moved to Archive",
+    "r-unarchived": "Restored from Archive",
+    "r-a-card": "a card",
+    "r-when-a-label-is": "When a label is",
+    "r-when-the-label-is": "When the label is",
+    "r-list-name": "list name",
+    "r-when-a-member": "When a member is",
+    "r-when-the-member": "When the member",
+    "r-name": "name",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "r-when-the-item": "When the checklist item",
+    "r-checked": "Checked",
+    "r-unchecked": "Unchecked",
+    "r-move-card-to": "Move card to",
+    "r-top-of": "Top of",
+    "r-bottom-of": "Bottom of",
+    "r-its-list": "its list",
+    "r-archive": "Move to Archive",
+    "r-unarchive": "Restore from Archive",
+    "r-card": "card",
+    "r-add": "დამატება",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-set-color": "Set color to",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "subject",
+    "r-rule-details": "Rule details",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Move card to top of list",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Move card to bottom of list",
+    "r-d-send-email": "Send email",
+    "r-d-send-email-to": "to",
+    "r-d-send-email-subject": "subject",
+    "r-d-send-email-message": "message",
+    "r-d-archive": "Move card to Archive",
+    "r-d-unarchive": "Restore card from Archive",
+    "r-d-add-label": "Add label",
+    "r-d-remove-label": "Remove label",
+    "r-create-card": "Create new card",
+    "r-in-list": "in list",
+    "r-in-swimlane": "in swimlane",
+    "r-d-add-member": "Add member",
+    "r-d-remove-member": "Remove member",
+    "r-d-remove-all-member": "Remove all member",
+    "r-d-check-all": "Check all items of a list",
+    "r-d-uncheck-all": "Uncheck all items of a list",
+    "r-d-check-one": "Check item",
+    "r-d-uncheck-one": "Uncheck item",
+    "r-d-check-of-list": "of checklist",
+    "r-d-add-checklist": "Add checklist",
+    "r-d-remove-checklist": "Remove checklist",
+    "r-by": "by",
+    "r-add-checklist": "Add checklist",
+    "r-with-items": "with items",
+    "r-items-list": "item1,item2,item3",
+    "r-add-swimlane": "Add swimlane",
+    "r-swimlane-name": "swimlane name",
+    "r-board-note": "Note: leave a field empty to match every possible value.",
+    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout",
+    "hide-logo": "Hide Logo",
+    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
+    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
+    "error-undefined": "Something went wrong",
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
+}
\ No newline at end of file
diff --git a/i18n/km.i18n.json b/i18n/km.i18n.json
new file mode 100644
index 00000000..4341bbf9
--- /dev/null
+++ b/i18n/km.i18n.json
@@ -0,0 +1,693 @@
+{
+    "accept": "យល់ព្រម",
+    "act-activity-notify": "Activity Notification",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__board__",
+    "act-withCardTitle": "[__board__] __card__",
+    "actions": "Actions",
+    "activities": "Activities",
+    "activity": "Activity",
+    "activity-added": "added %s to %s",
+    "activity-archived": "%s moved to Archive",
+    "activity-attached": "attached %s to %s",
+    "activity-created": "created %s",
+    "activity-customfield-created": "created custom field %s",
+    "activity-excluded": "excluded %s from %s",
+    "activity-imported": "imported %s into %s from %s",
+    "activity-imported-board": "imported %s from %s",
+    "activity-joined": "joined %s",
+    "activity-moved": "moved %s from %s to %s",
+    "activity-on": "on %s",
+    "activity-removed": "removed %s from %s",
+    "activity-sent": "sent %s to %s",
+    "activity-unjoined": "unjoined %s",
+    "activity-subtask-added": "added subtask to %s",
+    "activity-checked-item": "checked %s in checklist %s of %s",
+    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
+    "activity-checklist-added": "added checklist to %s",
+    "activity-checklist-removed": "removed a checklist from %s",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
+    "activity-checklist-item-added": "added checklist item to '%s' in %s",
+    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
+    "add": "Add",
+    "activity-checked-item-card": "checked %s in checklist %s",
+    "activity-unchecked-item-card": "unchecked %s in checklist %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
+    "add-attachment": "Add Attachment",
+    "add-board": "Add Board",
+    "add-card": "Add Card",
+    "add-swimlane": "Add Swimlane",
+    "add-subtask": "Add Subtask",
+    "add-checklist": "Add Checklist",
+    "add-checklist-item": "Add an item to checklist",
+    "add-cover": "Add Cover",
+    "add-label": "Add Label",
+    "add-list": "Add List",
+    "add-members": "Add Members",
+    "added": "Added",
+    "addMemberPopup-title": "Members",
+    "admin": "Admin",
+    "admin-desc": "Can view and edit cards, remove members, and change settings for the board.",
+    "admin-announcement": "Announcement",
+    "admin-announcement-active": "Active System-Wide Announcement",
+    "admin-announcement-title": "Announcement from Administrator",
+    "all-boards": "All boards",
+    "and-n-other-card": "And __count__ other card",
+    "and-n-other-card_plural": "And __count__ other cards",
+    "apply": "Apply",
+    "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
+    "archive": "Move to Archive",
+    "archive-all": "Move All to Archive",
+    "archive-board": "Move Board to Archive",
+    "archive-card": "Move Card to Archive",
+    "archive-list": "Move List to Archive",
+    "archive-swimlane": "Move Swimlane to Archive",
+    "archive-selection": "Move selection to Archive",
+    "archiveBoardPopup-title": "Move Board to Archive?",
+    "archived-items": "Archive",
+    "archived-boards": "Boards in Archive",
+    "restore-board": "Restore Board",
+    "no-archived-boards": "No Boards in Archive.",
+    "archives": "Archive",
+    "template": "Template",
+    "templates": "Templates",
+    "assign-member": "Assign member",
+    "attached": "attached",
+    "attachment": "Attachment",
+    "attachment-delete-pop": "Deleting an attachment is permanent. There is no undo.",
+    "attachmentDeletePopup-title": "Delete Attachment?",
+    "attachments": "Attachments",
+    "auto-watch": "Automatically watch boards when they are created",
+    "avatar-too-big": "The avatar is too large (70KB max)",
+    "back": "Back",
+    "board-change-color": "Change color",
+    "board-nb-stars": "%s stars",
+    "board-not-found": "Board not found",
+    "board-private-info": "This board will be <strong>private</strong>.",
+    "board-public-info": "This board will be <strong>public</strong>.",
+    "boardChangeColorPopup-title": "Change Board Background",
+    "boardChangeTitlePopup-title": "Rename Board",
+    "boardChangeVisibilityPopup-title": "Change Visibility",
+    "boardChangeWatchPopup-title": "Change Watch",
+    "boardMenuPopup-title": "Board Settings",
+    "boards": "Boards",
+    "board-view": "Board View",
+    "board-view-cal": "Calendar",
+    "board-view-swimlanes": "Swimlanes",
+    "board-view-lists": "Lists",
+    "bucket-example": "Like “Bucket List” for example",
+    "cancel": "Cancel",
+    "card-archived": "This card is moved to Archive.",
+    "board-archived": "This board is moved to Archive.",
+    "card-comments-title": "This card has %s comment.",
+    "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
+    "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
+    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
+    "card-due": "Due",
+    "card-due-on": "Due on",
+    "card-spent": "Spent Time",
+    "card-edit-attachments": "Edit attachments",
+    "card-edit-custom-fields": "Edit custom fields",
+    "card-edit-labels": "Edit labels",
+    "card-edit-members": "Edit members",
+    "card-labels-title": "Change the labels for the card.",
+    "card-members-title": "Add or remove members of the board from the card.",
+    "card-start": "Start",
+    "card-start-on": "Starts on",
+    "cardAttachmentsPopup-title": "Attach From",
+    "cardCustomField-datePopup-title": "Change date",
+    "cardCustomFieldsPopup-title": "Edit custom fields",
+    "cardDeletePopup-title": "Delete Card?",
+    "cardDetailsActionsPopup-title": "Card Actions",
+    "cardLabelsPopup-title": "Labels",
+    "cardMembersPopup-title": "Members",
+    "cardMorePopup-title": "More",
+    "cardTemplatePopup-title": "Create template",
+    "cards": "Cards",
+    "cards-count": "Cards",
+    "casSignIn": "Sign In with CAS",
+    "cardType-card": "Card",
+    "cardType-linkedCard": "Linked Card",
+    "cardType-linkedBoard": "Linked Board",
+    "change": "Change",
+    "change-avatar": "Change Avatar",
+    "change-password": "Change Password",
+    "change-permissions": "Change permissions",
+    "change-settings": "Change Settings",
+    "changeAvatarPopup-title": "Change Avatar",
+    "changeLanguagePopup-title": "Change Language",
+    "changePasswordPopup-title": "Change Password",
+    "changePermissionsPopup-title": "Change Permissions",
+    "changeSettingsPopup-title": "Change Settings",
+    "subtasks": "Subtasks",
+    "checklists": "Checklists",
+    "click-to-star": "Click to star this board.",
+    "click-to-unstar": "Click to unstar this board.",
+    "clipboard": "Clipboard or drag & drop",
+    "close": "Close",
+    "close-board": "Close Board",
+    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
+    "color-black": "black",
+    "color-blue": "blue",
+    "color-crimson": "crimson",
+    "color-darkgreen": "darkgreen",
+    "color-gold": "gold",
+    "color-gray": "gray",
+    "color-green": "green",
+    "color-indigo": "indigo",
+    "color-lime": "lime",
+    "color-magenta": "magenta",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "navy",
+    "color-orange": "orange",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
+    "color-pink": "pink",
+    "color-plum": "plum",
+    "color-purple": "purple",
+    "color-red": "red",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "silver",
+    "color-sky": "sky",
+    "color-slateblue": "slateblue",
+    "color-white": "white",
+    "color-yellow": "yellow",
+    "unset-color": "Unset",
+    "comment": "Comment",
+    "comment-placeholder": "Write Comment",
+    "comment-only": "Comment only",
+    "comment-only-desc": "Can comment on cards only.",
+    "no-comments": "No comments",
+    "no-comments-desc": "Can not see comments and activities.",
+    "computer": "Computer",
+    "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?",
+    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
+    "copy-card-link-to-clipboard": "Copy card link to clipboard",
+    "linkCardPopup-title": "Link Card",
+    "searchElementPopup-title": "Search",
+    "copyCardPopup-title": "Copy Card",
+    "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
+    "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
+    "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"First card title\", \"description\":\"First card description\"}, {\"title\":\"Second card title\",\"description\":\"Second card description\"},{\"title\":\"Last card title\",\"description\":\"Last card description\"} ]",
+    "create": "Create",
+    "createBoardPopup-title": "Create Board",
+    "chooseBoardSourcePopup-title": "Import board",
+    "createLabelPopup-title": "Create Label",
+    "createCustomField": "Create Field",
+    "createCustomFieldPopup-title": "Create Field",
+    "current": "current",
+    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
+    "custom-field-checkbox": "Checkbox",
+    "custom-field-date": "Date",
+    "custom-field-dropdown": "Dropdown List",
+    "custom-field-dropdown-none": "(none)",
+    "custom-field-dropdown-options": "List Options",
+    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
+    "custom-field-dropdown-unknown": "(unknown)",
+    "custom-field-number": "Number",
+    "custom-field-text": "Text",
+    "custom-fields": "Custom Fields",
+    "date": "Date",
+    "decline": "Decline",
+    "default-avatar": "Default avatar",
+    "delete": "Delete",
+    "deleteCustomFieldPopup-title": "Delete Custom Field?",
+    "deleteLabelPopup-title": "Delete Label?",
+    "description": "Description",
+    "disambiguateMultiLabelPopup-title": "Disambiguate Label Action",
+    "disambiguateMultiMemberPopup-title": "Disambiguate Member Action",
+    "discard": "Discard",
+    "done": "Done",
+    "download": "Download",
+    "edit": "Edit",
+    "edit-avatar": "Change Avatar",
+    "edit-profile": "Edit Profile",
+    "edit-wip-limit": "Edit WIP Limit",
+    "soft-wip-limit": "Soft WIP Limit",
+    "editCardStartDatePopup-title": "Change start date",
+    "editCardDueDatePopup-title": "Change due date",
+    "editCustomFieldPopup-title": "Edit Field",
+    "editCardSpentTimePopup-title": "Change spent time",
+    "editLabelPopup-title": "Change Label",
+    "editNotificationPopup-title": "Edit Notification",
+    "editProfilePopup-title": "Edit Profile",
+    "email": "Email",
+    "email-enrollAccount-subject": "An account created for you on __siteName__",
+    "email-enrollAccount-text": "Hello __user__,\n\nTo start using the service, simply click the link below.\n\n__url__\n\nThanks.",
+    "email-fail": "Sending email failed",
+    "email-fail-text": "Error trying to send email",
+    "email-invalid": "Invalid email",
+    "email-invite": "Invite via Email",
+    "email-invite-subject": "__inviter__ sent you an invitation",
+    "email-invite-text": "Dear __user__,\n\n__inviter__ invites you to join board \"__board__\" for collaborations.\n\nPlease follow the link below:\n\n__url__\n\nThanks.",
+    "email-resetPassword-subject": "Reset your password on __siteName__",
+    "email-resetPassword-text": "Hello __user__,\n\nTo reset your password, simply click the link below.\n\n__url__\n\nThanks.",
+    "email-sent": "Email sent",
+    "email-verifyEmail-subject": "Verify your email address on __siteName__",
+    "email-verifyEmail-text": "Hello __user__,\n\nTo verify your account email, simply click the link below.\n\n__url__\n\nThanks.",
+    "enable-wip-limit": "Enable WIP Limit",
+    "error-board-doesNotExist": "This board does not exist",
+    "error-board-notAdmin": "You need to be admin of this board to do that",
+    "error-board-notAMember": "You need to be a member of this board to do that",
+    "error-json-malformed": "Your text is not valid JSON",
+    "error-json-schema": "Your JSON data does not include the proper information in the correct format",
+    "error-list-doesNotExist": "This list does not exist",
+    "error-user-doesNotExist": "This user does not exist",
+    "error-user-notAllowSelf": "You can not invite yourself",
+    "error-user-notCreated": "This user is not created",
+    "error-username-taken": "This username is already taken",
+    "error-email-taken": "Email has already been taken",
+    "export-board": "Export board",
+    "filter": "Filter",
+    "filter-cards": "Filter Cards",
+    "filter-clear": "Clear filter",
+    "filter-no-label": "No label",
+    "filter-no-member": "No member",
+    "filter-no-custom-fields": "No Custom Fields",
+    "filter-on": "Filter is on",
+    "filter-on-desc": "You are filtering cards on this board. Click here to edit filter.",
+    "filter-to-selection": "Filter to selection",
+    "advanced-filter-label": "Advanced Filter",
+    "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) to be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
+    "fullname": "Full Name",
+    "header-logo-title": "Go back to your boards page.",
+    "hide-system-messages": "Hide system messages",
+    "headerBarCreateBoardPopup-title": "Create Board",
+    "home": "Home",
+    "import": "Import",
+    "link": "Link",
+    "import-board": "import board",
+    "import-board-c": "Import board",
+    "import-board-title-trello": "Import board from Trello",
+    "import-board-title-wekan": "Import board from previous export",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
+    "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
+    "from-trello": "From Trello",
+    "from-wekan": "From previous export",
+    "import-board-instruction-trello": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text.",
+    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
+    "import-json-placeholder": "Paste your valid JSON data here",
+    "import-map-members": "Map members",
+    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
+    "import-show-user-mapping": "Review members mapping",
+    "import-user-select": "Pick your existing user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select member",
+    "info": "Version",
+    "initials": "Initials",
+    "invalid-date": "Invalid date",
+    "invalid-time": "Invalid time",
+    "invalid-user": "Invalid user",
+    "joined": "joined",
+    "just-invited": "You are just invited to this board",
+    "keyboard-shortcuts": "Keyboard shortcuts",
+    "label-create": "Create Label",
+    "label-default": "%s label (default)",
+    "label-delete-pop": "There is no undo. This will remove this label from all cards and destroy its history.",
+    "labels": "Labels",
+    "language": "Language",
+    "last-admin-desc": "You can’t change roles because there must be at least one admin.",
+    "leave-board": "Leave Board",
+    "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
+    "leaveBoardPopup-title": "Leave Board ?",
+    "link-card": "Link to this card",
+    "list-archive-cards": "Move all cards in this list to Archive",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
+    "list-move-cards": "Move all cards in this list",
+    "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
+    "listActionPopup-title": "List Actions",
+    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
+    "listImportCardPopup-title": "Import a Trello card",
+    "listMorePopup-title": "More",
+    "link-list": "Link to this list",
+    "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
+    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
+    "lists": "Lists",
+    "swimlanes": "Swimlanes",
+    "log-out": "Log Out",
+    "log-in": "Log In",
+    "loginPopup-title": "Log In",
+    "memberMenuPopup-title": "Member Settings",
+    "members": "Members",
+    "menu": "Menu",
+    "move-selection": "Move selection",
+    "moveCardPopup-title": "Move Card",
+    "moveCardToBottom-title": "Move to Bottom",
+    "moveCardToTop-title": "Move to Top",
+    "moveSelectionPopup-title": "Move selection",
+    "multi-selection": "Multi-Selection",
+    "multi-selection-on": "Multi-Selection is on",
+    "muted": "Muted",
+    "muted-info": "You will never be notified of any changes in this board",
+    "my-boards": "My Boards",
+    "name": "Name",
+    "no-archived-cards": "No cards in Archive.",
+    "no-archived-lists": "No lists in Archive.",
+    "no-archived-swimlanes": "No swimlanes in Archive.",
+    "no-results": "No results",
+    "normal": "Normal",
+    "normal-desc": "Can view and edit cards. Can't change settings.",
+    "not-accepted-yet": "Invitation not accepted yet",
+    "notify-participate": "Receive updates to any cards you participate as creater or member",
+    "notify-watch": "Receive updates to any boards, lists, or cards you’re watching",
+    "optional": "optional",
+    "or": "or",
+    "page-maybe-private": "This page may be private. You may be able to view it by <a href='%s'>logging in</a>.",
+    "page-not-found": "Page not found.",
+    "password": "Password",
+    "paste-or-dragdrop": "to paste, or drag & drop image file to it (image only)",
+    "participating": "Participating",
+    "preview": "Preview",
+    "previewAttachedImagePopup-title": "Preview",
+    "previewClipboardImagePopup-title": "Preview",
+    "private": "Private",
+    "private-desc": "This board is private. Only people added to the board can view and edit it.",
+    "profile": "Profile",
+    "public": "Public",
+    "public-desc": "This board is public. It's visible to anyone with the link and will show up in search engines like Google. Only people added to the board can edit.",
+    "quick-access-description": "Star a board to add a shortcut in this bar.",
+    "remove-cover": "Remove Cover",
+    "remove-from-board": "Remove from Board",
+    "remove-label": "Remove Label",
+    "listDeletePopup-title": "Delete List ?",
+    "remove-member": "Remove Member",
+    "remove-member-from-card": "Remove from Card",
+    "remove-member-pop": "Remove __name__ (__username__) from __boardTitle__? The member will be removed from all cards on this board. They will receive a notification.",
+    "removeMemberPopup-title": "Remove Member?",
+    "rename": "Rename",
+    "rename-board": "Rename Board",
+    "restore": "Restore",
+    "save": "Save",
+    "search": "Search",
+    "rules": "Rules",
+    "search-cards": "Search from card titles and descriptions on this board",
+    "search-example": "Text to search for?",
+    "select-color": "Select Color",
+    "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
+    "setWipLimitPopup-title": "Set WIP Limit",
+    "shortcut-assign-self": "Assign yourself to current card",
+    "shortcut-autocomplete-emoji": "Autocomplete emoji",
+    "shortcut-autocomplete-members": "Autocomplete members",
+    "shortcut-clear-filters": "Clear all filters",
+    "shortcut-close-dialog": "បិទផ្ទាំង",
+    "shortcut-filter-my-cards": "តម្រងកាតរបស់ខ្ញុំ",
+    "shortcut-show-shortcuts": "Bring up this shortcuts list",
+    "shortcut-toggle-filterbar": "Toggle Filter Sidebar",
+    "shortcut-toggle-sidebar": "Toggle Board Sidebar",
+    "show-cards-minimum-count": "Show cards count if list contains more than",
+    "sidebar-open": "Open Sidebar",
+    "sidebar-close": "Close Sidebar",
+    "signupPopup-title": "បង្កើតគណនីមួយ",
+    "star-board-title": "Click to star this board. It will show up at top of your boards list.",
+    "starred-boards": "Starred Boards",
+    "starred-boards-description": "Starred boards show up at the top of your boards list.",
+    "subscribe": "Subscribe",
+    "team": "Team",
+    "this-board": "this board",
+    "this-card": "កាតនេះ",
+    "spent-time-hours": "ចំណាយពេល (ម៉ោង)",
+    "overtime-hours": "លើសពេល (ម៉ោង)",
+    "overtime": "លើសពេល",
+    "has-overtime-cards": "មានកាតលើសពេល",
+    "has-spenttime-cards": "មានកាតដែលបានចំណាយពេល",
+    "time": "Time",
+    "title": "Title",
+    "tracking": "Tracking",
+    "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
+    "type": "Type",
+    "unassign-member": "Unassign member",
+    "unsaved-description": "You have an unsaved description.",
+    "unwatch": "Unwatch",
+    "upload": "Upload",
+    "upload-avatar": "Upload an avatar",
+    "uploaded-avatar": "Uploaded an avatar",
+    "username": "Username",
+    "view-it": "View it",
+    "warn-list-archived": "warning: this card is in an list at Archive",
+    "watch": "Watch",
+    "watching": "Watching",
+    "watching-info": "You will be notified of any change in this board",
+    "welcome-board": "Welcome Board",
+    "welcome-swimlane": "Milestone 1",
+    "welcome-list1": "Basics",
+    "welcome-list2": "Advanced",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
+    "what-to-do": "What do you want to do?",
+    "wipLimitErrorPopup-title": "Invalid WIP Limit",
+    "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
+    "wipLimitErrorPopup-dialog-pt2": "Please move some tasks out of this list, or set a higher WIP limit.",
+    "admin-panel": "Admin Panel",
+    "settings": "Settings",
+    "people": "People",
+    "registration": "Registration",
+    "disable-self-registration": "Disable Self-Registration",
+    "invite": "Invite",
+    "invite-people": "Invite People",
+    "to-boards": "To board(s)",
+    "email-addresses": "Email Addresses",
+    "smtp-host-description": "The address of the SMTP server that handles your emails.",
+    "smtp-port-description": "The port your SMTP server uses for outgoing emails.",
+    "smtp-tls-description": "Enable TLS support for SMTP server",
+    "smtp-host": "SMTP Host",
+    "smtp-port": "SMTP Port",
+    "smtp-username": "Username",
+    "smtp-password": "Password",
+    "smtp-tls": "TLS support",
+    "send-from": "From",
+    "send-smtp-test": "Send a test email to yourself",
+    "invitation-code": "Invitation Code",
+    "email-invite-register-subject": "__inviter__ sent you an invitation",
+    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email",
+    "email-smtp-test-text": "You have successfully sent an email",
+    "error-invitation-code-not-exist": "Invitation code doesn't exist",
+    "error-notAuthorized": "You are not authorized to view this page.",
+    "outgoing-webhooks": "Outgoing Webhooks",
+    "outgoingWebhooksPopup-title": "Outgoing Webhooks",
+    "boardCardTitlePopup-title": "Card Title Filter",
+    "new-outgoing-webhook": "New Outgoing Webhook",
+    "no-name": "(Unknown)",
+    "Node_version": "Node version",
+    "OS_Arch": "OS Arch",
+    "OS_Cpus": "OS CPU Count",
+    "OS_Freemem": "OS Free Memory",
+    "OS_Loadavg": "OS Load Average",
+    "OS_Platform": "OS Platform",
+    "OS_Release": "OS Release",
+    "OS_Totalmem": "OS Total Memory",
+    "OS_Type": "OS Type",
+    "OS_Uptime": "OS Uptime",
+    "days": "days",
+    "hours": "hours",
+    "minutes": "minutes",
+    "seconds": "seconds",
+    "show-field-on-card": "Show this field on card",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
+    "yes": "Yes",
+    "no": "No",
+    "accounts": "Accounts",
+    "accounts-allowEmailChange": "Allow Email Change",
+    "accounts-allowUserNameChange": "Allow Username Change",
+    "createdAt": "Created at",
+    "verified": "Verified",
+    "active": "Active",
+    "card-received": "Received",
+    "card-received-on": "Received on",
+    "card-end": "End",
+    "card-end-on": "Ends on",
+    "editCardReceivedDatePopup-title": "Change received date",
+    "editCardEndDatePopup-title": "Change end date",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "Assigned By",
+    "requested-by": "Requested By",
+    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
+    "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
+    "boardDeletePopup-title": "Delete Board?",
+    "delete-board": "Delete Board",
+    "default-subtasks-board": "Subtasks for __board__ board",
+    "default": "Default",
+    "queue": "Queue",
+    "subtask-settings": "Subtasks Settings",
+    "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
+    "show-subtasks-field": "Cards can have subtasks",
+    "deposit-subtasks-board": "Deposit subtasks to this board:",
+    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
+    "show-parent-in-minicard": "Show parent in minicard:",
+    "prefix-with-full-path": "Prefix with full path",
+    "prefix-with-parent": "Prefix with parent",
+    "subtext-with-full-path": "Subtext with full path",
+    "subtext-with-parent": "Subtext with parent",
+    "change-card-parent": "Change card's parent",
+    "parent-card": "Parent card",
+    "source-board": "Source board",
+    "no-parent": "Don't show parent",
+    "activity-added-label": "added label '%s' to %s",
+    "activity-removed-label": "removed label '%s' from %s",
+    "activity-delete-attach": "deleted an attachment from %s",
+    "activity-added-label-card": "added label '%s'",
+    "activity-removed-label-card": "removed label '%s'",
+    "activity-delete-attach-card": "deleted an attachment",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "r-rule": "Rule",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "Add action",
+    "r-board-rules": "Board rules",
+    "r-add-rule": "Add rule",
+    "r-view-rule": "View rule",
+    "r-delete-rule": "Delete rule",
+    "r-new-rule-name": "New rule title",
+    "r-no-rules": "No rules",
+    "r-when-a-card": "When a card",
+    "r-is": "is",
+    "r-is-moved": "is moved",
+    "r-added-to": "added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "the board",
+    "r-list": "list",
+    "set-filter": "Set Filter",
+    "r-moved-to": "Moved to",
+    "r-moved-from": "Moved from",
+    "r-archived": "Moved to Archive",
+    "r-unarchived": "Restored from Archive",
+    "r-a-card": "a card",
+    "r-when-a-label-is": "When a label is",
+    "r-when-the-label-is": "When the label is",
+    "r-list-name": "list name",
+    "r-when-a-member": "When a member is",
+    "r-when-the-member": "When the member",
+    "r-name": "name",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "r-when-the-item": "When the checklist item",
+    "r-checked": "Checked",
+    "r-unchecked": "Unchecked",
+    "r-move-card-to": "Move card to",
+    "r-top-of": "Top of",
+    "r-bottom-of": "Bottom of",
+    "r-its-list": "its list",
+    "r-archive": "Move to Archive",
+    "r-unarchive": "Restore from Archive",
+    "r-card": "card",
+    "r-add": "Add",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-set-color": "Set color to",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "subject",
+    "r-rule-details": "Rule details",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Move card to top of list",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Move card to bottom of list",
+    "r-d-send-email": "Send email",
+    "r-d-send-email-to": "to",
+    "r-d-send-email-subject": "subject",
+    "r-d-send-email-message": "message",
+    "r-d-archive": "Move card to Archive",
+    "r-d-unarchive": "Restore card from Archive",
+    "r-d-add-label": "Add label",
+    "r-d-remove-label": "Remove label",
+    "r-create-card": "Create new card",
+    "r-in-list": "in list",
+    "r-in-swimlane": "in swimlane",
+    "r-d-add-member": "Add member",
+    "r-d-remove-member": "Remove member",
+    "r-d-remove-all-member": "Remove all member",
+    "r-d-check-all": "Check all items of a list",
+    "r-d-uncheck-all": "Uncheck all items of a list",
+    "r-d-check-one": "Check item",
+    "r-d-uncheck-one": "Uncheck item",
+    "r-d-check-of-list": "of checklist",
+    "r-d-add-checklist": "Add checklist",
+    "r-d-remove-checklist": "Remove checklist",
+    "r-by": "by",
+    "r-add-checklist": "Add checklist",
+    "r-with-items": "with items",
+    "r-items-list": "item1,item2,item3",
+    "r-add-swimlane": "Add swimlane",
+    "r-swimlane-name": "swimlane name",
+    "r-board-note": "Note: leave a field empty to match every possible value.",
+    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout",
+    "hide-logo": "Hide Logo",
+    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
+    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
+    "error-undefined": "Something went wrong",
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
+}
\ No newline at end of file
diff --git a/i18n/ko.i18n.json b/i18n/ko.i18n.json
index bee42e39..a15399d3 100644
--- a/i18n/ko.i18n.json
+++ b/i18n/ko.i18n.json
@@ -1,35 +1,51 @@
 {
     "accept": "확인",
-    "act-activity-notify": "[Wekan] 활동 알림",
-    "act-addAttachment": "__attachment__를 __card__에 첨부",
-    "act-addChecklist": "added checklist __checklist__ to __card__",
-    "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__",
-    "act-addComment": "__card__에 내용 추가 : __comment__",
-    "act-createBoard": "__board__ 생성",
-    "act-createCard": "__list__에 __card__ 추가",
-    "act-createList": "__board__에 __list__ 추가",
-    "act-addBoardMember": "__board__에 __member__ 추가",
-    "act-archivedBoard": "__board__ moved to Recycle Bin",
-    "act-archivedCard": "__card__ moved to Recycle Bin",
-    "act-archivedList": "__list__ moved to Recycle Bin",
-    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
-    "act-importBoard": "가져온 __board__",
-    "act-importCard": "가져온 __card__",
-    "act-importList": "가져온 __list__",
-    "act-joinMember": "__card__에 __member__ 추가",
-    "act-moveCard": "__card__을 __oldList__에서  __list__로 이동",
-    "act-removeBoardMember": "__board__에서 __member__를 삭제",
-    "act-restoredCard": "__card__를 __board__에 복원했습니다.",
-    "act-unjoinMember": "__card__에서 __member__를 삭제",
-    "act-withBoardTitle": "[Wekan] __board__",
+    "act-activity-notify": "Activity Notification",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__board__",
     "act-withCardTitle": "[__board__] __card__",
     "actions": "동작",
     "activities": "활동 내역",
     "activity": "활동 상태",
     "activity-added": "%s를 %s에 추가함",
-    "activity-archived": "%s moved to Recycle Bin",
+    "activity-archived": "%s moved to Archive",
     "activity-attached": "%s를 %s에 첨부함",
     "activity-created": "%s 생성됨",
+    "activity-customfield-created": "created custom field %s",
     "activity-excluded": "%s를 %s에서 제외함",
     "activity-imported": "imported %s into %s from %s",
     "activity-imported-board": "imported %s from %s",
@@ -39,13 +55,25 @@
     "activity-removed": "%s를 %s에서 삭제함",
     "activity-sent": "%s를 %s로 보냄",
     "activity-unjoined": "%s에서 멤버 해제",
+    "activity-subtask-added": "added subtask to %s",
+    "activity-checked-item": "checked %s in checklist %s of %s",
+    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
     "activity-checklist-added": "%s에 체크리스트를 추가함",
+    "activity-checklist-removed": "removed a checklist from %s",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
     "activity-checklist-item-added": "added checklist item to '%s' in %s",
+    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
     "add": "추가",
+    "activity-checked-item-card": "checked %s in checklist %s",
+    "activity-unchecked-item-card": "unchecked %s in checklist %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
     "add-attachment": "첨부파일 추가",
     "add-board": "보드 추가",
     "add-card": "카드 추가",
     "add-swimlane": "Add Swimlane",
+    "add-subtask": "Add Subtask",
     "add-checklist": "체크리스트 추가",
     "add-checklist-item": "체크리스트에 항목 추가",
     "add-cover": "커버 추가",
@@ -63,20 +91,22 @@
     "and-n-other-card": "__count__ 개의 다른 카드",
     "and-n-other-card_plural": "__count__ 개의 다른 카드들",
     "apply": "적용",
-    "app-is-offline": "Wekan 로딩 중 입니다. 잠시 기다려주세요. 페이지를 새로고침 하시면 데이터가 손실될 수 있습니다. Wekan 을 불러오는데 실패한다면 서버가 중지되지 않았는지 확인 바랍니다.",
-    "archive": "Move to Recycle Bin",
-    "archive-all": "Move All to Recycle Bin",
-    "archive-board": "Move Board to Recycle Bin",
-    "archive-card": "Move Card to Recycle Bin",
-    "archive-list": "Move List to Recycle Bin",
-    "archive-swimlane": "Move Swimlane to Recycle Bin",
-    "archive-selection": "Move selection to Recycle Bin",
-    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
-    "archived-items": "Recycle Bin",
-    "archived-boards": "Boards in Recycle Bin",
+    "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
+    "archive": "Move to Archive",
+    "archive-all": "Move All to Archive",
+    "archive-board": "Move Board to Archive",
+    "archive-card": "Move Card to Archive",
+    "archive-list": "Move List to Archive",
+    "archive-swimlane": "Move Swimlane to Archive",
+    "archive-selection": "Move selection to Archive",
+    "archiveBoardPopup-title": "Move Board to Archive?",
+    "archived-items": "보관",
+    "archived-boards": "Boards in Archive",
     "restore-board": "보드 복구",
-    "no-archived-boards": "No Boards in Recycle Bin.",
-    "archives": "Recycle Bin",
+    "no-archived-boards": "No Boards in Archive.",
+    "archives": "보관",
+    "template": "Template",
+    "templates": "Templates",
     "assign-member": "멤버 지정",
     "attached": "첨부됨",
     "attachment": "첨부 파일",
@@ -95,22 +125,25 @@
     "boardChangeTitlePopup-title": "보드 이름 바꾸기",
     "boardChangeVisibilityPopup-title": "표시 여부 변경",
     "boardChangeWatchPopup-title": "감시상태 변경",
-    "boardMenuPopup-title": "보드 메뉴",
+    "boardMenuPopup-title": "Board Settings",
     "boards": "보드",
     "board-view": "Board View",
+    "board-view-cal": "Calendar",
     "board-view-swimlanes": "Swimlanes",
     "board-view-lists": "목록들",
     "bucket-example": "예: “프로젝트 이름“ 입력",
     "cancel": "취소",
-    "card-archived": "This card is moved to Recycle Bin.",
+    "card-archived": "This card is moved to Archive.",
+    "board-archived": "This board is moved to Archive.",
     "card-comments-title": "이 카드에 %s 코멘트가 있습니다.",
     "card-delete-notice": "영구 삭제입니다. 이 카드와 관련된 모든 작업들을 잃게됩니다.",
     "card-delete-pop": "모든 작업이 활동 내역에서 제거되며 카드를 다시 열 수 없습니다. 복구가 안되니 주의하시기 바랍니다.",
-    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
     "card-due": "종료일",
     "card-due-on": "종료일",
     "card-spent": "Spent Time",
     "card-edit-attachments": "첨부 파일 수정",
+    "card-edit-custom-fields": "Edit custom fields",
     "card-edit-labels": "라벨 수정",
     "card-edit-members": "멤버 수정",
     "card-labels-title": "카드의 라벨 변경.",
@@ -118,13 +151,20 @@
     "card-start": "시작일",
     "card-start-on": "시작일",
     "cardAttachmentsPopup-title": "첨부 파일",
+    "cardCustomField-datePopup-title": "Change date",
+    "cardCustomFieldsPopup-title": "Edit custom fields",
     "cardDeletePopup-title": "카드를 삭제합니까?",
     "cardDetailsActionsPopup-title": "카드 액션",
     "cardLabelsPopup-title": "라벨",
     "cardMembersPopup-title": "멤버",
     "cardMorePopup-title": "더보기",
+    "cardTemplatePopup-title": "Create template",
     "cards": "카드",
     "cards-count": "카드",
+    "casSignIn": "Sign In with CAS",
+    "cardType-card": "Card",
+    "cardType-linkedCard": "Linked Card",
+    "cardType-linkedBoard": "Linked Board",
     "change": "변경",
     "change-avatar": "아바타 변경",
     "change-password": "암호 변경",
@@ -135,30 +175,52 @@
     "changePasswordPopup-title": "암호 변경",
     "changePermissionsPopup-title": "권한 변경",
     "changeSettingsPopup-title": "설정 변경",
+    "subtasks": "Subtasks",
     "checklists": "체크리스트",
     "click-to-star": "보드에 별 추가.",
     "click-to-unstar": "보드에 별 삭제.",
     "clipboard": "클립보드 또는 드래그 앤 드롭",
     "close": "닫기",
     "close-board": "보드 닫기",
-    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
     "color-black": "블랙",
     "color-blue": "블루",
+    "color-crimson": "crimson",
+    "color-darkgreen": "darkgreen",
+    "color-gold": "gold",
+    "color-gray": "gray",
     "color-green": "그린",
+    "color-indigo": "indigo",
     "color-lime": "라임",
+    "color-magenta": "magenta",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "navy",
     "color-orange": "오렌지",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
     "color-pink": "핑크",
+    "color-plum": "plum",
     "color-purple": "퍼플",
     "color-red": "레드",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "silver",
     "color-sky": "스카이",
+    "color-slateblue": "slateblue",
+    "color-white": "white",
     "color-yellow": "옐로우",
+    "unset-color": "Unset",
     "comment": "댓글",
     "comment-placeholder": "댓글 입력",
     "comment-only": "댓글만 입력 가능",
     "comment-only-desc": "카드에 댓글만 달수 있습니다.",
+    "no-comments": "No comments",
+    "no-comments-desc": "Can not see comments and activities.",
     "computer": "내 컴퓨터",
-    "confirm-checklist-delete-dialog": "정말 이 체크리스트를 삭제할까요?",
+    "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?",
+    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
     "copy-card-link-to-clipboard": "클립보드에 카드의 링크가 복사되었습니다.",
+    "linkCardPopup-title": "Link Card",
+    "searchElementPopup-title": "검색",
     "copyCardPopup-title": "카드 복사",
     "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
     "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
@@ -167,11 +229,25 @@
     "createBoardPopup-title": "보드 생성",
     "chooseBoardSourcePopup-title": "보드 가져오기",
     "createLabelPopup-title": "라벨 생성",
+    "createCustomField": "Create Field",
+    "createCustomFieldPopup-title": "Create Field",
     "current": "경향",
+    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
+    "custom-field-checkbox": "Checkbox",
+    "custom-field-date": "날짜",
+    "custom-field-dropdown": "Dropdown List",
+    "custom-field-dropdown-none": "(none)",
+    "custom-field-dropdown-options": "List Options",
+    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
+    "custom-field-dropdown-unknown": "(unknown)",
+    "custom-field-number": "Number",
+    "custom-field-text": "Text",
+    "custom-fields": "Custom Fields",
     "date": "날짜",
     "decline": "쇠퇴",
     "default-avatar": "기본 아바타",
     "delete": "삭제",
+    "deleteCustomFieldPopup-title": "Delete Custom Field?",
     "deleteLabelPopup-title": "라벨을 삭제합니까?",
     "description": "설명",
     "disambiguateMultiLabelPopup-title": "라벨 액션의 모호성 제거",
@@ -186,6 +262,7 @@
     "soft-wip-limit": "원만한 WIP 제한",
     "editCardStartDatePopup-title": "시작일 변경",
     "editCardDueDatePopup-title": "종료일 변경",
+    "editCustomFieldPopup-title": "Edit Field",
     "editCardSpentTimePopup-title": "Change spent time",
     "editLabelPopup-title": "라벨 변경",
     "editNotificationPopup-title": "알림 수정",
@@ -222,30 +299,36 @@
     "filter-clear": "필터 초기화",
     "filter-no-label": "라벨 없음",
     "filter-no-member": "멤버 없음",
+    "filter-no-custom-fields": "No Custom Fields",
     "filter-on": "필터 사용",
     "filter-on-desc": "보드에서 카드를 필터링합니다. 여기를 클릭하여 필터를 수정합니다.",
     "filter-to-selection": "선택 항목으로 필터링",
+    "advanced-filter-label": "Advanced Filter",
+    "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) to be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
     "fullname": "실명",
     "header-logo-title": "보드 페이지로 돌아가기.",
     "hide-system-messages": "시스템 메시지 숨기기",
     "headerBarCreateBoardPopup-title": "보드 생성",
     "home": "홈",
     "import": "가져오기",
+    "link": "Link",
     "import-board": "보드 가져오기",
     "import-board-c": "보드 가져오기",
     "import-board-title-trello": "Trello에서 보드 가져오기",
-    "import-board-title-wekan": "Wekan에서 보드 가져오기",
+    "import-board-title-wekan": "Import board from previous export",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
     "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
     "from-trello": "From Trello",
-    "from-wekan": "From Wekan",
+    "from-wekan": "From previous export",
     "import-board-instruction-trello": "Trello 게시판에서 'Menu' -> 'More' -> 'Print and Export', 'Export JSON' 선택하여 텍스트 결과값 복사",
-    "import-board-instruction-wekan": "In your Wekan board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
     "import-json-placeholder": "유효한 JSON 데이터를 여기에 붙여 넣으십시오.",
     "import-map-members": "보드 멤버들",
-    "import-members-map": "가져온 보드에는 멤버가 있습니다. 원하는 멤버를 Wekan 멤버로 매핑하세요.",
+    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
     "import-show-user-mapping": "멤버 매핑 미리보기",
-    "import-user-select": "이 멤버로 사용하려는 Wekan 유저를 선택하십시오.",
-    "importMapMembersAddPopup-title": "Wekan 멤버 선택",
+    "import-user-select": "Pick your existing user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select member",
     "info": "Version",
     "initials": "이니셜",
     "invalid-date": "적절하지 않은 날짜",
@@ -264,17 +347,19 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "카드에대한 링크",
-    "list-archive-cards": "Move all cards in this list to Recycle Bin",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
+    "list-archive-cards": "Move all cards in this list to Archive",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "목록에 있는 모든 카드를 이동",
     "list-select-cards": "목록에 있는 모든 카드를 선택",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "동작 목록",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Trello 카드 가져 오기",
     "listMorePopup-title": "더보기",
     "link-list": "이 리스트에 링크",
     "list-delete-pop": "모든 작업이 활동내역에서 제거되며 리스트를 복구 할 수 없습니다. 실행 취소는 불가능 합니다.",
-    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
     "lists": "목록들",
     "swimlanes": "Swimlanes",
     "log-out": "로그아웃",
@@ -294,9 +379,9 @@
     "muted-info": "보드의 변경된 사항들의 알림을 받지 않습니다.",
     "my-boards": "내 보드",
     "name": "이름",
-    "no-archived-cards": "No cards in Recycle Bin.",
-    "no-archived-lists": "No lists in Recycle Bin.",
-    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
+    "no-archived-cards": "No cards in Archive.",
+    "no-archived-lists": "No lists in Archive.",
+    "no-archived-swimlanes": "No swimlanes in Archive.",
     "no-results": "결과 값 없음",
     "normal": "표준",
     "normal-desc": "카드를 보거나 수정할 수 있습니다. 설정값은 변경할 수 없습니다.",
@@ -332,6 +417,7 @@
     "restore": "복구",
     "save": "저장",
     "search": "검색",
+    "rules": "Rules",
     "search-cards": "Search from card titles and descriptions on this board",
     "search-example": "Text to search for?",
     "select-color": "색 선택",
@@ -366,6 +452,7 @@
     "title": "제목",
     "tracking": "추적",
     "tracking-info": "보드 생성자 또는 멤버로 참여하는 모든 카드에 대한 변경사항 알림 받음",
+    "type": "Type",
     "unassign-member": "멤버 할당 해제",
     "unsaved-description": "저장되지 않은 설명이 있습니다.",
     "unwatch": "감시 해제",
@@ -374,7 +461,7 @@
     "uploaded-avatar": "업로드한 아바타",
     "username": "아이디",
     "view-it": "보기",
-    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
+    "warn-list-archived": "warning: this card is in an list at Archive",
     "watch": "감시",
     "watching": "감시 중",
     "watching-info": "\"이 보드의 변경사항을 알림으로 받습니다.",
@@ -382,6 +469,9 @@
     "welcome-swimlane": "Milestone 1",
     "welcome-list1": "신규",
     "welcome-list2": "진행",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
     "what-to-do": "무엇을 하고 싶으신가요?",
     "wipLimitErrorPopup-title": "Invalid WIP Limit",
     "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
@@ -407,16 +497,16 @@
     "send-smtp-test": "Send a test email to yourself",
     "invitation-code": "초대 코드",
     "email-invite-register-subject": "\"__inviter__ 님이 당신에게 초대장을 보냈습니다.",
-    "email-invite-register-text": "\"__user__ 님, \n\n__inviter__ 님이 Wekan 보드에 협업을 위하여 당신을 초대합니다.\n\n아래 링크를 클릭해주세요 : \n__url__\n\n그리고 초대 코드는 __icode__ 입니다.\n\n감사합니다.",
-    "email-smtp-test-subject": "SMTP 테스트 이메일이 발송되었습니다.",
+    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email",
     "email-smtp-test-text": "테스트 메일을 성공적으로 발송하였습니다.",
     "error-invitation-code-not-exist": "초대 코드가 존재하지 않습니다.",
     "error-notAuthorized": "이 페이지를 볼 수있는 권한이 없습니다.",
     "outgoing-webhooks": "Outgoing Webhooks",
     "outgoingWebhooksPopup-title": "Outgoing Webhooks",
+    "boardCardTitlePopup-title": "Card Title Filter",
     "new-outgoing-webhook": "New Outgoing Webhook",
     "no-name": "(Unknown)",
-    "Wekan_version": "Wekan version",
     "Node_version": "Node version",
     "OS_Arch": "OS Arch",
     "OS_Cpus": "OS CPU Count",
@@ -427,13 +517,18 @@
     "OS_Totalmem": "OS Total Memory",
     "OS_Type": "OS Type",
     "OS_Uptime": "OS Uptime",
+    "days": "days",
     "hours": "hours",
     "minutes": "minutes",
     "seconds": "seconds",
+    "show-field-on-card": "Show this field on card",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
     "yes": "Yes",
     "no": "No",
     "accounts": "Accounts",
     "accounts-allowEmailChange": "Allow Email Change",
+    "accounts-allowUserNameChange": "Allow Username Change",
     "createdAt": "Created at",
     "verified": "Verified",
     "active": "Active",
@@ -442,5 +537,157 @@
     "card-end": "End",
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
-    "editCardEndDatePopup-title": "Change end date"
-}
+    "editCardEndDatePopup-title": "Change end date",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "Assigned By",
+    "requested-by": "Requested By",
+    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
+    "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
+    "boardDeletePopup-title": "Delete Board?",
+    "delete-board": "Delete Board",
+    "default-subtasks-board": "Subtasks for __board__ board",
+    "default": "Default",
+    "queue": "Queue",
+    "subtask-settings": "Subtasks Settings",
+    "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
+    "show-subtasks-field": "Cards can have subtasks",
+    "deposit-subtasks-board": "Deposit subtasks to this board:",
+    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
+    "show-parent-in-minicard": "Show parent in minicard:",
+    "prefix-with-full-path": "Prefix with full path",
+    "prefix-with-parent": "Prefix with parent",
+    "subtext-with-full-path": "Subtext with full path",
+    "subtext-with-parent": "Subtext with parent",
+    "change-card-parent": "Change card's parent",
+    "parent-card": "Parent card",
+    "source-board": "Source board",
+    "no-parent": "Don't show parent",
+    "activity-added-label": "added label '%s' to %s",
+    "activity-removed-label": "removed label '%s' from %s",
+    "activity-delete-attach": "deleted an attachment from %s",
+    "activity-added-label-card": "added label '%s'",
+    "activity-removed-label-card": "removed label '%s'",
+    "activity-delete-attach-card": "deleted an attachment",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "r-rule": "Rule",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "Add action",
+    "r-board-rules": "Board rules",
+    "r-add-rule": "Add rule",
+    "r-view-rule": "View rule",
+    "r-delete-rule": "Delete rule",
+    "r-new-rule-name": "New rule title",
+    "r-no-rules": "No rules",
+    "r-when-a-card": "When a card",
+    "r-is": "is",
+    "r-is-moved": "is moved",
+    "r-added-to": "added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "the board",
+    "r-list": "list",
+    "set-filter": "Set Filter",
+    "r-moved-to": "Moved to",
+    "r-moved-from": "Moved from",
+    "r-archived": "Moved to Archive",
+    "r-unarchived": "Restored from Archive",
+    "r-a-card": "a card",
+    "r-when-a-label-is": "When a label is",
+    "r-when-the-label-is": "When the label is",
+    "r-list-name": "list name",
+    "r-when-a-member": "When a member is",
+    "r-when-the-member": "When the member",
+    "r-name": "name",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "r-when-the-item": "When the checklist item",
+    "r-checked": "Checked",
+    "r-unchecked": "Unchecked",
+    "r-move-card-to": "Move card to",
+    "r-top-of": "Top of",
+    "r-bottom-of": "Bottom of",
+    "r-its-list": "its list",
+    "r-archive": "Move to Archive",
+    "r-unarchive": "Restore from Archive",
+    "r-card": "card",
+    "r-add": "추가",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-set-color": "Set color to",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "subject",
+    "r-rule-details": "Rule details",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Move card to top of list",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Move card to bottom of list",
+    "r-d-send-email": "Send email",
+    "r-d-send-email-to": "to",
+    "r-d-send-email-subject": "subject",
+    "r-d-send-email-message": "message",
+    "r-d-archive": "Move card to Archive",
+    "r-d-unarchive": "Restore card from Archive",
+    "r-d-add-label": "Add label",
+    "r-d-remove-label": "Remove label",
+    "r-create-card": "Create new card",
+    "r-in-list": "목록에",
+    "r-in-swimlane": "in swimlane",
+    "r-d-add-member": "Add member",
+    "r-d-remove-member": "Remove member",
+    "r-d-remove-all-member": "Remove all member",
+    "r-d-check-all": "Check all items of a list",
+    "r-d-uncheck-all": "Uncheck all items of a list",
+    "r-d-check-one": "Check item",
+    "r-d-uncheck-one": "Uncheck item",
+    "r-d-check-of-list": "of checklist",
+    "r-d-add-checklist": "Add checklist",
+    "r-d-remove-checklist": "Remove checklist",
+    "r-by": "by",
+    "r-add-checklist": "Add checklist",
+    "r-with-items": "with items",
+    "r-items-list": "item1,item2,item3",
+    "r-add-swimlane": "Add swimlane",
+    "r-swimlane-name": "swimlane name",
+    "r-board-note": "Note: leave a field empty to match every possible value.",
+    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout",
+    "hide-logo": "Hide Logo",
+    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
+    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
+    "error-undefined": "Something went wrong",
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
+}
\ No newline at end of file
diff --git a/i18n/lv.i18n.json b/i18n/lv.i18n.json
index 1231a013..e9078c8e 100644
--- a/i18n/lv.i18n.json
+++ b/i18n/lv.i18n.json
@@ -1,35 +1,51 @@
 {
     "accept": "Piekrist",
-    "act-activity-notify": "[Wekan] Aktivitātes paziņojums",
-    "act-addAttachment": "pievienots __attachment__ to __card__",
-    "act-addChecklist": "pievienots checklist __checklist__ to __card__",
-    "act-addChecklistItem": "pievienots __checklistItem__ to checklist __checklist__ on __card__",
-    "act-addComment": "komentēja __card__: __comment__",
-    "act-createBoard": "izveidoja __board__",
-    "act-createCard": "pievienoja __card__ to __list__",
-    "act-createList": "pievienoja __list__ to __board__",
-    "act-addBoardMember": "pievienoja __member__ to __board__",
-    "act-archivedBoard": "__board__ moved to Recycle Bin",
-    "act-archivedCard": "__card__ moved to Recycle Bin",
-    "act-archivedList": "__list__ moved to Recycle Bin",
-    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
-    "act-importBoard": "importēja __board__",
-    "act-importCard": "importēja __card__",
-    "act-importList": "importēja __list__",
-    "act-joinMember": "pievienoja __member__ to __card__",
-    "act-moveCard": "pārvietoja __card__ from __oldList__ to __list__",
-    "act-removeBoardMember": "noņēma __member__ from __board__",
-    "act-restoredCard": "atjaunoja __card__ to __board__",
-    "act-unjoinMember": "noņēma __member__ from __card__",
-    "act-withBoardTitle": "[Wekan] __board__",
+    "act-activity-notify": "Activity Notification",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__board__",
     "act-withCardTitle": "[__board__] __card__",
     "actions": "Darbības",
     "activities": "Aktivitātes",
     "activity": "Aktivitāte",
     "activity-added": "pievienoja %s pie %s",
-    "activity-archived": "%s moved to Recycle Bin",
+    "activity-archived": "%s moved to Archive",
     "activity-attached": "pievienoja %s pie %s",
     "activity-created": "izveidoja%s",
+    "activity-customfield-created": "created custom field %s",
     "activity-excluded": "izslēdza%s no%s",
     "activity-imported": "importēja %s iekšā%s no%s",
     "activity-imported-board": "imported %s from %s",
@@ -39,13 +55,25 @@
     "activity-removed": "removed %s from %s",
     "activity-sent": "sent %s to %s",
     "activity-unjoined": "unjoined %s",
+    "activity-subtask-added": "added subtask to %s",
+    "activity-checked-item": "checked %s in checklist %s of %s",
+    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
     "activity-checklist-added": "added checklist to %s",
+    "activity-checklist-removed": "removed a checklist from %s",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
     "activity-checklist-item-added": "added checklist item to '%s' in %s",
+    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
     "add": "Add",
+    "activity-checked-item-card": "checked %s in checklist %s",
+    "activity-unchecked-item-card": "unchecked %s in checklist %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
     "add-attachment": "Add Attachment",
     "add-board": "Add Board",
     "add-card": "Add Card",
     "add-swimlane": "Add Swimlane",
+    "add-subtask": "Add Subtask",
     "add-checklist": "Add Checklist",
     "add-checklist-item": "Add an item to checklist",
     "add-cover": "Add Cover",
@@ -63,20 +91,22 @@
     "and-n-other-card": "And __count__ other card",
     "and-n-other-card_plural": "And __count__ other cards",
     "apply": "Apply",
-    "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Move to Recycle Bin",
-    "archive-all": "Move All to Recycle Bin",
-    "archive-board": "Move Board to Recycle Bin",
-    "archive-card": "Move Card to Recycle Bin",
-    "archive-list": "Move List to Recycle Bin",
-    "archive-swimlane": "Move Swimlane to Recycle Bin",
-    "archive-selection": "Move selection to Recycle Bin",
-    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
-    "archived-items": "Recycle Bin",
-    "archived-boards": "Boards in Recycle Bin",
+    "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
+    "archive": "Move to Archive",
+    "archive-all": "Move All to Archive",
+    "archive-board": "Move Board to Archive",
+    "archive-card": "Move Card to Archive",
+    "archive-list": "Move List to Archive",
+    "archive-swimlane": "Move Swimlane to Archive",
+    "archive-selection": "Move selection to Archive",
+    "archiveBoardPopup-title": "Move Board to Archive?",
+    "archived-items": "Archive",
+    "archived-boards": "Boards in Archive",
     "restore-board": "Restore Board",
-    "no-archived-boards": "No Boards in Recycle Bin.",
-    "archives": "Recycle Bin",
+    "no-archived-boards": "No Boards in Archive.",
+    "archives": "Archive",
+    "template": "Template",
+    "templates": "Templates",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Attachment",
@@ -95,22 +125,25 @@
     "boardChangeTitlePopup-title": "Rename Board",
     "boardChangeVisibilityPopup-title": "Change Visibility",
     "boardChangeWatchPopup-title": "Change Watch",
-    "boardMenuPopup-title": "Board Menu",
+    "boardMenuPopup-title": "Board Settings",
     "boards": "Boards",
     "board-view": "Board View",
+    "board-view-cal": "Calendar",
     "board-view-swimlanes": "Swimlanes",
     "board-view-lists": "Lists",
     "bucket-example": "Like “Bucket List” for example",
     "cancel": "Cancel",
-    "card-archived": "This card is moved to Recycle Bin.",
+    "card-archived": "This card is moved to Archive.",
+    "board-archived": "This board is moved to Archive.",
     "card-comments-title": "This card has %s comment.",
     "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
     "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
     "card-due": "Due",
     "card-due-on": "Due on",
     "card-spent": "Spent Time",
     "card-edit-attachments": "Edit attachments",
+    "card-edit-custom-fields": "Edit custom fields",
     "card-edit-labels": "Edit labels",
     "card-edit-members": "Edit members",
     "card-labels-title": "Change the labels for the card.",
@@ -118,13 +151,20 @@
     "card-start": "Start",
     "card-start-on": "Starts on",
     "cardAttachmentsPopup-title": "Attach From",
+    "cardCustomField-datePopup-title": "Change date",
+    "cardCustomFieldsPopup-title": "Edit custom fields",
     "cardDeletePopup-title": "Delete Card?",
     "cardDetailsActionsPopup-title": "Card Actions",
     "cardLabelsPopup-title": "Labels",
     "cardMembersPopup-title": "Members",
     "cardMorePopup-title": "More",
+    "cardTemplatePopup-title": "Create template",
     "cards": "Cards",
     "cards-count": "Cards",
+    "casSignIn": "Sign In with CAS",
+    "cardType-card": "Card",
+    "cardType-linkedCard": "Linked Card",
+    "cardType-linkedBoard": "Linked Board",
     "change": "Change",
     "change-avatar": "Change Avatar",
     "change-password": "Change Password",
@@ -135,30 +175,52 @@
     "changePasswordPopup-title": "Change Password",
     "changePermissionsPopup-title": "Change Permissions",
     "changeSettingsPopup-title": "Change Settings",
+    "subtasks": "Subtasks",
     "checklists": "Checklists",
     "click-to-star": "Click to star this board.",
     "click-to-unstar": "Click to unstar this board.",
     "clipboard": "Clipboard or drag & drop",
     "close": "Close",
     "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
     "color-black": "black",
     "color-blue": "blue",
+    "color-crimson": "crimson",
+    "color-darkgreen": "darkgreen",
+    "color-gold": "gold",
+    "color-gray": "gray",
     "color-green": "green",
+    "color-indigo": "indigo",
     "color-lime": "lime",
+    "color-magenta": "magenta",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "navy",
     "color-orange": "orange",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
     "color-pink": "pink",
+    "color-plum": "plum",
     "color-purple": "purple",
     "color-red": "red",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "silver",
     "color-sky": "sky",
+    "color-slateblue": "slateblue",
+    "color-white": "white",
     "color-yellow": "yellow",
+    "unset-color": "Unset",
     "comment": "Comment",
     "comment-placeholder": "Write Comment",
     "comment-only": "Comment only",
     "comment-only-desc": "Can comment on cards only.",
+    "no-comments": "No comments",
+    "no-comments-desc": "Can not see comments and activities.",
     "computer": "Computer",
-    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist",
+    "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?",
+    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
     "copy-card-link-to-clipboard": "Copy card link to clipboard",
+    "linkCardPopup-title": "Link Card",
+    "searchElementPopup-title": "Search",
     "copyCardPopup-title": "Copy Card",
     "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
     "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
@@ -167,11 +229,25 @@
     "createBoardPopup-title": "Create Board",
     "chooseBoardSourcePopup-title": "Import board",
     "createLabelPopup-title": "Create Label",
+    "createCustomField": "Create Field",
+    "createCustomFieldPopup-title": "Create Field",
     "current": "current",
+    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
+    "custom-field-checkbox": "Checkbox",
+    "custom-field-date": "Date",
+    "custom-field-dropdown": "Dropdown List",
+    "custom-field-dropdown-none": "(none)",
+    "custom-field-dropdown-options": "List Options",
+    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
+    "custom-field-dropdown-unknown": "(unknown)",
+    "custom-field-number": "Number",
+    "custom-field-text": "Text",
+    "custom-fields": "Custom Fields",
     "date": "Date",
     "decline": "Decline",
     "default-avatar": "Default avatar",
     "delete": "Delete",
+    "deleteCustomFieldPopup-title": "Delete Custom Field?",
     "deleteLabelPopup-title": "Delete Label?",
     "description": "Description",
     "disambiguateMultiLabelPopup-title": "Disambiguate Label Action",
@@ -186,6 +262,7 @@
     "soft-wip-limit": "Soft WIP Limit",
     "editCardStartDatePopup-title": "Change start date",
     "editCardDueDatePopup-title": "Change due date",
+    "editCustomFieldPopup-title": "Edit Field",
     "editCardSpentTimePopup-title": "Change spent time",
     "editLabelPopup-title": "Change Label",
     "editNotificationPopup-title": "Edit Notification",
@@ -222,30 +299,36 @@
     "filter-clear": "Clear filter",
     "filter-no-label": "No label",
     "filter-no-member": "No member",
+    "filter-no-custom-fields": "No Custom Fields",
     "filter-on": "Filter is on",
     "filter-on-desc": "You are filtering cards on this board. Click here to edit filter.",
     "filter-to-selection": "Filter to selection",
+    "advanced-filter-label": "Advanced Filter",
+    "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) to be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
     "fullname": "Full Name",
     "header-logo-title": "Go back to your boards page.",
     "hide-system-messages": "Hide system messages",
     "headerBarCreateBoardPopup-title": "Create Board",
     "home": "Home",
     "import": "Import",
+    "link": "Link",
     "import-board": "import board",
     "import-board-c": "Import board",
     "import-board-title-trello": "Import board from Trello",
-    "import-board-title-wekan": "Import board from Wekan",
+    "import-board-title-wekan": "Import board from previous export",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
     "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
     "from-trello": "From Trello",
-    "from-wekan": "From Wekan",
+    "from-wekan": "From previous export",
     "import-board-instruction-trello": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text.",
-    "import-board-instruction-wekan": "In your Wekan board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
     "import-json-placeholder": "Paste your valid JSON data here",
     "import-map-members": "Map members",
-    "import-members-map": "Your imported board has some members. Please map the members you want to import to Wekan users",
+    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
     "import-show-user-mapping": "Review members mapping",
-    "import-user-select": "Pick the Wekan user you want to use as this member",
-    "importMapMembersAddPopup-title": "Select Wekan member",
+    "import-user-select": "Pick your existing user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select member",
     "info": "Version",
     "initials": "Initials",
     "invalid-date": "Invalid date",
@@ -264,17 +347,19 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "Link to this card",
-    "list-archive-cards": "Move all cards in this list to Recycle Bin",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
+    "list-archive-cards": "Move all cards in this list to Archive",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "List Actions",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Import a Trello card",
     "listMorePopup-title": "More",
     "link-list": "Link to this list",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
     "lists": "Lists",
     "swimlanes": "Swimlanes",
     "log-out": "Log Out",
@@ -294,9 +379,9 @@
     "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "My Boards",
     "name": "Name",
-    "no-archived-cards": "No cards in Recycle Bin.",
-    "no-archived-lists": "No lists in Recycle Bin.",
-    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
+    "no-archived-cards": "No cards in Archive.",
+    "no-archived-lists": "No lists in Archive.",
+    "no-archived-swimlanes": "No swimlanes in Archive.",
     "no-results": "No results",
     "normal": "Normal",
     "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -332,6 +417,7 @@
     "restore": "Restore",
     "save": "Save",
     "search": "Search",
+    "rules": "Rules",
     "search-cards": "Search from card titles and descriptions on this board",
     "search-example": "Text to search for?",
     "select-color": "Select Color",
@@ -366,6 +452,7 @@
     "title": "Title",
     "tracking": "Tracking",
     "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
+    "type": "Type",
     "unassign-member": "Unassign member",
     "unsaved-description": "You have an unsaved description.",
     "unwatch": "Unwatch",
@@ -374,7 +461,7 @@
     "uploaded-avatar": "Uploaded an avatar",
     "username": "Username",
     "view-it": "View it",
-    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
+    "warn-list-archived": "warning: this card is in an list at Archive",
     "watch": "Watch",
     "watching": "Watching",
     "watching-info": "You will be notified of any change in this board",
@@ -382,6 +469,9 @@
     "welcome-swimlane": "Milestone 1",
     "welcome-list1": "Basics",
     "welcome-list2": "Advanced",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
     "what-to-do": "What do you want to do?",
     "wipLimitErrorPopup-title": "Invalid WIP Limit",
     "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
@@ -407,16 +497,16 @@
     "send-smtp-test": "Send a test email to yourself",
     "invitation-code": "Invitation Code",
     "email-invite-register-subject": "__inviter__ sent you an invitation",
-    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to Wekan for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
-    "email-smtp-test-subject": "SMTP Test Email From Wekan",
+    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email",
     "email-smtp-test-text": "You have successfully sent an email",
     "error-invitation-code-not-exist": "Invitation code doesn't exist",
     "error-notAuthorized": "You are not authorized to view this page.",
     "outgoing-webhooks": "Outgoing Webhooks",
     "outgoingWebhooksPopup-title": "Outgoing Webhooks",
+    "boardCardTitlePopup-title": "Card Title Filter",
     "new-outgoing-webhook": "New Outgoing Webhook",
     "no-name": "(Unknown)",
-    "Wekan_version": "Wekan version",
     "Node_version": "Node version",
     "OS_Arch": "OS Arch",
     "OS_Cpus": "OS CPU Count",
@@ -427,13 +517,18 @@
     "OS_Totalmem": "OS Total Memory",
     "OS_Type": "OS Type",
     "OS_Uptime": "OS Uptime",
+    "days": "days",
     "hours": "hours",
     "minutes": "minutes",
     "seconds": "seconds",
+    "show-field-on-card": "Show this field on card",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
     "yes": "Yes",
     "no": "No",
     "accounts": "Accounts",
     "accounts-allowEmailChange": "Allow Email Change",
+    "accounts-allowUserNameChange": "Allow Username Change",
     "createdAt": "Created at",
     "verified": "Verified",
     "active": "Active",
@@ -442,5 +537,157 @@
     "card-end": "End",
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
-    "editCardEndDatePopup-title": "Change end date"
-}
+    "editCardEndDatePopup-title": "Change end date",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "Assigned By",
+    "requested-by": "Requested By",
+    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
+    "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
+    "boardDeletePopup-title": "Delete Board?",
+    "delete-board": "Delete Board",
+    "default-subtasks-board": "Subtasks for __board__ board",
+    "default": "Default",
+    "queue": "Queue",
+    "subtask-settings": "Subtasks Settings",
+    "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
+    "show-subtasks-field": "Cards can have subtasks",
+    "deposit-subtasks-board": "Deposit subtasks to this board:",
+    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
+    "show-parent-in-minicard": "Show parent in minicard:",
+    "prefix-with-full-path": "Prefix with full path",
+    "prefix-with-parent": "Prefix with parent",
+    "subtext-with-full-path": "Subtext with full path",
+    "subtext-with-parent": "Subtext with parent",
+    "change-card-parent": "Change card's parent",
+    "parent-card": "Parent card",
+    "source-board": "Source board",
+    "no-parent": "Don't show parent",
+    "activity-added-label": "added label '%s' to %s",
+    "activity-removed-label": "removed label '%s' from %s",
+    "activity-delete-attach": "deleted an attachment from %s",
+    "activity-added-label-card": "added label '%s'",
+    "activity-removed-label-card": "removed label '%s'",
+    "activity-delete-attach-card": "deleted an attachment",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "r-rule": "Rule",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "Add action",
+    "r-board-rules": "Board rules",
+    "r-add-rule": "Add rule",
+    "r-view-rule": "View rule",
+    "r-delete-rule": "Delete rule",
+    "r-new-rule-name": "New rule title",
+    "r-no-rules": "No rules",
+    "r-when-a-card": "When a card",
+    "r-is": "is",
+    "r-is-moved": "is moved",
+    "r-added-to": "added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "the board",
+    "r-list": "list",
+    "set-filter": "Set Filter",
+    "r-moved-to": "Moved to",
+    "r-moved-from": "Moved from",
+    "r-archived": "Moved to Archive",
+    "r-unarchived": "Restored from Archive",
+    "r-a-card": "a card",
+    "r-when-a-label-is": "When a label is",
+    "r-when-the-label-is": "When the label is",
+    "r-list-name": "list name",
+    "r-when-a-member": "When a member is",
+    "r-when-the-member": "When the member",
+    "r-name": "name",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "r-when-the-item": "When the checklist item",
+    "r-checked": "Checked",
+    "r-unchecked": "Unchecked",
+    "r-move-card-to": "Move card to",
+    "r-top-of": "Top of",
+    "r-bottom-of": "Bottom of",
+    "r-its-list": "its list",
+    "r-archive": "Move to Archive",
+    "r-unarchive": "Restore from Archive",
+    "r-card": "card",
+    "r-add": "Add",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-set-color": "Set color to",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "subject",
+    "r-rule-details": "Rule details",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Move card to top of list",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Move card to bottom of list",
+    "r-d-send-email": "Send email",
+    "r-d-send-email-to": "to",
+    "r-d-send-email-subject": "subject",
+    "r-d-send-email-message": "message",
+    "r-d-archive": "Move card to Archive",
+    "r-d-unarchive": "Restore card from Archive",
+    "r-d-add-label": "Add label",
+    "r-d-remove-label": "Remove label",
+    "r-create-card": "Create new card",
+    "r-in-list": "in list",
+    "r-in-swimlane": "in swimlane",
+    "r-d-add-member": "Add member",
+    "r-d-remove-member": "Remove member",
+    "r-d-remove-all-member": "Remove all member",
+    "r-d-check-all": "Check all items of a list",
+    "r-d-uncheck-all": "Uncheck all items of a list",
+    "r-d-check-one": "Check item",
+    "r-d-uncheck-one": "Uncheck item",
+    "r-d-check-of-list": "of checklist",
+    "r-d-add-checklist": "Add checklist",
+    "r-d-remove-checklist": "Remove checklist",
+    "r-by": "by",
+    "r-add-checklist": "Add checklist",
+    "r-with-items": "with items",
+    "r-items-list": "item1,item2,item3",
+    "r-add-swimlane": "Add swimlane",
+    "r-swimlane-name": "swimlane name",
+    "r-board-note": "Note: leave a field empty to match every possible value.",
+    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout",
+    "hide-logo": "Hide Logo",
+    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
+    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
+    "error-undefined": "Something went wrong",
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
+}
\ No newline at end of file
diff --git a/i18n/mk.i18n.json b/i18n/mk.i18n.json
new file mode 100644
index 00000000..dd828bb8
--- /dev/null
+++ b/i18n/mk.i18n.json
@@ -0,0 +1,693 @@
+{
+    "accept": "Прифати",
+    "act-activity-notify": "Activity Notification",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__board__",
+    "act-withCardTitle": "[__board__] __card__",
+    "actions": "Акции",
+    "activities": "Активности",
+    "activity": "Активност",
+    "activity-added": "добави %s към %s",
+    "activity-archived": "%s е преместена во Архива",
+    "activity-attached": "прикачи %s към %s",
+    "activity-created": "създаде %s",
+    "activity-customfield-created": "създаде собствено поле %s",
+    "activity-excluded": "изключи %s от %s",
+    "activity-imported": "импортира %s в/във %s от %s",
+    "activity-imported-board": "импортира %s от %s",
+    "activity-joined": "се присъедини към %s",
+    "activity-moved": "премести %s от %s в/във %s",
+    "activity-on": "на %s",
+    "activity-removed": "премахна %s от %s",
+    "activity-sent": "изпрати %s до %s",
+    "activity-unjoined": "вече не е част от %s",
+    "activity-subtask-added": "добави задача към %s",
+    "activity-checked-item": "отбеляза%s в списък със задачи %s на %s",
+    "activity-unchecked-item": "размаркира %s от списък със задачи %s на %s",
+    "activity-checklist-added": "добави списък със задачи към %s",
+    "activity-checklist-removed": "премахна списък със задачи от %s",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted": "\"отзавърши\" чеклистта %s в %s",
+    "activity-checklist-item-added": "добави точка към '%s' в/във %s",
+    "activity-checklist-item-removed": "премахна точка от '%s' в %s",
+    "add": "Добави",
+    "activity-checked-item-card": "отбеляза %s в чеклист %s",
+    "activity-unchecked-item-card": "размаркира %s в чеклист %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted-card": "\"отзавърши\" чеклистта %s",
+    "add-attachment": "Додај прилог",
+    "add-board": "Додади Табла",
+    "add-card": "Додади Картичка",
+    "add-swimlane": "Додади Коридор",
+    "add-subtask": "Додади подзадача",
+    "add-checklist": "Додади список на задачи",
+    "add-checklist-item": "Додади точка во списокот со задачи",
+    "add-cover": "Додади корица",
+    "add-label": "Додади етикета",
+    "add-list": "Додади листа",
+    "add-members": "Додави членови",
+    "added": "Додадено",
+    "addMemberPopup-title": "Членови",
+    "admin": "Администратор",
+    "admin-desc": "Can view and edit cards, remove members, and change settings for the board.",
+    "admin-announcement": "Съобщение",
+    "admin-announcement-active": "Active System-Wide Announcement",
+    "admin-announcement-title": "Announcement from Administrator",
+    "all-boards": "Сите табли",
+    "and-n-other-card": "And __count__ other card",
+    "and-n-other-card_plural": "And __count__ other cards",
+    "apply": "Приложи",
+    "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
+    "archive": "Премести во Архива",
+    "archive-all": "Премести всички во Архива",
+    "archive-board": "Премести Таблото во Архива",
+    "archive-card": "Премести Картата во Архива",
+    "archive-list": "Премести Списъка во Архива",
+    "archive-swimlane": "Премести Коридора во Архива",
+    "archive-selection": "Премести избраното во Архива",
+    "archiveBoardPopup-title": "Да преместя ли Таблото во Архива?",
+    "archived-items": "Архива",
+    "archived-boards": "Табла во Архива",
+    "restore-board": "Възстанови Таблото",
+    "no-archived-boards": "Няма Табла во Архива.",
+    "archives": "Архива",
+    "template": "Template",
+    "templates": "Templates",
+    "assign-member": "Възложи на член от екипа",
+    "attached": "прикачен",
+    "attachment": "Прикаченн датотека",
+    "attachment-delete-pop": "Изтриването на прикачен датотека е завинаги. Няма как да бъде възстановен.",
+    "attachmentDeletePopup-title": "Желаете ли да изтриете прикачения датотека?",
+    "attachments": "Прикачени датотеки",
+    "auto-watch": "Автоматично наблюдаване на таблата, когато са създадени",
+    "avatar-too-big": "Аватарът е прекалено голям (максимум 70KB)",
+    "back": "Назад",
+    "board-change-color": "Промени боја",
+    "board-nb-stars": "%s звезди",
+    "board-not-found": "Таблото не е најдено",
+    "board-private-info": "This board will be <strong>private</strong>.",
+    "board-public-info": "This board will be <strong>public</strong>.",
+    "boardChangeColorPopup-title": "Change Board Background",
+    "boardChangeTitlePopup-title": "Промени името на Таблото",
+    "boardChangeVisibilityPopup-title": "Change Visibility",
+    "boardChangeWatchPopup-title": "Промени наблюдаването",
+    "boardMenuPopup-title": "Board Settings",
+    "boards": "Табли",
+    "board-view": "Board View",
+    "board-view-cal": "Календар",
+    "board-view-swimlanes": "Коридори",
+    "board-view-lists": "Листи",
+    "bucket-example": "Like “Bucket List” for example",
+    "cancel": "Откажи",
+    "card-archived": "Тази карта е преместена во Архива.",
+    "board-archived": "Това табло е преместено во Архива.",
+    "card-comments-title": "Тази карта има %s коментар.",
+    "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
+    "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
+    "card-delete-suggest-archive": "Можете да преместите картата во Архива, за да я премахнете от Таблото и така да запазите активността в него.",
+    "card-due": "Готова за",
+    "card-due-on": "Готова за",
+    "card-spent": "Изработено време",
+    "card-edit-attachments": "Промени прикачените датотеки",
+    "card-edit-custom-fields": "Промени собствените полета",
+    "card-edit-labels": "Промени етикетите",
+    "card-edit-members": "Промени членовете",
+    "card-labels-title": "Промени етикетите за картата.",
+    "card-members-title": "Добави или премахни членове на Таблото от тази карта.",
+    "card-start": "Започнува",
+    "card-start-on": "Започнува на",
+    "cardAttachmentsPopup-title": "Прикачи от",
+    "cardCustomField-datePopup-title": "Промени датата",
+    "cardCustomFieldsPopup-title": "Промени собствените полета",
+    "cardDeletePopup-title": "Желаете да изтриете картата?",
+    "cardDetailsActionsPopup-title": "Опции",
+    "cardLabelsPopup-title": "Етикети",
+    "cardMembersPopup-title": "Членови",
+    "cardMorePopup-title": "Повеќе",
+    "cardTemplatePopup-title": "Create template",
+    "cards": "Картички",
+    "cards-count": "Картички",
+    "casSignIn": "Sign In with CAS",
+    "cardType-card": "Карта",
+    "cardType-linkedCard": "Поврзана карта",
+    "cardType-linkedBoard": "Свързано табло",
+    "change": "Промени",
+    "change-avatar": "Промени аватара",
+    "change-password": "Промени лозинка",
+    "change-permissions": "Промени права",
+    "change-settings": "Промени параметри",
+    "changeAvatarPopup-title": "Промени аватар",
+    "changeLanguagePopup-title": "Промени јазик",
+    "changePasswordPopup-title": "Промени лозинка",
+    "changePermissionsPopup-title": "Промени права",
+    "changeSettingsPopup-title": "Промени параметри",
+    "subtasks": "Подзадачи",
+    "checklists": "Списъци със задачи",
+    "click-to-star": "Click to star this board.",
+    "click-to-unstar": "Натиснете, за да премахнете това табло от любими.",
+    "clipboard": "Клипборда или с драг & дроп",
+    "close": "Затвори",
+    "close-board": "Затвори Табла",
+    "close-board-pop": "Ще можете да възстановите Таблото като натиснете на бутона \"Архива\" в началото на хедъра.",
+    "color-black": "црно",
+    "color-blue": "сино",
+    "color-crimson": "crimson",
+    "color-darkgreen": "darkgreen",
+    "color-gold": "златно",
+    "color-gray": "сиво",
+    "color-green": "зелено",
+    "color-indigo": "indigo",
+    "color-lime": "лайм",
+    "color-magenta": "magenta",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "navy",
+    "color-orange": "оранжево",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
+    "color-pink": "розово",
+    "color-plum": "plum",
+    "color-purple": "пурпурно",
+    "color-red": "червено",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "silver",
+    "color-sky": "светло синьо",
+    "color-slateblue": "slateblue",
+    "color-white": "бяло",
+    "color-yellow": "жълто",
+    "unset-color": "Unset",
+    "comment": "Коментирај",
+    "comment-placeholder": "Напиши коментар",
+    "comment-only": "Само коментари",
+    "comment-only-desc": "Може да коментира само в карти.",
+    "no-comments": "Нема коментари",
+    "no-comments-desc": "Can not see comments and activities.",
+    "computer": "Компјутер",
+    "confirm-subtask-delete-dialog": "Сигурен ли сте, дека сакате да изтриете подзадачата?",
+    "confirm-checklist-delete-dialog": "Сигурни ли сте, дека сакате да изтриете този чеклист?",
+    "copy-card-link-to-clipboard": "Копирай връзката на картата в клипборда",
+    "linkCardPopup-title": "Поврзи картичка",
+    "searchElementPopup-title": "Барај",
+    "copyCardPopup-title": "Копирај картичка",
+    "copyChecklistToManyCardsPopup-title": "Копирай чеклисти в други карти",
+    "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
+    "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"First card title\", \"description\":\"First card description\"}, {\"title\":\"Second card title\",\"description\":\"Second card description\"},{\"title\":\"Last card title\",\"description\":\"Last card description\"} ]",
+    "create": "Креирај",
+    "createBoardPopup-title": "Креирај Табло",
+    "chooseBoardSourcePopup-title": "Импортирай Табло",
+    "createLabelPopup-title": "Креирај Табло",
+    "createCustomField": "Креирај Поле",
+    "createCustomFieldPopup-title": "Креирај Поле",
+    "current": "сегашен",
+    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
+    "custom-field-checkbox": "Чекбокс",
+    "custom-field-date": "Дата",
+    "custom-field-dropdown": "Падащо меню",
+    "custom-field-dropdown-none": "(няма)",
+    "custom-field-dropdown-options": "List Options",
+    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
+    "custom-field-dropdown-unknown": "(unknown)",
+    "custom-field-number": "Број",
+    "custom-field-text": "Текст",
+    "custom-fields": "Собствени полета",
+    "date": "Дата",
+    "decline": "Откажи",
+    "default-avatar": "Основен аватар",
+    "delete": "Избриши",
+    "deleteCustomFieldPopup-title": "Изтриване на Собственото поле?",
+    "deleteLabelPopup-title": "Желаете да изтриете етикета?",
+    "description": "Описание",
+    "disambiguateMultiLabelPopup-title": "Disambiguate Label Action",
+    "disambiguateMultiMemberPopup-title": "Disambiguate Member Action",
+    "discard": "Отказ",
+    "done": "Готово",
+    "download": "Сваляне",
+    "edit": "Промени",
+    "edit-avatar": "Промени аватара",
+    "edit-profile": "Промяна на профила",
+    "edit-wip-limit": "Промени WIP лимита",
+    "soft-wip-limit": "\"Мек\" WIP лимит",
+    "editCardStartDatePopup-title": "Промени началната дата",
+    "editCardDueDatePopup-title": "Промени датата за готовност",
+    "editCustomFieldPopup-title": "Промени Полето",
+    "editCardSpentTimePopup-title": "Промени изработеното време",
+    "editLabelPopup-title": "Промяна на Етикета",
+    "editNotificationPopup-title": "Промени известията",
+    "editProfilePopup-title": "Промяна на профила",
+    "email": "Имейл",
+    "email-enrollAccount-subject": "Ваш профил беше създаден на __siteName__",
+    "email-enrollAccount-text": "Hello __user__,\n\nTo start using the service, simply click the link below.\n\n__url__\n\nThanks.",
+    "email-fail": "Неуспешно изпращане на имейла",
+    "email-fail-text": "Възникна грешка при изпращането на имейла",
+    "email-invalid": "Невалиден е-маил",
+    "email-invite": "Покани чрез е-маил",
+    "email-invite-subject": "__inviter__ sent you an invitation",
+    "email-invite-text": "Dear __user__,\n\n__inviter__ invites you to join board \"__board__\" for collaborations.\n\nPlease follow the link below:\n\n__url__\n\nThanks.",
+    "email-resetPassword-subject": "Reset your password on __siteName__",
+    "email-resetPassword-text": "Hello __user__,\n\nTo reset your password, simply click the link below.\n\n__url__\n\nThanks.",
+    "email-sent": "Имейлът е изпратен",
+    "email-verifyEmail-subject": "Verify your email address on __siteName__",
+    "email-verifyEmail-text": "Hello __user__,\n\nTo verify your account email, simply click the link below.\n\n__url__\n\nThanks.",
+    "enable-wip-limit": "Включи WIP лимита",
+    "error-board-doesNotExist": "Това табло не съществува",
+    "error-board-notAdmin": "За да направите това трябва да сте администратор на това табло",
+    "error-board-notAMember": "За да направите това трябва да сте член на това табло",
+    "error-json-malformed": "Текстът Ви не е валиден JSON",
+    "error-json-schema": "JSON информацията Ви не съдържа информация във валиден формат",
+    "error-list-doesNotExist": "Този списък не съществува",
+    "error-user-doesNotExist": "Този потребител не съществува",
+    "error-user-notAllowSelf": "Не можете да поканите себе си",
+    "error-user-notCreated": "Този потребител не е създаден",
+    "error-username-taken": "Това потребителско име е вече заето",
+    "error-email-taken": "Имейлът е вече зает",
+    "export-board": "Експортиране на Табло",
+    "filter": "Филтер",
+    "filter-cards": "Филтрирай картите",
+    "filter-clear": "Премахване на филтрите",
+    "filter-no-label": "без етикет",
+    "filter-no-member": "без член",
+    "filter-no-custom-fields": "Няма Собствени полета",
+    "filter-on": "Има приложени филтри",
+    "filter-on-desc": "В момента филтрирате картите в това табло. Моля, натиснете тук, за да промените филтъра.",
+    "filter-to-selection": "Филтрирай избраните",
+    "advanced-filter-label": "Напреден филтер",
+    "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) to be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
+    "fullname": "Име",
+    "header-logo-title": "Назад към страницата с Вашите табла.",
+    "hide-system-messages": "Скриване на системните съобщения",
+    "headerBarCreateBoardPopup-title": "Креирај Табло",
+    "home": "Почетна",
+    "import": "Импорт",
+    "link": "Врска",
+    "import-board": "Импортирай Табло",
+    "import-board-c": "Импортирай Табло",
+    "import-board-title-trello": "Импорт на табло от Trello",
+    "import-board-title-wekan": "Import board from previous export",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
+    "import-sandstorm-warning": "Импортирането ще изтрие всичката налична информация в таблото и ще я замени с нова.",
+    "from-trello": "От Trello",
+    "from-wekan": "From previous export",
+    "import-board-instruction-trello": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text.",
+    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
+    "import-json-placeholder": "Копирайте валидната Ви JSON информация тук",
+    "import-map-members": "Map members",
+    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
+    "import-show-user-mapping": "Review members mapping",
+    "import-user-select": "Pick your existing user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select member",
+    "info": "Версия",
+    "initials": "Инициали",
+    "invalid-date": "Невалидна дата",
+    "invalid-time": "Невалиден час",
+    "invalid-user": "Невалиден потребител",
+    "joined": "присъедини",
+    "just-invited": "Бяхте поканени в това табло",
+    "keyboard-shortcuts": "Преки пътища с клавиатурата",
+    "label-create": "Креирај етикет",
+    "label-default": "%s етикет (по подразбиране)",
+    "label-delete-pop": "There is no undo. This will remove this label from all cards and destroy its history.",
+    "labels": "Етикети",
+    "language": "Език",
+    "last-admin-desc": "You can’t change roles because there must be at least one admin.",
+    "leave-board": "Leave Board",
+    "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
+    "leaveBoardPopup-title": "Leave Board ?",
+    "link-card": "Връзка към тази карта",
+    "list-archive-cards": "Премести всички карти от този списък во Архива",
+    "list-archive-cards-pop": "Това ще премахне всички карти от този Списък от Таблото. За да видите картите во Архива и да ги върнете натиснете на \"Меню\" > \"Архива\".",
+    "list-move-cards": "Премести всички карти в този списък",
+    "list-select-cards": "Избери всички карти в този списък",
+    "set-color-list": "Set Color",
+    "listActionPopup-title": "List Actions",
+    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
+    "listImportCardPopup-title": "Импорт на карта от Trello",
+    "listMorePopup-title": "Още",
+    "link-list": "Връзка към този списък",
+    "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
+    "list-delete-suggest-archive": "Можете да преместите списъка во Архива, за да го премахнете от Таблото и така да запазите активността в него.",
+    "lists": "Списъци",
+    "swimlanes": "Коридори",
+    "log-out": "Изход",
+    "log-in": "Вход",
+    "loginPopup-title": "Вход",
+    "memberMenuPopup-title": "Настройки на профила",
+    "members": "Членове",
+    "menu": "Меню",
+    "move-selection": "Move selection",
+    "moveCardPopup-title": "Премести картата",
+    "moveCardToBottom-title": "Премести в края",
+    "moveCardToTop-title": "Премести в началото",
+    "moveSelectionPopup-title": "Move selection",
+    "multi-selection": "Множествен избор",
+    "multi-selection-on": "Множественият избор е приложен",
+    "muted": "Muted",
+    "muted-info": "You will never be notified of any changes in this board",
+    "my-boards": "Моите табла",
+    "name": "Име",
+    "no-archived-cards": "Няма карти во Архива.",
+    "no-archived-lists": "Няма списъци во Архива.",
+    "no-archived-swimlanes": "Няма коридори во Архива.",
+    "no-results": "No results",
+    "normal": "Normal",
+    "normal-desc": "Can view and edit cards. Can't change settings.",
+    "not-accepted-yet": "Invitation not accepted yet",
+    "notify-participate": "Получавате информация за всички карти, в които сте отбелязани или сте създали",
+    "notify-watch": "Получавате информация за всички табла, списъци и карти, които наблюдавате",
+    "optional": "optional",
+    "or": "или",
+    "page-maybe-private": "This page may be private. You may be able to view it by <a href='%s'>logging in</a>.",
+    "page-not-found": "Page not found.",
+    "password": "Парола",
+    "paste-or-dragdrop": "to paste, or drag & drop image file to it (image only)",
+    "participating": "Participating",
+    "preview": "Preview",
+    "previewAttachedImagePopup-title": "Preview",
+    "previewClipboardImagePopup-title": "Preview",
+    "private": "Private",
+    "private-desc": "This board is private. Only people added to the board can view and edit it.",
+    "profile": "Профил",
+    "public": "Јавна",
+    "public-desc": "This board is public. It's visible to anyone with the link and will show up in search engines like Google. Only people added to the board can edit.",
+    "quick-access-description": "Star a board to add a shortcut in this bar.",
+    "remove-cover": "Remove Cover",
+    "remove-from-board": "Remove from Board",
+    "remove-label": "Remove Label",
+    "listDeletePopup-title": "Желаете да изтриете списъка?",
+    "remove-member": "Премахни член",
+    "remove-member-from-card": "Премахни от картата",
+    "remove-member-pop": "Remove __name__ (__username__) from __boardTitle__? The member will be removed from all cards on this board. They will receive a notification.",
+    "removeMemberPopup-title": "Remove Member?",
+    "rename": "Rename",
+    "rename-board": "Промени името на Таблото",
+    "restore": "Възстанови",
+    "save": "Запази",
+    "search": "Търсене",
+    "rules": "Правила",
+    "search-cards": "Search from card titles and descriptions on this board",
+    "search-example": "Text to search for?",
+    "select-color": "Избери цвят",
+    "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
+    "setWipLimitPopup-title": "Въведи WIP лимит",
+    "shortcut-assign-self": "Добави себе си към тази карта",
+    "shortcut-autocomplete-emoji": "Autocomplete emoji",
+    "shortcut-autocomplete-members": "Autocomplete members",
+    "shortcut-clear-filters": "Изчистване на всички филтри",
+    "shortcut-close-dialog": "Close Dialog",
+    "shortcut-filter-my-cards": "Филтрирай моите карти",
+    "shortcut-show-shortcuts": "Bring up this shortcuts list",
+    "shortcut-toggle-filterbar": "Отвори/затвори сайдбара с филтри",
+    "shortcut-toggle-sidebar": "Toggle Board Sidebar",
+    "show-cards-minimum-count": "Покажи бройката на картите, ако списъка съдържа повече от",
+    "sidebar-open": "Open Sidebar",
+    "sidebar-close": "Close Sidebar",
+    "signupPopup-title": "Create an Account",
+    "star-board-title": "Click to star this board. It will show up at top of your boards list.",
+    "starred-boards": "Любими табла",
+    "starred-boards-description": "Любимите табла се показват в началото на списъка Ви.",
+    "subscribe": "Subscribe",
+    "team": "Team",
+    "this-board": "това табло",
+    "this-card": "картата",
+    "spent-time-hours": "Изработено време (часа)",
+    "overtime-hours": "Оувъртайм (часа)",
+    "overtime": "Оувъртайм",
+    "has-overtime-cards": "Има карти с оувъртайм",
+    "has-spenttime-cards": "Има карти с изработено време",
+    "time": "Време",
+    "title": "Title",
+    "tracking": "Следене",
+    "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
+    "type": "Type",
+    "unassign-member": "Unassign member",
+    "unsaved-description": "You have an unsaved description.",
+    "unwatch": "Спри наблюдаването",
+    "upload": "Upload",
+    "upload-avatar": "Качване на аватар",
+    "uploaded-avatar": "Качихте аватар",
+    "username": "Потребителско име",
+    "view-it": "View it",
+    "warn-list-archived": "внимание: тази карта е в списък во Архива",
+    "watch": "Наблюдавай",
+    "watching": "Наблюдава",
+    "watching-info": "You will be notified of any change in this board",
+    "welcome-board": "Welcome Board",
+    "welcome-swimlane": "Milestone 1",
+    "welcome-list1": "Basics",
+    "welcome-list2": "Advanced",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
+    "what-to-do": "What do you want to do?",
+    "wipLimitErrorPopup-title": "Невалиден WIP лимит",
+    "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
+    "wipLimitErrorPopup-dialog-pt2": "Моля, преместете някои от задачите от този списък или въведете по-висок WIP лимит.",
+    "admin-panel": "Администраторски панел",
+    "settings": "Настройки",
+    "people": "Хора",
+    "registration": "Регистрация",
+    "disable-self-registration": "Disable Self-Registration",
+    "invite": "Покани",
+    "invite-people": "Покани хора",
+    "to-boards": "в табло/а",
+    "email-addresses": "Имейл адреси",
+    "smtp-host-description": "Адресът на SMTP сървъра, който обслужва Вашите имейли.",
+    "smtp-port-description": "Портът, който Вашият SMTP сървър използва за изходящи имейли.",
+    "smtp-tls-description": "Разреши TLS поддръжка за SMTP сървъра",
+    "smtp-host": "SMTP хост",
+    "smtp-port": "SMTP порт",
+    "smtp-username": "Потребителско име",
+    "smtp-password": "Парола",
+    "smtp-tls": "TLS поддръжка",
+    "send-from": "От",
+    "send-smtp-test": "Изпрати тестов е-маил на себе си",
+    "invitation-code": "Invitation Code",
+    "email-invite-register-subject": "__inviter__ sent you an invitation",
+    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email",
+    "email-smtp-test-text": "Успешно изпратихте е-маил",
+    "error-invitation-code-not-exist": "Invitation code doesn't exist",
+    "error-notAuthorized": "You are not authorized to view this page.",
+    "outgoing-webhooks": "Outgoing Webhooks",
+    "outgoingWebhooksPopup-title": "Outgoing Webhooks",
+    "boardCardTitlePopup-title": "Card Title Filter",
+    "new-outgoing-webhook": "New Outgoing Webhook",
+    "no-name": "(Unknown)",
+    "Node_version": "Версия на Node",
+    "OS_Arch": "Архитектура на ОС",
+    "OS_Cpus": "Брой CPU ядра",
+    "OS_Freemem": "Свободна памет",
+    "OS_Loadavg": "ОС средно натоварване",
+    "OS_Platform": "ОС платформа",
+    "OS_Release": "ОС Версия",
+    "OS_Totalmem": "ОС Общо памет",
+    "OS_Type": "Тип ОС",
+    "OS_Uptime": "OS Ъптайм",
+    "days": "дни",
+    "hours": "часа",
+    "minutes": "минути",
+    "seconds": "секунди",
+    "show-field-on-card": "Покажи това поле в картата",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
+    "yes": "Да",
+    "no": "Не",
+    "accounts": "Профили",
+    "accounts-allowEmailChange": "Разреши промяна на имейла",
+    "accounts-allowUserNameChange": "Allow Username Change",
+    "createdAt": "Създаден на",
+    "verified": "Потвърден",
+    "active": "Активен",
+    "card-received": "Получена",
+    "card-received-on": "Получена на",
+    "card-end": "Завършена",
+    "card-end-on": "Завършена на",
+    "editCardReceivedDatePopup-title": "Промени датата на получаване",
+    "editCardEndDatePopup-title": "Промени датата на завършване",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "Разпределена от",
+    "requested-by": "Поискан от",
+    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
+    "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
+    "boardDeletePopup-title": "Изтриване на Таблото?",
+    "delete-board": "Изтрий таблото",
+    "default-subtasks-board": "Подзадачи за табло __board__",
+    "default": "по подразбиране",
+    "queue": "Опашка",
+    "subtask-settings": "Настройки на Подзадачите",
+    "boardSubtaskSettingsPopup-title": "Настройки за Подзадачите за това Табло",
+    "show-subtasks-field": "Картата може да има подзадачи",
+    "deposit-subtasks-board": "Deposit subtasks to this board:",
+    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
+    "show-parent-in-minicard": "Show parent in minicard:",
+    "prefix-with-full-path": "Prefix with full path",
+    "prefix-with-parent": "Prefix with parent",
+    "subtext-with-full-path": "Subtext with full path",
+    "subtext-with-parent": "Subtext with parent",
+    "change-card-parent": "Промени източника на картата",
+    "parent-card": "Карта-източник",
+    "source-board": "Source board",
+    "no-parent": "Не показвай източника",
+    "activity-added-label": "добави етикет '%s' към %s",
+    "activity-removed-label": "премахна етикет '%s' от %s",
+    "activity-delete-attach": "изтри прикачен датотека от %s",
+    "activity-added-label-card": "добави етикет '%s'",
+    "activity-removed-label-card": "премахна етикет '%s'",
+    "activity-delete-attach-card": "изтри прикачения датотека",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "r-rule": "Правило",
+    "r-add-trigger": "Добави спусък",
+    "r-add-action": "Добави действие",
+    "r-board-rules": "Правила за таблото",
+    "r-add-rule": "Добави правилото",
+    "r-view-rule": "Виж правилото",
+    "r-delete-rule": "Изтрий правилото",
+    "r-new-rule-name": "Заглавие за новото правило",
+    "r-no-rules": "Няма правила",
+    "r-when-a-card": "Когато карта",
+    "r-is": "е",
+    "r-is-moved": "преместена",
+    "r-added-to": "добавена в",
+    "r-removed-from": "премахната от",
+    "r-the-board": "таблото",
+    "r-list": "списък",
+    "set-filter": "Set Filter",
+    "r-moved-to": "Moved to",
+    "r-moved-from": "Moved from",
+    "r-archived": "Преместено во Архива",
+    "r-unarchived": "Възстановено от Архива",
+    "r-a-card": "карта",
+    "r-when-a-label-is": "When a label is",
+    "r-when-the-label-is": "When the label is",
+    "r-list-name": "list name",
+    "r-when-a-member": "When a member is",
+    "r-when-the-member": "When the member",
+    "r-name": "име",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "r-when-the-item": "When the checklist item",
+    "r-checked": "Checked",
+    "r-unchecked": "Unchecked",
+    "r-move-card-to": "Премести картата в",
+    "r-top-of": "началото на",
+    "r-bottom-of": "края на",
+    "r-its-list": "списъка й",
+    "r-archive": "Премести во Архива",
+    "r-unarchive": "Възстанови от Архива",
+    "r-card": "карта",
+    "r-add": "Добави",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-set-color": "Set color to",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "subject",
+    "r-rule-details": "Детайли за правилото",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Move card to top of list",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Move card to bottom of list",
+    "r-d-send-email": "Send email",
+    "r-d-send-email-to": "to",
+    "r-d-send-email-subject": "subject",
+    "r-d-send-email-message": "message",
+    "r-d-archive": "Премести картата во Архива",
+    "r-d-unarchive": "Възстанови картата от Архива",
+    "r-d-add-label": "Add label",
+    "r-d-remove-label": "Remove label",
+    "r-create-card": "Create new card",
+    "r-in-list": "in list",
+    "r-in-swimlane": "in swimlane",
+    "r-d-add-member": "Add member",
+    "r-d-remove-member": "Remove member",
+    "r-d-remove-all-member": "Remove all member",
+    "r-d-check-all": "Check all items of a list",
+    "r-d-uncheck-all": "Uncheck all items of a list",
+    "r-d-check-one": "Check item",
+    "r-d-uncheck-one": "Uncheck item",
+    "r-d-check-of-list": "of checklist",
+    "r-d-add-checklist": "Добави чеклист",
+    "r-d-remove-checklist": "Премахни чеклист",
+    "r-by": "by",
+    "r-add-checklist": "Добави чеклист",
+    "r-with-items": "с точки",
+    "r-items-list": "точка1,точка2,точка3",
+    "r-add-swimlane": "Добави коридор",
+    "r-swimlane-name": "име на коридора",
+    "r-board-note": "Note: leave a field empty to match every possible value.",
+    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout",
+    "hide-logo": "Hide Logo",
+    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
+    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
+    "error-undefined": "Something went wrong",
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
+}
\ No newline at end of file
diff --git a/i18n/mn.i18n.json b/i18n/mn.i18n.json
index 346110c5..d71ba0d4 100644
--- a/i18n/mn.i18n.json
+++ b/i18n/mn.i18n.json
@@ -1,35 +1,51 @@
 {
     "accept": "Зөвшөөрөх",
-    "act-activity-notify": "[Wekan] Activity Notification",
-    "act-addAttachment": "_attachment__ хавсралтыг __card__-д хавсаргав",
-    "act-addChecklist": "added checklist __checklist__ to __card__",
-    "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__",
-    "act-addComment": "commented on __card__: __comment__",
-    "act-createBoard": "created __board__",
-    "act-createCard": "added __card__ to __list__",
-    "act-createList": "added __list__ to __board__",
-    "act-addBoardMember": "added __member__ to __board__",
-    "act-archivedBoard": "__board__ moved to Recycle Bin",
-    "act-archivedCard": "__card__ moved to Recycle Bin",
-    "act-archivedList": "__list__ moved to Recycle Bin",
-    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
-    "act-importBoard": "imported __board__",
-    "act-importCard": "imported __card__",
-    "act-importList": "imported __list__",
-    "act-joinMember": "added __member__ to __card__",
-    "act-moveCard": "moved __card__ from __oldList__ to __list__",
-    "act-removeBoardMember": "removed __member__ from __board__",
-    "act-restoredCard": "restored __card__ to __board__",
-    "act-unjoinMember": "removed __member__ from __card__",
-    "act-withBoardTitle": "[Wekan] __board__",
+    "act-activity-notify": "Activity Notification",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__board__",
     "act-withCardTitle": "[__board__] __card__",
     "actions": "Actions",
     "activities": "Activities",
     "activity": "Activity",
     "activity-added": "added %s to %s",
-    "activity-archived": "%s moved to Recycle Bin",
+    "activity-archived": "%s moved to Archive",
     "activity-attached": "attached %s to %s",
     "activity-created": "created %s",
+    "activity-customfield-created": "created custom field %s",
     "activity-excluded": "excluded %s from %s",
     "activity-imported": "imported %s into %s from %s",
     "activity-imported-board": "imported %s from %s",
@@ -39,13 +55,25 @@
     "activity-removed": "removed %s from %s",
     "activity-sent": "sent %s to %s",
     "activity-unjoined": "unjoined %s",
+    "activity-subtask-added": "added subtask to %s",
+    "activity-checked-item": "checked %s in checklist %s of %s",
+    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
     "activity-checklist-added": "added checklist to %s",
+    "activity-checklist-removed": "removed a checklist from %s",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
     "activity-checklist-item-added": "added checklist item to '%s' in %s",
+    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
     "add": "Нэмэх",
+    "activity-checked-item-card": "checked %s in checklist %s",
+    "activity-unchecked-item-card": "unchecked %s in checklist %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
     "add-attachment": "Хавсралт нэмэх",
     "add-board": "Самбар нэмэх",
     "add-card": "Карт нэмэх",
     "add-swimlane": "Add Swimlane",
+    "add-subtask": "Add Subtask",
     "add-checklist": "Чеклист нэмэх",
     "add-checklist-item": "Add an item to checklist",
     "add-cover": "Add Cover",
@@ -63,20 +91,22 @@
     "and-n-other-card": "And __count__ other card",
     "and-n-other-card_plural": "And __count__ other cards",
     "apply": "Apply",
-    "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Move to Recycle Bin",
-    "archive-all": "Move All to Recycle Bin",
-    "archive-board": "Move Board to Recycle Bin",
-    "archive-card": "Move Card to Recycle Bin",
-    "archive-list": "Move List to Recycle Bin",
-    "archive-swimlane": "Move Swimlane to Recycle Bin",
-    "archive-selection": "Move selection to Recycle Bin",
-    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
-    "archived-items": "Recycle Bin",
-    "archived-boards": "Boards in Recycle Bin",
+    "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
+    "archive": "Move to Archive",
+    "archive-all": "Move All to Archive",
+    "archive-board": "Move Board to Archive",
+    "archive-card": "Move Card to Archive",
+    "archive-list": "Move List to Archive",
+    "archive-swimlane": "Move Swimlane to Archive",
+    "archive-selection": "Move selection to Archive",
+    "archiveBoardPopup-title": "Move Board to Archive?",
+    "archived-items": "Archive",
+    "archived-boards": "Boards in Archive",
     "restore-board": "Restore Board",
-    "no-archived-boards": "No Boards in Recycle Bin.",
-    "archives": "Recycle Bin",
+    "no-archived-boards": "No Boards in Archive.",
+    "archives": "Archive",
+    "template": "Template",
+    "templates": "Templates",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Attachment",
@@ -95,22 +125,25 @@
     "boardChangeTitlePopup-title": "Rename Board",
     "boardChangeVisibilityPopup-title": "Change Visibility",
     "boardChangeWatchPopup-title": "Change Watch",
-    "boardMenuPopup-title": "Board Menu",
+    "boardMenuPopup-title": "Board Settings",
     "boards": "Boards",
     "board-view": "Board View",
+    "board-view-cal": "Calendar",
     "board-view-swimlanes": "Swimlanes",
     "board-view-lists": "Lists",
     "bucket-example": "Like “Bucket List” for example",
     "cancel": "Cancel",
-    "card-archived": "This card is moved to Recycle Bin.",
+    "card-archived": "This card is moved to Archive.",
+    "board-archived": "This board is moved to Archive.",
     "card-comments-title": "This card has %s comment.",
     "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
     "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
     "card-due": "Due",
     "card-due-on": "Due on",
     "card-spent": "Spent Time",
     "card-edit-attachments": "Edit attachments",
+    "card-edit-custom-fields": "Edit custom fields",
     "card-edit-labels": "Edit labels",
     "card-edit-members": "Edit members",
     "card-labels-title": "Change the labels for the card.",
@@ -118,13 +151,20 @@
     "card-start": "Start",
     "card-start-on": "Starts on",
     "cardAttachmentsPopup-title": "Attach From",
+    "cardCustomField-datePopup-title": "Change date",
+    "cardCustomFieldsPopup-title": "Edit custom fields",
     "cardDeletePopup-title": "Delete Card?",
     "cardDetailsActionsPopup-title": "Card Actions",
     "cardLabelsPopup-title": "Labels",
     "cardMembersPopup-title": "Гишүүд",
     "cardMorePopup-title": "More",
+    "cardTemplatePopup-title": "Create template",
     "cards": "Cards",
     "cards-count": "Cards",
+    "casSignIn": "Sign In with CAS",
+    "cardType-card": "Card",
+    "cardType-linkedCard": "Linked Card",
+    "cardType-linkedBoard": "Linked Board",
     "change": "Change",
     "change-avatar": "Аватар өөрчлөх",
     "change-password": "Нууц үг солих",
@@ -135,30 +175,52 @@
     "changePasswordPopup-title": "Нууц үг солих",
     "changePermissionsPopup-title": "Change Permissions",
     "changeSettingsPopup-title": "Тохиргоо өөрчлөх",
+    "subtasks": "Subtasks",
     "checklists": "Checklists",
     "click-to-star": "Click to star this board.",
     "click-to-unstar": "Click to unstar this board.",
     "clipboard": "Clipboard or drag & drop",
     "close": "Close",
     "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
     "color-black": "black",
     "color-blue": "blue",
+    "color-crimson": "crimson",
+    "color-darkgreen": "darkgreen",
+    "color-gold": "gold",
+    "color-gray": "gray",
     "color-green": "green",
+    "color-indigo": "indigo",
     "color-lime": "lime",
+    "color-magenta": "magenta",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "navy",
     "color-orange": "orange",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
     "color-pink": "pink",
+    "color-plum": "plum",
     "color-purple": "purple",
     "color-red": "red",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "silver",
     "color-sky": "sky",
+    "color-slateblue": "slateblue",
+    "color-white": "white",
     "color-yellow": "yellow",
+    "unset-color": "Unset",
     "comment": "Comment",
     "comment-placeholder": "Write Comment",
     "comment-only": "Comment only",
     "comment-only-desc": "Can comment on cards only.",
+    "no-comments": "No comments",
+    "no-comments-desc": "Can not see comments and activities.",
     "computer": "Computer",
-    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist",
+    "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?",
+    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
     "copy-card-link-to-clipboard": "Copy card link to clipboard",
+    "linkCardPopup-title": "Link Card",
+    "searchElementPopup-title": "Search",
     "copyCardPopup-title": "Copy Card",
     "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
     "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
@@ -167,11 +229,25 @@
     "createBoardPopup-title": "Самбар үүсгэх",
     "chooseBoardSourcePopup-title": "Import board",
     "createLabelPopup-title": "Шошго үүсгэх",
+    "createCustomField": "Create Field",
+    "createCustomFieldPopup-title": "Create Field",
     "current": "current",
+    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
+    "custom-field-checkbox": "Checkbox",
+    "custom-field-date": "Date",
+    "custom-field-dropdown": "Dropdown List",
+    "custom-field-dropdown-none": "(none)",
+    "custom-field-dropdown-options": "List Options",
+    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
+    "custom-field-dropdown-unknown": "(unknown)",
+    "custom-field-number": "Number",
+    "custom-field-text": "Text",
+    "custom-fields": "Custom Fields",
     "date": "Date",
     "decline": "Decline",
     "default-avatar": "Default avatar",
     "delete": "Delete",
+    "deleteCustomFieldPopup-title": "Delete Custom Field?",
     "deleteLabelPopup-title": "Delete Label?",
     "description": "Description",
     "disambiguateMultiLabelPopup-title": "Disambiguate Label Action",
@@ -186,6 +262,7 @@
     "soft-wip-limit": "Soft WIP Limit",
     "editCardStartDatePopup-title": "Change start date",
     "editCardDueDatePopup-title": "Change due date",
+    "editCustomFieldPopup-title": "Edit Field",
     "editCardSpentTimePopup-title": "Change spent time",
     "editLabelPopup-title": "Change Label",
     "editNotificationPopup-title": "Мэдэгдэл тохируулах",
@@ -222,30 +299,36 @@
     "filter-clear": "Clear filter",
     "filter-no-label": "No label",
     "filter-no-member": "No member",
+    "filter-no-custom-fields": "No Custom Fields",
     "filter-on": "Filter is on",
     "filter-on-desc": "You are filtering cards on this board. Click here to edit filter.",
     "filter-to-selection": "Filter to selection",
+    "advanced-filter-label": "Advanced Filter",
+    "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) to be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
     "fullname": "Full Name",
     "header-logo-title": "Go back to your boards page.",
     "hide-system-messages": "Hide system messages",
     "headerBarCreateBoardPopup-title": "Самбар үүсгэх",
     "home": "Home",
     "import": "Import",
+    "link": "Link",
     "import-board": "import board",
     "import-board-c": "Import board",
     "import-board-title-trello": "Import board from Trello",
-    "import-board-title-wekan": "Import board from Wekan",
+    "import-board-title-wekan": "Import board from previous export",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
     "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
     "from-trello": "From Trello",
-    "from-wekan": "From Wekan",
+    "from-wekan": "From previous export",
     "import-board-instruction-trello": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text.",
-    "import-board-instruction-wekan": "In your Wekan board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
     "import-json-placeholder": "Paste your valid JSON data here",
     "import-map-members": "Map members",
-    "import-members-map": "Your imported board has some members. Please map the members you want to import to Wekan users",
+    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
     "import-show-user-mapping": "Review members mapping",
-    "import-user-select": "Pick the Wekan user you want to use as this member",
-    "importMapMembersAddPopup-title": "Select Wekan member",
+    "import-user-select": "Pick your existing user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select member",
     "info": "Version",
     "initials": "Initials",
     "invalid-date": "Invalid date",
@@ -264,17 +347,19 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "Link to this card",
-    "list-archive-cards": "Move all cards in this list to Recycle Bin",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
+    "list-archive-cards": "Move all cards in this list to Archive",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "List Actions",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Import a Trello card",
     "listMorePopup-title": "More",
     "link-list": "Link to this list",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
     "lists": "Lists",
     "swimlanes": "Swimlanes",
     "log-out": "Гарах",
@@ -294,9 +379,9 @@
     "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "Миний самбарууд",
     "name": "Name",
-    "no-archived-cards": "No cards in Recycle Bin.",
-    "no-archived-lists": "No lists in Recycle Bin.",
-    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
+    "no-archived-cards": "No cards in Archive.",
+    "no-archived-lists": "No lists in Archive.",
+    "no-archived-swimlanes": "No swimlanes in Archive.",
     "no-results": "No results",
     "normal": "Normal",
     "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -332,6 +417,7 @@
     "restore": "Restore",
     "save": "Save",
     "search": "Search",
+    "rules": "Rules",
     "search-cards": "Search from card titles and descriptions on this board",
     "search-example": "Text to search for?",
     "select-color": "Select Color",
@@ -366,6 +452,7 @@
     "title": "Title",
     "tracking": "Tracking",
     "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
+    "type": "Type",
     "unassign-member": "Unassign member",
     "unsaved-description": "You have an unsaved description.",
     "unwatch": "Unwatch",
@@ -374,7 +461,7 @@
     "uploaded-avatar": "Uploaded an avatar",
     "username": "Username",
     "view-it": "View it",
-    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
+    "warn-list-archived": "warning: this card is in an list at Archive",
     "watch": "Watch",
     "watching": "Watching",
     "watching-info": "You will be notified of any change in this board",
@@ -382,6 +469,9 @@
     "welcome-swimlane": "Milestone 1",
     "welcome-list1": "Basics",
     "welcome-list2": "Advanced",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
     "what-to-do": "What do you want to do?",
     "wipLimitErrorPopup-title": "Invalid WIP Limit",
     "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
@@ -407,16 +497,16 @@
     "send-smtp-test": "Send a test email to yourself",
     "invitation-code": "Invitation Code",
     "email-invite-register-subject": "__inviter__ sent you an invitation",
-    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to Wekan for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
-    "email-smtp-test-subject": "SMTP Test Email From Wekan",
+    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email",
     "email-smtp-test-text": "You have successfully sent an email",
     "error-invitation-code-not-exist": "Invitation code doesn't exist",
     "error-notAuthorized": "You are not authorized to view this page.",
     "outgoing-webhooks": "Outgoing Webhooks",
     "outgoingWebhooksPopup-title": "Outgoing Webhooks",
+    "boardCardTitlePopup-title": "Card Title Filter",
     "new-outgoing-webhook": "New Outgoing Webhook",
     "no-name": "(Unknown)",
-    "Wekan_version": "Wekan version",
     "Node_version": "Node version",
     "OS_Arch": "OS Arch",
     "OS_Cpus": "OS CPU Count",
@@ -427,13 +517,18 @@
     "OS_Totalmem": "OS Total Memory",
     "OS_Type": "OS Type",
     "OS_Uptime": "OS Uptime",
+    "days": "days",
     "hours": "hours",
     "minutes": "minutes",
     "seconds": "seconds",
+    "show-field-on-card": "Show this field on card",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
     "yes": "Yes",
     "no": "No",
     "accounts": "Accounts",
     "accounts-allowEmailChange": "Allow Email Change",
+    "accounts-allowUserNameChange": "Allow Username Change",
     "createdAt": "Created at",
     "verified": "Verified",
     "active": "Active",
@@ -442,5 +537,157 @@
     "card-end": "End",
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
-    "editCardEndDatePopup-title": "Change end date"
-}
+    "editCardEndDatePopup-title": "Change end date",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "Assigned By",
+    "requested-by": "Requested By",
+    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
+    "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
+    "boardDeletePopup-title": "Delete Board?",
+    "delete-board": "Delete Board",
+    "default-subtasks-board": "Subtasks for __board__ board",
+    "default": "Default",
+    "queue": "Queue",
+    "subtask-settings": "Subtasks Settings",
+    "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
+    "show-subtasks-field": "Cards can have subtasks",
+    "deposit-subtasks-board": "Deposit subtasks to this board:",
+    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
+    "show-parent-in-minicard": "Show parent in minicard:",
+    "prefix-with-full-path": "Prefix with full path",
+    "prefix-with-parent": "Prefix with parent",
+    "subtext-with-full-path": "Subtext with full path",
+    "subtext-with-parent": "Subtext with parent",
+    "change-card-parent": "Change card's parent",
+    "parent-card": "Parent card",
+    "source-board": "Source board",
+    "no-parent": "Don't show parent",
+    "activity-added-label": "added label '%s' to %s",
+    "activity-removed-label": "removed label '%s' from %s",
+    "activity-delete-attach": "deleted an attachment from %s",
+    "activity-added-label-card": "added label '%s'",
+    "activity-removed-label-card": "removed label '%s'",
+    "activity-delete-attach-card": "deleted an attachment",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "r-rule": "Rule",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "Add action",
+    "r-board-rules": "Board rules",
+    "r-add-rule": "Add rule",
+    "r-view-rule": "View rule",
+    "r-delete-rule": "Delete rule",
+    "r-new-rule-name": "New rule title",
+    "r-no-rules": "No rules",
+    "r-when-a-card": "When a card",
+    "r-is": "is",
+    "r-is-moved": "is moved",
+    "r-added-to": "added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "the board",
+    "r-list": "list",
+    "set-filter": "Set Filter",
+    "r-moved-to": "Moved to",
+    "r-moved-from": "Moved from",
+    "r-archived": "Moved to Archive",
+    "r-unarchived": "Restored from Archive",
+    "r-a-card": "a card",
+    "r-when-a-label-is": "When a label is",
+    "r-when-the-label-is": "When the label is",
+    "r-list-name": "list name",
+    "r-when-a-member": "When a member is",
+    "r-when-the-member": "When the member",
+    "r-name": "name",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "r-when-the-item": "When the checklist item",
+    "r-checked": "Checked",
+    "r-unchecked": "Unchecked",
+    "r-move-card-to": "Move card to",
+    "r-top-of": "Top of",
+    "r-bottom-of": "Bottom of",
+    "r-its-list": "its list",
+    "r-archive": "Move to Archive",
+    "r-unarchive": "Restore from Archive",
+    "r-card": "card",
+    "r-add": "Нэмэх",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-set-color": "Set color to",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "subject",
+    "r-rule-details": "Rule details",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Move card to top of list",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Move card to bottom of list",
+    "r-d-send-email": "Send email",
+    "r-d-send-email-to": "to",
+    "r-d-send-email-subject": "subject",
+    "r-d-send-email-message": "message",
+    "r-d-archive": "Move card to Archive",
+    "r-d-unarchive": "Restore card from Archive",
+    "r-d-add-label": "Add label",
+    "r-d-remove-label": "Remove label",
+    "r-create-card": "Create new card",
+    "r-in-list": "in list",
+    "r-in-swimlane": "in swimlane",
+    "r-d-add-member": "Add member",
+    "r-d-remove-member": "Remove member",
+    "r-d-remove-all-member": "Remove all member",
+    "r-d-check-all": "Check all items of a list",
+    "r-d-uncheck-all": "Uncheck all items of a list",
+    "r-d-check-one": "Check item",
+    "r-d-uncheck-one": "Uncheck item",
+    "r-d-check-of-list": "of checklist",
+    "r-d-add-checklist": "Add checklist",
+    "r-d-remove-checklist": "Remove checklist",
+    "r-by": "by",
+    "r-add-checklist": "Add checklist",
+    "r-with-items": "with items",
+    "r-items-list": "item1,item2,item3",
+    "r-add-swimlane": "Add swimlane",
+    "r-swimlane-name": "swimlane name",
+    "r-board-note": "Note: leave a field empty to match every possible value.",
+    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout",
+    "hide-logo": "Hide Logo",
+    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
+    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
+    "error-undefined": "Something went wrong",
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
+}
\ No newline at end of file
diff --git a/i18n/nb.i18n.json b/i18n/nb.i18n.json
index a33240e8..78aeb8e2 100644
--- a/i18n/nb.i18n.json
+++ b/i18n/nb.i18n.json
@@ -1,35 +1,51 @@
 {
     "accept": "Godta",
-    "act-activity-notify": "[Wekan] Aktivitetsvarsel",
-    "act-addAttachment": "la ved __attachment__ til __card__",
-    "act-addChecklist": "added checklist __checklist__ to __card__",
-    "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__",
-    "act-addComment": "kommenterte til __card__: __comment__",
-    "act-createBoard": "opprettet __board__",
-    "act-createCard": "la __card__ til __list__",
-    "act-createList": "la __list__ til __board__",
-    "act-addBoardMember": "la __member__ til __board__",
-    "act-archivedBoard": "__board__ moved to Recycle Bin",
-    "act-archivedCard": "__card__ moved to Recycle Bin",
-    "act-archivedList": "__list__ moved to Recycle Bin",
-    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
-    "act-importBoard": "importerte __board__",
-    "act-importCard": "importerte __card__",
-    "act-importList": "importerte __list__",
-    "act-joinMember": "la __member__ til __card__",
-    "act-moveCard": "flyttet __card__ fra __oldList__ til __list__",
-    "act-removeBoardMember": "fjernet __member__ fra __board__",
-    "act-restoredCard": "gjenopprettet __card__ til __board__",
-    "act-unjoinMember": "fjernet __member__ fra __card__",
-    "act-withBoardTitle": "[Wekan] __board__",
+    "act-activity-notify": "Activity Notification",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__board__",
     "act-withCardTitle": "[__board__] __card__",
     "actions": "Actions",
     "activities": "Aktiviteter",
     "activity": "Aktivitet",
     "activity-added": "la %s til %s",
-    "activity-archived": "%s moved to Recycle Bin",
+    "activity-archived": "%s moved to Archive",
     "activity-attached": "la %s til %s",
     "activity-created": "opprettet %s",
+    "activity-customfield-created": "created custom field %s",
     "activity-excluded": "ekskluderte %s fra %s",
     "activity-imported": "importerte %s til %s fra %s",
     "activity-imported-board": "importerte %s fra %s",
@@ -39,13 +55,25 @@
     "activity-removed": "fjernet %s fra %s",
     "activity-sent": "sendte %s til %s",
     "activity-unjoined": "forlot %s",
+    "activity-subtask-added": "added subtask to %s",
+    "activity-checked-item": "checked %s in checklist %s of %s",
+    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
     "activity-checklist-added": "la til sjekkliste til %s",
+    "activity-checklist-removed": "removed a checklist from %s",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
     "activity-checklist-item-added": "added checklist item to '%s' in %s",
+    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
     "add": "Legg til",
+    "activity-checked-item-card": "checked %s in checklist %s",
+    "activity-unchecked-item-card": "unchecked %s in checklist %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
     "add-attachment": "Add Attachment",
     "add-board": "Add Board",
     "add-card": "Add Card",
     "add-swimlane": "Add Swimlane",
+    "add-subtask": "Add Subtask",
     "add-checklist": "Add Checklist",
     "add-checklist-item": "Nytt punkt på sjekklisten",
     "add-cover": "Nytt omslag",
@@ -63,20 +91,22 @@
     "and-n-other-card": "Og __count__ andre kort",
     "and-n-other-card_plural": "Og __count__ andre kort",
     "apply": "Lagre",
-    "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Move to Recycle Bin",
-    "archive-all": "Move All to Recycle Bin",
-    "archive-board": "Move Board to Recycle Bin",
-    "archive-card": "Move Card to Recycle Bin",
-    "archive-list": "Move List to Recycle Bin",
-    "archive-swimlane": "Move Swimlane to Recycle Bin",
-    "archive-selection": "Move selection to Recycle Bin",
-    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
-    "archived-items": "Recycle Bin",
-    "archived-boards": "Boards in Recycle Bin",
+    "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
+    "archive": "Move to Archive",
+    "archive-all": "Move All to Archive",
+    "archive-board": "Move Board to Archive",
+    "archive-card": "Move Card to Archive",
+    "archive-list": "Move List to Archive",
+    "archive-swimlane": "Move Swimlane to Archive",
+    "archive-selection": "Move selection to Archive",
+    "archiveBoardPopup-title": "Move Board to Archive?",
+    "archived-items": "Arkiv",
+    "archived-boards": "Boards in Archive",
     "restore-board": "Restore Board",
-    "no-archived-boards": "No Boards in Recycle Bin.",
-    "archives": "Recycle Bin",
+    "no-archived-boards": "No Boards in Archive.",
+    "archives": "Arkiv",
+    "template": "Template",
+    "templates": "Templates",
     "assign-member": "Tildel medlem",
     "attached": "la ved",
     "attachment": "Vedlegg",
@@ -95,22 +125,25 @@
     "boardChangeTitlePopup-title": "Endre navn på tavlen",
     "boardChangeVisibilityPopup-title": "Endre synlighet",
     "boardChangeWatchPopup-title": "Endre overvåkning",
-    "boardMenuPopup-title": "Tavlemeny",
+    "boardMenuPopup-title": "Board Settings",
     "boards": "Tavler",
     "board-view": "Board View",
+    "board-view-cal": "Calendar",
     "board-view-swimlanes": "Swimlanes",
     "board-view-lists": "Lists",
     "bucket-example": "Som \"Bucket List\" for eksempel",
     "cancel": "Avbryt",
-    "card-archived": "This card is moved to Recycle Bin.",
+    "card-archived": "This card is moved to Archive.",
+    "board-archived": "This board is moved to Archive.",
     "card-comments-title": "Dette kortet har %s kommentar.",
     "card-delete-notice": "Sletting er permanent. Du vil miste alle hendelser knyttet til dette kortet.",
     "card-delete-pop": "Alle handlinger vil fjernes fra feeden for aktiviteter og du vil ikke kunne åpne kortet på nytt. Det er ingen mulighet å angre.",
-    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
     "card-due": "Frist",
     "card-due-on": "Frist til",
     "card-spent": "Spent Time",
     "card-edit-attachments": "Rediger vedlegg",
+    "card-edit-custom-fields": "Edit custom fields",
     "card-edit-labels": "Rediger etiketter",
     "card-edit-members": "Endre medlemmer",
     "card-labels-title": "Endre etiketter for kortet.",
@@ -118,13 +151,20 @@
     "card-start": "Start",
     "card-start-on": "Starter på",
     "cardAttachmentsPopup-title": "Legg ved fra",
+    "cardCustomField-datePopup-title": "Change date",
+    "cardCustomFieldsPopup-title": "Edit custom fields",
     "cardDeletePopup-title": "Slett kort?",
     "cardDetailsActionsPopup-title": "Kort-handlinger",
     "cardLabelsPopup-title": "Etiketter",
     "cardMembersPopup-title": "Medlemmer",
     "cardMorePopup-title": "Mer",
+    "cardTemplatePopup-title": "Create template",
     "cards": "Kort",
     "cards-count": "Kort",
+    "casSignIn": "Sign In with CAS",
+    "cardType-card": "Card",
+    "cardType-linkedCard": "Linked Card",
+    "cardType-linkedBoard": "Linked Board",
     "change": "Endre",
     "change-avatar": "Endre avatar",
     "change-password": "Endre passord",
@@ -135,30 +175,52 @@
     "changePasswordPopup-title": "Endre passord",
     "changePermissionsPopup-title": "Endre tillatelser",
     "changeSettingsPopup-title": "Endre innstillinger",
+    "subtasks": "Subtasks",
     "checklists": "Sjekklister",
     "click-to-star": "Click to star this board.",
     "click-to-unstar": "Click to unstar this board.",
     "clipboard": "Clipboard or drag & drop",
     "close": "Close",
     "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
     "color-black": "black",
     "color-blue": "blue",
+    "color-crimson": "crimson",
+    "color-darkgreen": "darkgreen",
+    "color-gold": "gold",
+    "color-gray": "gray",
     "color-green": "green",
+    "color-indigo": "indigo",
     "color-lime": "lime",
+    "color-magenta": "magenta",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "navy",
     "color-orange": "orange",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
     "color-pink": "pink",
+    "color-plum": "plum",
     "color-purple": "purple",
     "color-red": "red",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "silver",
     "color-sky": "sky",
+    "color-slateblue": "slateblue",
+    "color-white": "white",
     "color-yellow": "yellow",
+    "unset-color": "Unset",
     "comment": "Comment",
     "comment-placeholder": "Write Comment",
     "comment-only": "Comment only",
     "comment-only-desc": "Can comment on cards only.",
+    "no-comments": "No comments",
+    "no-comments-desc": "Can not see comments and activities.",
     "computer": "Computer",
-    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist",
+    "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?",
+    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
     "copy-card-link-to-clipboard": "Copy card link to clipboard",
+    "linkCardPopup-title": "Link Card",
+    "searchElementPopup-title": "Search",
     "copyCardPopup-title": "Copy Card",
     "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
     "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
@@ -167,11 +229,25 @@
     "createBoardPopup-title": "Create Board",
     "chooseBoardSourcePopup-title": "Import board",
     "createLabelPopup-title": "Create Label",
+    "createCustomField": "Create Field",
+    "createCustomFieldPopup-title": "Create Field",
     "current": "current",
+    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
+    "custom-field-checkbox": "Checkbox",
+    "custom-field-date": "Date",
+    "custom-field-dropdown": "Dropdown List",
+    "custom-field-dropdown-none": "(none)",
+    "custom-field-dropdown-options": "List Options",
+    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
+    "custom-field-dropdown-unknown": "(unknown)",
+    "custom-field-number": "Number",
+    "custom-field-text": "Text",
+    "custom-fields": "Custom Fields",
     "date": "Date",
     "decline": "Decline",
     "default-avatar": "Default avatar",
     "delete": "Delete",
+    "deleteCustomFieldPopup-title": "Delete Custom Field?",
     "deleteLabelPopup-title": "Delete Label?",
     "description": "Description",
     "disambiguateMultiLabelPopup-title": "Disambiguate Label Action",
@@ -186,6 +262,7 @@
     "soft-wip-limit": "Soft WIP Limit",
     "editCardStartDatePopup-title": "Change start date",
     "editCardDueDatePopup-title": "Change due date",
+    "editCustomFieldPopup-title": "Edit Field",
     "editCardSpentTimePopup-title": "Change spent time",
     "editLabelPopup-title": "Change Label",
     "editNotificationPopup-title": "Edit Notification",
@@ -222,30 +299,36 @@
     "filter-clear": "Clear filter",
     "filter-no-label": "No label",
     "filter-no-member": "No member",
+    "filter-no-custom-fields": "No Custom Fields",
     "filter-on": "Filter is on",
     "filter-on-desc": "You are filtering cards on this board. Click here to edit filter.",
     "filter-to-selection": "Filter to selection",
+    "advanced-filter-label": "Advanced Filter",
+    "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) to be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
     "fullname": "Full Name",
     "header-logo-title": "Go back to your boards page.",
     "hide-system-messages": "Hide system messages",
     "headerBarCreateBoardPopup-title": "Create Board",
     "home": "Home",
     "import": "Import",
+    "link": "Link",
     "import-board": "import board",
     "import-board-c": "Import board",
     "import-board-title-trello": "Import board from Trello",
-    "import-board-title-wekan": "Import board from Wekan",
+    "import-board-title-wekan": "Import board from previous export",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
     "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
     "from-trello": "From Trello",
-    "from-wekan": "From Wekan",
+    "from-wekan": "From previous export",
     "import-board-instruction-trello": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text.",
-    "import-board-instruction-wekan": "In your Wekan board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
     "import-json-placeholder": "Paste your valid JSON data here",
     "import-map-members": "Map members",
-    "import-members-map": "Your imported board has some members. Please map the members you want to import to Wekan users",
+    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
     "import-show-user-mapping": "Review members mapping",
-    "import-user-select": "Pick the Wekan user you want to use as this member",
-    "importMapMembersAddPopup-title": "Select Wekan member",
+    "import-user-select": "Pick your existing user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select member",
     "info": "Version",
     "initials": "Initials",
     "invalid-date": "Invalid date",
@@ -264,17 +347,19 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "Link to this card",
-    "list-archive-cards": "Move all cards in this list to Recycle Bin",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
+    "list-archive-cards": "Move all cards in this list to Archive",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "List Actions",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Import a Trello card",
     "listMorePopup-title": "Mer",
     "link-list": "Link to this list",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
     "lists": "Lists",
     "swimlanes": "Swimlanes",
     "log-out": "Log Out",
@@ -294,9 +379,9 @@
     "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "My Boards",
     "name": "Name",
-    "no-archived-cards": "No cards in Recycle Bin.",
-    "no-archived-lists": "No lists in Recycle Bin.",
-    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
+    "no-archived-cards": "No cards in Archive.",
+    "no-archived-lists": "No lists in Archive.",
+    "no-archived-swimlanes": "No swimlanes in Archive.",
     "no-results": "No results",
     "normal": "Normal",
     "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -332,6 +417,7 @@
     "restore": "Restore",
     "save": "Save",
     "search": "Search",
+    "rules": "Rules",
     "search-cards": "Search from card titles and descriptions on this board",
     "search-example": "Text to search for?",
     "select-color": "Select Color",
@@ -366,6 +452,7 @@
     "title": "Title",
     "tracking": "Tracking",
     "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
+    "type": "Type",
     "unassign-member": "Unassign member",
     "unsaved-description": "You have an unsaved description.",
     "unwatch": "Unwatch",
@@ -374,7 +461,7 @@
     "uploaded-avatar": "Uploaded an avatar",
     "username": "Username",
     "view-it": "View it",
-    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
+    "warn-list-archived": "warning: this card is in an list at Archive",
     "watch": "Watch",
     "watching": "Watching",
     "watching-info": "You will be notified of any change in this board",
@@ -382,6 +469,9 @@
     "welcome-swimlane": "Milestone 1",
     "welcome-list1": "Basics",
     "welcome-list2": "Advanced",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
     "what-to-do": "What do you want to do?",
     "wipLimitErrorPopup-title": "Invalid WIP Limit",
     "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
@@ -407,16 +497,16 @@
     "send-smtp-test": "Send a test email to yourself",
     "invitation-code": "Invitation Code",
     "email-invite-register-subject": "__inviter__ sent you an invitation",
-    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to Wekan for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
-    "email-smtp-test-subject": "SMTP Test Email From Wekan",
+    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email",
     "email-smtp-test-text": "You have successfully sent an email",
     "error-invitation-code-not-exist": "Invitation code doesn't exist",
     "error-notAuthorized": "You are not authorized to view this page.",
     "outgoing-webhooks": "Outgoing Webhooks",
     "outgoingWebhooksPopup-title": "Outgoing Webhooks",
+    "boardCardTitlePopup-title": "Card Title Filter",
     "new-outgoing-webhook": "New Outgoing Webhook",
     "no-name": "(Unknown)",
-    "Wekan_version": "Wekan version",
     "Node_version": "Node version",
     "OS_Arch": "OS Arch",
     "OS_Cpus": "OS CPU Count",
@@ -427,13 +517,18 @@
     "OS_Totalmem": "OS Total Memory",
     "OS_Type": "OS Type",
     "OS_Uptime": "OS Uptime",
+    "days": "days",
     "hours": "hours",
     "minutes": "minutes",
     "seconds": "seconds",
+    "show-field-on-card": "Show this field on card",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
     "yes": "Yes",
     "no": "No",
     "accounts": "Accounts",
     "accounts-allowEmailChange": "Allow Email Change",
+    "accounts-allowUserNameChange": "Allow Username Change",
     "createdAt": "Created at",
     "verified": "Verified",
     "active": "Active",
@@ -442,5 +537,157 @@
     "card-end": "End",
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
-    "editCardEndDatePopup-title": "Change end date"
-}
+    "editCardEndDatePopup-title": "Change end date",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "Assigned By",
+    "requested-by": "Requested By",
+    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
+    "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
+    "boardDeletePopup-title": "Delete Board?",
+    "delete-board": "Delete Board",
+    "default-subtasks-board": "Subtasks for __board__ board",
+    "default": "Default",
+    "queue": "Queue",
+    "subtask-settings": "Subtasks Settings",
+    "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
+    "show-subtasks-field": "Cards can have subtasks",
+    "deposit-subtasks-board": "Deposit subtasks to this board:",
+    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
+    "show-parent-in-minicard": "Show parent in minicard:",
+    "prefix-with-full-path": "Prefix with full path",
+    "prefix-with-parent": "Prefix with parent",
+    "subtext-with-full-path": "Subtext with full path",
+    "subtext-with-parent": "Subtext with parent",
+    "change-card-parent": "Change card's parent",
+    "parent-card": "Parent card",
+    "source-board": "Source board",
+    "no-parent": "Don't show parent",
+    "activity-added-label": "added label '%s' to %s",
+    "activity-removed-label": "removed label '%s' from %s",
+    "activity-delete-attach": "deleted an attachment from %s",
+    "activity-added-label-card": "added label '%s'",
+    "activity-removed-label-card": "removed label '%s'",
+    "activity-delete-attach-card": "deleted an attachment",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "r-rule": "Rule",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "Add action",
+    "r-board-rules": "Board rules",
+    "r-add-rule": "Add rule",
+    "r-view-rule": "View rule",
+    "r-delete-rule": "Delete rule",
+    "r-new-rule-name": "New rule title",
+    "r-no-rules": "No rules",
+    "r-when-a-card": "When a card",
+    "r-is": "is",
+    "r-is-moved": "is moved",
+    "r-added-to": "added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "the board",
+    "r-list": "list",
+    "set-filter": "Set Filter",
+    "r-moved-to": "Moved to",
+    "r-moved-from": "Moved from",
+    "r-archived": "Moved to Archive",
+    "r-unarchived": "Restored from Archive",
+    "r-a-card": "a card",
+    "r-when-a-label-is": "When a label is",
+    "r-when-the-label-is": "When the label is",
+    "r-list-name": "list name",
+    "r-when-a-member": "When a member is",
+    "r-when-the-member": "When the member",
+    "r-name": "name",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "r-when-the-item": "When the checklist item",
+    "r-checked": "Checked",
+    "r-unchecked": "Unchecked",
+    "r-move-card-to": "Move card to",
+    "r-top-of": "Top of",
+    "r-bottom-of": "Bottom of",
+    "r-its-list": "its list",
+    "r-archive": "Move to Archive",
+    "r-unarchive": "Restore from Archive",
+    "r-card": "card",
+    "r-add": "Legg til",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-set-color": "Set color to",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "subject",
+    "r-rule-details": "Rule details",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Move card to top of list",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Move card to bottom of list",
+    "r-d-send-email": "Send email",
+    "r-d-send-email-to": "to",
+    "r-d-send-email-subject": "subject",
+    "r-d-send-email-message": "message",
+    "r-d-archive": "Move card to Archive",
+    "r-d-unarchive": "Restore card from Archive",
+    "r-d-add-label": "Add label",
+    "r-d-remove-label": "Remove label",
+    "r-create-card": "Create new card",
+    "r-in-list": "in list",
+    "r-in-swimlane": "in swimlane",
+    "r-d-add-member": "Add member",
+    "r-d-remove-member": "Remove member",
+    "r-d-remove-all-member": "Remove all member",
+    "r-d-check-all": "Check all items of a list",
+    "r-d-uncheck-all": "Uncheck all items of a list",
+    "r-d-check-one": "Check item",
+    "r-d-uncheck-one": "Uncheck item",
+    "r-d-check-of-list": "of checklist",
+    "r-d-add-checklist": "Add checklist",
+    "r-d-remove-checklist": "Remove checklist",
+    "r-by": "by",
+    "r-add-checklist": "Add checklist",
+    "r-with-items": "with items",
+    "r-items-list": "item1,item2,item3",
+    "r-add-swimlane": "Add swimlane",
+    "r-swimlane-name": "swimlane name",
+    "r-board-note": "Note: leave a field empty to match every possible value.",
+    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout",
+    "hide-logo": "Hide Logo",
+    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
+    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
+    "error-undefined": "Something went wrong",
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
+}
\ No newline at end of file
diff --git a/i18n/nl.i18n.json b/i18n/nl.i18n.json
index 72ef0f44..bec7469d 100644
--- a/i18n/nl.i18n.json
+++ b/i18n/nl.i18n.json
@@ -1,35 +1,51 @@
 {
     "accept": "Accepteren",
-    "act-activity-notify": "[Wekan] Activiteit Notificatie",
-    "act-addAttachment": "__attachment__ als bijlage toegevoegd aan __card__",
-    "act-addChecklist": "__checklist__ toegevoegd aan __card__",
-    "act-addChecklistItem": "__checklistItem__ aan checklist toegevoegd aan __checklist__ op __card__",
-    "act-addComment": "gereageerd op __card__:__comment__",
-    "act-createBoard": "aangemaakte __bord__",
-    "act-createCard": "toegevoegd __kaart__ aan __lijst__",
-    "act-createList": "toegevoegd __lijst__ aan __bord__",
-    "act-addBoardMember": "__member__ aan __board__ toegevoegd",
-    "act-archivedBoard": "__board__ moved to Recycle Bin",
-    "act-archivedCard": "__card__ moved to Recycle Bin",
-    "act-archivedList": "__list__ moved to Recycle Bin",
-    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
-    "act-importBoard": " __board__ geïmporteerd",
-    "act-importCard": "__card__ geïmporteerd",
-    "act-importList": "__list__ geïmporteerd",
-    "act-joinMember": "__member__ aan __card__ toegevoegd",
-    "act-moveCard": "verplaatst __card__ van __oldList__ naar __list__",
-    "act-removeBoardMember": "verwijderd __member__ van __board__",
-    "act-restoredCard": "hersteld __card__ naar __board__",
-    "act-unjoinMember": "verwijderd __member__ van __card__",
-    "act-withBoardTitle": "[Wekan] __board__",
+    "act-activity-notify": "Activity Notification",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__board__",
     "act-withCardTitle": "[__board__] __card__",
     "actions": "Acties",
     "activities": "Activiteiten",
     "activity": "Activiteit",
     "activity-added": "%s toegevoegd aan %s",
-    "activity-archived": "%s moved to Recycle Bin",
+    "activity-archived": "%s moved to Archive",
     "activity-attached": "%s bijgevoegd aan %s",
     "activity-created": "%s aangemaakt",
+    "activity-customfield-created": "created custom field %s",
     "activity-excluded": "%s uitgesloten van %s",
     "activity-imported": "%s geimporteerd in %s van %s",
     "activity-imported-board": "%s geimporteerd van %s",
@@ -39,13 +55,25 @@
     "activity-removed": "%s verwijderd van %s",
     "activity-sent": "%s gestuurd naar %s",
     "activity-unjoined": "uit %s gegaan",
+    "activity-subtask-added": "added subtask to %s",
+    "activity-checked-item": "checked %s in checklist %s of %s",
+    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
     "activity-checklist-added": "checklist toegevoegd aan %s",
+    "activity-checklist-removed": "removed a checklist from %s",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
     "activity-checklist-item-added": "checklist punt toegevoegd aan '%s' in '%s'",
+    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
     "add": "Toevoegen",
+    "activity-checked-item-card": "checked %s in checklist %s",
+    "activity-unchecked-item-card": "unchecked %s in checklist %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
     "add-attachment": "Voeg Bijlage Toe",
     "add-board": "Voeg Bord Toe",
     "add-card": "Voeg Kaart Toe",
     "add-swimlane": "Swimlane Toevoegen",
+    "add-subtask": "Add Subtask",
     "add-checklist": "Voeg Checklist Toe",
     "add-checklist-item": "Voeg item toe aan checklist",
     "add-cover": "Voeg Cover Toe",
@@ -63,20 +91,22 @@
     "and-n-other-card": "En nog __count__ ander",
     "and-n-other-card_plural": "En __count__ andere kaarten",
     "apply": "Aanmelden",
-    "app-is-offline": "Wekan is aan het laden, wacht alstublieft. Het verversen van de pagina zorgt voor verlies van gegevens. Als Wekan niet laadt, check of de Wekan server is gestopt.",
-    "archive": "Move to Recycle Bin",
-    "archive-all": "Move All to Recycle Bin",
-    "archive-board": "Move Board to Recycle Bin",
-    "archive-card": "Move Card to Recycle Bin",
-    "archive-list": "Move List to Recycle Bin",
-    "archive-swimlane": "Move Swimlane to Recycle Bin",
-    "archive-selection": "Move selection to Recycle Bin",
-    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
-    "archived-items": "Recycle Bin",
-    "archived-boards": "Boards in Recycle Bin",
+    "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
+    "archive": "Move to Archive",
+    "archive-all": "Move All to Archive",
+    "archive-board": "Move Board to Archive",
+    "archive-card": "Move Card to Archive",
+    "archive-list": "Move List to Archive",
+    "archive-swimlane": "Move Swimlane to Archive",
+    "archive-selection": "Move selection to Archive",
+    "archiveBoardPopup-title": "Move Board to Archive?",
+    "archived-items": "Archiveren",
+    "archived-boards": "Boards in Archive",
     "restore-board": "Herstel Bord",
-    "no-archived-boards": "No Boards in Recycle Bin.",
-    "archives": "Recycle Bin",
+    "no-archived-boards": "No Boards in Archive.",
+    "archives": "Archiveren",
+    "template": "Template",
+    "templates": "Templates",
     "assign-member": "Wijs lid aan",
     "attached": "bijgevoegd",
     "attachment": "Bijlage",
@@ -95,22 +125,25 @@
     "boardChangeTitlePopup-title": "Hernoem bord",
     "boardChangeVisibilityPopup-title": "Verander zichtbaarheid",
     "boardChangeWatchPopup-title": "Verander naar 'Watch'",
-    "boardMenuPopup-title": "Bord menu",
+    "boardMenuPopup-title": "Board Settings",
     "boards": "Borden",
     "board-view": "Bord overzicht",
+    "board-view-cal": "Calendar",
     "board-view-swimlanes": "Swimlanes",
     "board-view-lists": "Lijsten",
     "bucket-example": "Zoals \"Bucket List\" bijvoorbeeld",
     "cancel": "Annuleren",
-    "card-archived": "This card is moved to Recycle Bin.",
+    "card-archived": "This card is moved to Archive.",
+    "board-archived": "This board is moved to Archive.",
     "card-comments-title": "Deze kaart heeft %s reactie.",
     "card-delete-notice": "Verwijdering is permanent. Als je dit doet, verlies je alle informatie die op deze kaart is opgeslagen.",
     "card-delete-pop": "Alle acties worden verwijderd van de activiteiten feed, en er zal geen mogelijkheid zijn om de kaart opnieuw te openen. Deze actie kan je niet ongedaan maken.",
-    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
     "card-due": "Deadline: ",
     "card-due-on": "Deadline: ",
     "card-spent": "gespendeerde tijd",
     "card-edit-attachments": "Wijzig bijlagen",
+    "card-edit-custom-fields": "Edit custom fields",
     "card-edit-labels": "Wijzig labels",
     "card-edit-members": "Wijzig leden",
     "card-labels-title": "Wijzig de labels vam de kaart.",
@@ -118,13 +151,20 @@
     "card-start": "Begin",
     "card-start-on": "Begint op",
     "cardAttachmentsPopup-title": "Voeg bestand toe vanuit",
+    "cardCustomField-datePopup-title": "Change date",
+    "cardCustomFieldsPopup-title": "Edit custom fields",
     "cardDeletePopup-title": "Kaart verwijderen?",
     "cardDetailsActionsPopup-title": "Kaart actie ondernemen",
     "cardLabelsPopup-title": "Labels",
     "cardMembersPopup-title": "Leden",
     "cardMorePopup-title": "Meer",
+    "cardTemplatePopup-title": "Create template",
     "cards": "Kaarten",
     "cards-count": "Kaarten",
+    "casSignIn": "Sign In with CAS",
+    "cardType-card": "Card",
+    "cardType-linkedCard": "Linked Card",
+    "cardType-linkedBoard": "Linked Board",
     "change": "Wijzig",
     "change-avatar": "Wijzig avatar",
     "change-password": "Wijzig wachtwoord",
@@ -135,30 +175,52 @@
     "changePasswordPopup-title": "Wijzig wachtwoord",
     "changePermissionsPopup-title": "Wijzig permissies",
     "changeSettingsPopup-title": "Wijzig instellingen",
+    "subtasks": "Subtasks",
     "checklists": "Checklists",
     "click-to-star": "Klik om het bord als favoriet in te stellen",
     "click-to-unstar": "Klik om het bord uit favorieten weg te halen",
     "clipboard": "Vanuit clipboard of sleep het bestand hierheen",
     "close": "Sluiten",
     "close-board": "Sluit bord",
-    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
     "color-black": "zwart",
     "color-blue": "blauw",
+    "color-crimson": "crimson",
+    "color-darkgreen": "darkgreen",
+    "color-gold": "gold",
+    "color-gray": "gray",
     "color-green": "groen",
+    "color-indigo": "indigo",
     "color-lime": "Felgroen",
+    "color-magenta": "magenta",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "navy",
     "color-orange": "Oranje",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
     "color-pink": "Roze",
+    "color-plum": "plum",
     "color-purple": "Paars",
     "color-red": "Rood",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "silver",
     "color-sky": "Lucht",
+    "color-slateblue": "slateblue",
+    "color-white": "white",
     "color-yellow": "Geel",
+    "unset-color": "Unset",
     "comment": "Reageer",
     "comment-placeholder": "Schrijf reactie",
     "comment-only": "Alleen reageren",
     "comment-only-desc": "Kan alleen op kaarten reageren.",
+    "no-comments": "No comments",
+    "no-comments-desc": "Can not see comments and activities.",
     "computer": "Computer",
-    "confirm-checklist-delete-dialog": "Weet u zeker dat u de checklist wilt verwijderen",
+    "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?",
+    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
     "copy-card-link-to-clipboard": "Kopieer kaart link naar klembord",
+    "linkCardPopup-title": "Link Card",
+    "searchElementPopup-title": "Zoek",
     "copyCardPopup-title": "Kopieer kaart",
     "copyChecklistToManyCardsPopup-title": "Checklist sjabloon kopiëren naar meerdere kaarten",
     "copyChecklistToManyCardsPopup-instructions": "Doel kaart titels en omschrijvingen in dit JSON formaat",
@@ -167,11 +229,25 @@
     "createBoardPopup-title": "Bord aanmaken",
     "chooseBoardSourcePopup-title": "Importeer bord",
     "createLabelPopup-title": "Label aanmaken",
+    "createCustomField": "Create Field",
+    "createCustomFieldPopup-title": "Create Field",
     "current": "Huidige",
+    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
+    "custom-field-checkbox": "Checkbox",
+    "custom-field-date": "Datum",
+    "custom-field-dropdown": "Dropdown List",
+    "custom-field-dropdown-none": "(none)",
+    "custom-field-dropdown-options": "List Options",
+    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
+    "custom-field-dropdown-unknown": "(unknown)",
+    "custom-field-number": "Number",
+    "custom-field-text": "Text",
+    "custom-fields": "Custom Fields",
     "date": "Datum",
     "decline": "Weigeren",
     "default-avatar": "Standaard avatar",
     "delete": "Verwijderen",
+    "deleteCustomFieldPopup-title": "Delete Custom Field?",
     "deleteLabelPopup-title": "Verwijder label?",
     "description": "Beschrijving",
     "disambiguateMultiLabelPopup-title": "Disambigueer Label Actie",
@@ -186,6 +262,7 @@
     "soft-wip-limit": "Zachte WIP limiet",
     "editCardStartDatePopup-title": "Wijzig start datum",
     "editCardDueDatePopup-title": "Wijzig deadline",
+    "editCustomFieldPopup-title": "Edit Field",
     "editCardSpentTimePopup-title": "Verander gespendeerde tijd",
     "editLabelPopup-title": "Wijzig label",
     "editNotificationPopup-title": "Wijzig notificatie",
@@ -222,30 +299,36 @@
     "filter-clear": "Reset filter",
     "filter-no-label": "Geen label",
     "filter-no-member": "Geen lid",
+    "filter-no-custom-fields": "No Custom Fields",
     "filter-on": "Filter staat aan",
     "filter-on-desc": "Je bent nu kaarten aan het filteren op dit bord. Klik hier om het filter te wijzigen.",
     "filter-to-selection": "Filter zoals selectie",
+    "advanced-filter-label": "Advanced Filter",
+    "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) to be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
     "fullname": "Volledige naam",
     "header-logo-title": "Ga terug naar jouw borden pagina.",
     "hide-system-messages": "Verberg systeemberichten",
     "headerBarCreateBoardPopup-title": "Bord aanmaken",
     "home": "Voorpagina",
     "import": "Importeer",
+    "link": "Link",
     "import-board": "Importeer bord",
     "import-board-c": "Importeer bord",
     "import-board-title-trello": "Importeer bord van Trello",
-    "import-board-title-wekan": "Importeer bord van Wekan",
+    "import-board-title-wekan": "Import board from previous export",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
     "import-sandstorm-warning": "Het geïmporteerde bord verwijdert alle data op het huidige bord, om het daarna te vervangen.",
     "from-trello": "Van Trello",
-    "from-wekan": "Van Wekan",
+    "from-wekan": "From previous export",
     "import-board-instruction-trello": "Op jouw Trello bord, ga naar 'Menu', dan naar 'Meer', 'Print en Exporteer', 'Exporteer JSON', en kopieer de tekst.",
-    "import-board-instruction-wekan": "In jouw Wekan bord, ga naar 'Menu', dan 'Exporteer bord', en kopieer de tekst in het gedownloade bestand.",
+    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
     "import-json-placeholder": "Plak geldige JSON data hier",
     "import-map-members": "Breng leden in kaart",
-    "import-members-map": "Jouw geïmporteerde borden heeft een paar leden. Selecteer de leden die je wilt importeren naar Wekan gebruikers. ",
+    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
     "import-show-user-mapping": "Breng leden overzicht tevoorschijn",
-    "import-user-select": "Kies de Wekan gebruiker uit die je hier als lid wilt hebben",
-    "importMapMembersAddPopup-title": "Selecteer een Wekan lid",
+    "import-user-select": "Pick your existing user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select member",
     "info": "Versie",
     "initials": "Initialen",
     "invalid-date": "Ongeldige datum",
@@ -264,17 +347,19 @@
     "leave-board-pop": "Weet u zeker dat u __boardTitle__ wilt verlaten? U wordt verwijderd van alle kaarten binnen dit bord",
     "leaveBoardPopup-title": "Bord verlaten?",
     "link-card": "Link naar deze kaart",
-    "list-archive-cards": "Move all cards in this list to Recycle Bin",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
+    "list-archive-cards": "Move all cards in this list to Archive",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Verplaats alle kaarten in deze lijst",
     "list-select-cards": "Selecteer alle kaarten in deze lijst",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "Lijst acties",
     "swimlaneActionPopup-title": "Swimlane handelingen",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Importeer een Trello kaart",
     "listMorePopup-title": "Meer",
     "link-list": "Link naar deze lijst",
     "list-delete-pop": "Alle acties zullen verwijderd worden van de activiteiten feed, en je zult deze niet meer kunnen herstellen. Je kan deze actie niet ongedaan maken.",
-    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
     "lists": "Lijsten",
     "swimlanes": "Swimlanes",
     "log-out": "Uitloggen",
@@ -294,9 +379,9 @@
     "muted-info": "Je zal nooit meer geïnformeerd worden bij veranderingen in dit bord.",
     "my-boards": "Mijn Borden",
     "name": "Naam",
-    "no-archived-cards": "No cards in Recycle Bin.",
-    "no-archived-lists": "No lists in Recycle Bin.",
-    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
+    "no-archived-cards": "No cards in Archive.",
+    "no-archived-lists": "No lists in Archive.",
+    "no-archived-swimlanes": "No swimlanes in Archive.",
     "no-results": "Geen resultaten",
     "normal": "Normaal",
     "normal-desc": "Kan de kaarten zien en wijzigen. Kan de instellingen niet wijzigen.",
@@ -332,6 +417,7 @@
     "restore": "Herstel",
     "save": "Opslaan",
     "search": "Zoek",
+    "rules": "Rules",
     "search-cards": "Zoeken in kaart titels en omschrijvingen op dit bord",
     "search-example": "Tekst om naar te zoeken?",
     "select-color": "Selecteer kleur",
@@ -366,6 +452,7 @@
     "title": "Titel",
     "tracking": "Volgen",
     "tracking-info": "Je wordt op de hoogte gesteld als er veranderingen zijn aan de kaarten waar je lid of maker van bent.",
+    "type": "Type",
     "unassign-member": "Lid ontkennen",
     "unsaved-description": "Je hebt een niet opgeslagen beschrijving.",
     "unwatch": "Niet bekijken",
@@ -374,7 +461,7 @@
     "uploaded-avatar": "Avatar is geüpload",
     "username": "Gebruikersnaam",
     "view-it": "Bekijk het",
-    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
+    "warn-list-archived": "warning: this card is in an list at Archive",
     "watch": "Bekijk",
     "watching": "Bekijken",
     "watching-info": "Je zal op de hoogte worden gesteld als er een verandering gebeurt op dit bord.",
@@ -382,6 +469,9 @@
     "welcome-swimlane": "Mijlpaal 1",
     "welcome-list1": "Basis",
     "welcome-list2": "Geadvanceerd",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
     "what-to-do": "Wat wil je doen?",
     "wipLimitErrorPopup-title": "Ongeldige WIP limiet",
     "wipLimitErrorPopup-dialog-pt1": "Het aantal taken in deze lijst is groter dan de gedefinieerde WIP limiet ",
@@ -407,16 +497,16 @@
     "send-smtp-test": "Verzend een email naar uzelf",
     "invitation-code": "Uitnodigings code",
     "email-invite-register-subject": "__inviter__ heeft je een uitnodiging gestuurd",
-    "email-invite-register-text": "Beste __user__,\n\n__inviter__ heeft je uitgenodigd voor Wekan om samen te werken.\n\nKlik op de volgende link:\n__url__\n\nEn je uitnodigingscode is __icode__\n\nBedankt.",
-    "email-smtp-test-subject": "SMTP Test email van Wekan",
+    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email",
     "email-smtp-test-text": "U heeft met succes een email verzonden",
     "error-invitation-code-not-exist": "Uitnodigings code bestaat niet",
     "error-notAuthorized": "Je bent niet toegestaan om deze pagina te bekijken.",
     "outgoing-webhooks": "Uitgaande Webhooks",
     "outgoingWebhooksPopup-title": "Uitgaande Webhooks",
+    "boardCardTitlePopup-title": "Card Title Filter",
     "new-outgoing-webhook": "Nieuwe webhook",
     "no-name": "(Onbekend)",
-    "Wekan_version": "Wekan versie",
     "Node_version": "Node versie",
     "OS_Arch": "OS Arch",
     "OS_Cpus": "OS CPU Count",
@@ -427,13 +517,18 @@
     "OS_Totalmem": "OS Totaal Geheugen",
     "OS_Type": "OS Type",
     "OS_Uptime": "OS Uptime",
+    "days": "days",
     "hours": "uren",
     "minutes": "minuten",
     "seconds": "seconden",
+    "show-field-on-card": "Show this field on card",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
     "yes": "Ja",
     "no": "Nee",
     "accounts": "Accounts",
     "accounts-allowEmailChange": "Sta E-mailadres wijzigingen toe",
+    "accounts-allowUserNameChange": "Allow Username Change",
     "createdAt": "Gemaakt op",
     "verified": "Geverifieerd",
     "active": "Actief",
@@ -442,5 +537,157 @@
     "card-end": "End",
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
-    "editCardEndDatePopup-title": "Change end date"
-}
+    "editCardEndDatePopup-title": "Change end date",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "Assigned By",
+    "requested-by": "Requested By",
+    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
+    "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
+    "boardDeletePopup-title": "Delete Board?",
+    "delete-board": "Delete Board",
+    "default-subtasks-board": "Subtasks for __board__ board",
+    "default": "Default",
+    "queue": "Queue",
+    "subtask-settings": "Subtasks Settings",
+    "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
+    "show-subtasks-field": "Cards can have subtasks",
+    "deposit-subtasks-board": "Deposit subtasks to this board:",
+    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
+    "show-parent-in-minicard": "Show parent in minicard:",
+    "prefix-with-full-path": "Prefix with full path",
+    "prefix-with-parent": "Prefix with parent",
+    "subtext-with-full-path": "Subtext with full path",
+    "subtext-with-parent": "Subtext with parent",
+    "change-card-parent": "Change card's parent",
+    "parent-card": "Parent card",
+    "source-board": "Source board",
+    "no-parent": "Don't show parent",
+    "activity-added-label": "added label '%s' to %s",
+    "activity-removed-label": "removed label '%s' from %s",
+    "activity-delete-attach": "deleted an attachment from %s",
+    "activity-added-label-card": "added label '%s'",
+    "activity-removed-label-card": "removed label '%s'",
+    "activity-delete-attach-card": "deleted an attachment",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "r-rule": "Rule",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "Add action",
+    "r-board-rules": "Board rules",
+    "r-add-rule": "Add rule",
+    "r-view-rule": "View rule",
+    "r-delete-rule": "Delete rule",
+    "r-new-rule-name": "New rule title",
+    "r-no-rules": "No rules",
+    "r-when-a-card": "When a card",
+    "r-is": "is",
+    "r-is-moved": "is moved",
+    "r-added-to": "added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "the board",
+    "r-list": "list",
+    "set-filter": "Set Filter",
+    "r-moved-to": "Moved to",
+    "r-moved-from": "Moved from",
+    "r-archived": "Moved to Archive",
+    "r-unarchived": "Restored from Archive",
+    "r-a-card": "a card",
+    "r-when-a-label-is": "When a label is",
+    "r-when-the-label-is": "When the label is",
+    "r-list-name": "list name",
+    "r-when-a-member": "When a member is",
+    "r-when-the-member": "When the member",
+    "r-name": "name",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "r-when-the-item": "When the checklist item",
+    "r-checked": "Checked",
+    "r-unchecked": "Unchecked",
+    "r-move-card-to": "Move card to",
+    "r-top-of": "Top of",
+    "r-bottom-of": "Bottom of",
+    "r-its-list": "its list",
+    "r-archive": "Move to Archive",
+    "r-unarchive": "Restore from Archive",
+    "r-card": "card",
+    "r-add": "Toevoegen",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-set-color": "Set color to",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "subject",
+    "r-rule-details": "Rule details",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Move card to top of list",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Move card to bottom of list",
+    "r-d-send-email": "Send email",
+    "r-d-send-email-to": "to",
+    "r-d-send-email-subject": "subject",
+    "r-d-send-email-message": "message",
+    "r-d-archive": "Move card to Archive",
+    "r-d-unarchive": "Restore card from Archive",
+    "r-d-add-label": "Add label",
+    "r-d-remove-label": "Remove label",
+    "r-create-card": "Create new card",
+    "r-in-list": "in list",
+    "r-in-swimlane": "in swimlane",
+    "r-d-add-member": "Add member",
+    "r-d-remove-member": "Remove member",
+    "r-d-remove-all-member": "Remove all member",
+    "r-d-check-all": "Check all items of a list",
+    "r-d-uncheck-all": "Uncheck all items of a list",
+    "r-d-check-one": "Check item",
+    "r-d-uncheck-one": "Uncheck item",
+    "r-d-check-of-list": "of checklist",
+    "r-d-add-checklist": "Add checklist",
+    "r-d-remove-checklist": "Remove checklist",
+    "r-by": "by",
+    "r-add-checklist": "Add checklist",
+    "r-with-items": "with items",
+    "r-items-list": "item1,item2,item3",
+    "r-add-swimlane": "Add swimlane",
+    "r-swimlane-name": "swimlane name",
+    "r-board-note": "Note: leave a field empty to match every possible value.",
+    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout",
+    "hide-logo": "Hide Logo",
+    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
+    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
+    "error-undefined": "Something went wrong",
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
+}
\ No newline at end of file
diff --git a/i18n/oc.i18n.json b/i18n/oc.i18n.json
new file mode 100644
index 00000000..35df0ae7
--- /dev/null
+++ b/i18n/oc.i18n.json
@@ -0,0 +1,693 @@
+{
+    "accept": "Acceptar",
+    "act-activity-notify": "Notificacion d'activitat",
+    "act-addAttachment": "as apondut una pèça joncha __astacament__ de la carta __card__ a la tièra __list__ del corredor __swimlane__ del tablèu __board__",
+    "act-deleteAttachment": "as tirat una pèça joncha __astacament__ de la carta __card__ de la tièra __list__ del corredor __swimlane__ del tablèu __board__",
+    "act-addSubtask": "as apondut una jos-tasca __subtask__ de la carta __card__ de la tièra __list__ del corredor __swimlane__ del tablèu __board__",
+    "act-addLabel": "as apondut una etiqueta__label__ de la carta __card__ a la tièra __list__ del corredor __swimlane__ del tablèu __board__",
+    "act-addedLabel": "as apondut una etiqueta__label__ de la carta __card__ a la tièra __list__ del corredor __swimlane__ del tablèu __board__",
+    "act-removeLabel": "as tirat l'etiqueta__label__ de la carta __card__ de la tièra __list__ del corredor __swimlane__ del tablèu __board__",
+    "act-removedLabel": "as tirat l'etiqueta__label__ de la carta __card__ de la tièra __list__ del corredor __swimlane__ del tablèu __board__",
+    "act-addChecklist": "as apondut la checklist __checklist__ de la carta __card__ de la tièra __list__ del corredor __swimlane__ del tablèu __board__",
+    "act-addChecklistItem": " as apondut l'element __checklistItem__ de la checklist __checklist__ de la carta __card__ de la tièra __list__ del corredor __swimlane__ del tablèu __board__",
+    "act-removeChecklist": "as tirat la checklist __checklist__ de la carta __card__ de la tièra __list__ del corredor __swimlane__ del tablèu __board__",
+    "act-removeChecklistItem": " as tirat l'element __checklistItem__ de la checklist __checklist__ de la carta __card__ de la tièra __list__ del corredor __swimlane__ del tablèu __board__",
+    "act-checkedItem": "as croiat __checklistItem__ de la checklist __checklist__ de la carta __card__ de la  tièra __list__ del corredor __swimlane__ del tablèu __board__",
+    "act-uncheckedItem": "as descroiar __checklistItem__ de la checklist __checklist__ de la carta __card__ de la tièra __list__ del corredor __swimlane__ del tablèu __board__",
+    "act-completeChecklist": "as completat la checklist __checklist__ de la carta __card__ de la tièra __list__ del corredor __swimlane__ del tablèu __board__",
+    "act-uncompleteChecklist": "as rendut incomplet la checklist __checklist__ de la carta __card__ de la tièra __list__ del corredor __swimlane__ del tablèu __board__",
+    "act-addComment": "as comentat la carta __card__: __comment__ de la tièra __list__ del corredor __swimlane__ del tablèu __board__",
+    "act-createBoard": "as creat lo tablèu __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "as creat la carta __card__ de la tièra __list__ del corredor __swimlane__ del tablèu __board__",
+    "act-createCustomField": "as creat lo camp personalizat __customField__ a la carta __card__ de la tièra __list__ del corredor __swimlane__ del tablèu __board__",
+    "act-createList": "as apondut la tièra __list__ al tablèu __board__",
+    "act-addBoardMember": "as apondut un participant __member__ al tablèu __board__",
+    "act-archivedBoard": "Lo tablèu __board__ es estat desplaçar cap a Archius",
+    "act-archivedCard": "La carta __card__ de la tièra __list__ del corredor __swimlane__ del tablèu __board__ es estat desplaçar cap a Archiu",
+    "act-archivedList": "La tièra __list__ del corredor __swimlane__ del tablèu __board__ es estat desplaçar cap a Archius",
+    "act-archivedSwimlane": "Lo corredor __swimlane__ del tablèu __board__ es estat desplaçar cap a Archius",
+    "act-importBoard": "as importat lo tablèu __board__",
+    "act-importCard": "as importat la carta __card__ de la tièra __list__ del corredor __swimlane__ del tablèu __board__",
+    "act-importList": "as importat la tièra __list__ del corredor __swimlane__ del tablèu __board__",
+    "act-joinMember": "as apondut un participant __member__ a la carta __card__ de la tièra __list__ del corredor __swimlane__ del tablèu __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "as desplaçat la carta __card__ de la tièra __oldList__ del corredor __oldSwimlane__ del tablèu __oldBoard__ cap a la tièra __list__ del corredor __swimlane__ del tablèu __board__",
+    "act-removeBoardMember": "as tirat lo participant __member__ del tablèu __board__",
+    "act-restoredCard": "as restorat la carta __card__ de la tièra __list__ del corredor __swimlane__ del tablèu __board__",
+    "act-unjoinMember": "as tirat lo participant __member__ de la carta __card__ de la tièra __list__ del corredor __swimlane__ del tablèu __board__",
+    "act-withBoardTitle": "__tablèu__",
+    "act-withCardTitle": "[__board__] __card__",
+    "actions": "Accions",
+    "activities": "Activitats",
+    "activity": "Activitat",
+    "activity-added": "as apondut %s a %s",
+    "activity-archived": "%s desplaçat cap a Archius",
+    "activity-attached": "as ligat %s a %s",
+    "activity-created": "as creat %s",
+    "activity-customfield-created": "as creat lo camp personalizat %s",
+    "activity-excluded": "as exclús %s de %s",
+    "activity-imported": "as importat %s cap a %s dempuèi %s",
+    "activity-imported-board": "as importat %s dempuèi %s",
+    "activity-joined": "as rejonch %s",
+    "activity-moved": "as desplaçat %s dempuèi %s cap a %s",
+    "activity-on": "sus %s",
+    "activity-removed": "as tirat %s de %s",
+    "activity-sent": "as mandat %s cap a %s",
+    "activity-unjoined": "as quitat %s",
+    "activity-subtask-added": "as apondut una jos-tasca a %s",
+    "activity-checked-item": "as croiat %s dins la checklist %s de %s",
+    "activity-unchecked-item": "as descroiat %s dins la checklist %s de %s",
+    "activity-checklist-added": "as apondut a checklist a %s",
+    "activity-checklist-removed": "as tirat la checklist de %s",
+    "activity-checklist-completed": "as acabat la checklist __checklist__ de la carta __card__ de la tièra __list__ del corredor __swimlane__ del tablèu __board__",
+    "activity-checklist-uncompleted": "as rendut incomplet la checklist %s de %s",
+    "activity-checklist-item-added": "as apondut un element a la checklist '%s' dins %s",
+    "activity-checklist-item-removed": "as tirat un element a la checklist '%s' dins %s",
+    "add": "Apondre",
+    "activity-checked-item-card": "as croiat %s dins la checklist %s",
+    "activity-unchecked-item-card": "as descroiat %s dins la checklist %s",
+    "activity-checklist-completed-card": "as acabat la checklist__checklist__ de la carta __card__ de la tièra __list__ del corredor __swimlane__ del tablèu __board__",
+    "activity-checklist-uncompleted-card": "as rendut incomplet la checklist %s",
+    "add-attachment": "Apondre una pèça joncha",
+    "add-board": "Apondre un tablèu",
+    "add-card": "Apondre una carta",
+    "add-swimlane": "Apondre un corredor",
+    "add-subtask": "Apondre una jos-tasca",
+    "add-checklist": "Apondre una checklist",
+    "add-checklist-item": "Apondre un element a la checklist",
+    "add-cover": "Apondre una cobèrta",
+    "add-label": "Apondre una etiqueta",
+    "add-list": "Apondre una tièra",
+    "add-members": "Apondre un participant",
+    "added": "Apondut lo",
+    "addMemberPopup-title": "Participants",
+    "admin": "Administartor",
+    "admin-desc": "As lo drech de legir e modificar las cartas, tirar de participants, e modificar las opcions del tablèu.",
+    "admin-announcement": "Anóncia",
+    "admin-announcement-active": "Activar l'anóncia globala",
+    "admin-announcement-title": "Anóncia de l'administrator",
+    "all-boards": "Totes los tablèus",
+    "and-n-other-card": "E __comptar__ carta de mai",
+    "and-n-other-card_plural": "E __comptar__ cartas de mai",
+    "apply": "Aplicar",
+    "app-is-offline": "Cargament, vos cal esperar. Refrescar la pagina vos va far perdre vòstre trabalh. Se lo cargament es tròp long, vos cal agachar se lo servidor es pas blocat/arrestat.",
+    "archive": "Archivar",
+    "archive-all": "Archivar tot",
+    "archive-board": "Archivar lo tablèu",
+    "archive-card": "Archivar la carta",
+    "archive-list": "Archivar la tièra",
+    "archive-swimlane": "Archivar lo corredor",
+    "archive-selection": "Archivar la seleccion",
+    "archiveBoardPopup-title": "Archivar lo tablèu?",
+    "archived-items": "Archius",
+    "archived-boards": "Tablèu archivat",
+    "restore-board": "Restaurar lo tablèu",
+    "no-archived-boards": "Pas de tablèu archivat.",
+    "archives": "Archivar",
+    "template": "Modèl",
+    "templates": "Modèls",
+    "assign-member": "Affectar un participant",
+    "attached": "jónher",
+    "attachment": "pèça joncha",
+    "attachment-delete-pop": "Tirar una pèça joncha es defenitiu.",
+    "attachmentDeletePopup-title": "Tirar la pèça joncha ?",
+    "attachments": "Pèças jonchas",
+    "auto-watch": "Survelhar automaticament lo tablèu un còp creat",
+    "avatar-too-big": "L'imatge es tròp pesuc (70KB max)",
+    "back": "Tornar",
+    "board-change-color": "Cambiar de color",
+    "board-nb-stars": "%s estèla",
+    "board-not-found": "Tablèu pas trapat",
+    "board-private-info": "Aqueste tablèu serà <strong>privat</strong>.",
+    "board-public-info": "Aqueste tablèu serà <strong>public</strong>.",
+    "boardChangeColorPopup-title": "Cambiar lo fons del tablèu",
+    "boardChangeTitlePopup-title": "Tornar nomenar lo tablèu",
+    "boardChangeVisibilityPopup-title": "Cambiar la visibilitat",
+    "boardChangeWatchPopup-title": "Cambiar lo seguit",
+    "boardMenuPopup-title": "Opcions del tablèu",
+    "boards": "Tablèus",
+    "board-view": "Presentacion del tablèu",
+    "board-view-cal": "Calendièr",
+    "board-view-swimlanes": "Corredor",
+    "board-view-lists": "Tièras",
+    "bucket-example": "Coma \"Tota la tièra\" per exemple",
+    "cancel": "Tornar",
+    "card-archived": "Aquesta carta es desplaçada dins Archius",
+    "board-archived": "Aqueste tablèu esdesplaçat dins Archius",
+    "card-comments-title": "Aquesta carta a %s de comentaris.",
+    "card-delete-notice": "Un còp tirat, pas de posibilitat de tornar enrè",
+    "card-delete-pop": "Totes las accions van èsser quitadas del seguit d'activitat e poiretz pas mai utilizar aquesta carta.",
+    "card-delete-suggest-archive": "Podètz desplaçar una carta dins Archius per la quitar del tablèu e gardar las activitats.",
+    "card-due": "Esperat",
+    "card-due-on": "Esperat lo",
+    "card-spent": "Temps passat",
+    "card-edit-attachments": "Cambiar las pèças jonchas",
+    "card-edit-custom-fields": "Cambiar los camps personalizats",
+    "card-edit-labels": "Cambiar los labèls",
+    "card-edit-members": "Cambiar los participants",
+    "card-labels-title": "Cambiar l'etiqueta de la carta.",
+    "card-members-title": "Apondre o quitar de participants a la carta. ",
+    "card-start": "Debuta",
+    "card-start-on": "Debuta lo",
+    "cardAttachmentsPopup-title": "Apondut dempuèi",
+    "cardCustomField-datePopup-title": "Cambiar la data",
+    "cardCustomFieldsPopup-title": "Cambiar los camps personalizats",
+    "cardDeletePopup-title": "Suprimir la carta?",
+    "cardDetailsActionsPopup-title": "Accions sus la carta",
+    "cardLabelsPopup-title": "Etiquetas",
+    "cardMembersPopup-title": "Participants",
+    "cardMorePopup-title": "Mai",
+    "cardTemplatePopup-title": "Crear un modèl",
+    "cards": "Cartas",
+    "cards-count": "Cartas",
+    "casSignIn": "Vos connectar amb CAS",
+    "cardType-card": "Carta",
+    "cardType-linkedCard": "Carta ligada",
+    "cardType-linkedBoard": "Tablèu ligat",
+    "change": "Cambiar",
+    "change-avatar": "Cambiar la fòto",
+    "change-password": "Cambiar lo mot de Santa-Clara",
+    "change-permissions": "Cambiar las permissions",
+    "change-settings": "Cambiar los paramètres",
+    "changeAvatarPopup-title": "Cambiar la fòto",
+    "changeLanguagePopup-title": "Cambiar la lenga",
+    "changePasswordPopup-title": "Cambiar lo mot de Santa-Clara",
+    "changePermissionsPopup-title": "Cambiar las permissions",
+    "changeSettingsPopup-title": "Cambiar los paramètres",
+    "subtasks": "Jos-tasca",
+    "checklists": "Checklists",
+    "click-to-star": "Apondre lo tablèu als favorits",
+    "click-to-unstar": "Quitar lo tablèu dels favorits",
+    "clipboard": "Copiar o far limpar",
+    "close": "Tampar",
+    "close-board": "Tampar lo tablèu",
+    "close-board-pop": "Podètz tornar activar lo tablèu dempuèi la pagina d'acuèlh.",
+    "color-black": "negre",
+    "color-blue": "blau",
+    "color-crimson": "purple clar",
+    "color-darkgreen": "verd fonçat",
+    "color-gold": "aur",
+    "color-gray": "gris",
+    "color-green": "verd",
+    "color-indigo": "indi",
+    "color-lime": "jaune clar",
+    "color-magenta": "magenta",
+    "color-mistyrose": "ròse clar",
+    "color-navy": "blau marin",
+    "color-orange": "irange",
+    "color-paleturquoise": "turqués",
+    "color-peachpuff": "persèc",
+    "color-pink": "ròsa",
+    "color-plum": "pruna",
+    "color-purple": "violet",
+    "color-red": "roge",
+    "color-saddlebrown": "castanh",
+    "color-silver": "argent",
+    "color-sky": "blau clar",
+    "color-slateblue": "blau lausa",
+    "color-white": "blanc",
+    "color-yellow": "jaune",
+    "unset-color": "pas reglat",
+    "comment": "Comentari",
+    "comment-placeholder": "Escrire un comentari",
+    "comment-only": "Comentari solament",
+    "comment-only-desc": "Comentari sus las cartas solament.",
+    "no-comments": "Pas cap de comentari",
+    "no-comments-desc": "Podèts pas veire ni los comentaris ni las activitats",
+    "computer": "Ordenator",
+    "confirm-subtask-delete-dialog": "Sètz segur de voler quitar aquesta jos-tasca?",
+    "confirm-checklist-delete-dialog": "Sètz segur de voler quitar aquesta checklist?",
+    "copy-card-link-to-clipboard": "Còpia del ligam de la carta",
+    "linkCardPopup-title": "Ligam de la carta",
+    "searchElementPopup-title": "Cèrca",
+    "copyCardPopup-title": "Còpia de la carta",
+    "copyChecklistToManyCardsPopup-title": "Còpia del modèl de checklist cap a mai d'una carta",
+    "copyChecklistToManyCardsPopup-instructions": "Un compte es estat creat per vos sus ",
+    "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"Títol de la primièra carta\", \"description\":\"Descripcion de la primièra carta\"}, {\"title\":\"Títol de la segonda carta\",\"description\":\"Descripcion de la segonda carta\"},{\"title\":\"Títol de la darrièra carta\",\"description\":\"Descripcion de la darrièra carta\"} ]",
+    "create": "Crear",
+    "createBoardPopup-title": "Crear un tablèu",
+    "chooseBoardSourcePopup-title": "Importar un tablèu",
+    "createLabelPopup-title": "Crear una etiqueta",
+    "createCustomField": "Crear un camp",
+    "createCustomFieldPopup-title": "Crear un camp",
+    "current": "actual",
+    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
+    "custom-field-checkbox": "Casa de croiar",
+    "custom-field-date": "Data",
+    "custom-field-dropdown": "Tièra de causidas",
+    "custom-field-dropdown-none": "(pas res)",
+    "custom-field-dropdown-options": "Opcions de la tièra",
+    "custom-field-dropdown-options-placeholder": "Apiejar sus \"Enter\" per apondre d'opcions",
+    "custom-field-dropdown-unknown": "(desconegut)",
+    "custom-field-number": "Nombre",
+    "custom-field-text": "Tèxte",
+    "custom-fields": "Camps personalizats",
+    "date": "Data",
+    "decline": "Refusar",
+    "default-avatar": "Fòto per defaut",
+    "delete": "Suprimir",
+    "deleteCustomFieldPopup-title": "Tirar lo camp personalizat?",
+    "deleteLabelPopup-title": "Tirar l'etiqueta?",
+    "description": "Descripcion",
+    "disambiguateMultiLabelPopup-title": "Precisar l'accion de l'etiqueta",
+    "disambiguateMultiMemberPopup-title": "Precisar l'accion del participant",
+    "discard": "Botar dins l'escobilha",
+    "done": "Acabat",
+    "download": "Telecargar",
+    "edit": "Modificar",
+    "edit-avatar": "Cambiar la fòto",
+    "edit-profile": "Modificar lo perfil",
+    "edit-wip-limit": "Modificar la WIP limit",
+    "soft-wip-limit": "Leugièr WIP limit",
+    "editCardStartDatePopup-title": "Cambiar la data de debuta",
+    "editCardDueDatePopup-title": "Cambiar la data de fin",
+    "editCustomFieldPopup-title": "Modificar los camps",
+    "editCardSpentTimePopup-title": "Cambiar lo temp passat",
+    "editLabelPopup-title": "Cambiar l'etiqueta",
+    "editNotificationPopup-title": "Modificar la notificacion",
+    "editProfilePopup-title": "Modificar lo perfil",
+    "email": "Corrièl",
+    "email-enrollAccount-subject": "Vòstre compte es ara activat pel sit __siteName__",
+    "email-enrollAccount-text": "Adieu __user__,\n\nPer comença d'utilizar lo servici, vos cal clicar sul ligam.\n\n__url__\n\nMercé.",
+    "email-fail": "Pas possible de mandar lo corrièl",
+    "email-fail-text": "Error per mandar lo corrièl",
+    "email-invalid": "L'adreça corrièl es pas valida",
+    "email-invite": "Convidar per corrièl",
+    "email-invite-subject": "__inviter__ vos as mandat un convit",
+    "email-invite-text": "Car __user__,\n\n__inviter__ vos a convidat per jónher lo tablèu \"__board__\".\n\nVos cal clicar sul ligam:\n\n__url__\n\nMercé.",
+    "email-resetPassword-subject": "Tornar inicializar vòstre mot de Santa-Clara de sit __siteName__",
+    "email-resetPassword-text": "Adieu __user__,\n\nPer tornar inicializar  vòstre mot de Santa-Clara vos cal clicar sul ligam :\n\n__url__\n\nMercé.",
+    "email-sent": "Mail mandat",
+    "email-verifyEmail-subject": "Vos cal verificar vòstra adreça corrièl del sit __siteName__",
+    "email-verifyEmail-text": "Adieu __user__,\n\nPer verificar vòstra adreça corrièl, vos cal clicar sul ligam :\n\n__url__\n\nMercé.",
+    "enable-wip-limit": "Activar la WIP limit",
+    "error-board-doesNotExist": "Aqueste tablèu existís pas",
+    "error-board-notAdmin": "Devètz èsser un administrator del tablèu per far aquò ",
+    "error-board-notAMember": "Devètz èsser un participant del tablèu per far aquò",
+    "error-json-malformed": "Vòstre tèxte es pas valid JSON",
+    "error-json-schema": "Vòstre JSON es pas al format correct ",
+    "error-list-doesNotExist": "Aqueste tièra existís pas",
+    "error-user-doesNotExist": "Aqueste utilizator existís pas",
+    "error-user-notAllowSelf": "Vos podètz pas convidar vautres meteisses",
+    "error-user-notCreated": "Aqueste utilizator es pas encara creat",
+    "error-username-taken": "Lo nom es ja pres",
+    "error-email-taken": "Lo corrièl es ja pres ",
+    "export-board": "Exportar lo tablèu",
+    "filter": "Filtre",
+    "filter-cards": "Filtre cartas",
+    "filter-clear": "Escafar lo filtre",
+    "filter-no-label": "Pas cap d'etiqueta",
+    "filter-no-member": "Pas cap de participant",
+    "filter-no-custom-fields": "Pas de camp personalizat",
+    "filter-on": "Lo filtre es activat",
+    "filter-on-desc": "Filtratz las cartas dins aqueste tablèu. Picar aquí per editar los filtres",
+    "filter-to-selection": "Filtrar la seleccion",
+    "advanced-filter-label": "Filtre avançat",
+    "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) to be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
+    "fullname": "Nom complet",
+    "header-logo-title": "Retorn a vòstra pagina de tablèus",
+    "hide-system-messages": "Amagar los messatges sistèm",
+    "headerBarCreateBoardPopup-title": "Crear un tablèu",
+    "home": "Acuèlh",
+    "import": "Importar",
+    "link": "Ligar",
+    "import-board": "Importar un tablèu",
+    "import-board-c": "Importar un tablèu",
+    "import-board-title-trello": "Importar un tablèu dempuèi Trello",
+    "import-board-title-wekan": "Importar un tablèu dempuèi un export passat",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
+    "import-sandstorm-warning": "Importar lo tablèu va quitar totes las donadas del tablèu e lo va remplaçar amb las donadas del tablèu importat.",
+    "from-trello": "Dempuèi Trello",
+    "from-wekan": "Dempuèi un export passat",
+    "import-board-instruction-trello": "Dins vòstre tablèu Trello, vos cal anar dins \"Menut\", puèi \"Mai\", \"Export\", \"Export JSON\", e copiar lo tèxte balhat.",
+    "import-board-instruction-wekan": "Dins vòstre tablèu, vos cal anar dins \"Menut\", puèi \"Exportar lo tablèu\", e de copiar lo tèxte del fichièr telecargat.",
+    "import-board-instruction-about-errors": "Se avètz de errors al moment d'importar un tablèu, es possible que l'importacion as fonccionat, lo tablèu es belèu a la pagina \"Totes los tablèus\".",
+    "import-json-placeholder": "Pegar las donadas del fichièr JSON aicí",
+    "import-map-members": "Mapa dels participants",
+    "import-members-map": "Lo tablèu qu'avètz importat as ja de participants, vos cal far la migracion amb los utilizators actual",
+    "import-show-user-mapping": "Review members mapping",
+    "import-user-select": "Pick your existing user you want to use as this member",
+    "importMapMembersAddPopup-title": "Seleccionar un participant",
+    "info": "Vesion",
+    "initials": "Iniciala",
+    "invalid-date": "Data invalida",
+    "invalid-time": "Temps invalid",
+    "invalid-user": "Participant invalid",
+    "joined": "Jónher",
+    "just-invited": "Sètz just convidat dins aqueste tablèu",
+    "keyboard-shortcuts": "Keyboard shortcuts",
+    "label-create": "Crear una etiqueta",
+    "label-default": "%s label (default)",
+    "label-delete-pop": "There is no undo. This will remove this label from all cards and destroy its history.",
+    "labels": "Etiquetas",
+    "language": "Lenga",
+    "last-admin-desc": "You can’t change roles because there must be at least one admin.",
+    "leave-board": "Leave Board",
+    "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
+    "leaveBoardPopup-title": "Leave Board ?",
+    "link-card": "Ligam per aquesta carta",
+    "list-archive-cards": "Mandar totas las cartas d'aquesta tièra dins Archius",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
+    "list-move-cards": "Mandar totas las cartas dins aquesta tièra",
+    "list-select-cards": "Seleccionar totas las cartas dins aquesta tièra",
+    "set-color-list": "Set Color",
+    "listActionPopup-title": "Tièra de las accions",
+    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
+    "listImportCardPopup-title": "Importar una carta de Trello",
+    "listMorePopup-title": "Mai",
+    "link-list": "Ligam d'aquesta tièra",
+    "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
+    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
+    "lists": "Tièras",
+    "swimlanes": "Corredor",
+    "log-out": "Desconnexion",
+    "log-in": "Connexion",
+    "loginPopup-title": "Connexion",
+    "memberMenuPopup-title": "Paramètres dels participants",
+    "members": "Participants",
+    "menu": "Menut",
+    "move-selection": "Bolegar la seleccion",
+    "moveCardPopup-title": "Bolegar la carta",
+    "moveCardToBottom-title": "Bolegar cap al bas",
+    "moveCardToTop-title": "Bolegar cap al naut",
+    "moveSelectionPopup-title": "Bolegar la seleccion",
+    "multi-selection": "Multi-seleccion",
+    "multi-selection-on": "Multi-Selection is on",
+    "muted": "Silenciós",
+    "muted-info": "You will never be notified of any changes in this board",
+    "my-boards": "Mon tablèu",
+    "name": "Nom",
+    "no-archived-cards": "Pas cap de carta dins Archius",
+    "no-archived-lists": "Pas cap de tièra dins Archius",
+    "no-archived-swimlanes": "Pas cap de corredor dins Archius",
+    "no-results": "Pas brica de resultat",
+    "normal": "Normal",
+    "normal-desc": "Can view and edit cards. Can't change settings.",
+    "not-accepted-yet": "Invitation not accepted yet",
+    "notify-participate": "Receive updates to any cards you participate as creater or member",
+    "notify-watch": "Receive updates to any boards, lists, or cards you’re watching",
+    "optional": "opcional",
+    "or": "o",
+    "page-maybe-private": "This page may be private. You may be able to view it by <a href='%s'>logging in</a>.",
+    "page-not-found": "Pagina pas trapada",
+    "password": "Mot de Santa-Clara",
+    "paste-or-dragdrop": "to paste, or drag & drop image file to it (image only)",
+    "participating": "Participating",
+    "preview": "Apercebut",
+    "previewAttachedImagePopup-title": "Apercebut",
+    "previewClipboardImagePopup-title": "Apercebut",
+    "private": "Privat",
+    "private-desc": "Aqueste tablèu es privat. Solament las personas apondudas a aquete tablèu lo pòdon veire e editar.",
+    "profile": "Perfil",
+    "public": "Public",
+    "public-desc": "This board is public. It's visible to anyone with the link and will show up in search engines like Google. Only people added to the board can edit.",
+    "quick-access-description": "Star a board to add a shortcut in this bar.",
+    "remove-cover": "Remove Cover",
+    "remove-from-board": "Quitar lo tablèu",
+    "remove-label": "Quitar l'etiqueta",
+    "listDeletePopup-title": "Quitar la tièra ?",
+    "remove-member": "Quitar lo participant",
+    "remove-member-from-card": "Quitar aquesta carta",
+    "remove-member-pop": "Remove __name__ (__username__) from __boardTitle__? The member will be removed from all cards on this board. They will receive a notification.",
+    "removeMemberPopup-title": "Remove Member?",
+    "rename": "Tornar nomenar",
+    "rename-board": "Tornar nomenar lo tablèu",
+    "restore": "Restore",
+    "save": "Salvar",
+    "search": "Cèrca",
+    "rules": "Règlas",
+    "search-cards": "Search from card titles and descriptions on this board",
+    "search-example": "Text to search for?",
+    "select-color": "Color causida",
+    "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
+    "setWipLimitPopup-title": "Set WIP Limit",
+    "shortcut-assign-self": "Assign yourself to current card",
+    "shortcut-autocomplete-emoji": "Autocomplete emoji",
+    "shortcut-autocomplete-members": "Autocomplete members",
+    "shortcut-clear-filters": "Clear all filters",
+    "shortcut-close-dialog": "Tampar lo dialòg",
+    "shortcut-filter-my-cards": "Filter my cards",
+    "shortcut-show-shortcuts": "Bring up this shortcuts list",
+    "shortcut-toggle-filterbar": "Toggle Filter Sidebar",
+    "shortcut-toggle-sidebar": "Toggle Board Sidebar",
+    "show-cards-minimum-count": "Show cards count if list contains more than",
+    "sidebar-open": "Open Sidebar",
+    "sidebar-close": "Close Sidebar",
+    "signupPopup-title": "Create an Account",
+    "star-board-title": "Click to star this board. It will show up at top of your boards list.",
+    "starred-boards": "Starred Boards",
+    "starred-boards-description": "Starred boards show up at the top of your boards list.",
+    "subscribe": "Subscribe",
+    "team": "Còla",
+    "this-board": "Aqueste tablèu",
+    "this-card": "aquesta carta",
+    "spent-time-hours": "Spent time (hours)",
+    "overtime-hours": "Overtime (hours)",
+    "overtime": "Overtime",
+    "has-overtime-cards": "Has overtime cards",
+    "has-spenttime-cards": "Has spent time cards",
+    "time": "Temps",
+    "title": "Títol",
+    "tracking": "Tracking",
+    "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
+    "type": "Mena",
+    "unassign-member": "Unassign member",
+    "unsaved-description": "You have an unsaved description.",
+    "unwatch": "Unwatch",
+    "upload": "Telecargar",
+    "upload-avatar": "Telecargar un avatar",
+    "uploaded-avatar": "Avatar telecargat",
+    "username": "Username",
+    "view-it": "View it",
+    "warn-list-archived": "warning: this card is in an list at Archive",
+    "watch": "Seguit",
+    "watching": "Agachat",
+    "watching-info": "You will be notified of any change in this board",
+    "welcome-board": "Tablèu de benvenguda",
+    "welcome-swimlane": "Milestone 1",
+    "welcome-list1": "Basics",
+    "welcome-list2": "Advanced",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
+    "what-to-do": "What do you want to do?",
+    "wipLimitErrorPopup-title": "Invalid WIP Limit",
+    "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
+    "wipLimitErrorPopup-dialog-pt2": "Please move some tasks out of this list, or set a higher WIP limit.",
+    "admin-panel": "Admin Panel",
+    "settings": "Paramètres",
+    "people": "Personas",
+    "registration": "Registration",
+    "disable-self-registration": "Disable Self-Registration",
+    "invite": "Convidar",
+    "invite-people": "Convidat",
+    "to-boards": "To board(s)",
+    "email-addresses": "Adreça corrièl",
+    "smtp-host-description": "The address of the SMTP server that handles your emails.",
+    "smtp-port-description": "The port your SMTP server uses for outgoing emails.",
+    "smtp-tls-description": "Enable TLS support for SMTP server",
+    "smtp-host": "SMTP Host",
+    "smtp-port": "SMTP Port",
+    "smtp-username": "Username",
+    "smtp-password": "Mot de Santa-Clara",
+    "smtp-tls": "TLS support",
+    "send-from": "From",
+    "send-smtp-test": "Se mandar un corrièl d'ensag",
+    "invitation-code": "Còde de convit",
+    "email-invite-register-subject": "__inviter__ vos a mandat un convit",
+    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email",
+    "email-smtp-test-text": "As capitat de mandar un corrièl",
+    "error-invitation-code-not-exist": "Lo còde de convit existís pas",
+    "error-notAuthorized": "Sès pas autorizat a agachar aquesta pagina",
+    "outgoing-webhooks": "Outgoing Webhooks",
+    "outgoingWebhooksPopup-title": "Outgoing Webhooks",
+    "boardCardTitlePopup-title": "Card Title Filter",
+    "new-outgoing-webhook": "New Outgoing Webhook",
+    "no-name": "(Desconegut)",
+    "Node_version": "Node version",
+    "OS_Arch": "OS Arch",
+    "OS_Cpus": "OS CPU Count",
+    "OS_Freemem": "OS Free Memory",
+    "OS_Loadavg": "OS Load Average",
+    "OS_Platform": "OS Platform",
+    "OS_Release": "OS Release",
+    "OS_Totalmem": "OS Total Memory",
+    "OS_Type": "OS Type",
+    "OS_Uptime": "OS Uptime",
+    "days": "jorns",
+    "hours": "oras",
+    "minutes": "minutas",
+    "seconds": "segondas",
+    "show-field-on-card": "Show this field on card",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
+    "yes": "Òc",
+    "no": "Non",
+    "accounts": "Accounts",
+    "accounts-allowEmailChange": "Allow Email Change",
+    "accounts-allowUserNameChange": "Allow Username Change",
+    "createdAt": "Created at",
+    "verified": "Verificat",
+    "active": "Avtivat",
+    "card-received": "Recebut",
+    "card-received-on": "Received on",
+    "card-end": "Fin",
+    "card-end-on": "Ends on",
+    "editCardReceivedDatePopup-title": "Change received date",
+    "editCardEndDatePopup-title": "Change end date",
+    "setCardColorPopup-title": "Color seleccionada",
+    "setCardActionsColorPopup-title": "Causir una color",
+    "setSwimlaneColorPopup-title": "Causir una color",
+    "setListColorPopup-title": "Causir una color",
+    "assigned-by": "Assigned By",
+    "requested-by": "Requested By",
+    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
+    "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
+    "boardDeletePopup-title": "Suprimir lo tablèu ?",
+    "delete-board": "Tablèu suprimit",
+    "default-subtasks-board": "Subtasks for __board__ board",
+    "default": "Default",
+    "queue": "Queue",
+    "subtask-settings": "Subtasks Settings",
+    "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
+    "show-subtasks-field": "Cards can have subtasks",
+    "deposit-subtasks-board": "Deposit subtasks to this board:",
+    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
+    "show-parent-in-minicard": "Show parent in minicard:",
+    "prefix-with-full-path": "Prefix with full path",
+    "prefix-with-parent": "Prefix with parent",
+    "subtext-with-full-path": "Subtext with full path",
+    "subtext-with-parent": "Subtext with parent",
+    "change-card-parent": "Change card's parent",
+    "parent-card": "Parent card",
+    "source-board": "Source board",
+    "no-parent": "Don't show parent",
+    "activity-added-label": "added label '%s' to %s",
+    "activity-removed-label": "removed label '%s' from %s",
+    "activity-delete-attach": "deleted an attachment from %s",
+    "activity-added-label-card": "added label '%s'",
+    "activity-removed-label-card": "removed label '%s'",
+    "activity-delete-attach-card": "deleted an attachment",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "r-rule": "Rule",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "Add action",
+    "r-board-rules": "Board rules",
+    "r-add-rule": "Add rule",
+    "r-view-rule": "View rule",
+    "r-delete-rule": "Delete rule",
+    "r-new-rule-name": "New rule title",
+    "r-no-rules": "No rules",
+    "r-when-a-card": "When a card",
+    "r-is": "is",
+    "r-is-moved": "is moved",
+    "r-added-to": "added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "the board",
+    "r-list": "list",
+    "set-filter": "Set Filter",
+    "r-moved-to": "Moved to",
+    "r-moved-from": "Moved from",
+    "r-archived": "Moved to Archive",
+    "r-unarchived": "Restored from Archive",
+    "r-a-card": "a card",
+    "r-when-a-label-is": "When a label is",
+    "r-when-the-label-is": "When the label is",
+    "r-list-name": "list name",
+    "r-when-a-member": "When a member is",
+    "r-when-the-member": "When the member",
+    "r-name": "name",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "r-when-the-item": "When the checklist item",
+    "r-checked": "Checked",
+    "r-unchecked": "Unchecked",
+    "r-move-card-to": "Move card to",
+    "r-top-of": "Top of",
+    "r-bottom-of": "Bottom of",
+    "r-its-list": "its list",
+    "r-archive": "Desplaçar cap a Archius",
+    "r-unarchive": "Restore from Archive",
+    "r-card": "card",
+    "r-add": "Apondre",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-set-color": "Set color to",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "subject",
+    "r-rule-details": "Rule details",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Move card to top of list",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Move card to bottom of list",
+    "r-d-send-email": "Send email",
+    "r-d-send-email-to": "to",
+    "r-d-send-email-subject": "subject",
+    "r-d-send-email-message": "message",
+    "r-d-archive": "Move card to Archive",
+    "r-d-unarchive": "Restore card from Archive",
+    "r-d-add-label": "Add label",
+    "r-d-remove-label": "Remove label",
+    "r-create-card": "Create new card",
+    "r-in-list": "in list",
+    "r-in-swimlane": "in swimlane",
+    "r-d-add-member": "Add member",
+    "r-d-remove-member": "Remove member",
+    "r-d-remove-all-member": "Remove all member",
+    "r-d-check-all": "Check all items of a list",
+    "r-d-uncheck-all": "Uncheck all items of a list",
+    "r-d-check-one": "Check item",
+    "r-d-uncheck-one": "Uncheck item",
+    "r-d-check-of-list": "of checklist",
+    "r-d-add-checklist": "Add checklist",
+    "r-d-remove-checklist": "Remove checklist",
+    "r-by": "by",
+    "r-add-checklist": "Add checklist",
+    "r-with-items": "with items",
+    "r-items-list": "item1,item2,item3",
+    "r-add-swimlane": "Add swimlane",
+    "r-swimlane-name": "swimlane name",
+    "r-board-note": "Note: leave a field empty to match every possible value.",
+    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout",
+    "hide-logo": "Hide Logo",
+    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
+    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
+    "error-undefined": "Something went wrong",
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
+}
\ No newline at end of file
diff --git a/i18n/pl.i18n.json b/i18n/pl.i18n.json
index 4ce864bd..fcef2717 100644
--- a/i18n/pl.i18n.json
+++ b/i18n/pl.i18n.json
@@ -1,89 +1,119 @@
 {
     "accept": "Akceptuj",
-    "act-activity-notify": "[Wekan] Powiadomienia - aktywności",
-    "act-addAttachment": "załączono __attachement__ do __karty__",
-    "act-addChecklist": "dodano listę zadań __checklist__ to __card__",
-    "act-addChecklistItem": "dodano __checklistItem__ do listy zadań __checklist__ na karcie __card__",
-    "act-addComment": "commented on __card__: __comment__",
-    "act-createBoard": "created __board__",
-    "act-createCard": "added __card__ to __list__",
-    "act-createList": "added __list__ to __board__",
-    "act-addBoardMember": "added __member__ to __board__",
-    "act-archivedBoard": "__board__ moved to Recycle Bin",
-    "act-archivedCard": "__card__ moved to Recycle Bin",
-    "act-archivedList": "__list__ moved to Recycle Bin",
-    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
-    "act-importBoard": "imported __board__",
-    "act-importCard": "imported __card__",
-    "act-importList": "imported __list__",
-    "act-joinMember": "added __member__ to __card__",
-    "act-moveCard": "moved __card__ from __oldList__ to __list__",
-    "act-removeBoardMember": "removed __member__ from __board__",
-    "act-restoredCard": "restored __card__ to __board__",
-    "act-unjoinMember": "removed __member__ from __card__",
-    "act-withBoardTitle": "[Wekan] __board__",
+    "act-activity-notify": "Powiadomienia aktywności",
+    "act-addAttachment": "Dodano załącznik __attachment__ do karty __card__ na liście __list__ w diagramie czynności __swimlane__ na tablicy __board__",
+    "act-deleteAttachment": "Usunięto załącznik __attachment__ na karcie __card__ na liście __list__ w diagramie czynności __swimlane__ na tablicy __board__",
+    "act-addSubtask": "Dodane podzadanie __subtask__ na karcie __card__ na liście __list__ w diagramie czynności __swimlane__ na tablicy __board__",
+    "act-addLabel": "Dodano etykietę __label__ do karty __card__ na liście __list__ w diagramie czynności __swimlane__ na tablicy __board__",
+    "act-addedLabel": "Dodano etykietę __label__ do karty __card__ na liście __list__ w diagramie czynności __swimlane__ na tablicy __board__",
+    "act-removeLabel": "Usunięto etykietę __label__ z karty __card__ na liście __list__ w diagramie czynności __swimlane__ na tablicy __board__",
+    "act-removedLabel": "Usunięto etykietę __label__ z karty __card__ na liście __list__ w diagramie czynności __swimlane__ na tablicy __board__",
+    "act-addChecklist": "Dodano listę zadań __checklist__ do karty __card__ na liście __list__ w diagramie czynności __swimlane__ na tablicy __board__",
+    "act-addChecklistItem": "Dodano element listy zadań __checklistItem__ do listy zadań __checklist__ na karcie __card__ na liście __list__ na diagramie czynności __swimlane__ na tablicy __board__",
+    "act-removeChecklist": "Usunięto listę zadań __checklist__ z karty __card__ na liście __list__ na diagramie czynności __swimlane__ na tablicy __board__",
+    "act-removeChecklistItem": "Usunięto element listy zadań __checklistItem__ z listy zadań __checkList__ na karcie __card__ na liście __list__ na diagramie czynności __swimlane__ na tablicy __board__",
+    "act-checkedItem": "Zaznaczono __checklistItem__ na liście zadań __checklist__ na karcie __card__ na liście __list__ na diagramie czynności __swimlane__ na tablicy __board__",
+    "act-uncheckedItem": "Odznaczono __checklistItem__ na liście __checklist__ na karcie __card__ na liście __list__ na diagramie czynności __swimlane__ na tablicy __board__",
+    "act-completeChecklist": "Wykonano wszystkie zadania z listy __checklist__ na karcie __card__ na liście __list__ na diagramie czynności__ na tablicy __board__",
+    "act-uncompleteChecklist": "Wycofano ukończenie wykonania listy __checklist__ na karcie __card__ na liście __list__ na diagramie czynności__ na tablicy __board__",
+    "act-addComment": "Dodano komentarz na karcie __card__: __comment__ na liście __list__ na diagramie czynności __swimlane__ na tablicy __board__",
+    "act-createBoard": "Utworzono tablicę __board__",
+    "act-createSwimlane": "utworzono diagram czynności __swimlane__ na tablicy __board__",
+    "act-createCard": "Utworzono kartę __card__ na liście __list__ na diagramie czynności __swimlane__ na tablicy __board__",
+    "act-createCustomField": "Utworzono niestandardowe pole __customField__ na karcie __card__ na liście __list__ na diagramie czynności__ na tablicy __board__",
+    "act-createList": "Dodano listę __list__ do tablicy __board__",
+    "act-addBoardMember": "Dodano użytykownika __member__ do tablicy __board__",
+    "act-archivedBoard": "Tablica __board__ została przeniesiona do Archiwum",
+    "act-archivedCard": "Karta __card__ na liście __list__ na diagramie czynności __swimlane__ na tablicy __board__ została przeniesiona do Archiwum",
+    "act-archivedList": "Lista __list__ na diagramie czynności __swimlane__ na tablicy __board__ została przeniesiona do Archiwum",
+    "act-archivedSwimlane": "Diagram czynności __swimlane__ na tablicy __board__ został przeniesiony do Archiwum",
+    "act-importBoard": "Zaimportowano tablicę __board__",
+    "act-importCard": "Zaimportowano kartę __card__ do listy __list__ na diagramie czynności __swimlane__ na tablicy __board__",
+    "act-importList": "Zaimportowano listę __list__ na diagram czynności __swimlane__ do tablicy __board__",
+    "act-joinMember": "Dodano użytkownika __member__ do karty __card__ na liście __list__ na diagramie czynności __swimlane__ na tablicy __board__",
+    "act-moveCard": "przeniósł/a kartę __card__ na tablicy __board__ z listy __oldList__ na diagramie czynności __oldSwimlane__ na listę __list__ na diagramie czynności __swimlane__",
+    "act-moveCardToOtherBoard": "przeniósł/a kartę __card__ z listy __oldList__ na diagramie czynności __oldSwimlane__ na tablicy __oldBoard__ do listy __listy__ na diagramie czynności __swimlane__ na tablicy __board__",
+    "act-removeBoardMember": "Usunięto użytkownika __member__ z tablicy __board__",
+    "act-restoredCard": "Przywrócono kartę __card__ na listę __list__ na diagram czynności__ na tablicy __board__",
+    "act-unjoinMember": "Usunięto użytkownika __member__ z karty __card__ na liście __list__ na diagramie czynności __swimlane__ na tablicy __board__",
+    "act-withBoardTitle": "__board__",
     "act-withCardTitle": "[__board__] __card__",
     "actions": "Akcje",
-    "activities": "Aktywności",
+    "activities": "Ostatnia aktywność",
     "activity": "Aktywność",
-    "activity-added": "dodano %s z %s",
-    "activity-archived": "%s przeniesiono do Kosza",
+    "activity-added": "dodał(a) %s z %s",
+    "activity-archived": "%s została przeniesiona do Archiwum ",
     "activity-attached": "załączono %s z %s",
     "activity-created": "utworzono %s",
+    "activity-customfield-created": "utworzono niestandardowe pole %s",
     "activity-excluded": "wyłączono %s z %s",
     "activity-imported": "zaimportowano %s to %s z %s",
     "activity-imported-board": "zaimportowano %s z %s",
     "activity-joined": "dołączono %s",
-    "activity-moved": "przeniesiono % z %s to %s",
+    "activity-moved": "przeniósł/przeniosła % z %s to %s",
     "activity-on": "w %s",
     "activity-removed": "usunięto %s z %s",
     "activity-sent": "wysłano %s z %s",
     "activity-unjoined": "odłączono %s",
-    "activity-checklist-added": "added checklist to %s",
-    "activity-checklist-item-added": "added checklist item to '%s' in %s",
+    "activity-subtask-added": "dodał(a) podzadanie do %s",
+    "activity-checked-item": "zaznaczono %s w liście zadań%s z %s",
+    "activity-unchecked-item": "odznaczono %s w liście zadań %s z %s",
+    "activity-checklist-added": "dodał(a) listę zadań do %s",
+    "activity-checklist-removed": "usunięto listę zadań z %s",
+    "activity-checklist-completed": "Wykonano wszystkie zadania z listy __checklist__ na karcie __card__ na liście __list__ na diagramie czynności__ na tablicy __board__",
+    "activity-checklist-uncompleted": "nieukończono listy zadań %s z %s",
+    "activity-checklist-item-added": "dodał(a) zadanie '%s' do %s",
+    "activity-checklist-item-removed": "usunięto element z listy zadań '%s' w %s",
     "add": "Dodaj",
+    "activity-checked-item-card": "zaznaczono %s w liście zadań %s",
+    "activity-unchecked-item-card": "odznaczono %s w liście zadań %s",
+    "activity-checklist-completed-card": "Wykonano wszystkie zadania z listy __checklist__ na karcie __card__ na liście __list__ na diagramie czynności__ na tablicy __board__",
+    "activity-checklist-uncompleted-card": "nieukończono listy zadań %s",
     "add-attachment": "Dodaj załącznik",
     "add-board": "Dodaj tablicę",
     "add-card": "Dodaj kartę",
-    "add-swimlane": "Add Swimlane",
+    "add-swimlane": "Dodaj diagram czynności",
+    "add-subtask": "Dodano podzadanie",
     "add-checklist": "Dodaj listę kontrolną",
     "add-checklist-item": "Dodaj element do listy kontrolnej",
     "add-cover": "Dodaj okładkę",
     "add-label": "Dodaj etykietę",
     "add-list": "Dodaj listę",
     "add-members": "Dodaj członków",
-    "added": "Dodano",
+    "added": "Dodane",
     "addMemberPopup-title": "Członkowie",
-    "admin": "Admin",
+    "admin": "Administrator",
     "admin-desc": "Może widzieć i edytować karty, usuwać członków oraz zmieniać ustawienia tablicy.",
     "admin-announcement": "Ogłoszenie",
-    "admin-announcement-active": "Active System-Wide Announcement",
-    "admin-announcement-title": "Ogłoszenie od Administratora",
+    "admin-announcement-active": "Włącz ogłoszenie systemowe",
+    "admin-announcement-title": "Ogłoszenie od administratora",
     "all-boards": "Wszystkie tablice",
-    "and-n-other-card": "And __count__ other card",
-    "and-n-other-card_plural": "And __count__ other cards",
+    "and-n-other-card": "I __count__ inna karta",
+    "and-n-other-card_plural": "I __count__ inne karty",
     "apply": "Zastosuj",
-    "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Przenieś do Kosza",
-    "archive-all": "Move All to Recycle Bin",
-    "archive-board": "Move Board to Recycle Bin",
-    "archive-card": "Move Card to Recycle Bin",
-    "archive-list": "Move List to Recycle Bin",
-    "archive-swimlane": "Move Swimlane to Recycle Bin",
-    "archive-selection": "Move selection to Recycle Bin",
-    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
-    "archived-items": "Recycle Bin",
-    "archived-boards": "Boards in Recycle Bin",
+    "app-is-offline": "Trwa ładowanie, proszę czekać. Odświeżenie strony może spowodować utratę danych. Jeśli strona się nie przeładowuje, upewnij się, że serwer działa poprawnie.",
+    "archive": "Przenieś do Archiwum",
+    "archive-all": "Przenieś wszystko do Archiwum",
+    "archive-board": "Przenieś tablicę do Archiwum",
+    "archive-card": "Przenieś kartę do Archiwum",
+    "archive-list": "Przenieś listę do Archiwum",
+    "archive-swimlane": "Przenieś diagram czynności do Archiwum",
+    "archive-selection": "Przenieś zaznaczone do Archiwum",
+    "archiveBoardPopup-title": "Przenieść tablicę do Archiwum?",
+    "archived-items": "Zarchiwizuj",
+    "archived-boards": "Tablice w Archiwum",
     "restore-board": "Przywróć tablicę",
-    "no-archived-boards": "No Boards in Recycle Bin.",
-    "archives": "Recycle Bin",
+    "no-archived-boards": "Brak tablic w Archiwum.",
+    "archives": "Zarchiwizuj",
+    "template": "Szablon",
+    "templates": "Szablony",
     "assign-member": "Dodaj członka",
     "attached": "załączono",
     "attachment": "Załącznik",
     "attachment-delete-pop": "Usunięcie załącznika jest nieodwracalne.",
     "attachmentDeletePopup-title": "Usunąć załącznik?",
     "attachments": "Załączniki",
-    "auto-watch": "Automatically watch boards when they are created",
+    "auto-watch": "Automatycznie obserwuj tablice gdy zostaną stworzone",
     "avatar-too-big": "Awatar jest za duży (maksymalnie 70Kb)",
     "back": "Wstecz",
     "board-change-color": "Zmień kolor",
@@ -93,108 +123,155 @@
     "board-public-info": "Ta tablica będzie <strong>publiczna<strong>.",
     "boardChangeColorPopup-title": "Zmień tło tablicy",
     "boardChangeTitlePopup-title": "Zmień nazwę tablicy",
-    "boardChangeVisibilityPopup-title": "Zmień widoczność",
-    "boardChangeWatchPopup-title": "Change Watch",
-    "boardMenuPopup-title": "Menu tablicy",
+    "boardChangeVisibilityPopup-title": "Zmień widoczność tablicy",
+    "boardChangeWatchPopup-title": "Zmień sposób powiadamiania",
+    "boardMenuPopup-title": "Ustawienia tablicy",
     "boards": "Tablice",
-    "board-view": "Board View",
-    "board-view-swimlanes": "Swimlanes",
+    "board-view": "Widok tablicy",
+    "board-view-cal": "Kalendarz",
+    "board-view-swimlanes": "Diagramy czynności",
     "board-view-lists": "Listy",
-    "bucket-example": "Like “Bucket List” for example",
+    "bucket-example": "Tak jak na przykład \"lista kubełkowa\"",
     "cancel": "Anuluj",
-    "card-archived": "This card is moved to Recycle Bin.",
+    "card-archived": "Ta karta została przeniesiona do Archiwum.",
+    "board-archived": "Ta tablica została przeniesiona do Archiwum.",
     "card-comments-title": "Ta karta ma %s komentarzy.",
     "card-delete-notice": "Usunięcie jest trwałe. Stracisz wszystkie akcje powiązane z tą kartą.",
     "card-delete-pop": "Wszystkie akcje będą usunięte z widoku aktywności, nie można będzie ponownie otworzyć karty.  Usunięcie jest nieodwracalne.",
-    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
-    "card-due": "Due",
-    "card-due-on": "Due on",
-    "card-spent": "Spent Time",
+    "card-delete-suggest-archive": "Możesz przenieść kartę do Archiwum, a następnie usunąć ją z tablicy i zachować ją w Aktywności.",
+    "card-due": "Ukończenie\n",
+    "card-due-on": "Ukończenie w",
+    "card-spent": "Spędzony czas",
     "card-edit-attachments": "Edytuj załączniki",
+    "card-edit-custom-fields": "Edytuj niestandardowe pola",
     "card-edit-labels": "Edytuj etykiety",
     "card-edit-members": "Edytuj członków",
     "card-labels-title": "Zmień etykiety karty",
     "card-members-title": "Dodaj lub usuń członków tablicy z karty.",
-    "card-start": "Start",
-    "card-start-on": "Starts on",
+    "card-start": "Rozpoczęcie",
+    "card-start-on": "Zaczyna się o",
     "cardAttachmentsPopup-title": "Załącz z",
+    "cardCustomField-datePopup-title": "Zmień datę",
+    "cardCustomFieldsPopup-title": "Edytuj niestandardowe pola",
     "cardDeletePopup-title": "Usunąć kartę?",
-    "cardDetailsActionsPopup-title": "Card Actions",
+    "cardDetailsActionsPopup-title": "Czynności kart",
     "cardLabelsPopup-title": "Etykiety",
     "cardMembersPopup-title": "Członkowie",
     "cardMorePopup-title": "Więcej",
+    "cardTemplatePopup-title": "Utwórz szablon",
     "cards": "Karty",
     "cards-count": "Karty",
+    "casSignIn": "Zaloguj się poprzez CAS",
+    "cardType-card": "Karta",
+    "cardType-linkedCard": "Podpięta karta",
+    "cardType-linkedBoard": "Podpięta tablica",
     "change": "Zmień",
-    "change-avatar": "Zmień Avatar",
+    "change-avatar": "Zmień avatar",
     "change-password": "Zmień hasło",
     "change-permissions": "Zmień uprawnienia",
     "change-settings": "Zmień ustawienia",
-    "changeAvatarPopup-title": "Zmień Avatar",
+    "changeAvatarPopup-title": "Zmień avatar",
     "changeLanguagePopup-title": "Zmień język",
     "changePasswordPopup-title": "Zmień hasło",
     "changePermissionsPopup-title": "Zmień uprawnienia",
     "changeSettingsPopup-title": "Zmień ustawienia",
-    "checklists": "Checklists",
+    "subtasks": "Podzadania",
+    "checklists": "Listy zadań",
     "click-to-star": "Kliknij by odznaczyć tę tablicę.",
     "click-to-unstar": "Kliknij by usunąć odznaczenie tej tablicy.",
     "clipboard": "Schowek lub przeciągnij & upuść",
     "close": "Zamknij",
     "close-board": "Zamknij tablicę",
-    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
+    "close-board-pop": "Będziesz w stanie przywrócić tablicę poprzez kliknięcie przycisku \"Archiwizuj\" w nagłówku strony domowej.",
     "color-black": "czarny",
     "color-blue": "niebieski",
+    "color-crimson": "karmazynowy",
+    "color-darkgreen": "ciemnozielony",
+    "color-gold": "złoty",
+    "color-gray": "szary",
     "color-green": "zielony",
+    "color-indigo": "indygo",
     "color-lime": "limonkowy",
+    "color-magenta": "fuksjowy",
+    "color-mistyrose": "różowy",
+    "color-navy": "granatowy",
     "color-orange": "pomarańczowy",
+    "color-paleturquoise": "turkusowy",
+    "color-peachpuff": "brzoskwiniowy",
     "color-pink": "różowy",
+    "color-plum": "śliwkowy",
     "color-purple": "fioletowy",
     "color-red": "czerwony",
+    "color-saddlebrown": "jasnobrązowy",
+    "color-silver": "srebrny",
     "color-sky": "błękitny",
+    "color-slateblue": "szaroniebieski",
+    "color-white": "miały",
     "color-yellow": "żółty",
+    "unset-color": "Nieustawiony",
     "comment": "Komentarz",
     "comment-placeholder": "Dodaj komentarz",
-    "comment-only": "Comment only",
-    "comment-only-desc": "Can comment on cards only.",
+    "comment-only": "Tylko komentowanie",
+    "comment-only-desc": "Może tylko komentować w kartach.",
+    "no-comments": "Bez komentarzy",
+    "no-comments-desc": "Nie widzi komentarzy i aktywności.",
     "computer": "Komputer",
-    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist",
-    "copy-card-link-to-clipboard": "Copy card link to clipboard",
+    "confirm-subtask-delete-dialog": "Czy jesteś pewien, że chcesz usunąć to podzadanie?",
+    "confirm-checklist-delete-dialog": "Czy jesteś pewien, że chcesz usunąć listę zadań?",
+    "copy-card-link-to-clipboard": "Skopiuj łącze karty do schowka",
+    "linkCardPopup-title": "Podepnij kartę",
+    "searchElementPopup-title": "Wyszukaj",
     "copyCardPopup-title": "Skopiuj kartę",
-    "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
-    "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
-    "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"First card title\", \"description\":\"First card description\"}, {\"title\":\"Second card title\",\"description\":\"Second card description\"},{\"title\":\"Last card title\",\"description\":\"Last card description\"} ]",
+    "copyChecklistToManyCardsPopup-title": "Kopiuj szablon listy zadań do wielu kart",
+    "copyChecklistToManyCardsPopup-instructions": "Docelowe tytuły i opisy kart są w formacie JSON",
+    "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"Tytuł pierwszej karty\", \"description\":\"Opis pierwszej karty\"}, {\"title\":\"Tytuł drugiej karty\",\"description\":\"Opis drugiej karty\"},{\"title\":\"Tytuł ostatniej karty\",\"description\":\"Opis ostatniej karty\"} ]",
     "create": "Utwórz",
     "createBoardPopup-title": "Utwórz tablicę",
     "chooseBoardSourcePopup-title": "Import tablicy",
     "createLabelPopup-title": "Utwórz etykietę",
+    "createCustomField": "Utwórz pole",
+    "createCustomFieldPopup-title": "Utwórz pole",
     "current": "obecny",
+    "custom-field-delete-pop": "Nie ma możliwości wycofania tej operacji. To usunie te niestandardowe pole ze wszystkich kart oraz usunie ich całą historię.",
+    "custom-field-checkbox": "Pole wyboru",
+    "custom-field-date": "Data",
+    "custom-field-dropdown": "Lista rozwijana",
+    "custom-field-dropdown-none": "(puste)",
+    "custom-field-dropdown-options": "Opcje listy",
+    "custom-field-dropdown-options-placeholder": "Naciśnij przycisk Enter by zobaczyć więcej opcji",
+    "custom-field-dropdown-unknown": "(nieznany)",
+    "custom-field-number": "Numer",
+    "custom-field-text": "Tekst",
+    "custom-fields": "Niestandardowe pola",
     "date": "Data",
     "decline": "Odrzuć",
     "default-avatar": "Domyślny avatar",
     "delete": "Usuń",
+    "deleteCustomFieldPopup-title": "Usunąć niestandardowe pole?",
     "deleteLabelPopup-title": "Usunąć etykietę?",
     "description": "Opis",
-    "disambiguateMultiLabelPopup-title": "Disambiguate Label Action",
-    "disambiguateMultiMemberPopup-title": "Disambiguate Member Action",
+    "disambiguateMultiLabelPopup-title": "Ujednolić etykiety czynności",
+    "disambiguateMultiMemberPopup-title": "Ujednolić etykiety członków",
     "discard": "Odrzuć",
     "done": "Zrobiono",
     "download": "Pobierz",
     "edit": "Edytuj",
-    "edit-avatar": "Zmień Avatar",
+    "edit-avatar": "Zmień avatar",
     "edit-profile": "Edytuj profil",
-    "edit-wip-limit": "Edit WIP Limit",
-    "soft-wip-limit": "Soft WIP Limit",
-    "editCardStartDatePopup-title": "Change start date",
-    "editCardDueDatePopup-title": "Change due date",
-    "editCardSpentTimePopup-title": "Change spent time",
+    "edit-wip-limit": "Zmień limit kart na liście",
+    "soft-wip-limit": "Pozwól na nadmiarowe karty na liście",
+    "editCardStartDatePopup-title": "Zmień datę rozpoczęcia",
+    "editCardDueDatePopup-title": "Zmień datę ukończenia",
+    "editCustomFieldPopup-title": "Edytuj pole",
+    "editCardSpentTimePopup-title": "Zmień spędzony czas",
     "editLabelPopup-title": "Zmień etykietę",
-    "editNotificationPopup-title": "Edit Notification",
+    "editNotificationPopup-title": "Zmień tryb powiadamiania",
     "editProfilePopup-title": "Edytuj profil",
     "email": "Email",
     "email-enrollAccount-subject": "Konto zostało utworzone na __siteName__",
     "email-enrollAccount-text": "Witaj __user__,\nAby zacząć korzystać z serwisu, kliknij w link poniżej.\n__url__\nDzięki.",
     "email-fail": "Wysyłanie emaila nie powiodło się.",
-    "email-fail-text": "Error trying to send email",
+    "email-fail-text": "Bład w trakcie wysyłania wiadomości email",
     "email-invalid": "Nieprawidłowy email",
     "email-invite": "Zaproś przez email",
     "email-invite-subject": "__inviter__ wysłał Ci zaproszenie",
@@ -204,50 +281,56 @@
     "email-sent": "Email wysłany",
     "email-verifyEmail-subject": "Zweryfikuj swój adres email na __siteName__",
     "email-verifyEmail-text": "Witaj __user__,\nAby zweryfikować adres email, kliknij w link poniżej.\n__url__\nDzięki.",
-    "enable-wip-limit": "Enable WIP Limit",
+    "enable-wip-limit": "Włącz limit kart na liście",
     "error-board-doesNotExist": "Ta tablica nie istnieje",
     "error-board-notAdmin": "Musisz być administratorem tej tablicy żeby to zrobić",
-    "error-board-notAMember": "Musisz być członkiem tej tablicy żeby to zrobić",
-    "error-json-malformed": "Twój tekst nie jest poprawnym JSONem",
-    "error-json-schema": "Twój JSON nie zawiera prawidłowych informacji w poprawnym formacie",
+    "error-board-notAMember": "Musisz być członkiem tej tablicy, żeby wykonać tę czynność",
+    "error-json-malformed": "Twoja fraza nie jest w formacie JSON",
+    "error-json-schema": "Twoje dane JSON nie zawierają prawidłowych informacji w poprawnym formacie",
     "error-list-doesNotExist": "Ta lista nie isnieje",
     "error-user-doesNotExist": "Ten użytkownik nie istnieje",
     "error-user-notAllowSelf": "Nie możesz zaprosić samego siebie",
     "error-user-notCreated": "Ten użytkownik nie został stworzony",
     "error-username-taken": "Ta nazwa jest już zajęta",
-    "error-email-taken": "Email has already been taken",
+    "error-email-taken": "Adres email jest już zarezerwowany",
     "export-board": "Eksportuj tablicę",
     "filter": "Filtr",
     "filter-cards": "Odfiltruj karty",
     "filter-clear": "Usuń filter",
     "filter-no-label": "Brak etykiety",
-    "filter-no-member": "No member",
+    "filter-no-member": "Brak członków",
+    "filter-no-custom-fields": "Brak niestandardowych pól",
     "filter-on": "Filtr jest włączony",
     "filter-on-desc": "Filtrujesz karty na tej tablicy. Kliknij tutaj by edytować filtr.",
     "filter-to-selection": "Odfiltruj zaznaczenie",
-    "fullname": "Full Name",
+    "advanced-filter-label": "Zaawansowane filtry",
+    "advanced-filter-description": "Zaawansowane filtry pozwalają na wykorzystanie ciągu znaków wraz z następującymi operatorami: == != <= >= && || (). Spacja jest używana jako separator pomiędzy operatorami. Możesz przefiltrowywać wszystkie niestandardowe pola wpisując ich nazwy lub wartości, na przykład: Pole1 == Wartość1.\nUwaga: Jeśli pola lub wartości zawierają spację, musisz je zawrzeć w pojedyncze cudzysłowie, na przykład: 'Pole 1' == 'Wartość 1'. Dla pojedynczych znaków, które powinny być pominięte należy użyć \\, na przykład Pole1 == I\\'m. Możesz także wykorzystywać mieszane warunki, na przykład P1 == W1 || P1 == W2. Standardowo wszystkie operatory są interpretowane od lewej do prawej. Możesz także zmienić kolejność interpretacji wykorzystując nawiasy, na przykład P1 == W1 && (P2 == W2 || P2 == W3). Możesz także wyszukiwać tekstowo wykorzystując wyrażenia regularne, na przykład: P1 == /Tes.*/i",
+    "fullname": "Pełna nazwa",
     "header-logo-title": "Wróć do swojej strony z tablicami.",
     "hide-system-messages": "Ukryj wiadomości systemowe",
     "headerBarCreateBoardPopup-title": "Utwórz tablicę",
     "home": "Strona główna",
-    "import": "Importu",
+    "import": "Importuj",
+    "link": "Podłącz",
     "import-board": "importuj tablice",
     "import-board-c": "Import tablicy",
-    "import-board-title-trello": "Import board from Trello",
-    "import-board-title-wekan": "Importuj tablice z Wekan",
-    "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
+    "import-board-title-trello": "Importuj tablicę z Trello",
+    "import-board-title-wekan": "Importuj tablicę z poprzedniego eksportu",
+    "import-sandstorm-backup-warning": "Nie usuwaj danych, które importujesz ze źródłowej tablicy lub Trello zanim upewnisz się, że wszystko zostało prawidłowo przeniesione przy czym brane jest pod uwagę ponowne uruchomienie strony, ponieważ w przypadku błędu braku tablicy stracisz dane.",
+    "import-sandstorm-warning": "Zaimportowana tablica usunie wszystkie istniejące dane na aktualnej tablicy oraz zastąpi ją danymi z tej importowanej.",
     "from-trello": "Z Trello",
-    "from-wekan": "Z Wekan",
-    "import-board-instruction-trello": "W twojej tablicy na Trello, idź do 'Menu', następnie 'More', 'Print and Export', 'Export JSON' i skopiuj wynik",
-    "import-board-instruction-wekan": "In your Wekan board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
-    "import-json-placeholder": "Wklej twój JSON tutaj",
-    "import-map-members": "Map members",
-    "import-members-map": "Twoje zaimportowane tablice mają kilku członków. Proszę wybierz członków których chcesz zaimportować do Wekan",
+    "from-wekan": "Z poprzedniego eksportu",
+    "import-board-instruction-trello": "W twojej tablicy na Trello przejdź do 'Menu', następnie 'Więcej', 'Drukuj i eksportuj', 'Eksportuj jako JSON' i skopiuj wynik",
+    "import-board-instruction-wekan": "Na Twojej tablicy przejdź do 'Menu', a następnie wybierz 'Eksportuj tablicę' i skopiuj tekst w pobranym pliku.",
+    "import-board-instruction-about-errors": "W przypadku, gdy otrzymujesz błędy importowania tablicy, czasami importowanie pomimo wszystko działa poprawnie i tablica znajduje się w oknie Wszystkie tablice.",
+    "import-json-placeholder": "Wklej Twoje dane JSON tutaj",
+    "import-map-members": "Przypisz członków",
+    "import-members-map": "Twoje zaimportowane tablice mają kilku członków. Proszę wybierz członków których chcesz zaimportować dla Twoich użytkowników",
     "import-show-user-mapping": "Przejrzyj wybranych członków",
-    "import-user-select": "Pick the Wekan user you want to use as this member",
-    "importMapMembersAddPopup-title": "Select Wekan member",
+    "import-user-select": "Wybierz istniejącego użytkownika, który ma stać się członkiem",
+    "importMapMembersAddPopup-title": "Wybierz użytkownika",
     "info": "Wersja",
-    "initials": "Initials",
+    "initials": "Inicjały",
     "invalid-date": "Błędna data",
     "invalid-time": "Błędny czas",
     "invalid-user": "Zła nazwa użytkownika",
@@ -255,61 +338,63 @@
     "just-invited": "Właśnie zostałeś zaproszony do tej tablicy",
     "keyboard-shortcuts": "Skróty klawiaturowe",
     "label-create": "Utwórz etykietę",
-    "label-default": "%s etykieta (domyślna)",
-    "label-delete-pop": "There is no undo. This will remove this label from all cards and destroy its history.",
+    "label-default": "'%s' etykieta (domyślna)",
+    "label-delete-pop": "Nie da się tego wycofać. To usunie tę etykietę ze wszystkich kart i usunie ich historię.",
     "labels": "Etykiety",
     "language": "Język",
-    "last-admin-desc": "You can’t change roles because there must be at least one admin.",
+    "last-admin-desc": "Nie możesz zmienić roli użytkownika, ponieważ musi istnieć co najmniej jeden administrator.",
     "leave-board": "Opuść tablicę",
-    "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
-    "leaveBoardPopup-title": "Leave Board ?",
+    "leave-board-pop": "Czy jesteś pewien, że chcesz opuścić tablicę __boardTitle__? Zostaniesz usunięty ze wszystkich kart tej tablicy.",
+    "leaveBoardPopup-title": "Opuścić tablicę?",
     "link-card": "Link do tej karty",
-    "list-archive-cards": "Move all cards in this list to Recycle Bin",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
+    "list-archive-cards": "Przenieś wszystkie karty z tej listy do Archiwum",
+    "list-archive-cards-pop": "To usunie wszystkie karty z tej listy z tej tablicy. Aby przejrzeć karty w Archiwum i przywrócić na tablicę, kliknij \"Menu\" > \"Archiwizuj\".",
     "list-move-cards": "Przenieś wszystkie karty z tej listy",
     "list-select-cards": "Zaznacz wszystkie karty z tej listy",
+    "set-color-list": "Ustaw kolor",
     "listActionPopup-title": "Lista akcji",
-    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneActionPopup-title": "Opcje diagramu czynności",
+    "swimlaneAddPopup-title": "Dodaj diagram czynności poniżej",
     "listImportCardPopup-title": "Zaimportuj kartę z Trello",
     "listMorePopup-title": "Więcej",
-    "link-list": "Link to this list",
-    "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
+    "link-list": "Podepnij do tej listy",
+    "list-delete-pop": "Wszystkie czynności zostaną usunięte z Aktywności i nie będziesz w stanie przywrócić listy. Nie ma możliwości cofnięcia tej operacji.",
+    "list-delete-suggest-archive": "Możesz przenieść listę do Archiwum, a następnie usunąć ją z tablicy i zachować ją w Aktywności.",
     "lists": "Listy",
-    "swimlanes": "Swimlanes",
+    "swimlanes": "Diagramy czynności",
     "log-out": "Wyloguj",
     "log-in": "Zaloguj",
     "loginPopup-title": "Zaloguj",
-    "memberMenuPopup-title": "Member Settings",
+    "memberMenuPopup-title": "Ustawienia członków",
     "members": "Członkowie",
     "menu": "Menu",
     "move-selection": "Przenieś zaznaczone",
     "moveCardPopup-title": "Przenieś kartę",
-    "moveCardToBottom-title": "Move to Bottom",
-    "moveCardToTop-title": "Move to Top",
+    "moveCardToBottom-title": "Przenieś na dół",
+    "moveCardToTop-title": "Przenieś na górę",
     "moveSelectionPopup-title": "Przenieś zaznaczone",
     "multi-selection": "Wielokrotne zaznaczenie",
     "multi-selection-on": "Wielokrotne zaznaczenie jest włączone",
-    "muted": "Wyciszona",
-    "muted-info": "Nie zostaniesz powiadomiony o zmianach w tablicy",
+    "muted": "Wycisz",
+    "muted-info": "Nie zostaniesz powiadomiony o zmianach w tej tablicy",
     "my-boards": "Moje tablice",
     "name": "Nazwa",
-    "no-archived-cards": "No cards in Recycle Bin.",
-    "no-archived-lists": "No lists in Recycle Bin.",
-    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
+    "no-archived-cards": "Brak kart w Archiwum.",
+    "no-archived-lists": "Brak list w Archiwum.",
+    "no-archived-swimlanes": "Brak diagramów czynności w Archiwum",
     "no-results": "Brak wyników",
-    "normal": "Normal",
+    "normal": "Użytkownik standardowy",
     "normal-desc": "Może widzieć i edytować karty. Nie może zmieniać ustawiań.",
-    "not-accepted-yet": "Zaproszenie jeszcze nie zaakceptowane",
-    "notify-participate": "Receive updates to any cards you participate as creater or member",
-    "notify-watch": "Receive updates to any boards, lists, or cards you’re watching",
+    "not-accepted-yet": "Zaproszenie jeszcze niezaakceptowane",
+    "notify-participate": "Otrzymuj aktualizacje kart, w których uczestniczysz jako twórca lub członek.",
+    "notify-watch": "Otrzymuj powiadomienia z tablic, list i kart, które obserwujesz",
     "optional": "opcjonalny",
     "or": "lub",
     "page-maybe-private": "Ta strona może być prywatna. Możliwe, że możesz ją zobaczyć po <a href='%s'>zalogowaniu</a>.",
     "page-not-found": "Strona nie znaleziona.",
     "password": "Hasło",
-    "paste-or-dragdrop": "wklej lub przeciągnij & upuść obrazek",
-    "participating": "Participating",
+    "paste-or-dragdrop": "wklej lub przeciągnij & upuść (tylko grafika)",
+    "participating": "Uczestniczysz",
     "preview": "Podgląd",
     "previewAttachedImagePopup-title": "Podgląd",
     "previewClipboardImagePopup-title": "Podgląd",
@@ -317,7 +402,7 @@
     "private-desc": "Ta tablica jest prywatna. Tylko osoby dodane do tej tablicy mogą ją zobaczyć i edytować.",
     "profile": "Profil",
     "public": "Publiczny",
-    "public-desc": "This board is public. It's visible to anyone with the link and will show up in search engines like Google. Only people added to the board can edit.",
+    "public-desc": "Ta tablica jest publiczna. Jest widoczna dla wszystkich, którzy mają do niej odnośnik i będzie wynikiem silników wyszukiwania takich jak Google. Tylko użytkownicy dodani do tablicy mogą ją edytować.",
     "quick-access-description": "Odznacz tablicę aby dodać skrót na tym pasku.",
     "remove-cover": "Usuń okładkę",
     "remove-from-board": "Usuń z tablicy",
@@ -332,115 +417,277 @@
     "restore": "Przywróć",
     "save": "Zapisz",
     "search": "Wyszukaj",
-    "search-cards": "Search from card titles and descriptions on this board",
-    "search-example": "Text to search for?",
+    "rules": "Reguły",
+    "search-cards": "Szukaj spośród tytułów kart oraz opisów na tej tablicy",
+    "search-example": "Czego mam szukać?",
     "select-color": "Wybierz kolor",
-    "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
-    "setWipLimitPopup-title": "Set WIP Limit",
+    "set-wip-limit-value": "Ustaw maksymalny limit zadań na tej liście",
+    "setWipLimitPopup-title": "Ustaw limit kart na liście",
     "shortcut-assign-self": "Przypisz siebie do obecnej karty",
-    "shortcut-autocomplete-emoji": "Autocomplete emoji",
-    "shortcut-autocomplete-members": "Autocomplete members",
+    "shortcut-autocomplete-emoji": "Autouzupełnianie emoji",
+    "shortcut-autocomplete-members": "Autouzupełnianie członków",
     "shortcut-clear-filters": "Usuń wszystkie filtry",
     "shortcut-close-dialog": "Zamknij okno",
     "shortcut-filter-my-cards": "Filtruj moje karty",
     "shortcut-show-shortcuts": "Przypnij do listy skrótów",
     "shortcut-toggle-filterbar": "Przełącz boczny pasek filtru",
     "shortcut-toggle-sidebar": "Przełącz boczny pasek tablicy",
-    "show-cards-minimum-count": "Show cards count if list contains more than",
-    "sidebar-open": "Open Sidebar",
-    "sidebar-close": "Close Sidebar",
+    "show-cards-minimum-count": "Pokaż licznik kart, jeśli lista zawiera więcej niż",
+    "sidebar-open": "Otwórz pasek boczny",
+    "sidebar-close": "Zamknij pasek boczny",
     "signupPopup-title": "Utwórz konto",
-    "star-board-title": "Click to star this board. It will show up at top of your boards list.",
+    "star-board-title": "Kliknij by oznaczyć tę tablicę gwiazdką. Pojawi się wtedy na liście tablic na górze.",
     "starred-boards": "Odznaczone tablice",
-    "starred-boards-description": "Starred boards show up at the top of your boards list.",
+    "starred-boards-description": "Tablice oznaczone gwiazdką pojawią się na liście na górze.",
     "subscribe": "Zapisz się",
     "team": "Zespół",
     "this-board": "ta tablica",
     "this-card": "ta karta",
-    "spent-time-hours": "Spent time (hours)",
-    "overtime-hours": "Overtime (hours)",
-    "overtime": "Overtime",
-    "has-overtime-cards": "Has overtime cards",
-    "has-spenttime-cards": "Has spent time cards",
-    "time": "Time",
+    "spent-time-hours": "Spędzony czas (w godzinach)",
+    "overtime-hours": "Nadgodziny (czas)",
+    "overtime": "Dodatkowo",
+    "has-overtime-cards": "Ma dodatkowych kart",
+    "has-spenttime-cards": "Ma karty z wykorzystanym czasem",
+    "time": "Czas",
     "title": "Tytuł",
-    "tracking": "Tracking",
-    "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
+    "tracking": "Śledzenie",
+    "tracking-info": "Zostaniesz poinformowany o zmianach kart, w których bierzesz udział jako twórca lub członek.",
+    "type": "Typ",
     "unassign-member": "Nieprzypisany członek",
-    "unsaved-description": "You have an unsaved description.",
-    "unwatch": "Unwatch",
+    "unsaved-description": "Masz niezapisany opis.",
+    "unwatch": "Nie obserwuj",
     "upload": "Wyślij",
     "upload-avatar": "Wyślij avatar",
     "uploaded-avatar": "Wysłany avatar",
     "username": "Nazwa użytkownika",
     "view-it": "Zobacz",
-    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
+    "warn-list-archived": "Ostrzeżenie: ta karta jest na liście będącej w Archiwum",
     "watch": "Obserwuj",
     "watching": "Obserwujesz",
-    "watching-info": "You will be notified of any change in this board",
-    "welcome-board": "Welcome Board",
-    "welcome-swimlane": "Milestone 1",
+    "watching-info": "Będziesz poinformowany o każdej zmianie na tej tablicy",
+    "welcome-board": "Tablica powitalna",
+    "welcome-swimlane": "Kamień milowy 1",
     "welcome-list1": "Podstawy",
     "welcome-list2": "Zaawansowane",
+    "card-templates-swimlane": "Utwórz szablony",
+    "list-templates-swimlane": "Wyświetl szablony",
+    "board-templates-swimlane": "Szablony tablic",
     "what-to-do": "Co chcesz zrobić?",
-    "wipLimitErrorPopup-title": "Invalid WIP Limit",
-    "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
-    "wipLimitErrorPopup-dialog-pt2": "Please move some tasks out of this list, or set a higher WIP limit.",
+    "wipLimitErrorPopup-title": "Nieprawidłowy limit kart na liście",
+    "wipLimitErrorPopup-dialog-pt1": "Aktualna ilość kart na tej liście jest większa niż aktualny zdefiniowany limit kart.",
+    "wipLimitErrorPopup-dialog-pt2": "Proszę przenieś zadania z tej listy lub zmień limit kart na tej liście na wyższy.",
     "admin-panel": "Panel administracyjny",
     "settings": "Ustawienia",
     "people": "Osoby",
     "registration": "Rejestracja",
-    "disable-self-registration": "Disable Self-Registration",
+    "disable-self-registration": "Wyłącz samodzielną rejestrację",
     "invite": "Zaproś",
     "invite-people": "Zaproś osoby",
-    "to-boards": "To board(s)",
+    "to-boards": "Do tablic(y)",
     "email-addresses": "Adres e-mail",
-    "smtp-host-description": "The address of the SMTP server that handles your emails.",
-    "smtp-port-description": "The port your SMTP server uses for outgoing emails.",
-    "smtp-tls-description": "Enable TLS support for SMTP server",
+    "smtp-host-description": "Adres serwera SMTP, który wysyła Twoje maile.",
+    "smtp-port-description": "Port, który Twój serwer SMTP wykorzystuje do wysyłania emaili.",
+    "smtp-tls-description": "Włącz wsparcie TLS dla serwera SMTP",
     "smtp-host": "Serwer SMTP",
     "smtp-port": "Port SMTP",
     "smtp-username": "Nazwa użytkownika",
     "smtp-password": "Hasło",
-    "smtp-tls": "TLS support",
+    "smtp-tls": "Wsparcie dla TLS",
     "send-from": "Od",
     "send-smtp-test": "Wyślij wiadomość testową do siebie",
     "invitation-code": "Kod z zaproszenia",
     "email-invite-register-subject": "__inviter__ wysłał Ci zaproszenie",
-    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to Wekan for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
-    "email-smtp-test-subject": "SMTP Test Email From Wekan",
-    "email-smtp-test-text": "You have successfully sent an email",
-    "error-invitation-code-not-exist": "Invitation code doesn't exist",
-    "error-notAuthorized": "You are not authorized to view this page.",
-    "outgoing-webhooks": "Outgoing Webhooks",
-    "outgoingWebhooksPopup-title": "Outgoing Webhooks",
-    "new-outgoing-webhook": "New Outgoing Webhook",
+    "email-invite-register-text": "Drogi __user__,\n\n__inviter__ zaprasza Cię do współpracy na naszej tablicy kanban.\n\nAby kontynuować, wejdź w poniższy link:\n__url__\n\nTwój kod zaproszenia to: __icode__\n\nDziękuję.",
+    "email-smtp-test-subject": "Wiadomość testowa SMTP",
+    "email-smtp-test-text": "Wiadomość testowa została wysłana z powodzeniem.",
+    "error-invitation-code-not-exist": "Kod zaproszenia nie istnieje",
+    "error-notAuthorized": "Nie jesteś uprawniony do przeglądania tej strony.",
+    "outgoing-webhooks": "Wychodzące webhooki",
+    "outgoingWebhooksPopup-title": "Wychodzące webhooki",
+    "boardCardTitlePopup-title": "Filtruj poprzez nazwę karty",
+    "new-outgoing-webhook": "Nowy wychodzący webhook",
     "no-name": "(nieznany)",
-    "Wekan_version": "Wersja Wekan",
     "Node_version": "Wersja Node",
-    "OS_Arch": "OS Arch",
-    "OS_Cpus": "OS CPU Count",
-    "OS_Freemem": "OS Free Memory",
-    "OS_Loadavg": "OS Load Average",
-    "OS_Platform": "OS Platform",
-    "OS_Release": "OS Release",
-    "OS_Totalmem": "OS Total Memory",
-    "OS_Type": "OS Type",
-    "OS_Uptime": "OS Uptime",
+    "OS_Arch": "Architektura systemu",
+    "OS_Cpus": "Ilość rdzeni systemu",
+    "OS_Freemem": "Wolna pamięć RAM",
+    "OS_Loadavg": "Średnie obciążenie systemu",
+    "OS_Platform": "Platforma systemu",
+    "OS_Release": "Wersja jądra",
+    "OS_Totalmem": "Dostępna pamięć RAM",
+    "OS_Type": "Typ systemu",
+    "OS_Uptime": "Czas działania systemu",
+    "days": "dni",
     "hours": "godzin",
     "minutes": "minut",
     "seconds": "sekund",
+    "show-field-on-card": "Pokaż te pole na karcie",
+    "automatically-field-on-card": "Automatycznie stwórz pole dla wszystkich kart",
+    "showLabel-field-on-card": "Pokaż pole etykiety w minikarcie",
     "yes": "Tak",
     "no": "Nie",
     "accounts": "Konto",
     "accounts-allowEmailChange": "Zezwól na zmianę adresu email",
+    "accounts-allowUserNameChange": "Zezwól na zmianę nazwy użytkownika",
     "createdAt": "Stworzono o",
     "verified": "Zweryfikowane",
     "active": "Aktywny",
-    "card-received": "Received",
-    "card-received-on": "Received on",
-    "card-end": "End",
-    "card-end-on": "Ends on",
-    "editCardReceivedDatePopup-title": "Change received date",
-    "editCardEndDatePopup-title": "Change end date"
-}
+    "card-received": "Odebrano",
+    "card-received-on": "Odebrano",
+    "card-end": "Koniec",
+    "card-end-on": "Kończy się",
+    "editCardReceivedDatePopup-title": "Zmień datę odebrania",
+    "editCardEndDatePopup-title": "Zmień datę ukończenia",
+    "setCardColorPopup-title": "Ustaw kolor",
+    "setCardActionsColorPopup-title": "Wybierz kolor",
+    "setSwimlaneColorPopup-title": "Wybierz kolor",
+    "setListColorPopup-title": "Wybierz kolor",
+    "assigned-by": "Przypisane przez",
+    "requested-by": "Zlecone przez",
+    "board-delete-notice": "Usuwanie jest permanentne. Stracisz wszystkie listy, kart oraz czynności przypisane do tej tablicy.",
+    "delete-board-confirm-popup": "Wszystkie listy, etykiety oraz aktywności zostaną usunięte i nie będziesz w stanie przywrócić zawartości tablicy. Tego nie da się cofnąć.",
+    "boardDeletePopup-title": "Usunąć tablicę?",
+    "delete-board": "Usuń tablicę",
+    "default-subtasks-board": "Podzadania dla tablicy __board__",
+    "default": "Domyślny",
+    "queue": "Kolejka",
+    "subtask-settings": "Ustawienia podzadań",
+    "boardSubtaskSettingsPopup-title": "Ustawienia tablicy podzadań",
+    "show-subtasks-field": "Karty mogą mieć podzadania",
+    "deposit-subtasks-board": "Przechowuj podzadania na tablicy:",
+    "deposit-subtasks-list": "Początkowa lista dla podzadań jest przechowywana w:",
+    "show-parent-in-minicard": "Pokaż rodzica w minikarcie:",
+    "prefix-with-full-path": "Prefix z pełną ścieżką",
+    "prefix-with-parent": "Prefix z rodzicem",
+    "subtext-with-full-path": "Podtekst z pełną ścieżką",
+    "subtext-with-parent": "Podtekst z rodzicem",
+    "change-card-parent": "Zmień rodzica karty",
+    "parent-card": "Karta rodzica",
+    "source-board": "Tablica źródłowa",
+    "no-parent": "Nie pokazuj rodzica",
+    "activity-added-label": "dodał(a) etykietę '%s' z '%s'",
+    "activity-removed-label": "usunięto etykietę '%s' z '%s'",
+    "activity-delete-attach": "usunięto załącznik z %s",
+    "activity-added-label-card": "dodał(a) etykietę '%s'",
+    "activity-removed-label-card": "usunięto etykietę '%s'",
+    "activity-delete-attach-card": "usunięto załącznik",
+    "activity-set-customfield": "ustawiono niestandardowe pole '%s' do '%s' na '%s'",
+    "activity-unset-customfield": "wyczyszczono niestandardowe pole '%s' na '%s'",
+    "r-rule": "Reguła",
+    "r-add-trigger": "Dodaj przełącznik",
+    "r-add-action": "Dodaj czynność",
+    "r-board-rules": "Reguły tablicy",
+    "r-add-rule": "Dodaj regułę",
+    "r-view-rule": "Zobacz regułę",
+    "r-delete-rule": "Usuń regułę",
+    "r-new-rule-name": "Nowa nazwa reguły",
+    "r-no-rules": "Brak regułę",
+    "r-when-a-card": "Gdy karta",
+    "r-is": "jest",
+    "r-is-moved": "jest przenoszona",
+    "r-added-to": "dodana do",
+    "r-removed-from": "Usunięto z",
+    "r-the-board": "tablicy",
+    "r-list": "lista",
+    "set-filter": "Ustaw filtr",
+    "r-moved-to": "Przeniesiono do",
+    "r-moved-from": "Przeniesiono z",
+    "r-archived": "Przeniesione z Archiwum",
+    "r-unarchived": "Przywrócone z Archiwum",
+    "r-a-card": "karta",
+    "r-when-a-label-is": "Gdy etykieta jest",
+    "r-when-the-label-is": "Gdy etykieta jest",
+    "r-list-name": "nazwa listy",
+    "r-when-a-member": "Gdy członek jest",
+    "r-when-the-member": "Gdy członek jest",
+    "r-name": "nazwa",
+    "r-when-a-attach": "Gdy załącznik",
+    "r-when-a-checklist": "Gdy lista zadań jest",
+    "r-when-the-checklist": "Gdy lista zadań",
+    "r-completed": "Ukończono",
+    "r-made-incomplete": "Niedokończone",
+    "r-when-a-item": "Gdy lista zadań jest",
+    "r-when-the-item": "Gdy element listy zadań",
+    "r-checked": "Zaznaczony",
+    "r-unchecked": "Odznaczony",
+    "r-move-card-to": "Przenieś kartę do",
+    "r-top-of": "Góra od",
+    "r-bottom-of": "Dół od",
+    "r-its-list": "tej listy",
+    "r-archive": "Przenieś do Archiwum",
+    "r-unarchive": "Przywróć z Archiwum",
+    "r-card": "karta",
+    "r-add": "Dodaj",
+    "r-remove": "Usuń",
+    "r-label": "etykieta",
+    "r-member": "członek",
+    "r-remove-all": "Usuń wszystkich członków tej karty",
+    "r-set-color": "Ustaw kolor na",
+    "r-checklist": "lista zadań",
+    "r-check-all": "Zaznacz wszystkie",
+    "r-uncheck-all": "Odznacz wszystkie",
+    "r-items-check": "elementy listy",
+    "r-check": "Zaznacz",
+    "r-uncheck": "Odznacz",
+    "r-item": "element",
+    "r-of-checklist": "z listy zadań",
+    "r-send-email": "Wyślij wiadomość email",
+    "r-to": "do",
+    "r-subject": "temat",
+    "r-rule-details": "Szczegóły reguł",
+    "r-d-move-to-top-gen": "Przenieś kartę na górę tej listy",
+    "r-d-move-to-top-spec": "Przenieś kartę na górę listy",
+    "r-d-move-to-bottom-gen": "Przenieś kartę na dół tej listy",
+    "r-d-move-to-bottom-spec": "Przenieś kartę na dół listy",
+    "r-d-send-email": "Wyślij wiadomość email",
+    "r-d-send-email-to": "do",
+    "r-d-send-email-subject": "temat",
+    "r-d-send-email-message": "wiadomość",
+    "r-d-archive": "Przenieś kartę z Archiwum",
+    "r-d-unarchive": "Przywróć kartę z Archiwum",
+    "r-d-add-label": "Dodaj etykietę",
+    "r-d-remove-label": "Usuń etykietę",
+    "r-create-card": "Utwórz nową kartę",
+    "r-in-list": "na liście",
+    "r-in-swimlane": "w diagramie zdarzeń",
+    "r-d-add-member": "Dodaj członka",
+    "r-d-remove-member": "Usuń członka",
+    "r-d-remove-all-member": "Usuń wszystkich członków",
+    "r-d-check-all": "Zaznacz wszystkie elementy listy",
+    "r-d-uncheck-all": "Odznacz wszystkie elementy listy",
+    "r-d-check-one": "Zaznacz element",
+    "r-d-uncheck-one": "Odznacz element",
+    "r-d-check-of-list": "z listy zadań",
+    "r-d-add-checklist": "Dodaj listę zadań",
+    "r-d-remove-checklist": "Usuń listę zadań",
+    "r-by": "przez",
+    "r-add-checklist": "Dodaj listę zadań",
+    "r-with-items": "z elementami",
+    "r-items-list": "element1,element2,element3",
+    "r-add-swimlane": "Dodaj diagram zdarzeń",
+    "r-swimlane-name": "Nazwa diagramu",
+    "r-board-note": "Uwaga: pozostaw pole puste, aby każda wartość była brana pod uwagę.",
+    "r-checklist-note": "Uwaga: wartości elementów listy muszą być oddzielone przecinkami.",
+    "r-when-a-card-is-moved": "Gdy karta jest przeniesiona do innej listy",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Sposób autoryzacji",
+    "authentication-type": "Typ autoryzacji",
+    "custom-product-name": "Niestandardowa nazwa produktu",
+    "layout": "Układ strony",
+    "hide-logo": "Ukryj logo",
+    "add-custom-html-after-body-start": "Dodaj niestandardowy kod HTML po <body> starcie",
+    "add-custom-html-before-body-end": "Dodaj niestandardowy kod HTML przed </body> końcem",
+    "error-undefined": "Coś poszło nie tak",
+    "error-ldap-login": "Wystąpił błąd w trakcie logowania",
+    "display-authentication-method": "Wyświetl metodę logowania",
+    "default-authentication-method": "Domyślna metoda logowania",
+    "duplicate-board": "Duplikuj tablicę",
+    "people-number": "Liczba użytkowników to:",
+    "swimlaneDeletePopup-title": "Usunąć diagram czynności?",
+    "swimlane-delete-pop": "Wszystkie akcje będą usunięte z widoku aktywności, nie można będzie przywrócić diagramu czynności.  Usunięcie jest nieodwracalne.",
+    "restore-all": "Przywróć wszystkie",
+    "delete-all": "Usuń wszystkie",
+    "loading": "Ładowanie, proszę czekać."
+}
\ No newline at end of file
diff --git a/i18n/pt-BR.i18n.json b/i18n/pt-BR.i18n.json
index d7d7243a..16caedc2 100644
--- a/i18n/pt-BR.i18n.json
+++ b/i18n/pt-BR.i18n.json
@@ -1,35 +1,51 @@
 {
     "accept": "Aceitar",
-    "act-activity-notify": "[Wekan] Notificação de Atividade",
-    "act-addAttachment": "anexo __attachment__ de __card__",
-    "act-addChecklist": "added checklist __checklist__ no __card__",
-    "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__",
-    "act-addComment": "comentou em __card__: __comment__",
-    "act-createBoard": "criou __board__",
-    "act-createCard": "__card__ adicionado à __list__",
-    "act-createList": "__list__ adicionada à __board__",
-    "act-addBoardMember": "__member__ adicionado à __board__",
-    "act-archivedBoard": "__board__ moved to Recycle Bin",
-    "act-archivedCard": "__card__ moved to Recycle Bin",
-    "act-archivedList": "__list__ moved to Recycle Bin",
-    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
-    "act-importBoard": "__board__ importado",
-    "act-importCard": "__card__ importado",
-    "act-importList": "__list__ importada",
-    "act-joinMember": "__member__ adicionado à __card__",
-    "act-moveCard": "__card__ movido de __oldList__ para __list__",
-    "act-removeBoardMember": "__member__ removido de __board__",
-    "act-restoredCard": "__card__ restaurado para __board__",
-    "act-unjoinMember": "__member__ removido de __card__",
-    "act-withBoardTitle": "[Wekan] __board__",
+    "act-activity-notify": "Notificação de atividade",
+    "act-addAttachment": "adicionado anexo __attachment__ ao cartão __card__ na lista __list__ em raia __swimlane__ no quadro __board__",
+    "act-deleteAttachment": "excluido anexo __attachment__ do cartão __card__ na lista __list__ em raia __swimlane__ no quadro __board__",
+    "act-addSubtask": "adicionada subtarefa __subtask__ ao cartão __card__ na lista __list__ em raia __swimlane__ no quadro __board__",
+    "act-addLabel": "Adicionada etiqueta __label__ ao cartão __card__ na lista __list__ em raia __swimlane__ no quadro __board__",
+    "act-addedLabel": "Adicionada etiqueta __label__ ao cartão __card__ na lista __list__ em raia __swimlane__ no quadro __board__",
+    "act-removeLabel": "Removida etiqueta __label__ do cartão __card__ na lista __list__ em raia __swimlane__ no quadro __board__",
+    "act-removedLabel": "Removida etiqueta __label__ do cartão __card__ na lista __list__ em raia __swimlane__ no quadro __board__",
+    "act-addChecklist": "adicionada lista de verificação __checklist__ ao cartão __card__ na lista __list__ em raia __swimlane__ no quadro __board__",
+    "act-addChecklistItem": "adicionado o item  __checklistItem__ a lista de verificação__checklist__ no cartão __card__ na lista __list__ em raia __swimlane__ no quadro __board__",
+    "act-removeChecklist": "emovida a lista de verificação __checklist__ do cartão __card__ na lista __list__ em raia __swimlane__ no quadro __board__",
+    "act-removeChecklistItem": "removido item __checklistItem__ da lista de verificação __checkList__ no cartão __card__ na lista __list__ em raia __swimlane__ no quadro __board__",
+    "act-checkedItem": "marcado __checklistItem__ na lista de verificação __checklist__ no cartão __card__ na lista __list__ em raia __swimlane__ no quadro __board__",
+    "act-uncheckedItem": "desmarcado __checklistItem__ na lista __checklist__ no cartão __card__ na lista __list__ em raia __swimlane__ no quadro __board__",
+    "act-completeChecklist": "completada a lista de verificação __checklist__ no cartão __card__ na lista __list__ em raia __swimlane__ no quadro __board__",
+    "act-uncompleteChecklist": "lista de verificação incompleta __checklist__ no cartão __card__ na lista __list__ em raia __swimlane__ no quadro __board__",
+    "act-addComment": "comentou no cartão __card__: __comment__ na lista __list__ em raia __swimlane__ no quadro __board__",
+    "act-createBoard": "criado quadro__board__",
+    "act-createSwimlane": "criada a raia __swimlane__ no quadro __board__",
+    "act-createCard": "criado cartão __card__ na lista __list__ em raia __swimlane__ no quadro __board__",
+    "act-createCustomField": "criado campo customizado __customField__ no cartão __card__ na lista __list__ em raia __swimlane__ no quadro __board__",
+    "act-createList": "adicionada lista __list__ ao quadro __board__",
+    "act-addBoardMember": "adicionado membro __member__ ao quadro __board__",
+    "act-archivedBoard": "Quadro __board__ foi Arquivado",
+    "act-archivedCard": "Cartão __card__ na lista __list__ em raia __swimlane__ no quadro __board__ foi Arquivado",
+    "act-archivedList": "Lista __list__ em raia __swimlane__ no quadro __board__ foi Arquivada",
+    "act-archivedSwimlane": "Raia __swimlane__ no quadro __board__ foi Arquivada",
+    "act-importBoard": "importado quadro __board__",
+    "act-importCard": "importado cartão  __card__ para lista __list__ em raia __swimlane__ no quadro __board__",
+    "act-importList": "importada lista __list__ para raia __swimlane__ no quadro __board__",
+    "act-joinMember": "adicionado membro __member__ ao cartão __card__ na lista __list__ em raia __swimlane__ no quadro __board__",
+    "act-moveCard": "movido cartão __card__ do quadro __board__ da raia  __oldSwimlane__ da lista __oldList__ para a raia __swimlane__ na lista __list__ ",
+    "act-moveCardToOtherBoard": "movido cartão __card__ da lista __oldList__ em raia __oldSwimlane__ no quadro __oldBoard__ para lista __list__ em raia __swimlane__ no quadro __board__",
+    "act-removeBoardMember": "removido membro __member__ do quadro __board__",
+    "act-restoredCard": "restaurado cartão __card__ a lista __list__ em raia __swimlane__ no quadro __board__",
+    "act-unjoinMember": "removido membro __member__ do cartão __card__ na lista __list__ em raia __swimlane__ no quadro __board__",
+    "act-withBoardTitle": "__board__",
     "act-withCardTitle": "[__board__] __card__",
     "actions": "Ações",
     "activities": "Atividades",
     "activity": "Atividade",
     "activity-added": "adicionou %s a %s",
-    "activity-archived": "%s moved to Recycle Bin",
+    "activity-archived": "%s foi Arquivado",
     "activity-attached": "anexou %s a %s",
     "activity-created": "criou %s",
+    "activity-customfield-created": "criado campo customizado %s",
     "activity-excluded": "excluiu %s de %s",
     "activity-imported": "importado %s em %s de %s",
     "activity-imported-board": "importado %s de %s",
@@ -39,14 +55,26 @@
     "activity-removed": "removeu %s de %s",
     "activity-sent": "enviou %s de %s",
     "activity-unjoined": "saiu de %s",
-    "activity-checklist-added": "Adicionado lista de verificação a %s",
-    "activity-checklist-item-added": "adicionado o item de checklist para '%s' em %s",
+    "activity-subtask-added": "Adcionar subtarefa à",
+    "activity-checked-item": "marcado %s na lista de verificação %s de %s",
+    "activity-unchecked-item": "desmarcado %s na lista de verificação %s de %s",
+    "activity-checklist-added": "Adicionada lista de verificação a %s",
+    "activity-checklist-removed": "removida a lista de verificação de %s",
+    "activity-checklist-completed": "completada a lista de verificação __checklist__ no cartão __card__ na lista __list__ em raia __swimlane__ no quadro __board__",
+    "activity-checklist-uncompleted": "não-completada a lista de verificação %s de %s",
+    "activity-checklist-item-added": "adicionado o item de lista de verificação para '%s' em %s",
+    "activity-checklist-item-removed": "removida o item de lista de verificação de '%s' na %s",
     "add": "Novo",
+    "activity-checked-item-card": "marcaddo %s na lista de verificação %s",
+    "activity-unchecked-item-card": "desmarcado %s na lista de verificação %s",
+    "activity-checklist-completed-card": "completada a lista de verificação __checklist__ no cartão __card__ na lista __list__ em raia __swimlane__ no quadro __board__",
+    "activity-checklist-uncompleted-card": "não-completada a lista de verificação %s",
     "add-attachment": "Adicionar Anexos",
     "add-board": "Adicionar Quadro",
     "add-card": "Adicionar Cartão",
-    "add-swimlane": "Add Swimlane",
-    "add-checklist": "Adicionar Checklist",
+    "add-swimlane": "Adicionar Raia",
+    "add-subtask": "Adicionar subtarefa",
+    "add-checklist": "Adicionar lista de verificação",
     "add-checklist-item": "Adicionar um item à lista de verificação",
     "add-cover": "Adicionar Capa",
     "add-label": "Adicionar Etiqueta",
@@ -63,20 +91,22 @@
     "and-n-other-card": "E __count__ outro cartão",
     "and-n-other-card_plural": "E __count__ outros cartões",
     "apply": "Aplicar",
-    "app-is-offline": "O Wekan está carregando, por favor espere. Recarregar a página irá causar perda de dado. Se o Wekan não carregar por favor verifique se o servidor Wekan não está parado.",
-    "archive": "Move to Recycle Bin",
-    "archive-all": "Move All to Recycle Bin",
-    "archive-board": "Move Board to Recycle Bin",
-    "archive-card": "Move Card to Recycle Bin",
-    "archive-list": "Move List to Recycle Bin",
-    "archive-swimlane": "Move Swimlane to Recycle Bin",
-    "archive-selection": "Move selection to Recycle Bin",
-    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
-    "archived-items": "Recycle Bin",
-    "archived-boards": "Boards in Recycle Bin",
+    "app-is-offline": "Carregando, por favor espere. Atualizar a página causará perda de dados. Se a carga não funcionar, por favor verifique se o servidor não caiu.",
+    "archive": "Mover para o Arquivo-morto",
+    "archive-all": "Mover Tudo para o Arquivo-morto",
+    "archive-board": "Mover Quadro para o Arquivo-morto",
+    "archive-card": "Mover Cartão para o Arquivo-morto",
+    "archive-list": "Mover Lista para o Arquivo-morto",
+    "archive-swimlane": "Mover Raia para Arquivo-morto",
+    "archive-selection": "Mover seleção para o Arquivo-morto",
+    "archiveBoardPopup-title": "Mover Quadro para o Arquivo-morto?",
+    "archived-items": "Arquivo-morto",
+    "archived-boards": "Quadros no Arquivo-morto",
     "restore-board": "Restaurar Quadro",
-    "no-archived-boards": "No Boards in Recycle Bin.",
-    "archives": "Recycle Bin",
+    "no-archived-boards": "Sem Quadros no Arquivo-morto.",
+    "archives": "Arquivos-morto",
+    "template": "Modelo",
+    "templates": "Modelos",
     "assign-member": "Atribuir Membro",
     "attached": "anexado",
     "attachment": "Anexo",
@@ -95,22 +125,25 @@
     "boardChangeTitlePopup-title": "Renomear Quadro",
     "boardChangeVisibilityPopup-title": "Alterar Visibilidade",
     "boardChangeWatchPopup-title": "Alterar observação",
-    "boardMenuPopup-title": "Menu do Quadro",
+    "boardMenuPopup-title": "Configurações do quadro",
     "boards": "Quadros",
     "board-view": "Visão de quadro",
-    "board-view-swimlanes": "Swimlanes",
+    "board-view-cal": "Calendário",
+    "board-view-swimlanes": "Raias",
     "board-view-lists": "Listas",
     "bucket-example": "\"Bucket List\", por exemplo",
     "cancel": "Cancelar",
-    "card-archived": "This card is moved to Recycle Bin.",
+    "card-archived": "Este cartão está Arquivado.",
+    "board-archived": "Este quadro está Arquivado.",
     "card-comments-title": "Este cartão possui %s comentários.",
     "card-delete-notice": "A exclusão será permanente. Você perderá todas as ações associadas a este cartão.",
-    "card-delete-pop": "Todas as ações serão removidas da lista de Atividades e vocês não poderá re-abrir o cartão. Não há como desfazer.",
-    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
+    "card-delete-pop": "Todas as ações serão excluidas da lista de Atividades e vocês não poderá re-abrir o cartão. Não há como desfazer.",
+    "card-delete-suggest-archive": "Você pode mover um cartão para o Arquivo-morto para removê-lo do quadro e preservar a atividade.",
     "card-due": "Data fim",
     "card-due-on": "Finaliza em",
     "card-spent": "Tempo Gasto",
     "card-edit-attachments": "Editar anexos",
+    "card-edit-custom-fields": "Editar campos customizados",
     "card-edit-labels": "Editar etiquetas",
     "card-edit-members": "Editar membros",
     "card-labels-title": "Alterar etiquetas do cartão.",
@@ -118,13 +151,20 @@
     "card-start": "Data início",
     "card-start-on": "Começa em",
     "cardAttachmentsPopup-title": "Anexar a partir de",
+    "cardCustomField-datePopup-title": "Mudar data",
+    "cardCustomFieldsPopup-title": "Editar campos customizados",
     "cardDeletePopup-title": "Excluir Cartão?",
     "cardDetailsActionsPopup-title": "Ações do cartão",
     "cardLabelsPopup-title": "Etiquetas",
     "cardMembersPopup-title": "Membros",
     "cardMorePopup-title": "Mais",
+    "cardTemplatePopup-title": "Criar Modelo",
     "cards": "Cartões",
     "cards-count": "Cartões",
+    "casSignIn": "Entrar com CAS",
+    "cardType-card": "Cartão",
+    "cardType-linkedCard": "Cartão ligado",
+    "cardType-linkedBoard": "Quadro ligado",
     "change": "Alterar",
     "change-avatar": "Alterar Avatar",
     "change-password": "Alterar Senha",
@@ -135,43 +175,79 @@
     "changePasswordPopup-title": "Alterar Senha",
     "changePermissionsPopup-title": "Alterar Permissões",
     "changeSettingsPopup-title": "Altera configurações",
-    "checklists": "Checklists",
+    "subtasks": "Subtarefas",
+    "checklists": "Listas de verificação",
     "click-to-star": "Marcar quadro como favorito.",
     "click-to-unstar": "Remover quadro dos favoritos.",
     "clipboard": "Área de Transferência ou arraste e solte",
     "close": "Fechar",
     "close-board": "Fechar Quadro",
-    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
+    "close-board-pop": "Você será capaz de restaurar o quadro clicando no botão “Arquivo-morto” a partir do cabeçalho do Início.",
     "color-black": "preto",
     "color-blue": "azul",
+    "color-crimson": "carmesim",
+    "color-darkgreen": "verde escuro",
+    "color-gold": "dourado",
+    "color-gray": "cinza",
     "color-green": "verde",
+    "color-indigo": "azul",
     "color-lime": "verde limão",
+    "color-magenta": "magenta",
+    "color-mistyrose": "rosa claro",
+    "color-navy": "azul marinho",
     "color-orange": "laranja",
+    "color-paleturquoise": "azul ciano",
+    "color-peachpuff": "pêssego",
     "color-pink": "cor-de-rosa",
+    "color-plum": "ameixa",
     "color-purple": "roxo",
     "color-red": "vermelho",
-    "color-sky": "céu",
+    "color-saddlebrown": "marrom",
+    "color-silver": "prateado",
+    "color-sky": "azul-celeste",
+    "color-slateblue": "azul ardósia",
+    "color-white": "branco",
     "color-yellow": "amarelo",
+    "unset-color": "Remover",
     "comment": "Comentário",
     "comment-placeholder": "Escrever Comentário",
     "comment-only": "Somente comentários",
     "comment-only-desc": "Pode comentar apenas em cartões.",
+    "no-comments": "Sem comentários",
+    "no-comments-desc": "Sem visualização de comentários e atividades.",
     "computer": "Computador",
-    "confirm-checklist-delete-dialog": "Tem a certeza de que pretende eliminar lista de verificação",
+    "confirm-subtask-delete-dialog": "Tem certeza que deseja excluir a subtarefa?",
+    "confirm-checklist-delete-dialog": "Tem certeza que quer excluir a lista de verificação?",
     "copy-card-link-to-clipboard": "Copiar link do cartão para a área de transferência",
+    "linkCardPopup-title": "Ligar Cartão",
+    "searchElementPopup-title": "Buscar",
     "copyCardPopup-title": "Copiar o cartão",
-    "copyChecklistToManyCardsPopup-title": "Copiar modelo de checklist para vários cartões",
+    "copyChecklistToManyCardsPopup-title": "Copiar modelo de lista de verificação para vários cartões",
     "copyChecklistToManyCardsPopup-instructions": "Títulos e descrições do cartão de destino neste formato JSON",
     "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"Título do primeiro cartão\", \"description\":\"Descrição do primeiro cartão\"}, {\"title\":\"Título do segundo cartão\",\"description\":\"Descrição do segundo cartão\"},{\"title\":\"Título do último cartão\",\"description\":\"Descrição do último cartão\"} ]",
     "create": "Criar",
     "createBoardPopup-title": "Criar Quadro",
     "chooseBoardSourcePopup-title": "Importar quadro",
     "createLabelPopup-title": "Criar Etiqueta",
+    "createCustomField": "Criar campo",
+    "createCustomFieldPopup-title": "Criar campo",
     "current": "atual",
+    "custom-field-delete-pop": "Não existe desfazer. Isso irá excluir o campo customizado de todos os cartões e destruir seu histórico",
+    "custom-field-checkbox": "Caixa de seleção",
+    "custom-field-date": "Data",
+    "custom-field-dropdown": "Lista suspensa",
+    "custom-field-dropdown-none": "(nada)",
+    "custom-field-dropdown-options": "Lista de opções",
+    "custom-field-dropdown-options-placeholder": "Pressione enter para adicionar mais opções",
+    "custom-field-dropdown-unknown": "(desconhecido)",
+    "custom-field-number": "Número",
+    "custom-field-text": "Texto",
+    "custom-fields": "Campos customizados",
     "date": "Data",
     "decline": "Rejeitar",
     "default-avatar": "Avatar padrão",
     "delete": "Excluir",
+    "deleteCustomFieldPopup-title": "Excluir campo customizado?",
     "deleteLabelPopup-title": "Excluir Etiqueta?",
     "description": "Descrição",
     "disambiguateMultiLabelPopup-title": "Desambiguar ações de etiquetas",
@@ -186,6 +262,7 @@
     "soft-wip-limit": "Limite de WIP",
     "editCardStartDatePopup-title": "Altera data de início",
     "editCardDueDatePopup-title": "Altera data fim",
+    "editCustomFieldPopup-title": "Editar campo",
     "editCardSpentTimePopup-title": "Editar tempo gasto",
     "editLabelPopup-title": "Alterar Etiqueta",
     "editNotificationPopup-title": "Editar Notificações",
@@ -193,17 +270,17 @@
     "email": "E-mail",
     "email-enrollAccount-subject": "Uma conta foi criada para você em __siteName__",
     "email-enrollAccount-text": "Olá __user__\npara iniciar utilizando o serviço basta clicar no link abaixo.\n__url__\nMuito Obrigado.",
-    "email-fail": "Falhou ao enviar email",
+    "email-fail": "Falhou ao enviar e-mail",
     "email-fail-text": "Erro ao tentar enviar e-mail",
-    "email-invalid": "Email inválido",
-    "email-invite": "Convite via Email",
+    "email-invalid": "E-mail inválido",
+    "email-invite": "Convite via E-mail",
     "email-invite-subject": "__inviter__ lhe enviou um convite",
     "email-invite-text": "Caro __user__\n__inviter__ lhe convidou para ingressar no quadro \"__board__\" como colaborador.\nPor favor prossiga através do link abaixo:\n__url__\nMuito obrigado.",
     "email-resetPassword-subject": "Redefina sua senha em __siteName__",
     "email-resetPassword-text": "Olá __user__\nPara redefinir sua senha, por favor clique no link abaixo.\n__url__\nMuito obrigado.",
-    "email-sent": "Email enviado",
-    "email-verifyEmail-subject": "Verifique seu endereço de email em __siteName__",
-    "email-verifyEmail-text": "Olá __user__\nPara verificar sua conta de email, clique no link abaixo.\n__url__\nObrigado.",
+    "email-sent": "E-mail enviado",
+    "email-verifyEmail-subject": "Verifique seu endereço de e-mail em __siteName__",
+    "email-verifyEmail-text": "Olá __user__\nPara verificar sua conta de e-mail, clique no link abaixo.\n__url__\nObrigado.",
     "enable-wip-limit": "Ativar Limite WIP",
     "error-board-doesNotExist": "Este quadro não existe",
     "error-board-notAdmin": "Você precisa ser administrador desse quadro para fazer isto",
@@ -220,32 +297,38 @@
     "filter": "Filtrar",
     "filter-cards": "Filtrar Cartões",
     "filter-clear": "Limpar filtro",
-    "filter-no-label": "Sem labels",
+    "filter-no-label": "Sem etiquetas",
     "filter-no-member": "Sem membros",
+    "filter-no-custom-fields": "Não há campos customizados",
     "filter-on": "Filtro está ativo",
     "filter-on-desc": "Você está filtrando cartões neste quadro. Clique aqui para editar o filtro.",
     "filter-to-selection": "Filtrar esta seleção",
+    "advanced-filter-label": "Filtro avançado",
+    "advanced-filter-description": "Filtros avançados permitem escrever uma \"string\" contendo os seguintes operadores: == != <= >= && || (). Um espaco é utilizado como separador entre os operadores. Você pode filtrar para todos os campos personalizados escrevendo os nomes e valores. Exemplo: Campo1 == Valor1. Nota^Se o campo ou valor tiver espaços você precisa encapsular eles em citações sozinhas. Exemplo: Campo1 == Eu\\sou. Também você pode combinar múltiplas condições. Exemplo: C1 == V1 || C1 == V2. Normalmente todos os operadores são interpretados da esquerda para direita. Você pode alterar a ordem colocando parênteses - como ma expressão matemática. Exemplo: C1 == V1 && (C2 == V2 || C2 == V3). Você tamb~em pode pesquisar campos de texto usando regex: C1 == /Tes.*/i",
     "fullname": "Nome Completo",
     "header-logo-title": "Voltar para a lista de quadros.",
     "hide-system-messages": "Esconde mensagens de sistema",
     "headerBarCreateBoardPopup-title": "Criar Quadro",
     "home": "Início",
     "import": "Importar",
+    "link": "Ligação",
     "import-board": "importar quadro",
     "import-board-c": "Importar quadro",
-    "import-board-title-trello": "Importar board do Trello",
-    "import-board-title-wekan": "Importar quadro do Wekan",
+    "import-board-title-trello": "Importar quadro do Trello",
+    "import-board-title-wekan": "Importar quadro a partir de exportação prévia",
+    "import-sandstorm-backup-warning": "Não exclua os dados importados do quadro original exportado ou do Trello antes de verificar se esse item fecha e abre novamente, ou se você receber o erro Quadro não encontrado, que significa perda de dados.",
     "import-sandstorm-warning": "O quadro importado irá excluir todos os dados existentes no quadro e irá sobrescrever com o quadro importado.",
     "from-trello": "Do Trello",
-    "from-wekan": "Do Wekan",
+    "from-wekan": "A partir de exportação prévia",
     "import-board-instruction-trello": "No seu quadro do Trello, vá em 'Menu', depois em 'Mais', 'Imprimir e Exportar', 'Exportar JSON', então copie o texto emitido",
-    "import-board-instruction-wekan": "Em seu quadro Wekan, vá para 'Menu', em seguida 'Exportar quadro', e copie o texto no arquivo baixado.",
+    "import-board-instruction-wekan": "Em seu quadro vá para 'Menu', depois 'Exportar quadro' e copie o texto no arquivo baixado.",
+    "import-board-instruction-about-errors": "Se você receber erros ao importar o quadro, às vezes a importação ainda funciona e o quadro está na página Todos os Quadros.",
     "import-json-placeholder": "Cole seus dados JSON válidos aqui",
     "import-map-members": "Mapear membros",
-    "import-members-map": "O seu quadro importado tem alguns membros. Por favor determine os membros que você deseja importar para os usuários Wekan",
+    "import-members-map": "Seu quadro importado possui alguns membros. Por favor, mapeie os membros que você deseja importar para seus usuários",
     "import-show-user-mapping": "Revisar mapeamento dos membros",
-    "import-user-select": "Selecione o usuário Wekan que você gostaria de usar como este membro",
-    "importMapMembersAddPopup-title": "Seleciona um membro",
+    "import-user-select": "Escolha um usuário existente que você deseja usar como esse membro",
+    "importMapMembersAddPopup-title": "Selecione membro",
     "info": "Versão",
     "initials": "Iniciais",
     "invalid-date": "Data inválida",
@@ -256,27 +339,29 @@
     "keyboard-shortcuts": "Atalhos do teclado",
     "label-create": "Criar Etiqueta",
     "label-default": "%s etiqueta (padrão)",
-    "label-delete-pop": "Não será possível recuperá-la. A etiqueta será removida de todos os cartões e seu histórico será destruído.",
+    "label-delete-pop": "Não será possível recuperá-la. A etiqueta será excluida de todos os cartões e seu histórico será destruído.",
     "labels": "Etiquetas",
     "language": "Idioma",
     "last-admin-desc": "Você não pode alterar funções porque deve existir pelo menos um administrador.",
     "leave-board": "Sair do Quadro",
     "leave-board-pop": "Tem a certeza de que pretende sair de __boardTitle__? Você será removido de todos os cartões neste quadro.",
-    "leaveBoardPopup-title": "Sair do Quadro ?",
+    "leaveBoardPopup-title": "Sair do Quadro?",
     "link-card": "Vincular a este cartão",
-    "list-archive-cards": "Move all cards in this list to Recycle Bin",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
+    "list-archive-cards": "Move todos os cartões nesta lista para o Arquivo-morto",
+    "list-archive-cards-pop": "Isto removerá todos os cartões desta lista para o quadro. Para visualizar cartões arquivados e trazê-los de volta para o quadro, clique em “Menu” > “Arquivo-morto”.",
     "list-move-cards": "Mover todos os cartões desta lista",
     "list-select-cards": "Selecionar todos os cartões nesta lista",
+    "set-color-list": "Definir Cor",
     "listActionPopup-title": "Listar Ações",
-    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneActionPopup-title": "Ações de Raia",
+    "swimlaneAddPopup-title": "Adicionar uma Raia abaixo ",
     "listImportCardPopup-title": "Importe um cartão do Trello",
     "listMorePopup-title": "Mais",
     "link-list": "Vincular a esta lista",
-    "list-delete-pop": "Todas as ações serão removidas da lista de atividades e você não poderá recuperar a lista. Não há como desfazer.",
-    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
+    "list-delete-pop": "Todas as ações serão excluidas da lista de atividades e você não poderá recuperar a lista. Não há como desfazer.",
+    "list-delete-suggest-archive": "Você pode mover uma lista para o Arquivo-morto para removê-la do quadro e preservar a atividade.",
     "lists": "Listas",
-    "swimlanes": "Swimlanes",
+    "swimlanes": "Raias",
     "log-out": "Sair",
     "log-in": "Entrar",
     "loginPopup-title": "Entrar",
@@ -294,9 +379,9 @@
     "muted-info": "Você nunca receberá qualquer notificação desse board",
     "my-boards": "Meus Quadros",
     "name": "Nome",
-    "no-archived-cards": "No cards in Recycle Bin.",
-    "no-archived-lists": "No lists in Recycle Bin.",
-    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
+    "no-archived-cards": "Sem cartões no Arquivo-morto.",
+    "no-archived-lists": "Sem listas no Arquivo-morto.",
+    "no-archived-swimlanes": "Sem raias no Arquivo-morto.",
     "no-results": "Nenhum resultado.",
     "normal": "Normal",
     "normal-desc": "Pode ver e editar cartões. Não pode alterar configurações.",
@@ -308,7 +393,7 @@
     "page-maybe-private": "Esta página pode ser privada. Você poderá vê-la se estiver <a href='%s'>logado</a>.",
     "page-not-found": "Página não encontrada.",
     "password": "Senha",
-    "paste-or-dragdrop": "para colar, ou arraste e solte o arquivo da imagem para ca (somente imagens)",
+    "paste-or-dragdrop": "para colar, ou arraste e solte o arquivo da imagem para cá (somente imagens)",
     "participating": "Participando",
     "preview": "Previsualizar",
     "previewAttachedImagePopup-title": "Previsualizar",
@@ -322,7 +407,7 @@
     "remove-cover": "Remover Capa",
     "remove-from-board": "Remover do Quadro",
     "remove-label": "Remover Etiqueta",
-    "listDeletePopup-title": "Excluir Lista ?",
+    "listDeletePopup-title": "Excluir Lista?",
     "remove-member": "Remover Membro",
     "remove-member-from-card": "Remover do Cartão",
     "remove-member-pop": "Remover __name__ (__username__) de __boardTitle__? O membro será removido de todos os cartões neste quadro e será notificado.",
@@ -332,6 +417,7 @@
     "restore": "Restaurar",
     "save": "Salvar",
     "search": "Buscar",
+    "rules": "Regras",
     "search-cards": "Pesquisa em títulos e descrições de cartões neste quadro",
     "search-example": "Texto para procurar",
     "select-color": "Selecionar Cor",
@@ -361,27 +447,31 @@
     "overtime-hours": "Tempo extras (Horas)",
     "overtime": "Tempo extras",
     "has-overtime-cards": "Tem cartões de horas extras",
-    "has-spenttime-cards": "Has spent time cards",
+    "has-spenttime-cards": "Gastou cartões de tempo",
     "time": "Tempo",
     "title": "Título",
-    "tracking": "Tracking",
+    "tracking": "Rastreamento",
     "tracking-info": "Você será notificado se houver qualquer alteração em cards em que você é o criador ou membro",
+    "type": "Tipo",
     "unassign-member": "Membro não associado",
     "unsaved-description": "Você possui uma descrição não salva",
     "unwatch": "Deixar de observar",
-    "upload": "Upload",
+    "upload": "Carregar",
     "upload-avatar": "Carregar um avatar",
     "uploaded-avatar": "Avatar carregado",
     "username": "Nome de usuário",
     "view-it": "Visualizar",
-    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
+    "warn-list-archived": "aviso: este cartão está em uma lista no Arquiv-morto",
     "watch": "Observar",
     "watching": "Observando",
-    "watching-info": "Você será notificado em qualquer alteração desse board",
+    "watching-info": "Você será notificado de qualquer alteração neste quadro",
     "welcome-board": "Board de Boas Vindas",
-    "welcome-swimlane": "Milestone 1",
+    "welcome-swimlane": "Marco 1",
     "welcome-list1": "Básico",
     "welcome-list2": "Avançado",
+    "card-templates-swimlane": "Modelos de cartão",
+    "list-templates-swimlane": "Modelos de lista",
+    "board-templates-swimlane": "Modelos de quadro",
     "what-to-do": "O que você gostaria de fazer?",
     "wipLimitErrorPopup-title": "Limite WIP Inválido",
     "wipLimitErrorPopup-dialog-pt1": "O número de tarefas nesta lista excede o limite WIP definido.",
@@ -394,9 +484,9 @@
     "invite": "Convite",
     "invite-people": "Convide Pessoas",
     "to-boards": "Para o/os quadro(s)",
-    "email-addresses": "Endereço de Email",
-    "smtp-host-description": "O endereço do servidor SMTP que envia seus emails.",
-    "smtp-port-description": "A porta que o servidor SMTP usa para enviar os emails.",
+    "email-addresses": "Endereço de E-mail",
+    "smtp-host-description": "O endereço do servidor SMTP que envia seus e-mails.",
+    "smtp-port-description": "A porta que o servidor SMTP usa para enviar os e-mails.",
     "smtp-tls-description": "Habilitar suporte TLS para servidor SMTP",
     "smtp-host": "Servidor SMTP",
     "smtp-port": "Porta SMTP",
@@ -404,19 +494,19 @@
     "smtp-password": "Senha",
     "smtp-tls": "Suporte TLS",
     "send-from": "De",
-    "send-smtp-test": "Enviar um email de teste para você mesmo",
+    "send-smtp-test": "Enviar um e-mail de teste para você mesmo",
     "invitation-code": "Código do Convite",
     "email-invite-register-subject": "__inviter__ lhe enviou um convite",
-    "email-invite-register-text": "Caro __user__,\n\n__inviter__ convidou você para colaborar no Wekan.\n\nPor favor, vá no link abaixo:\n__url__\n\nE seu código de convite é: __icode__\n\nObrigado.",
-    "email-smtp-test-subject": "Email Teste SMTP de Wekan",
-    "email-smtp-test-text": "Você enviou um email com sucesso",
+    "email-invite-register-text": "Caro __user__,\n\n__inviter__ convida você para o quadro Kanban para colaborações.\n\nPor favor, siga o link abaixo:\n__url__ \n\nE seu código de convite é: __icode__\n\nObrigado.",
+    "email-smtp-test-subject": "E-mail de teste via SMTP",
+    "email-smtp-test-text": "Você enviou um e-mail com sucesso",
     "error-invitation-code-not-exist": "O código do convite não existe",
     "error-notAuthorized": "Você não está autorizado à ver esta página.",
     "outgoing-webhooks": "Webhook de saída",
     "outgoingWebhooksPopup-title": "Webhook de saída",
+    "boardCardTitlePopup-title": "Filtro do Título do Cartão",
     "new-outgoing-webhook": "Novo Webhook de saída",
     "no-name": "(Desconhecido)",
-    "Wekan_version": "Versão do Wekan",
     "Node_version": "Versão do Node",
     "OS_Arch": "Arquitetura do SO",
     "OS_Cpus": "Quantidade de CPUS do SO",
@@ -427,20 +517,177 @@
     "OS_Totalmem": "Memória Total do SO",
     "OS_Type": "Tipo do SO",
     "OS_Uptime": "Disponibilidade do SO",
+    "days": "dias",
     "hours": "horas",
     "minutes": "minutos",
     "seconds": "segundos",
+    "show-field-on-card": "Mostrar este campo no cartão",
+    "automatically-field-on-card": "Criar campo automaticamente para todos os cartões",
+    "showLabel-field-on-card": "Mostrar etiqueta do campo no minicartão",
     "yes": "Sim",
     "no": "Não",
     "accounts": "Contas",
-    "accounts-allowEmailChange": "Permitir Mudança de Email",
+    "accounts-allowEmailChange": "Permitir Mudança de e-mail",
+    "accounts-allowUserNameChange": "Permitir alteração de nome de usuário",
     "createdAt": "Criado em",
     "verified": "Verificado",
     "active": "Ativo",
-    "card-received": "Received",
-    "card-received-on": "Received on",
-    "card-end": "End",
-    "card-end-on": "Ends on",
-    "editCardReceivedDatePopup-title": "Change received date",
-    "editCardEndDatePopup-title": "Change end date"
-}
+    "card-received": "Recebido",
+    "card-received-on": "Recebido em",
+    "card-end": "Fim",
+    "card-end-on": "Termina em",
+    "editCardReceivedDatePopup-title": "Modificar data de recebimento",
+    "editCardEndDatePopup-title": "Mudar data de fim",
+    "setCardColorPopup-title": "Definir cor",
+    "setCardActionsColorPopup-title": "Escolha uma cor",
+    "setSwimlaneColorPopup-title": "Escolha uma cor",
+    "setListColorPopup-title": "Escolha uma cor",
+    "assigned-by": "Atribuído por",
+    "requested-by": "Solicitado por",
+    "board-delete-notice": "Excluir é permanente. Você perderá todas as listas, cartões e ações associados nesse quadro.",
+    "delete-board-confirm-popup": "Todas as listas, cartões, etiquetas e atividades serão excluidos e você não poderá recuperar o conteúdo do quadro. Não há como desfazer.",
+    "boardDeletePopup-title": "Excluir quadro?",
+    "delete-board": "Excluir quadro",
+    "default-subtasks-board": "Subtarefas para quadro __board__",
+    "default": "Padrão",
+    "queue": "Fila",
+    "subtask-settings": "Configurações de subtarefas",
+    "boardSubtaskSettingsPopup-title": "Configurações das subtarefas do quadro",
+    "show-subtasks-field": "Cartões podem ter subtarefas",
+    "deposit-subtasks-board": "Inserir subtarefas a este quadro:",
+    "deposit-subtasks-list": "Listas de subtarefas inseridas aqui:",
+    "show-parent-in-minicard": "Mostrar Pai do mini cartão:",
+    "prefix-with-full-path": "Prefixo com caminho completo",
+    "prefix-with-parent": "Prefixo com Pai",
+    "subtext-with-full-path": "Subtexto com caminho completo",
+    "subtext-with-parent": "Subtexto com Pai",
+    "change-card-parent": "Mudar Pai do cartão",
+    "parent-card": "Pai do cartão",
+    "source-board": "Fonte do quadro",
+    "no-parent": "Não mostrar Pai",
+    "activity-added-label": "adicionada etiqueta '%s' para %s",
+    "activity-removed-label": "removida etiqueta '%s' de %s",
+    "activity-delete-attach": "excluido um anexo de %s",
+    "activity-added-label-card": "adicionada etiqueta '%s'",
+    "activity-removed-label-card": "removida etiqueta '%s'",
+    "activity-delete-attach-card": "excluido um anexo",
+    "activity-set-customfield": "definir campo personalizado '%s' para '%s' em %s",
+    "activity-unset-customfield": "redefinir campo personalizado '%s' em %s",
+    "r-rule": "Regra",
+    "r-add-trigger": "Adicionar gatilho",
+    "r-add-action": "Adicionar ação",
+    "r-board-rules": "Quadro de regras",
+    "r-add-rule": "Adicionar regra",
+    "r-view-rule": "Ver regra",
+    "r-delete-rule": "Excluir regra",
+    "r-new-rule-name": "Título da nova regra",
+    "r-no-rules": "Sem regras",
+    "r-when-a-card": "Quando um cartão",
+    "r-is": "é",
+    "r-is-moved": "é movido",
+    "r-added-to": "adicionado à ",
+    "r-removed-from": "Removido de",
+    "r-the-board": "o quadro",
+    "r-list": "lista",
+    "set-filter": "Inserir Filtro",
+    "r-moved-to": "Movido para",
+    "r-moved-from": "Movido de",
+    "r-archived": "Movido para o Arquivo-morto",
+    "r-unarchived": "Restaurado do Arquivo-morto",
+    "r-a-card": "um cartão",
+    "r-when-a-label-is": "Quando uma etiqueta é",
+    "r-when-the-label-is": "Quando a etiqueta é",
+    "r-list-name": "listar nome",
+    "r-when-a-member": "Quando um membro é",
+    "r-when-the-member": "Quando o membro",
+    "r-name": "nome",
+    "r-when-a-attach": "Quando um anexo",
+    "r-when-a-checklist": "Quando a lista de verificação é",
+    "r-when-the-checklist": "Quando a lista de verificação",
+    "r-completed": "Completado",
+    "r-made-incomplete": "Feito incompleto",
+    "r-when-a-item": "Quando o item da lista de verificação é",
+    "r-when-the-item": "Quando o item da lista de verificação",
+    "r-checked": "Marcado",
+    "r-unchecked": "Desmarcado",
+    "r-move-card-to": "Mover cartão para",
+    "r-top-of": "Topo de",
+    "r-bottom-of": "Final de",
+    "r-its-list": "é lista",
+    "r-archive": "Mover para Arquivo-morto",
+    "r-unarchive": "Restaurar do Arquivo-morto",
+    "r-card": "cartão",
+    "r-add": "Novo",
+    "r-remove": "Remover",
+    "r-label": "etiqueta",
+    "r-member": "membro",
+    "r-remove-all": "Remover todos os membros do cartão",
+    "r-set-color": "Definir cor para",
+    "r-checklist": "lista de verificação",
+    "r-check-all": "Marcar todos",
+    "r-uncheck-all": "Desmarcar todos",
+    "r-items-check": "itens da lista de verificação",
+    "r-check": "Marcar",
+    "r-uncheck": "Desmarcar",
+    "r-item": "item",
+    "r-of-checklist": "da lista de verificação",
+    "r-send-email": "Enviar um e-mail",
+    "r-to": "para",
+    "r-subject": "assunto",
+    "r-rule-details": "Detalhes da regra",
+    "r-d-move-to-top-gen": "Mover cartão para o topo da sua lista",
+    "r-d-move-to-top-spec": "Mover cartão para o topo da lista",
+    "r-d-move-to-bottom-gen": "Mover cartão para o final da sua lista",
+    "r-d-move-to-bottom-spec": "Mover cartão para final da lista",
+    "r-d-send-email": "Enviar e-mail",
+    "r-d-send-email-to": "para",
+    "r-d-send-email-subject": "assunto",
+    "r-d-send-email-message": "mensagem",
+    "r-d-archive": "Mover cartão para Arquivo-morto",
+    "r-d-unarchive": "Restaurar cartão do Arquivo-morto",
+    "r-d-add-label": "Adicionar etiqueta",
+    "r-d-remove-label": "Remover etiqueta",
+    "r-create-card": "Criar novo cartão",
+    "r-in-list": "na lista",
+    "r-in-swimlane": "na raia",
+    "r-d-add-member": "Adicionar membro",
+    "r-d-remove-member": "Remover membro",
+    "r-d-remove-all-member": "Remover todos os membros",
+    "r-d-check-all": "Marcar todos os itens de uma lista",
+    "r-d-uncheck-all": "Desmarcar todos os itens de uma lista",
+    "r-d-check-one": "Marcar item",
+    "r-d-uncheck-one": "Desmarcar item",
+    "r-d-check-of-list": "da lista de verificação",
+    "r-d-add-checklist": "Adicionar lista de verificação",
+    "r-d-remove-checklist": "Remover lista de verificação",
+    "r-by": "por",
+    "r-add-checklist": "Adicionar lista de verificação",
+    "r-with-items": "com os itens",
+    "r-items-list": "item1,item2,item3",
+    "r-add-swimlane": "Adicionar raia",
+    "r-swimlane-name": "Nome da raia",
+    "r-board-note": "Nota: deixe o campo vazio para corresponder à todos os valores possíveis",
+    "r-checklist-note": "Nota: itens de Checklists devem ser escritos separados por vírgulas",
+    "r-when-a-card-is-moved": "Quando um cartão é movido de outra lista",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Método de autenticação",
+    "authentication-type": "Tipo de autenticação",
+    "custom-product-name": "Nome Customizado do Produto",
+    "layout": "Layout",
+    "hide-logo": "Esconder Logo",
+    "add-custom-html-after-body-start": "Adicionar HTML Customizado depois do início do <body>",
+    "add-custom-html-before-body-end": "Adicionar HTML Customizado antes do fim do </body>",
+    "error-undefined": "Algo deu errado",
+    "error-ldap-login": "Um erro ocorreu enquanto tentava entrar",
+    "display-authentication-method": "Mostrar Método de Autenticação",
+    "default-authentication-method": "Método de Autenticação Padrão",
+    "duplicate-board": "Duplicar Quadro",
+    "people-number": "O número de pessoas é:",
+    "swimlaneDeletePopup-title": "Excluir Raia?",
+    "swimlane-delete-pop": "Todas as ações serão excluídas da lista de atividades e você não poderá recuperar a raia. Não há como desfazer.",
+    "restore-all": "Restaurar tudo",
+    "delete-all": "Excluir tudo",
+    "loading": "Carregando, aguarde por favor."
+}
\ No newline at end of file
diff --git a/i18n/pt.i18n.json b/i18n/pt.i18n.json
index 98614f9c..e87c381a 100644
--- a/i18n/pt.i18n.json
+++ b/i18n/pt.i18n.json
@@ -1,446 +1,693 @@
 {
     "accept": "Aceitar",
-    "act-activity-notify": "[Wekan] Activity Notification",
-    "act-addAttachment": "attached __attachment__ to __card__",
-    "act-addChecklist": "added checklist __checklist__ to __card__",
-    "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__",
-    "act-addComment": "commented on __card__: __comment__",
-    "act-createBoard": "created __board__",
-    "act-createCard": "added __card__ to __list__",
-    "act-createList": "added __list__ to __board__",
-    "act-addBoardMember": "added __member__ to __board__",
-    "act-archivedBoard": "__board__ moved to Recycle Bin",
-    "act-archivedCard": "__card__ moved to Recycle Bin",
-    "act-archivedList": "__list__ moved to Recycle Bin",
-    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
-    "act-importBoard": "imported __board__",
-    "act-importCard": "imported __card__",
-    "act-importList": "imported __list__",
-    "act-joinMember": "added __member__ to __card__",
-    "act-moveCard": "moved __card__ from __oldList__ to __list__",
-    "act-removeBoardMember": "removed __member__ from __board__",
-    "act-restoredCard": "restored __card__ to __board__",
-    "act-unjoinMember": "removed __member__ from __card__",
-    "act-withBoardTitle": "[Wekan] __board__",
+    "act-activity-notify": "Notificação de Actividade",
+    "act-addAttachment": "adicionado anexo __attachment__ ao cartão __card__ na lista __list__ em pista __swimlane__ no quadro __board__",
+    "act-deleteAttachment": "excluido anexo __attachment__ do cartão __card__ na lista __list__ em pista __swimlane__ no quadro __board__",
+    "act-addSubtask": "adicionada sub-tarefa __subtask__ ao cartão __card__ na lista __list__ em pista __swimlane__ no quadro __board__",
+    "act-addLabel": "Adicionada etiqueta __label__ ao cartão __card__ na lista __list__ em pista __swimlane__ no quadro __board__",
+    "act-addedLabel": "Adicionada etiqueta __label__ ao cartão __card__ na lista __list__ em pista __swimlane__ no quadro __board__",
+    "act-removeLabel": "Removida etiqueta __label__ do cartão __card__ na lista __list__ em pista __swimlane__ no quadro __board__",
+    "act-removedLabel": "Removida etiqueta __label__ do cartão __card__ na lista __list__ em pista __swimlane__ no quadro __board__",
+    "act-addChecklist": "adicionada lista de verificação __checklist__ ao cartão __card__ na lista __list__ em pista __swimlane__ no quadro __board__",
+    "act-addChecklistItem": "adicionado o item  __checklistItem__ a lista de verificação__checklist__ no cartão __card__ na lista __list__ em pista __swimlane__ no quadro __board__",
+    "act-removeChecklist": "emovida a lista de verificação __checklist__ do cartão __card__ na lista __list__ em pista __swimlane__ no quadro __board__",
+    "act-removeChecklistItem": "removido item __checklistItem__ da lista de verificação __checkList__ no cartão __card__ na lista __list__ em pista __swimlane__ no quadro __board__",
+    "act-checkedItem": "marcado __checklistItem__ na lista de verificação __checklist__ no cartão __card__ na lista __list__ em pista __swimlane__ no quadro __board__",
+    "act-uncheckedItem": "desmarcado __checklistItem__ na lista __checklist__ no cartão __card__ na lista __list__ em pista __swimlane__ no quadro __board__",
+    "act-completeChecklist": "completada a lista de verificação __checklist__ no cartão __card__ na lista __list__ em pista __swimlane__ no quadro __board__",
+    "act-uncompleteChecklist": "lista de verificação incompleta __checklist__ no cartão __card__ na lista __list__ em pista __swimlane__ no quadro __board__",
+    "act-addComment": "comentou no cartão __card__: __comment__ na lista __list__ em pista __swimlane__ no quadro __board__",
+    "act-createBoard": "criado quadro __board__",
+    "act-createSwimlane": "criada a pista __swimlane__ no quadro __board__",
+    "act-createCard": "criado cartão __card__ na lista __list__ em pista __swimlane__ no quadro __board__",
+    "act-createCustomField": "criado campo personalizado __customField__ no cartão __card__ na lista __list__ em pista __swimlane__ no quadro __board__",
+    "act-createList": "adicionada lista __list__ ao quadro __board__",
+    "act-addBoardMember": "adicionado membro __member__ ao quadro __board__",
+    "act-archivedBoard": "Quadro __board__ foi Arquivado",
+    "act-archivedCard": "Cartão __card__ na lista __list__ em pista __swimlane__ no quadro __board__ foi Arquivado",
+    "act-archivedList": "Lista __list__ em pista __swimlane__ no quadro __board__ foi Arquivada",
+    "act-archivedSwimlane": "Pista __swimlane__ no quadro __board__ foi Arquivada",
+    "act-importBoard": "importado quadro __board__",
+    "act-importCard": "importado cartão  __card__ para lista __list__ em pista __swimlane__ no quadro __board__",
+    "act-importList": "importada lista __list__ para pista __swimlane__ no quadro __board__",
+    "act-joinMember": "adicionado membro __member__ ao cartão __card__ na lista __list__ em pista __swimlane__ no quadro __board__",
+    "act-moveCard": "movido cartão __card__ do quadro __board__ da pista  __oldSwimlane__ da lista __oldList__ para a pista __swimlane__ na lista __list__",
+    "act-moveCardToOtherBoard": "movido cartão __card__ da lista __oldList__ em pista __oldSwimlane__ no quadro __oldBoard__ para lista __list__ em pista __swimlane__ no quadro __board__",
+    "act-removeBoardMember": "removido membro __member__ do quadro __board__",
+    "act-restoredCard": "restaurado cartão __card__ a lista __list__ em pista __swimlane__ no quadro __board__",
+    "act-unjoinMember": "removido membro __member__ do cartão __card__ na lista __list__ em pista __swimlane__ no quadro __board__",
+    "act-withBoardTitle": "__board__",
     "act-withCardTitle": "[__board__] __card__",
-    "actions": "Actions",
-    "activities": "Activities",
-    "activity": "Activity",
-    "activity-added": "added %s to %s",
-    "activity-archived": "%s moved to Recycle Bin",
-    "activity-attached": "attached %s to %s",
-    "activity-created": "Criado %s",
-    "activity-excluded": "excluded %s from %s",
-    "activity-imported": "imported %s into %s from %s",
-    "activity-imported-board": "imported %s from %s",
-    "activity-joined": "joined %s",
-    "activity-moved": "moved %s from %s to %s",
-    "activity-on": "on %s",
-    "activity-removed": "removed %s from %s",
-    "activity-sent": "sent %s to %s",
-    "activity-unjoined": "unjoined %s",
-    "activity-checklist-added": "added checklist to %s",
-    "activity-checklist-item-added": "added checklist item to '%s' in %s",
-    "add": "Adicionar",
-    "add-attachment": "Add Attachment",
-    "add-board": "Add Board",
-    "add-card": "Add Card",
-    "add-swimlane": "Add Swimlane",
-    "add-checklist": "Add Checklist",
-    "add-checklist-item": "Add an item to checklist",
-    "add-cover": "Add Cover",
-    "add-label": "Add Label",
-    "add-list": "Add List",
-    "add-members": "Add Members",
-    "added": "Added",
+    "actions": "Ações",
+    "activities": "Atividades",
+    "activity": "Atividade",
+    "activity-added": "adicionou %s a %s",
+    "activity-archived": "%s foi Arquivado",
+    "activity-attached": "anexou %s a %s",
+    "activity-created": "criou %s",
+    "activity-customfield-created": "criado campo personalizado %s",
+    "activity-excluded": "excluiu %s de %s",
+    "activity-imported": "importado %s em %s de %s",
+    "activity-imported-board": "importado %s de %s",
+    "activity-joined": "juntou-se a %s",
+    "activity-moved": "moveu %s de %s para %s",
+    "activity-on": "em %s",
+    "activity-removed": "removeu %s de %s",
+    "activity-sent": "enviou %s de %s",
+    "activity-unjoined": "saiu de %s",
+    "activity-subtask-added": "Adicionar sub-tarefa à",
+    "activity-checked-item": "marcado %s na lista de verificação %s de %s",
+    "activity-unchecked-item": "desmarcado %s na lista de verificação %s de %s",
+    "activity-checklist-added": "Adicionada lista de verificação a %s",
+    "activity-checklist-removed": "removida a lista de verificação de %s",
+    "activity-checklist-completed": "completada a lista de verificação __checklist__ no cartão __card__ na lista __list__ em pista __swimlane__ no quadro __board__",
+    "activity-checklist-uncompleted": "não-completada a lista de verificação %s de %s",
+    "activity-checklist-item-added": "adicionado o item de lista de verificação para '%s' em %s",
+    "activity-checklist-item-removed": "removida o item de lista de verificação de '%s' na %s",
+    "add": "Novo",
+    "activity-checked-item-card": "marcado %s na lista de verificação %s",
+    "activity-unchecked-item-card": "desmarcado %s na lista de verificação %s",
+    "activity-checklist-completed-card": "completada a lista de verificação __checklist__ no cartão __card__ na lista __list__ em pista __swimlane__ no quadro __board__",
+    "activity-checklist-uncompleted-card": "não-completada a lista de verificação %s",
+    "add-attachment": "Adicionar Anexos",
+    "add-board": "Adicionar Quadro",
+    "add-card": "Adicionar Cartão",
+    "add-swimlane": "Adicionar Pista",
+    "add-subtask": "Adicionar sub-tarefa",
+    "add-checklist": "Adicionar lista de verificação",
+    "add-checklist-item": "Adicionar um item à lista de verificação",
+    "add-cover": "Adicionar Capa",
+    "add-label": "Adicionar Etiqueta",
+    "add-list": "Adicionar Lista",
+    "add-members": "Adicionar Membros",
+    "added": "Criado",
     "addMemberPopup-title": "Membros",
-    "admin": "Admin",
-    "admin-desc": "Can view and edit cards, remove members, and change settings for the board.",
-    "admin-announcement": "Announcement",
-    "admin-announcement-active": "Active System-Wide Announcement",
-    "admin-announcement-title": "Announcement from Administrator",
-    "all-boards": "All boards",
-    "and-n-other-card": "And __count__ other card",
-    "and-n-other-card_plural": "And __count__ other cards",
-    "apply": "Apply",
-    "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Move to Recycle Bin",
-    "archive-all": "Move All to Recycle Bin",
-    "archive-board": "Move Board to Recycle Bin",
-    "archive-card": "Move Card to Recycle Bin",
-    "archive-list": "Move List to Recycle Bin",
-    "archive-swimlane": "Move Swimlane to Recycle Bin",
-    "archive-selection": "Move selection to Recycle Bin",
-    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
-    "archived-items": "Recycle Bin",
-    "archived-boards": "Boards in Recycle Bin",
-    "restore-board": "Restore Board",
-    "no-archived-boards": "No Boards in Recycle Bin.",
-    "archives": "Recycle Bin",
-    "assign-member": "Assign member",
-    "attached": "attached",
-    "attachment": "Attachment",
-    "attachment-delete-pop": "Deleting an attachment is permanent. There is no undo.",
-    "attachmentDeletePopup-title": "Delete Attachment?",
-    "attachments": "Attachments",
-    "auto-watch": "Automatically watch boards when they are created",
-    "avatar-too-big": "The avatar is too large (70KB max)",
-    "back": "Back",
-    "board-change-color": "Change color",
-    "board-nb-stars": "%s stars",
-    "board-not-found": "Board not found",
-    "board-private-info": "This board will be <strong>private</strong>.",
-    "board-public-info": "This board will be <strong>public</strong>.",
-    "boardChangeColorPopup-title": "Change Board Background",
+    "admin": "Administrador",
+    "admin-desc": "Pode ver e editar cartões, remover membros e alterar configurações do quadro.",
+    "admin-announcement": "Anúncio",
+    "admin-announcement-active": "Anúncio ativo em todo o sistema",
+    "admin-announcement-title": "Anúncio do Administrador",
+    "all-boards": "Todos os quadros",
+    "and-n-other-card": "E __count__ outro cartão",
+    "and-n-other-card_plural": "E __count__ outros cartões",
+    "apply": "Aplicar",
+    "app-is-offline": "A carregar, por favor espere. Atualizar a página causará perda de dados. Se a carga não funcionar, por favor verifique se o servidor não caiu.",
+    "archive": "Mover para o Arquivo",
+    "archive-all": "Mover Tudo para o Arquivo",
+    "archive-board": "Mover Quadro para o Arquivo",
+    "archive-card": "Mover Cartão para o Arquivo",
+    "archive-list": "Mover Lista para o Arquivo",
+    "archive-swimlane": "Mover Pista para Arquivo",
+    "archive-selection": "Mover seleção para o Arquivo",
+    "archiveBoardPopup-title": "Mover Quadro para o Arquivo?",
+    "archived-items": "Arquivo",
+    "archived-boards": "Quadros no Arquivo",
+    "restore-board": "Restaurar Quadro",
+    "no-archived-boards": "Sem Quadros no Arquivo.",
+    "archives": "Arquivos",
+    "template": "Modelo",
+    "templates": "Modelos",
+    "assign-member": "Atribuir Membro",
+    "attached": "anexado",
+    "attachment": "Anexo",
+    "attachment-delete-pop": "Excluir um anexo é permanente. Não será possível recuperá-lo.",
+    "attachmentDeletePopup-title": "Excluir Anexo?",
+    "attachments": "Anexos",
+    "auto-watch": "Veja automaticamente os boards que são criados",
+    "avatar-too-big": "O avatar é muito grande (70KB max)",
+    "back": "Voltar",
+    "board-change-color": "Alterar cor",
+    "board-nb-stars": "%s estrelas",
+    "board-not-found": "Quadro não encontrado",
+    "board-private-info": "Este quadro será <strong>privado</strong>.",
+    "board-public-info": "Este quadro será <strong>público</strong>.",
+    "boardChangeColorPopup-title": "Alterar Tela de Fundo",
     "boardChangeTitlePopup-title": "Renomear Quadro",
-    "boardChangeVisibilityPopup-title": "Change Visibility",
-    "boardChangeWatchPopup-title": "Change Watch",
-    "boardMenuPopup-title": "Board Menu",
-    "boards": "Boards",
-    "board-view": "Board View",
-    "board-view-swimlanes": "Swimlanes",
-    "board-view-lists": "Lists",
-    "bucket-example": "Like “Bucket List” for example",
-    "cancel": "Cancel",
-    "card-archived": "This card is moved to Recycle Bin.",
-    "card-comments-title": "This card has %s comment.",
-    "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
-    "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
-    "card-due": "Due",
-    "card-due-on": "Due on",
-    "card-spent": "Spent Time",
-    "card-edit-attachments": "Edit attachments",
-    "card-edit-labels": "Edit labels",
-    "card-edit-members": "Edit members",
-    "card-labels-title": "Change the labels for the card.",
-    "card-members-title": "Add or remove members of the board from the card.",
-    "card-start": "Start",
-    "card-start-on": "Starts on",
-    "cardAttachmentsPopup-title": "Attach From",
-    "cardDeletePopup-title": "Delete Card?",
-    "cardDetailsActionsPopup-title": "Card Actions",
+    "boardChangeVisibilityPopup-title": "Alterar Visibilidade",
+    "boardChangeWatchPopup-title": "Alterar observação",
+    "boardMenuPopup-title": "Configurações do quadro",
+    "boards": "Quadros",
+    "board-view": "Visão de quadro",
+    "board-view-cal": "Calendário",
+    "board-view-swimlanes": "Pistas",
+    "board-view-lists": "Listas",
+    "bucket-example": "\"Bucket List\", por exemplo",
+    "cancel": "Cancelar",
+    "card-archived": "Este cartão está Arquivado.",
+    "board-archived": "Este quadro está Arquivado.",
+    "card-comments-title": "Este cartão possui %s comentários.",
+    "card-delete-notice": "A exclusão será permanente. Perderá todas as ações associadas a este cartão.",
+    "card-delete-pop": "Todas as ações serão excluídas da lista de Atividades e não poderá reabrir o cartão. Não há como desfazer.",
+    "card-delete-suggest-archive": "Pode mover um cartão para o Arquivo para removê-lo do quadro e preservar a atividade.",
+    "card-due": "Data fim",
+    "card-due-on": "Finaliza em",
+    "card-spent": "Tempo Gasto",
+    "card-edit-attachments": "Editar anexos",
+    "card-edit-custom-fields": "Editar campos personalizados",
+    "card-edit-labels": "Editar etiquetas",
+    "card-edit-members": "Editar membros",
+    "card-labels-title": "Alterar etiquetas do cartão.",
+    "card-members-title": "Acrescentar ou remover membros do quadro deste cartão.",
+    "card-start": "Data início",
+    "card-start-on": "Começa em",
+    "cardAttachmentsPopup-title": "Anexar a partir de",
+    "cardCustomField-datePopup-title": "Mudar data",
+    "cardCustomFieldsPopup-title": "Editar campos personalizados",
+    "cardDeletePopup-title": "Excluir Cartão?",
+    "cardDetailsActionsPopup-title": "Ações do cartão",
     "cardLabelsPopup-title": "Etiquetas",
     "cardMembersPopup-title": "Membros",
     "cardMorePopup-title": "Mais",
+    "cardTemplatePopup-title": "Criar Modelo",
     "cards": "Cartões",
     "cards-count": "Cartões",
+    "casSignIn": "Entrar com CAS",
+    "cardType-card": "Cartão",
+    "cardType-linkedCard": "Cartão ligado",
+    "cardType-linkedBoard": "Quadro ligado",
     "change": "Alterar",
-    "change-avatar": "Change Avatar",
-    "change-password": "Change Password",
-    "change-permissions": "Change permissions",
-    "change-settings": "Change Settings",
-    "changeAvatarPopup-title": "Change Avatar",
-    "changeLanguagePopup-title": "Change Language",
-    "changePasswordPopup-title": "Change Password",
-    "changePermissionsPopup-title": "Change Permissions",
-    "changeSettingsPopup-title": "Change Settings",
-    "checklists": "Checklists",
-    "click-to-star": "Click to star this board.",
-    "click-to-unstar": "Click to unstar this board.",
-    "clipboard": "Clipboard or drag & drop",
-    "close": "Close",
-    "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
-    "color-black": "black",
-    "color-blue": "blue",
-    "color-green": "green",
-    "color-lime": "lime",
-    "color-orange": "orange",
-    "color-pink": "pink",
-    "color-purple": "purple",
-    "color-red": "red",
-    "color-sky": "sky",
-    "color-yellow": "yellow",
+    "change-avatar": "Alterar Avatar",
+    "change-password": "Alterar Senha",
+    "change-permissions": "Alterar permissões",
+    "change-settings": "Altera configurações",
+    "changeAvatarPopup-title": "Alterar Avatar",
+    "changeLanguagePopup-title": "Alterar Idioma",
+    "changePasswordPopup-title": "Alterar Senha",
+    "changePermissionsPopup-title": "Alterar Permissões",
+    "changeSettingsPopup-title": "Altera configurações",
+    "subtasks": "Sub-tarefas",
+    "checklists": "Listas de verificação",
+    "click-to-star": "Marcar quadro como favorito.",
+    "click-to-unstar": "Remover quadro dos favoritos.",
+    "clipboard": "Área de Transferência ou arraste e solte",
+    "close": "Fechar",
+    "close-board": "Fechar Quadro",
+    "close-board-pop": "Poderá restaurar o quadro clicando no botão “Arquivo” a partir do cabeçalho do Início.",
+    "color-black": "preto",
+    "color-blue": "azul",
+    "color-crimson": "carmesim",
+    "color-darkgreen": "verde escuro",
+    "color-gold": "dourado",
+    "color-gray": "cinza",
+    "color-green": "verde",
+    "color-indigo": "azul",
+    "color-lime": "verde limão",
+    "color-magenta": "magenta",
+    "color-mistyrose": "rosa claro",
+    "color-navy": "azul marinho",
+    "color-orange": "laranja",
+    "color-paleturquoise": "azul ciano",
+    "color-peachpuff": "pêssego",
+    "color-pink": "cor-de-rosa",
+    "color-plum": "ameixa",
+    "color-purple": "roxo",
+    "color-red": "vermelho",
+    "color-saddlebrown": "marrom",
+    "color-silver": "prateado",
+    "color-sky": "azul-celeste",
+    "color-slateblue": "azul ardósia",
+    "color-white": "branco",
+    "color-yellow": "amarelo",
+    "unset-color": "Remover",
     "comment": "Comentário",
-    "comment-placeholder": "Write Comment",
-    "comment-only": "Comment only",
-    "comment-only-desc": "Can comment on cards only.",
+    "comment-placeholder": "Escrever Comentário",
+    "comment-only": "Somente comentários",
+    "comment-only-desc": "Pode comentar apenas em cartões.",
+    "no-comments": "Sem comentários",
+    "no-comments-desc": "Sem visualização de comentários e atividades.",
     "computer": "Computador",
-    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist",
-    "copy-card-link-to-clipboard": "Copy card link to clipboard",
-    "copyCardPopup-title": "Copy Card",
-    "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
-    "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
-    "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"First card title\", \"description\":\"First card description\"}, {\"title\":\"Second card title\",\"description\":\"Second card description\"},{\"title\":\"Last card title\",\"description\":\"Last card description\"} ]",
-    "create": "Create",
-    "createBoardPopup-title": "Create Board",
-    "chooseBoardSourcePopup-title": "Import board",
-    "createLabelPopup-title": "Create Label",
-    "current": "current",
-    "date": "Date",
-    "decline": "Decline",
-    "default-avatar": "Default avatar",
-    "delete": "Delete",
-    "deleteLabelPopup-title": "Delete Label?",
-    "description": "Description",
-    "disambiguateMultiLabelPopup-title": "Disambiguate Label Action",
-    "disambiguateMultiMemberPopup-title": "Disambiguate Member Action",
-    "discard": "Discard",
-    "done": "Done",
-    "download": "Download",
-    "edit": "Edit",
-    "edit-avatar": "Change Avatar",
-    "edit-profile": "Edit Profile",
-    "edit-wip-limit": "Edit WIP Limit",
-    "soft-wip-limit": "Soft WIP Limit",
-    "editCardStartDatePopup-title": "Change start date",
-    "editCardDueDatePopup-title": "Change due date",
-    "editCardSpentTimePopup-title": "Change spent time",
-    "editLabelPopup-title": "Change Label",
-    "editNotificationPopup-title": "Edit Notification",
-    "editProfilePopup-title": "Edit Profile",
-    "email": "Email",
-    "email-enrollAccount-subject": "An account created for you on __siteName__",
-    "email-enrollAccount-text": "Hello __user__,\n\nTo start using the service, simply click the link below.\n\n__url__\n\nThanks.",
-    "email-fail": "Sending email failed",
-    "email-fail-text": "Error trying to send email",
-    "email-invalid": "Invalid email",
-    "email-invite": "Invite via Email",
-    "email-invite-subject": "__inviter__ sent you an invitation",
-    "email-invite-text": "Dear __user__,\n\n__inviter__ invites you to join board \"__board__\" for collaborations.\n\nPlease follow the link below:\n\n__url__\n\nThanks.",
-    "email-resetPassword-subject": "Reset your password on __siteName__",
-    "email-resetPassword-text": "Hello __user__,\n\nTo reset your password, simply click the link below.\n\n__url__\n\nThanks.",
-    "email-sent": "Email sent",
-    "email-verifyEmail-subject": "Verify your email address on __siteName__",
-    "email-verifyEmail-text": "Hello __user__,\n\nTo verify your account email, simply click the link below.\n\n__url__\n\nThanks.",
-    "enable-wip-limit": "Enable WIP Limit",
-    "error-board-doesNotExist": "This board does not exist",
-    "error-board-notAdmin": "You need to be admin of this board to do that",
-    "error-board-notAMember": "You need to be a member of this board to do that",
-    "error-json-malformed": "Your text is not valid JSON",
-    "error-json-schema": "Your JSON data does not include the proper information in the correct format",
-    "error-list-doesNotExist": "This list does not exist",
-    "error-user-doesNotExist": "This user does not exist",
-    "error-user-notAllowSelf": "You can not invite yourself",
-    "error-user-notCreated": "This user is not created",
-    "error-username-taken": "This username is already taken",
-    "error-email-taken": "Email has already been taken",
-    "export-board": "Export board",
-    "filter": "Filter",
-    "filter-cards": "Filter Cards",
-    "filter-clear": "Clear filter",
-    "filter-no-label": "No label",
-    "filter-no-member": "No member",
-    "filter-on": "Filter is on",
-    "filter-on-desc": "You are filtering cards on this board. Click here to edit filter.",
-    "filter-to-selection": "Filter to selection",
-    "fullname": "Full Name",
-    "header-logo-title": "Go back to your boards page.",
-    "hide-system-messages": "Hide system messages",
-    "headerBarCreateBoardPopup-title": "Create Board",
-    "home": "Home",
-    "import": "Import",
-    "import-board": "import board",
-    "import-board-c": "Import board",
-    "import-board-title-trello": "Import board from Trello",
-    "import-board-title-wekan": "Import board from Wekan",
-    "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
-    "from-trello": "From Trello",
-    "from-wekan": "From Wekan",
-    "import-board-instruction-trello": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text.",
-    "import-board-instruction-wekan": "In your Wekan board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
-    "import-json-placeholder": "Paste your valid JSON data here",
-    "import-map-members": "Map members",
-    "import-members-map": "Your imported board has some members. Please map the members you want to import to Wekan users",
-    "import-show-user-mapping": "Review members mapping",
-    "import-user-select": "Pick the Wekan user you want to use as this member",
-    "importMapMembersAddPopup-title": "Select Wekan member",
-    "info": "Version",
-    "initials": "Initials",
-    "invalid-date": "Invalid date",
-    "invalid-time": "Invalid time",
-    "invalid-user": "Invalid user",
-    "joined": "joined",
-    "just-invited": "You are just invited to this board",
-    "keyboard-shortcuts": "Keyboard shortcuts",
-    "label-create": "Create Label",
-    "label-default": "%s label (default)",
-    "label-delete-pop": "There is no undo. This will remove this label from all cards and destroy its history.",
+    "confirm-subtask-delete-dialog": "Tem certeza que deseja excluir a sub-tarefa?",
+    "confirm-checklist-delete-dialog": "Tem certeza que quer excluir a lista de verificação?",
+    "copy-card-link-to-clipboard": "Copiar link do cartão para a área de transferência",
+    "linkCardPopup-title": "Ligar Cartão",
+    "searchElementPopup-title": "Buscar",
+    "copyCardPopup-title": "Copiar o cartão",
+    "copyChecklistToManyCardsPopup-title": "Copiar modelo de lista de verificação para vários cartões",
+    "copyChecklistToManyCardsPopup-instructions": "Títulos e descrições do cartão de destino neste formato JSON",
+    "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"Título do primeiro cartão\", \"description\":\"Descrição do primeiro cartão\"}, {\"title\":\"Título do segundo cartão\",\"description\":\"Descrição do segundo cartão\"},{\"title\":\"Título do último cartão\",\"description\":\"Descrição do último cartão\"} ]",
+    "create": "Criar",
+    "createBoardPopup-title": "Criar Quadro",
+    "chooseBoardSourcePopup-title": "Importar quadro",
+    "createLabelPopup-title": "Criar Etiqueta",
+    "createCustomField": "Criar campo",
+    "createCustomFieldPopup-title": "Criar campo",
+    "current": "atual",
+    "custom-field-delete-pop": "Não existe desfazer. Isso irá excluir o campo personalizado de todos os cartões e destruir seu histórico",
+    "custom-field-checkbox": "Caixa de seleção",
+    "custom-field-date": "Data",
+    "custom-field-dropdown": "Lista suspensa",
+    "custom-field-dropdown-none": "(nada)",
+    "custom-field-dropdown-options": "Lista de opções",
+    "custom-field-dropdown-options-placeholder": "Pressione enter para adicionar mais opções",
+    "custom-field-dropdown-unknown": "(desconhecido)",
+    "custom-field-number": "Número",
+    "custom-field-text": "Texto",
+    "custom-fields": "Campos personalizados",
+    "date": "Data",
+    "decline": "Rejeitar",
+    "default-avatar": "Avatar padrão",
+    "delete": "Excluir",
+    "deleteCustomFieldPopup-title": "Excluir campo personalizado?",
+    "deleteLabelPopup-title": "Excluir Etiqueta?",
+    "description": "Descrição",
+    "disambiguateMultiLabelPopup-title": "Desambiguar ações de etiquetas",
+    "disambiguateMultiMemberPopup-title": "Desambiguar ações de membros",
+    "discard": "Descartar",
+    "done": "Feito",
+    "download": "Baixar",
+    "edit": "Editar",
+    "edit-avatar": "Alterar Avatar",
+    "edit-profile": "Editar Perfil",
+    "edit-wip-limit": "Editar Limite WIP",
+    "soft-wip-limit": "Limite de WIP",
+    "editCardStartDatePopup-title": "Altera data de início",
+    "editCardDueDatePopup-title": "Altera data fim",
+    "editCustomFieldPopup-title": "Editar campo",
+    "editCardSpentTimePopup-title": "Editar tempo gasto",
+    "editLabelPopup-title": "Alterar Etiqueta",
+    "editNotificationPopup-title": "Editar Notificações",
+    "editProfilePopup-title": "Editar Perfil",
+    "email": "E-mail",
+    "email-enrollAccount-subject": "Uma conta foi criada para si em __siteName__",
+    "email-enrollAccount-text": "Olá __user__\npara começar a utilizar o serviço basta clicar no link abaixo.\n__url__\nMuito Obrigado.",
+    "email-fail": "Falhou ao enviar e-mail",
+    "email-fail-text": "Erro ao tentar enviar e-mail",
+    "email-invalid": "E-mail inválido",
+    "email-invite": "Convite via E-mail",
+    "email-invite-subject": "__inviter__ lhe enviou um convite",
+    "email-invite-text": "Caro __user__\n__inviter__ convidou-o para se juntar ao quadro \"__board__\" como colaborador.\nPor favor prossiga através do link abaixo:\n__url__\nMuito obrigado.",
+    "email-resetPassword-subject": "Redefina sua senha em __siteName__",
+    "email-resetPassword-text": "Olá __user__\nPara redefinir sua senha, por favor clique no link abaixo.\n__url__\nMuito obrigado.",
+    "email-sent": "E-mail enviado",
+    "email-verifyEmail-subject": "Verifique seu endereço de e-mail em __siteName__",
+    "email-verifyEmail-text": "Olá __user__\nPara verificar sua conta de e-mail, clique no link abaixo.\n__url__\nObrigado.",
+    "enable-wip-limit": "Ativar Limite WIP",
+    "error-board-doesNotExist": "Este quadro não existe",
+    "error-board-notAdmin": "Precisa ser administrador desse quadro para fazer isto",
+    "error-board-notAMember": "Precisa ser um membro desse quadro para fazer isto",
+    "error-json-malformed": "Seu texto não é um JSON válido",
+    "error-json-schema": "Seu JSON não inclui as informações no formato correto",
+    "error-list-doesNotExist": "Esta lista não existe",
+    "error-user-doesNotExist": "Este utilizador não existe",
+    "error-user-notAllowSelf": "Não pode convidar a si mesmo",
+    "error-user-notCreated": "Este utilizador não foi criado",
+    "error-username-taken": "Esse nome de utilizador já existe",
+    "error-email-taken": "E-mail já está em uso",
+    "export-board": "Exportar quadro",
+    "filter": "Filtrar",
+    "filter-cards": "Filtrar Cartões",
+    "filter-clear": "Limpar filtro",
+    "filter-no-label": "Sem etiquetas",
+    "filter-no-member": "Sem membros",
+    "filter-no-custom-fields": "Não há campos personalizados",
+    "filter-on": "Filtro está ativo",
+    "filter-on-desc": "Está a filtrar cartões neste quadro. Clique aqui para editar o filtro.",
+    "filter-to-selection": "Filtrar esta seleção",
+    "advanced-filter-label": "Filtro avançado",
+    "advanced-filter-description": "Filtros avançados permitem escrever uma \"string\" contendo os seguintes operadores: == != <= >= && || (). Um espaço é utilizado como separador entre os operadores. Pode filtrar para todos os campos personalizados escrevendo os nomes e valores. Exemplo: Campo1 == Valor1. Nota^Se o campo ou valor tiver espaços precisa encapsular eles em citações sozinhas. Exemplo: Campo1 == Eu\\sou. Também pode combinar múltiplas condições. Exemplo: C1 == V1 || C1 == V2. Normalmente todos os operadores são interpretados da esquerda para direita. Pode alterar a ordem colocando parênteses - como na expressão matemática. Exemplo: C1 == V1 && (C2 == V2 || C2 == V3). Também pode pesquisar campos de texto usando regex: C1 == /Tes.*/i",
+    "fullname": "Nome Completo",
+    "header-logo-title": "Voltar para a lista de quadros.",
+    "hide-system-messages": "Esconde mensagens de sistema",
+    "headerBarCreateBoardPopup-title": "Criar Quadro",
+    "home": "Início",
+    "import": "Importar",
+    "link": "Ligação",
+    "import-board": "importar quadro",
+    "import-board-c": "Importar quadro",
+    "import-board-title-trello": "Importar quadro do Trello",
+    "import-board-title-wekan": "Importar quadro a partir de exportação prévia",
+    "import-sandstorm-backup-warning": "Não exclua os dados importados do quadro original exportado ou do Trello antes de verificar se esse item fecha e abre novamente, ou se receber o erro Quadro não encontrado, que significa perda de dados.",
+    "import-sandstorm-warning": "O quadro importado irá excluir todos os dados existentes no quadro e irá sobrescrever com o quadro importado.",
+    "from-trello": "Do Trello",
+    "from-wekan": "A partir de exportação prévia",
+    "import-board-instruction-trello": "No seu quadro do Trello, vá em 'Menu', depois em 'Mais', 'Imprimir e Exportar', 'Exportar JSON', então copie o texto emitido",
+    "import-board-instruction-wekan": "Em seu quadro vá para 'Menu', depois 'Exportar quadro' e copie o texto no arquivo baixado.",
+    "import-board-instruction-about-errors": "Se receber erros ao importar o quadro, às vezes a importação ainda funciona e o quadro está na página Todos os Quadros.",
+    "import-json-placeholder": "Cole seus dados JSON válidos aqui",
+    "import-map-members": "Mapear membros",
+    "import-members-map": "Seu quadro importado possui alguns membros. Por favor, mapeie os membros que deseja importar para seus utilizadors",
+    "import-show-user-mapping": "Revisar mapeamento dos membros",
+    "import-user-select": "Escolha um utilizador existente que deseja usar como esse membro",
+    "importMapMembersAddPopup-title": "Selecione membro",
+    "info": "Versão",
+    "initials": "Iniciais",
+    "invalid-date": "Data inválida",
+    "invalid-time": "Hora inválida",
+    "invalid-user": "Utilizador inválido",
+    "joined": "juntou-se",
+    "just-invited": "Já foi convidado para este quadro",
+    "keyboard-shortcuts": "Atalhos do teclado",
+    "label-create": "Criar Etiqueta",
+    "label-default": "%s etiqueta (padrão)",
+    "label-delete-pop": "Não será possível recuperá-la. A etiqueta será excluída de todos os cartões e seu histórico será destruído.",
     "labels": "Etiquetas",
-    "language": "Language",
-    "last-admin-desc": "You can’t change roles because there must be at least one admin.",
-    "leave-board": "Leave Board",
-    "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
-    "leaveBoardPopup-title": "Leave Board ?",
-    "link-card": "Link to this card",
-    "list-archive-cards": "Move all cards in this list to Recycle Bin",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
-    "list-move-cards": "Move all cards in this list",
-    "list-select-cards": "Select all cards in this list",
-    "listActionPopup-title": "List Actions",
-    "swimlaneActionPopup-title": "Swimlane Actions",
-    "listImportCardPopup-title": "Import a Trello card",
+    "language": "Idioma",
+    "last-admin-desc": "Não pode alterar funções porque deve existir pelo menos um administrador.",
+    "leave-board": "Sair do Quadro",
+    "leave-board-pop": "Tem a certeza de que pretende sair de __boardTitle__? Será removido de todos os cartões neste quadro.",
+    "leaveBoardPopup-title": "Sair do Quadro?",
+    "link-card": "Vincular a este cartão",
+    "list-archive-cards": "Move todos os cartões nesta lista para o Arquivo",
+    "list-archive-cards-pop": "Isto removerá todos os cartões desta lista para o quadro. Para visualizar cartões arquivados e trazê-los de volta para o quadro, clique em “Menu” > “Arquivo”.",
+    "list-move-cards": "Mover todos os cartões desta lista",
+    "list-select-cards": "Selecionar todos os cartões nesta lista",
+    "set-color-list": "Definir Cor",
+    "listActionPopup-title": "Listar Ações",
+    "swimlaneActionPopup-title": "Ações de Pista",
+    "swimlaneAddPopup-title": "Adicionar uma Pista abaixo",
+    "listImportCardPopup-title": "Importe um cartão do Trello",
     "listMorePopup-title": "Mais",
-    "link-list": "Link to this list",
-    "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
-    "lists": "Lists",
-    "swimlanes": "Swimlanes",
-    "log-out": "Log Out",
-    "log-in": "Log In",
-    "loginPopup-title": "Log In",
-    "memberMenuPopup-title": "Member Settings",
+    "link-list": "Vincular a esta lista",
+    "list-delete-pop": "Todas as ações serão excluídas da lista de atividades e não poderá recuperar a lista. Não há como desfazer.",
+    "list-delete-suggest-archive": "Pode mover uma lista para o Arquivo para removê-la do quadro e preservar a atividade.",
+    "lists": "Listas",
+    "swimlanes": "Pistas",
+    "log-out": "Sair",
+    "log-in": "Entrar",
+    "loginPopup-title": "Entrar",
+    "memberMenuPopup-title": "Configuração de Membros",
     "members": "Membros",
     "menu": "Menu",
-    "move-selection": "Move selection",
-    "moveCardPopup-title": "Move Card",
-    "moveCardToBottom-title": "Move to Bottom",
-    "moveCardToTop-title": "Move to Top",
-    "moveSelectionPopup-title": "Move selection",
-    "multi-selection": "Multi-Selection",
-    "multi-selection-on": "Multi-Selection is on",
-    "muted": "Muted",
-    "muted-info": "You will never be notified of any changes in this board",
-    "my-boards": "My Boards",
+    "move-selection": "Mover seleção",
+    "moveCardPopup-title": "Mover Cartão",
+    "moveCardToBottom-title": "Mover para o final",
+    "moveCardToTop-title": "Mover para o topo",
+    "moveSelectionPopup-title": "Mover seleção",
+    "multi-selection": "Multi-Seleção",
+    "multi-selection-on": "Multi-seleção está ativo",
+    "muted": "Silenciar",
+    "muted-info": "Nunca receberá qualquer notificação desse quadro",
+    "my-boards": "Meus Quadros",
     "name": "Nome",
-    "no-archived-cards": "No cards in Recycle Bin.",
-    "no-archived-lists": "No lists in Recycle Bin.",
-    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
-    "no-results": "Nenhum resultado",
+    "no-archived-cards": "Sem cartões no Arquivo.",
+    "no-archived-lists": "Sem listas no Arquivo.",
+    "no-archived-swimlanes": "Sem pistas no Arquivo.",
+    "no-results": "Nenhum resultado.",
     "normal": "Normal",
-    "normal-desc": "Can view and edit cards. Can't change settings.",
-    "not-accepted-yet": "Invitation not accepted yet",
-    "notify-participate": "Receive updates to any cards you participate as creater or member",
-    "notify-watch": "Receive updates to any boards, lists, or cards you’re watching",
-    "optional": "optional",
-    "or": "or",
-    "page-maybe-private": "This page may be private. You may be able to view it by <a href='%s'>logging in</a>.",
-    "page-not-found": "Page not found.",
-    "password": "Password",
-    "paste-or-dragdrop": "to paste, or drag & drop image file to it (image only)",
-    "participating": "Participating",
-    "preview": "Preview",
-    "previewAttachedImagePopup-title": "Preview",
-    "previewClipboardImagePopup-title": "Preview",
-    "private": "Private",
-    "private-desc": "This board is private. Only people added to the board can view and edit it.",
-    "profile": "Profile",
-    "public": "Public",
-    "public-desc": "This board is public. It's visible to anyone with the link and will show up in search engines like Google. Only people added to the board can edit.",
-    "quick-access-description": "Star a board to add a shortcut in this bar.",
-    "remove-cover": "Remove Cover",
-    "remove-from-board": "Remove from Board",
-    "remove-label": "Remove Label",
-    "listDeletePopup-title": "Delete List ?",
-    "remove-member": "Remove Member",
-    "remove-member-from-card": "Remove from Card",
-    "remove-member-pop": "Remove __name__ (__username__) from __boardTitle__? The member will be removed from all cards on this board. They will receive a notification.",
+    "normal-desc": "Pode ver e editar cartões. Não pode alterar configurações.",
+    "not-accepted-yet": "Convite ainda não aceito",
+    "notify-participate": "Receber atualizações de qualquer cartão que criar ou participar como membro",
+    "notify-watch": "Receber atualizações de qualquer quadro, lista ou cartões que estiver a observar",
+    "optional": "opcional",
+    "or": "ou",
+    "page-maybe-private": "Esta página pode ser privada. Poderá vê-la se estiver <a href='%s'>logado</a>.",
+    "page-not-found": "Página não encontrada.",
+    "password": "Senha",
+    "paste-or-dragdrop": "para colar, ou arraste e solte o arquivo da imagem para cá (somente imagens)",
+    "participating": "Participando",
+    "preview": "Pré-visualizar",
+    "previewAttachedImagePopup-title": "Pré-visualizar",
+    "previewClipboardImagePopup-title": "Pré-visualizar",
+    "private": "Privado",
+    "private-desc": "Este quadro é privado. Apenas seus membros podem acessar e editá-lo.",
+    "profile": "Perfil",
+    "public": "Público",
+    "public-desc": "Este quadro é público. Ele é visível a qualquer pessoa com o link e será exibido em motores de busca como o Google. Apenas os seus membros podem editá-lo.",
+    "quick-access-description": "Clique na estrela para adicionar um atalho nesta barra.",
+    "remove-cover": "Remover Capa",
+    "remove-from-board": "Remover do Quadro",
+    "remove-label": "Remover Etiqueta",
+    "listDeletePopup-title": "Excluir Lista?",
+    "remove-member": "Remover Membro",
+    "remove-member-from-card": "Remover do Cartão",
+    "remove-member-pop": "Remover __name__ (__username__) de __boardTitle__? O membro será removido de todos os cartões neste quadro e será notificado.",
     "removeMemberPopup-title": "Remover Membro?",
     "rename": "Renomear",
     "rename-board": "Renomear Quadro",
-    "restore": "Restore",
-    "save": "Save",
-    "search": "Search",
-    "search-cards": "Search from card titles and descriptions on this board",
-    "search-example": "Text to search for?",
-    "select-color": "Select Color",
-    "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
-    "setWipLimitPopup-title": "Set WIP Limit",
-    "shortcut-assign-self": "Assign yourself to current card",
-    "shortcut-autocomplete-emoji": "Autocomplete emoji",
-    "shortcut-autocomplete-members": "Autocomplete members",
-    "shortcut-clear-filters": "Clear all filters",
-    "shortcut-close-dialog": "Close Dialog",
-    "shortcut-filter-my-cards": "Filter my cards",
-    "shortcut-show-shortcuts": "Bring up this shortcuts list",
-    "shortcut-toggle-filterbar": "Toggle Filter Sidebar",
-    "shortcut-toggle-sidebar": "Toggle Board Sidebar",
-    "show-cards-minimum-count": "Show cards count if list contains more than",
-    "sidebar-open": "Open Sidebar",
-    "sidebar-close": "Close Sidebar",
-    "signupPopup-title": "Create an Account",
-    "star-board-title": "Click to star this board. It will show up at top of your boards list.",
-    "starred-boards": "Starred Boards",
-    "starred-boards-description": "Starred boards show up at the top of your boards list.",
-    "subscribe": "Subscribe",
-    "team": "Team",
-    "this-board": "this board",
-    "this-card": "this card",
-    "spent-time-hours": "Spent time (hours)",
-    "overtime-hours": "Overtime (hours)",
-    "overtime": "Overtime",
-    "has-overtime-cards": "Has overtime cards",
-    "has-spenttime-cards": "Has spent time cards",
-    "time": "Time",
-    "title": "Title",
-    "tracking": "Tracking",
-    "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
-    "unassign-member": "Unassign member",
-    "unsaved-description": "You have an unsaved description.",
-    "unwatch": "Unwatch",
-    "upload": "Upload",
-    "upload-avatar": "Upload an avatar",
-    "uploaded-avatar": "Uploaded an avatar",
-    "username": "Username",
-    "view-it": "View it",
-    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
-    "watch": "Watch",
-    "watching": "Watching",
-    "watching-info": "You will be notified of any change in this board",
-    "welcome-board": "Welcome Board",
-    "welcome-swimlane": "Milestone 1",
-    "welcome-list1": "Basics",
-    "welcome-list2": "Advanced",
-    "what-to-do": "What do you want to do?",
-    "wipLimitErrorPopup-title": "Invalid WIP Limit",
-    "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
-    "wipLimitErrorPopup-dialog-pt2": "Please move some tasks out of this list, or set a higher WIP limit.",
-    "admin-panel": "Admin Panel",
-    "settings": "Settings",
-    "people": "People",
-    "registration": "Registration",
-    "disable-self-registration": "Disable Self-Registration",
-    "invite": "Invite",
-    "invite-people": "Invite People",
-    "to-boards": "To board(s)",
-    "email-addresses": "Email Addresses",
-    "smtp-host-description": "The address of the SMTP server that handles your emails.",
-    "smtp-port-description": "The port your SMTP server uses for outgoing emails.",
-    "smtp-tls-description": "Enable TLS support for SMTP server",
-    "smtp-host": "SMTP Host",
-    "smtp-port": "SMTP Port",
-    "smtp-username": "Username",
-    "smtp-password": "Password",
-    "smtp-tls": "TLS support",
-    "send-from": "From",
-    "send-smtp-test": "Send a test email to yourself",
-    "invitation-code": "Invitation Code",
-    "email-invite-register-subject": "__inviter__ sent you an invitation",
-    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to Wekan for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
-    "email-smtp-test-subject": "SMTP Test Email From Wekan",
-    "email-smtp-test-text": "You have successfully sent an email",
-    "error-invitation-code-not-exist": "Invitation code doesn't exist",
-    "error-notAuthorized": "You are not authorized to view this page.",
-    "outgoing-webhooks": "Outgoing Webhooks",
-    "outgoingWebhooksPopup-title": "Outgoing Webhooks",
-    "new-outgoing-webhook": "New Outgoing Webhook",
-    "no-name": "(Unknown)",
-    "Wekan_version": "Wekan version",
-    "Node_version": "Node version",
-    "OS_Arch": "OS Arch",
-    "OS_Cpus": "OS CPU Count",
-    "OS_Freemem": "OS Free Memory",
-    "OS_Loadavg": "OS Load Average",
-    "OS_Platform": "OS Platform",
-    "OS_Release": "OS Release",
-    "OS_Totalmem": "OS Total Memory",
-    "OS_Type": "OS Type",
-    "OS_Uptime": "OS Uptime",
-    "hours": "hours",
-    "minutes": "minutes",
-    "seconds": "seconds",
-    "yes": "Yes",
+    "restore": "Restaurar",
+    "save": "Salvar",
+    "search": "Buscar",
+    "rules": "Regras",
+    "search-cards": "Pesquisa em títulos e descrições de cartões neste quadro",
+    "search-example": "Texto para procurar",
+    "select-color": "Selecionar Cor",
+    "set-wip-limit-value": "Defina um limite máximo para o número de tarefas nesta lista",
+    "setWipLimitPopup-title": "Definir Limite WIP",
+    "shortcut-assign-self": "Atribuir a si o cartão atual",
+    "shortcut-autocomplete-emoji": "Autocompletar emoji",
+    "shortcut-autocomplete-members": "Preenchimento automático de membros",
+    "shortcut-clear-filters": "Limpar todos filtros",
+    "shortcut-close-dialog": "Fechar dialogo",
+    "shortcut-filter-my-cards": "Filtrar meus cartões",
+    "shortcut-show-shortcuts": "Mostrar lista de atalhos",
+    "shortcut-toggle-filterbar": "Alternar barra de filtro",
+    "shortcut-toggle-sidebar": "Fechar barra lateral.",
+    "show-cards-minimum-count": "Mostrar contador de cartões se a lista tiver mais de",
+    "sidebar-open": "Abrir barra lateral",
+    "sidebar-close": "Fechar barra lateral",
+    "signupPopup-title": "Criar uma Conta",
+    "star-board-title": "Clique para marcar este quadro como favorito. Ele aparecerá no topo na lista dos seus quadros.",
+    "starred-boards": "Quadros Favoritos",
+    "starred-boards-description": "Quadros favoritos aparecem no topo da lista dos seus quadros.",
+    "subscribe": "Acompanhar",
+    "team": "Equipe",
+    "this-board": "este quadro",
+    "this-card": "este cartão",
+    "spent-time-hours": "Tempo gasto (Horas)",
+    "overtime-hours": "Tempo extras (Horas)",
+    "overtime": "Tempo extras",
+    "has-overtime-cards": "Tem cartões de horas extras",
+    "has-spenttime-cards": "Gastou cartões de tempo",
+    "time": "Tempo",
+    "title": "Título",
+    "tracking": "Rastreamento",
+    "tracking-info": "Será notificado se houver qualquer alteração em cartões em que é o criador ou membro",
+    "type": "Tipo",
+    "unassign-member": "Membro não associado",
+    "unsaved-description": "Possui uma descrição não salva",
+    "unwatch": "Deixar de observar",
+    "upload": "Carregar",
+    "upload-avatar": "Carregar um avatar",
+    "uploaded-avatar": "Avatar carregado",
+    "username": "Nome de utilizador",
+    "view-it": "Visualizar",
+    "warn-list-archived": "aviso: este cartão está em uma lista no Arquivo",
+    "watch": "Observar",
+    "watching": "Observando",
+    "watching-info": "Será notificado de qualquer alteração neste quadro",
+    "welcome-board": "Quadro de Boas Vindas",
+    "welcome-swimlane": "Marco 1",
+    "welcome-list1": "Básico",
+    "welcome-list2": "Avançado",
+    "card-templates-swimlane": "Modelos de cartão",
+    "list-templates-swimlane": "Modelos de lista",
+    "board-templates-swimlane": "Modelos de quadro",
+    "what-to-do": "O que gostaria de fazer?",
+    "wipLimitErrorPopup-title": "Limite WIP Inválido",
+    "wipLimitErrorPopup-dialog-pt1": "O número de tarefas nesta lista excede o limite WIP definido.",
+    "wipLimitErrorPopup-dialog-pt2": "Por favor, mova algumas tarefas para fora desta lista, ou defina um limite WIP mais elevado.",
+    "admin-panel": "Painel Administrativo",
+    "settings": "Configurações",
+    "people": "Pessoas",
+    "registration": "Registo",
+    "disable-self-registration": "Desabilitar Cadastrar-se",
+    "invite": "Convite",
+    "invite-people": "Convide Pessoas",
+    "to-boards": "Para o/os quadro(s)",
+    "email-addresses": "Endereço de E-mail",
+    "smtp-host-description": "O endereço do servidor SMTP que envia seus e-mails.",
+    "smtp-port-description": "A porta que o servidor SMTP usa para enviar os e-mails.",
+    "smtp-tls-description": "Habilitar suporte TLS para servidor SMTP",
+    "smtp-host": "Servidor SMTP",
+    "smtp-port": "Porta SMTP",
+    "smtp-username": "Nome de utilizador",
+    "smtp-password": "Senha",
+    "smtp-tls": "Suporte TLS",
+    "send-from": "De",
+    "send-smtp-test": "Enviar um e-mail de teste para si mesmo",
+    "invitation-code": "Código do Convite",
+    "email-invite-register-subject": "__inviter__ lhe enviou um convite",
+    "email-invite-register-text": "Caro __user__,\n\n__inviter__ convida-o para o quadro Kanban para colaborações.\n\nPor favor, siga o link abaixo:\n__url__ \n\nE seu código de convite é: __icode__\n\nObrigado.",
+    "email-smtp-test-subject": "E-mail de teste via SMTP",
+    "email-smtp-test-text": "Enviou um e-mail com sucesso",
+    "error-invitation-code-not-exist": "O código do convite não existe",
+    "error-notAuthorized": "Não está autorizado à ver esta página.",
+    "outgoing-webhooks": "Webhook de saída",
+    "outgoingWebhooksPopup-title": "Webhook de saída",
+    "boardCardTitlePopup-title": "Filtro do Título do Cartão",
+    "new-outgoing-webhook": "Novo Webhook de saída",
+    "no-name": "(Desconhecido)",
+    "Node_version": "Versão do Node",
+    "OS_Arch": "Arquitetura do SO",
+    "OS_Cpus": "Quantidade de CPUS do SO",
+    "OS_Freemem": "Memória Disponível do SO",
+    "OS_Loadavg": "Carga Média do SO",
+    "OS_Platform": "Plataforma do SO",
+    "OS_Release": "Versão do SO",
+    "OS_Totalmem": "Memória Total do SO",
+    "OS_Type": "Tipo do SO",
+    "OS_Uptime": "Disponibilidade do SO",
+    "days": "dias",
+    "hours": "horas",
+    "minutes": "minutos",
+    "seconds": "segundos",
+    "show-field-on-card": "Mostrar este campo no cartão",
+    "automatically-field-on-card": "Criar campo automaticamente para todos os cartões",
+    "showLabel-field-on-card": "Mostrar etiqueta do campo no mini-cartão",
+    "yes": "Sim",
     "no": "Não",
     "accounts": "Contas",
-    "accounts-allowEmailChange": "Allow Email Change",
-    "createdAt": "Created at",
+    "accounts-allowEmailChange": "Permitir Mudança de e-mail",
+    "accounts-allowUserNameChange": "Permitir alteração de nome de utilizador",
+    "createdAt": "Criado em",
     "verified": "Verificado",
     "active": "Ativo",
-    "card-received": "Received",
-    "card-received-on": "Received on",
-    "card-end": "End",
-    "card-end-on": "Ends on",
-    "editCardReceivedDatePopup-title": "Change received date",
-    "editCardEndDatePopup-title": "Change end date"
-}
+    "card-received": "Recebido",
+    "card-received-on": "Recebido em",
+    "card-end": "Fim",
+    "card-end-on": "Termina em",
+    "editCardReceivedDatePopup-title": "Modificar data de recebimento",
+    "editCardEndDatePopup-title": "Mudar data de fim",
+    "setCardColorPopup-title": "Definir cor",
+    "setCardActionsColorPopup-title": "Escolha uma cor",
+    "setSwimlaneColorPopup-title": "Escolha uma cor",
+    "setListColorPopup-title": "Escolha uma cor",
+    "assigned-by": "Atribuído por",
+    "requested-by": "Solicitado por",
+    "board-delete-notice": "Excluir é permanente. Irá perder todas as listas, cartões e ações associados nesse quadro.",
+    "delete-board-confirm-popup": "Todas as listas, cartões, etiquetas e atividades serão excluídos e não poderá recuperar o conteúdo do quadro. Não há como desfazer.",
+    "boardDeletePopup-title": "Excluir quadro?",
+    "delete-board": "Excluir quadro",
+    "default-subtasks-board": "Sub-tarefas para quadro __board__",
+    "default": "Padrão",
+    "queue": "Fila",
+    "subtask-settings": "Configurações de sub-tarefas",
+    "boardSubtaskSettingsPopup-title": "Configurações das sub-tarefas do quadro",
+    "show-subtasks-field": "Cartões podem ter sub-tarefas",
+    "deposit-subtasks-board": "Inserir sub-tarefas a este quadro:",
+    "deposit-subtasks-list": "Listas de sub-tarefas inseridas aqui:",
+    "show-parent-in-minicard": "Mostrar Pai do mini cartão:",
+    "prefix-with-full-path": "Prefixo com caminho completo",
+    "prefix-with-parent": "Prefixo com Pai",
+    "subtext-with-full-path": "Sub-texto com caminho completo",
+    "subtext-with-parent": "Sub-texto com Pai",
+    "change-card-parent": "Mudar Pai do cartão",
+    "parent-card": "Pai do cartão",
+    "source-board": "Fonte do quadro",
+    "no-parent": "Não mostrar Pai",
+    "activity-added-label": "adicionada etiqueta '%s' para %s",
+    "activity-removed-label": "removida etiqueta '%s' de %s",
+    "activity-delete-attach": "excluído um anexo de %s",
+    "activity-added-label-card": "adicionada etiqueta '%s'",
+    "activity-removed-label-card": "removida etiqueta '%s'",
+    "activity-delete-attach-card": "excluído um anexo",
+    "activity-set-customfield": "definir campo personalizado '%s' para '%s' em %s",
+    "activity-unset-customfield": "redefinir campo personalizado '%s' em %s",
+    "r-rule": "Regra",
+    "r-add-trigger": "Adicionar gatilho",
+    "r-add-action": "Adicionar ação",
+    "r-board-rules": "Quadro de regras",
+    "r-add-rule": "Adicionar regra",
+    "r-view-rule": "Ver regra",
+    "r-delete-rule": "Excluir regra",
+    "r-new-rule-name": "Título da nova regra",
+    "r-no-rules": "Sem regras",
+    "r-when-a-card": "Quando um cartão",
+    "r-is": "é",
+    "r-is-moved": "é movido",
+    "r-added-to": "adicionado à",
+    "r-removed-from": "Removido de",
+    "r-the-board": "o quadro",
+    "r-list": "lista",
+    "set-filter": "Inserir Filtro",
+    "r-moved-to": "Movido para",
+    "r-moved-from": "Movido de",
+    "r-archived": "Movido para o Arquivo",
+    "r-unarchived": "Restaurado do Arquivo",
+    "r-a-card": "um cartão",
+    "r-when-a-label-is": "Quando uma etiqueta é",
+    "r-when-the-label-is": "Quando a etiqueta é",
+    "r-list-name": "listar nome",
+    "r-when-a-member": "Quando um membro é",
+    "r-when-the-member": "Quando o membro",
+    "r-name": "nome",
+    "r-when-a-attach": "Quando um anexo",
+    "r-when-a-checklist": "Quando a lista de verificação é",
+    "r-when-the-checklist": "Quando a lista de verificação",
+    "r-completed": "Completado",
+    "r-made-incomplete": "Feito incompleto",
+    "r-when-a-item": "Quando o item da lista de verificação é",
+    "r-when-the-item": "Quando o item da lista de verificação",
+    "r-checked": "Marcado",
+    "r-unchecked": "Desmarcado",
+    "r-move-card-to": "Mover cartão para",
+    "r-top-of": "Topo de",
+    "r-bottom-of": "Final de",
+    "r-its-list": "é lista",
+    "r-archive": "Mover para Arquivo",
+    "r-unarchive": "Restaurar do Arquivo",
+    "r-card": "cartão",
+    "r-add": "Novo",
+    "r-remove": "Remover",
+    "r-label": "etiqueta",
+    "r-member": "membro",
+    "r-remove-all": "Remover todos os membros do cartão",
+    "r-set-color": "Definir cor para",
+    "r-checklist": "lista de verificação",
+    "r-check-all": "Marcar todos",
+    "r-uncheck-all": "Desmarcar todos",
+    "r-items-check": "itens da lista de verificação",
+    "r-check": "Marcar",
+    "r-uncheck": "Desmarcar",
+    "r-item": "item",
+    "r-of-checklist": "da lista de verificação",
+    "r-send-email": "Enviar um e-mail",
+    "r-to": "para",
+    "r-subject": "assunto",
+    "r-rule-details": "Detalhes da regra",
+    "r-d-move-to-top-gen": "Mover cartão para o topo da sua lista",
+    "r-d-move-to-top-spec": "Mover cartão para o topo da lista",
+    "r-d-move-to-bottom-gen": "Mover cartão para o final da sua lista",
+    "r-d-move-to-bottom-spec": "Mover cartão para final da lista",
+    "r-d-send-email": "Enviar e-mail",
+    "r-d-send-email-to": "para",
+    "r-d-send-email-subject": "assunto",
+    "r-d-send-email-message": "mensagem",
+    "r-d-archive": "Mover cartão para Arquivo",
+    "r-d-unarchive": "Restaurar cartão do Arquivo",
+    "r-d-add-label": "Adicionar etiqueta",
+    "r-d-remove-label": "Remover etiqueta",
+    "r-create-card": "Criar novo cartão",
+    "r-in-list": "na lista",
+    "r-in-swimlane": "na pista",
+    "r-d-add-member": "Adicionar membro",
+    "r-d-remove-member": "Remover membro",
+    "r-d-remove-all-member": "Remover todos os membros",
+    "r-d-check-all": "Marcar todos os itens de uma lista",
+    "r-d-uncheck-all": "Desmarcar todos os itens de uma lista",
+    "r-d-check-one": "Marcar item",
+    "r-d-uncheck-one": "Desmarcar item",
+    "r-d-check-of-list": "da lista de verificação",
+    "r-d-add-checklist": "Adicionar lista de verificação",
+    "r-d-remove-checklist": "Remover lista de verificação",
+    "r-by": "por",
+    "r-add-checklist": "Adicionar lista de verificação",
+    "r-with-items": "com os itens",
+    "r-items-list": "item1,item2,item3",
+    "r-add-swimlane": "Adicionar pista",
+    "r-swimlane-name": "Nome da pista",
+    "r-board-note": "Nota: deixe o campo vazio para corresponder à todos os valores possíveis",
+    "r-checklist-note": "Nota: itens de Checklists devem ser escritos separados por vírgulas",
+    "r-when-a-card-is-moved": "Quando um cartão é movido de outra lista",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Método de autenticação",
+    "authentication-type": "Tipo de autenticação",
+    "custom-product-name": "Nome Personalizado do Produto",
+    "layout": "Layout",
+    "hide-logo": "Esconder Logo",
+    "add-custom-html-after-body-start": "Adicionar HTML Personalizado depois do início do <body>",
+    "add-custom-html-before-body-end": "Adicionar HTML Personalizado antes do fim do </body>",
+    "error-undefined": "Ocorreu um erro",
+    "error-ldap-login": "Um erro ocorreu enquanto tentava entrar",
+    "display-authentication-method": "Mostrar Método de Autenticação",
+    "default-authentication-method": "Método de Autenticação Padrão",
+    "duplicate-board": "Duplicar Quadro",
+    "people-number": "O número de pessoas é:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
+}
\ No newline at end of file
diff --git a/i18n/ro.i18n.json b/i18n/ro.i18n.json
index 3086cb0f..8cc39c9f 100644
--- a/i18n/ro.i18n.json
+++ b/i18n/ro.i18n.json
@@ -1,35 +1,51 @@
 {
     "accept": "Accept",
-    "act-activity-notify": "[Wekan] Activity Notification",
-    "act-addAttachment": "attached __attachment__ to __card__",
-    "act-addChecklist": "added checklist __checklist__ to __card__",
-    "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__",
-    "act-addComment": "commented on __card__: __comment__",
-    "act-createBoard": "created __board__",
-    "act-createCard": "added __card__ to __list__",
-    "act-createList": "added __list__ to __board__",
-    "act-addBoardMember": "added __member__ to __board__",
-    "act-archivedBoard": "__board__ moved to Recycle Bin",
-    "act-archivedCard": "__card__ moved to Recycle Bin",
-    "act-archivedList": "__list__ moved to Recycle Bin",
-    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
-    "act-importBoard": "imported __board__",
-    "act-importCard": "imported __card__",
-    "act-importList": "imported __list__",
-    "act-joinMember": "added __member__ to __card__",
-    "act-moveCard": "moved __card__ from __oldList__ to __list__",
-    "act-removeBoardMember": "removed __member__ from __board__",
-    "act-restoredCard": "restored __card__ to __board__",
-    "act-unjoinMember": "removed __member__ from __card__",
-    "act-withBoardTitle": "[Wekan] __board__",
+    "act-activity-notify": "Activity Notification",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__board__",
     "act-withCardTitle": "[__board__] __card__",
     "actions": "Actions",
     "activities": "Activities",
     "activity": "Activity",
     "activity-added": "added %s to %s",
-    "activity-archived": "%s moved to Recycle Bin",
+    "activity-archived": "%s moved to Archive",
     "activity-attached": "attached %s to %s",
     "activity-created": "created %s",
+    "activity-customfield-created": "created custom field %s",
     "activity-excluded": "excluded %s from %s",
     "activity-imported": "imported %s into %s from %s",
     "activity-imported-board": "imported %s from %s",
@@ -39,13 +55,25 @@
     "activity-removed": "removed %s from %s",
     "activity-sent": "sent %s to %s",
     "activity-unjoined": "unjoined %s",
+    "activity-subtask-added": "added subtask to %s",
+    "activity-checked-item": "checked %s in checklist %s of %s",
+    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
     "activity-checklist-added": "added checklist to %s",
+    "activity-checklist-removed": "removed a checklist from %s",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
     "activity-checklist-item-added": "added checklist item to '%s' in %s",
+    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
     "add": "Add",
+    "activity-checked-item-card": "checked %s in checklist %s",
+    "activity-unchecked-item-card": "unchecked %s in checklist %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
     "add-attachment": "Add Attachment",
     "add-board": "Add Board",
     "add-card": "Add Card",
     "add-swimlane": "Add Swimlane",
+    "add-subtask": "Add Subtask",
     "add-checklist": "Add Checklist",
     "add-checklist-item": "Add an item to checklist",
     "add-cover": "Add Cover",
@@ -63,20 +91,22 @@
     "and-n-other-card": "And __count__ other card",
     "and-n-other-card_plural": "And __count__ other cards",
     "apply": "Apply",
-    "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Move to Recycle Bin",
-    "archive-all": "Move All to Recycle Bin",
-    "archive-board": "Move Board to Recycle Bin",
-    "archive-card": "Move Card to Recycle Bin",
-    "archive-list": "Move List to Recycle Bin",
-    "archive-swimlane": "Move Swimlane to Recycle Bin",
-    "archive-selection": "Move selection to Recycle Bin",
-    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
-    "archived-items": "Recycle Bin",
-    "archived-boards": "Boards in Recycle Bin",
+    "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
+    "archive": "Move to Archive",
+    "archive-all": "Move All to Archive",
+    "archive-board": "Move Board to Archive",
+    "archive-card": "Move Card to Archive",
+    "archive-list": "Move List to Archive",
+    "archive-swimlane": "Move Swimlane to Archive",
+    "archive-selection": "Move selection to Archive",
+    "archiveBoardPopup-title": "Move Board to Archive?",
+    "archived-items": "Archive",
+    "archived-boards": "Boards in Archive",
     "restore-board": "Restore Board",
-    "no-archived-boards": "No Boards in Recycle Bin.",
-    "archives": "Recycle Bin",
+    "no-archived-boards": "No Boards in Archive.",
+    "archives": "Archive",
+    "template": "Template",
+    "templates": "Templates",
     "assign-member": "Assign member",
     "attached": "attached",
     "attachment": "Ataşament",
@@ -95,22 +125,25 @@
     "boardChangeTitlePopup-title": "Rename Board",
     "boardChangeVisibilityPopup-title": "Change Visibility",
     "boardChangeWatchPopup-title": "Change Watch",
-    "boardMenuPopup-title": "Board Menu",
+    "boardMenuPopup-title": "Board Settings",
     "boards": "Boards",
     "board-view": "Board View",
+    "board-view-cal": "Calendar",
     "board-view-swimlanes": "Swimlanes",
     "board-view-lists": "Liste",
     "bucket-example": "Like “Bucket List” for example",
     "cancel": "Cancel",
-    "card-archived": "This card is moved to Recycle Bin.",
+    "card-archived": "This card is moved to Archive.",
+    "board-archived": "This board is moved to Archive.",
     "card-comments-title": "This card has %s comment.",
     "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
     "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
     "card-due": "Due",
     "card-due-on": "Due on",
     "card-spent": "Spent Time",
     "card-edit-attachments": "Edit attachments",
+    "card-edit-custom-fields": "Edit custom fields",
     "card-edit-labels": "Edit labels",
     "card-edit-members": "Edit members",
     "card-labels-title": "Change the labels for the card.",
@@ -118,13 +151,20 @@
     "card-start": "Start",
     "card-start-on": "Starts on",
     "cardAttachmentsPopup-title": "Attach From",
+    "cardCustomField-datePopup-title": "Change date",
+    "cardCustomFieldsPopup-title": "Edit custom fields",
     "cardDeletePopup-title": "Delete Card?",
     "cardDetailsActionsPopup-title": "Card Actions",
     "cardLabelsPopup-title": "Labels",
     "cardMembersPopup-title": "Members",
     "cardMorePopup-title": "More",
+    "cardTemplatePopup-title": "Create template",
     "cards": "Cards",
     "cards-count": "Cards",
+    "casSignIn": "Sign In with CAS",
+    "cardType-card": "Card",
+    "cardType-linkedCard": "Linked Card",
+    "cardType-linkedBoard": "Linked Board",
     "change": "Change",
     "change-avatar": "Change Avatar",
     "change-password": "Change Password",
@@ -135,30 +175,52 @@
     "changePasswordPopup-title": "Change Password",
     "changePermissionsPopup-title": "Change Permissions",
     "changeSettingsPopup-title": "Change Settings",
+    "subtasks": "Subtasks",
     "checklists": "Checklists",
     "click-to-star": "Click to star this board.",
     "click-to-unstar": "Click to unstar this board.",
     "clipboard": "Clipboard or drag & drop",
     "close": "Închide",
     "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
     "color-black": "black",
     "color-blue": "blue",
+    "color-crimson": "crimson",
+    "color-darkgreen": "darkgreen",
+    "color-gold": "gold",
+    "color-gray": "gray",
     "color-green": "green",
+    "color-indigo": "indigo",
     "color-lime": "lime",
+    "color-magenta": "magenta",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "navy",
     "color-orange": "orange",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
     "color-pink": "pink",
+    "color-plum": "plum",
     "color-purple": "purple",
     "color-red": "red",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "silver",
     "color-sky": "sky",
+    "color-slateblue": "slateblue",
+    "color-white": "white",
     "color-yellow": "yellow",
+    "unset-color": "Unset",
     "comment": "Comment",
     "comment-placeholder": "Write Comment",
     "comment-only": "Comment only",
     "comment-only-desc": "Can comment on cards only.",
+    "no-comments": "No comments",
+    "no-comments-desc": "Can not see comments and activities.",
     "computer": "Computer",
-    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist",
+    "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?",
+    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
     "copy-card-link-to-clipboard": "Copy card link to clipboard",
+    "linkCardPopup-title": "Link Card",
+    "searchElementPopup-title": "Caută",
     "copyCardPopup-title": "Copy Card",
     "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
     "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
@@ -167,11 +229,25 @@
     "createBoardPopup-title": "Create Board",
     "chooseBoardSourcePopup-title": "Import board",
     "createLabelPopup-title": "Create Label",
+    "createCustomField": "Create Field",
+    "createCustomFieldPopup-title": "Create Field",
     "current": "current",
+    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
+    "custom-field-checkbox": "Checkbox",
+    "custom-field-date": "Date",
+    "custom-field-dropdown": "Dropdown List",
+    "custom-field-dropdown-none": "(none)",
+    "custom-field-dropdown-options": "List Options",
+    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
+    "custom-field-dropdown-unknown": "(unknown)",
+    "custom-field-number": "Number",
+    "custom-field-text": "Text",
+    "custom-fields": "Custom Fields",
     "date": "Date",
     "decline": "Decline",
     "default-avatar": "Default avatar",
     "delete": "Delete",
+    "deleteCustomFieldPopup-title": "Delete Custom Field?",
     "deleteLabelPopup-title": "Delete Label?",
     "description": "Description",
     "disambiguateMultiLabelPopup-title": "Disambiguate Label Action",
@@ -186,6 +262,7 @@
     "soft-wip-limit": "Soft WIP Limit",
     "editCardStartDatePopup-title": "Change start date",
     "editCardDueDatePopup-title": "Change due date",
+    "editCustomFieldPopup-title": "Edit Field",
     "editCardSpentTimePopup-title": "Change spent time",
     "editLabelPopup-title": "Change Label",
     "editNotificationPopup-title": "Edit Notification",
@@ -222,30 +299,36 @@
     "filter-clear": "Clear filter",
     "filter-no-label": "No label",
     "filter-no-member": "No member",
+    "filter-no-custom-fields": "No Custom Fields",
     "filter-on": "Filter is on",
     "filter-on-desc": "You are filtering cards on this board. Click here to edit filter.",
     "filter-to-selection": "Filter to selection",
+    "advanced-filter-label": "Advanced Filter",
+    "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) to be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
     "fullname": "Full Name",
     "header-logo-title": "Go back to your boards page.",
     "hide-system-messages": "Hide system messages",
     "headerBarCreateBoardPopup-title": "Create Board",
     "home": "Home",
     "import": "Import",
+    "link": "Link",
     "import-board": "import board",
     "import-board-c": "Import board",
     "import-board-title-trello": "Import board from Trello",
-    "import-board-title-wekan": "Import board from Wekan",
+    "import-board-title-wekan": "Import board from previous export",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
     "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
     "from-trello": "From Trello",
-    "from-wekan": "From Wekan",
+    "from-wekan": "From previous export",
     "import-board-instruction-trello": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text",
-    "import-board-instruction-wekan": "In your Wekan board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
     "import-json-placeholder": "Paste your valid JSON data here",
     "import-map-members": "Map members",
-    "import-members-map": "Your imported board has some members. Please map the members you want to import to Wekan users",
+    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
     "import-show-user-mapping": "Review members mapping",
-    "import-user-select": "Pick the Wekan user you want to use as this member",
-    "importMapMembersAddPopup-title": "Select Wekan member",
+    "import-user-select": "Pick your existing user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select member",
     "info": "Version",
     "initials": "Iniţiale",
     "invalid-date": "Invalid date",
@@ -264,17 +347,19 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "Link to this card",
-    "list-archive-cards": "Move all cards in this list to Recycle Bin",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
+    "list-archive-cards": "Move all cards in this list to Archive",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "List Actions",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Import a Trello card",
     "listMorePopup-title": "More",
     "link-list": "Link to this list",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
     "lists": "Liste",
     "swimlanes": "Swimlanes",
     "log-out": "Log Out",
@@ -294,9 +379,9 @@
     "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "My Boards",
     "name": "Nume",
-    "no-archived-cards": "No cards in Recycle Bin.",
-    "no-archived-lists": "No lists in Recycle Bin.",
-    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
+    "no-archived-cards": "No cards in Archive.",
+    "no-archived-lists": "No lists in Archive.",
+    "no-archived-swimlanes": "No swimlanes in Archive.",
     "no-results": "No results",
     "normal": "Normal",
     "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -332,6 +417,7 @@
     "restore": "Restore",
     "save": "Salvează",
     "search": "Caută",
+    "rules": "Rules",
     "search-cards": "Search from card titles and descriptions on this board",
     "search-example": "Text to search for?",
     "select-color": "Select Color",
@@ -366,6 +452,7 @@
     "title": "Titlu",
     "tracking": "Tracking",
     "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
+    "type": "Type",
     "unassign-member": "Unassign member",
     "unsaved-description": "You have an unsaved description.",
     "unwatch": "Unwatch",
@@ -374,7 +461,7 @@
     "uploaded-avatar": "Uploaded an avatar",
     "username": "Username",
     "view-it": "View it",
-    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
+    "warn-list-archived": "warning: this card is in an list at Archive",
     "watch": "Watch",
     "watching": "Watching",
     "watching-info": "You will be notified of any change in this board",
@@ -382,6 +469,9 @@
     "welcome-swimlane": "Milestone 1",
     "welcome-list1": "Basics",
     "welcome-list2": "Advanced",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
     "what-to-do": "Ce ai vrea sa faci?",
     "wipLimitErrorPopup-title": "Invalid WIP Limit",
     "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
@@ -407,16 +497,16 @@
     "send-smtp-test": "Send a test email to yourself",
     "invitation-code": "Invitation Code",
     "email-invite-register-subject": "__inviter__ sent you an invitation",
-    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to Wekan for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
-    "email-smtp-test-subject": "SMTP Test Email From Wekan",
+    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email",
     "email-smtp-test-text": "You have successfully sent an email",
     "error-invitation-code-not-exist": "Invitation code doesn't exist",
     "error-notAuthorized": "You are not authorized to view this page.",
     "outgoing-webhooks": "Outgoing Webhooks",
     "outgoingWebhooksPopup-title": "Outgoing Webhooks",
+    "boardCardTitlePopup-title": "Card Title Filter",
     "new-outgoing-webhook": "New Outgoing Webhook",
     "no-name": "(Unknown)",
-    "Wekan_version": "Wekan version",
     "Node_version": "Node version",
     "OS_Arch": "OS Arch",
     "OS_Cpus": "OS CPU Count",
@@ -427,13 +517,18 @@
     "OS_Totalmem": "OS Total Memory",
     "OS_Type": "OS Type",
     "OS_Uptime": "OS Uptime",
+    "days": "days",
     "hours": "hours",
     "minutes": "minutes",
     "seconds": "seconds",
+    "show-field-on-card": "Show this field on card",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
     "yes": "Yes",
     "no": "No",
     "accounts": "Accounts",
     "accounts-allowEmailChange": "Allow Email Change",
+    "accounts-allowUserNameChange": "Allow Username Change",
     "createdAt": "Created at",
     "verified": "Verified",
     "active": "Active",
@@ -442,5 +537,157 @@
     "card-end": "End",
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
-    "editCardEndDatePopup-title": "Change end date"
-}
+    "editCardEndDatePopup-title": "Change end date",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "Assigned By",
+    "requested-by": "Requested By",
+    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
+    "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
+    "boardDeletePopup-title": "Delete Board?",
+    "delete-board": "Delete Board",
+    "default-subtasks-board": "Subtasks for __board__ board",
+    "default": "Default",
+    "queue": "Queue",
+    "subtask-settings": "Subtasks Settings",
+    "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
+    "show-subtasks-field": "Cards can have subtasks",
+    "deposit-subtasks-board": "Deposit subtasks to this board:",
+    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
+    "show-parent-in-minicard": "Show parent in minicard:",
+    "prefix-with-full-path": "Prefix with full path",
+    "prefix-with-parent": "Prefix with parent",
+    "subtext-with-full-path": "Subtext with full path",
+    "subtext-with-parent": "Subtext with parent",
+    "change-card-parent": "Change card's parent",
+    "parent-card": "Parent card",
+    "source-board": "Source board",
+    "no-parent": "Don't show parent",
+    "activity-added-label": "added label '%s' to %s",
+    "activity-removed-label": "removed label '%s' from %s",
+    "activity-delete-attach": "deleted an attachment from %s",
+    "activity-added-label-card": "added label '%s'",
+    "activity-removed-label-card": "removed label '%s'",
+    "activity-delete-attach-card": "deleted an attachment",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "r-rule": "Rule",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "Add action",
+    "r-board-rules": "Board rules",
+    "r-add-rule": "Add rule",
+    "r-view-rule": "View rule",
+    "r-delete-rule": "Delete rule",
+    "r-new-rule-name": "New rule title",
+    "r-no-rules": "No rules",
+    "r-when-a-card": "When a card",
+    "r-is": "is",
+    "r-is-moved": "is moved",
+    "r-added-to": "added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "the board",
+    "r-list": "list",
+    "set-filter": "Set Filter",
+    "r-moved-to": "Moved to",
+    "r-moved-from": "Moved from",
+    "r-archived": "Moved to Archive",
+    "r-unarchived": "Restored from Archive",
+    "r-a-card": "a card",
+    "r-when-a-label-is": "When a label is",
+    "r-when-the-label-is": "When the label is",
+    "r-list-name": "list name",
+    "r-when-a-member": "When a member is",
+    "r-when-the-member": "When the member",
+    "r-name": "name",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "r-when-the-item": "When the checklist item",
+    "r-checked": "Checked",
+    "r-unchecked": "Unchecked",
+    "r-move-card-to": "Move card to",
+    "r-top-of": "Top of",
+    "r-bottom-of": "Bottom of",
+    "r-its-list": "its list",
+    "r-archive": "Move to Archive",
+    "r-unarchive": "Restore from Archive",
+    "r-card": "card",
+    "r-add": "Add",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-set-color": "Set color to",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "subject",
+    "r-rule-details": "Rule details",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Move card to top of list",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Move card to bottom of list",
+    "r-d-send-email": "Send email",
+    "r-d-send-email-to": "to",
+    "r-d-send-email-subject": "subject",
+    "r-d-send-email-message": "message",
+    "r-d-archive": "Move card to Archive",
+    "r-d-unarchive": "Restore card from Archive",
+    "r-d-add-label": "Add label",
+    "r-d-remove-label": "Remove label",
+    "r-create-card": "Create new card",
+    "r-in-list": "in list",
+    "r-in-swimlane": "in swimlane",
+    "r-d-add-member": "Add member",
+    "r-d-remove-member": "Remove member",
+    "r-d-remove-all-member": "Remove all member",
+    "r-d-check-all": "Check all items of a list",
+    "r-d-uncheck-all": "Uncheck all items of a list",
+    "r-d-check-one": "Check item",
+    "r-d-uncheck-one": "Uncheck item",
+    "r-d-check-of-list": "of checklist",
+    "r-d-add-checklist": "Add checklist",
+    "r-d-remove-checklist": "Remove checklist",
+    "r-by": "by",
+    "r-add-checklist": "Add checklist",
+    "r-with-items": "with items",
+    "r-items-list": "item1,item2,item3",
+    "r-add-swimlane": "Add swimlane",
+    "r-swimlane-name": "swimlane name",
+    "r-board-note": "Note: leave a field empty to match every possible value.",
+    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout",
+    "hide-logo": "Hide Logo",
+    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
+    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
+    "error-undefined": "Something went wrong",
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
+}
\ No newline at end of file
diff --git a/i18n/ru.i18n.json b/i18n/ru.i18n.json
index 8f5c0827..2bfbcbc4 100644
--- a/i18n/ru.i18n.json
+++ b/i18n/ru.i18n.json
@@ -1,35 +1,51 @@
 {
     "accept": "Принять",
-    "act-activity-notify": "[Wekan] Уведомление о действиях участников",
-    "act-addAttachment": "вложено __attachment__ в __card__",
-    "act-addChecklist": "добавил контрольный список __checklist__ в __card__",
-    "act-addChecklistItem": "добавил __checklistItem__ в контрольный список __checklist__ в __card__",
-    "act-addComment": "прокомментировал __card__: __comment__",
-    "act-createBoard": "создал __board__",
-    "act-createCard": "добавил __card__ в __list__",
-    "act-createList": "добавил __list__ для __board__",
-    "act-addBoardMember": "добавил __member__ в __board__",
-    "act-archivedBoard": "Доска __board__ перемещена в Корзину",
-    "act-archivedCard": "Карточка __card__ перемещена в Корзину",
-    "act-archivedList": "Список __list__ перемещён в Корзину",
-    "act-archivedSwimlane": "Дорожка __swimlane__ перемещена в Корзину",
-    "act-importBoard": "__board__ импортирована",
-    "act-importCard": "__card__ импортирована",
-    "act-importList": "__list__ импортирован",
-    "act-joinMember": "добавил __member__ в __card__",
-    "act-moveCard": "__card__ перемещена из __oldList__ в __list__",
-    "act-removeBoardMember": "__member__ удален из __board__",
-    "act-restoredCard": "__card__ востановлена в __board__",
-    "act-unjoinMember": "__member__ удален из __card__",
-    "act-withBoardTitle": "[Wekan] __board__",
+    "act-activity-notify": "Уведомление о действиях участников",
+    "act-addAttachment": "прикрепил вложение __attachment__ в карточку __card__ в списке __list__ на дорожке __swimlane__ доски __board__",
+    "act-deleteAttachment": "удалил вложение __attachment__ из карточки __card__ в списке __list__ на дорожке __swimlane__ доски __board__",
+    "act-addSubtask": "добавил подзадачу __subtask__ для карточки __card__ в списке __list__ на дорожке __swimlane__ доски __board__",
+    "act-addLabel": "добавил метку __label__ в карточку __card__ в списке __list__ на дорожке __swimlane__ доски __board__",
+    "act-addedLabel": "Добавлена метка __label__ в карточку __card__ в списке __list__ на дорожке __swimlane__ доски __board__",
+    "act-removeLabel": "Снята метка __label__ с карточки __card__ в списке __list__ на дорожке __swimlane__ доски __board__",
+    "act-removedLabel": "Снята метка __label__ с карточки __card__ в списке __list__ на дорожке __swimlane__ доски __board__",
+    "act-addChecklist": "добавил контрольный список __checklist__ в карточку __card__ в списке __list__ на дорожке __swimlane__ доски __board__",
+    "act-addChecklistItem": "добавил пункт __checklistItem__ в контрольный список __checklist__ в карточке __card__ в списке __list__ на дорожке __swimlane__ доски __board__",
+    "act-removeChecklist": "удалил контрольный список __checklist__ из карточки __card__ в списке __list__ на дорожке __swimlane__ доски __board__",
+    "act-removeChecklistItem": "удалил пункт __checklistItem__ из контрольного списка __checkList__ в карточке __card__ в списке __list__ на дорожке __swimlane__ доски __board__",
+    "act-checkedItem": "отметил __checklistItem__ в контрольном списке __checklist__ в карточке __card__ в списке __list__ на дорожке __swimlane__ доски __board__",
+    "act-uncheckedItem": "снял __checklistItem__ в контрольном списке __checklist__ в карточке __card__ в списке __list__ на дорожке __swimlane__ доски __board__",
+    "act-completeChecklist": "завершил контрольный список __checklist__ в карточке __card__ в списке __list__ на дорожке __swimlane__ доски __board__",
+    "act-uncompleteChecklist": "вновь открыл контрольный список __checklist__ в карточке __card__ в списке __list__ на дорожке __swimlane__ доски __board__",
+    "act-addComment": "написал в карточке __card__: __comment__ в списке __list__ на дорожке __swimlane__ доски __board__",
+    "act-createBoard": "создал доску __board__",
+    "act-createSwimlane": "создал дорожку __swimlane__ на доске __board__",
+    "act-createCard": "создал карточку __card__ в списке __list__ на дорожке __swimlane__ доски __board__",
+    "act-createCustomField": "создал поле __customField__ в карточке __card__ в списке __list__ на дорожке __swimlane__ доски __board__\n",
+    "act-createList": "добавил список __list__ на доску __board__",
+    "act-addBoardMember": "добавил участника __member__ на доску __board__",
+    "act-archivedBoard": "Доска __board__ перемещена в Архив",
+    "act-archivedCard": "Карточка __card__ из списка __list__ с дорожки __swimlane__ доски __board__ перемещена в Архив",
+    "act-archivedList": "Список __list__ на дорожке __swimlane__ доски __board__ перемещен в Архив",
+    "act-archivedSwimlane": "Дорожка __swimlane__ на доске __board__ перемещена в Архив",
+    "act-importBoard": "импортировал доску __board__",
+    "act-importCard": "импортировал карточку __card__ в список __list__ на дорожку __swimlane__ доски __board__",
+    "act-importList": "импортировал список __list__ на дорожку __swimlane__ доски __board__",
+    "act-joinMember": "добавил участника __member__ в карточку __card__ в списке __list__ на дорожке __swimlane__ доски __board__",
+    "act-moveCard": "переместил карточку __card__ на доске __board__ из списка __oldList__ с дорожки __oldSwimlane__ в список __list__ на дорожку __swimlane__",
+    "act-moveCardToOtherBoard": "переместил карточку __card__ из списка __oldList__ с дорожки __oldSwimlane__ доски __oldBoard__ в список __list__ на дорожку __swimlane__ доски __board__",
+    "act-removeBoardMember": "удалил участника __member__ с доски __board__",
+    "act-restoredCard": "восстановил карточку __card__ в список __list__ на дорожку __swimlane__ доски __board__",
+    "act-unjoinMember": "удалил участника __member__ из карточки __card__ в списке __list__ на дорожке __swimlane__ доски __board__",
+    "act-withBoardTitle": "__board__",
     "act-withCardTitle": "[__board__] __card__",
     "actions": "Действия",
     "activities": "История действий",
     "activity": "Действия участников",
     "activity-added": "добавил %s на %s",
-    "activity-archived": "%s перемещено в Корзину",
+    "activity-archived": "%s теперь в Архиве",
     "activity-attached": "прикрепил %s к %s",
     "activity-created": "создал %s",
+    "activity-customfield-created": "создал настраиваемое поле %s",
     "activity-excluded": "исключил %s из %s",
     "activity-imported": "импортировал %s в %s из %s",
     "activity-imported-board": "импортировал %s из %s",
@@ -39,13 +55,25 @@
     "activity-removed": "удалил %s из %s",
     "activity-sent": "отправил %s в %s",
     "activity-unjoined": "вышел из %s",
+    "activity-subtask-added": "добавил подзадачу в %s",
+    "activity-checked-item": "отметил %s в контрольном списке %s в %s",
+    "activity-unchecked-item": "снял %s в контрольном списке %s в %s",
     "activity-checklist-added": "добавил контрольный список в %s",
-    "activity-checklist-item-added": "добавил пункт контрольного списка в '%s' в карточке %s",
+    "activity-checklist-removed": "удалил контрольный список из %s",
+    "activity-checklist-completed": "завершил контрольный список __checklist__ в карточке __card__ в списке __list__ на дорожке __swimlane__ доски __board__",
+    "activity-checklist-uncompleted": "вновь открыл контрольный список %s в %s",
+    "activity-checklist-item-added": "добавил пункт в контрольный список '%s' в карточке %s",
+    "activity-checklist-item-removed": "удалил пункт из контрольного списка '%s' в карточке %s",
     "add": "Создать",
+    "activity-checked-item-card": "отметил %s в контрольном списке %s",
+    "activity-unchecked-item-card": "снял %s в контрольном списке %s",
+    "activity-checklist-completed-card": "завершил контрольный список __checklist__ в карточку __card__ в списке __list__ на дорожке __swimlane__ доски __board__",
+    "activity-checklist-uncompleted-card": "вновь открыл контрольный список %s",
     "add-attachment": "Добавить вложение",
     "add-board": "Добавить доску",
-    "add-card": "Добавить карту",
+    "add-card": "Добавить карточку",
     "add-swimlane": "Добавить дорожку",
+    "add-subtask": "Добавить подзадачу",
     "add-checklist": "Добавить контрольный список",
     "add-checklist-item": "Добавить пункт в контрольный список",
     "add-cover": "Прикрепить",
@@ -63,20 +91,22 @@
     "and-n-other-card": "И __count__ другая карточка",
     "and-n-other-card_plural": "И __count__ другие карточки",
     "apply": "Применить",
-    "app-is-offline": "Wekan загружается, пожалуйста подождите. Обновление страницы может привести к потере данных. Если Wekan не загрузился, пожалуйста проверьте что связь с сервером доступна.",
-    "archive": "Переместить в Корзину",
-    "archive-all": "Переместить всё в Корзину",
-    "archive-board": "Переместить Доску в Корзину",
-    "archive-card": "Переместить Карточку в Корзину",
-    "archive-list": "Переместить Список в Корзину",
-    "archive-swimlane": "Переместить Дорожку в Корзину",
-    "archive-selection": "Переместить выбранное в Корзину",
-    "archiveBoardPopup-title": "Переместить Доску в Корзину?",
-    "archived-items": "Корзина",
-    "archived-boards": "Доски находящиеся в Корзине",
+    "app-is-offline": "Идет загрузка, подождите. Обновление страницы приведет к потере данных. Если загрузка не происходит, проверьте работоспособность сервера.",
+    "archive": "Переместить в архив",
+    "archive-all": "Переместить всё в архив",
+    "archive-board": "Переместить доску в архив",
+    "archive-card": "Переместить карточку в архив",
+    "archive-list": "Переместить список в архив",
+    "archive-swimlane": "Переместить дорожку в архив",
+    "archive-selection": "Переместить выбранное в архив",
+    "archiveBoardPopup-title": "Переместить доску в архив?",
+    "archived-items": "Архив",
+    "archived-boards": "Доски в архиве",
     "restore-board": "Востановить доску",
-    "no-archived-boards": "В Корзине нет никаких Досок",
-    "archives": "Корзина",
+    "no-archived-boards": "Нет досок в архиве.",
+    "archives": "Архив",
+    "template": "Шаблон",
+    "templates": "Шаблоны",
     "assign-member": "Назначить участника",
     "attached": "прикреплено",
     "attachment": "Вложение",
@@ -94,37 +124,47 @@
     "boardChangeColorPopup-title": "Изменить фон доски",
     "boardChangeTitlePopup-title": "Переименовать доску",
     "boardChangeVisibilityPopup-title": "Изменить настройки видимости",
-    "boardChangeWatchPopup-title": "Изменить Отслеживание",
-    "boardMenuPopup-title": "Меню доски",
+    "boardChangeWatchPopup-title": "Режимы оповещения",
+    "boardMenuPopup-title": "Настройки доски",
     "boards": "Доски",
     "board-view": "Вид доски",
+    "board-view-cal": "Календарь",
     "board-view-swimlanes": "Дорожки",
     "board-view-lists": "Списки",
     "bucket-example": "Например “Список дел”",
     "cancel": "Отмена",
-    "card-archived": "Эта карточка перемещена в Корзину",
+    "card-archived": "Эта карточка перемещена в архив",
+    "board-archived": "Эта доска перемещена в архив.",
     "card-comments-title": "Комментарии (%s)",
     "card-delete-notice": "Это действие невозможно будет отменить. Все изменения, которые вы вносили в карточку будут потеряны.",
-    "card-delete-pop": "Все действия будут удалены из ленты активности участников и вы не сможете заново открыть карточку. Действие необратимо",
-    "card-delete-suggest-archive": "Вы можете переместить карточку в Корзину, чтобы удалить ее с доски и сохранить активность .",
+    "card-delete-pop": "Все действия будут удалены из ленты активности участников, и вы не сможете заново открыть карточку. Действие необратимо",
+    "card-delete-suggest-archive": "Вы можете переместить карточку в архив, чтобы убрать ее с доски, сохранив всю историю действий участников.",
     "card-due": "Выполнить к",
     "card-due-on": "Выполнить до",
     "card-spent": "Затраченное время",
     "card-edit-attachments": "Изменить вложения",
+    "card-edit-custom-fields": "Редактировать настраиваемые поля",
     "card-edit-labels": "Изменить метку",
     "card-edit-members": "Изменить участников",
     "card-labels-title": "Изменить метки для этой карточки.",
     "card-members-title": "Добавить или удалить с карточки участников доски.",
-    "card-start": "Дата начала",
+    "card-start": "В работе с",
     "card-start-on": "Начнётся с",
     "cardAttachmentsPopup-title": "Прикрепить из",
+    "cardCustomField-datePopup-title": "Изменить дату",
+    "cardCustomFieldsPopup-title": "редактировать настраиваемые поля",
     "cardDeletePopup-title": "Удалить карточку?",
     "cardDetailsActionsPopup-title": "Действия в карточке",
     "cardLabelsPopup-title": "Метки",
     "cardMembersPopup-title": "Участники",
     "cardMorePopup-title": "Поделиться",
+    "cardTemplatePopup-title": "Создать шаблон",
     "cards": "Карточки",
     "cards-count": "Карточки",
+    "casSignIn": "Войти через CAS",
+    "cardType-card": "Карточка",
+    "cardType-linkedCard": "Связанная карточка",
+    "cardType-linkedBoard": "Связанная доска",
     "change": "Изменить",
     "change-avatar": "Изменить аватар",
     "change-password": "Изменить пароль",
@@ -135,43 +175,79 @@
     "changePasswordPopup-title": "Изменить пароль",
     "changePermissionsPopup-title": "Изменить настройки доступа",
     "changeSettingsPopup-title": "Изменить Настройки",
+    "subtasks": "Подзадачи",
     "checklists": "Контрольные списки",
     "click-to-star": "Добавить в  «Избранное»",
     "click-to-unstar": "Удалить из «Избранного»",
     "clipboard": "Буфер обмена или drag & drop",
     "close": "Закрыть",
     "close-board": "Закрыть доску",
-    "close-board-pop": "Вы можете восстановить доску, нажав  “Корзина” в заголовке.",
+    "close-board-pop": "Вы сможете восстановить доску, нажав \"Архив\" в заголовке домашней страницы.",
     "color-black": "черный",
     "color-blue": "синий",
+    "color-crimson": "малиновый",
+    "color-darkgreen": "темно-зеленый",
+    "color-gold": "золотой",
+    "color-gray": "серый",
     "color-green": "зеленый",
+    "color-indigo": "индиго",
     "color-lime": "лимоновый",
+    "color-magenta": "маджента",
+    "color-mistyrose": "тускло-розовый",
+    "color-navy": "темно-синий",
     "color-orange": "оранжевый",
+    "color-paleturquoise": "бледно-бирюзовый",
+    "color-peachpuff": "персиковый",
     "color-pink": "розовый",
+    "color-plum": "сливовый",
     "color-purple": "фиолетовый",
     "color-red": "красный",
+    "color-saddlebrown": "кожано-коричневый",
+    "color-silver": "серебристый",
     "color-sky": "голубой",
+    "color-slateblue": "серо-голубой",
+    "color-white": "белый",
     "color-yellow": "желтый",
+    "unset-color": "Убрать",
     "comment": "Добавить комментарий",
     "comment-placeholder": "Написать комментарий",
     "comment-only": "Только комментирование",
     "comment-only-desc": "Может комментировать только карточки.",
+    "no-comments": "Без комментариев",
+    "no-comments-desc": "Не видит комментарии и историю действий.",
     "computer": "Загрузить с компьютера",
+    "confirm-subtask-delete-dialog": "Вы уверены, что хотите удалить подзадачу?",
     "confirm-checklist-delete-dialog": "Вы уверены, что хотите удалить контрольный список?",
     "copy-card-link-to-clipboard": "Копировать ссылку на карточку в буфер обмена",
+    "linkCardPopup-title": "Карточка-ссылка",
+    "searchElementPopup-title": "Поиск",
     "copyCardPopup-title": "Копировать карточку",
     "copyChecklistToManyCardsPopup-title": "Копировать шаблон контрольного списка в несколько карточек",
-    "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
-    "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"First card title\", \"description\":\"First card description\"}, {\"title\":\"Second card title\",\"description\":\"Second card description\"},{\"title\":\"Last card title\",\"description\":\"Last card description\"} ]",
+    "copyChecklistToManyCardsPopup-instructions": "Названия и описания целевых карт в формате JSON",
+    "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"Название первой карточки\", \"description\":\"Описание первой карточки\"}, {\"title\":\"Название второй карточки\",\"description\":\"Описание второй карточки\"},{\"title\":\"Название последней карточки\",\"description\":\"Описание последней карточки\"} ]",
     "create": "Создать",
     "createBoardPopup-title": "Создать доску",
     "chooseBoardSourcePopup-title": "Импортировать доску",
     "createLabelPopup-title": "Создать метку",
+    "createCustomField": "Создать поле",
+    "createCustomFieldPopup-title": "Создать поле",
     "current": "текущий",
+    "custom-field-delete-pop": "Отменить нельзя. Это удалит настраиваемое поле со всех карт и уничтожит его историю.",
+    "custom-field-checkbox": "Галочка",
+    "custom-field-date": "Дата",
+    "custom-field-dropdown": "Выпадающий список",
+    "custom-field-dropdown-none": "(нет)",
+    "custom-field-dropdown-options": "Параметры списка",
+    "custom-field-dropdown-options-placeholder": "Нажмите «Ввод», чтобы добавить дополнительные параметры.",
+    "custom-field-dropdown-unknown": "(неизвестно)",
+    "custom-field-number": "Номер",
+    "custom-field-text": "Текст",
+    "custom-fields": "Настраиваемые поля",
     "date": "Дата",
     "decline": "Отклонить",
     "default-avatar": "Аватар по умолчанию",
     "delete": "Удалить",
+    "deleteCustomFieldPopup-title": "Удалить настраиваемые поля?",
     "deleteLabelPopup-title": "Удалить метку?",
     "description": "Описание",
     "disambiguateMultiLabelPopup-title": "Разрешить конфликт меток",
@@ -183,9 +259,10 @@
     "edit-avatar": "Изменить аватар",
     "edit-profile": "Изменить профиль",
     "edit-wip-limit": " Изменить лимит на кол-во задач",
-    "soft-wip-limit": "Мягкий лимит на кол-во задач",
+    "soft-wip-limit": "Мягкий лимит",
     "editCardStartDatePopup-title": "Изменить дату начала",
     "editCardDueDatePopup-title": "Изменить дату выполнения",
+    "editCustomFieldPopup-title": "Редактировать поле",
     "editCardSpentTimePopup-title": "Изменить затраченное время",
     "editLabelPopup-title": "Изменить метки",
     "editNotificationPopup-title": "Редактировать уведомления",
@@ -195,7 +272,7 @@
     "email-enrollAccount-text": "Привет __user__,\n\nДля того, чтобы начать использовать сервис, просто нажми на ссылку ниже.\n\n__url__\n\nСпасибо.",
     "email-fail": "Отправка письма на EMail не удалась",
     "email-fail-text": "Ошибка при попытке отправить письмо",
-    "email-invalid": "Неверный адрес электронной почти",
+    "email-invalid": "Неверный адрес электронной почты",
     "email-invite": "Пригласить по электронной почте",
     "email-invite-subject": "__inviter__ прислал вам приглашение",
     "email-invite-text": "Дорогой __user__,\n\n__inviter__ пригласил вас присоединиться к доске \"__board__\" для сотрудничества.\n\nПожалуйста проследуйте по ссылке ниже:\n\n__url__\n\nСпасибо.",
@@ -222,30 +299,36 @@
     "filter-clear": "Очистить фильтр",
     "filter-no-label": "Нет метки",
     "filter-no-member": "Нет участников",
+    "filter-no-custom-fields": "Нет настраиваемых полей",
     "filter-on": "Включен фильтр",
     "filter-on-desc": "Показываются карточки, соответствующие настройкам фильтра. Нажмите для редактирования.",
     "filter-to-selection": "Filter to selection",
+    "advanced-filter-label": "Расширенный фильтр",
+    "advanced-filter-description": "Расширенный фильтр позволяет написать строку, содержащую следующие операторы: == != <= >= && || ( ) Пробел используется как разделитель между операторами. Можно фильтровать все настраиваемые поля, вводя их имена и значения. Например: Поле1 == Значение1. Примечание. Если поля или значения содержат пробелы, нужно взять их в одинарные кавычки. Например: 'Поле 1' == 'Значение 1'. Для одиночных управляющих символов (' \\/), которые нужно пропустить, следует использовать \\. Например: Field1 = I\\'m. Также  можно комбинировать несколько условий. Например: F1 == V1 || F1 == V2. Обычно все операторы интерпретируются слева направо, но можно изменить порядок, разместив скобки. Например: F1 == V1 && (F2 == V2 || F2 == V3). Также можно искать текстовые поля с помощью регулярных выражений: F1 == /Tes.*/i",
     "fullname": "Полное имя",
     "header-logo-title": "Вернуться к доскам.",
     "hide-system-messages": "Скрыть системные сообщения",
     "headerBarCreateBoardPopup-title": "Создать доску",
     "home": "Главная",
     "import": "Импорт",
+    "link": "Ссылка",
     "import-board": "импортировать доску",
     "import-board-c": "Импортировать доску",
     "import-board-title-trello": "Импортировать доску из Trello",
-    "import-board-title-wekan": "Импортировать доску из Wekan",
+    "import-board-title-wekan": "Импортировать доску, сохраненную ранее.",
+    "import-sandstorm-backup-warning": "Не удаляйте импортируемые данные из ранее сохраненной доски или Trello, пока не убедитесь, что импорт завершился успешно – удается закрыть и снова открыть доску, и не появляется ошибка «Доска не найдена», что означает потерю данных.",
     "import-sandstorm-warning": "Импортированная доска удалит все существующие данные на текущей доске и заменит её импортированной доской.",
     "from-trello": "Из Trello",
-    "from-wekan": "Из Wekan",
+    "from-wekan": "Сохраненную ранее",
     "import-board-instruction-trello": "На вашей Trello доске нажмите “Menu” - “More” - “Print and export - “Export JSON” и скопируйте полученный текст",
-    "import-board-instruction-wekan": "На вашей Wekan доске, перейдите в “Меню”, далее “Экспортировать доску” и скопируйте текст из скачаного файла",
+    "import-board-instruction-wekan": "На вашей доске перейдите в “Меню”, далее “Экспортировать доску” и скопируйте текст из скачаного файла",
+    "import-board-instruction-about-errors": "Даже если при импорте возникли ошибки, иногда импортирование проходит успешно – тогда доска появится на странице «Все доски».",
     "import-json-placeholder": "Вставьте JSON сюда",
     "import-map-members": "Составить карту участников",
-    "import-members-map": "Вы импортировали доску с участниками. Пожалуйста, составьте карту участников, которых вы хотите импортировать в качестве пользователей Wekan",
+    "import-members-map": "Вы импортировали доску с участниками. Пожалуйста, отметьте участников, которых вы хотите импортировать в качестве пользователей",
     "import-show-user-mapping": "Проверить карту участников",
-    "import-user-select": "Выберите пользователя Wekan, которого вы хотите использовать в качестве участника",
-    "importMapMembersAddPopup-title": "Выбрать участника Wekan",
+    "import-user-select": "Выберите существующего пользователя, которого вы хотите использовать в качестве участника",
+    "importMapMembersAddPopup-title": "Выбрать участника",
     "info": "Версия",
     "initials": "Инициалы",
     "invalid-date": "Неверная дата",
@@ -255,7 +338,7 @@
     "just-invited": "Вас только что пригласили на эту доску",
     "keyboard-shortcuts": "Сочетания клавиш",
     "label-create": "Создать метку",
-    "label-default": "%sметка (по умолчанию)",
+    "label-default": "%s (по умолчанию)",
     "label-delete-pop": "Это действие невозможно будет отменить. Эта метка будут удалена во всех карточках. Также будет удалена вся история этой метки.",
     "labels": "Метки",
     "language": "Язык",
@@ -264,17 +347,19 @@
     "leave-board-pop": "Вы уверенны, что хотите покинуть __boardTitle__? Вы будете удалены из всех карточек на этой доске.",
     "leaveBoardPopup-title": "Покинуть доску?",
     "link-card": "Доступна по ссылке",
-    "list-archive-cards": "Переместить все карточки в этом списке в Корзину",
-    "list-archive-cards-pop": "Это действие переместит все карточки в Корзину и они перестанут быть видимым на доске. Для просмотра карточек в Корзине и их восстановления нажмите “Меню” > “Корзина”.",
+    "list-archive-cards": "Переместить все карточки в этом списке в Архив",
+    "list-archive-cards-pop": "Это действие удалит все карточки из этого списка с доски. Чтобы просмотреть карточки в Архиве и вернуть их на доску, нажмите “Меню” > “Архив”.",
     "list-move-cards": "Переместить все карточки в этом списке",
     "list-select-cards": "Выбрать все карточки в этом списке",
+    "set-color-list": "Задать цвет",
     "listActionPopup-title": "Список действий",
     "swimlaneActionPopup-title": "Действия с дорожкой",
+    "swimlaneAddPopup-title": "Добавить дорожку ниже",
     "listImportCardPopup-title": "Импортировать Trello карточку",
     "listMorePopup-title": "Поделиться",
     "link-list": "Ссылка на список",
-    "list-delete-pop": "Все действия будут удалены из ленты активности участников и вы не сможете восстановить список. Данное действие необратимо.",
-    "list-delete-suggest-archive": "Вы можете переместить карточку в Корзину, чтобы удалить ее с доски и сохранить активность .",
+    "list-delete-pop": "Все действия будут удалены из ленты активности участников, и вы не сможете восстановить список. Данное действие необратимо.",
+    "list-delete-suggest-archive": "Вы можете отправить список в Архив, чтобы убрать его с доски и при этом сохранить результаты.",
     "lists": "Списки",
     "swimlanes": "Дорожки",
     "log-out": "Выйти",
@@ -290,13 +375,13 @@
     "moveSelectionPopup-title": "Переместить выделение",
     "multi-selection": "Выбрать несколько",
     "multi-selection-on": "Выбрать несколько из",
-    "muted": "Заглушен",
+    "muted": "Не беспокоить",
     "muted-info": "Вы НИКОГДА не будете уведомлены ни о каких изменениях в этой доске.",
     "my-boards": "Мои доски",
     "name": "Имя",
-    "no-archived-cards": "В Корзине нет никаких Карточек",
-    "no-archived-lists": "В Корзине нет никаких Списков",
-    "no-archived-swimlanes": "В Корзине нет никаких Дорожек",
+    "no-archived-cards": "Нет карточек в Архиве",
+    "no-archived-lists": "Нет списков в Архиве",
+    "no-archived-swimlanes": "Нет дорожек в Архиве",
     "no-results": "Ничего не найдено",
     "normal": "Обычный",
     "normal-desc": "Может редактировать карточки. Не может управлять настройками.",
@@ -332,6 +417,7 @@
     "restore": "Восстановить",
     "save": "Сохранить",
     "search": "Поиск",
+    "rules": "Правила",
     "search-cards": "Искать в названиях и описаниях карточек на этой доске",
     "search-example": "Искать текст?",
     "select-color": "Выбрать цвет",
@@ -366,6 +452,7 @@
     "title": "Название",
     "tracking": "Отслеживание",
     "tracking-info": "Вы будете уведомлены о любых изменениях в тех карточках, в которых вы являетесь создателем или участником.",
+    "type": "Тип",
     "unassign-member": "Отменить назначение участника",
     "unsaved-description": "У вас есть несохраненное описание.",
     "unwatch": "Перестать следить",
@@ -374,14 +461,17 @@
     "uploaded-avatar": "Загруженный аватар",
     "username": "Имя пользователя",
     "view-it": "Просмотреть",
-    "warn-list-archived": "Внимание: Данная карточка находится в списке, который перемещен в Корзину",
+    "warn-list-archived": "внимание: эта карточка из списка, который находится в Архиве",
     "watch": "Следить",
-    "watching": "Отслеживается",
+    "watching": "Полный контроль",
     "watching-info": "Вы будете уведомлены об любых изменениях в этой доске.",
     "welcome-board": "Приветственная Доска",
     "welcome-swimlane": "Этап 1",
     "welcome-list1": "Основы",
     "welcome-list2": "Расширенно",
+    "card-templates-swimlane": "Шаблоны карточек",
+    "list-templates-swimlane": "Шаблоны списков",
+    "board-templates-swimlane": "Шаблоны досок",
     "what-to-do": "Что вы хотите сделать?",
     "wipLimitErrorPopup-title": "Некорректный лимит на кол-во задач",
     "wipLimitErrorPopup-dialog-pt1": "Количество задач в этом списке превышает установленный вами лимит",
@@ -407,40 +497,197 @@
     "send-smtp-test": "Отправьте тестовое письмо себе",
     "invitation-code": "Код приглашения",
     "email-invite-register-subject": "__inviter__ прислал вам приглашение",
-    "email-invite-register-text": "Уважаемый __user__,\n\n__inviter__ приглашает вас в Wekan для сотрудничества.\n\nПожалуйста, проследуйте по ссылке:\n__url__\n\nВаш код приглашения: __icode__\n\nСпасибо.",
-    "email-smtp-test-subject": "SMTP Тестовое письмо от Wekan",
+    "email-invite-register-text": "Уважаемый __user__,\n\n__inviter__ приглашает вас использовать канбан-доску для совместной работы.\n\nПожалуйста, проследуйте по ссылке:\n__url__\n\nКод вашего приглашения: __icode__\n\nСпасибо.",
+    "email-smtp-test-subject": "Тестовое письмо SMTP",
     "email-smtp-test-text": "Вы успешно отправили письмо",
     "error-invitation-code-not-exist": "Код приглашения не существует",
     "error-notAuthorized": "У вас нет доступа на просмотр этой страницы.",
     "outgoing-webhooks": "Исходящие Веб-хуки",
     "outgoingWebhooksPopup-title": "Исходящие Веб-хуки",
+    "boardCardTitlePopup-title": "Фильтр названий карточек",
     "new-outgoing-webhook": "Новый исходящий Веб-хук",
     "no-name": "(Неизвестный)",
-    "Wekan_version": "Версия Wekan",
     "Node_version": "Версия NodeJS",
     "OS_Arch": "Архитектура",
     "OS_Cpus": "Количество процессоров",
     "OS_Freemem": "Свободная память",
     "OS_Loadavg": "Средняя загрузка",
     "OS_Platform": "Платформа",
-    "OS_Release": "Релиз",
+    "OS_Release": "Версия ядра",
     "OS_Totalmem": "Общая память",
     "OS_Type": "Тип ОС",
     "OS_Uptime": "Время работы",
+    "days": "дней",
     "hours": "часы",
     "minutes": "минуты",
     "seconds": "секунды",
+    "show-field-on-card": "Показать это поле на карточке",
+    "automatically-field-on-card": "Cоздавать поле во всех новых карточках",
+    "showLabel-field-on-card": "Показать имя поля на карточке",
     "yes": "Да",
     "no": "Нет",
     "accounts": "Учетные записи",
     "accounts-allowEmailChange": "Разрешить изменение электронной почты",
-    "createdAt": "Создано на",
-    "verified": "Проверено",
+    "accounts-allowUserNameChange": "Разрешить изменение имени пользователя",
+    "createdAt": "Создан",
+    "verified": "Подтвержден",
     "active": "Действующий",
     "card-received": "Получено",
     "card-received-on": "Получено с",
-    "card-end": "Дата окончания",
+    "card-end": "Завершено",
     "card-end-on": "Завершится до",
     "editCardReceivedDatePopup-title": "Изменить дату получения",
-    "editCardEndDatePopup-title": "Изменить дату завершения"
-}
+    "editCardEndDatePopup-title": "Изменить дату завершения",
+    "setCardColorPopup-title": "Задать цвет",
+    "setCardActionsColorPopup-title": "Выберите цвет",
+    "setSwimlaneColorPopup-title": "Выберите цвет",
+    "setListColorPopup-title": "Выберите цвет",
+    "assigned-by": "Поручил",
+    "requested-by": "Запросил",
+    "board-delete-notice": "Удаление является постоянным. Вы потеряете все списки, карты и действия, связанные с этой доской.",
+    "delete-board-confirm-popup": "Все списки, карточки, метки и действия будут удалены, и вы не сможете восстановить содержимое доски. Отменить нельзя.",
+    "boardDeletePopup-title": "Удалить доску?",
+    "delete-board": "Удалить доску",
+    "default-subtasks-board": "Подзадача для доски __board__ ",
+    "default": "По умолчанию",
+    "queue": "Очередь",
+    "subtask-settings": "Настройки подзадач",
+    "boardSubtaskSettingsPopup-title": "Настройки подзадач для доски",
+    "show-subtasks-field": "Разрешить подзадачи",
+    "deposit-subtasks-board": "Отправлять подзадачи на доску:",
+    "deposit-subtasks-list": "Размещать подзадачи, отправленные на эту доску, в списке:",
+    "show-parent-in-minicard": "Указывать исходную карточку:",
+    "prefix-with-full-path": "Cверху, полный путь",
+    "prefix-with-parent": "Сверху, только имя",
+    "subtext-with-full-path": "Cнизу, полный путь",
+    "subtext-with-parent": "Снизу, только имя",
+    "change-card-parent": "Сменить исходную карточку",
+    "parent-card": "Исходная карточка",
+    "source-board": "Исходная доска",
+    "no-parent": "Не указывать",
+    "activity-added-label": "добавил метку '%s' на %s",
+    "activity-removed-label": "удалил метку '%s' с %s",
+    "activity-delete-attach": "удалил вложение из %s",
+    "activity-added-label-card": "добавил метку '%s'",
+    "activity-removed-label-card": "удалил метку '%s'",
+    "activity-delete-attach-card": "удалил вложение",
+    "activity-set-customfield": "сменил значение поля '%s' на '%s' в карточке %s",
+    "activity-unset-customfield": "очистил поле '%s' в карточке %s",
+    "r-rule": "Правило",
+    "r-add-trigger": "Задать условие",
+    "r-add-action": "Задать действие",
+    "r-board-rules": "Правила доски",
+    "r-add-rule": "Добавить правило",
+    "r-view-rule": "Показать правило",
+    "r-delete-rule": "Удалить правило",
+    "r-new-rule-name": "Имя нового правила",
+    "r-no-rules": "Нет правил",
+    "r-when-a-card": "Когда карточка",
+    "r-is": " ",
+    "r-is-moved": "перемещается",
+    "r-added-to": "добавляется в",
+    "r-removed-from": "Покидает",
+    "r-the-board": "доску",
+    "r-list": "список",
+    "set-filter": "Установить фильтр",
+    "r-moved-to": "Перемещается в",
+    "r-moved-from": "Покидает",
+    "r-archived": "Перемещена в архив",
+    "r-unarchived": "Восстановлена из архива",
+    "r-a-card": "карточку",
+    "r-when-a-label-is": "Когда метка",
+    "r-when-the-label-is": "Когда метка",
+    "r-list-name": "имя",
+    "r-when-a-member": "Когда участник",
+    "r-when-the-member": "Когда участник",
+    "r-name": "имя",
+    "r-when-a-attach": "Когда вложение",
+    "r-when-a-checklist": "Когда контрольный список",
+    "r-when-the-checklist": "Когда контрольный список",
+    "r-completed": "Завершен",
+    "r-made-incomplete": "Вновь открыт",
+    "r-when-a-item": "Когда пункт контрольного списка",
+    "r-when-the-item": "Когда пункт контрольного списка",
+    "r-checked": "Отмечен",
+    "r-unchecked": "Снят",
+    "r-move-card-to": "Переместить карточку в",
+    "r-top-of": "Начало",
+    "r-bottom-of": "Конец",
+    "r-its-list": "текущего списка",
+    "r-archive": "Переместить в архив",
+    "r-unarchive": "Восстановить из Архива",
+    "r-card": "карточку",
+    "r-add": "Создать",
+    "r-remove": "Удалить",
+    "r-label": "метку",
+    "r-member": "участника",
+    "r-remove-all": "Удалить всех участников из карточки",
+    "r-set-color": "Сменить цвет на",
+    "r-checklist": "контрольный список",
+    "r-check-all": "Отметить все",
+    "r-uncheck-all": "Снять все",
+    "r-items-check": "пункты контрольного списка",
+    "r-check": "Отметить",
+    "r-uncheck": "Снять",
+    "r-item": "пункт",
+    "r-of-checklist": "контрольного списка",
+    "r-send-email": "Отправить письмо",
+    "r-to": "кому",
+    "r-subject": "тема",
+    "r-rule-details": "Содержание правила",
+    "r-d-move-to-top-gen": "Переместить карточку в начало текущего списка",
+    "r-d-move-to-top-spec": "Переместить карточку в начало списка",
+    "r-d-move-to-bottom-gen": "Переместить карточку в конец текущего списка",
+    "r-d-move-to-bottom-spec": "Переместить карточку в конец списка",
+    "r-d-send-email": "Отправить письмо",
+    "r-d-send-email-to": "кому",
+    "r-d-send-email-subject": "тема",
+    "r-d-send-email-message": "сообщение",
+    "r-d-archive": "Переместить карточку в Архив",
+    "r-d-unarchive": "Восстановить карточку из Архива",
+    "r-d-add-label": "Добавить метку",
+    "r-d-remove-label": "Удалить метку",
+    "r-create-card": "Создать новую карточку",
+    "r-in-list": "в списке",
+    "r-in-swimlane": "в дорожке",
+    "r-d-add-member": "Добавить участника",
+    "r-d-remove-member": "Удалить участника",
+    "r-d-remove-all-member": "Удалить всех участников",
+    "r-d-check-all": "Отметить все пункты в списке",
+    "r-d-uncheck-all": "Снять все пункты в списке",
+    "r-d-check-one": "Отметить пункт",
+    "r-d-uncheck-one": "Снять пункт",
+    "r-d-check-of-list": "контрольного списка",
+    "r-d-add-checklist": "Добавить контрольный список",
+    "r-d-remove-checklist": "Удалить контрольный список",
+    "r-by": "пользователем",
+    "r-add-checklist": "Добавить контрольный список",
+    "r-with-items": "с пунктами",
+    "r-items-list": "пункт1,пункт2,пункт3",
+    "r-add-swimlane": "Добавить дорожку",
+    "r-swimlane-name": "имя",
+    "r-board-note": "Примечание: пустое поле соответствует любым возможным значениям.",
+    "r-checklist-note": "Примечание: пункты контрольных списков при перечислении разделяются запятыми.",
+    "r-when-a-card-is-moved": "Когда карточка перемещена в другой список",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Способ авторизации",
+    "authentication-type": "Тип авторизации",
+    "custom-product-name": "Собственное наименование",
+    "layout": "Внешний вид",
+    "hide-logo": "Скрыть логотип",
+    "add-custom-html-after-body-start": "Добавить HTML после начала <body> ",
+    "add-custom-html-before-body-end": "Добавить HTML до завершения </body>",
+    "error-undefined": "Что-то пошло не так",
+    "error-ldap-login": "Ошибка при попытке авторизации",
+    "display-authentication-method": "Показывать способ авторизации",
+    "default-authentication-method": "Способ авторизации по умолчанию",
+    "duplicate-board": "Клонировать доску",
+    "people-number": "Количество человек:",
+    "swimlaneDeletePopup-title": "Удалить дорожку?",
+    "swimlane-delete-pop": "Все действия будут удалены из ленты активности участников, и вы не сможете восстановить дорожку. Данное действие необратимо.",
+    "restore-all": "Восстановить все",
+    "delete-all": "Удалить все",
+    "loading": "Идет загрузка, пожалуйста подождите"
+}
\ No newline at end of file
diff --git a/i18n/sr.i18n.json b/i18n/sr.i18n.json
index 66ffe5a4..c23e2162 100644
--- a/i18n/sr.i18n.json
+++ b/i18n/sr.i18n.json
@@ -1,35 +1,51 @@
 {
     "accept": "Prihvati",
-    "act-activity-notify": "[Wekan] Obaveštenje o aktivnostima",
-    "act-addAttachment": "attached __attachment__ to __card__",
-    "act-addChecklist": "added checklist __checklist__ to __card__",
-    "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__",
-    "act-addComment": "commented on __card__: __comment__",
-    "act-createBoard": "created __board__",
-    "act-createCard": "added __card__ to __list__",
-    "act-createList": "added __list__ to __board__",
-    "act-addBoardMember": "added __member__ to __board__",
-    "act-archivedBoard": "__board__ moved to Recycle Bin",
-    "act-archivedCard": "__card__ moved to Recycle Bin",
-    "act-archivedList": "__list__ moved to Recycle Bin",
-    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
-    "act-importBoard": "imported __board__",
-    "act-importCard": "imported __card__",
-    "act-importList": "imported __list__",
-    "act-joinMember": "added __member__ to __card__",
-    "act-moveCard": "moved __card__ from __oldList__ to __list__",
-    "act-removeBoardMember": "removed __member__ from __board__",
-    "act-restoredCard": "restored __card__ to __board__",
-    "act-unjoinMember": "removed __member__ from __card__",
-    "act-withBoardTitle": "[Wekan] __board__",
+    "act-activity-notify": "Activity Notification",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__board__",
     "act-withCardTitle": "[__board__] __card__",
     "actions": "Akcije",
     "activities": "Aktivnosti",
     "activity": "Aktivnost",
     "activity-added": "dodao %s u %s",
-    "activity-archived": "%s moved to Recycle Bin",
+    "activity-archived": "%s moved to Archive",
     "activity-attached": "prikačio %s u %s",
     "activity-created": "kreirao %s",
+    "activity-customfield-created": "created custom field %s",
     "activity-excluded": "izuzmi %s iz %s",
     "activity-imported": "uvezao %s u %s iz %s",
     "activity-imported-board": "uvezao %s iz %s",
@@ -39,13 +55,25 @@
     "activity-removed": "uklonio %s iz %s",
     "activity-sent": "poslao %s %s-u",
     "activity-unjoined": "rastavio %s",
+    "activity-subtask-added": "added subtask to %s",
+    "activity-checked-item": "checked %s in checklist %s of %s",
+    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
     "activity-checklist-added": "lista je dodata u %s",
+    "activity-checklist-removed": "removed a checklist from %s",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
     "activity-checklist-item-added": "added checklist item to '%s' in %s",
+    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
     "add": "Dodaj",
+    "activity-checked-item-card": "checked %s in checklist %s",
+    "activity-unchecked-item-card": "unchecked %s in checklist %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
     "add-attachment": "Add Attachment",
     "add-board": "Add Board",
     "add-card": "Add Card",
     "add-swimlane": "Add Swimlane",
+    "add-subtask": "Add Subtask",
     "add-checklist": "Add Checklist",
     "add-checklist-item": "Dodaj novu stavku u listu",
     "add-cover": "Dodaj zaglavlje",
@@ -63,20 +91,22 @@
     "and-n-other-card": "And __count__ other card",
     "and-n-other-card_plural": "And __count__ other cards",
     "apply": "Primeni",
-    "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Move to Recycle Bin",
-    "archive-all": "Move All to Recycle Bin",
-    "archive-board": "Move Board to Recycle Bin",
-    "archive-card": "Move Card to Recycle Bin",
-    "archive-list": "Move List to Recycle Bin",
-    "archive-swimlane": "Move Swimlane to Recycle Bin",
-    "archive-selection": "Move selection to Recycle Bin",
-    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
-    "archived-items": "Recycle Bin",
-    "archived-boards": "Boards in Recycle Bin",
+    "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
+    "archive": "Move to Archive",
+    "archive-all": "Move All to Archive",
+    "archive-board": "Move Board to Archive",
+    "archive-card": "Move Card to Archive",
+    "archive-list": "Move List to Archive",
+    "archive-swimlane": "Move Swimlane to Archive",
+    "archive-selection": "Move selection to Archive",
+    "archiveBoardPopup-title": "Move Board to Archive?",
+    "archived-items": "Arhiviraj",
+    "archived-boards": "Boards in Archive",
     "restore-board": "Restore Board",
-    "no-archived-boards": "No Boards in Recycle Bin.",
-    "archives": "Recycle Bin",
+    "no-archived-boards": "No Boards in Archive.",
+    "archives": "Arhiviraj",
+    "template": "Template",
+    "templates": "Templates",
     "assign-member": "Dodeli člana",
     "attached": "Prikačeno",
     "attachment": "Prikačeni dokument",
@@ -95,22 +125,25 @@
     "boardChangeTitlePopup-title": "Preimenuj tablu",
     "boardChangeVisibilityPopup-title": "Promeni Vidljivost",
     "boardChangeWatchPopup-title": "Change Watch",
-    "boardMenuPopup-title": "Meni table",
+    "boardMenuPopup-title": "Board Settings",
     "boards": "Table",
     "board-view": "Board View",
+    "board-view-cal": "Calendar",
     "board-view-swimlanes": "Swimlanes",
     "board-view-lists": "Lists",
     "bucket-example": "Na primer \"Lista zadataka\"",
     "cancel": "Otkaži",
-    "card-archived": "This card is moved to Recycle Bin.",
+    "card-archived": "This card is moved to Archive.",
+    "board-archived": "This board is moved to Archive.",
     "card-comments-title": "Ova kartica ima %s komentar.",
     "card-delete-notice": "Brisanje je trajno. Izgubićeš sve akcije povezane sa ovom karticom.",
     "card-delete-pop": "Sve akcije će biti uklonjene sa liste aktivnosti i kartica neće moći biti ponovo otvorena. Nema vraćanja unazad.",
-    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
     "card-due": "Krajnji datum",
     "card-due-on": "Završava se",
     "card-spent": "Spent Time",
     "card-edit-attachments": "Uredi priloge",
+    "card-edit-custom-fields": "Edit custom fields",
     "card-edit-labels": "Uredi natpise",
     "card-edit-members": "Uredi članove",
     "card-labels-title": "Promeni natpis na kartici.",
@@ -118,13 +151,20 @@
     "card-start": "Početak",
     "card-start-on": "Počinje",
     "cardAttachmentsPopup-title": "Attach From",
+    "cardCustomField-datePopup-title": "Change date",
+    "cardCustomFieldsPopup-title": "Edit custom fields",
     "cardDeletePopup-title": "Delete Card?",
     "cardDetailsActionsPopup-title": "Card Actions",
     "cardLabelsPopup-title": "Labels",
     "cardMembersPopup-title": "Članovi",
     "cardMorePopup-title": "More",
+    "cardTemplatePopup-title": "Create template",
     "cards": "Cards",
     "cards-count": "Cards",
+    "casSignIn": "Sign In with CAS",
+    "cardType-card": "Card",
+    "cardType-linkedCard": "Linked Card",
+    "cardType-linkedBoard": "Linked Board",
     "change": "Change",
     "change-avatar": "Change Avatar",
     "change-password": "Change Password",
@@ -135,30 +175,52 @@
     "changePasswordPopup-title": "Change Password",
     "changePermissionsPopup-title": "Change Permissions",
     "changeSettingsPopup-title": "Izmeni podešavanja",
+    "subtasks": "Subtasks",
     "checklists": "Liste",
     "click-to-star": "Click to star this board.",
     "click-to-unstar": "Click to unstar this board.",
     "clipboard": "Clipboard or drag & drop",
     "close": "Close",
     "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
     "color-black": "black",
     "color-blue": "blue",
+    "color-crimson": "crimson",
+    "color-darkgreen": "darkgreen",
+    "color-gold": "gold",
+    "color-gray": "gray",
     "color-green": "green",
+    "color-indigo": "indigo",
     "color-lime": "lime",
+    "color-magenta": "magenta",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "navy",
     "color-orange": "orange",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
     "color-pink": "pink",
+    "color-plum": "plum",
     "color-purple": "purple",
     "color-red": "red",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "silver",
     "color-sky": "sky",
+    "color-slateblue": "slateblue",
+    "color-white": "white",
     "color-yellow": "yellow",
+    "unset-color": "Unset",
     "comment": "Comment",
     "comment-placeholder": "Write Comment",
     "comment-only": "Comment only",
     "comment-only-desc": "Can comment on cards only.",
+    "no-comments": "No comments",
+    "no-comments-desc": "Can not see comments and activities.",
     "computer": "Computer",
-    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist",
+    "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?",
+    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
     "copy-card-link-to-clipboard": "Copy card link to clipboard",
+    "linkCardPopup-title": "Link Card",
+    "searchElementPopup-title": "Pretraga",
     "copyCardPopup-title": "Copy Card",
     "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
     "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
@@ -167,11 +229,25 @@
     "createBoardPopup-title": "Create Board",
     "chooseBoardSourcePopup-title": "Import board",
     "createLabelPopup-title": "Create Label",
+    "createCustomField": "Create Field",
+    "createCustomFieldPopup-title": "Create Field",
     "current": "current",
+    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
+    "custom-field-checkbox": "Checkbox",
+    "custom-field-date": "Datum",
+    "custom-field-dropdown": "Dropdown List",
+    "custom-field-dropdown-none": "(none)",
+    "custom-field-dropdown-options": "List Options",
+    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
+    "custom-field-dropdown-unknown": "(unknown)",
+    "custom-field-number": "Number",
+    "custom-field-text": "Text",
+    "custom-fields": "Custom Fields",
     "date": "Datum",
     "decline": "Decline",
     "default-avatar": "Default avatar",
     "delete": "Delete",
+    "deleteCustomFieldPopup-title": "Delete Custom Field?",
     "deleteLabelPopup-title": "Delete Label?",
     "description": "Description",
     "disambiguateMultiLabelPopup-title": "Disambiguate Label Action",
@@ -186,6 +262,7 @@
     "soft-wip-limit": "Soft WIP Limit",
     "editCardStartDatePopup-title": "Izmeni početni datum",
     "editCardDueDatePopup-title": "Izmeni krajnji datum",
+    "editCustomFieldPopup-title": "Edit Field",
     "editCardSpentTimePopup-title": "Change spent time",
     "editLabelPopup-title": "Change Label",
     "editNotificationPopup-title": "Izmeni notifikaciju",
@@ -222,30 +299,36 @@
     "filter-clear": "Clear filter",
     "filter-no-label": "Nema oznake",
     "filter-no-member": "Nema člana",
+    "filter-no-custom-fields": "No Custom Fields",
     "filter-on": "Filter is on",
     "filter-on-desc": "You are filtering cards on this board. Click here to edit filter.",
     "filter-to-selection": "Filter to selection",
+    "advanced-filter-label": "Advanced Filter",
+    "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) to be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
     "fullname": "Full Name",
     "header-logo-title": "Go back to your boards page.",
     "hide-system-messages": "Sakrij sistemske poruke",
     "headerBarCreateBoardPopup-title": "Create Board",
     "home": "Home",
     "import": "Import",
+    "link": "Link",
     "import-board": "import board",
     "import-board-c": "Import board",
     "import-board-title-trello": "Uvezi tablu iz Trella",
-    "import-board-title-wekan": "Import board from Wekan",
+    "import-board-title-wekan": "Import board from previous export",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
     "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
     "from-trello": "From Trello",
-    "from-wekan": "From Wekan",
+    "from-wekan": "From previous export",
     "import-board-instruction-trello": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text",
-    "import-board-instruction-wekan": "In your Wekan board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
     "import-json-placeholder": "Paste your valid JSON data here",
     "import-map-members": "Mapiraj članove",
-    "import-members-map": "Your imported board has some members. Please map the members you want to import to Wekan users",
+    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
     "import-show-user-mapping": "Review members mapping",
-    "import-user-select": "Pick the Wekan user you want to use as this member",
-    "importMapMembersAddPopup-title": "Izaberi člana Wekan-a",
+    "import-user-select": "Pick your existing user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select member",
     "info": "Version",
     "initials": "Initials",
     "invalid-date": "Neispravan datum",
@@ -264,17 +347,19 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "Link to this card",
-    "list-archive-cards": "Move all cards in this list to Recycle Bin",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
+    "list-archive-cards": "Move all cards in this list to Archive",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "List Actions",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Import a Trello card",
     "listMorePopup-title": "More",
     "link-list": "Link to this list",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
     "lists": "Lists",
     "swimlanes": "Swimlanes",
     "log-out": "Log Out",
@@ -294,9 +379,9 @@
     "muted-info": "Nećete biti obavešteni o promenama u ovoj tabli",
     "my-boards": "My Boards",
     "name": "Name",
-    "no-archived-cards": "No cards in Recycle Bin.",
-    "no-archived-lists": "No lists in Recycle Bin.",
-    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
+    "no-archived-cards": "No cards in Archive.",
+    "no-archived-lists": "No lists in Archive.",
+    "no-archived-swimlanes": "No swimlanes in Archive.",
     "no-results": "Nema rezultata",
     "normal": "Normalno",
     "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -332,6 +417,7 @@
     "restore": "Oporavi",
     "save": "Snimi",
     "search": "Pretraga",
+    "rules": "Rules",
     "search-cards": "Search from card titles and descriptions on this board",
     "search-example": "Text to search for?",
     "select-color": "Select Color",
@@ -366,6 +452,7 @@
     "title": "Naslov",
     "tracking": "Praćenje",
     "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
+    "type": "Type",
     "unassign-member": "Unassign member",
     "unsaved-description": "Imaš nesnimljen opis.",
     "unwatch": "Ne posmatraj",
@@ -374,7 +461,7 @@
     "uploaded-avatar": "Uploaded an avatar",
     "username": "Korisničko ime",
     "view-it": "Pregledaj je",
-    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
+    "warn-list-archived": "warning: this card is in an list at Archive",
     "watch": "Posmatraj",
     "watching": "Posmatranje",
     "watching-info": "Bićete obavešteni o promenama u ovoj tabli",
@@ -382,6 +469,9 @@
     "welcome-swimlane": "Milestone 1",
     "welcome-list1": "Osnove",
     "welcome-list2": "Napredno",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
     "what-to-do": "Šta želiš da uradiš ?",
     "wipLimitErrorPopup-title": "Invalid WIP Limit",
     "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
@@ -407,16 +497,16 @@
     "send-smtp-test": "Send a test email to yourself",
     "invitation-code": "Invitation Code",
     "email-invite-register-subject": "__inviter__ sent you an invitation",
-    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to Wekan for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
-    "email-smtp-test-subject": "SMTP Test Email From Wekan",
+    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email",
     "email-smtp-test-text": "You have successfully sent an email",
     "error-invitation-code-not-exist": "Invitation code doesn't exist",
     "error-notAuthorized": "You are not authorized to view this page.",
     "outgoing-webhooks": "Outgoing Webhooks",
     "outgoingWebhooksPopup-title": "Outgoing Webhooks",
+    "boardCardTitlePopup-title": "Card Title Filter",
     "new-outgoing-webhook": "New Outgoing Webhook",
     "no-name": "(Unknown)",
-    "Wekan_version": "Wekan version",
     "Node_version": "Node version",
     "OS_Arch": "OS Arch",
     "OS_Cpus": "OS CPU Count",
@@ -427,13 +517,18 @@
     "OS_Totalmem": "OS Total Memory",
     "OS_Type": "OS Type",
     "OS_Uptime": "OS Uptime",
+    "days": "days",
     "hours": "hours",
     "minutes": "minutes",
     "seconds": "seconds",
+    "show-field-on-card": "Show this field on card",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
     "yes": "Yes",
     "no": "No",
     "accounts": "Accounts",
     "accounts-allowEmailChange": "Allow Email Change",
+    "accounts-allowUserNameChange": "Allow Username Change",
     "createdAt": "Created at",
     "verified": "Verified",
     "active": "Active",
@@ -442,5 +537,157 @@
     "card-end": "End",
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
-    "editCardEndDatePopup-title": "Change end date"
-}
+    "editCardEndDatePopup-title": "Change end date",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "Assigned By",
+    "requested-by": "Requested By",
+    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
+    "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
+    "boardDeletePopup-title": "Delete Board?",
+    "delete-board": "Delete Board",
+    "default-subtasks-board": "Subtasks for __board__ board",
+    "default": "Default",
+    "queue": "Queue",
+    "subtask-settings": "Subtasks Settings",
+    "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
+    "show-subtasks-field": "Cards can have subtasks",
+    "deposit-subtasks-board": "Deposit subtasks to this board:",
+    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
+    "show-parent-in-minicard": "Show parent in minicard:",
+    "prefix-with-full-path": "Prefix with full path",
+    "prefix-with-parent": "Prefix with parent",
+    "subtext-with-full-path": "Subtext with full path",
+    "subtext-with-parent": "Subtext with parent",
+    "change-card-parent": "Change card's parent",
+    "parent-card": "Parent card",
+    "source-board": "Source board",
+    "no-parent": "Don't show parent",
+    "activity-added-label": "added label '%s' to %s",
+    "activity-removed-label": "removed label '%s' from %s",
+    "activity-delete-attach": "deleted an attachment from %s",
+    "activity-added-label-card": "added label '%s'",
+    "activity-removed-label-card": "removed label '%s'",
+    "activity-delete-attach-card": "deleted an attachment",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "r-rule": "Rule",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "Add action",
+    "r-board-rules": "Board rules",
+    "r-add-rule": "Add rule",
+    "r-view-rule": "View rule",
+    "r-delete-rule": "Delete rule",
+    "r-new-rule-name": "New rule title",
+    "r-no-rules": "No rules",
+    "r-when-a-card": "When a card",
+    "r-is": "is",
+    "r-is-moved": "is moved",
+    "r-added-to": "added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "the board",
+    "r-list": "list",
+    "set-filter": "Set Filter",
+    "r-moved-to": "Moved to",
+    "r-moved-from": "Moved from",
+    "r-archived": "Moved to Archive",
+    "r-unarchived": "Restored from Archive",
+    "r-a-card": "a card",
+    "r-when-a-label-is": "When a label is",
+    "r-when-the-label-is": "When the label is",
+    "r-list-name": "list name",
+    "r-when-a-member": "When a member is",
+    "r-when-the-member": "When the member",
+    "r-name": "name",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "r-when-the-item": "When the checklist item",
+    "r-checked": "Checked",
+    "r-unchecked": "Unchecked",
+    "r-move-card-to": "Move card to",
+    "r-top-of": "Top of",
+    "r-bottom-of": "Bottom of",
+    "r-its-list": "its list",
+    "r-archive": "Move to Archive",
+    "r-unarchive": "Restore from Archive",
+    "r-card": "card",
+    "r-add": "Dodaj",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-set-color": "Set color to",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "subject",
+    "r-rule-details": "Rule details",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Move card to top of list",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Move card to bottom of list",
+    "r-d-send-email": "Send email",
+    "r-d-send-email-to": "to",
+    "r-d-send-email-subject": "subject",
+    "r-d-send-email-message": "message",
+    "r-d-archive": "Move card to Archive",
+    "r-d-unarchive": "Restore card from Archive",
+    "r-d-add-label": "Add label",
+    "r-d-remove-label": "Remove label",
+    "r-create-card": "Create new card",
+    "r-in-list": "in list",
+    "r-in-swimlane": "in swimlane",
+    "r-d-add-member": "Add member",
+    "r-d-remove-member": "Remove member",
+    "r-d-remove-all-member": "Remove all member",
+    "r-d-check-all": "Check all items of a list",
+    "r-d-uncheck-all": "Uncheck all items of a list",
+    "r-d-check-one": "Check item",
+    "r-d-uncheck-one": "Uncheck item",
+    "r-d-check-of-list": "of checklist",
+    "r-d-add-checklist": "Add checklist",
+    "r-d-remove-checklist": "Remove checklist",
+    "r-by": "by",
+    "r-add-checklist": "Add checklist",
+    "r-with-items": "with items",
+    "r-items-list": "item1,item2,item3",
+    "r-add-swimlane": "Add swimlane",
+    "r-swimlane-name": "swimlane name",
+    "r-board-note": "Note: leave a field empty to match every possible value.",
+    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout",
+    "hide-logo": "Hide Logo",
+    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
+    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
+    "error-undefined": "Something went wrong",
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
+}
\ No newline at end of file
diff --git a/i18n/sv.i18n.json b/i18n/sv.i18n.json
index e923fdf5..13243d9a 100644
--- a/i18n/sv.i18n.json
+++ b/i18n/sv.i18n.json
@@ -1,35 +1,51 @@
 {
     "accept": "Acceptera",
-    "act-activity-notify": "[Wekan] Aktivitetsavisering",
-    "act-addAttachment": "bifogade __attachment__ to __card__",
-    "act-addChecklist": "lade till checklist __checklist__ till __card__",
-    "act-addChecklistItem": "lade till __checklistItem__ till checklistan __checklist__ on __card__",
-    "act-addComment": "kommenterade __card__: __comment__",
-    "act-createBoard": "skapade __board__",
-    "act-createCard": "lade till __card__ to __list__",
-    "act-createList": "lade till __list__ to __board__",
-    "act-addBoardMember": "lade till __member__ to __board__",
-    "act-archivedBoard": "__board__ flyttad till papperskorgen",
-    "act-archivedCard": "__card__ flyttad till papperskorgen",
-    "act-archivedList": "__list__ flyttad till papperskorgen",
-    "act-archivedSwimlane": "__swimlane__ flyttad till papperskorgen",
-    "act-importBoard": "importerade __board__",
-    "act-importCard": "importerade __card__",
-    "act-importList": "importerade __list__",
-    "act-joinMember": "lade __member__ till __card__",
-    "act-moveCard": "flyttade __card__ från __oldList__ till __list__",
-    "act-removeBoardMember": "tog bort __member__ från __board__",
-    "act-restoredCard": "återställde __card__ to __board__",
-    "act-unjoinMember": "tog bort __member__ from __card__",
-    "act-withBoardTitle": "[Wekan] __board__",
+    "act-activity-notify": "Aktivitetsnotifikation",
+    "act-addAttachment": "la till bifogad fil __attachment__ på kort __card__ i lista __list__ i simbana __swimlane__ på tavla __board__",
+    "act-deleteAttachment": "raderade bifogad fil __attachment__ från kort __card__ i lista __list__ i simbana __swimlane__ på tavla __board__",
+    "act-addSubtask": "la till underaktivitet __subtask__ på kort __card__ i lista __list__ i simbana __swimlane__ på tavla __board__",
+    "act-addLabel": "la till etikett __label__ på kort __card__ i lista __list__ i simbana __swimlane__ på tavla __board__",
+    "act-addedLabel": "la till etikett __label__ på kort __card__ i lista __list__ i simbana __swimlane__ på tavla __board__",
+    "act-removeLabel": "Tog bort etikett __label__ från kort __card__ i lista __list__ i simbana __swimlane__ på tavla __board__",
+    "act-removedLabel": "Tog bort etikett __label__ från kort __card__ i lista __list__ i simbana __swimlane__ på tavla __board__",
+    "act-addChecklist": "la till checklista __checklist__ på kort __card__ i lista __list__ i simbana __swimlane__ på tavla __board__",
+    "act-addChecklistItem": "la till checklistobjekt __checklistItem__ till checklista __checklist__ på kort __card__ i lista __list__ i simbana __swimlane__ på tavla __board__",
+    "act-removeChecklist": "tag bort checklista __checklist__ från kort __card__ i lista __list__ i simbana __swimlane__ på tavla __board__",
+    "act-removeChecklistItem": "tog bort checklistobjekt __checklistItem__ från __checklist__ på kort __card__ i lista __list__ i simbana __swimlane__ på tavla __board__",
+    "act-checkedItem": "bockade av __checklistItem__ från checklista __checklist__ på kort __card__ i lista __list__ i simbana __swimlane__ på tavla __board__",
+    "act-uncheckedItem": "avmarkerade __checklistItem__ från checklista __checklist__ på kort __card__ i lista __list__ i simbana __swimlane__ på tavla __board__",
+    "act-completeChecklist": "slutförde checklista __checklist__ i kort __card__ i lista __list__ i  simbana __swimlane__ på tavla __board__",
+    "act-uncompleteChecklist": "ofullbordade checklista __checklist__ på kort __card__ i lista __list__ i simbana __swimlane__ på tavla __board__",
+    "act-addComment": "kommenterade på kort __card__: __comment__ i lista __list__ i simbana __swimlane__ på tavla __board__",
+    "act-createBoard": "skapade tavla __board__",
+    "act-createSwimlane": "skapade simbana __swimlane__ till tavla __board__",
+    "act-createCard": "skapade kort __card__ i lista __list__ i simbana __swimlane__ på tavla __board__",
+    "act-createCustomField": "skapade anpassat fält __customField__ på kort __card__ i lista __list__ i simbana __swimlane__ på tavla __board__",
+    "act-createList": "la till lista __list__ på tavla __board__",
+    "act-addBoardMember": "la till medlem __member__ på tavla __board__",
+    "act-archivedBoard": "Tavla__board__ flyttad till arkivet",
+    "act-archivedCard": "Kort __card__ i lista __list__ i simbana __swimlane__ på tavla __board__ flyttad till arkivet",
+    "act-archivedList": "Lista __list__ i simbana __swimlane__ på tavla __board__ flyttad till arkivet",
+    "act-archivedSwimlane": "Simbana __swimlane__ på tavla __board__ flyttad till arkivet",
+    "act-importBoard": "importerade board __board__",
+    "act-importCard": "importerade kort __card__ i lista __list__ i simbana __swimlane__ på tavla __board__",
+    "act-importList": "importerade lista __list__ i simbana __swimlane__ på tavla __board__",
+    "act-joinMember": "la till medlem __member__ på kort __card__ i lista __list__ i simbana __swimlane__ på tavla __board__",
+    "act-moveCard": "flyttade kort __card__ på tavla __board__ från lista __oldList__ i sambana __oldSwimlane__ till lista list __list__ i simbana __swimlane__",
+    "act-moveCardToOtherBoard": "flyttade kort __card__ från lista __oldList__ i simbana __oldSwimlane__ på tavla __oldBoard__ till lista __list__ i simbana __swimlane__ på tavla __board__",
+    "act-removeBoardMember": "borttagen medlem __member__  från tavla __board__",
+    "act-restoredCard": "återställde kort __card__ till lista __lis__ i simbana __swimlane__ på tavla __board__",
+    "act-unjoinMember": "tog bort medlem __member__ från kort __card__ i lista __list__  i simbana __swimlane__ på tavla __board__",
+    "act-withBoardTitle": "_tavla_",
     "act-withCardTitle": "[__board__] __card__",
     "actions": "Åtgärder",
     "activities": "Aktiviteter",
     "activity": "Aktivitet",
     "activity-added": "Lade %s till %s",
-    "activity-archived": "%s flyttad till papperskorgen",
+    "activity-archived": "%s flyttades till Arkiv",
     "activity-attached": "bifogade %s to %s",
     "activity-created": "skapade %s",
+    "activity-customfield-created": "skapa anpassat fält %s",
     "activity-excluded": "exkluderade %s från %s",
     "activity-imported": "importerade %s till %s från %s",
     "activity-imported-board": "importerade %s från %s",
@@ -39,13 +55,25 @@
     "activity-removed": "tog bort %s från %s",
     "activity-sent": "skickade %s till %s",
     "activity-unjoined": "gick ur %s",
+    "activity-subtask-added": "lade till deluppgift till %s",
+    "activity-checked-item": "kryssad %s i checklistan %s av %s",
+    "activity-unchecked-item": "okryssad %s i checklistan %s av %s",
     "activity-checklist-added": "lade kontrollista till %s",
+    "activity-checklist-removed": "tog bort en checklista från %s",
+    "activity-checklist-completed": "slutförde checklista __checklist__ i kort __card__ i lista __list__ i  simbana __swimlane__ på tavla __board__",
+    "activity-checklist-uncompleted": "inte slutfört checklistan %s av %s",
     "activity-checklist-item-added": "lade checklista objekt till '%s' i %s",
+    "activity-checklist-item-removed": "tog bort en checklista objekt från \"%s\" i %s",
     "add": "Lägg till",
+    "activity-checked-item-card": "kryssad %s i checklistan %s",
+    "activity-unchecked-item-card": "okryssad %s i checklistan %s",
+    "activity-checklist-completed-card": "slutförde checklista __checklist__ i kort __card__ i lista __list__ i  simbana __swimlane__ på tavla __board__",
+    "activity-checklist-uncompleted-card": "icke slutfört checklistan %s",
     "add-attachment": "Lägg till bilaga",
     "add-board": "Lägg till anslagstavla",
     "add-card": "Lägg till kort",
-    "add-swimlane": "Add Swimlane",
+    "add-swimlane": "Lägg till simbana",
+    "add-subtask": "Lägg till deluppgift",
     "add-checklist": "Lägg till checklista",
     "add-checklist-item": "Lägg till ett objekt till kontrollista",
     "add-cover": "Lägg till omslag",
@@ -63,20 +91,22 @@
     "and-n-other-card": "Och __count__ annat kort",
     "and-n-other-card_plural": "Och __count__ andra kort",
     "apply": "Tillämpa",
-    "app-is-offline": "Wekan laddar, vänta. Uppdatering av sidan kommer att leda till förlust av data. Om Wekan inte laddas, kontrollera att Wekan-servern inte har stoppats.",
-    "archive": "Flytta till papperskorgen",
-    "archive-all": "Flytta alla till papperskorgen",
-    "archive-board": "Move Board to Recycle Bin",
-    "archive-card": "Move Card to Recycle Bin",
-    "archive-list": "Move List to Recycle Bin",
-    "archive-swimlane": "Move Swimlane to Recycle Bin",
-    "archive-selection": "Move selection to Recycle Bin",
-    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
-    "archived-items": "Papperskorgen",
-    "archived-boards": "Boards in Recycle Bin",
+    "app-is-offline": "Läser in, vänligen vänta. Uppdatering av sidan kommer att orsaka förlust av data. Om inläsningen inte fungerar, kontrollera att servern inte har stoppats.",
+    "archive": "Flytta till Arkiv",
+    "archive-all": "Flytta alla till Arkiv",
+    "archive-board": "Flytta Anslagstavla till Arkiv",
+    "archive-card": "Flytta Kort till Arkiv",
+    "archive-list": "Flytta Lista till Arkiv",
+    "archive-swimlane": "Flytta simbanan till arkivet",
+    "archive-selection": "Flytta markerade till Arkiv",
+    "archiveBoardPopup-title": "Flytta Anslagstavla till Arkiv?",
+    "archived-items": "Arkiv",
+    "archived-boards": "Anslagstavlor i Arkiv",
     "restore-board": "Återställ anslagstavla",
-    "no-archived-boards": "No Boards in Recycle Bin.",
-    "archives": "Papperskorgen",
+    "no-archived-boards": "Inga anslagstavlor i Arkiv.",
+    "archives": "Arkiv",
+    "template": "Mall",
+    "templates": "Mallar",
     "assign-member": "Tilldela medlem",
     "attached": "bifogad",
     "attachment": "Bilaga",
@@ -95,22 +125,25 @@
     "boardChangeTitlePopup-title": "Byt namn på anslagstavla",
     "boardChangeVisibilityPopup-title": "Ändra synlighet",
     "boardChangeWatchPopup-title": "Ändra bevaka",
-    "boardMenuPopup-title": "Anslagstavla meny",
+    "boardMenuPopup-title": "Tavlans inställningar",
     "boards": "Anslagstavlor",
-    "board-view": "Board View",
-    "board-view-swimlanes": "Swimlanes",
+    "board-view": "Anslagstavelsvy",
+    "board-view-cal": "Kalender",
+    "board-view-swimlanes": "Simbanor",
     "board-view-lists": "Listor",
     "bucket-example": "Gilla \"att-göra-innan-jag-dör-lista\" till exempel",
     "cancel": "Avbryt",
-    "card-archived": "Detta kort flyttas till papperskorgen.",
+    "card-archived": "Detta kort är flyttat till Arkiv.",
+    "board-archived": "Den här anslagstavlan är flyttad till Arkiv.",
     "card-comments-title": "Detta kort har %s kommentar.",
     "card-delete-notice": "Ta bort är permanent. Du kommer att förlora alla åtgärder i samband med detta kort.",
     "card-delete-pop": "Alla åtgärder kommer att tas bort från aktivitetsflöde och du kommer inte att kunna öppna kortet igen. Det går inte att ångra.",
-    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "Du kan flytta ett kort för att Arkiv för att ta bort det från anslagstavlan och bevara aktiviteten.",
     "card-due": "Förfaller",
     "card-due-on": "Förfaller på",
     "card-spent": "Spenderad tid",
     "card-edit-attachments": "Redigera bilaga",
+    "card-edit-custom-fields": "Redigera anpassade fält",
     "card-edit-labels": "Redigera etiketter",
     "card-edit-members": "Redigera medlemmar",
     "card-labels-title": "Ändra etiketter för kortet.",
@@ -118,13 +151,20 @@
     "card-start": "Börja",
     "card-start-on": "Börja med",
     "cardAttachmentsPopup-title": "Bifoga från",
+    "cardCustomField-datePopup-title": "Ändra datum",
+    "cardCustomFieldsPopup-title": "Redigera anpassade fält",
     "cardDeletePopup-title": "Ta bort kort?",
     "cardDetailsActionsPopup-title": "Kortåtgärder",
     "cardLabelsPopup-title": "Etiketter",
     "cardMembersPopup-title": "Medlemmar",
     "cardMorePopup-title": "Mera",
+    "cardTemplatePopup-title": "Skapa mall",
     "cards": "Kort",
     "cards-count": "Kort",
+    "casSignIn": "Logga in med CAS",
+    "cardType-card": "Kort",
+    "cardType-linkedCard": "Länkat kort",
+    "cardType-linkedBoard": "Länkad anslagstavla",
     "change": "Ändra",
     "change-avatar": "Ändra avatar",
     "change-password": "Ändra lösenord",
@@ -135,43 +175,79 @@
     "changePasswordPopup-title": "Ändra lösenord",
     "changePermissionsPopup-title": "Ändra behörigheter",
     "changeSettingsPopup-title": "Ändra inställningar",
+    "subtasks": "Deluppgifter",
     "checklists": "Kontrollistor",
     "click-to-star": "Klicka för att stjärnmärka denna anslagstavla.",
     "click-to-unstar": "Klicka för att ta bort stjärnmärkningen från denna anslagstavla.",
     "clipboard": "Urklipp eller dra och släpp",
     "close": "Stäng",
     "close-board": "Stäng anslagstavla",
-    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
+    "close-board-pop": "Du kommer att kunna återställa anslagstavlan genom att klicka på knappen \"Arkiv\" från hemrubriken.",
     "color-black": "svart",
     "color-blue": "blå",
+    "color-crimson": "mörkröd",
+    "color-darkgreen": "mörkgrön",
+    "color-gold": "guld",
+    "color-gray": "grå",
     "color-green": "grön",
+    "color-indigo": "indigo",
     "color-lime": "lime",
+    "color-magenta": "magenta",
+    "color-mistyrose": "ljusrosa",
+    "color-navy": "marinblå",
     "color-orange": "orange",
+    "color-paleturquoise": "turkos",
+    "color-peachpuff": "ersika",
     "color-pink": "rosa",
+    "color-plum": "lila",
     "color-purple": "lila",
     "color-red": "röd",
+    "color-saddlebrown": "sadelbrun",
+    "color-silver": "silver",
     "color-sky": "himmel",
+    "color-slateblue": "skifferblå",
+    "color-white": "vit",
     "color-yellow": "gul",
+    "unset-color": "Urkoppla",
     "comment": "Kommentera",
     "comment-placeholder": "Skriv kommentar",
     "comment-only": "Kommentera endast",
     "comment-only-desc": "Kan endast kommentera kort.",
+    "no-comments": "Inga kommentarer",
+    "no-comments-desc": "Kan inte se kommentarer och aktiviteter.",
     "computer": "Dator",
-    "confirm-checklist-delete-dialog": "Är du säker på att du vill ta bort checklista",
+    "confirm-subtask-delete-dialog": "Är du säker på att du vill radera deluppgift?",
+    "confirm-checklist-delete-dialog": "Är du säker på att du vill radera checklista?",
     "copy-card-link-to-clipboard": "Kopiera kortlänk till urklipp",
+    "linkCardPopup-title": "Länka kort",
+    "searchElementPopup-title": "Sök",
     "copyCardPopup-title": "Kopiera kort",
-    "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
-    "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
-    "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"First card title\", \"description\":\"First card description\"}, {\"title\":\"Second card title\",\"description\":\"Second card description\"},{\"title\":\"Last card title\",\"description\":\"Last card description\"} ]",
+    "copyChecklistToManyCardsPopup-title": "Kopiera checklist-mallen till flera kort",
+    "copyChecklistToManyCardsPopup-instructions": "Destinationskorttitlar och beskrivningar i detta JSON-format",
+    "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"Första kortets titel\", \"description\":\"Första kortets beskrivning\"}, {\"title\":\"Andra kortets titel\",\"description\":\"Andra kortets beskrivning\"},{\"title\":\"Sista kortets titel\",\"description\":\"Sista kortets beskrivning\"} ]",
     "create": "Skapa",
     "createBoardPopup-title": "Skapa anslagstavla",
     "chooseBoardSourcePopup-title": "Importera anslagstavla",
     "createLabelPopup-title": "Skapa etikett",
+    "createCustomField": "Skapa fält",
+    "createCustomFieldPopup-title": "Skapa fält",
     "current": "aktuell",
+    "custom-field-delete-pop": "Det går inte att ångra. Detta tar bort det här anpassade fältet från alla kort och förstör dess historia.",
+    "custom-field-checkbox": "Kryssruta",
+    "custom-field-date": "Datum",
+    "custom-field-dropdown": "Rullgardingsmeny",
+    "custom-field-dropdown-none": "(inga)",
+    "custom-field-dropdown-options": "Listalternativ",
+    "custom-field-dropdown-options-placeholder": "Tryck på enter för att lägga till fler alternativ",
+    "custom-field-dropdown-unknown": "(okänd)",
+    "custom-field-number": "Nummer",
+    "custom-field-text": "Text",
+    "custom-fields": "Anpassade fält",
     "date": "Datum",
     "decline": "Nedgång",
     "default-avatar": "Standard avatar",
     "delete": "Ta bort",
+    "deleteCustomFieldPopup-title": "Ta bort anpassade fält?",
     "deleteLabelPopup-title": "Ta bort etikett?",
     "description": "Beskrivning",
     "disambiguateMultiLabelPopup-title": "Otvetydig etikettåtgärd",
@@ -186,6 +262,7 @@
     "soft-wip-limit": "Mjuk WIP-gräns",
     "editCardStartDatePopup-title": "Ändra startdatum",
     "editCardDueDatePopup-title": "Ändra förfallodatum",
+    "editCustomFieldPopup-title": "Redigera fält",
     "editCardSpentTimePopup-title": "Ändra spenderad tid",
     "editLabelPopup-title": "Ändra etikett",
     "editNotificationPopup-title": "Redigera avisering",
@@ -222,30 +299,36 @@
     "filter-clear": "Rensa filter",
     "filter-no-label": "Ingen etikett",
     "filter-no-member": "Ingen medlem",
+    "filter-no-custom-fields": "Inga anpassade fält",
     "filter-on": "Filter är på",
     "filter-on-desc": "Du filtrerar kort på denna anslagstavla. Klicka här för att redigera filter.",
     "filter-to-selection": "Filter till val",
+    "advanced-filter-label": "Avancerat filter",
+    "advanced-filter-description": "Avancerade filter låter dig skriva en sträng innehållande följande operatorer: == != <= >= && || ( ). Ett mellanslag används som separator mellan operatorerna. Du kan filtrera alla specialfält genom att skriva dess namn och värde. Till exempel: Fält1 == Vårde1. Notera: om fälten eller värden innehåller mellanrum behöver du innesluta dem med enkla citatstecken. Till exempel:  'Fält 1' == 'Värde 1'. För att skippa enkla kontrolltecken (' \\/) kan du använda \\. Till exempel: Fält1 == I\\'m. Du kan även kombinera fler villkor. TIll exempel: F1 == V1 || F1 == V2. Vanligtvis läses operatorerna från vänster till höger. Du kan ändra ordning genom att använda paranteser. TIll exempel: F1 == V1 && ( F2 == V2 || F2 == V3 ). Du kan även söka efter textfält med hjälp av regex: F1 == /Tes.*/i",
     "fullname": "Namn",
     "header-logo-title": "Gå tillbaka till din anslagstavlor-sida.",
     "hide-system-messages": "Göm systemmeddelanden",
     "headerBarCreateBoardPopup-title": "Skapa anslagstavla",
     "home": "Hem",
     "import": "Importera",
+    "link": "Länka",
     "import-board": "importera anslagstavla",
     "import-board-c": "Importera anslagstavla",
     "import-board-title-trello": "Importera anslagstavla från Trello",
-    "import-board-title-wekan": "Importera anslagstavla från Wekan",
+    "import-board-title-wekan": "Importera anslagstavla från tidigare export",
+    "import-sandstorm-backup-warning": "Ta inte bort data som du importerar från exporterad original-tavla eller Trello innan du kontrollerar att det här spannet stänger och öppnas igen, eller får du felmeddelandet Tavla hittades inte, det vill säga dataförlust.",
     "import-sandstorm-warning": "Importerad anslagstavla raderar all befintlig data på anslagstavla och ersätter den med importerat anslagstavla.",
     "from-trello": "Från Trello",
-    "from-wekan": "Från Wekan",
+    "from-wekan": "Från tidigare export",
     "import-board-instruction-trello": "I din Trello-anslagstavla, gå till 'Meny', sedan 'Mera', 'Skriv ut och exportera', 'Exportera JSON' och kopiera den resulterande text.",
-    "import-board-instruction-wekan": "I din Wekan-anslagstavla, gå till \"Meny\", sedan \"Exportera anslagstavla\" och kopiera texten i den hämtade filen.",
+    "import-board-instruction-wekan": "På din anslagstavla, gå till \"Meny\", sedan \"Exportera anslagstavla\" och kopiera texten i den hämtade filen.",
+    "import-board-instruction-about-errors": "Om du får fel vid import av anslagstavla, ibland importerar fortfarande fungerar, och styrelsen är på alla sidor för anslagstavlor.",
     "import-json-placeholder": "Klistra in giltigt JSON data här",
     "import-map-members": "Kartlägg medlemmar",
-    "import-members-map": "Din importerade anslagstavla har några medlemmar. Kartlägg medlemmarna som du vill importera till Wekan-användare",
+    "import-members-map": "Din importerade anslagstavla har några medlemmar. Vänligen kartlägg medlemmarna du vill importera till dina användare",
     "import-show-user-mapping": "Granska medlemskartläggning",
-    "import-user-select": "Välj Wekan-användare du vill använda som denna medlem",
-    "importMapMembersAddPopup-title": "Välj Wekan member",
+    "import-user-select": "Välj din befintliga användare du vill använda som den här medlemmen",
+    "importMapMembersAddPopup-title": "Välj medlem",
     "info": "Version",
     "initials": "Initialer ",
     "invalid-date": "Ogiltigt datum",
@@ -264,19 +347,21 @@
     "leave-board-pop": "Är du säker på att du vill lämna __boardTitle__? Du kommer att tas bort från alla kort på den här anslagstavlan.",
     "leaveBoardPopup-title": "Lämna anslagstavla ?",
     "link-card": "Länka till detta kort",
-    "list-archive-cards": "Flytta alla kort i den här listan till papperskorgen",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
+    "list-archive-cards": "Flytta alla kort i den här listan till Arkiv",
+    "list-archive-cards-pop": "Detta kommer att ta bort alla kort i denna lista från anslagstavlan. För att visa kort i Arkiv och få dem tillbaka till anslagstavlan, klicka på \"Meny\" > \"Arkiv\".",
     "list-move-cards": "Flytta alla kort i denna lista",
     "list-select-cards": "Välj alla kort i denna lista",
+    "set-color-list": "Ange färg",
     "listActionPopup-title": "Liståtgärder",
-    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneActionPopup-title": "Simbana-åtgärder",
+    "swimlaneAddPopup-title": "Lägg till en simbana nedan",
     "listImportCardPopup-title": "Importera ett Trello kort",
     "listMorePopup-title": "Mera",
     "link-list": "Länk till den här listan",
     "list-delete-pop": "Alla åtgärder kommer att tas bort från aktivitetsmatningen och du kommer inte att kunna återställa listan. Det går inte att ångra.",
-    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "Du kan flytta en lista till Arkiv för att ta bort den från anslagstavlan och bevara aktiviteten.",
     "lists": "Listor",
-    "swimlanes": "Swimlanes",
+    "swimlanes": "Simbanor ",
     "log-out": "Logga ut",
     "log-in": "Logga in",
     "loginPopup-title": "Logga in",
@@ -294,9 +379,9 @@
     "muted-info": "Du kommer aldrig att meddelas om eventuella ändringar i denna anslagstavla",
     "my-boards": "Mina anslagstavlor",
     "name": "Namn",
-    "no-archived-cards": "Inga kort i papperskorgen.",
-    "no-archived-lists": "Inga listor i papperskorgen.",
-    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
+    "no-archived-cards": "Inga kort i Arkiv.",
+    "no-archived-lists": "Inga listor i Arkiv.",
+    "no-archived-swimlanes": "Inga simbanor i arkivet.",
     "no-results": "Inga reslutat",
     "normal": "Normal",
     "normal-desc": "Kan se och redigera kort. Kan inte ändra inställningar.",
@@ -332,7 +417,8 @@
     "restore": "Återställ",
     "save": "Spara",
     "search": "Sök",
-    "search-cards": "Search from card titles and descriptions on this board",
+    "rules": "Regler",
+    "search-cards": "Sök från korttitlar och beskrivningar på det här brädet",
     "search-example": "Text att söka efter?",
     "select-color": "Välj färg",
     "set-wip-limit-value": "Ange en gräns för det maximala antalet uppgifter i den här listan",
@@ -361,11 +447,12 @@
     "overtime-hours": "Övertid (timmar)",
     "overtime": "Övertid",
     "has-overtime-cards": "Har övertidskort",
-    "has-spenttime-cards": "Has spent time cards",
+    "has-spenttime-cards": "Har spenderat tidkort",
     "time": "Tid",
     "title": "Titel",
     "tracking": "Spårning",
     "tracking-info": "Du kommer att meddelas om eventuella ändringar av dessa kort du deltar i som skapare eller medlem.",
+    "type": "Skriv",
     "unassign-member": "Ta bort tilldelad medlem",
     "unsaved-description": "Du har en osparad beskrivning.",
     "unwatch": "Avbevaka",
@@ -374,7 +461,7 @@
     "uploaded-avatar": "Laddade upp en avatar",
     "username": "Änvandarnamn",
     "view-it": "Visa det",
-    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
+    "warn-list-archived": "varning: detta kort finns i en lista i Arkiv",
     "watch": "Bevaka",
     "watching": "Bevakar",
     "watching-info": "Du kommer att meddelas om alla ändringar på denna anslagstavla",
@@ -382,6 +469,9 @@
     "welcome-swimlane": "Milstolpe 1",
     "welcome-list1": "Grunderna",
     "welcome-list2": "Avancerad",
+    "card-templates-swimlane": "Kortmallar",
+    "list-templates-swimlane": "Listmalla",
+    "board-templates-swimlane": "Tavelmallar",
     "what-to-do": "Vad vill du göra?",
     "wipLimitErrorPopup-title": "Ogiltig WIP-gräns",
     "wipLimitErrorPopup-dialog-pt1": "Antalet uppgifter i den här listan är högre än WIP-gränsen du har definierat.",
@@ -407,16 +497,16 @@
     "send-smtp-test": "Skicka ett prov e-postmeddelande till dig själv",
     "invitation-code": "Inbjudningskod",
     "email-invite-register-subject": "__inviter__ skickade dig en inbjudan",
-    "email-invite-register-text": "Bästa __user__,\n\n__inviter__ inbjuder dig till Wekan för samarbeten.\n\nVänligen följ länken nedan:\n__url__\n\nOch din inbjudningskod är: __icode__\n\nTack.",
-    "email-smtp-test-subject": "SMTP-prov e-post från Wekan",
+    "email-invite-register-text": "Kära__user__,\n\n__inviter__ bjuder in dig att samarbeta på kanban-tavlan.\n\nFölj länken nedan:\n__url__\n\nDin inbjudningskod är: __icode__\n\nTack!",
+    "email-smtp-test-subject": "SMTP test-email",
     "email-smtp-test-text": "Du har skickat ett e-postmeddelande",
     "error-invitation-code-not-exist": "Inbjudningskod finns inte",
     "error-notAuthorized": "Du är inte behörig att se den här sidan.",
-    "outgoing-webhooks": "Outgoing Webhooks",
-    "outgoingWebhooksPopup-title": "Outgoing Webhooks",
-    "new-outgoing-webhook": "New Outgoing Webhook",
+    "outgoing-webhooks": "Utgående Webhookar",
+    "outgoingWebhooksPopup-title": "Utgående Webhookar",
+    "boardCardTitlePopup-title": "Korttitelfiler",
+    "new-outgoing-webhook": "Ny utgående webhook",
     "no-name": "(Okänd)",
-    "Wekan_version": "Wekan version",
     "Node_version": "Nodversion",
     "OS_Arch": "OS Arch",
     "OS_Cpus": "OS CPU-räkning",
@@ -427,20 +517,177 @@
     "OS_Totalmem": "OS totalt minne",
     "OS_Type": "OS Typ",
     "OS_Uptime": "OS drifttid",
+    "days": "dagar",
     "hours": "timmar",
     "minutes": "minuter",
     "seconds": "sekunder",
+    "show-field-on-card": "Visa detta fält på kort",
+    "automatically-field-on-card": "Skapa automatiskt fält till alla kort",
+    "showLabel-field-on-card": "Visa fältetikett på minikort",
     "yes": "Ja",
     "no": "Nej",
     "accounts": "Konton",
     "accounts-allowEmailChange": "Tillåt e-poständring",
+    "accounts-allowUserNameChange": "Tillåt användarnamnändring",
     "createdAt": "Skapad vid",
     "verified": "Verifierad",
     "active": "Aktiv",
     "card-received": "Mottagen",
-    "card-received-on": "Received on",
+    "card-received-on": "Mottagen den",
     "card-end": "Slut",
-    "card-end-on": "Ends on",
+    "card-end-on": "Slutar den",
     "editCardReceivedDatePopup-title": "Ändra mottagningsdatum",
-    "editCardEndDatePopup-title": "Ändra slutdatum"
-}
+    "editCardEndDatePopup-title": "Ändra slutdatum",
+    "setCardColorPopup-title": "Ange färg",
+    "setCardActionsColorPopup-title": "Välj en färg",
+    "setSwimlaneColorPopup-title": "Välj en färg",
+    "setListColorPopup-title": "Välj en färg",
+    "assigned-by": "Tilldelad av",
+    "requested-by": "Efterfrågad av",
+    "board-delete-notice": "Borttagningen är permanent. Du kommer förlora alla listor, kort och händelser kopplade till den här anslagstavlan.",
+    "delete-board-confirm-popup": "Alla listor, kort, etiketter och aktiviteter kommer tas bort och du kommer inte kunna återställa anslagstavlans innehåll. Det går inte att ångra.",
+    "boardDeletePopup-title": "Ta bort anslagstavla?",
+    "delete-board": "Ta bort anslagstavla",
+    "default-subtasks-board": "Deluppgifter för __board__ board",
+    "default": "Standard",
+    "queue": "Kö",
+    "subtask-settings": "Deluppgift inställningar",
+    "boardSubtaskSettingsPopup-title": "Deluppgiftsinställningar för anslagstavla",
+    "show-subtasks-field": "Kort kan ha deluppgifter",
+    "deposit-subtasks-board": "Insättnings deluppgifter på denna anslagstavla:",
+    "deposit-subtasks-list": "Landningslista för deluppgifter deponerade här:",
+    "show-parent-in-minicard": "Visa förälder i minikort:",
+    "prefix-with-full-path": "Prefix med fullständig sökväg",
+    "prefix-with-parent": "Prefix med förälder",
+    "subtext-with-full-path": "Undertext med fullständig sökväg",
+    "subtext-with-parent": "Undertext med förälder",
+    "change-card-parent": "Ändra kortets förälder",
+    "parent-card": "Föräldrakort",
+    "source-board": "Källa för anslagstavla",
+    "no-parent": "Visa inte förälder",
+    "activity-added-label": "lade till etiketten '%s' till %s",
+    "activity-removed-label": "tog bort etiketten '%s' från %s",
+    "activity-delete-attach": "raderade en bilaga från %s",
+    "activity-added-label-card": "lade till etiketten \"%s\"",
+    "activity-removed-label-card": "tog bort etiketten \"%s\"",
+    "activity-delete-attach-card": "tog bort en bilaga",
+    "activity-set-customfield": "ställ in anpassat fält '%s' till '%s' i %s",
+    "activity-unset-customfield": "Koppla bort anpassat fält '%s' i %s",
+    "r-rule": "Regel",
+    "r-add-trigger": "Lägg till utlösare",
+    "r-add-action": "Lägg till åtgärd",
+    "r-board-rules": "Regler för anslagstavla",
+    "r-add-rule": "Lägg till regel",
+    "r-view-rule": "Visa regel",
+    "r-delete-rule": "Ta bort regel",
+    "r-new-rule-name": "Ny titel på regel",
+    "r-no-rules": "Inga regler",
+    "r-when-a-card": "När ett kort",
+    "r-is": "är",
+    "r-is-moved": "är flyttad",
+    "r-added-to": "tillagd till",
+    "r-removed-from": "Borttagen från",
+    "r-the-board": "anslagstavlan",
+    "r-list": "lista",
+    "set-filter": "Ställ in filter",
+    "r-moved-to": "Flyttad till",
+    "r-moved-from": "Flyttad från",
+    "r-archived": "Flyttad till Arkiv",
+    "r-unarchived": "Återställd från Arkiv",
+    "r-a-card": "ett kort",
+    "r-when-a-label-is": "När en etikett är",
+    "r-when-the-label-is": "När etiketten är",
+    "r-list-name": "listnamn",
+    "r-when-a-member": "När en medlem är",
+    "r-when-the-member": "När medlemmen",
+    "r-name": "namn",
+    "r-when-a-attach": "När en bilaga",
+    "r-when-a-checklist": "När en checklista är",
+    "r-when-the-checklist": "När checklistan",
+    "r-completed": "Avslutad",
+    "r-made-incomplete": "Gjord ofullständig",
+    "r-when-a-item": "När ett checklistobjekt  ä",
+    "r-when-the-item": "När checklistans objekt",
+    "r-checked": "Kryssad",
+    "r-unchecked": "Okryssad",
+    "r-move-card-to": "Flytta kort till",
+    "r-top-of": "Överst på",
+    "r-bottom-of": "Nederst av",
+    "r-its-list": "sin lista",
+    "r-archive": "Flytta till Arkiv",
+    "r-unarchive": "Återställ från Arkiv",
+    "r-card": "kort",
+    "r-add": "Lägg till",
+    "r-remove": "Ta bort",
+    "r-label": "etikett",
+    "r-member": "medlem",
+    "r-remove-all": "Ta bort alla medlemmar från kortet",
+    "r-set-color": "Ställ in färg till",
+    "r-checklist": "checklista",
+    "r-check-all": "Kryssa alla",
+    "r-uncheck-all": "Avkryssa alla",
+    "r-items-check": "objekt på checklistan",
+    "r-check": "Kryssa",
+    "r-uncheck": "Avkryssa",
+    "r-item": "objekt",
+    "r-of-checklist": "av checklistan",
+    "r-send-email": "Skicka ett e-postmeddelande",
+    "r-to": "till",
+    "r-subject": "änme",
+    "r-rule-details": "Regeldetaljer",
+    "r-d-move-to-top-gen": "Flytta kort till toppen av sin lista",
+    "r-d-move-to-top-spec": "Flytta kort till toppen av listan",
+    "r-d-move-to-bottom-gen": "Flytta kort till botten av sin lista",
+    "r-d-move-to-bottom-spec": "Flytta kort till botten av listan",
+    "r-d-send-email": "Skicka e-post",
+    "r-d-send-email-to": "till",
+    "r-d-send-email-subject": "ämne",
+    "r-d-send-email-message": "meddelande",
+    "r-d-archive": "Flytta kortet till Arkiv",
+    "r-d-unarchive": "Återställ kortet från Arkiv",
+    "r-d-add-label": "Lägg till etikett",
+    "r-d-remove-label": "Ta bort etikett",
+    "r-create-card": "Skapa nytt kort",
+    "r-in-list": "i listan",
+    "r-in-swimlane": "i simbana",
+    "r-d-add-member": "Lägg till medlem",
+    "r-d-remove-member": "Ta bort medlem",
+    "r-d-remove-all-member": "Ta bort alla medlemmar",
+    "r-d-check-all": "Kryssa alla objekt i en lista",
+    "r-d-uncheck-all": "Avkryssa alla objekt i en lista",
+    "r-d-check-one": "Kryssa objekt",
+    "r-d-uncheck-one": "Avkryssa objekt",
+    "r-d-check-of-list": "av checklistan",
+    "r-d-add-checklist": "Lägg till checklista",
+    "r-d-remove-checklist": "Ta bort checklista",
+    "r-by": "av",
+    "r-add-checklist": "Lägg till checklista",
+    "r-with-items": "med objekt",
+    "r-items-list": "objekt1,objekt2,objekt3",
+    "r-add-swimlane": "Lägg till simbana",
+    "r-swimlane-name": "Simbanans namn",
+    "r-board-note": "Notera: lämna ett fält tomt för att matcha alla möjliga värden.",
+    "r-checklist-note": "Notera: Objekt i en checklista måste skrivas som kommaseparerade objekt",
+    "r-when-a-card-is-moved": "När ett kort flyttas till en annan lista",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Autentiseringsmetod",
+    "authentication-type": "Autentiseringstyp",
+    "custom-product-name": "Anpassat produktnamn",
+    "layout": "Layout",
+    "hide-logo": "Dölj logotypen",
+    "add-custom-html-after-body-start": "Lägg till anpassad HTML efter <body> start",
+    "add-custom-html-before-body-end": "Lägg till anpassad HTML före </body> slut",
+    "error-undefined": "Något gick fel",
+    "error-ldap-login": "Ett fel uppstod när du försökte logga in",
+    "display-authentication-method": "Visa autentiseringsmetod",
+    "default-authentication-method": "Standard autentiseringsmetod",
+    "duplicate-board": "Dubbletttavla",
+    "people-number": "Antalet personer är:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Återställ alla",
+    "delete-all": "Ta bort alla",
+    "loading": "Läser in, var god vänta."
+}
\ No newline at end of file
diff --git a/i18n/sw.i18n.json b/i18n/sw.i18n.json
new file mode 100644
index 00000000..caa91697
--- /dev/null
+++ b/i18n/sw.i18n.json
@@ -0,0 +1,693 @@
+{
+    "accept": "Kubali",
+    "act-activity-notify": "Activity Notification",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__board__",
+    "act-withCardTitle": "[__board__] __card__",
+    "actions": "Actions",
+    "activities": "Activities",
+    "activity": "Activity",
+    "activity-added": "added %s to %s",
+    "activity-archived": "%s moved to Archive",
+    "activity-attached": "attached %s to %s",
+    "activity-created": "created %s",
+    "activity-customfield-created": "created custom field %s",
+    "activity-excluded": "excluded %s from %s",
+    "activity-imported": "imported %s into %s from %s",
+    "activity-imported-board": "imported %s from %s",
+    "activity-joined": "joined %s",
+    "activity-moved": "moved %s from %s to %s",
+    "activity-on": "on %s",
+    "activity-removed": "removed %s from %s",
+    "activity-sent": "sent %s to %s",
+    "activity-unjoined": "unjoined %s",
+    "activity-subtask-added": "added subtask to %s",
+    "activity-checked-item": "checked %s in checklist %s of %s",
+    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
+    "activity-checklist-added": "added checklist to %s",
+    "activity-checklist-removed": "removed a checklist from %s",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
+    "activity-checklist-item-added": "added checklist item to '%s' in %s",
+    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
+    "add": "Add",
+    "activity-checked-item-card": "checked %s in checklist %s",
+    "activity-unchecked-item-card": "unchecked %s in checklist %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
+    "add-attachment": "Add Attachment",
+    "add-board": "Add Board",
+    "add-card": "Add Card",
+    "add-swimlane": "Add Swimlane",
+    "add-subtask": "Add Subtask",
+    "add-checklist": "Add Checklist",
+    "add-checklist-item": "Add an item to checklist",
+    "add-cover": "Add Cover",
+    "add-label": "Add Label",
+    "add-list": "Add List",
+    "add-members": "Add Members",
+    "added": "Added",
+    "addMemberPopup-title": "Members",
+    "admin": "Admin",
+    "admin-desc": "Can view and edit cards, remove members, and change settings for the board.",
+    "admin-announcement": "Announcement",
+    "admin-announcement-active": "Active System-Wide Announcement",
+    "admin-announcement-title": "Announcement from Administrator",
+    "all-boards": "All boards",
+    "and-n-other-card": "And __count__ other card",
+    "and-n-other-card_plural": "And __count__ other cards",
+    "apply": "Apply",
+    "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
+    "archive": "Move to Archive",
+    "archive-all": "Move All to Archive",
+    "archive-board": "Move Board to Archive",
+    "archive-card": "Move Card to Archive",
+    "archive-list": "Move List to Archive",
+    "archive-swimlane": "Move Swimlane to Archive",
+    "archive-selection": "Move selection to Archive",
+    "archiveBoardPopup-title": "Move Board to Archive?",
+    "archived-items": "Archive",
+    "archived-boards": "Boards in Archive",
+    "restore-board": "Restore Board",
+    "no-archived-boards": "No Boards in Archive.",
+    "archives": "Archive",
+    "template": "Template",
+    "templates": "Templates",
+    "assign-member": "Assign member",
+    "attached": "attached",
+    "attachment": "Attachment",
+    "attachment-delete-pop": "Deleting an attachment is permanent. There is no undo.",
+    "attachmentDeletePopup-title": "Delete Attachment?",
+    "attachments": "Attachments",
+    "auto-watch": "Automatically watch boards when they are created",
+    "avatar-too-big": "The avatar is too large (70KB max)",
+    "back": "Rudi",
+    "board-change-color": "Badilisha rangi",
+    "board-nb-stars": "%s stars",
+    "board-not-found": "Board not found",
+    "board-private-info": "This board will be <strong>private</strong>.",
+    "board-public-info": "This board will be <strong>public</strong>.",
+    "boardChangeColorPopup-title": "Change Board Background",
+    "boardChangeTitlePopup-title": "Rename Board",
+    "boardChangeVisibilityPopup-title": "Change Visibility",
+    "boardChangeWatchPopup-title": "Change Watch",
+    "boardMenuPopup-title": "Board Settings",
+    "boards": "Boards",
+    "board-view": "Board View",
+    "board-view-cal": "Calendar",
+    "board-view-swimlanes": "Swimlanes",
+    "board-view-lists": "Lists",
+    "bucket-example": "Like “Bucket List” for example",
+    "cancel": "Cancel",
+    "card-archived": "This card is moved to Archive.",
+    "board-archived": "This board is moved to Archive.",
+    "card-comments-title": "This card has %s comment.",
+    "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
+    "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
+    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
+    "card-due": "Due",
+    "card-due-on": "Due on",
+    "card-spent": "Muda uliotumika",
+    "card-edit-attachments": "Edit attachments",
+    "card-edit-custom-fields": "Edit custom fields",
+    "card-edit-labels": "Edit labels",
+    "card-edit-members": "Edit members",
+    "card-labels-title": "Change the labels for the card.",
+    "card-members-title": "Add or remove members of the board from the card.",
+    "card-start": "Start",
+    "card-start-on": "Starts on",
+    "cardAttachmentsPopup-title": "Attach From",
+    "cardCustomField-datePopup-title": "Badilisha tarehe",
+    "cardCustomFieldsPopup-title": "Edit custom fields",
+    "cardDeletePopup-title": "Delete Card?",
+    "cardDetailsActionsPopup-title": "Card Actions",
+    "cardLabelsPopup-title": "Labels",
+    "cardMembersPopup-title": "Members",
+    "cardMorePopup-title": "More",
+    "cardTemplatePopup-title": "Create template",
+    "cards": "Cards",
+    "cards-count": "Cards",
+    "casSignIn": "Sign In with CAS",
+    "cardType-card": "Card",
+    "cardType-linkedCard": "Linked Card",
+    "cardType-linkedBoard": "Linked Board",
+    "change": "Change",
+    "change-avatar": "Change Avatar",
+    "change-password": "Change Password",
+    "change-permissions": "Change permissions",
+    "change-settings": "Change Settings",
+    "changeAvatarPopup-title": "Change Avatar",
+    "changeLanguagePopup-title": "Change Language",
+    "changePasswordPopup-title": "Change Password",
+    "changePermissionsPopup-title": "Change Permissions",
+    "changeSettingsPopup-title": "Change Settings",
+    "subtasks": "Subtasks",
+    "checklists": "Checklists",
+    "click-to-star": "Click to star this board.",
+    "click-to-unstar": "Click to unstar this board.",
+    "clipboard": "Clipboard or drag & drop",
+    "close": "Funga",
+    "close-board": "Close Board",
+    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
+    "color-black": "Nyeusi",
+    "color-blue": "Samawati",
+    "color-crimson": "crimson",
+    "color-darkgreen": "darkgreen",
+    "color-gold": "gold",
+    "color-gray": "gray",
+    "color-green": "Kijani",
+    "color-indigo": "indigo",
+    "color-lime": "lime",
+    "color-magenta": "magenta",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "navy",
+    "color-orange": "orange",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
+    "color-pink": "pink",
+    "color-plum": "plum",
+    "color-purple": "purple",
+    "color-red": "red",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "silver",
+    "color-sky": "sky",
+    "color-slateblue": "slateblue",
+    "color-white": "white",
+    "color-yellow": "yellow",
+    "unset-color": "Unset",
+    "comment": "Changia",
+    "comment-placeholder": "Andika changio",
+    "comment-only": "Changia pekee",
+    "comment-only-desc": "Can comment on cards only.",
+    "no-comments": "No comments",
+    "no-comments-desc": "Can not see comments and activities.",
+    "computer": "Tarakilishi",
+    "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?",
+    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
+    "copy-card-link-to-clipboard": "Copy card link to clipboard",
+    "linkCardPopup-title": "Link Card",
+    "searchElementPopup-title": "Search",
+    "copyCardPopup-title": "Copy Card",
+    "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
+    "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
+    "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"First card title\", \"description\":\"First card description\"}, {\"title\":\"Second card title\",\"description\":\"Second card description\"},{\"title\":\"Last card title\",\"description\":\"Last card description\"} ]",
+    "create": "Create",
+    "createBoardPopup-title": "Create Board",
+    "chooseBoardSourcePopup-title": "Import board",
+    "createLabelPopup-title": "Create Label",
+    "createCustomField": "Create Field",
+    "createCustomFieldPopup-title": "Create Field",
+    "current": "current",
+    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
+    "custom-field-checkbox": "Checkbox",
+    "custom-field-date": "Date",
+    "custom-field-dropdown": "Dropdown List",
+    "custom-field-dropdown-none": "(none)",
+    "custom-field-dropdown-options": "List Options",
+    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
+    "custom-field-dropdown-unknown": "(unknown)",
+    "custom-field-number": "Number",
+    "custom-field-text": "Text",
+    "custom-fields": "Custom Fields",
+    "date": "Date",
+    "decline": "Decline",
+    "default-avatar": "Default avatar",
+    "delete": "Delete",
+    "deleteCustomFieldPopup-title": "Delete Custom Field?",
+    "deleteLabelPopup-title": "Delete Label?",
+    "description": "Description",
+    "disambiguateMultiLabelPopup-title": "Disambiguate Label Action",
+    "disambiguateMultiMemberPopup-title": "Disambiguate Member Action",
+    "discard": "Discard",
+    "done": "Done",
+    "download": "Download",
+    "edit": "Edit",
+    "edit-avatar": "Change Avatar",
+    "edit-profile": "Edit Profile",
+    "edit-wip-limit": "Edit WIP Limit",
+    "soft-wip-limit": "Soft WIP Limit",
+    "editCardStartDatePopup-title": "Change start date",
+    "editCardDueDatePopup-title": "Change due date",
+    "editCustomFieldPopup-title": "Edit Field",
+    "editCardSpentTimePopup-title": "Change spent time",
+    "editLabelPopup-title": "Change Label",
+    "editNotificationPopup-title": "Edit Notification",
+    "editProfilePopup-title": "Edit Profile",
+    "email": "Email",
+    "email-enrollAccount-subject": "An account created for you on __siteName__",
+    "email-enrollAccount-text": "Hello __user__,\n\nTo start using the service, simply click the link below.\n\n__url__\n\nThanks.",
+    "email-fail": "Sending email failed",
+    "email-fail-text": "Error trying to send email",
+    "email-invalid": "Invalid email",
+    "email-invite": "Invite via Email",
+    "email-invite-subject": "__inviter__ sent you an invitation",
+    "email-invite-text": "Dear __user__,\n\n__inviter__ invites you to join board \"__board__\" for collaborations.\n\nPlease follow the link below:\n\n__url__\n\nThanks.",
+    "email-resetPassword-subject": "Reset your password on __siteName__",
+    "email-resetPassword-text": "Hello __user__,\n\nTo reset your password, simply click the link below.\n\n__url__\n\nThanks.",
+    "email-sent": "Email sent",
+    "email-verifyEmail-subject": "Verify your email address on __siteName__",
+    "email-verifyEmail-text": "Hello __user__,\n\nTo verify your account email, simply click the link below.\n\n__url__\n\nThanks.",
+    "enable-wip-limit": "Enable WIP Limit",
+    "error-board-doesNotExist": "This board does not exist",
+    "error-board-notAdmin": "You need to be admin of this board to do that",
+    "error-board-notAMember": "You need to be a member of this board to do that",
+    "error-json-malformed": "Your text is not valid JSON",
+    "error-json-schema": "Your JSON data does not include the proper information in the correct format",
+    "error-list-doesNotExist": "This list does not exist",
+    "error-user-doesNotExist": "This user does not exist",
+    "error-user-notAllowSelf": "You can not invite yourself",
+    "error-user-notCreated": "This user is not created",
+    "error-username-taken": "This username is already taken",
+    "error-email-taken": "Email has already been taken",
+    "export-board": "Export board",
+    "filter": "Filter",
+    "filter-cards": "Filter Cards",
+    "filter-clear": "Clear filter",
+    "filter-no-label": "No label",
+    "filter-no-member": "No member",
+    "filter-no-custom-fields": "No Custom Fields",
+    "filter-on": "Filter is on",
+    "filter-on-desc": "You are filtering cards on this board. Click here to edit filter.",
+    "filter-to-selection": "Filter to selection",
+    "advanced-filter-label": "Advanced Filter",
+    "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) to be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
+    "fullname": "Full Name",
+    "header-logo-title": "Go back to your boards page.",
+    "hide-system-messages": "Hide system messages",
+    "headerBarCreateBoardPopup-title": "Create Board",
+    "home": "Home",
+    "import": "Import",
+    "link": "Link",
+    "import-board": "import board",
+    "import-board-c": "Import board",
+    "import-board-title-trello": "Import board from Trello",
+    "import-board-title-wekan": "Import board from previous export",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
+    "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
+    "from-trello": "From Trello",
+    "from-wekan": "From previous export",
+    "import-board-instruction-trello": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text.",
+    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
+    "import-json-placeholder": "Paste your valid JSON data here",
+    "import-map-members": "Map members",
+    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
+    "import-show-user-mapping": "Review members mapping",
+    "import-user-select": "Pick your existing user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select member",
+    "info": "Version",
+    "initials": "Initials",
+    "invalid-date": "Invalid date",
+    "invalid-time": "Invalid time",
+    "invalid-user": "Invalid user",
+    "joined": "joined",
+    "just-invited": "You are just invited to this board",
+    "keyboard-shortcuts": "Keyboard shortcuts",
+    "label-create": "Create Label",
+    "label-default": "%s label (default)",
+    "label-delete-pop": "There is no undo. This will remove this label from all cards and destroy its history.",
+    "labels": "Labels",
+    "language": "Language",
+    "last-admin-desc": "You can’t change roles because there must be at least one admin.",
+    "leave-board": "Leave Board",
+    "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
+    "leaveBoardPopup-title": "Leave Board ?",
+    "link-card": "Link to this card",
+    "list-archive-cards": "Move all cards in this list to Archive",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
+    "list-move-cards": "Move all cards in this list",
+    "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
+    "listActionPopup-title": "List Actions",
+    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
+    "listImportCardPopup-title": "Import a Trello card",
+    "listMorePopup-title": "More",
+    "link-list": "Link to this list",
+    "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
+    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
+    "lists": "Lists",
+    "swimlanes": "Swimlanes",
+    "log-out": "Log Out",
+    "log-in": "Log In",
+    "loginPopup-title": "Log In",
+    "memberMenuPopup-title": "Member Settings",
+    "members": "Members",
+    "menu": "Menu",
+    "move-selection": "Move selection",
+    "moveCardPopup-title": "Move Card",
+    "moveCardToBottom-title": "Move to Bottom",
+    "moveCardToTop-title": "Move to Top",
+    "moveSelectionPopup-title": "Move selection",
+    "multi-selection": "Multi-Selection",
+    "multi-selection-on": "Multi-Selection is on",
+    "muted": "Muted",
+    "muted-info": "You will never be notified of any changes in this board",
+    "my-boards": "My Boards",
+    "name": "Name",
+    "no-archived-cards": "No cards in Archive.",
+    "no-archived-lists": "No lists in Archive.",
+    "no-archived-swimlanes": "No swimlanes in Archive.",
+    "no-results": "No results",
+    "normal": "Normal",
+    "normal-desc": "Can view and edit cards. Can't change settings.",
+    "not-accepted-yet": "Invitation not accepted yet",
+    "notify-participate": "Receive updates to any cards you participate as creater or member",
+    "notify-watch": "Receive updates to any boards, lists, or cards you’re watching",
+    "optional": "optional",
+    "or": "or",
+    "page-maybe-private": "This page may be private. You may be able to view it by <a href='%s'>logging in</a>.",
+    "page-not-found": "Page not found.",
+    "password": "Password",
+    "paste-or-dragdrop": "to paste, or drag & drop image file to it (image only)",
+    "participating": "Participating",
+    "preview": "Preview",
+    "previewAttachedImagePopup-title": "Preview",
+    "previewClipboardImagePopup-title": "Preview",
+    "private": "Private",
+    "private-desc": "This board is private. Only people added to the board can view and edit it.",
+    "profile": "Profile",
+    "public": "Public",
+    "public-desc": "This board is public. It's visible to anyone with the link and will show up in search engines like Google. Only people added to the board can edit.",
+    "quick-access-description": "Star a board to add a shortcut in this bar.",
+    "remove-cover": "Remove Cover",
+    "remove-from-board": "Remove from Board",
+    "remove-label": "Remove Label",
+    "listDeletePopup-title": "Delete List ?",
+    "remove-member": "Remove Member",
+    "remove-member-from-card": "Remove from Card",
+    "remove-member-pop": "Remove __name__ (__username__) from __boardTitle__? The member will be removed from all cards on this board. They will receive a notification.",
+    "removeMemberPopup-title": "Remove Member?",
+    "rename": "Rename",
+    "rename-board": "Rename Board",
+    "restore": "Restore",
+    "save": "Save",
+    "search": "Search",
+    "rules": "Rules",
+    "search-cards": "Search from card titles and descriptions on this board",
+    "search-example": "Text to search for?",
+    "select-color": "Select Color",
+    "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
+    "setWipLimitPopup-title": "Set WIP Limit",
+    "shortcut-assign-self": "Assign yourself to current card",
+    "shortcut-autocomplete-emoji": "Autocomplete emoji",
+    "shortcut-autocomplete-members": "Autocomplete members",
+    "shortcut-clear-filters": "Clear all filters",
+    "shortcut-close-dialog": "Close Dialog",
+    "shortcut-filter-my-cards": "Filter my cards",
+    "shortcut-show-shortcuts": "Bring up this shortcuts list",
+    "shortcut-toggle-filterbar": "Toggle Filter Sidebar",
+    "shortcut-toggle-sidebar": "Toggle Board Sidebar",
+    "show-cards-minimum-count": "Show cards count if list contains more than",
+    "sidebar-open": "Open Sidebar",
+    "sidebar-close": "Close Sidebar",
+    "signupPopup-title": "Create an Account",
+    "star-board-title": "Click to star this board. It will show up at top of your boards list.",
+    "starred-boards": "Starred Boards",
+    "starred-boards-description": "Starred boards show up at the top of your boards list.",
+    "subscribe": "Subscribe",
+    "team": "Team",
+    "this-board": "this board",
+    "this-card": "this card",
+    "spent-time-hours": "Spent time (hours)",
+    "overtime-hours": "Overtime (hours)",
+    "overtime": "Overtime",
+    "has-overtime-cards": "Has overtime cards",
+    "has-spenttime-cards": "Has spent time cards",
+    "time": "Time",
+    "title": "Title",
+    "tracking": "Tracking",
+    "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
+    "type": "Type",
+    "unassign-member": "Unassign member",
+    "unsaved-description": "You have an unsaved description.",
+    "unwatch": "Unwatch",
+    "upload": "Upload",
+    "upload-avatar": "Upload an avatar",
+    "uploaded-avatar": "Uploaded an avatar",
+    "username": "Username",
+    "view-it": "View it",
+    "warn-list-archived": "warning: this card is in an list at Archive",
+    "watch": "Watch",
+    "watching": "Watching",
+    "watching-info": "You will be notified of any change in this board",
+    "welcome-board": "Welcome Board",
+    "welcome-swimlane": "Milestone 1",
+    "welcome-list1": "Basics",
+    "welcome-list2": "Advanced",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
+    "what-to-do": "What do you want to do?",
+    "wipLimitErrorPopup-title": "Invalid WIP Limit",
+    "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
+    "wipLimitErrorPopup-dialog-pt2": "Please move some tasks out of this list, or set a higher WIP limit.",
+    "admin-panel": "Admin Panel",
+    "settings": "Settings",
+    "people": "People",
+    "registration": "Registration",
+    "disable-self-registration": "Disable Self-Registration",
+    "invite": "Invite",
+    "invite-people": "Invite People",
+    "to-boards": "To board(s)",
+    "email-addresses": "Email Addresses",
+    "smtp-host-description": "The address of the SMTP server that handles your emails.",
+    "smtp-port-description": "The port your SMTP server uses for outgoing emails.",
+    "smtp-tls-description": "Enable TLS support for SMTP server",
+    "smtp-host": "SMTP Host",
+    "smtp-port": "SMTP Port",
+    "smtp-username": "Username",
+    "smtp-password": "Password",
+    "smtp-tls": "TLS support",
+    "send-from": "From",
+    "send-smtp-test": "Send a test email to yourself",
+    "invitation-code": "Invitation Code",
+    "email-invite-register-subject": "__inviter__ sent you an invitation",
+    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email",
+    "email-smtp-test-text": "You have successfully sent an email",
+    "error-invitation-code-not-exist": "Invitation code doesn't exist",
+    "error-notAuthorized": "You are not authorized to view this page.",
+    "outgoing-webhooks": "Outgoing Webhooks",
+    "outgoingWebhooksPopup-title": "Outgoing Webhooks",
+    "boardCardTitlePopup-title": "Card Title Filter",
+    "new-outgoing-webhook": "New Outgoing Webhook",
+    "no-name": "(Unknown)",
+    "Node_version": "Node version",
+    "OS_Arch": "OS Arch",
+    "OS_Cpus": "OS CPU Count",
+    "OS_Freemem": "OS Free Memory",
+    "OS_Loadavg": "OS Load Average",
+    "OS_Platform": "OS Platform",
+    "OS_Release": "OS Release",
+    "OS_Totalmem": "OS Total Memory",
+    "OS_Type": "OS Type",
+    "OS_Uptime": "OS Uptime",
+    "days": "days",
+    "hours": "hours",
+    "minutes": "minutes",
+    "seconds": "seconds",
+    "show-field-on-card": "Show this field on card",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
+    "yes": "Yes",
+    "no": "No",
+    "accounts": "Accounts",
+    "accounts-allowEmailChange": "Allow Email Change",
+    "accounts-allowUserNameChange": "Allow Username Change",
+    "createdAt": "Created at",
+    "verified": "Verified",
+    "active": "Active",
+    "card-received": "Received",
+    "card-received-on": "Received on",
+    "card-end": "End",
+    "card-end-on": "Ends on",
+    "editCardReceivedDatePopup-title": "Change received date",
+    "editCardEndDatePopup-title": "Change end date",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "Assigned By",
+    "requested-by": "Requested By",
+    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
+    "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
+    "boardDeletePopup-title": "Delete Board?",
+    "delete-board": "Delete Board",
+    "default-subtasks-board": "Subtasks for __board__ board",
+    "default": "Default",
+    "queue": "Queue",
+    "subtask-settings": "Subtasks Settings",
+    "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
+    "show-subtasks-field": "Cards can have subtasks",
+    "deposit-subtasks-board": "Deposit subtasks to this board:",
+    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
+    "show-parent-in-minicard": "Show parent in minicard:",
+    "prefix-with-full-path": "Prefix with full path",
+    "prefix-with-parent": "Prefix with parent",
+    "subtext-with-full-path": "Subtext with full path",
+    "subtext-with-parent": "Subtext with parent",
+    "change-card-parent": "Change card's parent",
+    "parent-card": "Parent card",
+    "source-board": "Source board",
+    "no-parent": "Don't show parent",
+    "activity-added-label": "added label '%s' to %s",
+    "activity-removed-label": "removed label '%s' from %s",
+    "activity-delete-attach": "deleted an attachment from %s",
+    "activity-added-label-card": "added label '%s'",
+    "activity-removed-label-card": "removed label '%s'",
+    "activity-delete-attach-card": "deleted an attachment",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "r-rule": "Rule",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "Add action",
+    "r-board-rules": "Board rules",
+    "r-add-rule": "Add rule",
+    "r-view-rule": "View rule",
+    "r-delete-rule": "Delete rule",
+    "r-new-rule-name": "New rule title",
+    "r-no-rules": "No rules",
+    "r-when-a-card": "When a card",
+    "r-is": "is",
+    "r-is-moved": "is moved",
+    "r-added-to": "added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "the board",
+    "r-list": "list",
+    "set-filter": "Set Filter",
+    "r-moved-to": "Moved to",
+    "r-moved-from": "Moved from",
+    "r-archived": "Moved to Archive",
+    "r-unarchived": "Restored from Archive",
+    "r-a-card": "a card",
+    "r-when-a-label-is": "When a label is",
+    "r-when-the-label-is": "When the label is",
+    "r-list-name": "list name",
+    "r-when-a-member": "When a member is",
+    "r-when-the-member": "When the member",
+    "r-name": "name",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "r-when-the-item": "When the checklist item",
+    "r-checked": "Checked",
+    "r-unchecked": "Unchecked",
+    "r-move-card-to": "Move card to",
+    "r-top-of": "Top of",
+    "r-bottom-of": "Bottom of",
+    "r-its-list": "its list",
+    "r-archive": "Move to Archive",
+    "r-unarchive": "Restore from Archive",
+    "r-card": "card",
+    "r-add": "Add",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-set-color": "Set color to",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "subject",
+    "r-rule-details": "Rule details",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Move card to top of list",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Move card to bottom of list",
+    "r-d-send-email": "Send email",
+    "r-d-send-email-to": "to",
+    "r-d-send-email-subject": "subject",
+    "r-d-send-email-message": "message",
+    "r-d-archive": "Move card to Archive",
+    "r-d-unarchive": "Restore card from Archive",
+    "r-d-add-label": "Add label",
+    "r-d-remove-label": "Remove label",
+    "r-create-card": "Create new card",
+    "r-in-list": "in list",
+    "r-in-swimlane": "in swimlane",
+    "r-d-add-member": "Add member",
+    "r-d-remove-member": "Remove member",
+    "r-d-remove-all-member": "Remove all member",
+    "r-d-check-all": "Check all items of a list",
+    "r-d-uncheck-all": "Uncheck all items of a list",
+    "r-d-check-one": "Check item",
+    "r-d-uncheck-one": "Uncheck item",
+    "r-d-check-of-list": "of checklist",
+    "r-d-add-checklist": "Add checklist",
+    "r-d-remove-checklist": "Remove checklist",
+    "r-by": "by",
+    "r-add-checklist": "Add checklist",
+    "r-with-items": "with items",
+    "r-items-list": "item1,item2,item3",
+    "r-add-swimlane": "Add swimlane",
+    "r-swimlane-name": "swimlane name",
+    "r-board-note": "Note: leave a field empty to match every possible value.",
+    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout",
+    "hide-logo": "Hide Logo",
+    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
+    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
+    "error-undefined": "Something went wrong",
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
+}
\ No newline at end of file
diff --git a/i18n/ta.i18n.json b/i18n/ta.i18n.json
index 1f46dce6..a9fafed6 100644
--- a/i18n/ta.i18n.json
+++ b/i18n/ta.i18n.json
@@ -1,51 +1,79 @@
 {
-    "accept": "Accept",
-    "act-activity-notify": "[Wekan] Activity Notification",
-    "act-addAttachment": "attached __attachment__ to __card__",
-    "act-addChecklist": "added checklist __checklist__ to __card__",
-    "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__",
-    "act-addComment": "commented on __card__: __comment__",
-    "act-createBoard": "created __board__",
-    "act-createCard": "added __card__ to __list__",
-    "act-createList": "added __list__ to __board__",
-    "act-addBoardMember": "added __member__ to __board__",
-    "act-archivedBoard": "__board__ moved to Recycle Bin",
-    "act-archivedCard": "__card__ moved to Recycle Bin",
-    "act-archivedList": "__list__ moved to Recycle Bin",
-    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
-    "act-importBoard": "imported __board__",
-    "act-importCard": "imported __card__",
-    "act-importList": "imported __list__",
-    "act-joinMember": "added __member__ to __card__",
-    "act-moveCard": "moved __card__ from __oldList__ to __list__",
-    "act-removeBoardMember": "removed __member__ from __board__",
-    "act-restoredCard": "restored __card__ to __board__",
-    "act-unjoinMember": "removed __member__ from __card__",
-    "act-withBoardTitle": "[Wekan] __board__",
+    "accept": "ஏற்றுக்கொள்",
+    "act-activity-notify": "Activity Notification",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__board__",
     "act-withCardTitle": "[__board__] __card__",
     "actions": "Actions",
     "activities": "Activities",
     "activity": "Activity",
     "activity-added": "added %s to %s",
-    "activity-archived": "%s moved to Recycle Bin",
+    "activity-archived": "%s moved to Archive",
     "activity-attached": "attached %s to %s",
-    "activity-created": "created %s",
+    "activity-created": "உருவாக்கப்பட்டது ",
+    "activity-customfield-created": "created custom field %s",
     "activity-excluded": "excluded %s from %s",
     "activity-imported": "imported %s into %s from %s",
     "activity-imported-board": "imported %s from %s",
-    "activity-joined": "joined %s",
+    "activity-joined": "சேர்ந்தது ",
     "activity-moved": "moved %s from %s to %s",
     "activity-on": "on %s",
     "activity-removed": "removed %s from %s",
     "activity-sent": "sent %s to %s",
-    "activity-unjoined": "unjoined %s",
+    "activity-unjoined": "பிரிக்கப்பட்டது ",
+    "activity-subtask-added": "added subtask to %s",
+    "activity-checked-item": "checked %s in checklist %s of %s",
+    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
     "activity-checklist-added": "added checklist to %s",
+    "activity-checklist-removed": "removed a checklist from %s",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
     "activity-checklist-item-added": "added checklist item to '%s' in %s",
-    "add": "Add",
+    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
+    "add": "சேர் ",
+    "activity-checked-item-card": "checked %s in checklist %s",
+    "activity-unchecked-item-card": "unchecked %s in checklist %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
     "add-attachment": "Add Attachment",
     "add-board": "Add Board",
     "add-card": "Add Card",
     "add-swimlane": "Add Swimlane",
+    "add-subtask": "Add Subtask",
     "add-checklist": "Add Checklist",
     "add-checklist-item": "Add an item to checklist",
     "add-cover": "Add Cover",
@@ -63,30 +91,32 @@
     "and-n-other-card": "And __count__ other card",
     "and-n-other-card_plural": "And __count__ other cards",
     "apply": "Apply",
-    "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Move to Recycle Bin",
-    "archive-all": "Move All to Recycle Bin",
-    "archive-board": "Move Board to Recycle Bin",
-    "archive-card": "Move Card to Recycle Bin",
-    "archive-list": "Move List to Recycle Bin",
-    "archive-swimlane": "Move Swimlane to Recycle Bin",
-    "archive-selection": "Move selection to Recycle Bin",
-    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
-    "archived-items": "Recycle Bin",
-    "archived-boards": "Boards in Recycle Bin",
+    "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
+    "archive": "Move to Archive",
+    "archive-all": "Move All to Archive",
+    "archive-board": "Move Board to Archive",
+    "archive-card": "Move Card to Archive",
+    "archive-list": "Move List to Archive",
+    "archive-swimlane": "Move Swimlane to Archive",
+    "archive-selection": "Move selection to Archive",
+    "archiveBoardPopup-title": "Move Board to Archive?",
+    "archived-items": "Archive",
+    "archived-boards": "Boards in Archive",
     "restore-board": "Restore Board",
-    "no-archived-boards": "No Boards in Recycle Bin.",
-    "archives": "Recycle Bin",
+    "no-archived-boards": "No Boards in Archive.",
+    "archives": "Archive",
+    "template": "Template",
+    "templates": "Templates",
     "assign-member": "Assign member",
     "attached": "attached",
-    "attachment": "Attachment",
+    "attachment": "இணைப்பு ",
     "attachment-delete-pop": "Deleting an attachment is permanent. There is no undo.",
     "attachmentDeletePopup-title": "Delete Attachment?",
-    "attachments": "Attachments",
+    "attachments": "இணைப்புகள் ",
     "auto-watch": "Automatically watch boards when they are created",
     "avatar-too-big": "The avatar is too large (70KB max)",
-    "back": "Back",
-    "board-change-color": "Change color",
+    "back": "பின்செல் ",
+    "board-change-color": "நிறம் மாற்று ",
     "board-nb-stars": "%s stars",
     "board-not-found": "Board not found",
     "board-private-info": "This board will be <strong>private</strong>.",
@@ -95,22 +125,25 @@
     "boardChangeTitlePopup-title": "Rename Board",
     "boardChangeVisibilityPopup-title": "Change Visibility",
     "boardChangeWatchPopup-title": "Change Watch",
-    "boardMenuPopup-title": "Board Menu",
+    "boardMenuPopup-title": "Board Settings",
     "boards": "Boards",
     "board-view": "Board View",
+    "board-view-cal": "நாள்கட்டி ",
     "board-view-swimlanes": "Swimlanes",
     "board-view-lists": "Lists",
     "bucket-example": "Like “Bucket List” for example",
     "cancel": "Cancel",
-    "card-archived": "This card is moved to Recycle Bin.",
+    "card-archived": "This card is moved to Archive.",
+    "board-archived": "This board is moved to Archive.",
     "card-comments-title": "This card has %s comment.",
     "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
     "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
     "card-due": "Due",
     "card-due-on": "Due on",
     "card-spent": "Spent Time",
     "card-edit-attachments": "Edit attachments",
+    "card-edit-custom-fields": "Edit custom fields",
     "card-edit-labels": "Edit labels",
     "card-edit-members": "Edit members",
     "card-labels-title": "Change the labels for the card.",
@@ -118,79 +151,123 @@
     "card-start": "Start",
     "card-start-on": "Starts on",
     "cardAttachmentsPopup-title": "Attach From",
+    "cardCustomField-datePopup-title": "Change date",
+    "cardCustomFieldsPopup-title": "Edit custom fields",
     "cardDeletePopup-title": "Delete Card?",
     "cardDetailsActionsPopup-title": "Card Actions",
     "cardLabelsPopup-title": "Labels",
     "cardMembersPopup-title": "Members",
-    "cardMorePopup-title": "More",
+    "cardMorePopup-title": "மேலும் ",
+    "cardTemplatePopup-title": "Create template",
     "cards": "Cards",
     "cards-count": "Cards",
+    "casSignIn": "Sign In with CAS",
+    "cardType-card": "Card",
+    "cardType-linkedCard": "Linked Card",
+    "cardType-linkedBoard": "Linked Board",
     "change": "Change",
     "change-avatar": "Change Avatar",
-    "change-password": "Change Password",
+    "change-password": "கடவுச்சொல்லை மாற்று ",
     "change-permissions": "Change permissions",
     "change-settings": "Change Settings",
     "changeAvatarPopup-title": "Change Avatar",
     "changeLanguagePopup-title": "Change Language",
-    "changePasswordPopup-title": "Change Password",
+    "changePasswordPopup-title": "கடவுச்சொல்லை மாற்றுக ",
     "changePermissionsPopup-title": "Change Permissions",
     "changeSettingsPopup-title": "Change Settings",
+    "subtasks": "Subtasks",
     "checklists": "Checklists",
     "click-to-star": "Click to star this board.",
     "click-to-unstar": "Click to unstar this board.",
     "clipboard": "Clipboard or drag & drop",
     "close": "Close",
     "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
     "color-black": "black",
     "color-blue": "blue",
-    "color-green": "green",
-    "color-lime": "lime",
-    "color-orange": "orange",
+    "color-crimson": "crimson",
+    "color-darkgreen": "அடர் பச்சை ",
+    "color-gold": "தங்கம் ",
+    "color-gray": "gray",
+    "color-green": "பச்சை ",
+    "color-indigo": "indigo",
+    "color-lime": "வெளிர் பச்சை ",
+    "color-magenta": "magenta",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "navy",
+    "color-orange": "ஆரஞ்சு ",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
     "color-pink": "pink",
+    "color-plum": "plum",
     "color-purple": "purple",
-    "color-red": "red",
-    "color-sky": "sky",
-    "color-yellow": "yellow",
-    "comment": "Comment",
+    "color-red": "சிகப்பு ",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "வெள்ளி ",
+    "color-sky": "வாணம் ",
+    "color-slateblue": "slateblue",
+    "color-white": "வெள்ளை ",
+    "color-yellow": "மஞ்சள் ",
+    "unset-color": "Unset",
+    "comment": "கருத்து ",
     "comment-placeholder": "Write Comment",
-    "comment-only": "Comment only",
+    "comment-only": "கருத்து மட்டும் ",
     "comment-only-desc": "Can comment on cards only.",
-    "computer": "Computer",
-    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist",
+    "no-comments": "கருத்து இல்லை ",
+    "no-comments-desc": "Can not see comments and activities.",
+    "computer": "கணினி ",
+    "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?",
+    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
     "copy-card-link-to-clipboard": "Copy card link to clipboard",
+    "linkCardPopup-title": "Link Card",
+    "searchElementPopup-title": "தேடு ",
     "copyCardPopup-title": "Copy Card",
     "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
     "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
     "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"First card title\", \"description\":\"First card description\"}, {\"title\":\"Second card title\",\"description\":\"Second card description\"},{\"title\":\"Last card title\",\"description\":\"Last card description\"} ]",
-    "create": "Create",
+    "create": "உருவாக்கு ",
     "createBoardPopup-title": "Create Board",
     "chooseBoardSourcePopup-title": "Import board",
     "createLabelPopup-title": "Create Label",
+    "createCustomField": "Create Field",
+    "createCustomFieldPopup-title": "Create Field",
     "current": "current",
-    "date": "Date",
+    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
+    "custom-field-checkbox": "Checkbox",
+    "custom-field-date": "நாள் ",
+    "custom-field-dropdown": "Dropdown List",
+    "custom-field-dropdown-none": "(none)",
+    "custom-field-dropdown-options": "List Options",
+    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
+    "custom-field-dropdown-unknown": "(unknown)",
+    "custom-field-number": "எண் ",
+    "custom-field-text": "Text",
+    "custom-fields": "Custom Fields",
+    "date": "நாள் ",
     "decline": "Decline",
     "default-avatar": "Default avatar",
     "delete": "Delete",
+    "deleteCustomFieldPopup-title": "Delete Custom Field?",
     "deleteLabelPopup-title": "Delete Label?",
     "description": "Description",
     "disambiguateMultiLabelPopup-title": "Disambiguate Label Action",
     "disambiguateMultiMemberPopup-title": "Disambiguate Member Action",
     "discard": "Discard",
     "done": "Done",
-    "download": "Download",
-    "edit": "Edit",
+    "download": "பதிவிறக்கம் ",
+    "edit": "திருத்து ",
     "edit-avatar": "Change Avatar",
     "edit-profile": "Edit Profile",
     "edit-wip-limit": "Edit WIP Limit",
     "soft-wip-limit": "Soft WIP Limit",
     "editCardStartDatePopup-title": "Change start date",
     "editCardDueDatePopup-title": "Change due date",
+    "editCustomFieldPopup-title": "Edit Field",
     "editCardSpentTimePopup-title": "Change spent time",
     "editLabelPopup-title": "Change Label",
     "editNotificationPopup-title": "Edit Notification",
     "editProfilePopup-title": "Edit Profile",
-    "email": "Email",
+    "email": "மின் அஞ்சல் ",
     "email-enrollAccount-subject": "An account created for you on __siteName__",
     "email-enrollAccount-text": "Hello __user__,\n\nTo start using the service, simply click the link below.\n\n__url__\n\nThanks.",
     "email-fail": "Sending email failed",
@@ -222,30 +299,36 @@
     "filter-clear": "Clear filter",
     "filter-no-label": "No label",
     "filter-no-member": "No member",
+    "filter-no-custom-fields": "No Custom Fields",
     "filter-on": "Filter is on",
     "filter-on-desc": "You are filtering cards on this board. Click here to edit filter.",
     "filter-to-selection": "Filter to selection",
-    "fullname": "Full Name",
+    "advanced-filter-label": "Advanced Filter",
+    "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) to be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
+    "fullname": "முழு பெயர் ",
     "header-logo-title": "Go back to your boards page.",
     "hide-system-messages": "Hide system messages",
     "headerBarCreateBoardPopup-title": "Create Board",
-    "home": "Home",
-    "import": "Import",
+    "home": "தொடக்கம் ",
+    "import": "பதிவேற்றம் ",
+    "link": "இணை ",
     "import-board": "import board",
     "import-board-c": "Import board",
     "import-board-title-trello": "Import board from Trello",
-    "import-board-title-wekan": "Import board from Wekan",
+    "import-board-title-wekan": "Import board from previous export",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
     "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
-    "from-trello": "From Trello",
-    "from-wekan": "From Wekan",
+    "from-trello": "Trello ல் இருந்து ",
+    "from-wekan": "From previous export",
     "import-board-instruction-trello": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text.",
-    "import-board-instruction-wekan": "In your Wekan board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
     "import-json-placeholder": "Paste your valid JSON data here",
     "import-map-members": "Map members",
-    "import-members-map": "Your imported board has some members. Please map the members you want to import to Wekan users",
+    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
     "import-show-user-mapping": "Review members mapping",
-    "import-user-select": "Pick the Wekan user you want to use as this member",
-    "importMapMembersAddPopup-title": "Select Wekan member",
+    "import-user-select": "Pick your existing user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select member",
     "info": "Version",
     "initials": "Initials",
     "invalid-date": "Invalid date",
@@ -258,23 +341,25 @@
     "label-default": "%s label (default)",
     "label-delete-pop": "There is no undo. This will remove this label from all cards and destroy its history.",
     "labels": "Labels",
-    "language": "Language",
+    "language": "மொழி ",
     "last-admin-desc": "You can’t change roles because there must be at least one admin.",
     "leave-board": "Leave Board",
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "Link to this card",
-    "list-archive-cards": "Move all cards in this list to Recycle Bin",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
+    "list-archive-cards": "Move all cards in this list to Archive",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
+    "set-color-list": "நிறத்தை மாற்று ",
     "listActionPopup-title": "List Actions",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Import a Trello card",
-    "listMorePopup-title": "More",
+    "listMorePopup-title": "மேலும் ",
     "link-list": "Link to this list",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
     "lists": "Lists",
     "swimlanes": "Swimlanes",
     "log-out": "Log Out",
@@ -293,10 +378,10 @@
     "muted": "Muted",
     "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "My Boards",
-    "name": "Name",
-    "no-archived-cards": "No cards in Recycle Bin.",
-    "no-archived-lists": "No lists in Recycle Bin.",
-    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
+    "name": "பெயர் ",
+    "no-archived-cards": "No cards in Archive.",
+    "no-archived-lists": "No lists in Archive.",
+    "no-archived-swimlanes": "No swimlanes in Archive.",
     "no-results": "No results",
     "normal": "Normal",
     "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -307,16 +392,16 @@
     "or": "or",
     "page-maybe-private": "This page may be private. You may be able to view it by <a href='%s'>logging in</a>.",
     "page-not-found": "Page not found.",
-    "password": "Password",
+    "password": "கடவுச்சொல் ",
     "paste-or-dragdrop": "to paste, or drag & drop image file to it (image only)",
     "participating": "Participating",
     "preview": "Preview",
     "previewAttachedImagePopup-title": "Preview",
     "previewClipboardImagePopup-title": "Preview",
-    "private": "Private",
+    "private": "தனியார் ",
     "private-desc": "This board is private. Only people added to the board can view and edit it.",
     "profile": "Profile",
-    "public": "Public",
+    "public": "பொது ",
     "public-desc": "This board is public. It's visible to anyone with the link and will show up in search engines like Google. Only people added to the board can edit.",
     "quick-access-description": "Star a board to add a shortcut in this bar.",
     "remove-cover": "Remove Cover",
@@ -327,11 +412,12 @@
     "remove-member-from-card": "Remove from Card",
     "remove-member-pop": "Remove __name__ (__username__) from __boardTitle__? The member will be removed from all cards on this board. They will receive a notification.",
     "removeMemberPopup-title": "Remove Member?",
-    "rename": "Rename",
+    "rename": "பெயர்மாற்றம் ",
     "rename-board": "Rename Board",
     "restore": "Restore",
-    "save": "Save",
-    "search": "Search",
+    "save": "சேமி ",
+    "search": "தேடு ",
+    "rules": "Rules",
     "search-cards": "Search from card titles and descriptions on this board",
     "search-example": "Text to search for?",
     "select-color": "Select Color",
@@ -353,8 +439,8 @@
     "star-board-title": "Click to star this board. It will show up at top of your boards list.",
     "starred-boards": "Starred Boards",
     "starred-boards-description": "Starred boards show up at the top of your boards list.",
-    "subscribe": "Subscribe",
-    "team": "Team",
+    "subscribe": "சந்தா ",
+    "team": "குழு ",
     "this-board": "this board",
     "this-card": "this card",
     "spent-time-hours": "Spent time (hours)",
@@ -366,6 +452,7 @@
     "title": "Title",
     "tracking": "Tracking",
     "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
+    "type": "Type",
     "unassign-member": "Unassign member",
     "unsaved-description": "You have an unsaved description.",
     "unwatch": "Unwatch",
@@ -374,7 +461,7 @@
     "uploaded-avatar": "Uploaded an avatar",
     "username": "Username",
     "view-it": "View it",
-    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
+    "warn-list-archived": "warning: this card is in an list at Archive",
     "watch": "Watch",
     "watching": "Watching",
     "watching-info": "You will be notified of any change in this board",
@@ -382,6 +469,9 @@
     "welcome-swimlane": "Milestone 1",
     "welcome-list1": "Basics",
     "welcome-list2": "Advanced",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
     "what-to-do": "What do you want to do?",
     "wipLimitErrorPopup-title": "Invalid WIP Limit",
     "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
@@ -391,7 +481,7 @@
     "people": "People",
     "registration": "Registration",
     "disable-self-registration": "Disable Self-Registration",
-    "invite": "Invite",
+    "invite": "அழைப்பு ",
     "invite-people": "Invite People",
     "to-boards": "To board(s)",
     "email-addresses": "Email Addresses",
@@ -401,22 +491,22 @@
     "smtp-host": "SMTP Host",
     "smtp-port": "SMTP Port",
     "smtp-username": "Username",
-    "smtp-password": "Password",
+    "smtp-password": "கடவுச்சொல் ",
     "smtp-tls": "TLS support",
-    "send-from": "From",
-    "send-smtp-test": "Send a test email to yourself",
+    "send-from": "அனுப்புனர் ",
+    "send-smtp-test": "சோதனை மின்னஞ்சல் அணுப்புக ",
     "invitation-code": "Invitation Code",
     "email-invite-register-subject": "__inviter__ sent you an invitation",
-    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to Wekan for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
-    "email-smtp-test-subject": "SMTP Test Email From Wekan",
+    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email",
     "email-smtp-test-text": "You have successfully sent an email",
     "error-invitation-code-not-exist": "Invitation code doesn't exist",
     "error-notAuthorized": "You are not authorized to view this page.",
     "outgoing-webhooks": "Outgoing Webhooks",
     "outgoingWebhooksPopup-title": "Outgoing Webhooks",
+    "boardCardTitlePopup-title": "Card Title Filter",
     "new-outgoing-webhook": "New Outgoing Webhook",
     "no-name": "(Unknown)",
-    "Wekan_version": "Wekan version",
     "Node_version": "Node version",
     "OS_Arch": "OS Arch",
     "OS_Cpus": "OS CPU Count",
@@ -427,20 +517,177 @@
     "OS_Totalmem": "OS Total Memory",
     "OS_Type": "OS Type",
     "OS_Uptime": "OS Uptime",
+    "days": "days",
     "hours": "hours",
     "minutes": "minutes",
     "seconds": "seconds",
+    "show-field-on-card": "Show this field on card",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
     "yes": "Yes",
     "no": "No",
     "accounts": "Accounts",
     "accounts-allowEmailChange": "Allow Email Change",
+    "accounts-allowUserNameChange": "Allow Username Change",
     "createdAt": "Created at",
     "verified": "Verified",
     "active": "Active",
     "card-received": "Received",
     "card-received-on": "Received on",
-    "card-end": "End",
+    "card-end": "முடிவு ",
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
-    "editCardEndDatePopup-title": "Change end date"
-}
+    "editCardEndDatePopup-title": "Change end date",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "Assigned By",
+    "requested-by": "Requested By",
+    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
+    "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
+    "boardDeletePopup-title": "Delete Board?",
+    "delete-board": "Delete Board",
+    "default-subtasks-board": "Subtasks for __board__ board",
+    "default": "Default",
+    "queue": "Queue",
+    "subtask-settings": "Subtasks Settings",
+    "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
+    "show-subtasks-field": "Cards can have subtasks",
+    "deposit-subtasks-board": "Deposit subtasks to this board:",
+    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
+    "show-parent-in-minicard": "Show parent in minicard:",
+    "prefix-with-full-path": "Prefix with full path",
+    "prefix-with-parent": "Prefix with parent",
+    "subtext-with-full-path": "Subtext with full path",
+    "subtext-with-parent": "Subtext with parent",
+    "change-card-parent": "Change card's parent",
+    "parent-card": "Parent card",
+    "source-board": "Source board",
+    "no-parent": "Don't show parent",
+    "activity-added-label": "added label '%s' to %s",
+    "activity-removed-label": "removed label '%s' from %s",
+    "activity-delete-attach": "deleted an attachment from %s",
+    "activity-added-label-card": "added label '%s'",
+    "activity-removed-label-card": "removed label '%s'",
+    "activity-delete-attach-card": "deleted an attachment",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "r-rule": "Rule",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "Add action",
+    "r-board-rules": "Board rules",
+    "r-add-rule": "Add rule",
+    "r-view-rule": "View rule",
+    "r-delete-rule": "Delete rule",
+    "r-new-rule-name": "New rule title",
+    "r-no-rules": "No rules",
+    "r-when-a-card": "When a card",
+    "r-is": "is",
+    "r-is-moved": "is moved",
+    "r-added-to": "added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "the board",
+    "r-list": "list",
+    "set-filter": "Set Filter",
+    "r-moved-to": "Moved to",
+    "r-moved-from": "Moved from",
+    "r-archived": "Moved to Archive",
+    "r-unarchived": "Restored from Archive",
+    "r-a-card": "a card",
+    "r-when-a-label-is": "When a label is",
+    "r-when-the-label-is": "When the label is",
+    "r-list-name": "list name",
+    "r-when-a-member": "When a member is",
+    "r-when-the-member": "When the member",
+    "r-name": "name",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "r-when-the-item": "When the checklist item",
+    "r-checked": "Checked",
+    "r-unchecked": "Unchecked",
+    "r-move-card-to": "Move card to",
+    "r-top-of": "Top of",
+    "r-bottom-of": "Bottom of",
+    "r-its-list": "its list",
+    "r-archive": "Move to Archive",
+    "r-unarchive": "Restore from Archive",
+    "r-card": "card",
+    "r-add": "சேர் ",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-set-color": "Set color to",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "subject",
+    "r-rule-details": "Rule details",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Move card to top of list",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Move card to bottom of list",
+    "r-d-send-email": "Send email",
+    "r-d-send-email-to": "to",
+    "r-d-send-email-subject": "subject",
+    "r-d-send-email-message": "message",
+    "r-d-archive": "Move card to Archive",
+    "r-d-unarchive": "Restore card from Archive",
+    "r-d-add-label": "Add label",
+    "r-d-remove-label": "Remove label",
+    "r-create-card": "Create new card",
+    "r-in-list": "in list",
+    "r-in-swimlane": "in swimlane",
+    "r-d-add-member": "Add member",
+    "r-d-remove-member": "Remove member",
+    "r-d-remove-all-member": "Remove all member",
+    "r-d-check-all": "Check all items of a list",
+    "r-d-uncheck-all": "Uncheck all items of a list",
+    "r-d-check-one": "Check item",
+    "r-d-uncheck-one": "Uncheck item",
+    "r-d-check-of-list": "of checklist",
+    "r-d-add-checklist": "Add checklist",
+    "r-d-remove-checklist": "Remove checklist",
+    "r-by": "by",
+    "r-add-checklist": "Add checklist",
+    "r-with-items": "with items",
+    "r-items-list": "item1,item2,item3",
+    "r-add-swimlane": "Add swimlane",
+    "r-swimlane-name": "swimlane name",
+    "r-board-note": "Note: leave a field empty to match every possible value.",
+    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout",
+    "hide-logo": "Hide Logo",
+    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
+    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
+    "error-undefined": "Something went wrong",
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
+}
\ No newline at end of file
diff --git a/i18n/th.i18n.json b/i18n/th.i18n.json
index a4f2d6b4..2be9c4f4 100644
--- a/i18n/th.i18n.json
+++ b/i18n/th.i18n.json
@@ -1,35 +1,51 @@
 {
     "accept": "ยอมรับ",
-    "act-activity-notify": "[Wekan] แจ้งกิจกรรม",
-    "act-addAttachment": "แนบไฟล์ __attachment__ ไปยัง __card__",
-    "act-addChecklist": "added checklist __checklist__ to __card__",
-    "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__",
-    "act-addComment": "ออกความเห็นที่ __card__: __comment__",
-    "act-createBoard": "สร้าง __board__",
-    "act-createCard": "เพิ่ม __card__ ไปยัง __list__",
-    "act-createList": "เพิ่ม __list__ ไปยัง __board__",
-    "act-addBoardMember": "เพิ่ม __member__ ไปยัง __board__",
-    "act-archivedBoard": "__board__ moved to Recycle Bin",
-    "act-archivedCard": "__card__ moved to Recycle Bin",
-    "act-archivedList": "__list__ moved to Recycle Bin",
-    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
-    "act-importBoard": "นำเข้า __board__",
-    "act-importCard": "นำเข้า __card__",
-    "act-importList": "นำเข้า __list__",
-    "act-joinMember": "เพิ่ม __member__ ไปยัง __card__",
-    "act-moveCard": "ย้าย __card__ จาก __oldList__ ไป __list__",
-    "act-removeBoardMember": "ลบ __member__ จาก __board__",
-    "act-restoredCard": "กู้คืน __card__ ไปยัง __board__",
-    "act-unjoinMember": "ลบ __member__ จาก __card__",
-    "act-withBoardTitle": "[Wekan] __board__",
+    "act-activity-notify": "Activity Notification",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__board__",
     "act-withCardTitle": "[__board__] __card__",
     "actions": "ปฎิบัติการ",
     "activities": "กิจกรรม",
     "activity": "กิจกรรม",
     "activity-added": "เพิ่ม %s ไปยัง %s",
-    "activity-archived": "%s moved to Recycle Bin",
+    "activity-archived": "%s moved to Archive",
     "activity-attached": "แนบ %s ไปยัง %s",
     "activity-created": "สร้าง %s",
+    "activity-customfield-created": "created custom field %s",
     "activity-excluded": "ยกเว้น %s จาก %s",
     "activity-imported": "ถูกนำเข้า %s ไปยัง %s จาก %s",
     "activity-imported-board": "นำเข้า %s จาก %s",
@@ -39,13 +55,25 @@
     "activity-removed": "ลบ %s จาด %s",
     "activity-sent": "ส่ง %s ถึง %s",
     "activity-unjoined": "ยกเลิกเข้าร่วม %s",
+    "activity-subtask-added": "added subtask to %s",
+    "activity-checked-item": "checked %s in checklist %s of %s",
+    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
     "activity-checklist-added": "รายการถูกเพิ่มไป %s",
+    "activity-checklist-removed": "removed a checklist from %s",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
     "activity-checklist-item-added": "added checklist item to '%s' in %s",
+    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
     "add": "เพิ่ม",
+    "activity-checked-item-card": "checked %s in checklist %s",
+    "activity-unchecked-item-card": "unchecked %s in checklist %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
     "add-attachment": "Add Attachment",
     "add-board": "Add Board",
     "add-card": "Add Card",
     "add-swimlane": "Add Swimlane",
+    "add-subtask": "Add Subtask",
     "add-checklist": "Add Checklist",
     "add-checklist-item": "เพิ่มรายการตรวจสอบ",
     "add-cover": "เพิ่มหน้าปก",
@@ -63,20 +91,22 @@
     "and-n-other-card": "และการ์ดอื่น __count__",
     "and-n-other-card_plural": "และการ์ดอื่น ๆ  __count__",
     "apply": "นำมาใช้",
-    "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Move to Recycle Bin",
-    "archive-all": "Move All to Recycle Bin",
-    "archive-board": "Move Board to Recycle Bin",
-    "archive-card": "Move Card to Recycle Bin",
-    "archive-list": "Move List to Recycle Bin",
-    "archive-swimlane": "Move Swimlane to Recycle Bin",
-    "archive-selection": "Move selection to Recycle Bin",
-    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
-    "archived-items": "Recycle Bin",
-    "archived-boards": "Boards in Recycle Bin",
+    "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
+    "archive": "Move to Archive",
+    "archive-all": "Move All to Archive",
+    "archive-board": "Move Board to Archive",
+    "archive-card": "Move Card to Archive",
+    "archive-list": "Move List to Archive",
+    "archive-swimlane": "Move Swimlane to Archive",
+    "archive-selection": "Move selection to Archive",
+    "archiveBoardPopup-title": "Move Board to Archive?",
+    "archived-items": "เอกสารที่เก็บไว้",
+    "archived-boards": "Boards in Archive",
     "restore-board": "Restore Board",
-    "no-archived-boards": "No Boards in Recycle Bin.",
-    "archives": "Recycle Bin",
+    "no-archived-boards": "No Boards in Archive.",
+    "archives": "เอกสารที่เก็บไว้",
+    "template": "Template",
+    "templates": "Templates",
     "assign-member": "กำหนดสมาชิก",
     "attached": "แนบมาด้วย",
     "attachment": "สิ่งที่แนบมา",
@@ -95,22 +125,25 @@
     "boardChangeTitlePopup-title": "เปลี่ยนชื่อบอร์ด",
     "boardChangeVisibilityPopup-title": "เปลี่ยนการเข้าถึง",
     "boardChangeWatchPopup-title": "เปลี่ยนการเฝ้าดู",
-    "boardMenuPopup-title": "เมนูบอร์ด",
+    "boardMenuPopup-title": "Board Settings",
     "boards": "บอร์ด",
     "board-view": "Board View",
+    "board-view-cal": "Calendar",
     "board-view-swimlanes": "Swimlanes",
     "board-view-lists": "รายการ",
     "bucket-example": "ตัวอย่างเช่น “ระบบที่ต้องทำ”",
     "cancel": "ยกเลิก",
-    "card-archived": "This card is moved to Recycle Bin.",
+    "card-archived": "This card is moved to Archive.",
+    "board-archived": "This board is moved to Archive.",
     "card-comments-title": "การ์ดนี้มี %s ความเห็น.",
     "card-delete-notice": "เป็นการลบถาวร คุณจะสูญเสียข้อมูลที่เกี่ยวข้องกับการ์ดนี้ทั้งหมด",
     "card-delete-pop": "การดำเนินการทั้งหมดจะถูกลบจาก feed กิจกรรมและคุณไม่สามารถเปิดได้อีกครั้งหรือยกเลิกการทำ",
-    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
     "card-due": "ครบกำหนด",
     "card-due-on": "ครบกำหนดเมื่อ",
     "card-spent": "Spent Time",
     "card-edit-attachments": "แก้ไขสิ่งที่แนบมา",
+    "card-edit-custom-fields": "Edit custom fields",
     "card-edit-labels": "แก้ไขป้ายกำกับ",
     "card-edit-members": "แก้ไขสมาชิก",
     "card-labels-title": "เปลี่ยนป้ายกำกับของการ์ด",
@@ -118,13 +151,20 @@
     "card-start": "เริ่ม",
     "card-start-on": "เริ่มเมื่อ",
     "cardAttachmentsPopup-title": "แนบจาก",
+    "cardCustomField-datePopup-title": "Change date",
+    "cardCustomFieldsPopup-title": "Edit custom fields",
     "cardDeletePopup-title": "ลบการ์ดนี้หรือไม่",
     "cardDetailsActionsPopup-title": "การดำเนินการการ์ด",
     "cardLabelsPopup-title": "ป้ายกำกับ",
     "cardMembersPopup-title": "สมาชิก",
     "cardMorePopup-title": "เพิ่มเติม",
+    "cardTemplatePopup-title": "Create template",
     "cards": "การ์ด",
     "cards-count": "การ์ด",
+    "casSignIn": "Sign In with CAS",
+    "cardType-card": "Card",
+    "cardType-linkedCard": "Linked Card",
+    "cardType-linkedBoard": "Linked Board",
     "change": "เปลี่ยน",
     "change-avatar": "เปลี่ยนภาพ",
     "change-password": "เปลี่ยนรหัสผ่าน",
@@ -135,30 +175,52 @@
     "changePasswordPopup-title": "เปลี่ยนรหัสผ่าน",
     "changePermissionsPopup-title": "เปลี่ยนสิทธิ์",
     "changeSettingsPopup-title": "เปลี่ยนการตั้งค่า",
+    "subtasks": "Subtasks",
     "checklists": "รายการตรวจสอบ",
     "click-to-star": "คลิกดาวบอร์ดนี้",
     "click-to-unstar": "คลิกยกเลิกดาวบอร์ดนี้",
     "clipboard": "Clipboard หรือลากและวาง",
     "close": "ปิด",
     "close-board": "ปิดบอร์ด",
-    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
     "color-black": "ดำ",
     "color-blue": "น้ำเงิน",
+    "color-crimson": "crimson",
+    "color-darkgreen": "darkgreen",
+    "color-gold": "gold",
+    "color-gray": "gray",
     "color-green": "เขียว",
+    "color-indigo": "indigo",
     "color-lime": "เหลืองมะนาว",
+    "color-magenta": "magenta",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "navy",
     "color-orange": "ส้ม",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
     "color-pink": "ชมพู",
+    "color-plum": "plum",
     "color-purple": "ม่วง",
     "color-red": "แดง",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "silver",
     "color-sky": "ฟ้า",
+    "color-slateblue": "slateblue",
+    "color-white": "white",
     "color-yellow": "เหลือง",
+    "unset-color": "Unset",
     "comment": "คอมเม็นต์",
     "comment-placeholder": "Write Comment",
     "comment-only": "Comment only",
     "comment-only-desc": "Can comment on cards only.",
+    "no-comments": "No comments",
+    "no-comments-desc": "Can not see comments and activities.",
     "computer": "คอมพิวเตอร์",
-    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist",
+    "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?",
+    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
     "copy-card-link-to-clipboard": "Copy card link to clipboard",
+    "linkCardPopup-title": "Link Card",
+    "searchElementPopup-title": "ค้นหา",
     "copyCardPopup-title": "Copy Card",
     "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
     "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
@@ -167,11 +229,25 @@
     "createBoardPopup-title": "สร้างบอร์ด",
     "chooseBoardSourcePopup-title": "Import board",
     "createLabelPopup-title": "สร้างป้ายกำกับ",
+    "createCustomField": "Create Field",
+    "createCustomFieldPopup-title": "Create Field",
     "current": "ปัจจุบัน",
+    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
+    "custom-field-checkbox": "Checkbox",
+    "custom-field-date": "วันที่",
+    "custom-field-dropdown": "Dropdown List",
+    "custom-field-dropdown-none": "(none)",
+    "custom-field-dropdown-options": "List Options",
+    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
+    "custom-field-dropdown-unknown": "(unknown)",
+    "custom-field-number": "Number",
+    "custom-field-text": "Text",
+    "custom-fields": "Custom Fields",
     "date": "วันที่",
     "decline": "ปฎิเสธ",
     "default-avatar": "ภาพเริ่มต้น",
     "delete": "ลบ",
+    "deleteCustomFieldPopup-title": "Delete Custom Field?",
     "deleteLabelPopup-title": "ลบป้ายกำกับนี้หรือไม่",
     "description": "คำอธิบาย",
     "disambiguateMultiLabelPopup-title": "การดำเนินการกำกับป้ายชัดเจน",
@@ -186,6 +262,7 @@
     "soft-wip-limit": "Soft WIP Limit",
     "editCardStartDatePopup-title": "เปลี่ยนวันเริ่มต้น",
     "editCardDueDatePopup-title": "เปลี่ยนวันครบกำหนด",
+    "editCustomFieldPopup-title": "Edit Field",
     "editCardSpentTimePopup-title": "Change spent time",
     "editLabelPopup-title": "เปลี่ยนป้ายกำกับ",
     "editNotificationPopup-title": "แก้ไขการแจ้งเตือน",
@@ -222,30 +299,36 @@
     "filter-clear": "ล้างตัวกรอง",
     "filter-no-label": "ไม่มีฉลาก",
     "filter-no-member": "ไม่มีสมาชิก",
+    "filter-no-custom-fields": "No Custom Fields",
     "filter-on": "กรองบน",
     "filter-on-desc": "คุณกำลังกรองการ์ดในบอร์ดนี้ คลิกที่นี่เพื่อแก้ไขตัวกรอง",
     "filter-to-selection": "กรองตัวเลือก",
+    "advanced-filter-label": "Advanced Filter",
+    "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) to be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
     "fullname": "ชื่อ นามสกุล",
     "header-logo-title": "ย้อนกลับไปที่หน้าบอร์ดของคุณ",
     "hide-system-messages": "ซ่อนข้อความของระบบ",
     "headerBarCreateBoardPopup-title": "สร้างบอร์ด",
     "home": "หน้าหลัก",
     "import": "นำเข้า",
+    "link": "Link",
     "import-board": "import board",
     "import-board-c": "Import board",
     "import-board-title-trello": "นำเข้าบอร์ดจาก Trello",
-    "import-board-title-wekan": "Import board from Wekan",
+    "import-board-title-wekan": "Import board from previous export",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
     "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
     "from-trello": "From Trello",
-    "from-wekan": "From Wekan",
+    "from-wekan": "From previous export",
     "import-board-instruction-trello": "ใน Trello ของคุณให้ไปที่ 'Menu' และไปที่ More -> Print and Export -> Export JSON และคัดลอกข้อความจากนั้น",
-    "import-board-instruction-wekan": "In your Wekan board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
     "import-json-placeholder": "วางข้อมูล JSON ที่ถูกต้องของคุณที่นี่",
     "import-map-members": "แผนที่สมาชิก",
-    "import-members-map": "Your imported board has some members. Please map the members you want to import to Wekan users",
+    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
     "import-show-user-mapping": "Review การทำแผนที่สมาชิก",
-    "import-user-select": "เลือกผู้ใช้ Wekan ที่คุณต้องการใช้เป็นเหมือนสมาชิกนี้",
-    "importMapMembersAddPopup-title": "เลือกสมาชิก",
+    "import-user-select": "Pick your existing user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select member",
     "info": "Version",
     "initials": "ชื่อย่อ",
     "invalid-date": "วันที่ไม่ถูกต้อง",
@@ -264,17 +347,19 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "เชื่อมโยงไปยังการ์ดใบนี้",
-    "list-archive-cards": "Move all cards in this list to Recycle Bin",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
+    "list-archive-cards": "Move all cards in this list to Archive",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "ย้ายการ์ดทั้งหมดในรายการนี้",
     "list-select-cards": "เลือกการ์ดทั้งหมดในรายการนี้",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "รายการการดำเนิน",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "นำเข้าการ์ด Trello",
     "listMorePopup-title": "เพิ่มเติม",
     "link-list": "Link to this list",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
     "lists": "รายการ",
     "swimlanes": "Swimlanes",
     "log-out": "ออกจากระบบ",
@@ -294,9 +379,9 @@
     "muted-info": "คุณจะไม่ได้รับแจ้งการเปลี่ยนแปลงใด ๆ ในบอร์ดนี้",
     "my-boards": "บอร์ดของฉัน",
     "name": "ชื่อ",
-    "no-archived-cards": "No cards in Recycle Bin.",
-    "no-archived-lists": "No lists in Recycle Bin.",
-    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
+    "no-archived-cards": "No cards in Archive.",
+    "no-archived-lists": "No lists in Archive.",
+    "no-archived-swimlanes": "No swimlanes in Archive.",
     "no-results": "ไม่มีข้อมูล",
     "normal": "ธรรมดา",
     "normal-desc": "สามารถดูและแก้ไขการ์ดได้ แต่ไม่สามารถเปลี่ยนการตั้งค่าได้",
@@ -332,6 +417,7 @@
     "restore": "กู้คืน",
     "save": "บันทึก",
     "search": "ค้นหา",
+    "rules": "Rules",
     "search-cards": "Search from card titles and descriptions on this board",
     "search-example": "Text to search for?",
     "select-color": "Select Color",
@@ -366,6 +452,7 @@
     "title": "หัวข้อ",
     "tracking": "ติดตาม",
     "tracking-info": "คุณจะได้รับแจ้งการเปลี่ยนแปลงใด ๆ กับการ์ดที่คุณมีส่วนร่วมในฐานะผู้สร้างหรือสมาชิก",
+    "type": "Type",
     "unassign-member": "ยกเลิกสมาชิก",
     "unsaved-description": "คุณมีคำอธิบายที่ไม่ได้บันทึก",
     "unwatch": "เลิกเฝ้าดู",
@@ -374,7 +461,7 @@
     "uploaded-avatar": "ภาพอัพโหลดแล้ว",
     "username": "ชื่อผู้ใช้งาน",
     "view-it": "ดู",
-    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
+    "warn-list-archived": "warning: this card is in an list at Archive",
     "watch": "เฝ้าดู",
     "watching": "เฝ้าดู",
     "watching-info": "คุณจะได้รับแจ้งหากมีการเปลี่ยนแปลงใด ๆ ในบอร์ดนี้",
@@ -382,6 +469,9 @@
     "welcome-swimlane": "Milestone 1",
     "welcome-list1": "พื้นฐาน",
     "welcome-list2": "ก้าวหน้า",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
     "what-to-do": "ต้องการทำอะไร",
     "wipLimitErrorPopup-title": "Invalid WIP Limit",
     "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
@@ -407,16 +497,16 @@
     "send-smtp-test": "Send a test email to yourself",
     "invitation-code": "Invitation Code",
     "email-invite-register-subject": "__inviter__ ส่งคำเชิญให้คุณ",
-    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to Wekan for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
-    "email-smtp-test-subject": "SMTP Test Email From Wekan",
+    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email",
     "email-smtp-test-text": "You have successfully sent an email",
     "error-invitation-code-not-exist": "Invitation code doesn't exist",
     "error-notAuthorized": "You are not authorized to view this page.",
     "outgoing-webhooks": "Outgoing Webhooks",
     "outgoingWebhooksPopup-title": "Outgoing Webhooks",
+    "boardCardTitlePopup-title": "Card Title Filter",
     "new-outgoing-webhook": "New Outgoing Webhook",
     "no-name": "(Unknown)",
-    "Wekan_version": "Wekan version",
     "Node_version": "Node version",
     "OS_Arch": "OS Arch",
     "OS_Cpus": "OS CPU Count",
@@ -427,13 +517,18 @@
     "OS_Totalmem": "OS Total Memory",
     "OS_Type": "OS Type",
     "OS_Uptime": "OS Uptime",
+    "days": "days",
     "hours": "hours",
     "minutes": "minutes",
     "seconds": "seconds",
+    "show-field-on-card": "Show this field on card",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
     "yes": "Yes",
     "no": "No",
     "accounts": "Accounts",
     "accounts-allowEmailChange": "Allow Email Change",
+    "accounts-allowUserNameChange": "Allow Username Change",
     "createdAt": "Created at",
     "verified": "Verified",
     "active": "Active",
@@ -442,5 +537,157 @@
     "card-end": "End",
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
-    "editCardEndDatePopup-title": "Change end date"
-}
+    "editCardEndDatePopup-title": "Change end date",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "Assigned By",
+    "requested-by": "Requested By",
+    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
+    "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
+    "boardDeletePopup-title": "Delete Board?",
+    "delete-board": "Delete Board",
+    "default-subtasks-board": "Subtasks for __board__ board",
+    "default": "Default",
+    "queue": "Queue",
+    "subtask-settings": "Subtasks Settings",
+    "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
+    "show-subtasks-field": "Cards can have subtasks",
+    "deposit-subtasks-board": "Deposit subtasks to this board:",
+    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
+    "show-parent-in-minicard": "Show parent in minicard:",
+    "prefix-with-full-path": "Prefix with full path",
+    "prefix-with-parent": "Prefix with parent",
+    "subtext-with-full-path": "Subtext with full path",
+    "subtext-with-parent": "Subtext with parent",
+    "change-card-parent": "Change card's parent",
+    "parent-card": "Parent card",
+    "source-board": "Source board",
+    "no-parent": "Don't show parent",
+    "activity-added-label": "added label '%s' to %s",
+    "activity-removed-label": "removed label '%s' from %s",
+    "activity-delete-attach": "deleted an attachment from %s",
+    "activity-added-label-card": "added label '%s'",
+    "activity-removed-label-card": "removed label '%s'",
+    "activity-delete-attach-card": "deleted an attachment",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "r-rule": "Rule",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "Add action",
+    "r-board-rules": "Board rules",
+    "r-add-rule": "Add rule",
+    "r-view-rule": "View rule",
+    "r-delete-rule": "Delete rule",
+    "r-new-rule-name": "New rule title",
+    "r-no-rules": "No rules",
+    "r-when-a-card": "When a card",
+    "r-is": "is",
+    "r-is-moved": "is moved",
+    "r-added-to": "added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "the board",
+    "r-list": "list",
+    "set-filter": "Set Filter",
+    "r-moved-to": "Moved to",
+    "r-moved-from": "Moved from",
+    "r-archived": "Moved to Archive",
+    "r-unarchived": "Restored from Archive",
+    "r-a-card": "a card",
+    "r-when-a-label-is": "When a label is",
+    "r-when-the-label-is": "When the label is",
+    "r-list-name": "list name",
+    "r-when-a-member": "When a member is",
+    "r-when-the-member": "When the member",
+    "r-name": "name",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "r-when-the-item": "When the checklist item",
+    "r-checked": "Checked",
+    "r-unchecked": "Unchecked",
+    "r-move-card-to": "Move card to",
+    "r-top-of": "Top of",
+    "r-bottom-of": "Bottom of",
+    "r-its-list": "its list",
+    "r-archive": "Move to Archive",
+    "r-unarchive": "Restore from Archive",
+    "r-card": "card",
+    "r-add": "เพิ่ม",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-set-color": "Set color to",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "subject",
+    "r-rule-details": "Rule details",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Move card to top of list",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Move card to bottom of list",
+    "r-d-send-email": "Send email",
+    "r-d-send-email-to": "to",
+    "r-d-send-email-subject": "subject",
+    "r-d-send-email-message": "message",
+    "r-d-archive": "Move card to Archive",
+    "r-d-unarchive": "Restore card from Archive",
+    "r-d-add-label": "Add label",
+    "r-d-remove-label": "Remove label",
+    "r-create-card": "Create new card",
+    "r-in-list": "in list",
+    "r-in-swimlane": "in swimlane",
+    "r-d-add-member": "Add member",
+    "r-d-remove-member": "Remove member",
+    "r-d-remove-all-member": "Remove all member",
+    "r-d-check-all": "Check all items of a list",
+    "r-d-uncheck-all": "Uncheck all items of a list",
+    "r-d-check-one": "Check item",
+    "r-d-uncheck-one": "Uncheck item",
+    "r-d-check-of-list": "of checklist",
+    "r-d-add-checklist": "Add checklist",
+    "r-d-remove-checklist": "Remove checklist",
+    "r-by": "by",
+    "r-add-checklist": "Add checklist",
+    "r-with-items": "with items",
+    "r-items-list": "item1,item2,item3",
+    "r-add-swimlane": "Add swimlane",
+    "r-swimlane-name": "swimlane name",
+    "r-board-note": "Note: leave a field empty to match every possible value.",
+    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout",
+    "hide-logo": "Hide Logo",
+    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
+    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
+    "error-undefined": "Something went wrong",
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
+}
\ No newline at end of file
diff --git a/i18n/tr.i18n.json b/i18n/tr.i18n.json
index 3dfecc59..bd8c9737 100644
--- a/i18n/tr.i18n.json
+++ b/i18n/tr.i18n.json
@@ -1,35 +1,51 @@
 {
     "accept": "Kabul Et",
-    "act-activity-notify": "[Wekan] Etkinlik Bildirimi",
-    "act-addAttachment": "__card__ kartına __attachment__ dosyasını ekledi",
-    "act-addChecklist": "__card__ kartında __checklist__ yapılacak listesini ekledi",
-    "act-addChecklistItem": "__checklistItem__ öğesini __card__ kartındaki __checklist__ yapılacak listesine ekledi",
-    "act-addComment": "__card__ kartına bir yorum bıraktı: __comment__",
-    "act-createBoard": "__board__ panosunu oluşturdu",
-    "act-createCard": "__card__ kartını ___list__ listesine ekledi",
-    "act-createList": "__list__ listesini __board__ panosuna ekledi",
-    "act-addBoardMember": "__member__ kullanıcısını __board__ panosuna ekledi",
-    "act-archivedBoard": "__board__ Geri Dönüşüm Kutusu'na taşındı",
-    "act-archivedCard": "__card__ Geri Dönüşüm Kutusu'na taşındı",
-    "act-archivedList": "__list__ Geri Dönüşüm Kutusu'na taşındı",
-    "act-archivedSwimlane": "__swimlane__ Geri Dönüşüm Kutusu'na taşındı",
-    "act-importBoard": "__board__ panosunu içe aktardı",
-    "act-importCard": "__card__ kartını içe aktardı",
-    "act-importList": "__list__ listesini içe aktardı",
-    "act-joinMember": "__member__ kullanıcısnı __card__ kartına ekledi",
-    "act-moveCard": "__card__ kartını __oldList__ listesinden __list__ listesine taşıdı",
-    "act-removeBoardMember": "__board__ panosundan __member__ kullanıcısını çıkarttı",
-    "act-restoredCard": "__card__ kartını __board__ panosuna geri getirdi",
-    "act-unjoinMember": "__member__ kullanıcısnı __card__ kartından çıkarttı",
-    "act-withBoardTitle": "[Wekan] __board__",
+    "act-activity-notify": "Etkinlik Bildirimi",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "__board__ panosu oluşturuldu",
+    "act-createSwimlane": "__board__ panosuna __swimlane__ kulvarı oluşturuldu",
+    "act-createCard": "__board__ panosunun __swimlane__ kulvarının __list__ listesinin __card__ kartı oluşturuldu",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "__board__ panosuna __member__ kullanıcısı eklendi",
+    "act-archivedBoard": "__board__ panosu Arşiv'e taşındı",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "__board__ panosu içeriye aktarıldı",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__board__",
     "act-withCardTitle": "[__board__] __card__",
     "actions": "İşlemler",
     "activities": "Etkinlikler",
     "activity": "Etkinlik",
     "activity-added": "%s içine %s ekledi",
-    "activity-archived": "%s Geri Dönüşüm Kutusu'na taşındı",
+    "activity-archived": "%s arşive taşındı",
     "activity-attached": "%s içine %s ekledi",
     "activity-created": "%s öğesini oluşturdu",
+    "activity-customfield-created": "%s adlı özel alan yaratıldı",
     "activity-excluded": "%s içinden %s çıkarttı",
     "activity-imported": "%s kaynağından %s öğesini %s öğesinin içine taşıdı ",
     "activity-imported-board": "%s i %s içinden aktardı",
@@ -39,13 +55,25 @@
     "activity-removed": "%s i %s ten kaldırdı",
     "activity-sent": "%s i %s e gönderdi",
     "activity-unjoined": "%s içinden ayrıldı",
+    "activity-subtask-added": "Alt-görev %s'e eklendi",
+    "activity-checked-item": "checked %s in checklist %s of %s",
+    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
     "activity-checklist-added": "%s içine yapılacak listesi ekledi",
+    "activity-checklist-removed": "%s Tarafından yapılacaklar listesi silinmiştir",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
     "activity-checklist-item-added": "%s içinde %s yapılacak listesine öğe ekledi",
+    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
     "add": "Ekle",
+    "activity-checked-item-card": "checked %s in checklist %s",
+    "activity-unchecked-item-card": "unchecked %s in checklist %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
     "add-attachment": "Ek Ekle",
     "add-board": "Pano Ekle",
     "add-card": "Kart Ekle",
     "add-swimlane": "Kulvar Ekle",
+    "add-subtask": "Alt Görev Ekle",
     "add-checklist": "Yapılacak Listesi Ekle",
     "add-checklist-item": "Yapılacak listesine yeni bir öğe ekle",
     "add-cover": "Kapak resmi ekle",
@@ -63,20 +91,22 @@
     "and-n-other-card": "Ve __count__ diğer kart",
     "and-n-other-card_plural": "Ve __count__ diğer kart",
     "apply": "Uygula",
-    "app-is-offline": "Wekan yükleniyor, lütfen bekleyin. Sayfayı yenilemek veri kaybına sebep olabilir. Eğer Wekan yüklenmezse, lütfen Wekan sunucusunun çalıştığından emin olun.",
-    "archive": "Geri Dönüşüm Kutusu'na taşı",
-    "archive-all": "Tümünü Geri Dönüşüm Kutusu'na taşı",
-    "archive-board": "Panoyu Geri Dönüşüm Kutusu'na taşı",
-    "archive-card": "Kartı Geri Dönüşüm Kutusu'na taşı",
-    "archive-list": "Listeyi Geri Dönüşüm Kutusu'na taşı",
-    "archive-swimlane": "Kulvarı Geri Dönüşüm Kutusu'na taşı",
-    "archive-selection": "Seçimi Geri Dönüşüm Kutusu'na taşı",
-    "archiveBoardPopup-title": "Panoyu Geri Dönüşüm Kutusu'na taşı",
-    "archived-items": "Geri Dönüşüm Kutusu",
-    "archived-boards": "Geri Dönüşüm Kutusu'ndaki panolar",
+    "app-is-offline": "Yükleniyor lütfen bekleyin. Sayfayı yenilemek veri kaybına neden olur. Yükleme çalışmıyorsa, lütfen sunucunun durmadığını kontrol edin.",
+    "archive": "Arşive Taşı",
+    "archive-all": "Hepsini Arşive Taşı",
+    "archive-board": "Panoyu Arşive Taşı",
+    "archive-card": "Kartı Arşive Taşı",
+    "archive-list": "Listeyi Arşive Taşı",
+    "archive-swimlane": "Kulvarı Arşive Taşı",
+    "archive-selection": "Seçimi arşive taşı",
+    "archiveBoardPopup-title": "Panoyu arşive taşı?",
+    "archived-items": "Arşivle",
+    "archived-boards": "Panolar Arşivde",
     "restore-board": "Panoyu Geri Getir",
-    "no-archived-boards": "Geri Dönüşüm Kutusu'nda pano yok.",
-    "archives": "Geri Dönüşüm Kutusu",
+    "no-archived-boards": "Arşivde Pano Yok.",
+    "archives": "Arşivle",
+    "template": "Template",
+    "templates": "Templates",
     "assign-member": "Üye ata",
     "attached": "dosya(sı) eklendi",
     "attachment": "Ek Dosya",
@@ -95,22 +125,25 @@
     "boardChangeTitlePopup-title": "Panonun Adını Değiştir",
     "boardChangeVisibilityPopup-title": "Görünebilirliği Değiştir",
     "boardChangeWatchPopup-title": "İzleme Durumunu Değiştir",
-    "boardMenuPopup-title": "Pano menüsü",
+    "boardMenuPopup-title": "Pano Ayarları",
     "boards": "Panolar",
     "board-view": "Pano Görünümü",
+    "board-view-cal": "Takvim",
     "board-view-swimlanes": "Kulvarlar",
     "board-view-lists": "Listeler",
     "bucket-example": "Örn: \"Marketten Alacaklarım\"",
     "cancel": "İptal",
-    "card-archived": "Bu kart Geri Dönüşüm Kutusu'na taşındı",
+    "card-archived": "Bu kart arşive taşındı.",
+    "board-archived": "Bu pano arşive taşındı.",
     "card-comments-title": "Bu kartta %s yorum var.",
     "card-delete-notice": "Silme işlemi kalıcıdır. Bu kartla ilişkili tüm eylemleri kaybedersiniz.",
     "card-delete-pop": "Son hareketler alanındaki tüm veriler silinecek, ayrıca bu kartı yeniden açamayacaksın. Bu işlemin geri dönüşü yok.",
-    "card-delete-suggest-archive": "Kartları Geri Dönüşüm Kutusu'na taşıyarak panodan kaldırabilir ve içindeki aktiviteleri saklayabilirsiniz.",
+    "card-delete-suggest-archive": "Bir kartı tahtadan çıkarmak ve etkinliği korumak için Arşive taşıyabilirsiniz.",
     "card-due": "Bitiş",
     "card-due-on": "Bitiş tarihi:",
     "card-spent": "Harcanan Zaman",
     "card-edit-attachments": "Ek dosyasını düzenle",
+    "card-edit-custom-fields": "Özel alanları düzenle",
     "card-edit-labels": "Etiketleri düzenle",
     "card-edit-members": "Üyeleri düzenle",
     "card-labels-title": "Bu kart için etiketleri düzenle",
@@ -118,13 +151,20 @@
     "card-start": "Başlama",
     "card-start-on": "Başlama tarihi:",
     "cardAttachmentsPopup-title": "Eklenme",
+    "cardCustomField-datePopup-title": "Tarihi değiştir",
+    "cardCustomFieldsPopup-title": "Özel alanları düzenle",
     "cardDeletePopup-title": "Kart Silinsin mi?",
     "cardDetailsActionsPopup-title": "Kart işlemleri",
     "cardLabelsPopup-title": "Etiketler",
     "cardMembersPopup-title": "Üyeler",
     "cardMorePopup-title": "Daha",
+    "cardTemplatePopup-title": "Create template",
     "cards": "Kartlar",
     "cards-count": "Kartlar",
+    "casSignIn": "CAS ile giriş yapın",
+    "cardType-card": "Kart",
+    "cardType-linkedCard": "Bağlantılı kart",
+    "cardType-linkedBoard": "Bağlantılı Pano",
     "change": "Değiştir",
     "change-avatar": "Avatar Değiştir",
     "change-password": "Parola Değiştir",
@@ -135,30 +175,52 @@
     "changePasswordPopup-title": "Parola Değiştir",
     "changePermissionsPopup-title": "Yetkileri Değiştirme",
     "changeSettingsPopup-title": "Ayarları değiştir",
+    "subtasks": "Alt Görevler",
     "checklists": "Yapılacak Listeleri",
     "click-to-star": "Bu panoyu yıldızlamak için tıkla.",
     "click-to-unstar": "Bu panunun yıldızını kaldırmak için tıkla.",
     "clipboard": "Yapıştır veya sürükleyip bırak",
     "close": "Kapat",
     "close-board": "Panoyu kapat",
-    "close-board-pop": "Silinen panoyu geri getirmek için menüden \"Geri Dönüşüm Kutusu\"'na tıklayabilirsiniz.",
+    "close-board-pop": "\n92/5000\nAna başlıktaki “Arşiv” düğmesine tıklayarak tahtayı geri yükleyebilirsiniz.",
     "color-black": "siyah",
     "color-blue": "mavi",
+    "color-crimson": "crimson",
+    "color-darkgreen": "darkgreen",
+    "color-gold": "gold",
+    "color-gray": "gray",
     "color-green": "yeşil",
+    "color-indigo": "indigo",
     "color-lime": "misket limonu",
+    "color-magenta": "magenta",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "navy",
     "color-orange": "turuncu",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
     "color-pink": "pembe",
+    "color-plum": "plum",
     "color-purple": "mor",
     "color-red": "kırmızı",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "silver",
     "color-sky": "açık mavi",
+    "color-slateblue": "slateblue",
+    "color-white": "white",
     "color-yellow": "sarı",
+    "unset-color": "Unset",
     "comment": "Yorum",
     "comment-placeholder": "Yorum Yaz",
     "comment-only": "Sadece yorum",
     "comment-only-desc": "Sadece kartlara yorum yazabilir.",
+    "no-comments": "Yorum Yok",
+    "no-comments-desc": "Yorumlar ve aktiviteleri göremiyorum.",
     "computer": "Bilgisayar",
-    "confirm-checklist-delete-dialog": "Yapılacak listesini silmek istediğinize emin misiniz",
+    "confirm-subtask-delete-dialog": "Alt görevi silmek istediğinizden emin misiniz?",
+    "confirm-checklist-delete-dialog": "Kontrol listesini silmek istediğinden emin misin?",
     "copy-card-link-to-clipboard": "Kartın linkini kopyala",
+    "linkCardPopup-title": "Bağlantı kartı",
+    "searchElementPopup-title": "Arama",
     "copyCardPopup-title": "Kartı Kopyala",
     "copyChecklistToManyCardsPopup-title": "Yapılacaklar Listesi şemasını birden çok karta kopyala",
     "copyChecklistToManyCardsPopup-instructions": "Hedef Kart Başlıkları ve Açıklamaları bu JSON formatında",
@@ -167,11 +229,25 @@
     "createBoardPopup-title": "Pano Oluşturma",
     "chooseBoardSourcePopup-title": "Panoyu içe aktar",
     "createLabelPopup-title": "Etiket Oluşturma",
+    "createCustomField": "Alanı yarat",
+    "createCustomFieldPopup-title": "Alanı yarat",
     "current": "mevcut",
+    "custom-field-delete-pop": "Bunun geri dönüşü yoktur. Bu özel alan tüm kartlardan kaldırılıp tarihçesi yokedilecektir.",
+    "custom-field-checkbox": "İşaret kutusu",
+    "custom-field-date": "Tarih",
+    "custom-field-dropdown": "Açılır liste",
+    "custom-field-dropdown-none": "(hiçbiri)",
+    "custom-field-dropdown-options": "Liste seçenekleri",
+    "custom-field-dropdown-options-placeholder": "Başka seçenekler eklemek için giriş tuşuna basınız",
+    "custom-field-dropdown-unknown": "(bilinmeyen)",
+    "custom-field-number": "Sayı",
+    "custom-field-text": "Metin",
+    "custom-fields": "Özel alanlar",
     "date": "Tarih",
     "decline": "Reddet",
     "default-avatar": "Varsayılan avatar",
     "delete": "Sil",
+    "deleteCustomFieldPopup-title": "Özel alan silinsin mi?",
     "deleteLabelPopup-title": "Etiket Silinsin mi?",
     "description": "Açıklama",
     "disambiguateMultiLabelPopup-title": "Etiket işlemini izah et",
@@ -186,6 +262,7 @@
     "soft-wip-limit": "Zayıf Devam Eden İş Sınırı",
     "editCardStartDatePopup-title": "Başlangıç tarihini değiştir",
     "editCardDueDatePopup-title": "Bitiş tarihini değiştir",
+    "editCustomFieldPopup-title": "Alanı düzenle",
     "editCardSpentTimePopup-title": "Harcanan zamanı değiştir",
     "editLabelPopup-title": "Etiket Değiştir",
     "editNotificationPopup-title": "Bildirimi değiştir",
@@ -222,29 +299,35 @@
     "filter-clear": "Filtreyi temizle",
     "filter-no-label": "Etiket yok",
     "filter-no-member": "Üye yok",
+    "filter-no-custom-fields": "Hiç özel alan yok",
     "filter-on": "Filtre aktif",
     "filter-on-desc": "Bu panodaki kartları filtreliyorsunuz. Fitreyi düzenlemek için tıklayın.",
     "filter-to-selection": "Seçime göre filtreleme yap",
+    "advanced-filter-label": "Gelişmiş Filtreleme",
+    "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) to be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
     "fullname": "Ad Soyad",
     "header-logo-title": "Panolar sayfanıza geri dön.",
     "hide-system-messages": "Sistem mesajlarını gizle",
     "headerBarCreateBoardPopup-title": "Pano Oluşturma",
     "home": "Ana Sayfa",
     "import": "İçeri aktar",
+    "link": "Bağlantı",
     "import-board": "panoyu içe aktar",
     "import-board-c": "Panoyu içe aktar",
     "import-board-title-trello": "Trello'dan panoyu içeri aktar",
-    "import-board-title-wekan": "Wekan'dan panoyu içe aktar",
+    "import-board-title-wekan": "Import board from previous export",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
     "import-sandstorm-warning": "İçe aktarılan pano şu anki panonun verilerinin üzerine yazılacak ve var olan veriler silinecek.",
     "from-trello": "Trello'dan",
-    "from-wekan": "Wekan'dan",
+    "from-wekan": "From previous export",
     "import-board-instruction-trello": "Trello panonuzda 'Menü'ye gidip 'Daha fazlası'na tıklayın, ardından 'Yazdır ve Çıktı Al'ı seçip 'JSON biçiminde çıktı al' diyerek çıkan metni buraya kopyalayın.",
-    "import-board-instruction-wekan": "Wekan panonuzda önce Menü'yü, ardından \"Panoyu dışa aktar\"ı seçip bilgisayarınıza indirilen dosyanın içindeki metni kopyalayın.",
+    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
     "import-json-placeholder": "Geçerli JSON verisini buraya yapıştırın",
     "import-map-members": "Üyeleri eşleştirme",
-    "import-members-map": "İçe aktardığın panoda bazı kullanıcılar var. Lütfen bu kullanıcıları Wekan panosundaki kullanıcılarla eşleştirin.",
+    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
     "import-show-user-mapping": "Üye eşleştirmesini kontrol et",
-    "import-user-select": "Bu üyenin sistemdeki hangi kullanıcı olduğunu seçin",
+    "import-user-select": "Bu üye olarak kullanmak istediğiniz mevcut kullanıcınızı seçin",
     "importMapMembersAddPopup-title": "Üye seç",
     "info": "Sürüm",
     "initials": "İlk Harfleri",
@@ -264,17 +347,19 @@
     "leave-board-pop": "__boardTitle__ panosundan ayrılmak istediğinize emin misiniz? Panodaki tüm kartlardan kaldırılacaksınız.",
     "leaveBoardPopup-title": "Panodan ayrılmak istediğinize emin misiniz?",
     "link-card": "Bu kartın bağlantısı",
-    "list-archive-cards": "Listedeki tüm kartları Geri Dönüşüm Kutusu'na gönder",
-    "list-archive-cards-pop": "Bu işlem listedeki tüm kartları kaldıracak. Silinmiş kartları görüntülemek ve geri yüklemek için menüden Geri Dönüşüm Kutusu'na tıklayabilirsiniz.",
+    "list-archive-cards": "Bu listedeki tüm kartları arşive taşı",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Listedeki tüm kartları taşı",
     "list-select-cards": "Listedeki tüm kartları seç",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "Liste İşlemleri",
     "swimlaneActionPopup-title": "Kulvar İşlemleri",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Bir Trello kartını içeri aktar",
     "listMorePopup-title": "Daha",
     "link-list": "Listeye doğrudan bağlantı",
     "list-delete-pop": "Etkinlik akışınızdaki tüm eylemler geri kurtarılamaz şekilde kaldırılacak. Bu işlem geri alınamaz.",
-    "list-delete-suggest-archive": "Bir listeyi Dönüşüm Kutusuna atarak panodan kaldırabilir, ancak eylemleri koruyarak saklayabilirsiniz. ",
+    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
     "lists": "Listeler",
     "swimlanes": "Kulvarlar",
     "log-out": "Oturum Kapat",
@@ -294,9 +379,9 @@
     "muted-info": "Bu panodaki hiçbir değişiklik hakkında bildirim almayacaksınız",
     "my-boards": "Panolarım",
     "name": "Adı",
-    "no-archived-cards": "Dönüşüm Kutusunda hiç kart yok.",
-    "no-archived-lists": "Dönüşüm Kutusunda hiç liste yok.",
-    "no-archived-swimlanes": "Dönüşüm Kutusunda hiç kulvar yok.",
+    "no-archived-cards": "Arşivde kart yok",
+    "no-archived-lists": "Arşivde liste yok",
+    "no-archived-swimlanes": "Arşivde kulvar yok",
     "no-results": "Sonuç yok",
     "normal": "Normal",
     "normal-desc": "Kartları görüntüleyebilir ve düzenleyebilir. Ayarları değiştiremez.",
@@ -332,7 +417,8 @@
     "restore": "Geri Getir",
     "save": "Kaydet",
     "search": "Arama",
-    "search-cards": "Bu tahta da ki kart başlıkları ve açıklamalarında arama yap",
+    "rules": "Kurallar",
+    "search-cards": "Bu panoda kart başlıkları ve açıklamalarında arama yap",
     "search-example": "Aranılacak metin?",
     "select-color": "Renk Seç",
     "set-wip-limit-value": "Bu listedeki en fazla öğe sayısı için bir sınır belirleyin",
@@ -366,6 +452,7 @@
     "title": "Başlık",
     "tracking": "Takip",
     "tracking-info": "Oluşturduğunuz veya üyesi olduğunuz tüm kartlardaki değişiklikler size bildirim olarak gelecek.",
+    "type": "Tür",
     "unassign-member": "Üyeye atamayı kaldır",
     "unsaved-description": "Kaydedilmemiş bir açıklama metnin bulunmakta",
     "unwatch": "Takibi bırak",
@@ -374,7 +461,7 @@
     "uploaded-avatar": "Avatar yüklendi",
     "username": "Kullanıcı adı",
     "view-it": "Görüntüle",
-    "warn-list-archived": "uyarı: bu kart Dönüşüm Kutusundaki bir listede var",
+    "warn-list-archived": "Uyarı: Bu kart arşivdeki bir listede",
     "watch": "Takip Et",
     "watching": "Takip Ediliyor",
     "watching-info": "Bu pano hakkındaki tüm değişiklikler hakkında bildirim alacaksınız",
@@ -382,6 +469,9 @@
     "welcome-swimlane": "Kilometre taşı",
     "welcome-list1": "Temel",
     "welcome-list2": "Gelişmiş",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
     "what-to-do": "Ne yapmak istiyorsunuz?",
     "wipLimitErrorPopup-title": "Geçersiz Devam Eden İş Sınırı",
     "wipLimitErrorPopup-dialog-pt1": "Bu listedeki iş sayısı belirlediğiniz sınırdan daha fazla.",
@@ -407,16 +497,16 @@
     "send-smtp-test": "Kendinize deneme E-Postası gönderin",
     "invitation-code": "Davetiye kodu",
     "email-invite-register-subject": "__inviter__ size bir davetiye gönderdi",
-    "email-invite-register-text": "Sevgili __user__,\n\n__inviter__ sizi beraber çalışabilmek için Wekan'a davet etti.\n\nLütfen aşağıdaki linke tıklayın:\n__url__\n\nDavetiye kodunuz: __icode__\n\nTeşekkürler.",
-    "email-smtp-test-subject": "Wekan' dan SMTP E-Postası",
+    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test E-postası",
     "email-smtp-test-text": "E-Posta başarıyla gönderildi",
     "error-invitation-code-not-exist": "Davetiye kodu bulunamadı",
     "error-notAuthorized": "Bu sayfayı görmek için yetkiniz yok.",
     "outgoing-webhooks": "Dışarı giden bağlantılar",
     "outgoingWebhooksPopup-title": "Dışarı giden bağlantılar",
+    "boardCardTitlePopup-title": "Kart Başlığı Filtresi",
     "new-outgoing-webhook": "Yeni Dışarı Giden Web Bağlantısı",
     "no-name": "(Bilinmeyen)",
-    "Wekan_version": "Wekan sürümü",
     "Node_version": "Node sürümü",
     "OS_Arch": "İşletim Sistemi Mimarisi",
     "OS_Cpus": "İşletim Sistemi İşlemci Sayısı",
@@ -427,13 +517,18 @@
     "OS_Totalmem": "İşletim Sistemi Toplam Belleği",
     "OS_Type": "İşletim Sistemi Tipi",
     "OS_Uptime": "İşletim Sistemi Toplam Açık Kalınan Süre",
+    "days": "günler",
     "hours": "saat",
     "minutes": "dakika",
     "seconds": "saniye",
+    "show-field-on-card": "Bu alanı kartta göster",
+    "automatically-field-on-card": "Tüm kartlara otomatik alan oluştur",
+    "showLabel-field-on-card": "Minikard üzerindeki alan etiketini göster",
     "yes": "Evet",
     "no": "Hayır",
     "accounts": "Hesaplar",
     "accounts-allowEmailChange": "E-posta Değiştirmeye İzin Ver",
+    "accounts-allowUserNameChange": "Kullanıcı adı değiştirmeye izin ver",
     "createdAt": "Oluşturulma tarihi",
     "verified": "Doğrulanmış",
     "active": "Aktif",
@@ -442,5 +537,157 @@
     "card-end": "Bitiş",
     "card-end-on": "Bitiş zamanı",
     "editCardReceivedDatePopup-title": "Giriş tarihini değiştir",
-    "editCardEndDatePopup-title": "Bitiş tarihini değiştir"
-}
+    "editCardEndDatePopup-title": "Bitiş tarihini değiştir",
+    "setCardColorPopup-title": "Renk ayarla",
+    "setCardActionsColorPopup-title": "Renk seçimi yap",
+    "setSwimlaneColorPopup-title": "Renk seçimi yap",
+    "setListColorPopup-title": "Renk seçimi yap",
+    "assigned-by": "Atamayı yapan",
+    "requested-by": "Talep Eden",
+    "board-delete-notice": "Silme kalıcıdır. Bu kartla ilişkili tüm listeleri, kartları ve işlemleri kaybedeceksiniz.",
+    "delete-board-confirm-popup": "Tüm listeler, kartlar, etiketler ve etkinlikler silinecek ve pano içeriğini kurtaramayacaksınız. Geri dönüş yok.",
+    "boardDeletePopup-title": "Panoyu Sil?",
+    "delete-board": "Panoyu Sil",
+    "default-subtasks-board": "Subtasks for __board__ board",
+    "default": "Varsayılan",
+    "queue": "Sıra",
+    "subtask-settings": "Alt Görev ayarları",
+    "boardSubtaskSettingsPopup-title": "Pano alt görev ayarları",
+    "show-subtasks-field": "Kartların alt görevleri olabilir",
+    "deposit-subtasks-board": "Deposit subtasks to this board:",
+    "deposit-subtasks-list": "Alt görevlerin açılacağı liste:",
+    "show-parent-in-minicard": "Mini kart içinde üst kartı göster",
+    "prefix-with-full-path": "Tam yolunu önüne ekle",
+    "prefix-with-parent": "Prefix with parent",
+    "subtext-with-full-path": "Tam yolu ile alt metin",
+    "subtext-with-parent": "üst öge ile alt metin",
+    "change-card-parent": "Kartın üst kartını değiştir",
+    "parent-card": "Ana kart",
+    "source-board": "Kaynak panosu",
+    "no-parent": "Üst ögeyi gösterme",
+    "activity-added-label": "added label '%s' to %s",
+    "activity-removed-label": "removed label '%s' from %s",
+    "activity-delete-attach": "deleted an attachment from %s",
+    "activity-added-label-card": "etiket eklendi '%s'",
+    "activity-removed-label-card": "removed label '%s'",
+    "activity-delete-attach-card": "Ek silindi",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "r-rule": "Kural",
+    "r-add-trigger": "Tetikleyici ekle",
+    "r-add-action": "Eylem ekle",
+    "r-board-rules": "Pano Kuralları",
+    "r-add-rule": "Kural ekle",
+    "r-view-rule": "Kuralı göster",
+    "r-delete-rule": "Kuralı sil",
+    "r-new-rule-name": "Yeni kural başlığı",
+    "r-no-rules": "Kural yok",
+    "r-when-a-card": "Kart eklendiğinde",
+    "r-is": "is",
+    "r-is-moved": "is moved",
+    "r-added-to": "added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "pano",
+    "r-list": "liste",
+    "set-filter": "Filtrele",
+    "r-moved-to": "Moved to",
+    "r-moved-from": "Moved from",
+    "r-archived": "Arşive taşındı",
+    "r-unarchived": "Arşivden geri çıkarıldı",
+    "r-a-card": "Kart",
+    "r-when-a-label-is": "When a label is",
+    "r-when-the-label-is": "When the label is",
+    "r-list-name": "liste adı",
+    "r-when-a-member": "When a member is",
+    "r-when-the-member": "When the member",
+    "r-name": "isim",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Tamamlandı",
+    "r-made-incomplete": "Tamamlanmamış",
+    "r-when-a-item": "When a checklist item is",
+    "r-when-the-item": "When the checklist item",
+    "r-checked": "İşaretlendi",
+    "r-unchecked": "İşaret Kaldırıldı",
+    "r-move-card-to": "Kartı taşı",
+    "r-top-of": "En üst",
+    "r-bottom-of": "En alt",
+    "r-its-list": "its list",
+    "r-archive": "Arşive Taşı",
+    "r-unarchive": "Arşivden Geri Yükle",
+    "r-card": "Kart",
+    "r-add": "Ekle",
+    "r-remove": "Kaldır",
+    "r-label": "etiket",
+    "r-member": "üye",
+    "r-remove-all": "Tüm üyeleri karttan çıkarın",
+    "r-set-color": "Set color to",
+    "r-checklist": "Kontrol Listesi",
+    "r-check-all": "Tümünü işaretle",
+    "r-uncheck-all": "Tüm işaretleri kaldır",
+    "r-items-check": "Kontrol Listesi maddeleri",
+    "r-check": "işaretle",
+    "r-uncheck": "İşareti Kaldır",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "E-Posta Gönder",
+    "r-to": "to",
+    "r-subject": "Konu",
+    "r-rule-details": "Kural Detayları",
+    "r-d-move-to-top-gen": "Kartı listesinin en üstüne taşı",
+    "r-d-move-to-top-spec": "Kartı listenin en üstüne taşı",
+    "r-d-move-to-bottom-gen": "Kartı listesinin en altına taşı",
+    "r-d-move-to-bottom-spec": "Kartı listenin en altına taşı",
+    "r-d-send-email": "E-Posta gönder",
+    "r-d-send-email-to": "to",
+    "r-d-send-email-subject": "Konu",
+    "r-d-send-email-message": "mesaj",
+    "r-d-archive": "Kartı Arşive Taşı",
+    "r-d-unarchive": "Kartı arşivden geri yükle",
+    "r-d-add-label": "Etiket ekle",
+    "r-d-remove-label": "Etiketi kaldır",
+    "r-create-card": "Yeni kart oluştur",
+    "r-in-list": ", listesinde",
+    "r-in-swimlane": "in swimlane",
+    "r-d-add-member": "Üye Ekle",
+    "r-d-remove-member": "Üye Sil",
+    "r-d-remove-all-member": "Tüm Üyeleri Sil",
+    "r-d-check-all": "Check all items of a list",
+    "r-d-uncheck-all": "Uncheck all items of a list",
+    "r-d-check-one": "Check item",
+    "r-d-uncheck-one": "Uncheck item",
+    "r-d-check-of-list": "of checklist",
+    "r-d-add-checklist": "Kontrol listesine ekle",
+    "r-d-remove-checklist": "Kontrol listesini kaldır",
+    "r-by": "by",
+    "r-add-checklist": "Kontrol listesine ekle",
+    "r-with-items": "with items",
+    "r-items-list": "item1,item2,item3",
+    "r-add-swimlane": "Kulvar ekle",
+    "r-swimlane-name": "kulvar adı",
+    "r-board-note": "Not: Her olası değere uyması için bir alanı boş bırakın.",
+    "r-checklist-note": "Not: kontrol listesindeki öğelerin virgülle ayrılmış değerler olarak yazılması gerekir.",
+    "r-when-a-card-is-moved": "Bir kart başka bir listeye taşındığında",
+    "ldap": "LDAP",
+    "oauth2": "Oauth2",
+    "cas": "CAS",
+    "authentication-method": "Kimlik doğrulama yöntemi",
+    "authentication-type": "Kimlik doğrulama türü",
+    "custom-product-name": "Özel Ürün Adı",
+    "layout": "Düzen",
+    "hide-logo": "Logoyu Gizle",
+    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
+    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
+    "error-undefined": "Bir şeyler yanlış gitti",
+    "error-ldap-login": "Giriş yapmaya çalışırken bir hata oluştu",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Kulvar silinsin mi?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Hepsini sil",
+    "loading": "Loading, please wait."
+}
\ No newline at end of file
diff --git a/i18n/uk.i18n.json b/i18n/uk.i18n.json
index 2552ec4e..5c641f26 100644
--- a/i18n/uk.i18n.json
+++ b/i18n/uk.i18n.json
@@ -1,56 +1,84 @@
 {
     "accept": "Прийняти",
-    "act-activity-notify": "[Wekan] Сповіщення Діяльності",
-    "act-addAttachment": "__attachment__ додане до __card__",
-    "act-addChecklist": "added checklist __checklist__ to __card__",
-    "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__",
-    "act-addComment": "комментар в __card__: __comment__",
-    "act-createBoard": "__board__ створенна",
-    "act-createCard": "__card__ карта додана до __list__ листа",
-    "act-createList": "added __list__ to __board__",
-    "act-addBoardMember": "added __member__ to __board__",
-    "act-archivedBoard": "__board__ moved to Recycle Bin",
-    "act-archivedCard": "__card__ moved to Recycle Bin",
-    "act-archivedList": "__list__ moved to Recycle Bin",
-    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
-    "act-importBoard": "imported __board__",
-    "act-importCard": "__card__ заімпортована",
-    "act-importList": "imported __list__",
-    "act-joinMember": "__member__ був доданий до __card__",
-    "act-moveCard": " __card__ була перенесена з __oldList__ до __list__",
-    "act-removeBoardMember": "removed __member__ from __board__",
-    "act-restoredCard": " __card__ відновлена у __board__",
-    "act-unjoinMember": " __member__ був виделений з __card__",
-    "act-withBoardTitle": "[Wekan] __board__",
+    "act-activity-notify": "Сповіщення діяльності",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "Створити Коробко",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__board__",
     "act-withCardTitle": "[__board__] __card__",
     "actions": "Дії",
     "activities": "Діяльність",
     "activity": "Активність",
-    "activity-added": "added %s to %s",
-    "activity-archived": "%s moved to Recycle Bin",
-    "activity-attached": "attached %s to %s",
-    "activity-created": "created %s",
-    "activity-excluded": "excluded %s from %s",
-    "activity-imported": "imported %s into %s from %s",
-    "activity-imported-board": "imported %s from %s",
-    "activity-joined": "joined %s",
-    "activity-moved": "moved %s from %s to %s",
-    "activity-on": "on %s",
-    "activity-removed": "removed %s from %s",
-    "activity-sent": "sent %s to %s",
+    "activity-added": "додав %s до %s",
+    "activity-archived": "%s перенесено до архіву",
+    "activity-attached": "прикріпив %s до %s",
+    "activity-created": "створив %s",
+    "activity-customfield-created": "створив налаштовуване поле",
+    "activity-excluded": "виключено %s з %s",
+    "activity-imported": "імпортовано %s до %s з %s",
+    "activity-imported-board": "імпортовано %s з %s",
+    "activity-joined": "приєднався %s",
+    "activity-moved": "переміщений %s з %s до %s",
+    "activity-on": "%s",
+    "activity-removed": "видалив %s з %s",
+    "activity-sent": "відправив %s до %s",
     "activity-unjoined": "unjoined %s",
-    "activity-checklist-added": "added checklist to %s",
+    "activity-subtask-added": "додав підзадачу до %s",
+    "activity-checked-item": "checked %s in checklist %s of %s",
+    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
+    "activity-checklist-added": "додав список до %s",
+    "activity-checklist-removed": "removed a checklist from %s",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
     "activity-checklist-item-added": "added checklist item to '%s' in %s",
+    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
     "add": "Додати",
+    "activity-checked-item-card": "checked %s in checklist %s",
+    "activity-unchecked-item-card": "unchecked %s in checklist %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
     "add-attachment": "Add Attachment",
-    "add-board": "Add Board",
-    "add-card": "Add Card",
+    "add-board": "Додати дошку",
+    "add-card": "Додати картку",
     "add-swimlane": "Add Swimlane",
+    "add-subtask": "Add Subtask",
     "add-checklist": "Add Checklist",
     "add-checklist-item": "Додати елемент в список",
     "add-cover": "Додати обкладинку",
-    "add-label": "Add Label",
-    "add-list": "Add List",
+    "add-label": "Додати мітку",
+    "add-list": "Додати список",
     "add-members": "Додати користувача",
     "added": "Доданно",
     "addMemberPopup-title": "Користувачі",
@@ -63,102 +91,136 @@
     "and-n-other-card": "та __count__ інших карток",
     "and-n-other-card_plural": "та __count__ інших карток",
     "apply": "Прийняти",
-    "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Move to Recycle Bin",
-    "archive-all": "Move All to Recycle Bin",
-    "archive-board": "Move Board to Recycle Bin",
-    "archive-card": "Move Card to Recycle Bin",
-    "archive-list": "Move List to Recycle Bin",
-    "archive-swimlane": "Move Swimlane to Recycle Bin",
-    "archive-selection": "Move selection to Recycle Bin",
-    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
-    "archived-items": "Recycle Bin",
-    "archived-boards": "Boards in Recycle Bin",
-    "restore-board": "Restore Board",
-    "no-archived-boards": "No Boards in Recycle Bin.",
-    "archives": "Recycle Bin",
+    "app-is-offline": "Завантаження, будь ласка, зачекайте. Оновлення сторінки призведе до втрати даних. Якщо завантаження не працює, перевірте, чи не зупинився сервер.",
+    "archive": "Move to Archive",
+    "archive-all": "Move All to Archive",
+    "archive-board": "Move Board to Archive",
+    "archive-card": "Move Card to Archive",
+    "archive-list": "Move List to Archive",
+    "archive-swimlane": "Move Swimlane to Archive",
+    "archive-selection": "Move selection to Archive",
+    "archiveBoardPopup-title": "Move Board to Archive?",
+    "archived-items": "Архів",
+    "archived-boards": "Дошки в архіві",
+    "restore-board": "Відновити дошку",
+    "no-archived-boards": "Немає дошок в архіві",
+    "archives": "Архів",
+    "template": "Template",
+    "templates": "Templates",
     "assign-member": "Assign member",
     "attached": "доданно",
     "attachment": "Додаток",
     "attachment-delete-pop": "Видалення Додатку безповоротне. Тут нема відміні (undo).",
     "attachmentDeletePopup-title": "Видалити Додаток?",
-    "attachments": "Attachments",
+    "attachments": "Додатки",
     "auto-watch": "Automatically watch boards when they are created",
     "avatar-too-big": "The avatar is too large (70KB max)",
     "back": "Назад",
-    "board-change-color": "Change color",
+    "board-change-color": "Змінити колір",
     "board-nb-stars": "%s stars",
-    "board-not-found": "Board not found",
+    "board-not-found": "Дошка не знайдена",
     "board-private-info": "This board will be <strong>private</strong>.",
     "board-public-info": "This board will be <strong>public</strong>.",
     "boardChangeColorPopup-title": "Change Board Background",
-    "boardChangeTitlePopup-title": "Rename Board",
+    "boardChangeTitlePopup-title": "Перейменувати дошку",
     "boardChangeVisibilityPopup-title": "Change Visibility",
     "boardChangeWatchPopup-title": "Change Watch",
-    "boardMenuPopup-title": "Board Menu",
+    "boardMenuPopup-title": "Board Settings",
     "boards": "Дошки",
     "board-view": "Board View",
+    "board-view-cal": "Календар",
     "board-view-swimlanes": "Swimlanes",
     "board-view-lists": "Lists",
     "bucket-example": "Like “Bucket List” for example",
     "cancel": "Відміна",
-    "card-archived": "This card is moved to Recycle Bin.",
+    "card-archived": "This card is moved to Archive.",
+    "board-archived": "This board is moved to Archive.",
     "card-comments-title": "This card has %s comment.",
-    "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
-    "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
+    "card-delete-notice": "Цю дію неможливо буде скасувати. Всі зміни, які ви вносили в картку будуть втрачені.",
+    "card-delete-pop": "Усі дії буде видалено з каналу активності, і ви не зможете повторно відкрити картку. Цю дію не можна скасувати.",
+    "card-delete-suggest-archive": "Ви можете перемістити картку до архіву, щоб прибрати її з дошки, зберігаючи всю історію дій учасників.",
     "card-due": "Due",
     "card-due-on": "Due on",
-    "card-spent": "Spent Time",
+    "card-spent": "Витрачено часу",
     "card-edit-attachments": "Edit attachments",
-    "card-edit-labels": "Edit labels",
-    "card-edit-members": "Edit members",
+    "card-edit-custom-fields": "Edit custom fields",
+    "card-edit-labels": "Редагувати мітки",
+    "card-edit-members": "Редагувати учасників",
     "card-labels-title": "Change the labels for the card.",
     "card-members-title": "Add or remove members of the board from the card.",
     "card-start": "Start",
     "card-start-on": "Starts on",
     "cardAttachmentsPopup-title": "Attach From",
-    "cardDeletePopup-title": "Delete Card?",
+    "cardCustomField-datePopup-title": "Change date",
+    "cardCustomFieldsPopup-title": "Edit custom fields",
+    "cardDeletePopup-title": "Видалити картку?",
     "cardDetailsActionsPopup-title": "Card Actions",
     "cardLabelsPopup-title": "Labels",
     "cardMembersPopup-title": "Користувачі",
     "cardMorePopup-title": "More",
-    "cards": "Cards",
-    "cards-count": "Cards",
-    "change": "Change",
-    "change-avatar": "Change Avatar",
-    "change-password": "Change Password",
+    "cardTemplatePopup-title": "Create template",
+    "cards": "Картки",
+    "cards-count": "Картки",
+    "casSignIn": "Sign In with CAS",
+    "cardType-card": "Картка",
+    "cardType-linkedCard": "Linked Card",
+    "cardType-linkedBoard": "Linked Board",
+    "change": "Змінити",
+    "change-avatar": "Змінити аватар",
+    "change-password": "Змінити пароль",
     "change-permissions": "Change permissions",
-    "change-settings": "Change Settings",
-    "changeAvatarPopup-title": "Change Avatar",
-    "changeLanguagePopup-title": "Change Language",
-    "changePasswordPopup-title": "Change Password",
+    "change-settings": "Змінити налаштування",
+    "changeAvatarPopup-title": "Змінити аватар",
+    "changeLanguagePopup-title": "Змінити мову",
+    "changePasswordPopup-title": "Змінити пароль",
     "changePermissionsPopup-title": "Change Permissions",
-    "changeSettingsPopup-title": "Change Settings",
+    "changeSettingsPopup-title": "Змінити налаштування",
+    "subtasks": "Підзадачі",
     "checklists": "Checklists",
     "click-to-star": "Click to star this board.",
     "click-to-unstar": "Click to unstar this board.",
     "clipboard": "Clipboard or drag & drop",
-    "close": "Close",
+    "close": "Закрити",
     "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
-    "color-black": "black",
-    "color-blue": "blue",
-    "color-green": "green",
-    "color-lime": "lime",
-    "color-orange": "orange",
-    "color-pink": "pink",
-    "color-purple": "purple",
-    "color-red": "red",
+    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
+    "color-black": "чорний",
+    "color-blue": "синій",
+    "color-crimson": "crimson",
+    "color-darkgreen": "darkgreen",
+    "color-gold": "gold",
+    "color-gray": "gray",
+    "color-green": "зелений",
+    "color-indigo": "indigo",
+    "color-lime": "лайм",
+    "color-magenta": "magenta",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "navy",
+    "color-orange": "помаранчевий",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
+    "color-pink": "рожевий",
+    "color-plum": "plum",
+    "color-purple": "фіолетовий",
+    "color-red": "червоний",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "silver",
     "color-sky": "sky",
-    "color-yellow": "yellow",
-    "comment": "Comment",
-    "comment-placeholder": "Write Comment",
+    "color-slateblue": "slateblue",
+    "color-white": "white",
+    "color-yellow": "жовтий",
+    "unset-color": "Unset",
+    "comment": "Коментар",
+    "comment-placeholder": "Написати коментар",
     "comment-only": "Comment only",
     "comment-only-desc": "Can comment on cards only.",
+    "no-comments": "Немає коментарів",
+    "no-comments-desc": "Can not see comments and activities.",
     "computer": "Computer",
-    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist",
-    "copy-card-link-to-clipboard": "Copy card link to clipboard",
+    "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?",
+    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
+    "copy-card-link-to-clipboard": "Скопіювати посилання на картку в буфер обміну",
+    "linkCardPopup-title": "Link Card",
+    "searchElementPopup-title": "Search",
     "copyCardPopup-title": "Copy Card",
     "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
     "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
@@ -167,11 +229,25 @@
     "createBoardPopup-title": "Create Board",
     "chooseBoardSourcePopup-title": "Import board",
     "createLabelPopup-title": "Create Label",
+    "createCustomField": "Create Field",
+    "createCustomFieldPopup-title": "Create Field",
     "current": "current",
+    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
+    "custom-field-checkbox": "Checkbox",
+    "custom-field-date": "Date",
+    "custom-field-dropdown": "Dropdown List",
+    "custom-field-dropdown-none": "(none)",
+    "custom-field-dropdown-options": "List Options",
+    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
+    "custom-field-dropdown-unknown": "(unknown)",
+    "custom-field-number": "Number",
+    "custom-field-text": "Text",
+    "custom-fields": "Custom Fields",
     "date": "Date",
     "decline": "Decline",
     "default-avatar": "Default avatar",
     "delete": "Delete",
+    "deleteCustomFieldPopup-title": "Delete Custom Field?",
     "deleteLabelPopup-title": "Delete Label?",
     "description": "Description",
     "disambiguateMultiLabelPopup-title": "Disambiguate Label Action",
@@ -180,12 +256,13 @@
     "done": "Done",
     "download": "Download",
     "edit": "Edit",
-    "edit-avatar": "Change Avatar",
+    "edit-avatar": "Змінити аватар",
     "edit-profile": "Edit Profile",
     "edit-wip-limit": "Edit WIP Limit",
     "soft-wip-limit": "Soft WIP Limit",
     "editCardStartDatePopup-title": "Change start date",
     "editCardDueDatePopup-title": "Change due date",
+    "editCustomFieldPopup-title": "Edit Field",
     "editCardSpentTimePopup-title": "Change spent time",
     "editLabelPopup-title": "Change Label",
     "editNotificationPopup-title": "Edit Notification",
@@ -222,30 +299,36 @@
     "filter-clear": "Clear filter",
     "filter-no-label": "No label",
     "filter-no-member": "No member",
+    "filter-no-custom-fields": "No Custom Fields",
     "filter-on": "Filter is on",
     "filter-on-desc": "You are filtering cards on this board. Click here to edit filter.",
     "filter-to-selection": "Filter to selection",
+    "advanced-filter-label": "Advanced Filter",
+    "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) to be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
     "fullname": "Full Name",
     "header-logo-title": "Go back to your boards page.",
     "hide-system-messages": "Hide system messages",
     "headerBarCreateBoardPopup-title": "Create Board",
     "home": "Home",
     "import": "Import",
+    "link": "Link",
     "import-board": "import board",
     "import-board-c": "Import board",
     "import-board-title-trello": "Import board from Trello",
-    "import-board-title-wekan": "Import board from Wekan",
+    "import-board-title-wekan": "Import board from previous export",
+    "import-sandstorm-backup-warning": "Не видаляйте імпортовані дані з раніше збереженої дошки або Trello, поки не переконаєтеся, що імпорт завершився успішно - вдається закрити і знову відкрити дошку, і не з'являється помилка «Дошка не знайдена», що означає втрату даних.",
     "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
     "from-trello": "From Trello",
-    "from-wekan": "From Wekan",
+    "from-wekan": "From previous export",
     "import-board-instruction-trello": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text.",
-    "import-board-instruction-wekan": "In your Wekan board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
     "import-json-placeholder": "Paste your valid JSON data here",
     "import-map-members": "Map members",
-    "import-members-map": "Your imported board has some members. Please map the members you want to import to Wekan users",
+    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
     "import-show-user-mapping": "Review members mapping",
-    "import-user-select": "Pick the Wekan user you want to use as this member",
-    "importMapMembersAddPopup-title": "Select Wekan member",
+    "import-user-select": "Pick your existing user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select member",
     "info": "Version",
     "initials": "Initials",
     "invalid-date": "Invalid date",
@@ -264,17 +347,19 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "Link to this card",
-    "list-archive-cards": "Move all cards in this list to Recycle Bin",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
+    "list-archive-cards": "Move all cards in this list to Archive",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "List Actions",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Import a Trello card",
     "listMorePopup-title": "More",
     "link-list": "Link to this list",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
     "lists": "Lists",
     "swimlanes": "Swimlanes",
     "log-out": "Log Out",
@@ -294,9 +379,9 @@
     "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "My Boards",
     "name": "Name",
-    "no-archived-cards": "No cards in Recycle Bin.",
-    "no-archived-lists": "No lists in Recycle Bin.",
-    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
+    "no-archived-cards": "No cards in Archive.",
+    "no-archived-lists": "No lists in Archive.",
+    "no-archived-swimlanes": "No swimlanes in Archive.",
     "no-results": "No results",
     "normal": "Normal",
     "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -317,7 +402,7 @@
     "private-desc": "This board is private. Only people added to the board can view and edit it.",
     "profile": "Profile",
     "public": "Public",
-    "public-desc": "This board is public. It's visible to anyone with the link and will show up in search engines like Google. Only people added to the board can edit.",
+    "public-desc": "Цю дошку можуть переглядати усі, у кого є посилання. Також ця дошка може бути проіндексована пошуковими системами. Вносити зміни можуть тільки учасники.",
     "quick-access-description": "Star a board to add a shortcut in this bar.",
     "remove-cover": "Remove Cover",
     "remove-from-board": "Remove from Board",
@@ -328,10 +413,11 @@
     "remove-member-pop": "Remove __name__ (__username__) from __boardTitle__? The member will be removed from all cards on this board. They will receive a notification.",
     "removeMemberPopup-title": "Remove Member?",
     "rename": "Rename",
-    "rename-board": "Rename Board",
+    "rename-board": "Перейменувати дошку",
     "restore": "Restore",
     "save": "Save",
     "search": "Search",
+    "rules": "Rules",
     "search-cards": "Search from card titles and descriptions on this board",
     "search-example": "Text to search for?",
     "select-color": "Select Color",
@@ -365,7 +451,8 @@
     "time": "Time",
     "title": "Title",
     "tracking": "Tracking",
-    "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
+    "tracking-info": "Ви будете повідомлені про будь-які зміни в тих картках, в яких ви є творцем або учасником.",
+    "type": "Type",
     "unassign-member": "Unassign member",
     "unsaved-description": "You have an unsaved description.",
     "unwatch": "Unwatch",
@@ -374,7 +461,7 @@
     "uploaded-avatar": "Uploaded an avatar",
     "username": "Username",
     "view-it": "View it",
-    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
+    "warn-list-archived": "warning: this card is in an list at Archive",
     "watch": "Watch",
     "watching": "Watching",
     "watching-info": "You will be notified of any change in this board",
@@ -382,10 +469,13 @@
     "welcome-swimlane": "Milestone 1",
     "welcome-list1": "Basics",
     "welcome-list2": "Advanced",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
     "what-to-do": "What do you want to do?",
     "wipLimitErrorPopup-title": "Invalid WIP Limit",
-    "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
-    "wipLimitErrorPopup-dialog-pt2": "Please move some tasks out of this list, or set a higher WIP limit.",
+    "wipLimitErrorPopup-dialog-pt1": "Кількість завдань у цьому списку перевищує встановлений вами ліміт",
+    "wipLimitErrorPopup-dialog-pt2": "Будь ласка, перенесіть деякі завдання з цього списку або збільште ліміт на кількість завдань",
     "admin-panel": "Admin Panel",
     "settings": "Settings",
     "people": "People",
@@ -407,16 +497,16 @@
     "send-smtp-test": "Send a test email to yourself",
     "invitation-code": "Invitation Code",
     "email-invite-register-subject": "__inviter__ sent you an invitation",
-    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to Wekan for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
-    "email-smtp-test-subject": "SMTP Test Email From Wekan",
+    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email",
     "email-smtp-test-text": "You have successfully sent an email",
     "error-invitation-code-not-exist": "Invitation code doesn't exist",
     "error-notAuthorized": "You are not authorized to view this page.",
     "outgoing-webhooks": "Outgoing Webhooks",
     "outgoingWebhooksPopup-title": "Outgoing Webhooks",
+    "boardCardTitlePopup-title": "Card Title Filter",
     "new-outgoing-webhook": "New Outgoing Webhook",
     "no-name": "(Unknown)",
-    "Wekan_version": "Wekan version",
     "Node_version": "Node version",
     "OS_Arch": "OS Arch",
     "OS_Cpus": "OS CPU Count",
@@ -427,13 +517,18 @@
     "OS_Totalmem": "OS Total Memory",
     "OS_Type": "OS Type",
     "OS_Uptime": "OS Uptime",
+    "days": "days",
     "hours": "hours",
     "minutes": "minutes",
     "seconds": "seconds",
+    "show-field-on-card": "Show this field on card",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
     "yes": "Yes",
     "no": "No",
     "accounts": "Accounts",
     "accounts-allowEmailChange": "Allow Email Change",
+    "accounts-allowUserNameChange": "Allow Username Change",
     "createdAt": "Created at",
     "verified": "Verified",
     "active": "Active",
@@ -442,5 +537,157 @@
     "card-end": "End",
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
-    "editCardEndDatePopup-title": "Change end date"
-}
+    "editCardEndDatePopup-title": "Change end date",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "Assigned By",
+    "requested-by": "Requested By",
+    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
+    "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
+    "boardDeletePopup-title": "Delete Board?",
+    "delete-board": "Delete Board",
+    "default-subtasks-board": "Subtasks for __board__ board",
+    "default": "Default",
+    "queue": "Queue",
+    "subtask-settings": "Subtasks Settings",
+    "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
+    "show-subtasks-field": "Cards can have subtasks",
+    "deposit-subtasks-board": "Deposit subtasks to this board:",
+    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
+    "show-parent-in-minicard": "Show parent in minicard:",
+    "prefix-with-full-path": "Prefix with full path",
+    "prefix-with-parent": "Prefix with parent",
+    "subtext-with-full-path": "Subtext with full path",
+    "subtext-with-parent": "Subtext with parent",
+    "change-card-parent": "Change card's parent",
+    "parent-card": "Parent card",
+    "source-board": "Source board",
+    "no-parent": "Don't show parent",
+    "activity-added-label": "added label '%s' to %s",
+    "activity-removed-label": "removed label '%s' from %s",
+    "activity-delete-attach": "deleted an attachment from %s",
+    "activity-added-label-card": "added label '%s'",
+    "activity-removed-label-card": "removed label '%s'",
+    "activity-delete-attach-card": "deleted an attachment",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "r-rule": "Правило",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "Add action",
+    "r-board-rules": "Дошка правил",
+    "r-add-rule": "Add rule",
+    "r-view-rule": "Переглянути правило",
+    "r-delete-rule": "Видалити правило",
+    "r-new-rule-name": "Заголовок нового правила\n",
+    "r-no-rules": "No rules",
+    "r-when-a-card": "When a card",
+    "r-is": "is",
+    "r-is-moved": "is moved",
+    "r-added-to": "added to",
+    "r-removed-from": "Видалити з",
+    "r-the-board": "Дошка",
+    "r-list": "list",
+    "set-filter": "Set Filter",
+    "r-moved-to": "переміщено до",
+    "r-moved-from": "переміщено з",
+    "r-archived": "переміщено до Архіву",
+    "r-unarchived": "Відновлено з Архіву",
+    "r-a-card": "a card",
+    "r-when-a-label-is": "When a label is",
+    "r-when-the-label-is": "When the label is",
+    "r-list-name": "list name",
+    "r-when-a-member": "When a member is",
+    "r-when-the-member": "When the member",
+    "r-name": "name",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "r-when-the-item": "When the checklist item",
+    "r-checked": "Checked",
+    "r-unchecked": "Unchecked",
+    "r-move-card-to": "Move card to",
+    "r-top-of": "Top of",
+    "r-bottom-of": "Bottom of",
+    "r-its-list": "its list",
+    "r-archive": "Move to Archive",
+    "r-unarchive": "Restore from Archive",
+    "r-card": "Картка",
+    "r-add": "Додати",
+    "r-remove": "Видалити\n",
+    "r-label": "label",
+    "r-member": "Користувач",
+    "r-remove-all": "Видалити усіх учасників картки",
+    "r-set-color": "Set color to",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "Об'єкт",
+    "r-rule-details": "Rule details",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Move card to top of list",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Move card to bottom of list",
+    "r-d-send-email": "Відправити email",
+    "r-d-send-email-to": "to",
+    "r-d-send-email-subject": "Об'єкт",
+    "r-d-send-email-message": "повідомлення",
+    "r-d-archive": "Move card to Archive",
+    "r-d-unarchive": "Restore card from Archive",
+    "r-d-add-label": "Add label",
+    "r-d-remove-label": "Remove label",
+    "r-create-card": "Create new card",
+    "r-in-list": "in list",
+    "r-in-swimlane": "in swimlane",
+    "r-d-add-member": "Додати користувача",
+    "r-d-remove-member": "Видалити користувача",
+    "r-d-remove-all-member": "Remove all member",
+    "r-d-check-all": "Check all items of a list",
+    "r-d-uncheck-all": "Uncheck all items of a list",
+    "r-d-check-one": "Check item",
+    "r-d-uncheck-one": "Uncheck item",
+    "r-d-check-of-list": "of checklist",
+    "r-d-add-checklist": "Add checklist",
+    "r-d-remove-checklist": "Remove checklist",
+    "r-by": "by",
+    "r-add-checklist": "Add checklist",
+    "r-with-items": "with items",
+    "r-items-list": "item1,item2,item3",
+    "r-add-swimlane": "Add swimlane",
+    "r-swimlane-name": "swimlane name",
+    "r-board-note": "Note: leave a field empty to match every possible value.",
+    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout",
+    "hide-logo": "Hide Logo",
+    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
+    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
+    "error-undefined": "Something went wrong",
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
+}
\ No newline at end of file
diff --git a/i18n/vi.i18n.json b/i18n/vi.i18n.json
index 5e03eaed..e1327ee0 100644
--- a/i18n/vi.i18n.json
+++ b/i18n/vi.i18n.json
@@ -1,35 +1,51 @@
 {
     "accept": "Chấp nhận",
-    "act-activity-notify": "[Wekan] Thông Báo Hoạt Động",
-    "act-addAttachment": "đã đính kèm __attachment__ vào __card__",
-    "act-addChecklist": "added checklist __checklist__ to __card__",
-    "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__",
-    "act-addComment": "đã bình luận trong __card__: __comment__",
-    "act-createBoard": "đã tạo __board__",
-    "act-createCard": "đã thêm __card__ vào __list__",
-    "act-createList": "đã thêm __list__ vào __board__",
-    "act-addBoardMember": "đã thêm __member__ vào __board__",
-    "act-archivedBoard": "__board__ moved to Recycle Bin",
-    "act-archivedCard": "__card__ moved to Recycle Bin",
-    "act-archivedList": "__list__ moved to Recycle Bin",
-    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
-    "act-importBoard": "đã nạp bảng __board__",
-    "act-importCard": "đã nạp thẻ __card__",
-    "act-importList": "đã nạp danh sách __list__",
-    "act-joinMember": "đã thêm thành viên __member__ vào __card__",
-    "act-moveCard": "đã chuyển thẻ __card__ từ __oldList__ sang __list__",
-    "act-removeBoardMember": "đã xóa thành viên __member__ khỏi __board__",
-    "act-restoredCard": "đã khôi phục thẻ __card__ vào bảng __board__",
-    "act-unjoinMember": "đã xóa thành viên __member__ khỏi thẻ __card__",
-    "act-withBoardTitle": "[Wekan] Bảng __board__",
+    "act-activity-notify": "Activity Notification",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__board__",
     "act-withCardTitle": "[__board__] __card__",
     "actions": "Hành Động",
     "activities": "Hoạt Động",
     "activity": "Hoạt Động",
     "activity-added": "đã thêm %s vào %s",
-    "activity-archived": "%s moved to Recycle Bin",
+    "activity-archived": "%s moved to Archive",
     "activity-attached": "đã đính kèm %s vào %s",
     "activity-created": "đã tạo %s",
+    "activity-customfield-created": "created custom field %s",
     "activity-excluded": "đã loại bỏ %s khỏi %s",
     "activity-imported": "đã nạp %s vào %s từ %s",
     "activity-imported-board": "đã nạp %s từ %s",
@@ -39,13 +55,25 @@
     "activity-removed": "đã xóa %s từ %s",
     "activity-sent": "gửi %s đến %s",
     "activity-unjoined": "đã rời khỏi %s",
+    "activity-subtask-added": "added subtask to %s",
+    "activity-checked-item": "checked %s in checklist %s of %s",
+    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
     "activity-checklist-added": "đã thêm checklist vào %s",
+    "activity-checklist-removed": "removed a checklist from %s",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
     "activity-checklist-item-added": "added checklist item to '%s' in %s",
+    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
     "add": "Thêm",
+    "activity-checked-item-card": "checked %s in checklist %s",
+    "activity-unchecked-item-card": "unchecked %s in checklist %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
     "add-attachment": "Thêm Bản Đính Kèm",
     "add-board": "Thêm Bảng",
     "add-card": "Thêm Thẻ",
     "add-swimlane": "Add Swimlane",
+    "add-subtask": "Add Subtask",
     "add-checklist": "Thêm Danh Sách Kiểm Tra",
     "add-checklist-item": "Thêm Một Mục Vào Danh Sách Kiểm Tra",
     "add-cover": "Thêm Bìa",
@@ -63,20 +91,22 @@
     "and-n-other-card": "Và __count__ thẻ khác",
     "and-n-other-card_plural": "Và __count__ thẻ khác",
     "apply": "Ứng Dụng",
-    "app-is-offline": "Wekan đang tải, vui lòng đợi. Tải lại trang có thể làm mất dữ liệu. Nếu Wekan không thể tải được, Vui lòng kiểm tra lại Wekan server.",
-    "archive": "Move to Recycle Bin",
-    "archive-all": "Move All to Recycle Bin",
-    "archive-board": "Move Board to Recycle Bin",
-    "archive-card": "Move Card to Recycle Bin",
-    "archive-list": "Move List to Recycle Bin",
-    "archive-swimlane": "Move Swimlane to Recycle Bin",
-    "archive-selection": "Move selection to Recycle Bin",
-    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
-    "archived-items": "Recycle Bin",
-    "archived-boards": "Boards in Recycle Bin",
+    "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
+    "archive": "Move to Archive",
+    "archive-all": "Move All to Archive",
+    "archive-board": "Move Board to Archive",
+    "archive-card": "Move Card to Archive",
+    "archive-list": "Move List to Archive",
+    "archive-swimlane": "Move Swimlane to Archive",
+    "archive-selection": "Move selection to Archive",
+    "archiveBoardPopup-title": "Move Board to Archive?",
+    "archived-items": "Lưu Trữ",
+    "archived-boards": "Boards in Archive",
     "restore-board": "Khôi Phục Bảng",
-    "no-archived-boards": "No Boards in Recycle Bin.",
-    "archives": "Recycle Bin",
+    "no-archived-boards": "No Boards in Archive.",
+    "archives": "Lưu Trữ",
+    "template": "Template",
+    "templates": "Templates",
     "assign-member": "Chỉ định thành viên",
     "attached": "đã đính kèm",
     "attachment": "Phần đính kèm",
@@ -95,22 +125,25 @@
     "boardChangeTitlePopup-title": "Đổi tên bảng",
     "boardChangeVisibilityPopup-title": "Đổi cách hiển thị",
     "boardChangeWatchPopup-title": "Đổi cách xem",
-    "boardMenuPopup-title": "Board Menu",
+    "boardMenuPopup-title": "Board Settings",
     "boards": "Bảng",
     "board-view": "Board View",
+    "board-view-cal": "Calendar",
     "board-view-swimlanes": "Swimlanes",
     "board-view-lists": "Lists",
     "bucket-example": "Like “Bucket List” for example",
     "cancel": "Hủy",
-    "card-archived": "This card is moved to Recycle Bin.",
+    "card-archived": "This card is moved to Archive.",
+    "board-archived": "This board is moved to Archive.",
     "card-comments-title": "Thẻ này có %s bình luận.",
     "card-delete-notice": "Hành động xóa là không thể khôi phục. Bạn sẽ mất hết các hoạt động liên quan đến thẻ này.",
     "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
     "card-due": "Due",
     "card-due-on": "Due on",
     "card-spent": "Spent Time",
     "card-edit-attachments": "Edit attachments",
+    "card-edit-custom-fields": "Edit custom fields",
     "card-edit-labels": "Edit labels",
     "card-edit-members": "Edit members",
     "card-labels-title": "Change the labels for the card.",
@@ -118,13 +151,20 @@
     "card-start": "Start",
     "card-start-on": "Starts on",
     "cardAttachmentsPopup-title": "Attach From",
+    "cardCustomField-datePopup-title": "Change date",
+    "cardCustomFieldsPopup-title": "Edit custom fields",
     "cardDeletePopup-title": "Delete Card?",
     "cardDetailsActionsPopup-title": "Card Actions",
     "cardLabelsPopup-title": "Labels",
     "cardMembersPopup-title": "Thành Viên",
     "cardMorePopup-title": "More",
+    "cardTemplatePopup-title": "Create template",
     "cards": "Cards",
     "cards-count": "Cards",
+    "casSignIn": "Sign In with CAS",
+    "cardType-card": "Card",
+    "cardType-linkedCard": "Linked Card",
+    "cardType-linkedBoard": "Linked Board",
     "change": "Change",
     "change-avatar": "Change Avatar",
     "change-password": "Change Password",
@@ -135,30 +175,52 @@
     "changePasswordPopup-title": "Change Password",
     "changePermissionsPopup-title": "Change Permissions",
     "changeSettingsPopup-title": "Change Settings",
+    "subtasks": "Subtasks",
     "checklists": "Checklists",
     "click-to-star": "Click to star this board.",
     "click-to-unstar": "Click to unstar this board.",
     "clipboard": "Clipboard or drag & drop",
     "close": "Close",
     "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
     "color-black": "black",
     "color-blue": "blue",
+    "color-crimson": "crimson",
+    "color-darkgreen": "darkgreen",
+    "color-gold": "gold",
+    "color-gray": "gray",
     "color-green": "green",
+    "color-indigo": "indigo",
     "color-lime": "lime",
+    "color-magenta": "magenta",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "navy",
     "color-orange": "orange",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
     "color-pink": "pink",
+    "color-plum": "plum",
     "color-purple": "purple",
     "color-red": "red",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "silver",
     "color-sky": "sky",
+    "color-slateblue": "slateblue",
+    "color-white": "white",
     "color-yellow": "yellow",
+    "unset-color": "Unset",
     "comment": "Comment",
     "comment-placeholder": "Write Comment",
     "comment-only": "Comment only",
     "comment-only-desc": "Can comment on cards only.",
+    "no-comments": "No comments",
+    "no-comments-desc": "Can not see comments and activities.",
     "computer": "Computer",
-    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist",
+    "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?",
+    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
     "copy-card-link-to-clipboard": "Copy card link to clipboard",
+    "linkCardPopup-title": "Link Card",
+    "searchElementPopup-title": "Search",
     "copyCardPopup-title": "Copy Card",
     "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
     "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
@@ -167,11 +229,25 @@
     "createBoardPopup-title": "Create Board",
     "chooseBoardSourcePopup-title": "Import board",
     "createLabelPopup-title": "Create Label",
+    "createCustomField": "Create Field",
+    "createCustomFieldPopup-title": "Create Field",
     "current": "current",
+    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
+    "custom-field-checkbox": "Checkbox",
+    "custom-field-date": "Date",
+    "custom-field-dropdown": "Dropdown List",
+    "custom-field-dropdown-none": "(none)",
+    "custom-field-dropdown-options": "List Options",
+    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
+    "custom-field-dropdown-unknown": "(unknown)",
+    "custom-field-number": "Number",
+    "custom-field-text": "Text",
+    "custom-fields": "Custom Fields",
     "date": "Date",
     "decline": "Decline",
     "default-avatar": "Default avatar",
     "delete": "Delete",
+    "deleteCustomFieldPopup-title": "Delete Custom Field?",
     "deleteLabelPopup-title": "Delete Label?",
     "description": "Description",
     "disambiguateMultiLabelPopup-title": "Disambiguate Label Action",
@@ -186,6 +262,7 @@
     "soft-wip-limit": "Soft WIP Limit",
     "editCardStartDatePopup-title": "Change start date",
     "editCardDueDatePopup-title": "Change due date",
+    "editCustomFieldPopup-title": "Edit Field",
     "editCardSpentTimePopup-title": "Change spent time",
     "editLabelPopup-title": "Change Label",
     "editNotificationPopup-title": "Edit Notification",
@@ -222,30 +299,36 @@
     "filter-clear": "Clear filter",
     "filter-no-label": "No label",
     "filter-no-member": "No member",
+    "filter-no-custom-fields": "No Custom Fields",
     "filter-on": "Filter is on",
     "filter-on-desc": "You are filtering cards on this board. Click here to edit filter.",
     "filter-to-selection": "Filter to selection",
+    "advanced-filter-label": "Advanced Filter",
+    "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) to be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
     "fullname": "Full Name",
     "header-logo-title": "Go back to your boards page.",
     "hide-system-messages": "Hide system messages",
     "headerBarCreateBoardPopup-title": "Create Board",
     "home": "Home",
     "import": "Import",
+    "link": "Link",
     "import-board": "import board",
     "import-board-c": "Import board",
     "import-board-title-trello": "Import board from Trello",
-    "import-board-title-wekan": "Import board from Wekan",
+    "import-board-title-wekan": "Import board from previous export",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
     "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
     "from-trello": "From Trello",
-    "from-wekan": "From Wekan",
+    "from-wekan": "From previous export",
     "import-board-instruction-trello": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text.",
-    "import-board-instruction-wekan": "In your Wekan board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
     "import-json-placeholder": "Paste your valid JSON data here",
     "import-map-members": "Map members",
-    "import-members-map": "Your imported board has some members. Please map the members you want to import to Wekan users",
+    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
     "import-show-user-mapping": "Review members mapping",
-    "import-user-select": "Pick the Wekan user you want to use as this member",
-    "importMapMembersAddPopup-title": "Select Wekan member",
+    "import-user-select": "Pick your existing user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select member",
     "info": "Version",
     "initials": "Initials",
     "invalid-date": "Invalid date",
@@ -264,17 +347,19 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "Link to this card",
-    "list-archive-cards": "Move all cards in this list to Recycle Bin",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
+    "list-archive-cards": "Move all cards in this list to Archive",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "Move all cards in this list",
     "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "List Actions",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "Import a Trello card",
     "listMorePopup-title": "More",
     "link-list": "Link to this list",
     "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
     "lists": "Lists",
     "swimlanes": "Swimlanes",
     "log-out": "Log Out",
@@ -294,9 +379,9 @@
     "muted-info": "You will never be notified of any changes in this board",
     "my-boards": "My Boards",
     "name": "Name",
-    "no-archived-cards": "No cards in Recycle Bin.",
-    "no-archived-lists": "No lists in Recycle Bin.",
-    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
+    "no-archived-cards": "No cards in Archive.",
+    "no-archived-lists": "No lists in Archive.",
+    "no-archived-swimlanes": "No swimlanes in Archive.",
     "no-results": "No results",
     "normal": "Normal",
     "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -332,6 +417,7 @@
     "restore": "Restore",
     "save": "Save",
     "search": "Search",
+    "rules": "Rules",
     "search-cards": "Search from card titles and descriptions on this board",
     "search-example": "Text to search for?",
     "select-color": "Select Color",
@@ -366,6 +452,7 @@
     "title": "Title",
     "tracking": "Tracking",
     "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
+    "type": "Type",
     "unassign-member": "Unassign member",
     "unsaved-description": "You have an unsaved description.",
     "unwatch": "Unwatch",
@@ -374,7 +461,7 @@
     "uploaded-avatar": "Uploaded an avatar",
     "username": "Username",
     "view-it": "View it",
-    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
+    "warn-list-archived": "warning: this card is in an list at Archive",
     "watch": "Watch",
     "watching": "Watching",
     "watching-info": "You will be notified of any change in this board",
@@ -382,6 +469,9 @@
     "welcome-swimlane": "Milestone 1",
     "welcome-list1": "Basics",
     "welcome-list2": "Advanced",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
     "what-to-do": "What do you want to do?",
     "wipLimitErrorPopup-title": "Invalid WIP Limit",
     "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
@@ -407,16 +497,16 @@
     "send-smtp-test": "Send a test email to yourself",
     "invitation-code": "Invitation Code",
     "email-invite-register-subject": "__inviter__ sent you an invitation",
-    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to Wekan for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
-    "email-smtp-test-subject": "SMTP Test Email From Wekan",
+    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email",
     "email-smtp-test-text": "You have successfully sent an email",
     "error-invitation-code-not-exist": "Invitation code doesn't exist",
     "error-notAuthorized": "You are not authorized to view this page.",
     "outgoing-webhooks": "Outgoing Webhooks",
     "outgoingWebhooksPopup-title": "Outgoing Webhooks",
+    "boardCardTitlePopup-title": "Card Title Filter",
     "new-outgoing-webhook": "New Outgoing Webhook",
     "no-name": "(Unknown)",
-    "Wekan_version": "Wekan version",
     "Node_version": "Node version",
     "OS_Arch": "OS Arch",
     "OS_Cpus": "OS CPU Count",
@@ -427,13 +517,18 @@
     "OS_Totalmem": "OS Total Memory",
     "OS_Type": "OS Type",
     "OS_Uptime": "OS Uptime",
+    "days": "days",
     "hours": "hours",
     "minutes": "minutes",
     "seconds": "seconds",
+    "show-field-on-card": "Show this field on card",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
     "yes": "Yes",
     "no": "No",
     "accounts": "Accounts",
     "accounts-allowEmailChange": "Allow Email Change",
+    "accounts-allowUserNameChange": "Allow Username Change",
     "createdAt": "Created at",
     "verified": "Verified",
     "active": "Active",
@@ -442,5 +537,157 @@
     "card-end": "End",
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
-    "editCardEndDatePopup-title": "Change end date"
-}
+    "editCardEndDatePopup-title": "Change end date",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "Assigned By",
+    "requested-by": "Requested By",
+    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
+    "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
+    "boardDeletePopup-title": "Delete Board?",
+    "delete-board": "Delete Board",
+    "default-subtasks-board": "Subtasks for __board__ board",
+    "default": "Default",
+    "queue": "Queue",
+    "subtask-settings": "Subtasks Settings",
+    "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
+    "show-subtasks-field": "Cards can have subtasks",
+    "deposit-subtasks-board": "Deposit subtasks to this board:",
+    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
+    "show-parent-in-minicard": "Show parent in minicard:",
+    "prefix-with-full-path": "Prefix with full path",
+    "prefix-with-parent": "Prefix with parent",
+    "subtext-with-full-path": "Subtext with full path",
+    "subtext-with-parent": "Subtext with parent",
+    "change-card-parent": "Change card's parent",
+    "parent-card": "Parent card",
+    "source-board": "Source board",
+    "no-parent": "Don't show parent",
+    "activity-added-label": "added label '%s' to %s",
+    "activity-removed-label": "removed label '%s' from %s",
+    "activity-delete-attach": "deleted an attachment from %s",
+    "activity-added-label-card": "added label '%s'",
+    "activity-removed-label-card": "removed label '%s'",
+    "activity-delete-attach-card": "deleted an attachment",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "r-rule": "Rule",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "Add action",
+    "r-board-rules": "Board rules",
+    "r-add-rule": "Add rule",
+    "r-view-rule": "View rule",
+    "r-delete-rule": "Delete rule",
+    "r-new-rule-name": "New rule title",
+    "r-no-rules": "No rules",
+    "r-when-a-card": "When a card",
+    "r-is": "is",
+    "r-is-moved": "is moved",
+    "r-added-to": "added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "the board",
+    "r-list": "list",
+    "set-filter": "Set Filter",
+    "r-moved-to": "Moved to",
+    "r-moved-from": "Moved from",
+    "r-archived": "Moved to Archive",
+    "r-unarchived": "Restored from Archive",
+    "r-a-card": "a card",
+    "r-when-a-label-is": "When a label is",
+    "r-when-the-label-is": "When the label is",
+    "r-list-name": "list name",
+    "r-when-a-member": "When a member is",
+    "r-when-the-member": "When the member",
+    "r-name": "name",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "r-when-the-item": "When the checklist item",
+    "r-checked": "Checked",
+    "r-unchecked": "Unchecked",
+    "r-move-card-to": "Move card to",
+    "r-top-of": "Top of",
+    "r-bottom-of": "Bottom of",
+    "r-its-list": "its list",
+    "r-archive": "Move to Archive",
+    "r-unarchive": "Restore from Archive",
+    "r-card": "card",
+    "r-add": "Thêm",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-set-color": "Set color to",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "subject",
+    "r-rule-details": "Rule details",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Move card to top of list",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Move card to bottom of list",
+    "r-d-send-email": "Send email",
+    "r-d-send-email-to": "to",
+    "r-d-send-email-subject": "subject",
+    "r-d-send-email-message": "message",
+    "r-d-archive": "Move card to Archive",
+    "r-d-unarchive": "Restore card from Archive",
+    "r-d-add-label": "Add label",
+    "r-d-remove-label": "Remove label",
+    "r-create-card": "Create new card",
+    "r-in-list": "in list",
+    "r-in-swimlane": "in swimlane",
+    "r-d-add-member": "Add member",
+    "r-d-remove-member": "Remove member",
+    "r-d-remove-all-member": "Remove all member",
+    "r-d-check-all": "Check all items of a list",
+    "r-d-uncheck-all": "Uncheck all items of a list",
+    "r-d-check-one": "Check item",
+    "r-d-uncheck-one": "Uncheck item",
+    "r-d-check-of-list": "of checklist",
+    "r-d-add-checklist": "Add checklist",
+    "r-d-remove-checklist": "Remove checklist",
+    "r-by": "by",
+    "r-add-checklist": "Add checklist",
+    "r-with-items": "with items",
+    "r-items-list": "item1,item2,item3",
+    "r-add-swimlane": "Add swimlane",
+    "r-swimlane-name": "swimlane name",
+    "r-board-note": "Note: leave a field empty to match every possible value.",
+    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout",
+    "hide-logo": "Hide Logo",
+    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
+    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
+    "error-undefined": "Something went wrong",
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
+}
\ No newline at end of file
diff --git a/i18n/zh-CN.i18n.json b/i18n/zh-CN.i18n.json
index 37b641e7..22a46660 100644
--- a/i18n/zh-CN.i18n.json
+++ b/i18n/zh-CN.i18n.json
@@ -1,35 +1,51 @@
 {
     "accept": "接受",
-    "act-activity-notify": "[Wekan] 活动通知",
-    "act-addAttachment": "添加附件 __attachment__ 至卡片 __card__",
-    "act-addChecklist": "添加清单 __checklist__ 到 __card__",
-    "act-addChecklistItem": "向  __card__ 中的清单 __checklist__ 添加 __checklistItem__",
-    "act-addComment": "在 __card__ 发布评论: __comment__",
+    "act-activity-notify": "活动通知",
+    "act-addAttachment": "添加附件 __attachment__ 到看板 __board__ 中的泳道 __swimlane__ 中的列表 __list__ 中的卡片 __card__ 中",
+    "act-deleteAttachment": "删除看板 __board__ 中的泳道 __swimlane__ 中的列表 __list__ 中的卡片 __card__ 中的附件 __attachment__",
+    "act-addSubtask": "添加子任务 __subtask__  到看板 __board__ 中的泳道 __swimlane__ 中的列表 __list__ 中的卡片 __card__ 中",
+    "act-addLabel": "添加标签 __label__  到看板 __board__ 中的泳道 __swimlane__ 中的列表 __list__ 中的卡片 __card__ 中",
+    "act-addedLabel": "添加标签 __label__  到看板 __board__ 中的泳道 __swimlane__ 中的列表 __list__ 中的卡片 __card__ 中",
+    "act-removeLabel": "移除看板 __board__ 中的泳道 __swimlane__ 中的列表 __list__ 中的卡片 __card__ 中的标签 __label__ ",
+    "act-removedLabel": "移除看板 __board__ 中的泳道 __swimlane__ 中的列表 __list__ 中的卡片 __card__ 中的标签 __label__ ",
+    "act-addChecklist": "添加清单 __checklist__  到看板 __board__ 中的泳道 __swimlane__ 中的列表 __list__ 中的卡片 __card__ 中",
+    "act-addChecklistItem": "添加清单项 __checklistItem__ 到看板 __board__ 中的泳道 __swimlane__ 中的列表 __list__ 中的卡片 __card__ 中的清单 __checklist__",
+    "act-removeChecklist": "移除看板 __board__ 中的泳道 __swimlane__ 中的列表 __list__ 中的卡片 __card__ 中的清单 __checklist__",
+    "act-removeChecklistItem": "移除看板 __board__ 中的泳道 __swimlane__ 中的列表 __list__ 中的卡片 __card__ 中的清单 __checklist__ 清单项 __checklistItem__",
+    "act-checkedItem": "选中看板 __board__ 中的泳道 __swimlane__ 中的列表 __list__ 中的卡片 __card__ 中的清单 __checklist__ 的清单项 __checklistItem__",
+    "act-uncheckedItem": "反选看板 __board__ 中的泳道 __swimlane__ 中的列表 __list__ 中的卡片 __card__ 中的清单 __checklist__ 的清单项 __checklistItem__",
+    "act-completeChecklist": "完成检查列表__checklist__ 卡片 __card__ 列表 __list__ 泳道  __swimlane__ 看板 __board__",
+    "act-uncompleteChecklist": "看板 __board__ 中的泳道 __swimlane__ 中的列表 __list__ 中的卡片 __card__ 中的清单 __checklist__ 未完成",
+    "act-addComment": "对看板 __board__ 中的泳道 __swimlane__ 中的列表 __list__ 中的卡片 __card__ 发表了评论: __comment__ ",
     "act-createBoard": "创建看板 __board__",
-    "act-createCard": "添加卡片 __card__  至列表 __list__",
-    "act-createList": "添加列表 __list__  至看板 __board__",
-    "act-addBoardMember": "添加成员 __member__  至看板 __board__",
-    "act-archivedBoard": "__board__ 已被移入回收站 ",
-    "act-archivedCard": "__card__ 已被移入回收站",
-    "act-archivedList": "__list__ 已被移入回收站",
-    "act-archivedSwimlane": "__swimlane__ 已被移入回收站",
+    "act-createSwimlane": "创建泳道 __swimlane__ 到看板 __board__",
+    "act-createCard": "在看板 __board__ 的泳道 __swimlane__ 的列表 __list__ 中添加卡片 __card__",
+    "act-createCustomField": "在看板 __board__ 泳道 __swimlane__ 列表 __list__ 卡片 __card__ 中创建自定义字段 __customField__",
+    "act-createList": "添加列表 __list__ 至看板 __board__",
+    "act-addBoardMember": "添加成员 __member__ 到看板 __board__",
+    "act-archivedBoard": "看板 __board__ 已被移入归档",
+    "act-archivedCard": "将看板 __board__ 中的泳道 __swimlane__ 中的列表 __list__ 中的卡片 移动到归档中",
+    "act-archivedList": "看板 __board__ 中的泳道 __swimlane__ 中的列表 __list__ 已被移入归档",
+    "act-archivedSwimlane": "看板 __board__ 中的泳道 __swimlane__ 已被移入归档",
     "act-importBoard": "导入看板 __board__",
-    "act-importCard": "导入卡片 __card__",
-    "act-importList": "导入列表 __list__",
-    "act-joinMember": "添加成员 __member__  至卡片 __card__",
-    "act-moveCard": "从列表 __oldList__  移动卡片 __card__  至列表 __list__",
-    "act-removeBoardMember": "从看板 __board__ 移除成员 __member__",
-    "act-restoredCard": "恢复卡片 __card__  至看板 __board__",
-    "act-unjoinMember": "从卡片 __card__ 移除成员 __member__",
-    "act-withBoardTitle": "[Wekan] 看板 __board__",
+    "act-importCard": "已将卡片 __card__ 导入到 __board__ 看板中的 __swimlane__ 泳道中的 __list__ 列表中",
+    "act-importList": "已将列表导入到 __board__ 看板中的 __swimlane__  泳道中的 __list__  列表中",
+    "act-joinMember": "已将成员 __member__  添加到 __board__ 看板中的 __swimlane__ 泳道中的 __list__  列表中的 __card__ 卡片中",
+    "act-moveCard": "移动卡片 __card__ 到看板 __board__ 从列表 __oldList__ 泳道 __oldSwimlane__ 至列表 __list__ 泳道 __swimlane__",
+    "act-moveCardToOtherBoard": "移动卡片 __card__ 从列表  __oldList__ 泳道 __oldSwimlane__ 看板  __oldBoard__ 至列表 __list__ 泳道 __swimlane__ 看板 __board__",
+    "act-removeBoardMember": "从看板 __board__ 移除成员 __member__ ",
+    "act-restoredCard": "恢复卡片 __card__ 至列表 __list__ 泳道 __swimlane__  看板 __board__",
+    "act-unjoinMember": "移除成员  __member__  从卡片 __card__ 列表 __list__ a泳道 __swimlane__ 看板 __board__",
+    "act-withBoardTitle": "看板__board__",
     "act-withCardTitle": "[看板 __board__] 卡片 __card__",
     "actions": "操作",
     "activities": "活动",
     "activity": "活动",
     "activity-added": "添加 %s 至 %s",
-    "activity-archived": "%s 已被移入回收站",
+    "activity-archived": "%s 已被移入归档",
     "activity-attached": "添加附件 %s 至 %s",
     "activity-created": "创建 %s",
+    "activity-customfield-created": "创建了自定义字段 %s",
     "activity-excluded": "排除 %s 从 %s",
     "activity-imported": "导入 %s 至 %s 从 %s 中",
     "activity-imported-board": "已导入 %s 从 %s 中",
@@ -39,13 +55,25 @@
     "activity-removed": "从 %s 中移除 %s",
     "activity-sent": "发送 %s 至 %s",
     "activity-unjoined": "已解除 %s 关联",
+    "activity-subtask-added": "添加子任务到%s",
+    "activity-checked-item": "勾选%s于清单%s 共 %s",
+    "activity-unchecked-item": "未勾选 %s  于清单 %s 共 %s",
     "activity-checklist-added": "已经将清单添加到 %s",
+    "activity-checklist-removed": "已从%s移除待办清单",
+    "activity-checklist-completed": "完成检查列表__checklist__ 卡片 __card__ 列表 __list__ 泳道  __swimlane__ 看板 __board__",
+    "activity-checklist-uncompleted": "未完成清单 %s 共 %s",
     "activity-checklist-item-added": "添加清单项至'%s' 于 %s",
+    "activity-checklist-item-removed": "已从 '%s' 于 %s中 移除一个清单项",
     "add": "添加",
+    "activity-checked-item-card": "勾选 %s 与清单 %s 中",
+    "activity-unchecked-item-card": "取消勾选 %s 于清单 %s中",
+    "activity-checklist-completed-card": "完成检查列表  __checklist__  卡片  __card__ 列表 __list__ 泳道 __swimlane__ 看板 __board__",
+    "activity-checklist-uncompleted-card": "未完成清单 %s",
     "add-attachment": "添加附件",
     "add-board": "添加看板",
     "add-card": "添加卡片",
     "add-swimlane": "添加泳道图",
+    "add-subtask": "添加子任务",
     "add-checklist": "添加待办清单",
     "add-checklist-item": "扩充清单",
     "add-cover": "添加封面",
@@ -63,20 +91,22 @@
     "and-n-other-card": "和其他 __count__ 个卡片",
     "and-n-other-card_plural": "和其他 __count__ 个卡片",
     "apply": "应用",
-    "app-is-offline": "Wekan 正在加载，请稍等。刷新页面将导致数据丢失。如果 Wekan 无法加载，请检查 Wekan 服务器是否已经停止。",
-    "archive": "移入回收站",
-    "archive-all": "全部移入回收站",
-    "archive-board": "移动看板到回收站",
-    "archive-card": "移动卡片到回收站",
-    "archive-list": "移动列表到回收站",
-    "archive-swimlane": "移动泳道到回收站",
-    "archive-selection": "移动选择内容到回收站",
-    "archiveBoardPopup-title": "移动看板到回收站?",
-    "archived-items": "回收站",
-    "archived-boards": "回收站中的看板",
+    "app-is-offline": "加载中，请稍后。刷新页面将导致数据丢失，如果加载长时间不起作用，请检查服务器是否已经停止工作。",
+    "archive": "归档",
+    "archive-all": "全部归档",
+    "archive-board": "将看板归档",
+    "archive-card": "将卡片归档",
+    "archive-list": "将列表归档",
+    "archive-swimlane": "将泳道归档",
+    "archive-selection": "将选择归档",
+    "archiveBoardPopup-title": "是否归档看板？",
+    "archived-items": "归档",
+    "archived-boards": "归档的看板",
     "restore-board": "还原看板",
-    "no-archived-boards": "回收站中无看板",
-    "archives": "回收站",
+    "no-archived-boards": "没有归档的看板。",
+    "archives": "归档",
+    "template": "模板",
+    "templates": "模板",
     "assign-member": "分配成员",
     "attached": "附加",
     "attachment": "附件",
@@ -95,22 +125,25 @@
     "boardChangeTitlePopup-title": "重命名看板",
     "boardChangeVisibilityPopup-title": "更改可视级别",
     "boardChangeWatchPopup-title": "更改关注状态",
-    "boardMenuPopup-title": "看板菜单",
+    "boardMenuPopup-title": "看板设置",
     "boards": "看板",
     "board-view": "看板视图",
+    "board-view-cal": "日历",
     "board-view-swimlanes": "泳道图",
     "board-view-lists": "列表",
     "bucket-example": "例如 “目标清单”",
     "cancel": "取消",
-    "card-archived": "此卡片已经被移入回收站。",
+    "card-archived": "归档这个卡片。",
+    "board-archived": "归档这个看板。",
     "card-comments-title": "该卡片有 %s 条评论",
     "card-delete-notice": "彻底删除的操作不可恢复，你将会丢失该卡片相关的所有操作记录。",
     "card-delete-pop": "所有的活动将从活动摘要中被移除且您将无法重新打开该卡片。此操作无法撤销。",
-    "card-delete-suggest-archive": "将卡片移入回收站可以从看板中删除卡片，相关活动记录将被保留。",
+    "card-delete-suggest-archive": "您可以移动卡片到活动以便从看板中删除并保持活动。",
     "card-due": "到期",
     "card-due-on": "期限",
     "card-spent": "耗时",
     "card-edit-attachments": "编辑附件",
+    "card-edit-custom-fields": "编辑自定义字段",
     "card-edit-labels": "编辑标签",
     "card-edit-members": "编辑成员",
     "card-labels-title": "更改该卡片上的标签",
@@ -118,13 +151,20 @@
     "card-start": "开始",
     "card-start-on": "始于",
     "cardAttachmentsPopup-title": "附件来源",
+    "cardCustomField-datePopup-title": "修改日期",
+    "cardCustomFieldsPopup-title": "编辑自定义字段",
     "cardDeletePopup-title": "彻底删除卡片？",
     "cardDetailsActionsPopup-title": "卡片操作",
     "cardLabelsPopup-title": "标签",
     "cardMembersPopup-title": "成员",
     "cardMorePopup-title": "更多",
+    "cardTemplatePopup-title": "新建模板",
     "cards": "卡片",
     "cards-count": "卡片",
+    "casSignIn": "用CAS登录",
+    "cardType-card": "卡片",
+    "cardType-linkedCard": "已链接卡片",
+    "cardType-linkedBoard": "已链接看板",
     "change": "变更",
     "change-avatar": "更改头像",
     "change-password": "更改密码",
@@ -135,30 +175,52 @@
     "changePasswordPopup-title": "更改密码",
     "changePermissionsPopup-title": "更改权限",
     "changeSettingsPopup-title": "更改设置",
+    "subtasks": "子任务",
     "checklists": "清单",
     "click-to-star": "点此来标记该看板",
     "click-to-unstar": "点此来去除该看板的标记",
     "clipboard": "剪贴板或者拖放文件",
     "close": "关闭",
     "close-board": "关闭看板",
-    "close-board-pop": "在主页中点击顶部的“回收站”按钮可以恢复看板。",
+    "close-board-pop": "您可以通过主页头部的“归档”按钮，来恢复看板。",
     "color-black": "黑色",
     "color-blue": "蓝色",
+    "color-crimson": "深红",
+    "color-darkgreen": "墨绿",
+    "color-gold": "金",
+    "color-gray": "灰",
     "color-green": "绿色",
+    "color-indigo": "靛蓝",
     "color-lime": "绿黄",
+    "color-magenta": "洋红",
+    "color-mistyrose": "玫瑰红",
+    "color-navy": "藏青",
     "color-orange": "橙色",
+    "color-paleturquoise": "宝石绿",
+    "color-peachpuff": "桃红",
     "color-pink": "粉红",
+    "color-plum": "紫红",
     "color-purple": "紫色",
     "color-red": "红色",
+    "color-saddlebrown": "棕褐",
+    "color-silver": "银",
     "color-sky": "天蓝",
+    "color-slateblue": "石板蓝",
+    "color-white": "白",
     "color-yellow": "黄色",
+    "unset-color": "复原",
     "comment": "评论",
     "comment-placeholder": "添加评论",
     "comment-only": "仅能评论",
     "comment-only-desc": "只能在卡片上评论。",
+    "no-comments": "暂无评论",
+    "no-comments-desc": "无法查看评论和活动。",
     "computer": "从本机上传",
-    "confirm-checklist-delete-dialog": "确认要删除清单吗",
+    "confirm-subtask-delete-dialog": "确定要删除子任务吗？",
+    "confirm-checklist-delete-dialog": "确定要删除清单吗？",
     "copy-card-link-to-clipboard": "复制卡片链接到剪贴板",
+    "linkCardPopup-title": "链接卡片",
+    "searchElementPopup-title": "搜索",
     "copyCardPopup-title": "复制卡片",
     "copyChecklistToManyCardsPopup-title": "复制清单模板至多个卡片",
     "copyChecklistToManyCardsPopup-instructions": "以JSON格式表示目标卡片的标题和描述",
@@ -167,15 +229,29 @@
     "createBoardPopup-title": "创建看板",
     "chooseBoardSourcePopup-title": "导入看板",
     "createLabelPopup-title": "创建标签",
+    "createCustomField": "创建字段",
+    "createCustomFieldPopup-title": "创建字段",
     "current": "当前",
+    "custom-field-delete-pop": "没有撤销，此动作将从所有卡片中移除自定义字段并销毁历史。",
+    "custom-field-checkbox": "选择框",
+    "custom-field-date": "日期",
+    "custom-field-dropdown": "下拉列表",
+    "custom-field-dropdown-none": "(无)",
+    "custom-field-dropdown-options": "列表选项",
+    "custom-field-dropdown-options-placeholder": "回车可以加入更多选项",
+    "custom-field-dropdown-unknown": "(未知)",
+    "custom-field-number": "数字",
+    "custom-field-text": "文本",
+    "custom-fields": "自定义字段",
     "date": "日期",
     "decline": "拒绝",
     "default-avatar": "默认头像",
     "delete": "删除",
+    "deleteCustomFieldPopup-title": "删除自定义字段？",
     "deleteLabelPopup-title": "删除标签？",
     "description": "描述",
-    "disambiguateMultiLabelPopup-title": "标签消歧 [?]",
-    "disambiguateMultiMemberPopup-title": "成员消歧 [?]",
+    "disambiguateMultiLabelPopup-title": "消除标签歧义",
+    "disambiguateMultiMemberPopup-title": "消除成员歧义",
     "discard": "放弃",
     "done": "完成",
     "download": "下载",
@@ -183,9 +259,10 @@
     "edit-avatar": "更改头像",
     "edit-profile": "编辑资料",
     "edit-wip-limit": "编辑最大任务数",
-    "soft-wip-limit": "软在制品限制",
+    "soft-wip-limit": "最大任务数软限制",
     "editCardStartDatePopup-title": "修改起始日期",
     "editCardDueDatePopup-title": "修改截止日期",
+    "editCustomFieldPopup-title": "编辑字段",
     "editCardSpentTimePopup-title": "修改耗时",
     "editLabelPopup-title": "更改标签",
     "editNotificationPopup-title": "编辑通知",
@@ -222,30 +299,36 @@
     "filter-clear": "清空过滤器",
     "filter-no-label": "无标签",
     "filter-no-member": "无成员",
+    "filter-no-custom-fields": "无自定义字段",
     "filter-on": "过滤器启用",
     "filter-on-desc": "你正在过滤该看板上的卡片，点此编辑过滤。",
     "filter-to-selection": "要选择的过滤器",
+    "advanced-filter-label": "高级过滤器",
+    "advanced-filter-description": "高级过滤器可以使用包含如下操作符的字符串进行过滤：== != <= >= && || ( ) 。操作符之间用空格隔开。输入字段名和数值就可以过滤所有自定义字段。例如：Field1 == Value1。注意如果字段名或数值包含空格，需要用单引号。例如: 'Field 1' == 'Value 1'。要跳过单个控制字符(' \\/)，请使用 \\ 转义字符。例如: Field1 = I\\'m。支持组合使用多个条件，例如: F1 == V1 || F1 == V2。通常以从左到右的顺序进行判断。可以通过括号修改顺序,例如：F1 == V1 && ( F2 == V2 || F2 == V3 )。也支持使用正则表达式搜索文本字段。",
     "fullname": "全称",
     "header-logo-title": "返回您的看板页",
     "hide-system-messages": "隐藏系统消息",
     "headerBarCreateBoardPopup-title": "创建看板",
     "home": "首页",
     "import": "导入",
+    "link": "链接",
     "import-board": "导入看板",
     "import-board-c": "导入看板",
     "import-board-title-trello": "从Trello导入看板",
-    "import-board-title-wekan": "从Wekan 导入看板",
+    "import-board-title-wekan": "从以前的导出数据导入看板",
+    "import-sandstorm-backup-warning": "在检查此颗粒是否关闭和再次打开之前，不要删除从原始导出的看板或Trello导入的数据，否则看板会发生未知的错误，这将意味着数据丢失。",
     "import-sandstorm-warning": "导入的面板将删除所有已存在于面板上的数据并替换他们为导入的面板。 ",
     "from-trello": "自 Trello",
-    "from-wekan": "自 Wekan",
+    "from-wekan": "自以前的导出",
     "import-board-instruction-trello": "在你的Trello看板中，点击“菜单”，然后选择“更多”，“打印与导出”，“导出为 JSON” 并拷贝结果文本",
-    "import-board-instruction-wekan": "在你的Wekan面板中点'菜单'，然后点‘导出面板’并在已下载的文档复制文本。",
+    "import-board-instruction-wekan": "在您的看板，点击“菜单”，然后“导出看板”，复制下载文件中的文本。",
+    "import-board-instruction-about-errors": "如果在导入看板时出现错误，导入工作可能仍然在进行中，并且看板已经出现在全部看板页。",
     "import-json-placeholder": "粘贴您有效的 JSON 数据至此",
     "import-map-members": "映射成员",
-    "import-members-map": "您导入的看板有一些成员。请将您想导入的成员映射到 Wekan 用户。",
+    "import-members-map": "您导入的看板有一些成员，请映射这些成员到您导入的用户。",
     "import-show-user-mapping": "核对成员映射",
-    "import-user-select": "选择您想将此成员映射到的 Wekan 用户",
-    "importMapMembersAddPopup-title": "选择Wekan成员",
+    "import-user-select": "为这个成员选择您已经存在的用户",
+    "importMapMembersAddPopup-title": "选择成员",
     "info": "版本",
     "initials": "缩写",
     "invalid-date": "无效日期",
@@ -264,17 +347,19 @@
     "leave-board-pop": "确认要离开 __boardTitle__ 吗？此看板的所有卡片都会将您移除。",
     "leaveBoardPopup-title": "离开看板?",
     "link-card": "关联至该卡片",
-    "list-archive-cards": "移动此列表中的所有卡片到回收站",
-    "list-archive-cards-pop": "此操作会从看板中删除所有此列表包含的卡片。要查看回收站中的卡片并恢复到看板，请点击“菜单” > “回收站”。",
+    "list-archive-cards": "将此列表中的所有卡片归档",
+    "list-archive-cards-pop": "将移动看板中列表的所有卡片，查看或回复归档中的卡片，点击“菜单”->“归档”",
     "list-move-cards": "移动列表中的所有卡片",
     "list-select-cards": "选择列表中的所有卡片",
+    "set-color-list": "设置颜色",
     "listActionPopup-title": "列表操作",
     "swimlaneActionPopup-title": "泳道图操作",
+    "swimlaneAddPopup-title": "在下面添加一个泳道",
     "listImportCardPopup-title": "导入 Trello 卡片",
     "listMorePopup-title": "更多",
     "link-list": "关联到这个列表",
     "list-delete-pop": "所有活动将被从活动动态中删除并且你无法恢复他们，此操作无法撤销。 ",
-    "list-delete-suggest-archive": "可以将列表移入回收站，看板中将删除列表，但是相关活动记录会被保留。",
+    "list-delete-suggest-archive": "您可以移动列表到归档以将其从看板中移除并保留活动。",
     "lists": "列表",
     "swimlanes": "泳道图",
     "log-out": "登出",
@@ -294,9 +379,9 @@
     "muted-info": "你将不会收到此看板的任何变更通知",
     "my-boards": "我的看板",
     "name": "名称",
-    "no-archived-cards": "回收站中无卡片。",
-    "no-archived-lists": "回收站中无列表。",
-    "no-archived-swimlanes": "回收站中无泳道。",
+    "no-archived-cards": "存档中没有卡片。",
+    "no-archived-lists": "存档中没有清单。",
+    "no-archived-swimlanes": "存档中没有泳道。",
     "no-results": "无结果",
     "normal": "普通",
     "normal-desc": "可以创建以及编辑卡片，无法更改设置。",
@@ -332,6 +417,7 @@
     "restore": "还原",
     "save": "保存",
     "search": "搜索",
+    "rules": "规则",
     "search-cards": "搜索当前看板上的卡片标题和描述",
     "search-example": "搜索",
     "select-color": "选择颜色",
@@ -366,6 +452,7 @@
     "title": "标题",
     "tracking": "跟踪",
     "tracking-info": "当任何包含您（作为创建者或成员）的卡片发生变更时，您将得到通知。",
+    "type": "类型",
     "unassign-member": "取消分配成员",
     "unsaved-description": "存在未保存的描述",
     "unwatch": "取消关注",
@@ -374,7 +461,7 @@
     "uploaded-avatar": "头像已经上传",
     "username": "用户名",
     "view-it": "查看",
-    "warn-list-archived": "警告：此卡片属于回收站中的一个列表",
+    "warn-list-archived": "警告：此卡片在列表归档中",
     "watch": "关注",
     "watching": "关注",
     "watching-info": "当此看板发生变更时会通知你",
@@ -382,6 +469,9 @@
     "welcome-swimlane": "里程碑 1",
     "welcome-list1": "基本",
     "welcome-list2": "高阶",
+    "card-templates-swimlane": "卡片模板",
+    "list-templates-swimlane": "列表模板",
+    "board-templates-swimlane": "看板模板",
     "what-to-do": "要做什么？",
     "wipLimitErrorPopup-title": "无效的最大任务数",
     "wipLimitErrorPopup-dialog-pt1": "此列表中的任务数量已经超过了设置的最大任务数。",
@@ -407,16 +497,16 @@
     "send-smtp-test": "给自己发送一封测试邮件",
     "invitation-code": "邀请码",
     "email-invite-register-subject": "__inviter__ 向您发出邀请",
-    "email-invite-register-text": "亲爱的 __user__，\n\n__inviter__ 邀请您加入 Wekan 进行协作。\n\n请访问下面的链接︰\n__url__\n\n您的的邀请码是︰\n__icode__\n\n非常感谢。",
-    "email-smtp-test-subject": "从Wekan发送SMTP测试邮件",
+    "email-invite-register-text": "亲爱的__user__：\n__inviter__ 邀请您加入到看板\n\n请点击下面的链接：\n__url__\n\n您的邀请码是：__icode__\n\n谢谢。",
+    "email-smtp-test-subject": "通过SMTP发送测试邮件",
     "email-smtp-test-text": "你已成功发送邮件",
     "error-invitation-code-not-exist": "邀请码不存在",
     "error-notAuthorized": "您无权查看此页面。",
     "outgoing-webhooks": "外部Web挂钩",
     "outgoingWebhooksPopup-title": "外部Web挂钩",
+    "boardCardTitlePopup-title": "卡片标题过滤",
     "new-outgoing-webhook": "新建外部Web挂钩",
     "no-name": "(未知)",
-    "Wekan_version": "Wekan版本",
     "Node_version": "Node.js版本",
     "OS_Arch": "系统架构",
     "OS_Cpus": "系统 CPU数量",
@@ -427,13 +517,18 @@
     "OS_Totalmem": "系统全部内存",
     "OS_Type": "系统类型",
     "OS_Uptime": "系统运行时间",
+    "days": "天",
     "hours": "小时",
     "minutes": "分钟",
     "seconds": "秒",
+    "show-field-on-card": "在卡片上显示此字段",
+    "automatically-field-on-card": "自动创建所有卡片的字段",
+    "showLabel-field-on-card": "在迷你卡片上显示字段标签",
     "yes": "是",
     "no": "否",
     "accounts": "账号",
     "accounts-allowEmailChange": "允许邮箱变更",
+    "accounts-allowUserNameChange": "允许变更用户名",
     "createdAt": "创建于",
     "verified": "已验证",
     "active": "活跃",
@@ -442,5 +537,157 @@
     "card-end": "终止",
     "card-end-on": "终止于",
     "editCardReceivedDatePopup-title": "修改接收日期",
-    "editCardEndDatePopup-title": "修改终止日期"
-}
+    "editCardEndDatePopup-title": "修改终止日期",
+    "setCardColorPopup-title": "设置颜色",
+    "setCardActionsColorPopup-title": "选择一种颜色",
+    "setSwimlaneColorPopup-title": "选择一种颜色",
+    "setListColorPopup-title": "选择一种颜色",
+    "assigned-by": "分配人",
+    "requested-by": "需求人",
+    "board-delete-notice": "删除时永久操作，将会丢失此看板上的所有列表、卡片和动作。",
+    "delete-board-confirm-popup": "所有列表、卡片、标签和活动都回被删除，将无法恢复看板内容。不支持撤销。",
+    "boardDeletePopup-title": "删除看板？",
+    "delete-board": "删除看板",
+    "default-subtasks-board": "__board__ 看板的子任务",
+    "default": "缺省",
+    "queue": "队列",
+    "subtask-settings": "子任务设置",
+    "boardSubtaskSettingsPopup-title": "看板子任务设置",
+    "show-subtasks-field": "卡片包含子任务",
+    "deposit-subtasks-board": "将子任务放入以下看板：",
+    "deposit-subtasks-list": "将子任务放入以下列表：",
+    "show-parent-in-minicard": "显示上一级卡片：",
+    "prefix-with-full-path": "完整路径前缀",
+    "prefix-with-parent": "上级前缀",
+    "subtext-with-full-path": "子标题显示完整路径",
+    "subtext-with-parent": "子标题显示上级",
+    "change-card-parent": "修改卡片的上级",
+    "parent-card": "上级卡片",
+    "source-board": "源看板",
+    "no-parent": "不显示上级",
+    "activity-added-label": "已添加标签 '%s' 到 %s",
+    "activity-removed-label": "已将标签 '%s' 从 %s 移除",
+    "activity-delete-attach": "已从 %s 删除附件",
+    "activity-added-label-card": "已添加标签 '%s'",
+    "activity-removed-label-card": "已移除标签 '%s'",
+    "activity-delete-attach-card": "已删除附件",
+    "activity-set-customfield": "设置自定义字段 '%s' 至 '%s' 于 %s",
+    "activity-unset-customfield": "未设置自定义字段  '%s' 于 %s",
+    "r-rule": "规则",
+    "r-add-trigger": "添加触发器",
+    "r-add-action": "添加行动",
+    "r-board-rules": "看板规则",
+    "r-add-rule": "添加规则",
+    "r-view-rule": "查看规则",
+    "r-delete-rule": "删除规则",
+    "r-new-rule-name": "新建规则标题",
+    "r-no-rules": "暂无规则",
+    "r-when-a-card": "当一张卡片",
+    "r-is": "是",
+    "r-is-moved": "已经移动",
+    "r-added-to": "添加到",
+    "r-removed-from": "已移除",
+    "r-the-board": "该看板",
+    "r-list": "列表",
+    "set-filter": "设置过滤器",
+    "r-moved-to": "移至",
+    "r-moved-from": "已移动",
+    "r-archived": "已移动到归档",
+    "r-unarchived": "已从归档中恢复",
+    "r-a-card": "一个卡片",
+    "r-when-a-label-is": "当一个标签是",
+    "r-when-the-label-is": "当该标签是",
+    "r-list-name": "列表名称",
+    "r-when-a-member": "当一个成员是",
+    "r-when-the-member": "当该成员",
+    "r-name": "名称",
+    "r-when-a-attach": "当一个附件",
+    "r-when-a-checklist": "当一个清单是",
+    "r-when-the-checklist": "当该清单",
+    "r-completed": "已完成",
+    "r-made-incomplete": "置为未完成",
+    "r-when-a-item": "当一个清单项是",
+    "r-when-the-item": "当该清单项",
+    "r-checked": "勾选",
+    "r-unchecked": "未勾选",
+    "r-move-card-to": "移动卡片到",
+    "r-top-of": "的顶部",
+    "r-bottom-of": "的尾部",
+    "r-its-list": "其列表",
+    "r-archive": "归档",
+    "r-unarchive": "从归档中恢复",
+    "r-card": "卡片",
+    "r-add": "添加",
+    "r-remove": "移除",
+    "r-label": "标签",
+    "r-member": "成员",
+    "r-remove-all": "从卡片移除所有成员",
+    "r-set-color": "设置颜色",
+    "r-checklist": "清单",
+    "r-check-all": "勾选所有",
+    "r-uncheck-all": "取消勾选所有",
+    "r-items-check": "清单条目",
+    "r-check": "勾选",
+    "r-uncheck": "取消勾选",
+    "r-item": "条目",
+    "r-of-checklist": "清单的",
+    "r-send-email": "发送邮件",
+    "r-to": "收件人",
+    "r-subject": "标题",
+    "r-rule-details": "规则详情",
+    "r-d-move-to-top-gen": "移动卡片到其列表顶部",
+    "r-d-move-to-top-spec": "移动卡片到列表顶部",
+    "r-d-move-to-bottom-gen": "移动卡片到其列表尾部",
+    "r-d-move-to-bottom-spec": "移动卡片到列表尾部",
+    "r-d-send-email": "发送邮件",
+    "r-d-send-email-to": "收件人",
+    "r-d-send-email-subject": "标题",
+    "r-d-send-email-message": "消息",
+    "r-d-archive": "将卡片归档",
+    "r-d-unarchive": "从归档中恢复卡片",
+    "r-d-add-label": "添加标签",
+    "r-d-remove-label": "移除标签",
+    "r-create-card": "创建新卡片",
+    "r-in-list": "在列表中",
+    "r-in-swimlane": "在泳道中",
+    "r-d-add-member": "添加成员",
+    "r-d-remove-member": "移除成员",
+    "r-d-remove-all-member": "移除所有成员",
+    "r-d-check-all": "勾选所有列表项",
+    "r-d-uncheck-all": "取消勾选所有列表项",
+    "r-d-check-one": "勾选该项",
+    "r-d-uncheck-one": "取消勾选",
+    "r-d-check-of-list": "清单的",
+    "r-d-add-checklist": "添加待办清单",
+    "r-d-remove-checklist": "移动待办清单",
+    "r-by": "在",
+    "r-add-checklist": "添加待办清单",
+    "r-with-items": "与项目",
+    "r-items-list": "项目1，项目2，项目3",
+    "r-add-swimlane": "添加泳道",
+    "r-swimlane-name": "泳道名",
+    "r-board-note": "注意：保留一个空字段去匹配所有可能的值。",
+    "r-checklist-note": "注意：清单中的项目必须用都好分割。",
+    "r-when-a-card-is-moved": "当移动卡片到另一个列表时",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "认证方式",
+    "authentication-type": "认证类型",
+    "custom-product-name": "自定义产品名称",
+    "layout": "布局",
+    "hide-logo": "隐藏LOGO",
+    "add-custom-html-after-body-start": "添加定制的HTML在开始<body>之前",
+    "add-custom-html-before-body-end": "添加定制的HTML在结束</body>之后",
+    "error-undefined": "出了点问题",
+    "error-ldap-login": "尝试登陆时出错",
+    "display-authentication-method": "显示认证方式",
+    "default-authentication-method": "缺省认证方式",
+    "duplicate-board": "复制看板",
+    "people-number": "人数是：",
+    "swimlaneDeletePopup-title": "是否删除泳道？",
+    "swimlane-delete-pop": "所有活动将从活动源中删除，您将无法恢复泳道。此操作无法撤销。",
+    "restore-all": "全部恢复",
+    "delete-all": "全部删除",
+    "loading": "加载中，请稍等。"
+}
\ No newline at end of file
diff --git a/i18n/zh-HK.i18n.json b/i18n/zh-HK.i18n.json
new file mode 100644
index 00000000..072f1b81
--- /dev/null
+++ b/i18n/zh-HK.i18n.json
@@ -0,0 +1,693 @@
+{
+    "accept": "Accept",
+    "act-activity-notify": "Activity Notification",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__board__",
+    "act-withCardTitle": "[__board__] __card__",
+    "actions": "Actions",
+    "activities": "Activities",
+    "activity": "Activity",
+    "activity-added": "added %s to %s",
+    "activity-archived": "%s moved to Archive",
+    "activity-attached": "attached %s to %s",
+    "activity-created": "created %s",
+    "activity-customfield-created": "created custom field %s",
+    "activity-excluded": "excluded %s from %s",
+    "activity-imported": "imported %s into %s from %s",
+    "activity-imported-board": "imported %s from %s",
+    "activity-joined": "joined %s",
+    "activity-moved": "moved %s from %s to %s",
+    "activity-on": "on %s",
+    "activity-removed": "removed %s from %s",
+    "activity-sent": "sent %s to %s",
+    "activity-unjoined": "unjoined %s",
+    "activity-subtask-added": "added subtask to %s",
+    "activity-checked-item": "checked %s in checklist %s of %s",
+    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
+    "activity-checklist-added": "added checklist to %s",
+    "activity-checklist-removed": "removed a checklist from %s",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
+    "activity-checklist-item-added": "added checklist item to '%s' in %s",
+    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
+    "add": "Add",
+    "activity-checked-item-card": "checked %s in checklist %s",
+    "activity-unchecked-item-card": "unchecked %s in checklist %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
+    "add-attachment": "Add Attachment",
+    "add-board": "Add Board",
+    "add-card": "Add Card",
+    "add-swimlane": "Add Swimlane",
+    "add-subtask": "Add Subtask",
+    "add-checklist": "Add Checklist",
+    "add-checklist-item": "Add an item to checklist",
+    "add-cover": "Add Cover",
+    "add-label": "Add Label",
+    "add-list": "Add List",
+    "add-members": "Add Members",
+    "added": "Added",
+    "addMemberPopup-title": "Members",
+    "admin": "Admin",
+    "admin-desc": "Can view and edit cards, remove members, and change settings for the board.",
+    "admin-announcement": "Announcement",
+    "admin-announcement-active": "Active System-Wide Announcement",
+    "admin-announcement-title": "Announcement from Administrator",
+    "all-boards": "All boards",
+    "and-n-other-card": "And __count__ other card",
+    "and-n-other-card_plural": "And __count__ other cards",
+    "apply": "Apply",
+    "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
+    "archive": "Move to Archive",
+    "archive-all": "Move All to Archive",
+    "archive-board": "Move Board to Archive",
+    "archive-card": "Move Card to Archive",
+    "archive-list": "Move List to Archive",
+    "archive-swimlane": "Move Swimlane to Archive",
+    "archive-selection": "Move selection to Archive",
+    "archiveBoardPopup-title": "Move Board to Archive?",
+    "archived-items": "Archive",
+    "archived-boards": "Boards in Archive",
+    "restore-board": "Restore Board",
+    "no-archived-boards": "No Boards in Archive.",
+    "archives": "Archive",
+    "template": "Template",
+    "templates": "Templates",
+    "assign-member": "Assign member",
+    "attached": "attached",
+    "attachment": "Attachment",
+    "attachment-delete-pop": "Deleting an attachment is permanent. There is no undo.",
+    "attachmentDeletePopup-title": "Delete Attachment?",
+    "attachments": "Attachments",
+    "auto-watch": "Automatically watch boards when they are created",
+    "avatar-too-big": "The avatar is too large (70KB max)",
+    "back": "Back",
+    "board-change-color": "Change color",
+    "board-nb-stars": "%s stars",
+    "board-not-found": "Board not found",
+    "board-private-info": "This board will be <strong>private</strong>.",
+    "board-public-info": "This board will be <strong>public</strong>.",
+    "boardChangeColorPopup-title": "Change Board Background",
+    "boardChangeTitlePopup-title": "Rename Board",
+    "boardChangeVisibilityPopup-title": "Change Visibility",
+    "boardChangeWatchPopup-title": "Change Watch",
+    "boardMenuPopup-title": "Board Settings",
+    "boards": "Boards",
+    "board-view": "Board View",
+    "board-view-cal": "Calendar",
+    "board-view-swimlanes": "Swimlanes",
+    "board-view-lists": "Lists",
+    "bucket-example": "Like “Bucket List” for example",
+    "cancel": "Cancel",
+    "card-archived": "This card is moved to Archive.",
+    "board-archived": "This board is moved to Archive.",
+    "card-comments-title": "This card has %s comment.",
+    "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
+    "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
+    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
+    "card-due": "Due",
+    "card-due-on": "Due on",
+    "card-spent": "Spent Time",
+    "card-edit-attachments": "Edit attachments",
+    "card-edit-custom-fields": "Edit custom fields",
+    "card-edit-labels": "Edit labels",
+    "card-edit-members": "Edit members",
+    "card-labels-title": "Change the labels for the card.",
+    "card-members-title": "Add or remove members of the board from the card.",
+    "card-start": "Start",
+    "card-start-on": "Starts on",
+    "cardAttachmentsPopup-title": "Attach From",
+    "cardCustomField-datePopup-title": "Change date",
+    "cardCustomFieldsPopup-title": "Edit custom fields",
+    "cardDeletePopup-title": "Delete Card?",
+    "cardDetailsActionsPopup-title": "Card Actions",
+    "cardLabelsPopup-title": "Labels",
+    "cardMembersPopup-title": "Members",
+    "cardMorePopup-title": "More",
+    "cardTemplatePopup-title": "Create template",
+    "cards": "Cards",
+    "cards-count": "Cards",
+    "casSignIn": "Sign In with CAS",
+    "cardType-card": "Card",
+    "cardType-linkedCard": "Linked Card",
+    "cardType-linkedBoard": "Linked Board",
+    "change": "Change",
+    "change-avatar": "Change Avatar",
+    "change-password": "Change Password",
+    "change-permissions": "Change permissions",
+    "change-settings": "Change Settings",
+    "changeAvatarPopup-title": "Change Avatar",
+    "changeLanguagePopup-title": "Change Language",
+    "changePasswordPopup-title": "Change Password",
+    "changePermissionsPopup-title": "Change Permissions",
+    "changeSettingsPopup-title": "Change Settings",
+    "subtasks": "Subtasks",
+    "checklists": "Checklists",
+    "click-to-star": "Click to star this board.",
+    "click-to-unstar": "Click to unstar this board.",
+    "clipboard": "Clipboard or drag & drop",
+    "close": "Close",
+    "close-board": "Close Board",
+    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
+    "color-black": "black",
+    "color-blue": "blue",
+    "color-crimson": "crimson",
+    "color-darkgreen": "darkgreen",
+    "color-gold": "gold",
+    "color-gray": "gray",
+    "color-green": "green",
+    "color-indigo": "indigo",
+    "color-lime": "lime",
+    "color-magenta": "magenta",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "navy",
+    "color-orange": "orange",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
+    "color-pink": "pink",
+    "color-plum": "plum",
+    "color-purple": "purple",
+    "color-red": "red",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "silver",
+    "color-sky": "sky",
+    "color-slateblue": "slateblue",
+    "color-white": "white",
+    "color-yellow": "yellow",
+    "unset-color": "Unset",
+    "comment": "Comment",
+    "comment-placeholder": "Write Comment",
+    "comment-only": "Comment only",
+    "comment-only-desc": "Can comment on cards only.",
+    "no-comments": "No comments",
+    "no-comments-desc": "Can not see comments and activities.",
+    "computer": "Computer",
+    "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?",
+    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
+    "copy-card-link-to-clipboard": "Copy card link to clipboard",
+    "linkCardPopup-title": "Link Card",
+    "searchElementPopup-title": "Search",
+    "copyCardPopup-title": "Copy Card",
+    "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
+    "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
+    "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"First card title\", \"description\":\"First card description\"}, {\"title\":\"Second card title\",\"description\":\"Second card description\"},{\"title\":\"Last card title\",\"description\":\"Last card description\"} ]",
+    "create": "Create",
+    "createBoardPopup-title": "Create Board",
+    "chooseBoardSourcePopup-title": "Import board",
+    "createLabelPopup-title": "Create Label",
+    "createCustomField": "Create Field",
+    "createCustomFieldPopup-title": "Create Field",
+    "current": "current",
+    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
+    "custom-field-checkbox": "Checkbox",
+    "custom-field-date": "Date",
+    "custom-field-dropdown": "Dropdown List",
+    "custom-field-dropdown-none": "(none)",
+    "custom-field-dropdown-options": "List Options",
+    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
+    "custom-field-dropdown-unknown": "(unknown)",
+    "custom-field-number": "Number",
+    "custom-field-text": "Text",
+    "custom-fields": "Custom Fields",
+    "date": "Date",
+    "decline": "Decline",
+    "default-avatar": "Default avatar",
+    "delete": "Delete",
+    "deleteCustomFieldPopup-title": "Delete Custom Field?",
+    "deleteLabelPopup-title": "Delete Label?",
+    "description": "Description",
+    "disambiguateMultiLabelPopup-title": "Disambiguate Label Action",
+    "disambiguateMultiMemberPopup-title": "Disambiguate Member Action",
+    "discard": "Discard",
+    "done": "Done",
+    "download": "Download",
+    "edit": "Edit",
+    "edit-avatar": "Change Avatar",
+    "edit-profile": "Edit Profile",
+    "edit-wip-limit": "Edit WIP Limit",
+    "soft-wip-limit": "Soft WIP Limit",
+    "editCardStartDatePopup-title": "Change start date",
+    "editCardDueDatePopup-title": "Change due date",
+    "editCustomFieldPopup-title": "Edit Field",
+    "editCardSpentTimePopup-title": "Change spent time",
+    "editLabelPopup-title": "Change Label",
+    "editNotificationPopup-title": "Edit Notification",
+    "editProfilePopup-title": "Edit Profile",
+    "email": "Email",
+    "email-enrollAccount-subject": "An account created for you on __siteName__",
+    "email-enrollAccount-text": "Hello __user__,\n\nTo start using the service, simply click the link below.\n\n__url__\n\nThanks.",
+    "email-fail": "Sending email failed",
+    "email-fail-text": "Error trying to send email",
+    "email-invalid": "Invalid email",
+    "email-invite": "Invite via Email",
+    "email-invite-subject": "__inviter__ sent you an invitation",
+    "email-invite-text": "Dear __user__,\n\n__inviter__ invites you to join board \"__board__\" for collaborations.\n\nPlease follow the link below:\n\n__url__\n\nThanks.",
+    "email-resetPassword-subject": "Reset your password on __siteName__",
+    "email-resetPassword-text": "Hello __user__,\n\nTo reset your password, simply click the link below.\n\n__url__\n\nThanks.",
+    "email-sent": "Email sent",
+    "email-verifyEmail-subject": "Verify your email address on __siteName__",
+    "email-verifyEmail-text": "Hello __user__,\n\nTo verify your account email, simply click the link below.\n\n__url__\n\nThanks.",
+    "enable-wip-limit": "Enable WIP Limit",
+    "error-board-doesNotExist": "This board does not exist",
+    "error-board-notAdmin": "You need to be admin of this board to do that",
+    "error-board-notAMember": "You need to be a member of this board to do that",
+    "error-json-malformed": "Your text is not valid JSON",
+    "error-json-schema": "Your JSON data does not include the proper information in the correct format",
+    "error-list-doesNotExist": "This list does not exist",
+    "error-user-doesNotExist": "This user does not exist",
+    "error-user-notAllowSelf": "You can not invite yourself",
+    "error-user-notCreated": "This user is not created",
+    "error-username-taken": "This username is already taken",
+    "error-email-taken": "Email has already been taken",
+    "export-board": "Export board",
+    "filter": "Filter",
+    "filter-cards": "Filter Cards",
+    "filter-clear": "Clear filter",
+    "filter-no-label": "No label",
+    "filter-no-member": "No member",
+    "filter-no-custom-fields": "No Custom Fields",
+    "filter-on": "Filter is on",
+    "filter-on-desc": "You are filtering cards on this board. Click here to edit filter.",
+    "filter-to-selection": "Filter to selection",
+    "advanced-filter-label": "Advanced Filter",
+    "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) to be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
+    "fullname": "Full Name",
+    "header-logo-title": "Go back to your boards page.",
+    "hide-system-messages": "Hide system messages",
+    "headerBarCreateBoardPopup-title": "Create Board",
+    "home": "Home",
+    "import": "Import",
+    "link": "Link",
+    "import-board": "import board",
+    "import-board-c": "Import board",
+    "import-board-title-trello": "Import board from Trello",
+    "import-board-title-wekan": "Import board from previous export",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
+    "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
+    "from-trello": "From Trello",
+    "from-wekan": "From previous export",
+    "import-board-instruction-trello": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text.",
+    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
+    "import-json-placeholder": "Paste your valid JSON data here",
+    "import-map-members": "Map members",
+    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
+    "import-show-user-mapping": "Review members mapping",
+    "import-user-select": "Pick your existing user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select member",
+    "info": "Version",
+    "initials": "Initials",
+    "invalid-date": "Invalid date",
+    "invalid-time": "Invalid time",
+    "invalid-user": "Invalid user",
+    "joined": "joined",
+    "just-invited": "You are just invited to this board",
+    "keyboard-shortcuts": "Keyboard shortcuts",
+    "label-create": "Create Label",
+    "label-default": "%s label (default)",
+    "label-delete-pop": "There is no undo. This will remove this label from all cards and destroy its history.",
+    "labels": "Labels",
+    "language": "Language",
+    "last-admin-desc": "You can’t change roles because there must be at least one admin.",
+    "leave-board": "Leave Board",
+    "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
+    "leaveBoardPopup-title": "Leave Board ?",
+    "link-card": "Link to this card",
+    "list-archive-cards": "Move all cards in this list to Archive",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
+    "list-move-cards": "Move all cards in this list",
+    "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
+    "listActionPopup-title": "List Actions",
+    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
+    "listImportCardPopup-title": "Import a Trello card",
+    "listMorePopup-title": "More",
+    "link-list": "Link to this list",
+    "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
+    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
+    "lists": "Lists",
+    "swimlanes": "Swimlanes",
+    "log-out": "Log Out",
+    "log-in": "登入",
+    "loginPopup-title": "登入",
+    "memberMenuPopup-title": "Member Settings",
+    "members": "Members",
+    "menu": "Menu",
+    "move-selection": "Move selection",
+    "moveCardPopup-title": "Move Card",
+    "moveCardToBottom-title": "Move to Bottom",
+    "moveCardToTop-title": "Move to Top",
+    "moveSelectionPopup-title": "Move selection",
+    "multi-selection": "Multi-Selection",
+    "multi-selection-on": "Multi-Selection is on",
+    "muted": "Muted",
+    "muted-info": "You will never be notified of any changes in this board",
+    "my-boards": "My Boards",
+    "name": "Name",
+    "no-archived-cards": "No cards in Archive.",
+    "no-archived-lists": "No lists in Archive.",
+    "no-archived-swimlanes": "No swimlanes in Archive.",
+    "no-results": "No results",
+    "normal": "Normal",
+    "normal-desc": "Can view and edit cards. Can't change settings.",
+    "not-accepted-yet": "Invitation not accepted yet",
+    "notify-participate": "Receive updates to any cards you participate as creater or member",
+    "notify-watch": "Receive updates to any boards, lists, or cards you’re watching",
+    "optional": "optional",
+    "or": "or",
+    "page-maybe-private": "This page may be private. You may be able to view it by <a href='%s'>logging in</a>.",
+    "page-not-found": "Page not found.",
+    "password": "Password",
+    "paste-or-dragdrop": "to paste, or drag & drop image file to it (image only)",
+    "participating": "Participating",
+    "preview": "Preview",
+    "previewAttachedImagePopup-title": "Preview",
+    "previewClipboardImagePopup-title": "Preview",
+    "private": "Private",
+    "private-desc": "This board is private. Only people added to the board can view and edit it.",
+    "profile": "Profile",
+    "public": "Public",
+    "public-desc": "This board is public. It's visible to anyone with the link and will show up in search engines like Google. Only people added to the board can edit.",
+    "quick-access-description": "Star a board to add a shortcut in this bar.",
+    "remove-cover": "Remove Cover",
+    "remove-from-board": "Remove from Board",
+    "remove-label": "Remove Label",
+    "listDeletePopup-title": "Delete List ?",
+    "remove-member": "Remove Member",
+    "remove-member-from-card": "Remove from Card",
+    "remove-member-pop": "Remove __name__ (__username__) from __boardTitle__? The member will be removed from all cards on this board. They will receive a notification.",
+    "removeMemberPopup-title": "Remove Member?",
+    "rename": "Rename",
+    "rename-board": "Rename Board",
+    "restore": "Restore",
+    "save": "儲存",
+    "search": "Search",
+    "rules": "Rules",
+    "search-cards": "Search from card titles and descriptions on this board",
+    "search-example": "Text to search for?",
+    "select-color": "Select Color",
+    "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
+    "setWipLimitPopup-title": "Set WIP Limit",
+    "shortcut-assign-self": "Assign yourself to current card",
+    "shortcut-autocomplete-emoji": "Autocomplete emoji",
+    "shortcut-autocomplete-members": "Autocomplete members",
+    "shortcut-clear-filters": "Clear all filters",
+    "shortcut-close-dialog": "Close Dialog",
+    "shortcut-filter-my-cards": "Filter my cards",
+    "shortcut-show-shortcuts": "Bring up this shortcuts list",
+    "shortcut-toggle-filterbar": "Toggle Filter Sidebar",
+    "shortcut-toggle-sidebar": "Toggle Board Sidebar",
+    "show-cards-minimum-count": "Show cards count if list contains more than",
+    "sidebar-open": "Open Sidebar",
+    "sidebar-close": "Close Sidebar",
+    "signupPopup-title": "Create an Account",
+    "star-board-title": "Click to star this board. It will show up at top of your boards list.",
+    "starred-boards": "Starred Boards",
+    "starred-boards-description": "Starred boards show up at the top of your boards list.",
+    "subscribe": "Subscribe",
+    "team": "Team",
+    "this-board": "this board",
+    "this-card": "this card",
+    "spent-time-hours": "Spent time (hours)",
+    "overtime-hours": "Overtime (hours)",
+    "overtime": "Overtime",
+    "has-overtime-cards": "Has overtime cards",
+    "has-spenttime-cards": "Has spent time cards",
+    "time": "Time",
+    "title": "Title",
+    "tracking": "Tracking",
+    "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
+    "type": "Type",
+    "unassign-member": "Unassign member",
+    "unsaved-description": "You have an unsaved description.",
+    "unwatch": "Unwatch",
+    "upload": "Upload",
+    "upload-avatar": "Upload an avatar",
+    "uploaded-avatar": "Uploaded an avatar",
+    "username": "Username",
+    "view-it": "View it",
+    "warn-list-archived": "warning: this card is in an list at Archive",
+    "watch": "Watch",
+    "watching": "Watching",
+    "watching-info": "You will be notified of any change in this board",
+    "welcome-board": "Welcome Board",
+    "welcome-swimlane": "Milestone 1",
+    "welcome-list1": "Basics",
+    "welcome-list2": "Advanced",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
+    "what-to-do": "What do you want to do?",
+    "wipLimitErrorPopup-title": "Invalid WIP Limit",
+    "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
+    "wipLimitErrorPopup-dialog-pt2": "Please move some tasks out of this list, or set a higher WIP limit.",
+    "admin-panel": "Admin Panel",
+    "settings": "Settings",
+    "people": "People",
+    "registration": "Registration",
+    "disable-self-registration": "Disable Self-Registration",
+    "invite": "Invite",
+    "invite-people": "Invite People",
+    "to-boards": "To board(s)",
+    "email-addresses": "Email Addresses",
+    "smtp-host-description": "The address of the SMTP server that handles your emails.",
+    "smtp-port-description": "The port your SMTP server uses for outgoing emails.",
+    "smtp-tls-description": "Enable TLS support for SMTP server",
+    "smtp-host": "SMTP Host",
+    "smtp-port": "SMTP Port",
+    "smtp-username": "Username",
+    "smtp-password": "Password",
+    "smtp-tls": "TLS support",
+    "send-from": "From",
+    "send-smtp-test": "Send a test email to yourself",
+    "invitation-code": "Invitation Code",
+    "email-invite-register-subject": "__inviter__ sent you an invitation",
+    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email",
+    "email-smtp-test-text": "You have successfully sent an email",
+    "error-invitation-code-not-exist": "Invitation code doesn't exist",
+    "error-notAuthorized": "You are not authorized to view this page.",
+    "outgoing-webhooks": "Outgoing Webhooks",
+    "outgoingWebhooksPopup-title": "Outgoing Webhooks",
+    "boardCardTitlePopup-title": "Card Title Filter",
+    "new-outgoing-webhook": "New Outgoing Webhook",
+    "no-name": "(Unknown)",
+    "Node_version": "Node version",
+    "OS_Arch": "OS Arch",
+    "OS_Cpus": "OS CPU Count",
+    "OS_Freemem": "OS Free Memory",
+    "OS_Loadavg": "OS Load Average",
+    "OS_Platform": "OS Platform",
+    "OS_Release": "OS Release",
+    "OS_Totalmem": "OS Total Memory",
+    "OS_Type": "OS Type",
+    "OS_Uptime": "OS Uptime",
+    "days": "days",
+    "hours": "hours",
+    "minutes": "minutes",
+    "seconds": "seconds",
+    "show-field-on-card": "Show this field on card",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
+    "yes": "Yes",
+    "no": "No",
+    "accounts": "Accounts",
+    "accounts-allowEmailChange": "Allow Email Change",
+    "accounts-allowUserNameChange": "Allow Username Change",
+    "createdAt": "Created at",
+    "verified": "Verified",
+    "active": "Active",
+    "card-received": "Received",
+    "card-received-on": "Received on",
+    "card-end": "End",
+    "card-end-on": "Ends on",
+    "editCardReceivedDatePopup-title": "Change received date",
+    "editCardEndDatePopup-title": "Change end date",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "Assigned By",
+    "requested-by": "Requested By",
+    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
+    "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
+    "boardDeletePopup-title": "Delete Board?",
+    "delete-board": "Delete Board",
+    "default-subtasks-board": "Subtasks for __board__ board",
+    "default": "Default",
+    "queue": "Queue",
+    "subtask-settings": "Subtasks Settings",
+    "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
+    "show-subtasks-field": "Cards can have subtasks",
+    "deposit-subtasks-board": "Deposit subtasks to this board:",
+    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
+    "show-parent-in-minicard": "Show parent in minicard:",
+    "prefix-with-full-path": "Prefix with full path",
+    "prefix-with-parent": "Prefix with parent",
+    "subtext-with-full-path": "Subtext with full path",
+    "subtext-with-parent": "Subtext with parent",
+    "change-card-parent": "Change card's parent",
+    "parent-card": "Parent card",
+    "source-board": "Source board",
+    "no-parent": "Don't show parent",
+    "activity-added-label": "added label '%s' to %s",
+    "activity-removed-label": "removed label '%s' from %s",
+    "activity-delete-attach": "deleted an attachment from %s",
+    "activity-added-label-card": "added label '%s'",
+    "activity-removed-label-card": "removed label '%s'",
+    "activity-delete-attach-card": "deleted an attachment",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "r-rule": "Rule",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "Add action",
+    "r-board-rules": "Board rules",
+    "r-add-rule": "Add rule",
+    "r-view-rule": "View rule",
+    "r-delete-rule": "Delete rule",
+    "r-new-rule-name": "New rule title",
+    "r-no-rules": "No rules",
+    "r-when-a-card": "When a card",
+    "r-is": "is",
+    "r-is-moved": "is moved",
+    "r-added-to": "added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "the board",
+    "r-list": "list",
+    "set-filter": "Set Filter",
+    "r-moved-to": "Moved to",
+    "r-moved-from": "Moved from",
+    "r-archived": "Moved to Archive",
+    "r-unarchived": "Restored from Archive",
+    "r-a-card": "a card",
+    "r-when-a-label-is": "When a label is",
+    "r-when-the-label-is": "When the label is",
+    "r-list-name": "list name",
+    "r-when-a-member": "When a member is",
+    "r-when-the-member": "When the member",
+    "r-name": "name",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "r-when-the-item": "When the checklist item",
+    "r-checked": "Checked",
+    "r-unchecked": "Unchecked",
+    "r-move-card-to": "Move card to",
+    "r-top-of": "Top of",
+    "r-bottom-of": "Bottom of",
+    "r-its-list": "its list",
+    "r-archive": "Move to Archive",
+    "r-unarchive": "Restore from Archive",
+    "r-card": "card",
+    "r-add": "Add",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-set-color": "Set color to",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "subject",
+    "r-rule-details": "Rule details",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Move card to top of list",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Move card to bottom of list",
+    "r-d-send-email": "Send email",
+    "r-d-send-email-to": "to",
+    "r-d-send-email-subject": "subject",
+    "r-d-send-email-message": "message",
+    "r-d-archive": "Move card to Archive",
+    "r-d-unarchive": "Restore card from Archive",
+    "r-d-add-label": "Add label",
+    "r-d-remove-label": "Remove label",
+    "r-create-card": "Create new card",
+    "r-in-list": "in list",
+    "r-in-swimlane": "in swimlane",
+    "r-d-add-member": "Add member",
+    "r-d-remove-member": "Remove member",
+    "r-d-remove-all-member": "Remove all member",
+    "r-d-check-all": "Check all items of a list",
+    "r-d-uncheck-all": "Uncheck all items of a list",
+    "r-d-check-one": "Check item",
+    "r-d-uncheck-one": "Uncheck item",
+    "r-d-check-of-list": "of checklist",
+    "r-d-add-checklist": "Add checklist",
+    "r-d-remove-checklist": "Remove checklist",
+    "r-by": "by",
+    "r-add-checklist": "Add checklist",
+    "r-with-items": "with items",
+    "r-items-list": "item1,item2,item3",
+    "r-add-swimlane": "Add swimlane",
+    "r-swimlane-name": "swimlane name",
+    "r-board-note": "Note: leave a field empty to match every possible value.",
+    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout",
+    "hide-logo": "Hide Logo",
+    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
+    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
+    "error-undefined": "Something went wrong",
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
+}
\ No newline at end of file
diff --git a/i18n/zh-TW.i18n.json b/i18n/zh-TW.i18n.json
index fa658a5e..e525cf07 100644
--- a/i18n/zh-TW.i18n.json
+++ b/i18n/zh-TW.i18n.json
@@ -1,177 +1,253 @@
 {
     "accept": "接受",
-    "act-activity-notify": "[Wekan] 活動通知",
-    "act-addAttachment": "新增附件__attachment__至__card__",
-    "act-addChecklist": "added checklist __checklist__ to __card__",
-    "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__",
-    "act-addComment": "評論__card__: __comment__",
-    "act-createBoard": "完成新增 __board__",
-    "act-createCard": "將__card__加入__list__",
-    "act-createList": "新增__list__至__board__",
-    "act-addBoardMember": "在__board__中新增成員__member__",
-    "act-archivedBoard": "__board__ moved to Recycle Bin",
-    "act-archivedCard": "__card__ moved to Recycle Bin",
-    "act-archivedList": "__list__ moved to Recycle Bin",
-    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
-    "act-importBoard": "匯入__board__",
-    "act-importCard": "匯入__card__",
-    "act-importList": "匯入__list__",
-    "act-joinMember": "在__card__中新增成員__member__",
-    "act-moveCard": "將__card__從__oldList__移動至__list__",
-    "act-removeBoardMember": "從__board__中移除成員__member__",
-    "act-restoredCard": "將__card__回復至__board__",
-    "act-unjoinMember": "從__card__中移除成員__member__",
-    "act-withBoardTitle": "[Wekan] __board__",
+    "act-activity-notify": "活動通知",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__board__",
     "act-withCardTitle": "[__board__] __card__",
     "actions": "操作",
     "activities": "活動",
     "activity": "活動",
-    "activity-added": "新增 %s 至 %s",
-    "activity-archived": "%s moved to Recycle Bin",
-    "activity-attached": "新增附件 %s 至 %s",
+    "activity-added": "新增 %s 到 %s",
+    "activity-archived": "%s 已被移到封存",
+    "activity-attached": "已新增附件 %s 到 %s",
     "activity-created": "建立 %s",
+    "activity-customfield-created": "已建立的自訂欄位 %s",
     "activity-excluded": "排除 %s 從 %s",
-    "activity-imported": "匯入 %s 至 %s 從 %s 中",
+    "activity-imported": "匯入 %s 到 %s 從 %s 中",
     "activity-imported-board": "已匯入 %s 從 %s 中",
-    "activity-joined": "關聯 %s",
-    "activity-moved": "將 %s 從 %s 移動到 %s",
+    "activity-joined": "已關聯 %s",
+    "activity-moved": "將 %s 從 %s 移到 %s",
     "activity-on": "在 %s",
-    "activity-removed": "移除 %s 從 %s 中",
-    "activity-sent": "寄送 %s 至 %s",
-    "activity-unjoined": "解除關聯 %s",
-    "activity-checklist-added": "新增待辦清單至 %s",
+    "activity-removed": "已移除 %s 從 %s 中",
+    "activity-sent": "已寄送 %s 到 %s",
+    "activity-unjoined": "已解除關聯 %s",
+    "activity-subtask-added": "已新增子任務到 %s",
+    "activity-checked-item": "checked %s in checklist %s of %s",
+    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
+    "activity-checklist-added": "已新增待辦清單到 %s",
+    "activity-checklist-removed": "removed a checklist from %s",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
     "activity-checklist-item-added": "新增待辦清單項目從 %s 到 %s",
+    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
     "add": "新增",
+    "activity-checked-item-card": "checked %s in checklist %s",
+    "activity-unchecked-item-card": "unchecked %s in checklist %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
     "add-attachment": "新增附件",
     "add-board": "新增看板",
     "add-card": "新增卡片",
-    "add-swimlane": "Add Swimlane",
+    "add-swimlane": "新增泳道圖",
+    "add-subtask": "新增子任務",
     "add-checklist": "新增待辦清單",
     "add-checklist-item": "新增項目",
     "add-cover": "新增封面",
     "add-label": "新增標籤",
     "add-list": "新增清單",
     "add-members": "新增成員",
-    "added": "新增",
+    "added": "已新增",
     "addMemberPopup-title": "成員",
     "admin": "管理員",
     "admin-desc": "可以瀏覽並編輯卡片，移除成員，並且更改該看板的設定",
-    "admin-announcement": "Announcement",
-    "admin-announcement-active": "Active System-Wide Announcement",
-    "admin-announcement-title": "Announcement from Administrator",
+    "admin-announcement": "公告",
+    "admin-announcement-active": "啟用全系統範圍公告",
+    "admin-announcement-title": "來自 Administrator 的公告",
     "all-boards": "全部看板",
     "and-n-other-card": "和其他 __count__ 個卡片",
     "and-n-other-card_plural": "和其他 __count__ 個卡片",
     "apply": "送出",
-    "app-is-offline": "請稍候，資料讀取中，重整頁面可能會導致資料遺失。如果一直讀取，請檢查 Wekan 的伺服器是否正確運行。",
-    "archive": "Move to Recycle Bin",
-    "archive-all": "Move All to Recycle Bin",
-    "archive-board": "Move Board to Recycle Bin",
-    "archive-card": "Move Card to Recycle Bin",
-    "archive-list": "Move List to Recycle Bin",
-    "archive-swimlane": "Move Swimlane to Recycle Bin",
-    "archive-selection": "Move selection to Recycle Bin",
-    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
-    "archived-items": "Recycle Bin",
-    "archived-boards": "Boards in Recycle Bin",
+    "app-is-offline": "請稍候，資料讀取中，重整頁面可能會導致資料遺失。如果讀取一直沒有進度, 請檢查伺服器是否還在運行。",
+    "archive": "移到封存",
+    "archive-all": "全部移到封存",
+    "archive-board": "將看板移到封存",
+    "archive-card": "將卡片移到封存",
+    "archive-list": "將清單移到封存",
+    "archive-swimlane": "將泳道圖移到封存",
+    "archive-selection": "將選取內容移到封存",
+    "archiveBoardPopup-title": "將看板移到封存？",
+    "archived-items": "封存",
+    "archived-boards": "封存中的看板",
     "restore-board": "還原看板",
-    "no-archived-boards": "No Boards in Recycle Bin.",
-    "archives": "Recycle Bin",
+    "no-archived-boards": "封存中沒有看板。",
+    "archives": "封存",
+    "template": "Template",
+    "templates": "Templates",
     "assign-member": "分配成員",
     "attached": "附加",
     "attachment": "附件",
     "attachment-delete-pop": "刪除附件的操作無法還原。",
     "attachmentDeletePopup-title": "刪除附件？",
     "attachments": "附件",
-    "auto-watch": "新增看板時自動加入觀察",
-    "avatar-too-big": "頭像檔案太大 (最大 70 KB)",
+    "auto-watch": "新增看板時自動加入觀看",
+    "avatar-too-big": "頭像檔案太大（最大 70 KB）",
     "back": "返回",
-    "board-change-color": "更改顏色",
+    "board-change-color": "更換顏色",
     "board-nb-stars": "%s 星號標記",
     "board-not-found": "看板不存在",
-    "board-private-info": "該看板將被設為 <strong>私有</strong>.",
-    "board-public-info": "該看板將被設為 <strong>公開</strong>.",
-    "boardChangeColorPopup-title": "修改看板背景",
+    "board-private-info": "此看板將被設為 <strong>私密</strong>.",
+    "board-public-info": "此看板將被設為 <strong>公開</strong>.",
+    "boardChangeColorPopup-title": "更換看板背景",
     "boardChangeTitlePopup-title": "重新命名看板",
-    "boardChangeVisibilityPopup-title": "更改可視級別",
+    "boardChangeVisibilityPopup-title": "改變觀看權限",
     "boardChangeWatchPopup-title": "更改觀察",
-    "boardMenuPopup-title": "看板選單",
+    "boardMenuPopup-title": "Board Settings",
     "boards": "看板",
-    "board-view": "Board View",
-    "board-view-swimlanes": "Swimlanes",
+    "board-view": "看板視圖",
+    "board-view-cal": "行事曆",
+    "board-view-swimlanes": "泳道圖",
     "board-view-lists": "清單",
-    "bucket-example": "例如 “目標清單”",
+    "bucket-example": "例如「目標清單」",
     "cancel": "取消",
-    "card-archived": "This card is moved to Recycle Bin.",
+    "card-archived": "此卡片已移到封存。",
+    "board-archived": "此看板已移到封存。",
     "card-comments-title": "該卡片有 %s 則評論",
-    "card-delete-notice": "徹底刪除的操作不可復原，你將會遺失該卡片相關的所有操作記錄。",
-    "card-delete-pop": "所有的動作將從活動動態中被移除且您將無法重新打開該卡片。此操作無法復原。",
-    "card-delete-suggest-archive": "You can move a card Recycle Bin to remove it from the board and preserve the activity.",
-    "card-due": "到期",
-    "card-due-on": "到期",
-    "card-spent": "Spent Time",
+    "card-delete-notice": "刪除是永久性的，您將遺失該卡片的所有相關操作記錄。",
+    "card-delete-pop": "所有活動中的內容都將被刪除，此操作無法撤消，您將無法重新開啟此卡片。",
+    "card-delete-suggest-archive": "您可以將卡片移到封存來將卡片從看板上移除，並且保留其中的活動。",
+    "card-due": "期限",
+    "card-due-on": "期限日",
+    "card-spent": "耗費時間",
     "card-edit-attachments": "編輯附件",
+    "card-edit-custom-fields": "編輯自訂欄位",
     "card-edit-labels": "編輯標籤",
     "card-edit-members": "編輯成員",
     "card-labels-title": "更改該卡片上的標籤",
     "card-members-title": "在該卡片中新增或移除看板成員",
     "card-start": "開始",
-    "card-start-on": "開始",
+    "card-start-on": "開始日",
     "cardAttachmentsPopup-title": "附件來源",
-    "cardDeletePopup-title": "徹底刪除卡片？",
+    "cardCustomField-datePopup-title": "更改日期",
+    "cardCustomFieldsPopup-title": "編輯自訂欄位",
+    "cardDeletePopup-title": "刪除卡片？",
     "cardDetailsActionsPopup-title": "卡片動作",
     "cardLabelsPopup-title": "標籤",
     "cardMembersPopup-title": "成員",
     "cardMorePopup-title": "更多",
+    "cardTemplatePopup-title": "Create template",
     "cards": "卡片",
     "cards-count": "卡片",
+    "casSignIn": "以 CAS 登入",
+    "cardType-card": "卡片",
+    "cardType-linkedCard": "已連結卡片",
+    "cardType-linkedBoard": "已連結看板",
     "change": "變更",
-    "change-avatar": "更改大頭貼",
-    "change-password": "更改密碼",
+    "change-avatar": "更換大頭貼",
+    "change-password": "變更密碼",
     "change-permissions": "更改許可權",
     "change-settings": "更改設定",
-    "changeAvatarPopup-title": "更改大頭貼",
+    "changeAvatarPopup-title": "更換大頭貼",
     "changeLanguagePopup-title": "更改語言",
-    "changePasswordPopup-title": "更改密碼",
+    "changePasswordPopup-title": "變更密碼",
     "changePermissionsPopup-title": "更改許可權",
     "changeSettingsPopup-title": "更改設定",
+    "subtasks": "子任務",
     "checklists": "待辦清單",
-    "click-to-star": "點此來標記該看板",
-    "click-to-unstar": "點此來去除該看板的標記",
+    "click-to-star": "點擊以添加標記於此看板。",
+    "click-to-unstar": "點擊以移除標記於此看板。",
     "clipboard": "剪貼簿貼上或者拖曳檔案",
     "close": "關閉",
     "close-board": "關閉看板",
-    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
+    "close-board-pop": "您可以通過點擊主頁眉中的「封存」按鈕來恢復看板。",
     "color-black": "黑色",
     "color-blue": "藍色",
+    "color-crimson": "艷紅",
+    "color-darkgreen": "暗綠",
+    "color-gold": "金色",
+    "color-gray": "灰色",
     "color-green": "綠色",
+    "color-indigo": "紫藍",
     "color-lime": "綠黃",
+    "color-magenta": "洋紅",
+    "color-mistyrose": "玫瑰粉",
+    "color-navy": "藏青",
     "color-orange": "橙色",
+    "color-paleturquoise": "淡藍綠",
+    "color-peachpuff": "桃色",
     "color-pink": "粉紅",
+    "color-plum": "梅色",
     "color-purple": "紫色",
     "color-red": "紅色",
+    "color-saddlebrown": "馬鞍棕",
+    "color-silver": "銀色",
     "color-sky": "天藍",
+    "color-slateblue": "青藍",
+    "color-white": "白色",
     "color-yellow": "黃色",
-    "comment": "留言",
-    "comment-placeholder": "新增評論",
-    "comment-only": "只可以發表評論",
-    "comment-only-desc": "只可以對卡片發表評論",
+    "unset-color": "未設置",
+    "comment": "評論",
+    "comment-placeholder": "撰寫評論",
+    "comment-only": "只能發表評論",
+    "comment-only-desc": "只能在卡片上發表評論",
+    "no-comments": "沒有評論",
+    "no-comments-desc": "無法檢視評論和活動。",
     "computer": "從本機上傳",
-    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist",
-    "copy-card-link-to-clipboard": "將卡片連結複製到剪貼板",
-    "copyCardPopup-title": "Copy Card",
-    "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
-    "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
-    "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"First card title\", \"description\":\"First card description\"}, {\"title\":\"Second card title\",\"description\":\"Second card description\"},{\"title\":\"Last card title\",\"description\":\"Last card description\"} ]",
+    "confirm-subtask-delete-dialog": "你確定要刪除子任務嗎？",
+    "confirm-checklist-delete-dialog": "你確定要刪除待辦清單嗎？",
+    "copy-card-link-to-clipboard": "將卡片連結複製到剪貼簿",
+    "linkCardPopup-title": "連結卡片",
+    "searchElementPopup-title": "搜尋",
+    "copyCardPopup-title": "複製卡片",
+    "copyChecklistToManyCardsPopup-title": "複製待辦清單的樣板到多個卡片",
+    "copyChecklistToManyCardsPopup-instructions": "使用此 JSON 格式來表示目標卡片的標題和描述",
+    "copyChecklistToManyCardsPopup-format": "[ {\\\"title\\\": \\\"第一個卡片標題\\\", \\\"description\\\":\\\"第一個卡片描述\\\"}, {\\\"title\\\":\\\"第二個卡片標題\\\",\\\"description\\\":\\\"第二個卡片描述\\\"},{\\\"title\\\":\\\"最後一個卡片標題\\\",\\\"description\\\":\\\"最後一個卡片描述\\\"} ]",
     "create": "建立",
     "createBoardPopup-title": "建立看板",
     "chooseBoardSourcePopup-title": "匯入看板",
     "createLabelPopup-title": "建立標籤",
+    "createCustomField": "建立欄位",
+    "createCustomFieldPopup-title": "建立欄位",
     "current": "目前",
+    "custom-field-delete-pop": "此操作將會從所有卡片中移除自訂欄位以及銷毀歷史紀錄，並且無法撤消。",
+    "custom-field-checkbox": "複選框",
+    "custom-field-date": "日期",
+    "custom-field-dropdown": "下拉式選單",
+    "custom-field-dropdown-none": "（無）",
+    "custom-field-dropdown-options": "清單選項",
+    "custom-field-dropdown-options-placeholder": "按下 Enter 新增更多選項",
+    "custom-field-dropdown-unknown": "（未知）",
+    "custom-field-number": "數字",
+    "custom-field-text": "文字",
+    "custom-fields": "自訂欄位",
     "date": "日期",
     "decline": "拒絕",
     "default-avatar": "預設大頭貼",
     "delete": "刪除",
+    "deleteCustomFieldPopup-title": "刪除自訂欄位？",
     "deleteLabelPopup-title": "刪除標籤？",
     "description": "描述",
     "disambiguateMultiLabelPopup-title": "清除標籤動作歧義",
@@ -180,21 +256,22 @@
     "done": "完成",
     "download": "下載",
     "edit": "編輯",
-    "edit-avatar": "更改大頭貼",
-    "edit-profile": "編輯資料",
-    "edit-wip-limit": "Edit WIP Limit",
-    "soft-wip-limit": "Soft WIP Limit",
-    "editCardStartDatePopup-title": "更改開始日期",
-    "editCardDueDatePopup-title": "更改到期日期",
-    "editCardSpentTimePopup-title": "Change spent time",
+    "edit-avatar": "更換大頭貼",
+    "edit-profile": "編輯個人資料",
+    "edit-wip-limit": "編輯 WIP 限制",
+    "soft-wip-limit": "軟性 WIP 限制",
+    "editCardStartDatePopup-title": "變更開始日期",
+    "editCardDueDatePopup-title": "變更到期日期",
+    "editCustomFieldPopup-title": "編輯欄位",
+    "editCardSpentTimePopup-title": "變更耗費時間",
     "editLabelPopup-title": "更改標籤",
     "editNotificationPopup-title": "更改通知",
-    "editProfilePopup-title": "編輯資料",
+    "editProfilePopup-title": "編輯個人資料",
     "email": "電子郵件",
     "email-enrollAccount-subject": "您在 __siteName__ 的帳號已經建立",
     "email-enrollAccount-text": "親愛的 __user__,\n\n點選下面的連結，即刻開始使用這項服務。\n\n__url__\n\n謝謝。",
     "email-fail": "郵件寄送失敗",
-    "email-fail-text": "Error trying to send email",
+    "email-fail-text": "嘗試發送郵件時出現錯誤",
     "email-invalid": "電子郵件地址錯誤",
     "email-invite": "寄送郵件邀請",
     "email-invite-subject": "__inviter__ 向您發出邀請",
@@ -216,36 +293,42 @@
     "error-user-notCreated": "該使用者未能成功建立",
     "error-username-taken": "這個使用者名稱已被使用",
     "error-email-taken": "電子信箱已被使用",
-    "export-board": "Export board",
-    "filter": "過濾",
-    "filter-cards": "過濾卡片",
-    "filter-clear": "清空過濾條件",
+    "export-board": "匯出看板",
+    "filter": "篩選",
+    "filter-cards": "篩選卡片",
+    "filter-clear": "清除篩選條件",
     "filter-no-label": "沒有標籤",
     "filter-no-member": "沒有成員",
-    "filter-on": "過濾條件啟用",
-    "filter-on-desc": "你正在過濾該看板上的卡片，點此編輯過濾條件。",
-    "filter-to-selection": "要選擇的過濾條件",
+    "filter-no-custom-fields": "沒有自訂欄位",
+    "filter-on": "篩選器已開啟",
+    "filter-on-desc": "你正在篩選該看板上的卡片，點此編輯篩選條件。",
+    "filter-to-selection": "選擇的篩選條件",
+    "advanced-filter-label": "進階篩選",
+    "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) to be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
     "fullname": "全稱",
     "header-logo-title": "返回您的看板頁面",
     "hide-system-messages": "隱藏系統訊息",
     "headerBarCreateBoardPopup-title": "建立看板",
     "home": "首頁",
     "import": "匯入",
+    "link": "Link",
     "import-board": "匯入看板",
     "import-board-c": "匯入看板",
     "import-board-title-trello": "匯入在 Trello 的看板",
-    "import-board-title-wekan": "從 Wekan 匯入看板",
+    "import-board-title-wekan": "Import board from previous export",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
     "import-sandstorm-warning": "匯入資料將會移除所有現有的看版資料，並取代成此次匯入的看板資料",
     "from-trello": "來自 Trello",
-    "from-wekan": "來自 Wekan",
+    "from-wekan": "From previous export",
     "import-board-instruction-trello": "在你的Trello看板中，點選“功能表”，然後選擇“更多”，“列印與匯出”，“匯出為 JSON” 並拷貝結果文本",
-    "import-board-instruction-wekan": "在 Wekan 看板中點選“功能表”，然後選擇“匯出看版”且複製文字到下載的檔案",
+    "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
     "import-json-placeholder": "貼上您有效的 JSON 資料至此",
     "import-map-members": "複製成員",
-    "import-members-map": "您匯入的看板有一些成員。請將您想匯入的成員映射到 Wekan 使用者。",
+    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
     "import-show-user-mapping": "核對成員映射",
-    "import-user-select": "選擇您想將此成員映射到的 Wekan 使用者",
-    "importMapMembersAddPopup-title": "選擇 Wekan 成員",
+    "import-user-select": "Pick your existing user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select member",
     "info": "版本",
     "initials": "縮寫",
     "invalid-date": "無效的日期",
@@ -264,19 +347,21 @@
     "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
     "leaveBoardPopup-title": "Leave Board ?",
     "link-card": "關聯至該卡片",
-    "list-archive-cards": "Move all cards in this list to Recycle Bin",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
+    "list-archive-cards": "Move all cards in this list to Archive",
+    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
     "list-move-cards": "移動清單中的所有卡片",
     "list-select-cards": "選擇清單中的所有卡片",
+    "set-color-list": "Set Color",
     "listActionPopup-title": "清單操作",
     "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
     "listImportCardPopup-title": "匯入 Trello 卡片",
     "listMorePopup-title": "更多",
     "link-list": "連結到這個清單",
     "list-delete-pop": "所有的動作將從活動動態中被移除且您將無法再開啟該清單\b。此操作無法復原。",
-    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
     "lists": "清單",
-    "swimlanes": "Swimlanes",
+    "swimlanes": "泳道圖",
     "log-out": "登出",
     "log-in": "登入",
     "loginPopup-title": "登入",
@@ -294,9 +379,9 @@
     "muted-info": "您將不會收到有關這個看板的任何訊息",
     "my-boards": "我的看板",
     "name": "名稱",
-    "no-archived-cards": "No cards in Recycle Bin.",
-    "no-archived-lists": "No lists in Recycle Bin.",
-    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
+    "no-archived-cards": "No cards in Archive.",
+    "no-archived-lists": "No lists in Archive.",
+    "no-archived-swimlanes": "No swimlanes in Archive.",
     "no-results": "無結果",
     "normal": "普通",
     "normal-desc": "可以建立以及編輯卡片，無法更改。",
@@ -332,6 +417,7 @@
     "restore": "還原",
     "save": "儲存",
     "search": "搜尋",
+    "rules": "Rules",
     "search-cards": "Search from card titles and descriptions on this board",
     "search-example": "Text to search for?",
     "select-color": "選擇顏色",
@@ -366,6 +452,7 @@
     "title": "標題",
     "tracking": "追蹤",
     "tracking-info": "你將會收到與你有關的卡片的所有變更通知",
+    "type": "Type",
     "unassign-member": "取消分配成員",
     "unsaved-description": "未儲存的描述",
     "unwatch": "取消觀察",
@@ -374,7 +461,7 @@
     "uploaded-avatar": "大頭貼已經上傳",
     "username": "使用者名稱",
     "view-it": "檢視",
-    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
+    "warn-list-archived": "warning: this card is in an list at Archive",
     "watch": "觀察",
     "watching": "觀察中",
     "watching-info": "你將會收到關於這個看板所有的變更通知",
@@ -382,6 +469,9 @@
     "welcome-swimlane": "Milestone 1",
     "welcome-list1": "基本",
     "welcome-list2": "進階",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
     "what-to-do": "要做什麼？",
     "wipLimitErrorPopup-title": "Invalid WIP Limit",
     "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
@@ -407,16 +497,16 @@
     "send-smtp-test": "Send a test email to yourself",
     "invitation-code": "邀請碼",
     "email-invite-register-subject": "__inviter__ 向您發出邀請",
-    "email-invite-register-text": "親愛的 __user__,\n\n__inviter__ 邀請您加入 Wekan 一同協作\n\n請點擊下列連結：\n__url__\n\n您的邀請碼為：__icode__\n\n謝謝。",
-    "email-smtp-test-subject": "SMTP Test Email From Wekan",
+    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email",
     "email-smtp-test-text": "You have successfully sent an email",
     "error-invitation-code-not-exist": "邀請碼不存在",
     "error-notAuthorized": "沒有適合的權限觀看",
     "outgoing-webhooks": "設定 Webhooks",
     "outgoingWebhooksPopup-title": "設定 Webhooks",
+    "boardCardTitlePopup-title": "Card Title Filter",
     "new-outgoing-webhook": "New Outgoing Webhook",
     "no-name": "(Unknown)",
-    "Wekan_version": "Wekan 版本",
     "Node_version": "Node 版本",
     "OS_Arch": "系統架構",
     "OS_Cpus": "系統\b CPU 數",
@@ -427,13 +517,18 @@
     "OS_Totalmem": "系統總記憶體",
     "OS_Type": "系統類型",
     "OS_Uptime": "系統運行時間",
+    "days": "days",
     "hours": "小時",
     "minutes": "分鐘",
     "seconds": "秒",
+    "show-field-on-card": "Show this field on card",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
     "yes": "是",
     "no": "否",
     "accounts": "帳號",
     "accounts-allowEmailChange": "准許變更電子信箱",
+    "accounts-allowUserNameChange": "Allow Username Change",
     "createdAt": "Created at",
     "verified": "Verified",
     "active": "Active",
@@ -442,5 +537,157 @@
     "card-end": "End",
     "card-end-on": "Ends on",
     "editCardReceivedDatePopup-title": "Change received date",
-    "editCardEndDatePopup-title": "Change end date"
-}
+    "editCardEndDatePopup-title": "Change end date",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "Assigned By",
+    "requested-by": "Requested By",
+    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
+    "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
+    "boardDeletePopup-title": "Delete Board?",
+    "delete-board": "Delete Board",
+    "default-subtasks-board": "Subtasks for __board__ board",
+    "default": "Default",
+    "queue": "Queue",
+    "subtask-settings": "Subtasks Settings",
+    "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
+    "show-subtasks-field": "Cards can have subtasks",
+    "deposit-subtasks-board": "Deposit subtasks to this board:",
+    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
+    "show-parent-in-minicard": "Show parent in minicard:",
+    "prefix-with-full-path": "Prefix with full path",
+    "prefix-with-parent": "Prefix with parent",
+    "subtext-with-full-path": "Subtext with full path",
+    "subtext-with-parent": "Subtext with parent",
+    "change-card-parent": "Change card's parent",
+    "parent-card": "Parent card",
+    "source-board": "Source board",
+    "no-parent": "Don't show parent",
+    "activity-added-label": "added label '%s' to %s",
+    "activity-removed-label": "removed label '%s' from %s",
+    "activity-delete-attach": "deleted an attachment from %s",
+    "activity-added-label-card": "added label '%s'",
+    "activity-removed-label-card": "removed label '%s'",
+    "activity-delete-attach-card": "deleted an attachment",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "r-rule": "Rule",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "Add action",
+    "r-board-rules": "Board rules",
+    "r-add-rule": "Add rule",
+    "r-view-rule": "View rule",
+    "r-delete-rule": "Delete rule",
+    "r-new-rule-name": "New rule title",
+    "r-no-rules": "No rules",
+    "r-when-a-card": "When a card",
+    "r-is": "is",
+    "r-is-moved": "is moved",
+    "r-added-to": "added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "the board",
+    "r-list": "list",
+    "set-filter": "Set Filter",
+    "r-moved-to": "Moved to",
+    "r-moved-from": "Moved from",
+    "r-archived": "Moved to Archive",
+    "r-unarchived": "Restored from Archive",
+    "r-a-card": "a card",
+    "r-when-a-label-is": "When a label is",
+    "r-when-the-label-is": "When the label is",
+    "r-list-name": "list name",
+    "r-when-a-member": "When a member is",
+    "r-when-the-member": "When the member",
+    "r-name": "name",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "r-when-the-item": "When the checklist item",
+    "r-checked": "Checked",
+    "r-unchecked": "Unchecked",
+    "r-move-card-to": "Move card to",
+    "r-top-of": "Top of",
+    "r-bottom-of": "Bottom of",
+    "r-its-list": "its list",
+    "r-archive": "移到封存",
+    "r-unarchive": "Restore from Archive",
+    "r-card": "card",
+    "r-add": "新增",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-set-color": "Set color to",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "subject",
+    "r-rule-details": "Rule details",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Move card to top of list",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Move card to bottom of list",
+    "r-d-send-email": "Send email",
+    "r-d-send-email-to": "to",
+    "r-d-send-email-subject": "subject",
+    "r-d-send-email-message": "message",
+    "r-d-archive": "Move card to Archive",
+    "r-d-unarchive": "Restore card from Archive",
+    "r-d-add-label": "Add label",
+    "r-d-remove-label": "Remove label",
+    "r-create-card": "Create new card",
+    "r-in-list": "in list",
+    "r-in-swimlane": "in swimlane",
+    "r-d-add-member": "Add member",
+    "r-d-remove-member": "Remove member",
+    "r-d-remove-all-member": "Remove all member",
+    "r-d-check-all": "Check all items of a list",
+    "r-d-uncheck-all": "Uncheck all items of a list",
+    "r-d-check-one": "Check item",
+    "r-d-uncheck-one": "Uncheck item",
+    "r-d-check-of-list": "of checklist",
+    "r-d-add-checklist": "Add checklist",
+    "r-d-remove-checklist": "Remove checklist",
+    "r-by": "by",
+    "r-add-checklist": "Add checklist",
+    "r-with-items": "with items",
+    "r-items-list": "item1,item2,item3",
+    "r-add-swimlane": "Add swimlane",
+    "r-swimlane-name": "swimlane name",
+    "r-board-note": "Note: leave a field empty to match every possible value.",
+    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout",
+    "hide-logo": "Hide Logo",
+    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
+    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
+    "error-undefined": "Something went wrong",
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
+}
\ No newline at end of file
diff --git a/meta/t9n-changelog/fr.md b/meta/t9n-changelog/fr.md
index fed1fbe6..fed1fbe6 100755..100644
--- a/meta/t9n-changelog/fr.md
+++ b/meta/t9n-changelog/fr.md
diff --git a/models/actions.js b/models/actions.js
new file mode 100644
index 00000000..0430b044
--- /dev/null
+++ b/models/actions.js
@@ -0,0 +1,19 @@
+Actions = new Mongo.Collection('actions');
+
+Actions.allow({
+  insert(userId, doc) {
+    return allowIsBoardAdmin(userId, Boards.findOne(doc.boardId));
+  },
+  update(userId, doc) {
+    return allowIsBoardAdmin(userId, Boards.findOne(doc.boardId));
+  },
+  remove(userId, doc) {
+    return allowIsBoardAdmin(userId, Boards.findOne(doc.boardId));
+  },
+});
+
+Actions.helpers({
+  description() {
+    return this.desc;
+  },
+});
diff --git a/models/activities.js b/models/activities.js
index 3f1d28ae..1e97895d 100644
--- a/models/activities.js
+++ b/models/activities.js
@@ -14,6 +14,9 @@ Activities.helpers({
   board() {
     return Boards.findOne(this.boardId);
   },
+  oldBoard() {
+    return Boards.findOne(this.oldBoardId);
+  },
   user() {
     return Users.findOne(this.userId);
   },
@@ -26,6 +29,9 @@ Activities.helpers({
   swimlane() {
     return Swimlanes.findOne(this.swimlaneId);
   },
+  oldSwimlane() {
+    return Swimlanes.findOne(this.oldSwimlaneId);
+  },
   oldList() {
     return Lists.findOne(this.oldListId);
   },
@@ -44,12 +50,28 @@ Activities.helpers({
   checklistItem() {
     return ChecklistItems.findOne(this.checklistItemId);
   },
+  subtasks() {
+    return Cards.findOne(this.subtaskId);
+  },
+  customField() {
+    return CustomFields.findOne(this.customFieldId);
+  },
+  // Label activity did not work yet, unable to edit labels when tried this.
+  //label() {
+  //  return Cards.findOne(this.labelId);
+  //},
 });
 
 Activities.before.insert((userId, doc) => {
   doc.createdAt = new Date();
 });
 
+Activities.after.insert((userId, doc) => {
+  const activity = Activities._transform(doc);
+  RulesHelper.executeRules(activity);
+
+});
+
 if (Meteor.isServer) {
   // For efficiency create indexes on the date of creation, and on the date of
   // creation in conjunction with the card or board id, as corresponding views
@@ -60,6 +82,10 @@ if (Meteor.isServer) {
     Activities._collection._ensureIndex({ boardId: 1, createdAt: -1 });
     Activities._collection._ensureIndex({ commentId: 1 }, { partialFilterExpression: { commentId: { $exists: true } } });
     Activities._collection._ensureIndex({ attachmentId: 1 }, { partialFilterExpression: { attachmentId: { $exists: true } } });
+    Activities._collection._ensureIndex({ customFieldId: 1 }, { partialFilterExpression: { customFieldId: { $exists: true } } });
+    // Label activity did not work yet, unable to edit labels when tried this.
+    //Activities._collection._dropIndex({ labelId: 1 }, { "indexKey": -1 });
+    //Activities._collection._dropIndex({ labelId: 1 }, { partialFilterExpression: { labelId: { $exists: true } } });
   });
 
   Activities.after.insert((userId, doc) => {
@@ -85,6 +111,14 @@ if (Meteor.isServer) {
       params.url = board.absoluteUrl();
       params.boardId = activity.boardId;
     }
+    if (activity.oldBoardId) {
+      const oldBoard = activity.oldBoard();
+      if (oldBoard) {
+        watchers = _.union(watchers, oldBoard.watchers || []);
+        params.oldBoard = oldBoard.title;
+        params.oldBoardId = activity.oldBoardId;
+      }
+    }
     if (activity.memberId) {
       participants = _.union(participants, [activity.memberId]);
       params.member = activity.member().getName();
@@ -97,9 +131,19 @@ if (Meteor.isServer) {
     }
     if (activity.oldListId) {
       const oldList = activity.oldList();
-      watchers = _.union(watchers, oldList.watchers || []);
-      params.oldList = oldList.title;
-      params.oldListId = activity.oldListId;
+      if (oldList) {
+        watchers = _.union(watchers, oldList.watchers || []);
+        params.oldList = oldList.title;
+        params.oldListId = activity.oldListId;
+      }
+    }
+    if (activity.oldSwimlaneId) {
+      const oldSwimlane = activity.oldSwimlane();
+      if (oldSwimlane) {
+        watchers = _.union(watchers, oldSwimlane.watchers || []);
+        params.oldSwimlane = oldSwimlane.title;
+        params.oldSwimlaneId = activity.oldSwimlaneId;
+      }
     }
     if (activity.cardId) {
       const card = activity.card();
@@ -110,6 +154,11 @@ if (Meteor.isServer) {
       params.url = card.absoluteUrl();
       params.cardId = activity.cardId;
     }
+    if (activity.swimlaneId) {
+      const swimlane = activity.swimlane();
+      params.swimlane = swimlane.title;
+      params.swimlaneId = activity.swimlaneId;
+    }
     if (activity.commentId) {
       const comment = activity.comment();
       params.comment = comment.text;
@@ -127,24 +176,23 @@ if (Meteor.isServer) {
       const checklistItem = activity.checklistItem();
       params.checklistItem = checklistItem.title;
     }
+    if (activity.customFieldId) {
+      const customField = activity.customField();
+      params.customField = customField.name;
+    }
+    // Label activity did not work yet, unable to edit labels when tried this.
+    //if (activity.labelId) {
+    //  const label = activity.label();
+    //  params.label = label.name;
+    //  params.labelId = activity.labelId;
+    //}
     if (board) {
       const watchingUsers = _.pluck(_.where(board.watchers, {level: 'watching'}), 'userId');
       const trackingUsers = _.pluck(_.where(board.watchers, {level: 'tracking'}), 'userId');
-      const mutedUsers = _.pluck(_.where(board.watchers, {level: 'muted'}), 'userId');
-      switch(board.getWatchDefault()) {
-      case 'muted':
-        participants = _.intersection(participants, trackingUsers);
-        watchers = _.intersection(watchers, trackingUsers);
-        break;
-      case 'tracking':
-        participants = _.difference(participants, mutedUsers);
-        watchers = _.difference(watchers, mutedUsers);
-        break;
-      }
-      watchers = _.union(watchers, watchingUsers || []);
+      watchers = _.union(watchers, watchingUsers, _.intersection(participants, trackingUsers));
     }
 
-    Notifications.getUsers(participants, watchers).forEach((user) => {
+    Notifications.getUsers(watchers).forEach((user) => {
       Notifications.notify(user, title, description, params);
     });
 
diff --git a/models/attachments.js b/models/attachments.js
index 5e5c4926..fb32f497 100644
--- a/models/attachments.js
+++ b/models/attachments.js
@@ -1,90 +1,105 @@
-  Attachments = new FS.Collection('attachments', {
-    stores: [
+Attachments = new FS.Collection('attachments', {
+  stores: [
 
-      // XXX Add a new store for cover thumbnails so we don't load big images in
-      // the general board view
-      new FS.Store.GridFS('attachments', {
-        // If the uploaded document is not an image we need to enforce browser
-        // download instead of execution. This is particularly important for HTML
-        // files that the browser will just execute if we don't serve them with the
-        // appropriate `application/octet-stream` MIME header which can lead to user
-        // data leaks. I imagine other formats (like PDF) can also be attack vectors.
-        // See https://github.com/wekan/wekan/issues/99
-        // XXX Should we use `beforeWrite` option of CollectionFS instead of
-        // collection-hooks?
-        // We should use `beforeWrite`.
-        beforeWrite: (fileObj) => {
-          if (!fileObj.isImage()) {
-            return {
-              type: 'application/octet-stream',
-            };
-          }
-          return {};
-        },
-      }),
-    ],
-  });
-
-
-  if (Meteor.isServer) {
-    Attachments.allow({
-      insert(userId, doc) {
-        return allowIsBoardMember(userId, Boards.findOne(doc.boardId));
-      },
-      update(userId, doc) {
-        return allowIsBoardMember(userId, Boards.findOne(doc.boardId));
-      },
-      remove(userId, doc) {
-        return allowIsBoardMember(userId, Boards.findOne(doc.boardId));
-      },
-      // We authorize the attachment download either:
-      // - if the board is public, everyone (even unconnected) can download it
-      // - if the board is private, only board members can download it
-      download(userId, doc) {
-        const board = Boards.findOne(doc.boardId);
-        if (board.isPublic()) {
-          return true;
-        } else {
-          return board.hasMember(userId);
+    // XXX Add a new store for cover thumbnails so we don't load big images in
+    // the general board view
+    new FS.Store.GridFS('attachments', {
+      // If the uploaded document is not an image we need to enforce browser
+      // download instead of execution. This is particularly important for HTML
+      // files that the browser will just execute if we don't serve them with the
+      // appropriate `application/octet-stream` MIME header which can lead to user
+      // data leaks. I imagine other formats (like PDF) can also be attack vectors.
+      // See https://github.com/wekan/wekan/issues/99
+      // XXX Should we use `beforeWrite` option of CollectionFS instead of
+      // collection-hooks?
+      // We should use `beforeWrite`.
+      beforeWrite: (fileObj) => {
+        if (!fileObj.isImage()) {
+          return {
+            type: 'application/octet-stream',
+          };
         }
+        return {};
       },
+    }),
+  ],
+});
 
-      fetch: ['boardId'],
-    });
-  }
 
-  // XXX Enforce a schema for the Attachments CollectionFS
+if (Meteor.isServer) {
+  Meteor.startup(() => {
+    Attachments.files._ensureIndex({ cardId: 1 });
+  });
 
-  if (Meteor.isServer) {
-    Attachments.files.after.insert((userId, doc) => {
-      // If the attachment doesn't have a source field
-      // or its source is different than import
-      if (!doc.source || doc.source !== 'import') {
-        // Add activity about adding the attachment
-        Activities.insert({
-          userId,
-          type: 'card',
-          activityType: 'addAttachment',
-          attachmentId: doc._id,
-          boardId: doc.boardId,
-          cardId: doc.cardId,
-        });
+  Attachments.allow({
+    insert(userId, doc) {
+      return allowIsBoardMember(userId, Boards.findOne(doc.boardId));
+    },
+    update(userId, doc) {
+      return allowIsBoardMember(userId, Boards.findOne(doc.boardId));
+    },
+    remove(userId, doc) {
+      return allowIsBoardMember(userId, Boards.findOne(doc.boardId));
+    },
+    // We authorize the attachment download either:
+    // - if the board is public, everyone (even unconnected) can download it
+    // - if the board is private, only board members can download it
+    download(userId, doc) {
+      const board = Boards.findOne(doc.boardId);
+      if (board.isPublic()) {
+        return true;
       } else {
-        // Don't add activity about adding the attachment as the activity
-        // be imported and delete source field
-        Attachments.update({
-          _id: doc._id,
-        }, {
-          $unset: {
-            source: '',
-          },
-        });
+        return board.hasMember(userId);
       }
-    });
+    },
 
-    Attachments.files.after.remove((userId, doc) => {
-      Activities.remove({
+    fetch: ['boardId'],
+  });
+}
+
+// XXX Enforce a schema for the Attachments CollectionFS
+
+if (Meteor.isServer) {
+  Attachments.files.after.insert((userId, doc) => {
+    // If the attachment doesn't have a source field
+    // or its source is different than import
+    if (!doc.source || doc.source !== 'import') {
+      // Add activity about adding the attachment
+      Activities.insert({
+        userId,
+        type: 'card',
+        activityType: 'addAttachment',
         attachmentId: doc._id,
+        boardId: doc.boardId,
+        cardId: doc.cardId,
+        listId: doc.listId,
+        swimlaneId: doc.swimlaneId,
+      });
+    } else {
+      // Don't add activity about adding the attachment as the activity
+      // be imported and delete source field
+      Attachments.update({
+        _id: doc._id,
+      }, {
+        $unset: {
+          source: '',
+        },
       });
+    }
+  });
+
+  Attachments.files.after.remove((userId, doc) => {
+    Activities.remove({
+      attachmentId: doc._id,
     });
-  }
+    Activities.insert({
+      userId,
+      type: 'card',
+      activityType: 'deleteAttachment',
+      boardId: doc.boardId,
+      cardId: doc.cardId,
+      listId: doc.listId,
+      swimlaneId: doc.swimlaneId,
+    });
+  });
+}
diff --git a/models/boards.js b/models/boards.js
index 3e05b499..b07d9e27 100644
--- a/models/boards.js
+++ b/models/boards.js
@@ -1,10 +1,19 @@
 Boards = new Mongo.Collection('boards');
 
+/**
+ * This is a Board.
+ */
 Boards.attachSchema(new SimpleSchema({
   title: {
+    /**
+     * The title of the board
+     */
     type: String,
   },
   slug: {
+    /**
+     * The title slugified.
+     */
     type: String,
     autoValue() { // eslint-disable-line consistent-return
       // XXX We need to improve slug management. Only the id should be necessary
@@ -24,6 +33,9 @@ Boards.attachSchema(new SimpleSchema({
     },
   },
   archived: {
+    /**
+     * Is the board archived?
+     */
     type: Boolean,
     autoValue() { // eslint-disable-line consistent-return
       if (this.isInsert && !this.isSet) {
@@ -32,6 +44,9 @@ Boards.attachSchema(new SimpleSchema({
     },
   },
   createdAt: {
+    /**
+     * Creation time of the board
+     */
     type: Date,
     autoValue() { // eslint-disable-line consistent-return
       if (this.isInsert) {
@@ -43,6 +58,9 @@ Boards.attachSchema(new SimpleSchema({
   },
   // XXX Inconsistent field naming
   modifiedAt: {
+    /**
+     * Last modification time of the board
+     */
     type: Date,
     optional: true,
     autoValue() { // eslint-disable-line consistent-return
@@ -55,6 +73,9 @@ Boards.attachSchema(new SimpleSchema({
   },
   // De-normalized number of users that have starred this board
   stars: {
+    /**
+     * How many stars the board has
+     */
     type: Number,
     autoValue() { // eslint-disable-line consistent-return
       if (this.isInsert) {
@@ -64,6 +85,9 @@ Boards.attachSchema(new SimpleSchema({
   },
   // De-normalized label system
   'labels': {
+    /**
+     * List of labels attached to a board
+     */
     type: [Object],
     autoValue() { // eslint-disable-line consistent-return
       if (this.isInsert && !this.isSet) {
@@ -78,6 +102,9 @@ Boards.attachSchema(new SimpleSchema({
     },
   },
   'labels.$._id': {
+    /**
+     * Unique id of a label
+     */
     // We don't specify that this field must be unique in the board because that
     // will cause performance penalties and is not necessary since this field is
     // always set on the server.
@@ -86,20 +113,38 @@ Boards.attachSchema(new SimpleSchema({
     type: String,
   },
   'labels.$.name': {
+    /**
+     * Name of a label
+     */
     type: String,
     optional: true,
   },
   'labels.$.color': {
+    /**
+     * color of a label.
+     *
+     * Can be amongst `green`, `yellow`, `orange`, `red`, `purple`,
+     * `blue`, `sky`, `lime`, `pink`, `black`,
+     * `silver`, `peachpuff`, `crimson`, `plum`, `darkgreen`,
+     * `slateblue`, `magenta`, `gold`, `navy`, `gray`,
+     * `saddlebrown`, `paleturquoise`, `mistyrose`, `indigo`
+     */
     type: String,
     allowedValues: [
       'green', 'yellow', 'orange', 'red', 'purple',
       'blue', 'sky', 'lime', 'pink', 'black',
+      'silver', 'peachpuff', 'crimson', 'plum', 'darkgreen',
+      'slateblue', 'magenta', 'gold', 'navy', 'gray',
+      'saddlebrown', 'paleturquoise', 'mistyrose', 'indigo',
     ],
   },
   // XXX We might want to maintain more informations under the member sub-
   // documents like de-normalized meta-data (the date the member joined the
   // board, the number of contributions, etc.).
   'members': {
+    /**
+     * List of members of a board
+     */
     type: [Object],
     autoValue() { // eslint-disable-line consistent-return
       if (this.isInsert && !this.isSet) {
@@ -107,28 +152,55 @@ Boards.attachSchema(new SimpleSchema({
           userId: this.userId,
           isAdmin: true,
           isActive: true,
+          isNoComments: false,
           isCommentOnly: false,
         }];
       }
     },
   },
   'members.$.userId': {
+    /**
+     * The uniq ID of the member
+     */
     type: String,
   },
   'members.$.isAdmin': {
+    /**
+     * Is the member an admin of the board?
+     */
     type: Boolean,
   },
   'members.$.isActive': {
+    /**
+     * Is the member active?
+     */
     type: Boolean,
   },
+  'members.$.isNoComments': {
+    /**
+     * Is the member not allowed to make comments
+     */
+    type: Boolean,
+    optional: true,
+  },
   'members.$.isCommentOnly': {
+    /**
+     * Is the member only allowed to comment on the board
+     */
     type: Boolean,
+    optional: true,
   },
   permission: {
+    /**
+     * visibility of the board
+     */
     type: String,
     allowedValues: ['public', 'private'],
   },
   color: {
+    /**
+     * The color of the board.
+     */
     type: String,
     allowedValues: [
       'belize',
@@ -145,13 +217,118 @@ Boards.attachSchema(new SimpleSchema({
     },
   },
   description: {
+    /**
+     * The description of the board
+     */
+    type: String,
+    optional: true,
+  },
+  subtasksDefaultBoardId: {
+    /**
+     * The default board ID assigned to subtasks.
+     */
+    type: String,
+    optional: true,
+    defaultValue: null,
+  },
+  subtasksDefaultListId: {
+    /**
+     * The default List ID assigned to subtasks.
+     */
+    type: String,
+    optional: true,
+    defaultValue: null,
+  },
+  allowsSubtasks: {
+    /**
+     * Does the board allows subtasks?
+     */
+    type: Boolean,
+    defaultValue: true,
+  },
+  presentParentTask: {
+    /**
+     * Controls how to present the parent task:
+     *
+     * - `prefix-with-full-path`: add a prefix with the full path
+     * - `prefix-with-parent`: add a prefisx with the parent name
+     * - `subtext-with-full-path`: add a subtext with the full path
+     * - `subtext-with-parent`: add a subtext with the parent name
+     * - `no-parent`: does not show the parent at all
+     */
     type: String,
+    allowedValues: [
+      'prefix-with-full-path',
+      'prefix-with-parent',
+      'subtext-with-full-path',
+      'subtext-with-parent',
+      'no-parent',
+    ],
+    optional: true,
+    defaultValue: 'no-parent',
+  },
+  startAt: {
+    /**
+     * Starting date of the board.
+     */
+    type: Date,
+    optional: true,
+  },
+  dueAt: {
+    /**
+     * Due date of the board.
+     */
+    type: Date,
+    optional: true,
+  },
+  endAt: {
+    /**
+     * End date of the board.
+     */
+    type: Date,
     optional: true,
   },
+  spentTime: {
+    /**
+     * Time spent in the board.
+     */
+    type: Number,
+    decimal: true,
+    optional: true,
+  },
+  isOvertime: {
+    /**
+     * Is the board overtimed?
+     */
+    type: Boolean,
+    defaultValue: false,
+    optional: true,
+  },
+  type: {
+    /**
+     * The type of board
+     */
+    type: String,
+    defaultValue: 'board',
+  },
 }));
 
 
 Boards.helpers({
+  copy() {
+    const oldId = this._id;
+    delete this._id;
+    const _id = Boards.insert(this);
+
+    // Copy all swimlanes in board
+    Swimlanes.find({
+      boardId: oldId,
+      archived: false,
+    }).forEach((swimlane) => {
+      swimlane.type = 'swimlane';
+      swimlane.copy(_id);
+    });
+  },
   /**
    * Is supplied user authorized to view this board?
    */
@@ -183,14 +360,45 @@ Boards.helpers({
     return this.permission === 'public';
   },
 
+  cards() {
+    return Cards.find({ boardId: this._id, archived: false }, { sort: { title: 1 } });
+  },
+
   lists() {
     return Lists.find({ boardId: this._id, archived: false }, { sort: { sort: 1 } });
   },
 
+  nullSortLists() {
+    return Lists.find({
+      boardId: this._id,
+      archived: false,
+      sort: { $eq: null },
+    });
+  },
+
   swimlanes() {
     return Swimlanes.find({ boardId: this._id, archived: false }, { sort: { sort: 1 } });
   },
 
+  nextSwimlane(swimlane) {
+    return Swimlanes.findOne({
+      boardId: this._id,
+      archived: false,
+      sort: { $gte: swimlane.sort },
+      _id: { $ne: swimlane._id },
+    }, {
+      sort: { sort: 1 },
+    });
+  },
+
+  nullSortSwimlanes() {
+    return Swimlanes.find({
+      boardId: this._id,
+      archived: false,
+      sort: { $eq: null },
+    });
+  },
+
   hasOvertimeCards(){
     const card = Cards.findOne({isOvertime: true, boardId: this._id, archived: false} );
     return card !== undefined;
@@ -221,6 +429,10 @@ Boards.helpers({
     return _.findWhere(this.labels, { name, color });
   },
 
+  getLabelById(labelId){
+    return _.findWhere(this.labels, { _id: labelId });
+  },
+
   labelIndex(labelId) {
     return _.pluck(this.labels, '_id').indexOf(labelId);
   },
@@ -237,6 +449,10 @@ Boards.helpers({
     return !!_.findWhere(this.members, { userId: memberId, isActive: true, isAdmin: true });
   },
 
+  hasNoComments(memberId) {
+    return !!_.findWhere(this.members, { userId: memberId, isActive: true, isAdmin: false, isNoComments: true });
+  },
+
   hasCommentOnly(memberId) {
     return !!_.findWhere(this.members, { userId: memberId, isActive: true, isAdmin: false, isCommentOnly: true });
   },
@@ -249,6 +465,10 @@ Boards.helpers({
     return `board-color-${this.color}`;
   },
 
+  customFields() {
+    return CustomFields.find({ boardIds: {$in: [this._id]} }, { sort: { name: 1 } });
+  },
+
   // XXX currently mutations return no value so we have an issue when using addLabel in import
   // XXX waiting on https://github.com/mquandalle/meteor-collection-mutations/issues/1 to remove...
   pushLabel(name, color) {
@@ -257,28 +477,192 @@ Boards.helpers({
     return _id;
   },
 
-  searchCards(term) {
+  searchBoards(term) {
     check(term, Match.OneOf(String, null, undefined));
 
-    let query = { boardId: this._id };
+    const query = { boardId: this._id };
+    query.type = 'cardType-linkedBoard';
+    query.archived = false;
+
     const projection = { limit: 10, sort: { createdAt: -1 } };
 
     if (term) {
       const regex = new RegExp(term, 'i');
 
-      query = {
-        boardId: this._id,
-        $or: [
-          { title: regex },
-          { description: regex },
-        ],
-      };
+      query.$or = [
+        { title: regex },
+        { description: regex },
+      ];
     }
 
     return Cards.find(query, projection);
   },
+
+  searchSwimlanes(term) {
+    check(term, Match.OneOf(String, null, undefined));
+
+    const query = { boardId: this._id };
+    if (this.isTemplatesBoard()) {
+      query.type = 'template-swimlane';
+      query.archived = false;
+    } else {
+      query.type = {$nin: ['template-swimlane']};
+    }
+    const projection = { limit: 10, sort: { createdAt: -1 } };
+
+    if (term) {
+      const regex = new RegExp(term, 'i');
+
+      query.$or = [
+        { title: regex },
+        { description: regex },
+      ];
+    }
+
+    return Swimlanes.find(query, projection);
+  },
+
+  searchLists(term) {
+    check(term, Match.OneOf(String, null, undefined));
+
+    const query = { boardId: this._id };
+    if (this.isTemplatesBoard()) {
+      query.type = 'template-list';
+      query.archived = false;
+    } else {
+      query.type = {$nin: ['template-list']};
+    }
+    const projection = { limit: 10, sort: { createdAt: -1 } };
+
+    if (term) {
+      const regex = new RegExp(term, 'i');
+
+      query.$or = [
+        { title: regex },
+        { description: regex },
+      ];
+    }
+
+    return Lists.find(query, projection);
+  },
+
+  searchCards(term, excludeLinked) {
+    check(term, Match.OneOf(String, null, undefined));
+
+    const query = { boardId: this._id };
+    if (excludeLinked) {
+      query.linkedId = null;
+    }
+    if (this.isTemplatesBoard()) {
+      query.type = 'template-card';
+      query.archived = false;
+    } else {
+      query.type = {$nin: ['template-card']};
+    }
+    const projection = { limit: 10, sort: { createdAt: -1 } };
+
+    if (term) {
+      const regex = new RegExp(term, 'i');
+
+      query.$or = [
+        { title: regex },
+        { description: regex },
+      ];
+    }
+
+    return Cards.find(query, projection);
+  },
+  // A board alwasy has another board where it deposits subtasks of thasks
+  // that belong to itself.
+  getDefaultSubtasksBoardId() {
+    if ((this.subtasksDefaultBoardId === null) || (this.subtasksDefaultBoardId === undefined)) {
+      this.subtasksDefaultBoardId = Boards.insert({
+        title: `^${this.title}^`,
+        permission: this.permission,
+        members: this.members,
+        color: this.color,
+        description: TAPi18n.__('default-subtasks-board', {board: this.title}),
+      });
+
+      Swimlanes.insert({
+        title: TAPi18n.__('default'),
+        boardId: this.subtasksDefaultBoardId,
+      });
+      Boards.update(this._id, {$set: {
+        subtasksDefaultBoardId: this.subtasksDefaultBoardId,
+      }});
+    }
+    return this.subtasksDefaultBoardId;
+  },
+
+  getDefaultSubtasksBoard() {
+    return Boards.findOne(this.getDefaultSubtasksBoardId());
+  },
+
+  getDefaultSubtasksListId() {
+    if ((this.subtasksDefaultListId === null) || (this.subtasksDefaultListId === undefined)) {
+      this.subtasksDefaultListId = Lists.insert({
+        title: TAPi18n.__('queue'),
+        boardId: this._id,
+      });
+      this.setSubtasksDefaultListId(this.subtasksDefaultListId);
+    }
+    return this.subtasksDefaultListId;
+  },
+
+  getDefaultSubtasksList() {
+    return Lists.findOne(this.getDefaultSubtasksListId());
+  },
+
+  getDefaultSwimline() {
+    let result = Swimlanes.findOne({boardId: this._id});
+    if (result === undefined) {
+      Swimlanes.insert({
+        title: TAPi18n.__('default'),
+        boardId: this._id,
+      });
+      result = Swimlanes.findOne({boardId: this._id});
+    }
+    return result;
+  },
+
+  cardsInInterval(start, end) {
+    return Cards.find({
+      boardId: this._id,
+      $or: [
+        {
+          startAt: {
+            $lte: start,
+          }, endAt: {
+            $gte: start,
+          },
+        }, {
+          startAt: {
+            $lte: end,
+          }, endAt: {
+            $gte: end,
+          },
+        }, {
+          startAt: {
+            $gte: start,
+          }, endAt: {
+            $lte: end,
+          },
+        },
+      ],
+    });
+  },
+
+  isTemplateBoard() {
+    return this.type === 'template-board';
+  },
+
+  isTemplatesBoard() {
+    return this.type === 'template-container';
+  },
 });
 
+
 Boards.mutations({
   archive() {
     return { $set: { archived: true } };
@@ -358,6 +742,7 @@ Boards.mutations({
           userId: memberId,
           isAdmin: false,
           isActive: true,
+          isNoComments: false,
           isCommentOnly: false,
         },
       },
@@ -385,23 +770,46 @@ Boards.mutations({
     };
   },
 
-  setMemberPermission(memberId, isAdmin, isCommentOnly) {
+  setMemberPermission(memberId, isAdmin, isNoComments, isCommentOnly, currentUserId = Meteor.userId()) {
     const memberIndex = this.memberIndex(memberId);
-
     // do not allow change permission of self
-    if (memberId === Meteor.userId()) {
+    if (memberId === currentUserId) {
       isAdmin = this.members[memberIndex].isAdmin;
     }
 
     return {
       $set: {
         [`members.${memberIndex}.isAdmin`]: isAdmin,
+        [`members.${memberIndex}.isNoComments`]: isNoComments,
         [`members.${memberIndex}.isCommentOnly`]: isCommentOnly,
       },
     };
   },
+
+  setAllowsSubtasks(allowsSubtasks) {
+    return { $set: { allowsSubtasks } };
+  },
+
+  setSubtasksDefaultBoardId(subtasksDefaultBoardId) {
+    return { $set: { subtasksDefaultBoardId } };
+  },
+
+  setSubtasksDefaultListId(subtasksDefaultListId) {
+    return { $set: { subtasksDefaultListId } };
+  },
+
+  setPresentParentTask(presentParentTask) {
+    return { $set: { presentParentTask } };
+  },
 });
 
+function boardRemover(userId, doc) {
+  [Cards, Lists, Swimlanes, Integrations, Rules, Activities].forEach((element) => {
+    element.remove({ boardId: doc._id });
+  });
+}
+
+
 if (Meteor.isServer) {
   Boards.allow({
     insert: Meteor.userId,
@@ -565,6 +973,18 @@ if (Meteor.isServer) {
     }
   });
 
+  Boards.before.remove((userId, doc) => {
+    boardRemover(userId, doc);
+    // Add removeBoard activity to keep it
+    Activities.insert({
+      userId,
+      type: 'board',
+      activityTypeId: doc._id,
+      activityType: 'removeBoard',
+      boardId: doc._id,
+    });
+  });
+
   // Add a new activity if we add or remove a member to the board
   Boards.after.update((userId, doc, fieldNames, modifier) => {
     if (!_.contains(fieldNames, 'members')) {
@@ -600,6 +1020,14 @@ if (Meteor.isServer) {
 
 //BOARDS REST API
 if (Meteor.isServer) {
+  /**
+   * @operation get_boards_from_user
+   * @summary Get all boards attached to a user
+   *
+   * @param {string} userId the ID of the user to retrieve the data
+   * @return_type [{_id: string,
+                    title: string}]
+                    */
   JsonRoutes.add('GET', '/api/users/:userId/boards', function (req, res) {
     try {
       Authentication.checkLoggedIn(req.userId);
@@ -630,6 +1058,13 @@ if (Meteor.isServer) {
     }
   });
 
+  /**
+   * @operation get_public_boards
+   * @summary Get all public boards
+   *
+   * @return_type [{_id: string,
+                    title: string}]
+                    */
   JsonRoutes.add('GET', '/api/boards', function (req, res) {
     try {
       Authentication.checkUserId(req.userId);
@@ -651,9 +1086,16 @@ if (Meteor.isServer) {
     }
   });
 
-  JsonRoutes.add('GET', '/api/boards/:id', function (req, res) {
+  /**
+   * @operation get_board
+   * @summary Get the board with that particular ID
+   *
+   * @param {string} boardId the ID of the board to retrieve the data
+   * @return_type Boards
+   */
+  JsonRoutes.add('GET', '/api/boards/:boardId', function (req, res) {
     try {
-      const id = req.params.id;
+      const id = req.params.boardId;
       Authentication.checkBoardAccess(req.userId, id);
 
       JsonRoutes.sendResult(res, {
@@ -669,6 +1111,31 @@ if (Meteor.isServer) {
     }
   });
 
+  /**
+   * @operation new_board
+   * @summary Create a board
+   *
+   * @description This allows to create a board.
+   *
+   * The color has to be chosen between `belize`, `nephritis`, `pomegranate`,
+   * `pumpkin`, `wisteria`, `midnight`:
+   *
+   * <img src="https://wekan.github.io/board-colors.png" width="40%" alt="Wekan logo" />
+   *
+   * @param {string} title the new title of the board
+   * @param {string} owner "ABCDE12345" <= User ID in Wekan.
+   *                 (Not username or email)
+   * @param {boolean} [isAdmin] is the owner an admin of the board (default true)
+   * @param {boolean} [isActive] is the board active (default true)
+   * @param {boolean} [isNoComments] disable comments (default false)
+   * @param {boolean} [isCommentOnly] only enable comments (default false)
+   * @param {string} [permission] "private" board <== Set to "public" if you
+   *                 want public Wekan board
+   * @param {string} [color] the color of the board
+   *
+   * @return_type {_id: string,
+                   defaultSwimlaneId: string}
+                   */
   JsonRoutes.add('POST', '/api/boards', function (req, res) {
     try {
       Authentication.checkUserId(req.userId);
@@ -677,18 +1144,24 @@ if (Meteor.isServer) {
         members: [
           {
             userId: req.body.owner,
-            isAdmin: true,
-            isActive: true,
-            isCommentOnly: false,
+            isAdmin: req.body.isAdmin || true,
+            isActive: req.body.isActive || true,
+            isNoComments: req.body.isNoComments || false,
+            isCommentOnly: req.body.isCommentOnly || false,
           },
         ],
-        permission: 'public',
-        color: 'belize',
+        permission: req.body.permission || 'private',
+        color: req.body.color || 'belize',
+      });
+      const swimlaneId = Swimlanes.insert({
+        title: TAPi18n.__('default'),
+        boardId: id,
       });
       JsonRoutes.sendResult(res, {
         code: 200,
         data: {
           _id: id,
+          defaultSwimlaneId: swimlaneId,
         },
       });
     }
@@ -700,10 +1173,16 @@ if (Meteor.isServer) {
     }
   });
 
-  JsonRoutes.add('DELETE', '/api/boards/:id', function (req, res) {
+  /**
+   * @operation delete_board
+   * @summary Delete a board
+   *
+   * @param {string} boardId the ID of the board
+   */
+  JsonRoutes.add('DELETE', '/api/boards/:boardId', function (req, res) {
     try {
       Authentication.checkUserId(req.userId);
-      const id = req.params.id;
+      const id = req.params.boardId;
       Boards.remove({ _id: id });
       JsonRoutes.sendResult(res, {
         code: 200,
@@ -719,4 +1198,87 @@ if (Meteor.isServer) {
       });
     }
   });
+
+  /**
+   * @operation add_board_label
+   * @summary Add a label to a board
+   *
+   * @description If the board doesn't have the name/color label, this function
+   * adds the label to the board.
+   *
+   * @param {string} boardId the board
+   * @param {string} color the color of the new label
+   * @param {string} name the name of the new label
+   *
+   * @return_type string
+   */
+  JsonRoutes.add('PUT', '/api/boards/:boardId/labels', function (req, res) {
+    Authentication.checkUserId(req.userId);
+    const id = req.params.boardId;
+    try {
+      if (req.body.hasOwnProperty('label')) {
+        const board = Boards.findOne({ _id: id });
+        const color = req.body.label.color;
+        const name = req.body.label.name;
+        const labelId = Random.id(6);
+        if (!board.getLabel(name, color)) {
+          Boards.direct.update({ _id: id }, { $push: { labels: { _id: labelId,  name,  color } } });
+          JsonRoutes.sendResult(res, {
+            code: 200,
+            data: labelId,
+          });
+        } else {
+          JsonRoutes.sendResult(res, {
+            code: 200,
+          });
+        }
+      }
+    }
+    catch (error) {
+      JsonRoutes.sendResult(res, {
+        data: error,
+      });
+    }
+  });
+
+  /**
+   * @operation set_board_member_permission
+   * @tag Users
+   * @summary Change the permission of a member of a board
+   *
+   * @param {string} boardId the ID of the board that we are changing
+   * @param {string} memberId the ID of the user to change permissions
+   * @param {boolean} isAdmin admin capability
+   * @param {boolean} isNoComments NoComments capability
+   * @param {boolean} isCommentOnly CommentsOnly capability
+   */
+  JsonRoutes.add('POST', '/api/boards/:boardId/members/:memberId', function (req, res) {
+    try {
+      const boardId = req.params.boardId;
+      const memberId = req.params.memberId;
+      const {isAdmin, isNoComments, isCommentOnly} = req.body;
+      Authentication.checkBoardAccess(req.userId, boardId);
+      const board = Boards.findOne({ _id: boardId });
+      function isTrue(data){
+        try {
+          return data.toLowerCase() === 'true';
+        }
+        catch (error) {
+          return data;
+        }
+      }
+      const query = board.setMemberPermission(memberId, isTrue(isAdmin), isTrue(isNoComments), isTrue(isCommentOnly), req.userId);
+
+      JsonRoutes.sendResult(res, {
+        code: 200,
+        data: query,
+      });
+    }
+    catch (error) {
+      JsonRoutes.sendResult(res, {
+        code: 200,
+        data: error,
+      });
+    }
+  });
 }
diff --git a/models/cardComments.js b/models/cardComments.js
index b6cb10fa..2bcb5453 100644
--- a/models/cardComments.js
+++ b/models/cardComments.js
@@ -1,19 +1,34 @@
 CardComments = new Mongo.Collection('card_comments');
 
+/**
+ * A comment on a card
+ */
 CardComments.attachSchema(new SimpleSchema({
   boardId: {
+    /**
+     * the board ID
+     */
     type: String,
   },
   cardId: {
+    /**
+     * the card ID
+     */
     type: String,
   },
   // XXX Rename in `content`? `text` is a bit vague...
   text: {
+    /**
+     * the text of the comment
+     */
     type: String,
   },
   // XXX We probably don't need this information here, since we already have it
   // in the associated comment creation activity
   createdAt: {
+    /**
+     * when was the comment created
+     */
     type: Date,
     denyUpdate: false,
     autoValue() { // eslint-disable-line consistent-return
@@ -26,6 +41,9 @@ CardComments.attachSchema(new SimpleSchema({
   },
   // XXX Should probably be called `authorId`
   userId: {
+    /**
+     * the author ID of the comment
+     */
     type: String,
     autoValue() { // eslint-disable-line consistent-return
       if (this.isInsert && !this.isSet) {
@@ -49,6 +67,12 @@ CardComments.allow({
 });
 
 CardComments.helpers({
+  copy(newCardId) {
+    this.cardId = newCardId;
+    delete this._id;
+    CardComments.insert(this);
+  },
+
   user() {
     return Users.findOne(this.userId);
   },
@@ -63,6 +87,8 @@ function commentCreation(userId, doc){
     boardId: doc.boardId,
     cardId: doc.cardId,
     commentId: doc._id,
+    listId: doc.listId,
+    swimlaneId: doc.swimlaneId,
   });
 }
 
@@ -87,6 +113,16 @@ if (Meteor.isServer) {
 
 //CARD COMMENT REST API
 if (Meteor.isServer) {
+  /**
+   * @operation get_all_comments
+   * @summary Get all comments attached to a card
+   *
+   * @param {string} boardId the board ID of the card
+   * @param {string} cardId the ID of the card
+   * @return_type [{_id: string,
+   *                comment: string,
+   *                authorId: string}]
+   */
   JsonRoutes.add('GET', '/api/boards/:boardId/cards/:cardId/comments', function (req, res) {
     try {
       Authentication.checkUserId( req.userId);
@@ -111,6 +147,15 @@ if (Meteor.isServer) {
     }
   });
 
+  /**
+   * @operation get_comment
+   * @summary Get a comment on a card
+   *
+   * @param {string} boardId the board ID of the card
+   * @param {string} cardId the ID of the card
+   * @param {string} commentId the ID of the comment to retrieve
+   * @return_type CardComments
+   */
   JsonRoutes.add('GET', '/api/boards/:boardId/cards/:cardId/comments/:commentId', function (req, res) {
     try {
       Authentication.checkUserId( req.userId);
@@ -130,6 +175,16 @@ if (Meteor.isServer) {
     }
   });
 
+  /**
+   * @operation new_comment
+   * @summary Add a comment on a card
+   *
+   * @param {string} boardId the board ID of the card
+   * @param {string} cardId the ID of the card
+   * @param {string} authorId the user who 'posted' the comment
+   * @param {string} text the content of the comment
+   * @return_type {_id: string}
+   */
   JsonRoutes.add('POST', '/api/boards/:boardId/cards/:cardId/comments', function (req, res) {
     try {
       Authentication.checkUserId( req.userId);
@@ -160,6 +215,15 @@ if (Meteor.isServer) {
     }
   });
 
+  /**
+   * @operation delete_comment
+   * @summary Delete a comment on a card
+   *
+   * @param {string} boardId the board ID of the card
+   * @param {string} cardId the ID of the card
+   * @param {string} commentId the ID of the comment to delete
+   * @return_type {_id: string}
+   */
   JsonRoutes.add('DELETE', '/api/boards/:boardId/cards/:cardId/comments/:commentId', function (req, res) {
     try {
       Authentication.checkUserId( req.userId);
diff --git a/models/cards.js b/models/cards.js
index e322dc2e..d5a59377 100644
--- a/models/cards.js
+++ b/models/cards.js
@@ -5,9 +5,17 @@ Cards = new Mongo.Collection('cards');
 // of comments just to display the number of them in the board view.
 Cards.attachSchema(new SimpleSchema({
   title: {
+    /**
+     * the title of the card
+     */
     type: String,
+    optional: true,
+    defaultValue: '',
   },
   archived: {
+    /**
+     * is the card archived
+     */
     type: Boolean,
     autoValue() { // eslint-disable-line consistent-return
       if (this.isInsert && !this.isSet) {
@@ -15,23 +23,63 @@ Cards.attachSchema(new SimpleSchema({
       }
     },
   },
+  parentId: {
+    /**
+     * ID of the parent card
+     */
+    type: String,
+    optional: true,
+    defaultValue: '',
+  },
   listId: {
+    /**
+     * List ID where the card is
+     */
     type: String,
+    optional: true,
+    defaultValue: '',
   },
   swimlaneId: {
+    /**
+     * Swimlane ID where the card is
+     */
     type: String,
   },
   // The system could work without this `boardId` information (we could deduce
   // the board identifier from the card), but it would make the system more
   // difficult to manage and less efficient.
   boardId: {
+    /**
+     * Board ID of the card
+     */
     type: String,
+    optional: true,
+    defaultValue: '',
   },
   coverId: {
+    /**
+     * Cover ID of the card
+     */
+    type: String,
+    optional: true,
+    defaultValue: '',
+
+  },
+  color: {
     type: String,
     optional: true,
+    allowedValues: [
+      'white', 'green', 'yellow', 'orange', 'red', 'purple',
+      'blue', 'sky', 'lime', 'pink', 'black',
+      'silver', 'peachpuff', 'crimson', 'plum', 'darkgreen',
+      'slateblue', 'magenta', 'gold', 'navy', 'gray',
+      'saddlebrown', 'paleturquoise', 'mistyrose', 'indigo',
+    ],
   },
   createdAt: {
+    /**
+     * creation date
+     */
     type: Date,
     autoValue() { // eslint-disable-line consistent-return
       if (this.isInsert) {
@@ -41,46 +89,124 @@ Cards.attachSchema(new SimpleSchema({
       }
     },
   },
+  customFields: {
+    /**
+     * list of custom fields
+     */
+    type: [Object],
+    optional: true,
+    defaultValue: [],
+  },
+  'customFields.$': {
+    type: new SimpleSchema({
+      _id: {
+        /**
+         * the ID of the related custom field
+         */
+        type: String,
+        optional: true,
+        defaultValue: '',
+      },
+      value: {
+        /**
+         * value attached to the custom field
+         */
+        type: Match.OneOf(String, Number, Boolean, Date),
+        optional: true,
+        defaultValue: '',
+      },
+    }),
+  },
   dateLastActivity: {
+    /**
+     * Date of last activity
+     */
     type: Date,
     autoValue() {
       return new Date();
     },
   },
   description: {
+    /**
+     * description of the card
+     */
+    type: String,
+    optional: true,
+    defaultValue: '',
+  },
+  requestedBy: {
+    /**
+     * who requested the card (ID of the user)
+     */
+    type: String,
+    optional: true,
+    defaultValue: '',
+  },
+  assignedBy: {
+    /**
+     * who assigned the card (ID of the user)
+     */
     type: String,
     optional: true,
+    defaultValue: '',
   },
   labelIds: {
+    /**
+     * list of labels ID the card has
+     */
     type: [String],
     optional: true,
+    defaultValue: [],
   },
   members: {
+    /**
+     * list of members (user IDs)
+     */
     type: [String],
     optional: true,
+    defaultValue: [],
   },
   receivedAt: {
+    /**
+     * Date the card was received
+     */
     type: Date,
     optional: true,
   },
   startAt: {
+    /**
+     * Date the card was started to be worked on
+     */
     type: Date,
     optional: true,
   },
   dueAt: {
+    /**
+     * Date the card is due
+     */
     type: Date,
     optional: true,
   },
   endAt: {
+    /**
+     * Date the card ended
+     */
     type: Date,
     optional: true,
   },
   spentTime: {
+    /**
+     * How much time has been spent on this
+     */
     type: Number,
     decimal: true,
     optional: true,
+    defaultValue: 0,
   },
   isOvertime: {
+    /**
+     * is the card over time?
+     */
     type: Boolean,
     defaultValue: false,
     optional: true,
@@ -88,6 +214,9 @@ Cards.attachSchema(new SimpleSchema({
   // XXX Should probably be called `authorId`. Is it even needed since we have
   // the `members` field?
   userId: {
+    /**
+     * user ID of the author of the card
+     */
     type: String,
     autoValue() { // eslint-disable-line consistent-return
       if (this.isInsert && !this.isSet) {
@@ -96,8 +225,36 @@ Cards.attachSchema(new SimpleSchema({
     },
   },
   sort: {
+    /**
+     * Sort value
+     */
     type: Number,
     decimal: true,
+    defaultValue: '',
+  },
+  subtaskSort: {
+    /**
+     * subtask sort value
+     */
+    type: Number,
+    decimal: true,
+    defaultValue: -1,
+    optional: true,
+  },
+  type: {
+    /**
+     * type of the card
+     */
+    type: String,
+    defaultValue: 'cardType-card',
+  },
+  linkedId: {
+    /**
+     * ID of the linked card
+     */
+    type: String,
+    optional: true,
+    defaultValue: '',
   },
 }));
 
@@ -115,6 +272,68 @@ Cards.allow({
 });
 
 Cards.helpers({
+  copy(boardId, swimlaneId, listId) {
+    const oldBoard = Boards.findOne(this.boardId);
+    const oldBoardLabels = oldBoard.labels;
+    // Get old label names
+    const oldCardLabels = _.pluck(_.filter(oldBoardLabels, (label) => {
+      return _.contains(this.labelIds, label._id);
+    }), 'name');
+
+    const newBoard = Boards.findOne(boardId);
+    const newBoardLabels = newBoard.labels;
+    const newCardLabels = _.pluck(_.filter(newBoardLabels, (label) => {
+      return _.contains(oldCardLabels, label.name);
+    }), '_id');
+
+    const oldId = this._id;
+    const oldCard = Cards.findOne(oldId);
+
+    // Copy Custom Fields
+    if (oldBoard._id !== boardId) {
+      CustomFields.find({
+        _id: {$in: oldCard.customFields.map((cf) => { return cf._id; })},
+      }).forEach((cf) => {
+        if (!_.contains(cf.boardIds, boardId))
+          cf.addBoard(boardId);
+      });
+    }
+
+    delete this._id;
+    delete this.labelIds;
+    this.labelIds = newCardLabels;
+    this.boardId = boardId;
+    this.swimlaneId = swimlaneId;
+    this.listId = listId;
+    const _id = Cards.insert(this);
+
+    // Copy attachments
+    oldCard.attachments().forEach((att) => {
+      att.cardId = _id;
+      delete att._id;
+      return Attachments.insert(att);
+    });
+
+    // copy checklists
+    Checklists.find({cardId: oldId}).forEach((ch) => {
+      ch.copy(_id);
+    });
+
+    // copy subtasks
+    Cards.find({parentId: oldId}).forEach((subtask) => {
+      subtask.parentId = _id;
+      subtask._id = null;
+      Cards.insert(subtask);
+    });
+
+    // copy card comments
+    CardComments.find({cardId: oldId}).forEach((cmt) => {
+      cmt.copy(_id);
+    });
+
+    return _id;
+  },
+
   list() {
     return Lists.findOne(this.listId);
   },
@@ -140,19 +359,33 @@ Cards.helpers({
   },
 
   isAssigned(memberId) {
-    return _.contains(this.members, memberId);
+    return _.contains(this.getMembers(), memberId);
   },
 
   activities() {
-    return Activities.find({cardId: this._id}, {sort: {createdAt: -1}});
+    if (this.isLinkedCard()) {
+      return Activities.find({cardId: this.linkedId}, {sort: {createdAt: -1}});
+    } else if (this.isLinkedBoard()) {
+      return Activities.find({boardId: this.linkedId}, {sort: {createdAt: -1}});
+    } else {
+      return Activities.find({cardId: this._id}, {sort: {createdAt: -1}});
+    }
   },
 
   comments() {
-    return CardComments.find({cardId: this._id}, {sort: {createdAt: -1}});
+    if (this.isLinkedCard()) {
+      return CardComments.find({cardId: this.linkedId}, {sort: {createdAt: -1}});
+    } else {
+      return CardComments.find({cardId: this._id}, {sort: {createdAt: -1}});
+    }
   },
 
   attachments() {
-    return Attachments.find({cardId: this._id}, {sort: {uploadedAt: -1}});
+    if (this.isLinkedCard()) {
+      return Attachments.find({cardId: this.linkedId}, {sort: {uploadedAt: -1}});
+    } else {
+      return Attachments.find({cardId: this._id}, {sort: {uploadedAt: -1}});
+    }
   },
 
   cover() {
@@ -163,7 +396,11 @@ Cards.helpers({
   },
 
   checklists() {
-    return Checklists.find({cardId: this._id}, {sort: { sort: 1 } });
+    if (this.isLinkedCard()) {
+      return Checklists.find({cardId: this.linkedId}, {sort: { sort: 1 } });
+    } else {
+      return Checklists.find({cardId: this._id}, {sort: { sort: 1 } });
+    }
   },
 
   checklistItemCount() {
@@ -192,6 +429,96 @@ Cards.helpers({
     return this.checklistItemCount() !== 0;
   },
 
+  subtasks() {
+    return Cards.find({
+      parentId: this._id,
+      archived: false,
+    }, {
+      sort: {
+        sort: 1,
+      },
+    });
+  },
+
+  allSubtasks() {
+    return Cards.find({
+      parentId: this._id,
+      archived: false,
+    }, {
+      sort: {
+        sort: 1,
+      },
+    });
+  },
+
+  subtasksCount() {
+    return Cards.find({
+      parentId: this._id,
+      archived: false,
+    }).count();
+  },
+
+  subtasksFinishedCount() {
+    return Cards.find({
+      parentId: this._id,
+      archived: true,
+    }).count();
+  },
+
+  subtasksFinished() {
+    const finishCount = this.subtasksFinishedCount();
+    return finishCount > 0 && this.subtasksCount() === finishCount;
+  },
+
+  allowsSubtasks() {
+    return this.subtasksCount() !== 0;
+  },
+
+  customFieldIndex(customFieldId) {
+    return _.pluck(this.customFields, '_id').indexOf(customFieldId);
+  },
+
+  // customFields with definitions
+  customFieldsWD() {
+
+    // get all definitions
+    const definitions = CustomFields.find({
+      boardIds: {$in: [this.boardId]},
+    }).fetch();
+
+    // match right definition to each field
+    if (!this.customFields) return [];
+    return this.customFields.map((customField) => {
+      const definition = definitions.find((definition) => {
+        return definition._id === customField._id;
+      });
+      if (!definition) {
+        return {};
+      }
+      //search for "True Value" which is for DropDowns other then the Value (which is the id)
+      let trueValue = customField.value;
+      if (definition.settings.dropdownItems && definition.settings.dropdownItems.length > 0) {
+        for (let i = 0; i < definition.settings.dropdownItems.length; i++) {
+          if (definition.settings.dropdownItems[i]._id === customField.value) {
+            trueValue = definition.settings.dropdownItems[i].name;
+          }
+        }
+      }
+      return {
+        _id: customField._id,
+        value: customField.value,
+        trueValue,
+        definition,
+      };
+    });
+  },
+
+  colorClass() {
+    if (this.color)
+      return this.color;
+    return '';
+  },
+
   absoluteUrl() {
     const board = this.board();
     return FlowRouter.url('card', {
@@ -202,49 +529,560 @@ Cards.helpers({
   },
 
   canBeRestored() {
-    const list = Lists.findOne({_id: this.listId});
-    if(!list.getWipLimit('soft') && list.getWipLimit('enabled') && list.getWipLimit('value') === list.cards().count()){
+    const list = Lists.findOne({
+      _id: this.listId,
+    });
+    if (!list.getWipLimit('soft') && list.getWipLimit('enabled') && list.getWipLimit('value') === list.cards().count()) {
       return false;
     }
     return true;
   },
+
+  parentCard() {
+    if (this.parentId === '') {
+      return null;
+    }
+    return Cards.findOne(this.parentId);
+  },
+
+  parentCardName() {
+    let result = '';
+    if (this.parentId !== '') {
+      const card = Cards.findOne(this.parentId);
+      if (card) {
+        result = card.title;
+      }
+    }
+    return result;
+  },
+
+  parentListId() {
+    const result = [];
+    let crtParentId = this.parentId;
+    while (crtParentId !== '') {
+      const crt = Cards.findOne(crtParentId);
+      if ((crt === null) || (crt === undefined)) {
+        // maybe it has been deleted
+        break;
+      }
+      if (crtParentId in result) {
+        // circular reference
+        break;
+      }
+      result.unshift(crtParentId);
+      crtParentId = crt.parentId;
+    }
+    return result;
+  },
+
+  parentList() {
+    const resultId = [];
+    const result = [];
+    let crtParentId = this.parentId;
+    while (crtParentId !== '') {
+      const crt = Cards.findOne(crtParentId);
+      if ((crt === null) || (crt === undefined)) {
+        // maybe it has been deleted
+        break;
+      }
+      if (crtParentId in resultId) {
+        // circular reference
+        break;
+      }
+      resultId.unshift(crtParentId);
+      result.unshift(crt);
+      crtParentId = crt.parentId;
+    }
+    return result;
+  },
+
+  parentString(sep) {
+    return this.parentList().map(function(elem) {
+      return elem.title;
+    }).join(sep);
+  },
+
+  isTopLevel() {
+    return this.parentId === '';
+  },
+
+  isLinkedCard() {
+    return this.type === 'cardType-linkedCard';
+  },
+
+  isLinkedBoard() {
+    return this.type === 'cardType-linkedBoard';
+  },
+
+  isLinked() {
+    return this.isLinkedCard() || this.isLinkedBoard();
+  },
+
+  setDescription(description) {
+    if (this.isLinkedCard()) {
+      return Cards.update({_id: this.linkedId}, {$set: {description}});
+    } else if (this.isLinkedBoard()) {
+      return Boards.update({_id: this.linkedId}, {$set: {description}});
+    } else {
+      return Cards.update(
+        {_id: this._id},
+        {$set: {description}}
+      );
+    }
+  },
+
+  getDescription() {
+    if (this.isLinkedCard()) {
+      const card = Cards.findOne({_id: this.linkedId});
+      if (card && card.description)
+        return card.description;
+      else
+        return null;
+    } else if (this.isLinkedBoard()) {
+      const board = Boards.findOne({_id: this.linkedId});
+      if (board && board.description)
+        return board.description;
+      else
+        return null;
+    } else if (this.description) {
+      return this.description;
+    } else {
+      return null;
+    }
+  },
+
+  getMembers() {
+    if (this.isLinkedCard()) {
+      const card = Cards.findOne({_id: this.linkedId});
+      return card.members;
+    } else if (this.isLinkedBoard()) {
+      const board = Boards.findOne({_id: this.linkedId});
+      return board.activeMembers().map((member) => {
+        return member.userId;
+      });
+    } else {
+      return this.members;
+    }
+  },
+
+  assignMember(memberId) {
+    if (this.isLinkedCard()) {
+      return Cards.update(
+        { _id: this.linkedId },
+        { $addToSet: { members: memberId }}
+      );
+    } else if (this.isLinkedBoard()) {
+      const board = Boards.findOne({_id: this.linkedId});
+      return board.addMember(memberId);
+    } else {
+      return Cards.update(
+        { _id: this._id },
+        { $addToSet: { members: memberId}}
+      );
+    }
+  },
+
+  unassignMember(memberId) {
+    if (this.isLinkedCard()) {
+      return Cards.update(
+        { _id: this.linkedId },
+        { $pull: { members: memberId }}
+      );
+    } else if (this.isLinkedBoard()) {
+      const board = Boards.findOne({_id: this.linkedId});
+      return board.removeMember(memberId);
+    } else {
+      return Cards.update(
+        { _id: this._id },
+        { $pull: { members: memberId}}
+      );
+    }
+  },
+
+  toggleMember(memberId) {
+    if (this.getMembers() && this.getMembers().indexOf(memberId) > -1) {
+      return this.unassignMember(memberId);
+    } else {
+      return this.assignMember(memberId);
+    }
+  },
+
+  getReceived() {
+    if (this.isLinkedCard()) {
+      const card = Cards.findOne({_id: this.linkedId});
+      return card.receivedAt;
+    } else {
+      return this.receivedAt;
+    }
+  },
+
+  setReceived(receivedAt) {
+    if (this.isLinkedCard()) {
+      return Cards.update(
+        {_id: this.linkedId},
+        {$set: {receivedAt}}
+      );
+    } else {
+      return Cards.update(
+        {_id: this._id},
+        {$set: {receivedAt}}
+      );
+    }
+  },
+
+  getStart() {
+    if (this.isLinkedCard()) {
+      const card = Cards.findOne({_id: this.linkedId});
+      return card.startAt;
+    } else if (this.isLinkedBoard()) {
+      const board = Boards.findOne({_id: this.linkedId});
+      return board.startAt;
+    } else {
+      return this.startAt;
+    }
+  },
+
+  setStart(startAt) {
+    if (this.isLinkedCard()) {
+      return Cards.update(
+        { _id: this.linkedId },
+        {$set: {startAt}}
+      );
+    } else if (this.isLinkedBoard()) {
+      return Boards.update(
+        {_id: this.linkedId},
+        {$set: {startAt}}
+      );
+    } else {
+      return Cards.update(
+        {_id: this._id},
+        {$set: {startAt}}
+      );
+    }
+  },
+
+  getDue() {
+    if (this.isLinkedCard()) {
+      const card = Cards.findOne({_id: this.linkedId});
+      return card.dueAt;
+    } else if (this.isLinkedBoard()) {
+      const board = Boards.findOne({_id: this.linkedId});
+      return board.dueAt;
+    } else {
+      return this.dueAt;
+    }
+  },
+
+  setDue(dueAt) {
+    if (this.isLinkedCard()) {
+      return Cards.update(
+        { _id: this.linkedId },
+        {$set: {dueAt}}
+      );
+    } else if (this.isLinkedBoard()) {
+      return Boards.update(
+        {_id: this.linkedId},
+        {$set: {dueAt}}
+      );
+    } else {
+      return Cards.update(
+        {_id: this._id},
+        {$set: {dueAt}}
+      );
+    }
+  },
+
+  getEnd() {
+    if (this.isLinkedCard()) {
+      const card = Cards.findOne({_id: this.linkedId});
+      return card.endAt;
+    } else if (this.isLinkedBoard()) {
+      const board = Boards.findOne({_id: this.linkedId});
+      return board.endAt;
+    } else {
+      return this.endAt;
+    }
+  },
+
+  setEnd(endAt) {
+    if (this.isLinkedCard()) {
+      return Cards.update(
+        { _id: this.linkedId },
+        {$set: {endAt}}
+      );
+    } else if (this.isLinkedBoard()) {
+      return Boards.update(
+        {_id: this.linkedId},
+        {$set: {endAt}}
+      );
+    } else {
+      return Cards.update(
+        {_id: this._id},
+        {$set: {endAt}}
+      );
+    }
+  },
+
+  getIsOvertime() {
+    if (this.isLinkedCard()) {
+      const card = Cards.findOne({ _id: this.linkedId });
+      return card.isOvertime;
+    } else if (this.isLinkedBoard()) {
+      const board = Boards.findOne({ _id: this.linkedId});
+      return board.isOvertime;
+    } else {
+      return this.isOvertime;
+    }
+  },
+
+  setIsOvertime(isOvertime) {
+    if (this.isLinkedCard()) {
+      return Cards.update(
+        { _id: this.linkedId },
+        {$set: {isOvertime}}
+      );
+    } else if (this.isLinkedBoard()) {
+      return Boards.update(
+        {_id: this.linkedId},
+        {$set: {isOvertime}}
+      );
+    } else {
+      return Cards.update(
+        {_id: this._id},
+        {$set: {isOvertime}}
+      );
+    }
+  },
+
+  getSpentTime() {
+    if (this.isLinkedCard()) {
+      const card = Cards.findOne({ _id: this.linkedId });
+      return card.spentTime;
+    } else if (this.isLinkedBoard()) {
+      const board = Boards.findOne({ _id: this.linkedId});
+      return board.spentTime;
+    } else {
+      return this.spentTime;
+    }
+  },
+
+  setSpentTime(spentTime) {
+    if (this.isLinkedCard()) {
+      return Cards.update(
+        { _id: this.linkedId },
+        {$set: {spentTime}}
+      );
+    } else if (this.isLinkedBoard()) {
+      return Boards.update(
+        {_id: this.linkedId},
+        {$set: {spentTime}}
+      );
+    } else {
+      return Cards.update(
+        {_id: this._id},
+        {$set: {spentTime}}
+      );
+    }
+  },
+
+  getId() {
+    if (this.isLinked()) {
+      return this.linkedId;
+    } else {
+      return this._id;
+    }
+  },
+
+  getTitle() {
+    if (this.isLinkedCard()) {
+      const card = Cards.findOne({ _id: this.linkedId });
+      return card.title;
+    } else if (this.isLinkedBoard()) {
+      const board = Boards.findOne({ _id: this.linkedId});
+      return board.title;
+    } else {
+      return this.title;
+    }
+  },
+
+  getBoardTitle() {
+    if (this.isLinkedCard()) {
+      const card = Cards.findOne({ _id: this.linkedId });
+      const board = Boards.findOne({ _id: card.boardId });
+      return board.title;
+    } else if (this.isLinkedBoard()) {
+      const board = Boards.findOne({ _id: this.linkedId});
+      return board.title;
+    } else {
+      const board = Boards.findOne({ _id: this.boardId });
+      return board.title;
+    }
+  },
+
+  setTitle(title) {
+    if (this.isLinkedCard()) {
+      return Cards.update(
+        { _id: this.linkedId },
+        {$set: {title}}
+      );
+    } else if (this.isLinkedBoard()) {
+      return Boards.update(
+        {_id: this.linkedId},
+        {$set: {title}}
+      );
+    } else {
+      return Cards.update(
+        {_id: this._id},
+        {$set: {title}}
+      );
+    }
+  },
+
+  getArchived() {
+    if (this.isLinkedCard()) {
+      const card = Cards.findOne({ _id: this.linkedId });
+      return card.archived;
+    } else if (this.isLinkedBoard()) {
+      const board = Boards.findOne({ _id: this.linkedId});
+      return board.archived;
+    } else {
+      return this.archived;
+    }
+  },
+
+  setRequestedBy(requestedBy) {
+    if (this.isLinkedCard()) {
+      return Cards.update(
+        { _id: this.linkedId },
+        {$set: {requestedBy}}
+      );
+    } else {
+      return Cards.update(
+        {_id: this._id},
+        {$set: {requestedBy}}
+      );
+    }
+  },
+
+  getRequestedBy() {
+    if (this.isLinkedCard()) {
+      const card = Cards.findOne({ _id: this.linkedId });
+      return card.requestedBy;
+    } else  {
+      return this.requestedBy;
+    }
+  },
+
+  setAssignedBy(assignedBy) {
+    if (this.isLinkedCard()) {
+      return Cards.update(
+        { _id: this.linkedId },
+        {$set: {assignedBy}}
+      );
+    } else {
+      return Cards.update(
+        {_id: this._id},
+        {$set: {assignedBy}}
+      );
+    }
+  },
+
+  getAssignedBy() {
+    if (this.isLinkedCard()) {
+      const card = Cards.findOne({ _id: this.linkedId });
+      return card.assignedBy;
+    } else  {
+      return this.assignedBy;
+    }
+  },
+
+  isTemplateCard() {
+    return this.type === 'template-card';
+  },
 });
 
 Cards.mutations({
+  applyToChildren(funct) {
+    Cards.find({
+      parentId: this._id,
+    }).forEach((card) => {
+      funct(card);
+    });
+  },
+
   archive() {
-    return {$set: {archived: true}};
+    this.applyToChildren((card) => {
+      return card.archive();
+    });
+    return {
+      $set: {
+        archived: true,
+      },
+    };
   },
 
   restore() {
-    return {$set: {archived: false}};
+    this.applyToChildren((card) => {
+      return card.restore();
+    });
+    return {
+      $set: {
+        archived: false,
+      },
+    };
   },
 
-  setTitle(title) {
-    return {$set: {title}};
-  },
+  move(boardId, swimlaneId, listId, sort) {
+    // Copy Custom Fields
+    if (this.boardId !== boardId) {
+      CustomFields.find({
+        _id: {$in: this.customFields.map((cf) => { return cf._id; })},
+      }).forEach((cf) => {
+        if (!_.contains(cf.boardIds, boardId))
+          cf.addBoard(boardId);
+      });
+    }
 
-  setDescription(description) {
-    return {$set: {description}};
-  },
+    // Get label names
+    const oldBoard = Boards.findOne(this.boardId);
+    const oldBoardLabels = oldBoard.labels;
+    const oldCardLabels = _.pluck(_.filter(oldBoardLabels, (label) => {
+      return _.contains(this.labelIds, label._id);
+    }), 'name');
+
+    const newBoard = Boards.findOne(boardId);
+    const newBoardLabels = newBoard.labels;
+    const newCardLabelIds = _.pluck(_.filter(newBoardLabels, (label) => {
+      return label.name && _.contains(oldCardLabels, label.name);
+    }), '_id');
 
-  move(swimlaneId, listId, sortIndex) {
-    const list = Lists.findOne(listId);
     const mutatedFields = {
+      boardId,
       swimlaneId,
       listId,
-      boardId: list.boardId,
-      sort: sortIndex,
+      sort,
+      labelIds: newCardLabelIds,
     };
 
-    return {$set: mutatedFields};
+    Cards.update(this._id, {
+      $set: mutatedFields,
+    });
   },
 
   addLabel(labelId) {
-    return {$addToSet: {labelIds: labelId}};
+    return {
+      $addToSet: {
+        labelIds: labelId,
+      },
+    };
   },
 
   removeLabel(labelId) {
-    return {$pull: {labelIds: labelId}};
+    return {
+      $pull: {
+        labelIds: labelId,
+      },
+    };
   },
 
   toggleLabel(labelId) {
@@ -255,12 +1093,31 @@ Cards.mutations({
     }
   },
 
+  setColor(newColor) {
+    if (newColor === 'white') {
+      newColor = null;
+    }
+    return {
+      $set: {
+        color: newColor,
+      },
+    };
+  },
+
   assignMember(memberId) {
-    return {$addToSet: {members: memberId}};
+    return {
+      $addToSet: {
+        members: memberId,
+      },
+    };
   },
 
   unassignMember(memberId) {
-    return {$pull: {members: memberId}};
+    return {
+      $pull: {
+        members: memberId,
+      },
+    };
   },
 
   toggleMember(memberId) {
@@ -271,71 +1128,220 @@ Cards.mutations({
     }
   },
 
+  assignCustomField(customFieldId) {
+    return {
+      $addToSet: {
+        customFields: {
+          _id: customFieldId,
+          value: null,
+        },
+      },
+    };
+  },
+
+  unassignCustomField(customFieldId) {
+    return {
+      $pull: {
+        customFields: {
+          _id: customFieldId,
+        },
+      },
+    };
+  },
+
+  toggleCustomField(customFieldId) {
+    if (this.customFields && this.customFieldIndex(customFieldId) > -1) {
+      return this.unassignCustomField(customFieldId);
+    } else {
+      return this.assignCustomField(customFieldId);
+    }
+  },
+
+  setCustomField(customFieldId, value) {
+    // todo
+    const index = this.customFieldIndex(customFieldId);
+    if (index > -1) {
+      const update = {
+        $set: {},
+      };
+      update.$set[`customFields.${index}.value`] = value;
+      return update;
+    }
+    // TODO
+    // Ignatz 18.05.2018: Return null to silence ESLint. No Idea if that is correct
+    return null;
+  },
+
   setCover(coverId) {
-    return {$set: {coverId}};
+    return {
+      $set: {
+        coverId,
+      },
+    };
   },
 
   unsetCover() {
-    return {$unset: {coverId: ''}};
+    return {
+      $unset: {
+        coverId: '',
+      },
+    };
   },
 
   setReceived(receivedAt) {
-    return {$set: {receivedAt}};
+    return {
+      $set: {
+        receivedAt,
+      },
+    };
   },
 
   unsetReceived() {
-    return {$unset: {receivedAt: ''}};
+    return {
+      $unset: {
+        receivedAt: '',
+      },
+    };
   },
 
   setStart(startAt) {
-    return {$set: {startAt}};
+    return {
+      $set: {
+        startAt,
+      },
+    };
   },
 
   unsetStart() {
-    return {$unset: {startAt: ''}};
+    return {
+      $unset: {
+        startAt: '',
+      },
+    };
   },
 
   setDue(dueAt) {
-    return {$set: {dueAt}};
+    return {
+      $set: {
+        dueAt,
+      },
+    };
   },
 
   unsetDue() {
-    return {$unset: {dueAt: ''}};
+    return {
+      $unset: {
+        dueAt: '',
+      },
+    };
   },
 
   setEnd(endAt) {
-    return {$set: {endAt}};
+    return {
+      $set: {
+        endAt,
+      },
+    };
   },
 
   unsetEnd() {
-    return {$unset: {endAt: ''}};
+    return {
+      $unset: {
+        endAt: '',
+      },
+    };
   },
 
   setOvertime(isOvertime) {
-    return {$set: {isOvertime}};
+    return {
+      $set: {
+        isOvertime,
+      },
+    };
   },
 
   setSpentTime(spentTime) {
-    return {$set: {spentTime}};
+    return {
+      $set: {
+        spentTime,
+      },
+    };
   },
 
   unsetSpentTime() {
-    return {$unset: {spentTime: '', isOvertime: false}};
+    return {
+      $unset: {
+        spentTime: '',
+        isOvertime: false,
+      },
+    };
   },
-});
 
+  setParentId(parentId) {
+    return {
+      $set: {
+        parentId,
+      },
+    };
+  },
+});
 
 //FUNCTIONS FOR creation of Activities
 
-function cardMove(userId, doc, fieldNames, oldListId) {
-  if (_.contains(fieldNames, 'listId') && doc.listId !== oldListId) {
+function updateActivities(doc, fieldNames, modifier) {
+  if (_.contains(fieldNames, 'labelIds') && _.contains(fieldNames, 'boardId')) {
+    Activities.find({
+      activityType: 'addedLabel',
+      cardId: doc._id,
+    }).forEach((a) => {
+      const lidx = doc.labelIds.indexOf(a.labelId);
+      if (lidx !== -1 && modifier.$set.labelIds.length > lidx) {
+        Activities.update(a._id, {
+          $set: {
+            labelId: modifier.$set.labelIds[doc.labelIds.indexOf(a.labelId)],
+            boardId: modifier.$set.boardId,
+          },
+        });
+      } else {
+        Activities.remove(a._id);
+      }
+    });
+  } else if (_.contains(fieldNames, 'boardId')) {
+    Activities.remove({
+      activityType: 'addedLabel',
+      cardId: doc._id,
+    });
+  }
+}
+
+function cardMove(userId, doc, fieldNames, oldListId, oldSwimlaneId, oldBoardId) {
+  if (_.contains(fieldNames, 'boardId') && (doc.boardId !== oldBoardId)) {
+    Activities.insert({
+      userId,
+      activityType: 'moveCardBoard',
+      boardName: Boards.findOne(doc.boardId).title,
+      boardId: doc.boardId,
+      oldBoardId,
+      oldBoardName: Boards.findOne(oldBoardId).title,
+      cardId: doc._id,
+      swimlaneName: Swimlanes.findOne(doc.swimlaneId).title,
+      swimlaneId: doc.swimlaneId,
+      oldSwimlaneId,
+    });
+  } else if ((_.contains(fieldNames, 'listId') && doc.listId !== oldListId) ||
+    (_.contains(fieldNames, 'swimlaneId') && doc.swimlaneId !== oldSwimlaneId)){
     Activities.insert({
       userId,
       oldListId,
       activityType: 'moveCard',
+      listName: Lists.findOne(doc.listId).title,
       listId: doc.listId,
       boardId: doc.boardId,
       cardId: doc._id,
+      cardTitle:doc.title,
+      swimlaneName: Swimlanes.findOne(doc.swimlaneId).title,
+      swimlaneId: doc.swimlaneId,
+      oldSwimlaneId,
     });
   }
 }
@@ -346,17 +1352,21 @@ function cardState(userId, doc, fieldNames) {
       Activities.insert({
         userId,
         activityType: 'archivedCard',
+        listName: Lists.findOne(doc.listId).title,
         boardId: doc.boardId,
         listId: doc.listId,
         cardId: doc._id,
+        swimlaneId: doc.swimlaneId,
       });
     } else {
       Activities.insert({
         userId,
         activityType: 'restoredCard',
         boardId: doc.boardId,
+        listName: Lists.findOne(doc.listId).title,
         listId: doc.listId,
         cardId: doc._id,
+        swimlaneId: doc.swimlaneId,
       });
     }
   }
@@ -369,13 +1379,17 @@ function cardMembers(userId, doc, fieldNames, modifier) {
   // Say hello to the new member
   if (modifier.$addToSet && modifier.$addToSet.members) {
     memberId = modifier.$addToSet.members;
+    const username = Users.findOne(memberId).username;
     if (!_.contains(doc.members, memberId)) {
       Activities.insert({
         userId,
-        memberId,
+        username,
         activityType: 'joinMember',
         boardId: doc.boardId,
         cardId: doc._id,
+        memberId,
+        listId: doc.listId,
+        swimlaneId: doc.swimlaneId,
       });
     }
   }
@@ -383,36 +1397,136 @@ function cardMembers(userId, doc, fieldNames, modifier) {
   // Say goodbye to the former member
   if (modifier.$pull && modifier.$pull.members) {
     memberId = modifier.$pull.members;
+    const username = Users.findOne(memberId).username;
     // Check that the former member is member of the card
     if (_.contains(doc.members, memberId)) {
       Activities.insert({
         userId,
-        memberId,
+        username,
         activityType: 'unjoinMember',
         boardId: doc.boardId,
         cardId: doc._id,
+        memberId,
+        listId: doc.listId,
+        swimlaneId: doc.swimlaneId,
+      });
+    }
+  }
+}
+
+function cardLabels(userId, doc, fieldNames, modifier) {
+  if (!_.contains(fieldNames, 'labelIds'))
+    return;
+  let labelId;
+  // Say hello to the new label
+  if (modifier.$addToSet && modifier.$addToSet.labelIds) {
+    labelId = modifier.$addToSet.labelIds;
+    if (!_.contains(doc.labelIds, labelId)) {
+      const act = {
+        userId,
+        labelId,
+        activityType: 'addedLabel',
+        boardId: doc.boardId,
+        cardId: doc._id,
+        listId: doc.listId,
+        swimlaneId: doc.swimlaneId,
+      };
+      Activities.insert(act);
+    }
+  }
+
+  // Say goodbye to the label
+  if (modifier.$pull && modifier.$pull.labelIds) {
+    labelId = modifier.$pull.labelIds;
+    // Check that the former member is member of the card
+    if (_.contains(doc.labelIds, labelId)) {
+      Activities.insert({
+        userId,
+        labelId,
+        activityType: 'removedLabel',
+        boardId: doc.boardId,
+        cardId: doc._id,
+        listId: doc.listId,
+        swimlaneId: doc.swimlaneId,
       });
     }
   }
 }
 
+function cardCustomFields(userId, doc, fieldNames, modifier) {
+  if (!_.contains(fieldNames, 'customFields'))
+    return;
+
+  // Say hello to the new customField value
+  if (modifier.$set) {
+    _.each(modifier.$set, (value, key) => {
+      if (key.startsWith('customFields')) {
+        const dotNotation = key.split('.');
+
+        // only individual changes are registered
+        if (dotNotation.length > 1) {
+          const customFieldId = doc.customFields[dotNotation[1]]._id;
+          const act = {
+            userId,
+            customFieldId,
+            value,
+            activityType: 'setCustomField',
+            boardId: doc.boardId,
+            cardId: doc._id,
+          };
+          Activities.insert(act);
+        }
+      }
+    });
+  }
+
+  // Say goodbye to the former customField value
+  if (modifier.$unset) {
+    _.each(modifier.$unset, (value, key) => {
+      if (key.startsWith('customFields')) {
+        const dotNotation = key.split('.');
+
+        // only individual changes are registered
+        if (dotNotation.length > 1) {
+          const customFieldId = doc.customFields[dotNotation[1]]._id;
+          const act = {
+            userId,
+            customFieldId,
+            activityType: 'unsetCustomField',
+            boardId: doc.boardId,
+            cardId: doc._id,
+          };
+          Activities.insert(act);
+        }
+      }
+    });
+  }
+}
+
 function cardCreation(userId, doc) {
   Activities.insert({
     userId,
     activityType: 'createCard',
     boardId: doc.boardId,
+    listName: Lists.findOne(doc.listId).title,
     listId: doc.listId,
     cardId: doc._id,
+    cardTitle:doc.title,
+    swimlaneName: Swimlanes.findOne(doc.swimlaneId).title,
+    swimlaneId: doc.swimlaneId,
   });
 }
 
 function cardRemover(userId, doc) {
-  Activities.remove({
+  ChecklistItems.remove({
     cardId: doc._id,
   });
   Checklists.remove({
     cardId: doc._id,
   });
+  Cards.remove({
+    parentId: doc._id,
+  });
   CardComments.remove({
     cardId: doc._id,
   });
@@ -421,12 +1535,17 @@ function cardRemover(userId, doc) {
   });
 }
 
-
 if (Meteor.isServer) {
   // Cards are often fetched within a board, so we create an index to make these
   // queries more efficient.
   Meteor.startup(() => {
     Cards._collection._ensureIndex({boardId: 1, createdAt: -1});
+    // https://github.com/wekan/wekan/issues/1863
+    // Swimlane added a new field in the cards collection of mongodb named parentId.
+    // When loading a board, mongodb is searching for every cards, the id of the parent (in the swinglanes collection).
+    // With a huge database, this result in a very slow app and high CPU on the mongodb side.
+    // To correct it, add Index to parentId:
+    Cards._collection._ensureIndex({parentId: 1});
   });
 
   Cards.after.insert((userId, doc) => {
@@ -439,31 +1558,92 @@ if (Meteor.isServer) {
   });
 
   //New activity for card moves
-  Cards.after.update(function (userId, doc, fieldNames) {
+  Cards.after.update(function(userId, doc, fieldNames) {
     const oldListId = this.previous.listId;
-    cardMove(userId, doc, fieldNames, oldListId);
+    const oldSwimlaneId = this.previous.swimlaneId;
+    const oldBoardId = this.previous.boardId;
+    cardMove(userId, doc, fieldNames, oldListId, oldSwimlaneId, oldBoardId);
   });
 
   // Add a new activity if we add or remove a member to the card
   Cards.before.update((userId, doc, fieldNames, modifier) => {
     cardMembers(userId, doc, fieldNames, modifier);
+    updateActivities(doc, fieldNames, modifier);
+  });
+
+  // Add a new activity if we add or remove a label to the card
+  Cards.before.update((userId, doc, fieldNames, modifier) => {
+    cardLabels(userId, doc, fieldNames, modifier);
+  });
+
+  // Add a new activity if we edit a custom field
+  Cards.before.update((userId, doc, fieldNames, modifier) => {
+    cardCustomFields(userId, doc, fieldNames, modifier);
   });
 
   // Remove all activities associated with a card if we remove the card
   // Remove also card_comments / checklists / attachments
-  Cards.after.remove((userId, doc) => {
+  Cards.before.remove((userId, doc) => {
     cardRemover(userId, doc);
   });
 }
+//SWIMLANES REST API
+if (Meteor.isServer) {
+  /**
+   * @operation get_swimlane_cards
+   * @summary get all cards attached to a swimlane
+   *
+   * @param {string} boardId the board ID
+   * @param {string} swimlaneId the swimlane ID
+   * @return_type [{_id: string,
+   *                title: string,
+   *                description: string,
+   *                listId: string}]
+   */
+  JsonRoutes.add('GET', '/api/boards/:boardId/swimlanes/:swimlaneId/cards', function(req, res) {
+    const paramBoardId = req.params.boardId;
+    const paramSwimlaneId = req.params.swimlaneId;
+    Authentication.checkBoardAccess(req.userId, paramBoardId);
+    JsonRoutes.sendResult(res, {
+      code: 200,
+      data: Cards.find({
+        boardId: paramBoardId,
+        swimlaneId: paramSwimlaneId,
+        archived: false,
+      }).map(function(doc) {
+        return {
+          _id: doc._id,
+          title: doc.title,
+          description: doc.description,
+          listId: doc.listId,
+        };
+      }),
+    });
+  });
+}
 //LISTS REST API
 if (Meteor.isServer) {
-  JsonRoutes.add('GET', '/api/boards/:boardId/lists/:listId/cards', function (req, res) {
+  /**
+   * @operation get_all_cards
+   * @summary Get all Cards attached to a List
+   *
+   * @param {string} boardId the board ID
+   * @param {string} listId the list ID
+   * @return_type [{_id: string,
+   *                title: string,
+   *                description: string}]
+   */
+  JsonRoutes.add('GET', '/api/boards/:boardId/lists/:listId/cards', function(req, res) {
     const paramBoardId = req.params.boardId;
     const paramListId = req.params.listId;
     Authentication.checkBoardAccess(req.userId, paramBoardId);
     JsonRoutes.sendResult(res, {
       code: 200,
-      data: Cards.find({boardId: paramBoardId, listId: paramListId, archived: false}).map(function (doc) {
+      data: Cards.find({
+        boardId: paramBoardId,
+        listId: paramListId,
+        archived: false,
+      }).map(function(doc) {
         return {
           _id: doc._id,
           title: doc.title,
@@ -473,24 +1653,57 @@ if (Meteor.isServer) {
     });
   });
 
-  JsonRoutes.add('GET', '/api/boards/:boardId/lists/:listId/cards/:cardId', function (req, res) {
+  /**
+   * @operation get_card
+   * @summary Get a Card
+   *
+   * @param {string} boardId the board ID
+   * @param {string} listId the list ID of the card
+   * @param {string} cardId the card ID
+   * @return_type Cards
+   */
+  JsonRoutes.add('GET', '/api/boards/:boardId/lists/:listId/cards/:cardId', function(req, res) {
     const paramBoardId = req.params.boardId;
     const paramListId = req.params.listId;
     const paramCardId = req.params.cardId;
     Authentication.checkBoardAccess(req.userId, paramBoardId);
     JsonRoutes.sendResult(res, {
       code: 200,
-      data: Cards.findOne({_id: paramCardId, listId: paramListId, boardId: paramBoardId, archived: false}),
+      data: Cards.findOne({
+        _id: paramCardId,
+        listId: paramListId,
+        boardId: paramBoardId,
+        archived: false,
+      }),
     });
   });
 
-  JsonRoutes.add('POST', '/api/boards/:boardId/lists/:listId/cards', function (req, res) {
+  /**
+   * @operation new_card
+   * @summary Create a new Card
+   *
+   * @param {string} boardId the board ID of the new card
+   * @param {string} listId the list ID of the new card
+   * @param {string} authorID the user ID of the person owning the card
+   * @param {string} title the title of the new card
+   * @param {string} description the description of the new card
+   * @param {string} swimlaneId the swimlane ID of the new card
+   * @param {string} [members] the member IDs list of the new card
+   * @return_type {_id: string}
+   */
+  JsonRoutes.add('POST', '/api/boards/:boardId/lists/:listId/cards', function(req, res) {
     Authentication.checkUserId(req.userId);
     const paramBoardId = req.params.boardId;
     const paramListId = req.params.listId;
-    const check = Users.findOne({_id: req.body.authorId});
+    const currentCards = Cards.find({
+      listId: paramListId,
+      archived: false,
+    }, { sort: ['sort'] });
+    const check = Users.findOne({
+      _id: req.body.authorId,
+    });
     const members = req.body.members || [req.body.authorId];
-    if (typeof  check !== 'undefined') {
+    if (typeof check !== 'undefined') {
       const id = Cards.direct.insert({
         title: req.body.title,
         boardId: paramBoardId,
@@ -498,8 +1711,8 @@ if (Meteor.isServer) {
         description: req.body.description,
         userId: req.body.authorId,
         swimlaneId: req.body.swimlaneId,
-        sort: 0,
-        members: members,
+        sort: currentCards.count(),
+        members,
       });
       JsonRoutes.sendResult(res, {
         code: 200,
@@ -508,7 +1721,9 @@ if (Meteor.isServer) {
         },
       });
 
-      const card = Cards.findOne({_id:id});
+      const card = Cards.findOne({
+        _id: id,
+      });
       cardCreation(req.body.authorId, card);
 
     } else {
@@ -518,7 +1733,51 @@ if (Meteor.isServer) {
     }
   });
 
-  JsonRoutes.add('PUT', '/api/boards/:boardId/lists/:listId/cards/:cardId', function (req, res) {
+  /*
+   * Note for the JSDoc:
+   * 'list' will be interpreted as the path parameter
+   * 'listID' will be interpreted as the body parameter
+   */
+  /**
+   * @operation edit_card
+   * @summary Edit Fields in a Card
+   *
+   * @description Edit a card
+   *
+   * The color has to be chosen between `white`, `green`, `yellow`, `orange`,
+   * `red`, `purple`, `blue`, `sky`, `lime`, `pink`, `black`, `silver`,
+   * `peachpuff`, `crimson`, `plum`, `darkgreen`, `slateblue`, `magenta`,
+   * `gold`, `navy`, `gray`, `saddlebrown`, `paleturquoise`, `mistyrose`,
+   * `indigo`:
+   *
+   * <img src="/card-colors.png" width="40%" alt="Wekan card colors" />
+   *
+   * Note: setting the color to white has the same effect than removing it.
+   *
+   * @param {string} boardId the board ID of the card
+   * @param {string} list the list ID of the card
+   * @param {string} cardId the ID of the card
+   * @param {string} [title] the new title of the card
+   * @param {string} [listId] the new list ID of the card (move operation)
+   * @param {string} [description] the new description of the card
+   * @param {string} [authorId] change the owner of the card
+   * @param {string} [labelIds] the new list of label IDs attached to the card
+   * @param {string} [swimlaneId] the new swimlane ID of the card
+   * @param {string} [members] the new list of member IDs attached to the card
+   * @param {string} [requestedBy] the new requestedBy field of the card
+   * @param {string} [assignedBy] the new assignedBy field of the card
+   * @param {string} [receivedAt] the new receivedAt field of the card
+   * @param {string} [assignBy] the new assignBy field of the card
+   * @param {string} [startAt] the new startAt field of the card
+   * @param {string} [dueAt] the new dueAt field of the card
+   * @param {string} [endAt] the new endAt field of the card
+   * @param {string} [spentTime] the new spentTime field of the card
+   * @param {boolean} [isOverTime] the new isOverTime field of the card
+   * @param {string} [customFields] the new customFields value of the card
+   * @param {string} [color] the new color of the card
+   * @return_type {_id: string}
+   */
+  JsonRoutes.add('PUT', '/api/boards/:boardId/lists/:listId/cards/:cardId', function(req, res) {
     Authentication.checkUserId(req.userId);
     const paramBoardId = req.params.boardId;
     const paramCardId = req.params.cardId;
@@ -526,27 +1785,139 @@ if (Meteor.isServer) {
 
     if (req.body.hasOwnProperty('title')) {
       const newTitle = req.body.title;
-      Cards.direct.update({_id: paramCardId, listId: paramListId, boardId: paramBoardId, archived: false},
-        {$set: {title: newTitle}});
+      Cards.direct.update({
+        _id: paramCardId,
+        listId: paramListId,
+        boardId: paramBoardId,
+        archived: false,
+      }, {
+        $set: {
+          title: newTitle,
+        },
+      });
     }
     if (req.body.hasOwnProperty('listId')) {
       const newParamListId = req.body.listId;
-      Cards.direct.update({_id: paramCardId, listId: paramListId, boardId: paramBoardId, archived: false},
-        {$set: {listId: newParamListId}});
+      Cards.direct.update({
+        _id: paramCardId,
+        listId: paramListId,
+        boardId: paramBoardId,
+        archived: false,
+      }, {
+        $set: {
+          listId: newParamListId,
+        },
+      });
 
-      const card = Cards.findOne({_id: paramCardId} );
-      cardMove(req.body.authorId, card, {fieldName: 'listId'}, paramListId);
+      const card = Cards.findOne({
+        _id: paramCardId,
+      });
+      cardMove(req.body.authorId, card, {
+        fieldName: 'listId',
+      }, paramListId);
 
     }
     if (req.body.hasOwnProperty('description')) {
       const newDescription = req.body.description;
+      Cards.direct.update({
+        _id: paramCardId,
+        listId: paramListId,
+        boardId: paramBoardId,
+        archived: false,
+      }, {
+        $set: {
+          description: newDescription,
+        },
+      });
+    }
+    if (req.body.hasOwnProperty('color')) {
+      const newColor = req.body.color;
       Cards.direct.update({_id: paramCardId, listId: paramListId, boardId: paramBoardId, archived: false},
-        {$set: {description: newDescription}});
+        {$set: {color: newColor}});
     }
     if (req.body.hasOwnProperty('labelIds')) {
-      const newlabelIds = req.body.labelIds;
+      let newlabelIds = req.body.labelIds;
+      if (_.isString(newlabelIds)) {
+        if (newlabelIds === '') {
+          newlabelIds = null;
+        }
+        else {
+          newlabelIds = [newlabelIds];
+        }
+      }
+      Cards.direct.update({
+        _id: paramCardId,
+        listId: paramListId,
+        boardId: paramBoardId,
+        archived: false,
+      }, {
+        $set: {
+          labelIds: newlabelIds,
+        },
+      });
+    }
+    if (req.body.hasOwnProperty('requestedBy')) {
+      const newrequestedBy = req.body.requestedBy;
+      Cards.direct.update({_id: paramCardId, listId: paramListId, boardId: paramBoardId, archived: false},
+        {$set: {requestedBy: newrequestedBy}});
+    }
+    if (req.body.hasOwnProperty('assignedBy')) {
+      const newassignedBy = req.body.assignedBy;
+      Cards.direct.update({_id: paramCardId, listId: paramListId, boardId: paramBoardId, archived: false},
+        {$set: {assignedBy: newassignedBy}});
+    }
+    if (req.body.hasOwnProperty('receivedAt')) {
+      const newreceivedAt = req.body.receivedAt;
       Cards.direct.update({_id: paramCardId, listId: paramListId, boardId: paramBoardId, archived: false},
-        {$set: {labelIds: newlabelIds}});
+        {$set: {receivedAt: newreceivedAt}});
+    }
+    if (req.body.hasOwnProperty('startAt')) {
+      const newstartAt = req.body.startAt;
+      Cards.direct.update({_id: paramCardId, listId: paramListId, boardId: paramBoardId, archived: false},
+        {$set: {startAt: newstartAt}});
+    }
+    if (req.body.hasOwnProperty('dueAt')) {
+      const newdueAt = req.body.dueAt;
+      Cards.direct.update({_id: paramCardId, listId: paramListId, boardId: paramBoardId, archived: false},
+        {$set: {dueAt: newdueAt}});
+    }
+    if (req.body.hasOwnProperty('endAt')) {
+      const newendAt = req.body.endAt;
+      Cards.direct.update({_id: paramCardId, listId: paramListId, boardId: paramBoardId, archived: false},
+        {$set: {endAt: newendAt}});
+    }
+    if (req.body.hasOwnProperty('spentTime')) {
+      const newspentTime = req.body.spentTime;
+      Cards.direct.update({_id: paramCardId, listId: paramListId, boardId: paramBoardId, archived: false},
+        {$set: {spentTime: newspentTime}});
+    }
+    if (req.body.hasOwnProperty('isOverTime')) {
+      const newisOverTime = req.body.isOverTime;
+      Cards.direct.update({_id: paramCardId, listId: paramListId, boardId: paramBoardId, archived: false},
+        {$set: {isOverTime: newisOverTime}});
+    }
+    if (req.body.hasOwnProperty('customFields')) {
+      const newcustomFields = req.body.customFields;
+      Cards.direct.update({_id: paramCardId, listId: paramListId, boardId: paramBoardId, archived: false},
+        {$set: {customFields: newcustomFields}});
+    }
+    if (req.body.hasOwnProperty('members')) {
+      let newmembers = req.body.members;
+      if (_.isString(newmembers)) {
+        if (newmembers === '') {
+          newmembers = null;
+        }
+        else {
+          newmembers = [newmembers];
+        }
+      }
+      Cards.direct.update({_id: paramCardId, listId: paramListId, boardId: paramBoardId, archived: false},
+        {$set: {members: newmembers}});
+    }
+    if (req.body.hasOwnProperty('swimlaneId')) {
+      const newParamSwimlaneId = req.body.swimlaneId;
+      Cards.direct.update({_id: paramCardId, listId: paramListId, boardId: paramBoardId, archived: false},
+        {$set: {swimlaneId: newParamSwimlaneId}});
     }
     JsonRoutes.sendResult(res, {
       code: 200,
@@ -556,15 +1927,32 @@ if (Meteor.isServer) {
     });
   });
 
-
-  JsonRoutes.add('DELETE', '/api/boards/:boardId/lists/:listId/cards/:cardId', function (req, res) {
+  /**
+   * @operation delete_card
+   * @summary Delete a card from a board
+   *
+   * @description This operation **deletes** a card, and therefore the card
+   * is not put in the recycle bin.
+   *
+   * @param {string} boardId the board ID of the card
+   * @param {string} list the list ID of the card
+   * @param {string} cardId the ID of the card
+   * @return_type {_id: string}
+   */
+  JsonRoutes.add('DELETE', '/api/boards/:boardId/lists/:listId/cards/:cardId', function(req, res) {
     Authentication.checkUserId(req.userId);
     const paramBoardId = req.params.boardId;
     const paramListId = req.params.listId;
     const paramCardId = req.params.cardId;
 
-    Cards.direct.remove({_id: paramCardId, listId: paramListId, boardId: paramBoardId});
-    const card = Cards.find({_id: paramCardId} );
+    Cards.direct.remove({
+      _id: paramCardId,
+      listId: paramListId,
+      boardId: paramBoardId,
+    });
+    const card = Cards.find({
+      _id: paramCardId,
+    });
     cardRemover(req.body.authorId, card);
     JsonRoutes.sendResult(res, {
       code: 200,
diff --git a/models/checklistItems.js b/models/checklistItems.js
index e075eda2..013fee04 100644
--- a/models/checklistItems.js
+++ b/models/checklistItems.js
@@ -1,21 +1,39 @@
 ChecklistItems = new Mongo.Collection('checklistItems');
 
+/**
+ * An item in a checklist
+ */
 ChecklistItems.attachSchema(new SimpleSchema({
   title: {
+    /**
+     * the text of the item
+     */
     type: String,
   },
   sort: {
+    /**
+     * the sorting field of the item
+     */
     type: Number,
     decimal: true,
   },
   isFinished: {
+    /**
+     * Is the item checked?
+     */
     type: Boolean,
     defaultValue: false,
   },
   checklistId: {
+    /**
+     * the checklist ID the item is attached to
+     */
     type: String,
   },
   cardId: {
+    /**
+     * the card ID the item is attached to
+     */
     type: String,
   },
 }));
@@ -44,6 +62,12 @@ ChecklistItems.mutations({
   setTitle(title) {
     return { $set: { title } };
   },
+  check(){
+    return { $set: { isFinished: true } };
+  },
+  uncheck(){
+    return { $set: { isFinished: false } };
+  },
   toggleItem() {
     return { $set: { isFinished: !this.isFinished } };
   },
@@ -70,6 +94,9 @@ function itemCreation(userId, doc) {
     boardId,
     checklistId: doc.checklistId,
     checklistItemId: doc._id,
+    checklistItemName:doc.title,
+    listId: doc.listId,
+    swimlaneId: doc.swimlaneId,
   });
 }
 
@@ -79,22 +106,133 @@ function itemRemover(userId, doc) {
   });
 }
 
+function publishCheckActivity(userId, doc){
+  const card = Cards.findOne(doc.cardId);
+  const boardId = card.boardId;
+  let activityType;
+  if(doc.isFinished){
+    activityType = 'checkedItem';
+  }else{
+    activityType = 'uncheckedItem';
+  }
+  const act = {
+    userId,
+    activityType,
+    cardId: doc.cardId,
+    boardId,
+    checklistId: doc.checklistId,
+    checklistItemId: doc._id,
+    checklistItemName:doc.title,
+    listId: doc.listId,
+    swimlaneId: doc.swimlaneId,
+  };
+  Activities.insert(act);
+}
+
+function publishChekListCompleted(userId, doc){
+  const card = Cards.findOne(doc.cardId);
+  const boardId = card.boardId;
+  const checklistId = doc.checklistId;
+  const checkList = Checklists.findOne({_id:checklistId});
+  if(checkList.isFinished()){
+    const act = {
+      userId,
+      activityType: 'completeChecklist',
+      cardId: doc.cardId,
+      boardId,
+      checklistId: doc.checklistId,
+      checklistName: checkList.title,
+      listId: doc.listId,
+      swimlaneId: doc.swimlaneId,
+    };
+    Activities.insert(act);
+  }
+}
+
+function publishChekListUncompleted(userId, doc){
+  const card = Cards.findOne(doc.cardId);
+  const boardId = card.boardId;
+  const checklistId = doc.checklistId;
+  const checkList = Checklists.findOne({_id:checklistId});
+  // BUGS in IFTTT Rules: https://github.com/wekan/wekan/issues/1972
+  //       Currently in checklist all are set as uncompleted/not checked,
+  //       IFTTT Rule does not move card to other list.
+  //       If following line is negated/changed to:
+  //         if(!checkList.isFinished()){
+  //       then unchecking of any checkbox will move card to other list,
+  //       even when all checkboxes are not yet unchecked.
+  //       What is correct code for only moving when all in list is unchecked?
+  // TIPS: Finding  files, ignoring some directories with grep -v:
+  //         cd wekan
+  //         find . | xargs grep 'count' -sl | grep -v .meteor | grep -v node_modules | grep -v .build
+  //       Maybe something related here?
+  //         wekan/client/components/rules/triggers/checklistTriggers.js
+  if(checkList.isFinished()){
+    const act = {
+      userId,
+      activityType: 'uncompleteChecklist',
+      cardId: doc.cardId,
+      boardId,
+      checklistId: doc.checklistId,
+      checklistName: checkList.title,
+      listId: doc.listId,
+      swimlaneId: doc.swimlaneId,
+    };
+    Activities.insert(act);
+  }
+}
+
 // Activities
 if (Meteor.isServer) {
   Meteor.startup(() => {
     ChecklistItems._collection._ensureIndex({ checklistId: 1 });
+    ChecklistItems._collection._ensureIndex({ cardId: 1 });
+  });
+
+  ChecklistItems.after.update((userId, doc, fieldNames) => {
+    publishCheckActivity(userId, doc);
+    publishChekListCompleted(userId, doc, fieldNames);
   });
 
+  ChecklistItems.before.update((userId, doc, fieldNames) => {
+    publishChekListUncompleted(userId, doc, fieldNames);
+  });
+
+
   ChecklistItems.after.insert((userId, doc) => {
     itemCreation(userId, doc);
   });
 
-  ChecklistItems.after.remove((userId, doc) => {
+  ChecklistItems.before.remove((userId, doc) => {
     itemRemover(userId, doc);
+    const card = Cards.findOne(doc.cardId);
+    const boardId = card.boardId;
+    Activities.insert({
+      userId,
+      activityType: 'removedChecklistItem',
+      cardId: doc.cardId,
+      boardId,
+      checklistId: doc.checklistId,
+      checklistItemId: doc._id,
+      checklistItemName:doc.title,
+      listId: doc.listId,
+      swimlaneId: doc.swimlaneId,
+    });
   });
 }
 
 if (Meteor.isServer) {
+  /**
+   * @operation get_checklist_item
+   * @tag Checklists
+   * @summary Get a checklist item
+   *
+   * @param {string} boardId the board ID
+   * @param {string} cardId the card ID
+   * @param {string} checklistId the checklist ID
+   * @param {string} itemId the ID of the item
+   * @return_type ChecklistItems
+   */
   JsonRoutes.add('GET', '/api/boards/:boardId/cards/:cardId/checklists/:checklistId/items/:itemId', function (req, res) {
     Authentication.checkUserId( req.userId);
     const paramItemId = req.params.itemId;
@@ -111,6 +249,19 @@ if (Meteor.isServer) {
     }
   });
 
+  /**
+   * @operation edit_checklist_item
+   * @tag Checklists
+   * @summary Edit a checklist item
+   *
+   * @param {string} boardId the board ID
+   * @param {string} cardId the card ID
+   * @param {string} checklistId the checklist ID
+   * @param {string} itemId the ID of the item
+   * @param {string} [isFinished] is the item checked?
+   * @param {string} [title] the new text of the item
+   * @return_type {_id: string}
+   */
   JsonRoutes.add('PUT', '/api/boards/:boardId/cards/:cardId/checklists/:checklistId/items/:itemId', function (req, res) {
     Authentication.checkUserId( req.userId);
 
@@ -131,6 +282,19 @@ if (Meteor.isServer) {
     });
   });
 
+  /**
+   * @operation delete_checklist_item
+   * @tag Checklists
+   * @summary Delete a checklist item
+   *
+   * @description Note: this operation can't be reverted.
+   *
+   * @param {string} boardId the board ID
+   * @param {string} cardId the card ID
+   * @param {string} checklistId the checklist ID
+   * @param {string} itemId the ID of the item to be removed
+   * @return_type {_id: string}
+   */
   JsonRoutes.add('DELETE', '/api/boards/:boardId/cards/:cardId/checklists/:checklistId/items/:itemId', function (req, res) {
     Authentication.checkUserId( req.userId);
     const paramItemId = req.params.itemId;
diff --git a/models/checklists.js b/models/checklists.js
index c58453ef..33cb0f40 100644
--- a/models/checklists.js
+++ b/models/checklists.js
@@ -1,18 +1,33 @@
 Checklists = new Mongo.Collection('checklists');
 
+/**
+ * A Checklist
+ */
 Checklists.attachSchema(new SimpleSchema({
   cardId: {
+    /**
+     * The ID of the card the checklist is in
+     */
     type: String,
   },
   title: {
+    /**
+     * the title of the checklist
+     */
     type: String,
     defaultValue: 'Checklist',
   },
   finishedAt: {
+    /**
+     * When was the checklist finished
+     */
     type: Date,
     optional: true,
   },
   createdAt: {
+    /**
+     * Creation date of the checklist
+     */
     type: Date,
     denyUpdate: false,
     autoValue() { // eslint-disable-line consistent-return
@@ -24,12 +39,28 @@ Checklists.attachSchema(new SimpleSchema({
     },
   },
   sort: {
+    /**
+     * sorting value of the checklist
+     */
     type: Number,
     decimal: true,
   },
 }));
 
 Checklists.helpers({
+  copy(newCardId) {
+    const oldChecklistId = this._id;
+    this._id = null;
+    this.cardId = newCardId;
+    const newChecklistId = Checklists.insert(this);
+    ChecklistItems.find({checklistId: oldChecklistId}).forEach((item) => {
+      item._id = null;
+      item.checklistId = newChecklistId;
+      item.cardId = newCardId;
+      ChecklistItems.insert(item);
+    });
+  },
+
   itemCount() {
     return ChecklistItems.find({ checklistId: this._id }).count();
   },
@@ -47,6 +78,18 @@ Checklists.helpers({
   isFinished() {
     return 0 !== this.itemCount() && this.itemCount() === this.finishedCount();
   },
+  checkAllItems(){
+    const checkItems = ChecklistItems.find({checklistId: this._id});
+    checkItems.forEach(function(item){
+      item.check();
+    });
+  },
+  uncheckAllItems(){
+    const checkItems = ChecklistItems.find({checklistId: this._id});
+    checkItems.forEach(function(item){
+      item.uncheck();
+    });
+  },
   itemIndex(itemId) {
     const items = self.findOne({_id : this._id}).items;
     return _.pluck(items, '_id').indexOf(itemId);
@@ -91,6 +134,9 @@ if (Meteor.isServer) {
       cardId: doc.cardId,
       boardId: Cards.findOne(doc.cardId).boardId,
       checklistId: doc._id,
+      checklistName:doc.title,
+      listId: doc.listId,
+      swimlaneId: doc.swimlaneId,
     });
   });
 
@@ -101,10 +147,29 @@ if (Meteor.isServer) {
         Activities.remove(activity._id);
       });
     }
+    Activities.insert({
+      userId,
+      activityType: 'removeChecklist',
+      cardId: doc.cardId,
+      boardId: Cards.findOne(doc.cardId).boardId,
+      checklistId: doc._id,
+      checklistName:doc.title,
+      listId: doc.listId,
+      swimlaneId: doc.swimlaneId,
+    });
   });
 }
 
 if (Meteor.isServer) {
+  /**
+   * @operation get_all_checklists
+   * @summary Get the list of checklists attached to a card
+   *
+   * @param {string} boardId the board ID
+   * @param {string} cardId the card ID
+   * @return_type [{_id: string,
+   *                title: string}]
+   */
   JsonRoutes.add('GET', '/api/boards/:boardId/cards/:cardId/checklists', function (req, res) {
     Authentication.checkUserId( req.userId);
     const paramCardId = req.params.cardId;
@@ -126,6 +191,22 @@ if (Meteor.isServer) {
     }
   });
 
+  /**
+   * @operation get_checklist
+   * @summary Get a checklist
+   *
+   * @param {string} boardId the board ID
+   * @param {string} cardId the card ID
+   * @param {string} checklistId the ID of the checklist
+   * @return_type {cardId: string,
+   *               title: string,
+   *               finishedAt: string,
+   *               createdAt: string,
+   *               sort: number,
+   *               items: [{_id: string,
+   *                        title: string,
+   *                        isFinished: boolean}]}
+   */
   JsonRoutes.add('GET', '/api/boards/:boardId/cards/:cardId/checklists/:checklistId', function (req, res) {
     Authentication.checkUserId( req.userId);
     const paramChecklistId = req.params.checklistId;
@@ -150,6 +231,15 @@ if (Meteor.isServer) {
     }
   });
 
+  /**
+   * @operation new_checklist
+   * @summary create a new checklist
+   *
+   * @param {string} boardId the board ID
+   * @param {string} cardId the card ID
+   * @param {string} title the title of the new checklist
+   * @return_type {_id: string}
+   */
   JsonRoutes.add('POST', '/api/boards/:boardId/cards/:cardId/checklists', function (req, res) {
     Authentication.checkUserId( req.userId);
 
@@ -181,6 +271,17 @@ if (Meteor.isServer) {
     }
   });
 
+  /**
+   * @operation delete_checklist
+   * @summary Delete a checklist
+   *
+   * @description The checklist will be removed, not put in the recycle bin.
+   *
+   * @param {string} boardId the board ID
+   * @param {string} cardId the card ID
+   * @param {string} checklistId the ID of the checklist to remove
+   * @return_type {_id: string}
+   */
   JsonRoutes.add('DELETE', '/api/boards/:boardId/cards/:cardId/checklists/:checklistId', function (req, res) {
     Authentication.checkUserId( req.userId);
     const paramChecklistId = req.params.checklistId;
diff --git a/models/customFields.js b/models/customFields.js
new file mode 100644
index 00000000..a67ddb7d
--- /dev/null
+++ b/models/customFields.js
@@ -0,0 +1,266 @@
+CustomFields = new Mongo.Collection('customFields');
+
+/**
+ * A custom field on a card in the board
+ */
+CustomFields.attachSchema(new SimpleSchema({
+  boardIds: {
+    /**
+     * the ID of the board
+     */
+    type: [String],
+  },
+  name: {
+    /**
+     * name of the custom field
+     */
+    type: String,
+  },
+  type: {
+    /**
+     * type of the custom field
+     */
+    type: String,
+    allowedValues: ['text', 'number', 'date', 'dropdown'],
+  },
+  settings: {
+    /**
+     * settings of the custom field
+     */
+    type: Object,
+  },
+  'settings.dropdownItems': {
+    /**
+     * list of drop down items objects
+     */
+    type: [Object],
+    optional: true,
+  },
+  'settings.dropdownItems.$': {
+    type: new SimpleSchema({
+      _id: {
+        /**
+         * ID of the drop down item
+         */
+        type: String,
+      },
+      name: {
+        /**
+         * name of the drop down item
+         */
+        type: String,
+      },
+    }),
+  },
+  showOnCard: {
+    /**
+     * should we show on the cards this custom field
+     */
+    type: Boolean,
+  },
+  automaticallyOnCard: {
+    /**
+     * should the custom fields automatically be added on cards?
+     */
+    type: Boolean,
+  },
+  showLabelOnMiniCard: {
+    /**
+     * should the label of the custom field be shown on minicards?
+     */
+    type: Boolean,
+  },
+}));
+
+CustomFields.mutations({
+  addBoard(boardId) {
+    if (boardId) {
+      return {
+        $push: {
+          boardIds: boardId,
+        },
+      };
+    } else {
+      return null;
+    }
+  },
+});
+
+CustomFields.allow({
+  insert(userId, doc) {
+    return allowIsAnyBoardMember(userId, Boards.find({
+      _id: {$in: doc.boardIds},
+    }).fetch());
+  },
+  update(userId, doc) {
+    return allowIsAnyBoardMember(userId, Boards.find({
+      _id: {$in: doc.boardIds},
+    }).fetch());
+  },
+  remove(userId, doc) {
+    return allowIsAnyBoardMember(userId, Boards.find({
+      _id: {$in: doc.boardIds},
+    }).fetch());
+  },
+  fetch: ['userId', 'boardIds'],
+});
+
+// not sure if we need this?
+//CustomFields.hookOptions.after.update = { fetchPrevious: false };
+
+function customFieldCreation(userId, doc){
+  Activities.insert({
+    userId,
+    activityType: 'createCustomField',
+    boardId: doc.boardIds[0], // We are creating a customField, it has only one boardId
+    customFieldId: doc._id,
+  });
+}
+
+if (Meteor.isServer) {
+  Meteor.startup(() => {
+    CustomFields._collection._ensureIndex({ boardIds: 1 });
+  });
+
+  CustomFields.after.insert((userId, doc) => {
+    customFieldCreation(userId, doc);
+  });
+
+  CustomFields.before.update((userId, doc, fieldNames, modifier) => {
+    if (_.contains(fieldNames, 'boardIds') && modifier.$pull) {
+      Cards.update(
+        {boardId: modifier.$pull.boardIds, 'customFields._id': doc._id},
+        {$pull: {'customFields': {'_id': doc._id}}},
+        {multi: true}
+      );
+      Activities.remove({
+        customFieldId: doc._id,
+        boardId: modifier.$pull.boardIds,
+      });
+    } else if (_.contains(fieldNames, 'boardIds') && modifier.$push) {
+      Activities.insert({
+        userId,
+        activityType: 'createCustomField',
+        boardId: modifier.$push.boardIds,
+        customFieldId: doc._id,
+      });
+    }
+  });
+
+  CustomFields.before.remove((userId, doc) => {
+    Activities.remove({
+      customFieldId: doc._id,
+    });
+
+    Cards.update(
+      {boardId: {$in: doc.boardIds}, 'customFields._id': doc._id},
+      {$pull: {'customFields': {'_id': doc._id}}},
+      {multi: true}
+    );
+  });
+}
+
+//CUSTOM FIELD REST API
+if (Meteor.isServer) {
+  /**
+   * @operation get_all_custom_fields
+   * @summary Get the list of Custom Fields attached to a board
+   *
+   * @param {string} boardID the ID of the board
+   * @return_type [{_id: string,
+   *                name: string,
+   *                type: string}]
+   */
+  JsonRoutes.add('GET', '/api/boards/:boardId/custom-fields', function (req, res) {
+    Authentication.checkUserId( req.userId);
+    const paramBoardId = req.params.boardId;
+    JsonRoutes.sendResult(res, {
+      code: 200,
+      data: CustomFields.find({ boardIds: {$in: [paramBoardId]} }).map(function (cf) {
+        return {
+          _id: cf._id,
+          name: cf.name,
+          type: cf.type,
+        };
+      }),
+    });
+  });
+
+  /**
+   * @operation get_custom_field
+   * @summary Get a Custom Fields attached to a board
+   *
+   * @param {string} boardID the ID of the board
+   * @param {string} customFieldId the ID of the custom field
+   * @return_type CustomFields
+   */
+  JsonRoutes.add('GET', '/api/boards/:boardId/custom-fields/:customFieldId', function (req, res) {
+    Authentication.checkUserId( req.userId);
+    const paramBoardId = req.params.boardId;
+    const paramCustomFieldId = req.params.customFieldId;
+    JsonRoutes.sendResult(res, {
+      code: 200,
+      data: CustomFields.findOne({ _id: paramCustomFieldId, boardIds: {$in: [paramBoardId]} }),
+    });
+  });
+
+  /**
+   * @operation new_custom_field
+   * @summary Create a Custom Field
+   *
+   * @param {string} boardID the ID of the board
+   * @param {string} name the name of the custom field
+   * @param {string} type the type of the custom field
+   * @param {string} settings the settings object of the custom field
+   * @param {boolean} showOnCard should we show the custom field on cards?
+   * @param {boolean} automaticallyOnCard should the custom fields automatically be added on cards?
+   * @param {boolean} showLabelOnMiniCard should the label of the custom field be shown on minicards?
+   * @return_type {_id: string}
+   */
+  JsonRoutes.add('POST', '/api/boards/:boardId/custom-fields', function (req, res) {
+    Authentication.checkUserId( req.userId);
+    const paramBoardId = req.params.boardId;
+    const id = CustomFields.direct.insert({
+      name: req.body.name,
+      type: req.body.type,
+      settings: req.body.settings,
+      showOnCard: req.body.showOnCard,
+      automaticallyOnCard: req.body.automaticallyOnCard,
+      showLabelOnMiniCard: req.body.showLabelOnMiniCard,
+      boardIds: {$in: [paramBoardId]},
+    });
+
+    const customField = CustomFields.findOne({_id: id, boardIds: {$in: [paramBoardId]} });
+    customFieldCreation(req.body.authorId, customField);
+
+    JsonRoutes.sendResult(res, {
+      code: 200,
+      data: {
+        _id: id,
+      },
+    });
+  });
+
+  /**
+   * @operation delete_custom_field
+   * @summary Delete a Custom Fields attached to a board
+   *
+   * @description The Custom Field can't be retrieved after this operation
+   *
+   * @param {string} boardID the ID of the board
+   * @param {string} customFieldId the ID of the custom field
+   * @return_type {_id: string}
+   */
+  JsonRoutes.add('DELETE', '/api/boards/:boardId/custom-fields/:customFieldId', function (req, res) {
+    Authentication.checkUserId( req.userId);
+    const paramBoardId = req.params.boardId;
+    const id = req.params.customFieldId;
+    CustomFields.remove({ _id: id, boardIds: {$in: [paramBoardId]} });
+    JsonRoutes.sendResult(res, {
+      code: 200,
+      data: {
+        _id: id,
+      },
+    });
+  });
+}
diff --git a/models/export.js b/models/export.js
index aff66801..4f17d727 100644
--- a/models/export.js
+++ b/models/export.js
@@ -14,7 +14,9 @@ if (Meteor.isServer) {
    * See https://blog.kayla.com.au/server-side-route-authentication-in-meteor/
    * for detailed explanations
    */
-  JsonRoutes.add('get', '/api/boards/:boardId/export', function (req, res) {
+
+
+  JsonRoutes.add('get', '/api/boards/:boardId/export', function(req, res) {
     const boardId = req.params.boardId;
     let user = null;
     // todo XXX for real API, first look for token in Authentication: header
@@ -28,8 +30,11 @@ if (Meteor.isServer) {
     }
 
     const exporter = new Exporter(boardId);
-    if(exporter.canExport(user)) {
-      JsonRoutes.sendResult(res, { code: 200, data: exporter.build() });
+    if (exporter.canExport(user)) {
+      JsonRoutes.sendResult(res, {
+        code: 200,
+        data: exporter.build(),
+      });
     } else {
       // we could send an explicit error message, but on the other hand the only
       // way to get there is by hacking the UI so let's keep it raw.
@@ -38,29 +43,58 @@ if (Meteor.isServer) {
   });
 }
 
-class Exporter {
+export class Exporter {
   constructor(boardId) {
     this._boardId = boardId;
   }
 
   build() {
     const byBoard = { boardId: this._boardId };
+    const byBoardNoLinked = { boardId: this._boardId, linkedId: {$in: ['', null] } };
     // we do not want to retrieve boardId in related elements
-    const noBoardId = { fields: { boardId: 0 } };
+    const noBoardId = {
+      fields: {
+        boardId: 0,
+      },
+    };
     const result = {
       _format: 'wekan-board-1.0.0',
     };
-    _.extend(result, Boards.findOne(this._boardId, { fields: { stars: 0 } }));
+    _.extend(result, Boards.findOne(this._boardId, {
+      fields: {
+        stars: 0,
+      },
+    }));
     result.lists = Lists.find(byBoard, noBoardId).fetch();
-    result.cards = Cards.find(byBoard, noBoardId).fetch();
+    result.cards = Cards.find(byBoardNoLinked, noBoardId).fetch();
     result.swimlanes = Swimlanes.find(byBoard, noBoardId).fetch();
+    result.customFields = CustomFields.find({boardIds: {$in: [this.boardId]}}, {fields: {boardId: 0}}).fetch();
     result.comments = CardComments.find(byBoard, noBoardId).fetch();
     result.activities = Activities.find(byBoard, noBoardId).fetch();
+    result.rules = Rules.find(byBoard, noBoardId).fetch();
     result.checklists = [];
     result.checklistItems = [];
+    result.subtaskItems = [];
+    result.triggers = [];
+    result.actions = [];
     result.cards.forEach((card) => {
-      result.checklists.push(...Checklists.find({ cardId: card._id }).fetch());
-      result.checklistItems.push(...ChecklistItems.find({ cardId: card._id }).fetch());
+      result.checklists.push(...Checklists.find({
+        cardId: card._id,
+      }).fetch());
+      result.checklistItems.push(...ChecklistItems.find({
+        cardId: card._id,
+      }).fetch());
+      result.subtaskItems.push(...Cards.find({
+        parentid: card._id,
+      }).fetch());
+    });
+    result.rules.forEach((rule) => {
+      result.triggers.push(...Triggers.find({
+        _id: rule.triggerId,
+      }, noBoardId).fetch());
+      result.actions.push(...Actions.find({
+        _id: rule.actionId,
+      }, noBoardId).fetch());
     });
 
     // [Old] for attachments we only export IDs and absolute url to original doc
@@ -97,18 +131,34 @@ class Exporter {
     // 1- only exports users that are linked somehow to that board
     // 2- do not export any sensitive information
     const users = {};
-    result.members.forEach((member) => { users[member.userId] = true; });
-    result.lists.forEach((list) => { users[list.userId] = true; });
+    result.members.forEach((member) => {
+      users[member.userId] = true;
+    });
+    result.lists.forEach((list) => {
+      users[list.userId] = true;
+    });
     result.cards.forEach((card) => {
       users[card.userId] = true;
       if (card.members) {
-        card.members.forEach((memberId) => { users[memberId] = true; });
+        card.members.forEach((memberId) => {
+          users[memberId] = true;
+        });
       }
     });
-    result.comments.forEach((comment) => { users[comment.userId] = true; });
-    result.activities.forEach((activity) => { users[activity.userId] = true; });
-    result.checklists.forEach((checklist) => { users[checklist.userId] = true; });
-    const byUserIds = { _id: { $in: Object.getOwnPropertyNames(users) } };
+    result.comments.forEach((comment) => {
+      users[comment.userId] = true;
+    });
+    result.activities.forEach((activity) => {
+      users[activity.userId] = true;
+    });
+    result.checklists.forEach((checklist) => {
+      users[checklist.userId] = true;
+    });
+    const byUserIds = {
+      _id: {
+        $in: Object.getOwnPropertyNames(users),
+      },
+    };
     // we use whitelist to be sure we do not expose inadvertently
     // some secret fields that gets added to User later.
     const userFields = {
@@ -122,7 +172,7 @@ class Exporter {
     };
     result.users = Users.find(byUserIds, userFields).fetch().map((user) => {
       // user avatar is stored as a relative url, we export absolute
-      if (user.profile.avatarUrl) {
+      if ((user.profile || {}).avatarUrl) {
         user.profile.avatarUrl = FlowRouter.url(user.profile.avatarUrl);
       }
       return user;
diff --git a/models/import.js b/models/import.js
index 09769794..5e433669 100644
--- a/models/import.js
+++ b/models/import.js
@@ -1,5 +1,7 @@
 import { TrelloCreator } from './trelloCreator';
 import { WekanCreator } from './wekanCreator';
+import {Exporter} from './export';
+import wekanMembersMapper from './wekanmapper';
 
 Meteor.methods({
   importBoard(board, data, importSource, currentBoard) {
@@ -18,7 +20,7 @@ Meteor.methods({
     }
 
     // 1. check all parameters are ok from a syntax point of view
-    creator.check(board);
+    //creator.check(board);
 
     // 2. check parameters are ok from a business point of view (exist &
     // authorized) nothing to check, everyone can import boards in their account
@@ -27,3 +29,20 @@ Meteor.methods({
     return creator.create(board, currentBoard);
   },
 });
+
+Meteor.methods({
+  cloneBoard(sourceBoardId, currentBoardId) {
+    check(sourceBoardId, String);
+    check(currentBoardId, Match.Maybe(String));
+    const exporter = new Exporter(sourceBoardId);
+    const data = exporter.build();
+    const addData = {};
+    addData.membersMapping = wekanMembersMapper.getMembersToMap(data);
+    const creator =  new WekanCreator(addData);
+    //data.title = `${data.title  } - ${  TAPi18n.__('copy-tag')}`;
+    data.title = `${data.title}`;
+    return creator.create(data, currentBoardId);
+  },
+});
+
+
diff --git a/models/integrations.js b/models/integrations.js
index 1062b93b..65a7af63 100644
--- a/models/integrations.js
+++ b/models/integrations.js
@@ -1,33 +1,60 @@
 Integrations = new Mongo.Collection('integrations');
 
+/**
+ * Integration with third-party applications
+ */
 Integrations.attachSchema(new SimpleSchema({
   enabled: {
+    /**
+     * is the integration enabled?
+     */
     type: Boolean,
     defaultValue: true,
   },
   title: {
+    /**
+     * name of the integration
+     */
     type: String,
     optional: true,
   },
   type: {
+    /**
+     * type of the integratation (Default to 'outgoing-webhooks')
+     */
     type: String,
     defaultValue: 'outgoing-webhooks',
   },
   activities: {
+    /**
+     * activities the integration gets triggered (list)
+     */
     type: [String],
     defaultValue: ['all'],
   },
   url: { // URL validation regex (https://mathiasbynens.be/demo/url-regex)
+    /**
+     * URL validation regex (https://mathiasbynens.be/demo/url-regex)
+     */
     type: String,
   },
   token: {
+    /**
+     * token of the integration
+     */
     type: String,
     optional: true,
   },
   boardId: {
+    /**
+     * Board ID of the integration
+     */
     type: String,
   },
   createdAt: {
+    /**
+     * Creation date of the integration
+     */
     type: Date,
     denyUpdate: false,
     autoValue() { // eslint-disable-line consistent-return
@@ -39,6 +66,9 @@ Integrations.attachSchema(new SimpleSchema({
     },
   },
   userId: {
+    /**
+     * user ID who created the interation
+     */
     type: String,
   },
 }));
@@ -58,7 +88,17 @@ Integrations.allow({
 
 //INTEGRATIONS REST API
 if (Meteor.isServer) {
-  // Get all integrations in board
+  Meteor.startup(() => {
+    Integrations._collection._ensureIndex({ boardId: 1 });
+  });
+
+  /**
+   * @operation get_all_integrations
+   * @summary Get all integrations in board
+   *
+   * @param {string} boardId the board ID
+   * @return_type [Integrations]
+   */
   JsonRoutes.add('GET', '/api/boards/:boardId/integrations', function(req, res) {
     try {
       const paramBoardId = req.params.boardId;
@@ -78,7 +118,14 @@ if (Meteor.isServer) {
     }
   });
 
-  // Get a single integration in board
+  /**
+   * @operation get_integration
+   * @summary Get a single integration in board
+   *
+   * @param {string} boardId the board ID
+   * @param {string} intId the integration ID
+   * @return_type Integrations
+   */
   JsonRoutes.add('GET', '/api/boards/:boardId/integrations/:intId', function(req, res) {
     try {
       const paramBoardId = req.params.boardId;
@@ -98,7 +145,14 @@ if (Meteor.isServer) {
     }
   });
 
-  // Create a new integration
+  /**
+   * @operation new_integration
+   * @summary Create a new integration
+   *
+   * @param {string} boardId the board ID
+   * @param {string} url the URL of the integration
+   * @return_type {_id: string}
+   */
   JsonRoutes.add('POST', '/api/boards/:boardId/integrations', function(req, res) {
     try {
       const paramBoardId = req.params.boardId;
@@ -125,7 +179,19 @@ if (Meteor.isServer) {
     }
   });
 
-  // Edit integration data
+  /**
+   * @operation edit_integration
+   * @summary Edit integration data
+   *
+   * @param {string} boardId the board ID
+   * @param {string} intId the integration ID
+   * @param {string} [enabled] is the integration enabled?
+   * @param {string} [title] new name of the integration
+   * @param {string} [url] new URL of the integration
+   * @param {string} [token] new token of the integration
+   * @param {string} [activities] new list of activities of the integration
+   * @return_type {_id: string}
+   */
   JsonRoutes.add('PUT', '/api/boards/:boardId/integrations/:intId', function (req, res) {
     try {
       const paramBoardId = req.params.boardId;
@@ -173,7 +239,15 @@ if (Meteor.isServer) {
     }
   });
 
-  // Delete subscribed activities
+  /**
+   * @operation delete_integration_activities
+   * @summary Delete subscribed activities
+   *
+   * @param {string} boardId the board ID
+   * @param {string} intId the integration ID
+   * @param {string} newActivities the activities to remove from the integration
+   * @return_type Integrations
+   */
   JsonRoutes.add('DELETE', '/api/boards/:boardId/integrations/:intId/activities', function (req, res) {
     try {
       const paramBoardId = req.params.boardId;
@@ -197,7 +271,15 @@ if (Meteor.isServer) {
     }
   });
 
-  // Add subscribed activities
+  /**
+   * @operation new_integration_activities
+   * @summary Add subscribed activities
+   *
+   * @param {string} boardId the board ID
+   * @param {string} intId the integration ID
+   * @param {string} newActivities the activities to add to the integration
+   * @return_type Integrations
+   */
   JsonRoutes.add('POST', '/api/boards/:boardId/integrations/:intId/activities', function (req, res) {
     try {
       const paramBoardId = req.params.boardId;
@@ -221,7 +303,14 @@ if (Meteor.isServer) {
     }
   });
 
-  // Delete integration
+  /**
+   * @operation delete_integration
+   * @summary Delete integration
+   *
+   * @param {string} boardId the board ID
+   * @param {string} intId the integration ID
+   * @return_type {_id: string}
+   */
   JsonRoutes.add('DELETE', '/api/boards/:boardId/integrations/:intId', function (req, res) {
     try {
       const paramBoardId = req.params.boardId;
diff --git a/models/lists.js b/models/lists.js
index 6f6996cb..1a0910c2 100644
--- a/models/lists.js
+++ b/models/lists.js
@@ -1,10 +1,19 @@
 Lists = new Mongo.Collection('lists');
 
+/**
+ * A list (column) in the Wekan board.
+ */
 Lists.attachSchema(new SimpleSchema({
   title: {
+    /**
+     * the title of the list
+     */
     type: String,
   },
   archived: {
+    /**
+     * is the list archived
+     */
     type: Boolean,
     autoValue() { // eslint-disable-line consistent-return
       if (this.isInsert && !this.isSet) {
@@ -13,9 +22,22 @@ Lists.attachSchema(new SimpleSchema({
     },
   },
   boardId: {
+    /**
+     * the board associated to this list
+     */
     type: String,
   },
+  swimlaneId: {
+    /**
+     * the swimlane associated to this list. Used for templates
+     */
+    type: String,
+    defaultValue: '',
+  },
   createdAt: {
+    /**
+     * creation date
+     */
     type: Date,
     autoValue() { // eslint-disable-line consistent-return
       if (this.isInsert) {
@@ -26,12 +48,18 @@ Lists.attachSchema(new SimpleSchema({
     },
   },
   sort: {
+    /**
+     * is the list sorted
+     */
     type: Number,
     decimal: true,
     // XXX We should probably provide a default
     optional: true,
   },
   updatedAt: {
+    /**
+     * last update of the list
+     */
     type: Date,
     optional: true,
     autoValue() { // eslint-disable-line consistent-return
@@ -43,38 +71,102 @@ Lists.attachSchema(new SimpleSchema({
     },
   },
   wipLimit: {
+    /**
+     * WIP object, see below
+     */
     type: Object,
     optional: true,
   },
   'wipLimit.value': {
+    /**
+     * value of the WIP
+     */
     type: Number,
     decimal: false,
     defaultValue: 1,
   },
   'wipLimit.enabled': {
+    /**
+     * is the WIP enabled
+     */
     type: Boolean,
     defaultValue: false,
   },
   'wipLimit.soft': {
+    /**
+     * is the WIP a soft or hard requirement
+     */
     type: Boolean,
     defaultValue: false,
   },
+  color: {
+    /**
+     * the color of the list
+     */
+    type: String,
+    optional: true,
+    // silver is the default, so it is left out
+    allowedValues: [
+      'white', 'green', 'yellow', 'orange', 'red', 'purple',
+      'blue', 'sky', 'lime', 'pink', 'black',
+      'peachpuff', 'crimson', 'plum', 'darkgreen',
+      'slateblue', 'magenta', 'gold', 'navy', 'gray',
+      'saddlebrown', 'paleturquoise', 'mistyrose', 'indigo',
+    ],
+  },
+  type: {
+    /**
+     * The type of list
+     */
+    type: String,
+    defaultValue: 'list',
+  },
 }));
 
 Lists.allow({
   insert(userId, doc) {
-    return allowIsBoardMemberNonComment(userId, Boards.findOne(doc.boardId));
+    return allowIsBoardMemberCommentOnly(userId, Boards.findOne(doc.boardId));
   },
   update(userId, doc) {
-    return allowIsBoardMemberNonComment(userId, Boards.findOne(doc.boardId));
+    return allowIsBoardMemberCommentOnly(userId, Boards.findOne(doc.boardId));
   },
   remove(userId, doc) {
-    return allowIsBoardMemberNonComment(userId, Boards.findOne(doc.boardId));
+    return allowIsBoardMemberCommentOnly(userId, Boards.findOne(doc.boardId));
   },
   fetch: ['boardId'],
 });
 
 Lists.helpers({
+  copy(boardId, swimlaneId) {
+    const oldId = this._id;
+    const oldSwimlaneId = this.swimlaneId || null;
+    this.boardId = boardId;
+    this.swimlaneId = swimlaneId;
+
+    let _id = null;
+    existingListWithSameName = Lists.findOne({
+      boardId,
+      title: this.title,
+      archived: false,
+    });
+    if (existingListWithSameName) {
+      _id = existingListWithSameName._id;
+    } else {
+      delete this._id;
+      delete this.swimlaneId;
+      _id = Lists.insert(this);
+    }
+
+    // Copy all cards in list
+    Cards.find({
+      swimlaneId: oldSwimlaneId,
+      listId: oldId,
+      archived: false,
+    }).forEach((card) => {
+      card.copy(boardId, swimlaneId, _id);
+    });
+  },
+
   cards(swimlaneId) {
     const selector = {
       listId: this._id,
@@ -86,6 +178,17 @@ Lists.helpers({
       { sort: ['sort'] });
   },
 
+  cardsUnfiltered(swimlaneId) {
+    const selector = {
+      listId: this._id,
+      archived: false,
+    };
+    if (swimlaneId)
+      selector.swimlaneId = swimlaneId;
+    return Cards.find(selector,
+      { sort: ['sort'] });
+  },
+
   allCards() {
     return Cards.find({ listId: this._id });
   },
@@ -104,6 +207,20 @@ Lists.helpers({
       return list.wipLimit[option] ? list.wipLimit[option] : 0; // Necessary check to avoid exceptions for the case where the doc doesn't have the wipLimit field yet set
     }
   },
+
+  colorClass() {
+    if (this.color)
+      return this.color;
+    return '';
+  },
+
+  isTemplateList() {
+    return this.type === 'template-list';
+  },
+
+  remove() {
+    Lists.remove({ _id: this._id});
+  },
 });
 
 Lists.mutations({
@@ -112,10 +229,20 @@ Lists.mutations({
   },
 
   archive() {
+    if (this.isTemplateList()) {
+      this.cards().forEach((card) => {
+        return card.archive();
+      });
+    }
     return { $set: { archived: true } };
   },
 
   restore() {
+    if (this.isTemplateList()) {
+      this.allCards().forEach((card) => {
+        return card.restore();
+      });
+    }
     return { $set: { archived: false } };
   },
 
@@ -130,6 +257,17 @@ Lists.mutations({
   setWipLimit(limit) {
     return { $set: { 'wipLimit.value': limit } };
   },
+
+  setColor(newColor) {
+    if (newColor === 'silver') {
+      newColor = null;
+    }
+    return {
+      $set: {
+        color: newColor,
+      },
+    };
+  },
 });
 
 Meteor.methods({
@@ -176,6 +314,12 @@ if (Meteor.isServer) {
   });
 
   Lists.before.remove((userId, doc) => {
+    const cards = Cards.find({ listId: doc._id });
+    if (cards) {
+      cards.forEach((card) => {
+        Cards.remove(card._id);
+      });
+    }
     Activities.insert({
       userId,
       type: 'list',
@@ -201,6 +345,14 @@ if (Meteor.isServer) {
 
 //LISTS REST API
 if (Meteor.isServer) {
+  /**
+   * @operation get_all_lists
+   * @summary Get the list of Lists attached to a board
+   *
+   * @param {string} boardId the board ID
+   * @return_type [{_id: string,
+   *           title: string}]
+   */
   JsonRoutes.add('GET', '/api/boards/:boardId/lists', function (req, res) {
     try {
       const paramBoardId = req.params.boardId;
@@ -224,6 +376,14 @@ if (Meteor.isServer) {
     }
   });
 
+  /**
+   * @operation get_list
+   * @summary Get a List attached to a board
+   *
+   * @param {string} boardId the board ID
+   * @param {string} listId the List ID
+   * @return_type Lists
+   */
   JsonRoutes.add('GET', '/api/boards/:boardId/lists/:listId', function (req, res) {
     try {
       const paramBoardId = req.params.boardId;
@@ -242,13 +402,23 @@ if (Meteor.isServer) {
     }
   });
 
+  /**
+   * @operation new_list
+   * @summary Add a List to a board
+   *
+   * @param {string} boardId the board ID
+   * @param {string} title the title of the List
+   * @return_type {_id: string}
+   */
   JsonRoutes.add('POST', '/api/boards/:boardId/lists', function (req, res) {
     try {
       Authentication.checkUserId( req.userId);
       const paramBoardId = req.params.boardId;
+      const board = Boards.findOne(paramBoardId);
       const id = Lists.insert({
         title: req.body.title,
         boardId: paramBoardId,
+        sort: board.lists().count(),
       });
       JsonRoutes.sendResult(res, {
         code: 200,
@@ -265,6 +435,17 @@ if (Meteor.isServer) {
     }
   });
 
+  /**
+   * @operation delete_list
+   * @summary Delete a List
+   *
+   * @description This **deletes** a list from a board.
+   * The list is not put in the recycle bin.
+   *
+   * @param {string} boardId the board ID
+   * @param {string} listId the ID of the list to remove
+   * @return_type {_id: string}
+   */
   JsonRoutes.add('DELETE', '/api/boards/:boardId/lists/:listId', function (req, res) {
     try {
       Authentication.checkUserId( req.userId);
diff --git a/models/rules.js b/models/rules.js
new file mode 100644
index 00000000..7d971980
--- /dev/null
+++ b/models/rules.js
@@ -0,0 +1,48 @@
+Rules = new Mongo.Collection('rules');
+
+Rules.attachSchema(new SimpleSchema({
+  title: {
+    type: String,
+    optional: false,
+  },
+  triggerId: {
+    type: String,
+    optional: false,
+  },
+  actionId: {
+    type: String,
+    optional: false,
+  },
+  boardId: {
+    type: String,
+    optional: false,
+  },
+}));
+
+Rules.mutations({
+  rename(description) {
+    return { $set: { description } };
+  },
+});
+
+Rules.helpers({
+  getAction(){
+    return Actions.findOne({_id:this.actionId});
+  },
+  getTrigger(){
+    return Triggers.findOne({_id:this.triggerId});
+  },
+});
+
+
+Rules.allow({
+  insert(userId, doc) {
+    return allowIsBoardAdmin(userId, Boards.findOne(doc.boardId));
+  },
+  update(userId, doc) {
+    return allowIsBoardAdmin(userId, Boards.findOne(doc.boardId));
+  },
+  remove(userId, doc) {
+    return allowIsBoardAdmin(userId, Boards.findOne(doc.boardId));
+  },
+});
diff --git a/models/settings.js b/models/settings.js
index 34f693d9..e0f94fca 100644
--- a/models/settings.js
+++ b/models/settings.js
@@ -28,6 +28,30 @@ Settings.attachSchema(new SimpleSchema({
     type: String,
     optional: true,
   },
+  productName: {
+    type: String,
+    optional: true,
+  },
+  customHTMLafterBodyStart: {
+    type: String,
+    optional: true,
+  },
+  customHTMLbeforeBodyEnd: {
+    type: String,
+    optional: true,
+  },
+  displayAuthenticationMethod: {
+    type: Boolean,
+    optional: true,
+  },
+  defaultAuthenticationMethod: {
+    type: String,
+    optional: false,
+  },
+  hideLogo: {
+    type: Boolean,
+    optional: true,
+  },
   createdAt: {
     type: Date,
     denyUpdate: true,
@@ -66,10 +90,11 @@ if (Meteor.isServer) {
     if(!setting){
       const now = new Date();
       const domain = process.env.ROOT_URL.match(/\/\/(?:www\.)?(.*)?(?:\/)?/)[1];
-      const from = `Wekan <wekan@${domain}>`;
+      const from = `Boards Support <support@${domain}>`;
       const defaultSetting = {disableRegistration: false, mailServer: {
         username: '', password: '', host: '', port: '', enableTLS: false, from,
-      }, createdAt: now, modifiedAt: now};
+      }, createdAt: now, modifiedAt: now, displayAuthenticationMethod: true,
+      defaultAuthenticationMethod: 'password'};
       Settings.insert(defaultSetting);
     }
     const newSetting = Settings.findOne();
@@ -96,6 +121,14 @@ if (Meteor.isServer) {
     return (min + Math.round(rand * range));
   }
 
+  function getEnvVar(name){
+    const value = process.env[name];
+    if (value){
+      return value;
+    }
+    throw new Meteor.Error(['var-not-exist', `The environment variable ${name} does not exist`]);
+  }
+
   function sendInvitationEmail (_id){
     const icode = InvitationCodes.findOne(_id);
     const author = Users.findOne(Meteor.userId());
@@ -108,6 +141,7 @@ if (Meteor.isServer) {
         url: FlowRouter.url('sign-up'),
       };
       const lang = author.getLanguage();
+
       Email.send({
         to: icode.email,
         from: Accounts.emailTemplates.from,
@@ -120,24 +154,49 @@ if (Meteor.isServer) {
     }
   }
 
+  function isLdapEnabled() {
+    return process.env.LDAP_ENABLE === 'true';
+  }
+
+  function isOauth2Enabled() {
+    return process.env.OAUTH2_ENABLED === 'true';
+  }
+
+  function isCasEnabled() {
+    return process.env.CAS_ENABLED === 'true';
+  }
+
   Meteor.methods({
     sendInvitation(emails, boards) {
       check(emails, [String]);
       check(boards, [String]);
+
       const user = Users.findOne(Meteor.userId());
       if(!user.isAdmin){
         throw new Meteor.Error('not-allowed');
       }
       emails.forEach((email) => {
         if (email && SimpleSchema.RegEx.Email.test(email)) {
-          const code = getRandomNum(100000, 999999);
-          InvitationCodes.insert({code, email, boardsToBeInvited: boards, createdAt: new Date(), authorId: Meteor.userId()}, function(err, _id){
-            if (!err && _id) {
-              sendInvitationEmail(_id);
-            } else {
-              throw new Meteor.Error('invitation-generated-fail', err.message);
-            }
-          });
+          // Checks if the email is already link to an account.
+          const userExist = Users.findOne({email});
+          if (userExist){
+            throw new Meteor.Error('user-exist', `The user with the email ${email} has already an account.`);
+          }
+          // Checks if the email is already link to an invitation.
+          const invitation = InvitationCodes.findOne({email});
+          if (invitation){
+            InvitationCodes.update(invitation, {$set : {boardsToBeInvited: boards}});
+            sendInvitationEmail(invitation._id);
+          }else {
+            const code = getRandomNum(100000, 999999);
+            InvitationCodes.insert({code, email, boardsToBeInvited: boards, createdAt: new Date(), authorId: Meteor.userId()}, function(err, _id){
+              if (!err && _id) {
+                sendInvitationEmail(_id);
+              } else {
+                throw new Meteor.Error('invitation-generated-fail', err.message);
+              }
+            });
+          }
         }
       });
     },
@@ -167,5 +226,52 @@ if (Meteor.isServer) {
         email: user.emails[0].address,
       };
     },
+
+    getCustomUI(){
+      const setting = Settings.findOne({});
+      if (!setting.productName) {
+        return {
+          productName: '',
+        };
+      } else {
+        return {
+          productName: `${setting.productName}`,
+        };
+      }
+    },
+
+    getMatomoConf(){
+      return {
+        address: getEnvVar('MATOMO_ADDRESS'),
+        siteId: getEnvVar('MATOMO_SITE_ID'),
+        doNotTrack: process.env.MATOMO_DO_NOT_TRACK || false,
+        withUserName: process.env.MATOMO_WITH_USERNAME || false,
+      };
+    },
+
+    _isLdapEnabled() {
+      return isLdapEnabled();
+    },
+
+    _isOauth2Enabled() {
+      return isOauth2Enabled();
+    },
+
+    _isCasEnabled() {
+      return isCasEnabled();
+    },
+
+    // Gets all connection methods to use it in the Template
+    getAuthenticationsEnabled() {
+      return {
+        ldap: isLdapEnabled(),
+        oauth2: isOauth2Enabled(),
+        cas: isCasEnabled(),
+      };
+    },
+
+    getDefaultAuthenticationMethod() {
+      return process.env.DEFAULT_AUTHENTICATION_METHOD;
+    },
   });
 }
diff --git a/models/swimlanes.js b/models/swimlanes.js
index 72ef3f36..9a53d116 100644
--- a/models/swimlanes.js
+++ b/models/swimlanes.js
@@ -1,10 +1,19 @@
 Swimlanes = new Mongo.Collection('swimlanes');
 
+/**
+ * A swimlane is an line in the kaban board.
+ */
 Swimlanes.attachSchema(new SimpleSchema({
   title: {
+    /**
+     * the title of the swimlane
+     */
     type: String,
   },
   archived: {
+    /**
+     * is the swimlane archived?
+     */
     type: Boolean,
     autoValue() { // eslint-disable-line consistent-return
       if (this.isInsert && !this.isSet) {
@@ -13,9 +22,15 @@ Swimlanes.attachSchema(new SimpleSchema({
     },
   },
   boardId: {
+    /**
+     * the ID of the board the swimlane is attached to
+     */
     type: String,
   },
   createdAt: {
+    /**
+     * creation date of the swimlane
+     */
     type: Date,
     autoValue() { // eslint-disable-line consistent-return
       if (this.isInsert) {
@@ -26,12 +41,33 @@ Swimlanes.attachSchema(new SimpleSchema({
     },
   },
   sort: {
+    /**
+     * the sort value of the swimlane
+     */
     type: Number,
     decimal: true,
     // XXX We should probably provide a default
     optional: true,
   },
+  color: {
+    /**
+     * the color of the swimlane
+     */
+    type: String,
+    optional: true,
+    // silver is the default, so it is left out
+    allowedValues: [
+      'white', 'green', 'yellow', 'orange', 'red', 'purple',
+      'blue', 'sky', 'lime', 'pink', 'black',
+      'peachpuff', 'crimson', 'plum', 'darkgreen',
+      'slateblue', 'magenta', 'gold', 'navy', 'gray',
+      'saddlebrown', 'paleturquoise', 'mistyrose', 'indigo',
+    ],
+  },
   updatedAt: {
+    /**
+     * when was the swimlane last edited
+     */
     type: Date,
     optional: true,
     autoValue() { // eslint-disable-line consistent-return
@@ -42,22 +78,53 @@ Swimlanes.attachSchema(new SimpleSchema({
       }
     },
   },
+  type: {
+    /**
+     * The type of swimlane
+     */
+    type: String,
+    defaultValue: 'swimlane',
+  },
 }));
 
 Swimlanes.allow({
   insert(userId, doc) {
-    return allowIsBoardMemberNonComment(userId, Boards.findOne(doc.boardId));
+    return allowIsBoardMemberCommentOnly(userId, Boards.findOne(doc.boardId));
   },
   update(userId, doc) {
-    return allowIsBoardMemberNonComment(userId, Boards.findOne(doc.boardId));
+    return allowIsBoardMemberCommentOnly(userId, Boards.findOne(doc.boardId));
   },
   remove(userId, doc) {
-    return allowIsBoardMemberNonComment(userId, Boards.findOne(doc.boardId));
+    return allowIsBoardMemberCommentOnly(userId, Boards.findOne(doc.boardId));
   },
   fetch: ['boardId'],
 });
 
 Swimlanes.helpers({
+  copy(boardId) {
+    const oldId = this._id;
+    const oldBoardId = this.boardId;
+    this.boardId = boardId;
+    delete this._id;
+    const _id = Swimlanes.insert(this);
+
+    const query = {
+      swimlaneId: {$in: [oldId, '']},
+      archived: false,
+    };
+    if (oldBoardId) {
+      query.boardId = oldBoardId;
+    }
+
+    // Copy all lists in swimlane
+    Lists.find(query).forEach((list) => {
+      list.type = 'list';
+      list.swimlaneId = oldId;
+      list.boardId = boardId;
+      list.copy(boardId, _id);
+    });
+  },
+
   cards() {
     return Cards.find(Filter.mongoSelector({
       swimlaneId: this._id,
@@ -65,6 +132,18 @@ Swimlanes.helpers({
     }), { sort: ['sort'] });
   },
 
+  lists() {
+    return Lists.find({
+      boardId: this.boardId,
+      swimlaneId: {$in: [this._id, '']},
+      archived: false,
+    }, { sort: ['sort'] });
+  },
+
+  myLists() {
+    return Lists.find({ swimlaneId: this._id });
+  },
+
   allCards() {
     return Cards.find({ swimlaneId: this._id });
   },
@@ -72,6 +151,39 @@ Swimlanes.helpers({
   board() {
     return Boards.findOne(this.boardId);
   },
+
+  colorClass() {
+    if (this.color)
+      return this.color;
+    return '';
+  },
+
+  isTemplateSwimlane() {
+    return this.type === 'template-swimlane';
+  },
+
+  isTemplateContainer() {
+    return this.type === 'template-container';
+  },
+
+  isListTemplatesSwimlane() {
+    const user = Users.findOne(Meteor.userId());
+    return (user.profile || {}).listTemplatesSwimlaneId === this._id;
+  },
+
+  isCardTemplatesSwimlane() {
+    const user = Users.findOne(Meteor.userId());
+    return (user.profile || {}).cardTemplatesSwimlaneId === this._id;
+  },
+
+  isBoardTemplatesSwimlane() {
+    const user = Users.findOne(Meteor.userId());
+    return (user.profile || {}).boardTemplatesSwimlaneId === this._id;
+  },
+
+  remove() {
+    Swimlanes.remove({ _id: this._id});
+  },
 });
 
 Swimlanes.mutations({
@@ -80,12 +192,33 @@ Swimlanes.mutations({
   },
 
   archive() {
+    if (this.isTemplateSwimlane()) {
+      this.myLists().forEach((list) => {
+        return list.archive();
+      });
+    }
     return { $set: { archived: true } };
   },
 
   restore() {
+    if (this.isTemplateSwimlane()) {
+      this.myLists().forEach((list) => {
+        return list.restore();
+      });
+    }
     return { $set: { archived: false } };
   },
+
+  setColor(newColor) {
+    if (newColor === 'silver') {
+      newColor = null;
+    }
+    return {
+      $set: {
+        color: newColor,
+      },
+    };
+  },
 });
 
 Swimlanes.hookOptions.after.update = { fetchPrevious: false };
@@ -105,7 +238,21 @@ if (Meteor.isServer) {
     });
   });
 
-  Swimlanes.before.remove((userId, doc) => {
+  Swimlanes.before.remove(function(userId, doc) {
+    const lists = Lists.find({
+      boardId: doc.boardId,
+      swimlaneId: {$in: [doc._id, '']},
+      archived: false,
+    }, { sort: ['sort'] });
+
+    if (lists.count() < 2) {
+      lists.forEach((list) => {
+        list.remove();
+      });
+    } else {
+      Cards.remove({swimlaneId: doc._id});
+    }
+
     Activities.insert({
       userId,
       type: 'swimlane',
@@ -131,6 +278,15 @@ if (Meteor.isServer) {
 
 //SWIMLANE REST API
 if (Meteor.isServer) {
+  /**
+   * @operation get_all_swimlanes
+   *
+   * @summary Get the list of swimlanes attached to a board
+   *
+   * @param {string} boardId the ID of the board
+   * @return_type [{_id: string,
+   *                title: string}]
+   */
   JsonRoutes.add('GET', '/api/boards/:boardId/swimlanes', function (req, res) {
     try {
       const paramBoardId = req.params.boardId;
@@ -154,6 +310,15 @@ if (Meteor.isServer) {
     }
   });
 
+  /**
+   * @operation get_swimlane
+   *
+   * @summary Get a swimlane
+   *
+   * @param {string} boardId the ID of the board
+   * @param {string} swimlaneId the ID of the swimlane
+   * @return_type Swimlanes
+   */
   JsonRoutes.add('GET', '/api/boards/:boardId/swimlanes/:swimlaneId', function (req, res) {
     try {
       const paramBoardId = req.params.boardId;
@@ -172,13 +337,24 @@ if (Meteor.isServer) {
     }
   });
 
+  /**
+   * @operation new_swimlane
+   *
+   * @summary Add a swimlane to a board
+   *
+   * @param {string} boardId the ID of the board
+   * @param {string} title the new title of the swimlane
+   * @return_type {_id: string}
+   */
   JsonRoutes.add('POST', '/api/boards/:boardId/swimlanes', function (req, res) {
     try {
       Authentication.checkUserId( req.userId);
       const paramBoardId = req.params.boardId;
+      const board = Boards.findOne(paramBoardId);
       const id = Swimlanes.insert({
         title: req.body.title,
         boardId: paramBoardId,
+        sort: board.swimlanes().count(),
       });
       JsonRoutes.sendResult(res, {
         code: 200,
@@ -195,6 +371,17 @@ if (Meteor.isServer) {
     }
   });
 
+  /**
+   * @operation delete_swimlane
+   *
+   * @summary Delete a swimlane
+   *
+   * @description The swimlane will be deleted, not moved to the recycle bin
+   *
+   * @param {string} boardId the ID of the board
+   * @param {string} swimlaneId the ID of the swimlane
+   * @return_type {_id: string}
+   */
   JsonRoutes.add('DELETE', '/api/boards/:boardId/swimlanes/:swimlaneId', function (req, res) {
     try {
       Authentication.checkUserId( req.userId);
diff --git a/models/trelloCreator.js b/models/trelloCreator.js
index 30f0bc2b..3ac511a5 100644
--- a/models/trelloCreator.js
+++ b/models/trelloCreator.js
@@ -150,6 +150,7 @@ export class TrelloCreator {
         userId: Meteor.userId(),
         isAdmin: true,
         isActive: true,
+        isNoComments: false,
         isCommentOnly: false,
         swimlaneId: false,
       }],
@@ -177,6 +178,7 @@ export class TrelloCreator {
               userId: wekanId,
               isAdmin: this.getAdmin(trelloMembership.memberType),
               isActive: true,
+              isNoComments: false,
               isCommentOnly: false,
               swimlaneId: false,
             });
@@ -266,7 +268,7 @@ export class TrelloCreator {
       }
       // insert card
       const cardId = Cards.direct.insert(cardToCreate);
-      // keep track of Trello id => WeKan id
+      // keep track of Trello id => Wekan id
       this.cards[card.id] = cardId;
       // log activity
       // Activities.direct.insert({
@@ -429,7 +431,7 @@ export class TrelloCreator {
           sort: checklist.pos,
         };
         const checklistId = Checklists.direct.insert(checklistToCreate);
-        // keep track of Trello id => WeKan id
+        // keep track of Trello id => Wekan id
         this.checklists[checklist.id] = checklistId;
         // Now add the items to the checklistItems
         let counter = 0;
diff --git a/models/triggers.js b/models/triggers.js
new file mode 100644
index 00000000..15982b6e
--- /dev/null
+++ b/models/triggers.js
@@ -0,0 +1,58 @@
+Triggers = new Mongo.Collection('triggers');
+
+Triggers.mutations({
+  rename(description) {
+    return {
+      $set: {
+        description,
+      },
+    };
+  },
+});
+
+Triggers.allow({
+  insert(userId, doc) {
+    return allowIsBoardAdmin(userId, Boards.findOne(doc.boardId));
+  },
+  update(userId, doc) {
+    return allowIsBoardAdmin(userId, Boards.findOne(doc.boardId));
+  },
+  remove(userId, doc) {
+    return allowIsBoardAdmin(userId, Boards.findOne(doc.boardId));
+  },
+});
+
+Triggers.helpers({
+
+  description() {
+    return this.desc;
+  },
+
+  getRule() {
+    return Rules.findOne({
+      triggerId: this._id,
+    });
+  },
+
+  fromList() {
+    return Lists.findOne(this.fromId);
+  },
+
+  toList() {
+    return Lists.findOne(this.toId);
+  },
+
+  findList(title) {
+    return Lists.findOne({
+      title,
+    });
+  },
+
+  labels() {
+    const boardLabels = this.board().labels;
+    const cardLabels = _.filter(boardLabels, (label) => {
+      return _.contains(this.labelIds, label._id);
+    });
+    return cardLabels;
+  },
+});
diff --git a/models/users.js b/models/users.js
index 0093f7cb..5f949c80 100644
--- a/models/users.js
+++ b/models/users.js
@@ -4,8 +4,14 @@ const isSandstorm = Meteor.settings && Meteor.settings.public &&
   Meteor.settings.public.sandstorm;
 Users = Meteor.users;
 
+/**
+ * A User in wekan
+ */
 Users.attachSchema(new SimpleSchema({
   username: {
+    /**
+     * the username of the user
+     */
     type: String,
     optional: true,
     autoValue() { // eslint-disable-line consistent-return
@@ -18,17 +24,29 @@ Users.attachSchema(new SimpleSchema({
     },
   },
   emails: {
+    /**
+     * the list of emails attached to a user
+     */
     type: [Object],
     optional: true,
   },
   'emails.$.address': {
+    /**
+     * The email address
+     */
     type: String,
     regEx: SimpleSchema.RegEx.Email,
   },
   'emails.$.verified': {
+    /**
+     * Has the email been verified
+     */
     type: Boolean,
   },
   createdAt: {
+    /**
+     * creation date of the user
+     */
     type: Date,
     autoValue() { // eslint-disable-line consistent-return
       if (this.isInsert) {
@@ -39,6 +57,9 @@ Users.attachSchema(new SimpleSchema({
     },
   },
   profile: {
+    /**
+     * profile settings
+     */
     type: Object,
     optional: true,
     autoValue() { // eslint-disable-line consistent-return
@@ -50,78 +71,166 @@ Users.attachSchema(new SimpleSchema({
     },
   },
   'profile.avatarUrl': {
+    /**
+     * URL of the avatar of the user
+     */
     type: String,
     optional: true,
   },
   'profile.emailBuffer': {
+    /**
+     * list of email buffers of the user
+     */
     type: [String],
     optional: true,
   },
   'profile.fullname': {
+    /**
+     * full name of the user
+     */
     type: String,
     optional: true,
   },
   'profile.hiddenSystemMessages': {
+    /**
+     * does the user wants to hide system messages?
+     */
     type: Boolean,
     optional: true,
   },
   'profile.initials': {
+    /**
+     * initials of the user
+     */
     type: String,
     optional: true,
   },
   'profile.invitedBoards': {
+    /**
+     * board IDs the user has been invited to
+     */
     type: [String],
     optional: true,
   },
   'profile.language': {
+    /**
+     * language of the user
+     */
     type: String,
     optional: true,
   },
   'profile.notifications': {
+    /**
+     * enabled notifications for the user
+     */
     type: [String],
     optional: true,
   },
   'profile.showCardsCountAt': {
+    /**
+     * showCardCountAt field of the user
+     */
     type: Number,
     optional: true,
   },
   'profile.starredBoards': {
-    type: [String],
-    optional: true,
-  },
-  'profile.tags': {
+    /**
+     * list of starred board IDs
+     */
     type: [String],
     optional: true,
   },
   'profile.icode': {
+    /**
+     * icode
+     */
     type: String,
     optional: true,
   },
   'profile.boardView': {
+    /**
+     * boardView field of the user
+     */
     type: String,
     optional: true,
+    allowedValues: [
+      'board-view-lists',
+      'board-view-swimlanes',
+      'board-view-cal',
+    ],
+  },
+  'profile.templatesBoardId': {
+    /**
+     * Reference to the templates board
+     */
+    type: String,
+    defaultValue: '',
+  },
+  'profile.cardTemplatesSwimlaneId': {
+    /**
+     * Reference to the card templates swimlane Id
+     */
+    type: String,
+    defaultValue: '',
+  },
+  'profile.listTemplatesSwimlaneId': {
+    /**
+     * Reference to the list templates swimlane Id
+     */
+    type: String,
+    defaultValue: '',
+  },
+  'profile.boardTemplatesSwimlaneId': {
+    /**
+     * Reference to the board templates swimlane Id
+     */
+    type: String,
+    defaultValue: '',
   },
   services: {
+    /**
+     * services field of the user
+     */
     type: Object,
     optional: true,
     blackbox: true,
   },
   heartbeat: {
+    /**
+     * last time the user has been seen
+     */
     type: Date,
     optional: true,
   },
   isAdmin: {
+    /**
+     * is the user an admin of the board?
+     */
     type: Boolean,
     optional: true,
   },
   createdThroughApi: {
+    /**
+     * was the user created through the API?
+     */
     type: Boolean,
     optional: true,
   },
   loginDisabled: {
+    /**
+     * loginDisabled field of the user
+     */
     type: Boolean,
     optional: true,
   },
+  'authenticationMethod': {
+    /**
+     * authentication method of the user
+     */
+    type: String,
+    optional: false,
+    defaultValue: 'password',
+  },
 }));
 
 Users.allow({
@@ -129,6 +238,19 @@ Users.allow({
     const user = Users.findOne(userId);
     return user && Meteor.user().isAdmin;
   },
+  remove(userId, doc) {
+    const adminsNumber = Users.find({ isAdmin: true }).count();
+    const { isAdmin } = Users.findOne({ _id: userId }, { fields: { 'isAdmin': 1 } });
+
+    // Prevents remove of the only one administrator
+    if (adminsNumber === 1 && isAdmin && userId === doc._id) {
+      return false;
+    }
+
+    // If it's the user or an admin
+    return userId === doc._id || isAdmin;
+  },
+  fetch: [],
 });
 
 // Search a user in the complete server database by its name or username. This
@@ -146,6 +268,16 @@ if (Meteor.isClient) {
       return board && board.hasMember(this._id);
     },
 
+    isNotNoComments() {
+      const board = Boards.findOne(Session.get('currentBoard'));
+      return board && board.hasMember(this._id) && !board.hasNoComments(this._id);
+    },
+
+    isNoComments() {
+      const board = Boards.findOne(Session.get('currentBoard'));
+      return board && board.hasNoComments(this._id);
+    },
+
     isNotCommentOnly() {
       const board = Boards.findOne(Session.get('currentBoard'));
       return board && board.hasMember(this._id) && !board.hasCommentOnly(this._id);
@@ -169,32 +301,32 @@ Users.helpers({
   },
 
   starredBoards() {
-    const {starredBoards = []} = this.profile;
+    const {starredBoards = []} = this.profile || {};
     return Boards.find({archived: false, _id: {$in: starredBoards}});
   },
 
   hasStarred(boardId) {
-    const {starredBoards = []} = this.profile;
+    const {starredBoards = []} = this.profile || {};
     return _.contains(starredBoards, boardId);
   },
 
   invitedBoards() {
-    const {invitedBoards = []} = this.profile;
+    const {invitedBoards = []} = this.profile || {};
     return Boards.find({archived: false, _id: {$in: invitedBoards}});
   },
 
   isInvitedTo(boardId) {
-    const {invitedBoards = []} = this.profile;
+    const {invitedBoards = []} = this.profile || {};
     return _.contains(invitedBoards, boardId);
   },
 
   hasTag(tag) {
-    const {tags = []} = this.profile;
+    const {tags = []} = this.profile || {};
     return _.contains(tags, tag);
   },
 
   hasNotification(activityId) {
-    const {notifications = []} = this.profile;
+    const {notifications = []} = this.profile || {};
     return _.contains(notifications, activityId);
   },
 
@@ -204,7 +336,7 @@ Users.helpers({
   },
 
   getEmailBuffer() {
-    const {emailBuffer = []} = this.profile;
+    const {emailBuffer = []} = this.profile || {};
     return emailBuffer;
   },
 
@@ -237,6 +369,18 @@ Users.helpers({
     const profile = this.profile || {};
     return profile.language || 'en';
   },
+
+  getTemplatesBoardId() {
+    return (this.profile || {}).templatesBoardId;
+  },
+
+  getTemplatesBoardSlug() {
+    return (Boards.findOne((this.profile || {}).templatesBoardId) || {}).slug;
+  },
+
+  remove() {
+    User.remove({ _id: this._id});
+  },
 });
 
 Users.mutations({
@@ -468,17 +612,49 @@ if (Meteor.isServer) {
   });
   Accounts.onCreateUser((options, user) => {
     const userCount = Users.find().count();
-    if (!isSandstorm && userCount === 0) {
+    if (userCount === 0) {
       user.isAdmin = true;
       return user;
     }
 
+    if (user.services.oidc) {
+      const email = user.services.oidc.email.toLowerCase();
+      user.username = user.services.oidc.username;
+      user.emails = [{ address: email, verified: true }];
+      const initials = user.services.oidc.fullname.match(/\b[a-zA-Z]/g).join('').toUpperCase();
+      user.profile = { initials, fullname: user.services.oidc.fullname, boardView: 'board-view-lists' };
+      user.authenticationMethod = 'oauth2';
+
+      // see if any existing user has this email address or username, otherwise create new
+      const existingUser = Meteor.users.findOne({$or: [{'emails.address': email}, {'username':user.username}]});
+      if (!existingUser)
+        return user;
+
+      // copy across new service info
+      const service = _.keys(user.services)[0];
+      existingUser.services[service] = user.services[service];
+      existingUser.emails = user.emails;
+      existingUser.username = user.username;
+      existingUser.profile = user.profile;
+      existingUser.authenticationMethod = user.authenticationMethod;
+
+      Meteor.users.remove({_id: existingUser._id}); // remove existing record
+      return existingUser;
+    }
+
     if (options.from === 'admin') {
       user.createdThroughApi = true;
       return user;
     }
 
     const disableRegistration = Settings.findOne().disableRegistration;
+    // If this is the first Authentication by the ldap and self registration disabled
+    if (disableRegistration && options && options.ldap) {
+      user.authenticationMethod = 'ldap';
+      return user;
+    }
+
+    // If self registration enabled
     if (!disableRegistration) {
       return user;
     }
@@ -496,9 +672,13 @@ if (Meteor.isServer) {
     } else {
       user.profile = {icode: options.profile.invitationcode};
       user.profile.boardView = 'board-view-lists';
-    }
 
-    return user;
+      // Deletes the invitation code after the user was created successfully.
+      setTimeout(Meteor.bindEnvironment(() => {
+        InvitationCodes.remove({'_id': invitationCode._id});
+      }), 200);
+      return user;
+    }
   });
 }
 
@@ -510,6 +690,23 @@ if (Meteor.isServer) {
     }, {unique: true});
   });
 
+  // OLD WAY THIS CODE DID WORK: When user is last admin of board,
+  // if admin is removed, board is removed.
+  // NOW THIS IS COMMENTED OUT, because other board users still need to be able
+  // to use that board, and not have board deleted.
+  // Someone can be later changed to be admin of board, by making change to database.
+  // TODO: Add UI for changing someone as board admin.
+  //Users.before.remove((userId, doc) => {
+  //  Boards
+  //    .find({members: {$elemMatch: {userId: doc._id, isAdmin: true}}})
+  //    .forEach((board) => {
+  //      // If only one admin for the board
+  //      if (board.members.filter((e) => e.isAdmin).length === 1) {
+  //        Boards.remove(board._id);
+  //      }
+  //    });
+  //});
+
   // Each board document contains the de-normalized number of users that have
   // starred it. If the user star or unstar a board, we need to update this
   // counter.
@@ -548,7 +745,6 @@ if (Meteor.isServer) {
   CollectionHooks.getUserId = () => {
     return fakeUserId.get() || getUserId();
   };
-
   if (!isSandstorm) {
     Users.after.insert((userId, doc) => {
       const fakeUser = {
@@ -558,6 +754,7 @@ if (Meteor.isServer) {
       };
 
       fakeUserId.withValue(doc._id, () => {
+      /*
         // Insert the Welcome Board
         Boards.insert({
           title: TAPi18n.__('welcome-board'),
@@ -574,6 +771,53 @@ if (Meteor.isServer) {
             Lists.insert({title: TAPi18n.__(title), boardId, sort: titleIndex}, fakeUser);
           });
         });
+        */
+
+        Boards.insert({
+          title: TAPi18n.__('templates'),
+          permission: 'private',
+          type: 'template-container',
+        }, fakeUser, (err, boardId) => {
+
+          // Insert the reference to our templates board
+          Users.update(fakeUserId.get(), {$set: {'profile.templatesBoardId': boardId}});
+
+          // Insert the card templates swimlane
+          Swimlanes.insert({
+            title: TAPi18n.__('card-templates-swimlane'),
+            boardId,
+            sort: 1,
+            type: 'template-container',
+          }, fakeUser, (err, swimlaneId) => {
+
+            // Insert the reference to out card templates swimlane
+            Users.update(fakeUserId.get(), {$set: {'profile.cardTemplatesSwimlaneId': swimlaneId}});
+          });
+
+          // Insert the list templates swimlane
+          Swimlanes.insert({
+            title: TAPi18n.__('list-templates-swimlane'),
+            boardId,
+            sort: 2,
+            type: 'template-container',
+          }, fakeUser, (err, swimlaneId) => {
+
+            // Insert the reference to out list templates swimlane
+            Users.update(fakeUserId.get(), {$set: {'profile.listTemplatesSwimlaneId': swimlaneId}});
+          });
+
+          // Insert the board templates swimlane
+          Swimlanes.insert({
+            title: TAPi18n.__('board-templates-swimlane'),
+            boardId,
+            sort: 3,
+            type: 'template-container',
+          }, fakeUser, (err, swimlaneId) => {
+
+            // Insert the reference to out board templates swimlane
+            Users.update(fakeUserId.get(), {$set: {'profile.boardTemplatesSwimlaneId': swimlaneId}});
+          });
+        });
       });
     });
   }
@@ -593,7 +837,9 @@ if (Meteor.isServer) {
 
     //invite user to corresponding boards
     const disableRegistration = Settings.findOne().disableRegistration;
-    if (disableRegistration) {
+    // If ldap, bypass the inviation code if the self registration isn't allowed.
+    // TODO : pay attention if ldap field in the user model change to another content ex : ldap field to connection_type
+    if (doc.authenticationMethod !== 'ldap' && disableRegistration) {
       const invitationCode = InvitationCodes.findOne({code: doc.profile.icode, valid: true});
       if (!invitationCode) {
         throw new Meteor.Error('error-invitation-code-not-exist');
@@ -613,9 +859,26 @@ if (Meteor.isServer) {
   });
 }
 
-
 // USERS REST API
 if (Meteor.isServer) {
+  // Middleware which checks that API is enabled.
+  JsonRoutes.Middleware.use(function (req, res, next) {
+    const api = req.url.search('api');
+    if (api === 1 && process.env.WITH_API === 'true' || api === -1){
+      return next();
+    }
+    else {
+      res.writeHead(301, {Location: '/'});
+      return res.end();
+    }
+  });
+
+  /**
+   * @operation get_current_user
+   *
+   * @summary returns the current user
+   * @return_type Users
+   */
   JsonRoutes.add('GET', '/api/user', function(req, res) {
     try {
       Authentication.checkLoggedIn(req.userId);
@@ -634,6 +897,15 @@ if (Meteor.isServer) {
     }
   });
 
+  /**
+   * @operation get_all_users
+   *
+   * @summary return all the users
+   *
+   * @description Only the admin user (the first user) can call the REST API.
+   * @return_type [{ _id: string,
+   *                 username: string}]
+   */
   JsonRoutes.add('GET', '/api/users', function (req, res) {
     try {
       Authentication.checkUserId(req.userId);
@@ -652,10 +924,20 @@ if (Meteor.isServer) {
     }
   });
 
-  JsonRoutes.add('GET', '/api/users/:id', function (req, res) {
+  /**
+   * @operation get_user
+   *
+   * @summary get a given user
+   *
+   * @description Only the admin user (the first user) can call the REST API.
+   *
+   * @param {string} userId the user ID
+   * @return_type Users
+   */
+  JsonRoutes.add('GET', '/api/users/:userId', function (req, res) {
     try {
       Authentication.checkUserId(req.userId);
-      const id = req.params.id;
+      const id = req.params.userId;
       JsonRoutes.sendResult(res, {
         code: 200,
         data: Meteor.users.findOne({ _id: id }),
@@ -669,10 +951,27 @@ if (Meteor.isServer) {
     }
   });
 
-  JsonRoutes.add('PUT', '/api/users/:id', function (req, res) {
+  /**
+   * @operation edit_user
+   *
+   * @summary edit a given user
+   *
+   * @description Only the admin user (the first user) can call the REST API.
+   *
+   * Possible values for *action*:
+   * - `takeOwnership`: The admin takes the ownership of ALL boards of the user (archived and not archived) where the user is admin on.
+   * - `disableLogin`: Disable a user (the user is not allowed to login and his login tokens are purged)
+   * - `enableLogin`: Enable a user
+   *
+   * @param {string} userId the user ID
+   * @param {string} action the action
+   * @return_type {_id: string,
+   *               title: string}
+   */
+  JsonRoutes.add('PUT', '/api/users/:userId', function (req, res) {
     try {
       Authentication.checkUserId(req.userId);
-      const id = req.params.id;
+      const id = req.params.userId;
       const action = req.body.action;
       let data = Meteor.users.findOne({ _id: id });
       if (data !== undefined) {
@@ -712,6 +1011,126 @@ if (Meteor.isServer) {
     }
   });
 
+  /**
+   * @operation add_board_member
+   * @tag Boards
+   *
+   * @summary Add New Board Member with Role
+   *
+   * @description Only the admin user (the first user) can call the REST API.
+   *
+   * **Note**: see [Boards.set_board_member_permission](#set_board_member_permission)
+   * to later change the permissions.
+   *
+   * @param {string} boardId the board ID
+   * @param {string} userId the user ID
+   * @param {boolean} isAdmin is the user an admin of the board
+   * @param {boolean} isNoComments disable comments
+   * @param {boolean} isCommentOnly only enable comments
+   * @return_type {_id: string,
+   *               title: string}
+   */
+  JsonRoutes.add('POST', '/api/boards/:boardId/members/:userId/add', function (req, res) {
+    try {
+      Authentication.checkUserId(req.userId);
+      const userId = req.params.userId;
+      const boardId = req.params.boardId;
+      const action = req.body.action;
+      const {isAdmin, isNoComments, isCommentOnly} = req.body;
+      let data = Meteor.users.findOne({ _id: userId });
+      if (data !== undefined) {
+        if (action === 'add') {
+          data = Boards.find({
+            _id: boardId,
+          }).map(function(board) {
+            if (!board.hasMember(userId)) {
+              board.addMember(userId);
+              function isTrue(data){
+                return data.toLowerCase() === 'true';
+              }
+              board.setMemberPermission(userId, isTrue(isAdmin), isTrue(isNoComments), isTrue(isCommentOnly), userId);
+            }
+            return {
+              _id: board._id,
+              title: board.title,
+            };
+          });
+        }
+      }
+      JsonRoutes.sendResult(res, {
+        code: 200,
+        data: query,
+      });
+    }
+    catch (error) {
+      JsonRoutes.sendResult(res, {
+        code: 200,
+        data: error,
+      });
+    }
+  });
+
+  /**
+   * @operation remove_board_member
+   * @tag Boards
+   *
+   * @summary Remove Member from Board
+   *
+   * @description Only the admin user (the first user) can call the REST API.
+   *
+   * @param {string} boardId the board ID
+   * @param {string} userId the user ID
+   * @param {string} action the action (needs to be `remove`)
+   * @return_type {_id: string,
+   *               title: string}
+   */
+  JsonRoutes.add('POST', '/api/boards/:boardId/members/:userId/remove', function (req, res) {
+    try {
+      Authentication.checkUserId(req.userId);
+      const userId = req.params.userId;
+      const boardId = req.params.boardId;
+      const action = req.body.action;
+      let data = Meteor.users.findOne({ _id: userId });
+      if (data !== undefined) {
+        if (action === 'remove') {
+          data = Boards.find({
+            _id: boardId,
+          }).map(function(board) {
+            if (board.hasMember(userId)) {
+              board.removeMember(userId);
+            }
+            return {
+              _id: board._id,
+              title: board.title,
+            };
+          });
+        }
+      }
+      JsonRoutes.sendResult(res, {
+        code: 200,
+        data: query,
+      });
+    }
+    catch (error) {
+      JsonRoutes.sendResult(res, {
+        code: 200,
+        data: error,
+      });
+    }
+  });
+
+  /**
+   * @operation new_user
+   *
+   * @summary Create a new user
+   *
+   * @description Only the admin user (the first user) can call the REST API.
+   *
+   * @param {string} username the new username
+   * @param {string} email the email of the new user
+   * @param {string} password the password of the new user
+   * @return_type {_id: string}
+   */
   JsonRoutes.add('POST', '/api/users/', function (req, res) {
     try {
       Authentication.checkUserId(req.userId);
@@ -736,10 +1155,20 @@ if (Meteor.isServer) {
     }
   });
 
-  JsonRoutes.add('DELETE', '/api/users/:id', function (req, res) {
+  /**
+   * @operation delete_user
+   *
+   * @summary Delete a user
+   *
+   * @description Only the admin user (the first user) can call the REST API.
+   *
+   * @param {string} userId the ID of the user to delete
+   * @return_type {_id: string}
+   */
+  JsonRoutes.add('DELETE', '/api/users/:userId', function (req, res) {
     try {
       Authentication.checkUserId(req.userId);
-      const id = req.params.id;
+      const id = req.params.userId;
       Meteor.users.remove({ _id: id });
       JsonRoutes.sendResult(res, {
         code: 200,
diff --git a/models/wekanCreator.js b/models/wekanCreator.js
index 4551979b..0f6a9d17 100644
--- a/models/wekanCreator.js
+++ b/models/wekanCreator.js
@@ -1,4 +1,4 @@
-const DateString = Match.Where(function (dateAsString) {
+const DateString = Match.Where(function(dateAsString) {
   check(dateAsString, String);
   return moment(dateAsString, moment.ISO_8601).isValid();
 });
@@ -40,8 +40,14 @@ export class WekanCreator {
     this.checklistItems = {};
     // The comments, indexed by Wekan card id (to map when importing cards)
     this.comments = {};
+    // Map of rules Wekan ID => Wekan ID
+    this.rules = {};
     // the members, indexed by Wekan member id => Wekan user ID
     this.members = data.membersMapping ? data.membersMapping : {};
+    // Map of triggers Wekan ID => Wekan ID
+    this.triggers = {};
+    // Map of actions Wekan ID => Wekan ID
+    this.actions = {};
 
     // maps a wekanCardId to an array of wekanAttachments
     this.attachments = {};
@@ -57,10 +63,10 @@ export class WekanCreator {
    * @param {String} dateString a properly formatted Date
    */
   _now(dateString) {
-    if(dateString) {
+    if (dateString) {
       return new Date(dateString);
     }
-    if(!this._nowDate) {
+    if (!this._nowDate) {
       this._nowDate = new Date();
     }
     return this._nowDate;
@@ -72,9 +78,9 @@ export class WekanCreator {
    * Otherwise return current logged user.
    * @param wekanUserId
    * @private
-     */
+   */
   _user(wekanUserId) {
-    if(wekanUserId && this.members[wekanUserId]) {
+    if (wekanUserId && this.members[wekanUserId]) {
       return this.members[wekanUserId];
     }
     return Meteor.userId();
@@ -96,7 +102,7 @@ export class WekanCreator {
       // allowed values (is it worth the maintenance?)
       color: String,
       permission: Match.Where((value) => {
-        return ['private', 'public'].indexOf(value)>= 0;
+        return ['private', 'public'].indexOf(value) >= 0;
       }),
     }));
   }
@@ -147,6 +153,55 @@ export class WekanCreator {
     })]);
   }
 
+  checkRules(wekanRules) {
+    check(wekanRules, [Match.ObjectIncluding({
+      triggerId: String,
+      actionId: String,
+      title: String,
+    })]);
+  }
+
+  checkTriggers(wekanTriggers) {
+    // XXX More check based on trigger type
+    check(wekanTriggers, [Match.ObjectIncluding({
+      activityType: String,
+      desc: String,
+    })]);
+  }
+
+  getMembersToMap(data) {
+  // we will work on the list itself (an ordered array of objects) when a
+  // mapping is done, we add a 'wekan' field to the object representing the
+  // imported member
+    const membersToMap = data.members;
+    const users = data.users;
+    // auto-map based on username
+    membersToMap.forEach((importedMember) => {
+      importedMember.id = importedMember.userId;
+      delete importedMember.userId;
+      const user = users.filter((user) => {
+        return user._id === importedMember.id;
+      })[0];
+      if (user.profile && user.profile.fullname) {
+        importedMember.fullName = user.profile.fullname;
+      }
+      importedMember.username = user.username;
+      const wekanUser = Users.findOne({ username: importedMember.username });
+      if (wekanUser) {
+        importedMember.wekanId = wekanUser._id;
+      }
+    });
+    return membersToMap;
+  }
+
+  checkActions(wekanActions) {
+    // XXX More check based on action type
+    check(wekanActions, [Match.ObjectIncluding({
+      actionType: String,
+      desc: String,
+    })]);
+  }
+
   // You must call parseActions before calling this one.
   createBoardAndLabels(boardToImport) {
     const boardToCreate = {
@@ -160,6 +215,7 @@ export class WekanCreator {
         wekanId: Meteor.userId(),
         isActive: true,
         isAdmin: true,
+        isNoComments: false,
         isCommentOnly: false,
         swimlaneId: false,
       }],
@@ -171,12 +227,12 @@ export class WekanCreator {
       title: boardToImport.title,
     };
     // now add other members
-    if(boardToImport.members) {
+    if (boardToImport.members) {
       boardToImport.members.forEach((wekanMember) => {
         // do we already have it in our list?
-        if(!boardToCreate.members.some((member) => member.wekanId === wekanMember.wekanId))
+        if (!boardToCreate.members.some((member) => member.wekanId === wekanMember.wekanId))
           boardToCreate.members.push({
-            ... wekanMember,
+            ...wekanMember,
             userId: wekanMember.wekanId,
           });
       });
@@ -193,7 +249,11 @@ export class WekanCreator {
       boardToCreate.labels.push(labelToCreate);
     });
     const boardId = Boards.direct.insert(boardToCreate);
-    Boards.direct.update(boardId, {$set: {modifiedAt: this._now()}});
+    Boards.direct.update(boardId, {
+      $set: {
+        modifiedAt: this._now(),
+      },
+    });
     // log activity
     Activities.direct.insert({
       activityType: 'importBoard',
@@ -245,27 +305,31 @@ export class WekanCreator {
         });
       }
       // add members {
-      if(card.members) {
+      if (card.members) {
         const wekanMembers = [];
         // we can't just map, as some members may not have been mapped
         card.members.forEach((sourceMemberId) => {
-          if(this.members[sourceMemberId]) {
+          if (this.members[sourceMemberId]) {
             const wekanId = this.members[sourceMemberId];
             // we may map multiple Wekan members to the same wekan user
             // in which case we risk adding the same user multiple times
-            if(!wekanMembers.find((wId) => wId === wekanId)){
+            if (!wekanMembers.find((wId) => wId === wekanId)) {
               wekanMembers.push(wekanId);
             }
           }
           return true;
         });
-        if(wekanMembers.length>0) {
+        if (wekanMembers.length > 0) {
           cardToCreate.members = wekanMembers;
         }
       }
+      // set color
+      if (card.color) {
+        cardToCreate.color = card.color;
+      }
       // insert card
       const cardId = Cards.direct.insert(cardToCreate);
-      // keep track of Wekan id => WeKan id
+      // keep track of Wekan id => Wekan id
       this.cards[card._id] = cardId;
       // // log activity
       // Activities.direct.insert({
@@ -320,9 +384,9 @@ export class WekanCreator {
           // - the template then tries to display the url to the attachment which causes other errors
           // so we make it server only, and let UI catch up once it is done, forget about latency comp.
           const self = this;
-          if(Meteor.isServer) {
+          if (Meteor.isServer) {
             if (att.url) {
-              file.attachData(att.url, function (error) {
+              file.attachData(att.url, function(error) {
                 file.boardId = boardId;
                 file.cardId = cardId;
                 file.userId = self._user(att.userId);
@@ -330,20 +394,26 @@ export class WekanCreator {
                 // attachments' related activities automatically
                 file.source = 'import';
                 if (error) {
-                  throw(error);
+                  throw (error);
                 } else {
                   const wekanAtt = Attachments.insert(file, () => {
                     // we do nothing
                   });
                   self.attachmentIds[att._id] = wekanAtt._id;
                   //
-                  if(wekanCoverId === att._id) {
-                    Cards.direct.update(cardId, { $set: {coverId: wekanAtt._id}});
+                  if (wekanCoverId === att._id) {
+                    Cards.direct.update(cardId, {
+                      $set: {
+                        coverId: wekanAtt._id,
+                      },
+                    });
                   }
                 }
               });
             } else if (att.file) {
-              file.attachData(new Buffer(att.file, 'base64'), {type: att.type}, (error) => {
+              file.attachData(new Buffer(att.file, 'base64'), {
+                type: att.type,
+              }, (error) => {
                 file.name(att.name);
                 file.boardId = boardId;
                 file.cardId = cardId;
@@ -352,15 +422,19 @@ export class WekanCreator {
                 // attachments' related activities automatically
                 file.source = 'import';
                 if (error) {
-                  throw(error);
+                  throw (error);
                 } else {
                   const wekanAtt = Attachments.insert(file, () => {
                     // we do nothing
                   });
                   this.attachmentIds[att._id] = wekanAtt._id;
                   //
-                  if(wekanCoverId === att._id) {
-                    Cards.direct.update(cardId, { $set: {coverId: wekanAtt._id}});
+                  if (wekanCoverId === att._id) {
+                    Cards.direct.update(cardId, {
+                      $set: {
+                        coverId: wekanAtt._id,
+                      },
+                    });
                   }
                 }
               });
@@ -403,7 +477,11 @@ export class WekanCreator {
         sort: list.sort ? list.sort : listIndex,
       };
       const listId = Lists.direct.insert(listToCreate);
-      Lists.direct.update(listId, {$set: {'updatedAt': this._now()}});
+      Lists.direct.update(listId, {
+        $set: {
+          'updatedAt': this._now(),
+        },
+      });
       this.lists[list._id] = listId;
       // // log activity
       // Activities.direct.insert({
@@ -435,8 +513,16 @@ export class WekanCreator {
         title: swimlane.title,
         sort: swimlane.sort ? swimlane.sort : swimlaneIndex,
       };
+      // set color
+      if (swimlane.color) {
+        swimlaneToCreate.color = swimlane.color;
+      }
       const swimlaneId = Swimlanes.direct.insert(swimlaneToCreate);
-      Swimlanes.direct.update(swimlaneId, {$set: {'updatedAt': this._now()}});
+      Swimlanes.direct.update(swimlaneId, {
+        $set: {
+          'updatedAt': this._now(),
+        },
+      });
       this.swimlanes[swimlane._id] = swimlaneId;
     });
   }
@@ -458,6 +544,47 @@ export class WekanCreator {
     return result;
   }
 
+  createTriggers(wekanTriggers, boardId) {
+    wekanTriggers.forEach((trigger) => {
+      if (trigger.hasOwnProperty('labelId')) {
+        trigger.labelId = this.labels[trigger.labelId];
+      }
+      if (trigger.hasOwnProperty('memberId')) {
+        trigger.memberId = this.members[trigger.memberId];
+      }
+      trigger.boardId = boardId;
+      const oldId = trigger._id;
+      delete trigger._id;
+      this.triggers[oldId] = Triggers.direct.insert(trigger);
+    });
+  }
+
+  createActions(wekanActions, boardId) {
+    wekanActions.forEach((action) => {
+      if (action.hasOwnProperty('labelId')) {
+        action.labelId = this.labels[action.labelId];
+      }
+      if (action.hasOwnProperty('memberId')) {
+        action.memberId = this.members[action.memberId];
+      }
+      action.boardId = boardId;
+      const oldId = action._id;
+      delete action._id;
+      this.actions[oldId] = Actions.direct.insert(action);
+    });
+  }
+
+  createRules(wekanRules, boardId) {
+    wekanRules.forEach((rule) => {
+      // Create the rule
+      rule.boardId = boardId;
+      rule.triggerId = this.triggers[rule.triggerId];
+      rule.actionId = this.actions[rule.actionId];
+      delete rule._id;
+      Rules.direct.insert(rule);
+    });
+  }
+
   createChecklistItems(wekanChecklistItems) {
     wekanChecklistItems.forEach((checklistitem, checklistitemIndex) => {
       // Create the checklistItem
@@ -476,7 +603,8 @@ export class WekanCreator {
   parseActivities(wekanBoard) {
     wekanBoard.activities.forEach((activity) => {
       switch (activity.activityType) {
-      case 'addAttachment': {
+      case 'addAttachment':
+      {
         // We have to be cautious, because the attachment could have been removed later.
         // In that case Wekan still reports its addition, but removes its 'url' field.
         // So we test for that
@@ -484,12 +612,12 @@ export class WekanCreator {
           return attachment._id === activity.attachmentId;
         })[0];
 
-        if ( typeof wekanAttachment !== 'undefined' && wekanAttachment ) {
-          if(wekanAttachment.url || wekanAttachment.file) {
-          // we cannot actually create the Wekan attachment, because we don't yet
-          // have the cards to attach it to, so we store it in the instance variable.
+        if (typeof wekanAttachment !== 'undefined' && wekanAttachment) {
+          if (wekanAttachment.url || wekanAttachment.file) {
+            // we cannot actually create the Wekan attachment, because we don't yet
+            // have the cards to attach it to, so we store it in the instance variable.
             const wekanCardId = activity.cardId;
-            if(!this.attachments[wekanCardId]) {
+            if (!this.attachments[wekanCardId]) {
               this.attachments[wekanCardId] = [];
             }
             this.attachments[wekanCardId].push(wekanAttachment);
@@ -497,7 +625,8 @@ export class WekanCreator {
         }
         break;
       }
-      case 'addComment': {
+      case 'addComment':
+      {
         const wekanComment = wekanBoard.comments.filter((comment) => {
           return comment._id === activity.commentId;
         })[0];
@@ -508,26 +637,31 @@ export class WekanCreator {
         this.comments[id].push(wekanComment);
         break;
       }
-      case 'createBoard': {
+      case 'createBoard':
+      {
         this.createdAt.board = activity.createdAt;
         break;
       }
-      case 'createCard': {
+      case 'createCard':
+      {
         const cardId = activity.cardId;
         this.createdAt.cards[cardId] = activity.createdAt;
         this.createdBy.cards[cardId] = activity.userId;
         break;
       }
-      case 'createList': {
+      case 'createList':
+      {
         const listId = activity.listId;
         this.createdAt.lists[listId] = activity.createdAt;
         break;
       }
-      case 'createSwimlane': {
+      case 'createSwimlane':
+      {
         const swimlaneId = activity.swimlaneId;
         this.createdAt.swimlanes[swimlaneId] = activity.createdAt;
         break;
-      }}
+      }
+      }
     });
   }
 
@@ -536,7 +670,8 @@ export class WekanCreator {
       switch (activity.activityType) {
       // Board related activities
       // TODO: addBoardMember, removeBoardMember
-      case 'createBoard': {
+      case 'createBoard':
+      {
         Activities.direct.insert({
           userId: this._user(activity.userId),
           type: 'board',
@@ -549,7 +684,8 @@ export class WekanCreator {
       }
       // List related activities
       // TODO: removeList, archivedList
-      case 'createList': {
+      case 'createList':
+      {
         Activities.direct.insert({
           userId: this._user(activity.userId),
           type: 'list',
@@ -562,7 +698,8 @@ export class WekanCreator {
       }
       // Card related activities
       // TODO: archivedCard, restoredCard, joinMember, unjoinMember
-      case 'createCard': {
+      case 'createCard':
+      {
         Activities.direct.insert({
           userId: this._user(activity.userId),
           activityType: activity.activityType,
@@ -573,7 +710,8 @@ export class WekanCreator {
         });
         break;
       }
-      case 'moveCard': {
+      case 'moveCard':
+      {
         Activities.direct.insert({
           userId: this._user(activity.userId),
           oldListId: this.lists[activity.oldListId],
@@ -586,7 +724,8 @@ export class WekanCreator {
         break;
       }
       // Comment related activities
-      case 'addComment': {
+      case 'addComment':
+      {
         Activities.direct.insert({
           userId: this._user(activity.userId),
           activityType: activity.activityType,
@@ -598,7 +737,8 @@ export class WekanCreator {
         break;
       }
       // Attachment related activities
-      case 'addAttachment': {
+      case 'addAttachment':
+      {
         Activities.direct.insert({
           userId: this._user(activity.userId),
           type: 'card',
@@ -611,7 +751,8 @@ export class WekanCreator {
         break;
       }
       // Checklist related activities
-      case 'addChecklist': {
+      case 'addChecklist':
+      {
         Activities.direct.insert({
           userId: this._user(activity.userId),
           activityType: activity.activityType,
@@ -622,7 +763,8 @@ export class WekanCreator {
         });
         break;
       }
-      case 'addChecklistItem': {
+      case 'addChecklistItem':
+      {
         Activities.direct.insert({
           userId: this._user(activity.userId),
           activityType: activity.activityType,
@@ -635,26 +777,32 @@ export class WekanCreator {
           createdAt: this._now(activity.createdAt),
         });
         break;
-      }}
+      }
+      }
     });
   }
 
-  check(board) {
-    try {
-      // check(data, {
-      //   membersMapping: Match.Optional(Object),
-      // });
-      this.checkActivities(board.activities);
-      this.checkBoard(board);
-      this.checkLabels(board.labels);
-      this.checkLists(board.lists);
-      this.checkSwimlanes(board.swimlanes);
-      this.checkCards(board.cards);
-      this.checkChecklists(board.checklists);
-      this.checkChecklistItems(board.checklistItems);
-    } catch (e) {
-      throw new Meteor.Error('error-json-schema');
-    }
+  //check(board) {
+  check() {
+    //try {
+    // check(data, {
+    //   membersMapping: Match.Optional(Object),
+    // });
+
+    // this.checkActivities(board.activities);
+    // this.checkBoard(board);
+    // this.checkLabels(board.labels);
+    // this.checkLists(board.lists);
+    // this.checkSwimlanes(board.swimlanes);
+    // this.checkCards(board.cards);
+    //this.checkChecklists(board.checklists);
+    // this.checkRules(board.rules);
+    // this.checkActions(board.actions);
+    //this.checkTriggers(board.triggers);
+    //this.checkChecklistItems(board.checklistItems);
+    //} catch (e) {
+    //  throw new Meteor.Error('error-json-schema');
+    // }
   }
 
   create(board, currentBoardId) {
@@ -673,6 +821,9 @@ export class WekanCreator {
     this.createChecklists(board.checklists);
     this.createChecklistItems(board.checklistItems);
     this.importActivities(board.activities, boardId);
+    this.createTriggers(board.triggers, boardId);
+    this.createActions(board.actions, boardId);
+    this.createRules(board.rules, boardId);
     // XXX add members
     return boardId;
   }
diff --git a/models/wekanmapper.js b/models/wekanmapper.js
new file mode 100644
index 00000000..f4c110f7
--- /dev/null
+++ b/models/wekanmapper.js
@@ -0,0 +1,24 @@
+export function getMembersToMap(data) {
+  // we will work on the list itself (an ordered array of objects) when a
+  // mapping is done, we add a 'wekan' field to the object representing the
+  // imported member
+  const membersToMap = data.members;
+  const users = data.users;
+  // auto-map based on username
+  membersToMap.forEach((importedMember) => {
+    importedMember.id = importedMember.userId;
+    delete importedMember.userId;
+    const user = users.filter((user) => {
+      return user._id === importedMember.id;
+    })[0];
+    if (user.profile && user.profile.fullname) {
+      importedMember.fullName = user.profile.fullname;
+    }
+    importedMember.username = user.username;
+    const wekanUser = Users.findOne({ username: importedMember.username });
+    if (wekanUser) {
+      importedMember.wekanId = wekanUser._id;
+    }
+  });
+  return membersToMap;
+}
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
new file mode 100644
index 00000000..9029a2b4
--- /dev/null
+++ b/nginx/nginx.conf
@@ -0,0 +1,92 @@
+user  www-data;
+worker_processes  1;
+
+error_log  /var/log/nginx/error.log warn;
+pid        /var/run/nginx.pid;
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log  main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    keepalive_timeout  65;
+
+    map $http_host $this_host {
+        "" $host;
+        default $http_host;
+    }
+
+    map $http_x_forwarded_proto $the_scheme {
+        default $http_x_forwarded_proto;
+        "" $scheme;
+    }
+
+    map $http_x_forwarded_host $the_host {
+       default $http_x_forwarded_host;
+       "" $this_host;
+    }
+
+    map $http_upgrade $connection_upgrade {
+        default upgrade;
+        '' close;
+    }
+
+    server {
+   	listen 80;
+	listen 443 ssl;
+
+	if ($scheme = http) {
+  	    rewrite ^ https://$host$request_uri? permanent;
+	}
+
+
+  ssl_certificate /etc/nginx/ssl/server.crt;
+	ssl_certificate_key /etc/nginx/ssl/server.key;
+
+
+	ssl_protocols TLSv1.2;	
+	ssl_prefer_server_ciphers on;
+	ssl_ciphers EECDH+AESGCM:EECDH+CHACHA20:EECDH+AES;
+
+	ssl_session_cache shared:SSL:10m;
+	ssl_session_timeout 10m;
+
+	ssl_ecdh_curve sect571r1:secp521r1:brainpoolP512r1:secp384r1;
+	add_header Strict-Transport-Security "max-age=31536000; preload";
+
+        # Add headers to serve security related headers
+        add_header X-Content-Type-Options nosniff;
+        add_header X-XSS-Protection "1; mode=block";
+        add_header X-Robots-Tag none;
+        add_header X-Download-Options noopen;
+        add_header X-Permitted-Cross-Domain-Policies none;
+
+	add_header Referrer-Policy "same-origin";
+
+        root /var/www/html;
+        client_max_body_size 10G; # 0=unlimited - set max upload size
+        fastcgi_buffers 64 4K;
+
+        gzip off;
+
+	location / {
+		proxy_pass http://wekan:8080;
+		proxy_http_version 1.1;
+		proxy_set_header Upgrade $http_upgrade;
+		proxy_set_header Connection $connection_upgrade;
+		proxy_set_header X-Forwarded-For $remote_addr;
+	}
+    }
+}
diff --git a/nginx/ssl/.gitkeep b/nginx/ssl/.gitkeep
new file mode 100644
index 00000000..1fe3dd24
--- /dev/null
+++ b/nginx/ssl/.gitkeep
@@ -0,0 +1 @@
+PLACE YOUR SSL Certificates in this folder
diff --git a/openapi/README.md b/openapi/README.md
new file mode 100644
index 00000000..e3fb7fd9
--- /dev/null
+++ b/openapi/README.md
@@ -0,0 +1,27 @@
+
+# OpenAPI tools and doc generation
+
+## Open API generation
+
+This folder contains a script (`generate_openapi.py`) that extracts
+the REST API of Wekan and exports it under the OpenAPI 2.0 specification
+(Swagger 2.0).
+
+### dependencies
+- python3
+- [esprima-python](https://github.com/Kronuz/esprima-python)
+
+### calling the tool
+
+    python3 generate_openapi.py --release v1.65 > ../public/wekan_api.yml
+
+## Generating docs
+Now that we have the OpenAPI, it's easy enough to convert the YAML file into some nice Markdown with
+[shins](https://github.com/Mermade/shins) and [api2html](https://github.com/tobilg/api2html),
+or even [ReDoc](https://github.com/Rebilly/ReDoc):
+
+    api2html -c ../public/logo-header.png -o api.html ../public/wekan_api.yml
+
+or
+
+    redoc-cli serve ../public/wekan_api.yml
diff --git a/openapi/generate_openapi.py b/openapi/generate_openapi.py
new file mode 100644
index 00000000..2a898f0e
--- /dev/null
+++ b/openapi/generate_openapi.py
@@ -0,0 +1,915 @@
+#!/bin/env python3
+
+import argparse
+import esprima
+import json
+import os
+import re
+import sys
+
+
+def get_req_body_elems(obj, elems):
+    if obj.type == 'FunctionExpression':
+        get_req_body_elems(obj.body, elems)
+    elif obj.type == 'BlockStatement':
+        for s in obj.body:
+            get_req_body_elems(s, elems)
+    elif obj.type == 'TryStatement':
+        get_req_body_elems(obj.block, elems)
+    elif obj.type == 'ExpressionStatement':
+        get_req_body_elems(obj.expression, elems)
+    elif obj.type == 'MemberExpression':
+        left = get_req_body_elems(obj.object, elems)
+        right = obj.property.name
+        if left == 'req.body' and right not in elems:
+            elems.append(right)
+        return '{}.{}'.format(left, right)
+    elif obj.type == 'VariableDeclaration':
+        for s in obj.declarations:
+            get_req_body_elems(s, elems)
+    elif obj.type == 'VariableDeclarator':
+        if obj.id.type == 'ObjectPattern':
+            # get_req_body_elems() can't be called directly here:
+            # const {isAdmin, isNoComments, isCommentOnly} = req.body;
+            right = get_req_body_elems(obj.init, elems)
+            if right == 'req.body':
+                for p in obj.id.properties:
+                    name = p.key.name
+                    if name not in elems:
+                        elems.append(name)
+        else:
+            get_req_body_elems(obj.init, elems)
+    elif obj.type == 'Property':
+        get_req_body_elems(obj.value, elems)
+    elif obj.type == 'ObjectExpression':
+        for s in obj.properties:
+            get_req_body_elems(s, elems)
+    elif obj.type == 'CallExpression':
+        for s in obj.arguments:
+            get_req_body_elems(s, elems)
+    elif obj.type == 'ArrayExpression':
+        for s in obj.elements:
+            get_req_body_elems(s, elems)
+    elif obj.type == 'IfStatement':
+        get_req_body_elems(obj.test, elems)
+        if obj.consequent is not None:
+            get_req_body_elems(obj.consequent, elems)
+        if obj.alternate is not None:
+            get_req_body_elems(obj.alternate, elems)
+    elif obj.type in ('LogicalExpression', 'BinaryExpression', 'AssignmentExpression'):
+        get_req_body_elems(obj.left, elems)
+        get_req_body_elems(obj.right, elems)
+    elif obj.type in ('ReturnStatement', 'UnaryExpression'):
+        get_req_body_elems(obj.argument, elems)
+    elif obj.type == 'Literal':
+        pass
+    elif obj.type == 'Identifier':
+        return obj.name
+    elif obj.type == 'FunctionDeclaration':
+        pass
+    else:
+        print(obj)
+    return ''
+
+
+def cleanup_jsdocs(jsdoc):
+    # remove leading spaces before the first '*'
+    doc = [s.lstrip() for s in jsdoc.value.split('\n')]
+
+    # remove leading stars
+    doc = [s.lstrip('*') for s in doc]
+
+    # remove leading empty lines
+    while len(doc) and not doc[0].strip():
+        doc.pop(0)
+
+    # remove terminating empty lines
+    while len(doc) and not doc[-1].strip():
+        doc.pop(-1)
+
+    return doc
+
+
+class JS2jsonDecoder(json.JSONDecoder):
+    def decode(self, s):
+        result = super().decode(s)  # result = super(Decoder, self).decode(s) for Python 2.x
+        return self._decode(result)
+
+    def _decode(self, o):
+        if isinstance(o, str) or isinstance(o, unicode):
+            try:
+                return int(o)
+            except ValueError:
+                return o
+        elif isinstance(o, dict):
+            return {k: self._decode(v) for k, v in o.items()}
+        elif isinstance(o, list):
+            return [self._decode(v) for v in o]
+        else:
+            return o
+
+
+def load_return_type_jsdoc_json(data):
+    regex_replace = [(r'\n', r' '),  # replace new lines by spaces
+                     (r'([\{\s,])(\w+)(:)', r'\1"\2"\3'),  # insert double quotes in keys
+                     (r'(:)\s*([^:\},\]]+)\s*([\},\]])', r'\1"\2"\3'),  # insert double quotes in values
+                     (r'(\[)\s*([^{].+)\s*(\])', r'\1"\2"\3'),  # insert double quotes in array items
+                     (r'^\s*([^\[{].+)\s*', r'"\1"')]  # insert double quotes in single item
+    for r, s in regex_replace:
+        data = re.sub(r, s, data)
+    return json.loads(data)
+
+
+class EntryPoint(object):
+    def __init__(self, schema, statements):
+        self.schema = schema
+        self.method, self._path, self.body = statements
+        self._jsdoc = None
+        self._doc = {}
+        self._raw_doc = None
+        self.path = self.compute_path()
+        self.method_name = self.method.value.lower()
+        self.body_params = []
+        if self.method_name in ('post', 'put'):
+            get_req_body_elems(self.body, self.body_params)
+
+        # replace the :parameter in path by {parameter}
+        self.url = re.sub(r':([^/]*)Id', r'{\1}', self.path)
+        self.url = re.sub(r':([^/]*)', r'{\1}', self.url)
+
+        # reduce the api name
+        # get_boards_board_cards() should be get_board_cards()
+        tokens = self.url.split('/')
+        reduced_function_name = []
+        for i, token in enumerate(tokens):
+            if token in ('api'):
+                continue
+            if (i < len(tokens) - 1 and  # not the last item
+               tokens[i + 1].startswith('{')):  # and the next token is a parameter
+                continue
+            reduced_function_name.append(token.strip('{}'))
+        self.reduced_function_name = '_'.join(reduced_function_name)
+
+        # mark the schema as used
+        schema.used = True
+
+    def compute_path(self):
+        return self._path.value.rstrip('/')
+
+    def error(self, message):
+        if self._raw_doc is None:
+            sys.stderr.write('in {},\n'.format(self.schema.name))
+            sys.stderr.write('{}\n'.format(message))
+            return
+        sys.stderr.write('in {}, lines {}-{}\n'.format(self.schema.name,
+                                                       self._raw_doc.loc.start.line,
+                                                       self._raw_doc.loc.end.line))
+        sys.stderr.write('{}\n'.format(self._raw_doc.value))
+        sys.stderr.write('{}\n'.format(message))
+
+    @property
+    def doc(self):
+        return self._doc
+
+    @doc.setter
+    def doc(self, doc):
+        '''Parse the JSDoc attached to an entry point.
+        `jsdoc` will not get these right as they are not attached to a method.
+        So instead, we do our custom parsing here (yes, subject to errors).
+
+        The expected format is the following (empty lines between entries
+        are ignored):
+        /**
+         * @operation name_of_entry_point
+         * @tag: a_tag_to_add
+         * @tag: an_other_tag_to_add
+         * @summary A nice summary, better in one line.
+         *
+         * @description This is a quite long description.
+         *              We can use *mardown* as the final rendering is done
+         *              by slate.
+         *
+         *     indentation doesn't matter.
+         *
+         * @param param_0 description of param 0
+         * @param {string} param_1 we can also put the type of the parameter
+         *    before its name, like in JSDoc
+         * @param {boolean} [param_2] we can also tell if the parameter is
+         *    optional by adding square brackets around its name
+         *
+         * @return Documents a return value
+         */
+
+        Notes:
+         - name_of_entry_point will be referenced in the ToC of the generated
+           document. This is also the operationId used in the resulting openapi
+           file. It needs to be uniq in the namesapce (the current schema.js
+           file)
+         - tags are appended to the current Schema attached to the file
+        '''
+
+        self._raw_doc = doc
+
+        self._jsdoc = cleanup_jsdocs(doc)
+
+        def store_tag(tag, data):
+            # check that there is something to store first
+            if not data.strip():
+                return
+
+            # remove terminating whitespaces and empty lines
+            data = data.rstrip()
+
+            # parameters are handled specially
+            if tag == 'param':
+                if 'params' not in self._doc:
+                    self._doc['params'] = {}
+                params = self._doc['params']
+
+                param_type = None
+                try:
+                    name, desc = data.split(maxsplit=1)
+                except ValueError:
+                    desc = ''
+
+                if name.startswith('{'):
+                    param_type = name.strip('{}')
+                    if param_type not in ['string', 'number', 'boolean', 'integer', 'array', 'file']:
+                        self.error('Warning, unknown type {}\n allowed values: string, number, boolean, integer, array, file'.format(param_type))
+                    try:
+                        name, desc = desc.split(maxsplit=1)
+                    except ValueError:
+                        desc = ''
+
+                optional = name.startswith('[') and name.endswith(']')
+
+                if optional:
+                    name = name[1:-1]
+
+                # we should not have 2 identical parameter names
+                if tag in params:
+                    self.error('Warning, overwriting parameter {}'.format(name))
+
+                params[name] = (param_type, optional, desc)
+
+                if name.endswith('Id'):
+                    # we strip out the 'Id' from the form parameters, we need
+                    # to keep the actual description around
+                    name = name[:-2]
+                    if name not in params:
+                        params[name] = (param_type, optional, desc)
+
+                return
+
+            # 'tag' can be set several times
+            if tag == 'tag':
+                if tag not in self._doc:
+                    self._doc[tag] = []
+                self._doc[tag].append(data)
+
+                return
+
+            # 'return' tag is json
+            if tag == 'return_type':
+                try:
+                    data = load_return_type_jsdoc_json(data)
+                except json.decoder.JSONDecodeError:
+                    pass
+
+            # we should not have 2 identical tags but @param or @tag
+            if tag in self._doc:
+                self.error('Warning, overwriting tag {}'.format(tag))
+
+            self._doc[tag] = data
+
+        # reset the current doc fields
+        self._doc = {}
+
+        # first item is supposed to be the description
+        current_tag = 'description'
+        current_data = ''
+
+        for line in self._jsdoc:
+            if line.lstrip().startswith('@'):
+                tag, data = line.lstrip().split(maxsplit=1)
+
+                if tag in ['@operation', '@summary', '@description', '@param', '@return_type', '@tag']:
+                    # store the current data
+                    store_tag(current_tag, current_data)
+
+                    current_tag = tag.lstrip('@')
+                    current_data = ''
+                    line = data
+                else:
+                    self.error('Unknown tag {}, ignoring'.format(tag))
+
+            current_data += line + '\n'
+
+        store_tag(current_tag, current_data)
+
+    @property
+    def summary(self):
+        if 'summary' in self._doc:
+            # new lines are not allowed
+            return self._doc['summary'].replace('\n', ' ')
+
+        return None
+
+    def doc_param(self, name):
+        if 'params' in self._doc and name in self._doc['params']:
+            return self._doc['params'][name]
+        return None, None, None
+
+    def print_openapi_param(self, name, indent):
+        ptype, poptional, pdesc = self.doc_param(name)
+        if pdesc is not None:
+            print('{}description: |'.format(' ' * indent))
+            print('{}{}'.format(' ' * (indent + 2), pdesc))
+        else:
+            print('{}description: the {} value'.format(' ' * indent, name))
+        if ptype is not None:
+            print('{}type: {}'.format(' ' * indent, ptype))
+        else:
+            print('{}type: string'.format(' ' * indent))
+        if poptional:
+            print('{}required: false'.format(' ' * indent))
+        else:
+            print('{}required: true'.format(' ' * indent))
+
+    @property
+    def operationId(self):
+        if 'operation' in self._doc:
+            return self._doc['operation']
+        return '{}_{}'.format(self.method_name, self.reduced_function_name)
+
+    @property
+    def description(self):
+        if 'description' in self._doc:
+            return self._doc['description']
+        return None
+
+    @property
+    def returns(self):
+        if 'return_type' in self._doc:
+            return self._doc['return_type']
+        return None
+
+    @property
+    def tags(self):
+        tags = []
+        if self.schema.fields is not None:
+            tags.append(self.schema.name)
+        if 'tag' in self._doc:
+            tags.extend(self._doc['tag'])
+        return tags
+
+    def print_openapi_return(self, obj, indent):
+        if isinstance(obj, dict):
+            print('{}type: object'.format(' ' * indent))
+            print('{}properties:'.format(' ' * indent))
+            for k, v in obj.items():
+                print('{}{}:'.format(' ' * (indent + 2), k))
+                self.print_openapi_return(v, indent + 4)
+
+        elif isinstance(obj, list):
+            if len(obj) > 1:
+                self.error('Error while parsing @return tag, an array should have only one type')
+            print('{}type: array'.format(' ' * indent))
+            print('{}items:'.format(' ' * indent))
+            self.print_openapi_return(obj[0], indent + 2)
+
+        elif isinstance(obj, str) or isinstance(obj, unicode):
+            rtype = 'type: ' + obj
+            if obj == self.schema.name:
+                rtype = '$ref: "#/definitions/{}"'.format(obj)
+            print('{}{}'.format(' ' * indent, rtype))
+
+    def print_openapi(self):
+        parameters = [token[1:-2] if token.endswith('Id') else token[1:]
+                      for token in self.path.split('/')
+                      if token.startswith(':')]
+
+        print('    {}:'.format(self.method_name))
+
+        print('      operationId: {}'.format(self.operationId))
+
+        if self.summary is not None:
+            print('      summary: {}'.format(self.summary))
+
+        if self.description is not None:
+            print('      description: |')
+            for line in self.description.split('\n'):
+                if line.strip():
+                    print('        {}'.format(line))
+                else:
+                    print('')
+
+        if len(self.tags) > 0:
+            print('      tags:')
+            for tag in self.tags:
+                print('        - {}'.format(tag))
+
+        # export the parameters
+        if self.method_name in ('post', 'put'):
+            print('''      consumes:
+        - multipart/form-data
+        - application/json''')
+        if len(parameters) > 0 or self.method_name in ('post', 'put'):
+            print('      parameters:')
+        if self.method_name in ('post', 'put'):
+            for f in self.body_params:
+                print('''        - name: {}
+          in: formData'''.format(f))
+                self.print_openapi_param(f, 10)
+        for p in parameters:
+            if p in self.body_params:
+                self.error(' '.join((p, self.path, self.method_name)))
+            print('''        - name: {}
+          in: path'''.format(p))
+            self.print_openapi_param(p, 10)
+        print('''      produces:
+        - application/json
+      security:
+          - UserSecurity: []
+      responses:
+        '200':
+          description: |-
+            200 response''')
+        if self.returns is not None:
+            print('          schema:')
+            self.print_openapi_return(self.returns, 12)
+
+
+class SchemaProperty(object):
+    def __init__(self, statement, schema):
+        self.schema = schema
+        self.statement = statement
+        self.name = statement.key.name or statement.key.value
+        self.type = 'object'
+        self.blackbox = False
+        self.required = True
+        for p in statement.value.properties:
+            if p.key.name == 'type':
+                if p.value.type == 'Identifier':
+                    self.type = p.value.name.lower()
+                elif p.value.type == 'ArrayExpression':
+                    self.type = 'array'
+                    self.elements = [e.name.lower() for e in p.value.elements]
+
+            elif p.key.name == 'allowedValues':
+                self.type = 'enum'
+                self.enum = [e.value.lower() for e in p.value.elements]
+
+            elif p.key.name == 'blackbox':
+                self.blackbox = True
+
+            elif p.key.name == 'optional' and p.value.value:
+                self.required = False
+
+        self._doc = None
+        self._raw_doc = None
+
+    @property
+    def doc(self):
+        return self._doc
+
+    @doc.setter
+    def doc(self, jsdoc):
+        self._raw_doc = jsdoc
+        self._doc = cleanup_jsdocs(jsdoc)
+
+    def process_jsdocs(self, jsdocs):
+        start = self.statement.key.loc.start.line
+        for index, doc in enumerate(jsdocs):
+            if start + 1 == doc.loc.start.line:
+                self.doc = doc
+                jsdocs.pop(index)
+                return
+
+    def __repr__(self):
+        return 'SchemaProperty({}{}, {})'.format(self.name,
+                                                 '*' if self.required else '',
+                                                 self.doc)
+
+    def print_openapi(self, indent, current_schema, required_properties):
+        schema_name = self.schema.name
+        name = self.name
+
+        # deal with subschemas
+        if '.' in name:
+            if name.endswith('$'):
+                # reference in reference
+                subschema = ''.join([n.capitalize() for n in self.name.split('.')[:-1]])
+                subschema = self.schema.name + subschema
+                if current_schema != subschema:
+                    if required_properties is not None and required_properties:
+                        print('    required:')
+                        for f in required_properties:
+                            print('      - {}'.format(f))
+                        required_properties.clear()
+
+                    print('''  {}:
+    type: object'''.format(subschema))
+                    return current_schema
+
+            subschema = name.split('.')[0]
+            schema_name = self.schema.name + subschema.capitalize()
+            name = name.split('.')[-1]
+
+            if current_schema != schema_name:
+                if required_properties is not None and required_properties:
+                    print('    required:')
+                    for f in required_properties:
+                        print('      - {}'.format(f))
+                    required_properties.clear()
+
+                print('''  {}:
+    type: object
+    properties:'''.format(schema_name))
+
+        if required_properties is not None and self.required:
+            required_properties.append(name)
+
+        print('{}{}:'.format(' ' * indent, name))
+
+        if self.doc is not None:
+            print('{}  description: |'.format(' ' * indent))
+            for line in self.doc:
+                if line.strip():
+                    print('{}    {}'.format(' ' * indent, line))
+                else:
+                    print('')
+
+        ptype = self.type
+        if ptype in ('enum', 'date'):
+            ptype = 'string'
+        if ptype != 'object':
+            print('{}  type: {}'.format(' ' * indent, ptype))
+
+        if self.type == 'array':
+            print('{}  items:'.format(' ' * indent))
+            for elem in self.elements:
+                if elem == 'object':
+                    print('{}    $ref: "#/definitions/{}"'.format(' ' * indent, schema_name + name.capitalize()))
+                else:
+                    print('{}    type: {}'.format(' ' * indent, elem))
+                    if not self.required:
+                        print('{}    x-nullable: true'.format(' ' * indent))
+
+        elif self.type == 'object':
+            if self.blackbox:
+                print('{}  type: object'.format(' ' * indent))
+            else:
+                print('{}  $ref: "#/definitions/{}"'.format(' ' * indent, schema_name + name.capitalize()))
+
+        elif self.type == 'enum':
+            print('{}  enum:'.format(' ' * indent))
+            for enum in self.enum:
+                print('{}    - {}'.format(' ' * indent, enum))
+
+        if '.' not in self.name and not self.required:
+            print('{}  x-nullable: true'.format(' ' * indent))
+
+        return schema_name
+
+
+class Schemas(object):
+    def __init__(self, data=None, jsdocs=None, name=None):
+        self.name = name
+        self._data = data
+        self.fields = None
+        self.used = False
+
+        if data is not None:
+            if self.name is None:
+                self.name = data.expression.callee.object.name
+
+            content = data.expression.arguments[0].arguments[0]
+            self.fields = [SchemaProperty(p, self) for p in content.properties]
+
+        self._doc = None
+        self._raw_doc = None
+
+        if jsdocs is not None:
+            self.process_jsdocs(jsdocs)
+
+    @property
+    def doc(self):
+        if self._doc is None:
+            return None
+        return ' '.join(self._doc)
+
+    @doc.setter
+    def doc(self, jsdoc):
+        self._raw_doc = jsdoc
+        self._doc = cleanup_jsdocs(jsdoc)
+
+    def process_jsdocs(self, jsdocs):
+        start = self._data.loc.start.line
+        end = self._data.loc.end.line
+
+        for doc in jsdocs:
+            if doc.loc.end.line + 1 == start:
+                self.doc = doc
+
+        docs = [doc
+                for doc in jsdocs
+                if doc.loc.start.line >= start and doc.loc.end.line <= end]
+
+        for field in self.fields:
+            field.process_jsdocs(docs)
+
+    def print_openapi(self):
+        # empty schemas are skipped
+        if self.fields is None:
+            return
+
+        print('  {}:'.format(self.name))
+        print('    type: object')
+        if self.doc is not None:
+            print('    description: {}'.format(self.doc))
+
+        print('    properties:')
+
+        # first print out the object itself
+        properties = [field for field in self.fields if '.' not in field.name]
+        for prop in properties:
+            prop.print_openapi(6, None, None)
+
+        required_properties = [f.name for f in properties if f.required]
+        if required_properties:
+            print('    required:')
+            for f in required_properties:
+                print('      - {}'.format(f))
+
+        # then print the references
+        current = None
+        required_properties = []
+        properties = [f for f in self.fields if '.' in f.name and not f.name.endswith('$')]
+        for prop in properties:
+            current = prop.print_openapi(6, current, required_properties)
+
+        if required_properties:
+            print('    required:')
+            for f in required_properties:
+                print('      - {}'.format(f))
+
+        required_properties = []
+        # then print the references in the references
+        for prop in [f for f in self.fields if '.' in f.name and f.name.endswith('$')]:
+            current = prop.print_openapi(6, current, required_properties)
+
+        if required_properties:
+            print('    required:')
+            for f in required_properties:
+                print('      - {}'.format(f))
+
+
+def parse_schemas(schemas_dir):
+
+    schemas = {}
+    entry_points = []
+
+    for root, dirs, files in os.walk(schemas_dir):
+        files.sort()
+        for filename in files:
+            path = os.path.join(root, filename)
+            with open(path) as f:
+                data = ''.join(f.readlines())
+                try:
+                    # if the file failed, it's likely it doesn't contain a schema
+                    program = esprima.parseScript(data, options={'comment': True, 'loc': True})
+                except:
+                    continue
+
+                current_schema = None
+                jsdocs = [c for c in program.comments
+                          if c.type == 'Block' and c.value.startswith('*\n')]
+
+                for statement in program.body:
+
+                    # find the '<ITEM>.attachSchema(new SimpleSchema(<data>)'
+                    # those are the schemas
+                    if (statement.type == 'ExpressionStatement' and
+                       statement.expression.callee is not None and
+                       statement.expression.callee.property is not None and
+                       statement.expression.callee.property.name == 'attachSchema' and
+                       statement.expression.arguments[0].type == 'NewExpression' and
+                       statement.expression.arguments[0].callee.name == 'SimpleSchema'):
+
+                        schema = Schemas(statement, jsdocs)
+                        current_schema = schema.name
+                        schemas[current_schema] = schema
+
+                    # find all the 'if (Meteor.isServer) { JsonRoutes.add('
+                    # those are the entry points of the API
+                    elif (statement.type == 'IfStatement' and
+                          statement.test.type == 'MemberExpression' and
+                          statement.test.object.name == 'Meteor' and
+                          statement.test.property.name == 'isServer'):
+                            data = [s.expression.arguments
+                                    for s in statement.consequent.body
+                                    if (s.type == 'ExpressionStatement' and
+                                        s.expression.type == 'CallExpression' and
+                                        s.expression.callee.object.name == 'JsonRoutes')]
+
+                            # we found at least one entry point, keep them
+                            if len(data) > 0:
+                                if current_schema is None:
+                                    current_schema = filename
+                                    schemas[current_schema] = Schemas(name=current_schema)
+
+                                schema_entry_points = [EntryPoint(schemas[current_schema], d)
+                                                       for d in data]
+                                entry_points.extend(schema_entry_points)
+
+                                # try to match JSDoc to the operations
+                                for entry_point in schema_entry_points:
+                                    operation = entry_point.method  # POST/GET/PUT/DELETE
+                                    jsdoc = [j for j in jsdocs
+                                             if j.loc.end.line + 1 == operation.loc.start.line]
+                                    if bool(jsdoc):
+                                        entry_point.doc = jsdoc[0]
+
+    return schemas, entry_points
+
+
+def generate_openapi(schemas, entry_points, version):
+    print('''swagger: '2.0'
+info:
+  title: Wekan REST API
+  version: {0}
+  description: |
+    The REST API allows you to control and extend Wekan with ease.
+
+    If you are an end-user and not a dev or a tester, [create an issue](https://github.com/wekan/wekan/issues/new) to request new APIs.
+
+    > All API calls in the documentation are made using `curl`.  However, you are free to use Java / Python / PHP / Golang / Ruby / Swift / Objective-C / Rust / Scala / C# or any other programming languages.
+
+    # Production Security Concerns
+    When calling a production Wekan server, ensure it is running via HTTPS and has a valid SSL Certificate. The login method requires you to post your username and password in plaintext, which is why we highly suggest only calling the REST login api over HTTPS. Also, few things to note:
+
+    * Only call via HTTPS
+    * Implement a timed authorization token expiration strategy
+    * Ensure the calling user only has permissions for what they are calling and no more
+
+schemes:
+  - http
+
+securityDefinitions:
+  UserSecurity:
+    type: apiKey
+    in: header
+    name: Authorization
+
+paths:
+  /users/login:
+    post:
+      operationId: login
+      summary: Login with REST API
+      consumes:
+        - application/x-www-form-urlencoded
+        - application/json
+      tags:
+        - Login
+      parameters:
+        - name: username
+          in: formData
+          required: true
+          description: |
+            Your username
+          type: string
+        - name: password
+          in: formData
+          required: true
+          description: |
+            Your password
+          type: string
+          format: password
+      responses:
+        200:
+          description: |-
+            Successful authentication
+          schema:
+            items:
+              properties:
+                id:
+                  type: string
+                token:
+                  type: string
+                tokenExpires:
+                  type: string
+        400:
+          description: |
+            Error in authentication
+          schema:
+            items:
+              properties:
+                error:
+                  type: number
+                reason:
+                  type: string
+        default:
+          description: |
+            Error in authentication
+  /users/register:
+    post:
+      operationId: register
+      summary: Register with REST API
+      description: |
+        Notes:
+          - You will need to provide the token for any of the authenticated methods.
+      consumes:
+        - application/x-www-form-urlencoded
+        - application/json
+      tags:
+        - Login
+      parameters:
+        - name: username
+          in: formData
+          required: true
+          description: |
+            Your username
+          type: string
+        - name: password
+          in: formData
+          required: true
+          description: |
+            Your password
+          type: string
+          format: password
+        - name: email
+          in: formData
+          required: true
+          description: |
+            Your email
+          type: string
+      responses:
+        200:
+          description: |-
+            Successful registration
+          schema:
+            items:
+              properties:
+                id:
+                  type: string
+                token:
+                  type: string
+                tokenExpires:
+                  type: string
+        400:
+          description: |
+            Error in registration
+          schema:
+            items:
+              properties:
+                error:
+                  type: number
+                reason:
+                  type: string
+        default:
+          description: |
+            Error in registration
+'''.format(version))
+
+    # GET and POST on the same path are valid, we need to reshuffle the paths
+    # with the path as the sorting key
+    methods = {}
+    for ep in entry_points:
+        if ep.path not in methods:
+            methods[ep.path] = []
+        methods[ep.path].append(ep)
+
+    sorted_paths = list(methods.keys())
+    sorted_paths.sort()
+
+    for path in sorted_paths:
+        print('  {}:'.format(methods[path][0].url))
+
+        for ep in methods[path]:
+            ep.print_openapi()
+
+    print('definitions:')
+    for schema in schemas.values():
+        # do not export the objects if there is no API attached
+        if not schema.used:
+            continue
+
+        schema.print_openapi()
+
+
+def main():
+    parser = argparse.ArgumentParser(description='Generate an OpenAPI 2.0 from the given JS schemas.')
+    script_dir = os.path.dirname(os.path.realpath(__file__))
+    parser.add_argument('--release', default='git-master', nargs=1,
+                        help='the current version of the API, can be retrieved by running `git describe --tags --abbrev=0`')
+    parser.add_argument('dir', default='{}/../models'.format(script_dir), nargs='?',
+                        help='the directory where to look for schemas')
+
+    args = parser.parse_args()
+    schemas, entry_points = parse_schemas(args.dir)
+    generate_openapi(schemas, entry_points, args.release[0])
+
+
+if __name__ == '__main__':
+    main()
diff --git a/openshift/README.md b/openshift/README.md
new file mode 100644
index 00000000..a97657f3
--- /dev/null
+++ b/openshift/README.md
@@ -0,0 +1,19 @@
+# Wekan on OpenShift
+ 
+OpenShift Template for Wekan backed by MongoDB
+ 
+#### Create Template
+```sh
+oc create -f wekan.yml
+```
+ 
+#### Delete Instance Resources
+Clean up all resources created. Note label filters assume single instance of template deployed in the current namespace.
+ 
+```sh
+oc delete all -l app=wekan
+oc delete pods -l app=wekan
+oc delete persistentvolumeclaim -l app=wekan
+oc delete serviceaccount -l app=wekan
+oc delete secret -l app=wekan
+```
diff --git a/openshift/wekan.yml b/openshift/wekan.yml
new file mode 100644
index 00000000..9ccdf8c0
--- /dev/null
+++ b/openshift/wekan.yml
@@ -0,0 +1,368 @@
+---
+apiVersion: v1
+kind: Template
+labels:
+  template: wekan-mongodb-persistent-template
+message: |-
+  The following service(s) have been created in your project: ${WEKAN_SERVICE_NAME}.
+metadata:
+  annotations:
+    description: |-
+      This template provides a Wekan instance backed by a standalone MongoDB
+      server. The database is stored on persistent storage.
+    iconClass: pficon-trend-up
+    openshift.io/display-name: Wekan backed by MongoDB
+    openshift.io/documentation-url: https://wekan.github.io/
+    openshift.io/long-description: This template provides a Wekan platform
+      with a MongoDB database created. The database is stored on persistent storage. The
+      database name, username, and password are chosen via parameters when provisioning
+      this service.
+    tags: wekan,kanban,mongodb
+  name: wekan-mongodb-persistent
+objects:
+- apiVersion: v1
+  kind: ServiceAccount
+  metadata:
+    name: ${WEKAN_SERVICE_NAME}
+    labels:
+      app: wekan
+      service: ${WEKAN_SERVICE_NAME}
+- apiVersion: v1
+  kind: Secret
+  metadata:
+    annotations:
+      template.openshift.io/expose-admin_password: "{.data['database-admin-password']}"
+      template.openshift.io/expose-database_name: "{.data['database-name']}"
+      template.openshift.io/expose-password: "{.data['database-password']}"
+      template.openshift.io/expose-username: "{.data['database-user']}"
+    name: "${DATABASE_SERVICE_NAME}"
+    labels:
+      app: wekan
+      service: ${WEKAN_SERVICE_NAME}
+  stringData:
+    database-admin-password: "${MONGODB_ADMIN_PASSWORD}"
+    database-name: "${MONGODB_DATABASE}"
+    database-password: "${MONGODB_PASSWORD}"
+    database-user: "${MONGODB_USER}"
+- apiVersion: v1
+  kind: Service
+  metadata:
+    annotations:
+      template.openshift.io/expose-uri: http://{.spec.clusterIP}:{.spec.ports[?(.name=="wekan")].port}
+    name: "${WEKAN_SERVICE_NAME}"
+    labels:
+      app: wekan
+      service: ${WEKAN_SERVICE_NAME}
+  spec:
+    ports:
+    - name: wekan
+      nodePort: 0
+      port: 8080
+      protocol: TCP
+      targetPort: 8080
+    selector:
+      name: "${WEKAN_SERVICE_NAME}"
+    sessionAffinity: None
+    type: ClusterIP
+  status:
+    loadBalancer: {}
+- apiVersion: v1
+  kind: Service
+  metadata:
+    annotations:
+      template.openshift.io/expose-uri: mongodb://{.spec.clusterIP}:{.spec.ports[?(.name=="mongo")].port}
+    name: "${DATABASE_SERVICE_NAME}"
+    labels:
+      app: wekan
+      service: ${WEKAN_SERVICE_NAME}
+  spec:
+    ports:
+    - name: mongo
+      nodePort: 0
+      port: 27017
+      protocol: TCP
+      targetPort: 27017
+    selector:
+      name: "${DATABASE_SERVICE_NAME}"
+    sessionAffinity: None
+    type: ClusterIP
+  status:
+    loadBalancer: {}
+- apiVersion: v1
+  kind: PersistentVolumeClaim
+  metadata:
+    name: "${DATABASE_SERVICE_NAME}"
+    labels:
+      app: wekan
+      service: ${WEKAN_SERVICE_NAME}
+  spec:
+    accessModes:
+    - ReadWriteOnce
+    resources:
+      requests:
+        storage: "${VOLUME_CAPACITY}"
+- apiVersion: image.openshift.io/v1
+  kind: ImageStream
+  metadata:
+    labels:
+      app: wekan
+    name: ${WEKAN_SERVICE_NAME}
+  spec:
+    tags:
+    - from:
+        kind: DockerImage
+        name: ${WEKAN_IMAGE}
+      generation: 2
+      name: latest
+      referencePolicy:
+        type: Source
+- apiVersion: v1
+  kind: DeploymentConfig
+  metadata:
+    name: ${WEKAN_SERVICE_NAME}
+    labels:
+      app: wekan
+      service: ${WEKAN_SERVICE_NAME}
+  spec:
+    replicas: 1
+    selector:
+      app: wekan
+      deploymentconfig: ${WEKAN_SERVICE_NAME}
+    strategy:
+      type: Recreate
+    template:
+      metadata:
+        labels:
+          app: wekan
+          service: ${WEKAN_SERVICE_NAME}
+          deploymentconfig: ${WEKAN_SERVICE_NAME}
+          template: wekan
+          name: ${WEKAN_SERVICE_NAME}
+      spec:
+        containers:
+        - name: ${WEKAN_SERVICE_NAME}
+          image: ${WEKAN_IMAGE}
+          imagePullPolicy: Always
+          env:
+          - name: MONGO_URL
+            value: mongodb://${MONGODB_USER}:${MONGODB_PASSWORD}@${DATABASE_SERVICE_NAME}:27017/${MONGODB_DATABASE}
+          - name: ROOT_URL
+            value: https://${FQDN}/
+          - name: PORT
+            value: "8080"
+          ports:
+          - containerPort: 8080
+            name: ${WEKAN_SERVICE_NAME}
+            protocol: TCP
+          terminationMessagePath: /dev/termination-log
+          livenessProbe:
+            failureThreshold: 30
+            httpGet:
+              path: /
+              port: 8080
+            initialDelaySeconds: 240
+            timeoutSeconds: 3
+          readinessProbe:
+            httpGet:
+              path: /
+              port: 8080
+            initialDelaySeconds: 3
+            timeoutSeconds: 3
+        dnsPolicy: ClusterFirst
+        restartPolicy: Always
+        serviceAccount: ${WEKAN_SERVICE_NAME}
+        serviceAccountName: ${WEKAN_SERVICE_NAME}
+        terminationGracePeriodSeconds: 30
+    triggers:
+    - type: ConfigChange
+    - type: ImageChange
+      imageChangeParams:
+        automatic: true
+        containerNames:
+        - ${WEKAN_SERVICE_NAME}
+        from:
+          kind: ImageStreamTag
+          name: ${WEKAN_SERVICE_NAME}:latest
+        lastTriggeredImage: ""
+- apiVersion: v1
+  kind: DeploymentConfig
+  metadata:
+    annotations:
+      template.alpha.openshift.io/wait-for-ready: 'true'
+    name: "${DATABASE_SERVICE_NAME}"
+    labels:
+      app: wekan
+      service: ${WEKAN_SERVICE_NAME}
+  spec:
+    replicas: 1
+    selector:
+      name: "${DATABASE_SERVICE_NAME}"
+    strategy:
+      type: Recreate
+    template:
+      metadata:
+        labels:
+          name: "${DATABASE_SERVICE_NAME}"
+      spec:
+        containers:
+        - capabilities: {}
+          env:
+          - name: MONGODB_USER
+            valueFrom:
+              secretKeyRef:
+                key: database-user
+                name: "${DATABASE_SERVICE_NAME}"
+          - name: MONGODB_PASSWORD
+            valueFrom:
+              secretKeyRef:
+                key: database-password
+                name: "${DATABASE_SERVICE_NAME}"
+          - name: MONGODB_ADMIN_PASSWORD
+            valueFrom:
+              secretKeyRef:
+                key: database-admin-password
+                name: "${DATABASE_SERVICE_NAME}"
+          - name: MONGODB_DATABASE
+            valueFrom:
+              secretKeyRef:
+                key: database-name
+                name: "${DATABASE_SERVICE_NAME}"
+          image: " "
+          imagePullPolicy: IfNotPresent
+          livenessProbe:
+            initialDelaySeconds: 30
+            tcpSocket:
+              port: 27017
+            timeoutSeconds: 1
+          name: mongodb
+          ports:
+          - containerPort: 27017
+            protocol: TCP
+          readinessProbe:
+            exec:
+              command:
+              - "/bin/sh"
+              - "-i"
+              - "-c"
+              - mongo 127.0.0.1:27017/$MONGODB_DATABASE -u $MONGODB_USER -p $MONGODB_PASSWORD
+                --eval="quit()"
+            initialDelaySeconds: 3
+            timeoutSeconds: 1
+          resources:
+            limits:
+              memory: "${MEMORY_LIMIT}"
+          securityContext:
+            capabilities: {}
+            privileged: false
+          terminationMessagePath: "/dev/termination-log"
+          volumeMounts:
+          - mountPath: "/var/lib/mongodb/data"
+            name: "${DATABASE_SERVICE_NAME}-data"
+        dnsPolicy: ClusterFirst
+        restartPolicy: Always
+        volumes:
+        - name: "${DATABASE_SERVICE_NAME}-data"
+          persistentVolumeClaim:
+            claimName: "${DATABASE_SERVICE_NAME}"
+    triggers:
+    - imageChangeParams:
+        automatic: true
+        containerNames:
+        - mongodb
+        from:
+          kind: ImageStreamTag
+          name: mongodb:${MONGODB_VERSION}
+          namespace: "openshift"
+        lastTriggeredImage: ''
+      type: ImageChange
+    - type: ConfigChange
+  status: {}
+- apiVersion: route.openshift.io/v1
+  kind: Route
+  metadata:
+    labels:
+      app: wekan
+      service: wekan
+      template: wekan-mongodb-persistent-template
+    name: wekan
+    namespace: ${NAMESPACE}
+  spec:
+    host: ${FQDN}
+    port:
+      targetPort: wekan
+    tls:
+      termination: edge
+    to:
+      kind: Service
+      name: wekan
+      weight: 100
+    wildcardPolicy: None
+  status:
+    ingress:
+      - conditions:
+          - lastTransitionTime: '2018-08-28T14:45:21Z'
+            status: 'True'
+            type: Admitted
+        host: ${FQDN}
+        routerName: router
+        wildcardPolicy: None
+parameters:
+- description: The Fully Qualified Hostname (FQDN) of the application
+  displayName: FQDN
+  name: FQDN
+  required: true
+- description: Maximum amount of memory the container can use.
+  displayName: Memory Limit
+  name: MEMORY_LIMIT
+  required: true
+  value: 512Mi
+- description: The OpenShift Namespace where the ImageStream resides.
+  displayName: Namespace
+  name: NAMESPACE
+- description: The name of the OpenShift Service exposed for the database.
+  displayName: Database Service Name
+  name: DATABASE_SERVICE_NAME
+  required: true
+  value: mongodb
+- description: Username for MongoDB user that will be used for accessing the database.
+  displayName: MongoDB Connection Username
+  from: user[A-Z0-9]{3}
+  generate: expression
+  name: MONGODB_USER
+  required: true
+- description: Password for the MongoDB connection user.
+  displayName: MongoDB Connection Password
+  from: "[a-zA-Z0-9]{16}"
+  generate: expression
+  name: MONGODB_PASSWORD
+  required: true
+- description: Name of the MongoDB database accessed.
+  displayName: MongoDB Database Name
+  name: MONGODB_DATABASE
+  required: true
+  value: wekan
+- description: Password for the database admin user.
+  displayName: MongoDB Admin Password
+  from: "[a-zA-Z0-9]{16}"
+  generate: expression
+  name: MONGODB_ADMIN_PASSWORD
+  required: true
+- description: Volume space available for data, e.g. 512Mi, 2Gi.
+  displayName: Volume Capacity
+  name: VOLUME_CAPACITY
+  required: true
+  value: 1Gi
+- description: Version of MongoDB image to be used (2.4, 2.6, 3.2 or latest).
+  displayName: Version of MongoDB Image
+  name: MONGODB_VERSION
+  required: true
+  value: '3.2'
+- name: WEKAN_SERVICE_NAME
+  displayName: Wekan Service Name
+  value: wekan
+  required: true
+- name: WEKAN_IMAGE
+  displayName: WeKan Docker Image
+  value: quay.io/wekan/wekan:latest
+  description: The metabase docker image to use
+  required: true
diff --git a/package.json b/package.json
index 68b5fd5c..13e971e0 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "wekan",
-  "version": "0.94.0",
-  "description": "The open-source Trello-like kanban",
+  "version": "v2.66.0",
+  "description": "Open-Source kanban",
   "private": true,
   "scripts": {
     "lint": "eslint --ignore-pattern 'packages/*' .",
@@ -20,15 +20,19 @@
   },
   "homepage": "https://wekan.github.io",
   "devDependencies": {
-    "eslint": "^2.0.0"
+    "eslint": "^4.19.1"
   },
   "dependencies": {
-    "babel-runtime": "^6.23.0",
-    "bcrypt": "^1.0.3",
-    "bson-ext": "^1.0.5",
-    "es6-promise": "^4.1.0",
-    "meteor-node-stubs": "^0.2.6",
+    "@babel/runtime": "^7.1.2",
+    "babel-runtime": "^6.26.0",
+    "bson-ext": "^2.0.0",
+    "es6-promise": "^4.2.4",
+    "hoek": "^5.0.4",
+    "meteor-node-stubs": "^0.4.1",
     "os": "^0.1.1",
-    "xss": "^0.3.3"
+    "page": "^1.8.6",
+    "qs": "^6.5.2",
+    "source-map-support": "^0.5.9",
+    "xss": "^1.0.3"
   }
 }
diff --git a/packages/kadira-flow-router/.gitignore b/packages/kadira-flow-router/.gitignore
new file mode 100644
index 00000000..22ee0cce
--- /dev/null
+++ b/packages/kadira-flow-router/.gitignore
@@ -0,0 +1,3 @@
+.build*
+*.browserify.js.cached
+*.browserify.js.map
diff --git a/packages/kadira-flow-router/.travis.yml b/packages/kadira-flow-router/.travis.yml
new file mode 100644
index 00000000..5125066a
--- /dev/null
+++ b/packages/kadira-flow-router/.travis.yml
@@ -0,0 +1,8 @@
+sudo: required
+language: node_js
+node_js:
+  - "0.10"
+before_install:
+  - "curl -L http://git.io/ejPSng | /bin/sh"
+env:
+  - TEST_COMMAND=meteor
\ No newline at end of file
diff --git a/packages/kadira-flow-router/CHANGELOG.md b/packages/kadira-flow-router/CHANGELOG.md
new file mode 100644
index 00000000..80fd6708
--- /dev/null
+++ b/packages/kadira-flow-router/CHANGELOG.md
@@ -0,0 +1,155 @@
+# Changelog
+
+### v2.12.1
+
+* Add NPM modules back. Fixes: [#602](https://github.com/kadirahq/flow-router/issues/602)
+
+### v2.12.0
+
+* Update Fast Render to v2.14.0
+
+### v2.11.0
+
+* Add support for Meteor 1.3 RC-1.
+* Removes browserify and get modules from Meteor 1.3.
+
+### v2.10.1
+* Fix the url generation for prefixed paths. See: [#508](https://github.com/kadirahq/flow-router/issues/508)
+
+### v2.10.0
+* Update few dependencies to the latest versions: pagejs, qs, cosmos:browserify
+
+### v2.9.0
+* Add FlowRouter.url() See: [#374](https://github.com/kadirahq/flow-router/pull/374)
+
+### v2.8.0
+* Allow to access options in groups as well. See: [#378](https://github.com/kadirahq/flow-router/pull/378)
+
+### v2.7.0
+* Add Path Prefix support. See: [#329](https://github.com/kadirahq/flow-router/pull/329)
+
+### v2.6.2
+* Now .current() sends a cloned version of the internal current object. Which prevent outside mutations to params and queryParams
+
+### v2.6.1
+
+* Fix [#143](https://github.com/kadirahq/flow-router/issues/314).
+  This says that when we are doing a trigger redirect,
+  We won't get reactive changes like: `getRouteName()`
+
+### v2.6.0
+* Add hashbang support. See [#311](https://github.com/kadirahq/flow-router/pull/311)
+
+### v2.5.0
+* Add a stop callback on the triggers. See: [#306](https://github.com/kadirahq/flow-router/pull/306).
+
+### v2.4.0
+
+* Add a name to the route groups. See: [#290](https://github.com/kadirahq/flow-router/pull/290)
+
+### v2.3.0
+* We've used `path` for both the current path and for the pathDef earlier. Now we differentiate it. See: [#272](https://github.com/kadirahq/flow-router/issues/272) and [#273](https://github.com/kadirahq/flow-router/pull/273) for more information.
+
+### v2.2.0
+* Add the first addOn api: FlowRouter.onRouteRegister(cb)
+
+### v2.1.1
+* There was an issue in IE9 support. We fix it with this version.
+
+### v2.1.0
+* Add IE9 Support. See this issue [#111](https://github.com/kadirahq/flow-router/issues/111) for more info.
+
+### v2.0.2
+
+* Add missing queryParams object in the subscriptions method (with FR on the server)
+* With that, [#237](https://github.com/kadirahq/flow-router/issues/237) is partially fixed.
+
+### v2.0.1
+
+* Use pagejs.redirect() for our redirection process.
+* Above fixes [#239](https://github.com/kadirahq/flow-router/issues/239)
+
+### v2.0.0
+
+* Released 2.0  :)
+* Now flow-router comes as `kadira:flow-router`
+* Remove deprecated APIs
+    - `FlowRouter.reactiveCurrent()`
+    - Middlewares
+    - `FlowRouter.current().params.query`
+* Follow the [migration guide](https://github.com/kadirahq/flow-router#migrating-into-20) for more information.
+
+### v1.18.0
+
+* Implement idempotent routing on withReplaceState. See: [#197](https://github.com/meteorhacks/flow-router/issues/197)
+* Add an [API](https://github.com/meteorhacks/flow-router#flowrouterwithtrailingslashfn) to set trailing slashes.
+
+### v1.17.2
+* Fix [#182](https://github.com/meteorhacks/flow-router/issues/182) - Now trigger's redirect function support `FlowRouter.go()` syntax.
+
+### v1.17.1
+
+* Fix [#164](https://github.com/meteorhacks/flow-router/issues/164) - It's an issue when using `check` with flow router query params.
+* Fix [#168](https://github.com/meteorhacks/flow-router/pull/168) - It's URL encoding issue.
+
+### v1.17.0
+
+* Add an API called `FlowRouter.wait()` to wait the initialization and pass it back to the app. Fixes issue [180](https://github.com/meteorhacks/flow-router/issues/180).
+
+### v1.16.3
+
+* Fix a crazy context switching issue. For more information see commit [6ca54cc](https://github.com/meteorhacks/flow-router/commit/6ca54cc7969b3a8aa71d63c98c99a20b175125a2)
+
+### v1.16.2
+* Fix issue [#167](https://github.com/meteorhacks/flow-router/issues/167) via [#175](https://github.com/meteorhacks/flow-router/pull/175)
+* Fix [#176](https://github.com/meteorhacks/flow-router/issues/176) by the removal of `Tracker.flush` usage.
+
+### v1.16.1
+* Fix [issue](https://github.com/meteorhacks/flow-router/pull/173) of overwriting global triggers when written multiple times.
+
+### v1.16.0
+
+* [Refactor](https://github.com/meteorhacks/flow-router/pull/172) triggers API for clean code
+* Added [redirect](https://github.com/meteorhacks/flow-router#redirecting-with-triggers) functionality for triggers
+* Now we are API complete for the 2.x release
+
+### v1.15.0
+
+* Now all our routes are idempotent.
+* If some one needs to re-run the route, he needs to use our `FlowRouter.reload()` API.
+
+### v1.14.1
+
+* Fix regression came from v1.11.0. With that, `FlowRouter.go("/")` does not work. More information on [#147](https://github.com/meteorhacks/flow-router/issues/147).
+
+### v1.14.0
+* Bring browserify back with the updated version of `cosmos:browserify` which fixes some size issues. See [more info](https://github.com/meteorhacks/flow-router/issues/128#issuecomment-109799953).
+
+### v1.13.0
+* Remove browserified pagejs and qs dependency loading. With that we could reduce ~10kb of data size (without compression). We can look for a bower integration in the future. For now, here are the dependencies we have.
+    - page@1.6.3: https://github.com/visionmedia/page.js
+    - qs@3.1.0: https://github.com/hapijs/qs
+
+### v1.12.0
+* Add [`FlowRouter.withReplaceState`](https://github.com/meteorhacks/flow-router#flowrouterwithreplcaestatefn) api to use replaceState when changing routes via FlowRouter apis.
+
+### v1.11.0
+* Fix [#145](https://github.com/meteorhacks/flow-router/issues/145) by changing how safeToRun works.
+* Add `FlowRouter.path()` to the server side
+* Fix [#130](https://github.com/meteorhacks/flow-router/issues/130)
+
+### v1.10.0
+Add support for [triggers](https://github.com/meteorhacks/flow-router#triggers). This is something similar to middlewares but not as middlewares. Visit [here](https://github.com/meteorhacks/flow-router/pull/59) to learn about design decisions.
+
+_**Now, middlewares are deprecated.**_
+
+### v1.9.0
+Fix [#120](https://github.com/meteorhacks/flow-router/issues/120) and added callback support for `FlowRouter.subsReady()`.
+
+### v1.8.0
+
+This release comes with improvements to the reactive API.
+
+* Fixed [#77](https://github.com/meteorhacks/flow-router/issues/77), [#85](https://github.com/meteorhacks/flow-router/issues/85), [#95](https://github.com/meteorhacks/flow-router/issues/95), [#96](https://github.com/meteorhacks/flow-router/issues/96), [#103](https://github.com/meteorhacks/flow-router/issues/103)
+* Add a new API called `FlowRouter.watchPathChange()`
+* Deprecated `FlowRouter.reactiveCurrent()` in the favour of `FlowRouter.watchPathChange()`
diff --git a/packages/kadira-flow-router/CONTRIBUTING.md b/packages/kadira-flow-router/CONTRIBUTING.md
new file mode 100644
index 00000000..adb08f1b
--- /dev/null
+++ b/packages/kadira-flow-router/CONTRIBUTING.md
@@ -0,0 +1,16 @@
+## Whether to submit an issue or not?
+
+We've very limited time to answer all the issues and respond them in a proper manner. 
+So, this repo's issue list only used to report **bugs** and **new features.**
+
+For any other questions, issues or asking for best practices use [Meteor Forums](https://forums.meteor.com/). 
+Even before you ask a question on Meteor Forums, make sure you read the [Meteor Routing Guide](https://kadira.io/academy/meteor-routing-guide).
+
+## Implementing Feature and Bug Fixes
+
+We are welcome and greedy for PRs. So, 
+
+* If you wanna fix a bug, simply submit it. 
+* If you wanna implement feature or support with contributions, just drop a message to arunoda [at] kadira.io.
+
+
diff --git a/packages/kadira-flow-router/LICENSE b/packages/kadira-flow-router/LICENSE
new file mode 100644
index 00000000..6519acbf
--- /dev/null
+++ b/packages/kadira-flow-router/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 MeteorHacks Pvt Ltd (Sri Lanka). <hello@meteorhacks.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
\ No newline at end of file
diff --git a/packages/kadira-flow-router/README.md b/packages/kadira-flow-router/README.md
new file mode 100644
index 00000000..7e74eb10
--- /dev/null
+++ b/packages/kadira-flow-router/README.md
@@ -0,0 +1,777 @@
+# FlowRouter [![Build Status](https://travis-ci.org/kadirahq/flow-router.svg?branch=master)](https://travis-ci.org/kadirahq/flow-router) [![Stories in Ready](https://badge.waffle.io/kadirahq/flow-router.svg?label=doing&title=Activities)](http://waffle.io/kadirahq/flow-router)
+
+Forked for bug fixes
+
+Carefully Designed Client Side Router for Meteor.
+
+FlowRouter is a very simple router for Meteor. It does routing for client-side apps and does not handle rendering itself.
+
+It exposes a great API for changing the URL and reactively getting data from the URL. However, inside the router, it's not reactive. Most importantly, FlowRouter is designed with performance in mind and it focuses on what it does best: **routing**.
+
+> We've released 2.0 and follow this [migration guide](#migrating-into-20) if you are already using FlowRouter.
+
+## TOC
+
+* [Meteor Routing Guide](#meteor-routing-guide)
+* [Getting Started](#getting-started)
+* [Routes Definition](#routes-definition)
+* [Group Routes](#group-routes)
+* [Rendering and Layout Management](#rendering-and-layout-management)
+* [Triggers](#triggers)
+* [Not Found Routes](#not-found-routes)
+* [API](#api)
+* [Subscription Management](#subscription-management)
+* [IE9 Support](#ie9-support)
+* [Hashbang URLs](#hashbang-urls)
+* [Prefixed paths](#prefixed-paths)
+* [Add-ons](#add-ons)
+* [Difference with Iron Router](#difference-with-iron-router)
+* [Migrating into 2.0](#migrating-into-20)
+
+## Meteor Routing Guide
+
+[Meteor Routing Guide](https://kadira.io/academy/meteor-routing-guide) is a completed guide into **routing** and related topics in Meteor. It talks about how to use FlowRouter properly and use it with **Blaze and React**. It also shows how to manage **subscriptions** and implement **auth logic** in the view layer.
+
+[![Meteor Routing Guide](https://cldup.com/AxlPfoxXmR.png)](https://kadira.io/academy/meteor-routing-guide)
+
+## Getting Started
+
+Add FlowRouter to your app:
+
+~~~shell
+meteor add kadira:flow-router
+~~~
+
+Let's write our first route (add this file to `lib/router.js`):
+
+~~~js
+FlowRouter.route('/blog/:postId', {
+    action: function(params, queryParams) {
+        console.log("Yeah! We are on the post:", params.postId);
+    }
+});
+~~~
+
+Then visit `/blog/my-post-id` from the browser or invoke the following command from the browser console:
+
+~~~js
+FlowRouter.go('/blog/my-post-id');
+~~~
+
+Then you can see some messages printed in the console.
+
+## Routes Definition
+
+FlowRouter routes are very simple and based on the syntax of [path-to-regexp](https://github.com/pillarjs/path-to-regexp) which is used in both [Express](http://expressjs.com/) and `iron:router`.
+
+Here's the syntax for a simple route:
+
+~~~js
+FlowRouter.route('/blog/:postId', {
+    // do some action for this route
+    action: function(params, queryParams) {
+        console.log("Params:", params);
+        console.log("Query Params:", queryParams);
+    },
+
+    name: "<name for the route>" // optional
+});
+~~~
+
+So, this route will be activated when you visit a url like below:
+
+~~~js
+FlowRouter.go('/blog/my-post?comments=on&color=dark');
+~~~
+
+After you've visit the route, this will be printed in the console:
+
+~~~
+Params: {postId: "my-post"}
+Query Params: {comments: "on", color: "dark"}
+~~~
+
+For a single interaction, the router only runs once. That means, after you've visit a route, first it will call `triggers`, then `subscriptions` and finally `action`. After that happens, none of those methods will be called again for that route visit.
+
+You can define routes anywhere in the `client` directory. But, we recommend to add them in the `lib` directory. Then `fast-render` can detect subscriptions and send them for you (we'll talk about this is a moment).
+
+### Group Routes
+
+You can group routes for better route organization. Here's an example:
+
+~~~js
+var adminRoutes = FlowRouter.group({
+  prefix: '/admin',
+  name: 'admin',
+  triggersEnter: [function(context, redirect) {
+    console.log('running group triggers');
+  }]
+});
+
+// handling /admin route
+adminRoutes.route('/', {
+  action: function() {
+    BlazeLayout.render('componentLayout', {content: 'admin'});
+  },
+  triggersEnter: [function(context, redirect) {
+    console.log('running /admin trigger');
+  }]
+});
+
+// handling /admin/posts
+adminRoutes.route('/posts', {
+  action: function() {
+    BlazeLayout.render('componentLayout', {content: 'posts'});
+  }
+});
+~~~
+
+**All of the options for the `FlowRouter.group()` are optional.**
+
+You can even have nested group routes as shown below:
+
+~~~js
+var adminRoutes = FlowRouter.group({
+    prefix: "/admin",
+    name: "admin"
+});
+
+var superAdminRoutes = adminRoutes.group({
+    prefix: "/super",
+    name: "superadmin"
+});
+
+// handling /admin/super/post
+superAdminRoutes.route('/post', {
+    action: function() {
+
+    }
+});
+~~~
+
+You can determine which group the current route is in using:
+
+~~~js
+FlowRouter.current().route.group.name
+~~~
+
+This can be useful for determining if the current route is in a specific group (e.g. *admin*, *public*, *loggedIn*) without needing to use prefixes if you don't want to. If it's a nested group, you can get the parent group's name with:
+
+~~~js
+FlowRouter.current().route.group.parent.name
+~~~
+
+As with all current route properties, these are not reactive, but can be combined with `FlowRouter.watchPathChange()` to get group names reactively.
+
+## Rendering and Layout Management
+
+FlowRouter does not handle rendering or layout management. For that, you can use:
+
+  * [Blaze Layout for Blaze](https://github.com/kadirahq/blaze-layout)
+  * [React Layout for React](https://github.com/kadirahq/meteor-react-layout)
+
+Then you can invoke the layout manager inside the `action` method in the router.
+
+~~~js
+FlowRouter.route('/blog/:postId', {
+    action: function(params) {
+        BlazeLayout.render("mainLayout", {area: "blog"});
+    }
+});
+~~~
+
+## Triggers
+
+Triggers are the way FlowRouter allows you to perform tasks before you **enter** into a route and after you **exit** from a route.
+
+#### Defining triggers for a route
+
+Here's how you can define triggers for a route:
+
+~~~js
+FlowRouter.route('/home', {
+  // calls just before the action
+  triggersEnter: [trackRouteEntry],
+  action: function() {
+    // do something you like
+  },
+  // calls when we decide to move to another route
+  // but calls before the next route started
+  triggersExit: [trackRouteClose]
+});
+
+function trackRouteEntry(context) {
+  // context is the output of `FlowRouter.current()`
+  Mixpanel.track("visit-to-home", context.queryParams);
+}
+
+function trackRouteClose(context) {
+  Mixpanel.track("move-from-home", context.queryParams);
+}
+~~~
+
+#### Defining triggers for a group route
+
+This is how you can define triggers on a group definition.
+
+~~~js
+var adminRoutes = FlowRouter.group({
+  prefix: '/admin',
+  triggersEnter: [trackRouteEntry],
+  triggersExit: [trackRouteEntry]
+});
+~~~
+
+> You can add triggers to individual routes in the group too.
+
+#### Defining Triggers Globally
+
+You can also define triggers globally. Here's how to do it:
+
+~~~js
+FlowRouter.triggers.enter([cb1, cb2]);
+FlowRouter.triggers.exit([cb1, cb2]);
+
+// filtering
+FlowRouter.triggers.enter([trackRouteEntry], {only: ["home"]});
+FlowRouter.triggers.exit([trackRouteExit], {except: ["home"]});
+~~~
+
+As you can see from the last two examples, you can filter routes using the `only` or `except` keywords. But, you can't use both `only` and `except` at once.
+
+> If you'd like to learn more about triggers and design decisions, visit [here](https://github.com/meteorhacks/flow-router/pull/59).
+
+#### Redirecting With Triggers
+
+You can redirect to a different route using triggers. You can do it from both enter and exit triggers. See how to do it:
+
+~~~js
+FlowRouter.route('/', {
+  triggersEnter: [function(context, redirect) {
+    redirect('/some-other-path');
+  }],
+  action: function(_params) {
+    throw new Error("this should not get called");
+  }
+});
+~~~
+
+Every trigger callback comes with a second argument: a function you can use to redirect to a different route. Redirect also has few properties to make sure it's not blocking the router.
+
+* redirect must be called with an URL
+* redirect must be called within the same event loop cycle (no async or called inside a Tracker)
+* redirect cannot be called multiple times
+
+Check this [PR](https://github.com/meteorhacks/flow-router/pull/172) to learn more about our redirect API.
+
+#### Stopping the Callback With Triggers
+
+In some cases, you may need to stop the route callback from firing using triggers. You can do this in **before** triggers, using the third argument: the `stop` function. For example, you can check the prefix and if it fails, show the notFound layout and stop before the action fires.
+
+```js
+var localeGroup = FlowRouter.group({
+  prefix: '/:locale?',
+  triggersEnter: [localeCheck]
+});
+
+localeGroup.route('/login', {
+  action: function (params, queryParams) {
+    BlazeLayout.render('componentLayout', {content: 'login'});
+  }
+});
+
+function localeCheck(context, redirect, stop) {
+  var locale = context.params.locale;
+
+  if (locale !== undefined && locale !== 'fr') {
+    BlazeLayout.render('notFound');
+    stop();
+  }
+}
+```
+
+> **Note**: When using the stop function, you should always pass the second **redirect** argument, even if you won't use it.
+
+## Not Found Routes
+
+You can configure Not Found routes like this:
+
+~~~js
+FlowRouter.notFound = {
+    // Subscriptions registered here don't have Fast Render support.
+    subscriptions: function() {
+
+    },
+    action: function() {
+
+    }
+};
+~~~
+
+## API
+
+FlowRouter has a rich API to help you to navigate the router and reactively get information from the router.
+
+#### FlowRouter.getParam(paramName);
+
+Reactive function which you can use to get a parameter from the URL.
+
+~~~js
+// route def: /apps/:appId
+// url: /apps/this-is-my-app
+
+var appId = FlowRouter.getParam("appId");
+console.log(appId); // prints "this-is-my-app"
+~~~
+
+#### FlowRouter.getQueryParam(queryStringKey);
+
+Reactive function which you can use to get a value from the queryString.
+
+~~~js
+// route def: /apps/:appId
+// url: /apps/this-is-my-app?show=yes&color=red
+
+var color = FlowRouter.getQueryParam("color");
+console.log(color); // prints "red"
+~~~
+
+#### FlowRouter.path(pathDef, params, queryParams)
+
+Generate a path from a path definition. Both `params` and `queryParams` are optional.
+
+Special characters in `params` and `queryParams` will be URL encoded.
+
+~~~js
+var pathDef = "/blog/:cat/:id";
+var params = {cat: "met eor", id: "abc"};
+var queryParams = {show: "y+e=s", color: "black"};
+
+var path = FlowRouter.path(pathDef, params, queryParams);
+console.log(path); // prints "/blog/met%20eor/abc?show=y%2Be%3Ds&color=black"
+~~~
+
+If there are no params or queryParams, this will simply return the pathDef as it is.
+
+##### Using Route name instead of the pathDef
+
+You can also use the route's name instead of the pathDef. Then, FlowRouter will pick the pathDef from the given route. See the following example:
+
+~~~js
+FlowRouter.route("/blog/:cat/:id", {
+    name: "blogPostRoute",
+    action: function(params) {
+        //...
+    }
+})
+
+var params = {cat: "meteor", id: "abc"};
+var queryParams = {show: "yes", color: "black"};
+
+var path = FlowRouter.path("blogPostRoute", params, queryParams);
+console.log(path); // prints "/blog/meteor/abc?show=yes&color=black"
+~~~
+
+#### FlowRouter.go(pathDef, params, queryParams);
+
+This will get the path via `FlowRouter.path` based on the arguments and re-route to that path.
+
+You can call `FlowRouter.go` like this as well:
+
+~~~js
+FlowRouter.go("/blog");
+~~~
+
+
+#### FlowRouter.url(pathDef, params, queryParams)
+
+Just like `FlowRouter.path`, but gives the absolute url. (Uses `Meteor.absoluteUrl` behind the scenes.)
+
+#### FlowRouter.setParams(newParams)
+
+This will change the current params with the newParams and re-route to the new path.
+
+~~~js
+// route def: /apps/:appId
+// url: /apps/this-is-my-app?show=yes&color=red
+
+FlowRouter.setParams({appId: "new-id"});
+// Then the user will be redirected to the following path
+//      /apps/new-id?show=yes&color=red
+~~~
+
+#### FlowRouter.setQueryParams(newQueryParams)
+
+Just like `FlowRouter.setParams`, but for queryString params.
+
+To remove a query param set it to `null` like below:
+
+~~~js
+FlowRouter.setQueryParams({paramToRemove: null});
+~~~
+
+#### FlowRouter.getRouteName()
+
+To get the name of the route reactively.
+
+~~~js
+Tracker.autorun(function() {
+  var routeName = FlowRouter.getRouteName();
+  console.log("Current route name is: ", routeName);
+});
+~~~
+
+#### FlowRouter.current()
+
+Get the current state of the router. **This API is not reactive**.
+If you need to watch the changes in the path simply use `FlowRouter.watchPathChange()`.
+
+This gives an object like this:
+
+~~~js
+// route def: /apps/:appId
+// url: /apps/this-is-my-app?show=yes&color=red
+
+var current = FlowRouter.current();
+console.log(current);
+
+// prints following object
+// {
+//     path: "/apps/this-is-my-app?show=yes&color=red",
+//     params: {appId: "this-is-my-app"},
+//     queryParams: {show: "yes", color: "red"}
+//     route: {pathDef: "/apps/:appId", name: "name-of-the-route"}
+// }
+~~~
+
+#### FlowRouter.watchPathChange()
+
+Reactively watch the changes in the path. If you need to simply get the params or queryParams use dedicated APIs like `FlowRouter.getQueryParam()`.
+
+~~~js
+Tracker.autorun(function() {
+  FlowRouter.watchPathChange();
+  var currentContext = FlowRouter.current();
+  // do anything with the current context
+  // or anything you wish
+});
+~~~
+
+#### FlowRouter.withReplaceState(fn)
+Normally, all the route changes made via APIs like `FlowRouter.go` and `FlowRouter.setParams()` add a URL item to the browser history. For example, run the following code:
+
+~~~js
+FlowRouter.setParams({id: "the-id-1"});
+FlowRouter.setParams({id: "the-id-2"});
+FlowRouter.setParams({id: "the-id-3"});
+~~~
+
+Now you can hit the back button of your browser two times. This is normal behavior since users may click the back button and expect to see the previous state of the app.
+
+But sometimes, this is not something you want. You don't need to pollute the browser history. Then, you can use the following syntax.
+
+~~~js
+FlowRouter.withReplaceState(function() {
+  FlowRouter.setParams({id: "the-id-1"});
+  FlowRouter.setParams({id: "the-id-2"});
+  FlowRouter.setParams({id: "the-id-3"});
+});
+~~~
+
+Now, there is no item in the browser history. Just like `FlowRouter.setParams`, you can use any FlowRouter API inside `FlowRouter.withReplaceState`.
+
+> We named this function as `withReplaceState` because, replaceState is the underline API used for this functionality. Read more about [replace state & the history API](https://developer.mozilla.org/en-US/docs/Web/Guide/API/DOM/Manipulating_the_browser_history).
+
+#### FlowRouter.reload()
+
+FlowRouter routes are idempotent. That means, even if you call `FlowRouter.go()` to the same URL multiple times, it only activates in the first run. This is also true for directly clicking on paths.
+
+So, if you really need to reload the route, this is the API you want.
+
+#### FlowRouter.wait() and FlowRouter.initialize()
+
+By default, FlowRouter initializes the routing process in a `Meteor.startup()` callback. This works for most of the apps. But, some apps have custom initializations and FlowRouter needs to initialize after that.
+
+So, that's where `FlowRouter.wait()` comes to save you. You need to call it directly inside your JavaScript file. After that, whenever your app is ready call `FlowRouter.initialize()`.
+
+eg:-
+
+~~~js
+// file: app.js
+FlowRouter.wait();
+WhenEverYourAppIsReady(function() {
+  FlowRouter.initialize();
+});
+~~~
+
+For more information visit [issue #180](https://github.com/meteorhacks/flow-router/issues/180).
+
+#### FlowRouter.onRouteRegister(cb)
+
+This API is specially designed for add-on developers. They can listen for any registered route and add custom functionality to FlowRouter. This works on both server and client alike.
+
+~~~js
+FlowRouter.onRouteRegister(function(route) {
+  // do anything with the route object
+  console.log(route);
+});
+~~~
+
+Let's say a user defined a route like this:
+
+~~~js
+FlowRouter.route('/blog/:post', {
+  name: 'postList',
+  triggersEnter: [function() {}],
+  subscriptions: function() {},
+  action: function() {},
+  triggersExit: [function() {}],
+  customField: 'customName'
+});
+~~~
+
+Then the route object will be something like this:
+
+~~~js
+{
+  pathDef: '/blog/:post',
+  name: 'postList',
+  options: {customField: 'customName'}
+}
+~~~
+
+So, it's not the internal route object we are using.
+
+## Subscription Management
+
+For Subscription Management, we highly suggest you to follow [Template/Component level subscriptions](https://kadira.io/academy/meteor-routing-guide/content/subscriptions-and-data-management). Visit this [guide](https://kadira.io/academy/meteor-routing-guide/content/subscriptions-and-data-management) for that.
+
+FlowRouter also has it's own subscription registration mechanism. We will remove this in version 3.0. We don't remove or deprecate it in version 2.x because this is the easiest way to implement FastRender support for your app. In 3.0 we've better support for FastRender with Server Side Rendering.
+
+FlowRouter only deals with registration of subscriptions. It does not wait until subscription becomes ready. This is how to register a subscription.
+
+~~~js
+FlowRouter.route('/blog/:postId', {
+    subscriptions: function(params, queryParams) {
+        this.register('myPost', Meteor.subscribe('blogPost', params.postId));
+    }
+});
+~~~
+
+We can also register global subscriptions like this:
+
+~~~js
+FlowRouter.subscriptions = function() {
+  this.register('myCourses', Meteor.subscribe('courses'));
+};
+~~~
+
+All these global subscriptions run on every route. So, pay special attention to names when registering subscriptions.
+
+After you've registered your subscriptions, you can reactively check for the status of those subscriptions like this:
+
+~~~js
+Tracker.autorun(function() {
+    console.log("Is myPost ready?:", FlowRouter.subsReady("myPost"));
+    console.log("Are all subscriptions ready?:", FlowRouter.subsReady());
+});
+~~~
+
+So, you can use `FlowRouter.subsReady` inside template helpers to show the loading status and act accordingly.
+
+### FlowRouter.subsReady() with a callback
+
+Sometimes, we need to use `FlowRouter.subsReady()` in places where an autorun is not available. One such example is inside an event handler. For such places, we can use the callback API of `FlowRouter.subsReady()`.
+
+~~~js
+Template.myTemplate.events({
+   "click #id": function(){
+      FlowRouter.subsReady("myPost", function() {
+         // do something
+      });
+  }
+});
+~~~
+
+> Arunoda has discussed more about Subscription Management in FlowRouter in [this](https://meteorhacks.com/flow-router-and-subscription-management.html#subscription-management) blog post about [FlowRouter and Subscription Management](https://meteorhacks.com/flow-router-and-subscription-management.html).
+
+> He's showing how to build an app like this:
+
+>![FlowRouter's Subscription Management](https://cldup.com/esLzM8cjEL.gif)
+
+#### Fast Render
+FlowRouter has built in support for [Fast Render](https://github.com/meteorhacks/fast-render).
+
+- `meteor add meteorhacks:fast-render`
+- Put `router.js` in a shared location. We suggest `lib/router.js`.
+
+You can exclude Fast Render support by wrapping the subscription registration in an `isClient` block:
+
+~~~js
+FlowRouter.route('/blog/:postId', {
+    subscriptions: function(params, queryParams) {
+        // using Fast Render
+        this.register('myPost', Meteor.subscribe('blogPost', params.postId));
+
+        // not using Fast Render
+        if(Meteor.isClient) {
+            this.register('data', Meteor.subscribe('bootstrap-data');
+        }
+    }
+});
+~~~
+
+#### Subscription Caching
+
+You can also use [Subs Manager](https://github.com/meteorhacks/subs-manager) for caching subscriptions on the client. We haven't done anything special to make it work. It should work as it works with other routers.
+
+## IE9 Support
+
+FlowRouter has IE9 support. But it does not ship the **HTML5 history polyfill** out of the box. That's because most apps do not require it.
+
+If you need to support IE9, add the **HTML5 history polyfill** with the following package.
+
+~~~shell
+meteor add tomwasd:history-polyfill
+~~~
+
+## Hashbang URLs
+
+To enable hashbang urls like `mydomain.com/#!/mypath` simple set the `hashbang` option to `true` in the initialize function:
+
+~~~js
+// file: app.js
+FlowRouter.wait();
+WhenEverYourAppIsReady(function() {
+  FlowRouter.initialize({hashbang: true});
+});
+~~~
+
+## Prefixed paths
+
+In cases you wish to run multiple web application on the same domain name, you’ll probably want to serve your particular meteor application under a sub-path (eg `example.com/myapp`). In this case simply include the path prefix in the meteor `ROOT_URL` environment variable and FlowRouter will handle it transparently without any additional configuration.
+
+## Add-ons
+
+Router is a base package for an app. Other projects like [useraccounts](http://useraccounts.meteor.com/)  should have support for FlowRouter. Otherwise, it's hard to use  FlowRouter in a real project. Now a lot of packages have [started to support FlowRouter](https://kadira.io/blog/meteor/addon-packages-for-flowrouter).
+
+So, you can use your your favorite package with FlowRouter as well. If not, there is an [easy process](https://kadira.io/blog/meteor/addon-packages-for-flowrouter#what-if-project-xxx-still-doesn-t-support-flowrouter-) to convert them to FlowRouter.
+
+**Add-on API**
+
+We have also released a [new API](https://github.com/kadirahq/flow-router#flowrouteronrouteregistercb) to support add-on developers. With that add-on packages can get a notification, when the user created a route in their app.
+
+If you've more ideas for the add-on API, [let us know](https://github.com/kadirahq/flow-router/issues).
+
+## Difference with Iron Router
+
+FlowRouter and Iron Router are two different routers. Iron Router tries to be a full featured solution. It tries to do everything including routing, subscriptions, rendering and layout management.
+
+FlowRouter is a minimalistic solution focused on routing with UI performance in mind. It exposes APIs for related functionality.
+
+Let's learn more about the differences:
+
+### Rendering
+
+FlowRouter doesn't handle rendering. By decoupling rendering from the router it's possible to use any rendering framework, such as [Blaze Layout](https://github.com/kadirahq/blaze-layout) to render with Blaze's Dynamic Templates. Rendering calls are made in the the route's action. We have a layout manager for [React](https://github.com/kadirahq/meteor-react-layout) as well.
+
+### Subscriptions
+
+With FlowRouter, we highly suggest using template/component layer subscriptions. But, if you need to do routing in the router layer, FlowRouter has [subscription registration](#subscription-management) mechanism. Even with that, FlowRouter never waits for the subscriptions and view layer to do it.
+
+### Reactive Content
+
+In Iron Router you can use reactive content inside the router, but any hook or method can re-run in an unpredictable manner. FlowRouter limits reactive data sources to a single run; when it is first called.
+
+We think that's the way to go. Router is just a user action. We can work with reactive content in the rendering layer.
+
+### router.current() is evil
+
+`Router.current()` is evil. Why? Let's look at following example. Imagine we have a route like this in our app:
+
+~~~
+/apps/:appId/:section
+~~~
+
+Now let's say, we need to get `appId` from the URL. Then we will do, something like this in Iron Router.
+
+~~~js
+Templates['foo'].helpers({
+    "someData": function() {
+        var appId = Router.current().params.appId;
+        return doSomething(appId);
+    }
+});
+~~~
+
+Let's say we changed `:section` in the route. Then the above helper also gets rerun. If we add a query param to the URL, it gets rerun. That's because `Router.current()` looks for changes in the route(or URL). But in any of above cases, `appId` didn't get changed.
+
+Because of this, a lot parts of our app get re-run and re-rendered. This creates unpredictable rendering behavior in our app.
+
+FlowRouter fixes this issue by providing the `Router.getParam()` API. See how to use it:
+
+~~~js
+Templates['foo'].helpers({
+    "someData": function() {
+        var appId = FlowRouter.getParam('appId');
+        return doSomething(appId);
+    }
+});
+~~~
+
+### No data context
+
+FlowRouter does not have a data context. Data context has the same problem as reactive `.current()`. We believe, it'll possible to get data directly in the template (component) layer.
+
+### Built in Fast Render Support
+
+FlowRouter has built in [Fast Render](https://github.com/meteorhacks/fast-render) support. Just add Fast Render to your app and it'll work. Nothing to change in the router.
+
+For more information check [docs](#fast-render).
+
+### Server Side Routing
+
+FlowRouter is a client side router and it **does not** support server side routing at all. But `subscriptions` run on the server to enable Fast Render support.
+
+#### Reason behind that
+
+Meteor is not a traditional framework where you can send HTML directly from the server. Meteor needs to send a special set of HTML to the client initially. So, you can't directly send something to the client yourself.
+
+Also, in the server we need look for different things compared with the client. For example:
+
+* In the server we have to deal with headers.
+* In the server we have to deal with methods like `GET`, `POST`, etc.
+* In the server we have Cookies.
+
+So, it's better to use a dedicated server-side router like [`meteorhacks:picker`](https://github.com/meteorhacks/picker). It supports connect and express middlewares and has a very easy to use route syntax.
+
+### Server Side Rendering
+
+FlowRouter 3.0 will have server side rendering support. We've already started the initial version and check our [`ssr`](https://github.com/meteorhacks/flow-router/tree/ssr) branch for that.
+
+It's currently very usable and Kadira already using it for <https://kadira.io>
+
+### Better Initial Loading Support
+
+In Meteor, we have to wait until all the JS and other resources send before rendering anything. This is an issue. In 3.0, with the support from Server Side Rendering we are going to fix it.
+
+## Migrating into 2.0
+
+Migrating into version 2.0 is easy and you don't need to change any application code since you are already using 2.0 features and the APIs. In 2.0, we've changed names and removed some deprecated APIs.
+
+Here are the steps to migrate your app into 2.0.
+
+#### Use the New FlowRouter Package
+* Now FlowRouter comes as `kadira:flow-router`
+* So, remove `meteorhacks:flow-router` with : `meteor remove meteorhacks:flow-router`
+* Then, add `kadira:flow-router` with `meteor add kadira:flow-router`
+
+#### Change FlowLayout into BlazeLayout
+* We've also renamed FlowLayout as [BlazeLayout](https://github.com/kadirahq/blaze-layout).
+* So, remove `meteorhacks:flow-layout` and add `kadira:blaze-layout` instead.
+* You need to use `BlazeLayout.render()` instead of `FlowLayout.render()`
+
+#### Stop using deprecated Apis
+* There is no middleware support. Use triggers instead.
+* There is no API called `.reactiveCurrent()`, use `.watchPathChange()` instead.
+* Earlier, you can access query params with `FlowRouter.current().params.query`. But, now you can't do that. Use `FlowRouter.current().queryParams` instead.
diff --git a/packages/kadira-flow-router/client/_init.js b/packages/kadira-flow-router/client/_init.js
new file mode 100644
index 00000000..a18fdc89
--- /dev/null
+++ b/packages/kadira-flow-router/client/_init.js
@@ -0,0 +1,11 @@
+// Export Router Instance
+FlowRouter = new Router();
+FlowRouter.Router = Router;
+FlowRouter.Route = Route;
+
+// Initialize FlowRouter
+Meteor.startup(function () {
+  if(!FlowRouter._askedToWait) {
+    FlowRouter.initialize();
+  }
+});
diff --git a/packages/kadira-flow-router/client/group.js b/packages/kadira-flow-router/client/group.js
new file mode 100644
index 00000000..b93296bc
--- /dev/null
+++ b/packages/kadira-flow-router/client/group.js
@@ -0,0 +1,57 @@
+Group = function(router, options, parent) {
+  options = options || {};
+
+  if (options.prefix && !/^\/.*/.test(options.prefix)) {
+    var message = "group's prefix must start with '/'";
+    throw new Error(message);
+  }
+
+  this._router = router;
+  this.prefix = options.prefix || '';
+  this.name = options.name;
+  this.options = options;
+
+  this._triggersEnter = options.triggersEnter || [];
+  this._triggersExit = options.triggersExit || [];
+  this._subscriptions = options.subscriptions || Function.prototype;
+
+  this.parent = parent;
+  if (this.parent) {
+    this.prefix = parent.prefix + this.prefix;
+
+    this._triggersEnter = parent._triggersEnter.concat(this._triggersEnter);
+    this._triggersExit = this._triggersExit.concat(parent._triggersExit);
+  }
+};
+
+Group.prototype.route = function(pathDef, options, group) {
+  options = options || {};
+
+  if (!/^\/.*/.test(pathDef)) {
+    var message = "route's path must start with '/'";
+    throw new Error(message);
+  }
+
+  group = group || this;
+  pathDef = this.prefix + pathDef;
+
+  var triggersEnter = options.triggersEnter || [];
+  options.triggersEnter = this._triggersEnter.concat(triggersEnter);
+
+  var triggersExit = options.triggersExit || [];
+  options.triggersExit = triggersExit.concat(this._triggersExit);
+
+  return this._router.route(pathDef, options, group);
+};
+
+Group.prototype.group = function(options) {
+  return new Group(this._router, options, this);
+};
+
+Group.prototype.callSubscriptions = function(current) {
+  if (this.parent) {
+    this.parent.callSubscriptions(current);
+  }
+
+  this._subscriptions.call(current.route, current.params, current.queryParams);
+};
diff --git a/packages/kadira-flow-router/client/modules.js b/packages/kadira-flow-router/client/modules.js
new file mode 100644
index 00000000..7b734f44
--- /dev/null
+++ b/packages/kadira-flow-router/client/modules.js
@@ -0,0 +1,2 @@
+page = require('page');
+qs   = require('qs');
diff --git a/packages/kadira-flow-router/client/route.js b/packages/kadira-flow-router/client/route.js
new file mode 100644
index 00000000..b82e9721
--- /dev/null
+++ b/packages/kadira-flow-router/client/route.js
@@ -0,0 +1,125 @@
+Route = function(router, pathDef, options, group) {
+  options = options || {};
+
+  this.options = options;
+  this.pathDef = pathDef
+
+  // Route.path is deprecated and will be removed in 3.0
+  this.path = pathDef;
+
+  if (options.name) {
+    this.name = options.name;
+  }
+
+  this._action = options.action || Function.prototype;
+  this._subscriptions = options.subscriptions || Function.prototype;
+  this._triggersEnter = options.triggersEnter || [];
+  this._triggersExit = options.triggersExit || [];
+  this._subsMap = {};
+  this._router = router;
+
+  this._params = new ReactiveDict();
+  this._queryParams = new ReactiveDict();
+  this._routeCloseDep = new Tracker.Dependency();
+
+  // tracks the changes in the URL
+  this._pathChangeDep = new Tracker.Dependency();
+
+  this.group = group;
+};
+
+Route.prototype.clearSubscriptions = function() {
+  this._subsMap = {};
+};
+
+Route.prototype.register = function(name, sub, options) {
+  this._subsMap[name] = sub;
+};
+
+
+Route.prototype.getSubscription = function(name) {
+  return this._subsMap[name];
+};
+
+
+Route.prototype.getAllSubscriptions = function() {
+  return this._subsMap;
+};
+
+Route.prototype.callAction = function(current) {
+  var self = this;
+  self._action(current.params, current.queryParams);
+};
+
+Route.prototype.callSubscriptions = function(current) {
+  this.clearSubscriptions();
+  if (this.group) {
+    this.group.callSubscriptions(current);
+  }
+
+  this._subscriptions(current.params, current.queryParams);
+};
+
+Route.prototype.getRouteName = function() {
+  this._routeCloseDep.depend();
+  return this.name;
+};
+
+Route.prototype.getParam = function(key) {
+  this._routeCloseDep.depend();
+  return this._params.get(key);
+};
+
+Route.prototype.getQueryParam = function(key) {
+  this._routeCloseDep.depend();
+  return this._queryParams.get(key);
+};
+
+Route.prototype.watchPathChange = function() {
+  this._pathChangeDep.depend();
+};
+
+Route.prototype.registerRouteClose = function() {
+  this._params = new ReactiveDict();
+  this._queryParams = new ReactiveDict();
+  this._routeCloseDep.changed();
+  this._pathChangeDep.changed();
+};
+
+Route.prototype.registerRouteChange = function(currentContext, routeChanging) {
+  // register params
+  var params = currentContext.params;
+  this._updateReactiveDict(this._params, params);
+
+  // register query params
+  var queryParams = currentContext.queryParams;
+  this._updateReactiveDict(this._queryParams, queryParams);
+
+  // if the route is changing, we need to defer triggering path changing
+  // if we did this, old route's path watchers will detect this
+  // Real issue is, above watcher will get removed with the new route
+  // So, we don't need to trigger it now
+  // We are doing it on the route close event. So, if they exists they'll 
+  // get notify that
+  if(!routeChanging) {
+    this._pathChangeDep.changed();
+  }
+};
+
+Route.prototype._updateReactiveDict = function(dict, newValues) {
+  var currentKeys = _.keys(newValues);
+  var oldKeys = _.keys(dict.keyDeps);
+
+  // set new values
+  //  params is an array. So, _.each(params) does not works
+  //  to iterate params
+  _.each(currentKeys, function(key) {
+    dict.set(key, newValues[key]);
+  });
+
+  // remove keys which does not exisits here
+  var removedKeys = _.difference(oldKeys, currentKeys);
+  _.each(removedKeys, function(key) {
+    dict.set(key, undefined);
+  });
+};
diff --git a/packages/kadira-flow-router/client/router.js b/packages/kadira-flow-router/client/router.js
new file mode 100644
index 00000000..ae91751f
--- /dev/null
+++ b/packages/kadira-flow-router/client/router.js
@@ -0,0 +1,587 @@
+Router = function () {
+  var self = this;
+  this.globals = [];
+  this.subscriptions = Function.prototype;
+
+  this._tracker = this._buildTracker();
+  this._current = {};
+
+  // tracks the current path change
+  this._onEveryPath = new Tracker.Dependency();
+
+  this._globalRoute = new Route(this);
+
+  // holds onRoute callbacks
+  this._onRouteCallbacks = [];
+
+  // if _askedToWait is true. We don't automatically start the router
+  // in Meteor.startup callback. (see client/_init.js)
+  // Instead user need to call `.initialize()
+  this._askedToWait = false;
+  this._initialized = false;
+  this._triggersEnter = [];
+  this._triggersExit = [];
+  this._routes = [];
+  this._routesMap = {};
+  this._updateCallbacks();
+  this.notFound = this.notfound = null;
+  // indicate it's okay (or not okay) to run the tracker
+  // when doing subscriptions
+  // using a number and increment it help us to support FlowRouter.go()
+  // and legitimate reruns inside tracker on the same event loop.
+  // this is a solution for #145
+  this.safeToRun = 0;
+
+  // Meteor exposes to the client the path prefix that was defined using the
+  // ROOT_URL environement variable on the server using the global runtime
+  // configuration. See #315.
+  this._basePath = __meteor_runtime_config__.ROOT_URL_PATH_PREFIX || '';
+
+  // this is a chain contains a list of old routes
+  // most of the time, there is only one old route
+  // but when it's the time for a trigger redirect we've a chain
+  this._oldRouteChain = [];
+
+  this.env = {
+    replaceState: new Meteor.EnvironmentVariable(),
+    reload: new Meteor.EnvironmentVariable(),
+    trailingSlash: new Meteor.EnvironmentVariable()
+  };
+
+  // redirect function used inside triggers
+  this._redirectFn = function(pathDef, fields, queryParams) {
+    if (/^http(s)?:\/\//.test(pathDef)) {
+        var message = "Redirects to URLs outside of the app are not supported in this version of Flow Router. Use 'window.location = yourUrl' instead";
+        throw new Error(message);
+    }
+    self.withReplaceState(function() {
+      var path = FlowRouter.path(pathDef, fields, queryParams);
+      self._page.redirect(path);
+    });
+  };
+  this._initTriggersAPI();
+};
+
+Router.prototype.route = function(pathDef, options, group) {
+  if (!/^\/.*/.test(pathDef)) {
+    var message = "route's path must start with '/'";
+    throw new Error(message);
+  }
+
+  options = options || {};
+  var self = this;
+  var route = new Route(this, pathDef, options, group);
+
+  // calls when the page route being activates
+  route._actionHandle = function (context, next) {
+    var oldRoute = self._current.route;
+    self._oldRouteChain.push(oldRoute);
+
+    var queryParams = self._qs.parse(context.querystring);
+    // _qs.parse() gives us a object without prototypes,
+    // created with Object.create(null)
+    // Meteor's check doesn't play nice with it.
+    // So, we need to fix it by cloning it.
+    // see more: https://github.com/meteorhacks/flow-router/issues/164
+    queryParams = JSON.parse(JSON.stringify(queryParams));
+
+    self._current = {
+      path: context.path,
+      context: context,
+      params: context.params,
+      queryParams: queryParams,
+      route: route,
+      oldRoute: oldRoute
+    };
+
+    // we need to invalidate if all the triggers have been completed
+    // if not that means, we've been redirected to another path
+    // then we don't need to invalidate
+    var afterAllTriggersRan = function() {
+      self._invalidateTracker();
+    };
+
+    var triggers = self._triggersEnter.concat(route._triggersEnter);
+    Triggers.runTriggers(
+      triggers,
+      self._current,
+      self._redirectFn,
+      afterAllTriggersRan
+    );
+  };
+
+  // calls when you exit from the page js route
+  route._exitHandle = function(context, next) {
+    var triggers = self._triggersExit.concat(route._triggersExit);
+    Triggers.runTriggers(
+      triggers,
+      self._current,
+      self._redirectFn,
+      next
+    );
+  };
+
+  this._routes.push(route);
+  if (options.name) {
+    this._routesMap[options.name] = route;
+  }
+
+  this._updateCallbacks();
+  this._triggerRouteRegister(route);
+
+  return route;
+};
+
+Router.prototype.group = function(options) {
+  return new Group(this, options);
+};
+
+Router.prototype.path = function(pathDef, fields, queryParams) {
+  if (this._routesMap[pathDef]) {
+    pathDef = this._routesMap[pathDef].pathDef;
+  }
+
+  var path = "";
+
+  // Prefix the path with the router global prefix
+  if (this._basePath) {
+    path += "/" + this._basePath + "/";
+  }
+
+  fields = fields || {};
+  var regExp = /(:[\w\(\)\\\+\*\.\?]+)+/g;
+  path += pathDef.replace(regExp, function(key) {
+    var firstRegexpChar = key.indexOf("(");
+    // get the content behind : and (\\d+/)
+    key = key.substring(1, (firstRegexpChar > 0)? firstRegexpChar: undefined);
+    // remove +?*
+    key = key.replace(/[\+\*\?]+/g, "");
+
+    // this is to allow page js to keep the custom characters as it is
+    // we need to encode 2 times otherwise "/" char does not work properly
+    // So, in that case, when I includes "/" it will think it's a part of the
+    // route. encoding 2times fixes it
+    return encodeURIComponent(encodeURIComponent(fields[key] || ""));
+  });
+
+  // Replace multiple slashes with single slash
+  path = path.replace(/\/\/+/g, "/");
+
+  // remove trailing slash
+  // but keep the root slash if it's the only one
+  path = path.match(/^\/{1}$/) ? path: path.replace(/\/$/, "");
+
+  // explictly asked to add a trailing slash
+  if(this.env.trailingSlash.get() && _.last(path) !== "/") {
+    path += "/";
+  }
+
+  var strQueryParams = this._qs.stringify(queryParams || {});
+  if(strQueryParams) {
+    path += "?" + strQueryParams;
+  }
+
+  return path;
+};
+
+Router.prototype.go = function(pathDef, fields, queryParams) {
+  var path = this.path(pathDef, fields, queryParams);
+
+  var useReplaceState = this.env.replaceState.get();
+  if(useReplaceState) {
+    this._page.replace(path);
+  } else {
+    this._page(path);
+  }
+};
+
+Router.prototype.reload = function() {
+  var self = this;
+
+  self.env.reload.withValue(true, function() {
+    self._page.replace(self._current.path);
+  });
+};
+
+Router.prototype.redirect = function(path) {
+  this._page.redirect(path);
+};
+
+Router.prototype.setParams = function(newParams) {
+  if(!this._current.route) {return false;}
+
+  var pathDef = this._current.route.pathDef;
+  var existingParams = this._current.params;
+  var params = {};
+  _.each(_.keys(existingParams), function(key) {
+    params[key] = existingParams[key];
+  });
+
+  params = _.extend(params, newParams);
+  var queryParams = this._current.queryParams;
+
+  this.go(pathDef, params, queryParams);
+  return true;
+};
+
+Router.prototype.setQueryParams = function(newParams) {
+  if(!this._current.route) {return false;}
+
+  var queryParams = _.clone(this._current.queryParams);
+  _.extend(queryParams, newParams);
+
+  for (var k in queryParams) {
+    if (queryParams[k] === null || queryParams[k] === undefined) {
+      delete queryParams[k];
+    }
+  }
+
+  var pathDef = this._current.route.pathDef;
+  var params = this._current.params;
+  this.go(pathDef, params, queryParams);
+  return true;
+};
+
+// .current is not reactive
+// This is by design. use .getParam() instead
+// If you really need to watch the path change, use .watchPathChange()
+Router.prototype.current = function() {
+  // We can't trust outside, that's why we clone this
+  // Anyway, we can't clone the whole object since it has non-jsonable values
+  // That's why we clone what's really needed.
+  var current = _.clone(this._current);
+  current.queryParams = EJSON.clone(current.queryParams);
+  current.params = EJSON.clone(current.params);
+  return current;
+};
+
+// Implementing Reactive APIs
+var reactiveApis = [
+  'getParam', 'getQueryParam',
+  'getRouteName', 'watchPathChange'
+];
+reactiveApis.forEach(function(api) {
+  Router.prototype[api] = function(arg1) {
+    // when this is calling, there may not be any route initiated
+    // so we need to handle it
+    var currentRoute = this._current.route;
+    if(!currentRoute) {
+      this._onEveryPath.depend();
+      return;
+    }
+
+    // currently, there is only one argument. If we've more let's add more args
+    // this is not clean code, but better in performance
+    return currentRoute[api].call(currentRoute, arg1);
+  };
+});
+
+Router.prototype.subsReady = function() {
+  var callback = null;
+  var args = _.toArray(arguments);
+
+  if (typeof _.last(args) === "function") {
+    callback = args.pop();
+  }
+
+  var currentRoute = this.current().route;
+  var globalRoute = this._globalRoute;
+
+  // we need to depend for every route change and
+  // rerun subscriptions to check the ready state
+  this._onEveryPath.depend();
+
+  if(!currentRoute) {
+    return false;
+  }
+
+  var subscriptions;
+  if(args.length === 0) {
+    subscriptions = _.values(globalRoute.getAllSubscriptions());
+    subscriptions = subscriptions.concat(_.values(currentRoute.getAllSubscriptions()));
+  } else {
+    subscriptions = _.map(args, function(subName) {
+      return globalRoute.getSubscription(subName) || currentRoute.getSubscription(subName);
+    });
+  }
+
+  var isReady = function() {
+    var ready =  _.every(subscriptions, function(sub) {
+      return sub && sub.ready();
+    });
+
+    return ready;
+  };
+
+  if (callback) {
+    Tracker.autorun(function(c) {
+      if (isReady()) {
+        callback();
+        c.stop();
+      }
+    });
+  } else {
+    return isReady();
+  }
+};
+
+Router.prototype.withReplaceState = function(fn) {
+  return this.env.replaceState.withValue(true, fn);
+};
+
+Router.prototype.withTrailingSlash = function(fn) {
+  return this.env.trailingSlash.withValue(true, fn);
+};
+
+Router.prototype._notfoundRoute = function(context) {
+  this._current = {
+    path: context.path,
+    context: context,
+    params: [],
+    queryParams: {},
+  };
+
+  // XXX this.notfound kept for backwards compatibility
+  this.notFound = this.notFound || this.notfound;
+  if(!this.notFound) {
+    console.error("There is no route for the path:", context.path);
+    return;
+  }
+
+  this._current.route = new Route(this, "*", this.notFound);
+  this._invalidateTracker();
+};
+
+Router.prototype.initialize = function(options) {
+  options = options || {};
+
+  if(this._initialized) {
+    throw new Error("FlowRouter is already initialized");
+  }
+
+  var self = this;
+  this._updateCallbacks();
+
+  // Implementing idempotent routing
+  // by overriding page.js`s "show" method.
+  // Why?
+  // It is impossible to bypass exit triggers,
+  // because they execute before the handler and
+  // can not know what the next path is, inside exit trigger.
+  //
+  // we need override both show, replace to make this work
+  // since we use redirect when we are talking about withReplaceState
+  _.each(['show', 'replace'], function(fnName) {
+    var original = self._page[fnName];
+    self._page[fnName] = function(path, state, dispatch, push) {
+      var reload = self.env.reload.get();
+      if (!reload && self._current.path === path) {
+        return;
+      }
+
+      original.call(this, path, state, dispatch, push);
+    };
+  });
+
+  // this is very ugly part of pagejs and it does decoding few times
+  // in unpredicatable manner. See #168
+  // this is the default behaviour and we need keep it like that
+  // we are doing a hack. see .path()
+  this._page.base(this._basePath);
+  this._page({
+    decodeURLComponents: true,
+    hashbang: !!options.hashbang
+  });
+
+  this._initialized = true;
+};
+
+Router.prototype._buildTracker = function() {
+  var self = this;
+
+  // main autorun function
+  var tracker = Tracker.autorun(function () {
+    if(!self._current || !self._current.route) {
+      return;
+    }
+
+    // see the definition of `this._processingContexts`
+    var currentContext = self._current;
+    var route = currentContext.route;
+    var path = currentContext.path;
+
+    if(self.safeToRun === 0) {
+      var message =
+        "You can't use reactive data sources like Session" +
+        " inside the `.subscriptions` method!";
+      throw new Error(message);
+    }
+
+    // We need to run subscriptions inside a Tracker
+    // to stop subs when switching between routes
+    // But we don't need to run this tracker with
+    // other reactive changes inside the .subscription method
+    // We tackle this with the `safeToRun` variable
+    self._globalRoute.clearSubscriptions();
+    self.subscriptions.call(self._globalRoute, path);
+    route.callSubscriptions(currentContext);
+
+    // otherwise, computations inside action will trigger to re-run
+    // this computation. which we do not need.
+    Tracker.nonreactive(function() {
+      var isRouteChange = currentContext.oldRoute !== currentContext.route;
+      var isFirstRoute = !currentContext.oldRoute;
+      // first route is not a route change
+      if(isFirstRoute) {
+        isRouteChange = false;
+      }
+
+      // Clear oldRouteChain just before calling the action
+      // We still need to get a copy of the oldestRoute first
+      // It's very important to get the oldest route and registerRouteClose() it
+      // See: https://github.com/kadirahq/flow-router/issues/314
+      var oldestRoute = self._oldRouteChain[0];
+      self._oldRouteChain = [];
+
+      currentContext.route.registerRouteChange(currentContext, isRouteChange);
+      route.callAction(currentContext);
+
+      Tracker.afterFlush(function() {
+        self._onEveryPath.changed();
+        if(isRouteChange) {
+          // We need to trigger that route (definition itself) has changed.
+          // So, we need to re-run all the register callbacks to current route
+          // This is pretty important, otherwise tracker
+          // can't identify new route's items
+
+          // We also need to afterFlush, otherwise this will re-run
+          // helpers on templates which are marked for destroying
+          if(oldestRoute) {
+            oldestRoute.registerRouteClose();
+          }
+        }
+      });
+    });
+
+    self.safeToRun--;
+  });
+
+  return tracker;
+};
+
+Router.prototype._invalidateTracker = function() {
+  var self = this;
+  this.safeToRun++;
+  this._tracker.invalidate();
+  // After the invalidation we need to flush to make changes imediately
+  // otherwise, we have face some issues context mix-maches and so on.
+  // But there are some cases we can't flush. So we need to ready for that.
+
+  // we clearly know, we can't flush inside an autorun
+  // this may leads some issues on flow-routing
+  // we may need to do some warning
+  if(!Tracker.currentComputation) {
+    // Still there are some cases where we can't flush
+    //  eg:- when there is a flush currently
+    // But we've no public API or hacks to get that state
+    // So, this is the only solution
+    try {
+      Tracker.flush();
+    } catch(ex) {
+      // only handling "while flushing" errors
+      if(!/Tracker\.flush while flushing/.test(ex.message)) {
+        return;
+      }
+
+      // XXX: fix this with a proper solution by removing subscription mgt.
+      // from the router. Then we don't need to run invalidate using a tracker
+
+      // this happens when we are trying to invoke a route change
+      // with inside a route chnage. (eg:- Template.onCreated)
+      // Since we use page.js and tracker, we don't have much control
+      // over this process.
+      // only solution is to defer route execution.
+
+      // It's possible to have more than one path want to defer
+      // But, we only need to pick the last one.
+      // self._nextPath = self._current.path;
+      Meteor.defer(function() {
+        var path = self._nextPath;
+        if(!path) {
+          return;
+        }
+
+        delete self._nextPath;
+        self.env.reload.withValue(true, function() {
+          self.go(path);
+        });
+      });
+    }
+  }
+};
+
+Router.prototype._updateCallbacks = function () {
+  var self = this;
+
+  self._page.callbacks = [];
+  self._page.exits = [];
+
+  _.each(self._routes, function(route) {
+    self._page(route.pathDef, route._actionHandle);
+    self._page.exit(route.pathDef, route._exitHandle);
+  });
+
+  self._page("*", function(context) {
+    self._notfoundRoute(context);
+  });
+};
+
+Router.prototype._initTriggersAPI = function() {
+  var self = this;
+  this.triggers = {
+    enter: function(triggers, filter) {
+      triggers = Triggers.applyFilters(triggers, filter);
+      if(triggers.length) {
+        self._triggersEnter = self._triggersEnter.concat(triggers);
+      }
+    },
+
+    exit: function(triggers, filter) {
+      triggers = Triggers.applyFilters(triggers, filter);
+      if(triggers.length) {
+        self._triggersExit = self._triggersExit.concat(triggers);
+      }
+    }
+  };
+};
+
+Router.prototype.wait = function() {
+  if(this._initialized) {
+    throw new Error("can't wait after FlowRouter has been initialized");
+  }
+
+  this._askedToWait = true;
+};
+
+Router.prototype.onRouteRegister = function(cb) {
+  this._onRouteCallbacks.push(cb);
+};
+
+Router.prototype._triggerRouteRegister = function(currentRoute) {
+  // We should only need to send a safe set of fields on the route
+  // object.
+  // This is not to hide what's inside the route object, but to show
+  // these are the public APIs
+  var routePublicApi = _.pick(currentRoute, 'name', 'pathDef', 'path');
+  var omittingOptionFields = [
+    'triggersEnter', 'triggersExit', 'action', 'subscriptions', 'name'
+  ];
+  routePublicApi.options = _.omit(currentRoute.options, omittingOptionFields);
+
+  _.each(this._onRouteCallbacks, function(cb) {
+    cb(routePublicApi);
+  });
+};
+
+Router.prototype._page = page;
+Router.prototype._qs = qs;
diff --git a/packages/kadira-flow-router/client/triggers.js b/packages/kadira-flow-router/client/triggers.js
new file mode 100644
index 00000000..7733332c
--- /dev/null
+++ b/packages/kadira-flow-router/client/triggers.js
@@ -0,0 +1,112 @@
+// a set of utility functions for triggers
+
+Triggers = {};
+
+// Apply filters for a set of triggers
+// @triggers - a set of triggers
+// @filter - filter with array fileds with `only` and `except` 
+//           support only either `only` or `except`, but not both
+Triggers.applyFilters = function(triggers, filter) {
+  if(!(triggers instanceof Array)) {
+    triggers = [triggers];
+  }
+
+  if(!filter) {
+    return triggers;
+  }
+
+  if(filter.only && filter.except) {
+    throw new Error("Triggers don't support only and except filters at once");
+  }
+
+  if(filter.only && !(filter.only instanceof Array)) {
+    throw new Error("only filters needs to be an array");
+  }
+
+  if(filter.except && !(filter.except instanceof Array)) {
+    throw new Error("except filters needs to be an array");
+  }
+
+  if(filter.only) {
+    return Triggers.createRouteBoundTriggers(triggers, filter.only);
+  }
+
+  if(filter.except) {
+    return Triggers.createRouteBoundTriggers(triggers, filter.except, true);
+  }
+
+  throw new Error("Provided a filter but not supported");
+};
+
+//  create triggers by bounding them to a set of route names
+//  @triggers - a set of triggers 
+//  @names - list of route names to be bound (trigger runs only for these names)
+//  @negate - negate the result (triggers won't run for above names)
+Triggers.createRouteBoundTriggers = function(triggers, names, negate) {
+  var namesMap = {};
+  _.each(names, function(name) {
+    namesMap[name] = true;
+  });
+
+  var filteredTriggers = _.map(triggers, function(originalTrigger) {
+    var modifiedTrigger = function(context, next) {
+      var routeName = context.route.name;
+      var matched = (namesMap[routeName])? 1: -1;
+      matched = (negate)? matched * -1 : matched;
+
+      if(matched === 1) {
+        originalTrigger(context, next);
+      }
+    };
+    return modifiedTrigger;
+  });
+
+  return filteredTriggers;
+};
+
+//  run triggers and abort if redirected or callback stopped
+//  @triggers - a set of triggers 
+//  @context - context we need to pass (it must have the route)
+//  @redirectFn - function which used to redirect 
+//  @after - called after if only all the triggers runs
+Triggers.runTriggers = function(triggers, context, redirectFn, after) {
+  var abort = false;
+  var inCurrentLoop = true;
+  var alreadyRedirected = false;
+
+  for(var lc=0; lc<triggers.length; lc++) {
+    var trigger = triggers[lc];
+    trigger(context, doRedirect, doStop);
+
+    if(abort) {
+      return;
+    }
+  }
+
+  // mark that, we've exceeds the currentEventloop for
+  // this set of triggers.
+  inCurrentLoop = false;
+  after();
+
+  function doRedirect(url, params, queryParams) {
+    if(alreadyRedirected) {
+      throw new Error("already redirected");
+    }
+
+    if(!inCurrentLoop) {
+      throw new Error("redirect needs to be done in sync");
+    }
+
+    if(!url) {
+      throw new Error("trigger redirect requires an URL");
+    }
+
+    abort = true;
+    alreadyRedirected = true;
+    redirectFn(url, params, queryParams);
+  }
+
+  function doStop() {
+    abort = true;
+  }
+};
\ No newline at end of file
diff --git a/packages/kadira-flow-router/lib/router.js b/packages/kadira-flow-router/lib/router.js
new file mode 100644
index 00000000..c0c9abc6
--- /dev/null
+++ b/packages/kadira-flow-router/lib/router.js
@@ -0,0 +1,9 @@
+Router.prototype.url = function() {
+  // We need to remove the leading base path, or "/", as it will be inserted
+  // automatically by `Meteor.absoluteUrl` as documented in:
+  // http://docs.meteor.com/#/full/meteor_absoluteurl
+  var completePath = this.path.apply(this, arguments);
+  var basePath = this._basePath || '/';
+  var pathWithoutBase = completePath.replace(new RegExp('^' + basePath + '\/|(\/)'), '');
+  return Meteor.absoluteUrl(pathWithoutBase);
+};
diff --git a/packages/kadira-flow-router/package.js b/packages/kadira-flow-router/package.js
new file mode 100644
index 00000000..f9f27240
--- /dev/null
+++ b/packages/kadira-flow-router/package.js
@@ -0,0 +1,81 @@
+Package.describe({
+  name: 'kadira:flow-router',
+  summary: 'Carefully Designed Client Side Router for Meteor, fixed by Serubin',
+  version: '2.12.1',
+  git: 'https://github.com/serubin/flow-router.git'
+});
+
+Npm.depends({
+  // In order to support IE9, we had to fork pagejs and apply
+  // this PR: https://github.com/visionmedia/page.js/pull/288
+  'page':'https://github.com/kadirahq/page.js/archive/34ddf45ea8e4c37269ce3df456b44fc0efc595c6.tar.gz',
+  'qs':'5.2.0'
+ });
+
+Package.onUse(function(api) {
+  configure(api);
+  api.export('FlowRouter');
+});
+
+Package.onTest(function(api) {
+  configure(api);
+  api.use('tinytest');
+  api.use('check');
+  api.use('mongo');
+  api.use('http');
+  api.use('random');
+  api.use('meteorhacks:fast-render');
+  api.use('meteorhacks:inject-data');
+  api.use('tmeasday:html5-history-api');
+
+  api.addFiles('test/common/fast_render_route.js', ['client', 'server']);
+
+  api.addFiles('test/client/_helpers.js', 'client');
+  api.addFiles('test/server/_helpers.js', 'server');
+
+  api.addFiles('test/client/loader.spec.js', 'client');
+  api.addFiles('test/client/route.reactivity.spec.js', 'client');
+  api.addFiles('test/client/router.core.spec.js', 'client');
+  api.addFiles('test/client/router.subs_ready.spec.js', 'client');
+  api.addFiles('test/client/router.reactivity.spec.js', 'client');
+  api.addFiles('test/client/group.spec.js', 'client');
+  api.addFiles('test/client/trigger.spec.js', 'client');
+  api.addFiles('test/client/triggers.js', 'client');
+
+  api.addFiles('test/server/plugins/fast_render.js', 'server');
+
+  api.addFiles('test/common/router.path.spec.js', ['client', 'server']);
+  api.addFiles('test/common/router.url.spec.js', ['client', 'server']);
+  api.addFiles('test/common/router.addons.spec.js', ['client', 'server']);
+  api.addFiles('test/common/route.spec.js', ['client', 'server']);
+  api.addFiles('test/common/group.spec.js', ['client', 'server']);
+});
+
+function configure(api) {
+  //api.versionsFrom('METEOR@1.3-rc.1');
+
+  api.use('underscore');
+  api.use('tracker');
+  api.use('reactive-dict');
+  api.use('reactive-var');
+  api.use('ejson');
+  api.use('modules');
+
+  api.use('meteorhacks:fast-render@2.14.0', ['client', 'server'], {weak: true});
+
+  api.addFiles('client/modules.js', 'client');
+  api.addFiles('client/triggers.js', 'client');
+  api.addFiles('client/router.js', 'client');
+  api.addFiles('client/group.js', 'client');
+  api.addFiles('client/route.js', 'client');
+  api.addFiles('client/_init.js', 'client');
+
+  api.addFiles('server/router.js', 'server');
+  api.addFiles('server/group.js', 'server');
+  api.addFiles('server/route.js', 'server');
+  api.addFiles('server/_init.js', 'server');
+
+  api.addFiles('server/plugins/fast_render.js', 'server');
+
+  api.addFiles('lib/router.js', ['client', 'server']);
+}
diff --git a/packages/kadira-flow-router/server/_init.js b/packages/kadira-flow-router/server/_init.js
new file mode 100644
index 00000000..cf128603
--- /dev/null
+++ b/packages/kadira-flow-router/server/_init.js
@@ -0,0 +1,4 @@
+// Export Router Instance
+FlowRouter = new Router();
+FlowRouter.Router = Router;
+FlowRouter.Route = Route;
diff --git a/packages/kadira-flow-router/server/group.js b/packages/kadira-flow-router/server/group.js
new file mode 100644
index 00000000..89a6d027
--- /dev/null
+++ b/packages/kadira-flow-router/server/group.js
@@ -0,0 +1,18 @@
+Group = function(router, options) {
+  options = options || {};
+  this.prefix = options.prefix || '';
+  this.options = options;
+  this._router = router;
+};
+
+Group.prototype.route = function(pathDef, options) {
+  pathDef = this.prefix + pathDef;
+  return this._router.route(pathDef, options);
+};
+
+Group.prototype.group = function(options) {
+  var group = new Group(this._router, options);
+  group.parent = this;
+
+  return group;
+};
diff --git a/packages/kadira-flow-router/server/plugins/fast_render.js b/packages/kadira-flow-router/server/plugins/fast_render.js
new file mode 100644
index 00000000..1121a924
--- /dev/null
+++ b/packages/kadira-flow-router/server/plugins/fast_render.js
@@ -0,0 +1,40 @@
+if(!Package['meteorhacks:fast-render']) {
+  return;
+}
+
+FastRender = Package['meteorhacks:fast-render'].FastRender;
+
+// hack to run after eveything else on startup
+Meteor.startup(function () {
+  Meteor.startup(function () {
+    setupFastRender();
+  });
+});
+
+function setupFastRender () {
+  _.each(FlowRouter._routes, function (route) {
+    FastRender.route(route.pathDef, function (routeParams, path) {
+      var self = this;
+
+      // anyone using Meteor.subscribe for something else?
+      var original = Meteor.subscribe;
+      Meteor.subscribe = function () {
+        return _.toArray(arguments);
+      };
+
+      route._subsMap = {};
+      FlowRouter.subscriptions.call(route, path);
+      if(route.subscriptions) {
+        var queryParams = routeParams.query;
+        var params = _.omit(routeParams, 'query');
+        route.subscriptions(params, queryParams);
+      }
+      _.each(route._subsMap, function (args) {
+        self.subscribe.apply(self, args);
+      });
+
+      // restore Meteor.subscribe, ... on server side
+      Meteor.subscribe = original;
+    });
+  });
+}
diff --git a/packages/kadira-flow-router/server/route.js b/packages/kadira-flow-router/server/route.js
new file mode 100644
index 00000000..dd2be1c7
--- /dev/null
+++ b/packages/kadira-flow-router/server/route.js
@@ -0,0 +1,28 @@
+Route = function(router, pathDef, options) {
+  options = options || {};
+  this.options = options;
+  this.name = options.name;
+  this.pathDef = pathDef;
+
+  // Route.path is deprecated and will be removed in 3.0
+  this.path = pathDef;
+
+  this.action = options.action || Function.prototype;
+  this.subscriptions = options.subscriptions || Function.prototype;
+  this._subsMap = {};
+};
+
+
+Route.prototype.register = function(name, sub, options) {
+  this._subsMap[name] = sub;
+};
+
+
+Route.prototype.subscription = function(name) {
+  return this._subsMap[name];
+};
+
+
+Route.prototype.middleware = function(middleware) {
+ 
+};
diff --git a/packages/kadira-flow-router/server/router.js b/packages/kadira-flow-router/server/router.js
new file mode 100644
index 00000000..f7a50aea
--- /dev/null
+++ b/packages/kadira-flow-router/server/router.js
@@ -0,0 +1,146 @@
+var Qs = Npm.require('qs');
+
+Router = function () {
+  this._routes = [];
+  this._routesMap = {};
+  this.subscriptions = Function.prototype;
+
+  // holds onRoute callbacks
+  this._onRouteCallbacks = [];
+};
+
+Router.prototype.route = function(pathDef, options) {
+  if (!/^\/.*/.test(pathDef)) {
+    var message = "route's path must start with '/'";
+    throw new Error(message);
+  }
+  
+  options = options || {};
+  var route = new Route(this, pathDef, options);
+  this._routes.push(route);
+
+  if (options.name) {
+    this._routesMap[options.name] = route;
+  }
+
+  this._triggerRouteRegister(route);
+  return route;
+};
+
+Router.prototype.group = function(options) {
+  return new Group(this, options);
+};
+
+Router.prototype.path = function(pathDef, fields, queryParams) {
+  if (this._routesMap[pathDef]) {
+    pathDef = this._routesMap[pathDef].path;
+  }
+
+  fields = fields || {};
+  var regExp = /(:[\w\(\)\\\+\*\.\?]+)+/g;
+  var path = pathDef.replace(regExp, function(key) {
+    var firstRegexpChar = key.indexOf("(");
+    // get the content behind : and (\\d+/)
+    key = key.substring(1, (firstRegexpChar > 0)? firstRegexpChar: undefined);
+    // remove +?*
+    key = key.replace(/[\+\*\?]+/g, "");
+
+    return fields[key] || "";
+  });
+
+  path = path.replace(/\/\/+/g, "/"); // Replace multiple slashes with single slash
+
+  // remove trailing slash
+  // but keep the root slash if it's the only one
+  path = path.match(/^\/{1}$/) ? path: path.replace(/\/$/, "");
+
+  var strQueryParams = Qs.stringify(queryParams || {});
+  if(strQueryParams) {
+    path += "?" + strQueryParams;
+  }
+
+  return path;
+};
+
+Router.prototype.onRouteRegister = function(cb) {
+  this._onRouteCallbacks.push(cb);
+};
+
+Router.prototype._triggerRouteRegister = function(currentRoute) {
+  // We should only need to send a safe set of fields on the route
+  // object.
+  // This is not to hide what's inside the route object, but to show 
+  // these are the public APIs
+  var routePublicApi = _.pick(currentRoute, 'name', 'pathDef', 'path');
+  var omittingOptionFields = [
+    'triggersEnter', 'triggersExit', 'action', 'subscriptions', 'name'
+  ];
+  routePublicApi.options = _.omit(currentRoute.options, omittingOptionFields);
+
+  _.each(this._onRouteCallbacks, function(cb) {
+    cb(routePublicApi);
+  });
+};
+
+
+Router.prototype.go = function() {
+  // client only
+};
+
+
+Router.prototype.current = function() {
+  // client only
+};
+
+
+Router.prototype.triggers = {
+  enter: function() {
+    // client only
+  },
+  exit: function() {
+    // client only
+  }
+};
+
+Router.prototype.middleware = function() {
+  // client only
+};
+
+
+Router.prototype.getState = function() {
+  // client only
+};
+
+
+Router.prototype.getAllStates = function() {
+  // client only
+};
+
+
+Router.prototype.setState = function() {
+  // client only
+};
+
+
+Router.prototype.removeState = function() {
+  // client only
+};
+
+
+Router.prototype.clearStates = function() {
+  // client only
+};
+
+
+Router.prototype.ready = function() {
+  // client only
+};
+
+
+Router.prototype.initialize = function() {
+  // client only
+};
+
+Router.prototype.wait = function() {
+  // client only
+};
diff --git a/packages/kadira-flow-router/test/client/_helpers.js b/packages/kadira-flow-router/test/client/_helpers.js
new file mode 100644
index 00000000..94376f00
--- /dev/null
+++ b/packages/kadira-flow-router/test/client/_helpers.js
@@ -0,0 +1,10 @@
+GetSub = function (name) {
+  for(var id in Meteor.connection._subscriptions) {
+    var sub = Meteor.connection._subscriptions[id];
+    if(name === sub.name) {
+      return sub;
+    }
+  }
+};
+
+FlowRouter.route('/');
diff --git a/packages/kadira-flow-router/test/client/group.spec.js b/packages/kadira-flow-router/test/client/group.spec.js
new file mode 100644
index 00000000..06e793ba
--- /dev/null
+++ b/packages/kadira-flow-router/test/client/group.spec.js
@@ -0,0 +1,113 @@
+Tinytest.add('Client - Group - validate path definition', function (test, next) {
+  // path & prefix must start with '/'
+  test.throws(function() {
+    new Group(null, {prefix: Random.id()});
+  });
+
+  var group = FlowRouter.group({prefix: '/' + Random.id()});
+
+  test.throws(function() {
+    group.route(Random.id());
+  });
+});
+
+Tinytest.addAsync('Client - Group - define and go to route with prefix', function (test, next) {
+  var prefix = Random.id();
+  var rand = Random.id();
+  var rendered = 0;
+
+  var group = FlowRouter.group({prefix: '/' + prefix});
+
+  group.route('/' + rand, {
+    action: function(_params) {
+      rendered++;
+    }
+  });
+
+  FlowRouter.go('/' + prefix + '/' + rand);
+
+  setTimeout(function() {
+    test.equal(rendered, 1);
+    setTimeout(next, 100);
+  }, 100);
+});
+
+Tinytest.addAsync('Client - Group - define and go to route without prefix', function (test, next) {
+  var rand = Random.id();
+  var rendered = 0;
+
+  var group = FlowRouter.group();
+
+  group.route('/' + rand, {
+    action: function(_params) {
+      rendered++;
+    }
+  });
+
+  FlowRouter.go('/' + rand);
+
+  setTimeout(function() {
+    test.equal(rendered, 1);
+    setTimeout(next, 100);
+  }, 100);
+});
+
+Tinytest.addAsync('Client - Group - subscribe', function (test, next) {
+  var rand = Random.id();
+
+  var group = FlowRouter.group({
+    subscriptions: function (params) {
+      this.register('baz', Meteor.subscribe('baz'));
+    }
+  });
+
+  group.route('/' + rand);
+
+  FlowRouter.go('/' + rand);
+  setTimeout(function() {
+    test.isTrue(!!GetSub('baz'));
+    next();
+  }, 100);
+});
+
+
+Tinytest.addAsync('Client - Group - set and retrieve group name', function (test, next) {
+  var rand = Random.id();
+  var name = Random.id();
+
+  var group = FlowRouter.group({
+    name: name
+  });
+
+  group.route('/' + rand);
+
+  FlowRouter.go('/' + rand);
+  setTimeout(function() {
+    test.isTrue(FlowRouter.current().route.group.name === name);
+    next();
+  }, 100);
+});
+
+Tinytest.add('Client - Group - expose group options on a route', function (test) {
+  var pathDef = "/" + Random.id();
+  var name = Random.id();
+  var groupName = Random.id();
+  var data = {aa: 10};
+  var layout = 'blah';
+
+  var group = FlowRouter.group({
+    name: groupName,
+    prefix: '/admin',
+    layout: layout,
+    someData: data
+  });
+
+  group.route(pathDef, {
+    name: name
+  });
+
+  var route = FlowRouter._routesMap[name];
+
+  test.equal(route.group.options.someData, data);
+  test.equal(route.group.options.layout, layout);
+});
diff --git a/packages/kadira-flow-router/test/client/loader.spec.js b/packages/kadira-flow-router/test/client/loader.spec.js
new file mode 100644
index 00000000..091c2e02
--- /dev/null
+++ b/packages/kadira-flow-router/test/client/loader.spec.js
@@ -0,0 +1,17 @@
+Router = FlowRouter.Router;
+
+
+Tinytest.add('Client - import page.js', function (test) {
+  test.isTrue(!!Router.prototype._page);
+  test.isFalse(!!window.page);
+});
+
+
+Tinytest.add('Client - import query.js', function (test) {
+  test.isTrue(!!Router.prototype._qs);
+});
+
+
+Tinytest.add('Client - create FlowRouter', function (test) {
+  test.isTrue(!!FlowRouter);
+});
diff --git a/packages/kadira-flow-router/test/client/route.reactivity.spec.js b/packages/kadira-flow-router/test/client/route.reactivity.spec.js
new file mode 100644
index 00000000..c6c44183
--- /dev/null
+++ b/packages/kadira-flow-router/test/client/route.reactivity.spec.js
@@ -0,0 +1,158 @@
+Route = FlowRouter.Route;
+
+
+Tinytest.addAsync('Client - Route - Reactivity - getParam', function (test, done) {
+  var r = new Route();
+  Tracker.autorun(function(c) {
+    var param = r.getParam("id");
+    if(param) {
+      test.equal(param, "hello");
+      c.stop();
+      Meteor.defer(done);
+    }
+  });
+  
+  setTimeout(function() {
+    var context = {
+      params: {id: "hello"},
+      queryParams: {}
+    };
+    r.registerRouteChange(context);
+  }, 10);
+});
+
+Tinytest.addAsync('Client - Route - Reactivity - getParam on route close', function (test, done) {
+  var r = new Route();
+  var closeTriggered = false;
+  Tracker.autorun(function(c) {
+    var param = r.getParam("id");
+    if(closeTriggered) {
+      test.equal(param, undefined);
+      c.stop();
+      Meteor.defer(done);
+    }
+  });
+  
+  setTimeout(function() {
+    closeTriggered = true;
+    r.registerRouteClose();
+  }, 10);
+});
+
+Tinytest.addAsync('Client - Route - Reactivity - getQueryParam', function (test, done) {
+  var r = new Route();
+  Tracker.autorun(function(c) {
+    var param = r.getQueryParam("id");
+    if(param) {
+      test.equal(param, "hello");
+      c.stop();
+      Meteor.defer(done);
+    }
+  });
+  
+  setTimeout(function() {
+    var context = {
+      params: {},
+      queryParams: {id: "hello"}
+    };
+    r.registerRouteChange(context);
+  }, 10);
+});
+
+Tinytest.addAsync('Client - Route - Reactivity - getQueryParam on route close', function (test, done) {
+  var r = new Route();
+  var closeTriggered = false;
+  Tracker.autorun(function(c) {
+    var param = r.getQueryParam("id");
+    if(closeTriggered) {
+      test.equal(param, undefined);
+      c.stop();
+      Meteor.defer(done);
+    }
+  });
+  
+  setTimeout(function() {
+    closeTriggered = true;
+    r.registerRouteClose();
+  }, 10);
+});
+
+Tinytest.addAsync('Client - Route - Reactivity - getRouteName rerun when route closed', function (test, done) {
+  var r = new Route();
+  r.name = "my-route";
+  var closeTriggered = false;
+
+  Tracker.autorun(function(c) {
+    var name = r.getRouteName();
+    test.equal(name, r.name);
+
+    if(closeTriggered) {
+      c.stop();
+      Meteor.defer(done);
+    }
+  });
+  
+  setTimeout(function() {
+    closeTriggered = true;
+    r.registerRouteClose();
+  }, 10);
+});
+
+Tinytest.addAsync('Client - Route - Reactivity - watchPathChange when routeChange', function (test, done) {
+  var r = new Route();
+  var pathChangeCounts = 0;
+
+  var c = Tracker.autorun(function() {
+    r.watchPathChange();
+    pathChangeCounts++;
+  });
+
+  var context = {
+    params: {},
+    queryParams: {}
+  };
+
+  setTimeout(function() {
+    r.registerRouteChange(context);
+    setTimeout(checkAfterNormalRouteChange, 50);
+  }, 10);
+
+  function checkAfterNormalRouteChange() {
+    test.equal(pathChangeCounts, 2);
+    var lastRouteChange = true;
+    r.registerRouteChange(context, lastRouteChange);
+    setTimeout(checkAfterLastRouteChange, 10);
+  }
+
+  function checkAfterLastRouteChange() {
+    test.equal(pathChangeCounts, 2);
+    c.stop();
+    Meteor.defer(done);
+  }
+});
+
+Tinytest.addAsync('Client - Route - Reactivity - watchPathChange when routeClose', function (test, done) {
+  var r = new Route();
+  var pathChangeCounts = 0;
+
+  var c = Tracker.autorun(function() {
+    r.watchPathChange();
+    pathChangeCounts++;
+  });
+
+  var context = {
+    params: {},
+    queryParams: {}
+  };
+  
+  setTimeout(function() {
+    r.registerRouteClose();
+    setTimeout(checkAfterRouteClose, 10);
+  }, 10);
+
+  function checkAfterRouteClose() {
+    test.equal(pathChangeCounts, 2);
+    c.stop();
+    Meteor.defer(done);
+  }
+});
\ No newline at end of file
diff --git a/packages/kadira-flow-router/test/client/router.core.spec.js b/packages/kadira-flow-router/test/client/router.core.spec.js
new file mode 100644
index 00000000..160c9112
--- /dev/null
+++ b/packages/kadira-flow-router/test/client/router.core.spec.js
@@ -0,0 +1,632 @@
+Router = FlowRouter.Router;
+
+Tinytest.addAsync('Client - Router - define and go to route', function (test, next) {
+  var rand = Random.id();
+  var rendered = 0;
+
+  FlowRouter.route('/' + rand, {
+    action: function(_params) {
+      rendered++;
+    }
+  });
+
+  FlowRouter.go('/' + rand);
+
+  setTimeout(function() {
+    test.equal(rendered, 1);
+    setTimeout(next, 100);
+  }, 100);
+});
+
+Tinytest.addAsync('Client - Router - define and go to route with fields',
+function (test, next) {
+  var rand = Random.id();
+  var pathDef = "/" + rand + "/:key";
+  var rendered = 0;
+
+  FlowRouter.route(pathDef, {
+    action: function(params) {
+      test.equal(params.key, "abc +@%");
+      rendered++;
+    }
+  });
+
+  FlowRouter.go(pathDef, {key: "abc +@%"});
+
+  setTimeout(function() {
+    test.equal(rendered, 1);
+    setTimeout(next, 100);
+  }, 100);
+});
+
+Tinytest.addAsync('Client - Router - parse params and query', function (test, next) {
+  var rand = Random.id();
+  var rendered = 0;
+  var params = null;
+
+  FlowRouter.route('/' + rand + '/:foo', {
+    action: function(_params) {
+      rendered++;
+      params = _params;
+    }
+  });
+
+  FlowRouter.go('/' + rand + '/bar');
+
+  setTimeout(function() {
+    test.equal(rendered, 1);
+    test.equal(params.foo, 'bar');
+    setTimeout(next, 100);
+  }, 100);
+});
+
+Tinytest.addAsync('Client - Router - redirect using FlowRouter.go', function (test, next) {
+  var rand = Random.id(), rand2 = Random.id();
+  var log = [];
+  var paths = ['/' + rand2, '/' + rand];
+  var done = false;
+
+  FlowRouter.route(paths[0], {
+    action: function(_params) {
+      log.push(1);
+      FlowRouter.go(paths[1]);
+    }
+  });
+
+  FlowRouter.route(paths[1], {
+    action: function(_params) {
+      log.push(2);
+    }
+  });
+
+  FlowRouter.go(paths[0]);
+
+  setTimeout(function() {
+    test.equal(log, [1, 2]);
+    done = true;
+    next();
+  }, 100);
+});
+
+Tinytest.addAsync('Client - Router - get current route path', function (test, next) {
+  var value = Random.id();
+  var randomValue = Random.id();
+  var pathDef = "/" + randomValue + '/:_id';
+  var path = "/" + randomValue + "/" + value;
+
+  var detectedValue = null;
+
+  FlowRouter.route(pathDef, {
+    action: function(params) {
+      detectedValue = params._id;
+    }
+  });
+
+  FlowRouter.go(path);
+
+  Meteor.setTimeout(function() {
+    test.equal(detectedValue, value);
+    test.equal(FlowRouter.current().path, path);
+    next();
+  }, 50);
+});
+
+Tinytest.addAsync('Client - Router - subscribe to global subs', function (test, next) {
+  var rand = Random.id();
+  FlowRouter.route('/' + rand);
+
+  FlowRouter.subscriptions = function (path) {
+    test.equal(path, '/' + rand);
+    this.register('baz', Meteor.subscribe('baz'));
+  };
+
+  FlowRouter.go('/' + rand);
+  setTimeout(function() {
+    test.isTrue(!!GetSub('baz'));
+    FlowRouter.subscriptions = Function.prototype;
+    next();
+  }, 100);
+});
+
+Tinytest.addAsync('Client - Router - setParams - generic', function (test, done) {
+  var randomKey = Random.id();
+  var pathDef = "/" + randomKey + "/:cat/:id";
+  var paramsList = [];
+  FlowRouter.route(pathDef, {
+    action: function(params) {
+      paramsList.push(params);
+    }
+  });
+
+  FlowRouter.go(pathDef, {cat: "meteor", id: "200"});
+  setTimeout(function() {
+    // return done();
+    var success = FlowRouter.setParams({id: "700"});
+    test.isTrue(success);
+    setTimeout(validate, 50);
+  }, 50);
+
+  function validate() {
+    test.equal(paramsList.length, 2);
+    test.equal(_.pick(paramsList[0], "id", "cat"), {cat: "meteor", id: "200"});
+    test.equal(_.pick(paramsList[1], "id", "cat"), {cat: "meteor", id: "700"});
+    done();
+  }
+});
+
+Tinytest.addAsync('Client - Router - setParams - preserve query strings', function (test, done) {
+  var randomKey = Random.id();
+  var pathDef = "/" + randomKey + "/:cat/:id";
+  var paramsList = [];
+  var queryParamsList = [];
+
+  FlowRouter.route(pathDef, {
+    action: function(params, queryParams) {
+      paramsList.push(params);
+      queryParamsList.push(queryParams);
+    }
+  });
+
+  FlowRouter.go(pathDef, {cat: "meteor", id: "200 +% / ad"}, {aa: "20 +%"});
+  setTimeout(function() {
+    // return done();
+    var success = FlowRouter.setParams({id: "700 +% / ad"});
+    test.isTrue(success);
+    setTimeout(validate, 50);
+  }, 50);
+
+  function validate() {
+    test.equal(paramsList.length, 2);
+    test.equal(queryParamsList.length, 2);
+
+    test.equal(_.pick(paramsList[0], "id", "cat"), {cat: "meteor", id: "200 +% / ad"});
+    test.equal(_.pick(paramsList[1], "id", "cat"), {cat: "meteor", id: "700 +% / ad"});
+    test.equal(queryParamsList, [{aa: "20 +%"}, {aa: "20 +%"}]);
+    done();
+  }
+});
+
+Tinytest.add('Client - Router - setParams - no route selected', function (test) {
+  var originalRoute = FlowRouter._current.route;
+  FlowRouter._current.route = undefined;
+  var success = FlowRouter.setParams({id: "800"});
+  test.isFalse(success);
+  FlowRouter._current.route = originalRoute;
+});
+
+Tinytest.addAsync('Client - Router - setQueryParams - using check', function (test, done) {
+  var randomKey = Random.id();
+  var pathDef = "/" + randomKey + "";
+  var queryParamsList = [];
+  FlowRouter.route(pathDef, {
+    action: function(params, queryParams) {
+      queryParamsList.push(queryParams);
+    }
+  });
+
+  FlowRouter.go(pathDef, {}, {cat: "meteor", id: "200"});
+  setTimeout(function() {
+    check(FlowRouter.current().queryParams, {cat: String, id: String});
+    done();
+  }, 50);
+});
+
+Tinytest.addAsync('Client - Router - setQueryParams - generic', function (test, done) {
+  var randomKey = Random.id();
+  var pathDef = "/" + randomKey + "";
+  var queryParamsList = [];
+  FlowRouter.route(pathDef, {
+    action: function(params, queryParams) {
+      queryParamsList.push(queryParams);
+    }
+  });
+
+  FlowRouter.go(pathDef, {}, {cat: "meteor", id: "200"});
+  setTimeout(function() {
+    // return done();
+    var success = FlowRouter.setQueryParams({id: "700"});
+    test.isTrue(success);
+    setTimeout(validate, 50);
+  }, 50);
+
+  function validate() {
+    test.equal(queryParamsList.length, 2);
+    test.equal(_.pick(queryParamsList[0], "id", "cat"), {cat: "meteor", id: "200"});
+    test.equal(_.pick(queryParamsList[1], "id", "cat"), {cat: "meteor", id: "700"});
+    done();
+  }
+});
+
+Tinytest.addAsync('Client - Router - setQueryParams - remove query param null', function (test, done) {
+  var randomKey = Random.id();
+  var pathDef = "/" + randomKey + "";
+  var queryParamsList = [];
+  FlowRouter.route(pathDef, {
+    action: function(params, queryParams) {
+      queryParamsList.push(queryParams);
+    }
+  });
+
+  FlowRouter.go(pathDef, {}, {cat: "meteor", id: "200"});
+  setTimeout(function() {
+    var success = FlowRouter.setQueryParams({id: "700", cat: null});
+    test.isTrue(success);
+    setTimeout(validate, 50);
+  }, 50);
+
+  function validate() {
+    test.equal(queryParamsList.length, 2);
+    test.equal(_.pick(queryParamsList[0], "id", "cat"), {cat: "meteor", id: "200"});
+    test.equal(queryParamsList[1], {id: "700"});
+    done();
+  }
+});
+
+Tinytest.addAsync('Client - Router - setQueryParams - remove query param undefined', function (test, done) {
+  var randomKey = Random.id();
+  var pathDef = "/" + randomKey + "";
+  var queryParamsList = [];
+  FlowRouter.route(pathDef, {
+    action: function(params, queryParams) {
+      queryParamsList.push(queryParams);
+    }
+  });
+
+  FlowRouter.go(pathDef, {}, {cat: "meteor", id: "200"});
+  setTimeout(function() {
+    var success = FlowRouter.setQueryParams({id: "700", cat: undefined});
+    test.isTrue(success);
+    setTimeout(validate, 50);
+  }, 50);
+
+  function validate() {
+    test.equal(queryParamsList.length, 2);
+    test.equal(_.pick(queryParamsList[0], "id", "cat"), {cat: "meteor", id: "200"});
+    test.equal(queryParamsList[1], {id: "700"});
+    done();
+  }
+});
+
+Tinytest.addAsync('Client - Router - setQueryParams - preserve params', function (test, done) {
+  var randomKey = Random.id();
+  var pathDef = "/" + randomKey + "/:abc";
+  var queryParamsList = [];
+  var paramsList = [];
+  FlowRouter.route(pathDef, {
+    action: function(params, queryParams) {
+      paramsList.push(params);
+      queryParamsList.push(queryParams);
+    }
+  });
+
+  FlowRouter.go(pathDef, {abc: "20"}, {cat: "meteor", id: "200"});
+  setTimeout(function() {
+    // return done();
+    var success = FlowRouter.setQueryParams({id: "700"});
+    test.isTrue(success);
+    setTimeout(validate, 50);
+  }, 50);
+
+  function validate() {
+    test.equal(queryParamsList.length, 2);
+    test.equal(queryParamsList, [
+      {cat: "meteor", id: "200"}, {cat: "meteor", id: "700"}
+    ]);
+
+    test.equal(paramsList.length, 2);
+    test.equal(_.pick(paramsList[0], "abc"), {abc: "20"});
+    test.equal(_.pick(paramsList[1], "abc"), {abc: "20"});
+    done();
+  }
+});
+
+Tinytest.add('Client - Router - setQueryParams - no route selected', function (test) {
+  var originalRoute = FlowRouter._current.route;
+  FlowRouter._current.route = undefined;
+  var success = FlowRouter.setQueryParams({id: "800"});
+  test.isFalse(success);
+  FlowRouter._current.route = originalRoute;
+});
+
+Tinytest.addAsync('Client - Router - notFound', function (test, done) {
+  var data = [];
+  FlowRouter.notFound = {
+    subscriptions: function() {
+      data.push("subscriptions");
+    },
+    action: function() {
+      data.push("action");
+    }
+  };
+
+  FlowRouter.go("/" + Random.id());
+  setTimeout(function() {
+    test.equal(data, ["subscriptions", "action"]);
+    done();
+  }, 50);
+});
+
+Tinytest.addAsync('Client - Router - withReplaceState - enabled',
+function (test, done) {
+  var pathDef = "/" + Random.id() + "/:id";
+  var originalRedirect = FlowRouter._page.replace;
+  var callCount = 0;
+  FlowRouter._page.replace = function(path) {
+    callCount++;
+    originalRedirect.call(FlowRouter._page, path);
+  };
+
+  FlowRouter.route(pathDef, {
+    name: name,
+    action: function(params) {
+      test.equal(params.id, "awesome");
+      test.equal(callCount, 1);
+      FlowRouter._page.replace = originalRedirect;
+      // We don't use Meteor.defer here since it carries
+      // Meteor.Environment vars too
+      // Which breaks our test below
+      setTimeout(done, 0);
+    }
+  });
+
+  FlowRouter.withReplaceState(function() {
+    FlowRouter.go(pathDef, {id: "awesome"});
+  });
+});
+
+Tinytest.addAsync('Client - Router - withReplaceState - disabled',
+function (test, done) {
+  var pathDef = "/" + Random.id() + "/:id";
+  var originalRedirect = FlowRouter._page.replace;
+  var callCount = 0;
+  FlowRouter._page.replace = function(path) {
+    callCount++;
+    originalRedirect.call(FlowRouter._page, path);
+  };
+
+  FlowRouter.route(pathDef, {
+    name: name,
+    action: function(params) {
+      test.equal(params.id, "awesome");
+      test.equal(callCount, 0);
+      FlowRouter._page.replace = originalRedirect;
+      Meteor.defer(done);
+    }
+  });
+
+  FlowRouter.go(pathDef, {id: "awesome"});
+});
+
+Tinytest.addAsync('Client - Router - withTrailingSlash - enabled', function (test, next) {
+  var rand = Random.id();
+  var rendered = 0;
+
+  FlowRouter.route('/' + rand, {
+    action: function(_params) {
+      rendered++;
+    }
+  });
+
+  FlowRouter.withTrailingSlash(function() {
+    FlowRouter.go('/' + rand);
+  });
+
+  setTimeout(function() {
+    test.equal(rendered, 1);
+    test.equal(_.last(location.href), '/');
+    setTimeout(next, 100);
+  }, 100);
+});
+
+Tinytest.addAsync('Client - Router - idempotent routing - action',
+function (test, done) {
+  var rand = Random.id();
+  var pathDef = "/" + rand;
+  var rendered = 0;
+
+  FlowRouter.route(pathDef, {
+    action: function(params) {
+      rendered++;
+    }
+  });
+
+  FlowRouter.go(pathDef);
+
+  Meteor.defer(function() {
+    FlowRouter.go(pathDef);
+
+    Meteor.defer(function() {
+      test.equal(rendered, 1);
+      done();
+    });
+  });
+});
+
+Tinytest.addAsync('Client - Router - idempotent routing - triggers',
+function (test, next) {
+  var rand = Random.id();
+  var pathDef = "/" + rand;
+  var runnedTriggers = 0;
+  var done = false;
+
+  var triggerFns = [function(params) {
+    if (done) return;
+
+    runnedTriggers++;
+  }];
+
+  FlowRouter.triggers.enter(triggerFns);
+
+  FlowRouter.route(pathDef, {
+    triggersEnter: triggerFns,
+    triggersExit: triggerFns
+  });
+
+  FlowRouter.go(pathDef);
+
+  FlowRouter.triggers.exit(triggerFns);
+
+  Meteor.defer(function() {
+    FlowRouter.go(pathDef);
+
+    Meteor.defer(function() {
+      test.equal(runnedTriggers, 2);
+      done = true;
+      next();
+    });
+  });
+});
+
+Tinytest.addAsync('Client - Router - reload - action',
+function (test, done) {
+  var rand = Random.id();
+  var pathDef = "/" + rand;
+  var rendered = 0;
+
+  FlowRouter.route(pathDef, {
+    action: function(params) {
+      rendered++;
+    }
+  });
+
+  FlowRouter.go(pathDef);
+
+  Meteor.defer(function() {
+    FlowRouter.reload();
+
+    Meteor.defer(function() {
+      test.equal(rendered, 2);
+      done();
+    });
+  });
+});
+
+Tinytest.addAsync('Client - Router - reload - triggers',
+function (test, next) {
+  var rand = Random.id();
+  var pathDef = "/" + rand;
+  var runnedTriggers = 0;
+  var done = false;
+
+  var triggerFns = [function(params) {
+    if (done) return;
+
+    runnedTriggers++;
+  }];
+
+  FlowRouter.triggers.enter(triggerFns);
+
+  FlowRouter.route(pathDef, {
+    triggersEnter: triggerFns,
+    triggersExit: triggerFns
+  });
+
+  FlowRouter.go(pathDef);
+
+  FlowRouter.triggers.exit(triggerFns);
+
+  Meteor.defer(function() {
+    FlowRouter.reload();
+
+    Meteor.defer(function() {
+      test.equal(runnedTriggers, 6);
+      done = true;
+      next();
+    });
+  });
+});
+
+Tinytest.addAsync(
+'Client - Router - wait - before initialize',
+function(test, done) {
+  FlowRouter._initialized = false;
+  FlowRouter.wait();
+  test.equal(FlowRouter._askedToWait, true);
+
+  FlowRouter._initialized = true;
+  FlowRouter._askedToWait = false;
+  done();
+});
+
+Tinytest.addAsync(
+'Client - Router - wait - after initialized',
+function(test, done) {
+  try {
+    FlowRouter.wait();
+  } catch(ex) {
+    test.isTrue(/can't wait/.test(ex.message));
+    done();
+  }
+});
+
+Tinytest.addAsync(
+'Client - Router - initialize - after initialized',
+function(test, done) {
+  try {
+    FlowRouter.initialize();
+  } catch(ex) {
+    test.isTrue(/already initialized/.test(ex.message));
+    done();
+  }
+});
+
+Tinytest.addAsync(
+'Client - Router - base path - url updated',
+function(test, done) {
+  var simulatedBasePath = '/flow';
+  var rand = Random.id();
+  FlowRouter.route('/' + rand, { action: function() {} });
+
+  setBasePath(simulatedBasePath);
+  FlowRouter.go('/' + rand);
+  setTimeout(function() {
+    test.equal(location.pathname, simulatedBasePath + '/' + rand);
+    resetBasePath();
+    done();
+  }, 100);
+});
+
+Tinytest.addAsync(
+'Client - Router - base path - route action called',
+function(test, done) {
+  var simulatedBasePath = '/flow';
+  var rand = Random.id();
+  FlowRouter.route('/' + rand, {
+    action: function() {
+      resetBasePath();
+      done();
+    }
+  });
+
+  setBasePath(simulatedBasePath);
+  FlowRouter.go('/' + rand);
+});
+
+Tinytest.add(
+'Client - Router - base path - path generation',
+function(test, done) {
+  _.each(['/flow', '/flow/', 'flow/', 'flow'], function(simulatedBasePath) {
+    var rand = Random.id();
+    setBasePath(simulatedBasePath);
+    test.equal(FlowRouter.path('/' + rand), '/flow/' + rand);
+  });
+  resetBasePath();
+});
+
+
+function setBasePath(path) {
+  FlowRouter._initialized = false;
+  FlowRouter._basePath = path;
+  FlowRouter.initialize();
+}
+
+var defaultBasePath = FlowRouter._basePath;
+function resetBasePath() {
+  setBasePath(defaultBasePath);
+}
+
+function bind(obj, method) {
+  return function() {
+    obj[method].apply(obj, arguments);
+  };
+}
diff --git a/packages/kadira-flow-router/test/client/router.reactivity.spec.js b/packages/kadira-flow-router/test/client/router.reactivity.spec.js
new file mode 100644
index 00000000..b06deeda
--- /dev/null
+++ b/packages/kadira-flow-router/test/client/router.reactivity.spec.js
@@ -0,0 +1,208 @@
+Tinytest.addAsync(
+'Client - Router - Reactivity - detectChange only once', 
+function (test, done) {
+  var route = "/" + Random.id();
+  var name = Random.id();
+  FlowRouter.route(route, {name: name});
+  
+  var ranCount = 0;
+  var pickedId = null;
+  var c = Tracker.autorun(function() {
+    ranCount++;
+    pickedId = FlowRouter.getQueryParam("id");
+    if(pickedId) {
+      test.equal(pickedId, "hello");
+      test.equal(ranCount, 2);
+      c.stop();
+      Meteor.defer(done);
+    }
+  });
+
+  setTimeout(function() {
+    FlowRouter.go(name, {}, {id: "hello"});
+  }, 2);
+});
+
+Tinytest.addAsync(
+'Client - Router - Reactivity - detectChange in the action', 
+function (test, done) {
+  var route = "/" + Random.id();
+  var name = Random.id();
+  FlowRouter.route(route, {
+    name: name,
+    action: function() {
+      var id = FlowRouter.getQueryParam("id");
+      test.equal(id, "hello");
+      Meteor.defer(done);
+    }
+  });
+
+  setTimeout(function() {
+    FlowRouter.go(name, {}, {id: "hello"});
+  }, 2);
+});
+
+Tinytest.addAsync(
+'Client - Router - Reactivity - detect prev routeChange after new action', 
+function (test, done) {
+  var route1 = "/" + Random.id();
+  var name1 = Random.id();
+  var pickedName1 = null;
+
+  var route2 = "/" + Random.id();
+  var name2 = Random.id();
+  var pickedName2 = Random.id();
+
+  FlowRouter.route(route1, {
+    name: name1,
+    action: function() {
+      Tracker.autorun(function(c) {
+        pickedName1 = FlowRouter.getRouteName();
+        if(pickedName1 == name2) {
+          test.equal(pickedName1, pickedName2);
+          c.stop();
+          Meteor.defer(done);
+        }
+      });
+    }
+  });
+
+  FlowRouter.route(route2, {
+    name: name2,
+    action: function() {
+      pickedName2 = FlowRouter.getRouteName();
+      test.equal(pickedName1, name1);
+      test.equal(pickedName2, name2);
+    }
+  });
+
+  FlowRouter.go(name1);
+  Meteor.setTimeout(function() {
+    FlowRouter.go(name2);
+  }, 10);
+});
+
+Tinytest.addAsync(
+'Client - Router - Reactivity - defer watchPathChange until new route rendered',
+function(test, done) {
+  var route1 = "/" + Random.id();
+  var name1 = Random.id();
+  var pickedName1 = null;
+
+  var route2 = "/" + Random.id();
+  var name2 = Random.id();
+  var pickedName2 = Random.id();
+
+  FlowRouter.route(route1, {
+    name: name1,
+    action: function() {
+      Tracker.autorun(function(c) {
+        FlowRouter.watchPathChange();
+        pickedName1 = FlowRouter.current().route.name;
+        if(pickedName1 == name2) {
+          test.equal(pickedName1, pickedName2);
+          c.stop();
+          Meteor.defer(done);
+        }
+      });
+    }
+  });
+
+  FlowRouter.route(route2, {
+    name: name2,
+    action: function() {
+      pickedName2 = FlowRouter.current().route.name;
+      test.equal(pickedName1, name1);
+      test.equal(pickedName2, name2);
+    }
+  });
+
+  FlowRouter.go(name1);
+  Meteor.setTimeout(function() {
+    FlowRouter.go(name2);
+  }, 10);
+});
+
+Tinytest.addAsync(
+'Client - Router - Reactivity - reactive changes and trigger redirects',
+function(test, done) {
+  var name1 = Random.id();
+  var route1 = "/" + name1;
+  FlowRouter.route(route1, {
+    name: name1
+  });
+
+  var name2 = Random.id();
+  var route2 = "/" + name2;
+  FlowRouter.route(route2, {
+    name: name2,
+    triggersEnter: [function(context, redirect) {
+      redirect(name3);
+    }]
+  });
+
+
+  var name3 = Random.id();
+  var route3 = "/" + name3;
+  FlowRouter.route(route3, {
+    name: name3
+  });
+
+  var routeNamesFired = [];
+  FlowRouter.go(name1);
+
+  var c = null;
+  setTimeout(function() {
+    c = Tracker.autorun(function(c) {
+      routeNamesFired.push(FlowRouter.getRouteName());
+    });
+    FlowRouter.go(name2);
+  }, 50);
+
+  setTimeout(function() {
+    c.stop();
+    test.equal(routeNamesFired, [name1, name3]);
+    Meteor.defer(done);
+  }, 250);
+});
+
+Tinytest.addAsync(
+'Client - Router - Reactivity - watchPathChange for every route change',
+function(test, done) {
+  var route1 = "/" + Random.id();
+  var name1 = Random.id();
+  var pickedName1 = null;
+
+  var route2 = "/" + Random.id();
+  var name2 = Random.id();
+  var pickedName2 = Random.id();
+
+  FlowRouter.route(route1, {
+    name: name1
+  });
+
+  FlowRouter.route(route2, {
+    name: name2
+  });
+
+  var ids = [];
+  var c = Tracker.autorun(function() {
+    FlowRouter.watchPathChange();
+    ids.push(FlowRouter.current().queryParams['id']);
+  });
+
+  FlowRouter.go(name1, {}, {id: "one"});
+  Meteor.setTimeout(function() {
+    FlowRouter.go(name1, {}, {id: "two"});
+  }, 10);
+
+  Meteor.setTimeout(function() {
+    FlowRouter.go(name2, {}, {id: "three"});
+  }, 20);
+
+  Meteor.setTimeout(function() {
+    test.equal(ids, [undefined, "one", "two", "three"]);
+    c.stop();
+    done();
+  }, 40);
+});
\ No newline at end of file
diff --git a/packages/kadira-flow-router/test/client/router.subs_ready.spec.js b/packages/kadira-flow-router/test/client/router.subs_ready.spec.js
new file mode 100644
index 00000000..8a20077a
--- /dev/null
+++ b/packages/kadira-flow-router/test/client/router.subs_ready.spec.js
@@ -0,0 +1,225 @@
+Tinytest.addAsync('Client - Router - subsReady - with no args - all subscriptions ready', function (test, next) {
+  var rand = Random.id();
+  FlowRouter.route('/' + rand, {
+    subscriptions: function(params) {
+      this.register('bar', Meteor.subscribe('bar'));
+      this.register('foo', Meteor.subscribe('foo'));
+    }
+  });
+
+  FlowRouter.subscriptions = function () {
+    this.register('baz', Meteor.subscribe('baz'));
+  };
+
+  FlowRouter.go('/' + rand);
+
+  Tracker.autorun(function(c) {
+    if(FlowRouter.subsReady()) {
+      FlowRouter.subscriptions = Function.prototype;
+      next();
+      c.stop();
+    }
+  });
+});
+
+Tinytest.addAsync('Client - Router - subsReady - with no args - all subscriptions does not ready', function (test, next) {
+  var rand = Random.id();
+  FlowRouter.route('/' + rand, {
+    subscriptions: function(params) {
+      this.register('fooNotReady', Meteor.subscribe('fooNotReady'));
+    }
+  });
+
+  FlowRouter.subscriptions = function () {
+    this.register('bazNotReady', Meteor.subscribe('bazNotReady'));
+  };
+
+  FlowRouter.go('/' + rand);
+  setTimeout(function() {
+    test.isTrue(!FlowRouter.subsReady());
+    FlowRouter.subscriptions = Function.prototype;
+    next();
+  }, 100);
+});
+
+Tinytest.addAsync('Client - Router - subsReady - with no args - global subscriptions does not ready', function (test, next) {
+  var rand = Random.id();
+  FlowRouter.route('/' + rand, {
+    subscriptions: function(params) {
+      this.register('bar', Meteor.subscribe('bar'));
+      this.register('foo', Meteor.subscribe('foo'));
+    }
+  });
+
+  FlowRouter.subscriptions = function () {
+    this.register('bazNotReady', Meteor.subscribe('bazNotReady'));
+  };
+
+  FlowRouter.go('/' + rand);
+  setTimeout(function() {
+    test.isTrue(!FlowRouter.subsReady());
+    FlowRouter.subscriptions = Function.prototype;
+    next();
+  }, 100);
+});
+
+Tinytest.addAsync('Client - Router - subsReady - with no args - current subscriptions does not ready', function (test, next) {
+  var rand = Random.id();
+  FlowRouter.route('/' + rand, {
+    subscriptions: function(params) {
+      this.register('bar', Meteor.subscribe('bar'));
+      this.register('fooNotReady', Meteor.subscribe('fooNotReady'));
+    }
+  });
+
+  FlowRouter.subscriptions = function () {
+    this.register('baz', Meteor.subscribe('baz'));
+  };
+
+  FlowRouter.go('/' + rand);
+  setTimeout(function() {
+    test.isTrue(!FlowRouter.subsReady());
+    FlowRouter.subscriptions = Function.prototype;
+    next();
+  }, 100);
+});
+
+Tinytest.addAsync('Client - Router - subsReady - with args - all subscriptions ready', function (test, next) {
+  var rand = Random.id();
+  FlowRouter.route('/' + rand, {
+    subscriptions: function(params) {
+      this.register('bar', Meteor.subscribe('bar'));
+      this.register('foo', Meteor.subscribe('foo'));
+    }
+  });
+
+  FlowRouter.subscriptions = function () {
+    this.register('baz', Meteor.subscribe('baz'));
+  };
+
+  FlowRouter.go('/' + rand);
+  Tracker.autorun(function(c) {
+    if(FlowRouter.subsReady('foo', 'baz')) {
+      FlowRouter.subscriptions = Function.prototype;
+      next();
+      c.stop();
+    }
+  });
+});
+
+Tinytest.addAsync('Client - Router - subsReady - with args - all subscriptions does not ready', function (test, next) {
+  var rand = Random.id();
+  FlowRouter.route('/' + rand, {
+    subscriptions: function(params) {
+      this.register('fooNotReady', Meteor.subscribe('fooNotReady'));
+    }
+  });
+
+  FlowRouter.subscriptions = function () {
+    this.register('bazNotReady', Meteor.subscribe('bazNotReady'));
+  };
+
+  FlowRouter.go('/' + rand);
+  setTimeout(function() {
+    test.isTrue(!FlowRouter.subsReady('fooNotReady', 'bazNotReady'));
+    FlowRouter.subscriptions = Function.prototype;
+    next();
+  }, 100);
+});
+
+Tinytest.addAsync('Client - Router - subsReady - with args - global subscriptions does not ready', function (test, next) {
+  var rand = Random.id();
+  FlowRouter.route('/' + rand, {
+    subscriptions: function(params) {
+      this.register('bar', Meteor.subscribe('bar'));
+      this.register('foo', Meteor.subscribe('foo'));
+    }
+  });
+
+  FlowRouter.subscriptions = function () {
+    this.register('bazNotReady', Meteor.subscribe('bazNotReady'));
+  };
+
+  FlowRouter.go('/' + rand);
+  setTimeout(function() {
+    test.isTrue(!FlowRouter.subsReady('foo', 'bazNotReady'));
+    FlowRouter.subscriptions = Function.prototype;
+    next();
+  }, 100);
+});
+
+Tinytest.addAsync('Client - Router - subsReady - with args - current subscriptions does not ready', function (test, next) {
+  var rand = Random.id();
+  FlowRouter.route('/' + rand, {
+    subscriptions: function(params) {
+      this.register('bar', Meteor.subscribe('bar'));
+      this.register('fooNotReady', Meteor.subscribe('fooNotReady'));
+    }
+  });
+
+  FlowRouter.subscriptions = function () {
+    this.register('baz', Meteor.subscribe('baz'));
+  };
+
+  FlowRouter.go('/' + rand);
+  setTimeout(function() {
+    test.isTrue(!FlowRouter.subsReady('fooNotReady', 'baz'));
+    FlowRouter.subscriptions = Function.prototype;
+    next();
+  }, 100);
+});
+
+Tinytest.addAsync('Client - Router - subsReady - with args - subscribe with wrong name', function (test, next) {
+  var rand = Random.id();
+  FlowRouter.route('/' + rand, {
+    subscriptions: function(params) {
+      this.register('bar', Meteor.subscribe('bar'));
+    }
+  });
+
+  FlowRouter.subscriptions = function () {
+    this.register('baz', Meteor.subscribe('baz'));
+  };
+
+  FlowRouter.go('/' + rand);
+  setTimeout(function() {
+    test.isTrue(!FlowRouter.subsReady('baz', 'xxx', 'baz'));
+    FlowRouter.subscriptions = Function.prototype;
+    next();
+  }, 100);
+});
+
+Tinytest.addAsync('Client - Router - subsReady - with args - same route two different subs', function (test, next) {
+  var rand = Random.id();
+  var count = 0;
+  FlowRouter.route('/' + rand, {
+    subscriptions: function(params) {
+      if(++count == 1) {
+        this.register('not-exisitng', Meteor.subscribe('not-exisitng'));
+      }
+    }
+  });
+
+  FlowRouter.subscriptions = Function.prototype;
+  FlowRouter.go('/' + rand);
+  setTimeout(function() {
+    test.isFalse(FlowRouter.subsReady());
+    FlowRouter.go('/' + rand, {}, {param: "111"});
+    setTimeout(function() {
+      test.isTrue(FlowRouter.subsReady());
+      next();
+    }, 100)
+  }, 100);
+});
+
+Tinytest.addAsync('Client - Router - subsReady - no subscriptions - simple', function (test, next) {
+  var rand = Random.id();
+  FlowRouter.route('/' + rand, {});
+  FlowRouter.subscriptions = Function.prototype;
+
+  FlowRouter.go('/' + rand);
+  setTimeout(function() {
+    test.isTrue(FlowRouter.subsReady());
+    next();
+  }, 100);
+});
\ No newline at end of file
diff --git a/packages/kadira-flow-router/test/client/trigger.spec.js b/packages/kadira-flow-router/test/client/trigger.spec.js
new file mode 100644
index 00000000..319c6bd2
--- /dev/null
+++ b/packages/kadira-flow-router/test/client/trigger.spec.js
@@ -0,0 +1,570 @@
+Tinytest.addAsync('Client - Triggers - global enter triggers', function(test, next) {
+  var rand = Random.id(), rand2 = Random.id();
+  var log = [];
+  var paths = ['/' + rand2, '/' + rand];
+  var done = false;
+
+  FlowRouter.route('/' + rand, {
+    action: function(_params) {
+      log.push(1);
+    }
+  });
+
+  FlowRouter.route('/' + rand2, {
+    action: function(_params) {
+      log.push(2);
+    }
+  });
+
+  FlowRouter.triggers.enter([function(context) {
+    if(done) return;
+    test.equal(context.path, paths.pop());
+    log.push(0);
+  }]);
+
+  FlowRouter.go('/' + rand);
+
+  setTimeout(function() {
+    FlowRouter.go('/' + rand2);
+
+    setTimeout(function() {
+      test.equal(log, [0, 1, 0, 2]);
+      done = true;
+      setTimeout(next, 100);
+    }, 100);
+  }, 100);
+});
+
+Tinytest.addAsync('Client - Triggers - global enter triggers with "only"', function (test, next) {
+  var rand = Random.id(), rand2 = Random.id();
+  var log = [];
+  var done = false;
+
+  FlowRouter.route('/' + rand, {
+    action: function(_params) {
+      log.push(1);
+    }
+  });
+
+  FlowRouter.route('/' + rand2, {
+    name: 'foo',
+    action: function(_params) {
+      log.push(2);
+    }
+  });
+
+  FlowRouter.triggers.enter([function(context) {
+    if(done) return;
+    test.equal(context.path, '/' + rand2);
+    log.push(8);
+  }], {only: ['foo']});
+
+  FlowRouter.go('/' + rand);
+
+  setTimeout(function() {
+    FlowRouter.go('/' + rand2);
+
+    setTimeout(function() {
+      test.equal(log, [1, 8, 2]);
+      done = true;
+      setTimeout(next, 100);
+    }, 100);
+  }, 100);
+});
+
+Tinytest.addAsync('Client - Triggers - global enter triggers with "except"', function (test, next) {
+  var rand = Random.id(), rand2 = Random.id();
+  var log = [];
+  var done = false;
+
+  FlowRouter.route('/' + rand, {
+    action: function(_params) {
+      log.push(1);
+    }
+  });
+
+  FlowRouter.route('/' + rand2, {
+    name: 'foo',
+    action: function(_params) {
+      log.push(2);
+    }
+  });
+
+  FlowRouter.triggers.enter([function(context) {
+    if(done) return;
+    test.equal(context.path, '/' + rand);
+    log.push(8);
+  }], {except: ['foo']});
+
+  FlowRouter.go('/' + rand);
+
+  setTimeout(function() {
+    FlowRouter.go('/' + rand2);
+
+    setTimeout(function() {
+      test.equal(log, [8, 1, 2]);
+      done = true;
+      setTimeout(next, 100);
+    }, 100);
+  }, 100);
+});
+
+Tinytest.addAsync('Client - Triggers - global exit triggers', function (test, next) {
+  var rand = Random.id(), rand2 = Random.id();
+  var log = [];
+  var done =false;
+
+  FlowRouter.route('/' + rand, {
+    action: function(_params) {
+      log.push(1);
+    }
+  });
+
+  FlowRouter.route('/' + rand2, {
+    action: function(_params) {
+      log.push(2);
+    }
+  });
+
+  FlowRouter.go('/' + rand);
+
+  FlowRouter.triggers.exit([function(context) {
+    if(done) return;
+    test.equal(context.path, '/' + rand);
+    log.push(0);
+  }]);
+
+  setTimeout(function() {
+    FlowRouter.go('/' + rand2);
+
+    setTimeout(function() {
+      test.equal(log, [1, 0, 2]);
+      done = true;
+      setTimeout(next, 100);
+    }, 100);
+  }, 100);
+});
+
+Tinytest.addAsync('Client - Triggers - global exit triggers with "only"', function (test, next) {
+  var rand = Random.id(), rand2 = Random.id();
+  var log = [];
+  var done = false;
+
+  FlowRouter.route('/' + rand, {
+    action: function(_params) {
+      log.push(1);
+    }
+  });
+
+  FlowRouter.route('/' + rand2, {
+    name: 'foo',
+    action: function(_params) {
+      log.push(2);
+    }
+  });
+
+  FlowRouter.triggers.exit([function(context) {
+    if(done) return;
+    test.equal(context.path, '/' + rand2);
+    log.push(8);
+  }], {only: ['foo']});
+
+  FlowRouter.go('/' + rand);
+
+  setTimeout(function() {
+    FlowRouter.go('/' + rand2);
+
+    setTimeout(function() {
+      FlowRouter.go('/' + rand);
+
+      setTimeout(function() {
+        test.equal(log, [1, 2, 8, 1]);
+        done = true;
+        setTimeout(next, 100);
+      }, 100);
+    }, 100);
+  }, 100);
+});
+
+Tinytest.addAsync('Client - Triggers - global exit triggers with "except"', function (test, next) {
+  var rand = Random.id(), rand2 = Random.id();
+  var log = [];
+  var done = false;
+
+  FlowRouter.route('/' + rand, {
+    action: function(_params) {
+      log.push(1);
+    }
+  });
+
+  FlowRouter.route('/' + rand2, {
+    name: 'foo',
+    action: function(_params) {
+      log.push(2);
+    }
+  });
+
+  FlowRouter.go('/' + rand);
+
+  FlowRouter.triggers.exit([function(context) {
+    if(done) return;
+    test.equal(context.path, '/' + rand);
+    log.push(9);
+  }], {except: ['foo']});
+
+
+  setTimeout(function() {
+    FlowRouter.go('/' + rand2);
+
+    setTimeout(function() {
+      FlowRouter.go('/' + rand);
+
+      setTimeout(function() {
+        test.equal(log, [1, 9, 2, 1]);
+        done = true;
+        setTimeout(next, 100);
+      }, 100);
+    }, 100);
+  }, 100);
+});
+
+Tinytest.addAsync('Client - Triggers - route enter triggers', function (test, next) {
+  var rand = Random.id();
+  var log = [];
+
+  var triggerFn = function (context) {
+    test.equal(context.path, '/' + rand);
+    log.push(5);
+  };
+
+  FlowRouter.route('/' + rand, {
+    triggersEnter: [triggerFn],
+    action: function(_params) {
+      log.push(1);
+    }
+  });
+
+  FlowRouter.go('/' + rand);
+
+  setTimeout(function() {
+    test.equal(log, [5, 1]);
+    setTimeout(next, 100);
+  }, 100);
+});
+
+Tinytest.addAsync('Client - Triggers - router exit triggers', function (test, next) {
+  var rand = Random.id();
+  var log = [];
+
+  var triggerFn = function (context) {
+    test.equal(context.path, '/' + rand);
+    log.push(6);
+  };
+
+  FlowRouter.route('/' + rand, {
+    triggersExit: [triggerFn],
+    action: function(_params) {
+      log.push(1);
+    }
+  });
+
+  FlowRouter.go('/' + rand);
+
+  setTimeout(function() {
+    FlowRouter.go('/' + Random.id());
+
+    setTimeout(function() {
+      test.equal(log, [1, 6]);
+      setTimeout(next, 100);
+    }, 100);
+  }, 100);
+});
+
+Tinytest.addAsync('Client - Triggers - group enter triggers', function (test, next) {
+  var rand = Random.id(), rand2 = Random.id();
+  var log = [];
+  var paths = ['/' + rand2, '/' + rand];
+
+  var triggerFn = function (context) {
+    test.equal(context.path, paths.pop());
+    log.push(3);
+  };
+
+  var group = FlowRouter.group({
+    triggersEnter: [triggerFn]
+  });
+
+  group.route('/' + rand, {
+    action: function(_params) {
+      log.push(1);
+    }
+  });
+
+  group.route('/' + rand2, {
+    action: function(_params) {
+      log.push(2);
+    }
+  });
+
+  FlowRouter.go('/' + rand);
+
+  setTimeout(function() {
+    FlowRouter.go('/' + rand2);
+
+    setTimeout(function() {
+      test.equal(log, [3, 1, 3, 2]);
+      setTimeout(next, 100);
+    }, 100);
+  }, 100);
+});
+
+Tinytest.addAsync('Client - Triggers - group exit triggers', function (test, next) {
+  var rand = Random.id(), rand2 = Random.id();
+  var log = [];
+
+  var triggerFn = function (context) {
+    log.push(4);
+  };
+
+  var group = FlowRouter.group({
+    triggersExit: [triggerFn]
+  });
+
+  group.route('/' + rand, {
+    action: function(_params) {
+      log.push(1);
+    }
+  });
+
+  group.route('/' + rand2, {
+    action: function(_params) {
+      log.push(2);
+    }
+  });
+
+  FlowRouter.go('/' + rand);
+
+  setTimeout(function() {
+    FlowRouter.go('/' + rand2);
+
+    setTimeout(function() {
+      test.equal(log, [1, 4, 2]);
+      setTimeout(next, 100);
+    }, 100);
+  }, 100);
+});
+
+Tinytest.addAsync('Client - Triggers - redirect from enter', function(test, next) {
+  var rand = Random.id(), rand2 = Random.id();
+  var log = [];
+
+  FlowRouter.route('/' + rand, {
+    triggersEnter: [function(context, redirect) {
+      redirect("/" + rand2);
+    }, function() {
+      throw new Error("should not execute this trigger");
+    }],
+    action: function(_params) {
+      log.push(1);
+    },
+    name: rand
+  });
+
+  FlowRouter.route('/' + rand2, {
+    action: function(_params) {
+      log.push(2);
+    },
+    name: rand2
+  });
+
+  FlowRouter.go('/');
+  FlowRouter.go('/' + rand);
+
+  setTimeout(function() {
+    test.equal(log, [2]);
+    next();
+  }, 300);
+});
+
+Tinytest.addAsync('Client - Triggers - redirect by routeName', function(test, next) {
+  var rand = Random.id(), rand2 = Random.id();
+  var log = [];
+
+  FlowRouter.route('/' + rand, {
+    name: rand,
+    triggersEnter: [function(context, redirect) {
+      redirect(rand2, null, {aa: "bb"});
+    }, function() {
+      throw new Error("should not execute this trigger");
+    }],
+    action: function(_params) {
+      log.push(1);
+    },
+    name: rand
+  });
+
+  FlowRouter.route('/' + rand2, {
+    name: rand2,
+    action: function(_params, queryParams) {
+      log.push(2);
+      test.equal(queryParams, {aa: "bb"});
+    },
+    name: rand2
+  });
+
+  FlowRouter.go('/');
+  FlowRouter.go('/' + rand);
+
+  setTimeout(function() {
+    test.equal(log, [2]);
+    next();
+  }, 300);
+});
+
+Tinytest.addAsync('Client - Triggers - redirect from exit', function(test, next) {
+  var rand = Random.id(), rand2 = Random.id(), rand3 = Random.id();
+  var log = [];
+
+  FlowRouter.route('/' + rand, {
+    action: function() {
+      log.push(1);
+    },
+    triggersExit: [
+      function(context, redirect) {
+        redirect('/' + rand3);
+      },
+      function() {
+        throw new Error("should not call this trigger");
+      }
+    ]
+  });
+
+  FlowRouter.route('/' + rand2, {
+    action: function() {
+      log.push(2);
+    }
+  });
+
+  FlowRouter.route('/' + rand3, {
+    action: function() {
+      log.push(3);
+    }
+  });
+
+  FlowRouter.go('/' + rand);
+
+  setTimeout(function() {
+    FlowRouter.go('/' + rand2);
+    
+    setTimeout(function() {
+      test.equal(log, [1, 3]);
+      next();
+    }, 100);
+  }, 100);
+});
+
+Tinytest.addAsync('Client - Triggers - redirect to external URL fails', function(test, next) {
+  var rand = Random.id(), rand2 = Random.id();
+  var log = [];
+
+  // testing "http://" URLs
+  FlowRouter.route('/' + rand, {
+    triggersEnter: [function(context, redirect) {
+      test.throws(function() {
+          redirect("http://example.com/")
+      }, "Redirects to URLs outside of the app are not supported")
+    }],
+    action: function(_params) {
+      log.push(1);
+    },
+    name: rand
+  });
+
+  // testing "https://" URLs
+  FlowRouter.route('/' + rand2, {
+    triggersEnter: [function(context, redirect) {
+      test.throws(function() {
+          redirect("https://example.com/")
+      })
+    }],
+    action: function(_params) {
+      log.push(2);
+    },
+    name: rand2
+  });
+
+  FlowRouter.go('/');
+  FlowRouter.go('/' + rand);
+  FlowRouter.go('/' + rand2);
+
+  setTimeout(function() {
+    test.equal(log, []);
+    next();
+  }, 300);
+});
+
+Tinytest.addAsync('Client - Triggers - stop callback from enter', function(test, next) {
+  var rand = Random.id();
+  var log = [];
+
+  FlowRouter.route('/' + rand, {
+    triggersEnter: [function(context, redirect, stop) {
+      log.push(10);
+      stop();
+    }, function() {
+      throw new Error("should not execute this trigger");
+    }],
+    action: function(_params) {
+      throw new Error("should not execute the action");
+    }
+  });
+
+  FlowRouter.go('/');
+  FlowRouter.go('/' + rand);
+
+  setTimeout(function() {
+    test.equal(log, [10]);
+    next();
+  }, 100);
+});
+
+Tinytest.addAsync(
+'Client - Triggers - invalidate inside an autorun', 
+function(test, next) {
+  var rand = Random.id(), rand2 = Random.id();
+  var log = [];
+  var paths = ['/' + rand2, '/' + rand];
+  var done = false;
+
+  FlowRouter.route('/' + rand, {
+    action: function(_params) {
+      log.push(1);
+    }
+  });
+
+  FlowRouter.route('/' + rand2, {
+    action: function(_params) {
+      log.push(2);
+    }
+  });
+
+  FlowRouter.triggers.enter([function(context) {
+    if(done) return;
+    test.equal(context.path, paths.pop());
+    log.push(0);
+  }]);
+
+  Tracker.autorun(function(c) {
+    FlowRouter.go('/' + rand);
+  });
+
+  setTimeout(function() {
+    FlowRouter.go('/' + rand2);
+
+    setTimeout(function() {
+      test.equal(log, [0, 1, 0, 2]);
+      done = true;
+      setTimeout(next, 100);
+    }, 100);
+  }, 100);
+});
diff --git a/packages/kadira-flow-router/test/client/triggers.js b/packages/kadira-flow-router/test/client/triggers.js
new file mode 100644
index 00000000..7eb9a99c
--- /dev/null
+++ b/packages/kadira-flow-router/test/client/triggers.js
@@ -0,0 +1,297 @@
+Tinytest.addAsync(
+'Triggers - runTriggers - run all and after',
+function(test, done) {
+  var store = [];
+  var triggers = MakeTriggers(2, store);
+  Triggers.runTriggers(triggers, null, null, function() {
+    test.equal(store, [0, 1]);
+    done();
+  });
+});
+
+Tinytest.addAsync(
+'Triggers - runTriggers - redirect with url',
+function(test, done) {
+  var store = [];
+  var url = "http://google.com";
+  var triggers = MakeTriggers(2, store);
+  triggers.splice(1, 0, function(context, redirect) {
+    redirect(url); 
+  });
+
+  Triggers.runTriggers(triggers, null, function(u) {
+    test.equal(store, [0]);
+    test.equal(u, url);
+    done();
+  }, null);
+});
+
+Tinytest.addAsync(
+'Triggers - runTriggers - redirect without url',
+function(test, done) {
+  var store = [];
+  var url = "http://google.com";
+  var triggers = MakeTriggers(2, store);
+  triggers.splice(1, 0, function(context, redirect) {
+    try {
+      redirect(); 
+    } catch(ex) {
+      test.isTrue(/requires an URL/.test(ex.message));
+      test.equal(store, [0]);
+      done();
+    }
+  });
+
+  Triggers.runTriggers(triggers, null, null, null);
+});
+
+Tinytest.addAsync(
+'Triggers - runTriggers - redirect in a different event loop',
+function(test, done) {
+  var store = [];
+  var url = "http://google.com";
+  var triggers = MakeTriggers(2, store);
+  var doneCalled = false;
+
+  triggers.splice(1, 0, function(context, redirect) {
+    setTimeout(function() {
+      try {
+        redirect(url); 
+      } catch(ex) {
+        test.isTrue(/sync/.test(ex.message));
+        test.equal(store, [0, 1]);
+        test.isTrue(doneCalled);
+        done();
+      }
+    }, 0);
+  });
+
+  Triggers.runTriggers(triggers, null, null, function() {
+    doneCalled = true;
+  });
+});
+
+Tinytest.addAsync(
+'Triggers - runTriggers - redirect called multiple times',
+function(test, done) {
+  var store = [];
+  var url = "http://google.com";
+  var triggers = MakeTriggers(2, store);
+  var redirectCalled = false;
+
+  triggers.splice(1, 0, function(context, redirect) {
+    redirect(url); 
+    try {
+      redirect(url);
+    } catch(ex) {
+      test.isTrue(/already redirected/.test(ex.message));
+      test.equal(store, [0]);
+      test.isTrue(redirectCalled);
+      done();
+    }
+  });
+
+  Triggers.runTriggers(triggers, null, function() {
+    redirectCalled = true;
+  }, null);
+});
+
+Tinytest.addAsync(
+'Triggers - runTriggers - stop callback',
+function(test, done) {
+  var store = [];
+  var triggers = MakeTriggers(2, store);
+  triggers.splice(1, 0, function(context, redirect, stop) {
+    stop();
+  });
+
+  Triggers.runTriggers(triggers, null, null, function() {
+    store.push(2);
+  });
+
+  test.equal(store, [0]);
+  done();
+});
+
+
+Tinytest.addAsync(
+'Triggers - runTriggers - get context',
+function(test, done) {
+  var context = {};
+  var trigger = function(c) {
+    test.equal(c, context);
+    done();
+  };
+
+  Triggers.runTriggers([trigger], context, function() {}, function() {});
+});
+
+Tinytest.addAsync(
+'Triggers - createRouteBoundTriggers - matching trigger',
+function(test, done) {
+  var context = {route: {name: "abc"}};
+  var redirect = function() {};
+
+  var trigger = function(c, r) {
+    test.equal(c, context);
+    test.equal(r, redirect);
+    done();
+  };
+
+  var triggers = Triggers.createRouteBoundTriggers([trigger], ["abc"]);
+  triggers[0](context, redirect);
+});
+
+Tinytest.addAsync(
+'Triggers - createRouteBoundTriggers - multiple matching triggers',
+function(test, done) {
+  var context = {route: {name: "abc"}};
+  var redirect = function() {};
+  var doneCount = 0;
+
+  var trigger = function(c, r) {
+    test.equal(c, context);
+    test.equal(r, redirect);
+    doneCount++;
+  };
+
+  var triggers = Triggers.createRouteBoundTriggers([trigger, trigger], ["abc"]);
+  triggers[0](context, redirect);
+  triggers[1](context, redirect);
+
+  test.equal(doneCount, 2);
+  done();
+});
+
+Tinytest.addAsync(
+'Triggers - createRouteBoundTriggers - no matching trigger',
+function(test, done) {
+  var context = {route: {name: "some-other-route"}};
+  var redirect = function() {};
+  var doneCount = 0;
+
+  var trigger = function(c, r) {
+    test.equal(c, context);
+    test.equal(r, redirect);
+    doneCount++;
+  };
+
+  var triggers = Triggers.createRouteBoundTriggers([trigger], ["abc"]);
+  triggers[0](context, redirect);
+
+  test.equal(doneCount, 0);
+  done();
+});
+
+Tinytest.addAsync(
+'Triggers - createRouteBoundTriggers - negate logic',
+function(test, done) {
+  var context = {route: {name: "some-other-route"}};
+  var redirect = function() {};
+  var doneCount = 0;
+
+  var trigger = function(c, r) {
+    test.equal(c, context);
+    test.equal(r, redirect);
+    doneCount++;
+  };
+
+  var triggers = Triggers.createRouteBoundTriggers([trigger], ["abc"], true);
+  triggers[0](context, redirect);
+
+  test.equal(doneCount, 1);
+  done();
+});
+
+Tinytest.addAsync(
+'Triggers - applyFilters - no filters',
+function(test, done) {
+  var original = [];
+  test.equal(Triggers.applyFilters(original), original);
+  done();
+});
+
+Tinytest.addAsync(
+'Triggers - applyFilters - single trigger to array',
+function(test, done) {
+  var original = function() {};
+  test.equal(Triggers.applyFilters(original)[0], original);
+  done();
+});
+
+Tinytest.addAsync(
+'Triggers - applyFilters - only and except both',
+function(test, done) {
+  var original = [];
+  try {
+    Triggers.applyFilters(original, {only: [], except: []});
+  } catch(ex) {
+    test.isTrue(/only and except/.test(ex.message));
+    done();
+  }
+});
+
+Tinytest.addAsync(
+'Triggers - applyFilters - only is not an array',
+function(test, done) {
+  var original = [];
+  try {
+    Triggers.applyFilters(original, {only: "name"});
+  } catch(ex) {
+    test.isTrue(/to be an array/.test(ex.message));
+    done();
+  }
+});
+
+Tinytest.addAsync(
+'Triggers - applyFilters - except is not an array',
+function(test, done) {
+  var original = [];
+  try {
+    Triggers.applyFilters(original, {except: "name"});
+  } catch(ex) {
+    test.isTrue(/to be an array/.test(ex.message));
+    done();
+  }
+});
+
+Tinytest.addAsync(
+'Triggers - applyFilters - unsupported filter',
+function(test, done) {
+  var original = [];
+  try {
+    Triggers.applyFilters(original, {wowFilter: []});
+  } catch(ex) {
+    test.isTrue(/not supported/.test(ex.message));
+    done();
+  }
+});
+
+Tinytest.addAsync(
+'Triggers - applyFilters - just only filter',
+function(test, done) {
+  var bounded = Triggers.applyFilters(done, {only: ["abc"]});
+  bounded[0]({route: {name: "abc"}});
+});
+
+Tinytest.addAsync(
+'Triggers - applyFilters - just except filter',
+function(test, done) {
+  var bounded = Triggers.applyFilters(done, {except: ["abc"]});
+  bounded[0]({route: {name: "some-other"}});
+});
+
+function MakeTriggers(count, store) {
+  var triggers = [];
+
+  function addTrigger(no) {
+    triggers.push(function() {
+      store.push(no);
+    });
+  }
+
+  for(var lc=0; lc<count; lc++) {
+    addTrigger(lc);
+  }
+  return triggers;
+}
\ No newline at end of file
diff --git a/packages/kadira-flow-router/test/common/fast_render_route.js b/packages/kadira-flow-router/test/common/fast_render_route.js
new file mode 100644
index 00000000..d56f1c06
--- /dev/null
+++ b/packages/kadira-flow-router/test/common/fast_render_route.js
@@ -0,0 +1,48 @@
+FastRenderColl = new Mongo.Collection('fast-render-coll');
+
+FlowRouter.route('/the-fast-render-route', {
+  subscriptions: function() {
+    this.register('data', Meteor.subscribe('fast-render-data'));
+  }
+});
+
+FlowRouter.route('/the-fast-render-route-params/:id', {
+  subscriptions: function(params, queryParams) {
+    this.register('data', Meteor.subscribe('fast-render-data-params', params, queryParams));
+  }
+});
+
+FlowRouter.route('/no-fast-render', {
+  subscriptions: function() {
+    if(Meteor.isClient) {
+      this.register('data', Meteor.subscribe('fast-render-data'));
+    }
+  }
+});
+
+var frGroup = FlowRouter.group({
+  prefix: "/fr"
+});
+
+frGroup.route("/have-fr", {
+  subscriptions: function() {
+    this.register('data', Meteor.subscribe('fast-render-data'));
+  }
+});
+
+if(Meteor.isServer) {
+  if(!FastRenderColl.findOne()) {
+    FastRenderColl.insert({_id: "one", aa: 10});
+    FastRenderColl.insert({_id: "two", aa: 20});
+  }
+
+  Meteor.publish('fast-render-data', function() {
+    return FastRenderColl.find({}, {sort: {aa: -1}});
+  });
+
+  Meteor.publish('fast-render-data-params', function(params, queryParams) {
+    var fields = {params: params, queryParams: queryParams};
+    this.added('fast-render-coll', 'one', fields);
+    this.ready();
+  });
+}
\ No newline at end of file
diff --git a/packages/kadira-flow-router/test/common/group.spec.js b/packages/kadira-flow-router/test/common/group.spec.js
new file mode 100644
index 00000000..e6e799cb
--- /dev/null
+++ b/packages/kadira-flow-router/test/common/group.spec.js
@@ -0,0 +1,16 @@
+Tinytest.add('Common - Group - expose group options', function (test) {
+  var pathDef = "/" + Random.id();
+  var name = Random.id();
+  var data = {aa: 10};
+  var layout = 'blah';
+
+  var group = FlowRouter.group({
+    name: name,
+    prefix: '/admin',
+    layout: layout,
+    someData: data
+  });
+
+  test.equal(group.options.someData, data);
+  test.equal(group.options.layout, layout);
+});
diff --git a/packages/kadira-flow-router/test/common/route.spec.js b/packages/kadira-flow-router/test/common/route.spec.js
new file mode 100644
index 00000000..9e4c7e5a
--- /dev/null
+++ b/packages/kadira-flow-router/test/common/route.spec.js
@@ -0,0 +1,15 @@
+Router = FlowRouter.Router;
+
+Tinytest.addAsync('Common - Route - expose route options', function (test, next) {
+  var pathDef = "/" + Random.id();
+  var name = Random.id();
+  var data = {aa: 10};
+  
+  FlowRouter.route(pathDef, {
+    name: name,
+    someData: data
+  });
+
+  test.equal(FlowRouter._routesMap[name].options.someData, data);
+  next();
+});
diff --git a/packages/kadira-flow-router/test/common/router.addons.spec.js b/packages/kadira-flow-router/test/common/router.addons.spec.js
new file mode 100644
index 00000000..f5078734
--- /dev/null
+++ b/packages/kadira-flow-router/test/common/router.addons.spec.js
@@ -0,0 +1,30 @@
+Router = FlowRouter.Router;
+
+Tinytest.addAsync('Common - Addons - onRouteRegister basic usage', function (test, done) {
+  var name = Random.id();
+  var customField = Random.id();
+  var pathDef = '/' + name;
+  
+  FlowRouter.onRouteRegister(function(route) {
+    test.equal(route, {
+      pathDef: pathDef,
+
+      // Route.path is deprecated and will be removed in 3.0
+      path: pathDef,
+
+      name: name,
+      options: {customField: customField}
+    });  
+    FlowRouter._onRouteCallbacks = [];
+    done();
+  });
+
+  FlowRouter.route(pathDef, {
+    name: name,
+    action: function() {},
+    subscriptions: function() {},
+    triggersEnter: function() {},
+    triggersExit: function() {},
+    customField: customField
+  });
+});
diff --git a/packages/kadira-flow-router/test/common/router.path.spec.js b/packages/kadira-flow-router/test/common/router.path.spec.js
new file mode 100644
index 00000000..92f0881e
--- /dev/null
+++ b/packages/kadira-flow-router/test/common/router.path.spec.js
@@ -0,0 +1,135 @@
+Router = FlowRouter.Router;
+
+Tinytest.addAsync('Common - Router - validate path definition', function (test, next) {
+  // path must start with '/'
+  try {
+    FlowRouter.route(Random.id());
+  } catch(ex) {
+    next();
+  }
+});
+
+Tinytest.add('Common - Router - path - generic', function (test) {
+  var pathDef = "/blog/:blogId/some/:name";
+  var fields = {
+    blogId: "1001",
+    name: "superb"
+  };
+  var expectedPath = "/blog/1001/some/superb";
+
+  var path = FlowRouter.path(pathDef, fields);
+  test.equal(path, expectedPath);
+});
+
+Tinytest.add('Common - Router - path - queryParams', function (test) {
+  var pathDef = "/blog/:blogId/some/:name";
+  var fields = {
+    blogId: "1001",
+    name: "superb"
+  };
+
+  var queryParams = {
+    aa: "100",
+    bb: "200"
+  };
+
+  var expectedPath = "/blog/1001/some/superb?aa=100&bb=200";
+
+  var path = FlowRouter.path(pathDef, fields, queryParams);
+  test.equal(path, expectedPath);
+});
+
+Tinytest.add('Common - Router - path - just queryParams', function (test) {
+  var pathDef = "/blog/abc";
+  var queryParams = {
+    aa: "100",
+    bb: "200"
+  };
+
+  var expectedPath = "/blog/abc?aa=100&bb=200";
+
+  var path = FlowRouter.path(pathDef, null, queryParams);
+  test.equal(path, expectedPath);
+});
+
+
+Tinytest.add('Common - Router - path - missing fields', function (test) {
+  var pathDef = "/blog/:blogId/some/:name";
+  var fields = {
+    blogId: "1001",
+  };
+  var expectedPath = "/blog/1001/some";
+
+  var path = FlowRouter.path(pathDef, fields);
+  test.equal(path, expectedPath);
+});
+
+Tinytest.add('Common - Router - path - no fields', function (test) {
+  var pathDef = "/blog/blogId/some/name";
+  var path = FlowRouter.path(pathDef);
+  test.equal(path, pathDef);
+});
+
+Tinytest.add('Common - Router - path - complex route', function (test) {
+  var pathDef = "/blog/:blogId/some/:name(\\d*)+";
+  var fields = {
+    blogId: "1001",
+    name: 20
+  };
+  var expectedPath = "/blog/1001/some/20";
+
+  var path = FlowRouter.path(pathDef, fields);
+  test.equal(path, expectedPath);
+});
+
+Tinytest.add('Common - Router - path - optional last param missing', function (test) {
+  var pathDef = "/blog/:blogId/some/:name?";
+  var fields = {
+    blogId: "1001"
+  };
+  var expectedPath = "/blog/1001/some";
+
+  var path = FlowRouter.path(pathDef, fields);
+  test.equal(path, expectedPath);
+});
+
+Tinytest.add('Common - Router - path - optional last param exists', function (test) {
+  var pathDef = "/blog/:blogId/some/:name?";
+  var fields = {
+    blogId: "1001",
+    name: 20
+  };
+  var expectedPath = "/blog/1001/some/20";
+
+  var path = FlowRouter.path(pathDef, fields);
+  test.equal(path, expectedPath);
+});
+
+Tinytest.add('Common - Router - path - remove trailing slashes', function (test) {
+  var pathDef = "/blog/:blogId/some/:name//";
+  var fields = {
+    blogId: "1001",
+    name: "superb"
+  };
+  var expectedPath = "/blog/1001/some/superb";
+
+  var path = FlowRouter.path(pathDef, fields);
+  test.equal(path, expectedPath);
+});
+
+Tinytest.add('Common - Router - path - handle multiple slashes', function (test) {
+  var pathDef = "/blog///some/hi////";
+  var expectedPath = "/blog/some/hi";
+
+  var path = FlowRouter.path(pathDef);
+  test.equal(path, expectedPath);
+});
+
+Tinytest.add('Common - Router - path - keep the root slash', function (test) {
+  var pathDef = "/";
+  var fields = {};
+  var expectedPath = "/";
+
+  var path = FlowRouter.path(pathDef, fields);
+  test.equal(path, expectedPath);
+});
diff --git a/packages/kadira-flow-router/test/common/router.url.spec.js b/packages/kadira-flow-router/test/common/router.url.spec.js
new file mode 100644
index 00000000..0dbf4632
--- /dev/null
+++ b/packages/kadira-flow-router/test/common/router.url.spec.js
@@ -0,0 +1,11 @@
+Tinytest.add('Common - Router - url - generic', function (test) {
+  var pathDef = "/blog/:blogId/some/:name";
+  var fields = {
+    blogId: "1001",
+    name: "superb"
+  };
+  var expectedUrl = Meteor.absoluteUrl('blog/1001/some/superb');
+
+  var path = FlowRouter.url(pathDef, fields);
+  test.equal(path, expectedUrl);
+});
diff --git a/packages/kadira-flow-router/test/server/_helpers.js b/packages/kadira-flow-router/test/server/_helpers.js
new file mode 100644
index 00000000..c7538851
--- /dev/null
+++ b/packages/kadira-flow-router/test/server/_helpers.js
@@ -0,0 +1,38 @@
+Meteor.publish('foo', function () {
+  this.ready();
+});
+
+Meteor.publish('fooNotReady', function () {
+});
+
+Meteor.publish('bar', function () {
+  this.ready();
+});
+
+// use this only to test global subs
+Meteor.publish('baz', function () {
+  this.ready();
+});
+
+Meteor.publish('bazNotReady', function () {
+});
+
+Meteor.publish('readyness', function (doIt) {
+  if(doIt) {
+    this.ready();
+  }
+});
+
+InjectData = Package['meteorhacks:inject-data'].InjectData;
+var urlResolve = Npm.require('url').resolve;
+GetFRData = function GetFRData(path) {
+  var url = urlResolve(process.env.ROOT_URL, path);
+  // FastRender only servers if there is a accept header with html in it
+  var options  = {
+    headers: {'accept': 'html'}
+  };
+  var res = HTTP.get(url, options);
+
+  var encodedData = res.content.match(/data">(.*)<\/script/)[1];
+  return InjectData._decode(encodedData)['fast-render-data'];
+}
\ No newline at end of file
diff --git a/packages/kadira-flow-router/test/server/plugins/fast_render.js b/packages/kadira-flow-router/test/server/plugins/fast_render.js
new file mode 100644
index 00000000..1ec77866
--- /dev/null
+++ b/packages/kadira-flow-router/test/server/plugins/fast_render.js
@@ -0,0 +1,35 @@
+Tinytest.add('Server - Fast Render - fast render supported route', function (test) {
+  var expectedFastRenderCollData = [
+    [{_id: "two", aa: 20}, {_id: "one", aa: 10}]
+  ];
+
+  var data = GetFRData('/the-fast-render-route');
+  test.equal(data.collectionData['fast-render-coll'], expectedFastRenderCollData);
+});
+
+Tinytest.add('Server - Fast Render - fast render supported route with params', function (test) {
+  var expectedFastRenderCollData = [
+    [{
+      _id: "one", 
+      params: {id: 'the-id'},
+      queryParams: {aa: "20"}
+    }]
+  ];
+
+  var data = GetFRData('/the-fast-render-route-params/the-id?aa=20');
+  test.equal(data.collectionData['fast-render-coll'], expectedFastRenderCollData);
+});
+
+Tinytest.add('Server - Fast Render - no fast render supported route', function (test) {
+  var data = GetFRData('/no-fast-render');
+  test.equal(data.collectionData, {});
+});
+
+Tinytest.add('Server - Fast Render - with group routes', function (test) {
+  var expectedFastRenderCollData = [
+    [{_id: "two", aa: 20}, {_id: "one", aa: 10}]
+  ];
+
+  var data = GetFRData('/fr/have-fr');
+  test.equal(data.collectionData['fast-render-coll'], expectedFastRenderCollData);
+});
\ No newline at end of file
diff --git a/packages/markdown/.gitignore b/packages/markdown/.gitignore
new file mode 100755
index 00000000..677a6fc2
--- /dev/null
+++ b/packages/markdown/.gitignore
@@ -0,0 +1 @@
+.build*
diff --git a/packages/markdown/README.md b/packages/markdown/README.md
new file mode 100755
index 00000000..96c5725e
--- /dev/null
+++ b/packages/markdown/README.md
@@ -0,0 +1,40 @@
+markdown
+========
+
+GitHub flavored markdown parser for Meteor based on marked.js newest version, updated by xet7.
+
+GFM tables and linebreaks are enabled by default.
+
+
+Usage
+-----
+
+Anywhere inside your template add markdown block and write markdown inside.
+
+Example:
+
+```
+{{#markdown}}
+
+...markdown text here...
+
+{{/markdown}}
+```
+
+That's it!
+
+
+Thanks to:
+----------
+
+- Christopher Jeffrey for <a href="https://github.com/chjj/marked" target="_blank">marked.js</a>
+
+- Bozhao Yu for original <a href="https://github.com/yubozhao/meteor-markdown" target="_blank">meteor-markdown</a> package (I just made this package compatible with Meteor 0.9+)
+
+- Bernhard Millauer - for contributions to this package
+
+- <a href="https://github.com/xet7">xet7</a> for updating to newest GFM package.
+
+License
+-------
+MIT
diff --git a/packages/markdown/markdown.js b/packages/markdown/markdown.js
new file mode 100755
index 00000000..bb015cc4
--- /dev/null
+++ b/packages/markdown/markdown.js
@@ -0,0 +1,9 @@
+var mark = marked;
+
+mark.setOptions({
+  gfm: true,
+  tables: true,
+  breaks: true
+});
+
+Markdown = mark;
diff --git a/packages/markdown/marked/.editorconfig b/packages/markdown/marked/.editorconfig
new file mode 100644
index 00000000..97ff4e8a
--- /dev/null
+++ b/packages/markdown/marked/.editorconfig
@@ -0,0 +1,16 @@
+root = true
+
+[*.{json,js}]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+
+[*.md, !test/*.md]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = tab
+indent_size = 4
\ No newline at end of file
diff --git a/packages/markdown/marked/.eslintignore b/packages/markdown/marked/.eslintignore
new file mode 100644
index 00000000..121531af
--- /dev/null
+++ b/packages/markdown/marked/.eslintignore
@@ -0,0 +1 @@
+*.min.js
diff --git a/packages/markdown/marked/.eslintrc.json b/packages/markdown/marked/.eslintrc.json
new file mode 100644
index 00000000..1800cb72
--- /dev/null
+++ b/packages/markdown/marked/.eslintrc.json
@@ -0,0 +1,29 @@
+{
+  "extends": "standard",
+  "plugins": [
+    "standard"
+  ],
+  "parserOptions": { "ecmaVersion": 5 },
+  "rules": {
+    "semi": ["error", "always"],
+    "indent": ["warn", 2, {
+      "VariableDeclarator": { "var": 2 },
+      "SwitchCase": 1,
+      "outerIIFEBody": 0
+    }],
+    "space-before-function-paren": "off",
+    "object-curly-spacing": "off",
+    "operator-linebreak": ["error", "before", { "overrides": { "=": "after" } }],
+    "no-cond-assign": "off",
+    "no-useless-escape": "off",
+    "no-return-assign": "off",
+    "one-var": "off",
+    "no-control-regex": "off"
+  },
+  "env": {
+    "node": true,
+    "browser": true,
+    "amd": true,
+    "jasmine": true
+  }
+}
diff --git a/packages/markdown/marked/.gitattributes b/packages/markdown/marked/.gitattributes
new file mode 100644
index 00000000..8f2d8c35
--- /dev/null
+++ b/packages/markdown/marked/.gitattributes
@@ -0,0 +1,2 @@
+test/* linguist-vendored
+
diff --git a/packages/markdown/marked/.github/ISSUE_TEMPLATE.md b/packages/markdown/marked/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000..9df84eaf
--- /dev/null
+++ b/packages/markdown/marked/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,42 @@
+**Marked version:**
+
+**Markdown flavor:** Markdown.pl|CommonMark|GitHub Flavored Markdown|n/a
+
+<!-- The NPM version or commit hash having the issue --> 
+
+<!-- 
+
+	If submitting something other than a defect with Marked itself, please use the following:
+
+**Proposal type:** new feature | project operations | other
+
+## What pain point are you perceiving?
+
+## What solution are you suggesting?
+
+-->
+
+## Expectation
+
+**CommonMark Demo:** [demo](https://spec.commonmark.org/dingus/)
+<!-- You can replace the link above with a permalink from: https://spec.commonmark.org/dingus/ -->
+
+<!-- Describe the output you are expecting from marked -->
+
+## Result
+
+**Marked Demo:** [demo](https://marked.js.org/demo/)
+<!-- You can replace the link above with a permalink from: https://marked.js.org/demo/ -->
+
+<!-- Describe the output you received from marked -->
+
+## What was attempted
+
+<!-- Describe what code combination got you there -->
+
+<!-- 
+	If error is thrown add the following:
+
+## Call stack & console log
+
+-->
diff --git a/packages/markdown/marked/.github/ISSUE_TEMPLATE/Bug_report.md b/packages/markdown/marked/.github/ISSUE_TEMPLATE/Bug_report.md
new file mode 100644
index 00000000..d8042b4d
--- /dev/null
+++ b/packages/markdown/marked/.github/ISSUE_TEMPLATE/Bug_report.md
@@ -0,0 +1,27 @@
+---

+name: Bug report

+about: Marked says it does this thing but does not

+

+---

+

+**Describe the bug**

+A clear and concise description of what the bug is.

+

+**To Reproduce**

+Steps to reproduce the behavior:

+

+<!-- If possible, use the Marked Demo permalink and compare to the CommonMark Dingus permalink to demonstrate the bug -->

+<!--

+1. [Marked Demo](https://marked.js.org/demo/)

+2. [CommonMark Demo](https://spec.commonmark.org/dingus/)

+-->

+

+<!-- If you need a specific version and options to reproduce the bug, use the following template -->

+<!--

+1. Install marked `npm install --save marked@0.3.19` with the version you are using

+2. Run marked with input string and options such as `marked('hello *world*', {gfm: true})`

+3. Actual output (or error) is...

+-->

+

+**Expected behavior**

+A clear and concise description of what you expected to happen.

diff --git a/packages/markdown/marked/.github/ISSUE_TEMPLATE/Feature_request.md b/packages/markdown/marked/.github/ISSUE_TEMPLATE/Feature_request.md
new file mode 100644
index 00000000..745d4b43
--- /dev/null
+++ b/packages/markdown/marked/.github/ISSUE_TEMPLATE/Feature_request.md
@@ -0,0 +1,14 @@
+---

+name: Feature request

+about: Marked doesn't do this thing and I think it should

+

+---

+

+**Describe the feature**

+A clear and concise description of what you would like.

+

+**Why is this feature necessary?**

+A clear and concise description of why.

+

+**Describe alternatives you've considered**

+A clear and concise description of any alternative solutions or features you've considered.

diff --git a/packages/markdown/marked/.github/ISSUE_TEMPLATE/Proposal.md b/packages/markdown/marked/.github/ISSUE_TEMPLATE/Proposal.md
new file mode 100644
index 00000000..aa94da3a
--- /dev/null
+++ b/packages/markdown/marked/.github/ISSUE_TEMPLATE/Proposal.md
@@ -0,0 +1,11 @@
+---
+name: Proposal
+about: Marked doesn't do this thing and I think it should
+ 
+---
+ 
+**What pain point are you perceiving?.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+ 
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
diff --git a/packages/markdown/marked/.github/PULL_REQUEST_TEMPLATE.md b/packages/markdown/marked/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000..8274e607
--- /dev/null
+++ b/packages/markdown/marked/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,53 @@
+
+<!--
+
+	If release PR, add ?template=release.md to the PR url to use the release PR template.
+
+	If badging PR, add ?template=badges.md to the PR url to use the badges PR template.
+
+	Otherwise, you are stating this PR fixes an issue that has been submitted; or,
+	describes the issue or proposal under consideration and contains the project-related code to implement.
+
+-->
+
+**Marked version:**
+
+<!-- The NPM version or commit hash having the issue -->
+
+**Markdown flavor:** Markdown.pl|CommonMark|GitHub Flavored Markdown|n/a
+
+## Description
+
+- Fixes #### (if fixing a known issue; otherwise, describe issue using the following format)
+
+<!--
+
+	If no issue exists that you're aware of. The maintainers should be able to figure out if it's a duplicate.
+
+## Expectation
+
+Describe the output you are expecting from marked
+
+## Result
+
+Describe the output you received from marked
+
+## What was attempted
+
+Describe what code combination got you there
+
+-->
+
+## Contributor
+
+- [ ] Test(s) exist to ensure functionality and minimize regression (if no tests added, list tests covering this PR); or,
+- [ ] no tests required for this PR.
+- [ ] If submitting new feature, it has been documented in the appropriate places.
+
+## Committer
+
+In most cases, this should be a different person than the contributor.
+
+- [ ] Draft GitHub release notes have been updated.
+- [ ] CI is green (no forced merge required).
+- [ ] Merge PR
diff --git a/packages/markdown/marked/.github/PULL_REQUEST_TEMPLATE/badges.md b/packages/markdown/marked/.github/PULL_REQUEST_TEMPLATE/badges.md
new file mode 100644
index 00000000..2078243d
--- /dev/null
+++ b/packages/markdown/marked/.github/PULL_REQUEST_TEMPLATE/badges.md
@@ -0,0 +1,50 @@
+**@mention the contributor:**
+
+## Recommendation to:
+
+- [ ] Change user group
+- [ ] Add a badge
+- [ ] Remove a badge
+
+<!-- 
+
+	Explain your reasoning behind tagging that person. 
+
+	Preferably by citing objective examples, like PRs, Issues, and so on.
+
+-->
+
+## As the one mentioned, I would like to:
+
+- [ ] accept the recommendation; or,
+- [ ] graciously decline; or,
+- [ ] dispute the recommendation
+
+within 30 days, if you have not indicated which option you are taking one of the following will happen:
+
+1. If adding a badge, we will assume you are graciously declining.
+2. If removing a badge, we will assume you do not want to dispute the recommendation; therefore, the badge will be removed.
+
+<!--
+
+	Why would someone not accept a badge? Loads of reasons depending on the circumstances.
+
+	1. If you're a committer and someone puts a badge for you on having decision making authority in an area, do you really a) think you earned it and b) think you can do that *and* all the other stuff you got going as a committer, admin, or publisher (not to even mention your outside life)? Maybe not. And that's okay. Thank them for the recognition, explain you aren't able to take more on at the moment. It's cool to get recognized though.
+	2. Maybe you don't feel you actually earned it yet. I remember being in an interview once. The interviewer asked me to give an example of going above and beyond the call of duty. I said, "That's hard. Because what you consider going above and beyond may be what I consider to be 'just rising to'. If we're in battle and you get wounded and I pull you out of the frey before heading back into it, I don't consider that going above and beyond; I consider that rising to."
+
+	Why would someone remove their own badge? Loads of reasons...
+
+	1. Maybe you got a lot going on right now and want to broadcast to the Marked community that, "Hey, I don't want to say I'm going to do this unless I can really commit to it right now in a way that serves the project well." That's awesome! That takes courage! Because a) saying "no" is hard for most humans ("people pleasers") and b) the alternative, well, for those of us here since about October of 2017 (and prior), we know what the alternative can look like.
+	2. Maybe you just think you've done all you can to help and learned all you can from the experience. Again, very awesome and courageous. It takes courage to know when to walk away on your own accord.
+
+	Why would you want to remove someone's badge? Loads of reasons...
+
+	1. Maybe they have decision making authority on something. You asked for their advice. And, you ended up waiting almost a month before receiving a response.
+	2. Maybe it was relevant at the time (Master of Marked, for example) but you think they've lost their former level of skill (fell out of practice, for example). They could always get it back.
+	3. Maybe to signal to them that, "Hey, you seem to have forgotten about us. Are you still around (or alive)?"
+
+	Anyway, you get the idea. This isn't about good or bad...it's just about giving the community a simple game mechanic by which to publicly say, "Thank you" or "Here's what my status is" in the community or "Hey, I think something's wrong here" in a civil manner.
+
+-->
+
+Note: All committers must approve via review before merging, the disapproving committer can simply close the PR.
\ No newline at end of file
diff --git a/packages/markdown/marked/.github/PULL_REQUEST_TEMPLATE/release.md b/packages/markdown/marked/.github/PULL_REQUEST_TEMPLATE/release.md
new file mode 100644
index 00000000..29cd7f2e
--- /dev/null
+++ b/packages/markdown/marked/.github/PULL_REQUEST_TEMPLATE/release.md
@@ -0,0 +1,25 @@
+## Publisher
+
+- [ ] `$ npm version` has been run.
+- [ ] Release notes in [draft GitHub release](https://github.com/markedjs/marked/releases) are up to date
+- [ ] Release notes include which flavors and versions of Markdown are supported by this release
+- [ ] Committer checklist is complete.
+- [ ] Merge PR.
+- [ ] Publish GitHub release using `master` with correct version number.
+- [ ] `$ npm publish` has been run.
+- [ ] Create draft GitHub release to prepare next release.
+
+Note: If merges to `master` occur after submitting this PR and before running `$ npm pubish` you should be able to
+
+1. pull from `upstream/master` (`git pull upstream master`) into the branch holding this version,
+2. run `$ npm run build` to regenerate the `min` file, and
+3. commit and push the updated changes.
+
+## Committer
+
+In most cases, this should be someone different than the publisher.
+
+- [ ] Version in `package.json` has been updated (see [PUBLISHING.md](https://github.com/markedjs/marked/blob/master/docs/PUBLISHING.md)).
+- [ ] The `marked.min.js` has been updated; or,
+- [ ] release does not change library.
+- [ ] CI is green (no forced merge required).
diff --git a/packages/markdown/marked/.gitignore b/packages/markdown/marked/.gitignore
new file mode 100644
index 00000000..68ccf75d
--- /dev/null
+++ b/packages/markdown/marked/.gitignore
@@ -0,0 +1,3 @@
+.DS_Store
+node_modules/
+test/compiled_tests
diff --git a/packages/markdown/marked/.travis.yml b/packages/markdown/marked/.travis.yml
new file mode 100644
index 00000000..8ff71da4
--- /dev/null
+++ b/packages/markdown/marked/.travis.yml
@@ -0,0 +1,46 @@
+language: node_js
+
+jobs:
+  fast_finish: true
+  allow_failures:
+    - stage: security scan 🔐
+
+  include:
+    - stage: unit tests 👩🏽‍💻
+      script: npm run test:unit
+      node_js: lts/*
+
+    - stage: spec tests 👩🏽‍💻
+      script: npm run test:specs
+      node_js: v4
+    - node_js: lts/*
+    - node_js: node
+
+    - stage: lint ✨
+      script: npm run test:lint
+      node_js: lts/*
+
+    - stage: minify 🗜️
+      script: |
+        npm run build
+        if ! git diff --quiet; then
+          git config --global user.email "travis@travis-ci.org"
+          git config --global user.name "Travis-CI"
+          git config credential.helper "store --file=.git/credentials"
+          echo "https://${GITHUB_TOKEN}:@github.com" > .git/credentials
+          git commit -am '🗜️ minify [skip ci]'
+          git push origin HEAD:${TRAVIS_BRANCH}
+        fi
+      node_js: lts/*
+      if: branch = master AND type = push
+
+    - stage: security scan 🔐
+      script: npm run test:redos
+      node_js: lts/*
+
+cache:
+  directories:
+    - node_modules
+
+git:
+  depth: 3
diff --git a/packages/markdown/marked/LICENSE.md b/packages/markdown/marked/LICENSE.md
new file mode 100644
index 00000000..64b41a0e
--- /dev/null
+++ b/packages/markdown/marked/LICENSE.md
@@ -0,0 +1,43 @@
+# License information
+
+## Contribution License Agreement
+
+If you contribute code to this project, you are implicitly allowing your code
+to be distributed under the MIT license. You are also implicitly verifying that
+all code is your original work. `</legalese>`
+
+## Marked
+
+Copyright (c) 2011-2018, Christopher Jeffrey (https://github.com/chjj/)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+## Markdown
+
+Copyright © 2004, John Gruber 
+http://daringfireball.net/ 
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+* Neither the name “Markdown” nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+This software is provided by the copyright holders and contributors “as is” and any express or implied warranties, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose are disclaimed. In no event shall the copyright owner or contributors be liable for any direct, indirect, incidental, special, exemplary, or consequential damages (including, but not limited to, procurement of substitute goods or services; loss of use, data, or profits; or business interruption) however caused and on any theory of liability, whether in contract, strict liability, or tort (including negligence or otherwise) arising in any way out of the use of this software, even if advised of the possibility of such damage.
diff --git a/packages/markdown/marked/Makefile b/packages/markdown/marked/Makefile
new file mode 100644
index 00000000..7deead54
--- /dev/null
+++ b/packages/markdown/marked/Makefile
@@ -0,0 +1,15 @@
+all:
+	@cp lib/marked.js marked.js
+	@uglifyjs --comments '/\*[^\0]+?Copyright[^\0]+?\*/' -o marked.min.js lib/marked.js
+
+clean:
+	@rm marked.js
+	@rm marked.min.js
+
+bench:
+	@node test --bench
+
+man/marked.1.txt:
+	groff -man -Tascii man/marked.1 | col -b > man/marked.1.txt
+
+.PHONY: clean all
diff --git a/packages/markdown/marked/README.md b/packages/markdown/marked/README.md
new file mode 100644
index 00000000..2dfd5cd1
--- /dev/null
+++ b/packages/markdown/marked/README.md
@@ -0,0 +1,76 @@
+<a href="https://marked.js.org">
+  <img width="60px" height="60px" src="https://marked.js.org/img/logo-black.svg" align="right" />
+</a>
+
+# Marked
+
+[![npm](https://badgen.net/npm/v/marked)](https://www.npmjs.com/package/marked)
+[![gzip size](https://badgen.net/badgesize/gzip/https://cdn.jsdelivr.net/npm/marked/marked.min.js)](https://cdn.jsdelivr.net/npm/marked/marked.min.js)
+[![install size](https://badgen.net/packagephobia/install/marked)](https://packagephobia.now.sh/result?p=marked)
+[![downloads](https://badgen.net/npm/dt/marked)](https://www.npmjs.com/package/marked)
+[![dep](https://badgen.net/david/dep/markedjs/marked?label=deps)](https://david-dm.org/markedjs/marked)
+[![dev dep](https://badgen.net/david/dev/markedjs/marked?label=devDeps)](https://david-dm.org/markedjs/marked?type=dev)
+[![travis](https://badgen.net/travis/markedjs/marked)](https://travis-ci.org/markedjs/marked)
+[![snyk](https://snyk.io/test/npm/marked/badge.svg)](https://snyk.io/test/npm/marked)
+
+- ⚡ built for speed
+- ⬇️ low-level compiler for parsing markdown without caching or blocking for long periods of time
+- ⚖️ light-weight while implementing all markdown features from the supported flavors & specifications
+- 🌐 works in a browser, on a server, or from a command line interface (CLI)
+
+## Demo
+
+Checkout the [demo page](https://marked.js.org/demo/) to see marked in action ⛹️
+
+## Docs
+
+Our [documentation pages](https://marked.js.org) are also rendered using marked 💯
+
+Also read about:
+
+* [Options](https://marked.js.org/#/USING_ADVANCED.md)
+* [Extensibility](https://marked.js.org/#/USING_PRO.md)
+
+## Installation
+
+**CLI:** `npm install -g marked`
+
+**In-browser:** `npm install marked`
+
+## Usage
+
+### Warning: 🚨 Marked does not [sanitize](https://marked.js.org/#/USING_ADVANCED.md#options) the output HTML by default 🚨
+
+**CLI**
+
+``` bash
+$ marked -o hello.html
+hello world
+^D
+$ cat hello.html
+<p>hello world</p>
+```
+
+**Browser**
+
+```html
+<!doctype html>
+<html>
+<head>
+  <meta charset="utf-8"/>
+  <title>Marked in the browser</title>
+</head>
+<body>
+  <div id="content"></div>
+  <script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
+  <script>
+    document.getElementById('content').innerHTML =
+      marked('# Marked in the browser\n\nRendered by **marked**.');
+  </script>
+</body>
+</html>
+```
+
+## License
+
+Copyright (c) 2011-2018, Christopher Jeffrey. (MIT License)
diff --git a/packages/markdown/marked/bin/marked b/packages/markdown/marked/bin/marked
new file mode 100755
index 00000000..0ea63c54
--- /dev/null
+++ b/packages/markdown/marked/bin/marked
@@ -0,0 +1,215 @@
+#!/usr/bin/env node
+
+/**
+ * Marked CLI
+ * Copyright (c) 2011-2013, Christopher Jeffrey (MIT License)
+ */
+
+var fs = require('fs'),
+    path = require('path'),
+    marked = require('../');
+
+/**
+ * Man Page
+ */
+
+function help() {
+  var spawn = require('child_process').spawn;
+
+  var options = {
+    cwd: process.cwd(),
+    env: process.env,
+    setsid: false,
+    stdio: 'inherit'
+  };
+
+  spawn('man', [path.resolve(__dirname, '/../man/marked.1')], options)
+    .on('error', function() {
+      fs.readFile(path.resolve(__dirname, '/../man/marked.1.txt'), 'utf8', function(err, data) {
+        if (err) throw err;
+        console.log(data);
+      });
+    });
+}
+
+function version() {
+  var pkg = require('../package.json');
+  console.log(pkg.version);
+}
+
+/**
+ * Main
+ */
+
+function main(argv, callback) {
+  var files = [],
+      options = {},
+      input,
+      output,
+      string,
+      arg,
+      tokens,
+      opt;
+
+  function getarg() {
+    var arg = argv.shift();
+
+    if (arg.indexOf('--') === 0) {
+      // e.g. --opt
+      arg = arg.split('=');
+      if (arg.length > 1) {
+        // e.g. --opt=val
+        argv.unshift(arg.slice(1).join('='));
+      }
+      arg = arg[0];
+    } else if (arg[0] === '-') {
+      if (arg.length > 2) {
+        // e.g. -abc
+        argv = arg.substring(1).split('').map(function(ch) {
+          return '-' + ch;
+        }).concat(argv);
+        arg = argv.shift();
+      } else {
+        // e.g. -a
+      }
+    } else {
+      // e.g. foo
+    }
+
+    return arg;
+  }
+
+  while (argv.length) {
+    arg = getarg();
+    switch (arg) {
+      case '--test':
+        return require('../test').main(process.argv.slice());
+      case '-o':
+      case '--output':
+        output = argv.shift();
+        break;
+      case '-i':
+      case '--input':
+        input = argv.shift();
+        break;
+      case '-s':
+      case '--string':
+        string = argv.shift();
+        break;
+      case '-t':
+      case '--tokens':
+        tokens = true;
+        break;
+      case '-h':
+      case '--help':
+        return help();
+      case '-v':
+      case '--version':
+        return version();
+      default:
+        if (arg.indexOf('--') === 0) {
+          opt = camelize(arg.replace(/^--(no-)?/, ''));
+          if (!marked.defaults.hasOwnProperty(opt)) {
+            continue;
+          }
+          if (arg.indexOf('--no-') === 0) {
+            options[opt] = typeof marked.defaults[opt] !== 'boolean'
+              ? null
+              : false;
+          } else {
+            options[opt] = typeof marked.defaults[opt] !== 'boolean'
+              ? argv.shift()
+              : true;
+          }
+        } else {
+          files.push(arg);
+        }
+        break;
+    }
+  }
+
+  function getData(callback) {
+    if (!input) {
+      if (files.length <= 2) {
+        if (string) {
+          return callback(null, string);
+        }
+        return getStdin(callback);
+      }
+      input = files.pop();
+    }
+    return fs.readFile(input, 'utf8', callback);
+  }
+
+  return getData(function(err, data) {
+    if (err) return callback(err);
+
+    data = tokens
+      ? JSON.stringify(marked.lexer(data, options), null, 2)
+      : marked(data, options);
+
+    if (!output) {
+      process.stdout.write(data + '\n');
+      return callback();
+    }
+
+    return fs.writeFile(output, data, callback);
+  });
+}
+
+/**
+ * Helpers
+ */
+
+function getStdin(callback) {
+  var stdin = process.stdin,
+      buff = '';
+
+  stdin.setEncoding('utf8');
+
+  stdin.on('data', function(data) {
+    buff += data;
+  });
+
+  stdin.on('error', function(err) {
+    return callback(err);
+  });
+
+  stdin.on('end', function() {
+    return callback(null, buff);
+  });
+
+  try {
+    stdin.resume();
+  } catch (e) {
+    callback(e);
+  }
+}
+
+function camelize(text) {
+  return text.replace(/(\w)-(\w)/g, function(_, a, b) {
+    return a + b.toUpperCase();
+  });
+}
+
+function handleError(err) {
+  if (err.code === 'ENOENT') {
+    console.error(`marked: output to ${err.path}: No such directory`);
+    return process.exit(1);
+  }
+  throw err;
+}
+
+/**
+ * Expose / Entry Point
+ */
+
+if (!module.parent) {
+  process.title = 'marked';
+  main(process.argv.slice(), function(err, code) {
+    if (err) return handleError(err);
+    return process.exit(code || 0);
+  });
+} else {
+  module.exports = main;
+}
diff --git a/packages/markdown/marked/bower.json b/packages/markdown/marked/bower.json
new file mode 100644
index 00000000..57c91f03
--- /dev/null
+++ b/packages/markdown/marked/bower.json
@@ -0,0 +1,23 @@
+{
+  "name": "marked",
+  "homepage": "https://github.com/markedjs/marked",
+  "authors": [
+    "Christopher Jeffrey <chjjeffrey@gmail.com>"
+  ],
+  "description": "A markdown parser built for speed",
+  "keywords": [
+    "markdown",
+    "markup",
+    "html"
+  ],
+  "main": "lib/marked.js",
+  "license": "MIT",
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "app/bower_components",
+    "test",
+    "tests"
+  ]
+}
diff --git a/packages/markdown/marked/component.json b/packages/markdown/marked/component.json
new file mode 100644
index 00000000..7ebd0356
--- /dev/null
+++ b/packages/markdown/marked/component.json
@@ -0,0 +1,10 @@
+{
+  "name": "marked",
+  "version": "0.3.4",
+  "repo": "markedjs/marked",
+  "description": "A markdown parser built for speed",
+  "keywords": ["markdown", "markup", "html"],
+  "scripts": ["lib/marked.js"],
+  "main": "lib/marked.js",
+  "license": "MIT"
+}
diff --git a/packages/markdown/marked/docs/AUTHORS.md b/packages/markdown/marked/docs/AUTHORS.md
new file mode 100644
index 00000000..dd914095
--- /dev/null
+++ b/packages/markdown/marked/docs/AUTHORS.md
@@ -0,0 +1,269 @@
+# Authors
+
+Marked takes an encompassing approach to its community. As such, you can think of these as [concentric circles](https://medium.com/the-node-js-collection/healthy-open-source-967fa8be7951), where each group encompases the following groups.
+
+<table>
+  <tbody>
+  	<tr>
+      <td align="center" valign="top" style="width:32%">
+        <a href="https://github.com/chjj">
+          <img width="100" height="100" src="https://github.com/chjj.png?s=150">
+        </a>
+        <br>
+        <a href="https://github.com/chjj">Christopher Jeffrey</a>
+        <div>Original Author</div>
+        <small>Started the fire</small>
+      </td>
+      <td align="center" valign="top" style="width:32%">
+        <a href="https://github.com/joshbruce">
+          <img width="100" height="100" src="https://github.com/joshbruce.png?s=150">
+        </a>
+        <br>
+        <a href="https://joshbruce.com">Josh Bruce</a>
+        <div>Publisher</div>
+        <small>Release Wrangler; Humaning Helper; Heckler of Hypertext</small>
+      </td>
+      <td align="center" valign="top" style="width:32%">
+        <a href="https://github.com/styfle">
+          <img width="100" height="100" src="https://github.com/styfle.png?s=150">
+        </a>
+        <br>
+        <a href="https://www.ceriously.com">Steven</a>
+        <div>Publisher</div>
+        <small>Release Wrangler; Dr. Docs; Open source, of course; GitHub Guru; Humaning Helper</small>
+      </td>
+    </tr>
+  	<tr>
+      <td align="center" valign="top">
+        <a href="https://github.com/davisjam">
+          <img width="100" height="100" src="https://github.com/davisjam.png?s=150">
+        </a>
+        <br>
+        <a href="https://github.com/davisjam">Jamie Davis</a>
+        <div>Committer</div>
+        <small>Seeker of Security</small>
+      </td>
+      <td align="center" valign="top">
+        <a href="https://github.com/UziTech">
+          <img width="100" height="100" src="https://github.com/UziTech.png?s=150">
+        </a>
+        <br>
+        <a href="https://tony.brix.ninja">Tony Brix</a>
+        <div>Publisher</div>
+        <small>Release Wrangler; Titan of the test harness; Dr. DevOps</small>
+      </td>
+      <td align="center" valign="top">
+        &nbsp;
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+<table>
+  <tbody>
+    <tr>
+      <td align="center" valign="top">
+        <a href="https://github.com/intcreator">
+          <img width="100" height="100" src="https://github.com/intcreator.png?s=150">
+        </a>
+        <br>
+        <a href="https://github.com/intcreator">Brandon der Blätter</a>
+        <div>Contributor</div>
+        <small>Curious Contributor</small>
+      </td>
+      <td align="center" valign="top">
+        <a href="https://github.com/carlosvalle">
+          <img width="100" height="100" src="https://github.com/carlosvalle.png?s=150">
+        </a>
+        <br>
+        <a href="https://github.com/carlosvalle">Carlos Valle</a>
+        <div>Contributor</div>
+        <small>Maker of the Marked mark from 2018 to present</small>
+      </td>
+      <td align="center" width="20%" valign="top">
+        <a href="https://github.com/Feder1co5oave">
+          <img width="100" height="100" src="https://github.com/Feder1co5oave.png?s=150">
+        </a>
+        <br>
+        <a href="https://github.com/Feder1co5oave">Federico Soave</a>
+        <div>Contributor</div>
+        <small>Regent of the Regex; Master of Marked</small>
+      </td>
+      <td align="center" valign="top">
+        <a href="https://github.com/karenyavine">
+          <img width="100" height="100" src="https://github.com/karenyavine.png?s=150">
+        </a>
+        <br>
+        <a href="https://github.com/karenyavine">Karen Yavine</a>
+        <div>Contributor</div>
+        <small>Snyk's Security Saint</small>
+      </td>
+     </tr>
+     <tr>
+      <td align="center" valign="top">
+        <a href="https://github.com/KostyaTretyak">
+          <img width="100" height="100" src="https://github.com/KostyaTretyak.png?s=150">
+        </a>
+        <br>
+        <a href="https://github.com/KostyaTretyak">Костя Третяк</a>
+        <div>Contributor</div>
+        <small></small>
+      </td>
+      <td align="center" width="20%" valign="top">
+        <a href="https://github.com/tomtheisen">
+          <img width="100" height="100" src="https://github.com/tomtheisen.png?s=150">
+        </a>
+        <br>
+        <a href="https://github.com/tomtheisen">Tom Theisen</a>
+        <div>Contributor</div>
+        <small>Defibrillator</small>
+      </td>
+      <td align="center" width="20%" valign="top">
+        <a href="https://github.com/mccraveiro">
+          <img width="100" height="100" src="https://github.com/mccraveiro.png?s=150">
+        </a>
+        <br>
+        <a href="https://github.com/mccraveiro">Mateus Craveiro</a>
+        <div>Contributor</div>
+        <small>Defibrillator</small>
+      </td>
+      <td align="center" width="20%" valign="top">
+      </td>
+     </tr>
+  </tbody>
+</table>
+
+## Publishers
+
+Publishers are admins who also have the responsibility, privilege, and burden of publishing the new releases to NPM and performing outreach and external stakeholder communications. Further, when things go pear-shaped, they're the ones taking most of the heat. Finally, when things go well, they're the primary ones praising the contributors who made it possible.
+
+(In other words, while Admins are focused primarily on the internal workings of the project, Publishers are focused on internal *and* external concerns.)
+
+**Should not exceed 2:** Having more people with the authority to publish a release can quickly turn into a consensus seeking nightmare (design by committee). Having only one is preferred (Directly Responsible Individual); however, given the nature of the project and its history, having an immediate fallback, and a potential deep fallback (Original author) is probably a good idea.
+
+[Details on badges](#badges)
+
+## Admins
+
+Admins are committers who also have the responsibility, privilege, and burden of selecting committers and making sure the project itself runs smoothly, which includes community maintenance, governance, dispute resolution, and so on. (Letting the contributors easily enter into, and work within, the project to begin contributing, with as little friction as possible.)
+
+**Should not exceed 3:** When there are too many people with the ability to resolve disputes, the dispute itself can quickly turn into a dispute amongst the admins themselves; therefore, we want this group to be small enough to commit to action and large enough to not put too much burden on one person. (Should ensure faster resolution and responsiveness.)
+
+To be listed: Admins are usually selected from the pool of committers (or they volunteer, using the same process) who demonstrate good understanding of the marked culture, operations, and do their best to help new contributors get up to speed on how to contribute effectively to the project.
+
+To be removed: You can remove yourself through the [GitHub UI](https://help.github.com/articles/removing-yourself-from-a-collaborator-s-repository/).
+
+[Details on badges](#badges)
+
+## Committers
+
+Committers are contributors who also have the responsibility, privilege, some might even say burden of being able to review and merge contributions (just usually not their own).
+
+A note on "decision making authority". This is related to submitting PRs and the [advice process](http://www.reinventingorganizationswiki.com/Decision_Making). The person marked as having decision making authority over a certain area should be sought for advice in that area before committing to a course of action.
+
+**Should not exceed 5:** For larger PRs affecting more of the codebase and, most likely, review by more people, we try to keep this pool small and responsive and let those with decision making authority have final say without negative repercussions from the other committers.
+
+To be listed: Committers are usually selected (or they volunteer, using the same process) from contributors who enter the discussions regarding the future direction of Marked (maybe even doing informal reviews of contributions despite not being able to merge them yourself).
+
+To be removed: You can remove yourself through the [GitHub UI](https://help.github.com/articles/removing-yourself-from-a-collaborator-s-repository/).
+
+A note on volunteering:
+
+1. Please do not volunteer unless you believe you can demonstrate to your peers you can do the work required.
+2. Please do not overcommit yourself; we count on those committed to the project to be responsive. Really consider, with all you have going on, wehther you able to really commit to it.
+3. Don't let the previous frighten you away, it can always be changed later by you or your peers.
+
+[Details on badges](#badges)
+
+## Contributors
+
+Contributors are users who submit a [PR](https://github.com/markedjs/marked/pulls), [Issue](https://github.com/markedjs/marked/issues), or collaborate in making Marked a better product and experience for all the users.
+
+To be listed: make a contribution and, if it has significant impact, the committers may be able to add you here.
+
+To be removed: please let us know or submit a PR.
+
+[Details on badges](#badges)
+
+## Users
+
+Users are anyone using Marked in some fashion, without them, there's no reason for us to exist.
+
+|Individual or Organization |Website                 |Project                              |Submitted by                                        |
+|:--------------------------|:-----------------------|:------------------------------------|:---------------------------------------------------|
+|MarkedJS                   |https://marked.js.org   |https://github.com/markedjs/marked   |The marked committers                               |
+
+To be listed: All fields are optional. Contact any of the committers or, more timely, submit a pull request with the following (using the first row as an example):
+
+- **Individual or Organization:** The name you would like associated with the record.
+- **Website:** A URL to a standalone website for the project.
+- **Project:** A URL for the repository of the project using marked.
+- **Submitted by:** The name and optional honorifics for the person adding the listing.
+
+To be removed: Same as above. Only instead of requesting addition request deletion or delete the row yourself.
+
+<h2 id="badges">Badges</h2>
+
+Badges? You don't *need* no stinkin' badges.
+
+Movie references aside. (It was either that or, "Let's play a game", but that would have been creepy&hellip;that's why it will most likely come later.)
+
+Badges? If you *want* 'em, we got 'em, and here's how you get 'em (and&hellip;dramatic pause&hellip;why not two dramatic pauses for emphasis?&hellip; how they can be taken away).
+
+- [ ] Add the appropriate badge to the desired contributor in the desired column of this page, even if they're not listed here yet.
+- [ ] Submit a PR (we're big on PRs around here, if you haven't noticed, help us help you).
+- [ ] Follow the instructions for submitting a badge PR. (There are more details to find within. Come on. Everybody likes surprises, right? No? Actually, we just try to put documentation where it belongs, closer to the code and part of the sequence of events.)
+
+### Badges at play:
+
+<dl>
+	<dt>Curious Contributor</dt>
+	<dd>A contributor with less than one year on this page who is actively engaged in submitting PRs, Issues, making recommendations, sharing thoughts&hellip;without being too annoying about it (let's be clear, submitting 100 Issues recommending the Marked Committers send everyone candy is trying for the badge, not honestly earning it).</dd>
+	<dt>Dr. DevOps</dt>
+	<dd>
+		<p>Someone who understands and contributes to improving the developer experience and flow of Marked into the world.</p>
+		<blockquote>
+			"The main characteristic of the DevOps movement is to strongly advocate automation and monitoring at all steps of software construction, from integration, testing, releasing to deployment and infrastructure management. DevOps aims at shorter development cycles, increased deployment frequency, more dependable releases, in close alignment with business objectives." ~ <a href="https://www.wikipedia.org/wiki/DevOps">Wikipedia</a>
+		</blockquote>
+	</dd>
+  <dt>Dr. Docs</dt>
+  <dd>Someone who has contributed a great deal to the creation and maintainance of the non-code areas of marked.</dd>
+	<dt>Eye for the CLI</dt>
+	<dd>At this point? Pretty much anyone who can update that `man` file to the current Marked version without regression in the CLI tool itself.</dd>
+	<dt>GitHub Guru</dt>
+	<dd>Someone who always seems to be able to tell you easier ways to do things with GitHub.</dd>
+	<dt>Humaning Helper</dt>
+	<dd>Someone who goes out of their way to help contributors feel welcomed and valued. Further, someone who takes the extra steps(s) necessary to help new contributors get up to speed. Finally, they maintain composure even in times of disagreement and dispute resolution.</dd>
+	<dt>Heckler of Hypertext</dt>
+	<dd>Someone who demonstrates an esoteric level of knowledge when it comes to HTML. In other words, someone who says things like, "Did you know most Markdown flavors don't have a way to render a description list (`dl`)? All the more reason Markdown `!==` HTML."</dd>
+	<dt>Markdown Maestro</dt>
+	<dd>You know that person who knows about way too many different flavors of Markdown? The one who maybe seems a little too obsessed with the possibilities of Markdown beyond HTML? Come on. You know who they are. Or, at least you could, if you give them this badge.</dd>
+	<dt>Master of Marked</dt>
+	<dd>Someone who demonstrates they know the ins and outs of the codebase for Marked.</dd>
+	<dt>Open source, of course</dt>
+	<dd>Someone who advocates for and has a proven understanding of how to operate within open source communities.</dd>
+	<dt>Regent of the Regex</dt>
+	<dd><p>Can you demonstrate you understand the following without Google and Stackoverflow?</p>
+		<p><code>/^( *)(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/</code></p>
+		<p>Because this author can't yet. That's who gets these.</p>
+	</dd>
+	<dt>Seeker of Security</dt>
+	<dd>Someone who has demonstrated a high degree of expertise or authority when it comes to software security.</dd>
+	<dt>Titan of the Test Harness</dt>
+	<dd>Someone who demonstrates high-levels of understanding regarding Marked's test harness.</dd>
+	<dt>Totally Tron</dt>
+	<dd>Someone who demonstrates they are willing and able to "fight for the users", both developers dependent on marked to do their jobs as well as end-users interacting with the output (particularly in the realm of those with the disabilities).</dd>
+</dl>
+
+### Special badges that come with the job:
+
+<dl>
+	<dt>Defibrillator</dt>
+	<dd>A contributor who stepped up to help bring Marked back to life by contriuting solutions to help Marked pass when compared against the CommonMark and GitHub Flavored Markdown specifications.</dd>
+	<dt>Maker of the Marked mark</dt>
+	<dd>This badge is given to the person or oganization credited with creating the logo (or logotype) used in Marked communications for a given period of time. **Maker of the Marked mark from 2017 to present**, for example.</dd>
+	<dt>Release Wrangler</dt>
+	<dd>This is a badge given to all Publishers.</dd>
+	<dt>Snyk's Security Saint</dt>
+	<dd>This is a badge given to whomever primarily reaches out from Snyk to let us know about security issues.</dd>
+</dl>
diff --git a/packages/markdown/marked/docs/CNAME b/packages/markdown/marked/docs/CNAME
new file mode 100644
index 00000000..c92fdfcb
--- /dev/null
+++ b/packages/markdown/marked/docs/CNAME
@@ -0,0 +1 @@
+marked.js.org
diff --git a/packages/markdown/marked/docs/CODE_OF_CONDUCT.md b/packages/markdown/marked/docs/CODE_OF_CONDUCT.md
new file mode 100644
index 00000000..5335399b
--- /dev/null
+++ b/packages/markdown/marked/docs/CODE_OF_CONDUCT.md
@@ -0,0 +1,74 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to block temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team by submitting a PR with changes to the [AUTHORS](#/AUTHORS.md) page (or emailing josh@8fold.com). All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version [1.4][version].
+
+[homepage]: https://www.contributor-covenant.org/
+[version]: https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
diff --git a/packages/markdown/marked/docs/CONTRIBUTING.md b/packages/markdown/marked/docs/CONTRIBUTING.md
new file mode 100644
index 00000000..ac88ba15
--- /dev/null
+++ b/packages/markdown/marked/docs/CONTRIBUTING.md
@@ -0,0 +1,92 @@
+# Contributing to Marked
+
+- [ ] Fork `markedjs/marked`.
+- [ ] Clone the library locally using GitHub Desktop or the command line.
+- [ ] Make sure you are on the `master` branch.
+- [ ] Be sure to run `npm install` or `npm update`.
+- [ ] Create a branch.
+- [ ] Make as small a change as possible.
+- [ ] Run `npm test`, fix any broken things (for linting, you can run `npm run lint` to have the linter fix them for you).
+- [ ] Submit a PR.
+
+## Design principles
+
+Marked tends to favor following the SOLID set of software design and development principles; mainly the [single responsibility](https://en.wikipedia.org/wiki/Single_responsibility_principle) and [open/closed principles](https://en.wikipedia.org/wiki/Open/closed_principle):
+
+- **Single responsibility:** Marked, and the components of Marked, have the single responsibility of converting Markdown strings into HTML.
+- **Open/closed:** Marked favors giving developers the means to easily extend the library and its components over changing Marked's behavior through configuration options.
+
+## Priorities
+
+We think we have our priorities sorted to build quality in.
+
+The following table lists the ticket type labels we use when there is work to be done on the code either through an Issue or a PR; in priority order.
+
+|Ticket type label                  |Description                                                                                                                                                                         |
+|:----------------------------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+|L0 - security                      |A security vulnerability within the Marked library is discovered.                                                                                                                   |
+|L1 - broken                        |Valid usage results in incorrect output compared to [supported specifications](#/README.md#specifications) OR causes marked to crash AND there is no known workaround for the issue. |
+|L2 - annoying                      |Similar to L1 - broken only there is a known workaround available for the issue.                                                                                                   |
+|RR - refactor and re-engineer      |Results in an improvement to developers using Marked (improved readability) or end-users (faster performance) or both.                                                              |
+|NFS - new feature (spec related)   |A capability Marked does not currently provide but is in one of the [supported specifications](#/README.md#specifications)                                                           |
+|NFU - new feature (user requested) |A capability Marked does not currently provide but has been requested by users of Marked.                                                                                           |
+
+## Test early, often, and everything
+
+We try to write test cases to validate output (writing tests based on the [supported specifications](#/README.md#specifications)) and minimize regression (writing tests for issues fixed). Therefore, if you would like to contribute, some things you should know regarding the test harness.
+
+|Location      |Description                                         |
+|:-------------|:---------------------------------------------------|
+|/test/browser |For testing Marked in a client-side implementation. |
+|/test/new     |Tests not related to the original `markdown.pl`.    |
+|/test/original|Tests validating against the original `markdown.pl`.|
+
+If your test uses features or options, assuming `gfm` is set to `false`, for example, you can add [front-matter](https://www.npmjs.com/package/front-matter) to the top of
+your `.md` file
+
+``` yml
+---
+gfm: false
+---
+```
+
+## Submitting PRs and Issues
+
+Marked provides templates for submitting both pull requests and issues. When you begin creating a new PR or issue, you will see instructions on using the template.
+
+The PR templates include checklists for both the submitter and the reviewer, which, in most cases, will not be the same person.
+
+## Scripts
+
+When it comes to NPM commands, we try to use the native scripts provided by the NPM framework.
+
+To run the tests:
+
+``` bash
+npm test
+```
+
+To test whether you are using the standard syntax rules for the project:
+
+```bash
+npm run test:lint
+```
+
+To see time comparisons between Marked and other popular Markdown libraries:
+
+```bash
+npm run bench
+```
+
+To check for (and fix) standardized syntax (lint):
+
+```bash
+npm run lint
+```
+
+To build your own minified version of Marked:
+
+```bash
+npm run build
+```
+
diff --git a/packages/markdown/marked/docs/PUBLISHING.md b/packages/markdown/marked/docs/PUBLISHING.md
new file mode 100644
index 00000000..27937c2f
--- /dev/null
+++ b/packages/markdown/marked/docs/PUBLISHING.md
@@ -0,0 +1,24 @@
+# Releasing Marked
+
+- [ ] See [contributing](#/CONTRIBUTING.md)
+- [ ] Create release branch from `master` (`release-x.y.z`)
+- [ ] Submit PR with minimal name: Release x.y.z
+- [ ] Complete PR checklists
+
+## Overall strategy
+
+**Master is always shippable:** We try to merge PRs in such a way that `master` is the only branch to really be concerned about *and* `master` can always be released. This allows smoother flow between new fetures, bug fixes, and so on. (Almost a continuous deployment setup, without automation.)
+
+## Versioning
+
+We follow [semantic versioning](https://semver.org) where the following sequence is true `[major].[minor].[patch]`; therefore, consider the following implications of the release you are preparing:
+
+1. **Major:** There is at least one change not deemed backward compatible.
+2. **Minor:** There is at least one new feature added to the release.
+3. **Patch:** No breaking changes, no new features.
+
+What to expect while Marked is a zero-major (0.x.y):
+
+1. The major will remain at zero; thereby, alerting consumers to the potentially volatile nature of the package.
+2. The minor will tend to be more analagous to a `major` release. 
+3. The patch will tend to be more analagous to a `minor` release or a collection of bug fixes (patches).
diff --git a/packages/markdown/marked/docs/README.md b/packages/markdown/marked/docs/README.md
new file mode 100644
index 00000000..261e4f3b
--- /dev/null
+++ b/packages/markdown/marked/docs/README.md
@@ -0,0 +1,85 @@
+Marked is
+
+1. built for speed.<sup>*</sup>
+2. a low-level markdown compiler for parsing markdown without caching or blocking for long periods of time.<sup>**</sup>
+3. light-weight while implementing all markdown features from the supported flavors & specifications.<sup>***</sup>
+4. available as a command line interface (CLI) and running in client- or server-side JavaScript projects.
+
+<p><small><sup>*</sup> Still working on metrics for comparative analysis and definition.</small><br>
+<small><sup>**</sup> As few dependencies as possible.</small><br>
+<small><sup>***</sup> Strict compliance could result in slower processing when running comparative benchmarking.</small></p>
+
+
+<h2 id="demo">Demo</h2>
+
+Checkout the [demo page](./demo/) to see marked in action ⛹️
+
+These documentation pages are also rendered using marked 💯
+
+
+<h2 id="installation">Installation</h2>
+
+**CLI:** `npm install -g marked`
+
+**In-browser:** `npm install marked`
+
+<h2 id="usage">Usage</h2>
+
+### Warning: 🚨 Marked does not [sanitize](https://marked.js.org/#/USING_ADVANCED.md#options) the output HTML by default 🚨
+
+**CLI**
+
+``` bash
+$ marked -o hello.html
+hello world
+^D
+$ cat hello.html
+<p>hello world</p>
+```
+
+``` bash
+$ marked -s "*hello world*"
+<p><em>hello world</em></p>
+```
+
+**Browser**
+
+```html
+<!doctype html>
+<html>
+<head>
+  <meta charset="utf-8"/>
+  <title>Marked in the browser</title>
+</head>
+<body>
+  <div id="content"></div>
+  <script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
+  <script>
+    document.getElementById('content').innerHTML =
+      marked('# Marked in browser\n\nRendered by **marked**.');
+  </script>
+</body>
+</html>
+```
+
+
+Marked offers [advanced configurations](#/USING_ADVANCED.md) and [extensibility](#/USING_PRO.md) as well.
+
+<h2 id="specifications">Supported Markdown specifications</h2>
+
+We actively support the features of the following [Markdown flavors](https://github.com/commonmark/CommonMark/wiki/Markdown-Flavors).
+
+|Flavor                                                     |Version    |
+|:----------------------------------------------------------|:----------|
+|The original markdown.pl                                   |--         |
+|[CommonMark](http://spec.commonmark.org/0.28/)             |0.28       |
+|[GitHub Flavored Markdown](https://github.github.com/gfm/) |0.28       |
+
+By supporting the above Markdown flavors, it's possible that Marked can help you use other flavors as well; however, these are not actively supported by the community.
+
+<h2 id="security">Security</h2>
+
+The only completely secure system is the one that doesn't exist in the first place. Having said that, we take the security of Marked very seriously.
+
+Therefore, please disclose potential security issues by email to the project [committers](#/AUTHORS.md) as well as the [listed owners within NPM](https://docs.npmjs.com/cli/owner). We will provide an initial assessment of security reports within 48 hours and should apply patches within 2 weeks (also, feel free to contribute a fix for the issue).
+
diff --git a/packages/markdown/marked/docs/USING_ADVANCED.md b/packages/markdown/marked/docs/USING_ADVANCED.md
new file mode 100644
index 00000000..6490caa7
--- /dev/null
+++ b/packages/markdown/marked/docs/USING_ADVANCED.md
@@ -0,0 +1,78 @@
+## The `marked` function
+
+```js
+marked(markdownString [,options] [,callback])
+```
+
+|Argument              |Type         |Notes                                                                                                |
+|:---------------------|:------------|:----------------------------------------------------------------------------------------------------|
+|markdownString        |`string`     |String of markdown source to be compiled.                                                            |
+|<a href="#options">options</a>|`object`|Hash of options. Can also use `marked.setOptions`.                                                |
+|callback              |`function`   |Called when `markdownString` has been parsed. Can be used as second argument if no `options` present.|
+
+### Alternative using reference
+
+```js
+// Create reference instance
+var myMarked = require('marked');
+
+// Set options
+// `highlight` example uses `highlight.js`
+myMarked.setOptions({
+  renderer: new myMarked.Renderer(),
+  highlight: function(code) {
+    return require('highlight.js').highlightAuto(code).value;
+  },
+  pedantic: false,
+  gfm: true,
+  tables: true,
+  breaks: false,
+  sanitize: false,
+  smartLists: true,
+  smartypants: false,
+  xhtml: false
+});
+
+// Compile
+console.log(myMarked('I am using __markdown__.'));
+```
+
+<h2 id="options">Options</h2>
+
+|Member      |Type      |Default  |Since    |Notes         |
+|:-----------|:---------|:--------|:--------|:-------------|
+|baseUrl     |`string`  |`null`   |0.3.9    |A prefix url for any relative link. |  
+|breaks      |`boolean` |`false`  |v0.2.7   |If true, add `<br>` on a single line break (copies GitHub). Requires `gfm` be `true`.|
+|gfm         |`boolean` |`true`   |v0.2.1   |If true, use approved [GitHub Flavored Markdown (GFM) specification](https://github.github.com/gfm/).|
+|headerIds   |`boolean` |`true`   |v0.4.0   |If true, include an `id` attribute when emitting headings (h1, h2, h3, etc).|
+|headerPrefix|`string`  |`''`     |v0.3.0   |A string to prefix the `id` attribute when emitting headings (h1, h2, h3, etc).|
+|highlight   |`function`|`null`   |v0.3.0   |A function to highlight code blocks, see <a href="#highlight">Asynchronous highlighting</a>.|
+|langPrefix  |`string`  |`'language-'`|v0.3.0|A string to prefix the className in a `<code>` block. Useful for syntax highlighting.|
+|mangle      |`boolean` |`true`   |v0.3.4   |If true, autolinked email address is escaped with HTML character references.|
+|pedantic    |`boolean` |`false`  |v0.2.1   |If true, conform to the original `markdown.pl` as much as possible. Don't fix original markdown bugs or behavior. Turns off and overrides `gfm`.|
+|renderer    |`object`  |`new Renderer()`|v0.3.0|An object containing functions to render tokens to HTML. See [extensibility](USING_PRO.md) for more details.|
+|sanitize    |`boolean` |`false`  |v0.2.1   |If true, sanitize the HTML passed into `markdownString` with the `sanitizer` function.|
+|sanitizer   |`function`|`null`   |v0.3.4   |A function to sanitize the HTML passed into `markdownString`.|
+|silent      |`boolean` |`false`  |v0.2.7   |If true, the parser does not throw any exception.|
+|smartLists  |`boolean` |`false`  |v0.2.8   |If true, use smarter list behavior than those found in `markdown.pl`.|
+|smartypants |`boolean` |`false`  |v0.2.9   |If true, use "smart" typographic punctuation for things like quotes and dashes.|
+|tables      |`boolean` |`true`   |v0.2.7   |If true and `gfm` is true, use [GFM Tables extension](https://github.github.com/gfm/#tables-extension-).|
+|xhtml       |`boolean` |`false`  |v0.3.2   |If true, emit self-closing HTML tags for void elements (&lt;br/&gt;, &lt;img/&gt;, etc.) with a "/" as required by XHTML.|
+
+<h2 id="highlight">Asynchronous highlighting</h2>
+
+Unlike `highlight.js` the `pygmentize.js` library uses asynchronous highlighting. This example demonstrates that marked is agnostic when it comes to the highlighter you use.
+
+```js
+myMarked.setOptions({
+  highlight: function(code, lang, callback) {
+    require('pygmentize-bundled') ({ lang: lang, format: 'html' }, code, function (err, result) {
+      callback(err, result.toString());
+    });
+  }
+});
+
+console.log(myMarked(markdownString));
+```
+
+In both examples, `code` is a `string` representing the section of code to pass to the highlighter. In this example, `lang` is a `string` informing the highlighter what programming lnaguage to use for the `code` and `callback` is the `function` the asynchronous highlighter will call once complete.
diff --git a/packages/markdown/marked/docs/USING_PRO.md b/packages/markdown/marked/docs/USING_PRO.md
new file mode 100644
index 00000000..861caa2d
--- /dev/null
+++ b/packages/markdown/marked/docs/USING_PRO.md
@@ -0,0 +1,163 @@
+## Extending Marked
+
+To champion the single-responsibility and open/closed prinicples, we have tried to make it relatively painless to extend marked. If you are looking to add custom functionality, this is the place to start.
+
+<h2 id="renderer">The renderer</h2>
+
+The renderer is...
+
+**Example:** Overriding default heading token by adding an embedded anchor tag like on GitHub.
+
+```js
+// Create reference instance
+var myMarked = require('marked');
+
+// Get reference
+var renderer = new myMarked.Renderer();
+
+// Override function
+renderer.heading = function (text, level) {
+  var escapedText = text.toLowerCase().replace(/[^\w]+/g, '-');
+
+  return `
+          <h${level}>
+            <a name="${escapedText}" class="anchor" href="#${escapedText}">
+              <span class="header-link"></span>
+            </a>
+            ${text}
+          </h${level}>`;
+};
+
+// Run marked
+console.log(myMarked('# heading+', { renderer: renderer }));
+```
+
+**Output:**
+
+```html
+<h1>
+  <a name="heading-" class="anchor" href="#heading-">
+    <span class="header-link"></span>
+  </a>
+  heading+
+</h1>
+```
+
+### Block level renderer methods
+
+- code(*string* code, *string* infostring, *boolean* escaped)
+- blockquote(*string* quote)
+- html(*string* html)
+- heading(*string* text, *number* level, *string* raw, *Slugger* slugger)
+- hr()
+- list(*string* body, *boolean* ordered, *number* start)
+- listitem(*string* text, *boolean* task, *boolean* checked)
+- checkbox(*boolean* checked)
+- paragraph(*string* text)
+- table(*string* header, *string* body)
+- tablerow(*string* content)
+- tablecell(*string* content, *object* flags)
+
+`slugger` has the `slug` method to create an unique id from value:
+
+```js
+slugger.slug('foo')   // foo
+slugger.slug('foo')   // foo-1
+slugger.slug('foo')   // foo-2
+slugger.slug('foo 1') // foo-1-1
+slugger.slug('foo-1') // foo-1-2
+...
+```
+
+`flags` has the following properties:
+
+```js
+{
+    header: true || false,
+    align: 'center' || 'left' || 'right'
+}
+```
+
+### Inline level renderer methods
+
+- strong(*string* text)
+- em(*string* text)
+- codespan(*string* code)
+- br()
+- del(*string* text)
+- link(*string* href, *string* title, *string* text)
+- image(*string* href, *string* title, *string* text)
+- text(*string* text)
+
+<h2 id="lexer">The lexer</h2>
+
+The lexer is...
+
+
+<h2 id="parser">The parser</h2>
+
+The parser is...
+
+***
+
+<h2 id="extend">Access to lexer and parser</h2>
+
+You also have direct access to the lexer and parser if you so desire.
+
+``` js
+var tokens = marked.lexer(text, options);
+console.log(marked.parser(tokens));
+```
+
+``` js
+var lexer = new marked.Lexer(options);
+var tokens = lexer.lex(text);
+console.log(tokens);
+console.log(lexer.rules);
+```
+
+``` bash
+$ node
+> require('marked').lexer('> i am using marked.')
+[ { type: 'blockquote_start' },
+  { type: 'paragraph',
+    text: 'i am using marked.' },
+  { type: 'blockquote_end' },
+  links: {} ]
+```
+
+The Lexers build an array of tokens, which will be passed to their respective
+Parsers. The Parsers process each token in the token arrays,
+which are removed from the array of tokens:
+
+``` js
+const marked = require('marked');
+
+const md = `
+  # heading
+
+  [link][1]
+
+  [1]: #heading "heading"
+`;
+
+const tokens = marked.lexer(md);
+console.log(tokens);
+
+const html = marked.parser(tokens);
+console.log(html);
+
+console.log(tokens);
+```
+
+``` bash
+[ { type: 'heading', depth: 1, text: 'heading' },
+  { type: 'paragraph', text: '  [link][1]' },
+  { type: 'space' },
+  links: { '1': { href: '#heading', title: 'heading' } } ]
+
+<h1 id="heading">heading</h1>
+<p>  <a href="#heading" title="heading">link</a></p>
+
+[ links: { '1': { href: '#heading', title: 'heading' } } ]
+```
diff --git a/packages/markdown/marked/docs/broken.md b/packages/markdown/marked/docs/broken.md
new file mode 100644
index 00000000..7bfa49e8
--- /dev/null
+++ b/packages/markdown/marked/docs/broken.md
@@ -0,0 +1,426 @@
+# Markdown is broken
+
+I have a lot of scraps of markdown engine oddities that I've collected over the
+years. What you see below is slightly messy, but it's what I've managed to
+cobble together to illustrate the differences between markdown engines, and
+why, if there ever is a markdown specification, it has to be absolutely
+thorough. There are a lot more of these little differences I have documented
+elsewhere. I know I will find them lingering on my disk one day, but until
+then, I'll continue to add whatever strange nonsensical things I find.
+
+Some of these examples may only mention a particular engine compared to marked.
+However, the examples with markdown.pl could easily be swapped out for
+discount, upskirt, or markdown.js, and you would very easily see even more
+inconsistencies.
+
+A lot of this was written when I was very unsatisfied with the inconsistencies
+between markdown engines. Please excuse the frustration noticeable in my
+writing.
+
+## Examples of markdown's "stupid" list parsing
+
+```
+$ markdown.pl
+
+  * item1
+
+    * item2
+
+  text
+^D
+<ul>
+<li><p>item1</p>
+
+<ul>
+<li>item2</li>
+</ul>
+
+<p><p>text</p></li>
+</ul></p>
+```
+
+
+```
+$ marked
+  * item1
+
+    * item2
+
+  text
+^D
+<ul>
+<li><p>item1</p>
+<ul>
+<li>item2</li>
+</ul>
+<p>text</p>
+</li>
+</ul>
+```
+
+Which looks correct to you?
+
+- - -
+
+```
+$ markdown.pl
+* hello
+  > world
+^D
+<p><ul>
+<li>hello</p>
+
+<blockquote>
+  <p>world</li>
+</ul></p>
+</blockquote>
+```
+
+```
+$ marked
+* hello
+  > world
+^D
+<ul>
+<li>hello<blockquote>
+<p>world</p>
+</blockquote>
+</li>
+</ul>
+```
+
+Again, which looks correct to you?
+
+- - -
+
+EXAMPLE:
+
+```
+$ markdown.pl
+* hello
+  * world
+    * hi
+          code
+^D
+<ul>
+<li>hello
+<ul>
+<li>world</li>
+<li>hi
+  code</li>
+</ul></li>
+</ul>
+```
+
+The code isn't a code block even though it's after the bullet margin. I know,
+lets give it two more spaces, effectively making it 8 spaces past the bullet.
+
+```
+$ markdown.pl
+* hello
+  * world
+    * hi
+            code
+^D
+<ul>
+<li>hello
+<ul>
+<li>world</li>
+<li>hi
+    code</li>
+</ul></li>
+</ul>
+```
+
+And, it's still not a code block. Did you also notice that the 3rd item isn't
+even its own list? Markdown screws that up too because of its indentation
+unaware parsing.
+
+- - -
+
+Let's look at some more examples of markdown's list parsing:
+
+```
+$ markdown.pl
+
+  * item1
+
+    * item2
+
+  text
+^D
+<ul>
+<li><p>item1</p>
+
+<ul>
+<li>item2</li>
+</ul>
+
+<p><p>text</p></li>
+</ul></p>
+```
+
+Misnested tags.
+
+
+```
+$ marked
+  * item1
+
+    * item2
+
+  text
+^D
+<ul>
+<li><p>item1</p>
+<ul>
+<li>item2</li>
+</ul>
+<p>text</p>
+</li>
+</ul>
+```
+
+Which looks correct to you?
+
+- - -
+
+```
+$ markdown.pl
+* hello
+  > world
+^D
+<p><ul>
+<li>hello</p>
+
+<blockquote>
+  <p>world</li>
+</ul></p>
+</blockquote>
+```
+
+More misnested tags.
+
+
+```
+$ marked
+* hello
+  > world
+^D
+<ul>
+<li>hello<blockquote>
+<p>world</p>
+</blockquote>
+</li>
+</ul>
+```
+
+Again, which looks correct to you?
+
+- - -
+
+# Why quality matters - Part 2
+
+``` bash
+$ markdown.pl
+* hello
+  > world
+^D
+<p><ul>
+<li>hello</p>
+
+<blockquote>
+  <p>world</li>
+</ul></p>
+</blockquote>
+```
+
+``` bash
+$ sundown # upskirt
+* hello
+  > world
+^D
+<ul>
+<li>hello
+&gt; world</li>
+</ul>
+```
+
+``` bash
+$ marked
+* hello
+  > world
+^D
+<ul><li>hello <blockquote><p>world</p></blockquote></li></ul>
+```
+
+Which looks correct to you?
+
+- - -
+
+See: https://github.com/evilstreak/markdown-js/issues/23
+
+``` bash
+$ markdown.pl # upskirt/markdown.js/discount
+* hello
+      var a = 1;
+* world
+^D
+<ul>
+<li>hello
+var a = 1;</li>
+<li>world</li>
+</ul>
+```
+
+``` bash
+$ marked
+* hello
+      var a = 1;
+* world
+^D
+<ul><li>hello
+<pre>code>var a = 1;</code></pre></li>
+<li>world</li></ul>
+```
+
+Which looks more reasonable? Why shouldn't code blocks be able to appear in
+list items in a sane way?
+
+- - -
+
+``` bash
+$ markdown.js
+<div>hello</div>
+
+<span>hello</span>
+^D
+<p>&lt;div&gt;hello&lt;/div&gt;</p>
+
+<p>&lt;span&gt;hello&lt;/span&gt;</p>
+```
+
+``` bash
+$ marked
+<div>hello</div>
+
+<span>hello</span>
+^D
+<div>hello</div>
+
+
+<p><span>hello</span>
+</p>
+```
+
+- - -
+
+See: https://github.com/evilstreak/markdown-js/issues/27
+
+``` bash
+$ markdown.js
+[![an image](/image)](/link)
+^D
+<p><a href="/image)](/link">![an image</a></p>
+```
+
+``` bash
+$ marked
+[![an image](/image)](/link)
+^D
+<p><a href="/link"><img src="/image" alt="an image"></a>
+</p>
+```
+
+- - -
+
+See: https://github.com/evilstreak/markdown-js/issues/24
+
+``` bash
+$ markdown.js
+> a
+
+> b
+
+> c
+^D
+<blockquote><p>a</p><p>bundefined&gt; c</p></blockquote>
+```
+
+``` bash
+$ marked
+> a
+
+> b
+
+> c
+^D
+<blockquote><p>a
+
+</p></blockquote>
+<blockquote><p>b
+
+</p></blockquote>
+<blockquote><p>c
+</p></blockquote>
+```
+
+- - -
+
+``` bash
+$ markdown.pl
+* hello
+  * world
+    how
+
+    are
+    you
+
+  * today
+* hi
+^D
+<ul>
+<li><p>hello</p>
+
+<ul>
+<li>world
+how</li>
+</ul>
+
+<p>are
+you</p>
+
+<ul>
+<li>today</li>
+</ul></li>
+<li>hi</li>
+</ul>
+```
+
+``` bash
+$ marked
+* hello
+  * world
+    how
+
+    are
+    you
+
+  * today
+* hi
+^D
+<ul>
+<li><p>hello</p>
+<ul>
+<li><p>world
+how</p>
+<p>are
+you</p>
+</li>
+<li><p>today</p>
+</li>
+</ul>
+</li>
+<li>hi</li>
+</ul>
+```
diff --git a/packages/markdown/marked/docs/demo/demo.css b/packages/markdown/marked/docs/demo/demo.css
new file mode 100644
index 00000000..398c663a
--- /dev/null
+++ b/packages/markdown/marked/docs/demo/demo.css
@@ -0,0 +1,72 @@
+html, body {
+	margin: 0;
+	padding: 0;
+	font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+	color: #333;
+	background-color: #fbfbfb;
+	height: 100%;
+}
+
+textarea {
+	font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
+	font-size: 12px;
+	resize: none;
+}
+
+header {
+	padding-top: 10px;
+	display: flex;
+	height: 58px;
+}
+
+header h1 {
+	margin: 0;
+}
+
+.github-ribbon {
+	position: absolute;
+	top: 0;
+	right: 0;
+	border: 0;
+	z-index: 1000;
+}
+
+.containers {
+	display: flex;
+	height: calc(100vh - 68px);
+}
+
+.container {
+	flex-basis: 50%;
+	padding: 5px;
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+	box-sizing: border-box;
+}
+
+.pane, .inputPane {
+	margin-top: 5px;
+	padding: 0.6em;
+	border: 1px solid #ccc;
+	overflow: auto;
+	flex-grow: 1;
+	flex-shrink: 1;
+}
+
+#preview {
+	display: flex;
+}
+
+#preview iframe {
+	flex-grow: 1;
+}
+
+#main {
+	display: none;
+}
+
+.error {
+	border-color: red;
+	background-color: #FEE
+}
diff --git a/packages/markdown/marked/docs/demo/demo.js b/packages/markdown/marked/docs/demo/demo.js
new file mode 100644
index 00000000..e7d97c59
--- /dev/null
+++ b/packages/markdown/marked/docs/demo/demo.js
@@ -0,0 +1,534 @@
+/* globals marked, unfetch, ES6Promise */
+
+if (!window.Promise) {
+  window.Promise = ES6Promise;
+}
+if (!window.fetch) {
+  window.fetch = unfetch;
+}
+
+onunhandledrejection = function (e) {
+  throw e.reason;
+};
+
+var $loadingElem = document.querySelector('#loading');
+var $mainElem = document.querySelector('#main');
+var $markdownElem = document.querySelector('#markdown');
+var $markedVerElem = document.querySelector('#markedVersion');
+var $commitVerElem = document.querySelector('#commitVersion');
+var $markedVer = document.querySelector('#markedCdn');
+var $optionsElem = document.querySelector('#options');
+var $outputTypeElem = document.querySelector('#outputType');
+var $inputTypeElem = document.querySelector('#inputType');
+var $responseTimeElem = document.querySelector('#responseTime');
+var $previewElem = document.querySelector('#preview');
+var $previewIframe = document.querySelector('#preview iframe');
+var $permalinkElem = document.querySelector('#permalink');
+var $clearElem = document.querySelector('#clear');
+var $htmlElem = document.querySelector('#html');
+var $lexerElem = document.querySelector('#lexer');
+var $panes = document.querySelectorAll('.pane');
+var $inputPanes = document.querySelectorAll('.inputPane');
+var lastInput = '';
+var inputDirty = true;
+var $activeOutputElem = null;
+var search = searchToObject();
+var markedVersions = {
+  master: 'https://cdn.jsdelivr.net/gh/markedjs/marked/lib/marked.js'
+};
+var markedVersionCache = {};
+var delayTime = 1;
+var checkChangeTimeout = null;
+var markedWorker;
+
+$previewIframe.addEventListener('load', handleIframeLoad);
+
+$outputTypeElem.addEventListener('change', handleOutputChange, false);
+
+$inputTypeElem.addEventListener('change', handleInputChange, false);
+
+$markedVerElem.addEventListener('change', handleVersionChange, false);
+
+$markdownElem.addEventListener('change', handleInput, false);
+$markdownElem.addEventListener('keyup', handleInput, false);
+$markdownElem.addEventListener('keypress', handleInput, false);
+$markdownElem.addEventListener('keydown', handleInput, false);
+
+$optionsElem.addEventListener('change', handleInput, false);
+$optionsElem.addEventListener('keyup', handleInput, false);
+$optionsElem.addEventListener('keypress', handleInput, false);
+$optionsElem.addEventListener('keydown', handleInput, false);
+
+$commitVerElem.style.display = 'none';
+$commitVerElem.addEventListener('keypress', handleAddVersion, false);
+
+$clearElem.addEventListener('click', handleClearClick, false);
+
+Promise.all([
+  setInitialQuickref(),
+  setInitialOutputType(),
+  setInitialText(),
+  setInitialVersion()
+    .then(setInitialOptions)
+]).then(function () {
+  handleInputChange();
+  handleOutputChange();
+  checkForChanges();
+  setScrollPercent(0);
+  $loadingElem.style.display = 'none';
+  $mainElem.style.display = 'block';
+});
+
+function setInitialText() {
+  if ('text' in search) {
+    $markdownElem.value = search.text;
+  } else {
+    return fetch('./initial.md')
+      .then(function (res) { return res.text(); })
+      .then(function (text) {
+        if ($markdownElem.value === '') {
+          $markdownElem.value = text;
+        }
+      });
+  }
+}
+
+function setInitialQuickref() {
+  return fetch('./quickref.md')
+    .then(function (res) { return res.text(); })
+    .then(function (text) {
+      document.querySelector('#quickref').value = text;
+    });
+}
+
+function setInitialVersion() {
+  return fetch('https://data.jsdelivr.com/v1/package/npm/marked')
+    .then(function (res) {
+      return res.json();
+    })
+    .then(function (json) {
+      for (var i = 0; i < json.versions.length; i++) {
+        var ver = json.versions[i];
+        markedVersions[ver] = 'https://cdn.jsdelivr.net/npm/marked@' + ver + '/lib/marked.js';
+        var opt = document.createElement('option');
+        opt.textContent = ver;
+        opt.value = ver;
+        $markedVerElem.appendChild(opt);
+      }
+    })
+    .then(function () {
+      return fetch('https://api.github.com/repos/markedjs/marked/commits')
+        .then(function (res) {
+          return res.json();
+        })
+        .then(function (json) {
+          markedVersions['master'] = 'https://cdn.jsdelivr.net/gh/markedjs/marked@' + json[0].sha + '/lib/marked.js';
+        })
+        .catch(function () {
+          // do nothing
+          // uses url without commit
+        });
+    })
+    .then(function () {
+      if (search.version) {
+        if (markedVersions[search.version]) {
+          return search.version;
+        } else {
+          var match = search.version.match(/^(\w+):(.+)$/);
+          if (match) {
+            switch (match[1]) {
+              case 'commit':
+                addCommitVersion(search.version, match[2].substring(0, 7), match[2]);
+                return search.version;
+              case 'pr':
+                return getPrCommit(match[2])
+                  .then(function (commit) {
+                    if (!commit) {
+                      return 'master';
+                    }
+                    addCommitVersion(search.version, 'PR #' + match[2], commit);
+                    return search.version;
+                  });
+            }
+          }
+        }
+      }
+
+      return 'master';
+    })
+    .then(function (version) {
+      $markedVerElem.value = version;
+    })
+    .then(updateVersion);
+}
+
+function setInitialOptions() {
+  if ('options' in search) {
+    $optionsElem.value = search.options;
+  } else {
+    setDefaultOptions();
+  }
+}
+
+function setInitialOutputType() {
+  if (search.outputType) {
+    $outputTypeElem.value = search.outputType;
+  }
+}
+
+function handleIframeLoad() {
+  lastInput = '';
+  inputDirty = true;
+}
+
+function handleInput() {
+  inputDirty = true;
+};
+
+function handleVersionChange() {
+  if ($markedVerElem.value === 'commit' || $markedVerElem.value === 'pr') {
+    $commitVerElem.style.display = '';
+  } else {
+    $commitVerElem.style.display = 'none';
+    updateVersion();
+  }
+}
+
+function handleClearClick() {
+  $markdownElem.value = '';
+  $markedVerElem.value = 'master';
+  $commitVerElem.style.display = 'none';
+  updateVersion().then(setDefaultOptions);
+}
+
+function handleAddVersion(e) {
+  if (e.which === 13) {
+    switch ($markedVerElem.value) {
+      case 'commit':
+        var commit = $commitVerElem.value.toLowerCase();
+        if (!commit.match(/^[0-9a-f]{40}$/)) {
+          alert('That is not a valid commit');
+          return;
+        }
+        addCommitVersion('commit:' + commit, commit.substring(0, 7), commit);
+        $markedVerElem.value = 'commit:' + commit;
+        $commitVerElem.style.display = 'none';
+        $commitVerElem.value = '';
+        updateVersion();
+        break;
+      case 'pr':
+        $commitVerElem.disabled = true;
+        var pr = $commitVerElem.value.replace(/\D/g, '');
+        getPrCommit(pr)
+          .then(function (commit) {
+            $commitVerElem.disabled = false;
+            if (!commit) {
+              alert('That is not a valid PR');
+              return;
+            }
+            addCommitVersion('pr:' + pr, 'PR #' + pr, commit);
+            $markedVerElem.value = 'pr:' + pr;
+            $commitVerElem.style.display = 'none';
+            $commitVerElem.value = '';
+            updateVersion();
+          });
+    }
+  }
+}
+
+function handleInputChange() {
+  handleChange($inputPanes, $inputTypeElem.value);
+}
+
+function handleOutputChange() {
+  $activeOutputElem = handleChange($panes, $outputTypeElem.value);
+  updateLink();
+}
+
+function handleChange(panes, visiblePane) {
+  var active = null;
+  for (var i = 0; i < panes.length; i++) {
+    if (panes[i].id === visiblePane) {
+      panes[i].style.display = '';
+      active = panes[i];
+    } else {
+      panes[i].style.display = 'none';
+    }
+  }
+  return active;
+};
+
+function addCommitVersion(value, text, commit) {
+  if (markedVersions[value]) {
+    return;
+  }
+  markedVersions[value] = 'https://cdn.jsdelivr.net/gh/markedjs/marked@' + commit + '/lib/marked.js';
+  var opt = document.createElement('option');
+  opt.textContent = text;
+  opt.value = value;
+  $markedVerElem.insertBefore(opt, $markedVerElem.firstChild);
+}
+
+function getPrCommit(pr) {
+  return fetch('https://api.github.com/repos/markedjs/marked/pulls/' + pr + '/commits')
+    .then(function (res) {
+      return res.json();
+    })
+    .then(function (json) {
+      return json[json.length - 1].sha;
+    }).catch(function () {
+      // return undefined
+    });
+}
+
+function setDefaultOptions() {
+  if (window.Worker) {
+    messageWorker({
+      task: 'defaults',
+      version: markedVersions[$markedVerElem.value]
+    });
+  } else {
+    var defaults = marked.getDefaults();
+    setOptions(defaults);
+  }
+}
+
+function setOptions(opts) {
+  $optionsElem.value = JSON.stringify(
+    opts,
+    function (key, value) {
+      if (value && typeof value === 'object' && Object.getPrototypeOf(value) !== Object.prototype) {
+        return undefined;
+      }
+      return value;
+    }, ' ');
+}
+
+function searchToObject() {
+  // modified from https://stackoverflow.com/a/7090123/806777
+  var pairs = location.search.slice(1).split('&');
+  var obj = {};
+
+  for (var i = 0; i < pairs.length; i++) {
+    if (pairs[i] === '') {
+      continue;
+    }
+
+    var pair = pairs[i].split('=');
+
+    obj[decodeURIComponent(pair.shift())] = decodeURIComponent(pair.join('='));
+  }
+
+  return obj;
+}
+
+function jsonString(input) {
+  var output = (input + '')
+    .replace(/\n/g, '\\n')
+    .replace(/\r/g, '\\r')
+    .replace(/\t/g, '\\t')
+    .replace(/\f/g, '\\f')
+    .replace(/[\\"']/g, '\\$&')
+    .replace(/\u0000/g, '\\0');
+  return '"' + output + '"';
+};
+
+function getScrollSize() {
+  var e = $activeOutputElem;
+
+  return e.scrollHeight - e.clientHeight;
+};
+
+function getScrollPercent() {
+  var size = getScrollSize();
+
+  if (size <= 0) {
+    return 1;
+  }
+
+  return $activeOutputElem.scrollTop / size;
+};
+
+function setScrollPercent(percent) {
+  $activeOutputElem.scrollTop = percent * getScrollSize();
+};
+
+function updateLink() {
+  var outputType = '';
+  if ($outputTypeElem.value !== 'preview') {
+    outputType = 'outputType=' + $outputTypeElem.value + '&';
+  }
+
+  $permalinkElem.href = '?' + outputType + 'text=' + encodeURIComponent($markdownElem.value)
+      + '&options=' + encodeURIComponent($optionsElem.value)
+      + '&version=' + encodeURIComponent($markedVerElem.value);
+  history.replaceState('', document.title, $permalinkElem.href);
+}
+
+function updateVersion() {
+  if (window.Worker) {
+    handleInput();
+    return Promise.resolve();
+  }
+  var promise;
+  if (markedVersionCache[$markedVerElem.value]) {
+    promise = Promise.resolve(markedVersionCache[$markedVerElem.value]);
+  } else {
+    promise = fetch(markedVersions[$markedVerElem.value])
+      .then(function (res) { return res.text(); })
+      .then(function (text) {
+        markedVersionCache[$markedVerElem.value] = text;
+        return text;
+      });
+  }
+  return promise.then(function (text) {
+    var script = document.createElement('script');
+    script.textContent = text;
+
+    $markedVer.parentNode.replaceChild(script, $markedVer);
+    $markedVer = script;
+  }).then(handleInput);
+}
+
+function checkForChanges() {
+  if (inputDirty && $markedVerElem.value !== 'commit' && $markedVerElem.value !== 'pr' && (typeof marked !== 'undefined' || window.Worker)) {
+    inputDirty = false;
+
+    updateLink();
+
+    var options = {};
+    var optionsString = $optionsElem.value || '{}';
+    try {
+      var newOptions = JSON.parse(optionsString);
+      options = newOptions;
+      $optionsElem.classList.remove('error');
+    } catch (err) {
+      $optionsElem.classList.add('error');
+    }
+
+    var version = markedVersions[$markedVerElem.value];
+    var markdown = $markdownElem.value;
+    var hash = version + markdown + optionsString;
+    if (lastInput !== hash) {
+      lastInput = hash;
+      if (window.Worker) {
+        delayTime = 100;
+        messageWorker({
+          task: 'parse',
+          version: version,
+          markdown: markdown,
+          options: options
+        });
+      } else {
+        var startTime = new Date();
+        var lexed = marked.lexer(markdown, options);
+        var lexedList = [];
+        for (var i = 0; i < lexed.length; i++) {
+          var lexedLine = [];
+          for (var j in lexed[i]) {
+            lexedLine.push(j + ':' + jsonString(lexed[i][j]));
+          }
+          lexedList.push('{' + lexedLine.join(', ') + '}');
+        }
+        var parsed = marked.parser(lexed, options);
+        var scrollPercent = getScrollPercent();
+        setParsed(parsed, lexedList.join('\n'));
+        setScrollPercent(scrollPercent);
+        var endTime = new Date();
+        delayTime = endTime - startTime;
+        setResponseTime(delayTime);
+        if (delayTime < 50) {
+          delayTime = 50;
+        } else if (delayTime > 500) {
+          delayTime = 1000;
+        }
+      }
+    }
+  }
+  checkChangeTimeout = window.setTimeout(checkForChanges, delayTime);
+};
+
+function setResponseTime(ms) {
+  var amount = ms;
+  var suffix = 'ms';
+  if (ms > 1000 * 60 * 60) {
+    amount = 'Too Long';
+    suffix = '';
+  } else if (ms > 1000 * 60) {
+    amount = '>' + Math.floor(ms / (1000 * 60));
+    suffix = 'm';
+  } else if (ms > 1000) {
+    amount = '>' + Math.floor(ms / 1000);
+    suffix = 's';
+  }
+  $responseTimeElem.textContent = amount + suffix;
+}
+
+function setParsed(parsed, lexed) {
+  try {
+    $previewIframe.contentDocument.body.innerHTML = parsed;
+  } catch (ex) {}
+  $htmlElem.value = parsed;
+  $lexerElem.value = lexed;
+}
+
+function messageWorker(message) {
+  if (!markedWorker || markedWorker.working) {
+    if (markedWorker) {
+      clearTimeout(markedWorker.timeout);
+      markedWorker.terminate();
+    }
+    markedWorker = new Worker('worker.js');
+    markedWorker.onmessage = function (e) {
+      clearTimeout(markedWorker.timeout);
+      markedWorker.working = false;
+      switch (e.data.task) {
+        case 'defaults':
+          setOptions(e.data.defaults);
+          break;
+        case 'parse':
+          $previewElem.classList.remove('error');
+          $htmlElem.classList.remove('error');
+          $lexerElem.classList.remove('error');
+          var scrollPercent = getScrollPercent();
+          setParsed(e.data.parsed, e.data.lexed);
+          setScrollPercent(scrollPercent);
+          setResponseTime(e.data.time);
+          break;
+      }
+      clearTimeout(checkChangeTimeout);
+      delayTime = 10;
+      checkForChanges();
+    };
+    markedWorker.onerror = markedWorker.onmessageerror = function (err) {
+      clearTimeout(markedWorker.timeout);
+      var error = 'There was an error in the Worker';
+      if (err) {
+        if (err.message) {
+          error = err.message;
+        } else {
+          error = err;
+        }
+      }
+      error = error.replace(/^Uncaught Error: /, '');
+      $previewElem.classList.add('error');
+      $htmlElem.classList.add('error');
+      $lexerElem.classList.add('error');
+      setParsed(error, error);
+      setScrollPercent(0);
+    };
+  }
+  if (message.task !== 'defaults') {
+    markedWorker.working = true;
+    workerTimeout(0);
+  }
+  markedWorker.postMessage(message);
+}
+
+function workerTimeout(seconds) {
+  markedWorker.timeout = setTimeout(function () {
+    seconds++;
+    markedWorker.onerror('Marked has taken longer than ' + seconds + ' second' + (seconds > 1 ? 's' : '') + ' to respond...');
+    workerTimeout(seconds);
+  }, 1000);
+}
diff --git a/packages/markdown/marked/docs/demo/index.html b/packages/markdown/marked/docs/demo/index.html
new file mode 100644
index 00000000..96a8ec14
--- /dev/null
+++ b/packages/markdown/marked/docs/demo/index.html
@@ -0,0 +1,78 @@
+<!doctype html>
+<html lang="en">
+
+  <head>
+    <title>Marked Demo</title>
+    <link rel="stylesheet" href="./demo.css" type="text/css" />
+  </head>
+
+  <body>
+    <a href="https://github.com/markedjs/marked">
+    <img class="github-ribbon" src="https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub">
+  </a>
+
+    <header>
+      <a href="../">
+      <img src="../img/logo-black.svg" height="64px" width="64px" />
+    </a>
+      <h1>Marked Demo</h1>
+    </header>
+
+    <div id="loading">Loading...</div>
+    <div id="main">
+      <div class="containers">
+        <div class="container">
+          <div class="label">
+            <span>Input</span> ·
+            <a id="permalink">Permalink</a> ·
+            <span>Version: </span>
+            <select id="markedVersion">
+              <option value="pr">Add PR:</option>
+              <option value="commit">Add Commit:</option>
+              <option value="master" selected>master</option>
+            </select>
+            <input type="text" id="commitVersion" title="Press ENTER to add commit" />·
+            <button id="clear">Clear</button>
+            <select id="inputType">
+              <option value="markdown">Markdown</option>
+              <option value="options">Options</option>
+            </select>
+          </div>
+          <textarea id="markdown" class="inputPane"></textarea>
+          <textarea id="options" class="inputPane" placeholder="Options (as JSON)"></textarea>
+        </div>
+
+        <div class="container">
+          <div class="label">
+            <select id="outputType">
+              <option value="preview">Preview</option>
+              <option value="html">HTML Source</option>
+              <option value="lexer">Lexer Data</option>
+              <option value="quickref">Quick Reference</option>
+            </select> ·
+            Response Time:
+            <span id="responseTime"></span>
+          </div>
+
+          <div id="preview" class="pane">
+            <noscript>
+              <h2>You'll need to enable Javascript to use this tool.</h2>
+            </noscript>
+            <iframe src="./preview.html" frameborder="0" sandbox="allow-same-origin allow-top-navigation-by-user-activation"></iframe>
+          </div>
+
+          <textarea id="html" class="pane" readonly="readonly"></textarea>
+
+          <textarea id="lexer" class="pane" readonly="readonly"></textarea>
+
+          <textarea id="quickref" class="pane" readonly="readonly"></textarea>
+        </div>
+      </div>
+    </div>
+    <script id="markedCdn"></script>
+    <script src="https://cdn.jsdelivr.net/npm/es6-promise/dist/es6-promise.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/unfetch/dist/unfetch.umd.js"></script>
+    <script src="./demo.js"></script>
+  </body>
+
+</html>
diff --git a/packages/markdown/marked/docs/demo/initial.md b/packages/markdown/marked/docs/demo/initial.md
new file mode 100644
index 00000000..d2b7d77c
--- /dev/null
+++ b/packages/markdown/marked/docs/demo/initial.md
@@ -0,0 +1,36 @@
+Marked - Markdown Parser
+========================
+
+[Marked] lets you convert [Markdown] into HTML.  Markdown is a simple text format whose goal is to be very easy to read and write, even when not converted to HTML.  This demo page will let you type anything you like and see how it gets converted.  Live.  No more waiting around.
+
+How To Use The Demo
+-------------------
+
+1. Type in stuff on the left.
+2. See the live updates on the right.
+
+That's it.  Pretty simple.  There's also a drop-down option in the upper right to switch between various views:
+
+- **Preview:**  A live display of the generated HTML as it would render in a browser.
+- **HTML Source:**  The generated HTML before your browser makes it pretty.
+- **Lexer Data:**  What [marked] uses internally, in case you like gory stuff like this.
+- **Quick Reference:**  A brief run-down of how to format things using markdown.
+
+Why Markdown?
+-------------
+
+It's easy.  It's not overly bloated, unlike HTML.  Also, as the creator of [markdown] says,
+
+> The overriding design goal for Markdown's
+> formatting syntax is to make it as readable
+> as possible. The idea is that a
+> Markdown-formatted document should be
+> publishable as-is, as plain text, without
+> looking like it's been marked up with tags
+> or formatting instructions.
+
+Ready to start writing?  Either start changing stuff on the left or
+[clear everything](/demo/?text=) with a simple click.
+
+[Marked]: https://github.com/markedjs/marked/
+[Markdown]: http://daringfireball.net/projects/markdown/
diff --git a/packages/markdown/marked/docs/demo/preview.html b/packages/markdown/marked/docs/demo/preview.html
new file mode 100644
index 00000000..7e8c89fe
--- /dev/null
+++ b/packages/markdown/marked/docs/demo/preview.html
@@ -0,0 +1,12 @@
+
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>marked.js preview</title>
+  <link rel="stylesheet" href="./demo.css" />
+  <base target="_parent">
+</head>
+<body>
+</body>
+</html>
diff --git a/packages/markdown/marked/docs/demo/quickref.md b/packages/markdown/marked/docs/demo/quickref.md
new file mode 100644
index 00000000..10f09bda
--- /dev/null
+++ b/packages/markdown/marked/docs/demo/quickref.md
@@ -0,0 +1,167 @@
+Markdown Quick Reference
+========================
+
+This guide is a very brief overview, with examples, of the syntax that [Markdown] supports.  It is itself written in Markdown and you can copy the samples over to the left-hand pane for experimentation.  It's shown as *text* and not *rendered HTML*.
+
+[Markdown]: http://daringfireball.net/projects/markdown/
+
+
+Simple Text Formatting
+======================
+
+First thing is first.  You can use *stars* or _underscores_ for italics.  **Double stars** and __double underscores__ do bold.  ***Three together*** do ___both___.
+
+Paragraphs are pretty easy too.  Just have a blank line between chunks of text.
+
+> This chunk of text is in a block quote.  Its multiple lines will all be
+> indended a bit from the rest of the text.
+>
+> > Multiple levels of block quotes also work.
+
+Sometimes you want to include some code, such as when you are explaining how `<h1>` HTML tags work, or maybe you are a programmer and you are discussing `someMethod()`.
+
+If you want to include some code and have
+newlines preserved, indent the line with a tab
+or at least four spaces.
+    Extra spaces work here too.
+This is also called preformatted text and it is useful for showing examples.
+The text will stay as text, so any *markdown* or <u>HTML</u> you add will
+not show up formatted.  This way you can show markdown examples in a
+markdown document.
+
+>     You can also use preformatted text with your blockquotes
+>     as long as you add at least five spaces.
+
+
+Headings
+========
+
+There are a couple of ways to make headings.  Using three or more equals signs on a line under a heading makes it into an "h1" style.  Three or more hyphens under a line makes it "h2" (slightly smaller).  You can also use multiple pound symbols before and after a heading.  Pounds after the title are ignored.  Here's some examples:
+
+This is H1
+==========
+
+This is H2
+----------
+
+# This is H1
+## This is H2
+### This is H3 with some extra pounds ###
+#### You get the idea ####
+##### I don't need extra pounds at the end
+###### H6 is the max
+
+
+Links
+=====
+
+Let's link to a few sites.  First, let's use the bare URL, like <http://www.github.com>.  Great for text, but ugly for HTML.
+Next is an inline link to [Google](http://www.google.com).  A little nicer.
+This is a reference-style link to [Wikipedia] [1].
+Lastly, here's a pretty link to [Yahoo].  The reference-style and pretty links both automatically use the links defined below, but they could be defined *anywhere* in the markdown and are removed from the HTML.  The names are also case insensitive, so you can use [YaHoO] and have it link properly.
+
+[1]: http://www.wikipedia.org/
+[Yahoo]: http://www.yahoo.com/
+
+Title attributes may be added to links by adding text after a link.
+This is the [inline link](http://www.bing.com "Bing") with a "Bing" title.
+You can also go to [W3C] [2] and maybe visit a [friend].
+
+[2]: http://w3c.org (The W3C puts out specs for web-based things)
+[Friend]: http://facebook.com/ "Facebook!"
+
+Email addresses in plain text are not linked: test@example.com.
+Email addresses wrapped in angle brackets are linked: <test@example.com>.
+They are also obfuscated so that email harvesting spam robots hopefully won't get them.
+
+
+Lists
+=====
+
+* This is a bulleted list
+* Great for shopping lists
+- You can also use hyphens
++ Or plus symbols
+
+The above is an "unordered" list.  Now, on for a bit of order.
+
+1. Numbered lists are also easy
+2. Just start with a number
+3738762. However, the actual number doesn't matter when converted to HTML.
+1.  This will still show up as 4.
+
+You might want a few advanced lists:
+
+- This top-level list is wrapped in paragraph tags
+- This generates an extra space between each top-level item.
+
+- You do it by adding a blank line
+
+- This nested list also has blank lines between the list items.
+
+- How to create nested lists
+1.  Start your regular list
+2.  Indent nested lists with four spaces
+3.  Further nesting means you should indent with four more spaces
+    * This line is indented with eight spaces.
+
+- List items can be quite lengthy.  You can keep typing and either continue
+them on the next line with no indentation.
+
+- Alternately, if that looks ugly, you can also
+indent the next line a bit for a prettier look.
+
+- You can put large blocks of text in your list by just indenting with four spaces.
+
+This is formatted the same as code, but you can inspect the HTML
+and find that it's just wrapped in a `<p>` tag and *won't* be shown
+as preformatted text.
+
+You can keep adding more and more paragraphs to a single
+list item by adding the traditional blank line and then keep
+on indenting the paragraphs with four spaces.  You really need
+to only indent the first line, but that looks ugly.
+
+- Lists support blockquotes
+
+> Just like this example here.  By the way, you can
+> nest lists inside blockquotes!
+> - Fantastic!
+
+- Lists support preformatted text
+
+    You just need to indent eight spaces.
+
+
+Even More
+=========
+
+Horizontal Rule
+---------------
+
+If you need a horizontal rule you just need to put at least three hyphens, asterisks, or underscores on a line by themselves.  You can also even put spaces between the characters.
+
+---
+****************************
+_ _ _ _ _ _ _
+
+Those three all produced horizontal lines.  Keep in mind that three hyphens under any text turns that text into a heading, so add a blank like if you use hyphens.
+
+Images
+------
+
+Images work exactly like links, but they have exclamation points in front.  They work with references and titles too.
+
+![Google Logo](http://www.google.com/images/errors/logo_sm.gif) and ![Happy].
+
+[Happy]: http://www.wpclipart.com/smiley/simple_smiley/smiley_face_simple_green_small.png ("Smiley face")
+
+
+Inline HTML
+-----------
+
+If markdown is too limiting, you can just insert your own <strike>crazy</strike> HTML.  Span-level HTML <u>can *still* use markdown</u>.  Block level elements must be separated from text by a blank line and must not have any spaces before the opening and closing HTML.
+
+<div style='font-family: "Comic Sans", sans-serif;'>
+It is a pity, but markdown does **not** work in here for most markdown parsers.  [Marked] handles it pretty well.
+</div>
diff --git a/packages/markdown/marked/docs/demo/worker.js b/packages/markdown/marked/docs/demo/worker.js
new file mode 100644
index 00000000..06b8befe
--- /dev/null
+++ b/packages/markdown/marked/docs/demo/worker.js
@@ -0,0 +1,105 @@
+/* globals marked, unfetch, ES6Promise */
+if (!self.Promise) {
+  self.importScripts('https://cdn.jsdelivr.net/npm/es6-promise/dist/es6-promise.js');
+  self.Promise = ES6Promise;
+}
+if (!self.fetch) {
+  self.importScripts('https://cdn.jsdelivr.net/npm/unfetch/dist/unfetch.umd.js');
+  self.fetch = unfetch;
+}
+
+var versionCache = {};
+var currentVersion;
+
+onunhandledrejection = function (e) {
+  throw e.reason;
+};
+
+onmessage = function (e) {
+  if (e.data.version === currentVersion) {
+    parse(e);
+  } else {
+    loadVersion(e.data.version).then(function () {
+      parse(e);
+    });
+  }
+};
+
+function parse(e) {
+  switch (e.data.task) {
+    case 'defaults':
+
+      var defaults = {};
+      if (typeof marked.getDefaults === 'function') {
+        defaults = marked.getDefaults();
+        delete defaults.renderer;
+      } else if ('defaults' in marked) {
+        for (var prop in marked.defaults) {
+          if (prop !== 'renderer') {
+            defaults[prop] = marked.defaults[prop];
+          }
+        }
+      }
+      postMessage({
+        task: e.data.task,
+        defaults: defaults
+      });
+      break;
+    case 'parse':
+      var startTime = new Date();
+      var lexed = marked.lexer(e.data.markdown, e.data.options);
+      var lexedList = [];
+      for (var i = 0; i < lexed.length; i++) {
+        var lexedLine = [];
+        for (var j in lexed[i]) {
+          lexedLine.push(j + ':' + jsonString(lexed[i][j]));
+        }
+        lexedList.push('{' + lexedLine.join(', ') + '}');
+      }
+      var parsed = marked.parser(lexed, e.data.options);
+      var endTime = new Date();
+      // setTimeout(function () {
+      postMessage({
+        task: e.data.task,
+        lexed: lexedList.join('\n'),
+        parsed: parsed,
+        time: endTime - startTime
+      });
+      // }, 10000);
+      break;
+  }
+}
+
+function jsonString(input) {
+  var output = (input + '')
+    .replace(/\n/g, '\\n')
+    .replace(/\r/g, '\\r')
+    .replace(/\t/g, '\\t')
+    .replace(/\f/g, '\\f')
+    .replace(/[\\"']/g, '\\$&')
+    .replace(/\u0000/g, '\\0');
+  return '"' + output + '"';
+};
+
+function loadVersion(ver) {
+  var promise;
+  if (versionCache[ver]) {
+    promise = Promise.resolve(versionCache[ver]);
+  } else {
+    promise = fetch(ver)
+      .then(function (res) { return res.text(); })
+      .then(function (text) {
+        versionCache[ver] = text;
+        return text;
+      });
+  }
+  return promise.then(function (text) {
+    try {
+      // eslint-disable-next-line no-new-func
+      Function(text)();
+    } catch (err) {
+      throw new Error('Cannot load that version of marked');
+    }
+    currentVersion = ver;
+  });
+}
diff --git a/packages/markdown/marked/docs/img/logo-black-and-white.svg b/packages/markdown/marked/docs/img/logo-black-and-white.svg
new file mode 100644
index 00000000..5f6c0b78
--- /dev/null
+++ b/packages/markdown/marked/docs/img/logo-black-and-white.svg
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="996px" height="439.589px" viewBox="0 0 996 439.589" enable-background="new 0 0 996 439.589" xml:space="preserve">
+<g>
+	<g id="Marked_Letters">
+		<path fill="#010101" d="M185.044,358.869h-9.961l-1.143-25.986l-14.092,25.986h-6.24l-6.709-26.807l-8.818,26.807h-10.225
+			l13.389-40.605h10.928l6.416,25.781l13.916-25.781h10.635L185.044,358.869z"/>
+		<path fill="#010101" d="M226.617,358.869h-10.811l-1.084-8.994H202.33l-4.102,8.994h-10.605l20.566-40.605h10.986L226.617,358.869
+			z M214.019,344.162l-1.934-15.527l-7.061,15.527H214.019z"/>
+		<path fill="#010101" d="M267.712,358.869h-11.338l-4.043-8.467c-1.191-2.559-2.227-4.478-3.105-5.757s-1.651-2.07-2.314-2.373
+			c-0.664-0.303-1.553-0.454-2.666-0.454h-1.553l-2.578,17.051h-10.283l5.889-40.605h15.85c5.761,0,9.672,1.27,11.733,3.809
+			c2.061,2.539,3.091,5.283,3.091,8.232c0,3.105-0.854,5.522-2.563,7.251c-1.709,1.729-4.097,2.798-7.163,3.208
+			c1.562,0.898,2.769,1.953,3.618,3.164s1.86,3.096,3.032,5.654L267.712,358.869z M255.525,330.012c0-1.562-0.571-2.925-1.714-4.087
+			s-3.453-1.743-6.929-1.743h-1.611l-1.699,11.719h4.102c2.89,0,4.922-0.61,6.094-1.831S255.525,331.496,255.525,330.012z"/>
+		<path fill="#010101" d="M313.705,318.264l-17.578,18.223l14.912,22.383h-11.807l-14.59-21.65l-3.282,21.65h-10.342l6.064-40.605
+			h10.401l-2.578,17.256l16.611-17.256H313.705z"/>
+		<path fill="#010101" d="M346.426,318.264L345.4,325.5h-16.436l-1.26,8.818h14.268l-1.025,7.266h-14.385l-1.377,10.02h19.98
+			l-1.025,7.266h-30.439l5.889-40.605H346.426z"/>
+		<path fill="#010101" d="M389.953,338.156c0,4.512-0.86,8.301-2.578,11.367c-1.719,3.066-4.273,5.391-7.662,6.973
+			s-7.583,2.373-12.582,2.373H348.41l5.83-40.605h14.941c3.534,0,6.625,0.527,9.271,1.582s4.82,2.51,6.52,4.365
+			s2.953,3.97,3.764,6.343S389.953,335.461,389.953,338.156z M379.377,338.303c0-2.031-0.387-4.004-1.158-5.918
+			s-2.192-3.54-4.262-4.878c-2.07-1.338-4.941-2.007-8.613-2.007h-1.67l-3.779,26.104h5.449c2.597,0,4.828-0.391,6.693-1.172
+			s3.33-1.821,4.395-3.12s1.821-2.71,2.271-4.233C379.152,341.555,379.377,339.963,379.377,338.303z"/>
+	</g>
+	<g>
+		<path fill="#010101" d="M406.922,307.149l-3.703,26.35c-0.609,4.324-2.72,6.486-6.33,6.486c-0.773,0-1.553-0.07-2.338-0.211
+			l-0.756-3.023c0.879,0.188,1.67,0.281,2.373,0.281c1.219,0,2.118-0.302,2.698-0.905s0.964-1.55,1.151-2.839l3.674-26.139H406.922z
+			"/>
+		<path fill="#010101" d="M423.027,307.8l-0.475,3.357c-1.312-0.867-2.748-1.301-4.307-1.301c-1.312,0-2.361,0.34-3.146,1.02
+			s-1.178,1.576-1.178,2.689c0,0.551,0.188,1.131,0.562,1.74s1.471,1.644,3.287,3.103s3.015,2.739,3.595,3.841
+			s0.87,2.203,0.87,3.305c0,1.758-0.662,3.275-1.986,4.553s-3.088,1.916-5.291,1.916c-1.957,0-3.938-0.586-5.941-1.758l0.51-3.604
+			c2.238,1.559,4.16,2.338,5.766,2.338c0.867,0,1.69-0.284,2.47-0.852c0.779-0.568,1.169-1.339,1.169-2.312
+			c0-0.62-0.197-1.265-0.59-1.933c-0.394-0.667-1.502-1.745-3.324-3.232c-1.824-1.486-3.014-2.778-3.568-3.874
+			c-0.555-1.097-0.832-2.185-0.832-3.263c0-1.899,0.785-3.491,2.355-4.775c1.57-1.283,3.422-1.926,5.555-1.926
+			C420.016,306.833,421.516,307.155,423.027,307.8z"/>
+	</g>
+	<g>
+		<g>
+			<path fill="#010101" d="M357,200v-92c0-8.284-6.716-15-15-15H172c-8.284,0-15,6.716-15,15v92H357z"/>
+			<path fill="#010101" d="M157,205v73c0,8.284,6.716,15,15,15h170c8.284,0,15-6.716,15-15v-73H157z"/>
+		</g>
+		<g>
+			<path fill="#FFFFFF" d="M208.737,180.15v-33.125l16.987,21.234l16.987-21.234v33.125h16.987v-57.756h-16.987l-16.987,21.234
+				l-16.987-21.234H191.75v57.756H208.737z"/>
+			<path fill="#FFFFFF" d="M322.55,151.272h-16.987v-28.878h-16.986v28.878h-16.987L297.069,181L322.55,151.272z"/>
+		</g>
+		<g>
+			<path fill="#FFFFFF" d="M217,241.154c0,2.124-1.722,3.846-3.845,3.846h-5.31c-2.124,0-3.845-1.722-3.845-3.846v-0.309
+				c0-2.124,1.722-3.846,3.845-3.846h5.31c2.124,0,3.845,1.722,3.845,3.846V241.154z"/>
+			<path fill="#FFFFFF" d="M207.859,256.5c0,1.933-1.1,3.5-2.457,3.5h-12.046c-1.357,0-2.457-1.567-2.457-3.5l0,0
+				c0-1.933,1.1-3.5,2.457-3.5h12.046C206.759,253,207.859,254.567,207.859,256.5L207.859,256.5z"/>
+			<path fill="#FFFFFF" d="M328.044,238.021c-1.058-3.094-2.692-5.85-4.907-8.269c-2.215-2.418-5.049-4.314-8.498-5.689
+				c-3.45-1.375-7.479-2.063-12.086-2.063h-19.477l-7.6,52.932h24.403c6.518,0,11.984-1.032,16.402-3.094
+				c4.416-2.062,7.746-5.092,9.986-9.09c2.24-3.996,3.361-8.936,3.361-14.817C329.629,244.418,329.1,241.115,328.044,238.021z
+				 M314.964,254.347c-0.586,1.986-1.573,3.826-2.96,5.519c-1.389,1.694-3.297,3.049-5.729,4.067s-5.34,1.528-8.727,1.528h-7.103
+				l4.927-34.027h2.176c4.787,0,8.529,0.872,11.229,2.616c2.698,1.744,4.55,3.863,5.557,6.358c1.005,2.494,1.508,5.066,1.508,7.713
+				C315.842,250.286,315.549,252.361,314.964,254.347z"/>
+			<path fill="#FFFFFF" d="M246.148,241.043l1.373-9.61h21.424l1.336-9.434h-10.601h-24.38h-1.256c-2.125,0-3.846,1.877-3.846,4
+				s1.721,4,3.846,4h0.096h3.793c1.928,0,3.491,1.563,3.491,3.491c0,1.928-1.563,3.491-3.491,3.491h-4.806L233.126,237h-8.983
+				c-1.299,0-2.353,1.786-2.353,3.988c0,2.203,1.053,3.989,2.353,3.989h7.826L231.966,245h3.189c2.124,0,3.845,1.722,3.845,3.846
+				v0.309c0,2.124-1.722,3.846-3.845,3.846h-4.349h-0.96H216.2c-1.933,0-3.5,1.567-3.5,3.5s1.567,3.5,3.5,3.5h8.645h4.945h0.364
+				c2.124,0,3.845,1.722,3.845,3.846v0.309c0,2.124-1.722,3.846-3.845,3.846h-1.524h-3.785h-1.8c-2.125,0-3.846,1.377-3.846,3.5
+				s1.721,3.5,3.846,3.5h25.636c0.273,0,0.538-0.024,0.795-0.068h17.828l1.336-9.471h-26.045l1.795-13.062h18.751l1.336-9.471
+				h-18.598l0.029-0.205C246.055,242.213,246.144,241.647,246.148,241.043z"/>
+		</g>
+	</g>
+</g>
+<g>
+	<g id="Marked_Letters_1_">
+		<path fill="#010101" d="M619.045,356.869h-9.961l-1.143-25.986l-14.092,25.986h-6.24l-6.709-26.807l-8.818,26.807h-10.225
+			l13.389-40.605h10.928l6.416,25.781l13.916-25.781h10.635L619.045,356.869z"/>
+		<path fill="#010101" d="M660.617,356.869h-10.811l-1.084-8.994H636.33l-4.102,8.994h-10.605l20.566-40.605h10.986L660.617,356.869
+			z M648.02,342.162l-1.934-15.527l-7.061,15.527H648.02z"/>
+		<path fill="#010101" d="M701.713,356.869h-11.338l-4.043-8.467c-1.191-2.559-2.227-4.478-3.105-5.757s-1.651-2.07-2.314-2.373
+			c-0.664-0.303-1.553-0.454-2.666-0.454h-1.553l-2.578,17.051h-10.283l5.889-40.605h15.85c5.761,0,9.672,1.27,11.732,3.809
+			s3.092,5.283,3.092,8.232c0,3.105-0.855,5.522-2.564,7.251s-4.097,2.798-7.162,3.208c1.562,0.898,2.768,1.953,3.617,3.164
+			s1.861,3.096,3.033,5.654L701.713,356.869z M689.525,328.012c0-1.562-0.572-2.925-1.715-4.087s-3.452-1.743-6.928-1.743h-1.611
+			l-1.699,11.719h4.102c2.89,0,4.922-0.61,6.094-1.831S689.525,329.496,689.525,328.012z"/>
+		<path fill="#010101" d="M747.705,316.264l-17.578,18.223l14.912,22.383h-11.807l-14.59-21.65l-3.281,21.65H705.02l6.064-40.605
+			h10.4l-2.578,17.256l16.611-17.256H747.705z"/>
+		<path fill="#010101" d="M780.426,316.264L779.4,323.5h-16.436l-1.26,8.818h14.268l-1.025,7.266h-14.385l-1.377,10.02h19.98
+			l-1.025,7.266h-30.439l5.889-40.605H780.426z"/>
+		<path fill="#010101" d="M823.953,336.156c0,4.512-0.86,8.301-2.578,11.367c-1.719,3.066-4.273,5.391-7.662,6.973
+			s-7.583,2.373-12.582,2.373H782.41l5.83-40.605h14.941c3.534,0,6.625,0.527,9.271,1.582s4.82,2.51,6.52,4.365
+			s2.953,3.97,3.764,6.343S823.953,333.461,823.953,336.156z M813.377,336.303c0-2.031-0.387-4.004-1.158-5.918
+			s-2.192-3.54-4.262-4.878c-2.07-1.338-4.941-2.007-8.613-2.007h-1.67l-3.779,26.104h5.449c2.597,0,4.828-0.391,6.693-1.172
+			s3.33-1.821,4.395-3.12s1.821-2.71,2.271-4.233C813.152,339.555,813.377,337.963,813.377,336.303z"/>
+	</g>
+	<g>
+		<path fill="#010101" d="M840.922,305.149l-3.703,26.35c-0.609,4.324-2.72,6.486-6.33,6.486c-0.773,0-1.553-0.07-2.338-0.211
+			l-0.756-3.023c0.879,0.188,1.67,0.281,2.373,0.281c1.219,0,2.118-0.302,2.698-0.905s0.964-1.55,1.151-2.839l3.674-26.139H840.922z
+			"/>
+		<path fill="#010101" d="M857.027,305.8l-0.475,3.357c-1.312-0.867-2.748-1.301-4.307-1.301c-1.312,0-2.361,0.34-3.146,1.02
+			s-1.178,1.576-1.178,2.689c0,0.551,0.188,1.131,0.562,1.74s1.471,1.644,3.287,3.103s3.015,2.739,3.595,3.841
+			s0.87,2.203,0.87,3.305c0,1.758-0.662,3.275-1.986,4.553s-3.088,1.916-5.291,1.916c-1.957,0-3.938-0.586-5.941-1.758l0.51-3.604
+			c2.238,1.559,4.16,2.338,5.766,2.338c0.867,0,1.69-0.284,2.47-0.852c0.779-0.568,1.169-1.339,1.169-2.312
+			c0-0.62-0.197-1.265-0.59-1.933c-0.394-0.667-1.502-1.745-3.324-3.232c-1.824-1.486-3.014-2.778-3.568-3.874
+			c-0.555-1.097-0.832-2.185-0.832-3.263c0-1.899,0.785-3.491,2.355-4.775c1.57-1.283,3.422-1.926,5.555-1.926
+			C854.016,304.833,855.516,305.155,857.027,305.8z"/>
+	</g>
+	<g>
+		<g>
+			<path d="M641,234.154c0,2.124-1.722,3.846-3.846,3.846h-5.309c-2.124,0-3.846-1.722-3.846-3.846v-0.309
+				c0-2.124,1.722-3.846,3.846-3.846h5.309c2.124,0,3.846,1.722,3.846,3.846V234.154z"/>
+			<path d="M631.859,249.5c0,1.933-1.1,3.5-2.457,3.5h-12.046c-1.356,0-2.456-1.567-2.456-3.5l0,0c0-1.933,1.1-3.5,2.456-3.5h12.046
+				C630.76,246,631.859,247.567,631.859,249.5L631.859,249.5z"/>
+			<path d="M752.044,231.021c-1.058-3.094-2.692-5.85-4.907-8.269c-2.215-2.418-5.049-4.314-8.498-5.689
+				c-3.45-1.375-7.479-2.063-12.086-2.063h-19.477l-7.6,52.932h24.402c6.518,0,11.984-1.032,16.402-3.094
+				c4.416-2.062,7.746-5.092,9.986-9.09c2.24-3.996,3.361-8.936,3.361-14.817C753.629,237.418,753.1,234.115,752.044,231.021z
+				 M738.964,247.347c-0.586,1.986-1.573,3.826-2.96,5.519c-1.389,1.694-3.297,3.049-5.729,4.067s-5.34,1.528-8.727,1.528h-7.103
+				l4.927-34.027h2.176c4.787,0,8.529,0.872,11.229,2.616c2.698,1.744,4.55,3.863,5.557,6.358c1.005,2.494,1.508,5.066,1.508,7.713
+				C739.842,243.286,739.549,245.361,738.964,247.347z"/>
+			<path d="M670.148,234.043l1.373-9.61h21.424l1.337-9.434h-10.601h-24.381h-1.256c-2.124,0-3.846,1.877-3.846,4s1.722,4,3.846,4
+				h0.096h3.793c1.929,0,3.492,1.563,3.492,3.491c0,1.928-1.563,3.491-3.492,3.491h-4.805L657.126,230h-8.983
+				c-1.299,0-2.352,1.786-2.352,3.988c0,2.203,1.053,3.989,2.352,3.989h7.826L655.966,238h3.188c2.124,0,3.846,1.722,3.846,3.846
+				v0.309c0,2.124-1.722,3.846-3.846,3.846h-4.349h-0.96H640.2c-1.933,0-3.5,1.567-3.5,3.5s1.567,3.5,3.5,3.5h8.646h4.945h0.363
+				c2.124,0,3.846,1.722,3.846,3.846v0.309c0,2.124-1.722,3.846-3.846,3.846h-1.523h-3.785h-1.801c-2.124,0-3.846,1.377-3.846,3.5
+				s1.722,3.5,3.846,3.5h25.637c0.272,0,0.537-0.024,0.795-0.068h17.827l1.337-9.471h-26.045l1.795-13.062h18.75l1.337-9.471
+				h-18.599l0.029-0.205C670.055,235.213,670.144,234.647,670.148,234.043z"/>
+		</g>
+		<g>
+			<path fill="#010101" d="M642.236,179.15v-33.125l16.988,21.234l16.986-21.234v33.125h16.987v-57.756h-16.987l-16.986,21.234
+				l-16.988-21.234H625.25v57.756H642.236z"/>
+			<path fill="#010101" d="M756.05,150.272h-16.987v-28.878h-16.986v28.878H705.09L730.569,180L756.05,150.272z"/>
+		</g>
+		<path fill="#010101" d="M776,90H606c-11.028,0-20,8.972-20,20v170c0,11.028,8.972,20,20,20h170c11.028,0,20-8.972,20-20V110
+			C796,98.972,787.028,90,776,90z M606,100h170c5.514,0,10,4.486,10,10v83H596v-83C596,104.486,600.486,100,606,100z M776,290H606
+			c-5.514,0-10-4.486-10-10v-82h190v82C786,285.514,781.514,290,776,290z"/>
+	</g>
+</g>
+</svg>
\ No newline at end of file
diff --git a/packages/markdown/marked/docs/img/logo-black.svg b/packages/markdown/marked/docs/img/logo-black.svg
new file mode 100644
index 00000000..a67fb80e
--- /dev/null
+++ b/packages/markdown/marked/docs/img/logo-black.svg
@@ -0,0 +1,32 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" width="300px" height="439.589px" viewBox="100 100 400 400" xml:space="preserve">
+<g>
+	<g id="Marked_Letters">
+		<path fill="#010101" d="M185.044,358.869h-9.961l-1.143-25.986l-14.092,25.986h-6.24l-6.709-26.807l-8.818,26.807h-10.225    l13.389-40.605h10.928l6.416,25.781l13.916-25.781h10.635L185.044,358.869z"/>
+		<path fill="#010101" d="M226.617,358.869h-10.811l-1.084-8.994H202.33l-4.102,8.994h-10.605l20.566-40.605h10.986L226.617,358.869    z M214.019,344.162l-1.934-15.527l-7.061,15.527H214.019z"/>
+		<path fill="#010101" d="M267.712,358.869h-11.338l-4.043-8.467c-1.191-2.559-2.227-4.478-3.105-5.757s-1.651-2.07-2.314-2.373    c-0.664-0.303-1.553-0.454-2.666-0.454h-1.553l-2.578,17.051h-10.283l5.889-40.605h15.85c5.761,0,9.672,1.27,11.733,3.809    c2.061,2.539,3.091,5.283,3.091,8.232c0,3.105-0.854,5.522-2.563,7.251c-1.709,1.729-4.097,2.798-7.163,3.208    c1.562,0.898,2.769,1.953,3.618,3.164s1.86,3.096,3.032,5.654L267.712,358.869z M255.525,330.012c0-1.562-0.571-2.925-1.714-4.087    s-3.453-1.743-6.929-1.743h-1.611l-1.699,11.719h4.102c2.89,0,4.922-0.61,6.094-1.831S255.525,331.496,255.525,330.012z"/>
+		<path fill="#010101" d="M313.705,318.264l-17.578,18.223l14.912,22.383h-11.807l-14.59-21.65l-3.282,21.65h-10.342l6.064-40.605    h10.401l-2.578,17.256l16.611-17.256H313.705z"/>
+		<path fill="#010101" d="M346.426,318.264L345.4,325.5h-16.436l-1.26,8.818h14.268l-1.025,7.266h-14.385l-1.377,10.02h19.98    l-1.025,7.266h-30.439l5.889-40.605H346.426z"/>
+		<path fill="#010101" d="M389.953,338.156c0,4.512-0.86,8.301-2.578,11.367c-1.719,3.066-4.273,5.391-7.662,6.973    s-7.583,2.373-12.582,2.373H348.41l5.83-40.605h14.941c3.534,0,6.625,0.527,9.271,1.582s4.82,2.51,6.52,4.365    s2.953,3.97,3.764,6.343S389.953,335.461,389.953,338.156z M379.377,338.303c0-2.031-0.387-4.004-1.158-5.918    s-2.192-3.54-4.262-4.878c-2.07-1.338-4.941-2.007-8.613-2.007h-1.67l-3.779,26.104h5.449c2.597,0,4.828-0.391,6.693-1.172    s3.33-1.821,4.395-3.12s1.821-2.71,2.271-4.233C379.152,341.555,379.377,339.963,379.377,338.303z"/>
+	</g>
+	<g>
+		<path fill="#010101" d="M406.922,307.149l-3.703,26.35c-0.609,4.324-2.72,6.486-6.33,6.486c-0.773,0-1.553-0.07-2.338-0.211    l-0.756-3.023c0.879,0.188,1.67,0.281,2.373,0.281c1.219,0,2.118-0.302,2.698-0.905s0.964-1.55,1.151-2.839l3.674-26.139H406.922z    "/>
+		<path fill="#010101" d="M423.027,307.8l-0.475,3.357c-1.312-0.867-2.748-1.301-4.307-1.301c-1.312,0-2.361,0.34-3.146,1.02    s-1.178,1.576-1.178,2.689c0,0.551,0.188,1.131,0.562,1.74s1.471,1.644,3.287,3.103s3.015,2.739,3.595,3.841    s0.87,2.203,0.87,3.305c0,1.758-0.662,3.275-1.986,4.553s-3.088,1.916-5.291,1.916c-1.957,0-3.938-0.586-5.941-1.758l0.51-3.604    c2.238,1.559,4.16,2.338,5.766,2.338c0.867,0,1.69-0.284,2.47-0.852c0.779-0.568,1.169-1.339,1.169-2.312    c0-0.62-0.197-1.265-0.59-1.933c-0.394-0.667-1.502-1.745-3.324-3.232c-1.824-1.486-3.014-2.778-3.568-3.874    c-0.555-1.097-0.832-2.185-0.832-3.263c0-1.899,0.785-3.491,2.355-4.775c1.57-1.283,3.422-1.926,5.555-1.926    C420.016,306.833,421.516,307.155,423.027,307.8z"/>
+	</g>
+	<g>
+		<g>
+			<path fill="#010101" d="M357,200v-92c0-8.284-6.716-15-15-15H172c-8.284,0-15,6.716-15,15v92H357z"/>
+			<path fill="#010101" d="M157,205v73c0,8.284,6.716,15,15,15h170c8.284,0,15-6.716,15-15v-73H157z"/>
+		</g>
+		<g>
+			<path fill="#FFFFFF" d="M208.737,180.15v-33.125l16.987,21.234l16.987-21.234v33.125h16.987v-57.756h-16.987l-16.987,21.234     l-16.987-21.234H191.75v57.756H208.737z"/>
+			<path fill="#FFFFFF" d="M322.55,151.272h-16.987v-28.878h-16.986v28.878h-16.987L297.069,181L322.55,151.272z"/>
+		</g>
+		<g>
+			<path fill="#FFFFFF" d="M217,241.154c0,2.124-1.722,3.846-3.845,3.846h-5.31c-2.124,0-3.845-1.722-3.845-3.846v-0.309     c0-2.124,1.722-3.846,3.845-3.846h5.31c2.124,0,3.845,1.722,3.845,3.846V241.154z"/>
+			<path fill="#FFFFFF" d="M207.859,256.5c0,1.933-1.1,3.5-2.457,3.5h-12.046c-1.357,0-2.457-1.567-2.457-3.5l0,0     c0-1.933,1.1-3.5,2.457-3.5h12.046C206.759,253,207.859,254.567,207.859,256.5L207.859,256.5z"/>
+			<path fill="#FFFFFF" d="M328.044,238.021c-1.058-3.094-2.692-5.85-4.907-8.269c-2.215-2.418-5.049-4.314-8.498-5.689     c-3.45-1.375-7.479-2.063-12.086-2.063h-19.477l-7.6,52.932h24.403c6.518,0,11.984-1.032,16.402-3.094     c4.416-2.062,7.746-5.092,9.986-9.09c2.24-3.996,3.361-8.936,3.361-14.817C329.629,244.418,329.1,241.115,328.044,238.021z      M314.964,254.347c-0.586,1.986-1.573,3.826-2.96,5.519c-1.389,1.694-3.297,3.049-5.729,4.067s-5.34,1.528-8.727,1.528h-7.103     l4.927-34.027h2.176c4.787,0,8.529,0.872,11.229,2.616c2.698,1.744,4.55,3.863,5.557,6.358c1.005,2.494,1.508,5.066,1.508,7.713     C315.842,250.286,315.549,252.361,314.964,254.347z"/>
+			<path fill="#FFFFFF" d="M246.148,241.043l1.373-9.61h21.424l1.336-9.434h-10.601h-24.38h-1.256c-2.125,0-3.846,1.877-3.846,4     s1.721,4,3.846,4h0.096h3.793c1.928,0,3.491,1.563,3.491,3.491c0,1.928-1.563,3.491-3.491,3.491h-4.806L233.126,237h-8.983     c-1.299,0-2.353,1.786-2.353,3.988c0,2.203,1.053,3.989,2.353,3.989h7.826L231.966,245h3.189c2.124,0,3.845,1.722,3.845,3.846     v0.309c0,2.124-1.722,3.846-3.845,3.846h-4.349h-0.96H216.2c-1.933,0-3.5,1.567-3.5,3.5s1.567,3.5,3.5,3.5h8.645h4.945h0.364     c2.124,0,3.845,1.722,3.845,3.846v0.309c0,2.124-1.722,3.846-3.845,3.846h-1.524h-3.785h-1.8c-2.125,0-3.846,1.377-3.846,3.5     s1.721,3.5,3.846,3.5h25.636c0.273,0,0.538-0.024,0.795-0.068h17.828l1.336-9.471h-26.045l1.795-13.062h18.751l1.336-9.471     h-18.598l0.029-0.205C246.055,242.213,246.144,241.647,246.148,241.043z"/>
+		</g>
+	</g>
+</g>
+</svg>
\ No newline at end of file
diff --git a/packages/markdown/marked/docs/index.html b/packages/markdown/marked/docs/index.html
new file mode 100644
index 00000000..07a4d5ee
--- /dev/null
+++ b/packages/markdown/marked/docs/index.html
@@ -0,0 +1,269 @@
+<!doctype html>
+<html>
+<head>
+    <meta charset="utf-8"/>
+    <title>Marked.js Documentation</title>
+    <style>
+        body {
+            font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol";
+            font-size: 16px;
+            line-height: 1.5;
+            word-wrap: break-word;
+            background: #F9F9F9;
+        }
+
+        #container {
+            max-width: 900px;
+            margin: auto;
+        }
+
+        #content {
+            padding: 5px 10px;
+            border: 1px solid #ddd;
+            border-radius: 3px;
+            background: white;
+        }
+
+        #content h1:first-child {
+            margin-top: 0px;
+        }
+
+        nav {
+            border: 1px solid #ddd;
+            border-radius: 3px;
+            background: white;
+            margin-right: 10px;
+        }
+
+        nav > ul {
+            position: sticky;
+            top: 5px;
+            margin: 10px 0px;
+            padding: 0;
+            list-style-type: none;
+            font-size: 14px;
+        }
+
+        nav > ul > li {
+            min-width: 125px;
+            padding: 0px 15px;
+        }
+
+        nav > ul > li > ul {
+            padding-left: 25px;
+        }
+
+        nav > ul > li > ul > li {
+            font-size: 0.8em;
+        }
+
+        nav .selected {
+            color: #111;
+            font-weight: bold;
+        }
+
+        nav .selected:hover {
+            text-decoration: none;
+        }
+
+        header {
+            display: flex;
+            height: 50px;
+        }
+
+        header h1 { margin: 0; }
+
+        table {
+            border-spacing: 0;
+            border-collapse: collapse;
+            border: 1px solid #ddd;
+        }
+
+        td, th {
+            border: 1px solid #ddd;
+            padding: 5px;
+        }
+
+        a {
+            color: #0366d6;
+            text-decoration: none;
+        }
+
+        a:hover {
+            text-decoration: underline;
+        }
+
+        pre {
+            font-family: "SFMono-Regular",Consolas,"Liberation Mono",Menlo,Courier,monospace;
+            padding: 16px;
+            overflow: auto;
+            font-size: 85%;
+            line-height: 1.45;
+            background-color: #f6f8fa;
+            border-radius: 3px;
+        }
+
+        code:not([class]) {
+            padding: 0.2em 0.4em;
+            margin: 0;
+            font-size: 85%;
+            background-color: rgba(27,31,35,0.05);
+            border-radius: 3px;
+        }
+
+        .github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}
+
+    </style>
+</head>
+<body>
+    <a href="https://github.com/markedjs/marked" class="github-corner" aria-label="View source on Github">
+        <svg width="80" height="80" viewBox="0 0 250 250" style="fill:#202020; color:#fff; position: absolute; top: 0; border: 0; right: 0;" aria-hidden="true">
+            <path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path>
+            <path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path>
+            <path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path>
+        </svg>
+    </a>
+    <div id="container">
+        <header>
+            <a href="#/README.md">
+                <img src="img/logo-black.svg" height="64px" width="64px" />
+            </a>
+            <h1>Marked.js Documentation</h1>
+        </header>
+        <div style="display: flex">
+            <nav>
+                <ul>
+                    <li>
+                        <a href="#/README.md">Getting Started</a>
+                        <ul>
+                            <li><a href="#/README.md#demo">Demo</a></li>
+                            <li><a href="#/README.md#installation">Installation</a></li>
+                            <li><a href="#/README.md#usage">Usage</a></li>
+                            <li><a href="#/README.md#specifications">Specs</a></li>
+                            <li><a href="#/README.md#security">Security</a></li>
+                        </ul>
+                    </li>
+                    <li>
+                        <a href="#/USING_ADVANCED.md">Advanced Usage</a>
+                        <ul>
+                            <li><a href="#/USING_ADVANCED.md#options">Options</a></li>
+                            <li><a href="#/USING_ADVANCED.md#highlight">Highlighting</a></li>
+                        </ul>
+                    </li>
+                    <li>
+                        <a href="#/USING_PRO.md">Extensibility</a>
+                        <ul>
+                            <li><a href="#/USING_PRO.md#renderer">Renderer</a></li>
+                            <li><a href="#/USING_PRO.md#lexer">Lexer</a></li>
+                            <li><a href="#/USING_PRO.md#parser">Parser</a></li>
+                        </ul>
+                    </li>
+                    <li>
+                        <a href="#/CONTRIBUTING.md">Contributing</a>
+                        <ul>
+                            <li><a href="#/CONTRIBUTING.md#design-principles">Design Principles</a></li>
+                            <li><a href="#/CONTRIBUTING.md#priorities">Priorities</a></li>
+                            <li><a href="#/CONTRIBUTING.md#test-early-often-and-everything">Testing</a></li>
+                        </ul>
+                    </li>
+                    <li><a href="#/CODE_OF_CONDUCT.md">Code of Conduct</a></li>
+                    <li><a href="#/AUTHORS.md">Authors</a></li>
+                    <li><a href="#/PUBLISHING.md">Publishing</a></li>
+                    <li><a href="https://github.com/markedjs/marked/blob/master/LICENSE.md">License</a></li>
+                </ul>
+            </nav>
+            <div id="content"></div>
+        </div>
+    </div>
+    <script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/es6-promise/dist/es6-promise.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/unfetch/dist/unfetch.umd.js"></script>
+    <script>
+        if (!window.Promise) {
+          window.Promise = ES6Promise;
+        }
+        if (!window.fetch) {
+          window.fetch = unfetch;
+        }
+
+        var content = document.querySelector('#content');
+        var body = document.querySelector('html');
+        var navLinks = document.querySelectorAll('nav a');
+        var currentPage = 'README.md';
+        var currentHash = '';
+        var renderedPage = '';
+
+        function hashChange() {
+            var hash = location.hash.slice(1);
+            if (!hash) {
+                hash = 'README.md';
+            }
+
+            var uri = hash.split('#');
+
+            if (uri[0].match(/^\//)) {
+                currentPage = uri[0].slice(1);
+                if (uri.length > 1) {
+                    currentHash = uri[1];
+                } else {
+                    currentHash = '';
+                }
+            } else {
+                currentHash = uri[0];
+            }
+
+            fetchPage(currentPage).then(function () {
+                fetchAnchor(currentHash)
+            });
+
+            var url = '#/' + currentPage + (currentHash ? '#' + currentHash : '');
+            var fullUrl = window.location.origin + '/' + url;
+
+            navLinks.forEach(function(link) {
+                link.className = link.href === fullUrl ? 'selected' : '';
+            });
+
+            history.replaceState('', document.title, url);
+        }
+
+        function fetchAnchor(anchor) {
+            if (!anchor) {
+                return;
+            }
+
+            var hashElement = document.getElementById(anchor);
+            if (hashElement) {
+                hashElement.scrollIntoView();
+            }
+        }
+
+        function fetchPage(page) {
+            if (page === renderedPage) {
+                return Promise.resolve();
+            }
+            return fetch(page)
+                .then(function (res) {
+                    if (!res.ok) {
+                        throw new Error('Error ' + res.status + ': ' + res.statusText);
+                    }
+                    return res.text();
+                })
+                .then(function (text) {
+                    renderedPage = page;
+                    content.innerHTML = marked(text);
+                    body.scrollTop = 0;
+                }).catch(function (e) {
+                    content.innerHTML = '<p>Oops! There was a problem rendering the page.</p>'
+                        + '<p>' + e.message + '</p>';
+                });
+        }
+
+        window.addEventListener('hashchange', function (e) {
+            e.preventDefault();
+            hashChange();
+        });
+
+        hashChange();
+    </script>
+</body>
+</html>
diff --git a/packages/markdown/marked/index.js b/packages/markdown/marked/index.js
new file mode 100644
index 00000000..a12f9056
--- /dev/null
+++ b/packages/markdown/marked/index.js
@@ -0,0 +1 @@
+module.exports = require('./lib/marked');
diff --git a/packages/markdown/marked/jasmine.json b/packages/markdown/marked/jasmine.json
new file mode 100644
index 00000000..bec42542
--- /dev/null
+++ b/packages/markdown/marked/jasmine.json
@@ -0,0 +1,11 @@
+{
+  "spec_dir": "test",
+  "spec_files": [
+    "**/*-spec.js"
+  ],
+  "helpers": [
+    "helpers/helpers.js"
+  ],
+  "stopSpecOnExpectationFailure": false,
+  "random": true
+}
diff --git a/packages/markdown/marked/lib/marked.js b/packages/markdown/marked/lib/marked.js
new file mode 100644
index 00000000..39c25f26
--- /dev/null
+++ b/packages/markdown/marked/lib/marked.js
@@ -0,0 +1,1689 @@
+/**
+ * marked - a markdown parser
+ * Copyright (c) 2011-2018, Christopher Jeffrey. (MIT Licensed)
+ * https://github.com/markedjs/marked
+ */
+
+;(function(root) {
+'use strict';
+
+/**
+ * Block-Level Grammar
+ */
+
+var block = {
+  newline: /^\n+/,
+  code: /^( {4}[^\n]+\n*)+/,
+  fences: noop,
+  hr: /^ {0,3}((?:- *){3,}|(?:_ *){3,}|(?:\* *){3,})(?:\n+|$)/,
+  heading: /^ *(#{1,6}) *([^\n]+?) *(?:#+ *)?(?:\n+|$)/,
+  nptable: noop,
+  blockquote: /^( {0,3}> ?(paragraph|[^\n]*)(?:\n|$))+/,
+  list: /^( {0,3})(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,
+  html: '^ {0,3}(?:' // optional indentation
+    + '<(script|pre|style)[\\s>][\\s\\S]*?(?:</\\1>[^\\n]*\\n+|$)' // (1)
+    + '|comment[^\\n]*(\\n+|$)' // (2)
+    + '|<\\?[\\s\\S]*?\\?>\\n*' // (3)
+    + '|<![A-Z][\\s\\S]*?>\\n*' // (4)
+    + '|<!\\[CDATA\\[[\\s\\S]*?\\]\\]>\\n*' // (5)
+    + '|</?(tag)(?: +|\\n|/?>)[\\s\\S]*?(?:\\n{2,}|$)' // (6)
+    + '|<(?!script|pre|style)([a-z][\\w-]*)(?:attribute)*? */?>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:\\n{2,}|$)' // (7) open tag
+    + '|</(?!script|pre|style)[a-z][\\w-]*\\s*>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:\\n{2,}|$)' // (7) closing tag
+    + ')',
+  def: /^ {0,3}\[(label)\]: *\n? *<?([^\s>]+)>?(?:(?: +\n? *| *\n *)(title))? *(?:\n+|$)/,
+  table: noop,
+  lheading: /^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/,
+  paragraph: /^([^\n]+(?:\n(?!hr|heading|lheading| {0,3}>|<\/?(?:tag)(?: +|\n|\/?>)|<(?:script|pre|style|!--))[^\n]+)*)/,
+  text: /^[^\n]+/
+};
+
+block._label = /(?!\s*\])(?:\\[\[\]]|[^\[\]])+/;
+block._title = /(?:"(?:\\"?|[^"\\])*"|'[^'\n]*(?:\n[^'\n]+)*\n?'|\([^()]*\))/;
+block.def = edit(block.def)
+  .replace('label', block._label)
+  .replace('title', block._title)
+  .getRegex();
+
+block.bullet = /(?:[*+-]|\d{1,9}\.)/;
+block.item = /^( *)(bull) ?[^\n]*(?:\n(?!\1bull ?)[^\n]*)*/;
+block.item = edit(block.item, 'gm')
+  .replace(/bull/g, block.bullet)
+  .getRegex();
+
+block.list = edit(block.list)
+  .replace(/bull/g, block.bullet)
+  .replace('hr', '\\n+(?=\\1?(?:(?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$))')
+  .replace('def', '\\n+(?=' + block.def.source + ')')
+  .getRegex();
+
+block._tag = 'address|article|aside|base|basefont|blockquote|body|caption'
+  + '|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption'
+  + '|figure|footer|form|frame|frameset|h[1-6]|head|header|hr|html|iframe'
+  + '|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option'
+  + '|p|param|section|source|summary|table|tbody|td|tfoot|th|thead|title|tr'
+  + '|track|ul';
+block._comment = /<!--(?!-?>)[\s\S]*?-->/;
+block.html = edit(block.html, 'i')
+  .replace('comment', block._comment)
+  .replace('tag', block._tag)
+  .replace('attribute', / +[a-zA-Z:_][\w.:-]*(?: *= *"[^"\n]*"| *= *'[^'\n]*'| *= *[^\s"'=<>`]+)?/)
+  .getRegex();
+
+block.paragraph = edit(block.paragraph)
+  .replace('hr', block.hr)
+  .replace('heading', block.heading)
+  .replace('lheading', block.lheading)
+  .replace('tag', block._tag) // pars can be interrupted by type (6) html blocks
+  .getRegex();
+
+block.blockquote = edit(block.blockquote)
+  .replace('paragraph', block.paragraph)
+  .getRegex();
+
+/**
+ * Normal Block Grammar
+ */
+
+block.normal = merge({}, block);
+
+/**
+ * GFM Block Grammar
+ */
+
+block.gfm = merge({}, block.normal, {
+  fences: /^ {0,3}(`{3,}|~{3,})([^`\n]*)\n(?:|([\s\S]*?)\n)(?: {0,3}\1[~`]* *(?:\n+|$)|$)/,
+  paragraph: /^/,
+  heading: /^ *(#{1,6}) +([^\n]+?) *#* *(?:\n+|$)/
+});
+
+block.gfm.paragraph = edit(block.paragraph)
+  .replace('(?!', '(?!'
+    + block.gfm.fences.source.replace('\\1', '\\2') + '|'
+    + block.list.source.replace('\\1', '\\3') + '|')
+  .getRegex();
+
+/**
+ * GFM + Tables Block Grammar
+ */
+
+block.tables = merge({}, block.gfm, {
+  nptable: /^ *([^|\n ].*\|.*)\n *([-:]+ *\|[-| :]*)(?:\n((?:.*[^>\n ].*(?:\n|$))*)\n*|$)/,
+  table: /^ *\|(.+)\n *\|?( *[-:]+[-| :]*)(?:\n((?: *[^>\n ].*(?:\n|$))*)\n*|$)/
+});
+
+/**
+ * Pedantic grammar
+ */
+
+block.pedantic = merge({}, block.normal, {
+  html: edit(
+    '^ *(?:comment *(?:\\n|\\s*$)'
+    + '|<(tag)[\\s\\S]+?</\\1> *(?:\\n{2,}|\\s*$)' // closed tag
+    + '|<tag(?:"[^"]*"|\'[^\']*\'|\\s[^\'"/>\\s]*)*?/?> *(?:\\n{2,}|\\s*$))')
+    .replace('comment', block._comment)
+    .replace(/tag/g, '(?!(?:'
+      + 'a|em|strong|small|s|cite|q|dfn|abbr|data|time|code|var|samp|kbd|sub'
+      + '|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo|span|br|wbr|ins|del|img)'
+      + '\\b)\\w+(?!:|[^\\w\\s@]*@)\\b')
+    .getRegex(),
+  def: /^ *\[([^\]]+)\]: *<?([^\s>]+)>?(?: +(["(][^\n]+[")]))? *(?:\n+|$)/
+});
+
+/**
+ * Block Lexer
+ */
+
+function Lexer(options) {
+  this.tokens = [];
+  this.tokens.links = Object.create(null);
+  this.options = options || marked.defaults;
+  this.rules = block.normal;
+
+  if (this.options.pedantic) {
+    this.rules = block.pedantic;
+  } else if (this.options.gfm) {
+    if (this.options.tables) {
+      this.rules = block.tables;
+    } else {
+      this.rules = block.gfm;
+    }
+  }
+}
+
+/**
+ * Expose Block Rules
+ */
+
+Lexer.rules = block;
+
+/**
+ * Static Lex Method
+ */
+
+Lexer.lex = function(src, options) {
+  var lexer = new Lexer(options);
+  return lexer.lex(src);
+};
+
+/**
+ * Preprocessing
+ */
+
+Lexer.prototype.lex = function(src) {
+  src = src
+    .replace(/\r\n|\r/g, '\n')
+    .replace(/\t/g, '    ')
+    .replace(/\u00a0/g, ' ')
+    .replace(/\u2424/g, '\n');
+
+  return this.token(src, true);
+};
+
+/**
+ * Lexing
+ */
+
+Lexer.prototype.token = function(src, top) {
+  src = src.replace(/^ +$/gm, '');
+  var next,
+      loose,
+      cap,
+      bull,
+      b,
+      item,
+      listStart,
+      listItems,
+      t,
+      space,
+      i,
+      tag,
+      l,
+      isordered,
+      istask,
+      ischecked;
+
+  while (src) {
+    // newline
+    if (cap = this.rules.newline.exec(src)) {
+      src = src.substring(cap[0].length);
+      if (cap[0].length > 1) {
+        this.tokens.push({
+          type: 'space'
+        });
+      }
+    }
+
+    // code
+    if (cap = this.rules.code.exec(src)) {
+      src = src.substring(cap[0].length);
+      cap = cap[0].replace(/^ {4}/gm, '');
+      this.tokens.push({
+        type: 'code',
+        text: !this.options.pedantic
+          ? rtrim(cap, '\n')
+          : cap
+      });
+      continue;
+    }
+
+    // fences (gfm)
+    if (cap = this.rules.fences.exec(src)) {
+      src = src.substring(cap[0].length);
+      this.tokens.push({
+        type: 'code',
+        lang: cap[2] ? cap[2].trim() : cap[2],
+        text: cap[3] || ''
+      });
+      continue;
+    }
+
+    // heading
+    if (cap = this.rules.heading.exec(src)) {
+      src = src.substring(cap[0].length);
+      this.tokens.push({
+        type: 'heading',
+        depth: cap[1].length,
+        text: cap[2]
+      });
+      continue;
+    }
+
+    // table no leading pipe (gfm)
+    if (cap = this.rules.nptable.exec(src)) {
+      item = {
+        type: 'table',
+        header: splitCells(cap[1].replace(/^ *| *\| *$/g, '')),
+        align: cap[2].replace(/^ *|\| *$/g, '').split(/ *\| */),
+        cells: cap[3] ? cap[3].replace(/\n$/, '').split('\n') : []
+      };
+
+      if (item.header.length === item.align.length) {
+        src = src.substring(cap[0].length);
+
+        for (i = 0; i < item.align.length; i++) {
+          if (/^ *-+: *$/.test(item.align[i])) {
+            item.align[i] = 'right';
+          } else if (/^ *:-+: *$/.test(item.align[i])) {
+            item.align[i] = 'center';
+          } else if (/^ *:-+ *$/.test(item.align[i])) {
+            item.align[i] = 'left';
+          } else {
+            item.align[i] = null;
+          }
+        }
+
+        for (i = 0; i < item.cells.length; i++) {
+          item.cells[i] = splitCells(item.cells[i], item.header.length);
+        }
+
+        this.tokens.push(item);
+
+        continue;
+      }
+    }
+
+    // hr
+    if (cap = this.rules.hr.exec(src)) {
+      src = src.substring(cap[0].length);
+      this.tokens.push({
+        type: 'hr'
+      });
+      continue;
+    }
+
+    // blockquote
+    if (cap = this.rules.blockquote.exec(src)) {
+      src = src.substring(cap[0].length);
+
+      this.tokens.push({
+        type: 'blockquote_start'
+      });
+
+      cap = cap[0].replace(/^ *> ?/gm, '');
+
+      // Pass `top` to keep the current
+      // "toplevel" state. This is exactly
+      // how markdown.pl works.
+      this.token(cap, top);
+
+      this.tokens.push({
+        type: 'blockquote_end'
+      });
+
+      continue;
+    }
+
+    // list
+    if (cap = this.rules.list.exec(src)) {
+      src = src.substring(cap[0].length);
+      bull = cap[2];
+      isordered = bull.length > 1;
+
+      listStart = {
+        type: 'list_start',
+        ordered: isordered,
+        start: isordered ? +bull : '',
+        loose: false
+      };
+
+      this.tokens.push(listStart);
+
+      // Get each top-level item.
+      cap = cap[0].match(this.rules.item);
+
+      listItems = [];
+      next = false;
+      l = cap.length;
+      i = 0;
+
+      for (; i < l; i++) {
+        item = cap[i];
+
+        // Remove the list item's bullet
+        // so it is seen as the next token.
+        space = item.length;
+        item = item.replace(/^ *([*+-]|\d+\.) */, '');
+
+        // Outdent whatever the
+        // list item contains. Hacky.
+        if (~item.indexOf('\n ')) {
+          space -= item.length;
+          item = !this.options.pedantic
+            ? item.replace(new RegExp('^ {1,' + space + '}', 'gm'), '')
+            : item.replace(/^ {1,4}/gm, '');
+        }
+
+        // Determine whether the next list item belongs here.
+        // Backpedal if it does not belong in this list.
+        if (i !== l - 1) {
+          b = block.bullet.exec(cap[i + 1])[0];
+          if (bull.length > 1 ? b.length === 1
+            : (b.length > 1 || (this.options.smartLists && b !== bull))) {
+            src = cap.slice(i + 1).join('\n') + src;
+            i = l - 1;
+          }
+        }
+
+        // Determine whether item is loose or not.
+        // Use: /(^|\n)(?! )[^\n]+\n\n(?!\s*$)/
+        // for discount behavior.
+        loose = next || /\n\n(?!\s*$)/.test(item);
+        if (i !== l - 1) {
+          next = item.charAt(item.length - 1) === '\n';
+          if (!loose) loose = next;
+        }
+
+        if (loose) {
+          listStart.loose = true;
+        }
+
+        // Check for task list items
+        istask = /^\[[ xX]\] /.test(item);
+        ischecked = undefined;
+        if (istask) {
+          ischecked = item[1] !== ' ';
+          item = item.replace(/^\[[ xX]\] +/, '');
+        }
+
+        t = {
+          type: 'list_item_start',
+          task: istask,
+          checked: ischecked,
+          loose: loose
+        };
+
+        listItems.push(t);
+        this.tokens.push(t);
+
+        // Recurse.
+        this.token(item, false);
+
+        this.tokens.push({
+          type: 'list_item_end'
+        });
+      }
+
+      if (listStart.loose) {
+        l = listItems.length;
+        i = 0;
+        for (; i < l; i++) {
+          listItems[i].loose = true;
+        }
+      }
+
+      this.tokens.push({
+        type: 'list_end'
+      });
+
+      continue;
+    }
+
+    // html
+    if (cap = this.rules.html.exec(src)) {
+      src = src.substring(cap[0].length);
+      this.tokens.push({
+        type: this.options.sanitize
+          ? 'paragraph'
+          : 'html',
+        pre: !this.options.sanitizer
+          && (cap[1] === 'pre' || cap[1] === 'script' || cap[1] === 'style'),
+        text: cap[0]
+      });
+      continue;
+    }
+
+    // def
+    if (top && (cap = this.rules.def.exec(src))) {
+      src = src.substring(cap[0].length);
+      if (cap[3]) cap[3] = cap[3].substring(1, cap[3].length - 1);
+      tag = cap[1].toLowerCase().replace(/\s+/g, ' ');
+      if (!this.tokens.links[tag]) {
+        this.tokens.links[tag] = {
+          href: cap[2],
+          title: cap[3]
+        };
+      }
+      continue;
+    }
+
+    // table (gfm)
+    if (cap = this.rules.table.exec(src)) {
+      item = {
+        type: 'table',
+        header: splitCells(cap[1].replace(/^ *| *\| *$/g, '')),
+        align: cap[2].replace(/^ *|\| *$/g, '').split(/ *\| */),
+        cells: cap[3] ? cap[3].replace(/\n$/, '').split('\n') : []
+      };
+
+      if (item.header.length === item.align.length) {
+        src = src.substring(cap[0].length);
+
+        for (i = 0; i < item.align.length; i++) {
+          if (/^ *-+: *$/.test(item.align[i])) {
+            item.align[i] = 'right';
+          } else if (/^ *:-+: *$/.test(item.align[i])) {
+            item.align[i] = 'center';
+          } else if (/^ *:-+ *$/.test(item.align[i])) {
+            item.align[i] = 'left';
+          } else {
+            item.align[i] = null;
+          }
+        }
+
+        for (i = 0; i < item.cells.length; i++) {
+          item.cells[i] = splitCells(
+            item.cells[i].replace(/^ *\| *| *\| *$/g, ''),
+            item.header.length);
+        }
+
+        this.tokens.push(item);
+
+        continue;
+      }
+    }
+
+    // lheading
+    if (cap = this.rules.lheading.exec(src)) {
+      src = src.substring(cap[0].length);
+      this.tokens.push({
+        type: 'heading',
+        depth: cap[2] === '=' ? 1 : 2,
+        text: cap[1]
+      });
+      continue;
+    }
+
+    // top-level paragraph
+    if (top && (cap = this.rules.paragraph.exec(src))) {
+      src = src.substring(cap[0].length);
+      this.tokens.push({
+        type: 'paragraph',
+        text: cap[1].charAt(cap[1].length - 1) === '\n'
+          ? cap[1].slice(0, -1)
+          : cap[1]
+      });
+      continue;
+    }
+
+    // text
+    if (cap = this.rules.text.exec(src)) {
+      // Top-level should never reach here.
+      src = src.substring(cap[0].length);
+      this.tokens.push({
+        type: 'text',
+        text: cap[0]
+      });
+      continue;
+    }
+
+    if (src) {
+      throw new Error('Infinite loop on byte: ' + src.charCodeAt(0));
+    }
+  }
+
+  return this.tokens;
+};
+
+/**
+ * Inline-Level Grammar
+ */
+
+var inline = {
+  escape: /^\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/,
+  autolink: /^<(scheme:[^\s\x00-\x1f<>]*|email)>/,
+  url: noop,
+  tag: '^comment'
+    + '|^</[a-zA-Z][\\w:-]*\\s*>' // self-closing tag
+    + '|^<[a-zA-Z][\\w-]*(?:attribute)*?\\s*/?>' // open tag
+    + '|^<\\?[\\s\\S]*?\\?>' // processing instruction, e.g. <?php ?>
+    + '|^<![a-zA-Z]+\\s[\\s\\S]*?>' // declaration, e.g. <!DOCTYPE html>
+    + '|^<!\\[CDATA\\[[\\s\\S]*?\\]\\]>', // CDATA section
+  link: /^!?\[(label)\]\(href(?:\s+(title))?\s*\)/,
+  reflink: /^!?\[(label)\]\[(?!\s*\])((?:\\[\[\]]?|[^\[\]\\])+)\]/,
+  nolink: /^!?\[(?!\s*\])((?:\[[^\[\]]*\]|\\[\[\]]|[^\[\]])*)\](?:\[\])?/,
+  strong: /^__([^\s_])__(?!_)|^\*\*([^\s*])\*\*(?!\*)|^__([^\s][\s\S]*?[^\s])__(?!_)|^\*\*([^\s][\s\S]*?[^\s])\*\*(?!\*)/,
+  em: /^_([^\s_])_(?!_)|^\*([^\s*"<\[])\*(?!\*)|^_([^\s][\s\S]*?[^\s_])_(?!_|[^\spunctuation])|^_([^\s_][\s\S]*?[^\s])_(?!_|[^\spunctuation])|^\*([^\s"<\[][\s\S]*?[^\s*])\*(?!\*)|^\*([^\s*"<\[][\s\S]*?[^\s])\*(?!\*)/,
+  code: /^(`+)([^`]|[^`][\s\S]*?[^`])\1(?!`)/,
+  br: /^( {2,}|\\)\n(?!\s*$)/,
+  del: noop,
+  text: /^(`+|[^`])(?:[\s\S]*?(?:(?=[\\<!\[`*]|\b_|$)|[^ ](?= {2,}\n))|(?= {2,}\n))/
+};
+
+// list of punctuation marks from common mark spec
+// without ` and ] to workaround Rule 17 (inline code blocks/links)
+inline._punctuation = '!"#$%&\'()*+,\\-./:;<=>?@\\[^_{|}~';
+inline.em = edit(inline.em).replace(/punctuation/g, inline._punctuation).getRegex();
+
+inline._escapes = /\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/g;
+
+inline._scheme = /[a-zA-Z][a-zA-Z0-9+.-]{1,31}/;
+inline._email = /[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+(@)[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+(?![-_])/;
+inline.autolink = edit(inline.autolink)
+  .replace('scheme', inline._scheme)
+  .replace('email', inline._email)
+  .getRegex();
+
+inline._attribute = /\s+[a-zA-Z:_][\w.:-]*(?:\s*=\s*"[^"]*"|\s*=\s*'[^']*'|\s*=\s*[^\s"'=<>`]+)?/;
+
+inline.tag = edit(inline.tag)
+  .replace('comment', block._comment)
+  .replace('attribute', inline._attribute)
+  .getRegex();
+
+inline._label = /(?:\[[^\[\]]*\]|\\[\[\]]?|`[^`]*`|`(?!`)|[^\[\]\\`])*?/;
+inline._href = /\s*(<(?:\\[<>]?|[^\s<>\\])*>|[^\s\x00-\x1f]*)/;
+inline._title = /"(?:\\"?|[^"\\])*"|'(?:\\'?|[^'\\])*'|\((?:\\\)?|[^)\\])*\)/;
+
+inline.link = edit(inline.link)
+  .replace('label', inline._label)
+  .replace('href', inline._href)
+  .replace('title', inline._title)
+  .getRegex();
+
+inline.reflink = edit(inline.reflink)
+  .replace('label', inline._label)
+  .getRegex();
+
+/**
+ * Normal Inline Grammar
+ */
+
+inline.normal = merge({}, inline);
+
+/**
+ * Pedantic Inline Grammar
+ */
+
+inline.pedantic = merge({}, inline.normal, {
+  strong: /^__(?=\S)([\s\S]*?\S)__(?!_)|^\*\*(?=\S)([\s\S]*?\S)\*\*(?!\*)/,
+  em: /^_(?=\S)([\s\S]*?\S)_(?!_)|^\*(?=\S)([\s\S]*?\S)\*(?!\*)/,
+  link: edit(/^!?\[(label)\]\((.*?)\)/)
+    .replace('label', inline._label)
+    .getRegex(),
+  reflink: edit(/^!?\[(label)\]\s*\[([^\]]*)\]/)
+    .replace('label', inline._label)
+    .getRegex()
+});
+
+/**
+ * GFM Inline Grammar
+ */
+
+inline.gfm = merge({}, inline.normal, {
+  escape: edit(inline.escape).replace('])', '~|])').getRegex(),
+  _extended_email: /[A-Za-z0-9._+-]+(@)[a-zA-Z0-9-_]+(?:\.[a-zA-Z0-9-_]*[a-zA-Z0-9])+(?![-_])/,
+  url: /^((?:ftp|https?):\/\/|www\.)(?:[a-zA-Z0-9\-]+\.?)+[^\s<]*|^email/,
+  _backpedal: /(?:[^?!.,:;*_~()&]+|\([^)]*\)|&(?![a-zA-Z0-9]+;$)|[?!.,:;*_~)]+(?!$))+/,
+  del: /^~+(?=\S)([\s\S]*?\S)~+/,
+  text: /^(`+|[^`])(?:[\s\S]*?(?:(?=[\\<!\[`*~]|\b_|https?:\/\/|ftp:\/\/|www\.|$)|[^ ](?= {2,}\n)|[^a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-](?=[a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-]+@))|(?= {2,}\n|[a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-]+@))/
+});
+
+inline.gfm.url = edit(inline.gfm.url, 'i')
+  .replace('email', inline.gfm._extended_email)
+  .getRegex();
+/**
+ * GFM + Line Breaks Inline Grammar
+ */
+
+inline.breaks = merge({}, inline.gfm, {
+  br: edit(inline.br).replace('{2,}', '*').getRegex(),
+  text: edit(inline.gfm.text).replace(/\{2,\}/g, '*').getRegex()
+});
+
+/**
+ * Inline Lexer & Compiler
+ */
+
+function InlineLexer(links, options) {
+  this.options = options || marked.defaults;
+  this.links = links;
+  this.rules = inline.normal;
+  this.renderer = this.options.renderer || new Renderer();
+  this.renderer.options = this.options;
+
+  if (!this.links) {
+    throw new Error('Tokens array requires a `links` property.');
+  }
+
+  if (this.options.pedantic) {
+    this.rules = inline.pedantic;
+  } else if (this.options.gfm) {
+    if (this.options.breaks) {
+      this.rules = inline.breaks;
+    } else {
+      this.rules = inline.gfm;
+    }
+  }
+}
+
+/**
+ * Expose Inline Rules
+ */
+
+InlineLexer.rules = inline;
+
+/**
+ * Static Lexing/Compiling Method
+ */
+
+InlineLexer.output = function(src, links, options) {
+  var inline = new InlineLexer(links, options);
+  return inline.output(src);
+};
+
+/**
+ * Lexing/Compiling
+ */
+
+InlineLexer.prototype.output = function(src) {
+  var out = '',
+      link,
+      text,
+      href,
+      title,
+      cap,
+      prevCapZero;
+
+  while (src) {
+    // escape
+    if (cap = this.rules.escape.exec(src)) {
+      src = src.substring(cap[0].length);
+      out += escape(cap[1]);
+      continue;
+    }
+
+    // tag
+    if (cap = this.rules.tag.exec(src)) {
+      if (!this.inLink && /^<a /i.test(cap[0])) {
+        this.inLink = true;
+      } else if (this.inLink && /^<\/a>/i.test(cap[0])) {
+        this.inLink = false;
+      }
+      if (!this.inRawBlock && /^<(pre|code|kbd|script)(\s|>)/i.test(cap[0])) {
+        this.inRawBlock = true;
+      } else if (this.inRawBlock && /^<\/(pre|code|kbd|script)(\s|>)/i.test(cap[0])) {
+        this.inRawBlock = false;
+      }
+
+      src = src.substring(cap[0].length);
+      out += this.options.sanitize
+        ? this.options.sanitizer
+          ? this.options.sanitizer(cap[0])
+          : escape(cap[0])
+        : cap[0];
+      continue;
+    }
+
+    // link
+    if (cap = this.rules.link.exec(src)) {
+      var lastParenIndex = findClosingBracket(cap[2], '()');
+      if (lastParenIndex > -1) {
+        var linkLen = cap[0].length - (cap[2].length - lastParenIndex) - (cap[3] || '').length;
+        cap[2] = cap[2].substring(0, lastParenIndex);
+        cap[0] = cap[0].substring(0, linkLen).trim();
+        cap[3] = '';
+      }
+      src = src.substring(cap[0].length);
+      this.inLink = true;
+      href = cap[2];
+      if (this.options.pedantic) {
+        link = /^([^'"]*[^\s])\s+(['"])(.*)\2/.exec(href);
+
+        if (link) {
+          href = link[1];
+          title = link[3];
+        } else {
+          title = '';
+        }
+      } else {
+        title = cap[3] ? cap[3].slice(1, -1) : '';
+      }
+      href = href.trim().replace(/^<([\s\S]*)>$/, '$1');
+      out += this.outputLink(cap, {
+        href: InlineLexer.escapes(href),
+        title: InlineLexer.escapes(title)
+      });
+      this.inLink = false;
+      continue;
+    }
+
+    // reflink, nolink
+    if ((cap = this.rules.reflink.exec(src))
+        || (cap = this.rules.nolink.exec(src))) {
+      src = src.substring(cap[0].length);
+      link = (cap[2] || cap[1]).replace(/\s+/g, ' ');
+      link = this.links[link.toLowerCase()];
+      if (!link || !link.href) {
+        out += cap[0].charAt(0);
+        src = cap[0].substring(1) + src;
+        continue;
+      }
+      this.inLink = true;
+      out += this.outputLink(cap, link);
+      this.inLink = false;
+      continue;
+    }
+
+    // strong
+    if (cap = this.rules.strong.exec(src)) {
+      src = src.substring(cap[0].length);
+      out += this.renderer.strong(this.output(cap[4] || cap[3] || cap[2] || cap[1]));
+      continue;
+    }
+
+    // em
+    if (cap = this.rules.em.exec(src)) {
+      src = src.substring(cap[0].length);
+      out += this.renderer.em(this.output(cap[6] || cap[5] || cap[4] || cap[3] || cap[2] || cap[1]));
+      continue;
+    }
+
+    // code
+    if (cap = this.rules.code.exec(src)) {
+      src = src.substring(cap[0].length);
+      out += this.renderer.codespan(escape(cap[2].trim(), true));
+      continue;
+    }
+
+    // br
+    if (cap = this.rules.br.exec(src)) {
+      src = src.substring(cap[0].length);
+      out += this.renderer.br();
+      continue;
+    }
+
+    // del (gfm)
+    if (cap = this.rules.del.exec(src)) {
+      src = src.substring(cap[0].length);
+      out += this.renderer.del(this.output(cap[1]));
+      continue;
+    }
+
+    // autolink
+    if (cap = this.rules.autolink.exec(src)) {
+      src = src.substring(cap[0].length);
+      if (cap[2] === '@') {
+        text = escape(this.mangle(cap[1]));
+        href = 'mailto:' + text;
+      } else {
+        text = escape(cap[1]);
+        href = text;
+      }
+      out += this.renderer.link(href, null, text);
+      continue;
+    }
+
+    // url (gfm)
+    if (!this.inLink && (cap = this.rules.url.exec(src))) {
+      if (cap[2] === '@') {
+        text = escape(cap[0]);
+        href = 'mailto:' + text;
+      } else {
+        // do extended autolink path validation
+        do {
+          prevCapZero = cap[0];
+          cap[0] = this.rules._backpedal.exec(cap[0])[0];
+        } while (prevCapZero !== cap[0]);
+        text = escape(cap[0]);
+        if (cap[1] === 'www.') {
+          href = 'http://' + text;
+        } else {
+          href = text;
+        }
+      }
+      src = src.substring(cap[0].length);
+      out += this.renderer.link(href, null, text);
+      continue;
+    }
+
+    // text
+    if (cap = this.rules.text.exec(src)) {
+      src = src.substring(cap[0].length);
+      if (this.inRawBlock) {
+        out += this.renderer.text(cap[0]);
+      } else {
+        out += this.renderer.text(escape(this.smartypants(cap[0])));
+      }
+      continue;
+    }
+
+    if (src) {
+      throw new Error('Infinite loop on byte: ' + src.charCodeAt(0));
+    }
+  }
+
+  return out;
+};
+
+InlineLexer.escapes = function(text) {
+  return text ? text.replace(InlineLexer.rules._escapes, '$1') : text;
+};
+
+/**
+ * Compile Link
+ */
+
+InlineLexer.prototype.outputLink = function(cap, link) {
+  var href = link.href,
+      title = link.title ? escape(link.title) : null;
+
+  return cap[0].charAt(0) !== '!'
+    ? this.renderer.link(href, title, this.output(cap[1]))
+    : this.renderer.image(href, title, escape(cap[1]));
+};
+
+/**
+ * Smartypants Transformations
+ */
+
+InlineLexer.prototype.smartypants = function(text) {
+  if (!this.options.smartypants) return text;
+  return text
+    // em-dashes
+    .replace(/---/g, '\u2014')
+    // en-dashes
+    .replace(/--/g, '\u2013')
+    // opening singles
+    .replace(/(^|[-\u2014/(\[{"\s])'/g, '$1\u2018')
+    // closing singles & apostrophes
+    .replace(/'/g, '\u2019')
+    // opening doubles
+    .replace(/(^|[-\u2014/(\[{\u2018\s])"/g, '$1\u201c')
+    // closing doubles
+    .replace(/"/g, '\u201d')
+    // ellipses
+    .replace(/\.{3}/g, '\u2026');
+};
+
+/**
+ * Mangle Links
+ */
+
+InlineLexer.prototype.mangle = function(text) {
+  if (!this.options.mangle) return text;
+  var out = '',
+      l = text.length,
+      i = 0,
+      ch;
+
+  for (; i < l; i++) {
+    ch = text.charCodeAt(i);
+    if (Math.random() > 0.5) {
+      ch = 'x' + ch.toString(16);
+    }
+    out += '&#' + ch + ';';
+  }
+
+  return out;
+};
+
+/**
+ * Renderer
+ */
+
+function Renderer(options) {
+  this.options = options || marked.defaults;
+}
+
+Renderer.prototype.code = function(code, infostring, escaped) {
+  var lang = (infostring || '').match(/\S*/)[0];
+  if (this.options.highlight) {
+    var out = this.options.highlight(code, lang);
+    if (out != null && out !== code) {
+      escaped = true;
+      code = out;
+    }
+  }
+
+  if (!lang) {
+    return '<pre><code>'
+      + (escaped ? code : escape(code, true))
+      + '</code></pre>';
+  }
+
+  return '<pre><code class="'
+    + this.options.langPrefix
+    + escape(lang, true)
+    + '">'
+    + (escaped ? code : escape(code, true))
+    + '</code></pre>\n';
+};
+
+Renderer.prototype.blockquote = function(quote) {
+  return '<blockquote>\n' + quote + '</blockquote>\n';
+};
+
+Renderer.prototype.html = function(html) {
+  return html;
+};
+
+Renderer.prototype.heading = function(text, level, raw, slugger) {
+  if (this.options.headerIds) {
+    return '<h'
+      + level
+      + ' id="'
+      + this.options.headerPrefix
+      + slugger.slug(raw)
+      + '">'
+      + text
+      + '</h'
+      + level
+      + '>\n';
+  }
+  // ignore IDs
+  return '<h' + level + '>' + text + '</h' + level + '>\n';
+};
+
+Renderer.prototype.hr = function() {
+  return this.options.xhtml ? '<hr/>\n' : '<hr>\n';
+};
+
+Renderer.prototype.list = function(body, ordered, start) {
+  var type = ordered ? 'ol' : 'ul',
+      startatt = (ordered && start !== 1) ? (' start="' + start + '"') : '';
+  return '<' + type + startatt + '>\n' + body + '</' + type + '>\n';
+};
+
+Renderer.prototype.listitem = function(text) {
+  return '<li>' + text + '</li>\n';
+};
+
+Renderer.prototype.checkbox = function(checked) {
+  return '<input '
+    + (checked ? 'checked="" ' : '')
+    + 'disabled="" type="checkbox"'
+    + (this.options.xhtml ? ' /' : '')
+    + '> ';
+};
+
+Renderer.prototype.paragraph = function(text) {
+  return '<p>' + text + '</p>\n';
+};
+
+Renderer.prototype.table = function(header, body) {
+  if (body) body = '<tbody>' + body + '</tbody>';
+
+  return '<table>\n'
+    + '<thead>\n'
+    + header
+    + '</thead>\n'
+    + body
+    + '</table>\n';
+};
+
+Renderer.prototype.tablerow = function(content) {
+  return '<tr>\n' + content + '</tr>\n';
+};
+
+Renderer.prototype.tablecell = function(content, flags) {
+  var type = flags.header ? 'th' : 'td';
+  var tag = flags.align
+    ? '<' + type + ' align="' + flags.align + '">'
+    : '<' + type + '>';
+  return tag + content + '</' + type + '>\n';
+};
+
+// span level renderer
+Renderer.prototype.strong = function(text) {
+  return '<strong>' + text + '</strong>';
+};
+
+Renderer.prototype.em = function(text) {
+  return '<em>' + text + '</em>';
+};
+
+Renderer.prototype.codespan = function(text) {
+  return '<code>' + text + '</code>';
+};
+
+Renderer.prototype.br = function() {
+  return this.options.xhtml ? '<br/>' : '<br>';
+};
+
+Renderer.prototype.del = function(text) {
+  return '<del>' + text + '</del>';
+};
+
+Renderer.prototype.link = function(href, title, text) {
+  href = cleanUrl(this.options.sanitize, this.options.baseUrl, href);
+  if (href === null) {
+    return text;
+  }
+  var out = '<a href="' + escape(href) + '"';
+  if (title) {
+    out += ' title="' + title + '"';
+  }
+  out += '>' + text + '</a>';
+  return out;
+};
+
+Renderer.prototype.image = function(href, title, text) {
+  href = cleanUrl(this.options.sanitize, this.options.baseUrl, href);
+  if (href === null) {
+    return text;
+  }
+
+  var out = '<img src="' + href + '" alt="' + text + '"';
+  if (title) {
+    out += ' title="' + title + '"';
+  }
+  out += this.options.xhtml ? '/>' : '>';
+  return out;
+};
+
+Renderer.prototype.text = function(text) {
+  return text;
+};
+
+/**
+ * TextRenderer
+ * returns only the textual part of the token
+ */
+
+function TextRenderer() {}
+
+// no need for block level renderers
+
+TextRenderer.prototype.strong =
+TextRenderer.prototype.em =
+TextRenderer.prototype.codespan =
+TextRenderer.prototype.del =
+TextRenderer.prototype.text = function (text) {
+  return text;
+};
+
+TextRenderer.prototype.link =
+TextRenderer.prototype.image = function(href, title, text) {
+  return '' + text;
+};
+
+TextRenderer.prototype.br = function() {
+  return '';
+};
+
+/**
+ * Parsing & Compiling
+ */
+
+function Parser(options) {
+  this.tokens = [];
+  this.token = null;
+  this.options = options || marked.defaults;
+  this.options.renderer = this.options.renderer || new Renderer();
+  this.renderer = this.options.renderer;
+  this.renderer.options = this.options;
+  this.slugger = new Slugger();
+}
+
+/**
+ * Static Parse Method
+ */
+
+Parser.parse = function(src, options) {
+  var parser = new Parser(options);
+  return parser.parse(src);
+};
+
+/**
+ * Parse Loop
+ */
+
+Parser.prototype.parse = function(src) {
+  this.inline = new InlineLexer(src.links, this.options);
+  // use an InlineLexer with a TextRenderer to extract pure text
+  this.inlineText = new InlineLexer(
+    src.links,
+    merge({}, this.options, {renderer: new TextRenderer()})
+  );
+  this.tokens = src.reverse();
+
+  var out = '';
+  while (this.next()) {
+    out += this.tok();
+  }
+
+  return out;
+};
+
+/**
+ * Next Token
+ */
+
+Parser.prototype.next = function() {
+  return this.token = this.tokens.pop();
+};
+
+/**
+ * Preview Next Token
+ */
+
+Parser.prototype.peek = function() {
+  return this.tokens[this.tokens.length - 1] || 0;
+};
+
+/**
+ * Parse Text Tokens
+ */
+
+Parser.prototype.parseText = function() {
+  var body = this.token.text;
+
+  while (this.peek().type === 'text') {
+    body += '\n' + this.next().text;
+  }
+
+  return this.inline.output(body);
+};
+
+/**
+ * Parse Current Token
+ */
+
+Parser.prototype.tok = function() {
+  switch (this.token.type) {
+    case 'space': {
+      return '';
+    }
+    case 'hr': {
+      return this.renderer.hr();
+    }
+    case 'heading': {
+      return this.renderer.heading(
+        this.inline.output(this.token.text),
+        this.token.depth,
+        unescape(this.inlineText.output(this.token.text)),
+        this.slugger);
+    }
+    case 'code': {
+      return this.renderer.code(this.token.text,
+        this.token.lang,
+        this.token.escaped);
+    }
+    case 'table': {
+      var header = '',
+          body = '',
+          i,
+          row,
+          cell,
+          j;
+
+      // header
+      cell = '';
+      for (i = 0; i < this.token.header.length; i++) {
+        cell += this.renderer.tablecell(
+          this.inline.output(this.token.header[i]),
+          { header: true, align: this.token.align[i] }
+        );
+      }
+      header += this.renderer.tablerow(cell);
+
+      for (i = 0; i < this.token.cells.length; i++) {
+        row = this.token.cells[i];
+
+        cell = '';
+        for (j = 0; j < row.length; j++) {
+          cell += this.renderer.tablecell(
+            this.inline.output(row[j]),
+            { header: false, align: this.token.align[j] }
+          );
+        }
+
+        body += this.renderer.tablerow(cell);
+      }
+      return this.renderer.table(header, body);
+    }
+    case 'blockquote_start': {
+      body = '';
+
+      while (this.next().type !== 'blockquote_end') {
+        body += this.tok();
+      }
+
+      return this.renderer.blockquote(body);
+    }
+    case 'list_start': {
+      body = '';
+      var ordered = this.token.ordered,
+          start = this.token.start;
+
+      while (this.next().type !== 'list_end') {
+        body += this.tok();
+      }
+
+      return this.renderer.list(body, ordered, start);
+    }
+    case 'list_item_start': {
+      body = '';
+      var loose = this.token.loose;
+      var checked = this.token.checked;
+      var task = this.token.task;
+
+      if (this.token.task) {
+        body += this.renderer.checkbox(checked);
+      }
+
+      while (this.next().type !== 'list_item_end') {
+        body += !loose && this.token.type === 'text'
+          ? this.parseText()
+          : this.tok();
+      }
+      return this.renderer.listitem(body, task, checked);
+    }
+    case 'html': {
+      // TODO parse inline content if parameter markdown=1
+      return this.renderer.html(this.token.text);
+    }
+    case 'paragraph': {
+      return this.renderer.paragraph(this.inline.output(this.token.text));
+    }
+    case 'text': {
+      return this.renderer.paragraph(this.parseText());
+    }
+    default: {
+      var errMsg = 'Token with "' + this.token.type + '" type was not found.';
+      if (this.options.silent) {
+        console.log(errMsg);
+      } else {
+        throw new Error(errMsg);
+      }
+    }
+  }
+};
+
+/**
+ * Slugger generates header id
+ */
+
+function Slugger () {
+  this.seen = {};
+}
+
+/**
+ * Convert string to unique id
+ */
+
+Slugger.prototype.slug = function (value) {
+  var slug = value
+    .toLowerCase()
+    .trim()
+    .replace(/[\u2000-\u206F\u2E00-\u2E7F\\'!"#$%&()*+,./:;<=>?@[\]^`{|}~]/g, '')
+    .replace(/\s/g, '-');
+
+  if (this.seen.hasOwnProperty(slug)) {
+    var originalSlug = slug;
+    do {
+      this.seen[originalSlug]++;
+      slug = originalSlug + '-' + this.seen[originalSlug];
+    } while (this.seen.hasOwnProperty(slug));
+  }
+  this.seen[slug] = 0;
+
+  return slug;
+};
+
+/**
+ * Helpers
+ */
+
+function escape(html, encode) {
+  if (encode) {
+    if (escape.escapeTest.test(html)) {
+      return html.replace(escape.escapeReplace, function (ch) { return escape.replacements[ch]; });
+    }
+  } else {
+    if (escape.escapeTestNoEncode.test(html)) {
+      return html.replace(escape.escapeReplaceNoEncode, function (ch) { return escape.replacements[ch]; });
+    }
+  }
+
+  return html;
+}
+
+escape.escapeTest = /[&<>"']/;
+escape.escapeReplace = /[&<>"']/g;
+escape.replacements = {
+  '&': '&amp;',
+  '<': '&lt;',
+  '>': '&gt;',
+  '"': '&quot;',
+  "'": '&#39;'
+};
+
+escape.escapeTestNoEncode = /[<>"']|&(?!#?\w+;)/;
+escape.escapeReplaceNoEncode = /[<>"']|&(?!#?\w+;)/g;
+
+function unescape(html) {
+  // explicitly match decimal, hex, and named HTML entities
+  return html.replace(/&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/ig, function(_, n) {
+    n = n.toLowerCase();
+    if (n === 'colon') return ':';
+    if (n.charAt(0) === '#') {
+      return n.charAt(1) === 'x'
+        ? String.fromCharCode(parseInt(n.substring(2), 16))
+        : String.fromCharCode(+n.substring(1));
+    }
+    return '';
+  });
+}
+
+function edit(regex, opt) {
+  regex = regex.source || regex;
+  opt = opt || '';
+  return {
+    replace: function(name, val) {
+      val = val.source || val;
+      val = val.replace(/(^|[^\[])\^/g, '$1');
+      regex = regex.replace(name, val);
+      return this;
+    },
+    getRegex: function() {
+      return new RegExp(regex, opt);
+    }
+  };
+}
+
+function cleanUrl(sanitize, base, href) {
+  if (sanitize) {
+    try {
+      var prot = decodeURIComponent(unescape(href))
+        .replace(/[^\w:]/g, '')
+        .toLowerCase();
+    } catch (e) {
+      return null;
+    }
+    if (prot.indexOf('javascript:') === 0 || prot.indexOf('vbscript:') === 0 || prot.indexOf('data:') === 0) {
+      return null;
+    }
+  }
+  if (base && !originIndependentUrl.test(href)) {
+    href = resolveUrl(base, href);
+  }
+  try {
+    href = encodeURI(href).replace(/%25/g, '%');
+  } catch (e) {
+    return null;
+  }
+  return href;
+}
+
+function resolveUrl(base, href) {
+  if (!baseUrls[' ' + base]) {
+    // we can ignore everything in base after the last slash of its path component,
+    // but we might need to add _that_
+    // https://tools.ietf.org/html/rfc3986#section-3
+    if (/^[^:]+:\/*[^/]*$/.test(base)) {
+      baseUrls[' ' + base] = base + '/';
+    } else {
+      baseUrls[' ' + base] = rtrim(base, '/', true);
+    }
+  }
+  base = baseUrls[' ' + base];
+
+  if (href.slice(0, 2) === '//') {
+    return base.replace(/:[\s\S]*/, ':') + href;
+  } else if (href.charAt(0) === '/') {
+    return base.replace(/(:\/*[^/]*)[\s\S]*/, '$1') + href;
+  } else {
+    return base + href;
+  }
+}
+var baseUrls = {};
+var originIndependentUrl = /^$|^[a-z][a-z0-9+.-]*:|^[?#]/i;
+
+function noop() {}
+noop.exec = noop;
+
+function merge(obj) {
+  var i = 1,
+      target,
+      key;
+
+  for (; i < arguments.length; i++) {
+    target = arguments[i];
+    for (key in target) {
+      if (Object.prototype.hasOwnProperty.call(target, key)) {
+        obj[key] = target[key];
+      }
+    }
+  }
+
+  return obj;
+}
+
+function splitCells(tableRow, count) {
+  // ensure that every cell-delimiting pipe has a space
+  // before it to distinguish it from an escaped pipe
+  var row = tableRow.replace(/\|/g, function (match, offset, str) {
+        var escaped = false,
+            curr = offset;
+        while (--curr >= 0 && str[curr] === '\\') escaped = !escaped;
+        if (escaped) {
+          // odd number of slashes means | is escaped
+          // so we leave it alone
+          return '|';
+        } else {
+          // add space before unescaped |
+          return ' |';
+        }
+      }),
+      cells = row.split(/ \|/),
+      i = 0;
+
+  if (cells.length > count) {
+    cells.splice(count);
+  } else {
+    while (cells.length < count) cells.push('');
+  }
+
+  for (; i < cells.length; i++) {
+    // leading or trailing whitespace is ignored per the gfm spec
+    cells[i] = cells[i].trim().replace(/\\\|/g, '|');
+  }
+  return cells;
+}
+
+// Remove trailing 'c's. Equivalent to str.replace(/c*$/, '').
+// /c*$/ is vulnerable to REDOS.
+// invert: Remove suffix of non-c chars instead. Default falsey.
+function rtrim(str, c, invert) {
+  if (str.length === 0) {
+    return '';
+  }
+
+  // Length of suffix matching the invert condition.
+  var suffLen = 0;
+
+  // Step left until we fail to match the invert condition.
+  while (suffLen < str.length) {
+    var currChar = str.charAt(str.length - suffLen - 1);
+    if (currChar === c && !invert) {
+      suffLen++;
+    } else if (currChar !== c && invert) {
+      suffLen++;
+    } else {
+      break;
+    }
+  }
+
+  return str.substr(0, str.length - suffLen);
+}
+
+function findClosingBracket(str, b) {
+  if (str.indexOf(b[1]) === -1) {
+    return -1;
+  }
+  var level = 0;
+  for (var i = 0; i < str.length; i++) {
+    if (str[i] === '\\') {
+      i++;
+    } else if (str[i] === b[0]) {
+      level++;
+    } else if (str[i] === b[1]) {
+      level--;
+      if (level < 0) {
+        return i;
+      }
+    }
+  }
+  return -1;
+}
+
+/**
+ * Marked
+ */
+
+function marked(src, opt, callback) {
+  // throw error in case of non string input
+  if (typeof src === 'undefined' || src === null) {
+    throw new Error('marked(): input parameter is undefined or null');
+  }
+  if (typeof src !== 'string') {
+    throw new Error('marked(): input parameter is of type '
+      + Object.prototype.toString.call(src) + ', string expected');
+  }
+
+  if (callback || typeof opt === 'function') {
+    if (!callback) {
+      callback = opt;
+      opt = null;
+    }
+
+    opt = merge({}, marked.defaults, opt || {});
+
+    var highlight = opt.highlight,
+        tokens,
+        pending,
+        i = 0;
+
+    try {
+      tokens = Lexer.lex(src, opt);
+    } catch (e) {
+      return callback(e);
+    }
+
+    pending = tokens.length;
+
+    var done = function(err) {
+      if (err) {
+        opt.highlight = highlight;
+        return callback(err);
+      }
+
+      var out;
+
+      try {
+        out = Parser.parse(tokens, opt);
+      } catch (e) {
+        err = e;
+      }
+
+      opt.highlight = highlight;
+
+      return err
+        ? callback(err)
+        : callback(null, out);
+    };
+
+    if (!highlight || highlight.length < 3) {
+      return done();
+    }
+
+    delete opt.highlight;
+
+    if (!pending) return done();
+
+    for (; i < tokens.length; i++) {
+      (function(token) {
+        if (token.type !== 'code') {
+          return --pending || done();
+        }
+        return highlight(token.text, token.lang, function(err, code) {
+          if (err) return done(err);
+          if (code == null || code === token.text) {
+            return --pending || done();
+          }
+          token.text = code;
+          token.escaped = true;
+          --pending || done();
+        });
+      })(tokens[i]);
+    }
+
+    return;
+  }
+  try {
+    if (opt) opt = merge({}, marked.defaults, opt);
+    return Parser.parse(Lexer.lex(src, opt), opt);
+  } catch (e) {
+    e.message += '\nPlease report this to https://github.com/markedjs/marked.';
+    if ((opt || marked.defaults).silent) {
+      return '<p>An error occurred:</p><pre>'
+        + escape(e.message + '', true)
+        + '</pre>';
+    }
+    throw e;
+  }
+}
+
+/**
+ * Options
+ */
+
+marked.options =
+marked.setOptions = function(opt) {
+  merge(marked.defaults, opt);
+  return marked;
+};
+
+marked.getDefaults = function () {
+  return {
+    baseUrl: null,
+    breaks: false,
+    gfm: true,
+    headerIds: true,
+    headerPrefix: '',
+    highlight: null,
+    langPrefix: 'language-',
+    mangle: true,
+    pedantic: false,
+    renderer: new Renderer(),
+    sanitize: false,
+    sanitizer: null,
+    silent: false,
+    smartLists: false,
+    smartypants: false,
+    tables: true,
+    xhtml: false
+  };
+};
+
+marked.defaults = marked.getDefaults();
+
+/**
+ * Expose
+ */
+
+marked.Parser = Parser;
+marked.parser = Parser.parse;
+
+marked.Renderer = Renderer;
+marked.TextRenderer = TextRenderer;
+
+marked.Lexer = Lexer;
+marked.lexer = Lexer.lex;
+
+marked.InlineLexer = InlineLexer;
+marked.inlineLexer = InlineLexer.output;
+
+marked.Slugger = Slugger;
+
+marked.parse = marked;
+
+if (typeof module !== 'undefined' && typeof exports === 'object') {
+  module.exports = marked;
+} else if (typeof define === 'function' && define.amd) {
+  define(function() { return marked; });
+} else {
+  root.marked = marked;
+}
+})(this || (typeof window !== 'undefined' ? window : global));
diff --git a/packages/markdown/marked/man/marked.1 b/packages/markdown/marked/man/marked.1
new file mode 100644
index 00000000..848b4424
--- /dev/null
+++ b/packages/markdown/marked/man/marked.1
@@ -0,0 +1,114 @@
+.ds q \N'34'
+.TH marked 1
+
+.SH NAME
+marked \- a javascript markdown parser
+
+.SH SYNOPSIS
+.B marked
+[\-o \fI<output>\fP] [\-i \fI<input>\fP] [\-\-help]
+[\-\-tokens] [\-\-pedantic] [\-\-gfm]
+[\-\-breaks] [\-\-tables] [\-\-sanitize]
+[\-\-smart\-lists] [\-\-lang\-prefix \fI<prefix>\fP]
+[\-\-no\-etc...] [\-\-silent] [\fIfilename\fP]
+
+.SH DESCRIPTION
+.B marked
+is a full-featured javascript markdown parser, built for speed.
+It also includes multiple GFM features.
+
+.SH EXAMPLES
+.TP
+cat in.md | marked > out.html
+.TP
+echo "hello *world*" | marked
+.TP
+marked \-o out.html \-i in.md \-\-gfm
+.TP
+marked \-\-output="hello world.html" \-i in.md \-\-no-breaks
+
+.SH OPTIONS
+.TP
+.BI \-o,\ \-\-output\ [\fIoutput\fP]
+Specify file output. If none is specified, write to stdout.
+.TP
+.BI \-i,\ \-\-input\ [\fIinput\fP]
+Specify file input, otherwise use last argument as input file.
+If no input file is specified, read from stdin.
+.TP
+.BI \-\-test
+Makes sure the test(s) pass.
+.RS
+.PP
+.B \-\-glob [\fIfile\fP]
+Specify which test to use.
+.PP
+.B \-\-fix
+Fixes tests.
+.PP
+.B \-\-bench
+Benchmarks the test(s).
+.PP
+.B \-\-time
+Times The test(s).
+.PP
+.B \-\-minified
+Runs test file(s) as minified.
+.PP
+.B \-\-stop
+Stop process if a test fails.
+.RE
+.TP
+.BI \-t,\ \-\-tokens
+Output a token stream instead of html.
+.TP
+.BI \-\-pedantic
+Conform to obscure parts of markdown.pl as much as possible.
+Don't fix original markdown bugs.
+.TP
+.BI \-\-gfm
+Enable github flavored markdown.
+.TP
+.BI \-\-breaks
+Enable GFM line breaks. Only works with the gfm option.
+.TP
+.BI \-\-tables
+Enable GFM tables. Only works with the gfm option.
+.TP
+.BI \-\-sanitize
+Sanitize output. Ignore any HTML input.
+.TP
+.BI \-\-smart\-lists
+Use smarter list behavior than the original markdown.
+.TP
+.BI \-\-lang\-prefix\ [\fIprefix\fP]
+Set the prefix for code block classes.
+.TP
+.BI \-\-mangle
+Mangle email addresses.
+.TP
+.BI \-\-no\-sanitize,\ \-no-etc...
+The inverse of any of the marked options above.
+.TP
+.BI \-\-silent
+Silence error output.
+.TP
+.BI \-h,\ \-\-help
+Display help information.
+
+.SH CONFIGURATION
+For configuring and running programmatically.
+
+.B Example
+
+    require('marked')('*foo*', { gfm: true });
+
+.SH BUGS
+Please report any bugs to https://github.com/markedjs/marked.
+
+.SH LICENSE
+Copyright (c) 2011-2014, Christopher Jeffrey (MIT License).
+
+.SH "SEE ALSO"
+.BR markdown(1),
+.BR node.js(1)
diff --git a/packages/markdown/marked/man/marked.1.txt b/packages/markdown/marked/man/marked.1.txt
new file mode 100644
index 00000000..ea07ad36
--- /dev/null
+++ b/packages/markdown/marked/man/marked.1.txt
@@ -0,0 +1,99 @@
+marked(1)		    General Commands Manual		     marked(1)
+
+NAME
+       marked - a javascript markdown parser
+
+SYNOPSIS
+       marked  [-o  <output>]  [-i  <input>]  [--help]  [--tokens]
+       [--pedantic]  [--gfm]  [--breaks]  [--tables]  [--sanitize]
+       [--smart-lists]  [--lang-prefix <prefix>]  [--no-etc...]  [--silent]
+       [filename]
+
+DESCRIPTION
+       marked is a full-featured javascript markdown parser, built for speed.
+       It also includes multiple GFM features.
+
+EXAMPLES
+       cat in.md | marked > out.html
+
+       echo "hello *world*" | marked
+
+       marked -o out.html -i in.md --gfm
+
+       marked --output="hello world.html" -i in.md --no-breaks
+
+OPTIONS
+       -o, --output [output]
+              Specify file output. If none is specified, write to stdout.
+
+       -i, --input [input]
+              Specify file input, otherwise use last argument as input file.
+              If no input file is specified, read from stdin.
+
+       --test Makes sure the test(s) pass.
+
+              --glob [file] Specify which test to use.
+
+              --fix Fixes tests.
+
+              --bench Benchmarks the test(s).
+
+              --time Times The test(s).
+
+              --minified Runs test file(s) as minified.
+
+              --stop Stop process if a test fails.
+
+       -t, --tokens
+              Output a token stream instead of html.
+
+       --pedantic
+              Conform to obscure parts of markdown.pl as much as possible.
+              Don't fix original markdown bugs.
+
+       --gfm  Enable github flavored markdown.
+
+       --breaks
+              Enable GFM line breaks. Only works with the gfm option.
+
+       --tables
+              Enable GFM tables. Only works with the gfm option.
+
+       --sanitize
+              Sanitize output. Ignore any HTML input.
+
+       --smart-lists
+              Use smarter list behavior than the original markdown.
+
+       --lang-prefix [prefix]
+              Set the prefix for code block classes.
+
+       --mangle
+              Mangle email addresses.
+
+       --no-sanitize, -no-etc...
+              The inverse of any of the marked options above.
+
+       --silent
+              Silence error output.
+
+       -h, --help
+              Display help information.
+
+CONFIGURATION
+       For configuring and running programmatically.
+
+       Example
+
+           require('marked')('*foo*', { gfm: true });
+
+BUGS
+       Please report any bugs to https://github.com/markedjs/marked.
+
+LICENSE
+       Copyright (c) 2011-2014, Christopher Jeffrey (MIT License).
+
+SEE ALSO
+       markdown(1), node.js(1)
+
+								     marked(1)
diff --git a/packages/markdown/marked/marked.min.js b/packages/markdown/marked/marked.min.js
new file mode 100644
index 00000000..085cfb56
--- /dev/null
+++ b/packages/markdown/marked/marked.min.js
@@ -0,0 +1,6 @@
+/**
+ * marked - a markdown parser
+ * Copyright (c) 2011-2018, Christopher Jeffrey. (MIT Licensed)
+ * https://github.com/markedjs/marked
+ */
+!function(e){"use strict";var k={newline:/^\n+/,code:/^( {4}[^\n]+\n*)+/,fences:f,hr:/^ {0,3}((?:- *){3,}|(?:_ *){3,}|(?:\* *){3,})(?:\n+|$)/,heading:/^ *(#{1,6}) *([^\n]+?) *(?:#+ *)?(?:\n+|$)/,nptable:f,blockquote:/^( {0,3}> ?(paragraph|[^\n]*)(?:\n|$))+/,list:/^( {0,3})(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,html:"^ {0,3}(?:<(script|pre|style)[\\s>][\\s\\S]*?(?:</\\1>[^\\n]*\\n+|$)|comment[^\\n]*(\\n+|$)|<\\?[\\s\\S]*?\\?>\\n*|<![A-Z][\\s\\S]*?>\\n*|<!\\[CDATA\\[[\\s\\S]*?\\]\\]>\\n*|</?(tag)(?: +|\\n|/?>)[\\s\\S]*?(?:\\n{2,}|$)|<(?!script|pre|style)([a-z][\\w-]*)(?:attribute)*? */?>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:\\n{2,}|$)|</(?!script|pre|style)[a-z][\\w-]*\\s*>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:\\n{2,}|$))",def:/^ {0,3}\[(label)\]: *\n? *<?([^\s>]+)>?(?:(?: +\n? *| *\n *)(title))? *(?:\n+|$)/,table:f,lheading:/^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/,paragraph:/^([^\n]+(?:\n(?!hr|heading|lheading| {0,3}>|<\/?(?:tag)(?: +|\n|\/?>)|<(?:script|pre|style|!--))[^\n]+)*)/,text:/^[^\n]+/};function a(e){this.tokens=[],this.tokens.links=Object.create(null),this.options=e||b.defaults,this.rules=k.normal,this.options.pedantic?this.rules=k.pedantic:this.options.gfm&&(this.options.tables?this.rules=k.tables:this.rules=k.gfm)}k._label=/(?!\s*\])(?:\\[\[\]]|[^\[\]])+/,k._title=/(?:"(?:\\"?|[^"\\])*"|'[^'\n]*(?:\n[^'\n]+)*\n?'|\([^()]*\))/,k.def=i(k.def).replace("label",k._label).replace("title",k._title).getRegex(),k.bullet=/(?:[*+-]|\d{1,9}\.)/,k.item=/^( *)(bull) ?[^\n]*(?:\n(?!\1bull ?)[^\n]*)*/,k.item=i(k.item,"gm").replace(/bull/g,k.bullet).getRegex(),k.list=i(k.list).replace(/bull/g,k.bullet).replace("hr","\\n+(?=\\1?(?:(?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$))").replace("def","\\n+(?="+k.def.source+")").getRegex(),k._tag="address|article|aside|base|basefont|blockquote|body|caption|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption|figure|footer|form|frame|frameset|h[1-6]|head|header|hr|html|iframe|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option|p|param|section|source|summary|table|tbody|td|tfoot|th|thead|title|tr|track|ul",k._comment=/<!--(?!-?>)[\s\S]*?-->/,k.html=i(k.html,"i").replace("comment",k._comment).replace("tag",k._tag).replace("attribute",/ +[a-zA-Z:_][\w.:-]*(?: *= *"[^"\n]*"| *= *'[^'\n]*'| *= *[^\s"'=<>`]+)?/).getRegex(),k.paragraph=i(k.paragraph).replace("hr",k.hr).replace("heading",k.heading).replace("lheading",k.lheading).replace("tag",k._tag).getRegex(),k.blockquote=i(k.blockquote).replace("paragraph",k.paragraph).getRegex(),k.normal=d({},k),k.gfm=d({},k.normal,{fences:/^ {0,3}(`{3,}|~{3,})([^`\n]*)\n(?:|([\s\S]*?)\n)(?: {0,3}\1[~`]* *(?:\n+|$)|$)/,paragraph:/^/,heading:/^ *(#{1,6}) +([^\n]+?) *#* *(?:\n+|$)/}),k.gfm.paragraph=i(k.paragraph).replace("(?!","(?!"+k.gfm.fences.source.replace("\\1","\\2")+"|"+k.list.source.replace("\\1","\\3")+"|").getRegex(),k.tables=d({},k.gfm,{nptable:/^ *([^|\n ].*\|.*)\n *([-:]+ *\|[-| :]*)(?:\n((?:.*[^>\n ].*(?:\n|$))*)\n*|$)/,table:/^ *\|(.+)\n *\|?( *[-:]+[-| :]*)(?:\n((?: *[^>\n ].*(?:\n|$))*)\n*|$)/}),k.pedantic=d({},k.normal,{html:i("^ *(?:comment *(?:\\n|\\s*$)|<(tag)[\\s\\S]+?</\\1> *(?:\\n{2,}|\\s*$)|<tag(?:\"[^\"]*\"|'[^']*'|\\s[^'\"/>\\s]*)*?/?> *(?:\\n{2,}|\\s*$))").replace("comment",k._comment).replace(/tag/g,"(?!(?:a|em|strong|small|s|cite|q|dfn|abbr|data|time|code|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo|span|br|wbr|ins|del|img)\\b)\\w+(?!:|[^\\w\\s@]*@)\\b").getRegex(),def:/^ *\[([^\]]+)\]: *<?([^\s>]+)>?(?: +(["(][^\n]+[")]))? *(?:\n+|$)/}),a.rules=k,a.lex=function(e,t){return new a(t).lex(e)},a.prototype.lex=function(e){return e=e.replace(/\r\n|\r/g,"\n").replace(/\t/g,"    ").replace(/\u00a0/g," ").replace(/\u2424/g,"\n"),this.token(e,!0)},a.prototype.token=function(e,t){var n,r,s,i,l,o,a,h,p,u,c,g,f,d,m,b;for(e=e.replace(/^ +$/gm,"");e;)if((s=this.rules.newline.exec(e))&&(e=e.substring(s[0].length),1<s[0].length&&this.tokens.push({type:"space"})),s=this.rules.code.exec(e))e=e.substring(s[0].length),s=s[0].replace(/^ {4}/gm,""),this.tokens.push({type:"code",text:this.options.pedantic?s:y(s,"\n")});else if(s=this.rules.fences.exec(e))e=e.substring(s[0].length),this.tokens.push({type:"code",lang:s[2]?s[2].trim():s[2],text:s[3]||""});else if(s=this.rules.heading.exec(e))e=e.substring(s[0].length),this.tokens.push({type:"heading",depth:s[1].length,text:s[2]});else if((s=this.rules.nptable.exec(e))&&(o={type:"table",header:x(s[1].replace(/^ *| *\| *$/g,"")),align:s[2].replace(/^ *|\| *$/g,"").split(/ *\| */),cells:s[3]?s[3].replace(/\n$/,"").split("\n"):[]}).header.length===o.align.length){for(e=e.substring(s[0].length),c=0;c<o.align.length;c++)/^ *-+: *$/.test(o.align[c])?o.align[c]="right":/^ *:-+: *$/.test(o.align[c])?o.align[c]="center":/^ *:-+ *$/.test(o.align[c])?o.align[c]="left":o.align[c]=null;for(c=0;c<o.cells.length;c++)o.cells[c]=x(o.cells[c],o.header.length);this.tokens.push(o)}else if(s=this.rules.hr.exec(e))e=e.substring(s[0].length),this.tokens.push({type:"hr"});else if(s=this.rules.blockquote.exec(e))e=e.substring(s[0].length),this.tokens.push({type:"blockquote_start"}),s=s[0].replace(/^ *> ?/gm,""),this.token(s,t),this.tokens.push({type:"blockquote_end"});else if(s=this.rules.list.exec(e)){for(e=e.substring(s[0].length),a={type:"list_start",ordered:d=1<(i=s[2]).length,start:d?+i:"",loose:!1},this.tokens.push(a),n=!(h=[]),f=(s=s[0].match(this.rules.item)).length,c=0;c<f;c++)u=(o=s[c]).length,~(o=o.replace(/^ *([*+-]|\d+\.) */,"")).indexOf("\n ")&&(u-=o.length,o=this.options.pedantic?o.replace(/^ {1,4}/gm,""):o.replace(new RegExp("^ {1,"+u+"}","gm"),"")),c!==f-1&&(l=k.bullet.exec(s[c+1])[0],(1<i.length?1===l.length:1<l.length||this.options.smartLists&&l!==i)&&(e=s.slice(c+1).join("\n")+e,c=f-1)),r=n||/\n\n(?!\s*$)/.test(o),c!==f-1&&(n="\n"===o.charAt(o.length-1),r||(r=n)),r&&(a.loose=!0),b=void 0,(m=/^\[[ xX]\] /.test(o))&&(b=" "!==o[1],o=o.replace(/^\[[ xX]\] +/,"")),p={type:"list_item_start",task:m,checked:b,loose:r},h.push(p),this.tokens.push(p),this.token(o,!1),this.tokens.push({type:"list_item_end"});if(a.loose)for(f=h.length,c=0;c<f;c++)h[c].loose=!0;this.tokens.push({type:"list_end"})}else if(s=this.rules.html.exec(e))e=e.substring(s[0].length),this.tokens.push({type:this.options.sanitize?"paragraph":"html",pre:!this.options.sanitizer&&("pre"===s[1]||"script"===s[1]||"style"===s[1]),text:s[0]});else if(t&&(s=this.rules.def.exec(e)))e=e.substring(s[0].length),s[3]&&(s[3]=s[3].substring(1,s[3].length-1)),g=s[1].toLowerCase().replace(/\s+/g," "),this.tokens.links[g]||(this.tokens.links[g]={href:s[2],title:s[3]});else if((s=this.rules.table.exec(e))&&(o={type:"table",header:x(s[1].replace(/^ *| *\| *$/g,"")),align:s[2].replace(/^ *|\| *$/g,"").split(/ *\| */),cells:s[3]?s[3].replace(/\n$/,"").split("\n"):[]}).header.length===o.align.length){for(e=e.substring(s[0].length),c=0;c<o.align.length;c++)/^ *-+: *$/.test(o.align[c])?o.align[c]="right":/^ *:-+: *$/.test(o.align[c])?o.align[c]="center":/^ *:-+ *$/.test(o.align[c])?o.align[c]="left":o.align[c]=null;for(c=0;c<o.cells.length;c++)o.cells[c]=x(o.cells[c].replace(/^ *\| *| *\| *$/g,""),o.header.length);this.tokens.push(o)}else if(s=this.rules.lheading.exec(e))e=e.substring(s[0].length),this.tokens.push({type:"heading",depth:"="===s[2]?1:2,text:s[1]});else if(t&&(s=this.rules.paragraph.exec(e)))e=e.substring(s[0].length),this.tokens.push({type:"paragraph",text:"\n"===s[1].charAt(s[1].length-1)?s[1].slice(0,-1):s[1]});else if(s=this.rules.text.exec(e))e=e.substring(s[0].length),this.tokens.push({type:"text",text:s[0]});else if(e)throw new Error("Infinite loop on byte: "+e.charCodeAt(0));return this.tokens};var n={escape:/^\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/,autolink:/^<(scheme:[^\s\x00-\x1f<>]*|email)>/,url:f,tag:"^comment|^</[a-zA-Z][\\w:-]*\\s*>|^<[a-zA-Z][\\w-]*(?:attribute)*?\\s*/?>|^<\\?[\\s\\S]*?\\?>|^<![a-zA-Z]+\\s[\\s\\S]*?>|^<!\\[CDATA\\[[\\s\\S]*?\\]\\]>",link:/^!?\[(label)\]\(href(?:\s+(title))?\s*\)/,reflink:/^!?\[(label)\]\[(?!\s*\])((?:\\[\[\]]?|[^\[\]\\])+)\]/,nolink:/^!?\[(?!\s*\])((?:\[[^\[\]]*\]|\\[\[\]]|[^\[\]])*)\](?:\[\])?/,strong:/^__([^\s_])__(?!_)|^\*\*([^\s*])\*\*(?!\*)|^__([^\s][\s\S]*?[^\s])__(?!_)|^\*\*([^\s][\s\S]*?[^\s])\*\*(?!\*)/,em:/^_([^\s_])_(?!_)|^\*([^\s*"<\[])\*(?!\*)|^_([^\s][\s\S]*?[^\s_])_(?!_|[^\spunctuation])|^_([^\s_][\s\S]*?[^\s])_(?!_|[^\spunctuation])|^\*([^\s"<\[][\s\S]*?[^\s*])\*(?!\*)|^\*([^\s*"<\[][\s\S]*?[^\s])\*(?!\*)/,code:/^(`+)([^`]|[^`][\s\S]*?[^`])\1(?!`)/,br:/^( {2,}|\\)\n(?!\s*$)/,del:f,text:/^(`+|[^`])(?:[\s\S]*?(?:(?=[\\<!\[`*]|\b_|$)|[^ ](?= {2,}\n))|(?= {2,}\n))/};function p(e,t){if(this.options=t||b.defaults,this.links=e,this.rules=n.normal,this.renderer=this.options.renderer||new r,this.renderer.options=this.options,!this.links)throw new Error("Tokens array requires a `links` property.");this.options.pedantic?this.rules=n.pedantic:this.options.gfm&&(this.options.breaks?this.rules=n.breaks:this.rules=n.gfm)}function r(e){this.options=e||b.defaults}function s(){}function h(e){this.tokens=[],this.token=null,this.options=e||b.defaults,this.options.renderer=this.options.renderer||new r,this.renderer=this.options.renderer,this.renderer.options=this.options,this.slugger=new t}function t(){this.seen={}}function u(e,t){if(t){if(u.escapeTest.test(e))return e.replace(u.escapeReplace,function(e){return u.replacements[e]})}else if(u.escapeTestNoEncode.test(e))return e.replace(u.escapeReplaceNoEncode,function(e){return u.replacements[e]});return e}function c(e){return e.replace(/&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/gi,function(e,t){return"colon"===(t=t.toLowerCase())?":":"#"===t.charAt(0)?"x"===t.charAt(1)?String.fromCharCode(parseInt(t.substring(2),16)):String.fromCharCode(+t.substring(1)):""})}function i(n,e){return n=n.source||n,e=e||"",{replace:function(e,t){return t=(t=t.source||t).replace(/(^|[^\[])\^/g,"$1"),n=n.replace(e,t),this},getRegex:function(){return new RegExp(n,e)}}}function l(e,t,n){if(e){try{var r=decodeURIComponent(c(n)).replace(/[^\w:]/g,"").toLowerCase()}catch(e){return null}if(0===r.indexOf("javascript:")||0===r.indexOf("vbscript:")||0===r.indexOf("data:"))return null}t&&!g.test(n)&&(n=function(e,t){o[" "+e]||(/^[^:]+:\/*[^/]*$/.test(e)?o[" "+e]=e+"/":o[" "+e]=y(e,"/",!0));return e=o[" "+e],"//"===t.slice(0,2)?e.replace(/:[\s\S]*/,":")+t:"/"===t.charAt(0)?e.replace(/(:\/*[^/]*)[\s\S]*/,"$1")+t:e+t}(t,n));try{n=encodeURI(n).replace(/%25/g,"%")}catch(e){return null}return n}n._punctuation="!\"#$%&'()*+,\\-./:;<=>?@\\[^_{|}~",n.em=i(n.em).replace(/punctuation/g,n._punctuation).getRegex(),n._escapes=/\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/g,n._scheme=/[a-zA-Z][a-zA-Z0-9+.-]{1,31}/,n._email=/[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+(@)[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+(?![-_])/,n.autolink=i(n.autolink).replace("scheme",n._scheme).replace("email",n._email).getRegex(),n._attribute=/\s+[a-zA-Z:_][\w.:-]*(?:\s*=\s*"[^"]*"|\s*=\s*'[^']*'|\s*=\s*[^\s"'=<>`]+)?/,n.tag=i(n.tag).replace("comment",k._comment).replace("attribute",n._attribute).getRegex(),n._label=/(?:\[[^\[\]]*\]|\\[\[\]]?|`[^`]*`|`(?!`)|[^\[\]\\`])*?/,n._href=/\s*(<(?:\\[<>]?|[^\s<>\\])*>|[^\s\x00-\x1f]*)/,n._title=/"(?:\\"?|[^"\\])*"|'(?:\\'?|[^'\\])*'|\((?:\\\)?|[^)\\])*\)/,n.link=i(n.link).replace("label",n._label).replace("href",n._href).replace("title",n._title).getRegex(),n.reflink=i(n.reflink).replace("label",n._label).getRegex(),n.normal=d({},n),n.pedantic=d({},n.normal,{strong:/^__(?=\S)([\s\S]*?\S)__(?!_)|^\*\*(?=\S)([\s\S]*?\S)\*\*(?!\*)/,em:/^_(?=\S)([\s\S]*?\S)_(?!_)|^\*(?=\S)([\s\S]*?\S)\*(?!\*)/,link:i(/^!?\[(label)\]\((.*?)\)/).replace("label",n._label).getRegex(),reflink:i(/^!?\[(label)\]\s*\[([^\]]*)\]/).replace("label",n._label).getRegex()}),n.gfm=d({},n.normal,{escape:i(n.escape).replace("])","~|])").getRegex(),_extended_email:/[A-Za-z0-9._+-]+(@)[a-zA-Z0-9-_]+(?:\.[a-zA-Z0-9-_]*[a-zA-Z0-9])+(?![-_])/,url:/^((?:ftp|https?):\/\/|www\.)(?:[a-zA-Z0-9\-]+\.?)+[^\s<]*|^email/,_backpedal:/(?:[^?!.,:;*_~()&]+|\([^)]*\)|&(?![a-zA-Z0-9]+;$)|[?!.,:;*_~)]+(?!$))+/,del:/^~+(?=\S)([\s\S]*?\S)~+/,text:/^(`+|[^`])(?:[\s\S]*?(?:(?=[\\<!\[`*~]|\b_|https?:\/\/|ftp:\/\/|www\.|$)|[^ ](?= {2,}\n)|[^a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-](?=[a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-]+@))|(?= {2,}\n|[a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-]+@))/}),n.gfm.url=i(n.gfm.url,"i").replace("email",n.gfm._extended_email).getRegex(),n.breaks=d({},n.gfm,{br:i(n.br).replace("{2,}","*").getRegex(),text:i(n.gfm.text).replace(/\{2,\}/g,"*").getRegex()}),p.rules=n,p.output=function(e,t,n){return new p(t,n).output(e)},p.prototype.output=function(e){for(var t,n,r,s,i,l,o="";e;)if(i=this.rules.escape.exec(e))e=e.substring(i[0].length),o+=u(i[1]);else if(i=this.rules.tag.exec(e))!this.inLink&&/^<a /i.test(i[0])?this.inLink=!0:this.inLink&&/^<\/a>/i.test(i[0])&&(this.inLink=!1),!this.inRawBlock&&/^<(pre|code|kbd|script)(\s|>)/i.test(i[0])?this.inRawBlock=!0:this.inRawBlock&&/^<\/(pre|code|kbd|script)(\s|>)/i.test(i[0])&&(this.inRawBlock=!1),e=e.substring(i[0].length),o+=this.options.sanitize?this.options.sanitizer?this.options.sanitizer(i[0]):u(i[0]):i[0];else if(i=this.rules.link.exec(e)){var a=m(i[2],"()");if(-1<a){var h=i[0].length-(i[2].length-a)-(i[3]||"").length;i[2]=i[2].substring(0,a),i[0]=i[0].substring(0,h).trim(),i[3]=""}e=e.substring(i[0].length),this.inLink=!0,r=i[2],s=this.options.pedantic?(t=/^([^'"]*[^\s])\s+(['"])(.*)\2/.exec(r))?(r=t[1],t[3]):"":i[3]?i[3].slice(1,-1):"",r=r.trim().replace(/^<([\s\S]*)>$/,"$1"),o+=this.outputLink(i,{href:p.escapes(r),title:p.escapes(s)}),this.inLink=!1}else if((i=this.rules.reflink.exec(e))||(i=this.rules.nolink.exec(e))){if(e=e.substring(i[0].length),t=(i[2]||i[1]).replace(/\s+/g," "),!(t=this.links[t.toLowerCase()])||!t.href){o+=i[0].charAt(0),e=i[0].substring(1)+e;continue}this.inLink=!0,o+=this.outputLink(i,t),this.inLink=!1}else if(i=this.rules.strong.exec(e))e=e.substring(i[0].length),o+=this.renderer.strong(this.output(i[4]||i[3]||i[2]||i[1]));else if(i=this.rules.em.exec(e))e=e.substring(i[0].length),o+=this.renderer.em(this.output(i[6]||i[5]||i[4]||i[3]||i[2]||i[1]));else if(i=this.rules.code.exec(e))e=e.substring(i[0].length),o+=this.renderer.codespan(u(i[2].trim(),!0));else if(i=this.rules.br.exec(e))e=e.substring(i[0].length),o+=this.renderer.br();else if(i=this.rules.del.exec(e))e=e.substring(i[0].length),o+=this.renderer.del(this.output(i[1]));else if(i=this.rules.autolink.exec(e))e=e.substring(i[0].length),r="@"===i[2]?"mailto:"+(n=u(this.mangle(i[1]))):n=u(i[1]),o+=this.renderer.link(r,null,n);else if(this.inLink||!(i=this.rules.url.exec(e))){if(i=this.rules.text.exec(e))e=e.substring(i[0].length),this.inRawBlock?o+=this.renderer.text(i[0]):o+=this.renderer.text(u(this.smartypants(i[0])));else if(e)throw new Error("Infinite loop on byte: "+e.charCodeAt(0))}else{if("@"===i[2])r="mailto:"+(n=u(i[0]));else{for(;l=i[0],i[0]=this.rules._backpedal.exec(i[0])[0],l!==i[0];);n=u(i[0]),r="www."===i[1]?"http://"+n:n}e=e.substring(i[0].length),o+=this.renderer.link(r,null,n)}return o},p.escapes=function(e){return e?e.replace(p.rules._escapes,"$1"):e},p.prototype.outputLink=function(e,t){var n=t.href,r=t.title?u(t.title):null;return"!"!==e[0].charAt(0)?this.renderer.link(n,r,this.output(e[1])):this.renderer.image(n,r,u(e[1]))},p.prototype.smartypants=function(e){return this.options.smartypants?e.replace(/---/g,"—").replace(/--/g,"–").replace(/(^|[-\u2014/(\[{"\s])'/g,"$1‘").replace(/'/g,"’").replace(/(^|[-\u2014/(\[{\u2018\s])"/g,"$1“").replace(/"/g,"”").replace(/\.{3}/g,"…"):e},p.prototype.mangle=function(e){if(!this.options.mangle)return e;for(var t,n="",r=e.length,s=0;s<r;s++)t=e.charCodeAt(s),.5<Math.random()&&(t="x"+t.toString(16)),n+="&#"+t+";";return n},r.prototype.code=function(e,t,n){var r=(t||"").match(/\S*/)[0];if(this.options.highlight){var s=this.options.highlight(e,r);null!=s&&s!==e&&(n=!0,e=s)}return r?'<pre><code class="'+this.options.langPrefix+u(r,!0)+'">'+(n?e:u(e,!0))+"</code></pre>\n":"<pre><code>"+(n?e:u(e,!0))+"</code></pre>"},r.prototype.blockquote=function(e){return"<blockquote>\n"+e+"</blockquote>\n"},r.prototype.html=function(e){return e},r.prototype.heading=function(e,t,n,r){return this.options.headerIds?"<h"+t+' id="'+this.options.headerPrefix+r.slug(n)+'">'+e+"</h"+t+">\n":"<h"+t+">"+e+"</h"+t+">\n"},r.prototype.hr=function(){return this.options.xhtml?"<hr/>\n":"<hr>\n"},r.prototype.list=function(e,t,n){var r=t?"ol":"ul";return"<"+r+(t&&1!==n?' start="'+n+'"':"")+">\n"+e+"</"+r+">\n"},r.prototype.listitem=function(e){return"<li>"+e+"</li>\n"},r.prototype.checkbox=function(e){return"<input "+(e?'checked="" ':"")+'disabled="" type="checkbox"'+(this.options.xhtml?" /":"")+"> "},r.prototype.paragraph=function(e){return"<p>"+e+"</p>\n"},r.prototype.table=function(e,t){return t&&(t="<tbody>"+t+"</tbody>"),"<table>\n<thead>\n"+e+"</thead>\n"+t+"</table>\n"},r.prototype.tablerow=function(e){return"<tr>\n"+e+"</tr>\n"},r.prototype.tablecell=function(e,t){var n=t.header?"th":"td";return(t.align?"<"+n+' align="'+t.align+'">':"<"+n+">")+e+"</"+n+">\n"},r.prototype.strong=function(e){return"<strong>"+e+"</strong>"},r.prototype.em=function(e){return"<em>"+e+"</em>"},r.prototype.codespan=function(e){return"<code>"+e+"</code>"},r.prototype.br=function(){return this.options.xhtml?"<br/>":"<br>"},r.prototype.del=function(e){return"<del>"+e+"</del>"},r.prototype.link=function(e,t,n){if(null===(e=l(this.options.sanitize,this.options.baseUrl,e)))return n;var r='<a href="'+u(e)+'"';return t&&(r+=' title="'+t+'"'),r+=">"+n+"</a>"},r.prototype.image=function(e,t,n){if(null===(e=l(this.options.sanitize,this.options.baseUrl,e)))return n;var r='<img src="'+e+'" alt="'+n+'"';return t&&(r+=' title="'+t+'"'),r+=this.options.xhtml?"/>":">"},r.prototype.text=function(e){return e},s.prototype.strong=s.prototype.em=s.prototype.codespan=s.prototype.del=s.prototype.text=function(e){return e},s.prototype.link=s.prototype.image=function(e,t,n){return""+n},s.prototype.br=function(){return""},h.parse=function(e,t){return new h(t).parse(e)},h.prototype.parse=function(e){this.inline=new p(e.links,this.options),this.inlineText=new p(e.links,d({},this.options,{renderer:new s})),this.tokens=e.reverse();for(var t="";this.next();)t+=this.tok();return t},h.prototype.next=function(){return this.token=this.tokens.pop()},h.prototype.peek=function(){return this.tokens[this.tokens.length-1]||0},h.prototype.parseText=function(){for(var e=this.token.text;"text"===this.peek().type;)e+="\n"+this.next().text;return this.inline.output(e)},h.prototype.tok=function(){switch(this.token.type){case"space":return"";case"hr":return this.renderer.hr();case"heading":return this.renderer.heading(this.inline.output(this.token.text),this.token.depth,c(this.inlineText.output(this.token.text)),this.slugger);case"code":return this.renderer.code(this.token.text,this.token.lang,this.token.escaped);case"table":var e,t,n,r,s="",i="";for(n="",e=0;e<this.token.header.length;e++)n+=this.renderer.tablecell(this.inline.output(this.token.header[e]),{header:!0,align:this.token.align[e]});for(s+=this.renderer.tablerow(n),e=0;e<this.token.cells.length;e++){for(t=this.token.cells[e],n="",r=0;r<t.length;r++)n+=this.renderer.tablecell(this.inline.output(t[r]),{header:!1,align:this.token.align[r]});i+=this.renderer.tablerow(n)}return this.renderer.table(s,i);case"blockquote_start":for(i="";"blockquote_end"!==this.next().type;)i+=this.tok();return this.renderer.blockquote(i);case"list_start":i="";for(var l=this.token.ordered,o=this.token.start;"list_end"!==this.next().type;)i+=this.tok();return this.renderer.list(i,l,o);case"list_item_start":i="";var a=this.token.loose,h=this.token.checked,p=this.token.task;for(this.token.task&&(i+=this.renderer.checkbox(h));"list_item_end"!==this.next().type;)i+=a||"text"!==this.token.type?this.tok():this.parseText();return this.renderer.listitem(i,p,h);case"html":return this.renderer.html(this.token.text);case"paragraph":return this.renderer.paragraph(this.inline.output(this.token.text));case"text":return this.renderer.paragraph(this.parseText());default:var u='Token with "'+this.token.type+'" type was not found.';if(!this.options.silent)throw new Error(u);console.log(u)}},t.prototype.slug=function(e){var t=e.toLowerCase().trim().replace(/[\u2000-\u206F\u2E00-\u2E7F\\'!"#$%&()*+,./:;<=>?@[\]^`{|}~]/g,"").replace(/\s/g,"-");if(this.seen.hasOwnProperty(t))for(var n=t;this.seen[n]++,t=n+"-"+this.seen[n],this.seen.hasOwnProperty(t););return this.seen[t]=0,t},u.escapeTest=/[&<>"']/,u.escapeReplace=/[&<>"']/g,u.replacements={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;"},u.escapeTestNoEncode=/[<>"']|&(?!#?\w+;)/,u.escapeReplaceNoEncode=/[<>"']|&(?!#?\w+;)/g;var o={},g=/^$|^[a-z][a-z0-9+.-]*:|^[?#]/i;function f(){}function d(e){for(var t,n,r=1;r<arguments.length;r++)for(n in t=arguments[r])Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e}function x(e,t){var n=e.replace(/\|/g,function(e,t,n){for(var r=!1,s=t;0<=--s&&"\\"===n[s];)r=!r;return r?"|":" |"}).split(/ \|/),r=0;if(n.length>t)n.splice(t);else for(;n.length<t;)n.push("");for(;r<n.length;r++)n[r]=n[r].trim().replace(/\\\|/g,"|");return n}function y(e,t,n){if(0===e.length)return"";for(var r=0;r<e.length;){var s=e.charAt(e.length-r-1);if(s!==t||n){if(s===t||!n)break;r++}else r++}return e.substr(0,e.length-r)}function m(e,t){if(-1===e.indexOf(t[1]))return-1;for(var n=0,r=0;r<e.length;r++)if("\\"===e[r])r++;else if(e[r]===t[0])n++;else if(e[r]===t[1]&&--n<0)return r;return-1}function b(e,n,r){if(null==e)throw new Error("marked(): input parameter is undefined or null");if("string"!=typeof e)throw new Error("marked(): input parameter is of type "+Object.prototype.toString.call(e)+", string expected");if(r||"function"==typeof n){r||(r=n,n=null);var s,i,l=(n=d({},b.defaults,n||{})).highlight,t=0;try{s=a.lex(e,n)}catch(e){return r(e)}i=s.length;var o=function(t){if(t)return n.highlight=l,r(t);var e;try{e=h.parse(s,n)}catch(e){t=e}return n.highlight=l,t?r(t):r(null,e)};if(!l||l.length<3)return o();if(delete n.highlight,!i)return o();for(;t<s.length;t++)!function(n){"code"!==n.type?--i||o():l(n.text,n.lang,function(e,t){return e?o(e):null==t||t===n.text?--i||o():(n.text=t,n.escaped=!0,void(--i||o()))})}(s[t])}else try{return n&&(n=d({},b.defaults,n)),h.parse(a.lex(e,n),n)}catch(e){if(e.message+="\nPlease report this to https://github.com/markedjs/marked.",(n||b.defaults).silent)return"<p>An error occurred:</p><pre>"+u(e.message+"",!0)+"</pre>";throw e}}f.exec=f,b.options=b.setOptions=function(e){return d(b.defaults,e),b},b.getDefaults=function(){return{baseUrl:null,breaks:!1,gfm:!0,headerIds:!0,headerPrefix:"",highlight:null,langPrefix:"language-",mangle:!0,pedantic:!1,renderer:new r,sanitize:!1,sanitizer:null,silent:!1,smartLists:!1,smartypants:!1,tables:!0,xhtml:!1}},b.defaults=b.getDefaults(),b.Parser=h,b.parser=h.parse,b.Renderer=r,b.TextRenderer=s,b.Lexer=a,b.lexer=a.lex,b.InlineLexer=p,b.inlineLexer=p.output,b.Slugger=t,b.parse=b,"undefined"!=typeof module&&"object"==typeof exports?module.exports=b:"function"==typeof define&&define.amd?define(function(){return b}):e.marked=b}(this||("undefined"!=typeof window?window:global));
\ No newline at end of file
diff --git a/packages/markdown/marked/package.json b/packages/markdown/marked/package.json
new file mode 100644
index 00000000..43cea559
--- /dev/null
+++ b/packages/markdown/marked/package.json
@@ -0,0 +1,69 @@
+{
+  "name": "marked",
+  "description": "A markdown parser built for speed",
+  "author": "Christopher Jeffrey",
+  "version": "0.6.2",
+  "main": "./lib/marked.js",
+  "bin": "./bin/marked",
+  "man": "./man/marked.1",
+  "files": [
+    "bin/",
+    "lib/",
+    "man/",
+    "marked.min.js"
+  ],
+  "repository": "git://github.com/markedjs/marked.git",
+  "homepage": "https://marked.js.org",
+  "bugs": {
+    "url": "http://github.com/markedjs/marked/issues"
+  },
+  "license": "MIT",
+  "keywords": [
+    "markdown",
+    "markup",
+    "html"
+  ],
+  "tags": [
+    "markdown",
+    "markup",
+    "html"
+  ],
+  "devDependencies": {
+    "@markedjs/html-differ": "^2.0.1",
+    "cheerio": "^1.0.0-rc.3",
+    "commonmark": "0.x",
+    "eslint": "^5.15.1",
+    "eslint-config-standard": "^12.0.0",
+    "eslint-plugin-import": "^2.16.0",
+    "eslint-plugin-node": "^8.0.1",
+    "eslint-plugin-promise": "^4.0.1",
+    "eslint-plugin-standard": "^4.0.0",
+    "eslint-plugin-vuln-regex-detector": "^1.0.4",
+    "front-matter": "^3.0.1",
+    "glob-to-regexp": "^0.4.0",
+    "jasmine": "^3.3.1",
+    "markdown": "0.x",
+    "markdown-it": "8.x",
+    "node-fetch": "^2.3.0",
+    "uglify-js": "^3.4.9"
+  },
+  "scripts": {
+    "test": "jasmine --config=jasmine.json",
+    "test:unit": "npm test -- test/unit/**/*-spec.js",
+    "test:specs": "npm test -- test/specs/**/*-spec.js",
+    "test:cm": "npm test -- test/specs/commonmark/**/*-spec.js",
+    "test:gfm": "npm test -- test/specs/gfm/**/*-spec.js",
+    "test:marked": "npm test -- test/specs/marked/**/*-spec.js",
+    "test:old": "node test",
+    "test:lint": "eslint bin/marked .",
+    "test:redos": "eslint --plugin vuln-regex-detector --rule '\"vuln-regex-detector/no-vuln-regex\": 2' lib/marked.js",
+    "test:node4": "npx node@4 ./node_modules/jasmine/bin/jasmine.js --config=jasmine.json",
+    "bench": "node test --bench",
+    "lint": "eslint --fix bin/marked .",
+    "build": "uglifyjs lib/marked.js -cm  --comments /Copyright/ -o marked.min.js",
+    "preversion": "npm run build && (git diff --quiet || git commit -am 'minify')"
+  },
+  "engines": {
+    "node": ">=0.10.0"
+  }
+}
diff --git a/packages/markdown/marked/test/README b/packages/markdown/marked/test/README
new file mode 100644
index 00000000..51f6560b
--- /dev/null
+++ b/packages/markdown/marked/test/README
@@ -0,0 +1,10 @@
+In this directory:
+
+#
+# MarkdownTester -- Run tests for Markdown implementations
+#
+# Copyright (c) 2004-2005 John Gruber
+# <http://daringfireball.net/projects/markdown/>
+#
+
+Partially modified for testing purposes.
diff --git a/packages/markdown/marked/test/browser/index.html b/packages/markdown/marked/test/browser/index.html
new file mode 100644
index 00000000..fbde1293
--- /dev/null
+++ b/packages/markdown/marked/test/browser/index.html
@@ -0,0 +1,5 @@
+<!doctype html>
+<title>marked tests</title>
+<p>testing...</p>
+<script src="marked.js"></script>
+<script src="test.js"></script>
diff --git a/packages/markdown/marked/test/browser/index.js b/packages/markdown/marked/test/browser/index.js
new file mode 100644
index 00000000..8208fa3f
--- /dev/null
+++ b/packages/markdown/marked/test/browser/index.js
@@ -0,0 +1,39 @@
+var fs = require('fs'),
+    path = require('path');
+
+var testMod = require('../'),
+    load = testMod.load;
+
+var express = require('express'),
+    app = express();
+
+var files = load();
+
+app.use(function(req, res, next) {
+  var setHeader = res.setHeader;
+  res.setHeader = function(name) {
+    switch (name) {
+      case 'Cache-Control':
+      case 'Last-Modified':
+      case 'ETag':
+        return;
+    }
+    return setHeader.apply(res, arguments);
+  };
+  next();
+});
+
+app.get('/test.js', function(req, res, next) {
+  var test = fs.readFileSync(path.join(__dirname, 'test.js'), 'utf8');
+  var testScript = test.replace('__TESTS__', JSON.stringify(files))
+    .replace('__MAIN__', testMod.runTests + '')
+    .replace('__LIBS__', testMod.testFile + '');
+
+  res.contentType('.js');
+  res.send(testScript);
+});
+
+app.use(express.static(path.join(__dirname, '/../../lib')));
+app.use(express.static(__dirname));
+
+app.listen(8080);
diff --git a/packages/markdown/marked/test/browser/test.js b/packages/markdown/marked/test/browser/test.js
new file mode 100644
index 00000000..59917dd4
--- /dev/null
+++ b/packages/markdown/marked/test/browser/test.js
@@ -0,0 +1,66 @@
+
+;(function() {
+  var console = {},
+      files = __TESTS__; // eslint-disable-line no-undef
+
+  console.log = function(text) {
+    var args = Array.prototype.slice.call(arguments, 1),
+        i = 0;
+
+    text = text.replace(/%\w/g, function() {
+      return args[i++] || '';
+    });
+
+    if (window.console) window.console.log(text);
+    document.body.innerHTML += '<pre>' + escape(text) + '</pre>';
+  };
+
+  if (!Object.keys) {
+    Object.keys = function(obj) {
+      var out = [],
+          key;
+
+      for (key in obj) {
+        if (Object.prototype.hasOwnProperty.call(obj, key)) {
+          out.push(key);
+        }
+      }
+
+      return out;
+    };
+  }
+
+  if (!Array.prototype.forEach) {
+    // eslint-disable-next-line no-extend-native
+    Array.prototype.forEach = function(callback, context) {
+      for (var i = 0; i < this.length; i++) {
+        callback.call(context || null, this[i], i, this);
+      }
+    };
+  }
+
+  if (!String.prototype.trim) {
+    // eslint-disable-next-line no-extend-native
+    String.prototype.trim = function() {
+      return this.replace(/^\s+|\s+$/g, '');
+    };
+  }
+
+  // eslint-disable-next-line no-unused-vars
+  function load() {
+    return files;
+  }
+
+  function escape(html, encode) {
+    return html
+      .replace(!encode ? /&(?!#?\w+;)/g : /&/g, '&amp;')
+      .replace(/</g, '&lt;')
+      .replace(/>/g, '&gt;')
+      .replace(/"/g, '&quot;')
+      .replace(/'/g, '&#39;');
+  }
+
+  __LIBS__; // eslint-disable-line no-undef, no-unused-expressions
+
+  (__MAIN__)(); // eslint-disable-line no-undef
+}).call(this);
diff --git a/packages/markdown/marked/test/helpers/helpers.js b/packages/markdown/marked/test/helpers/helpers.js
new file mode 100644
index 00000000..44632fcd
--- /dev/null
+++ b/packages/markdown/marked/test/helpers/helpers.js
@@ -0,0 +1,26 @@
+const marked = require('../../');
+const htmlDiffer = require('./html-differ.js');
+
+beforeEach(() => {
+  marked.setOptions(marked.getDefaults());
+
+  jasmine.addMatchers({
+    toRender: () => {
+      return {
+        compare: (spec, expected) => {
+          const result = {};
+          const actual = marked(spec.markdown, spec.options);
+          result.pass = htmlDiffer.isEqual(expected, actual);
+
+          if (result.pass) {
+            result.message = `${spec.markdown}\n------\n\nExpected: Should Fail`;
+          } else {
+            const diff = htmlDiffer.firstDiff(actual, expected);
+            result.message = `Expected: ${diff.expected}\n  Actual: ${diff.actual}`;
+          }
+          return result;
+        }
+      };
+    }
+  });
+});
diff --git a/packages/markdown/marked/test/helpers/html-differ.js b/packages/markdown/marked/test/helpers/html-differ.js
new file mode 100644
index 00000000..44052be4
--- /dev/null
+++ b/packages/markdown/marked/test/helpers/html-differ.js
@@ -0,0 +1,38 @@
+const HtmlDiffer = require('@markedjs/html-differ').HtmlDiffer;
+const htmlDiffer = new HtmlDiffer({ignoreSelfClosingSlash: true});
+
+module.exports = {
+  isEqual: htmlDiffer.isEqual.bind(htmlDiffer),
+  firstDiff: (actual, expected, padding) => {
+    padding = padding || 30;
+    const result = htmlDiffer
+      .diffHtml(actual, expected)
+      .reduce((obj, diff) => {
+        if (diff.added) {
+          if (obj.firstIndex === null) {
+            obj.firstIndex = obj.expected.length;
+          }
+          obj.expected += diff.value;
+        } else if (diff.removed) {
+          if (obj.firstIndex === null) {
+            obj.firstIndex = obj.actual.length;
+          }
+          obj.actual += diff.value;
+        } else {
+          obj.actual += diff.value;
+          obj.expected += diff.value;
+        }
+
+        return obj;
+      }, {
+        firstIndex: null,
+        actual: '',
+        expected: ''
+      });
+
+    return {
+      actual: result.actual.substring(result.firstIndex - padding, result.firstIndex + padding),
+      expected: result.expected.substring(result.firstIndex - padding, result.firstIndex + padding)
+    };
+  }
+};
diff --git a/packages/markdown/marked/test/index.js b/packages/markdown/marked/test/index.js
new file mode 100644
index 00000000..5027ee5b
--- /dev/null
+++ b/packages/markdown/marked/test/index.js
@@ -0,0 +1,551 @@
+#!/usr/bin/env node
+'use strict';
+// 'use strict' is here so we can use let and const in node 4
+
+/**
+ * marked tests
+ * Copyright (c) 2011-2013, Christopher Jeffrey. (MIT Licensed)
+ * https://github.com/markedjs/marked
+ */
+
+/**
+ * Modules
+ */
+
+const fs = require('fs');
+const path = require('path');
+const fm = require('front-matter');
+const g2r = require('glob-to-regexp');
+let marked = require('../');
+const htmlDiffer = require('./helpers/html-differ.js');
+
+/**
+ * Load Tests
+ */
+
+function load(options) {
+  options = options || {};
+  const dir = path.join(__dirname, 'compiled_tests');
+  const glob = g2r(options.glob || '*', { extended: true });
+
+  const list = fs
+    .readdirSync(dir)
+    .filter(file => {
+      return path.extname(file) === '.md';
+    })
+    .sort();
+
+  const files = list.reduce((obj, item) => {
+    const name = path.basename(item, '.md');
+    if (glob.test(name)) {
+      const file = path.join(dir, item);
+      const content = fm(fs.readFileSync(file, 'utf8'));
+
+      obj[name] = {
+        options: content.attributes,
+        text: content.body,
+        html: fs.readFileSync(file.replace(/[^.]+$/, 'html'), 'utf8')
+      };
+    }
+    return obj;
+  }, {});
+
+  if (options.bench || options.time) {
+    if (!options.glob) {
+      // Change certain tests to allow
+      // comparison to older benchmark times.
+      fs.readdirSync(path.join(__dirname, 'new')).forEach(name => {
+        if (path.extname(name) === '.html') return;
+        if (name === 'main.md') return;
+        delete files[name];
+      });
+    }
+
+    if (files['backslash_escapes.md']) {
+      files['backslash_escapes.md'] = {
+        text: 'hello world \\[how](are you) today'
+      };
+    }
+
+    if (files['main.md']) {
+      files['main.md'].text = files['main.md'].text.replace('* * *\n\n', '');
+    }
+  }
+
+  return files;
+}
+
+/**
+ * Test Runner
+ */
+
+function runTests(engine, options) {
+  if (typeof engine !== 'function') {
+    options = engine;
+    engine = null;
+  }
+
+  engine = engine || marked;
+  options = options || {};
+
+  let succeeded = 0;
+  let failed = 0;
+  const files = options.files || load(options);
+  const filenames = Object.keys(files);
+
+  if (options.marked) {
+    marked.setOptions(options.marked);
+  }
+
+  for (let i = 0; i < filenames.length; i++) {
+    const filename = filenames[i];
+    const file = files[filename];
+
+    const success = testFile(engine, file, filename, i + 1);
+
+    if (success) {
+      succeeded++;
+    } else {
+      failed++;
+      if (options.stop) {
+        break;
+      }
+    }
+  }
+
+  console.log('\n%d/%d tests completed successfully.', succeeded, filenames.length);
+  if (failed) console.log('%d/%d tests failed.', failed, filenames.length);
+
+  return !failed;
+}
+
+/**
+ * Test a file
+ */
+
+function testFile(engine, file, filename, index) {
+  const opts = Object.keys(file.options);
+
+  if (marked._original) {
+    marked.defaults = marked._original;
+    delete marked._original;
+  }
+
+  console.log('#%d. Test %s', index, filename);
+
+  if (opts.length) {
+    marked._original = marked.defaults;
+    marked.defaults = {};
+    Object.keys(marked._original).forEach(key => {
+      marked.defaults[key] = marked._original[key];
+    });
+    opts.forEach(key => {
+      if (marked.defaults.hasOwnProperty(key)) {
+        marked.defaults[key] = file.options[key];
+      }
+    });
+  }
+
+  const before = process.hrtime();
+
+  let text, html, elapsed;
+  try {
+    text = engine(file.text);
+    html = file.html;
+  } catch (e) {
+    elapsed = process.hrtime(before);
+    console.log('\n    failed in %dms\n', prettyElapsedTime(elapsed));
+    throw e;
+  }
+
+  elapsed = process.hrtime(before);
+
+  if (htmlDiffer.isEqual(text, html)) {
+    if (elapsed[0] > 0) {
+      console.log('\n    failed because it took too long.\n\n    passed in %dms\n', prettyElapsedTime(elapsed));
+      return false;
+    }
+    console.log('    passed in %dms', prettyElapsedTime(elapsed));
+    return true;
+  }
+
+  const diff = htmlDiffer.firstDiff(text, html);
+
+  console.log('\n    failed in %dms', prettyElapsedTime(elapsed));
+  console.log('    Expected: %s', diff.expected);
+  console.log('      Actual: %s\n', diff.actual);
+  return false;
+}
+
+/**
+ * Benchmark a function
+ */
+
+function bench(name, files, engine) {
+  const start = Date.now();
+
+  for (let i = 0; i < 1000; i++) {
+    for (const filename in files) {
+      engine(files[filename].text);
+    }
+  }
+
+  const end = Date.now();
+
+  console.log('%s completed in %dms.', name, end - start);
+}
+
+/**
+ * Benchmark all engines
+ */
+
+function runBench(options) {
+  options = options || {};
+  const files = load(options);
+
+  // Non-GFM, Non-pedantic
+  marked.setOptions({
+    gfm: false,
+    tables: false,
+    breaks: false,
+    pedantic: false,
+    sanitize: false,
+    smartLists: false
+  });
+  if (options.marked) {
+    marked.setOptions(options.marked);
+  }
+  bench('marked', files, marked);
+
+  // GFM
+  marked.setOptions({
+    gfm: true,
+    tables: false,
+    breaks: false,
+    pedantic: false,
+    sanitize: false,
+    smartLists: false
+  });
+  if (options.marked) {
+    marked.setOptions(options.marked);
+  }
+  bench('marked (gfm)', files, marked);
+
+  // Pedantic
+  marked.setOptions({
+    gfm: false,
+    tables: false,
+    breaks: false,
+    pedantic: true,
+    sanitize: false,
+    smartLists: false
+  });
+  if (options.marked) {
+    marked.setOptions(options.marked);
+  }
+  bench('marked (pedantic)', files, marked);
+
+  try {
+    bench('commonmark', files, (() => {
+      const commonmark = require('commonmark');
+      const parser = new commonmark.Parser();
+      const writer = new commonmark.HtmlRenderer();
+      return function (text) {
+        return writer.render(parser.parse(text));
+      };
+    })());
+  } catch (e) {
+    console.log('Could not bench commonmark. (Error: %s)', e.message);
+  }
+
+  try {
+    bench('markdown-it', files, (() => {
+      const MarkdownIt = require('markdown-it');
+      const md = new MarkdownIt();
+      return md.render.bind(md);
+    })());
+  } catch (e) {
+    console.log('Could not bench markdown-it. (Error: %s)', e.message);
+  }
+
+  try {
+    bench('markdown.js', files, (() => {
+      const markdown = require('markdown').markdown;
+      return markdown.toHTML.bind(markdown);
+    })());
+  } catch (e) {
+    console.log('Could not bench markdown.js. (Error: %s)', e.message);
+  }
+
+  return true;
+}
+
+/**
+ * A simple one-time benchmark
+ */
+
+function time(options) {
+  options = options || {};
+  const files = load(options);
+  if (options.marked) {
+    marked.setOptions(options.marked);
+  }
+  bench('marked', files, marked);
+
+  return true;
+}
+
+/**
+ * Markdown Test Suite Fixer
+ *   This function is responsible for "fixing"
+ *   the markdown test suite. There are
+ *   certain aspects of the suite that
+ *   are strange or might make tests
+ *   fail for reasons unrelated to
+ *   conformance.
+ */
+
+function fix() {
+  ['compiled_tests', 'original', 'new', 'redos'].forEach(dir => {
+    try {
+      fs.mkdirSync(path.resolve(__dirname, dir));
+    } catch (e) {
+      // directory already exists
+    }
+  });
+
+  // rm -rf tests
+  fs.readdirSync(path.resolve(__dirname, 'compiled_tests')).forEach(file => {
+    fs.unlinkSync(path.resolve(__dirname, 'compiled_tests', file));
+  });
+
+  // cp -r original tests
+  fs.readdirSync(path.resolve(__dirname, 'original')).forEach(file => {
+    let text = fs.readFileSync(path.resolve(__dirname, 'original', file), 'utf8');
+
+    if (path.extname(file) === '.md') {
+      if (fm.test(text)) {
+        text = fm(text);
+        text = `---\n${text.frontmatter}\ngfm: false\n---\n${text.body}`;
+      } else {
+        text = `---\ngfm: false\n---\n${text}`;
+      }
+    }
+
+    fs.writeFileSync(path.resolve(__dirname, 'compiled_tests', file), text);
+  });
+
+  // node fix.js
+  const dir = path.join(__dirname, 'compiled_tests');
+
+  fs.readdirSync(dir).filter(file => {
+    return path.extname(file) === '.html';
+  }).forEach(file => {
+    file = path.join(dir, file);
+    let html = fs.readFileSync(file, 'utf8');
+
+    // fix unencoded quotes
+    html = html
+      .replace(/='([^\n']*)'(?=[^<>\n]*>)/g, '=&__APOS__;$1&__APOS__;')
+      .replace(/="([^\n"]*)"(?=[^<>\n]*>)/g, '=&__QUOT__;$1&__QUOT__;')
+      .replace(/"/g, '&quot;')
+      .replace(/'/g, '&#39;')
+      .replace(/&__QUOT__;/g, '"')
+      .replace(/&__APOS__;/g, '\'');
+
+    fs.writeFileSync(file, html);
+  });
+
+  // turn <hr /> into <hr>
+  fs.readdirSync(dir).forEach(file => {
+    file = path.join(dir, file);
+    let text = fs.readFileSync(file, 'utf8');
+
+    text = text.replace(/(<|&lt;)hr\s*\/(>|&gt;)/g, '$1hr$2');
+
+    fs.writeFileSync(file, text);
+  });
+
+  // markdown does some strange things.
+  // it does not encode naked `>`, marked does.
+  {
+    const file = `${dir}/amps_and_angles_encoding.html`;
+    const html = fs.readFileSync(file, 'utf8')
+      .replace('6 > 5.', '6 &gt; 5.');
+
+    fs.writeFileSync(file, html);
+  }
+
+  // cp new/* tests/
+  fs.readdirSync(path.resolve(__dirname, 'new')).forEach(file => {
+    fs.writeFileSync(path.resolve(__dirname, 'compiled_tests', file),
+      fs.readFileSync(path.resolve(__dirname, 'new', file)));
+  });
+
+  // cp redos/* tests/
+  fs.readdirSync(path.resolve(__dirname, 'redos')).forEach(file => {
+    fs.writeFileSync(path.resolve(__dirname, 'compiled_tests', file),
+      fs.readFileSync(path.resolve(__dirname, 'redos', file)));
+  });
+}
+
+/**
+ * Argument Parsing
+ */
+
+function parseArg(argv) {
+  argv = argv.slice(2);
+
+  const options = {};
+  const orphans = [];
+
+  function getarg() {
+    let arg = argv.shift();
+
+    if (arg.indexOf('--') === 0) {
+      // e.g. --opt
+      arg = arg.split('=');
+      if (arg.length > 1) {
+        // e.g. --opt=val
+        argv.unshift(arg.slice(1).join('='));
+      }
+      arg = arg[0];
+    } else if (arg[0] === '-') {
+      if (arg.length > 2) {
+        // e.g. -abc
+        argv = arg.substring(1).split('').map(ch => {
+          return `-${ch}`;
+        }).concat(argv);
+        arg = argv.shift();
+      } else {
+        // e.g. -a
+      }
+    } else {
+      // e.g. foo
+    }
+
+    return arg;
+  }
+
+  while (argv.length) {
+    let arg = getarg();
+    switch (arg) {
+      case '-f':
+      case '--fix':
+      case 'fix':
+        if (options.fix !== false) {
+          options.fix = true;
+        }
+        break;
+      case '--no-fix':
+      case 'no-fix':
+        options.fix = false;
+        break;
+      case '-b':
+      case '--bench':
+        options.bench = true;
+        break;
+      case '-s':
+      case '--stop':
+        options.stop = true;
+        break;
+      case '-t':
+      case '--time':
+        options.time = true;
+        break;
+      case '-m':
+      case '--minified':
+        options.minified = true;
+        break;
+      case '--glob':
+        arg = argv.shift();
+        options.glob = arg.replace(/^=/, '');
+        break;
+      default:
+        if (arg.indexOf('--') === 0) {
+          const opt = camelize(arg.replace(/^--(no-)?/, ''));
+          if (!marked.defaults.hasOwnProperty(opt)) {
+            continue;
+          }
+          options.marked = options.marked || {};
+          if (arg.indexOf('--no-') === 0) {
+            options.marked[opt] = typeof marked.defaults[opt] !== 'boolean'
+              ? null
+              : false;
+          } else {
+            options.marked[opt] = typeof marked.defaults[opt] !== 'boolean'
+              ? argv.shift()
+              : true;
+          }
+        } else {
+          orphans.push(arg);
+        }
+        break;
+    }
+  }
+
+  return options;
+}
+
+/**
+ * Helpers
+ */
+
+function camelize(text) {
+  return text.replace(/(\w)-(\w)/g, (_, a, b) => a + b.toUpperCase());
+}
+
+/**
+ * Main
+ */
+
+function main(argv) {
+  const opt = parseArg(argv);
+
+  if (opt.fix !== false) {
+    fix();
+  }
+
+  if (opt.fix) {
+    // only run fix
+    return;
+  }
+
+  if (opt.bench) {
+    return runBench(opt);
+  }
+
+  if (opt.time) {
+    return time(opt);
+  }
+
+  if (opt.minified) {
+    marked = require('../marked.min.js');
+  }
+  return runTests(opt);
+}
+
+/**
+ * Execute
+ */
+
+if (!module.parent) {
+  process.title = 'marked';
+  process.exit(main(process.argv.slice()) ? 0 : 1);
+} else {
+  exports = main;
+  exports.main = main;
+  exports.runTests = runTests;
+  exports.testFile = testFile;
+  exports.runBench = runBench;
+  exports.load = load;
+  exports.bench = bench;
+  module.exports = exports;
+}
+
+// returns time to millisecond granularity
+function prettyElapsedTime(hrtimeElapsed) {
+  const seconds = hrtimeElapsed[0];
+  const frac = Math.round(hrtimeElapsed[1] / 1e3) / 1e3;
+  return seconds * 1e3 + frac;
+}
diff --git a/packages/markdown/marked/test/json-to-files.js b/packages/markdown/marked/test/json-to-files.js
new file mode 100644
index 00000000..d7e72aaf
--- /dev/null
+++ b/packages/markdown/marked/test/json-to-files.js
@@ -0,0 +1,62 @@
+const path = require('path');
+const fs = require('fs');
+
+const folder = process.argv[2];
+const jsonFile = process.argv[3];
+
+if (!folder || !jsonFile) {
+  console.log('node ./json-to-files.js {path to folder} {path to json file}');
+  process.exit(1);
+}
+
+const specs = require(jsonFile);
+
+const files = specs.reduce((obj, spec) => {
+  if (!obj[spec.section]) {
+    obj[spec.section] = {
+      md: [],
+      html: [],
+      options: {}
+    };
+  }
+
+  obj[spec.section].md.push(spec.markdown);
+  obj[spec.section].html.push(spec.html);
+  Object.assign(obj[spec.section].options, spec.options);
+
+  return obj;
+}, {});
+
+try {
+  fs.mkdirSync(folder, {recursive: true});
+} catch (ex) {
+  // already exists
+}
+
+for (const section in files) {
+  const file = files[section];
+  const name = section.toLowerCase().replace(' ', '_');
+  const frontMatter = Object.keys(file.options).map(opt => {
+    let value = file.options[opt];
+    if (typeof value !== 'string') {
+      value = JSON.stringify(value);
+    }
+    return `${opt}: ${value}`;
+  }).join('\n');
+
+  let markdown = file.md.join('\n\n');
+  if (frontMatter) {
+    markdown = `---\n${frontMatter}\n---\n\n${markdown}`;
+  }
+  const html = file.html.join('\n\n');
+
+  const mdFile = path.resolve(folder, `${name}.md`);
+  const htmlFile = path.resolve(folder, `${name}.html`);
+
+  if (fs.existsSync(mdFile) || fs.existsSync(htmlFile)) {
+    throw new Error(`${name} already exists.`);
+  }
+
+  fs.writeFileSync(mdFile, markdown);
+  fs.writeFileSync(htmlFile, html);
+}
diff --git a/packages/markdown/marked/test/new/adjacent_lists.html b/packages/markdown/marked/test/new/adjacent_lists.html
new file mode 100644
index 00000000..b4cd8f50
--- /dev/null
+++ b/packages/markdown/marked/test/new/adjacent_lists.html
@@ -0,0 +1,9 @@
+<ul>
+<li>This should be</li>
+<li>An unordered list</li>
+</ul>
+
+<ol>
+<li>This should be</li>
+<li>An unordered list</li>
+</ol>
diff --git a/packages/markdown/marked/test/new/adjacent_lists.md b/packages/markdown/marked/test/new/adjacent_lists.md
new file mode 100644
index 00000000..3fd460b3
--- /dev/null
+++ b/packages/markdown/marked/test/new/adjacent_lists.md
@@ -0,0 +1,5 @@
+* This should be
+* An unordered list
+
+1. This should be
+2. An unordered list
diff --git a/packages/markdown/marked/test/new/autolink_lines.html b/packages/markdown/marked/test/new/autolink_lines.html
new file mode 100644
index 00000000..aa2bed4d
--- /dev/null
+++ b/packages/markdown/marked/test/new/autolink_lines.html
@@ -0,0 +1,3 @@
+<p>hello world
+<a href="http://example.com">http://example.com</a>
+</p>
diff --git a/packages/markdown/marked/test/new/autolink_lines.md b/packages/markdown/marked/test/new/autolink_lines.md
new file mode 100644
index 00000000..c9b61a2c
--- /dev/null
+++ b/packages/markdown/marked/test/new/autolink_lines.md
@@ -0,0 +1,2 @@
+hello world
+<http://example.com>
diff --git a/packages/markdown/marked/test/new/autolinks.html b/packages/markdown/marked/test/new/autolinks.html
new file mode 100644
index 00000000..8fa4837e
--- /dev/null
+++ b/packages/markdown/marked/test/new/autolinks.html
@@ -0,0 +1,15 @@
+<p>(See <a href="https://www.example.com/fhqwhgads">https://www.example.com/fhqwhgads</a>.)</p>
+
+<p>((<a href="http://foo.com">http://foo.com</a>))</p>
+
+<p>((<a href="http://foo.com">http://foo.com</a>.))</p>
+
+<p><a href="HTTP://FOO.COM">HTTP://FOO.COM</a></p>
+
+<p><a href="hTtP://fOo.CoM">hTtP://fOo.CoM</a></p>
+
+<p><del><a href="mailto:hello@email.com">hello@email.com</a></del></p>
+
+<p><strong><a href="mailto:me@example.com">me@example.com</a></strong></p>
+
+<p><strong><a href="mailto:test@test.com">test@test.com</a></strong></p>
\ No newline at end of file
diff --git a/packages/markdown/marked/test/new/autolinks.md b/packages/markdown/marked/test/new/autolinks.md
new file mode 100644
index 00000000..1f5f739c
--- /dev/null
+++ b/packages/markdown/marked/test/new/autolinks.md
@@ -0,0 +1,15 @@
+(See https://www.example.com/fhqwhgads.)
+
+((http://foo.com))
+
+((http://foo.com.))
+
+HTTP://FOO.COM
+
+hTtP://fOo.CoM
+
+~~hello@email.com~~
+
+**me@example.com**
+
+__test@test.com__
\ No newline at end of file
diff --git a/packages/markdown/marked/test/new/blockquote_list_item.html b/packages/markdown/marked/test/new/blockquote_list_item.html
new file mode 100644
index 00000000..83cf0bdd
--- /dev/null
+++ b/packages/markdown/marked/test/new/blockquote_list_item.html
@@ -0,0 +1,3 @@
+<p>This fails in markdown.pl and upskirt:</p>
+
+<ul><li>hello<blockquote><p>world</p></blockquote></li></ul>
diff --git a/packages/markdown/marked/test/new/blockquote_list_item.md b/packages/markdown/marked/test/new/blockquote_list_item.md
new file mode 100644
index 00000000..19e93829
--- /dev/null
+++ b/packages/markdown/marked/test/new/blockquote_list_item.md
@@ -0,0 +1,4 @@
+This fails in markdown.pl and upskirt:
+
+* hello
+  > world
diff --git a/packages/markdown/marked/test/new/case_insensitive_refs.html b/packages/markdown/marked/test/new/case_insensitive_refs.html
new file mode 100644
index 00000000..c54388ea
--- /dev/null
+++ b/packages/markdown/marked/test/new/case_insensitive_refs.html
@@ -0,0 +1 @@
+<p><a href="/url">hi</a></p>
diff --git a/packages/markdown/marked/test/new/case_insensitive_refs.md b/packages/markdown/marked/test/new/case_insensitive_refs.md
new file mode 100644
index 00000000..598915a8
--- /dev/null
+++ b/packages/markdown/marked/test/new/case_insensitive_refs.md
@@ -0,0 +1,3 @@
+[hi]
+
+[HI]: /url
diff --git a/packages/markdown/marked/test/new/cm_autolinks.html b/packages/markdown/marked/test/new/cm_autolinks.html
new file mode 100644
index 00000000..e7ae0ee4
--- /dev/null
+++ b/packages/markdown/marked/test/new/cm_autolinks.html
@@ -0,0 +1,91 @@
+<p>Here are some valid autolinks:</p>
+
+<h3 id="example-565">Example 565</h3>
+
+<p><a href="http://foo.bar.baz">http://foo.bar.baz</a></p>
+
+<h3 id="example-566">Example 566</h3>
+
+<p><a href="http://foo.bar.baz/test?q=hello&amp;id=22&amp;boolean">http://foo.bar.baz/test?q=hello&amp;id=22&amp;boolean</a></p>
+
+<h3 id="example-567">Example 567</h3>
+
+<p><a href="irc://foo.bar:2233/baz">irc://foo.bar:2233/baz</a></p>
+
+<h3 id="example-568">Example 568</h3>
+
+<p>Uppercase is also fine:</p>
+
+<p><a href="MAILTO:FOO@BAR.BAZ">MAILTO:FOO@BAR.BAZ</a></p>
+
+<p>Note that many strings that count as absolute URIs for purposes of this spec are not valid URIs, because their schemes are not registered or because of other problems with their syntax:</p>
+
+<h3 id="example-569">Example 569</h3>
+
+<p><a href="a+b+c:d">a+b+c:d</a></p>
+
+<h3 id="example-570">Example 570</h3>
+
+<p><a href="made-up-scheme://foo,bar">made-up-scheme://foo,bar</a></p>
+
+<h3 id="example-571">Example 571</h3>
+
+<p><a href="http://../">http://../</a></p>
+
+<h3 id="example-572">Example 572</h3>
+
+<p><a href="localhost:5001/foo">localhost:5001/foo</a></p>
+
+<h3 id="example-573">Example 573</h3>
+
+<p>Spaces are not allowed in autolinks:</p>
+
+<p>&lt;http://foo.bar/baz bim&gt;</p>
+
+<h3 id="example-574">Example 574</h3>
+
+<p>Backslash-escapes do not work inside autolinks:</p>
+
+<p><a href="http://example.com/%5C%5B%5C">http://example.com/\[\</a></p>
+
+<p>Examples of email autolinks:</p>
+
+<h3 id="example-575">Example 575</h3>
+
+<p><a href="mailto:foo@bar.example.com">foo@bar.example.com</a></p>
+
+<h3 id="example-576">Example 576</h3>
+
+<p><a href="mailto:foo+special@Bar.baz-bar0.com">foo+special@Bar.baz-bar0.com</a></p>
+
+<h3 id="example-577">Example 577</h3>
+
+<p>Backslash-escapes do not work inside email autolinks:</p>
+
+<p>&lt;foo+@bar.example.com&gt;</p>
+
+<p>These are not autolinks:</p>
+
+<h3 id="example-578">Example 578</h3>
+
+<p>&lt;&gt;</p>
+
+<h3 id="example-579">Example 579</h3>
+
+<p>&lt; http://foo.bar &gt;</p>
+
+<h3 id="example-580">Example 580</h3>
+
+<p>&lt;m:abc&gt;</p>
+
+<h3 id="example-581">Example 581</h3>
+
+<p>&lt;foo.bar.baz&gt;</p>
+
+<h3 id="example-582">Example 582</h3>
+
+<p>http://example.com</p>
+
+<h3 id="example-583">Example 583</h3>
+
+<p>foo@bar.example.com</p>
\ No newline at end of file
diff --git a/packages/markdown/marked/test/new/cm_autolinks.md b/packages/markdown/marked/test/new/cm_autolinks.md
new file mode 100644
index 00000000..a19d830c
--- /dev/null
+++ b/packages/markdown/marked/test/new/cm_autolinks.md
@@ -0,0 +1,96 @@
+---
+gfm: false
+mangle: false
+---
+
+Here are some valid autolinks:
+
+### Example 565
+
+<http://foo.bar.baz>
+
+### Example 566
+
+<http://foo.bar.baz/test?q=hello&id=22&boolean>
+
+### Example 567
+
+<irc://foo.bar:2233/baz>
+
+### Example 568
+
+Uppercase is also fine:
+
+<MAILTO:FOO@BAR.BAZ>
+
+Note that many strings that count as absolute URIs for purposes of this spec are not valid URIs, because their schemes are not registered or because of other problems with their syntax:
+
+### Example 569
+
+<a+b+c:d>
+
+### Example 570
+
+<made-up-scheme://foo,bar>
+
+### Example 571
+
+<http://../>
+
+### Example 572
+
+<localhost:5001/foo>
+
+### Example 573
+
+Spaces are not allowed in autolinks:
+
+<http://foo.bar/baz bim>
+
+### Example 574
+
+Backslash-escapes do not work inside autolinks:
+
+<http://example.com/\[\>
+
+Examples of email autolinks:
+
+### Example 575
+
+<foo@bar.example.com>
+
+### Example 576
+
+<foo+special@Bar.baz-bar0.com>
+
+### Example 577
+
+Backslash-escapes do not work inside email autolinks:
+
+<foo\+@bar.example.com>
+
+These are not autolinks:
+
+### Example 578
+
+<>
+
+### Example 579
+
+< http://foo.bar >
+
+### Example 580
+
+<m:abc>
+
+### Example 581
+
+<foo.bar.baz>
+
+### Example 582
+
+http://example.com
+
+### Example 583
+
+foo@bar.example.com
\ No newline at end of file
diff --git a/packages/markdown/marked/test/new/cm_blockquotes.html b/packages/markdown/marked/test/new/cm_blockquotes.html
new file mode 100644
index 00000000..b4d51b1f
--- /dev/null
+++ b/packages/markdown/marked/test/new/cm_blockquotes.html
@@ -0,0 +1,233 @@
+<h3 id="example-191">Example 191</h3>
+
+<blockquote>
+<h1 id="foo">Foo</h1>
+<p>bar
+baz</p>
+</blockquote>
+
+<h3 id="example-192">Example 192</h3>
+
+<p>The spaces after the <code>&gt;</code> characters can be omitted:</p>
+
+<blockquote>
+<h1 id="bar">Bar</h1>
+<p>bar
+baz</p>
+</blockquote>
+
+<h3 id="example-193">Example 193</h3>
+
+<p>The <code>&gt;</code> characters can be indented 1-3 spaces:</p>
+
+<blockquote>
+<h1 id="baz">Baz</h1>
+<p>bar
+baz</p>
+</blockquote>
+
+<h3 id="example-194">Example 194</h3>
+
+<p>Four spaces gives us a code block:</p>
+
+<pre><code>&gt; # Qux
+&gt; bar
+&gt; baz</code></pre>
+
+<h3 id="example-195">Example 195</h3>
+
+<p>The Laziness clause allows us to omit the <code>&gt;</code> before paragraph continuation text:</p>
+
+<blockquote>
+<h1 id="quux">Quux</h1>
+<p>bar
+baz</p>
+</blockquote>
+
+<h3 id="example-196">Example 196</h3>
+
+<p>A block quote can contain some lazy and some non-lazy continuation lines:</p>
+
+<blockquote>
+<p>bar
+baz
+foo</p>
+</blockquote>
+
+<h3 id="example-197">Example 197</h3>
+
+<p>Laziness only applies to lines that would have been continuations of paragraphs had they been prepended with block quote markers. For example, the <code>&gt;</code> cannot be omitted in the second line of</p>
+
+<blockquote>
+<p>foo</p>
+</blockquote>
+<hr>
+
+<p>without changing the meaning.</p>
+
+<h3 id="example-198">Example 198</h3>
+
+<pre><code>Similarly, if we omit the `&gt;` in the second line then the block quote ends after the first line:
+
+&gt; - foo
+- bar</code></pre>
+
+<h3 id="example-199">Example 199</h3>
+
+<p>For the same reason, we can’t omit the <code>&gt;</code> in front of subsequent lines of an indented or fenced code block:</p>
+
+<blockquote>
+<pre><code>foo</code></pre>
+</blockquote>
+<pre><code>bar</code></pre>
+
+<h3 id="example-200">Example 200</h3>
+
+<pre><code>&gt; ```
+foo
+```
+
+&lt;blockquote&gt;
+&lt;pre&gt;&lt;code&gt;&lt;/code&gt;&lt;/pre&gt;
+&lt;/blockquote&gt;
+&lt;p&gt;foo&lt;/p&gt;
+&lt;pre&gt;&lt;code&gt;&lt;/code&gt;&lt;/pre&gt;</code></pre>
+
+<h3 id="example-201">Example 201</h3>
+<pre><code>&gt; foo
+    - bar
+
+&lt;blockquote&gt;
+&lt;p&gt;foo
+- bar&lt;/p&gt;
+&lt;/blockquote&gt;</code></pre>
+
+<h3 id="example-202">Example 202</h3>
+
+<p>A block quote can be empty:</p>
+
+<blockquote>
+</blockquote>
+
+<h3 id="example-203">Example 203</h3>
+
+<blockquote>
+</blockquote>
+
+<h3 id="example-204">Example 204</h3>
+
+<p>A block quote can have initial or final blank lines:</p>
+
+<blockquote>
+<p>foo</p>
+</blockquote>
+
+
+<h3 id="example-205">Example 205</h3>
+
+<p>A blank line always separates block quotes:</p>
+
+<blockquote>
+<p>foo</p>
+</blockquote>
+<blockquote>
+<p>bar</p>
+</blockquote>
+
+<h3 id="example-206">Example 206</h3>
+
+<p>Consecutiveness means that if we put these block quotes together, we get a single block quote:</p>
+
+<blockquote>
+<p>foo
+bar</p>
+</blockquote>
+
+<h3 id="example-207">Example 207</h3>
+
+<p>To get a block quote with two paragraphs, use:</p>
+
+<blockquote>
+<p>foo</p>
+<p>bar</p>
+</blockquote>
+
+<h3 id="example-208">Example 208</h3>
+
+<p>Block quotes can interrupt paragraphs:</p>
+
+<p>foo</p>
+<blockquote>
+<p>bar</p>
+</blockquote>
+
+<h3 id="example-209">Example 209</h3>
+
+<p>In general, blank lines are not needed before or after block quotes:</p>
+
+<blockquote>
+<p>aaa</p>
+</blockquote>
+<hr>
+<blockquote>
+<p>bbb</p>
+</blockquote>
+
+<h3 id="example-210">Example 210</h3>
+
+<p>However, because of laziness, a blank line is needed between a block quote and a following paragraph:</p>
+
+<blockquote>
+<p>bar
+baz</p>
+</blockquote>
+
+<h3 id="example-211">Example 211</h3>
+
+<blockquote>
+<p>bar</p>
+</blockquote>
+<p>baz</p>
+
+<h3 id="example-212">Example 212</h3>
+
+<blockquote>
+<p>bar</p>
+</blockquote>
+<p>baz</p>
+
+<h3 id="example-213">Example 213</h3>
+
+<p>It is a consequence of the Laziness rule that any number of initial <code>&gt;</code>s may be omitted on a continuation line of a nested block quote:</p>
+
+<blockquote>
+<blockquote>
+<blockquote>
+<p>foo
+bar</p>
+</blockquote>
+</blockquote>
+</blockquote>
+
+<h3 id="example-214">Example 214</h3>
+
+<blockquote>
+<blockquote>
+<blockquote>
+<p>foo
+bar
+baz</p>
+</blockquote>
+</blockquote>
+</blockquote>
+
+<h3 id="example-215">Example 215</h3>
+
+<p>When including an indented code block in a block quote, remember that the block quote marker includes both the <code>&gt;</code> and a following space. So five spaces are needed after the <code>&gt;</code>:</p>
+
+<blockquote>
+<pre><code>code</code></pre>
+</blockquote>
+<blockquote>
+<p>not code</p>
+</blockquote>
diff --git a/packages/markdown/marked/test/new/cm_blockquotes.md b/packages/markdown/marked/test/new/cm_blockquotes.md
new file mode 100644
index 00000000..6a80a6f3
--- /dev/null
+++ b/packages/markdown/marked/test/new/cm_blockquotes.md
@@ -0,0 +1,189 @@
+### Example 191
+
+> # Foo
+> bar
+> baz
+
+### Example 192
+
+The spaces after the `>` characters can be omitted:
+
+># Bar
+>bar
+> baz
+
+### Example 193
+
+The `>` characters can be indented 1-3 spaces:
+
+   > # Baz
+   > bar
+ > baz
+
+### Example 194
+
+Four spaces gives us a code block:
+
+    > # Qux
+    > bar
+    > baz
+
+### Example 195
+
+The Laziness clause allows us to omit the `>` before paragraph continuation text:
+
+> # Quux
+> bar
+baz
+
+### Example 196
+
+A block quote can contain some lazy and some non-lazy continuation lines:
+
+> bar
+baz
+> foo
+
+### Example 197
+
+Laziness only applies to lines that would have been continuations of paragraphs had they been prepended with block quote markers. For example, the `>` cannot be omitted in the second line of
+
+> foo
+---
+
+without changing the meaning.
+
+### Example 198
+
+    Similarly, if we omit the `>` in the second line then the block quote ends after the first line:
+
+    > - foo
+    - bar
+
+### Example 199
+
+For the same reason, we can’t omit the `>` in front of subsequent lines of an indented or fenced code block:
+
+>     foo
+
+    bar
+
+### Example 200
+
+    > ```
+    foo
+    ```
+
+    <blockquote>
+    <pre><code></code></pre>
+    </blockquote>
+    <p>foo</p>
+    <pre><code></code></pre>
+
+### Example 201
+
+    > foo
+        - bar
+
+    <blockquote>
+    <p>foo
+    - bar</p>
+    </blockquote>
+
+### Example 202
+
+A block quote can be empty:
+
+>
+
+### Example 203
+
+>
+>  
+> 
+
+### Example 204
+
+A block quote can have initial or final blank lines:
+
+>
+> foo
+>  
+
+### Example 205
+
+A blank line always separates block quotes:
+
+> foo
+
+> bar
+
+### Example 206
+
+Consecutiveness means that if we put these block quotes together, we get a single block quote:
+
+> foo
+> bar
+
+### Example 207
+
+To get a block quote with two paragraphs, use:
+
+> foo
+>
+> bar
+
+### Example 208
+
+Block quotes can interrupt paragraphs:
+
+foo
+> bar
+
+### Example 209
+
+In general, blank lines are not needed before or after block quotes:
+
+> aaa
+***
+> bbb
+
+### Example 210
+
+However, because of laziness, a blank line is needed between a block quote and a following paragraph:
+
+> bar
+baz
+
+### Example 211
+
+> bar
+
+baz
+
+### Example 212
+
+> bar
+>
+baz
+
+### Example 213
+
+It is a consequence of the Laziness rule that any number of initial `>`s may be omitted on a continuation line of a nested block quote:
+
+> > > foo
+bar
+
+### Example 214
+
+>>> foo
+> bar
+>>baz
+
+### Example 215
+
+When including an indented code block in a block quote, remember that the block quote marker includes both the `>` and a following space. So five spaces are needed after the `>`:
+
+>     code
+
+>    not code
diff --git a/packages/markdown/marked/test/new/cm_html_blocks.html b/packages/markdown/marked/test/new/cm_html_blocks.html
new file mode 100644
index 00000000..80fdff57
--- /dev/null
+++ b/packages/markdown/marked/test/new/cm_html_blocks.html
@@ -0,0 +1,300 @@
+<h1 id="html-blocks">HTML blocks</h1>
+
+<h3 id="example-116">Example 116</h3>
+
+<table><tr><td>
+<pre>
+**Hello**,
+<p><em>world</em>.
+</pre></p>
+</td></tr></table>
+
+<h3 id="example-117">Example 117</h3>
+
+<table>
+  <tr>
+    <td>
+           hi
+    </td>
+  </tr>
+</table>
+<p>okay.</p>
+
+<h3 id="example-118">Example 118</h3>
+
+ <div>
+  *hello*
+         <foo><a>
+
+<h3 id="example-119">Example 119</h3>
+
+</div>
+*foo*
+
+<h3 id="example-120">Example 120</h3>
+
+<DIV CLASS="foo">
+<p><em>Markdown</em></p>
+</DIV>
+
+<h3 id="example-121">Example 121</h3>
+
+<div id="foo"
+  class="bar">
+</div>
+
+<h3 id="example-122">Example 122</h3>
+
+<div id="foo" class="bar
+  baz">
+</div>
+
+<h3 id="example-123">Example 123</h3>
+
+<div>
+*foo*
+<p><em>bar</em></p>
+
+<h3 id="example-124">Example 124</h3>
+
+<div id="foo"
+*hi*
+
+<h3 id="example-125">Example 125</h3>
+
+<div class
+foo
+
+<h3 id="example-126">Example 126</h3>
+
+<div *???-&&&-<---
+*foo*
+
+<h3 id="example-127">Example 127</h3>
+
+<div><a href="bar">*foo*</a></div>
+
+<h3 id="example-128">Example 128</h3>
+
+<table><tr><td>
+foo
+</td></tr></table>
+
+<h3 id="example-129">Example 129</h3>
+
+<div></div>
+``` c
+int x = 33;
+```
+
+<h3 id="example-130">Example 130</h3>
+
+<a href="foo">
+*bar*
+</a>
+
+<h3 id="example-131">Example 131</h3>
+
+<Warning>
+*bar*
+</Warning>
+
+<h3 id="example-132">Example 132</h3>
+
+<i class="foo">
+*bar*
+</i>
+
+<h3 id="example-133">Example 133</h3>
+
+</ins>
+*bar*
+
+<h3 id="example-134">Example 134</h3>
+
+<del>
+*foo*
+</del>
+
+<h3 id="example-135">Example 135</h3>
+
+<del>
+<p><em>foo</em></p>
+</del>
+
+<h3 id="example-136">Example 136</h3>
+
+<p><del><em>foo</em></del></p>
+
+<h3 id="example-137">Example 137</h3>
+
+<pre language="haskell"><code>
+import Text.HTML.TagSoup
+
+main :: IO ()
+main = print $ parseTags tags
+</code></pre>
+<p>okay</p>
+
+<h3 id="example-138">Example 138</h3>
+
+<script type="text/javascript">
+// JavaScript example
+
+document.getElementById("demo").innerHTML = "Hello JavaScript!";
+</script>
+<p>okay</p>
+
+<h3 id="example-139">Example 139</h3>
+
+<style
+  type="text/css">
+h1 {color:red;}
+
+p {color:blue;}
+</style>
+<p>okay</p>
+
+<h3 id="example-141">Example 141</h3>
+
+<blockquote>
+<div>
+foo
+</blockquote>
+<p>bar</p>
+
+<h3 id="example-142">Example 142</h3>
+
+<ul>
+<li>
+<div>
+</li>
+<li>foo</li>
+</ul>
+
+<h3 id="example-143">Example 143</h3>
+
+<style>p{color:red;}</style>
+<p><em>foo</em></p>
+
+<h3 id="example-144">Example 144</h3>
+
+<!-- foo -->*bar*
+<p><em>baz</em></p>
+
+<h3 id="example-145">Example 145</h3>
+
+<script>
+foo
+</script>1. *bar*
+
+<h3 id="example-146">Example 146</h3>
+
+<!-- Foo
+
+bar
+   baz -->
+<p>okay</p>
+
+<h3 id="example-147">Example 147</h3>
+
+<?php
+
+  echo '>';
+
+?>
+<p>okay</p>
+
+<h3 id="example-148">Example 148</h3>
+
+<!DOCTYPE html>
+
+<h3 id="example-149">Example 149</h3>
+
+<![CDATA[
+function matchwo(a,b)
+{
+  if (a < b && a < 0) then {
+    return 1;
+
+  } else {
+
+    return 0;
+  }
+}
+]]>
+<p>okay</p>
+
+<h3 id="example-150">Example 150</h3>
+
+  <!-- foo -->
+<pre><code>&lt;!-- foo --&gt;
+</code></pre>
+
+<h3 id="example-151">Example 151</h3>
+
+  <div>
+<pre><code>&lt;div&gt;
+</code></pre>
+
+<h3 id="example-152">Example 152</h3>
+
+<p>Foo</p>
+<div>
+bar
+</div>
+
+<h3 id="example-153">Example 153</h3>
+
+<div>
+bar
+</div>
+*foo*
+
+<h3 id="example-154">Example 154</h3>
+
+<p>Foo
+<a href="bar">
+baz</p>
+
+<h3 id="example-155">Example 155</h3>
+
+<div>
+<p><em>Emphasized</em> text.</p>
+</div>
+
+<h3 id="example-156">Example 156</h3>
+
+<div>
+*Emphasized* text.
+</div>
+
+<h3 id="example-157">Example 157</h3>
+
+<table>
+<tr>
+<td>
+Hi
+</td>
+</tr>
+</table>
+
+<h3 id="example-158">Example 158</h3>
+
+<table>
+  <tr>
+<pre><code>&lt;td&gt;
+  Hi
+&lt;/td&gt;
+</code></pre>
+  </tr>
+</table>
+
+<h3 id="example-140">Example 140</h3>
+
+<p>If there is no matching end tag, the block will end at the end of the document (or the enclosing block quote or list item):</p>
+
+<style
+  type="text/css">
+
+foo
diff --git a/packages/markdown/marked/test/new/cm_html_blocks.md b/packages/markdown/marked/test/new/cm_html_blocks.md
new file mode 100644
index 00000000..0372245f
--- /dev/null
+++ b/packages/markdown/marked/test/new/cm_html_blocks.md
@@ -0,0 +1,312 @@
+HTML blocks
+===================
+
+### Example 116
+
+<table><tr><td>
+<pre>
+**Hello**,
+
+_world_.
+</pre>
+</td></tr></table>
+
+### Example 117
+
+<table>
+  <tr>
+    <td>
+           hi
+    </td>
+  </tr>
+</table>
+
+okay.
+
+### Example 118
+
+ <div>
+  *hello*
+         <foo><a>
+
+### Example 119
+
+</div>
+*foo*
+
+### Example 120
+
+<DIV CLASS="foo">
+
+*Markdown*
+
+</DIV>
+
+### Example 121
+
+<div id="foo"
+  class="bar">
+</div>
+
+### Example 122
+
+<div id="foo" class="bar
+  baz">
+</div>
+
+### Example 123
+
+<div>
+*foo*
+
+*bar*
+
+### Example 124
+
+<div id="foo"
+*hi*
+
+### Example 125
+
+<div class
+foo
+
+### Example 126
+
+<div *???-&&&-<---
+*foo*
+
+### Example 127
+
+<div><a href="bar">*foo*</a></div>
+
+### Example 128
+
+<table><tr><td>
+foo
+</td></tr></table>
+
+### Example 129
+
+<div></div>
+``` c
+int x = 33;
+```
+
+### Example 130
+
+<a href="foo">
+*bar*
+</a>
+
+### Example 131
+
+<Warning>
+*bar*
+</Warning>
+
+### Example 132
+
+<i class="foo">
+*bar*
+</i>
+
+### Example 133
+
+</ins>
+*bar*
+
+### Example 134
+
+<del>
+*foo*
+</del>
+
+### Example 135
+
+<del>
+
+*foo*
+
+</del>
+
+### Example 136
+
+<del>*foo*</del>
+
+### Example 137
+
+<pre language="haskell"><code>
+import Text.HTML.TagSoup
+
+main :: IO ()
+main = print $ parseTags tags
+</code></pre>
+okay
+
+### Example 138
+
+<script type="text/javascript">
+// JavaScript example
+
+document.getElementById("demo").innerHTML = "Hello JavaScript!";
+</script>
+okay
+
+### Example 139
+
+<style
+  type="text/css">
+h1 {color:red;}
+
+p {color:blue;}
+</style>
+okay
+
+### Example 141
+
+> <div>
+> foo
+
+bar
+
+### Example 142
+
+- <div>
+- foo
+
+### Example 143
+
+<style>p{color:red;}</style>
+*foo*
+
+### Example 144
+
+<!-- foo -->*bar*
+*baz*
+
+### Example 145
+
+<script>
+foo
+</script>1. *bar*
+
+### Example 146
+
+<!-- Foo
+
+bar
+   baz -->
+okay
+
+### Example 147
+
+<?php
+
+  echo '>';
+
+?>
+okay
+
+### Example 148
+
+<!DOCTYPE html>
+
+### Example 149
+
+<![CDATA[
+function matchwo(a,b)
+{
+  if (a < b && a < 0) then {
+    return 1;
+
+  } else {
+
+    return 0;
+  }
+}
+]]>
+okay
+
+### Example 150
+
+  <!-- foo -->
+
+    <!-- foo -->
+
+### Example 151
+
+  <div>
+
+    <div>
+
+### Example 152
+
+Foo
+<div>
+bar
+</div>
+
+### Example 153
+
+<div>
+bar
+</div>
+*foo*
+
+### Example 154
+
+Foo
+<a href="bar">
+baz
+
+### Example 155
+
+<div>
+
+*Emphasized* text.
+
+</div>
+
+### Example 156
+
+<div>
+*Emphasized* text.
+</div>
+
+### Example 157
+
+<table>
+
+<tr>
+
+<td>
+Hi
+</td>
+
+</tr>
+
+</table>
+
+### Example 158
+
+<table>
+
+  <tr>
+
+    <td>
+      Hi
+    </td>
+
+  </tr>
+
+</table>
+
+### Example 140
+
+If there is no matching end tag, the block will end at the end of the document (or the enclosing block quote or list item):
+
+<style
+  type="text/css">
+
+foo
\ No newline at end of file
diff --git a/packages/markdown/marked/test/new/cm_link_defs.html b/packages/markdown/marked/test/new/cm_link_defs.html
new file mode 100644
index 00000000..8763ca15
--- /dev/null
+++ b/packages/markdown/marked/test/new/cm_link_defs.html
@@ -0,0 +1,115 @@
+<h3 id="example-159">Example 159</h3>
+
+<p><a href="/url" title="title">foo159</a></p>
+
+<h3 id="example-160">Example 160</h3>
+
+<p><a href="/url" title="the title">foo160</a></p>
+
+<h3 id="example-161">Example 161</h3>
+
+<p><a href="my_(url)" title="title (with parens)">Foo161*bar]</a></p>
+
+<h3 id="example-162">Example 162</h3>
+
+<p><a href="my%20url" title="title">Foo162 bar</a></p>
+
+<h3 id="example-163">Example 163</h3>
+
+<p><a href="/url" title="
+title
+line1
+line2
+">foo163</a></p>
+
+<h3 id="example-164">Example 164</h3>
+
+<p>[foo164]: /url &#39;title</p>
+<p>with blank line&#39;</p>
+<p>[foo164]</p>
+
+<h3 id="example-165">Example 165</h3>
+
+<p><a href="/url">foo165</a></p>
+
+<h3 id="example-166">Example 166</h3>
+
+<p>[foo166]:</p>
+<p>[foo166]</p>
+
+<h3 id="example-167">Example 167</h3>
+
+<pre><code>[foo167]: /url\bar\*baz &quot;foo\&quot;bar\baz&quot;
+
+[foo167]
+
+should render to
+
+&lt;p&gt;&lt;a href=&quot;/url%5Cbar*baz&quot; title=&quot;foo&amp;quot;bar\baz&quot;&gt;foo167&lt;/a&gt;&lt;/p&gt;</code></pre>
+
+<h3 id="example-168">Example 168</h3>
+
+<p><a href="url">foo168</a></p>
+
+<h3 id="example-169">Example 169</h3>
+
+<p><a href="first">foo169</a></p>
+
+<h3 id="example-170">Example 170</h3>
+
+<p><a href="/url">Foo170</a></p>
+
+<h3 id="example-171">Example 171</h3>
+
+<p><a href="/%CF%86%CE%BF%CF%85">αγω</a></p>
+
+<h3 id="example-172">Example 172</h3>
+
+<h3 id="example-173">Example 173</h3>
+
+<p>bar</p>
+
+<h3 id="example-174">Example 174</h3>
+
+<p>[foo174]: /url &quot;title&quot; ok</p>
+
+<h3 id="example-175">Example 175</h3>
+
+<p>&quot;title&quot; ok</p>
+
+<h3 id="example-176">Example 176</h3>
+
+<pre><code>[foo176]: /url &quot;title&quot;
+</code></pre>
+<p>[foo176]</p>
+
+<h3 id="example-177">Example 177</h3>
+
+<pre><code>[foo177]: /url
+</code></pre>
+<p>[foo177]</p>
+
+<h3 id="example-178">Example 178</h3>
+
+<p>Foo
+[bar178]: /baz</p>
+<p>[bar178]</p>
+
+<h3 id="example-179">Example 179</h3>
+
+<h1 id="foo179"><a href="/url">Foo179</a></h1>
+<blockquote>
+<p>bar</p>
+</blockquote>
+
+<h3 id="example-180">Example 180</h3>
+
+<p><a href="/foo-url" title="foo">foo180</a>,
+<a href="/bar-url" title="bar">bar180</a>,
+<a href="/baz-url">baz180</a></p>
+
+<h3 id="example-181">Example 181</h3>
+
+<p><a href="/url">foo181</a></p>
+<blockquote>
+</blockquote>
\ No newline at end of file
diff --git a/packages/markdown/marked/test/new/cm_link_defs.md b/packages/markdown/marked/test/new/cm_link_defs.md
new file mode 100644
index 00000000..74684f21
--- /dev/null
+++ b/packages/markdown/marked/test/new/cm_link_defs.md
@@ -0,0 +1,157 @@
+### Example 159
+
+[foo159]: /url "title"
+
+[foo159]
+
+### Example 160
+
+   [foo160]: 
+      /url  
+           'the title'  
+
+[foo160]
+
+### Example 161
+
+[Foo161*bar\]]:my_(url) 'title (with parens)'
+
+[Foo161*bar\]]
+
+### Example 162
+
+[Foo162 bar]:
+<my%20url>
+'title'
+
+[Foo162 bar]
+
+### Example 163
+
+[foo163]: /url '
+title
+line1
+line2
+'
+
+[foo163]
+
+### Example 164
+
+[foo164]: /url 'title
+
+with blank line'
+
+[foo164]
+
+### Example 165
+
+[foo165]:
+/url
+
+[foo165]
+
+### Example 166
+
+[foo166]:
+
+[foo166]
+
+### Example 167
+
+	[foo167]: /url\bar\*baz "foo\"bar\baz"
+
+	[foo167]
+
+	should render to
+
+	<p><a href="/url%5Cbar*baz" title="foo&quot;bar\baz">foo167</a></p>
+
+### Example 168
+
+[foo168]
+
+[foo168]: url
+
+### Example 169
+
+[foo169]
+
+[foo169]: first
+[foo169]: second
+
+### Example 170
+
+[FOO170]: /url
+
+[Foo170]
+
+### Example 171
+
+[ΑΓΩ]: /φου
+
+[αγω]
+
+### Example 172
+
+[foo172]: /url
+
+### Example 173
+
+[
+foo173
+]: /url
+bar
+
+### Example 174
+
+[foo174]: /url "title" ok
+
+### Example 175
+
+[foo175]: /url
+"title" ok
+
+### Example 176
+
+    [foo176]: /url "title"
+
+[foo176]
+
+### Example 177
+
+```
+[foo177]: /url
+```
+
+[foo177]
+
+### Example 178
+
+Foo
+[bar178]: /baz
+
+[bar178]
+
+### Example 179
+
+# [Foo179]
+[foo179]: /url
+> bar
+
+### Example 180
+
+[foo180]: /foo-url "foo"
+[bar180]: /bar-url
+  "bar"
+[baz180]: /baz-url
+
+[foo180],
+[bar180],
+[baz180]
+
+### Example 181
+
+[foo181]
+
+> [foo181]: /url
\ No newline at end of file
diff --git a/packages/markdown/marked/test/new/cm_links.html b/packages/markdown/marked/test/new/cm_links.html
new file mode 100644
index 00000000..08c65e7c
--- /dev/null
+++ b/packages/markdown/marked/test/new/cm_links.html
@@ -0,0 +1,397 @@
+<h1 id="links">Links</h1>
+
+<h3 id="example-459">Example 459</h3>
+
+<p><a href="/uri" title="title">link</a></p>
+
+<h3 id="example-460">Example 460</h3>
+
+<p><a href="/uri">link</a></p>
+
+<h3 id="example-461">Example 461</h3>
+
+<p><a href="">link</a></p>
+
+<h3 id="example-462">Example 462</h3>
+
+<p><a href="">link</a></p>
+
+<h3 id="example-463">Example 463</h3>
+
+<p>[link](/my uri)</p>
+
+<h3 id="example-464">Example 464</h3>
+
+<p>[link](&lt;/my uri&gt;)</p>
+
+<h3 id="example-465">Example 465</h3>
+
+<p>[link](foo
+bar)</p>
+
+<h3 id="example-466">Example 466</h3>
+
+<p>[link](<foo
+bar>)</p>
+
+<h3 id="example-467">Example 467</h3>
+
+<p><a href="(foo)">link</a></p>
+
+<h3 id="example-4680">Example 4680</h3>
+
+<p>ONE LEVEL of parentheses are allowed without escaping, as long as they are balanced:</p>
+
+<p><a href="foo(bar)">link</a></p>
+
+<h3 id="example-469">Example 469</h3>
+
+<p><a href="foo(and(bar)">link</a></p>
+
+<h3 id="example-470">Example 470</h3>
+
+<p>However, if you have ANY unbalanced parentheses, you need to escape or use the &lt;...&gt; form:</p>
+
+<p><a href="foo(and(bar)">link</a></p>
+
+<h3 id="example-471">Example 471</h3>
+
+<p><a href="foo):">link</a></p>
+
+<h3 id="example-472">Example 472</h3>
+
+<p><a href="#fragment">link</a></p>
+<p><a href="http://example.com#fragment">link</a></p>
+<p><a href="http://example.com?foo=3#frag">link</a></p>
+
+<h3 id="example-473">Example 473</h3>
+
+<p><a href="foo%5Cbar">link</a></p>
+
+<h3 id="example-4740">Example 4740</h3>
+
+<p><a href="foo%20b&auml;">link</a></p>
+
+<h3 id="example-475">Example 475</h3>
+
+<p><a href="%22title%22">link</a></p>
+
+<h3 id="example-476">Example 476</h3>
+
+<p><a href="/url" title="title">link</a>
+<a href="/url" title="title">link</a>
+<a href="/url" title="title">link</a></p>
+
+<h3 id="example-477">Example 477</h3>
+
+<p><a href="/url" title="title &quot;&quot;">link</a></p>
+
+<h3 id="example-479">Example 479</h3>
+
+<p>[link](/url &quot;title &quot;and&quot; title&quot;)</p>
+
+<h3 id="example-480">Example 480</h3>
+
+<p><a href="/url" title="title &quot;and&quot; title">link</a></p>
+
+<h3 id="example-481">Example 481</h3>
+
+<p><a href="/uri" title="title">link</a></p>
+
+<h3 id="example-482">Example 482</h3>
+
+<p>[link] (/uri)</p>
+
+<h3 id="example-4830">Example 4830</h3>
+
+<p>The link text may contain ONE LEVEL of balanced brackets, but not unbalanced ones, unless they are escaped:</p>
+
+<p><a href="/uri">link [foo4830]</a></p>
+
+<h3 id="example-484">Example 484</h3>
+
+<p>[link] bar](/uri)</p>
+
+<h3 id="example-485">Example 485</h3>
+
+<p>[link <a href="/uri">bar</a></p>
+
+<h3 id="example-486">Example 486</h3>
+
+<p><a href="/uri">link [bar</a></p>
+
+<h3 id="example-487">Example 487</h3>
+
+<p><a href="/uri">link <em>foo <strong>bar</strong> <code>#</code></em></a></p>
+
+<h3 id="example-488">Example 488</h3>
+
+<p><a href="/uri"><img src="moon.jpg" alt="moon" /></a></p>
+
+<h3 id="example-493">Example 493</h3>
+
+<p><a href="baz*">foo *bar</a></p>
+
+<h3 id="example-494">Example 494</h3>
+
+<p><em>foo [bar</em> baz]</p>
+
+<h3 id="example-498">Example 498</h3>
+
+<p><a href="/url" title="title">foo</a></p>
+
+<h3 id="example-4990">Example 4990</h3>
+
+<p><a href="/uri">link [foo499]</a></p>
+
+<h3 id="example-500">Example 500</h3>
+
+<p><a href="/uri">link [bar</a></p>
+
+<h3 id="example-501">Example 501</h3>
+
+<p><a href="/uri">link <em>foo <strong>bar</strong> <code>#</code></em></a></p>
+
+<h3 id="example-502">Example 502</h3>
+
+<p><a href="/uri"><img src="moon.jpg" alt="moon" /></a></p>
+
+<h3 id="example-5030">Example 5030</h3>
+
+<p><a href="/uri">foo <a href="/uri">bar</a></a></p>
+
+<h3 id="example-504">Example 504</h3>
+
+<p><a href="/uri">foo <em>bar <a href="/uri">baz</a></em></a></p>
+
+<h3 id="example-506">Example 506</h3>
+
+<p><a href="/uri">foo *bar</a></p>
+
+<h3 id="example-510">Example 510</h3>
+
+<p><a href="/url" title="title">foo</a></p>
+
+<h3 id="example-511">Example 511</h3>
+
+<p><a href="/url">Толпой</a> is a Russian word.</p>
+
+<h3 id="example-512">Example 512</h3>
+
+<p><a href="/url">Baz</a></p>
+
+<h3 id="example-513">Example 513</h3>
+
+<p>[foo513] <a href="/url" title="title">bar513</a></p>
+
+<h3 id="example-514">Example 514</h3>
+
+<p>[foo514]
+<a href="/url" title="title">bar514</a></p>
+
+<h3 id="example-515">Example 515</h3>
+
+<p><a href="/url1">bar</a></p>
+
+<h3 id="example-516">Example 516</h3>
+
+<p>[bar][foo!516]</p>
+
+<h3 id="example-517">Example 517</h3>
+
+<p>[foo517][ref[517]</p>
+<p>[ref[517]: /uri</p>
+
+<h3 id="example-518">Example 518</h3>
+
+<p>[foo518][ref[bar518]518]</p>
+<p>[ref[bar518]518]: /uri</p>
+
+<h3 id="example-519">Example 519</h3>
+
+<p>[[[foo519]]]</p>
+<p>[[[foo519]]]: /url</p>
+
+<h3 id="example-520">Example 520</h3>
+
+<p><a href="/uri">foo</a></p>
+
+<h3 id="example-521">Example 521</h3>
+
+<p><a href="/uri">bar\</a></p>
+
+<h3 id="example-522">Example 522</h3>
+
+<p>[]</p>
+<p>[]: /uri</p>
+
+<h3 id="example-523">Example 523</h3>
+
+<p>[
+ ]</p>
+<p>[
+ ]: /uri</p>
+
+<h3 id="example-524">Example 524</h3>
+
+<p><a href="/url" title="title">foo</a></p>
+
+<h3 id="example-525">Example 525</h3>
+
+<p><a href="/url" title="title"><em>foo</em> bar</a></p>
+
+<h3 id="example-526">Example 526</h3>
+
+<p><a href="/url" title="title">Foo</a></p>
+
+<h3 id="example-527">Example 527</h3>
+
+<p><a href="/url" title="title">foo</a>
+[]</p>
+
+<h3 id="example-528">Example 528</h3>
+
+<p><a href="/url" title="title">foo</a></p>
+
+<h3 id="example-529">Example 529</h3>
+
+<p><a href="/url" title="title"><em>foo</em> bar</a></p>
+
+<h3 id="example-530">Example 530</h3>
+
+<p>[<a href="/url" title="title"><em>foo</em> bar</a>]</p>
+
+<h3 id="example-531">Example 531</h3>
+
+<p>[[bar <a href="/url">foo531</a></p>
+
+<h3 id="example-532">Example 532</h3>
+
+<p><a href="/url" title="title">Foo</a></p>
+
+<h3 id="example-533">Example 533</h3>
+
+<p><a href="/url">foo533</a> bar</p>
+
+<h3 id="example-534">Example 534</h3>
+
+<p>[foo]</p>
+
+<h3 id="example-536">Example 536</h3>
+
+<p><a href="/url2">foo536</a></p>
+
+<h3 id="example-537">Example 537</h3>
+
+<p><a href="/url1">foo537</a></p>
+
+<h3 id="example-538">Example 538</h3>
+
+<p><a href="">foo538</a></p>
+
+<h3 id="example-539">Example 539</h3>
+
+<p><a href="/url1">foo539</a>(not a link)</p>
+
+<h3 id="example-540">Example 540</h3>
+
+<p>[foo540]<a href="/url">bar540</a></p>
+
+<h3 id="example-541">Example 541</h3>
+
+<p><a href="/url2">foo541</a><a href="/url1">baz541</a></p>
+
+<h3 id="example-542">Example 542</h3>
+
+<p>[foo542]<a href="/url1">bar542</a></p>
+
+<h3 id="example-543">Example 543</h3>
+
+<p><img src="/url" alt="foo543" title="title" /></p>
+
+<h3 id="example-5440">Example 5440</h3>
+
+<p><img src="train.jpg" alt="foo *bar*544" title="train &amp; tracks" /></p>
+
+<h3 id="example-5450">Example 5450</h3>
+
+<p><img src="/url2" alt="foo ![bar](/url)" /></p>
+
+<h3 id="example-5460">Example 5460</h3>
+
+<p><img src="/url2" alt="foo [bar](/url)" /></p>
+
+<h3 id="example-5470">Example 5470</h3>
+
+<p><img src="train.jpg" alt="foo *bar*547" title="train &amp; tracks" /></p>
+
+<h3 id="example-5480">Example 5480</h3>
+
+<p><img src="train.jpg" alt="foo *bar*" title="train &amp; tracks" /></p>
+
+<h3 id="example-549">Example 549</h3>
+
+<p><img src="train.jpg" alt="foo" /></p>
+
+<h3 id="example-550">Example 550</h3>
+
+<p>My <img src="/path/to/train.jpg" alt="foo bar" title="title" /></p>
+
+<h3 id="example-551">Example 551</h3>
+
+<p><img src="url" alt="foo" /></p>
+
+<h3 id="example-552">Example 552</h3>
+
+<p><img src="/url" alt="" /></p>
+
+<h3 id="example-553">Example 553</h3>
+
+<p><img src="/url" alt="foo" /></p>
+
+<h3 id="example-554">Example 554</h3>
+
+<p><img src="/url" alt="foo" /></p>
+
+<h3 id="example-555">Example 555</h3>
+
+<p><img src="/url" alt="foo" title="title" /></p>
+
+<h3 id="example-5560">Example 5560</h3>
+
+<p><img src="/url" alt="*foo* bar" title="title" /></p>
+
+<h3 id="example-557">Example 557</h3>
+
+<p><img src="/url" alt="Foo" title="title" /></p>
+
+<h3 id="example-558">Example 558</h3>
+
+<p><img src="/url" alt="foo" title="title" />
+[]</p>
+
+<h3 id="example-559">Example 559</h3>
+
+<p><img src="/url" alt="foo" title="title" /></p>
+
+<h3 id="example-5600">Example 5600</h3>
+
+<p><img src="/url" alt="*foo* bar" title="title" /></p>
+
+<h3 id="example-561">Example 561</h3>
+
+<p>![[foo561]]</p>
+<p>[[foo561]]: /url &quot;title&quot;</p>
+
+<h3 id="example-562">Example 562</h3>
+
+<p><img src="/url" alt="Foo" title="title" /></p>
+
+<h3 id="example-563">Example 563</h3>
+
+<p>![foo]</p>
+
+<h3 id="example-564">Example 564</h3>
+
+<p>!<a href="/url" title="title">foo</a></p>
+
diff --git a/packages/markdown/marked/test/new/cm_links.md b/packages/markdown/marked/test/new/cm_links.md
new file mode 100644
index 00000000..11e90144
--- /dev/null
+++ b/packages/markdown/marked/test/new/cm_links.md
@@ -0,0 +1,515 @@
+---
+xhtml: true
+---
+
+Links
+===================
+
+### Example 459
+
+[link](/uri "title")
+
+### Example 460
+
+[link](/uri)
+
+### Example 461
+
+[link]()
+
+### Example 462
+
+[link](<>)
+
+### Example 463
+
+[link](/my uri)
+
+### Example 464
+
+[link](</my uri>)
+
+### Example 465
+
+[link](foo
+bar)
+
+### Example 466
+
+[link](<foo
+bar>)
+
+### Example 467
+
+[link](\(foo\))
+
+### Example 4680
+
+ONE LEVEL of parentheses are allowed without escaping, as long as they are balanced:
+
+[link](foo(bar))
+
+### Example 469
+
+[link](foo\(and\(bar\))
+
+### Example 470
+
+However, if you have ANY unbalanced parentheses, you need to escape or use the <...> form:
+
+[link](<foo(and(bar)>)
+
+### Example 471
+
+[link](foo\)\:)
+
+### Example 472
+
+[link](#fragment)
+
+[link](http://example.com#fragment)
+
+[link](http://example.com?foo=3#frag)
+
+### Example 473
+
+[link](foo\bar)
+
+### Example 4740
+
+[link](foo%20b&auml;)
+
+### Example 475
+
+[link]("title")
+
+### Example 476
+
+[link](/url "title")
+[link](/url 'title')
+[link](/url (title))
+
+### Example 477
+
+[link](/url "title \"&quot;")
+
+### Example 479
+
+[link](/url "title "and" title")
+
+### Example 480
+
+[link](/url 'title "and" title')
+
+### Example 481
+
+[link](   /uri
+  "title"  )
+
+### Example 482
+
+[link] (/uri)
+
+### Example 4830
+
+The link text may contain ONE LEVEL of balanced brackets, but not unbalanced ones, unless they are escaped:
+
+[link [foo4830]](/uri)
+
+### Example 484
+
+[link] bar](/uri)
+
+### Example 485
+
+[link [bar](/uri)
+
+### Example 486
+
+[link \[bar](/uri)
+
+### Example 487
+
+[link *foo **bar** `#`*](/uri)
+
+### Example 488
+
+[![moon](moon.jpg)](/uri)
+
+### Example 493
+
+[foo *bar](baz*)
+
+### Example 494
+
+*foo [bar* baz]
+
+### Example 498
+
+[foo][bar]
+
+[bar]: /url "title"
+
+### Example 4990
+
+[link [foo499]][ref499]
+
+[ref499]: /uri
+
+### Example 500
+
+[link \[bar][ref]
+
+[ref]: /uri
+
+### Example 501
+
+[link *foo **bar** `#`*][ref]
+
+[ref]: /uri
+
+### Example 502
+
+[![moon](moon.jpg)][ref]
+
+[ref]: /uri
+
+### Example 5030
+
+[foo [bar](/uri)][ref503]
+
+[ref503]: /uri
+
+### Example 504
+
+[foo *bar [baz][ref504]*][ref504]
+
+[ref504]: /uri
+
+### Example 506
+
+[foo *bar][ref]
+
+[ref]: /uri
+
+### Example 510
+
+[foo][BaR]
+
+[bar]: /url "title"
+
+### Example 511
+
+[Толпой][Толпой] is a Russian word.
+
+[ТОЛПОЙ]: /url
+
+### Example 512
+
+[Foo
+  bar]: /url
+
+[Baz][Foo bar]
+
+### Example 513
+
+[foo513] [bar513]
+
+[bar513]: /url "title"
+
+### Example 514
+
+[foo514]
+[bar514]
+
+[bar514]: /url "title"
+
+### Example 515
+
+[foo515]: /url1
+
+[foo515]: /url2
+
+[bar][foo515]
+
+### Example 516
+
+[bar][foo\!516]
+
+[foo!516]: /url
+
+### Example 517
+
+[foo517][ref[517]
+
+[ref[517]: /uri
+
+### Example 518
+
+[foo518][ref[bar518]518]
+
+[ref[bar518]518]: /uri
+
+### Example 519
+
+[[[foo519]]]
+
+[[[foo519]]]: /url
+
+### Example 520
+
+[foo][ref\[]
+
+[ref\[]: /uri
+
+### Example 521
+
+[bar\\]: /uri
+
+[bar\\]
+
+### Example 522
+
+[]
+
+[]: /uri
+
+### Example 523
+
+[
+ ]
+
+[
+ ]: /uri
+
+### Example 524
+
+[foo][]
+
+[foo]: /url "title"
+
+### Example 525
+
+[*foo* bar][]
+
+[*foo* bar]: /url "title"
+
+### Example 526
+
+[Foo][]
+
+[foo]: /url "title"
+
+### Example 527
+
+[foo] 
+[]
+
+[foo]: /url "title"
+
+### Example 528
+
+[foo]
+
+[foo]: /url "title"
+
+### Example 529
+
+[*foo* bar]
+
+[*foo* bar]: /url "title"
+
+### Example 530
+
+[[*foo* bar]]
+
+[*foo* bar]: /url "title"
+
+### Example 531
+
+[[bar [foo531]
+
+[foo531]: /url
+
+### Example 532
+
+[Foo]
+
+[foo]: /url "title"
+
+### Example 533
+
+[foo533] bar
+
+[foo533]: /url
+
+### Example 534
+
+\[foo]
+
+[foo534]: /url "title"
+
+### Example 536
+
+[foo536][bar536]
+
+[foo536]: /url1
+[bar536]: /url2
+
+### Example 537
+
+[foo537][]
+
+[foo537]: /url1
+
+### Example 538
+
+[foo538]()
+
+[foo538]: /url1
+
+### Example 539
+
+[foo539](not a link)
+
+[foo539]: /url1
+
+### Example 540
+
+[foo540][bar540][baz540]
+
+[baz540]: /url
+
+### Example 541
+
+[foo541][bar541][baz541]
+
+[baz541]: /url1
+[bar541]: /url2
+
+### Example 542
+
+[foo542][bar542][baz542]
+
+[baz542]: /url1
+[foo542]: /url2
+
+### Example 543
+
+![foo543](/url "title")
+
+### Example 5440
+
+![foo *bar*544]
+
+[foo *bar*544]: train.jpg "train & tracks"
+
+### Example 5450
+
+![foo ![bar](/url)](/url2)
+
+### Example 5460
+
+![foo [bar](/url)](/url2)
+
+### Example 5470
+
+![foo *bar*547][]
+
+[foo *bar*547]: train.jpg "train & tracks"
+
+### Example 5480
+
+![foo *bar*][foobar548]
+
+[FOOBAR548]: train.jpg "train & tracks"
+
+### Example 549
+
+![foo](train.jpg)
+
+### Example 550
+
+My ![foo bar](/path/to/train.jpg  "title"   )
+
+### Example 551
+
+![foo](<url>)
+
+### Example 552
+
+![](/url)
+
+### Example 553
+
+![foo][bar553]
+
+[bar553]: /url
+
+### Example 554
+
+![foo][bar554]
+
+[BAR554]: /url
+
+### Example 555
+
+![foo][]
+
+[foo]: /url "title"
+
+### Example 5560
+
+![*foo* bar][]
+
+[*foo* bar]: /url "title"
+
+### Example 557
+
+![Foo][]
+
+[foo]: /url "title"
+
+### Example 558
+
+![foo] 
+[]
+
+[foo]: /url "title"
+
+### Example 559
+
+![foo]
+
+[foo]: /url "title"
+
+### Example 5600
+
+![*foo* bar]
+
+[*foo* bar]: /url "title"
+
+### Example 561
+
+![[foo561]]
+
+[[foo561]]: /url "title"
+
+### Example 562
+
+![Foo]
+
+[foo]: /url "title"
+
+### Example 563
+
+!\[foo]
+
+[foo]: /url "title"
+
+### Example 564
+
+\![foo]
+
+[foo]: /url "title"
+
diff --git a/packages/markdown/marked/test/new/cm_raw_html.html b/packages/markdown/marked/test/new/cm_raw_html.html
new file mode 100644
index 00000000..f3da050e
--- /dev/null
+++ b/packages/markdown/marked/test/new/cm_raw_html.html
@@ -0,0 +1,77 @@
+<h1 id="raw-html">Raw HTML</h1>
+
+<h3 id="example-584">Example 584</h3>
+
+<p><a><bab><c2c></p>
+
+<h3 id="example-585">Example 585</h3>
+
+<p><a/><b2/></p>
+
+<h3 id="example-586">Example 586</h3>
+
+<p><a  /><b2
+data="foo" ></p>
+
+<h3 id="example-587">Example 587</h3>
+
+<p><a foo="bar" bam = 'baz <em>"</em>'
+_boolean zoop:33=zoop:33 /></p>
+
+<h3 id="example-588">Example 588</h3>
+
+<p>Foo <responsive-image src="foo.jpg" /></p>
+
+<h3 id="example-589">Example 589</h3>
+
+<p>&lt;33&gt; &lt;__&gt;</p>
+
+<h3 id="example-590">Example 590</h3>
+
+<p>&lt;a h*#ref=&quot;hi&quot;&gt;</p>
+
+<h3 id="example-591">Example 591</h3>
+
+<p>&lt;a href=&quot;hi&#39;&gt; &lt;a href=hi&#39;&gt;</p>
+
+<h3 id="example-592">Example 592</h3>
+
+<p>&lt; a&gt;&lt;
+foo&gt;&lt;bar/ &gt;</p>
+
+<h3 id="example-593">Example 593</h3>
+
+<p>&lt;a href=&#39;bar&#39;title=title&gt;</p>
+
+<h3 id="example-594">Example 594</h3>
+
+<p></a></foo ></p>
+
+<h3 id="example-595">Example 595</h3>
+
+<p>&lt;/a href=&quot;foo&quot;&gt;</p>
+
+<h3 id="example-596">Example 596</h3>
+
+<p>foo <!-- this is a
+comment - with hyphen --></p>
+
+<h3 id="example-599">Example 599</h3>
+
+<p>foo <?php echo $a; ?></p>
+
+<h3 id="example-600">Example 600</h3>
+
+<p>foo <!ELEMENT br EMPTY></p>
+
+<h3 id="example-601">Example 601</h3>
+
+<p>foo <![CDATA[>&<]]></p>
+
+<h3 id="example-602">Example 602</h3>
+
+<p>foo <a href="&ouml;"></p>
+
+<h3 id="example-603">Example 603</h3>
+
+<p>foo <a href="\*"></p>
diff --git a/packages/markdown/marked/test/new/cm_raw_html.md b/packages/markdown/marked/test/new/cm_raw_html.md
new file mode 100644
index 00000000..becbb8a6
--- /dev/null
+++ b/packages/markdown/marked/test/new/cm_raw_html.md
@@ -0,0 +1,78 @@
+Raw HTML
+===================
+
+### Example 584
+
+<a><bab><c2c>
+
+### Example 585
+
+<a/><b2/>
+
+### Example 586
+
+<a  /><b2
+data="foo" >
+
+### Example 587
+
+<a foo="bar" bam = 'baz <em>"</em>'
+_boolean zoop:33=zoop:33 />
+
+### Example 588
+
+Foo <responsive-image src="foo.jpg" />
+
+### Example 589
+
+<33> <__>
+
+### Example 590
+
+<a h*#ref="hi">
+
+### Example 591
+
+<a href="hi'> <a href=hi'>
+
+### Example 592
+
+< a><
+foo><bar/ >
+
+### Example 593
+
+<a href='bar'title=title>
+
+### Example 594
+
+</a></foo >
+
+### Example 595
+
+</a href="foo">
+
+### Example 596
+
+foo <!-- this is a
+comment - with hyphen -->
+
+### Example 599
+
+foo <?php echo $a; ?>
+
+### Example 600
+
+foo <!ELEMENT br EMPTY>
+
+### Example 601
+
+foo <![CDATA[>&<]]>
+
+### Example 602
+
+foo <a href="&ouml;">
+
+### Example 603
+
+foo <a href="\*">
diff --git a/packages/markdown/marked/test/new/cm_strong_and_em.html b/packages/markdown/marked/test/new/cm_strong_and_em.html
new file mode 100644
index 00000000..084f6381
--- /dev/null
+++ b/packages/markdown/marked/test/new/cm_strong_and_em.html
@@ -0,0 +1,7 @@
+<p>So <em>a</em> single <em>word</em> followed <em>b</em>y <em>a</em>nother</p>
+
+<p>So <strong>a</strong> single <strong>word</strong> followed <strong>b</strong>y <strong>a</strong>nother</p>
+
+<p>So <em>a</em> single <em>word</em> followed <em>b</em>y <em>a</em>nother</p>
+
+<p>So <strong>a</strong> single <strong>word</strong> followed <strong>b</strong>y <strong>a</strong>nother</p>
diff --git a/packages/markdown/marked/test/new/cm_strong_and_em.md b/packages/markdown/marked/test/new/cm_strong_and_em.md
new file mode 100644
index 00000000..34b4a20b
--- /dev/null
+++ b/packages/markdown/marked/test/new/cm_strong_and_em.md
@@ -0,0 +1,7 @@
+So *a* single *word* followed *b*y *a*nother
+
+So **a** single **word** followed **b**y **a**nother
+
+So _a_ single _word_ followed _b_y _a_nother
+
+So __a__ single __word__ followed __b__y __a__nother
diff --git a/packages/markdown/marked/test/new/cm_thematic_breaks.html b/packages/markdown/marked/test/new/cm_thematic_breaks.html
new file mode 100644
index 00000000..ec3f9f74
--- /dev/null
+++ b/packages/markdown/marked/test/new/cm_thematic_breaks.html
@@ -0,0 +1,106 @@
+<h1 id="thematic-breaks">Thematic breaks</h1>
+
+<h3 id="example-13">Example 13</h3>
+
+<hr>
+<hr>
+<hr>
+
+<h3 id="example-14">Example 14</h3>
+
+<p>+++</p>
+
+<h3 id="example-15">Example 15</h3>
+
+<p>===</p>
+
+<h3 id="example-16">Example 16</h3>
+
+<p>--
+**
+__</p>
+
+<h3 id="example-17">Example 17</h3>
+
+<hr>
+<hr>
+<hr>
+
+<h3 id="example-18">Example 18</h3>
+
+<pre><code>***
+</code></pre>
+
+<h3 id="example-19">Example 19</h3>
+
+<p>Foo
+    ***</p>
+
+<h3 id="example-20">Example 20</h3>
+
+<hr>
+
+<h3 id="example-21">Example 21</h3>
+
+<hr>
+
+<h3 id="example-22">Example 22</h3>
+
+<hr>
+
+<h3 id="example-23">Example 23</h3>
+
+<hr>
+
+<h3 id="example-24">Example 24</h3>
+
+<hr>
+
+<h3 id="example-25">Example 25</h3>
+
+<p>_ _ _ _ a</p>
+<p>a------</p>
+<p>---a---</p>
+
+
+<h3 id="example-26">Example 26</h3>
+
+<p> <em>-</em></p>
+
+<h3 id="example-27">Example 27</h3>
+
+<ul>
+<li>foo</li>
+</ul>
+<hr>
+<ul>
+<li>bar</li>
+</ul>
+
+<h3 id="example-28">Example 28</h3>
+
+<p>Foo</p>
+<hr>
+<p>bar</p>
+
+<h3 id="example-29">Example 29</h3>
+
+<h2 id="foo">Foo</h2>
+<p>bar</p>
+
+<h3 id="example-30">Example 30</h3>
+
+<ul>
+<li>Foo</li>
+</ul>
+<hr>
+<ul>
+<li>Bar</li>
+</ul>
+
+<h3 id="example-31">Example 31</h3>
+
+<ul>
+<li>Foo</li>
+<li><hr></li>
+</ul>
\ No newline at end of file
diff --git a/packages/markdown/marked/test/new/cm_thematic_breaks.md b/packages/markdown/marked/test/new/cm_thematic_breaks.md
new file mode 100644
index 00000000..af28f8dd
--- /dev/null
+++ b/packages/markdown/marked/test/new/cm_thematic_breaks.md
@@ -0,0 +1,98 @@
+Thematic breaks
+===================
+
+### Example 13
+
+***
+---
+___
+
+### Example 14
+
++++
+
+### Example 15
+
+===
+
+### Example 16
+
+--
+**
+__
+
+### Example 17
+
+ ***
+  ***
+   ***
+
+### Example 18
+
+    ***
+
+### Example 19
+
+Foo
+    ***
+
+### Example 20
+
+_____________________________________
+
+### Example 21
+
+ - - -
+
+### Example 22
+
+ **  * ** * ** * **
+
+### Example 23
+
+-     -      -      -
+
+### Example 24
+
+- - - -    
+
+### Example 25
+
+_ _ _ _ a
+
+a------
+
+---a---
+
+### Example 26
+
+ *-*
+
+### Example 27
+
+- foo
+***
+- bar
+
+### Example 28
+
+Foo
+***
+bar
+
+### Example 29
+
+Foo
+---
+bar
+
+### Example 30
+
+* Foo
+* * *
+* Bar
+
+### Example 31
+
+- Foo
+- * * *
diff --git a/packages/markdown/marked/test/new/code_spans.html b/packages/markdown/marked/test/new/code_spans.html
new file mode 100644
index 00000000..ca220d80
--- /dev/null
+++ b/packages/markdown/marked/test/new/code_spans.html
@@ -0,0 +1,3 @@
+<p><code>someone@example.com</code></p>
+
+<p>``<em>test`</em></p>
\ No newline at end of file
diff --git a/packages/markdown/marked/test/new/code_spans.md b/packages/markdown/marked/test/new/code_spans.md
new file mode 100644
index 00000000..845a116a
--- /dev/null
+++ b/packages/markdown/marked/test/new/code_spans.md
@@ -0,0 +1,3 @@
+`someone@example.com`
+
+``*test`*
\ No newline at end of file
diff --git a/packages/markdown/marked/test/new/def_blocks.html b/packages/markdown/marked/test/new/def_blocks.html
new file mode 100644
index 00000000..5d8de49c
--- /dev/null
+++ b/packages/markdown/marked/test/new/def_blocks.html
@@ -0,0 +1,30 @@
+<blockquote>
+  <p>hello
+[1]: hello</p>
+</blockquote>
+
+<hr>
+
+<blockquote>
+  <p>hello
+[2]: hello</p>
+</blockquote>
+
+
+<ul>
+<li>hello</li>
+<li>[3]: hello</li>
+</ul>
+
+
+<ul>
+<li>hello</li>
+</ul>
+
+
+<blockquote>
+  <p>foo
+bar
+[5]: foo
+bar</p>
+</blockquote>
diff --git a/packages/markdown/marked/test/new/def_blocks.md b/packages/markdown/marked/test/new/def_blocks.md
new file mode 100644
index 00000000..f58fa4d3
--- /dev/null
+++ b/packages/markdown/marked/test/new/def_blocks.md
@@ -0,0 +1,21 @@
+> hello
+> [1]: hello
+
+* * *
+
+> hello
+[2]: hello
+
+
+* hello
+* [3]: hello
+
+
+* hello
+[4]: hello
+
+
+> foo
+> bar
+[5]: foo
+> bar
diff --git a/packages/markdown/marked/test/new/double_link.html b/packages/markdown/marked/test/new/double_link.html
new file mode 100644
index 00000000..ff68395a
--- /dev/null
+++ b/packages/markdown/marked/test/new/double_link.html
@@ -0,0 +1,5 @@
+<p>Already linked: <a href="http://example.com/">http://example.com/</a>.</p>
+
+<p>Already linked: <a href="http://example.com/">http://example.com/</a>.</p>
+
+<p>Already linked: <a href="http://example.com/"><strong>http://example.com/</strong></a>.</p>
diff --git a/packages/markdown/marked/test/new/double_link.md b/packages/markdown/marked/test/new/double_link.md
new file mode 100644
index 00000000..50216736
--- /dev/null
+++ b/packages/markdown/marked/test/new/double_link.md
@@ -0,0 +1,5 @@
+<p>Already linked: <a href="http://example.com/">http://example.com/</a>.</p>
+
+Already linked: [http://example.com/](http://example.com/).
+
+Already linked: <a href="http://example.com/">**http://example.com/**</a>.
diff --git a/packages/markdown/marked/test/new/em_2char.html b/packages/markdown/marked/test/new/em_2char.html
new file mode 100644
index 00000000..81da0a00
--- /dev/null
+++ b/packages/markdown/marked/test/new/em_2char.html
@@ -0,0 +1,25 @@
+<p><em>123</em></p>
+
+<p><em>123</em></p>
+
+<p><em>12</em></p>
+
+<p><em>12</em></p>
+
+<p><em>1</em></p>
+
+<p><em>1</em></p>
+
+<p>__</p>
+
+<p>**</p>
+
+<p>_123 _</p>
+
+<p>*123 *</p>
+
+<p>_ 123_</p>
+
+<p><em>1_</em></p>
+
+<p><em>1*</em></p>
diff --git a/packages/markdown/marked/test/new/em_2char.md b/packages/markdown/marked/test/new/em_2char.md
new file mode 100644
index 00000000..ca8689aa
--- /dev/null
+++ b/packages/markdown/marked/test/new/em_2char.md
@@ -0,0 +1,25 @@
+_123_
+
+*123*
+
+_12_
+
+*12*
+
+_1_
+
+*1*
+
+__
+
+**
+
+_123 _
+
+*123 *
+
+_ 123_
+
+_1__
+
+*1**
diff --git a/packages/markdown/marked/test/new/emphasis_extra tests.html b/packages/markdown/marked/test/new/emphasis_extra tests.html
new file mode 100644
index 00000000..0e2609cd
--- /dev/null
+++ b/packages/markdown/marked/test/new/emphasis_extra tests.html
@@ -0,0 +1 @@
+<p><em>test</em>. <em>test</em>: <em>test</em>! <em>test</em>? <em>test</em>-</p>
\ No newline at end of file
diff --git a/packages/markdown/marked/test/new/emphasis_extra tests.md b/packages/markdown/marked/test/new/emphasis_extra tests.md
new file mode 100644
index 00000000..bf8afdc7
--- /dev/null
+++ b/packages/markdown/marked/test/new/emphasis_extra tests.md
@@ -0,0 +1 @@
+_test_. _test_: _test_! _test_? _test_-
\ No newline at end of file
diff --git a/packages/markdown/marked/test/new/escaped_angles.html b/packages/markdown/marked/test/new/escaped_angles.html
new file mode 100644
index 00000000..aa3e73a4
--- /dev/null
+++ b/packages/markdown/marked/test/new/escaped_angles.html
@@ -0,0 +1 @@
+<p>&gt;</p>
diff --git a/packages/markdown/marked/test/new/escaped_angles.md b/packages/markdown/marked/test/new/escaped_angles.md
new file mode 100644
index 00000000..db7422f1
--- /dev/null
+++ b/packages/markdown/marked/test/new/escaped_angles.md
@@ -0,0 +1 @@
+\>
diff --git a/packages/markdown/marked/test/new/gfm_autolinks.html b/packages/markdown/marked/test/new/gfm_autolinks.html
new file mode 100644
index 00000000..9058f2f2
--- /dev/null
+++ b/packages/markdown/marked/test/new/gfm_autolinks.html
@@ -0,0 +1,83 @@
+<p>link with . <a href="http://example.com/hello-world">http://example.com/hello-world</a>.</p>
+
+<p>link with ! <a href="http://example.com/hello-world">http://example.com/hello-world</a>!</p>
+
+<p>link with : <a href="http://example.com/hello-world">http://example.com/hello-world</a>:</p>
+
+<p>link with , <a href="http://example.com/hello-world">http://example.com/hello-world</a>,</p>
+
+<p>link with ; <a href="http://example.com/hello-world">http://example.com/hello-world</a>;</p>
+
+<p>link with ) <a href="http://example.com/hello-world">http://example.com/hello-world</a>)</p>
+
+<p>link with nothing <a href="http://example.com/hello-world">http://example.com/hello-world</a></p>
+
+<h3 id="example-597">Example 597</h3>
+
+<p>The scheme http will be inserted automatically:</p>
+
+<p><a href="http://www.commonmark.org">www.commonmark.org</a></p>
+<h3 id="example-598">Example 598</h3>
+
+<p>After a valid domain, zero or more non-space non-&lt; characters may follow:</p>
+
+<p>Visit <a href="http://www.commonmark.org/help">www.commonmark.org/help</a> for more information.</p>
+
+<h3 id="example-599">Example 599</h3>
+
+<p>Trailing punctuation (specifically, ?, !, ., ,, :, *, _, and ~) will not be considered part of the autolink, though they may be included in the interior of the link:</p>
+
+<p>Visit <a href="http://www.commonmark.org">www.commonmark.org</a>.</p>
+
+<p>Visit <a href="http://www.commonmark.org/a.b">www.commonmark.org/a.b</a>.</p>
+
+<h3 id="example-600">Example 600</h3>
+
+<p><a href="http://www.google.com/search?q=Markup+(business)">www.google.com/search?q=Markup+(business)</a></p>
+
+<p>(<a href="http://www.google.com/search?q=Markup+(business)">www.google.com/search?q=Markup+(business)</a>)</p>
+
+<h3 id="example-601">Example 601</h3>
+
+<p><a href="http://www.google.com/search?q=(business))+ok">www.google.com/search?q=(business))+ok</a></p>
+
+<h3 id="example-602">Example 602</h3>
+
+<p><a href="http://www.google.com/search?q=commonmark&amp;hl=en">www.google.com/search?q=commonmark&amp;hl=en</a></p>
+
+<p><a href="http://www.google.com/search?q=commonmark">www.google.com/search?q=commonmark</a>&amp;</p>
+
+<h3 id="example-603">Example 603</h3>
+
+<p>&lt; immediately ends an autolink.</p>
+
+<p><a href="http://www.commonmark.org/he">www.commonmark.org/he</a>&lt;lp</p>
+
+<h3 id="example-604">Example 604</h3>
+
+<p><a href="http://commonmark.org">http://commonmark.org</a></p>
+
+<p>(Visit <a href="https://encrypted.google.com/search?q=Markup+(business)">https://encrypted.google.com/search?q=Markup+(business)</a>)</p>
+
+<p>Anonymous FTP is available at <a href="ftp://foo.bar.baz">ftp://foo.bar.baz</a>.</p>
+
+<p>Extended email autolinks:</p>
+
+<h3 id="example-605">Example 605</h3>
+
+<p><a href="mailto:foo@bar.baz">foo@bar.baz</a></p>
+
+<h3 id="example-606">Example 606</h3>
+
+<p>hello@mail+xyz.example isn&#39;t valid, but <a href="mailto:hello+xyz@mail.example">hello+xyz@mail.example</a> is.</p>
+
+<h3 id="example-607">Example 607</h3>
+
+<p><a href="mailto:a.b-c_d@a.b">a.b-c_d@a.b</a></p>
+
+<p><a href="mailto:a.b-c_d@a.b">a.b-c_d@a.b</a>.</p>
+
+<p>a.b-c_d@a.b-</p>
+
+<pre><code>a.b-c_d@a.b_
+</code></pre>
\ No newline at end of file
diff --git a/packages/markdown/marked/test/new/gfm_autolinks.md b/packages/markdown/marked/test/new/gfm_autolinks.md
new file mode 100644
index 00000000..86b9a3ee
--- /dev/null
+++ b/packages/markdown/marked/test/new/gfm_autolinks.md
@@ -0,0 +1,83 @@
+link with . http://example.com/hello-world.
+
+link with ! http://example.com/hello-world!
+
+link with : http://example.com/hello-world:
+
+link with , http://example.com/hello-world,
+
+link with ; http://example.com/hello-world;
+
+link with ) http://example.com/hello-world)
+
+link with nothing http://example.com/hello-world
+
+### Example 597
+
+The scheme http will be inserted automatically:
+
+www.commonmark.org
+
+### Example 598
+
+After a valid domain, zero or more non-space non-< characters may follow:
+
+Visit www.commonmark.org/help for more information.
+
+### Example 599
+
+Trailing punctuation (specifically, ?, !, ., ,, :, \*, \_, and ~) will not be considered part of the autolink, though they may be included in the interior of the link:
+
+Visit www.commonmark.org.
+
+Visit www.commonmark.org/a.b.
+
+### Example 600
+
+www.google.com/search?q=Markup+(business)
+
+(www.google.com/search?q=Markup+(business))
+
+### Example 601
+
+www.google.com/search?q=(business))+ok
+
+### Example 602
+
+www.google.com/search?q=commonmark&hl=en
+
+www.google.com/search?q=commonmark&amp;
+
+### Example 603
+
+< immediately ends an autolink.
+
+www.commonmark.org/he<lp
+
+### Example 604
+
+http://commonmark.org
+
+(Visit https://encrypted.google.com/search?q=Markup+(business))
+
+Anonymous FTP is available at ftp://foo.bar.baz.
+
+Extended email autolinks:
+
+### Example 605
+
+foo@bar.baz
+
+### Example 606
+
+hello@mail+xyz.example isn't valid, but hello+xyz@mail.example is.
+
+### Example 607
+
+a.b-c_d@a.b
+
+a.b-c_d@a.b.
+
+a.b-c_d@a.b-
+
+    a.b-c_d@a.b_
diff --git a/packages/markdown/marked/test/new/gfm_break.html b/packages/markdown/marked/test/new/gfm_break.html
new file mode 100644
index 00000000..398ba018
--- /dev/null
+++ b/packages/markdown/marked/test/new/gfm_break.html
@@ -0,0 +1 @@
+<p>Look at the<br>pretty line<br>breaks.</p>
diff --git a/packages/markdown/marked/test/new/gfm_break.md b/packages/markdown/marked/test/new/gfm_break.md
new file mode 100644
index 00000000..5bf79a2b
--- /dev/null
+++ b/packages/markdown/marked/test/new/gfm_break.md
@@ -0,0 +1,6 @@
+---
+breaks: true
+---
+Look at the
+pretty line
+breaks.
diff --git a/packages/markdown/marked/test/new/gfm_code.html b/packages/markdown/marked/test/new/gfm_code.html
new file mode 100644
index 00000000..3e6b946f
--- /dev/null
+++ b/packages/markdown/marked/test/new/gfm_code.html
@@ -0,0 +1,21 @@
+<pre><code class="language-js">var a = &#39;hello&#39;;
+console.log(a + &#39; world&#39;);</code></pre>
+<pre><code class="language-bash">echo &quot;hello, ${WORLD}&quot;</code></pre>
+<pre><code class="language-longfence">Q: What do you call a tall person who sells stolen goods?</code></pre>
+<pre><code class="language-ManyTildes">A longfence!</code></pre>
+<p>How about an empty code block?</p>
+<pre><code class="language-js"></code></pre>
+<p>How about a code block with only an empty line?</p>
+<pre><code class="language-js">
+</code></pre>
+
+<p>With some trailing empty lines:</p>
+<pre><code>ciao
+
+
+</code></pre>
+
+<p>Closing fences must lay on a new line:</p>
+<pre><code>hello()
+^```
+&quot;this should still be in the code block!&quot;</code></pre>
diff --git a/packages/markdown/marked/test/new/gfm_code.md b/packages/markdown/marked/test/new/gfm_code.md
new file mode 100644
index 00000000..79d06b16
--- /dev/null
+++ b/packages/markdown/marked/test/new/gfm_code.md
@@ -0,0 +1,43 @@
+``` js
+var a = 'hello';
+console.log(a + ' world');
+```
+
+~~~bash
+echo "hello, ${WORLD}"
+~~~
+
+```````longfence
+Q: What do you call a tall person who sells stolen goods?
+```````
+
+~~~~~~~~~~  ManyTildes
+A longfence!
+~~~~~~~~~~
+
+How about an empty code block?
+
+```js
+```
+
+How about a code block with only an empty line?
+
+```js
+
+```
+
+With some trailing empty lines:
+
+```
+ciao
+
+
+```
+
+Closing fences must lay on a new line:
+
+```
+hello()
+^```
+"this should still be in the code block!"
+```
diff --git a/packages/markdown/marked/test/new/gfm_code_hr_list.html b/packages/markdown/marked/test/new/gfm_code_hr_list.html
new file mode 100644
index 00000000..d15b52fe
--- /dev/null
+++ b/packages/markdown/marked/test/new/gfm_code_hr_list.html
@@ -0,0 +1,52 @@
+<h2 id="foo">foo</h2>
+<ol>
+<li><p>bar:</p>
+<blockquote>
+<ul>
+<li>one<ul>
+<li>two<ul>
+<li>three</li>
+<li>four</li>
+<li>five</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</blockquote>
+</li>
+<li><p>foo:</p>
+<pre><code> line 1
+ line 2</code></pre>
+</li>
+<li><p>foo:</p>
+<ol>
+<li><p>foo <code>bar</code> bar:</p>
+<pre><code class="language-erb"> some code here
+</code></pre>
+</li>
+<li><p>foo <code>bar</code> bar:</p>
+<pre><code class="language-erb"> foo
+ ---
+ bar
+ ---
+ foo
+ bar</code></pre>
+</li>
+<li><p>foo <code>bar</code> bar:</p>
+<pre><code class="language-html"> ---
+ foo
+ foo
+ ---
+ bar</code></pre>
+</li>
+<li><p>foo <code>bar</code> bar:</p>
+<pre><code> foo
+ ---
+ bar</code></pre>
+</li>
+<li><p>foo</p>
+</li>
+</ol>
+</li>
+</ol>
diff --git a/packages/markdown/marked/test/new/gfm_code_hr_list.md b/packages/markdown/marked/test/new/gfm_code_hr_list.md
new file mode 100644
index 00000000..0eba4059
--- /dev/null
+++ b/packages/markdown/marked/test/new/gfm_code_hr_list.md
@@ -0,0 +1,53 @@
+## foo
+
+1. bar:
+
+    > - one
+        - two
+            - three
+            - four
+            - five
+
+1. foo:
+
+    ```
+    line 1
+    line 2
+    ```
+
+1. foo:
+
+    1. foo `bar` bar:
+
+        ``` erb
+        some code here
+        ```
+
+    2. foo `bar` bar:
+
+        ``` erb
+        foo
+        ---
+        bar
+        ---
+        foo
+        bar
+        ```
+
+    3. foo `bar` bar:
+
+        ``` html
+        ---
+        foo
+        foo
+        ---
+        bar
+        ```
+
+    4. foo `bar` bar:
+
+            foo
+            ---
+            bar
+
+    5. foo
diff --git a/packages/markdown/marked/test/new/gfm_em.html b/packages/markdown/marked/test/new/gfm_em.html
new file mode 100644
index 00000000..8fac3466
--- /dev/null
+++ b/packages/markdown/marked/test/new/gfm_em.html
@@ -0,0 +1 @@
+<p>These words should_not_be_emphasized.</p>
diff --git a/packages/markdown/marked/test/new/gfm_em.md b/packages/markdown/marked/test/new/gfm_em.md
new file mode 100644
index 00000000..6319874b
--- /dev/null
+++ b/packages/markdown/marked/test/new/gfm_em.md
@@ -0,0 +1 @@
+These words should_not_be_emphasized.
diff --git a/packages/markdown/marked/test/new/gfm_hashtag.html b/packages/markdown/marked/test/new/gfm_hashtag.html
new file mode 100644
index 00000000..6f9e43f5
--- /dev/null
+++ b/packages/markdown/marked/test/new/gfm_hashtag.html
@@ -0,0 +1,5 @@
+<p>#header</p>
+
+<h1 id="header1">header1</h1>
+
+<h1 id="header2">header2</h1>
diff --git a/packages/markdown/marked/test/new/gfm_hashtag.md b/packages/markdown/marked/test/new/gfm_hashtag.md
new file mode 100644
index 00000000..5eb26bf1
--- /dev/null
+++ b/packages/markdown/marked/test/new/gfm_hashtag.md
@@ -0,0 +1,8 @@
+---
+gfm: true
+---
+#header
+
+# header1
+
+#  header2
diff --git a/packages/markdown/marked/test/new/gfm_links_invalid.html b/packages/markdown/marked/test/new/gfm_links_invalid.html
new file mode 100644
index 00000000..4052efea
--- /dev/null
+++ b/packages/markdown/marked/test/new/gfm_links_invalid.html
@@ -0,0 +1 @@
+<p>This should not be linked: http://example.com/%ff</p>
diff --git a/packages/markdown/marked/test/new/gfm_links_invalid.md b/packages/markdown/marked/test/new/gfm_links_invalid.md
new file mode 100644
index 00000000..1b295d05
--- /dev/null
+++ b/packages/markdown/marked/test/new/gfm_links_invalid.md
@@ -0,0 +1,4 @@
+---
+sanitize: true
+---
+This should not be linked: http://example.com/%ff
diff --git a/packages/markdown/marked/test/new/gfm_tables.html b/packages/markdown/marked/test/new/gfm_tables.html
new file mode 100644
index 00000000..1c596573
--- /dev/null
+++ b/packages/markdown/marked/test/new/gfm_tables.html
@@ -0,0 +1,37 @@
+<table>
+	<thead>
+		<tr><th>Heading 1</th><th>Heading 2</th></tr>
+	</thead>
+	<tbody>
+		<tr><td>Cell 1</td><td>Cell 2</td></tr>
+		<tr><td>Cell 3</td><td>Cell 4</td></tr>
+	</tbody>
+</table>
+<table>
+	<thead>
+		<tr><th align="center">Header 1</th><th align="right">Header 2</th><th align="left">Header 3</th><th>Header 4</th></tr>
+	</thead>
+	<tbody>
+		<tr><td align="center">Cell 1</td><td align="right">Cell 2</td><td align="left">Cell 3</td><td>Cell 4</td></tr>
+		<tr><td align="center">Cell 5</td><td align="right">Cell 6</td><td align="left">Cell 7</td><td>Cell 8</td></tr>
+	</tbody>
+</table>
+<pre><code>Test code</code></pre>
+<table>
+	<thead>
+		<tr><th>Header 1</th><th>Header 2</th></tr>
+	</thead>
+	<tbody>
+		<tr><td>Cell 1</td><td>Cell 2</td></tr>
+		<tr><td>Cell 3</td><td>Cell 4</td></tr>
+	</tbody>
+</table>
+<table>
+	<thead>
+		<tr><th align="left">Header 1</th><th align="center">Header 2</th><th align="right">Header 3</th><th>Header 4</th></tr>
+	</thead>
+	<tbody>
+		<tr><td align="left">Cell 1</td><td align="center">Cell 2</td><td align="right">Cell 3</td><td>Cell 4</td></tr>
+		<tr><td align="left"><em>Cell 5</em></td><td align="center">Cell 6</td><td align="right">Cell 7</td><td>Cell 8</td></tr>
+	</tbody>
+</table>
diff --git a/packages/markdown/marked/test/new/gfm_tables.md b/packages/markdown/marked/test/new/gfm_tables.md
new file mode 100644
index 00000000..5fd6321c
--- /dev/null
+++ b/packages/markdown/marked/test/new/gfm_tables.md
@@ -0,0 +1,21 @@
+| Heading 1 | Heading 2
+| --------- | ---------
+| Cell 1    | Cell 2
+| Cell 3    | Cell 4
+
+| Header 1 | Header 2 | Header 3 | Header 4 |
+| :------: | -------: | :------- | -------- |
+| Cell 1   | Cell 2   | Cell 3   | Cell 4   |
+| Cell 5   | Cell 6   | Cell 7   | Cell 8   |
+
+    Test code
+
+Header 1 | Header 2
+-------- | --------
+Cell 1   | Cell 2
+Cell 3   | Cell 4
+
+Header 1|Header 2|Header 3|Header 4
+:-------|:------:|-------:|--------
+Cell 1  |Cell 2  |Cell 3  |Cell 4
+*Cell 5*|Cell 6  |Cell 7  |Cell 8
diff --git a/packages/markdown/marked/test/new/headings_id.html b/packages/markdown/marked/test/new/headings_id.html
new file mode 100644
index 00000000..6f0ae49e
--- /dev/null
+++ b/packages/markdown/marked/test/new/headings_id.html
@@ -0,0 +1,13 @@
+<h3 id="heading-with-a-link">Heading with a <a href="http://github.com/">link</a></h3>
+
+<h3 id="heading-with-some-italic-text">Heading with some <em>italic text</em></h3>
+
+<h3 id="or-some-strong">Or some <strong>strong</strong></h3>
+
+<p>(which doesn&#39;t really make any difference, here)</p>
+
+<h3 id="or-even-code">Or even <code>code</code></h3>
+
+<h3 id="what-about-strikethrough">What about <del>strikethrough</del></h3>
+
+<h2 id="and-a-ref-link">And a ref <a href="/some/url" title="link to nowhere">link</a></h2>
\ No newline at end of file
diff --git a/packages/markdown/marked/test/new/headings_id.md b/packages/markdown/marked/test/new/headings_id.md
new file mode 100644
index 00000000..fa8a4d82
--- /dev/null
+++ b/packages/markdown/marked/test/new/headings_id.md
@@ -0,0 +1,14 @@
+### Heading with a [link](http://github.com/)
+
+### Heading with some _italic text_
+
+### Or some **strong**
+(which doesn't really make any difference, here)
+
+### Or even `code`
+
+### What about ~~strikethrough~~
+
+## And a ref [link][destination]
+
+[destination]: /some/url "link to nowhere"
\ No newline at end of file
diff --git a/packages/markdown/marked/test/new/hr_list_break.html b/packages/markdown/marked/test/new/hr_list_break.html
new file mode 100644
index 00000000..bd3ad1f7
--- /dev/null
+++ b/packages/markdown/marked/test/new/hr_list_break.html
@@ -0,0 +1,10 @@
+<ul>
+<li>hello
+world</li>
+<li>how
+are</li>
+</ul>
+
+<hr>
+
+<p>you today?</p>
diff --git a/packages/markdown/marked/test/new/hr_list_break.md b/packages/markdown/marked/test/new/hr_list_break.md
new file mode 100644
index 00000000..036fe479
--- /dev/null
+++ b/packages/markdown/marked/test/new/hr_list_break.md
@@ -0,0 +1,6 @@
+* hello
+world
+* how
+are
+* * *
+you today?
diff --git a/packages/markdown/marked/test/new/html_comments.html b/packages/markdown/marked/test/new/html_comments.html
new file mode 100644
index 00000000..872b45f6
--- /dev/null
+++ b/packages/markdown/marked/test/new/html_comments.html
@@ -0,0 +1,57 @@
+<h3 id="example-1">Example 1</h3>
+
+<!-- comment -->
+
+<h3 id="example-2">Example 2</h3>
+
+<!---->
+
+<h3 id="example-3">Example 3</h3>
+
+<!-- -->
+
+<h3 id="example-4">Example 4</h3>
+
+<!-- - -->
+
+<h3 id="example-5">Example 5</h3>
+
+<!-- -- -->
+
+<h3 id="example-6">Example 6</h3>
+
+<!-- --->
+
+<h3 id="example-7">Example 7</h3>
+
+<!----->
+
+<h3 id="example-8">Example 8</h3>
+
+<!------>
+
+<h3 id="example-9">Example 9</h3>
+
+<!-- My favorite operators are > and <!-->
+
+<h3 id="example-10">Example 10</h3>
+
+<!-- multi
+line    
+comment
+-->
+
+<h3 id="example-11">Example 11</h3>
+
+   <!-- indented comment -->
+
+<pre><code>&lt;!-- too much indentation --&gt;
+</code></pre>
+
+<h3 id="example-12">Example 12</h3>
+
+<p>&lt;!--&gt; not a comment --&gt;</p>
+
+<p>&lt;!---&gt; not a comment --&gt;</p>
+
+<!-- <!-- not a comment? --> -->
diff --git a/packages/markdown/marked/test/new/html_comments.md b/packages/markdown/marked/test/new/html_comments.md
new file mode 100644
index 00000000..06aff02e
--- /dev/null
+++ b/packages/markdown/marked/test/new/html_comments.md
@@ -0,0 +1,56 @@
+### Example 1
+
+<!-- comment -->
+
+### Example 2
+
+<!---->
+
+### Example 3
+
+<!-- -->
+
+### Example 4
+
+<!-- - -->
+
+### Example 5
+
+<!-- -- -->
+
+### Example 6
+
+<!-- --->
+
+### Example 7
+
+<!----->
+
+### Example 8
+
+<!------>
+
+### Example 9
+
+<!-- My favorite operators are > and <!-->
+
+### Example 10
+
+<!-- multi
+line	
+comment
+-->
+
+### Example 11
+
+   <!-- indented comment -->
+
+    <!-- too much indentation -->
+
+### Example 12
+
+<!--> not a comment -->
+
+<!---> not a comment -->
+
+<!-- <!-- not a comment? --> -->
\ No newline at end of file
diff --git a/packages/markdown/marked/test/new/html_no_new_line.html b/packages/markdown/marked/test/new/html_no_new_line.html
new file mode 100644
index 00000000..a82e4a1c
--- /dev/null
+++ b/packages/markdown/marked/test/new/html_no_new_line.html
@@ -0,0 +1 @@
+<img src='sdfg'>
\ No newline at end of file
diff --git a/packages/markdown/marked/test/new/html_no_new_line.md b/packages/markdown/marked/test/new/html_no_new_line.md
new file mode 100644
index 00000000..a82e4a1c
--- /dev/null
+++ b/packages/markdown/marked/test/new/html_no_new_line.md
@@ -0,0 +1 @@
+<img src='sdfg'>
\ No newline at end of file
diff --git a/packages/markdown/marked/test/new/images.html b/packages/markdown/marked/test/new/images.html
new file mode 100644
index 00000000..2d3da7e8
--- /dev/null
+++ b/packages/markdown/marked/test/new/images.html
@@ -0,0 +1,5 @@
+<p>Image</p>
+<p>Image</p>
+<p>Image</p>
+<p>Image</p>
+<p>Image</p>
diff --git a/packages/markdown/marked/test/new/images.md b/packages/markdown/marked/test/new/images.md
new file mode 100644
index 00000000..c9d994a9
--- /dev/null
+++ b/packages/markdown/marked/test/new/images.md
@@ -0,0 +1,12 @@
+---
+sanitize: true
+---
+![Image](javascript:alert)
+
+![Image](vbscript:alert)
+
+![Image](javascript&colon;alert&#40;1&#41;)
+
+![Image](javascript&#58document;alert&#40;1&#41;)
+
+![Image](data:text/html;base64,PHNjcmlwdD5hbGVydCgnWFNTJyk8L3NjcmlwdD4K)
diff --git a/packages/markdown/marked/test/new/lazy_blockquotes.html b/packages/markdown/marked/test/new/lazy_blockquotes.html
new file mode 100644
index 00000000..a701d42a
--- /dev/null
+++ b/packages/markdown/marked/test/new/lazy_blockquotes.html
@@ -0,0 +1,4 @@
+<blockquote>
+  <p>hi there
+bud</p>
+</blockquote>
diff --git a/packages/markdown/marked/test/new/lazy_blockquotes.md b/packages/markdown/marked/test/new/lazy_blockquotes.md
new file mode 100644
index 00000000..c0e0b154
--- /dev/null
+++ b/packages/markdown/marked/test/new/lazy_blockquotes.md
@@ -0,0 +1,2 @@
+> hi there
+bud
diff --git a/packages/markdown/marked/test/new/link_lt.html b/packages/markdown/marked/test/new/link_lt.html
new file mode 100644
index 00000000..ea48caa9
--- /dev/null
+++ b/packages/markdown/marked/test/new/link_lt.html
@@ -0,0 +1 @@
+<p><a href="%3Ctest">URL</a></p>
diff --git a/packages/markdown/marked/test/new/link_lt.md b/packages/markdown/marked/test/new/link_lt.md
new file mode 100644
index 00000000..f4f9addd
--- /dev/null
+++ b/packages/markdown/marked/test/new/link_lt.md
@@ -0,0 +1 @@
+[URL](<test)
diff --git a/packages/markdown/marked/test/new/link_tick_redos.html b/packages/markdown/marked/test/new/link_tick_redos.html
new file mode 100644
index 00000000..4e4423bf
--- /dev/null
+++ b/packages/markdown/marked/test/new/link_tick_redos.html
@@ -0,0 +1,31 @@
+<p>dash_capstyle: [&#39;butt&#39; | &#39;round&#39; | &#39;projecting&#39;]
+dash_joinstyle: [&#39;miter&#39; | &#39;round&#39; | &#39;bevel&#39;]
+dashes: sequence of on/off ink in points
+drawstyle: [&#39;default&#39; | &#39;steps&#39; | &#39;steps-pre&#39; | &#39;steps-mid&#39; | &#39;steps-post&#39;]
+figure: a <code>~.Figure</code> instance
+fillstyle: [&#39;full&#39; | &#39;left&#39; | &#39;right&#39; | &#39;bottom&#39; | &#39;top&#39; | &#39;none&#39;]
+gid: an id string
+label: object
+linestyle or ls: [&#39;solid&#39; | &#39;dashed&#39;, &#39;dashdot&#39;, &#39;dotted&#39; | (offset, on-off-dash-seq) | <code>&#39;-&#39;</code> | <code>&#39;--&#39;</code> | <code>&#39;-.&#39;</code> | <code>&#39;:&#39;</code> | <code>&#39;None&#39;</code> | <code>&#39; &#39;</code> | <code>&#39;&#39;</code>]
+linewidth or lw: float value in points
+marker: :mod:<code>A valid marker style &lt;matplotlib.markers&gt;</code>
+markeredgecolor or mec: any matplotlib color
+markeredgewidth or mew: float value in points
+markerfacecolor or mfc: any matplotlib color
+markerfacecoloralt or mfcalt: any matplotlib color
+markersize or ms: float
+markevery: [None | int | length-2 tuple of int | slice | list/array of int | float | length-2 tuple of float]
+path_effects: <code>~.AbstractPathEffect</code>
+picker: float distance in points or callable pick function <code>fn(artist, event)</code>
+pickradius: float distance in points
+rasterized: bool or None
+sketch_params: (scale: float, length: float, randomness: float)
+snap: bool or None
+solid_capstyle: [&#39;butt&#39; | &#39;round&#39; |  &#39;projecting&#39;]
+solid_joinstyle: [&#39;miter&#39; | &#39;round&#39; | &#39;bevel&#39;]
+transform: a :class:<code>matplotlib.transforms.Transform</code> instance
+url: a url string
+visible: bool
+xdata: 1D array
+ydata: 1D array
+zorder: float</p>
diff --git a/packages/markdown/marked/test/new/link_tick_redos.md b/packages/markdown/marked/test/new/link_tick_redos.md
new file mode 100644
index 00000000..38c1107d
--- /dev/null
+++ b/packages/markdown/marked/test/new/link_tick_redos.md
@@ -0,0 +1,31 @@
+  dash_capstyle: ['butt' | 'round' | 'projecting']
+  dash_joinstyle: ['miter' | 'round' | 'bevel']
+  dashes: sequence of on/off ink in points
+  drawstyle: ['default' | 'steps' | 'steps-pre' | 'steps-mid' | 'steps-post']
+  figure: a `~.Figure` instance
+  fillstyle: ['full' | 'left' | 'right' | 'bottom' | 'top' | 'none']
+  gid: an id string
+  label: object
+  linestyle or ls: ['solid' | 'dashed', 'dashdot', 'dotted' | (offset, on-off-dash-seq) | ``'-'`` | ``'--'`` | ``'-.'`` | ``':'`` | ``'None'`` | ``' '`` | ``''``]
+  linewidth or lw: float value in points
+  marker: :mod:`A valid marker style <matplotlib.markers>`
+  markeredgecolor or mec: any matplotlib color
+  markeredgewidth or mew: float value in points
+  markerfacecolor or mfc: any matplotlib color
+  markerfacecoloralt or mfcalt: any matplotlib color
+  markersize or ms: float
+  markevery: [None | int | length-2 tuple of int | slice | list/array of int | float | length-2 tuple of float]
+  path_effects: `~.AbstractPathEffect`
+  picker: float distance in points or callable pick function ``fn(artist, event)``
+  pickradius: float distance in points
+  rasterized: bool or None
+  sketch_params: (scale: float, length: float, randomness: float)
+  snap: bool or None
+  solid_capstyle: ['butt' | 'round' |  'projecting']
+  solid_joinstyle: ['miter' | 'round' | 'bevel']
+  transform: a :class:`matplotlib.transforms.Transform` instance
+  url: a url string
+  visible: bool
+  xdata: 1D array
+  ydata: 1D array
+  zorder: float
diff --git a/packages/markdown/marked/test/new/links.html b/packages/markdown/marked/test/new/links.html
new file mode 100644
index 00000000..c3cbaa0c
--- /dev/null
+++ b/packages/markdown/marked/test/new/links.html
@@ -0,0 +1,3 @@
+<p>Link: <a href="https://example.org/">constructor</a>.</p>
+
+<p><a href="https://example.com/1">One</a> (<a href="https://example.com/2">Two</a>) <a href="https://example.com/3">Three</a></p>
diff --git a/packages/markdown/marked/test/new/links.md b/packages/markdown/marked/test/new/links.md
new file mode 100644
index 00000000..f53cbf13
--- /dev/null
+++ b/packages/markdown/marked/test/new/links.md
@@ -0,0 +1,5 @@
+Link: [constructor][].
+
+[One](https://example.com/1) ([Two](https://example.com/2)) [Three](https://example.com/3)
+
+[constructor]: https://example.org/
diff --git a/packages/markdown/marked/test/new/list_item_text.html b/packages/markdown/marked/test/new/list_item_text.html
new file mode 100644
index 00000000..142df366
--- /dev/null
+++ b/packages/markdown/marked/test/new/list_item_text.html
@@ -0,0 +1 @@
+<ul><li><p>item1</p>  <ul><li>item2 </li></ul> <p>text</p> </li></ul>
diff --git a/packages/markdown/marked/test/new/list_item_text.md b/packages/markdown/marked/test/new/list_item_text.md
new file mode 100644
index 00000000..a8f81b14
--- /dev/null
+++ b/packages/markdown/marked/test/new/list_item_text.md
@@ -0,0 +1,5 @@
+  * item1
+
+    * item2
+
+  text
diff --git a/packages/markdown/marked/test/new/list_table.html b/packages/markdown/marked/test/new/list_table.html
new file mode 100644
index 00000000..3a8b6388
--- /dev/null
+++ b/packages/markdown/marked/test/new/list_table.html
@@ -0,0 +1,44 @@
+<ul>
+	<li>
+		<p>Table in list:</p>
+		<table>
+			<thead>
+				<tr>
+					<th>column1</th>
+					<th>column2</th>
+				</tr>
+			</thead>
+			<tbody>
+				<tr>
+					<td>value1</td>
+					<td>value2</td>
+				</tr>
+				<tr>
+					<td>value3</td>
+					<td>value4</td>
+				</tr>
+			</tbody>
+		</table>
+	</li>
+	<li>
+		<p>No leading pipe table in list:</p>
+		<table>
+			<thead>
+				<tr>
+					<th>column1</th>
+					<th>column2</th>
+				</tr>
+			</thead>
+			<tbody>
+				<tr>
+					<td>value1</td>
+					<td>value2</td>
+				</tr>
+				<tr>
+					<td>value3</td>
+					<td>value4</td>
+				</tr>
+			</tbody>
+		</table>
+	</li>
+</ul>
diff --git a/packages/markdown/marked/test/new/list_table.md b/packages/markdown/marked/test/new/list_table.md
new file mode 100644
index 00000000..95541b11
--- /dev/null
+++ b/packages/markdown/marked/test/new/list_table.md
@@ -0,0 +1,13 @@
+* Table in list:
+
+  | column1 | column2 |
+  |---------|---------|
+  | value1  | value2  |
+  | value3  | value4  |
+
+* No leading pipe table in list:
+
+  column1 | column2
+  --------|--------
+  value1  | value2
+  value3  | value4
diff --git a/packages/markdown/marked/test/new/main.html b/packages/markdown/marked/test/new/main.html
new file mode 100644
index 00000000..8f78c4d3
--- /dev/null
+++ b/packages/markdown/marked/test/new/main.html
@@ -0,0 +1,4 @@
+<h1 id="a-heading">A heading</h1> <p>Just a note, I&#39;ve found that I can&#39;t test my markdown parser vs others. For example, both markdown.js and showdown code blocks in lists wrong. They&#39;re  also completely <a href="http://google.com/" title="Google">inconsistent</a> with regards to paragraphs in list items.</p> <p>A link. Not anymore.</p> <aside>This will make me fail the test because
+markdown.js doesnt acknowledge arbitrary html blocks =/</aside> <ul><li><p>List Item 1</p></li><li><p>List Item 2 </p><ul><li>New List Item 1 Hi, this is a list item.</li><li>New List Item 2 Another item <pre><code>Code goes here.
+Lots of it...</code></pre></li><li>New List Item 3 The last item</li></ul></li><li><p>List Item 3 The final item.</p></li><li><p>List Item 4 The real final item.</p></li></ul> <p>Paragraph.</p> <blockquote><ul><li>bq Item 1</li><li>bq Item 2 <ul><li>New bq Item 1</li><li>New bq Item 2 Text here</li></ul></li></ul></blockquote> <hr> <blockquote><p> Another blockquote!  I really need to get  more creative with  mockup text..  markdown.js breaks here again</p></blockquote> <h2 id="another-heading">Another Heading</h2> <p>Hello <em>world</em>. Here is a <a href="//hello">link</a>. And an image <img src="src" alt="alt">.</p> <pre><code>Code goes here.
+Lots of it...</code></pre>
diff --git a/packages/markdown/marked/test/new/main.md b/packages/markdown/marked/test/new/main.md
new file mode 100644
index 00000000..58e17a6a
--- /dev/null
+++ b/packages/markdown/marked/test/new/main.md
@@ -0,0 +1,55 @@
+[test]: http://google.com/ "Google"
+
+# A heading
+
+Just a note, I've found that I can't test my markdown parser vs others.
+For example, both markdown.js and showdown code blocks in lists wrong. They're
+also completely [inconsistent][test] with regards to paragraphs in list items.
+
+A link. Not anymore.
+
+<aside>This will make me fail the test because
+markdown.js doesnt acknowledge arbitrary html blocks =/</aside>
+
+* List Item 1
+
+* List Item 2
+  * New List Item 1
+    Hi, this is a list item.
+  * New List Item 2
+    Another item
+        Code goes here.
+        Lots of it...
+  * New List Item 3
+    The last item
+
+* List Item 3
+The final item.
+
+* List Item 4
+The real final item.
+
+Paragraph.
+
+> * bq Item 1
+> * bq Item 2
+>   * New bq Item 1
+>   * New bq Item 2
+>   Text here
+
+* * *
+
+> Another blockquote!
+> I really need to get
+> more creative with
+> mockup text..
+> markdown.js breaks here again
+
+Another Heading
+-------------
+
+Hello *world*. Here is a [link](//hello).
+And an image ![alt](src).
+
+    Code goes here.
+    Lots of it...
diff --git a/packages/markdown/marked/test/new/mangle_xss.html b/packages/markdown/marked/test/new/mangle_xss.html
new file mode 100644
index 00000000..3abcb67f
--- /dev/null
+++ b/packages/markdown/marked/test/new/mangle_xss.html
@@ -0,0 +1,3 @@
+<p>&lt;&lt;svg/onload=&quot;alert(1)&quot;//@x&gt;</p>
+
+<p>&lt;bar&quot;onclick=&quot;alert(&#39;XSS&#39;)&quot;@foo&gt;</p>
diff --git a/packages/markdown/marked/test/new/mangle_xss.md b/packages/markdown/marked/test/new/mangle_xss.md
new file mode 100644
index 00000000..419bd124
--- /dev/null
+++ b/packages/markdown/marked/test/new/mangle_xss.md
@@ -0,0 +1,7 @@
+---
+sanatize: true
+mangle: false
+---
+<<svg/onload="alert(1)"//@x>
+
+<bar"onclick="alert('XSS')"@foo>
diff --git a/packages/markdown/marked/test/new/nested_code.html b/packages/markdown/marked/test/new/nested_code.html
new file mode 100644
index 00000000..c28a1628
--- /dev/null
+++ b/packages/markdown/marked/test/new/nested_code.html
@@ -0,0 +1,9 @@
+<p><code>hi ther `` ok ```</code></p>
+
+<p><code>`</code></p>
+
+<p><code>There is a literal backtick (`) here.</code></p>
+
+<p>A backtick-delimited string in a code span: <code>`foo`</code></p>
+
+<p>Please don&#39;t use any <code>&lt;blink&gt;</code> tags.</p>
\ No newline at end of file
diff --git a/packages/markdown/marked/test/new/nested_code.md b/packages/markdown/marked/test/new/nested_code.md
new file mode 100644
index 00000000..adde4177
--- /dev/null
+++ b/packages/markdown/marked/test/new/nested_code.md
@@ -0,0 +1,9 @@
+````` hi ther `` ok ``` `````
+
+`` ` ``
+
+``There is a literal backtick (`) here.``
+
+A backtick-delimited string in a code span: `` `foo` ``
+
+Please don't use any `<blink>` tags.
\ No newline at end of file
diff --git a/packages/markdown/marked/test/new/nested_em.html b/packages/markdown/marked/test/new/nested_em.html
new file mode 100644
index 00000000..3ab4ec89
--- /dev/null
+++ b/packages/markdown/marked/test/new/nested_em.html
@@ -0,0 +1,3 @@
+<p><em>test <strong>test</strong> test</em></p>
+
+<p><em>test <strong>test</strong> test</em></p>
diff --git a/packages/markdown/marked/test/new/nested_em.md b/packages/markdown/marked/test/new/nested_em.md
new file mode 100644
index 00000000..550d0eb9
--- /dev/null
+++ b/packages/markdown/marked/test/new/nested_em.md
@@ -0,0 +1,3 @@
+*test **test** test*
+
+_test __test__ test_
diff --git a/packages/markdown/marked/test/new/nested_square_link.html b/packages/markdown/marked/test/new/nested_square_link.html
new file mode 100644
index 00000000..7b6986a1
--- /dev/null
+++ b/packages/markdown/marked/test/new/nested_square_link.html
@@ -0,0 +1,3 @@
+<p><a href="/url">the <code>]</code> character</a></p>
+
+<p><a href="/url">the ` character</a></p>
diff --git a/packages/markdown/marked/test/new/nested_square_link.md b/packages/markdown/marked/test/new/nested_square_link.md
new file mode 100644
index 00000000..0f311e95
--- /dev/null
+++ b/packages/markdown/marked/test/new/nested_square_link.md
@@ -0,0 +1,3 @@
+[the `]` character](/url)
+
+[the ` character](/url)
diff --git a/packages/markdown/marked/test/new/nogfm_hashtag.html b/packages/markdown/marked/test/new/nogfm_hashtag.html
new file mode 100644
index 00000000..ecd95d69
--- /dev/null
+++ b/packages/markdown/marked/test/new/nogfm_hashtag.html
@@ -0,0 +1,5 @@
+<h1 id="header">header</h1>
+
+<h1 id="header1">header1</h1>
+
+<h1 id="header2">header2</h1>
diff --git a/packages/markdown/marked/test/new/nogfm_hashtag.md b/packages/markdown/marked/test/new/nogfm_hashtag.md
new file mode 100644
index 00000000..4b805db4
--- /dev/null
+++ b/packages/markdown/marked/test/new/nogfm_hashtag.md
@@ -0,0 +1,8 @@
+---
+gfm: false
+---
+#header
+
+# header1
+
+#  header2
diff --git a/packages/markdown/marked/test/new/not_a_link.html b/packages/markdown/marked/test/new/not_a_link.html
new file mode 100644
index 00000000..a01685d2
--- /dev/null
+++ b/packages/markdown/marked/test/new/not_a_link.html
@@ -0,0 +1 @@
+<p>[test](not a link)</p>
diff --git a/packages/markdown/marked/test/new/not_a_link.md b/packages/markdown/marked/test/new/not_a_link.md
new file mode 100644
index 00000000..26f60437
--- /dev/null
+++ b/packages/markdown/marked/test/new/not_a_link.md
@@ -0,0 +1 @@
+\[test](not a link)
diff --git a/packages/markdown/marked/test/new/ref_paren.html b/packages/markdown/marked/test/new/ref_paren.html
new file mode 100644
index 00000000..cff6977f
--- /dev/null
+++ b/packages/markdown/marked/test/new/ref_paren.html
@@ -0,0 +1 @@
+<p><a href="/url" title="there">hi</a></p>
diff --git a/packages/markdown/marked/test/new/ref_paren.md b/packages/markdown/marked/test/new/ref_paren.md
new file mode 100644
index 00000000..aa97c91a
--- /dev/null
+++ b/packages/markdown/marked/test/new/ref_paren.md
@@ -0,0 +1,3 @@
+[hi]
+
+[hi]: /url (there)
diff --git a/packages/markdown/marked/test/new/relative_urls.html b/packages/markdown/marked/test/new/relative_urls.html
new file mode 100644
index 00000000..ee7f3bff
--- /dev/null
+++ b/packages/markdown/marked/test/new/relative_urls.html
@@ -0,0 +1,35 @@
+<h1 id="absolutization-of-rfc-3986-uris">Absolutization of RFC 3986 URIs</h1>
+
+<h2 id="absolute-uri">Absolute URI</h2>
+
+<p><a href="http://example.com/"><img src="http://example.com/logo" alt="section 4.3"></a></p>
+
+<h2 id="network-path-reference">Network-path reference</h2>
+
+<p><a href="http://example.com/"><img src="http://example.com/logo" alt="section 4.2"></a></p>
+
+<h2 id="absolute-path">Absolute path</h2>
+
+<p><a href="http://example.com/path/to/content"><img src="http://example.com/path/to/img" alt="section 4.2"></a></p>
+
+<h2 id="relative-path">Relative path</h2>
+
+<p><a href="http://example.com/base/content"><img src="http://example.com/base/img" alt="section 4.2"></a></p>
+
+<h2 id="dot-relative-path">Dot-relative path</h2>
+
+<p><a href="http://example.com/base/./content"><img src="http://example.com/base/./img" alt="section 3.3"></a></p>
+
+<p><a href="http://example.com/base/../content"><img src="http://example.com/base/../img" alt="section 3.3"></a></p>
+
+<h2 id="same-document-query">Same-document query</h2>
+
+<p><a href="?"><img src="?type=image" alt="section 4.4"></a></p>
+
+<h2 id="same-document-fragment">Same-document fragment</h2>
+
+<p><a href="#"><img src="#img" alt="section 4.4"></a></p>
+
+<h2 id="empty">Empty</h2>
+
+<p><a href="">section 4.2</a></p>
diff --git a/packages/markdown/marked/test/new/relative_urls.md b/packages/markdown/marked/test/new/relative_urls.md
new file mode 100644
index 00000000..5ced8915
--- /dev/null
+++ b/packages/markdown/marked/test/new/relative_urls.md
@@ -0,0 +1,30 @@
+---
+baseUrl: "http://example.com/base/"
+---
+# Absolutization of RFC 3986 URIs
+
+## Absolute URI
+[![section 4.3](http://example.com/logo)](http://example.com/)
+
+## Network-path reference
+[![section 4.2](//example.com/logo)](//example.com/)
+
+## Absolute path
+[![section 4.2](/path/to/img)](/path/to/content)
+
+## Relative path
+[![section 4.2](img)](content)
+
+## Dot-relative path
+[![section 3.3](./img)](./content)
+
+[![section 3.3](../img)](../content)
+
+## Same-document query
+[![section 4.4](?type=image)](?)
+
+## Same-document fragment
+[![section 4.4](#img)](#)
+
+## Empty
+[section 4.2]()
diff --git a/packages/markdown/marked/test/new/same_bullet.html b/packages/markdown/marked/test/new/same_bullet.html
new file mode 100644
index 00000000..9220741c
--- /dev/null
+++ b/packages/markdown/marked/test/new/same_bullet.html
@@ -0,0 +1,5 @@
+<ul>
+<li>test</li>
+<li>test</li>
+<li>test</li>
+</ul>
diff --git a/packages/markdown/marked/test/new/same_bullet.md b/packages/markdown/marked/test/new/same_bullet.md
new file mode 100644
index 00000000..27a89675
--- /dev/null
+++ b/packages/markdown/marked/test/new/same_bullet.md
@@ -0,0 +1,3 @@
+* test
++ test
+- test
diff --git a/packages/markdown/marked/test/new/sanitize_links.html b/packages/markdown/marked/test/new/sanitize_links.html
new file mode 100644
index 00000000..092ea471
--- /dev/null
+++ b/packages/markdown/marked/test/new/sanitize_links.html
@@ -0,0 +1,5 @@
+<p>URL</p>
+<p>URL</p>
+<p>URL</p>
+<p>URL</p>
+<p>URL</p>
diff --git a/packages/markdown/marked/test/new/sanitize_links.md b/packages/markdown/marked/test/new/sanitize_links.md
new file mode 100644
index 00000000..1850be4e
--- /dev/null
+++ b/packages/markdown/marked/test/new/sanitize_links.md
@@ -0,0 +1,12 @@
+---
+sanitize: true
+---
+[URL](javascript:alert)
+
+[URL](vbscript:alert)
+
+[URL](javascript&colon;alert&#40;1&#41;)
+
+[URL](javascript&#58document;alert&#40;1&#41;)
+
+[URL](data:text/html;base64,PHNjcmlwdD5hbGVydCgnWFNTJyk8L3NjcmlwdD4K)
diff --git a/packages/markdown/marked/test/new/smartypants.html b/packages/markdown/marked/test/new/smartypants.html
new file mode 100644
index 00000000..33718eea
--- /dev/null
+++ b/packages/markdown/marked/test/new/smartypants.html
@@ -0,0 +1,6 @@
+<p>Hello world ‘how’ “are” you – today…</p>
+
+<p>“It’s a more ‘challenging’ smartypants test…”</p>
+
+<p>‘And,’ as a bonus — “one
+multiline” test!</p>
diff --git a/packages/markdown/marked/test/new/smartypants.md b/packages/markdown/marked/test/new/smartypants.md
new file mode 100644
index 00000000..69225546
--- /dev/null
+++ b/packages/markdown/marked/test/new/smartypants.md
@@ -0,0 +1,9 @@
+---
+smartypants: true
+---
+Hello world 'how' "are" you -- today...
+
+"It's a more 'challenging' smartypants test..."
+
+'And,' as a bonus --- "one
+multiline" test!
diff --git a/packages/markdown/marked/test/new/smartypants_code.html b/packages/markdown/marked/test/new/smartypants_code.html
new file mode 100644
index 00000000..3ceb5094
--- /dev/null
+++ b/packages/markdown/marked/test/new/smartypants_code.html
@@ -0,0 +1,11 @@
+<pre>&amp;</pre>
+<p><code>--foo</code>
+<kbd>---foo</kbd></p>
+<script>--foo</script>
+
+<p>Ensure that text such as custom tags that happen to
+begin with the same letters as the above tags don’t
+match and thus benefit from Smartypants-ing.</p>
+
+<p><script-custom>–foo</script-custom>
+<code>--foo</code> &lt;codebar –foo codebar&gt;</p>
diff --git a/packages/markdown/marked/test/new/smartypants_code.md b/packages/markdown/marked/test/new/smartypants_code.md
new file mode 100644
index 00000000..6c4c5233
--- /dev/null
+++ b/packages/markdown/marked/test/new/smartypants_code.md
@@ -0,0 +1,15 @@
+---
+smartypants: true
+description: SmartyPants does not modify characters within <pre>, <code>, <kbd>, or <script> tag blocks.
+spec: https://daringfireball.net/projects/smartypants/
+---
+<pre>&amp;</pre>
+<code>--foo</code>
+<kbd>---foo</kbd>
+<script>--foo</script>
+
+Ensure that text such as custom tags that happen to
+begin with the same letters as the above tags don't
+match and thus benefit from Smartypants-ing.
+<script-custom>--foo</script-custom>
+`--foo` <codebar --foo codebar>
diff --git a/packages/markdown/marked/test/new/table_cells.html b/packages/markdown/marked/test/new/table_cells.html
new file mode 100644
index 00000000..694f7ddd
--- /dev/null
+++ b/packages/markdown/marked/test/new/table_cells.html
@@ -0,0 +1,27 @@
+<table><thead><tr><th>1</th></tr></thead><tbody><tr><td>1</td></tr></tbody></table>
+
+<table><thead><tr><th>1</th></tr></thead><tbody><tr><td>|</td></tr></tbody></table>
+
+<table><thead><tr><th>1</th></tr></thead><tbody><tr><td>1\1</td></tr></tbody></table>
+
+<table><thead><tr><th>1</th></tr></thead><tbody><tr><td>\\</td></tr></tbody></table>
+
+<table><thead><tr><th>1</th></tr></thead><tbody><tr><td>\\|</td></tr></tbody></table>
+
+<table><thead><tr><th>1</th><th>2</th></tr></thead><tbody><tr><td></td><td>2</td></tr></tbody></table>
+
+<table><thead><tr><th>1</th><th>2</th></tr></thead><tbody><tr><td>1|\</td><td>2|\</td></tr></tbody></table>
+
+<table><thead><tr><th>1</th><th>2</th></tr></thead><tbody><tr><td></td><td>2</td></tr></tbody></table>
+
+<table><thead><tr><th>1</th><th>2</th></tr></thead><tbody><tr><td>1|\</td><td>2|\</td></tr></tbody></table>
+
+<table><thead><tr><th>1</th><th>2</th></tr></thead><tbody><tr><td></td><td>2</td></tr></tbody></table>
+
+<table><thead><tr><th>1</th><th>2</th></tr></thead><tbody><tr><td>1</td><td>2|</td></tr></tbody></table>
+
+<table><thead><tr><th>1</th><th>2</th></tr></thead><tbody><tr><td>1</td><td>2|</td></tr></tbody></table>
+
+<table><thead><tr><th>1</th><th>2</th></tr></thead><tbody><tr><td>1</td><td>2|</td></tr></tbody></table>
+
+<table><thead><tr><th>1</th><th>2</th></tr></thead><tbody><tr><td>1</td><td>2|</td></tr></tbody></table>
diff --git a/packages/markdown/marked/test/new/table_cells.md b/packages/markdown/marked/test/new/table_cells.md
new file mode 100644
index 00000000..332298a6
--- /dev/null
+++ b/packages/markdown/marked/test/new/table_cells.md
@@ -0,0 +1,55 @@
+|1|
+|-|
+|1|
+
+|1|
+|-|
+|\||
+
+|1|
+|-|
+|1\\1|
+
+|1|
+|-|
+|\\\\||
+
+|1|
+|-|
+|\\\\\||
+
+|1|2|
+|-|-|
+||2|
+
+|1|2|
+|-|-|
+|1\|\\|2\|\\|
+
+|1|2|
+|-|-|
+| |2|
+
+1|2
+-|-
+1\|\\|2\|\\
+
+1|2
+-|-
+ |2
+
+1|2
+-|-
+1|2\|
+
+1|2
+-|-
+1|2\|
+
+|1|2|
+|-|-|
+|1|2\||
+
+|1|2|
+|-|-|
+|1|2\||
diff --git a/packages/markdown/marked/test/new/toplevel_paragraphs.html b/packages/markdown/marked/test/new/toplevel_paragraphs.html
new file mode 100644
index 00000000..7fd50947
--- /dev/null
+++ b/packages/markdown/marked/test/new/toplevel_paragraphs.html
@@ -0,0 +1,34 @@
+<p>hello world
+    text after spaces
+    text after spaces</p>
+
+<p>paragraph before code</p>
+<pre><code>text inside block code</code></pre>
+
+<p>paragraph before hr</p>
+<hr>
+
+<p>paragraph before head with hash</p>
+<h1 id="how-are-you">how are you</h1>
+
+<p>paragraph before head with equals</p>
+<h1 id="how-are-you-again">how are you again</h1>
+
+<p>paragraph before blockquote</p>
+<blockquote><p>text for blockquote</p></blockquote>
+
+<p>paragraph before list</p>
+<ul><li>text inside list</li></ul>
+
+<p>paragraph before div</p>
+<div>text inside div</div>
+
+<p>paragraph with span
+<span>text inside span</span></p>
+
+<p>hello <a href="/are/you">world</a>
+</p>
+
+<div>hello</div>
+
+<p><span>hello</span></p>
diff --git a/packages/markdown/marked/test/new/toplevel_paragraphs.md b/packages/markdown/marked/test/new/toplevel_paragraphs.md
new file mode 100644
index 00000000..f344fbe3
--- /dev/null
+++ b/packages/markdown/marked/test/new/toplevel_paragraphs.md
@@ -0,0 +1,41 @@
+---
+gfm: true
+---
+hello world
+    text after spaces
+    text after spaces
+
+paragraph before code
+```
+text inside block code
+```
+
+paragraph before hr
+* * *
+
+paragraph before head with hash
+# how are you
+
+paragraph before head with equals
+how are you again
+===========
+
+paragraph before blockquote
+> text for blockquote
+
+paragraph before list
+* text inside list
+
+paragraph before div
+<div>text inside div</div>
+
+paragraph with span
+<span>text inside span</span>
+
+hello [world][how]
+
+[how]: /are/you
+
+<div>hello</div>
+
+<span>hello</span>
diff --git a/packages/markdown/marked/test/new/tricky_list.html b/packages/markdown/marked/test/new/tricky_list.html
new file mode 100644
index 00000000..764a3352
--- /dev/null
+++ b/packages/markdown/marked/test/new/tricky_list.html
@@ -0,0 +1,23 @@
+<p><strong>hello</strong> <em>world</em></p>
+
+<ul>
+<li>hello world</li>
+</ul>
+
+<p><strong>hello</strong> <em>world</em></p>
+
+<ul>
+<li>hello world</li>
+</ul>
+
+<p><strong>hello</strong> <em>world</em></p>
+
+<ul>
+<li>Hello world</li>
+</ul>
+
+<p><strong>hello</strong> <em>world</em></p>
+
+<ul>
+<li>hello world</li>
+</ul>
diff --git a/packages/markdown/marked/test/new/tricky_list.md b/packages/markdown/marked/test/new/tricky_list.md
new file mode 100644
index 00000000..9aa76ceb
--- /dev/null
+++ b/packages/markdown/marked/test/new/tricky_list.md
@@ -0,0 +1,15 @@
+**hello** _world_
+
+* hello world
+
+**hello** _world_
+
+* hello world
+
+**hello** _world_
+
+* Hello world
+
+**hello** _world_
+
+* hello world
diff --git a/packages/markdown/marked/test/new/uppercase_hex.html b/packages/markdown/marked/test/new/uppercase_hex.html
new file mode 100644
index 00000000..97f55535
--- /dev/null
+++ b/packages/markdown/marked/test/new/uppercase_hex.html
@@ -0,0 +1,2 @@
+<p>lowerclick melower
+upperclick meupper</p>
diff --git a/packages/markdown/marked/test/new/uppercase_hex.md b/packages/markdown/marked/test/new/uppercase_hex.md
new file mode 100644
index 00000000..b4b228ab
--- /dev/null
+++ b/packages/markdown/marked/test/new/uppercase_hex.md
@@ -0,0 +1,5 @@
+---
+sanitize: true
+---
+lower[click me](javascript&#x3a;...)lower
+upper[click me](javascript&#X3a;...)upper
diff --git a/packages/markdown/marked/test/original/amps_and_angles_encoding.html b/packages/markdown/marked/test/original/amps_and_angles_encoding.html
new file mode 100644
index 00000000..9606860b
--- /dev/null
+++ b/packages/markdown/marked/test/original/amps_and_angles_encoding.html
@@ -0,0 +1,17 @@
+<p>AT&amp;T has an ampersand in their name.</p>
+
+<p>AT&amp;T is another way to write it.</p>
+
+<p>This &amp; that.</p>
+
+<p>4 &lt; 5.</p>
+
+<p>6 > 5.</p>
+
+<p>Here's a <a href="http://example.com/?foo=1&amp;bar=2">link</a> with an ampersand in the URL.</p>
+
+<p>Here's a link with an amersand in the link text: <a href="http://att.com/" title="AT&amp;T">AT&amp;T</a>.</p>
+
+<p>Here's an inline <a href="/script?foo=1&amp;bar=2">link</a>.</p>
+
+<p>Here's an inline <a href="/script?foo=1&amp;bar=2">link</a>.</p>
diff --git a/packages/markdown/marked/test/original/amps_and_angles_encoding.md b/packages/markdown/marked/test/original/amps_and_angles_encoding.md
new file mode 100644
index 00000000..d7fd65c1
--- /dev/null
+++ b/packages/markdown/marked/test/original/amps_and_angles_encoding.md
@@ -0,0 +1,25 @@
+---
+pedantic: true
+---
+
+AT&T has an ampersand in their name.
+
+AT&amp;T is another way to write it.
+
+This & that.
+
+4 < 5.
+
+6 > 5.
+
+Here's a [link] [1] with an ampersand in the URL.
+
+Here's a link with an amersand in the link text: [AT&T] [2].
+
+Here's an inline [link](/script?foo=1&bar=2).
+
+Here's an inline [link](</script?foo=1&bar=2>).
+
+
+[1]: http://example.com/?foo=1&bar=2
+[2]: http://att.com/  "AT&T"
diff --git a/packages/markdown/marked/test/original/auto_links.html b/packages/markdown/marked/test/original/auto_links.html
new file mode 100644
index 00000000..f8df9852
--- /dev/null
+++ b/packages/markdown/marked/test/original/auto_links.html
@@ -0,0 +1,18 @@
+<p>Link: <a href="http://example.com/">http://example.com/</a>.</p>
+
+<p>With an ampersand: <a href="http://example.com/?foo=1&amp;bar=2">http://example.com/?foo=1&amp;bar=2</a></p>
+
+<ul>
+<li>In a list?</li>
+<li><a href="http://example.com/">http://example.com/</a></li>
+<li>It should.</li>
+</ul>
+
+<blockquote>
+  <p>Blockquoted: <a href="http://example.com/">http://example.com/</a></p>
+</blockquote>
+
+<p>Auto-links should not occur here: <code>&lt;http://example.com/&gt;</code></p>
+
+<pre><code>or here: &lt;http://example.com/&gt;
+</code></pre>
diff --git a/packages/markdown/marked/test/original/auto_links.md b/packages/markdown/marked/test/original/auto_links.md
new file mode 100644
index 00000000..f85767b4
--- /dev/null
+++ b/packages/markdown/marked/test/original/auto_links.md
@@ -0,0 +1,13 @@
+Link: <http://example.com/>.
+
+With an ampersand: <http://example.com/?foo=1&bar=2>
+
+* In a list?
+* <http://example.com/>
+* It should.
+
+> Blockquoted: <http://example.com/>
+
+Auto-links should not occur here: `<http://example.com/>`
+
+	or here: <http://example.com/>
diff --git a/packages/markdown/marked/test/original/backslash_escapes.html b/packages/markdown/marked/test/original/backslash_escapes.html
new file mode 100644
index 00000000..7241d11f
--- /dev/null
+++ b/packages/markdown/marked/test/original/backslash_escapes.html
@@ -0,0 +1,118 @@
+<p>These should all get escaped:</p>
+
+<p>Backslash: \</p>
+
+<p>Backtick: `</p>
+
+<p>Asterisk: *</p>
+
+<p>Underscore: _</p>
+
+<p>Left brace: {</p>
+
+<p>Right brace: }</p>
+
+<p>Left bracket: [</p>
+
+<p>Right bracket: ]</p>
+
+<p>Left paren: (</p>
+
+<p>Right paren: )</p>
+
+<p>Greater-than: &gt;</p>
+
+<p>Hash: #</p>
+
+<p>Period: .</p>
+
+<p>Bang: !</p>
+
+<p>Plus: +</p>
+
+<p>Minus: -</p>
+
+<p>These should not, because they occur within a code block:</p>
+
+<pre><code>Backslash: \\
+
+Backtick: \`
+
+Asterisk: \*
+
+Underscore: \_
+
+Left brace: \{
+
+Right brace: \}
+
+Left bracket: \[
+
+Right bracket: \]
+
+Left paren: \(
+
+Right paren: \)
+
+Greater-than: \&gt;
+
+Hash: \#
+
+Period: \.
+
+Bang: \!
+
+Plus: \+
+
+Minus: \-
+</code></pre>
+
+<p>Nor should these, which occur in code spans:</p>
+
+<p>Backslash: <code>\\</code></p>
+
+<p>Backtick: <code>\`</code></p>
+
+<p>Asterisk: <code>\*</code></p>
+
+<p>Underscore: <code>\_</code></p>
+
+<p>Left brace: <code>\{</code></p>
+
+<p>Right brace: <code>\}</code></p>
+
+<p>Left bracket: <code>\[</code></p>
+
+<p>Right bracket: <code>\]</code></p>
+
+<p>Left paren: <code>\(</code></p>
+
+<p>Right paren: <code>\)</code></p>
+
+<p>Greater-than: <code>\&gt;</code></p>
+
+<p>Hash: <code>\#</code></p>
+
+<p>Period: <code>\.</code></p>
+
+<p>Bang: <code>\!</code></p>
+
+<p>Plus: <code>\+</code></p>
+
+<p>Minus: <code>\-</code></p>
+
+
+<p>These should get escaped, even though they're matching pairs for
+other Markdown constructs:</p>
+
+<p>*asterisks*</p>
+
+<p>_underscores_</p>
+
+<p>`backticks`</p>
+
+<p>This is a code span with a literal backslash-backtick sequence: <code>\`</code></p>
+
+<p>This is a tag with unescaped backticks <span attr='`ticks`'>bar</span>.</p>
+
+<p>This is a tag with backslashes <span attr='\\backslashes\\'>bar</span>.</p>
diff --git a/packages/markdown/marked/test/original/backslash_escapes.md b/packages/markdown/marked/test/original/backslash_escapes.md
new file mode 100644
index 00000000..5b014cb3
--- /dev/null
+++ b/packages/markdown/marked/test/original/backslash_escapes.md
@@ -0,0 +1,120 @@
+These should all get escaped:
+
+Backslash: \\
+
+Backtick: \`
+
+Asterisk: \*
+
+Underscore: \_
+
+Left brace: \{
+
+Right brace: \}
+
+Left bracket: \[
+
+Right bracket: \]
+
+Left paren: \(
+
+Right paren: \)
+
+Greater-than: \>
+
+Hash: \#
+
+Period: \.
+
+Bang: \!
+
+Plus: \+
+
+Minus: \-
+
+
+
+These should not, because they occur within a code block:
+
+	Backslash: \\
+
+	Backtick: \`
+
+	Asterisk: \*
+
+	Underscore: \_
+
+	Left brace: \{
+
+	Right brace: \}
+
+	Left bracket: \[
+
+	Right bracket: \]
+
+	Left paren: \(
+
+	Right paren: \)
+
+	Greater-than: \>
+
+	Hash: \#
+
+	Period: \.
+
+	Bang: \!
+
+	Plus: \+
+
+	Minus: \-
+
+
+Nor should these, which occur in code spans:
+
+Backslash: `\\`
+
+Backtick: `` \` ``
+
+Asterisk: `\*`
+
+Underscore: `\_`
+
+Left brace: `\{`
+
+Right brace: `\}`
+
+Left bracket: `\[`
+
+Right bracket: `\]`
+
+Left paren: `\(`
+
+Right paren: `\)`
+
+Greater-than: `\>`
+
+Hash: `\#`
+
+Period: `\.`
+
+Bang: `\!`
+
+Plus: `\+`
+
+Minus: `\-`
+
+
+These should get escaped, even though they're matching pairs for
+other Markdown constructs:
+
+\*asterisks\*
+
+\_underscores\_
+
+\`backticks\`
+
+This is a code span with a literal backslash-backtick sequence: `` \` ``
+
+This is a tag with unescaped backticks <span attr='`ticks`'>bar</span>.
+
+This is a tag with backslashes <span attr='\\backslashes\\'>bar</span>.
diff --git a/packages/markdown/marked/test/original/blockquotes_with_code_blocks.html b/packages/markdown/marked/test/original/blockquotes_with_code_blocks.html
new file mode 100644
index 00000000..990202a1
--- /dev/null
+++ b/packages/markdown/marked/test/original/blockquotes_with_code_blocks.html
@@ -0,0 +1,15 @@
+<blockquote>
+  <p>Example:</p>
+
+<pre><code>sub status {
+    print "working";
+}
+</code></pre>
+  
+  <p>Or:</p>
+
+<pre><code>sub status {
+    return "working";
+}
+</code></pre>
+</blockquote>
diff --git a/packages/markdown/marked/test/original/blockquotes_with_code_blocks.md b/packages/markdown/marked/test/original/blockquotes_with_code_blocks.md
new file mode 100644
index 00000000..c31d1710
--- /dev/null
+++ b/packages/markdown/marked/test/original/blockquotes_with_code_blocks.md
@@ -0,0 +1,11 @@
+> Example:
+> 
+>     sub status {
+>         print "working";
+>     }
+> 
+> Or:
+> 
+>     sub status {
+>         return "working";
+>     }
diff --git a/packages/markdown/marked/test/original/code_blocks.html b/packages/markdown/marked/test/original/code_blocks.html
new file mode 100644
index 00000000..32703f5c
--- /dev/null
+++ b/packages/markdown/marked/test/original/code_blocks.html
@@ -0,0 +1,18 @@
+<pre><code>code block on the first line
+</code></pre>
+
+<p>Regular text.</p>
+
+<pre><code>code block indented by spaces
+</code></pre>
+
+<p>Regular text.</p>
+
+<pre><code>the lines in this block  
+all contain trailing spaces  
+</code></pre>
+
+<p>Regular Text.</p>
+
+<pre><code>code block on the last line
+</code></pre>
diff --git a/packages/markdown/marked/test/original/code_blocks.md b/packages/markdown/marked/test/original/code_blocks.md
new file mode 100644
index 00000000..01f9a733
--- /dev/null
+++ b/packages/markdown/marked/test/original/code_blocks.md
@@ -0,0 +1,14 @@
+	code block on the first line
+	
+Regular text.
+
+    code block indented by spaces
+
+Regular text.
+
+	the lines in this block  
+	all contain trailing spaces  
+
+Regular Text.
+
+	code block on the last line
diff --git a/packages/markdown/marked/test/original/code_spans.html b/packages/markdown/marked/test/original/code_spans.html
new file mode 100644
index 00000000..4b8afbb7
--- /dev/null
+++ b/packages/markdown/marked/test/original/code_spans.html
@@ -0,0 +1,6 @@
+<p><code>&lt;test a="</code> content of attribute <code>"&gt;</code></p>
+
+<p>Fix for backticks within HTML tag: <span attr='`ticks`'>like this</span></p>
+
+<p>Here's how you put <code>`backticks`</code> in a code span.</p>
+
diff --git a/packages/markdown/marked/test/original/code_spans.md b/packages/markdown/marked/test/original/code_spans.md
new file mode 100644
index 00000000..750a1973
--- /dev/null
+++ b/packages/markdown/marked/test/original/code_spans.md
@@ -0,0 +1,6 @@
+`<test a="` content of attribute `">`
+
+Fix for backticks within HTML tag: <span attr='`ticks`'>like this</span>
+
+Here's how you put `` `backticks` `` in a code span.
+
diff --git a/packages/markdown/marked/test/original/hard_wrapped_paragraphs_with_list_like_lines.html b/packages/markdown/marked/test/original/hard_wrapped_paragraphs_with_list_like_lines.html
new file mode 100644
index 00000000..e21ac79a
--- /dev/null
+++ b/packages/markdown/marked/test/original/hard_wrapped_paragraphs_with_list_like_lines.html
@@ -0,0 +1,8 @@
+<p>In Markdown 1.0.0 and earlier. Version
+8. This line turns into a list item.
+Because a hard-wrapped line in the
+middle of a paragraph looked like a
+list item.</p>
+
+<p>Here's one with a bullet.
+* criminey.</p>
diff --git a/packages/markdown/marked/test/original/hard_wrapped_paragraphs_with_list_like_lines.md b/packages/markdown/marked/test/original/hard_wrapped_paragraphs_with_list_like_lines.md
new file mode 100644
index 00000000..f8a5b27b
--- /dev/null
+++ b/packages/markdown/marked/test/original/hard_wrapped_paragraphs_with_list_like_lines.md
@@ -0,0 +1,8 @@
+In Markdown 1.0.0 and earlier. Version
+8. This line turns into a list item.
+Because a hard-wrapped line in the
+middle of a paragraph looked like a
+list item.
+
+Here's one with a bullet.
+* criminey.
diff --git a/packages/markdown/marked/test/original/horizontal_rules.html b/packages/markdown/marked/test/original/horizontal_rules.html
new file mode 100644
index 00000000..b84ba925
--- /dev/null
+++ b/packages/markdown/marked/test/original/horizontal_rules.html
@@ -0,0 +1,85 @@
+<p>Dashes:</p>
+
+<hr />
+
+<hr />
+
+<hr />
+
+<hr />
+
+<pre><code>---
+</code></pre>
+
+<hr />
+
+<hr />
+
+<hr />
+
+<hr />
+
+<pre><code>- - -
+</code></pre>
+
+<p>Asterisks:</p>
+
+<hr />
+
+<hr />
+
+<hr />
+
+<hr />
+
+<pre><code>***
+</code></pre>
+
+<hr />
+
+<hr />
+
+<hr />
+
+<hr />
+
+<pre><code>* * *
+</code></pre>
+
+<p>Underscores:</p>
+
+<hr />
+
+<hr />
+
+<hr />
+
+<hr />
+
+<pre><code>___
+</code></pre>
+
+<hr />
+
+<hr />
+
+<hr />
+
+<hr />
+
+<pre><code>_ _ _
+</code></pre>
+
+<p>Not horizontal rules:</p>
+<p>--*</p>
+<p>-*-</p>
+<p>*--</p>
+<p>-_-</p>
+<p>__-</p>
+<p>-__</p>
+<pre><code>_-_
+</code></pre>
+<p>Long rules:</p>
+<hr>
+<hr>
+<hr>
diff --git a/packages/markdown/marked/test/original/horizontal_rules.md b/packages/markdown/marked/test/original/horizontal_rules.md
new file mode 100644
index 00000000..49bbcfad
--- /dev/null
+++ b/packages/markdown/marked/test/original/horizontal_rules.md
@@ -0,0 +1,94 @@
+Dashes:
+
+---
+
+ ---
+ 
+  ---
+
+   ---
+
+	---
+
+- - -
+
+ - - -
+ 
+  - - -
+
+   - - -
+
+	- - -
+
+
+Asterisks:
+
+***
+
+ ***
+ 
+  ***
+
+   ***
+
+	***
+
+* * *
+
+ * * *
+ 
+  * * *
+
+   * * *
+
+	* * *
+
+
+Underscores:
+
+___
+
+ ___
+ 
+  ___
+
+   ___
+
+    ___
+
+_ _ _
+
+ _ _ _
+ 
+  _ _ _
+
+   _ _ _
+
+    _ _ _
+
+
+
+Not horizontal rules:
+
+--*
+
+-*-
+
+*--
+
+ -_-
+
+  __-
+
+   -__
+
+    _-_
+
+
+Long rules:
+
+-----------
+
+___________
+
+***********
diff --git a/packages/markdown/marked/test/original/inline_html_advanced.html b/packages/markdown/marked/test/original/inline_html_advanced.html
new file mode 100644
index 00000000..3af9cafb
--- /dev/null
+++ b/packages/markdown/marked/test/original/inline_html_advanced.html
@@ -0,0 +1,15 @@
+<p>Simple block on one line:</p>
+
+<div>foo</div>
+
+<p>And nested without indentation:</p>
+
+<div>
+<div>
+<div>
+foo
+</div>
+<div style=">"/>
+</div>
+<div>bar</div>
+</div>
diff --git a/packages/markdown/marked/test/original/inline_html_advanced.md b/packages/markdown/marked/test/original/inline_html_advanced.md
new file mode 100644
index 00000000..86b7206d
--- /dev/null
+++ b/packages/markdown/marked/test/original/inline_html_advanced.md
@@ -0,0 +1,15 @@
+Simple block on one line:
+
+<div>foo</div>
+
+And nested without indentation:
+
+<div>
+<div>
+<div>
+foo
+</div>
+<div style=">"/>
+</div>
+<div>bar</div>
+</div>
diff --git a/packages/markdown/marked/test/original/inline_html_comments.html b/packages/markdown/marked/test/original/inline_html_comments.html
new file mode 100644
index 00000000..3f167a16
--- /dev/null
+++ b/packages/markdown/marked/test/original/inline_html_comments.html
@@ -0,0 +1,13 @@
+<p>Paragraph one.</p>
+
+<!-- This is a simple comment -->
+
+<!--
+    This is another comment.
+-->
+
+<p>Paragraph two.</p>
+
+<!-- one comment block -- -- with two comments -->
+
+<p>The end.</p>
diff --git a/packages/markdown/marked/test/original/inline_html_comments.md b/packages/markdown/marked/test/original/inline_html_comments.md
new file mode 100644
index 00000000..41d830d0
--- /dev/null
+++ b/packages/markdown/marked/test/original/inline_html_comments.md
@@ -0,0 +1,13 @@
+Paragraph one.
+
+<!-- This is a simple comment -->
+
+<!--
+	This is another comment.
+-->
+
+Paragraph two.
+
+<!-- one comment block -- -- with two comments -->
+
+The end.
diff --git a/packages/markdown/marked/test/original/inline_html_simple.html b/packages/markdown/marked/test/original/inline_html_simple.html
new file mode 100644
index 00000000..6bf78f8f
--- /dev/null
+++ b/packages/markdown/marked/test/original/inline_html_simple.html
@@ -0,0 +1,72 @@
+<p>Here's a simple block:</p>
+
+<div>
+    foo
+</div>
+
+<p>This should be a code block, though:</p>
+
+<pre><code>&lt;div&gt;
+    foo
+&lt;/div&gt;
+</code></pre>
+
+<p>As should this:</p>
+
+<pre><code>&lt;div&gt;foo&lt;/div&gt;
+</code></pre>
+
+<p>Now, nested:</p>
+
+<div>
+    <div>
+        <div>
+            foo
+        </div>
+    </div>
+</div>
+
+<p>This should just be an HTML comment:</p>
+
+<!-- Comment -->
+
+<p>Multiline:</p>
+
+<!--
+Blah
+Blah
+-->
+
+<p>Code block:</p>
+
+<pre><code>&lt;!-- Comment --&gt;
+</code></pre>
+
+<p>Just plain comment, with trailing spaces on the line:</p>
+
+<!-- foo -->   
+
+<p>Code:</p>
+
+<pre><code>&lt;hr /&gt;
+</code></pre>
+
+<p>Hr's:</p>
+
+<hr>
+
+<hr/>
+
+<hr />
+
+<hr>   
+
+<hr/>  
+
+<hr /> 
+
+<hr class="foo" id="bar" />
+
+<hr class="foo" id="bar"/>
+
+<hr class="foo" id="bar" >
diff --git a/packages/markdown/marked/test/original/inline_html_simple.md b/packages/markdown/marked/test/original/inline_html_simple.md
new file mode 100644
index 00000000..14aa2dc2
--- /dev/null
+++ b/packages/markdown/marked/test/original/inline_html_simple.md
@@ -0,0 +1,69 @@
+Here's a simple block:
+
+<div>
+	foo
+</div>
+
+This should be a code block, though:
+
+	<div>
+		foo
+	</div>
+
+As should this:
+
+	<div>foo</div>
+
+Now, nested:
+
+<div>
+	<div>
+		<div>
+			foo
+		</div>
+	</div>
+</div>
+
+This should just be an HTML comment:
+
+<!-- Comment -->
+
+Multiline:
+
+<!--
+Blah
+Blah
+-->
+
+Code block:
+
+	<!-- Comment -->
+
+Just plain comment, with trailing spaces on the line:
+
+<!-- foo -->   
+
+Code:
+
+	<hr />
+	
+Hr's:
+
+<hr>
+
+<hr/>
+
+<hr />
+
+<hr>   
+
+<hr/>  
+
+<hr /> 
+
+<hr class="foo" id="bar" />
+
+<hr class="foo" id="bar"/>
+
+<hr class="foo" id="bar" >
+
diff --git a/packages/markdown/marked/test/original/links_inline_style.html b/packages/markdown/marked/test/original/links_inline_style.html
new file mode 100644
index 00000000..12ec391c
--- /dev/null
+++ b/packages/markdown/marked/test/original/links_inline_style.html
@@ -0,0 +1,15 @@
+<p>Just a <a href="/url/">URL</a>.</p>
+
+<p><a href="/url/" title="title">URL and title</a>.</p>
+
+<p><a href="/url/" title="title preceded by two spaces">URL and title</a>.</p>
+
+<p><a href="/url/" title="title preceded by a tab">URL and title</a>.</p>
+
+<p><a href="/url/" title="title has spaces afterward">URL and title</a>.</p>
+
+<p><a href="/url/has%20space">URL and title</a>.</p>
+
+<p><a href="/url/has%20space/" title="url has space and title">URL and title</a>.</p>
+
+<p><a href="">Empty</a>.</p>
diff --git a/packages/markdown/marked/test/original/links_inline_style.md b/packages/markdown/marked/test/original/links_inline_style.md
new file mode 100644
index 00000000..1dc692be
--- /dev/null
+++ b/packages/markdown/marked/test/original/links_inline_style.md
@@ -0,0 +1,19 @@
+---
+pedantic: true
+---
+
+Just a [URL](/url/).
+
+[URL and title](/url/ "title").
+
+[URL and title](/url/  "title preceded by two spaces").
+
+[URL and title](/url/	"title preceded by a tab").
+
+[URL and title](/url/ "title has spaces afterward"  ).
+
+[URL and title]( /url/has space ).
+
+[URL and title]( /url/has space/ "url has space and title").
+
+[Empty]().
diff --git a/packages/markdown/marked/test/original/links_reference_style.html b/packages/markdown/marked/test/original/links_reference_style.html
new file mode 100644
index 00000000..8e70c32f
--- /dev/null
+++ b/packages/markdown/marked/test/original/links_reference_style.html
@@ -0,0 +1,52 @@
+<p>Foo <a href="/url/" title="Title">bar</a>.</p>
+
+<p>Foo <a href="/url/" title="Title">bar</a>.</p>
+
+<p>Foo <a href="/url/" title="Title">bar</a>.</p>
+
+<p>With <a href="/url/">embedded [brackets]</a>.</p>
+
+<p>Indented <a href="/url">once</a>.</p>
+
+<p>Indented <a href="/url">twice</a>.</p>
+
+<p>Indented <a href="/url">thrice</a>.</p>
+
+<p>Indented [four][] times.</p>
+
+<pre><code>[four]: /url
+</code></pre>
+
+<hr />
+
+<p><a href="foo">this</a> should work</p>
+
+<p>So should <a href="foo">this</a>.</p>
+
+<p>And <a href="foo">this</a>.</p>
+
+<p>And <a href="foo">this</a>.</p>
+
+<p>And <a href="foo">this</a>.</p>
+
+<p>But not [that] [].</p>
+
+<p>Nor [that][].</p>
+
+<p>Nor [that].</p>
+
+<p>[Something in brackets like <a href="foo">this</a> should work]</p>
+
+<p>[Same with <a href="foo">this</a>.]</p>
+
+<p>In this case, <a href="/somethingelse/">this</a> points to something else.</p>
+
+<p>Backslashing should suppress [this] and [this].</p>
+
+<hr />
+
+<p>Here's one where the <a href="/url/">link
+breaks</a> across lines.</p>
+
+<p>Here's another where the <a href="/url/">link 
+breaks</a> across lines, but with a line-ending space.</p>
diff --git a/packages/markdown/marked/test/original/links_reference_style.md b/packages/markdown/marked/test/original/links_reference_style.md
new file mode 100644
index 00000000..10ab1606
--- /dev/null
+++ b/packages/markdown/marked/test/original/links_reference_style.md
@@ -0,0 +1,75 @@
+---
+pedantic: true
+---
+
+Foo [bar] [1].
+
+Foo [bar][1].
+
+Foo [bar]
+[1].
+
+[1]: /url/  "Title"
+
+
+With [embedded [brackets]] [b].
+
+
+Indented [once][].
+
+Indented [twice][].
+
+Indented [thrice][].
+
+Indented [four][] times.
+
+ [once]: /url
+
+  [twice]: /url
+
+   [thrice]: /url
+
+    [four]: /url
+
+
+[b]: /url/
+
+* * *
+
+[this] [this] should work
+
+So should [this][this].
+
+And [this] [].
+
+And [this][].
+
+And [this].
+
+But not [that] [].
+
+Nor [that][].
+
+Nor [that].
+
+[Something in brackets like [this][] should work]
+
+[Same with [this].]
+
+In this case, [this](/somethingelse/) points to something else.
+
+Backslashing should suppress \[this] and [this\].
+
+[this]: foo
+
+
+* * *
+
+Here's one where the [link
+breaks] across lines.
+
+Here's another where the [link 
+breaks] across lines, but with a line-ending space.
+
+
+[link breaks]: /url/
diff --git a/packages/markdown/marked/test/original/links_shortcut_references.html b/packages/markdown/marked/test/original/links_shortcut_references.html
new file mode 100644
index 00000000..bf81e939
--- /dev/null
+++ b/packages/markdown/marked/test/original/links_shortcut_references.html
@@ -0,0 +1,9 @@
+<p>This is the <a href="/simple">simple case</a>.</p>
+
+<p>This one has a <a href="/foo">line
+break</a>.</p>
+
+<p>This one has a <a href="/foo">line 
+break</a> with a line-ending space.</p>
+
+<p><a href="/that">this</a> and the <a href="/other">other</a></p>
diff --git a/packages/markdown/marked/test/original/links_shortcut_references.md b/packages/markdown/marked/test/original/links_shortcut_references.md
new file mode 100644
index 00000000..0ff031fa
--- /dev/null
+++ b/packages/markdown/marked/test/original/links_shortcut_references.md
@@ -0,0 +1,24 @@
+---
+pedantic: true
+---
+
+This is the [simple case].
+
+[simple case]: /simple
+
+
+
+This one has a [line
+break].
+
+This one has a [line 
+break] with a line-ending space.
+
+[line break]: /foo
+
+
+[this] [that] and the [other]
+
+[this]: /this
+[that]: /that
+[other]: /other
diff --git a/packages/markdown/marked/test/original/literal_quotes_in_titles.html b/packages/markdown/marked/test/original/literal_quotes_in_titles.html
new file mode 100644
index 00000000..611c1ac6
--- /dev/null
+++ b/packages/markdown/marked/test/original/literal_quotes_in_titles.html
@@ -0,0 +1,3 @@
+<p>Foo <a href="/url/" title="Title with &quot;quotes&quot; inside">bar</a>.</p>
+
+<p>Foo <a href="/url/" title="Title with &quot;quotes&quot; inside">bar</a>.</p>
diff --git a/packages/markdown/marked/test/original/literal_quotes_in_titles.md b/packages/markdown/marked/test/original/literal_quotes_in_titles.md
new file mode 100644
index 00000000..74de60d8
--- /dev/null
+++ b/packages/markdown/marked/test/original/literal_quotes_in_titles.md
@@ -0,0 +1,11 @@
+---
+pedantic: true
+---
+
+Foo [bar][].
+
+Foo [bar](/url/ "Title with "quotes" inside").
+
+
+  [bar]: /url/ "Title with "quotes" inside"
+
diff --git a/packages/markdown/marked/test/original/markdown_documentation_basics.html b/packages/markdown/marked/test/original/markdown_documentation_basics.html
new file mode 100644
index 00000000..dede9d74
--- /dev/null
+++ b/packages/markdown/marked/test/original/markdown_documentation_basics.html
@@ -0,0 +1,314 @@
+<h1 id="markdown-basics">Markdown: Basics</h1>
+
+<ul id="ProjectSubmenu">
+    <li><a href="/projects/markdown/" title="Markdown Project Page">Main</a></li>
+    <li><a class="selected" title="Markdown Basics">Basics</a></li>
+    <li><a href="/projects/markdown/syntax" title="Markdown Syntax Documentation">Syntax</a></li>
+    <li><a href="/projects/markdown/license" title="Pricing and License Information">License</a></li>
+    <li><a href="/projects/markdown/dingus" title="Online Markdown Web Form">Dingus</a></li>
+</ul>
+
+<h2 id="getting-the-gist-of-markdowns-formatting-syntax">Getting the Gist of Markdown's Formatting Syntax</h2>
+
+<p>This page offers a brief overview of what it's like to use Markdown.
+The <a href="/projects/markdown/syntax" title="Markdown Syntax">syntax page</a> provides complete, detailed documentation for
+every feature, but Markdown should be very easy to pick up simply by
+looking at a few examples of it in action. The examples on this page
+are written in a before/after style, showing example syntax and the
+HTML output produced by Markdown.</p>
+
+<p>It's also helpful to simply try Markdown out; the <a href="/projects/markdown/dingus" title="Markdown Dingus">Dingus</a> is a
+web application that allows you type your own Markdown-formatted text
+and translate it to XHTML.</p>
+
+<p><strong>Note:</strong> This document is itself written using Markdown; you
+can <a href="/projects/markdown/basics.text">see the source for it by adding '.text' to the URL</a>.</p>
+
+<h2 id="paragraphs-headers-blockquotes">Paragraphs, Headers, Blockquotes</h2>
+
+<p>A paragraph is simply one or more consecutive lines of text, separated
+by one or more blank lines. (A blank line is any line that looks like a
+blank line -- a line containing nothing spaces or tabs is considered
+blank.) Normal paragraphs should not be intended with spaces or tabs.</p>
+
+<p>Markdown offers two styles of headers: <em>Setext</em> and <em>atx</em>.
+Setext-style headers for <code>&lt;h1&gt;</code> and <code>&lt;h2&gt;</code> are created by
+"underlining" with equal signs (<code>=</code>) and hyphens (<code>-</code>), respectively.
+To create an atx-style header, you put 1-6 hash marks (<code>#</code>) at the
+beginning of the line -- the number of hashes equals the resulting
+HTML header level.</p>
+
+<p>Blockquotes are indicated using email-style '<code>&gt;</code>' angle brackets.</p>
+
+<p>Markdown:</p>
+
+<pre><code>A First Level Header
+====================
+
+A Second Level Header
+---------------------
+
+Now is the time for all good men to come to
+the aid of their country. This is just a
+regular paragraph.
+
+The quick brown fox jumped over the lazy
+dog's back.
+
+### Header 3
+
+&gt; This is a blockquote.
+&gt; 
+&gt; This is the second paragraph in the blockquote.
+&gt;
+&gt; ## This is an H2 in a blockquote
+</code></pre>
+
+<p>Output:</p>
+
+<pre><code>&lt;h1&gt;A First Level Header&lt;/h1&gt;
+
+&lt;h2&gt;A Second Level Header&lt;/h2&gt;
+
+&lt;p&gt;Now is the time for all good men to come to
+the aid of their country. This is just a
+regular paragraph.&lt;/p&gt;
+
+&lt;p&gt;The quick brown fox jumped over the lazy
+dog's back.&lt;/p&gt;
+
+&lt;h3&gt;Header 3&lt;/h3&gt;
+
+&lt;blockquote&gt;
+    &lt;p&gt;This is a blockquote.&lt;/p&gt;
+
+    &lt;p&gt;This is the second paragraph in the blockquote.&lt;/p&gt;
+
+    &lt;h2&gt;This is an H2 in a blockquote&lt;/h2&gt;
+&lt;/blockquote&gt;
+</code></pre>
+
+<h3 id="phrase-emphasis">Phrase Emphasis</h3>
+
+<p>Markdown uses asterisks and underscores to indicate spans of emphasis.</p>
+
+<p>Markdown:</p>
+
+<pre><code>Some of these words *are emphasized*.
+Some of these words _are emphasized also_.
+
+Use two asterisks for **strong emphasis**.
+Or, if you prefer, __use two underscores instead__.
+</code></pre>
+
+<p>Output:</p>
+
+<pre><code>&lt;p&gt;Some of these words &lt;em&gt;are emphasized&lt;/em&gt;.
+Some of these words &lt;em&gt;are emphasized also&lt;/em&gt;.&lt;/p&gt;
+
+&lt;p&gt;Use two asterisks for &lt;strong&gt;strong emphasis&lt;/strong&gt;.
+Or, if you prefer, &lt;strong&gt;use two underscores instead&lt;/strong&gt;.&lt;/p&gt;
+</code></pre>
+
+<h2 id="lists">Lists</h2>
+
+<p>Unordered (bulleted) lists use asterisks, pluses, and hyphens (<code>*</code>,
+<code>+</code>, and <code>-</code>) as list markers. These three markers are
+interchangable; this:</p>
+
+<pre><code>*   Candy.
+*   Gum.
+*   Booze.
+</code></pre>
+
+<p>this:</p>
+
+<pre><code>+   Candy.
++   Gum.
++   Booze.
+</code></pre>
+
+<p>and this:</p>
+
+<pre><code>-   Candy.
+-   Gum.
+-   Booze.
+</code></pre>
+
+<p>all produce the same output:</p>
+
+<pre><code>&lt;ul&gt;
+&lt;li&gt;Candy.&lt;/li&gt;
+&lt;li&gt;Gum.&lt;/li&gt;
+&lt;li&gt;Booze.&lt;/li&gt;
+&lt;/ul&gt;
+</code></pre>
+
+<p>Ordered (numbered) lists use regular numbers, followed by periods, as
+list markers:</p>
+
+<pre><code>1.  Red
+2.  Green
+3.  Blue
+</code></pre>
+
+<p>Output:</p>
+
+<pre><code>&lt;ol&gt;
+&lt;li&gt;Red&lt;/li&gt;
+&lt;li&gt;Green&lt;/li&gt;
+&lt;li&gt;Blue&lt;/li&gt;
+&lt;/ol&gt;
+</code></pre>
+
+<p>If you put blank lines between items, you'll get <code>&lt;p&gt;</code> tags for the
+list item text. You can create multi-paragraph list items by indenting
+the paragraphs by 4 spaces or 1 tab:</p>
+
+<pre><code>*   A list item.
+
+    With multiple paragraphs.
+
+*   Another item in the list.
+</code></pre>
+
+<p>Output:</p>
+
+<pre><code>&lt;ul&gt;
+&lt;li&gt;&lt;p&gt;A list item.&lt;/p&gt;
+&lt;p&gt;With multiple paragraphs.&lt;/p&gt;&lt;/li&gt;
+&lt;li&gt;&lt;p&gt;Another item in the list.&lt;/p&gt;&lt;/li&gt;
+&lt;/ul&gt;
+</code></pre>
+
+<h3 id="links">Links</h3>
+
+<p>Markdown supports two styles for creating links: <em>inline</em> and
+<em>reference</em>. With both styles, you use square brackets to delimit the
+text you want to turn into a link.</p>
+
+<p>Inline-style links use parentheses immediately after the link text.
+For example:</p>
+
+<pre><code>This is an [example link](http://example.com/).
+</code></pre>
+
+<p>Output:</p>
+
+<pre><code>&lt;p&gt;This is an &lt;a href="http://example.com/"&gt;
+example link&lt;/a&gt;.&lt;/p&gt;
+</code></pre>
+
+<p>Optionally, you may include a title attribute in the parentheses:</p>
+
+<pre><code>This is an [example link](http://example.com/ "With a Title").
+</code></pre>
+
+<p>Output:</p>
+
+<pre><code>&lt;p&gt;This is an &lt;a href="http://example.com/" title="With a Title"&gt;
+example link&lt;/a&gt;.&lt;/p&gt;
+</code></pre>
+
+<p>Reference-style links allow you to refer to your links by names, which
+you define elsewhere in your document:</p>
+
+<pre><code>I get 10 times more traffic from [Google][1] than from
+[Yahoo][2] or [MSN][3].
+
+[1]: http://google.com/        "Google"
+[2]: http://search.yahoo.com/  "Yahoo Search"
+[3]: http://search.msn.com/    "MSN Search"
+</code></pre>
+
+<p>Output:</p>
+
+<pre><code>&lt;p&gt;I get 10 times more traffic from &lt;a href="http://google.com/"
+title="Google"&gt;Google&lt;/a&gt; than from &lt;a href="http://search.yahoo.com/"
+title="Yahoo Search"&gt;Yahoo&lt;/a&gt; or &lt;a href="http://search.msn.com/"
+title="MSN Search"&gt;MSN&lt;/a&gt;.&lt;/p&gt;
+</code></pre>
+
+<p>The title attribute is optional. Link names may contain letters,
+numbers and spaces, but are <em>not</em> case sensitive:</p>
+
+<pre><code>I start my morning with a cup of coffee and
+[The New York Times][NY Times].
+
+[ny times]: http://www.nytimes.com/
+</code></pre>
+
+<p>Output:</p>
+
+<pre><code>&lt;p&gt;I start my morning with a cup of coffee and
+&lt;a href="http://www.nytimes.com/"&gt;The New York Times&lt;/a&gt;.&lt;/p&gt;
+</code></pre>
+
+<h3 id="images">Images</h3>
+
+<p>Image syntax is very much like link syntax.</p>
+
+<p>Inline (titles are optional):</p>
+
+<pre><code>![alt text](/path/to/img.jpg "Title")
+</code></pre>
+
+<p>Reference-style:</p>
+
+<pre><code>![alt text][id]
+
+[id]: /path/to/img.jpg "Title"
+</code></pre>
+
+<p>Both of the above examples produce the same output:</p>
+
+<pre><code>&lt;img src="/path/to/img.jpg" alt="alt text" title="Title" /&gt;
+</code></pre>
+
+<h3 id="code">Code</h3>
+
+<p>In a regular paragraph, you can create code span by wrapping text in
+backtick quotes. Any ampersands (<code>&amp;</code>) and angle brackets (<code>&lt;</code> or
+<code>&gt;</code>) will automatically be translated into HTML entities. This makes
+it easy to use Markdown to write about HTML example code:</p>
+
+<pre><code>I strongly recommend against using any `&lt;blink&gt;` tags.
+
+I wish SmartyPants used named entities like `&amp;mdash;`
+instead of decimal-encoded entites like `&amp;#8212;`.
+</code></pre>
+
+<p>Output:</p>
+
+<pre><code>&lt;p&gt;I strongly recommend against using any
+&lt;code&gt;&amp;lt;blink&amp;gt;&lt;/code&gt; tags.&lt;/p&gt;
+
+&lt;p&gt;I wish SmartyPants used named entities like
+&lt;code&gt;&amp;amp;mdash;&lt;/code&gt; instead of decimal-encoded
+entites like &lt;code&gt;&amp;amp;#8212;&lt;/code&gt;.&lt;/p&gt;
+</code></pre>
+
+<p>To specify an entire block of pre-formatted code, indent every line of
+the block by 4 spaces or 1 tab. Just like with code spans, <code>&amp;</code>, <code>&lt;</code>,
+and <code>&gt;</code> characters will be escaped automatically.</p>
+
+<p>Markdown:</p>
+
+<pre><code>If you want your page to validate under XHTML 1.0 Strict,
+you've got to put paragraph tags in your blockquotes:
+
+    &lt;blockquote&gt;
+        &lt;p&gt;For example.&lt;/p&gt;
+    &lt;/blockquote&gt;
+</code></pre>
+
+<p>Output:</p>
+
+<pre><code>&lt;p&gt;If you want your page to validate under XHTML 1.0 Strict,
+you've got to put paragraph tags in your blockquotes:&lt;/p&gt;
+
+&lt;pre&gt;&lt;code&gt;&amp;lt;blockquote&amp;gt;
+    &amp;lt;p&amp;gt;For example.&amp;lt;/p&amp;gt;
+&amp;lt;/blockquote&amp;gt;
+&lt;/code&gt;&lt;/pre&gt;
+</code></pre>
diff --git a/packages/markdown/marked/test/original/markdown_documentation_basics.md b/packages/markdown/marked/test/original/markdown_documentation_basics.md
new file mode 100644
index 00000000..23079a33
--- /dev/null
+++ b/packages/markdown/marked/test/original/markdown_documentation_basics.md
@@ -0,0 +1,310 @@
+---
+pedantic: true
+---
+
+Markdown: Basics
+================
+
+<ul id="ProjectSubmenu">
+    <li><a href="/projects/markdown/" title="Markdown Project Page">Main</a></li>
+    <li><a class="selected" title="Markdown Basics">Basics</a></li>
+    <li><a href="/projects/markdown/syntax" title="Markdown Syntax Documentation">Syntax</a></li>
+    <li><a href="/projects/markdown/license" title="Pricing and License Information">License</a></li>
+    <li><a href="/projects/markdown/dingus" title="Online Markdown Web Form">Dingus</a></li>
+</ul>
+
+
+Getting the Gist of Markdown's Formatting Syntax
+------------------------------------------------
+
+This page offers a brief overview of what it's like to use Markdown.
+The [syntax page] [s] provides complete, detailed documentation for
+every feature, but Markdown should be very easy to pick up simply by
+looking at a few examples of it in action. The examples on this page
+are written in a before/after style, showing example syntax and the
+HTML output produced by Markdown.
+
+It's also helpful to simply try Markdown out; the [Dingus] [d] is a
+web application that allows you type your own Markdown-formatted text
+and translate it to XHTML.
+
+**Note:** This document is itself written using Markdown; you
+can [see the source for it by adding '.text' to the URL] [src].
+
+  [s]: /projects/markdown/syntax  "Markdown Syntax"
+  [d]: /projects/markdown/dingus  "Markdown Dingus"
+  [src]: /projects/markdown/basics.text
+
+
+## Paragraphs, Headers, Blockquotes ##
+
+A paragraph is simply one or more consecutive lines of text, separated
+by one or more blank lines. (A blank line is any line that looks like a
+blank line -- a line containing nothing spaces or tabs is considered
+blank.) Normal paragraphs should not be intended with spaces or tabs.
+
+Markdown offers two styles of headers: *Setext* and *atx*.
+Setext-style headers for `<h1>` and `<h2>` are created by
+"underlining" with equal signs (`=`) and hyphens (`-`), respectively.
+To create an atx-style header, you put 1-6 hash marks (`#`) at the
+beginning of the line -- the number of hashes equals the resulting
+HTML header level.
+
+Blockquotes are indicated using email-style '`>`' angle brackets.
+
+Markdown:
+
+    A First Level Header
+    ====================
+    
+    A Second Level Header
+    ---------------------
+
+    Now is the time for all good men to come to
+    the aid of their country. This is just a
+    regular paragraph.
+
+    The quick brown fox jumped over the lazy
+    dog's back.
+    
+    ### Header 3
+
+    > This is a blockquote.
+    > 
+    > This is the second paragraph in the blockquote.
+    >
+    > ## This is an H2 in a blockquote
+
+
+Output:
+
+    <h1>A First Level Header</h1>
+    
+    <h2>A Second Level Header</h2>
+    
+    <p>Now is the time for all good men to come to
+    the aid of their country. This is just a
+    regular paragraph.</p>
+    
+    <p>The quick brown fox jumped over the lazy
+    dog's back.</p>
+    
+    <h3>Header 3</h3>
+    
+    <blockquote>
+        <p>This is a blockquote.</p>
+        
+        <p>This is the second paragraph in the blockquote.</p>
+        
+        <h2>This is an H2 in a blockquote</h2>
+    </blockquote>
+
+
+
+### Phrase Emphasis ###
+
+Markdown uses asterisks and underscores to indicate spans of emphasis.
+
+Markdown:
+
+    Some of these words *are emphasized*.
+    Some of these words _are emphasized also_.
+    
+    Use two asterisks for **strong emphasis**.
+    Or, if you prefer, __use two underscores instead__.
+
+Output:
+
+    <p>Some of these words <em>are emphasized</em>.
+    Some of these words <em>are emphasized also</em>.</p>
+    
+    <p>Use two asterisks for <strong>strong emphasis</strong>.
+    Or, if you prefer, <strong>use two underscores instead</strong>.</p>
+   
+
+
+## Lists ##
+
+Unordered (bulleted) lists use asterisks, pluses, and hyphens (`*`,
+`+`, and `-`) as list markers. These three markers are
+interchangable; this:
+
+    *   Candy.
+    *   Gum.
+    *   Booze.
+
+this:
+
+    +   Candy.
+    +   Gum.
+    +   Booze.
+
+and this:
+
+    -   Candy.
+    -   Gum.
+    -   Booze.
+
+all produce the same output:
+
+    <ul>
+    <li>Candy.</li>
+    <li>Gum.</li>
+    <li>Booze.</li>
+    </ul>
+
+Ordered (numbered) lists use regular numbers, followed by periods, as
+list markers:
+
+    1.  Red
+    2.  Green
+    3.  Blue
+
+Output:
+
+    <ol>
+    <li>Red</li>
+    <li>Green</li>
+    <li>Blue</li>
+    </ol>
+
+If you put blank lines between items, you'll get `<p>` tags for the
+list item text. You can create multi-paragraph list items by indenting
+the paragraphs by 4 spaces or 1 tab:
+
+    *   A list item.
+    
+        With multiple paragraphs.
+
+    *   Another item in the list.
+
+Output:
+
+    <ul>
+    <li><p>A list item.</p>
+    <p>With multiple paragraphs.</p></li>
+    <li><p>Another item in the list.</p></li>
+    </ul>
+    
+
+
+### Links ###
+
+Markdown supports two styles for creating links: *inline* and
+*reference*. With both styles, you use square brackets to delimit the
+text you want to turn into a link.
+
+Inline-style links use parentheses immediately after the link text.
+For example:
+
+    This is an [example link](http://example.com/).
+
+Output:
+
+    <p>This is an <a href="http://example.com/">
+    example link</a>.</p>
+
+Optionally, you may include a title attribute in the parentheses:
+
+    This is an [example link](http://example.com/ "With a Title").
+
+Output:
+
+    <p>This is an <a href="http://example.com/" title="With a Title">
+    example link</a>.</p>
+
+Reference-style links allow you to refer to your links by names, which
+you define elsewhere in your document:
+
+    I get 10 times more traffic from [Google][1] than from
+    [Yahoo][2] or [MSN][3].
+
+    [1]: http://google.com/        "Google"
+    [2]: http://search.yahoo.com/  "Yahoo Search"
+    [3]: http://search.msn.com/    "MSN Search"
+
+Output:
+
+    <p>I get 10 times more traffic from <a href="http://google.com/"
+    title="Google">Google</a> than from <a href="http://search.yahoo.com/"
+    title="Yahoo Search">Yahoo</a> or <a href="http://search.msn.com/"
+    title="MSN Search">MSN</a>.</p>
+
+The title attribute is optional. Link names may contain letters,
+numbers and spaces, but are *not* case sensitive:
+
+    I start my morning with a cup of coffee and
+    [The New York Times][NY Times].
+
+    [ny times]: http://www.nytimes.com/
+
+Output:
+
+    <p>I start my morning with a cup of coffee and
+    <a href="http://www.nytimes.com/">The New York Times</a>.</p>
+
+
+### Images ###
+
+Image syntax is very much like link syntax.
+
+Inline (titles are optional):
+
+    ![alt text](/path/to/img.jpg "Title")
+
+Reference-style:
+
+    ![alt text][id]
+
+    [id]: /path/to/img.jpg "Title"
+
+Both of the above examples produce the same output:
+
+    <img src="/path/to/img.jpg" alt="alt text" title="Title" />
+
+
+
+### Code ###
+
+In a regular paragraph, you can create code span by wrapping text in
+backtick quotes. Any ampersands (`&`) and angle brackets (`<` or
+`>`) will automatically be translated into HTML entities. This makes
+it easy to use Markdown to write about HTML example code:
+
+    I strongly recommend against using any `<blink>` tags.
+
+    I wish SmartyPants used named entities like `&mdash;`
+    instead of decimal-encoded entites like `&#8212;`.
+
+Output:
+
+    <p>I strongly recommend against using any
+    <code>&lt;blink&gt;</code> tags.</p>
+    
+    <p>I wish SmartyPants used named entities like
+    <code>&amp;mdash;</code> instead of decimal-encoded
+    entites like <code>&amp;#8212;</code>.</p>
+
+
+To specify an entire block of pre-formatted code, indent every line of
+the block by 4 spaces or 1 tab. Just like with code spans, `&`, `<`,
+and `>` characters will be escaped automatically.
+
+Markdown:
+
+    If you want your page to validate under XHTML 1.0 Strict,
+    you've got to put paragraph tags in your blockquotes:
+
+        <blockquote>
+            <p>For example.</p>
+        </blockquote>
+
+Output:
+
+    <p>If you want your page to validate under XHTML 1.0 Strict,
+    you've got to put paragraph tags in your blockquotes:</p>
+    
+    <pre><code>&lt;blockquote&gt;
+        &lt;p&gt;For example.&lt;/p&gt;
+    &lt;/blockquote&gt;
+    </code></pre>
diff --git a/packages/markdown/marked/test/original/markdown_documentation_syntax.html b/packages/markdown/marked/test/original/markdown_documentation_syntax.html
new file mode 100644
index 00000000..5c01306c
--- /dev/null
+++ b/packages/markdown/marked/test/original/markdown_documentation_syntax.html
@@ -0,0 +1,942 @@
+<h1>Markdown: Syntax</h1>
+
+<ul id="ProjectSubmenu">
+    <li><a href="/projects/markdown/" title="Markdown Project Page">Main</a></li>
+    <li><a href="/projects/markdown/basics" title="Markdown Basics">Basics</a></li>
+    <li><a class="selected" title="Markdown Syntax Documentation">Syntax</a></li>
+    <li><a href="/projects/markdown/license" title="Pricing and License Information">License</a></li>
+    <li><a href="/projects/markdown/dingus" title="Online Markdown Web Form">Dingus</a></li>
+</ul>
+
+<ul>
+<li><a href="#overview">Overview</a>
+<ul>
+<li><a href="#philosophy">Philosophy</a></li>
+<li><a href="#html">Inline HTML</a></li>
+<li><a href="#autoescape">Automatic Escaping for Special Characters</a></li>
+</ul></li>
+<li><a href="#block">Block Elements</a>
+<ul>
+<li><a href="#p">Paragraphs and Line Breaks</a></li>
+<li><a href="#header">Headers</a></li>
+<li><a href="#blockquote">Blockquotes</a></li>
+<li><a href="#list">Lists</a></li>
+<li><a href="#precode">Code Blocks</a></li>
+<li><a href="#hr">Horizontal Rules</a></li>
+</ul></li>
+<li><a href="#span">Span Elements</a>
+<ul>
+<li><a href="#link">Links</a></li>
+<li><a href="#em">Emphasis</a></li>
+<li><a href="#code">Code</a></li>
+<li><a href="#img">Images</a></li>
+</ul></li>
+<li><a href="#misc">Miscellaneous</a>
+<ul>
+<li><a href="#backslash">Backslash Escapes</a></li>
+<li><a href="#autolink">Automatic Links</a></li>
+</ul></li>
+</ul>
+
+<p><strong>Note:</strong> This document is itself written using Markdown; you
+can <a href="/projects/markdown/syntax.text">see the source for it by adding '.text' to the URL</a>.</p>
+
+<hr />
+
+<h2 id="overview">Overview</h2>
+
+<h3 id="philosophy">Philosophy</h3>
+
+<p>Markdown is intended to be as easy-to-read and easy-to-write as is feasible.</p>
+
+<p>Readability, however, is emphasized above all else. A Markdown-formatted
+document should be publishable as-is, as plain text, without looking
+like it's been marked up with tags or formatting instructions. While
+Markdown's syntax has been influenced by several existing text-to-HTML
+filters -- including <a href="http://docutils.sourceforge.net/mirror/setext.html">Setext</a>, <a href="http://www.aaronsw.com/2002/atx/">atx</a>, <a href="http://textism.com/tools/textile/">Textile</a>, <a href="http://docutils.sourceforge.net/rst.html">reStructuredText</a>,
+<a href="http://www.triptico.com/software/grutatxt.html">Grutatext</a>, and <a href="http://ettext.taint.org/doc/">EtText</a> -- the single biggest source of
+inspiration for Markdown's syntax is the format of plain text email.</p>
+
+<p>To this end, Markdown's syntax is comprised entirely of punctuation
+characters, which punctuation characters have been carefully chosen so
+as to look like what they mean. E.g., asterisks around a word actually
+look like *emphasis*. Markdown lists look like, well, lists. Even
+blockquotes look like quoted passages of text, assuming you've ever
+used email.</p>
+
+<h3 id="html">Inline HTML</h3>
+
+<p>Markdown's syntax is intended for one purpose: to be used as a
+format for <em>writing</em> for the web.</p>
+
+<p>Markdown is not a replacement for HTML, or even close to it. Its
+syntax is very small, corresponding only to a very small subset of
+HTML tags. The idea is <em>not</em> to create a syntax that makes it easier
+to insert HTML tags. In my opinion, HTML tags are already easy to
+insert. The idea for Markdown is to make it easy to read, write, and
+edit prose. HTML is a <em>publishing</em> format; Markdown is a <em>writing</em>
+format. Thus, Markdown's formatting syntax only addresses issues that
+can be conveyed in plain text.</p>
+
+<p>For any markup that is not covered by Markdown's syntax, you simply
+use HTML itself. There's no need to preface it or delimit it to
+indicate that you're switching from Markdown to HTML; you just use
+the tags.</p>
+
+<p>The only restrictions are that block-level HTML elements -- e.g. <code>&lt;div&gt;</code>,
+<code>&lt;table&gt;</code>, <code>&lt;pre&gt;</code>, <code>&lt;p&gt;</code>, etc. -- must be separated from surrounding
+content by blank lines, and the start and end tags of the block should
+not be indented with tabs or spaces. Markdown is smart enough not
+to add extra (unwanted) <code>&lt;p&gt;</code> tags around HTML block-level tags.</p>
+
+<p>For example, to add an HTML table to a Markdown article:</p>
+
+<pre><code>This is a regular paragraph.
+
+&lt;table&gt;
+    &lt;tr&gt;
+        &lt;td&gt;Foo&lt;/td&gt;
+    &lt;/tr&gt;
+&lt;/table&gt;
+
+This is another regular paragraph.
+</code></pre>
+
+<p>Note that Markdown formatting syntax is not processed within block-level
+HTML tags. E.g., you can't use Markdown-style <code>*emphasis*</code> inside an
+HTML block.</p>
+
+<p>Span-level HTML tags -- e.g. <code>&lt;span&gt;</code>, <code>&lt;cite&gt;</code>, or <code>&lt;del&gt;</code> -- can be
+used anywhere in a Markdown paragraph, list item, or header. If you
+want, you can even use HTML tags instead of Markdown formatting; e.g. if
+you'd prefer to use HTML <code>&lt;a&gt;</code> or <code>&lt;img&gt;</code> tags instead of Markdown's
+link or image syntax, go right ahead.</p>
+
+<p>Unlike block-level HTML tags, Markdown syntax <em>is</em> processed within
+span-level tags.</p>
+
+<h3 id="autoescape">Automatic Escaping for Special Characters</h3>
+
+<p>In HTML, there are two characters that demand special treatment: <code>&lt;</code>
+and <code>&amp;</code>. Left angle brackets are used to start tags; ampersands are
+used to denote HTML entities. If you want to use them as literal
+characters, you must escape them as entities, e.g. <code>&amp;lt;</code>, and
+<code>&amp;amp;</code>.</p>
+
+<p>Ampersands in particular are bedeviling for web writers. If you want to
+write about 'AT&amp;T', you need to write '<code>AT&amp;amp;T</code>'. You even need to
+escape ampersands within URLs. Thus, if you want to link to:</p>
+
+<pre><code>http://images.google.com/images?num=30&amp;q=larry+bird
+</code></pre>
+
+<p>you need to encode the URL as:</p>
+
+<pre><code>http://images.google.com/images?num=30&amp;amp;q=larry+bird
+</code></pre>
+
+<p>in your anchor tag <code>href</code> attribute. Needless to say, this is easy to
+forget, and is probably the single most common source of HTML validation
+errors in otherwise well-marked-up web sites.</p>
+
+<p>Markdown allows you to use these characters naturally, taking care of
+all the necessary escaping for you. If you use an ampersand as part of
+an HTML entity, it remains unchanged; otherwise it will be translated
+into <code>&amp;amp;</code>.</p>
+
+<p>So, if you want to include a copyright symbol in your article, you can write:</p>
+
+<pre><code>&amp;copy;
+</code></pre>
+
+<p>and Markdown will leave it alone. But if you write:</p>
+
+<pre><code>AT&amp;T
+</code></pre>
+
+<p>Markdown will translate it to:</p>
+
+<pre><code>AT&amp;amp;T
+</code></pre>
+
+<p>Similarly, because Markdown supports <a href="#html">inline HTML</a>, if you use
+angle brackets as delimiters for HTML tags, Markdown will treat them as
+such. But if you write:</p>
+
+<pre><code>4 &lt; 5
+</code></pre>
+
+<p>Markdown will translate it to:</p>
+
+<pre><code>4 &amp;lt; 5
+</code></pre>
+
+<p>However, inside Markdown code spans and blocks, angle brackets and
+ampersands are <em>always</em> encoded automatically. This makes it easy to use
+Markdown to write about HTML code. (As opposed to raw HTML, which is a
+terrible format for writing about HTML syntax, because every single <code>&lt;</code>
+and <code>&amp;</code> in your example code needs to be escaped.)</p>
+
+<hr />
+
+<h2 id="block">Block Elements</h2>
+
+<h3 id="p">Paragraphs and Line Breaks</h3>
+
+<p>A paragraph is simply one or more consecutive lines of text, separated
+by one or more blank lines. (A blank line is any line that looks like a
+blank line -- a line containing nothing but spaces or tabs is considered
+blank.) Normal paragraphs should not be intended with spaces or tabs.</p>
+
+<p>The implication of the "one or more consecutive lines of text" rule is
+that Markdown supports "hard-wrapped" text paragraphs. This differs
+significantly from most other text-to-HTML formatters (including Movable
+Type's "Convert Line Breaks" option) which translate every line break
+character in a paragraph into a <code>&lt;br /&gt;</code> tag.</p>
+
+<p>When you <em>do</em> want to insert a <code>&lt;br /&gt;</code> break tag using Markdown, you
+end a line with two or more spaces, then type return.</p>
+
+<p>Yes, this takes a tad more effort to create a <code>&lt;br /&gt;</code>, but a simplistic
+"every line break is a <code>&lt;br /&gt;</code>" rule wouldn't work for Markdown.
+Markdown's email-style <a href="#blockquote">blockquoting</a> and multi-paragraph <a href="#list">list items</a>
+work best -- and look better -- when you format them with hard breaks.</p>
+
+<h3 id="header">Headers</h3>
+
+<p>Markdown supports two styles of headers, <a href="http://docutils.sourceforge.net/mirror/setext.html">Setext</a> and <a href="http://www.aaronsw.com/2002/atx/">atx</a>.</p>
+
+<p>Setext-style headers are "underlined" using equal signs (for first-level
+headers) and dashes (for second-level headers). For example:</p>
+
+<pre><code>This is an H1
+=============
+
+This is an H2
+-------------
+</code></pre>
+
+<p>Any number of underlining <code>=</code>'s or <code>-</code>'s will work.</p>
+
+<p>Atx-style headers use 1-6 hash characters at the start of the line,
+corresponding to header levels 1-6. For example:</p>
+
+<pre><code># This is an H1
+
+## This is an H2
+
+###### This is an H6
+</code></pre>
+
+<p>Optionally, you may "close" atx-style headers. This is purely
+cosmetic -- you can use this if you think it looks better. The
+closing hashes don't even need to match the number of hashes
+used to open the header. (The number of opening hashes
+determines the header level.) :</p>
+
+<pre><code># This is an H1 #
+
+## This is an H2 ##
+
+### This is an H3 ######
+</code></pre>
+
+<h3 id="blockquote">Blockquotes</h3>
+
+<p>Markdown uses email-style <code>&gt;</code> characters for blockquoting. If you're
+familiar with quoting passages of text in an email message, then you
+know how to create a blockquote in Markdown. It looks best if you hard
+wrap the text and put a <code>&gt;</code> before every line:</p>
+
+<pre><code>&gt; This is a blockquote with two paragraphs. Lorem ipsum dolor sit amet,
+&gt; consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.
+&gt; Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.
+&gt; 
+&gt; Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse
+&gt; id sem consectetuer libero luctus adipiscing.
+</code></pre>
+
+<p>Markdown allows you to be lazy and only put the <code>&gt;</code> before the first
+line of a hard-wrapped paragraph:</p>
+
+<pre><code>&gt; This is a blockquote with two paragraphs. Lorem ipsum dolor sit amet,
+consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.
+Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.
+
+&gt; Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse
+id sem consectetuer libero luctus adipiscing.
+</code></pre>
+
+<p>Blockquotes can be nested (i.e. a blockquote-in-a-blockquote) by
+adding additional levels of <code>&gt;</code>:</p>
+
+<pre><code>&gt; This is the first level of quoting.
+&gt;
+&gt; &gt; This is nested blockquote.
+&gt;
+&gt; Back to the first level.
+</code></pre>
+
+<p>Blockquotes can contain other Markdown elements, including headers, lists,
+and code blocks:</p>
+
+<pre><code>&gt; ## This is a header.
+&gt; 
+&gt; 1.   This is the first list item.
+&gt; 2.   This is the second list item.
+&gt; 
+&gt; Here's some example code:
+&gt; 
+&gt;     return shell_exec("echo $input | $markdown_script");
+</code></pre>
+
+<p>Any decent text editor should make email-style quoting easy. For
+example, with BBEdit, you can make a selection and choose Increase
+Quote Level from the Text menu.</p>
+
+<h3 id="list">Lists</h3>
+
+<p>Markdown supports ordered (numbered) and unordered (bulleted) lists.</p>
+
+<p>Unordered lists use asterisks, pluses, and hyphens -- interchangably
+-- as list markers:</p>
+
+<pre><code>*   Red
+*   Green
+*   Blue
+</code></pre>
+
+<p>is equivalent to:</p>
+
+<pre><code>+   Red
++   Green
++   Blue
+</code></pre>
+
+<p>and:</p>
+
+<pre><code>-   Red
+-   Green
+-   Blue
+</code></pre>
+
+<p>Ordered lists use numbers followed by periods:</p>
+
+<pre><code>1.  Bird
+2.  McHale
+3.  Parish
+</code></pre>
+
+<p>It's important to note that the actual numbers you use to mark the
+list have no effect on the HTML output Markdown produces. The HTML
+Markdown produces from the above list is:</p>
+
+<pre><code>&lt;ol&gt;
+&lt;li&gt;Bird&lt;/li&gt;
+&lt;li&gt;McHale&lt;/li&gt;
+&lt;li&gt;Parish&lt;/li&gt;
+&lt;/ol&gt;
+</code></pre>
+
+<p>If you instead wrote the list in Markdown like this:</p>
+
+<pre><code>1.  Bird
+1.  McHale
+1.  Parish
+</code></pre>
+
+<p>or even:</p>
+
+<pre><code>3. Bird
+1. McHale
+8. Parish
+</code></pre>
+
+<p>you'd get the exact same HTML output. The point is, if you want to,
+you can use ordinal numbers in your ordered Markdown lists, so that
+the numbers in your source match the numbers in your published HTML.
+But if you want to be lazy, you don't have to.</p>
+
+<p>If you do use lazy list numbering, however, you should still start the
+list with the number 1. At some point in the future, Markdown may support
+starting ordered lists at an arbitrary number.</p>
+
+<p>List markers typically start at the left margin, but may be indented by
+up to three spaces. List markers must be followed by one or more spaces
+or a tab.</p>
+
+<p>To make lists look nice, you can wrap items with hanging indents:</p>
+
+<pre><code>*   Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
+    Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi,
+    viverra nec, fringilla in, laoreet vitae, risus.
+*   Donec sit amet nisl. Aliquam semper ipsum sit amet velit.
+    Suspendisse id sem consectetuer libero luctus adipiscing.
+</code></pre>
+
+<p>But if you want to be lazy, you don't have to:</p>
+
+<pre><code>*   Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
+Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi,
+viverra nec, fringilla in, laoreet vitae, risus.
+*   Donec sit amet nisl. Aliquam semper ipsum sit amet velit.
+Suspendisse id sem consectetuer libero luctus adipiscing.
+</code></pre>
+
+<p>If list items are separated by blank lines, Markdown will wrap the
+items in <code>&lt;p&gt;</code> tags in the HTML output. For example, this input:</p>
+
+<pre><code>*   Bird
+*   Magic
+</code></pre>
+
+<p>will turn into:</p>
+
+<pre><code>&lt;ul&gt;
+&lt;li&gt;Bird&lt;/li&gt;
+&lt;li&gt;Magic&lt;/li&gt;
+&lt;/ul&gt;
+</code></pre>
+
+<p>But this:</p>
+
+<pre><code>*   Bird
+
+*   Magic
+</code></pre>
+
+<p>will turn into:</p>
+
+<pre><code>&lt;ul&gt;
+&lt;li&gt;&lt;p&gt;Bird&lt;/p&gt;&lt;/li&gt;
+&lt;li&gt;&lt;p&gt;Magic&lt;/p&gt;&lt;/li&gt;
+&lt;/ul&gt;
+</code></pre>
+
+<p>List items may consist of multiple paragraphs. Each subsequent
+paragraph in a list item must be intended by either 4 spaces
+or one tab:</p>
+
+<pre><code>1.  This is a list item with two paragraphs. Lorem ipsum dolor
+    sit amet, consectetuer adipiscing elit. Aliquam hendrerit
+    mi posuere lectus.
+
+    Vestibulum enim wisi, viverra nec, fringilla in, laoreet
+    vitae, risus. Donec sit amet nisl. Aliquam semper ipsum
+    sit amet velit.
+
+2.  Suspendisse id sem consectetuer libero luctus adipiscing.
+</code></pre>
+
+<p>It looks nice if you indent every line of the subsequent
+paragraphs, but here again, Markdown will allow you to be
+lazy:</p>
+
+<pre><code>*   This is a list item with two paragraphs.
+
+    This is the second paragraph in the list item. You're
+only required to indent the first line. Lorem ipsum dolor
+sit amet, consectetuer adipiscing elit.
+
+*   Another item in the same list.
+</code></pre>
+
+<p>To put a blockquote within a list item, the blockquote's <code>&gt;</code>
+delimiters need to be indented:</p>
+
+<pre><code>*   A list item with a blockquote:
+
+    &gt; This is a blockquote
+    &gt; inside a list item.
+</code></pre>
+
+<p>To put a code block within a list item, the code block needs
+to be indented <em>twice</em> -- 8 spaces or two tabs:</p>
+
+<pre><code>*   A list item with a code block:
+
+        &lt;code goes here&gt;
+</code></pre>
+
+<p>It's worth noting that it's possible to trigger an ordered list by
+accident, by writing something like this:</p>
+
+<pre><code>1986. What a great season.
+</code></pre>
+
+<p>In other words, a <em>number-period-space</em> sequence at the beginning of a
+line. To avoid this, you can backslash-escape the period:</p>
+
+<pre><code>1986\. What a great season.
+</code></pre>
+
+<h3 id="precode">Code Blocks</h3>
+
+<p>Pre-formatted code blocks are used for writing about programming or
+markup source code. Rather than forming normal paragraphs, the lines
+of a code block are interpreted literally. Markdown wraps a code block
+in both <code>&lt;pre&gt;</code> and <code>&lt;code&gt;</code> tags.</p>
+
+<p>To produce a code block in Markdown, simply indent every line of the
+block by at least 4 spaces or 1 tab. For example, given this input:</p>
+
+<pre><code>This is a normal paragraph:
+
+    This is a code block.
+</code></pre>
+
+<p>Markdown will generate:</p>
+
+<pre><code>&lt;p&gt;This is a normal paragraph:&lt;/p&gt;
+
+&lt;pre&gt;&lt;code&gt;This is a code block.
+&lt;/code&gt;&lt;/pre&gt;
+</code></pre>
+
+<p>One level of indentation -- 4 spaces or 1 tab -- is removed from each
+line of the code block. For example, this:</p>
+
+<pre><code>Here is an example of AppleScript:
+
+    tell application "Foo"
+        beep
+    end tell
+</code></pre>
+
+<p>will turn into:</p>
+
+<pre><code>&lt;p&gt;Here is an example of AppleScript:&lt;/p&gt;
+
+&lt;pre&gt;&lt;code&gt;tell application "Foo"
+    beep
+end tell
+&lt;/code&gt;&lt;/pre&gt;
+</code></pre>
+
+<p>A code block continues until it reaches a line that is not indented
+(or the end of the article).</p>
+
+<p>Within a code block, ampersands (<code>&amp;</code>) and angle brackets (<code>&lt;</code> and <code>&gt;</code>)
+are automatically converted into HTML entities. This makes it very
+easy to include example HTML source code using Markdown -- just paste
+it and indent it, and Markdown will handle the hassle of encoding the
+ampersands and angle brackets. For example, this:</p>
+
+<pre><code>    &lt;div class="footer"&gt;
+        &amp;copy; 2004 Foo Corporation
+    &lt;/div&gt;
+</code></pre>
+
+<p>will turn into:</p>
+
+<pre><code>&lt;pre&gt;&lt;code&gt;&amp;lt;div class="footer"&amp;gt;
+    &amp;amp;copy; 2004 Foo Corporation
+&amp;lt;/div&amp;gt;
+&lt;/code&gt;&lt;/pre&gt;
+</code></pre>
+
+<p>Regular Markdown syntax is not processed within code blocks. E.g.,
+asterisks are just literal asterisks within a code block. This means
+it's also easy to use Markdown to write about Markdown's own syntax.</p>
+
+<h3 id="hr">Horizontal Rules</h3>
+
+<p>You can produce a horizontal rule tag (<code>&lt;hr /&gt;</code>) by placing three or
+more hyphens, asterisks, or underscores on a line by themselves. If you
+wish, you may use spaces between the hyphens or asterisks. Each of the
+following lines will produce a horizontal rule:</p>
+
+<pre><code>* * *
+
+***
+
+*****
+
+- - -
+
+---------------------------------------
+
+_ _ _
+</code></pre>
+
+<hr />
+
+<h2 id="span">Span Elements</h2>
+
+<h3 id="link">Links</h3>
+
+<p>Markdown supports two style of links: <em>inline</em> and <em>reference</em>.</p>
+
+<p>In both styles, the link text is delimited by [square brackets].</p>
+
+<p>To create an inline link, use a set of regular parentheses immediately
+after the link text's closing square bracket. Inside the parentheses,
+put the URL where you want the link to point, along with an <em>optional</em>
+title for the link, surrounded in quotes. For example:</p>
+
+<pre><code>This is [an example](http://example.com/ "Title") inline link.
+
+[This link](http://example.net/) has no title attribute.
+</code></pre>
+
+<p>Will produce:</p>
+
+<pre><code>&lt;p&gt;This is &lt;a href="http://example.com/" title="Title"&gt;
+an example&lt;/a&gt; inline link.&lt;/p&gt;
+
+&lt;p&gt;&lt;a href="http://example.net/"&gt;This link&lt;/a&gt; has no
+title attribute.&lt;/p&gt;
+</code></pre>
+
+<p>If you're referring to a local resource on the same server, you can
+use relative paths:</p>
+
+<pre><code>See my [About](/about/) page for details.
+</code></pre>
+
+<p>Reference-style links use a second set of square brackets, inside
+which you place a label of your choosing to identify the link:</p>
+
+<pre><code>This is [an example][id] reference-style link.
+</code></pre>
+
+<p>You can optionally use a space to separate the sets of brackets:</p>
+
+<pre><code>This is [an example] [id] reference-style link.
+</code></pre>
+
+<p>Then, anywhere in the document, you define your link label like this,
+on a line by itself:</p>
+
+<pre><code>[id]: http://example.com/  "Optional Title Here"
+</code></pre>
+
+<p>That is:</p>
+
+<ul>
+<li>Square brackets containing the link identifier (optionally
+indented from the left margin using up to three spaces);</li>
+<li>followed by a colon;</li>
+<li>followed by one or more spaces (or tabs);</li>
+<li>followed by the URL for the link;</li>
+<li>optionally followed by a title attribute for the link, enclosed
+in double or single quotes.</li>
+</ul>
+
+<p>The link URL may, optionally, be surrounded by angle brackets:</p>
+
+<pre><code>[id]: &lt;http://example.com/&gt;  "Optional Title Here"
+</code></pre>
+
+<p>You can put the title attribute on the next line and use extra spaces
+or tabs for padding, which tends to look better with longer URLs:</p>
+
+<pre><code>[id]: http://example.com/longish/path/to/resource/here
+    "Optional Title Here"
+</code></pre>
+
+<p>Link definitions are only used for creating links during Markdown
+processing, and are stripped from your document in the HTML output.</p>
+
+<p>Link definition names may constist of letters, numbers, spaces, and punctuation -- but they are <em>not</em> case sensitive. E.g. these two links:</p>
+
+<pre><code>[link text][a]
+[link text][A]
+</code></pre>
+
+<p>are equivalent.</p>
+
+<p>The <em>implicit link name</em> shortcut allows you to omit the name of the
+link, in which case the link text itself is used as the name.
+Just use an empty set of square brackets -- e.g., to link the word
+"Google" to the google.com web site, you could simply write:</p>
+
+<pre><code>[Google][]
+</code></pre>
+
+<p>And then define the link:</p>
+
+<pre><code>[Google]: http://google.com/
+</code></pre>
+
+<p>Because link names may contain spaces, this shortcut even works for
+multiple words in the link text:</p>
+
+<pre><code>Visit [Daring Fireball][] for more information.
+</code></pre>
+
+<p>And then define the link:</p>
+
+<pre><code>[Daring Fireball]: http://daringfireball.net/
+</code></pre>
+
+<p>Link definitions can be placed anywhere in your Markdown document. I
+tend to put them immediately after each paragraph in which they're
+used, but if you want, you can put them all at the end of your
+document, sort of like footnotes.</p>
+
+<p>Here's an example of reference links in action:</p>
+
+<pre><code>I get 10 times more traffic from [Google] [1] than from
+[Yahoo] [2] or [MSN] [3].
+
+  [1]: http://google.com/        "Google"
+  [2]: http://search.yahoo.com/  "Yahoo Search"
+  [3]: http://search.msn.com/    "MSN Search"
+</code></pre>
+
+<p>Using the implicit link name shortcut, you could instead write:</p>
+
+<pre><code>I get 10 times more traffic from [Google][] than from
+[Yahoo][] or [MSN][].
+
+  [google]: http://google.com/        "Google"
+  [yahoo]:  http://search.yahoo.com/  "Yahoo Search"
+  [msn]:    http://search.msn.com/    "MSN Search"
+</code></pre>
+
+<p>Both of the above examples will produce the following HTML output:</p>
+
+<pre><code>&lt;p&gt;I get 10 times more traffic from &lt;a href="http://google.com/"
+title="Google"&gt;Google&lt;/a&gt; than from
+&lt;a href="http://search.yahoo.com/" title="Yahoo Search"&gt;Yahoo&lt;/a&gt;
+or &lt;a href="http://search.msn.com/" title="MSN Search"&gt;MSN&lt;/a&gt;.&lt;/p&gt;
+</code></pre>
+
+<p>For comparison, here is the same paragraph written using
+Markdown's inline link style:</p>
+
+<pre><code>I get 10 times more traffic from [Google](http://google.com/ "Google")
+than from [Yahoo](http://search.yahoo.com/ "Yahoo Search") or
+[MSN](http://search.msn.com/ "MSN Search").
+</code></pre>
+
+<p>The point of reference-style links is not that they're easier to
+write. The point is that with reference-style links, your document
+source is vastly more readable. Compare the above examples: using
+reference-style links, the paragraph itself is only 81 characters
+long; with inline-style links, it's 176 characters; and as raw HTML,
+it's 234 characters. In the raw HTML, there's more markup than there
+is text.</p>
+
+<p>With Markdown's reference-style links, a source document much more
+closely resembles the final output, as rendered in a browser. By
+allowing you to move the markup-related metadata out of the paragraph,
+you can add links without interrupting the narrative flow of your
+prose.</p>
+
+<h3 id="em">Emphasis</h3>
+
+<p>Markdown treats asterisks (<code>*</code>) and underscores (<code>_</code>) as indicators of
+emphasis. Text wrapped with one <code>*</code> or <code>_</code> will be wrapped with an
+HTML <code>&lt;em&gt;</code> tag; double <code>*</code>'s or <code>_</code>'s will be wrapped with an HTML
+<code>&lt;strong&gt;</code> tag. E.g., this input:</p>
+
+<pre><code>*single asterisks*
+
+_single underscores_
+
+**double asterisks**
+
+__double underscores__
+</code></pre>
+
+<p>will produce:</p>
+
+<pre><code>&lt;em&gt;single asterisks&lt;/em&gt;
+
+&lt;em&gt;single underscores&lt;/em&gt;
+
+&lt;strong&gt;double asterisks&lt;/strong&gt;
+
+&lt;strong&gt;double underscores&lt;/strong&gt;
+</code></pre>
+
+<p>You can use whichever style you prefer; the lone restriction is that
+the same character must be used to open and close an emphasis span.</p>
+
+<p>Emphasis can be used in the middle of a word:</p>
+
+<pre><code>un*fucking*believable
+</code></pre>
+
+<p>But if you surround an <code>*</code> or <code>_</code> with spaces, it'll be treated as a
+literal asterisk or underscore.</p>
+
+<p>To produce a literal asterisk or underscore at a position where it
+would otherwise be used as an emphasis delimiter, you can backslash
+escape it:</p>
+
+<pre><code>\*this text is surrounded by literal asterisks\*
+</code></pre>
+
+<h3 id="code">Code</h3>
+
+<p>To indicate a span of code, wrap it with backtick quotes (<code>`</code>).
+Unlike a pre-formatted code block, a code span indicates code within a
+normal paragraph. For example:</p>
+
+<pre><code>Use the `printf()` function.
+</code></pre>
+
+<p>will produce:</p>
+
+<pre><code>&lt;p&gt;Use the &lt;code&gt;printf()&lt;/code&gt; function.&lt;/p&gt;
+</code></pre>
+
+<p>To include a literal backtick character within a code span, you can use
+multiple backticks as the opening and closing delimiters:</p>
+
+<pre><code>``There is a literal backtick (`) here.``
+</code></pre>
+
+<p>which will produce this:</p>
+
+<pre><code>&lt;p&gt;&lt;code&gt;There is a literal backtick (`) here.&lt;/code&gt;&lt;/p&gt;
+</code></pre>
+
+<p>The backtick delimiters surrounding a code span may include spaces --
+one after the opening, one before the closing. This allows you to place
+literal backtick characters at the beginning or end of a code span:</p>
+
+<pre><code>A single backtick in a code span: `` ` ``
+
+A backtick-delimited string in a code span: `` `foo` ``
+</code></pre>
+
+<p>will produce:</p>
+
+<pre><code>&lt;p&gt;A single backtick in a code span: &lt;code&gt;`&lt;/code&gt;&lt;/p&gt;
+
+&lt;p&gt;A backtick-delimited string in a code span: &lt;code&gt;`foo`&lt;/code&gt;&lt;/p&gt;
+</code></pre>
+
+<p>With a code span, ampersands and angle brackets are encoded as HTML
+entities automatically, which makes it easy to include example HTML
+tags. Markdown will turn this:</p>
+
+<pre><code>Please don't use any `&lt;blink&gt;` tags.
+</code></pre>
+
+<p>into:</p>
+
+<pre><code>&lt;p&gt;Please don't use any &lt;code&gt;&amp;lt;blink&amp;gt;&lt;/code&gt; tags.&lt;/p&gt;
+</code></pre>
+
+<p>You can write this:</p>
+
+<pre><code>`&amp;#8212;` is the decimal-encoded equivalent of `&amp;mdash;`.
+</code></pre>
+
+<p>to produce:</p>
+
+<pre><code>&lt;p&gt;&lt;code&gt;&amp;amp;#8212;&lt;/code&gt; is the decimal-encoded
+equivalent of &lt;code&gt;&amp;amp;mdash;&lt;/code&gt;.&lt;/p&gt;
+</code></pre>
+
+<h3 id="img">Images</h3>
+
+<p>Admittedly, it's fairly difficult to devise a "natural" syntax for
+placing images into a plain text document format.</p>
+
+<p>Markdown uses an image syntax that is intended to resemble the syntax
+for links, allowing for two styles: <em>inline</em> and <em>reference</em>.</p>
+
+<p>Inline image syntax looks like this:</p>
+
+<pre><code>![Alt text](/path/to/img.jpg)
+
+![Alt text](/path/to/img.jpg "Optional title")
+</code></pre>
+
+<p>That is:</p>
+
+<ul>
+<li>An exclamation mark: <code>!</code>;</li>
+<li>followed by a set of square brackets, containing the <code>alt</code>
+attribute text for the image;</li>
+<li>followed by a set of parentheses, containing the URL or path to
+the image, and an optional <code>title</code> attribute enclosed in double
+or single quotes.</li>
+</ul>
+
+<p>Reference-style image syntax looks like this:</p>
+
+<pre><code>![Alt text][id]
+</code></pre>
+
+<p>Where "id" is the name of a defined image reference. Image references
+are defined using syntax identical to link references:</p>
+
+<pre><code>[id]: url/to/image  "Optional title attribute"
+</code></pre>
+
+<p>As of this writing, Markdown has no syntax for specifying the
+dimensions of an image; if this is important to you, you can simply
+use regular HTML <code>&lt;img&gt;</code> tags.</p>
+
+<hr />
+
+<h2 id="misc">Miscellaneous</h2>
+
+<h3 id="autolink">Automatic Links</h3>
+
+<p>Markdown supports a shortcut style for creating "automatic" links for URLs and email addresses: simply surround the URL or email address with angle brackets. What this means is that if you want to show the actual text of a URL or email address, and also have it be a clickable link, you can do this:</p>
+
+<pre><code>&lt;http://example.com/&gt;
+</code></pre>
+
+<p>Markdown will turn this into:</p>
+
+<pre><code>&lt;a href="http://example.com/"&gt;http://example.com/&lt;/a&gt;
+</code></pre>
+
+<p>Automatic links for email addresses work similarly, except that
+Markdown will also perform a bit of randomized decimal and hex
+entity-encoding to help obscure your address from address-harvesting
+spambots. For example, Markdown will turn this:</p>
+
+<pre><code>&lt;address@example.com&gt;
+</code></pre>
+
+<p>into something like this:</p>
+
+<pre><code>&lt;a href="&amp;#x6D;&amp;#x61;i&amp;#x6C;&amp;#x74;&amp;#x6F;:&amp;#x61;&amp;#x64;&amp;#x64;&amp;#x72;&amp;#x65;
+&amp;#115;&amp;#115;&amp;#64;&amp;#101;&amp;#120;&amp;#x61;&amp;#109;&amp;#x70;&amp;#x6C;e&amp;#x2E;&amp;#99;&amp;#111;
+&amp;#109;"&gt;&amp;#x61;&amp;#x64;&amp;#x64;&amp;#x72;&amp;#x65;&amp;#115;&amp;#115;&amp;#64;&amp;#101;&amp;#120;&amp;#x61;
+&amp;#109;&amp;#x70;&amp;#x6C;e&amp;#x2E;&amp;#99;&amp;#111;&amp;#109;&lt;/a&gt;
+</code></pre>
+
+<p>which will render in a browser as a clickable link to "address@example.com".</p>
+
+<p>(This sort of entity-encoding trick will indeed fool many, if not
+most, address-harvesting bots, but it definitely won't fool all of
+them. It's better than nothing, but an address published in this way
+will probably eventually start receiving spam.)</p>
+
+<h3 id="backslash">Backslash Escapes</h3>
+
+<p>Markdown allows you to use backslash escapes to generate literal
+characters which would otherwise have special meaning in Markdown's
+formatting syntax. For example, if you wanted to surround a word with
+literal asterisks (instead of an HTML <code>&lt;em&gt;</code> tag), you can backslashes
+before the asterisks, like this:</p>
+
+<pre><code>\*literal asterisks\*
+</code></pre>
+
+<p>Markdown provides backslash escapes for the following characters:</p>
+
+<pre><code>\   backslash
+`   backtick
+*   asterisk
+_   underscore
+{}  curly braces
+[]  square brackets
+()  parentheses
+#   hash mark
++   plus sign
+-   minus sign (hyphen)
+.   dot
+!   exclamation mark
+</code></pre>
diff --git a/packages/markdown/marked/test/original/markdown_documentation_syntax.md b/packages/markdown/marked/test/original/markdown_documentation_syntax.md
new file mode 100644
index 00000000..e3bd4a7f
--- /dev/null
+++ b/packages/markdown/marked/test/original/markdown_documentation_syntax.md
@@ -0,0 +1,892 @@
+---
+pedantic: true
+headerIds: false
+---
+
+Markdown: Syntax
+================
+
+<ul id="ProjectSubmenu">
+    <li><a href="/projects/markdown/" title="Markdown Project Page">Main</a></li>
+    <li><a href="/projects/markdown/basics" title="Markdown Basics">Basics</a></li>
+    <li><a class="selected" title="Markdown Syntax Documentation">Syntax</a></li>
+    <li><a href="/projects/markdown/license" title="Pricing and License Information">License</a></li>
+    <li><a href="/projects/markdown/dingus" title="Online Markdown Web Form">Dingus</a></li>
+</ul>
+
+
+*   [Overview](#overview)
+    *   [Philosophy](#philosophy)
+    *   [Inline HTML](#html)
+    *   [Automatic Escaping for Special Characters](#autoescape)
+*   [Block Elements](#block)
+    *   [Paragraphs and Line Breaks](#p)
+    *   [Headers](#header)
+    *   [Blockquotes](#blockquote)
+    *   [Lists](#list)
+    *   [Code Blocks](#precode)
+    *   [Horizontal Rules](#hr)
+*   [Span Elements](#span)
+    *   [Links](#link)
+    *   [Emphasis](#em)
+    *   [Code](#code)
+    *   [Images](#img)
+*   [Miscellaneous](#misc)
+    *   [Backslash Escapes](#backslash)
+    *   [Automatic Links](#autolink)
+
+
+**Note:** This document is itself written using Markdown; you
+can [see the source for it by adding '.text' to the URL][src].
+
+  [src]: /projects/markdown/syntax.text
+
+* * *
+
+<h2 id="overview">Overview</h2>
+
+<h3 id="philosophy">Philosophy</h3>
+
+Markdown is intended to be as easy-to-read and easy-to-write as is feasible.
+
+Readability, however, is emphasized above all else. A Markdown-formatted
+document should be publishable as-is, as plain text, without looking
+like it's been marked up with tags or formatting instructions. While
+Markdown's syntax has been influenced by several existing text-to-HTML
+filters -- including [Setext] [1], [atx] [2], [Textile] [3], [reStructuredText] [4],
+[Grutatext] [5], and [EtText] [6] -- the single biggest source of
+inspiration for Markdown's syntax is the format of plain text email.
+
+  [1]: http://docutils.sourceforge.net/mirror/setext.html
+  [2]: http://www.aaronsw.com/2002/atx/
+  [3]: http://textism.com/tools/textile/
+  [4]: http://docutils.sourceforge.net/rst.html
+  [5]: http://www.triptico.com/software/grutatxt.html
+  [6]: http://ettext.taint.org/doc/
+
+To this end, Markdown's syntax is comprised entirely of punctuation
+characters, which punctuation characters have been carefully chosen so
+as to look like what they mean. E.g., asterisks around a word actually
+look like \*emphasis\*. Markdown lists look like, well, lists. Even
+blockquotes look like quoted passages of text, assuming you've ever
+used email.
+
+
+
+<h3 id="html">Inline HTML</h3>
+
+Markdown's syntax is intended for one purpose: to be used as a
+format for *writing* for the web.
+
+Markdown is not a replacement for HTML, or even close to it. Its
+syntax is very small, corresponding only to a very small subset of
+HTML tags. The idea is *not* to create a syntax that makes it easier
+to insert HTML tags. In my opinion, HTML tags are already easy to
+insert. The idea for Markdown is to make it easy to read, write, and
+edit prose. HTML is a *publishing* format; Markdown is a *writing*
+format. Thus, Markdown's formatting syntax only addresses issues that
+can be conveyed in plain text.
+
+For any markup that is not covered by Markdown's syntax, you simply
+use HTML itself. There's no need to preface it or delimit it to
+indicate that you're switching from Markdown to HTML; you just use
+the tags.
+
+The only restrictions are that block-level HTML elements -- e.g. `<div>`,
+`<table>`, `<pre>`, `<p>`, etc. -- must be separated from surrounding
+content by blank lines, and the start and end tags of the block should
+not be indented with tabs or spaces. Markdown is smart enough not
+to add extra (unwanted) `<p>` tags around HTML block-level tags.
+
+For example, to add an HTML table to a Markdown article:
+
+    This is a regular paragraph.
+
+    <table>
+        <tr>
+            <td>Foo</td>
+        </tr>
+    </table>
+
+    This is another regular paragraph.
+
+Note that Markdown formatting syntax is not processed within block-level
+HTML tags. E.g., you can't use Markdown-style `*emphasis*` inside an
+HTML block.
+
+Span-level HTML tags -- e.g. `<span>`, `<cite>`, or `<del>` -- can be
+used anywhere in a Markdown paragraph, list item, or header. If you
+want, you can even use HTML tags instead of Markdown formatting; e.g. if
+you'd prefer to use HTML `<a>` or `<img>` tags instead of Markdown's
+link or image syntax, go right ahead.
+
+Unlike block-level HTML tags, Markdown syntax *is* processed within
+span-level tags.
+
+
+<h3 id="autoescape">Automatic Escaping for Special Characters</h3>
+
+In HTML, there are two characters that demand special treatment: `<`
+and `&`. Left angle brackets are used to start tags; ampersands are
+used to denote HTML entities. If you want to use them as literal
+characters, you must escape them as entities, e.g. `&lt;`, and
+`&amp;`.
+
+Ampersands in particular are bedeviling for web writers. If you want to
+write about 'AT&T', you need to write '`AT&amp;T`'. You even need to
+escape ampersands within URLs. Thus, if you want to link to:
+
+    http://images.google.com/images?num=30&q=larry+bird
+
+you need to encode the URL as:
+
+    http://images.google.com/images?num=30&amp;q=larry+bird
+
+in your anchor tag `href` attribute. Needless to say, this is easy to
+forget, and is probably the single most common source of HTML validation
+errors in otherwise well-marked-up web sites.
+
+Markdown allows you to use these characters naturally, taking care of
+all the necessary escaping for you. If you use an ampersand as part of
+an HTML entity, it remains unchanged; otherwise it will be translated
+into `&amp;`.
+
+So, if you want to include a copyright symbol in your article, you can write:
+
+    &copy;
+
+and Markdown will leave it alone. But if you write:
+
+    AT&T
+
+Markdown will translate it to:
+
+    AT&amp;T
+
+Similarly, because Markdown supports [inline HTML](#html), if you use
+angle brackets as delimiters for HTML tags, Markdown will treat them as
+such. But if you write:
+
+    4 < 5
+
+Markdown will translate it to:
+
+    4 &lt; 5
+
+However, inside Markdown code spans and blocks, angle brackets and
+ampersands are *always* encoded automatically. This makes it easy to use
+Markdown to write about HTML code. (As opposed to raw HTML, which is a
+terrible format for writing about HTML syntax, because every single `<`
+and `&` in your example code needs to be escaped.)
+
+
+* * *
+
+
+<h2 id="block">Block Elements</h2>
+
+
+<h3 id="p">Paragraphs and Line Breaks</h3>
+
+A paragraph is simply one or more consecutive lines of text, separated
+by one or more blank lines. (A blank line is any line that looks like a
+blank line -- a line containing nothing but spaces or tabs is considered
+blank.) Normal paragraphs should not be intended with spaces or tabs.
+
+The implication of the "one or more consecutive lines of text" rule is
+that Markdown supports "hard-wrapped" text paragraphs. This differs
+significantly from most other text-to-HTML formatters (including Movable
+Type's "Convert Line Breaks" option) which translate every line break
+character in a paragraph into a `<br />` tag.
+
+When you *do* want to insert a `<br />` break tag using Markdown, you
+end a line with two or more spaces, then type return.
+
+Yes, this takes a tad more effort to create a `<br />`, but a simplistic
+"every line break is a `<br />`" rule wouldn't work for Markdown.
+Markdown's email-style [blockquoting][bq] and multi-paragraph [list items][l]
+work best -- and look better -- when you format them with hard breaks.
+
+  [bq]: #blockquote
+  [l]:  #list
+
+
+
+<h3 id="header">Headers</h3>
+
+Markdown supports two styles of headers, [Setext] [1] and [atx] [2].
+
+Setext-style headers are "underlined" using equal signs (for first-level
+headers) and dashes (for second-level headers). For example:
+
+    This is an H1
+    =============
+
+    This is an H2
+    -------------
+
+Any number of underlining `=`'s or `-`'s will work.
+
+Atx-style headers use 1-6 hash characters at the start of the line,
+corresponding to header levels 1-6. For example:
+
+    # This is an H1
+
+    ## This is an H2
+
+    ###### This is an H6
+
+Optionally, you may "close" atx-style headers. This is purely
+cosmetic -- you can use this if you think it looks better. The
+closing hashes don't even need to match the number of hashes
+used to open the header. (The number of opening hashes
+determines the header level.) :
+
+    # This is an H1 #
+
+    ## This is an H2 ##
+
+    ### This is an H3 ######
+
+
+<h3 id="blockquote">Blockquotes</h3>
+
+Markdown uses email-style `>` characters for blockquoting. If you're
+familiar with quoting passages of text in an email message, then you
+know how to create a blockquote in Markdown. It looks best if you hard
+wrap the text and put a `>` before every line:
+
+    > This is a blockquote with two paragraphs. Lorem ipsum dolor sit amet,
+    > consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.
+    > Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.
+    >
+    > Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse
+    > id sem consectetuer libero luctus adipiscing.
+
+Markdown allows you to be lazy and only put the `>` before the first
+line of a hard-wrapped paragraph:
+
+    > This is a blockquote with two paragraphs. Lorem ipsum dolor sit amet,
+    consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.
+    Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.
+
+    > Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse
+    id sem consectetuer libero luctus adipiscing.
+
+Blockquotes can be nested (i.e. a blockquote-in-a-blockquote) by
+adding additional levels of `>`:
+
+    > This is the first level of quoting.
+    >
+    > > This is nested blockquote.
+    >
+    > Back to the first level.
+
+Blockquotes can contain other Markdown elements, including headers, lists,
+and code blocks:
+
+	> ## This is a header.
+	>
+	> 1.   This is the first list item.
+	> 2.   This is the second list item.
+	>
+	> Here's some example code:
+	>
+	>     return shell_exec("echo $input | $markdown_script");
+
+Any decent text editor should make email-style quoting easy. For
+example, with BBEdit, you can make a selection and choose Increase
+Quote Level from the Text menu.
+
+
+<h3 id="list">Lists</h3>
+
+Markdown supports ordered (numbered) and unordered (bulleted) lists.
+
+Unordered lists use asterisks, pluses, and hyphens -- interchangably
+-- as list markers:
+
+    *   Red
+    *   Green
+    *   Blue
+
+is equivalent to:
+
+    +   Red
+    +   Green
+    +   Blue
+
+and:
+
+    -   Red
+    -   Green
+    -   Blue
+
+Ordered lists use numbers followed by periods:
+
+    1.  Bird
+    2.  McHale
+    3.  Parish
+
+It's important to note that the actual numbers you use to mark the
+list have no effect on the HTML output Markdown produces. The HTML
+Markdown produces from the above list is:
+
+    <ol>
+    <li>Bird</li>
+    <li>McHale</li>
+    <li>Parish</li>
+    </ol>
+
+If you instead wrote the list in Markdown like this:
+
+    1.  Bird
+    1.  McHale
+    1.  Parish
+
+or even:
+
+    3. Bird
+    1. McHale
+    8. Parish
+
+you'd get the exact same HTML output. The point is, if you want to,
+you can use ordinal numbers in your ordered Markdown lists, so that
+the numbers in your source match the numbers in your published HTML.
+But if you want to be lazy, you don't have to.
+
+If you do use lazy list numbering, however, you should still start the
+list with the number 1. At some point in the future, Markdown may support
+starting ordered lists at an arbitrary number.
+
+List markers typically start at the left margin, but may be indented by
+up to three spaces. List markers must be followed by one or more spaces
+or a tab.
+
+To make lists look nice, you can wrap items with hanging indents:
+
+    *   Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
+        Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi,
+        viverra nec, fringilla in, laoreet vitae, risus.
+    *   Donec sit amet nisl. Aliquam semper ipsum sit amet velit.
+        Suspendisse id sem consectetuer libero luctus adipiscing.
+
+But if you want to be lazy, you don't have to:
+
+    *   Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
+    Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi,
+    viverra nec, fringilla in, laoreet vitae, risus.
+    *   Donec sit amet nisl. Aliquam semper ipsum sit amet velit.
+    Suspendisse id sem consectetuer libero luctus adipiscing.
+
+If list items are separated by blank lines, Markdown will wrap the
+items in `<p>` tags in the HTML output. For example, this input:
+
+    *   Bird
+    *   Magic
+
+will turn into:
+
+    <ul>
+    <li>Bird</li>
+    <li>Magic</li>
+    </ul>
+
+But this:
+
+    *   Bird
+
+    *   Magic
+
+will turn into:
+
+    <ul>
+    <li><p>Bird</p></li>
+    <li><p>Magic</p></li>
+    </ul>
+
+List items may consist of multiple paragraphs. Each subsequent
+paragraph in a list item must be intended by either 4 spaces
+or one tab:
+
+    1.  This is a list item with two paragraphs. Lorem ipsum dolor
+        sit amet, consectetuer adipiscing elit. Aliquam hendrerit
+        mi posuere lectus.
+
+        Vestibulum enim wisi, viverra nec, fringilla in, laoreet
+        vitae, risus. Donec sit amet nisl. Aliquam semper ipsum
+        sit amet velit.
+
+    2.  Suspendisse id sem consectetuer libero luctus adipiscing.
+
+It looks nice if you indent every line of the subsequent
+paragraphs, but here again, Markdown will allow you to be
+lazy:
+
+    *   This is a list item with two paragraphs.
+
+        This is the second paragraph in the list item. You're
+    only required to indent the first line. Lorem ipsum dolor
+    sit amet, consectetuer adipiscing elit.
+
+    *   Another item in the same list.
+
+To put a blockquote within a list item, the blockquote's `>`
+delimiters need to be indented:
+
+    *   A list item with a blockquote:
+
+        > This is a blockquote
+        > inside a list item.
+
+To put a code block within a list item, the code block needs
+to be indented *twice* -- 8 spaces or two tabs:
+
+    *   A list item with a code block:
+
+            <code goes here>
+
+
+It's worth noting that it's possible to trigger an ordered list by
+accident, by writing something like this:
+
+    1986. What a great season.
+
+In other words, a *number-period-space* sequence at the beginning of a
+line. To avoid this, you can backslash-escape the period:
+
+    1986\. What a great season.
+
+
+
+<h3 id="precode">Code Blocks</h3>
+
+Pre-formatted code blocks are used for writing about programming or
+markup source code. Rather than forming normal paragraphs, the lines
+of a code block are interpreted literally. Markdown wraps a code block
+in both `<pre>` and `<code>` tags.
+
+To produce a code block in Markdown, simply indent every line of the
+block by at least 4 spaces or 1 tab. For example, given this input:
+
+    This is a normal paragraph:
+
+        This is a code block.
+
+Markdown will generate:
+
+    <p>This is a normal paragraph:</p>
+
+    <pre><code>This is a code block.
+    </code></pre>
+
+One level of indentation -- 4 spaces or 1 tab -- is removed from each
+line of the code block. For example, this:
+
+    Here is an example of AppleScript:
+
+        tell application "Foo"
+            beep
+        end tell
+
+will turn into:
+
+    <p>Here is an example of AppleScript:</p>
+
+    <pre><code>tell application "Foo"
+        beep
+    end tell
+    </code></pre>
+
+A code block continues until it reaches a line that is not indented
+(or the end of the article).
+
+Within a code block, ampersands (`&`) and angle brackets (`<` and `>`)
+are automatically converted into HTML entities. This makes it very
+easy to include example HTML source code using Markdown -- just paste
+it and indent it, and Markdown will handle the hassle of encoding the
+ampersands and angle brackets. For example, this:
+
+        <div class="footer">
+            &copy; 2004 Foo Corporation
+        </div>
+
+will turn into:
+
+    <pre><code>&lt;div class="footer"&gt;
+        &amp;copy; 2004 Foo Corporation
+    &lt;/div&gt;
+    </code></pre>
+
+Regular Markdown syntax is not processed within code blocks. E.g.,
+asterisks are just literal asterisks within a code block. This means
+it's also easy to use Markdown to write about Markdown's own syntax.
+
+
+
+<h3 id="hr">Horizontal Rules</h3>
+
+You can produce a horizontal rule tag (`<hr />`) by placing three or
+more hyphens, asterisks, or underscores on a line by themselves. If you
+wish, you may use spaces between the hyphens or asterisks. Each of the
+following lines will produce a horizontal rule:
+
+    * * *
+
+    ***
+
+    *****
+
+    - - -
+
+    ---------------------------------------
+
+	_ _ _
+
+
+* * *
+
+<h2 id="span">Span Elements</h2>
+
+<h3 id="link">Links</h3>
+
+Markdown supports two style of links: *inline* and *reference*.
+
+In both styles, the link text is delimited by [square brackets].
+
+To create an inline link, use a set of regular parentheses immediately
+after the link text's closing square bracket. Inside the parentheses,
+put the URL where you want the link to point, along with an *optional*
+title for the link, surrounded in quotes. For example:
+
+    This is [an example](http://example.com/ "Title") inline link.
+
+    [This link](http://example.net/) has no title attribute.
+
+Will produce:
+
+    <p>This is <a href="http://example.com/" title="Title">
+    an example</a> inline link.</p>
+
+    <p><a href="http://example.net/">This link</a> has no
+    title attribute.</p>
+
+If you're referring to a local resource on the same server, you can
+use relative paths:
+
+    See my [About](/about/) page for details.
+
+Reference-style links use a second set of square brackets, inside
+which you place a label of your choosing to identify the link:
+
+    This is [an example][id] reference-style link.
+
+You can optionally use a space to separate the sets of brackets:
+
+    This is [an example] [id] reference-style link.
+
+Then, anywhere in the document, you define your link label like this,
+on a line by itself:
+
+    [id]: http://example.com/  "Optional Title Here"
+
+That is:
+
+*   Square brackets containing the link identifier (optionally
+    indented from the left margin using up to three spaces);
+*   followed by a colon;
+*   followed by one or more spaces (or tabs);
+*   followed by the URL for the link;
+*   optionally followed by a title attribute for the link, enclosed
+    in double or single quotes.
+
+The link URL may, optionally, be surrounded by angle brackets:
+
+    [id]: <http://example.com/>  "Optional Title Here"
+
+You can put the title attribute on the next line and use extra spaces
+or tabs for padding, which tends to look better with longer URLs:
+
+    [id]: http://example.com/longish/path/to/resource/here
+        "Optional Title Here"
+
+Link definitions are only used for creating links during Markdown
+processing, and are stripped from your document in the HTML output.
+
+Link definition names may constist of letters, numbers, spaces, and punctuation -- but they are *not* case sensitive. E.g. these two links:
+
+	[link text][a]
+	[link text][A]
+
+are equivalent.
+
+The *implicit link name* shortcut allows you to omit the name of the
+link, in which case the link text itself is used as the name.
+Just use an empty set of square brackets -- e.g., to link the word
+"Google" to the google.com web site, you could simply write:
+
+	[Google][]
+
+And then define the link:
+
+	[Google]: http://google.com/
+
+Because link names may contain spaces, this shortcut even works for
+multiple words in the link text:
+
+	Visit [Daring Fireball][] for more information.
+
+And then define the link:
+
+	[Daring Fireball]: http://daringfireball.net/
+
+Link definitions can be placed anywhere in your Markdown document. I
+tend to put them immediately after each paragraph in which they're
+used, but if you want, you can put them all at the end of your
+document, sort of like footnotes.
+
+Here's an example of reference links in action:
+
+    I get 10 times more traffic from [Google] [1] than from
+    [Yahoo] [2] or [MSN] [3].
+
+      [1]: http://google.com/        "Google"
+      [2]: http://search.yahoo.com/  "Yahoo Search"
+      [3]: http://search.msn.com/    "MSN Search"
+
+Using the implicit link name shortcut, you could instead write:
+
+    I get 10 times more traffic from [Google][] than from
+    [Yahoo][] or [MSN][].
+
+      [google]: http://google.com/        "Google"
+      [yahoo]:  http://search.yahoo.com/  "Yahoo Search"
+      [msn]:    http://search.msn.com/    "MSN Search"
+
+Both of the above examples will produce the following HTML output:
+
+    <p>I get 10 times more traffic from <a href="http://google.com/"
+    title="Google">Google</a> than from
+    <a href="http://search.yahoo.com/" title="Yahoo Search">Yahoo</a>
+    or <a href="http://search.msn.com/" title="MSN Search">MSN</a>.</p>
+
+For comparison, here is the same paragraph written using
+Markdown's inline link style:
+
+    I get 10 times more traffic from [Google](http://google.com/ "Google")
+    than from [Yahoo](http://search.yahoo.com/ "Yahoo Search") or
+    [MSN](http://search.msn.com/ "MSN Search").
+
+The point of reference-style links is not that they're easier to
+write. The point is that with reference-style links, your document
+source is vastly more readable. Compare the above examples: using
+reference-style links, the paragraph itself is only 81 characters
+long; with inline-style links, it's 176 characters; and as raw HTML,
+it's 234 characters. In the raw HTML, there's more markup than there
+is text.
+
+With Markdown's reference-style links, a source document much more
+closely resembles the final output, as rendered in a browser. By
+allowing you to move the markup-related metadata out of the paragraph,
+you can add links without interrupting the narrative flow of your
+prose.
+
+
+<h3 id="em">Emphasis</h3>
+
+Markdown treats asterisks (`*`) and underscores (`_`) as indicators of
+emphasis. Text wrapped with one `*` or `_` will be wrapped with an
+HTML `<em>` tag; double `*`'s or `_`'s will be wrapped with an HTML
+`<strong>` tag. E.g., this input:
+
+    *single asterisks*
+
+    _single underscores_
+
+    **double asterisks**
+
+    __double underscores__
+
+will produce:
+
+    <em>single asterisks</em>
+
+    <em>single underscores</em>
+
+    <strong>double asterisks</strong>
+
+    <strong>double underscores</strong>
+
+You can use whichever style you prefer; the lone restriction is that
+the same character must be used to open and close an emphasis span.
+
+Emphasis can be used in the middle of a word:
+
+    un*fucking*believable
+
+But if you surround an `*` or `_` with spaces, it'll be treated as a
+literal asterisk or underscore.
+
+To produce a literal asterisk or underscore at a position where it
+would otherwise be used as an emphasis delimiter, you can backslash
+escape it:
+
+    \*this text is surrounded by literal asterisks\*
+
+
+
+<h3 id="code">Code</h3>
+
+To indicate a span of code, wrap it with backtick quotes (`` ` ``).
+Unlike a pre-formatted code block, a code span indicates code within a
+normal paragraph. For example:
+
+    Use the `printf()` function.
+
+will produce:
+
+    <p>Use the <code>printf()</code> function.</p>
+
+To include a literal backtick character within a code span, you can use
+multiple backticks as the opening and closing delimiters:
+
+    ``There is a literal backtick (`) here.``
+
+which will produce this:
+
+    <p><code>There is a literal backtick (`) here.</code></p>
+
+The backtick delimiters surrounding a code span may include spaces --
+one after the opening, one before the closing. This allows you to place
+literal backtick characters at the beginning or end of a code span:
+
+	A single backtick in a code span: `` ` ``
+
+	A backtick-delimited string in a code span: `` `foo` ``
+
+will produce:
+
+	<p>A single backtick in a code span: <code>`</code></p>
+
+	<p>A backtick-delimited string in a code span: <code>`foo`</code></p>
+
+With a code span, ampersands and angle brackets are encoded as HTML
+entities automatically, which makes it easy to include example HTML
+tags. Markdown will turn this:
+
+    Please don't use any `<blink>` tags.
+
+into:
+
+    <p>Please don't use any <code>&lt;blink&gt;</code> tags.</p>
+
+You can write this:
+
+    `&#8212;` is the decimal-encoded equivalent of `&mdash;`.
+
+to produce:
+
+    <p><code>&amp;#8212;</code> is the decimal-encoded
+    equivalent of <code>&amp;mdash;</code>.</p>
+
+
+
+<h3 id="img">Images</h3>
+
+Admittedly, it's fairly difficult to devise a "natural" syntax for
+placing images into a plain text document format.
+
+Markdown uses an image syntax that is intended to resemble the syntax
+for links, allowing for two styles: *inline* and *reference*.
+
+Inline image syntax looks like this:
+
+    ![Alt text](/path/to/img.jpg)
+
+    ![Alt text](/path/to/img.jpg "Optional title")
+
+That is:
+
+*   An exclamation mark: `!`;
+*   followed by a set of square brackets, containing the `alt`
+    attribute text for the image;
+*   followed by a set of parentheses, containing the URL or path to
+    the image, and an optional `title` attribute enclosed in double
+    or single quotes.
+
+Reference-style image syntax looks like this:
+
+    ![Alt text][id]
+
+Where "id" is the name of a defined image reference. Image references
+are defined using syntax identical to link references:
+
+    [id]: url/to/image  "Optional title attribute"
+
+As of this writing, Markdown has no syntax for specifying the
+dimensions of an image; if this is important to you, you can simply
+use regular HTML `<img>` tags.
+
+
+* * *
+
+
+<h2 id="misc">Miscellaneous</h2>
+
+<h3 id="autolink">Automatic Links</h3>
+
+Markdown supports a shortcut style for creating "automatic" links for URLs and email addresses: simply surround the URL or email address with angle brackets. What this means is that if you want to show the actual text of a URL or email address, and also have it be a clickable link, you can do this:
+
+    <http://example.com/>
+
+Markdown will turn this into:
+
+    <a href="http://example.com/">http://example.com/</a>
+
+Automatic links for email addresses work similarly, except that
+Markdown will also perform a bit of randomized decimal and hex
+entity-encoding to help obscure your address from address-harvesting
+spambots. For example, Markdown will turn this:
+
+    <address@example.com>
+
+into something like this:
+
+    <a href="&#x6D;&#x61;i&#x6C;&#x74;&#x6F;:&#x61;&#x64;&#x64;&#x72;&#x65;
+    &#115;&#115;&#64;&#101;&#120;&#x61;&#109;&#x70;&#x6C;e&#x2E;&#99;&#111;
+    &#109;">&#x61;&#x64;&#x64;&#x72;&#x65;&#115;&#115;&#64;&#101;&#120;&#x61;
+    &#109;&#x70;&#x6C;e&#x2E;&#99;&#111;&#109;</a>
+
+which will render in a browser as a clickable link to "address@example.com".
+
+(This sort of entity-encoding trick will indeed fool many, if not
+most, address-harvesting bots, but it definitely won't fool all of
+them. It's better than nothing, but an address published in this way
+will probably eventually start receiving spam.)
+
+
+
+<h3 id="backslash">Backslash Escapes</h3>
+
+Markdown allows you to use backslash escapes to generate literal
+characters which would otherwise have special meaning in Markdown's
+formatting syntax. For example, if you wanted to surround a word with
+literal asterisks (instead of an HTML `<em>` tag), you can backslashes
+before the asterisks, like this:
+
+    \*literal asterisks\*
+
+Markdown provides backslash escapes for the following characters:
+
+    \   backslash
+    `   backtick
+    *   asterisk
+    _   underscore
+    {}  curly braces
+    []  square brackets
+    ()  parentheses
+    #   hash mark
+	+	plus sign
+	-	minus sign (hyphen)
+    .   dot
+    !   exclamation mark
diff --git a/packages/markdown/marked/test/original/nested_blockquotes.html b/packages/markdown/marked/test/original/nested_blockquotes.html
new file mode 100644
index 00000000..d8ec7f8e
--- /dev/null
+++ b/packages/markdown/marked/test/original/nested_blockquotes.html
@@ -0,0 +1,9 @@
+<blockquote>
+  <p>foo</p>
+  
+  <blockquote>
+    <p>bar</p>
+  </blockquote>
+  
+  <p>foo</p>
+</blockquote>
diff --git a/packages/markdown/marked/test/original/nested_blockquotes.md b/packages/markdown/marked/test/original/nested_blockquotes.md
new file mode 100644
index 00000000..ed3c624f
--- /dev/null
+++ b/packages/markdown/marked/test/original/nested_blockquotes.md
@@ -0,0 +1,5 @@
+> foo
+>
+> > bar
+>
+> foo
diff --git a/packages/markdown/marked/test/original/ordered_and_unordered_lists.html b/packages/markdown/marked/test/original/ordered_and_unordered_lists.html
new file mode 100644
index 00000000..45469479
--- /dev/null
+++ b/packages/markdown/marked/test/original/ordered_and_unordered_lists.html
@@ -0,0 +1,164 @@
+<h2>Unordered</h2>
+
+<p>Asterisks tight:</p>
+
+<ul>
+<li>asterisk 1</li>
+<li>asterisk 2</li>
+<li>asterisk 3</li>
+</ul>
+
+<p>Asterisks loose:</p>
+
+<ul>
+<li><p>asterisk 1</p></li>
+<li><p>asterisk 2</p></li>
+<li><p>asterisk 3</p></li>
+</ul>
+
+<hr />
+
+<p>Pluses tight:</p>
+
+<ul>
+<li>Plus 1</li>
+<li>Plus 2</li>
+<li>Plus 3</li>
+</ul>
+
+<p>Pluses loose:</p>
+
+<ul>
+<li><p>Plus 1</p></li>
+<li><p>Plus 2</p></li>
+<li><p>Plus 3</p></li>
+</ul>
+
+<hr />
+
+<p>Minuses tight:</p>
+
+<ul>
+<li>Minus 1</li>
+<li>Minus 2</li>
+<li>Minus 3</li>
+</ul>
+
+<p>Minuses loose:</p>
+
+<ul>
+<li><p>Minus 1</p></li>
+<li><p>Minus 2</p></li>
+<li><p>Minus 3</p></li>
+</ul>
+
+<h2>Ordered</h2>
+
+<p>Tight:</p>
+
+<ol>
+<li>First</li>
+<li>Second</li>
+<li>Third</li>
+</ol>
+
+<p>and:</p>
+
+<ol>
+<li>One</li>
+<li>Two</li>
+<li>Three</li>
+</ol>
+
+<p>Loose using tabs:</p>
+
+<ol>
+<li><p>First</p></li>
+<li><p>Second</p></li>
+<li><p>Third</p></li>
+</ol>
+
+<p>and using spaces:</p>
+
+<ol>
+<li><p>One</p></li>
+<li><p>Two</p></li>
+<li><p>Three</p></li>
+</ol>
+
+<p>Multiple paragraphs:</p>
+
+<ol>
+<li><p>Item 1, graf one.</p>
+
+<p>Item 2. graf two. The quick brown fox jumped over the lazy dog's
+back.</p></li>
+<li><p>Item 2.</p></li>
+<li><p>Item 3.</p></li>
+</ol>
+
+<h2>Nested</h2>
+
+<ul>
+<li>Tab
+<ul>
+<li>Tab
+<ul>
+<li>Tab</li>
+</ul></li>
+</ul></li>
+</ul>
+
+<p>Here's another:</p>
+
+<ol>
+<li>First</li>
+<li>Second:
+<ul>
+<li>Fee</li>
+<li>Fie</li>
+<li>Foe</li>
+</ul></li>
+<li>Third</li>
+</ol>
+
+<p>Same thing but with paragraphs:</p>
+
+<ol>
+<li><p>First</p></li>
+<li><p>Second:</p>
+
+<ul>
+<li>Fee</li>
+<li>Fie</li>
+<li>Foe</li>
+</ul></li>
+<li><p>Third</p></li>
+</ol>
+
+
+<p>This was an error in Markdown 1.0.1:</p>
+
+<ul>
+<li><p>this</p>
+
+<ul><li>sub</li></ul>
+
+<p>that</p></li>
+</ul>
+
+
+<p>Ordered lists start from initial number:</p>
+
+<ol start="3">
+<li>Three</li>
+<li>Four</li>
+</ol>
+
+
+<p>Ordered lists start from initial zero:</p>
+
+<ol start="0">
+<li>Zero</li>
+<li>One</li>
+</ol>
diff --git a/packages/markdown/marked/test/original/ordered_and_unordered_lists.md b/packages/markdown/marked/test/original/ordered_and_unordered_lists.md
new file mode 100644
index 00000000..d11fb5d8
--- /dev/null
+++ b/packages/markdown/marked/test/original/ordered_and_unordered_lists.md
@@ -0,0 +1,144 @@
+---
+headerIds: false
+---
+## Unordered
+
+Asterisks tight:
+
+*	asterisk 1
+*	asterisk 2
+*	asterisk 3
+
+
+Asterisks loose:
+
+*	asterisk 1
+
+*	asterisk 2
+
+*	asterisk 3
+
+* * *
+
+Pluses tight:
+
++	Plus 1
++	Plus 2
++	Plus 3
+
+
+Pluses loose:
+
++	Plus 1
+
++	Plus 2
+
++	Plus 3
+
+* * *
+
+
+Minuses tight:
+
+-	Minus 1
+-	Minus 2
+-	Minus 3
+
+
+Minuses loose:
+
+-	Minus 1
+
+-	Minus 2
+
+-	Minus 3
+
+
+## Ordered
+
+Tight:
+
+1.	First
+2.	Second
+3.	Third
+
+and:
+
+1. One
+2. Two
+3. Three
+
+
+Loose using tabs:
+
+1.	First
+
+2.	Second
+
+3.	Third
+
+and using spaces:
+
+1. One
+
+2. Two
+
+3. Three
+
+Multiple paragraphs:
+
+1.	Item 1, graf one.
+
+	Item 2. graf two. The quick brown fox jumped over the lazy dog's
+	back.
+
+2.	Item 2.
+
+3.	Item 3.
+
+
+
+## Nested
+
+*	Tab
+	*	Tab
+		*	Tab
+
+Here's another:
+
+1. First
+2. Second:
+	* Fee
+	* Fie
+	* Foe
+3. Third
+
+Same thing but with paragraphs:
+
+1. First
+
+2. Second:
+	* Fee
+	* Fie
+	* Foe
+
+3. Third
+
+
+This was an error in Markdown 1.0.1:
+
+*	this
+
+	*	sub
+
+	that
+
+Ordered lists start from initial number:
+
+3. Three
+1. Four
+
+Ordered lists start from initial zero:
+
+0. Zero
+1. One
diff --git a/packages/markdown/marked/test/original/strong_and_em_together.html b/packages/markdown/marked/test/original/strong_and_em_together.html
new file mode 100644
index 00000000..71ec78c7
--- /dev/null
+++ b/packages/markdown/marked/test/original/strong_and_em_together.html
@@ -0,0 +1,7 @@
+<p><strong><em>This is strong and em.</em></strong></p>
+
+<p>So is <strong><em>this</em></strong> word.</p>
+
+<p><strong><em>This is strong and em.</em></strong></p>
+
+<p>So is <strong><em>this</em></strong> word.</p>
diff --git a/packages/markdown/marked/test/original/strong_and_em_together.md b/packages/markdown/marked/test/original/strong_and_em_together.md
new file mode 100644
index 00000000..95ee690d
--- /dev/null
+++ b/packages/markdown/marked/test/original/strong_and_em_together.md
@@ -0,0 +1,7 @@
+***This is strong and em.***
+
+So is ***this*** word.
+
+___This is strong and em.___
+
+So is ___this___ word.
diff --git a/packages/markdown/marked/test/original/tabs.html b/packages/markdown/marked/test/original/tabs.html
new file mode 100644
index 00000000..3301ba80
--- /dev/null
+++ b/packages/markdown/marked/test/original/tabs.html
@@ -0,0 +1,25 @@
+<ul>
+<li><p>this is a list item
+indented with tabs</p></li>
+<li><p>this is a list item
+indented with spaces</p></li>
+</ul>
+
+<p>Code:</p>
+
+<pre><code>this code block is indented by one tab
+</code></pre>
+
+<p>And:</p>
+
+<pre><code>    this code block is indented by two tabs
+</code></pre>
+
+<p>And:</p>
+
+<pre><code>+   this is an example list item
+    indented with tabs
+
++   this is an example list item
+    indented with spaces
+</code></pre>
diff --git a/packages/markdown/marked/test/original/tabs.md b/packages/markdown/marked/test/original/tabs.md
new file mode 100644
index 00000000..589d1136
--- /dev/null
+++ b/packages/markdown/marked/test/original/tabs.md
@@ -0,0 +1,21 @@
++	this is a list item
+	indented with tabs
+
++   this is a list item
+    indented with spaces
+
+Code:
+
+	this code block is indented by one tab
+
+And:
+
+		this code block is indented by two tabs
+
+And:
+
+	+	this is an example list item
+		indented with tabs
+	
+	+   this is an example list item
+	    indented with spaces
diff --git a/packages/markdown/marked/test/original/tidyness.html b/packages/markdown/marked/test/original/tidyness.html
new file mode 100644
index 00000000..f2a8ce70
--- /dev/null
+++ b/packages/markdown/marked/test/original/tidyness.html
@@ -0,0 +1,8 @@
+<blockquote>
+<p>A list within a blockquote:</p>
+<ul>
+<li>asterisk 1</li>
+<li>asterisk 2</li>
+<li>asterisk 3</li>
+</ul>
+</blockquote>
diff --git a/packages/markdown/marked/test/original/tidyness.md b/packages/markdown/marked/test/original/tidyness.md
new file mode 100644
index 00000000..5f18b8da
--- /dev/null
+++ b/packages/markdown/marked/test/original/tidyness.md
@@ -0,0 +1,5 @@
+> A list within a blockquote:
+> 
+> *	asterisk 1
+> *	asterisk 2
+> *	asterisk 3
diff --git a/packages/markdown/marked/test/redos/link_redos.html b/packages/markdown/marked/test/redos/link_redos.html
new file mode 100644
index 00000000..fdbeb4d3
--- /dev/null
+++ b/packages/markdown/marked/test/redos/link_redos.html
@@ -0,0 +1,5 @@
+<ul>
+<li>伪类：<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:active">:active</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:any-link">:any-link</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:blank">:blank</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:checked">:checked</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:current">:current</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:default">:default</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:defined">:defined</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:dir">:dir()</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:disabled">:disabled</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:drop">:drop</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:empty">:empty</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:enabled">:enabled</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:first">:first</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:first-child">:first-child</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:first-of-type">:first-of-type</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:fullscreen">:fullscreen</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:future">:future</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:focus">:focus</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:focus-visible">:focus-visible</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:focus-within">:focus-within</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:has">:has()</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:host">:host</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:host()">:host()</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:host-context()">:host-context()</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:hover">:hover</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:indeterminate">:indeterminate</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:in-range">:in-range</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:invalid">:invalid</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:is">:is()</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:lang">:lang()</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:last-child">:last-child</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:last-of-type">:last-of-type</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:left">:left</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:link">:link</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:local-link">:local-link</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:not">:not()</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:nth-child">:nth-child()</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:nth-col">:nth-col()</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:nth-last-child">:nth-last-child()</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:nth-last-col">:nth-last-col()</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:nth-last-of-type">:nth-last-of-type()</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:nth-of-type">:nth-of-type()</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:only-child">:only-child</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:only-of-type">:only-of-type</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:optional">:optional</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:out-of-range">:out-of-range</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:past">:past</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:placeholder-shown">:placeholder-shown</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:read-only">:read-only</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:read-write">:read-write</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:required">:required</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:right">:right</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:root">:root</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:scope">:scope</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:target">:target</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:target-within">:target-within</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:user-invalid">:user-invalid</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:valid">:valid</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:visited">:visited</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:where">:where()</a></li>
+<li>伪元素：<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/::after">::after (:after)</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/::backdrop">::backdrop</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/::before">::before (:before)</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/::cue">::cue (:cue)</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/::first-letter">::first-letter (:first-letter)</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/::first-line">::first-line (:first-line)</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/::grammar-error">::grammar-error</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/::marker">::marker</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/::placeholder">::placeholder</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/::selection">::selection</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/::slotted">::slotted()</a>、<a href="https://developer.mozilla.org/en-US/docs/Web/CSS/::spelling-error">::spelling-error</a> </li>
+</ul>
+
diff --git a/packages/markdown/marked/test/redos/link_redos.md b/packages/markdown/marked/test/redos/link_redos.md
new file mode 100644
index 00000000..effafa37
--- /dev/null
+++ b/packages/markdown/marked/test/redos/link_redos.md
@@ -0,0 +1,2 @@
+* 伪类：[:active](https://developer.mozilla.org/en-US/docs/Web/CSS/:active)、[:any-link](https://developer.mozilla.org/en-US/docs/Web/CSS/:any-link)、[:blank](https://developer.mozilla.org/en-US/docs/Web/CSS/:blank)、[:checked](https://developer.mozilla.org/en-US/docs/Web/CSS/:checked)、[:current](https://developer.mozilla.org/en-US/docs/Web/CSS/:current)、[:default](https://developer.mozilla.org/en-US/docs/Web/CSS/:default)、[:defined](https://developer.mozilla.org/en-US/docs/Web/CSS/:defined)、[:dir()](https://developer.mozilla.org/en-US/docs/Web/CSS/:dir)、[:disabled](https://developer.mozilla.org/en-US/docs/Web/CSS/:disabled)、[:drop](https://developer.mozilla.org/en-US/docs/Web/CSS/:drop)、[:empty](https://developer.mozilla.org/en-US/docs/Web/CSS/:empty)、[:enabled](https://developer.mozilla.org/en-US/docs/Web/CSS/:enabled)、[:first](https://developer.mozilla.org/en-US/docs/Web/CSS/:first)、[:first-child](https://developer.mozilla.org/en-US/docs/Web/CSS/:first-child)、[:first-of-type](https://developer.mozilla.org/en-US/docs/Web/CSS/:first-of-type)、[:fullscreen](https://developer.mozilla.org/en-US/docs/Web/CSS/:fullscreen)、[:future](https://developer.mozilla.org/en-US/docs/Web/CSS/:future)、[:focus](https://developer.mozilla.org/en-US/docs/Web/CSS/:focus)、[:focus-visible](https://developer.mozilla.org/en-US/docs/Web/CSS/:focus-visible)、[:focus-within](https://developer.mozilla.org/en-US/docs/Web/CSS/:focus-within)、[:has()](https://developer.mozilla.org/en-US/docs/Web/CSS/:has)、[:host](https://developer.mozilla.org/en-US/docs/Web/CSS/:host)、[:host()](https://developer.mozilla.org/en-US/docs/Web/CSS/:host())、[:host-context()](https://developer.mozilla.org/en-US/docs/Web/CSS/:host-context())、[:hover](https://developer.mozilla.org/en-US/docs/Web/CSS/:hover)、[:indeterminate](https://developer.mozilla.org/en-US/docs/Web/CSS/:indeterminate)、[:in-range](https://developer.mozilla.org/en-US/docs/Web/CSS/:in-range)、[:invalid](https://developer.mozilla.org/en-US/docs/Web/CSS/:invalid)、[:is()](https://developer.mozilla.org/en-US/docs/Web/CSS/:is)、[:lang()](https://developer.mozilla.org/en-US/docs/Web/CSS/:lang)、[:last-child](https://developer.mozilla.org/en-US/docs/Web/CSS/:last-child)、[:last-of-type](https://developer.mozilla.org/en-US/docs/Web/CSS/:last-of-type)、[:left](https://developer.mozilla.org/en-US/docs/Web/CSS/:left)、[:link](https://developer.mozilla.org/en-US/docs/Web/CSS/:link)、[:local-link](https://developer.mozilla.org/en-US/docs/Web/CSS/:local-link)、[:not()](https://developer.mozilla.org/en-US/docs/Web/CSS/:not)、[:nth-child()](https://developer.mozilla.org/en-US/docs/Web/CSS/:nth-child)、[:nth-col()](https://developer.mozilla.org/en-US/docs/Web/CSS/:nth-col)、[:nth-last-child()](https://developer.mozilla.org/en-US/docs/Web/CSS/:nth-last-child)、[:nth-last-col()](https://developer.mozilla.org/en-US/docs/Web/CSS/:nth-last-col)、[:nth-last-of-type()](https://developer.mozilla.org/en-US/docs/Web/CSS/:nth-last-of-type)、[:nth-of-type()](https://developer.mozilla.org/en-US/docs/Web/CSS/:nth-of-type)、[:only-child](https://developer.mozilla.org/en-US/docs/Web/CSS/:only-child)、[:only-of-type](https://developer.mozilla.org/en-US/docs/Web/CSS/:only-of-type)、[:optional](https://developer.mozilla.org/en-US/docs/Web/CSS/:optional)、[:out-of-range](https://developer.mozilla.org/en-US/docs/Web/CSS/:out-of-range)、[:past](https://developer.mozilla.org/en-US/docs/Web/CSS/:past)、[:placeholder-shown](https://developer.mozilla.org/en-US/docs/Web/CSS/:placeholder-shown)、[:read-only](https://developer.mozilla.org/en-US/docs/Web/CSS/:read-only)、[:read-write](https://developer.mozilla.org/en-US/docs/Web/CSS/:read-write)、[:required](https://developer.mozilla.org/en-US/docs/Web/CSS/:required)、[:right](https://developer.mozilla.org/en-US/docs/Web/CSS/:right)、[:root](https://developer.mozilla.org/en-US/docs/Web/CSS/:root)、[:scope](https://developer.mozilla.org/en-US/docs/Web/CSS/:scope)、[:target](https://developer.mozilla.org/en-US/docs/Web/CSS/:target)、[:target-within](https://developer.mozilla.org/en-US/docs/Web/CSS/:target-within)、[:user-invalid](https://developer.mozilla.org/en-US/docs/Web/CSS/:user-invalid)、[:valid](https://developer.mozilla.org/en-US/docs/Web/CSS/:valid)、[:visited](https://developer.mozilla.org/en-US/docs/Web/CSS/:visited)、[:where()](https://developer.mozilla.org/en-US/docs/Web/CSS/:where)
+* 伪元素：[::after (:after)](https://developer.mozilla.org/en-US/docs/Web/CSS/::after)、[::backdrop](https://developer.mozilla.org/en-US/docs/Web/CSS/::backdrop)、[::before (:before)](https://developer.mozilla.org/en-US/docs/Web/CSS/::before)、[::cue (:cue)](https://developer.mozilla.org/en-US/docs/Web/CSS/::cue)、[::first-letter (:first-letter)](https://developer.mozilla.org/en-US/docs/Web/CSS/::first-letter)、[::first-line (:first-line)](https://developer.mozilla.org/en-US/docs/Web/CSS/::first-line)、[::grammar-error](https://developer.mozilla.org/en-US/docs/Web/CSS/::grammar-error)、[::marker](https://developer.mozilla.org/en-US/docs/Web/CSS/::marker)、[::placeholder](https://developer.mozilla.org/en-US/docs/Web/CSS/::placeholder)、[::selection](https://developer.mozilla.org/en-US/docs/Web/CSS/::selection)、[::slotted()](https://developer.mozilla.org/en-US/docs/Web/CSS/::slotted)、[::spelling-error](https://developer.mozilla.org/en-US/docs/Web/CSS/::spelling-error) 
\ No newline at end of file
diff --git a/packages/markdown/marked/test/redos/quadratic_br.js b/packages/markdown/marked/test/redos/quadratic_br.js
new file mode 100644
index 00000000..48456b8a
--- /dev/null
+++ b/packages/markdown/marked/test/redos/quadratic_br.js
@@ -0,0 +1,4 @@
+module.exports = {
+  markdown: `a${' '.repeat(50000)}`,
+  html: `<p>a${' '.repeat(50000)}</p>`
+};
diff --git a/packages/markdown/marked/test/redos/quadratic_email.js b/packages/markdown/marked/test/redos/quadratic_email.js
new file mode 100644
index 00000000..08243fe5
--- /dev/null
+++ b/packages/markdown/marked/test/redos/quadratic_email.js
@@ -0,0 +1,4 @@
+module.exports = {
+  markdown: 'a'.repeat(50000),
+  html: `<p>${'a'.repeat(50000)}</p>`
+};
diff --git a/packages/markdown/marked/test/redos/redos_html_closing.html b/packages/markdown/marked/test/redos/redos_html_closing.html
new file mode 100644
index 00000000..543e775a
--- /dev/null
+++ b/packages/markdown/marked/test/redos/redos_html_closing.html
@@ -0,0 +1 @@
+<p>&lt;tag  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;  &quot;&quot;&lt;&quot; /&gt;a&#39;a</p>
diff --git a/packages/markdown/marked/test/redos/redos_html_closing.md b/packages/markdown/marked/test/redos/redos_html_closing.md
new file mode 100644
index 00000000..65bc5f73
--- /dev/null
+++ b/packages/markdown/marked/test/redos/redos_html_closing.md
@@ -0,0 +1 @@
+<tag  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""  ""<" />a'a
diff --git a/packages/markdown/marked/test/redos/redos_nolink.html b/packages/markdown/marked/test/redos/redos_nolink.html
new file mode 100644
index 00000000..59153753
--- /dev/null
+++ b/packages/markdown/marked/test/redos/redos_nolink.html
@@ -0,0 +1 @@
+<p>![[[][[][[][[][[][[][[][[][[][[][[][[][[][[][[][[][[][[][[][[][[][[][[][[][[][[][[][[][[][[][[][[][[][[][[][[][[][[][[][[][[][[][[]!\</p>
diff --git a/packages/markdown/marked/test/redos/redos_nolink.md b/packages/markdown/marked/test/redos/redos_nolink.md
new file mode 100644
index 00000000..a43a1568
--- /dev/null
+++ b/packages/markdown/marked/test/redos/redos_nolink.md
@@ -0,0 +1 @@
+![\[[]\[[]\[[]\[[]\[[]\[[]\[[]\[[]\[[]\[[]\[[]\[[]\[[]\[[]\[[]\[[]\[[]\[[]\[[]\[[]\[[]\[[]\[[]\[[]\[[]\[[]\[[]\[[]\[[]\[[]\[[]\[[]\[[]\[[]\[[]\[[]\[[]\[[]\[[]\[[]\[[]\[[]\[[]!\
diff --git a/packages/markdown/marked/test/specs/commonmark/commonmark.0.29.json b/packages/markdown/marked/test/specs/commonmark/commonmark.0.29.json
new file mode 100644
index 00000000..db23d3bb
--- /dev/null
+++ b/packages/markdown/marked/test/specs/commonmark/commonmark.0.29.json
@@ -0,0 +1,5327 @@
+[
+  {
+    "markdown": "\tfoo\tbaz\t\tbim\n",
+    "html": "<pre><code>foo\tbaz\t\tbim\n</code></pre>\n",
+    "example": 1,
+    "start_line": 352,
+    "end_line": 357,
+    "section": "Tabs"
+  },
+  {
+    "markdown": "  \tfoo\tbaz\t\tbim\n",
+    "html": "<pre><code>foo\tbaz\t\tbim\n</code></pre>\n",
+    "example": 2,
+    "start_line": 359,
+    "end_line": 364,
+    "section": "Tabs"
+  },
+  {
+    "markdown": "    a\ta\n    ὐ\ta\n",
+    "html": "<pre><code>a\ta\nὐ\ta\n</code></pre>\n",
+    "example": 3,
+    "start_line": 366,
+    "end_line": 373,
+    "section": "Tabs"
+  },
+  {
+    "markdown": "  - foo\n\n\tbar\n",
+    "html": "<ul>\n<li>\n<p>foo</p>\n<p>bar</p>\n</li>\n</ul>\n",
+    "example": 4,
+    "start_line": 379,
+    "end_line": 390,
+    "section": "Tabs"
+  },
+  {
+    "markdown": "- foo\n\n\t\tbar\n",
+    "html": "<ul>\n<li>\n<p>foo</p>\n<pre><code>  bar\n</code></pre>\n</li>\n</ul>\n",
+    "example": 5,
+    "start_line": 392,
+    "end_line": 404,
+    "section": "Tabs"
+  },
+  {
+    "markdown": ">\t\tfoo\n",
+    "html": "<blockquote>\n<pre><code>  foo\n</code></pre>\n</blockquote>\n",
+    "example": 6,
+    "start_line": 415,
+    "end_line": 422,
+    "section": "Tabs"
+  },
+  {
+    "markdown": "-\t\tfoo\n",
+    "html": "<ul>\n<li>\n<pre><code>  foo\n</code></pre>\n</li>\n</ul>\n",
+    "example": 7,
+    "start_line": 424,
+    "end_line": 433,
+    "section": "Tabs",
+    "shouldFail": true
+  },
+  {
+    "markdown": "    foo\n\tbar\n",
+    "html": "<pre><code>foo\nbar\n</code></pre>\n",
+    "example": 8,
+    "start_line": 436,
+    "end_line": 443,
+    "section": "Tabs"
+  },
+  {
+    "markdown": " - foo\n   - bar\n\t - baz\n",
+    "html": "<ul>\n<li>foo\n<ul>\n<li>bar\n<ul>\n<li>baz</li>\n</ul>\n</li>\n</ul>\n</li>\n</ul>\n",
+    "example": 9,
+    "start_line": 445,
+    "end_line": 461,
+    "section": "Tabs"
+  },
+  {
+    "markdown": "#\tFoo\n",
+    "html": "<h1>Foo</h1>\n",
+    "example": 10,
+    "start_line": 463,
+    "end_line": 467,
+    "section": "Tabs"
+  },
+  {
+    "markdown": "*\t*\t*\t\n",
+    "html": "<hr />\n",
+    "example": 11,
+    "start_line": 469,
+    "end_line": 473,
+    "section": "Tabs"
+  },
+  {
+    "markdown": "- `one\n- two`\n",
+    "html": "<ul>\n<li>`one</li>\n<li>two`</li>\n</ul>\n",
+    "example": 12,
+    "start_line": 496,
+    "end_line": 504,
+    "section": "Precedence"
+  },
+  {
+    "markdown": "***\n---\n___\n",
+    "html": "<hr />\n<hr />\n<hr />\n",
+    "example": 13,
+    "start_line": 535,
+    "end_line": 543,
+    "section": "Thematic breaks"
+  },
+  {
+    "markdown": "+++\n",
+    "html": "<p>+++</p>\n",
+    "example": 14,
+    "start_line": 548,
+    "end_line": 552,
+    "section": "Thematic breaks"
+  },
+  {
+    "markdown": "===\n",
+    "html": "<p>===</p>\n",
+    "example": 15,
+    "start_line": 555,
+    "end_line": 559,
+    "section": "Thematic breaks"
+  },
+  {
+    "markdown": "--\n**\n__\n",
+    "html": "<p>--\n**\n__</p>\n",
+    "example": 16,
+    "start_line": 564,
+    "end_line": 572,
+    "section": "Thematic breaks"
+  },
+  {
+    "markdown": " ***\n  ***\n   ***\n",
+    "html": "<hr />\n<hr />\n<hr />\n",
+    "example": 17,
+    "start_line": 577,
+    "end_line": 585,
+    "section": "Thematic breaks"
+  },
+  {
+    "markdown": "    ***\n",
+    "html": "<pre><code>***\n</code></pre>\n",
+    "example": 18,
+    "start_line": 590,
+    "end_line": 595,
+    "section": "Thematic breaks"
+  },
+  {
+    "markdown": "Foo\n    ***\n",
+    "html": "<p>Foo\n***</p>\n",
+    "example": 19,
+    "start_line": 598,
+    "end_line": 604,
+    "section": "Thematic breaks"
+  },
+  {
+    "markdown": "_____________________________________\n",
+    "html": "<hr />\n",
+    "example": 20,
+    "start_line": 609,
+    "end_line": 613,
+    "section": "Thematic breaks"
+  },
+  {
+    "markdown": " - - -\n",
+    "html": "<hr />\n",
+    "example": 21,
+    "start_line": 618,
+    "end_line": 622,
+    "section": "Thematic breaks"
+  },
+  {
+    "markdown": " **  * ** * ** * **\n",
+    "html": "<hr />\n",
+    "example": 22,
+    "start_line": 625,
+    "end_line": 629,
+    "section": "Thematic breaks"
+  },
+  {
+    "markdown": "-     -      -      -\n",
+    "html": "<hr />\n",
+    "example": 23,
+    "start_line": 632,
+    "end_line": 636,
+    "section": "Thematic breaks"
+  },
+  {
+    "markdown": "- - - -    \n",
+    "html": "<hr />\n",
+    "example": 24,
+    "start_line": 641,
+    "end_line": 645,
+    "section": "Thematic breaks"
+  },
+  {
+    "markdown": "_ _ _ _ a\n\na------\n\n---a---\n",
+    "html": "<p>_ _ _ _ a</p>\n<p>a------</p>\n<p>---a---</p>\n",
+    "example": 25,
+    "start_line": 650,
+    "end_line": 660,
+    "section": "Thematic breaks"
+  },
+  {
+    "markdown": " *-*\n",
+    "html": "<p><em>-</em></p>\n",
+    "example": 26,
+    "start_line": 666,
+    "end_line": 670,
+    "section": "Thematic breaks"
+  },
+  {
+    "markdown": "- foo\n***\n- bar\n",
+    "html": "<ul>\n<li>foo</li>\n</ul>\n<hr />\n<ul>\n<li>bar</li>\n</ul>\n",
+    "example": 27,
+    "start_line": 675,
+    "end_line": 687,
+    "section": "Thematic breaks"
+  },
+  {
+    "markdown": "Foo\n***\nbar\n",
+    "html": "<p>Foo</p>\n<hr />\n<p>bar</p>\n",
+    "example": 28,
+    "start_line": 692,
+    "end_line": 700,
+    "section": "Thematic breaks"
+  },
+  {
+    "markdown": "Foo\n---\nbar\n",
+    "html": "<h2>Foo</h2>\n<p>bar</p>\n",
+    "example": 29,
+    "start_line": 709,
+    "end_line": 716,
+    "section": "Thematic breaks"
+  },
+  {
+    "markdown": "* Foo\n* * *\n* Bar\n",
+    "html": "<ul>\n<li>Foo</li>\n</ul>\n<hr />\n<ul>\n<li>Bar</li>\n</ul>\n",
+    "example": 30,
+    "start_line": 722,
+    "end_line": 734,
+    "section": "Thematic breaks"
+  },
+  {
+    "markdown": "- Foo\n- * * *\n",
+    "html": "<ul>\n<li>Foo</li>\n<li>\n<hr />\n</li>\n</ul>\n",
+    "example": 31,
+    "start_line": 739,
+    "end_line": 749,
+    "section": "Thematic breaks"
+  },
+  {
+    "markdown": "# foo\n## foo\n### foo\n#### foo\n##### foo\n###### foo\n",
+    "html": "<h1>foo</h1>\n<h2>foo</h2>\n<h3>foo</h3>\n<h4>foo</h4>\n<h5>foo</h5>\n<h6>foo</h6>\n",
+    "example": 32,
+    "start_line": 768,
+    "end_line": 782,
+    "section": "ATX headings"
+  },
+  {
+    "markdown": "####### foo\n",
+    "html": "<p>####### foo</p>\n",
+    "example": 33,
+    "start_line": 787,
+    "end_line": 791,
+    "section": "ATX headings"
+  },
+  {
+    "markdown": "#5 bolt\n\n#hashtag\n",
+    "html": "<p>#5 bolt</p>\n<p>#hashtag</p>\n",
+    "example": 34,
+    "start_line": 802,
+    "end_line": 809,
+    "section": "ATX headings"
+  },
+  {
+    "markdown": "\\## foo\n",
+    "html": "<p>## foo</p>\n",
+    "example": 35,
+    "start_line": 814,
+    "end_line": 818,
+    "section": "ATX headings"
+  },
+  {
+    "markdown": "# foo *bar* \\*baz\\*\n",
+    "html": "<h1>foo <em>bar</em> *baz*</h1>\n",
+    "example": 36,
+    "start_line": 823,
+    "end_line": 827,
+    "section": "ATX headings"
+  },
+  {
+    "markdown": "#                  foo                     \n",
+    "html": "<h1>foo</h1>\n",
+    "example": 37,
+    "start_line": 832,
+    "end_line": 836,
+    "section": "ATX headings"
+  },
+  {
+    "markdown": " ### foo\n  ## foo\n   # foo\n",
+    "html": "<h3>foo</h3>\n<h2>foo</h2>\n<h1>foo</h1>\n",
+    "example": 38,
+    "start_line": 841,
+    "end_line": 849,
+    "section": "ATX headings"
+  },
+  {
+    "markdown": "    # foo\n",
+    "html": "<pre><code># foo\n</code></pre>\n",
+    "example": 39,
+    "start_line": 854,
+    "end_line": 859,
+    "section": "ATX headings"
+  },
+  {
+    "markdown": "foo\n    # bar\n",
+    "html": "<p>foo\n# bar</p>\n",
+    "example": 40,
+    "start_line": 862,
+    "end_line": 868,
+    "section": "ATX headings",
+    "shouldFail": true
+  },
+  {
+    "markdown": "## foo ##\n  ###   bar    ###\n",
+    "html": "<h2>foo</h2>\n<h3>bar</h3>\n",
+    "example": 41,
+    "start_line": 873,
+    "end_line": 879,
+    "section": "ATX headings"
+  },
+  {
+    "markdown": "# foo ##################################\n##### foo ##\n",
+    "html": "<h1>foo</h1>\n<h5>foo</h5>\n",
+    "example": 42,
+    "start_line": 884,
+    "end_line": 890,
+    "section": "ATX headings"
+  },
+  {
+    "markdown": "### foo ###     \n",
+    "html": "<h3>foo</h3>\n",
+    "example": 43,
+    "start_line": 895,
+    "end_line": 899,
+    "section": "ATX headings"
+  },
+  {
+    "markdown": "### foo ### b\n",
+    "html": "<h3>foo ### b</h3>\n",
+    "example": 44,
+    "start_line": 906,
+    "end_line": 910,
+    "section": "ATX headings"
+  },
+  {
+    "markdown": "# foo#\n",
+    "html": "<h1>foo#</h1>\n",
+    "example": 45,
+    "start_line": 915,
+    "end_line": 919,
+    "section": "ATX headings",
+    "shouldFail": true
+  },
+  {
+    "markdown": "### foo \\###\n## foo #\\##\n# foo \\#\n",
+    "html": "<h3>foo ###</h3>\n<h2>foo ###</h2>\n<h1>foo #</h1>\n",
+    "example": 46,
+    "start_line": 925,
+    "end_line": 933,
+    "section": "ATX headings",
+    "shouldFail": true
+  },
+  {
+    "markdown": "****\n## foo\n****\n",
+    "html": "<hr />\n<h2>foo</h2>\n<hr />\n",
+    "example": 47,
+    "start_line": 939,
+    "end_line": 947,
+    "section": "ATX headings"
+  },
+  {
+    "markdown": "Foo bar\n# baz\nBar foo\n",
+    "html": "<p>Foo bar</p>\n<h1>baz</h1>\n<p>Bar foo</p>\n",
+    "example": 48,
+    "start_line": 950,
+    "end_line": 958,
+    "section": "ATX headings"
+  },
+  {
+    "markdown": "## \n#\n### ###\n",
+    "html": "<h2></h2>\n<h1></h1>\n<h3></h3>\n",
+    "example": 49,
+    "start_line": 963,
+    "end_line": 971,
+    "section": "ATX headings",
+    "shouldFail": true
+  },
+  {
+    "markdown": "Foo *bar*\n=========\n\nFoo *bar*\n---------\n",
+    "html": "<h1>Foo <em>bar</em></h1>\n<h2>Foo <em>bar</em></h2>\n",
+    "example": 50,
+    "start_line": 1006,
+    "end_line": 1015,
+    "section": "Setext headings"
+  },
+  {
+    "markdown": "Foo *bar\nbaz*\n====\n",
+    "html": "<h1>Foo <em>bar\nbaz</em></h1>\n",
+    "example": 51,
+    "start_line": 1020,
+    "end_line": 1027,
+    "section": "Setext headings",
+    "shouldFail": true
+  },
+  {
+    "markdown": "  Foo *bar\nbaz*\t\n====\n",
+    "html": "<h1>Foo <em>bar\nbaz</em></h1>\n",
+    "example": 52,
+    "start_line": 1034,
+    "end_line": 1041,
+    "section": "Setext headings",
+    "shouldFail": true
+  },
+  {
+    "markdown": "Foo\n-------------------------\n\nFoo\n=\n",
+    "html": "<h2>Foo</h2>\n<h1>Foo</h1>\n",
+    "example": 53,
+    "start_line": 1046,
+    "end_line": 1055,
+    "section": "Setext headings",
+    "shouldFail": true
+  },
+  {
+    "markdown": "   Foo\n---\n\n  Foo\n-----\n\n  Foo\n  ===\n",
+    "html": "<h2>Foo</h2>\n<h2>Foo</h2>\n<h1>Foo</h1>\n",
+    "example": 54,
+    "start_line": 1061,
+    "end_line": 1074,
+    "section": "Setext headings"
+  },
+  {
+    "markdown": "    Foo\n    ---\n\n    Foo\n---\n",
+    "html": "<pre><code>Foo\n---\n\nFoo\n</code></pre>\n<hr />\n",
+    "example": 55,
+    "start_line": 1079,
+    "end_line": 1092,
+    "section": "Setext headings"
+  },
+  {
+    "markdown": "Foo\n   ----      \n",
+    "html": "<h2>Foo</h2>\n",
+    "example": 56,
+    "start_line": 1098,
+    "end_line": 1103,
+    "section": "Setext headings"
+  },
+  {
+    "markdown": "Foo\n    ---\n",
+    "html": "<p>Foo\n---</p>\n",
+    "example": 57,
+    "start_line": 1108,
+    "end_line": 1114,
+    "section": "Setext headings",
+    "shouldFail": true
+  },
+  {
+    "markdown": "Foo\n= =\n\nFoo\n--- -\n",
+    "html": "<p>Foo\n= =</p>\n<p>Foo</p>\n<hr />\n",
+    "example": 58,
+    "start_line": 1119,
+    "end_line": 1130,
+    "section": "Setext headings"
+  },
+  {
+    "markdown": "Foo  \n-----\n",
+    "html": "<h2>Foo</h2>\n",
+    "example": 59,
+    "start_line": 1135,
+    "end_line": 1140,
+    "section": "Setext headings"
+  },
+  {
+    "markdown": "Foo\\\n----\n",
+    "html": "<h2>Foo\\</h2>\n",
+    "example": 60,
+    "start_line": 1145,
+    "end_line": 1150,
+    "section": "Setext headings"
+  },
+  {
+    "markdown": "`Foo\n----\n`\n\n<a title=\"a lot\n---\nof dashes\"/>\n",
+    "html": "<h2>`Foo</h2>\n<p>`</p>\n<h2>&lt;a title=&quot;a lot</h2>\n<p>of dashes&quot;/&gt;</p>\n",
+    "example": 61,
+    "start_line": 1156,
+    "end_line": 1169,
+    "section": "Setext headings"
+  },
+  {
+    "markdown": "> Foo\n---\n",
+    "html": "<blockquote>\n<p>Foo</p>\n</blockquote>\n<hr />\n",
+    "example": 62,
+    "start_line": 1175,
+    "end_line": 1183,
+    "section": "Setext headings"
+  },
+  {
+    "markdown": "> foo\nbar\n===\n",
+    "html": "<blockquote>\n<p>foo\nbar\n===</p>\n</blockquote>\n",
+    "example": 63,
+    "start_line": 1186,
+    "end_line": 1196,
+    "section": "Setext headings",
+    "shouldFail": true
+  },
+  {
+    "markdown": "- Foo\n---\n",
+    "html": "<ul>\n<li>Foo</li>\n</ul>\n<hr />\n",
+    "example": 64,
+    "start_line": 1199,
+    "end_line": 1207,
+    "section": "Setext headings"
+  },
+  {
+    "markdown": "Foo\nBar\n---\n",
+    "html": "<h2>Foo\nBar</h2>\n",
+    "example": 65,
+    "start_line": 1214,
+    "end_line": 1221,
+    "section": "Setext headings",
+    "shouldFail": true
+  },
+  {
+    "markdown": "---\nFoo\n---\nBar\n---\nBaz\n",
+    "html": "<hr />\n<h2>Foo</h2>\n<h2>Bar</h2>\n<p>Baz</p>\n",
+    "example": 66,
+    "start_line": 1227,
+    "end_line": 1239,
+    "section": "Setext headings"
+  },
+  {
+    "markdown": "\n====\n",
+    "html": "<p>====</p>\n",
+    "example": 67,
+    "start_line": 1244,
+    "end_line": 1249,
+    "section": "Setext headings"
+  },
+  {
+    "markdown": "---\n---\n",
+    "html": "<hr />\n<hr />\n",
+    "example": 68,
+    "start_line": 1256,
+    "end_line": 1262,
+    "section": "Setext headings"
+  },
+  {
+    "markdown": "- foo\n-----\n",
+    "html": "<ul>\n<li>foo</li>\n</ul>\n<hr />\n",
+    "example": 69,
+    "start_line": 1265,
+    "end_line": 1273,
+    "section": "Setext headings"
+  },
+  {
+    "markdown": "    foo\n---\n",
+    "html": "<pre><code>foo\n</code></pre>\n<hr />\n",
+    "example": 70,
+    "start_line": 1276,
+    "end_line": 1283,
+    "section": "Setext headings"
+  },
+  {
+    "markdown": "> foo\n-----\n",
+    "html": "<blockquote>\n<p>foo</p>\n</blockquote>\n<hr />\n",
+    "example": 71,
+    "start_line": 1286,
+    "end_line": 1294,
+    "section": "Setext headings"
+  },
+  {
+    "markdown": "\\> foo\n------\n",
+    "html": "<h2>&gt; foo</h2>\n",
+    "example": 72,
+    "start_line": 1300,
+    "end_line": 1305,
+    "section": "Setext headings"
+  },
+  {
+    "markdown": "Foo\n\nbar\n---\nbaz\n",
+    "html": "<p>Foo</p>\n<h2>bar</h2>\n<p>baz</p>\n",
+    "example": 73,
+    "start_line": 1331,
+    "end_line": 1341,
+    "section": "Setext headings"
+  },
+  {
+    "markdown": "Foo\nbar\n\n---\n\nbaz\n",
+    "html": "<p>Foo\nbar</p>\n<hr />\n<p>baz</p>\n",
+    "example": 74,
+    "start_line": 1347,
+    "end_line": 1359,
+    "section": "Setext headings"
+  },
+  {
+    "markdown": "Foo\nbar\n* * *\nbaz\n",
+    "html": "<p>Foo\nbar</p>\n<hr />\n<p>baz</p>\n",
+    "example": 75,
+    "start_line": 1365,
+    "end_line": 1375,
+    "section": "Setext headings"
+  },
+  {
+    "markdown": "Foo\nbar\n\\---\nbaz\n",
+    "html": "<p>Foo\nbar\n---\nbaz</p>\n",
+    "example": 76,
+    "start_line": 1380,
+    "end_line": 1390,
+    "section": "Setext headings"
+  },
+  {
+    "markdown": "    a simple\n      indented code block\n",
+    "html": "<pre><code>a simple\n  indented code block\n</code></pre>\n",
+    "example": 77,
+    "start_line": 1408,
+    "end_line": 1415,
+    "section": "Indented code blocks"
+  },
+  {
+    "markdown": "  - foo\n\n    bar\n",
+    "html": "<ul>\n<li>\n<p>foo</p>\n<p>bar</p>\n</li>\n</ul>\n",
+    "example": 78,
+    "start_line": 1422,
+    "end_line": 1433,
+    "section": "Indented code blocks"
+  },
+  {
+    "markdown": "1.  foo\n\n    - bar\n",
+    "html": "<ol>\n<li>\n<p>foo</p>\n<ul>\n<li>bar</li>\n</ul>\n</li>\n</ol>\n",
+    "example": 79,
+    "start_line": 1436,
+    "end_line": 1449,
+    "section": "Indented code blocks"
+  },
+  {
+    "markdown": "    <a/>\n    *hi*\n\n    - one\n",
+    "html": "<pre><code>&lt;a/&gt;\n*hi*\n\n- one\n</code></pre>\n",
+    "example": 80,
+    "start_line": 1456,
+    "end_line": 1467,
+    "section": "Indented code blocks"
+  },
+  {
+    "markdown": "    chunk1\n\n    chunk2\n  \n \n \n    chunk3\n",
+    "html": "<pre><code>chunk1\n\nchunk2\n\n\n\nchunk3\n</code></pre>\n",
+    "example": 81,
+    "start_line": 1472,
+    "end_line": 1489,
+    "section": "Indented code blocks"
+  },
+  {
+    "markdown": "    chunk1\n      \n      chunk2\n",
+    "html": "<pre><code>chunk1\n  \n  chunk2\n</code></pre>\n",
+    "example": 82,
+    "start_line": 1495,
+    "end_line": 1504,
+    "section": "Indented code blocks"
+  },
+  {
+    "markdown": "Foo\n    bar\n\n",
+    "html": "<p>Foo\nbar</p>\n",
+    "example": 83,
+    "start_line": 1510,
+    "end_line": 1517,
+    "section": "Indented code blocks"
+  },
+  {
+    "markdown": "    foo\nbar\n",
+    "html": "<pre><code>foo\n</code></pre>\n<p>bar</p>\n",
+    "example": 84,
+    "start_line": 1524,
+    "end_line": 1531,
+    "section": "Indented code blocks"
+  },
+  {
+    "markdown": "# Heading\n    foo\nHeading\n------\n    foo\n----\n",
+    "html": "<h1>Heading</h1>\n<pre><code>foo\n</code></pre>\n<h2>Heading</h2>\n<pre><code>foo\n</code></pre>\n<hr />\n",
+    "example": 85,
+    "start_line": 1537,
+    "end_line": 1552,
+    "section": "Indented code blocks"
+  },
+  {
+    "markdown": "        foo\n    bar\n",
+    "html": "<pre><code>    foo\nbar\n</code></pre>\n",
+    "example": 86,
+    "start_line": 1557,
+    "end_line": 1564,
+    "section": "Indented code blocks"
+  },
+  {
+    "markdown": "\n    \n    foo\n    \n\n",
+    "html": "<pre><code>foo\n</code></pre>\n",
+    "example": 87,
+    "start_line": 1570,
+    "end_line": 1579,
+    "section": "Indented code blocks"
+  },
+  {
+    "markdown": "    foo  \n",
+    "html": "<pre><code>foo  \n</code></pre>\n",
+    "example": 88,
+    "start_line": 1584,
+    "end_line": 1589,
+    "section": "Indented code blocks"
+  },
+  {
+    "markdown": "```\n<\n >\n```\n",
+    "html": "<pre><code>&lt;\n &gt;\n</code></pre>\n",
+    "example": 89,
+    "start_line": 1639,
+    "end_line": 1648,
+    "section": "Fenced code blocks"
+  },
+  {
+    "markdown": "~~~\n<\n >\n~~~\n",
+    "html": "<pre><code>&lt;\n &gt;\n</code></pre>\n",
+    "example": 90,
+    "start_line": 1653,
+    "end_line": 1662,
+    "section": "Fenced code blocks"
+  },
+  {
+    "markdown": "``\nfoo\n``\n",
+    "html": "<p><code>foo</code></p>\n",
+    "example": 91,
+    "start_line": 1666,
+    "end_line": 1672,
+    "section": "Fenced code blocks"
+  },
+  {
+    "markdown": "```\naaa\n~~~\n```\n",
+    "html": "<pre><code>aaa\n~~~\n</code></pre>\n",
+    "example": 92,
+    "start_line": 1677,
+    "end_line": 1686,
+    "section": "Fenced code blocks"
+  },
+  {
+    "markdown": "~~~\naaa\n```\n~~~\n",
+    "html": "<pre><code>aaa\n```\n</code></pre>\n",
+    "example": 93,
+    "start_line": 1689,
+    "end_line": 1698,
+    "section": "Fenced code blocks"
+  },
+  {
+    "markdown": "````\naaa\n```\n``````\n",
+    "html": "<pre><code>aaa\n```\n</code></pre>\n",
+    "example": 94,
+    "start_line": 1703,
+    "end_line": 1712,
+    "section": "Fenced code blocks"
+  },
+  {
+    "markdown": "~~~~\naaa\n~~~\n~~~~\n",
+    "html": "<pre><code>aaa\n~~~\n</code></pre>\n",
+    "example": 95,
+    "start_line": 1715,
+    "end_line": 1724,
+    "section": "Fenced code blocks"
+  },
+  {
+    "markdown": "```\n",
+    "html": "<pre><code></code></pre>\n",
+    "example": 96,
+    "start_line": 1730,
+    "end_line": 1734,
+    "section": "Fenced code blocks"
+  },
+  {
+    "markdown": "`````\n\n```\naaa\n",
+    "html": "<pre><code>\n```\naaa\n</code></pre>\n",
+    "example": 97,
+    "start_line": 1737,
+    "end_line": 1747,
+    "section": "Fenced code blocks"
+  },
+  {
+    "markdown": "> ```\n> aaa\n\nbbb\n",
+    "html": "<blockquote>\n<pre><code>aaa\n</code></pre>\n</blockquote>\n<p>bbb</p>\n",
+    "example": 98,
+    "start_line": 1750,
+    "end_line": 1761,
+    "section": "Fenced code blocks"
+  },
+  {
+    "markdown": "```\n\n  \n```\n",
+    "html": "<pre><code>\n  \n</code></pre>\n",
+    "example": 99,
+    "start_line": 1766,
+    "end_line": 1775,
+    "section": "Fenced code blocks"
+  },
+  {
+    "markdown": "```\n```\n",
+    "html": "<pre><code></code></pre>\n",
+    "example": 100,
+    "start_line": 1780,
+    "end_line": 1785,
+    "section": "Fenced code blocks"
+  },
+  {
+    "markdown": " ```\n aaa\naaa\n```\n",
+    "html": "<pre><code>aaa\naaa\n</code></pre>\n",
+    "example": 101,
+    "start_line": 1792,
+    "end_line": 1801,
+    "section": "Fenced code blocks"
+  },
+  {
+    "markdown": "  ```\naaa\n  aaa\naaa\n  ```\n",
+    "html": "<pre><code>aaa\naaa\naaa\n</code></pre>\n",
+    "example": 102,
+    "start_line": 1804,
+    "end_line": 1815,
+    "section": "Fenced code blocks"
+  },
+  {
+    "markdown": "   ```\n   aaa\n    aaa\n  aaa\n   ```\n",
+    "html": "<pre><code>aaa\n aaa\naaa\n</code></pre>\n",
+    "example": 103,
+    "start_line": 1818,
+    "end_line": 1829,
+    "section": "Fenced code blocks"
+  },
+  {
+    "markdown": "    ```\n    aaa\n    ```\n",
+    "html": "<pre><code>```\naaa\n```\n</code></pre>\n",
+    "example": 104,
+    "start_line": 1834,
+    "end_line": 1843,
+    "section": "Fenced code blocks"
+  },
+  {
+    "markdown": "```\naaa\n  ```\n",
+    "html": "<pre><code>aaa\n</code></pre>\n",
+    "example": 105,
+    "start_line": 1849,
+    "end_line": 1856,
+    "section": "Fenced code blocks"
+  },
+  {
+    "markdown": "   ```\naaa\n  ```\n",
+    "html": "<pre><code>aaa\n</code></pre>\n",
+    "example": 106,
+    "start_line": 1859,
+    "end_line": 1866,
+    "section": "Fenced code blocks"
+  },
+  {
+    "markdown": "```\naaa\n    ```\n",
+    "html": "<pre><code>aaa\n    ```\n</code></pre>\n",
+    "example": 107,
+    "start_line": 1871,
+    "end_line": 1879,
+    "section": "Fenced code blocks"
+  },
+  {
+    "markdown": "``` ```\naaa\n",
+    "html": "<p><code> </code>\naaa</p>\n",
+    "example": 108,
+    "start_line": 1885,
+    "end_line": 1891,
+    "section": "Fenced code blocks"
+  },
+  {
+    "markdown": "~~~~~~\naaa\n~~~ ~~\n",
+    "html": "<pre><code>aaa\n~~~ ~~\n</code></pre>\n",
+    "example": 109,
+    "start_line": 1894,
+    "end_line": 1902,
+    "section": "Fenced code blocks"
+  },
+  {
+    "markdown": "foo\n```\nbar\n```\nbaz\n",
+    "html": "<p>foo</p>\n<pre><code>bar\n</code></pre>\n<p>baz</p>\n",
+    "example": 110,
+    "start_line": 1908,
+    "end_line": 1919,
+    "section": "Fenced code blocks"
+  },
+  {
+    "markdown": "foo\n---\n~~~\nbar\n~~~\n# baz\n",
+    "html": "<h2>foo</h2>\n<pre><code>bar\n</code></pre>\n<h1>baz</h1>\n",
+    "example": 111,
+    "start_line": 1925,
+    "end_line": 1937,
+    "section": "Fenced code blocks"
+  },
+  {
+    "markdown": "```ruby\ndef foo(x)\n  return 3\nend\n```\n",
+    "html": "<pre><code class=\"language-ruby\">def foo(x)\n  return 3\nend\n</code></pre>\n",
+    "example": 112,
+    "start_line": 1947,
+    "end_line": 1958,
+    "section": "Fenced code blocks"
+  },
+  {
+    "markdown": "~~~~    ruby startline=3 $%@#$\ndef foo(x)\n  return 3\nend\n~~~~~~~\n",
+    "html": "<pre><code class=\"language-ruby\">def foo(x)\n  return 3\nend\n</code></pre>\n",
+    "example": 113,
+    "start_line": 1961,
+    "end_line": 1972,
+    "section": "Fenced code blocks"
+  },
+  {
+    "markdown": "````;\n````\n",
+    "html": "<pre><code class=\"language-;\"></code></pre>\n",
+    "example": 114,
+    "start_line": 1975,
+    "end_line": 1980,
+    "section": "Fenced code blocks"
+  },
+  {
+    "markdown": "``` aa ```\nfoo\n",
+    "html": "<p><code>aa</code>\nfoo</p>\n",
+    "example": 115,
+    "start_line": 1985,
+    "end_line": 1991,
+    "section": "Fenced code blocks"
+  },
+  {
+    "markdown": "~~~ aa ``` ~~~\nfoo\n~~~\n",
+    "html": "<pre><code class=\"language-aa\">foo\n</code></pre>\n",
+    "example": 116,
+    "start_line": 1996,
+    "end_line": 2003,
+    "section": "Fenced code blocks",
+    "shouldFail": true
+  },
+  {
+    "markdown": "```\n``` aaa\n```\n",
+    "html": "<pre><code>``` aaa\n</code></pre>\n",
+    "example": 117,
+    "start_line": 2008,
+    "end_line": 2015,
+    "section": "Fenced code blocks"
+  },
+  {
+    "markdown": "<table><tr><td>\n<pre>\n**Hello**,\n\n_world_.\n</pre>\n</td></tr></table>\n",
+    "html": "<table><tr><td>\n<pre>\n**Hello**,\n<p><em>world</em>.\n</pre></p>\n</td></tr></table>\n",
+    "example": 118,
+    "start_line": 2087,
+    "end_line": 2102,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "<table>\n  <tr>\n    <td>\n           hi\n    </td>\n  </tr>\n</table>\n\nokay.\n",
+    "html": "<table>\n  <tr>\n    <td>\n           hi\n    </td>\n  </tr>\n</table>\n<p>okay.</p>\n",
+    "example": 119,
+    "start_line": 2116,
+    "end_line": 2135,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": " <div>\n  *hello*\n         <foo><a>\n",
+    "html": " <div>\n  *hello*\n         <foo><a>\n",
+    "example": 120,
+    "start_line": 2138,
+    "end_line": 2146,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "</div>\n*foo*\n",
+    "html": "</div>\n*foo*\n",
+    "example": 121,
+    "start_line": 2151,
+    "end_line": 2157,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "<DIV CLASS=\"foo\">\n\n*Markdown*\n\n</DIV>\n",
+    "html": "<DIV CLASS=\"foo\">\n<p><em>Markdown</em></p>\n</DIV>\n",
+    "example": 122,
+    "start_line": 2162,
+    "end_line": 2172,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "<div id=\"foo\"\n  class=\"bar\">\n</div>\n",
+    "html": "<div id=\"foo\"\n  class=\"bar\">\n</div>\n",
+    "example": 123,
+    "start_line": 2178,
+    "end_line": 2186,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "<div id=\"foo\" class=\"bar\n  baz\">\n</div>\n",
+    "html": "<div id=\"foo\" class=\"bar\n  baz\">\n</div>\n",
+    "example": 124,
+    "start_line": 2189,
+    "end_line": 2197,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "<div>\n*foo*\n\n*bar*\n",
+    "html": "<div>\n*foo*\n<p><em>bar</em></p>\n",
+    "example": 125,
+    "start_line": 2201,
+    "end_line": 2210,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "<div id=\"foo\"\n*hi*\n",
+    "html": "<div id=\"foo\"\n*hi*\n",
+    "example": 126,
+    "start_line": 2217,
+    "end_line": 2223,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "<div class\nfoo\n",
+    "html": "<div class\nfoo\n",
+    "example": 127,
+    "start_line": 2226,
+    "end_line": 2232,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "<div *???-&&&-<---\n*foo*\n",
+    "html": "<div *???-&&&-<---\n*foo*\n",
+    "example": 128,
+    "start_line": 2238,
+    "end_line": 2244,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "<div><a href=\"bar\">*foo*</a></div>\n",
+    "html": "<div><a href=\"bar\">*foo*</a></div>\n",
+    "example": 129,
+    "start_line": 2250,
+    "end_line": 2254,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "<table><tr><td>\nfoo\n</td></tr></table>\n",
+    "html": "<table><tr><td>\nfoo\n</td></tr></table>\n",
+    "example": 130,
+    "start_line": 2257,
+    "end_line": 2265,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "<div></div>\n``` c\nint x = 33;\n```\n",
+    "html": "<div></div>\n``` c\nint x = 33;\n```\n",
+    "example": 131,
+    "start_line": 2274,
+    "end_line": 2284,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "<a href=\"foo\">\n*bar*\n</a>\n",
+    "html": "<a href=\"foo\">\n*bar*\n</a>\n",
+    "example": 132,
+    "start_line": 2291,
+    "end_line": 2299,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "<Warning>\n*bar*\n</Warning>\n",
+    "html": "<Warning>\n*bar*\n</Warning>\n",
+    "example": 133,
+    "start_line": 2304,
+    "end_line": 2312,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "<i class=\"foo\">\n*bar*\n</i>\n",
+    "html": "<i class=\"foo\">\n*bar*\n</i>\n",
+    "example": 134,
+    "start_line": 2315,
+    "end_line": 2323,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "</ins>\n*bar*\n",
+    "html": "</ins>\n*bar*\n",
+    "example": 135,
+    "start_line": 2326,
+    "end_line": 2332,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "<del>\n*foo*\n</del>\n",
+    "html": "<del>\n*foo*\n</del>\n",
+    "example": 136,
+    "start_line": 2341,
+    "end_line": 2349,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "<del>\n\n*foo*\n\n</del>\n",
+    "html": "<del>\n<p><em>foo</em></p>\n</del>\n",
+    "example": 137,
+    "start_line": 2356,
+    "end_line": 2366,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "<del>*foo*</del>\n",
+    "html": "<p><del><em>foo</em></del></p>\n",
+    "example": 138,
+    "start_line": 2374,
+    "end_line": 2378,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "<pre language=\"haskell\"><code>\nimport Text.HTML.TagSoup\n\nmain :: IO ()\nmain = print $ parseTags tags\n</code></pre>\nokay\n",
+    "html": "<pre language=\"haskell\"><code>\nimport Text.HTML.TagSoup\n\nmain :: IO ()\nmain = print $ parseTags tags\n</code></pre>\n<p>okay</p>\n",
+    "example": 139,
+    "start_line": 2390,
+    "end_line": 2406,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "<script type=\"text/javascript\">\n// JavaScript example\n\ndocument.getElementById(\"demo\").innerHTML = \"Hello JavaScript!\";\n</script>\nokay\n",
+    "html": "<script type=\"text/javascript\">\n// JavaScript example\n\ndocument.getElementById(\"demo\").innerHTML = \"Hello JavaScript!\";\n</script>\n<p>okay</p>\n",
+    "example": 140,
+    "start_line": 2411,
+    "end_line": 2425,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "<style\n  type=\"text/css\">\nh1 {color:red;}\n\np {color:blue;}\n</style>\nokay\n",
+    "html": "<style\n  type=\"text/css\">\nh1 {color:red;}\n\np {color:blue;}\n</style>\n<p>okay</p>\n",
+    "example": 141,
+    "start_line": 2430,
+    "end_line": 2446,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "<style\n  type=\"text/css\">\n\nfoo\n",
+    "html": "<style\n  type=\"text/css\">\n\nfoo\n",
+    "example": 142,
+    "start_line": 2453,
+    "end_line": 2463,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "> <div>\n> foo\n\nbar\n",
+    "html": "<blockquote>\n<div>\nfoo\n</blockquote>\n<p>bar</p>\n",
+    "example": 143,
+    "start_line": 2466,
+    "end_line": 2477,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "- <div>\n- foo\n",
+    "html": "<ul>\n<li>\n<div>\n</li>\n<li>foo</li>\n</ul>\n",
+    "example": 144,
+    "start_line": 2480,
+    "end_line": 2490,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "<style>p{color:red;}</style>\n*foo*\n",
+    "html": "<style>p{color:red;}</style>\n<p><em>foo</em></p>\n",
+    "example": 145,
+    "start_line": 2495,
+    "end_line": 2501,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "<!-- foo -->*bar*\n*baz*\n",
+    "html": "<!-- foo -->*bar*\n<p><em>baz</em></p>\n",
+    "example": 146,
+    "start_line": 2504,
+    "end_line": 2510,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "<script>\nfoo\n</script>1. *bar*\n",
+    "html": "<script>\nfoo\n</script>1. *bar*\n",
+    "example": 147,
+    "start_line": 2516,
+    "end_line": 2524,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "<!-- Foo\n\nbar\n   baz -->\nokay\n",
+    "html": "<!-- Foo\n\nbar\n   baz -->\n<p>okay</p>\n",
+    "example": 148,
+    "start_line": 2529,
+    "end_line": 2541,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "<?php\n\n  echo '>';\n\n?>\nokay\n",
+    "html": "<?php\n\n  echo '>';\n\n?>\n<p>okay</p>\n",
+    "example": 149,
+    "start_line": 2547,
+    "end_line": 2561,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "<!DOCTYPE html>\n",
+    "html": "<!DOCTYPE html>\n",
+    "example": 150,
+    "start_line": 2566,
+    "end_line": 2570,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "<![CDATA[\nfunction matchwo(a,b)\n{\n  if (a < b && a < 0) then {\n    return 1;\n\n  } else {\n\n    return 0;\n  }\n}\n]]>\nokay\n",
+    "html": "<![CDATA[\nfunction matchwo(a,b)\n{\n  if (a < b && a < 0) then {\n    return 1;\n\n  } else {\n\n    return 0;\n  }\n}\n]]>\n<p>okay</p>\n",
+    "example": 151,
+    "start_line": 2575,
+    "end_line": 2603,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "  <!-- foo -->\n\n    <!-- foo -->\n",
+    "html": "  <!-- foo -->\n<pre><code>&lt;!-- foo --&gt;\n</code></pre>\n",
+    "example": 152,
+    "start_line": 2608,
+    "end_line": 2616,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "  <div>\n\n    <div>\n",
+    "html": "  <div>\n<pre><code>&lt;div&gt;\n</code></pre>\n",
+    "example": 153,
+    "start_line": 2619,
+    "end_line": 2627,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "Foo\n<div>\nbar\n</div>\n",
+    "html": "<p>Foo</p>\n<div>\nbar\n</div>\n",
+    "example": 154,
+    "start_line": 2633,
+    "end_line": 2643,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "<div>\nbar\n</div>\n*foo*\n",
+    "html": "<div>\nbar\n</div>\n*foo*\n",
+    "example": 155,
+    "start_line": 2650,
+    "end_line": 2660,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "Foo\n<a href=\"bar\">\nbaz\n",
+    "html": "<p>Foo\n<a href=\"bar\">\nbaz</p>\n",
+    "example": 156,
+    "start_line": 2665,
+    "end_line": 2673,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "<div>\n\n*Emphasized* text.\n\n</div>\n",
+    "html": "<div>\n<p><em>Emphasized</em> text.</p>\n</div>\n",
+    "example": 157,
+    "start_line": 2706,
+    "end_line": 2716,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "<div>\n*Emphasized* text.\n</div>\n",
+    "html": "<div>\n*Emphasized* text.\n</div>\n",
+    "example": 158,
+    "start_line": 2719,
+    "end_line": 2727,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "<table>\n\n<tr>\n\n<td>\nHi\n</td>\n\n</tr>\n\n</table>\n",
+    "html": "<table>\n<tr>\n<td>\nHi\n</td>\n</tr>\n</table>\n",
+    "example": 159,
+    "start_line": 2741,
+    "end_line": 2761,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "<table>\n\n  <tr>\n\n    <td>\n      Hi\n    </td>\n\n  </tr>\n\n</table>\n",
+    "html": "<table>\n  <tr>\n<pre><code>&lt;td&gt;\n  Hi\n&lt;/td&gt;\n</code></pre>\n  </tr>\n</table>\n",
+    "example": 160,
+    "start_line": 2768,
+    "end_line": 2789,
+    "section": "HTML blocks"
+  },
+  {
+    "markdown": "[foo]: /url \"title\"\n\n[foo]\n",
+    "html": "<p><a href=\"/url\" title=\"title\">foo</a></p>\n",
+    "example": 161,
+    "start_line": 2816,
+    "end_line": 2822,
+    "section": "Link reference definitions"
+  },
+  {
+    "markdown": "   [foo]: \n      /url  \n           'the title'  \n\n[foo]\n",
+    "html": "<p><a href=\"/url\" title=\"the title\">foo</a></p>\n",
+    "example": 162,
+    "start_line": 2825,
+    "end_line": 2833,
+    "section": "Link reference definitions"
+  },
+  {
+    "markdown": "[Foo*bar\\]]:my_(url) 'title (with parens)'\n\n[Foo*bar\\]]\n",
+    "html": "<p><a href=\"my_(url)\" title=\"title (with parens)\">Foo*bar]</a></p>\n",
+    "example": 163,
+    "start_line": 2836,
+    "end_line": 2842,
+    "section": "Link reference definitions"
+  },
+  {
+    "markdown": "[Foo bar]:\n<my url>\n'title'\n\n[Foo bar]\n",
+    "html": "<p><a href=\"my%20url\" title=\"title\">Foo bar</a></p>\n",
+    "example": 164,
+    "start_line": 2845,
+    "end_line": 2853,
+    "section": "Link reference definitions",
+    "shouldFail": true
+  },
+  {
+    "markdown": "[foo]: /url '\ntitle\nline1\nline2\n'\n\n[foo]\n",
+    "html": "<p><a href=\"/url\" title=\"\ntitle\nline1\nline2\n\">foo</a></p>\n",
+    "example": 165,
+    "start_line": 2858,
+    "end_line": 2872,
+    "section": "Link reference definitions"
+  },
+  {
+    "markdown": "[foo]: /url 'title\n\nwith blank line'\n\n[foo]\n",
+    "html": "<p>[foo]: /url 'title</p>\n<p>with blank line'</p>\n<p>[foo]</p>\n",
+    "example": 166,
+    "start_line": 2877,
+    "end_line": 2887,
+    "section": "Link reference definitions"
+  },
+  {
+    "markdown": "[foo]:\n/url\n\n[foo]\n",
+    "html": "<p><a href=\"/url\">foo</a></p>\n",
+    "example": 167,
+    "start_line": 2892,
+    "end_line": 2899,
+    "section": "Link reference definitions"
+  },
+  {
+    "markdown": "[foo]:\n\n[foo]\n",
+    "html": "<p>[foo]:</p>\n<p>[foo]</p>\n",
+    "example": 168,
+    "start_line": 2904,
+    "end_line": 2911,
+    "section": "Link reference definitions"
+  },
+  {
+    "markdown": "[foo]: <>\n\n[foo]\n",
+    "html": "<p><a href=\"\">foo</a></p>\n",
+    "example": 169,
+    "start_line": 2916,
+    "end_line": 2922,
+    "section": "Link reference definitions",
+    "shouldFail": true
+  },
+  {
+    "markdown": "[foo]: <bar>(baz)\n\n[foo]\n",
+    "html": "<p>[foo]: <bar>(baz)</p>\n<p>[foo]</p>\n",
+    "example": 170,
+    "start_line": 2927,
+    "end_line": 2934,
+    "section": "Link reference definitions"
+  },
+  {
+    "markdown": "[foo]: /url\\bar\\*baz \"foo\\\"bar\\baz\"\n\n[foo]\n",
+    "html": "<p><a href=\"/url%5Cbar*baz\" title=\"foo&quot;bar\\baz\">foo</a></p>\n",
+    "example": 171,
+    "start_line": 2940,
+    "end_line": 2946,
+    "section": "Link reference definitions",
+    "shouldFail": true
+  },
+  {
+    "markdown": "[foo]\n\n[foo]: url\n",
+    "html": "<p><a href=\"url\">foo</a></p>\n",
+    "example": 172,
+    "start_line": 2951,
+    "end_line": 2957,
+    "section": "Link reference definitions"
+  },
+  {
+    "markdown": "[foo]\n\n[foo]: first\n[foo]: second\n",
+    "html": "<p><a href=\"first\">foo</a></p>\n",
+    "example": 173,
+    "start_line": 2963,
+    "end_line": 2970,
+    "section": "Link reference definitions"
+  },
+  {
+    "markdown": "[FOO]: /url\n\n[Foo]\n",
+    "html": "<p><a href=\"/url\">Foo</a></p>\n",
+    "example": 174,
+    "start_line": 2976,
+    "end_line": 2982,
+    "section": "Link reference definitions"
+  },
+  {
+    "markdown": "[ΑΓΩ]: /φου\n\n[αγω]\n",
+    "html": "<p><a href=\"/%CF%86%CE%BF%CF%85\">αγω</a></p>\n",
+    "example": 175,
+    "start_line": 2985,
+    "end_line": 2991,
+    "section": "Link reference definitions"
+  },
+  {
+    "markdown": "[foo]: /url\n",
+    "html": "",
+    "example": 176,
+    "start_line": 2997,
+    "end_line": 3000,
+    "section": "Link reference definitions"
+  },
+  {
+    "markdown": "[\nfoo\n]: /url\nbar\n",
+    "html": "<p>bar</p>\n",
+    "example": 177,
+    "start_line": 3005,
+    "end_line": 3012,
+    "section": "Link reference definitions"
+  },
+  {
+    "markdown": "[foo]: /url \"title\" ok\n",
+    "html": "<p>[foo]: /url &quot;title&quot; ok</p>\n",
+    "example": 178,
+    "start_line": 3018,
+    "end_line": 3022,
+    "section": "Link reference definitions"
+  },
+  {
+    "markdown": "[foo]: /url\n\"title\" ok\n",
+    "html": "<p>&quot;title&quot; ok</p>\n",
+    "example": 179,
+    "start_line": 3027,
+    "end_line": 3032,
+    "section": "Link reference definitions"
+  },
+  {
+    "markdown": "    [foo]: /url \"title\"\n\n[foo]\n",
+    "html": "<pre><code>[foo]: /url &quot;title&quot;\n</code></pre>\n<p>[foo]</p>\n",
+    "example": 180,
+    "start_line": 3038,
+    "end_line": 3046,
+    "section": "Link reference definitions"
+  },
+  {
+    "markdown": "```\n[foo]: /url\n```\n\n[foo]\n",
+    "html": "<pre><code>[foo]: /url\n</code></pre>\n<p>[foo]</p>\n",
+    "example": 181,
+    "start_line": 3052,
+    "end_line": 3062,
+    "section": "Link reference definitions"
+  },
+  {
+    "markdown": "Foo\n[bar]: /baz\n\n[bar]\n",
+    "html": "<p>Foo\n[bar]: /baz</p>\n<p>[bar]</p>\n",
+    "example": 182,
+    "start_line": 3067,
+    "end_line": 3076,
+    "section": "Link reference definitions"
+  },
+  {
+    "markdown": "# [Foo]\n[foo]: /url\n> bar\n",
+    "html": "<h1><a href=\"/url\">Foo</a></h1>\n<blockquote>\n<p>bar</p>\n</blockquote>\n",
+    "example": 183,
+    "start_line": 3082,
+    "end_line": 3091,
+    "section": "Link reference definitions"
+  },
+  {
+    "markdown": "[foo]: /url\nbar\n===\n[foo]\n",
+    "html": "<h1>bar</h1>\n<p><a href=\"/url\">foo</a></p>\n",
+    "example": 184,
+    "start_line": 3093,
+    "end_line": 3101,
+    "section": "Link reference definitions"
+  },
+  {
+    "markdown": "[foo]: /url\n===\n[foo]\n",
+    "html": "<p>===\n<a href=\"/url\">foo</a></p>\n",
+    "example": 185,
+    "start_line": 3103,
+    "end_line": 3110,
+    "section": "Link reference definitions"
+  },
+  {
+    "markdown": "[foo]: /foo-url \"foo\"\n[bar]: /bar-url\n  \"bar\"\n[baz]: /baz-url\n\n[foo],\n[bar],\n[baz]\n",
+    "html": "<p><a href=\"/foo-url\" title=\"foo\">foo</a>,\n<a href=\"/bar-url\" title=\"bar\">bar</a>,\n<a href=\"/baz-url\">baz</a></p>\n",
+    "example": 186,
+    "start_line": 3116,
+    "end_line": 3129,
+    "section": "Link reference definitions"
+  },
+  {
+    "markdown": "[foo]\n\n> [foo]: /url\n",
+    "html": "<p><a href=\"/url\">foo</a></p>\n<blockquote>\n</blockquote>\n",
+    "example": 187,
+    "start_line": 3137,
+    "end_line": 3145,
+    "section": "Link reference definitions"
+  },
+  {
+    "markdown": "[foo]: /url\n",
+    "html": "",
+    "example": 188,
+    "start_line": 3154,
+    "end_line": 3157,
+    "section": "Link reference definitions"
+  },
+  {
+    "markdown": "aaa\n\nbbb\n",
+    "html": "<p>aaa</p>\n<p>bbb</p>\n",
+    "example": 189,
+    "start_line": 3171,
+    "end_line": 3178,
+    "section": "Paragraphs"
+  },
+  {
+    "markdown": "aaa\nbbb\n\nccc\nddd\n",
+    "html": "<p>aaa\nbbb</p>\n<p>ccc\nddd</p>\n",
+    "example": 190,
+    "start_line": 3183,
+    "end_line": 3194,
+    "section": "Paragraphs"
+  },
+  {
+    "markdown": "aaa\n\n\nbbb\n",
+    "html": "<p>aaa</p>\n<p>bbb</p>\n",
+    "example": 191,
+    "start_line": 3199,
+    "end_line": 3207,
+    "section": "Paragraphs"
+  },
+  {
+    "markdown": "  aaa\n bbb\n",
+    "html": "<p>aaa\nbbb</p>\n",
+    "example": 192,
+    "start_line": 3212,
+    "end_line": 3218,
+    "section": "Paragraphs"
+  },
+  {
+    "markdown": "aaa\n             bbb\n                                       ccc\n",
+    "html": "<p>aaa\nbbb\nccc</p>\n",
+    "example": 193,
+    "start_line": 3224,
+    "end_line": 3232,
+    "section": "Paragraphs"
+  },
+  {
+    "markdown": "   aaa\nbbb\n",
+    "html": "<p>aaa\nbbb</p>\n",
+    "example": 194,
+    "start_line": 3238,
+    "end_line": 3244,
+    "section": "Paragraphs"
+  },
+  {
+    "markdown": "    aaa\nbbb\n",
+    "html": "<pre><code>aaa\n</code></pre>\n<p>bbb</p>\n",
+    "example": 195,
+    "start_line": 3247,
+    "end_line": 3254,
+    "section": "Paragraphs"
+  },
+  {
+    "markdown": "aaa     \nbbb     \n",
+    "html": "<p>aaa<br />\nbbb</p>\n",
+    "example": 196,
+    "start_line": 3261,
+    "end_line": 3267,
+    "section": "Paragraphs"
+  },
+  {
+    "markdown": "  \n\naaa\n  \n\n# aaa\n\n  \n",
+    "html": "<p>aaa</p>\n<h1>aaa</h1>\n",
+    "example": 197,
+    "start_line": 3278,
+    "end_line": 3290,
+    "section": "Blank lines"
+  },
+  {
+    "markdown": "> # Foo\n> bar\n> baz\n",
+    "html": "<blockquote>\n<h1>Foo</h1>\n<p>bar\nbaz</p>\n</blockquote>\n",
+    "example": 198,
+    "start_line": 3344,
+    "end_line": 3354,
+    "section": "Block quotes"
+  },
+  {
+    "markdown": "># Foo\n>bar\n> baz\n",
+    "html": "<blockquote>\n<h1>Foo</h1>\n<p>bar\nbaz</p>\n</blockquote>\n",
+    "example": 199,
+    "start_line": 3359,
+    "end_line": 3369,
+    "section": "Block quotes"
+  },
+  {
+    "markdown": "   > # Foo\n   > bar\n > baz\n",
+    "html": "<blockquote>\n<h1>Foo</h1>\n<p>bar\nbaz</p>\n</blockquote>\n",
+    "example": 200,
+    "start_line": 3374,
+    "end_line": 3384,
+    "section": "Block quotes"
+  },
+  {
+    "markdown": "    > # Foo\n    > bar\n    > baz\n",
+    "html": "<pre><code>&gt; # Foo\n&gt; bar\n&gt; baz\n</code></pre>\n",
+    "example": 201,
+    "start_line": 3389,
+    "end_line": 3398,
+    "section": "Block quotes"
+  },
+  {
+    "markdown": "> # Foo\n> bar\nbaz\n",
+    "html": "<blockquote>\n<h1>Foo</h1>\n<p>bar\nbaz</p>\n</blockquote>\n",
+    "example": 202,
+    "start_line": 3404,
+    "end_line": 3414,
+    "section": "Block quotes"
+  },
+  {
+    "markdown": "> bar\nbaz\n> foo\n",
+    "html": "<blockquote>\n<p>bar\nbaz\nfoo</p>\n</blockquote>\n",
+    "example": 203,
+    "start_line": 3420,
+    "end_line": 3430,
+    "section": "Block quotes"
+  },
+  {
+    "markdown": "> foo\n---\n",
+    "html": "<blockquote>\n<p>foo</p>\n</blockquote>\n<hr />\n",
+    "example": 204,
+    "start_line": 3444,
+    "end_line": 3452,
+    "section": "Block quotes"
+  },
+  {
+    "markdown": "> - foo\n- bar\n",
+    "html": "<blockquote>\n<ul>\n<li>foo</li>\n</ul>\n</blockquote>\n<ul>\n<li>bar</li>\n</ul>\n",
+    "example": 205,
+    "start_line": 3464,
+    "end_line": 3476,
+    "section": "Block quotes",
+    "shouldFail": true
+  },
+  {
+    "markdown": ">     foo\n    bar\n",
+    "html": "<blockquote>\n<pre><code>foo\n</code></pre>\n</blockquote>\n<pre><code>bar\n</code></pre>\n",
+    "example": 206,
+    "start_line": 3482,
+    "end_line": 3492,
+    "section": "Block quotes",
+    "shouldFail": true
+  },
+  {
+    "markdown": "> ```\nfoo\n```\n",
+    "html": "<blockquote>\n<pre><code></code></pre>\n</blockquote>\n<p>foo</p>\n<pre><code></code></pre>\n",
+    "example": 207,
+    "start_line": 3495,
+    "end_line": 3505,
+    "section": "Block quotes",
+    "shouldFail": true
+  },
+  {
+    "markdown": "> foo\n    - bar\n",
+    "html": "<blockquote>\n<p>foo\n- bar</p>\n</blockquote>\n",
+    "example": 208,
+    "start_line": 3511,
+    "end_line": 3519,
+    "section": "Block quotes"
+  },
+  {
+    "markdown": ">\n",
+    "html": "<blockquote>\n</blockquote>\n",
+    "example": 209,
+    "start_line": 3535,
+    "end_line": 3540,
+    "section": "Block quotes"
+  },
+  {
+    "markdown": ">\n>  \n> \n",
+    "html": "<blockquote>\n</blockquote>\n",
+    "example": 210,
+    "start_line": 3543,
+    "end_line": 3550,
+    "section": "Block quotes"
+  },
+  {
+    "markdown": ">\n> foo\n>  \n",
+    "html": "<blockquote>\n<p>foo</p>\n</blockquote>\n",
+    "example": 211,
+    "start_line": 3555,
+    "end_line": 3563,
+    "section": "Block quotes"
+  },
+  {
+    "markdown": "> foo\n\n> bar\n",
+    "html": "<blockquote>\n<p>foo</p>\n</blockquote>\n<blockquote>\n<p>bar</p>\n</blockquote>\n",
+    "example": 212,
+    "start_line": 3568,
+    "end_line": 3579,
+    "section": "Block quotes"
+  },
+  {
+    "markdown": "> foo\n> bar\n",
+    "html": "<blockquote>\n<p>foo\nbar</p>\n</blockquote>\n",
+    "example": 213,
+    "start_line": 3590,
+    "end_line": 3598,
+    "section": "Block quotes"
+  },
+  {
+    "markdown": "> foo\n>\n> bar\n",
+    "html": "<blockquote>\n<p>foo</p>\n<p>bar</p>\n</blockquote>\n",
+    "example": 214,
+    "start_line": 3603,
+    "end_line": 3612,
+    "section": "Block quotes"
+  },
+  {
+    "markdown": "foo\n> bar\n",
+    "html": "<p>foo</p>\n<blockquote>\n<p>bar</p>\n</blockquote>\n",
+    "example": 215,
+    "start_line": 3617,
+    "end_line": 3625,
+    "section": "Block quotes"
+  },
+  {
+    "markdown": "> aaa\n***\n> bbb\n",
+    "html": "<blockquote>\n<p>aaa</p>\n</blockquote>\n<hr />\n<blockquote>\n<p>bbb</p>\n</blockquote>\n",
+    "example": 216,
+    "start_line": 3631,
+    "end_line": 3643,
+    "section": "Block quotes"
+  },
+  {
+    "markdown": "> bar\nbaz\n",
+    "html": "<blockquote>\n<p>bar\nbaz</p>\n</blockquote>\n",
+    "example": 217,
+    "start_line": 3649,
+    "end_line": 3657,
+    "section": "Block quotes"
+  },
+  {
+    "markdown": "> bar\n\nbaz\n",
+    "html": "<blockquote>\n<p>bar</p>\n</blockquote>\n<p>baz</p>\n",
+    "example": 218,
+    "start_line": 3660,
+    "end_line": 3669,
+    "section": "Block quotes"
+  },
+  {
+    "markdown": "> bar\n>\nbaz\n",
+    "html": "<blockquote>\n<p>bar</p>\n</blockquote>\n<p>baz</p>\n",
+    "example": 219,
+    "start_line": 3672,
+    "end_line": 3681,
+    "section": "Block quotes"
+  },
+  {
+    "markdown": "> > > foo\nbar\n",
+    "html": "<blockquote>\n<blockquote>\n<blockquote>\n<p>foo\nbar</p>\n</blockquote>\n</blockquote>\n</blockquote>\n",
+    "example": 220,
+    "start_line": 3688,
+    "end_line": 3700,
+    "section": "Block quotes"
+  },
+  {
+    "markdown": ">>> foo\n> bar\n>>baz\n",
+    "html": "<blockquote>\n<blockquote>\n<blockquote>\n<p>foo\nbar\nbaz</p>\n</blockquote>\n</blockquote>\n</blockquote>\n",
+    "example": 221,
+    "start_line": 3703,
+    "end_line": 3717,
+    "section": "Block quotes"
+  },
+  {
+    "markdown": ">     code\n\n>    not code\n",
+    "html": "<blockquote>\n<pre><code>code\n</code></pre>\n</blockquote>\n<blockquote>\n<p>not code</p>\n</blockquote>\n",
+    "example": 222,
+    "start_line": 3725,
+    "end_line": 3737,
+    "section": "Block quotes"
+  },
+  {
+    "markdown": "A paragraph\nwith two lines.\n\n    indented code\n\n> A block quote.\n",
+    "html": "<p>A paragraph\nwith two lines.</p>\n<pre><code>indented code\n</code></pre>\n<blockquote>\n<p>A block quote.</p>\n</blockquote>\n",
+    "example": 223,
+    "start_line": 3779,
+    "end_line": 3794,
+    "section": "List items"
+  },
+  {
+    "markdown": "1.  A paragraph\n    with two lines.\n\n        indented code\n\n    > A block quote.\n",
+    "html": "<ol>\n<li>\n<p>A paragraph\nwith two lines.</p>\n<pre><code>indented code\n</code></pre>\n<blockquote>\n<p>A block quote.</p>\n</blockquote>\n</li>\n</ol>\n",
+    "example": 224,
+    "start_line": 3801,
+    "end_line": 3820,
+    "section": "List items"
+  },
+  {
+    "markdown": "- one\n\n two\n",
+    "html": "<ul>\n<li>one</li>\n</ul>\n<p>two</p>\n",
+    "example": 225,
+    "start_line": 3834,
+    "end_line": 3843,
+    "section": "List items",
+    "shouldFail": true
+  },
+  {
+    "markdown": "- one\n\n  two\n",
+    "html": "<ul>\n<li>\n<p>one</p>\n<p>two</p>\n</li>\n</ul>\n",
+    "example": 226,
+    "start_line": 3846,
+    "end_line": 3857,
+    "section": "List items"
+  },
+  {
+    "markdown": " -    one\n\n     two\n",
+    "html": "<ul>\n<li>one</li>\n</ul>\n<pre><code> two\n</code></pre>\n",
+    "example": 227,
+    "start_line": 3860,
+    "end_line": 3870,
+    "section": "List items",
+    "shouldFail": true
+  },
+  {
+    "markdown": " -    one\n\n      two\n",
+    "html": "<ul>\n<li>\n<p>one</p>\n<p>two</p>\n</li>\n</ul>\n",
+    "example": 228,
+    "start_line": 3873,
+    "end_line": 3884,
+    "section": "List items"
+  },
+  {
+    "markdown": "   > > 1.  one\n>>\n>>     two\n",
+    "html": "<blockquote>\n<blockquote>\n<ol>\n<li>\n<p>one</p>\n<p>two</p>\n</li>\n</ol>\n</blockquote>\n</blockquote>\n",
+    "example": 229,
+    "start_line": 3895,
+    "end_line": 3910,
+    "section": "List items"
+  },
+  {
+    "markdown": ">>- one\n>>\n  >  > two\n",
+    "html": "<blockquote>\n<blockquote>\n<ul>\n<li>one</li>\n</ul>\n<p>two</p>\n</blockquote>\n</blockquote>\n",
+    "example": 230,
+    "start_line": 3922,
+    "end_line": 3935,
+    "section": "List items"
+  },
+  {
+    "markdown": "-one\n\n2.two\n",
+    "html": "<p>-one</p>\n<p>2.two</p>\n",
+    "example": 231,
+    "start_line": 3941,
+    "end_line": 3948,
+    "section": "List items"
+  },
+  {
+    "markdown": "- foo\n\n\n  bar\n",
+    "html": "<ul>\n<li>\n<p>foo</p>\n<p>bar</p>\n</li>\n</ul>\n",
+    "example": 232,
+    "start_line": 3954,
+    "end_line": 3966,
+    "section": "List items",
+    "shouldFail": true
+  },
+  {
+    "markdown": "1.  foo\n\n    ```\n    bar\n    ```\n\n    baz\n\n    > bam\n",
+    "html": "<ol>\n<li>\n<p>foo</p>\n<pre><code>bar\n</code></pre>\n<p>baz</p>\n<blockquote>\n<p>bam</p>\n</blockquote>\n</li>\n</ol>\n",
+    "example": 233,
+    "start_line": 3971,
+    "end_line": 3993,
+    "section": "List items"
+  },
+  {
+    "markdown": "- Foo\n\n      bar\n\n\n      baz\n",
+    "html": "<ul>\n<li>\n<p>Foo</p>\n<pre><code>bar\n\n\nbaz\n</code></pre>\n</li>\n</ul>\n",
+    "example": 234,
+    "start_line": 3999,
+    "end_line": 4017,
+    "section": "List items",
+    "shouldFail": true
+  },
+  {
+    "markdown": "123456789. ok\n",
+    "html": "<ol start=\"123456789\">\n<li>ok</li>\n</ol>\n",
+    "example": 235,
+    "start_line": 4021,
+    "end_line": 4027,
+    "section": "List items"
+  },
+  {
+    "markdown": "1234567890. not ok\n",
+    "html": "<p>1234567890. not ok</p>\n",
+    "example": 236,
+    "start_line": 4030,
+    "end_line": 4034,
+    "section": "List items"
+  },
+  {
+    "markdown": "0. ok\n",
+    "html": "<ol start=\"0\">\n<li>ok</li>\n</ol>\n",
+    "example": 237,
+    "start_line": 4039,
+    "end_line": 4045,
+    "section": "List items"
+  },
+  {
+    "markdown": "003. ok\n",
+    "html": "<ol start=\"3\">\n<li>ok</li>\n</ol>\n",
+    "example": 238,
+    "start_line": 4048,
+    "end_line": 4054,
+    "section": "List items"
+  },
+  {
+    "markdown": "-1. not ok\n",
+    "html": "<p>-1. not ok</p>\n",
+    "example": 239,
+    "start_line": 4059,
+    "end_line": 4063,
+    "section": "List items"
+  },
+  {
+    "markdown": "- foo\n\n      bar\n",
+    "html": "<ul>\n<li>\n<p>foo</p>\n<pre><code>bar\n</code></pre>\n</li>\n</ul>\n",
+    "example": 240,
+    "start_line": 4082,
+    "end_line": 4094,
+    "section": "List items"
+  },
+  {
+    "markdown": "  10.  foo\n\n           bar\n",
+    "html": "<ol start=\"10\">\n<li>\n<p>foo</p>\n<pre><code>bar\n</code></pre>\n</li>\n</ol>\n",
+    "example": 241,
+    "start_line": 4099,
+    "end_line": 4111,
+    "section": "List items"
+  },
+  {
+    "markdown": "    indented code\n\nparagraph\n\n    more code\n",
+    "html": "<pre><code>indented code\n</code></pre>\n<p>paragraph</p>\n<pre><code>more code\n</code></pre>\n",
+    "example": 242,
+    "start_line": 4118,
+    "end_line": 4130,
+    "section": "List items"
+  },
+  {
+    "markdown": "1.     indented code\n\n   paragraph\n\n       more code\n",
+    "html": "<ol>\n<li>\n<pre><code>indented code\n</code></pre>\n<p>paragraph</p>\n<pre><code>more code\n</code></pre>\n</li>\n</ol>\n",
+    "example": 243,
+    "start_line": 4133,
+    "end_line": 4149,
+    "section": "List items",
+    "shouldFail": true
+  },
+  {
+    "markdown": "1.      indented code\n\n   paragraph\n\n       more code\n",
+    "html": "<ol>\n<li>\n<pre><code> indented code\n</code></pre>\n<p>paragraph</p>\n<pre><code>more code\n</code></pre>\n</li>\n</ol>\n",
+    "example": 244,
+    "start_line": 4155,
+    "end_line": 4171,
+    "section": "List items",
+    "shouldFail": true
+  },
+  {
+    "markdown": "   foo\n\nbar\n",
+    "html": "<p>foo</p>\n<p>bar</p>\n",
+    "example": 245,
+    "start_line": 4182,
+    "end_line": 4189,
+    "section": "List items"
+  },
+  {
+    "markdown": "-    foo\n\n  bar\n",
+    "html": "<ul>\n<li>foo</li>\n</ul>\n<p>bar</p>\n",
+    "example": 246,
+    "start_line": 4192,
+    "end_line": 4201,
+    "section": "List items",
+    "shouldFail": true
+  },
+  {
+    "markdown": "-  foo\n\n   bar\n",
+    "html": "<ul>\n<li>\n<p>foo</p>\n<p>bar</p>\n</li>\n</ul>\n",
+    "example": 247,
+    "start_line": 4209,
+    "end_line": 4220,
+    "section": "List items"
+  },
+  {
+    "markdown": "-\n  foo\n-\n  ```\n  bar\n  ```\n-\n      baz\n",
+    "html": "<ul>\n<li>foo</li>\n<li>\n<pre><code>bar\n</code></pre>\n</li>\n<li>\n<pre><code>baz\n</code></pre>\n</li>\n</ul>\n",
+    "example": 248,
+    "start_line": 4237,
+    "end_line": 4258,
+    "section": "List items",
+    "shouldFail": true
+  },
+  {
+    "markdown": "-   \n  foo\n",
+    "html": "<ul>\n<li>foo</li>\n</ul>\n",
+    "example": 249,
+    "start_line": 4263,
+    "end_line": 4270,
+    "section": "List items"
+  },
+  {
+    "markdown": "-\n\n  foo\n",
+    "html": "<ul>\n<li></li>\n</ul>\n<p>foo</p>\n",
+    "example": 250,
+    "start_line": 4277,
+    "end_line": 4286,
+    "section": "List items",
+    "shouldFail": true
+  },
+  {
+    "markdown": "- foo\n-\n- bar\n",
+    "html": "<ul>\n<li>foo</li>\n<li></li>\n<li>bar</li>\n</ul>\n",
+    "example": 251,
+    "start_line": 4291,
+    "end_line": 4301,
+    "section": "List items"
+  },
+  {
+    "markdown": "- foo\n-   \n- bar\n",
+    "html": "<ul>\n<li>foo</li>\n<li></li>\n<li>bar</li>\n</ul>\n",
+    "example": 252,
+    "start_line": 4306,
+    "end_line": 4316,
+    "section": "List items"
+  },
+  {
+    "markdown": "1. foo\n2.\n3. bar\n",
+    "html": "<ol>\n<li>foo</li>\n<li></li>\n<li>bar</li>\n</ol>\n",
+    "example": 253,
+    "start_line": 4321,
+    "end_line": 4331,
+    "section": "List items"
+  },
+  {
+    "markdown": "*\n",
+    "html": "<ul>\n<li></li>\n</ul>\n",
+    "example": 254,
+    "start_line": 4336,
+    "end_line": 4342,
+    "section": "List items",
+    "shouldFail": true
+  },
+  {
+    "markdown": "foo\n*\n\nfoo\n1.\n",
+    "html": "<p>foo\n*</p>\n<p>foo\n1.</p>\n",
+    "example": 255,
+    "start_line": 4346,
+    "end_line": 4357,
+    "section": "List items"
+  },
+  {
+    "markdown": " 1.  A paragraph\n     with two lines.\n\n         indented code\n\n     > A block quote.\n",
+    "html": "<ol>\n<li>\n<p>A paragraph\nwith two lines.</p>\n<pre><code>indented code\n</code></pre>\n<blockquote>\n<p>A block quote.</p>\n</blockquote>\n</li>\n</ol>\n",
+    "example": 256,
+    "start_line": 4368,
+    "end_line": 4387,
+    "section": "List items"
+  },
+  {
+    "markdown": "  1.  A paragraph\n      with two lines.\n\n          indented code\n\n      > A block quote.\n",
+    "html": "<ol>\n<li>\n<p>A paragraph\nwith two lines.</p>\n<pre><code>indented code\n</code></pre>\n<blockquote>\n<p>A block quote.</p>\n</blockquote>\n</li>\n</ol>\n",
+    "example": 257,
+    "start_line": 4392,
+    "end_line": 4411,
+    "section": "List items"
+  },
+  {
+    "markdown": "   1.  A paragraph\n       with two lines.\n\n           indented code\n\n       > A block quote.\n",
+    "html": "<ol>\n<li>\n<p>A paragraph\nwith two lines.</p>\n<pre><code>indented code\n</code></pre>\n<blockquote>\n<p>A block quote.</p>\n</blockquote>\n</li>\n</ol>\n",
+    "example": 258,
+    "start_line": 4416,
+    "end_line": 4435,
+    "section": "List items"
+  },
+  {
+    "markdown": "    1.  A paragraph\n        with two lines.\n\n            indented code\n\n        > A block quote.\n",
+    "html": "<pre><code>1.  A paragraph\n    with two lines.\n\n        indented code\n\n    &gt; A block quote.\n</code></pre>\n",
+    "example": 259,
+    "start_line": 4440,
+    "end_line": 4455,
+    "section": "List items"
+  },
+  {
+    "markdown": "  1.  A paragraph\nwith two lines.\n\n          indented code\n\n      > A block quote.\n",
+    "html": "<ol>\n<li>\n<p>A paragraph\nwith two lines.</p>\n<pre><code>indented code\n</code></pre>\n<blockquote>\n<p>A block quote.</p>\n</blockquote>\n</li>\n</ol>\n",
+    "example": 260,
+    "start_line": 4470,
+    "end_line": 4489,
+    "section": "List items"
+  },
+  {
+    "markdown": "  1.  A paragraph\n    with two lines.\n",
+    "html": "<ol>\n<li>A paragraph\nwith two lines.</li>\n</ol>\n",
+    "example": 261,
+    "start_line": 4494,
+    "end_line": 4502,
+    "section": "List items"
+  },
+  {
+    "markdown": "> 1. > Blockquote\ncontinued here.\n",
+    "html": "<blockquote>\n<ol>\n<li>\n<blockquote>\n<p>Blockquote\ncontinued here.</p>\n</blockquote>\n</li>\n</ol>\n</blockquote>\n",
+    "example": 262,
+    "start_line": 4507,
+    "end_line": 4521,
+    "section": "List items"
+  },
+  {
+    "markdown": "> 1. > Blockquote\n> continued here.\n",
+    "html": "<blockquote>\n<ol>\n<li>\n<blockquote>\n<p>Blockquote\ncontinued here.</p>\n</blockquote>\n</li>\n</ol>\n</blockquote>\n",
+    "example": 263,
+    "start_line": 4524,
+    "end_line": 4538,
+    "section": "List items"
+  },
+  {
+    "markdown": "- foo\n  - bar\n    - baz\n      - boo\n",
+    "html": "<ul>\n<li>foo\n<ul>\n<li>bar\n<ul>\n<li>baz\n<ul>\n<li>boo</li>\n</ul>\n</li>\n</ul>\n</li>\n</ul>\n</li>\n</ul>\n",
+    "example": 264,
+    "start_line": 4552,
+    "end_line": 4573,
+    "section": "List items"
+  },
+  {
+    "markdown": "- foo\n - bar\n  - baz\n   - boo\n",
+    "html": "<ul>\n<li>foo</li>\n<li>bar</li>\n<li>baz</li>\n<li>boo</li>\n</ul>\n",
+    "example": 265,
+    "start_line": 4578,
+    "end_line": 4590,
+    "section": "List items",
+    "shouldFail": true
+  },
+  {
+    "markdown": "10) foo\n    - bar\n",
+    "html": "<ol start=\"10\">\n<li>foo\n<ul>\n<li>bar</li>\n</ul>\n</li>\n</ol>\n",
+    "example": 266,
+    "start_line": 4595,
+    "end_line": 4606,
+    "section": "List items",
+    "shouldFail": true
+  },
+  {
+    "markdown": "10) foo\n   - bar\n",
+    "html": "<ol start=\"10\">\n<li>foo</li>\n</ol>\n<ul>\n<li>bar</li>\n</ul>\n",
+    "example": 267,
+    "start_line": 4611,
+    "end_line": 4621,
+    "section": "List items",
+    "shouldFail": true
+  },
+  {
+    "markdown": "- - foo\n",
+    "html": "<ul>\n<li>\n<ul>\n<li>foo</li>\n</ul>\n</li>\n</ul>\n",
+    "example": 268,
+    "start_line": 4626,
+    "end_line": 4636,
+    "section": "List items"
+  },
+  {
+    "markdown": "1. - 2. foo\n",
+    "html": "<ol>\n<li>\n<ul>\n<li>\n<ol start=\"2\">\n<li>foo</li>\n</ol>\n</li>\n</ul>\n</li>\n</ol>\n",
+    "example": 269,
+    "start_line": 4639,
+    "end_line": 4653,
+    "section": "List items"
+  },
+  {
+    "markdown": "- # Foo\n- Bar\n  ---\n  baz\n",
+    "html": "<ul>\n<li>\n<h1>Foo</h1>\n</li>\n<li>\n<h2>Bar</h2>\nbaz</li>\n</ul>\n",
+    "example": 270,
+    "start_line": 4658,
+    "end_line": 4672,
+    "section": "List items"
+  },
+  {
+    "markdown": "- foo\n- bar\n+ baz\n",
+    "html": "<ul>\n<li>foo</li>\n<li>bar</li>\n</ul>\n<ul>\n<li>baz</li>\n</ul>\n",
+    "example": 271,
+    "start_line": 4894,
+    "end_line": 4906,
+    "section": "Lists",
+    "shouldFail": true
+  },
+  {
+    "markdown": "1. foo\n2. bar\n3) baz\n",
+    "html": "<ol>\n<li>foo</li>\n<li>bar</li>\n</ol>\n<ol start=\"3\">\n<li>baz</li>\n</ol>\n",
+    "example": 272,
+    "start_line": 4909,
+    "end_line": 4921,
+    "section": "Lists",
+    "shouldFail": true
+  },
+  {
+    "markdown": "Foo\n- bar\n- baz\n",
+    "html": "<p>Foo</p>\n<ul>\n<li>bar</li>\n<li>baz</li>\n</ul>\n",
+    "example": 273,
+    "start_line": 4928,
+    "end_line": 4938,
+    "section": "Lists"
+  },
+  {
+    "markdown": "The number of windows in my house is\n14.  The number of doors is 6.\n",
+    "html": "<p>The number of windows in my house is\n14.  The number of doors is 6.</p>\n",
+    "example": 274,
+    "start_line": 5005,
+    "end_line": 5011,
+    "section": "Lists",
+    "shouldFail": true
+  },
+  {
+    "markdown": "The number of windows in my house is\n1.  The number of doors is 6.\n",
+    "html": "<p>The number of windows in my house is</p>\n<ol>\n<li>The number of doors is 6.</li>\n</ol>\n",
+    "example": 275,
+    "start_line": 5015,
+    "end_line": 5023,
+    "section": "Lists"
+  },
+  {
+    "markdown": "- foo\n\n- bar\n\n\n- baz\n",
+    "html": "<ul>\n<li>\n<p>foo</p>\n</li>\n<li>\n<p>bar</p>\n</li>\n<li>\n<p>baz</p>\n</li>\n</ul>\n",
+    "example": 276,
+    "start_line": 5029,
+    "end_line": 5048,
+    "section": "Lists",
+    "shouldFail": true
+  },
+  {
+    "markdown": "- foo\n  - bar\n    - baz\n\n\n      bim\n",
+    "html": "<ul>\n<li>foo\n<ul>\n<li>bar\n<ul>\n<li>\n<p>baz</p>\n<p>bim</p>\n</li>\n</ul>\n</li>\n</ul>\n</li>\n</ul>\n",
+    "example": 277,
+    "start_line": 5050,
+    "end_line": 5072,
+    "section": "Lists",
+    "shouldFail": true
+  },
+  {
+    "markdown": "- foo\n- bar\n\n<!-- -->\n\n- baz\n- bim\n",
+    "html": "<ul>\n<li>foo</li>\n<li>bar</li>\n</ul>\n<!-- -->\n<ul>\n<li>baz</li>\n<li>bim</li>\n</ul>\n",
+    "example": 278,
+    "start_line": 5080,
+    "end_line": 5098,
+    "section": "Lists"
+  },
+  {
+    "markdown": "-   foo\n\n    notcode\n\n-   foo\n\n<!-- -->\n\n    code\n",
+    "html": "<ul>\n<li>\n<p>foo</p>\n<p>notcode</p>\n</li>\n<li>\n<p>foo</p>\n</li>\n</ul>\n<!-- -->\n<pre><code>code\n</code></pre>\n",
+    "example": 279,
+    "start_line": 5101,
+    "end_line": 5124,
+    "section": "Lists"
+  },
+  {
+    "markdown": "- a\n - b\n  - c\n   - d\n  - e\n - f\n- g\n",
+    "html": "<ul>\n<li>a</li>\n<li>b</li>\n<li>c</li>\n<li>d</li>\n<li>e</li>\n<li>f</li>\n<li>g</li>\n</ul>\n",
+    "example": 280,
+    "start_line": 5132,
+    "end_line": 5150,
+    "section": "Lists",
+    "shouldFail": true
+  },
+  {
+    "markdown": "1. a\n\n  2. b\n\n   3. c\n",
+    "html": "<ol>\n<li>\n<p>a</p>\n</li>\n<li>\n<p>b</p>\n</li>\n<li>\n<p>c</p>\n</li>\n</ol>\n",
+    "example": 281,
+    "start_line": 5153,
+    "end_line": 5171,
+    "section": "Lists",
+    "shouldFail": true
+  },
+  {
+    "markdown": "- a\n - b\n  - c\n   - d\n    - e\n",
+    "html": "<ul>\n<li>a</li>\n<li>b</li>\n<li>c</li>\n<li>d\n- e</li>\n</ul>\n",
+    "example": 282,
+    "start_line": 5177,
+    "end_line": 5191,
+    "section": "Lists",
+    "shouldFail": true
+  },
+  {
+    "markdown": "1. a\n\n  2. b\n\n    3. c\n",
+    "html": "<ol>\n<li>\n<p>a</p>\n</li>\n<li>\n<p>b</p>\n</li>\n</ol>\n<pre><code>3. c\n</code></pre>\n",
+    "example": 283,
+    "start_line": 5197,
+    "end_line": 5214,
+    "section": "Lists",
+    "shouldFail": true
+  },
+  {
+    "markdown": "- a\n- b\n\n- c\n",
+    "html": "<ul>\n<li>\n<p>a</p>\n</li>\n<li>\n<p>b</p>\n</li>\n<li>\n<p>c</p>\n</li>\n</ul>\n",
+    "example": 284,
+    "start_line": 5220,
+    "end_line": 5237,
+    "section": "Lists"
+  },
+  {
+    "markdown": "* a\n*\n\n* c\n",
+    "html": "<ul>\n<li>\n<p>a</p>\n</li>\n<li></li>\n<li>\n<p>c</p>\n</li>\n</ul>\n",
+    "example": 285,
+    "start_line": 5242,
+    "end_line": 5257,
+    "section": "Lists"
+  },
+  {
+    "markdown": "- a\n- b\n\n  c\n- d\n",
+    "html": "<ul>\n<li>\n<p>a</p>\n</li>\n<li>\n<p>b</p>\n<p>c</p>\n</li>\n<li>\n<p>d</p>\n</li>\n</ul>\n",
+    "example": 286,
+    "start_line": 5264,
+    "end_line": 5283,
+    "section": "Lists"
+  },
+  {
+    "markdown": "- a\n- b\n\n  [ref]: /url\n- d\n",
+    "html": "<ul>\n<li>\n<p>a</p>\n</li>\n<li>\n<p>b</p>\n</li>\n<li>\n<p>d</p>\n</li>\n</ul>\n",
+    "example": 287,
+    "start_line": 5286,
+    "end_line": 5304,
+    "section": "Lists",
+    "shouldFail": true
+  },
+  {
+    "markdown": "- a\n- ```\n  b\n\n\n  ```\n- c\n",
+    "html": "<ul>\n<li>a</li>\n<li>\n<pre><code>b\n\n\n</code></pre>\n</li>\n<li>c</li>\n</ul>\n",
+    "example": 288,
+    "start_line": 5309,
+    "end_line": 5328,
+    "section": "Lists",
+    "shouldFail": true
+  },
+  {
+    "markdown": "- a\n  - b\n\n    c\n- d\n",
+    "html": "<ul>\n<li>a\n<ul>\n<li>\n<p>b</p>\n<p>c</p>\n</li>\n</ul>\n</li>\n<li>d</li>\n</ul>\n",
+    "example": 289,
+    "start_line": 5335,
+    "end_line": 5353,
+    "section": "Lists",
+    "shouldFail": true
+  },
+  {
+    "markdown": "* a\n  > b\n  >\n* c\n",
+    "html": "<ul>\n<li>a\n<blockquote>\n<p>b</p>\n</blockquote>\n</li>\n<li>c</li>\n</ul>\n",
+    "example": 290,
+    "start_line": 5359,
+    "end_line": 5373,
+    "section": "Lists"
+  },
+  {
+    "markdown": "- a\n  > b\n  ```\n  c\n  ```\n- d\n",
+    "html": "<ul>\n<li>a\n<blockquote>\n<p>b</p>\n</blockquote>\n<pre><code>c\n</code></pre>\n</li>\n<li>d</li>\n</ul>\n",
+    "example": 291,
+    "start_line": 5379,
+    "end_line": 5397,
+    "section": "Lists",
+    "shouldFail": true
+  },
+  {
+    "markdown": "- a\n",
+    "html": "<ul>\n<li>a</li>\n</ul>\n",
+    "example": 292,
+    "start_line": 5402,
+    "end_line": 5408,
+    "section": "Lists"
+  },
+  {
+    "markdown": "- a\n  - b\n",
+    "html": "<ul>\n<li>a\n<ul>\n<li>b</li>\n</ul>\n</li>\n</ul>\n",
+    "example": 293,
+    "start_line": 5411,
+    "end_line": 5422,
+    "section": "Lists"
+  },
+  {
+    "markdown": "1. ```\n   foo\n   ```\n\n   bar\n",
+    "html": "<ol>\n<li>\n<pre><code>foo\n</code></pre>\n<p>bar</p>\n</li>\n</ol>\n",
+    "example": 294,
+    "start_line": 5428,
+    "end_line": 5442,
+    "section": "Lists"
+  },
+  {
+    "markdown": "* foo\n  * bar\n\n  baz\n",
+    "html": "<ul>\n<li>\n<p>foo</p>\n<ul>\n<li>bar</li>\n</ul>\n<p>baz</p>\n</li>\n</ul>\n",
+    "example": 295,
+    "start_line": 5447,
+    "end_line": 5462,
+    "section": "Lists"
+  },
+  {
+    "markdown": "- a\n  - b\n  - c\n\n- d\n  - e\n  - f\n",
+    "html": "<ul>\n<li>\n<p>a</p>\n<ul>\n<li>b</li>\n<li>c</li>\n</ul>\n</li>\n<li>\n<p>d</p>\n<ul>\n<li>e</li>\n<li>f</li>\n</ul>\n</li>\n</ul>\n",
+    "example": 296,
+    "start_line": 5465,
+    "end_line": 5490,
+    "section": "Lists"
+  },
+  {
+    "markdown": "`hi`lo`\n",
+    "html": "<p><code>hi</code>lo`</p>\n",
+    "example": 297,
+    "start_line": 5499,
+    "end_line": 5503,
+    "section": "Inlines"
+  },
+  {
+    "markdown": "\\!\\\"\\#\\$\\%\\&\\'\\(\\)\\*\\+\\,\\-\\.\\/\\:\\;\\<\\=\\>\\?\\@\\[\\\\\\]\\^\\_\\`\\{\\|\\}\\~\n",
+    "html": "<p>!&quot;#$%&amp;'()*+,-./:;&lt;=&gt;?@[\\]^_`{|}~</p>\n",
+    "example": 298,
+    "start_line": 5513,
+    "end_line": 5517,
+    "section": "Backslash escapes"
+  },
+  {
+    "markdown": "\\\t\\A\\a\\ \\3\\φ\\«\n",
+    "html": "<p>\\\t\\A\\a\\ \\3\\φ\\«</p>\n",
+    "example": 299,
+    "start_line": 5523,
+    "end_line": 5527,
+    "section": "Backslash escapes"
+  },
+  {
+    "markdown": "\\*not emphasized*\n\\<br/> not a tag\n\\[not a link](/foo)\n\\`not code`\n1\\. not a list\n\\* not a list\n\\# not a heading\n\\[foo]: /url \"not a reference\"\n\\&ouml; not a character entity\n",
+    "html": "<p>*not emphasized*\n&lt;br/&gt; not a tag\n[not a link](/foo)\n`not code`\n1. not a list\n* not a list\n# not a heading\n[foo]: /url &quot;not a reference&quot;\n&amp;ouml; not a character entity</p>\n",
+    "example": 300,
+    "start_line": 5533,
+    "end_line": 5553,
+    "section": "Backslash escapes"
+  },
+  {
+    "markdown": "\\\\*emphasis*\n",
+    "html": "<p>\\<em>emphasis</em></p>\n",
+    "example": 301,
+    "start_line": 5558,
+    "end_line": 5562,
+    "section": "Backslash escapes"
+  },
+  {
+    "markdown": "foo\\\nbar\n",
+    "html": "<p>foo<br />\nbar</p>\n",
+    "example": 302,
+    "start_line": 5567,
+    "end_line": 5573,
+    "section": "Backslash escapes"
+  },
+  {
+    "markdown": "`` \\[\\` ``\n",
+    "html": "<p><code>\\[\\`</code></p>\n",
+    "example": 303,
+    "start_line": 5579,
+    "end_line": 5583,
+    "section": "Backslash escapes"
+  },
+  {
+    "markdown": "    \\[\\]\n",
+    "html": "<pre><code>\\[\\]\n</code></pre>\n",
+    "example": 304,
+    "start_line": 5586,
+    "end_line": 5591,
+    "section": "Backslash escapes"
+  },
+  {
+    "markdown": "~~~\n\\[\\]\n~~~\n",
+    "html": "<pre><code>\\[\\]\n</code></pre>\n",
+    "example": 305,
+    "start_line": 5594,
+    "end_line": 5601,
+    "section": "Backslash escapes"
+  },
+  {
+    "markdown": "<http://example.com?find=\\*>\n",
+    "html": "<p><a href=\"http://example.com?find=%5C*\">http://example.com?find=\\*</a></p>\n",
+    "example": 306,
+    "start_line": 5604,
+    "end_line": 5608,
+    "section": "Backslash escapes"
+  },
+  {
+    "markdown": "<a href=\"/bar\\/)\">\n",
+    "html": "<a href=\"/bar\\/)\">\n",
+    "example": 307,
+    "start_line": 5611,
+    "end_line": 5615,
+    "section": "Backslash escapes"
+  },
+  {
+    "markdown": "[foo](/bar\\* \"ti\\*tle\")\n",
+    "html": "<p><a href=\"/bar*\" title=\"ti*tle\">foo</a></p>\n",
+    "example": 308,
+    "start_line": 5621,
+    "end_line": 5625,
+    "section": "Backslash escapes"
+  },
+  {
+    "markdown": "[foo]\n\n[foo]: /bar\\* \"ti\\*tle\"\n",
+    "html": "<p><a href=\"/bar*\" title=\"ti*tle\">foo</a></p>\n",
+    "example": 309,
+    "start_line": 5628,
+    "end_line": 5634,
+    "section": "Backslash escapes",
+    "shouldFail": true
+  },
+  {
+    "markdown": "``` foo\\+bar\nfoo\n```\n",
+    "html": "<pre><code class=\"language-foo+bar\">foo\n</code></pre>\n",
+    "example": 310,
+    "start_line": 5637,
+    "end_line": 5644,
+    "section": "Backslash escapes",
+    "shouldFail": true
+  },
+  {
+    "markdown": "&nbsp; &amp; &copy; &AElig; &Dcaron;\n&frac34; &HilbertSpace; &DifferentialD;\n&ClockwiseContourIntegral; &ngE;\n",
+    "html": "<p>  &amp; © Æ Ď\n¾ ℋ ⅆ\n∲ ≧̸</p>\n",
+    "example": 311,
+    "start_line": 5674,
+    "end_line": 5682,
+    "section": "Entity and numeric character references"
+  },
+  {
+    "markdown": "&#35; &#1234; &#992; &#0;\n",
+    "html": "<p># Ӓ Ϡ �</p>\n",
+    "example": 312,
+    "start_line": 5693,
+    "end_line": 5697,
+    "section": "Entity and numeric character references"
+  },
+  {
+    "markdown": "&#X22; &#XD06; &#xcab;\n",
+    "html": "<p>&quot; ആ ಫ</p>\n",
+    "example": 313,
+    "start_line": 5706,
+    "end_line": 5710,
+    "section": "Entity and numeric character references"
+  },
+  {
+    "markdown": "&nbsp &x; &#; &#x;\n&#987654321;\n&#abcdef0;\n&ThisIsNotDefined; &hi?;\n",
+    "html": "<p>&amp;nbsp &amp;x; &amp;#; &amp;#x;\n&amp;#987654321;\n&amp;#abcdef0;\n&amp;ThisIsNotDefined; &amp;hi?;</p>\n",
+    "example": 314,
+    "start_line": 5715,
+    "end_line": 5725,
+    "section": "Entity and numeric character references",
+    "shouldFail": true
+  },
+  {
+    "markdown": "&copy\n",
+    "html": "<p>&amp;copy</p>\n",
+    "example": 315,
+    "start_line": 5732,
+    "end_line": 5736,
+    "section": "Entity and numeric character references"
+  },
+  {
+    "markdown": "&MadeUpEntity;\n",
+    "html": "<p>&amp;MadeUpEntity;</p>\n",
+    "example": 316,
+    "start_line": 5742,
+    "end_line": 5746,
+    "section": "Entity and numeric character references"
+  },
+  {
+    "markdown": "<a href=\"&ouml;&ouml;.html\">\n",
+    "html": "<a href=\"&ouml;&ouml;.html\">\n",
+    "example": 317,
+    "start_line": 5753,
+    "end_line": 5757,
+    "section": "Entity and numeric character references"
+  },
+  {
+    "markdown": "[foo](/f&ouml;&ouml; \"f&ouml;&ouml;\")\n",
+    "html": "<p><a href=\"/f%C3%B6%C3%B6\" title=\"föö\">foo</a></p>\n",
+    "example": 318,
+    "start_line": 5760,
+    "end_line": 5764,
+    "section": "Entity and numeric character references",
+    "shouldFail": true
+  },
+  {
+    "markdown": "[foo]\n\n[foo]: /f&ouml;&ouml; \"f&ouml;&ouml;\"\n",
+    "html": "<p><a href=\"/f%C3%B6%C3%B6\" title=\"föö\">foo</a></p>\n",
+    "example": 319,
+    "start_line": 5767,
+    "end_line": 5773,
+    "section": "Entity and numeric character references",
+    "shouldFail": true
+  },
+  {
+    "markdown": "``` f&ouml;&ouml;\nfoo\n```\n",
+    "html": "<pre><code class=\"language-föö\">foo\n</code></pre>\n",
+    "example": 320,
+    "start_line": 5776,
+    "end_line": 5783,
+    "section": "Entity and numeric character references",
+    "shouldFail": true
+  },
+  {
+    "markdown": "`f&ouml;&ouml;`\n",
+    "html": "<p><code>f&amp;ouml;&amp;ouml;</code></p>\n",
+    "example": 321,
+    "start_line": 5789,
+    "end_line": 5793,
+    "section": "Entity and numeric character references"
+  },
+  {
+    "markdown": "    f&ouml;f&ouml;\n",
+    "html": "<pre><code>f&amp;ouml;f&amp;ouml;\n</code></pre>\n",
+    "example": 322,
+    "start_line": 5796,
+    "end_line": 5801,
+    "section": "Entity and numeric character references"
+  },
+  {
+    "markdown": "&#42;foo&#42;\n*foo*\n",
+    "html": "<p>*foo*\n<em>foo</em></p>\n",
+    "example": 323,
+    "start_line": 5808,
+    "end_line": 5814,
+    "section": "Entity and numeric character references"
+  },
+  {
+    "markdown": "&#42; foo\n\n* foo\n",
+    "html": "<p>* foo</p>\n<ul>\n<li>foo</li>\n</ul>\n",
+    "example": 324,
+    "start_line": 5816,
+    "end_line": 5825,
+    "section": "Entity and numeric character references"
+  },
+  {
+    "markdown": "foo&#10;&#10;bar\n",
+    "html": "<p>foo\n\nbar</p>\n",
+    "example": 325,
+    "start_line": 5827,
+    "end_line": 5833,
+    "section": "Entity and numeric character references"
+  },
+  {
+    "markdown": "&#9;foo\n",
+    "html": "<p>\tfoo</p>\n",
+    "example": 326,
+    "start_line": 5835,
+    "end_line": 5839,
+    "section": "Entity and numeric character references"
+  },
+  {
+    "markdown": "[a](url &quot;tit&quot;)\n",
+    "html": "<p>[a](url &quot;tit&quot;)</p>\n",
+    "example": 327,
+    "start_line": 5842,
+    "end_line": 5846,
+    "section": "Entity and numeric character references"
+  },
+  {
+    "markdown": "`foo`\n",
+    "html": "<p><code>foo</code></p>\n",
+    "example": 328,
+    "start_line": 5870,
+    "end_line": 5874,
+    "section": "Code spans"
+  },
+  {
+    "markdown": "`` foo ` bar ``\n",
+    "html": "<p><code>foo ` bar</code></p>\n",
+    "example": 329,
+    "start_line": 5881,
+    "end_line": 5885,
+    "section": "Code spans"
+  },
+  {
+    "markdown": "` `` `\n",
+    "html": "<p><code>``</code></p>\n",
+    "example": 330,
+    "start_line": 5891,
+    "end_line": 5895,
+    "section": "Code spans"
+  },
+  {
+    "markdown": "`  ``  `\n",
+    "html": "<p><code> `` </code></p>\n",
+    "example": 331,
+    "start_line": 5899,
+    "end_line": 5903,
+    "section": "Code spans"
+  },
+  {
+    "markdown": "` a`\n",
+    "html": "<p><code> a</code></p>\n",
+    "example": 332,
+    "start_line": 5908,
+    "end_line": 5912,
+    "section": "Code spans"
+  },
+  {
+    "markdown": "` b `\n",
+    "html": "<p><code> b </code></p>\n",
+    "example": 333,
+    "start_line": 5917,
+    "end_line": 5921,
+    "section": "Code spans"
+  },
+  {
+    "markdown": "` `\n`  `\n",
+    "html": "<p><code> </code>\n<code>  </code></p>\n",
+    "example": 334,
+    "start_line": 5925,
+    "end_line": 5931,
+    "section": "Code spans"
+  },
+  {
+    "markdown": "``\nfoo\nbar  \nbaz\n``\n",
+    "html": "<p><code>foo bar   baz</code></p>\n",
+    "example": 335,
+    "start_line": 5936,
+    "end_line": 5944,
+    "section": "Code spans"
+  },
+  {
+    "markdown": "``\nfoo \n``\n",
+    "html": "<p><code>foo </code></p>\n",
+    "example": 336,
+    "start_line": 5946,
+    "end_line": 5952,
+    "section": "Code spans"
+  },
+  {
+    "markdown": "`foo   bar \nbaz`\n",
+    "html": "<p><code>foo   bar  baz</code></p>\n",
+    "example": 337,
+    "start_line": 5957,
+    "end_line": 5962,
+    "section": "Code spans"
+  },
+  {
+    "markdown": "`foo\\`bar`\n",
+    "html": "<p><code>foo\\</code>bar`</p>\n",
+    "example": 338,
+    "start_line": 5974,
+    "end_line": 5978,
+    "section": "Code spans"
+  },
+  {
+    "markdown": "``foo`bar``\n",
+    "html": "<p><code>foo`bar</code></p>\n",
+    "example": 339,
+    "start_line": 5985,
+    "end_line": 5989,
+    "section": "Code spans"
+  },
+  {
+    "markdown": "` foo `` bar `\n",
+    "html": "<p><code>foo `` bar</code></p>\n",
+    "example": 340,
+    "start_line": 5991,
+    "end_line": 5995,
+    "section": "Code spans"
+  },
+  {
+    "markdown": "*foo`*`\n",
+    "html": "<p>*foo<code>*</code></p>\n",
+    "example": 341,
+    "start_line": 6003,
+    "end_line": 6007,
+    "section": "Code spans",
+    "shouldFail": true
+  },
+  {
+    "markdown": "[not a `link](/foo`)\n",
+    "html": "<p>[not a <code>link](/foo</code>)</p>\n",
+    "example": 342,
+    "start_line": 6012,
+    "end_line": 6016,
+    "section": "Code spans",
+    "shouldFail": true
+  },
+  {
+    "markdown": "`<a href=\"`\">`\n",
+    "html": "<p><code>&lt;a href=&quot;</code>&quot;&gt;`</p>\n",
+    "example": 343,
+    "start_line": 6022,
+    "end_line": 6026,
+    "section": "Code spans"
+  },
+  {
+    "markdown": "<a href=\"`\">`\n",
+    "html": "<p><a href=\"`\">`</p>\n",
+    "example": 344,
+    "start_line": 6031,
+    "end_line": 6035,
+    "section": "Code spans"
+  },
+  {
+    "markdown": "`<http://foo.bar.`baz>`\n",
+    "html": "<p><code>&lt;http://foo.bar.</code>baz&gt;`</p>\n",
+    "example": 345,
+    "start_line": 6040,
+    "end_line": 6044,
+    "section": "Code spans"
+  },
+  {
+    "markdown": "<http://foo.bar.`baz>`\n",
+    "html": "<p><a href=\"http://foo.bar.%60baz\">http://foo.bar.`baz</a>`</p>\n",
+    "example": 346,
+    "start_line": 6049,
+    "end_line": 6053,
+    "section": "Code spans"
+  },
+  {
+    "markdown": "```foo``\n",
+    "html": "<p>```foo``</p>\n",
+    "example": 347,
+    "start_line": 6059,
+    "end_line": 6063,
+    "section": "Code spans"
+  },
+  {
+    "markdown": "`foo\n",
+    "html": "<p>`foo</p>\n",
+    "example": 348,
+    "start_line": 6066,
+    "end_line": 6070,
+    "section": "Code spans"
+  },
+  {
+    "markdown": "`foo``bar``\n",
+    "html": "<p>`foo<code>bar</code></p>\n",
+    "example": 349,
+    "start_line": 6075,
+    "end_line": 6079,
+    "section": "Code spans"
+  },
+  {
+    "markdown": "*foo bar*\n",
+    "html": "<p><em>foo bar</em></p>\n",
+    "example": 350,
+    "start_line": 6292,
+    "end_line": 6296,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "a * foo bar*\n",
+    "html": "<p>a * foo bar*</p>\n",
+    "example": 351,
+    "start_line": 6302,
+    "end_line": 6306,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "a*\"foo\"*\n",
+    "html": "<p>a*&quot;foo&quot;*</p>\n",
+    "example": 352,
+    "start_line": 6313,
+    "end_line": 6317,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "* a *\n",
+    "html": "<p>* a *</p>\n",
+    "example": 353,
+    "start_line": 6322,
+    "end_line": 6326,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "foo*bar*\n",
+    "html": "<p>foo<em>bar</em></p>\n",
+    "example": 354,
+    "start_line": 6331,
+    "end_line": 6335,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "5*6*78\n",
+    "html": "<p>5<em>6</em>78</p>\n",
+    "example": 355,
+    "start_line": 6338,
+    "end_line": 6342,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "_foo bar_\n",
+    "html": "<p><em>foo bar</em></p>\n",
+    "example": 356,
+    "start_line": 6347,
+    "end_line": 6351,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "_ foo bar_\n",
+    "html": "<p>_ foo bar_</p>\n",
+    "example": 357,
+    "start_line": 6357,
+    "end_line": 6361,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "a_\"foo\"_\n",
+    "html": "<p>a_&quot;foo&quot;_</p>\n",
+    "example": 358,
+    "start_line": 6367,
+    "end_line": 6371,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "foo_bar_\n",
+    "html": "<p>foo_bar_</p>\n",
+    "example": 359,
+    "start_line": 6376,
+    "end_line": 6380,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "5_6_78\n",
+    "html": "<p>5_6_78</p>\n",
+    "example": 360,
+    "start_line": 6383,
+    "end_line": 6387,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "пристаням_стремятся_\n",
+    "html": "<p>пристаням_стремятся_</p>\n",
+    "example": 361,
+    "start_line": 6390,
+    "end_line": 6394,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "aa_\"bb\"_cc\n",
+    "html": "<p>aa_&quot;bb&quot;_cc</p>\n",
+    "example": 362,
+    "start_line": 6400,
+    "end_line": 6404,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "foo-_(bar)_\n",
+    "html": "<p>foo-<em>(bar)</em></p>\n",
+    "example": 363,
+    "start_line": 6411,
+    "end_line": 6415,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "_foo*\n",
+    "html": "<p>_foo*</p>\n",
+    "example": 364,
+    "start_line": 6423,
+    "end_line": 6427,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "*foo bar *\n",
+    "html": "<p>*foo bar *</p>\n",
+    "example": 365,
+    "start_line": 6433,
+    "end_line": 6437,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "*foo bar\n*\n",
+    "html": "<p>*foo bar\n*</p>\n",
+    "example": 366,
+    "start_line": 6442,
+    "end_line": 6448,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "*(*foo)\n",
+    "html": "<p>*(*foo)</p>\n",
+    "example": 367,
+    "start_line": 6455,
+    "end_line": 6459,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "*(*foo*)*\n",
+    "html": "<p><em>(<em>foo</em>)</em></p>\n",
+    "example": 368,
+    "start_line": 6465,
+    "end_line": 6469,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "*foo*bar\n",
+    "html": "<p><em>foo</em>bar</p>\n",
+    "example": 369,
+    "start_line": 6474,
+    "end_line": 6478,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "_foo bar _\n",
+    "html": "<p>_foo bar _</p>\n",
+    "example": 370,
+    "start_line": 6487,
+    "end_line": 6491,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "_(_foo)\n",
+    "html": "<p>_(_foo)</p>\n",
+    "example": 371,
+    "start_line": 6497,
+    "end_line": 6501,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "_(_foo_)_\n",
+    "html": "<p><em>(<em>foo</em>)</em></p>\n",
+    "example": 372,
+    "start_line": 6506,
+    "end_line": 6510,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "_foo_bar\n",
+    "html": "<p>_foo_bar</p>\n",
+    "example": 373,
+    "start_line": 6515,
+    "end_line": 6519,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "_пристаням_стремятся\n",
+    "html": "<p>_пристаням_стремятся</p>\n",
+    "example": 374,
+    "start_line": 6522,
+    "end_line": 6526,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "_foo_bar_baz_\n",
+    "html": "<p><em>foo_bar_baz</em></p>\n",
+    "example": 375,
+    "start_line": 6529,
+    "end_line": 6533,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "_(bar)_.\n",
+    "html": "<p><em>(bar)</em>.</p>\n",
+    "example": 376,
+    "start_line": 6540,
+    "end_line": 6544,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "**foo bar**\n",
+    "html": "<p><strong>foo bar</strong></p>\n",
+    "example": 377,
+    "start_line": 6549,
+    "end_line": 6553,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "** foo bar**\n",
+    "html": "<p>** foo bar**</p>\n",
+    "example": 378,
+    "start_line": 6559,
+    "end_line": 6563,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "a**\"foo\"**\n",
+    "html": "<p>a**&quot;foo&quot;**</p>\n",
+    "example": 379,
+    "start_line": 6570,
+    "end_line": 6574,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "foo**bar**\n",
+    "html": "<p>foo<strong>bar</strong></p>\n",
+    "example": 380,
+    "start_line": 6579,
+    "end_line": 6583,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "__foo bar__\n",
+    "html": "<p><strong>foo bar</strong></p>\n",
+    "example": 381,
+    "start_line": 6588,
+    "end_line": 6592,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "__ foo bar__\n",
+    "html": "<p>__ foo bar__</p>\n",
+    "example": 382,
+    "start_line": 6598,
+    "end_line": 6602,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "__\nfoo bar__\n",
+    "html": "<p>__\nfoo bar__</p>\n",
+    "example": 383,
+    "start_line": 6606,
+    "end_line": 6612,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "a__\"foo\"__\n",
+    "html": "<p>a__&quot;foo&quot;__</p>\n",
+    "example": 384,
+    "start_line": 6618,
+    "end_line": 6622,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "foo__bar__\n",
+    "html": "<p>foo__bar__</p>\n",
+    "example": 385,
+    "start_line": 6627,
+    "end_line": 6631,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "5__6__78\n",
+    "html": "<p>5__6__78</p>\n",
+    "example": 386,
+    "start_line": 6634,
+    "end_line": 6638,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "пристаням__стремятся__\n",
+    "html": "<p>пристаням__стремятся__</p>\n",
+    "example": 387,
+    "start_line": 6641,
+    "end_line": 6645,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "__foo, __bar__, baz__\n",
+    "html": "<p><strong>foo, <strong>bar</strong>, baz</strong></p>\n",
+    "example": 388,
+    "start_line": 6648,
+    "end_line": 6652,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "foo-__(bar)__\n",
+    "html": "<p>foo-<strong>(bar)</strong></p>\n",
+    "example": 389,
+    "start_line": 6659,
+    "end_line": 6663,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "**foo bar **\n",
+    "html": "<p>**foo bar **</p>\n",
+    "example": 390,
+    "start_line": 6672,
+    "end_line": 6676,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "**(**foo)\n",
+    "html": "<p>**(**foo)</p>\n",
+    "example": 391,
+    "start_line": 6685,
+    "end_line": 6689,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "*(**foo**)*\n",
+    "html": "<p><em>(<strong>foo</strong>)</em></p>\n",
+    "example": 392,
+    "start_line": 6695,
+    "end_line": 6699,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "**Gomphocarpus (*Gomphocarpus physocarpus*, syn.\n*Asclepias physocarpa*)**\n",
+    "html": "<p><strong>Gomphocarpus (<em>Gomphocarpus physocarpus</em>, syn.\n<em>Asclepias physocarpa</em>)</strong></p>\n",
+    "example": 393,
+    "start_line": 6702,
+    "end_line": 6708,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "**foo \"*bar*\" foo**\n",
+    "html": "<p><strong>foo &quot;<em>bar</em>&quot; foo</strong></p>\n",
+    "example": 394,
+    "start_line": 6711,
+    "end_line": 6715,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "**foo**bar\n",
+    "html": "<p><strong>foo</strong>bar</p>\n",
+    "example": 395,
+    "start_line": 6720,
+    "end_line": 6724,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "__foo bar __\n",
+    "html": "<p>__foo bar __</p>\n",
+    "example": 396,
+    "start_line": 6732,
+    "end_line": 6736,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "__(__foo)\n",
+    "html": "<p>__(__foo)</p>\n",
+    "example": 397,
+    "start_line": 6742,
+    "end_line": 6746,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "_(__foo__)_\n",
+    "html": "<p><em>(<strong>foo</strong>)</em></p>\n",
+    "example": 398,
+    "start_line": 6752,
+    "end_line": 6756,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "__foo__bar\n",
+    "html": "<p>__foo__bar</p>\n",
+    "example": 399,
+    "start_line": 6761,
+    "end_line": 6765,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "__пристаням__стремятся\n",
+    "html": "<p>__пристаням__стремятся</p>\n",
+    "example": 400,
+    "start_line": 6768,
+    "end_line": 6772,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "__foo__bar__baz__\n",
+    "html": "<p><strong>foo__bar__baz</strong></p>\n",
+    "example": 401,
+    "start_line": 6775,
+    "end_line": 6779,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "__(bar)__.\n",
+    "html": "<p><strong>(bar)</strong>.</p>\n",
+    "example": 402,
+    "start_line": 6786,
+    "end_line": 6790,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "*foo [bar](/url)*\n",
+    "html": "<p><em>foo <a href=\"/url\">bar</a></em></p>\n",
+    "example": 403,
+    "start_line": 6798,
+    "end_line": 6802,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "*foo\nbar*\n",
+    "html": "<p><em>foo\nbar</em></p>\n",
+    "example": 404,
+    "start_line": 6805,
+    "end_line": 6811,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "_foo __bar__ baz_\n",
+    "html": "<p><em>foo <strong>bar</strong> baz</em></p>\n",
+    "example": 405,
+    "start_line": 6817,
+    "end_line": 6821,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "_foo _bar_ baz_\n",
+    "html": "<p><em>foo <em>bar</em> baz</em></p>\n",
+    "example": 406,
+    "start_line": 6824,
+    "end_line": 6828,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "__foo_ bar_\n",
+    "html": "<p><em><em>foo</em> bar</em></p>\n",
+    "example": 407,
+    "start_line": 6831,
+    "end_line": 6835,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "*foo *bar**\n",
+    "html": "<p><em>foo <em>bar</em></em></p>\n",
+    "example": 408,
+    "start_line": 6838,
+    "end_line": 6842,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "*foo **bar** baz*\n",
+    "html": "<p><em>foo <strong>bar</strong> baz</em></p>\n",
+    "example": 409,
+    "start_line": 6845,
+    "end_line": 6849,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "*foo**bar**baz*\n",
+    "html": "<p><em>foo<strong>bar</strong>baz</em></p>\n",
+    "example": 410,
+    "start_line": 6851,
+    "end_line": 6855,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "*foo**bar*\n",
+    "html": "<p><em>foo**bar</em></p>\n",
+    "example": 411,
+    "start_line": 6875,
+    "end_line": 6879,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "***foo** bar*\n",
+    "html": "<p><em><strong>foo</strong> bar</em></p>\n",
+    "example": 412,
+    "start_line": 6888,
+    "end_line": 6892,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "*foo **bar***\n",
+    "html": "<p><em>foo <strong>bar</strong></em></p>\n",
+    "example": 413,
+    "start_line": 6895,
+    "end_line": 6899,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "*foo**bar***\n",
+    "html": "<p><em>foo<strong>bar</strong></em></p>\n",
+    "example": 414,
+    "start_line": 6902,
+    "end_line": 6906,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "foo***bar***baz\n",
+    "html": "<p>foo<em><strong>bar</strong></em>baz</p>\n",
+    "example": 415,
+    "start_line": 6913,
+    "end_line": 6917,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "foo******bar*********baz\n",
+    "html": "<p>foo<strong><strong><strong>bar</strong></strong></strong>***baz</p>\n",
+    "example": 416,
+    "start_line": 6919,
+    "end_line": 6923,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "*foo **bar *baz* bim** bop*\n",
+    "html": "<p><em>foo <strong>bar <em>baz</em> bim</strong> bop</em></p>\n",
+    "example": 417,
+    "start_line": 6928,
+    "end_line": 6932,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "*foo [*bar*](/url)*\n",
+    "html": "<p><em>foo <a href=\"/url\"><em>bar</em></a></em></p>\n",
+    "example": 418,
+    "start_line": 6935,
+    "end_line": 6939,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "** is not an empty emphasis\n",
+    "html": "<p>** is not an empty emphasis</p>\n",
+    "example": 419,
+    "start_line": 6944,
+    "end_line": 6948,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "**** is not an empty strong emphasis\n",
+    "html": "<p>**** is not an empty strong emphasis</p>\n",
+    "example": 420,
+    "start_line": 6951,
+    "end_line": 6955,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "**foo [bar](/url)**\n",
+    "html": "<p><strong>foo <a href=\"/url\">bar</a></strong></p>\n",
+    "example": 421,
+    "start_line": 6964,
+    "end_line": 6968,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "**foo\nbar**\n",
+    "html": "<p><strong>foo\nbar</strong></p>\n",
+    "example": 422,
+    "start_line": 6971,
+    "end_line": 6977,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "__foo _bar_ baz__\n",
+    "html": "<p><strong>foo <em>bar</em> baz</strong></p>\n",
+    "example": 423,
+    "start_line": 6983,
+    "end_line": 6987,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "__foo __bar__ baz__\n",
+    "html": "<p><strong>foo <strong>bar</strong> baz</strong></p>\n",
+    "example": 424,
+    "start_line": 6990,
+    "end_line": 6994,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "____foo__ bar__\n",
+    "html": "<p><strong><strong>foo</strong> bar</strong></p>\n",
+    "example": 425,
+    "start_line": 6997,
+    "end_line": 7001,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "**foo **bar****\n",
+    "html": "<p><strong>foo <strong>bar</strong></strong></p>\n",
+    "example": 426,
+    "start_line": 7004,
+    "end_line": 7008,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "**foo *bar* baz**\n",
+    "html": "<p><strong>foo <em>bar</em> baz</strong></p>\n",
+    "example": 427,
+    "start_line": 7011,
+    "end_line": 7015,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "**foo*bar*baz**\n",
+    "html": "<p><strong>foo<em>bar</em>baz</strong></p>\n",
+    "example": 428,
+    "start_line": 7018,
+    "end_line": 7022,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "***foo* bar**\n",
+    "html": "<p><strong><em>foo</em> bar</strong></p>\n",
+    "example": 429,
+    "start_line": 7025,
+    "end_line": 7029,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "**foo *bar***\n",
+    "html": "<p><strong>foo <em>bar</em></strong></p>\n",
+    "example": 430,
+    "start_line": 7032,
+    "end_line": 7036,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "**foo *bar **baz**\nbim* bop**\n",
+    "html": "<p><strong>foo <em>bar <strong>baz</strong>\nbim</em> bop</strong></p>\n",
+    "example": 431,
+    "start_line": 7041,
+    "end_line": 7047,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "**foo [*bar*](/url)**\n",
+    "html": "<p><strong>foo <a href=\"/url\"><em>bar</em></a></strong></p>\n",
+    "example": 432,
+    "start_line": 7050,
+    "end_line": 7054,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "__ is not an empty emphasis\n",
+    "html": "<p>__ is not an empty emphasis</p>\n",
+    "example": 433,
+    "start_line": 7059,
+    "end_line": 7063,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "____ is not an empty strong emphasis\n",
+    "html": "<p>____ is not an empty strong emphasis</p>\n",
+    "example": 434,
+    "start_line": 7066,
+    "end_line": 7070,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "foo ***\n",
+    "html": "<p>foo ***</p>\n",
+    "example": 435,
+    "start_line": 7076,
+    "end_line": 7080,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "foo *\\**\n",
+    "html": "<p>foo <em>*</em></p>\n",
+    "example": 436,
+    "start_line": 7083,
+    "end_line": 7087,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "foo *_*\n",
+    "html": "<p>foo <em>_</em></p>\n",
+    "example": 437,
+    "start_line": 7090,
+    "end_line": 7094,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "foo *****\n",
+    "html": "<p>foo *****</p>\n",
+    "example": 438,
+    "start_line": 7097,
+    "end_line": 7101,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "foo **\\***\n",
+    "html": "<p>foo <strong>*</strong></p>\n",
+    "example": 439,
+    "start_line": 7104,
+    "end_line": 7108,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "foo **_**\n",
+    "html": "<p>foo <strong>_</strong></p>\n",
+    "example": 440,
+    "start_line": 7111,
+    "end_line": 7115,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "**foo*\n",
+    "html": "<p>*<em>foo</em></p>\n",
+    "example": 441,
+    "start_line": 7122,
+    "end_line": 7126,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "*foo**\n",
+    "html": "<p><em>foo</em>*</p>\n",
+    "example": 442,
+    "start_line": 7129,
+    "end_line": 7133,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "***foo**\n",
+    "html": "<p>*<strong>foo</strong></p>\n",
+    "example": 443,
+    "start_line": 7136,
+    "end_line": 7140,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "****foo*\n",
+    "html": "<p>***<em>foo</em></p>\n",
+    "example": 444,
+    "start_line": 7143,
+    "end_line": 7147,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "**foo***\n",
+    "html": "<p><strong>foo</strong>*</p>\n",
+    "example": 445,
+    "start_line": 7150,
+    "end_line": 7154,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "*foo****\n",
+    "html": "<p><em>foo</em>***</p>\n",
+    "example": 446,
+    "start_line": 7157,
+    "end_line": 7161,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "foo ___\n",
+    "html": "<p>foo ___</p>\n",
+    "example": 447,
+    "start_line": 7167,
+    "end_line": 7171,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "foo _\\__\n",
+    "html": "<p>foo <em>_</em></p>\n",
+    "example": 448,
+    "start_line": 7174,
+    "end_line": 7178,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "foo _*_\n",
+    "html": "<p>foo <em>*</em></p>\n",
+    "example": 449,
+    "start_line": 7181,
+    "end_line": 7185,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "foo _____\n",
+    "html": "<p>foo _____</p>\n",
+    "example": 450,
+    "start_line": 7188,
+    "end_line": 7192,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "foo __\\___\n",
+    "html": "<p>foo <strong>_</strong></p>\n",
+    "example": 451,
+    "start_line": 7195,
+    "end_line": 7199,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "foo __*__\n",
+    "html": "<p>foo <strong>*</strong></p>\n",
+    "example": 452,
+    "start_line": 7202,
+    "end_line": 7206,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "__foo_\n",
+    "html": "<p>_<em>foo</em></p>\n",
+    "example": 453,
+    "start_line": 7209,
+    "end_line": 7213,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "_foo__\n",
+    "html": "<p><em>foo</em>_</p>\n",
+    "example": 454,
+    "start_line": 7220,
+    "end_line": 7224,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "___foo__\n",
+    "html": "<p>_<strong>foo</strong></p>\n",
+    "example": 455,
+    "start_line": 7227,
+    "end_line": 7231,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "____foo_\n",
+    "html": "<p>___<em>foo</em></p>\n",
+    "example": 456,
+    "start_line": 7234,
+    "end_line": 7238,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "__foo___\n",
+    "html": "<p><strong>foo</strong>_</p>\n",
+    "example": 457,
+    "start_line": 7241,
+    "end_line": 7245,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "_foo____\n",
+    "html": "<p><em>foo</em>___</p>\n",
+    "example": 458,
+    "start_line": 7248,
+    "end_line": 7252,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "**foo**\n",
+    "html": "<p><strong>foo</strong></p>\n",
+    "example": 459,
+    "start_line": 7258,
+    "end_line": 7262,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "*_foo_*\n",
+    "html": "<p><em><em>foo</em></em></p>\n",
+    "example": 460,
+    "start_line": 7265,
+    "end_line": 7269,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "__foo__\n",
+    "html": "<p><strong>foo</strong></p>\n",
+    "example": 461,
+    "start_line": 7272,
+    "end_line": 7276,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "_*foo*_\n",
+    "html": "<p><em><em>foo</em></em></p>\n",
+    "example": 462,
+    "start_line": 7279,
+    "end_line": 7283,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "****foo****\n",
+    "html": "<p><strong><strong>foo</strong></strong></p>\n",
+    "example": 463,
+    "start_line": 7289,
+    "end_line": 7293,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "____foo____\n",
+    "html": "<p><strong><strong>foo</strong></strong></p>\n",
+    "example": 464,
+    "start_line": 7296,
+    "end_line": 7300,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "******foo******\n",
+    "html": "<p><strong><strong><strong>foo</strong></strong></strong></p>\n",
+    "example": 465,
+    "start_line": 7307,
+    "end_line": 7311,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "***foo***\n",
+    "html": "<p><em><strong>foo</strong></em></p>\n",
+    "example": 466,
+    "start_line": 7316,
+    "end_line": 7320,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "_____foo_____\n",
+    "html": "<p><em><strong><strong>foo</strong></strong></em></p>\n",
+    "example": 467,
+    "start_line": 7323,
+    "end_line": 7327,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "*foo _bar* baz_\n",
+    "html": "<p><em>foo _bar</em> baz_</p>\n",
+    "example": 468,
+    "start_line": 7332,
+    "end_line": 7336,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "*foo __bar *baz bim__ bam*\n",
+    "html": "<p><em>foo <strong>bar *baz bim</strong> bam</em></p>\n",
+    "example": 469,
+    "start_line": 7339,
+    "end_line": 7343,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "**foo **bar baz**\n",
+    "html": "<p>**foo <strong>bar baz</strong></p>\n",
+    "example": 470,
+    "start_line": 7348,
+    "end_line": 7352,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "*foo *bar baz*\n",
+    "html": "<p>*foo <em>bar baz</em></p>\n",
+    "example": 471,
+    "start_line": 7355,
+    "end_line": 7359,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "*[bar*](/url)\n",
+    "html": "<p>*<a href=\"/url\">bar*</a></p>\n",
+    "example": 472,
+    "start_line": 7364,
+    "end_line": 7368,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "_foo [bar_](/url)\n",
+    "html": "<p>_foo <a href=\"/url\">bar_</a></p>\n",
+    "example": 473,
+    "start_line": 7371,
+    "end_line": 7375,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "*<img src=\"foo\" title=\"*\"/>\n",
+    "html": "<p>*<img src=\"foo\" title=\"*\"/></p>\n",
+    "example": 474,
+    "start_line": 7378,
+    "end_line": 7382,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "**<a href=\"**\">\n",
+    "html": "<p>**<a href=\"**\"></p>\n",
+    "example": 475,
+    "start_line": 7385,
+    "end_line": 7389,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "__<a href=\"__\">\n",
+    "html": "<p>__<a href=\"__\"></p>\n",
+    "example": 476,
+    "start_line": 7392,
+    "end_line": 7396,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "*a `*`*\n",
+    "html": "<p><em>a <code>*</code></em></p>\n",
+    "example": 477,
+    "start_line": 7399,
+    "end_line": 7403,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "_a `_`_\n",
+    "html": "<p><em>a <code>_</code></em></p>\n",
+    "example": 478,
+    "start_line": 7406,
+    "end_line": 7410,
+    "section": "Emphasis and strong emphasis"
+  },
+  {
+    "markdown": "**a<http://foo.bar/?q=**>\n",
+    "html": "<p>**a<a href=\"http://foo.bar/?q=**\">http://foo.bar/?q=**</a></p>\n",
+    "example": 479,
+    "start_line": 7413,
+    "end_line": 7417,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "__a<http://foo.bar/?q=__>\n",
+    "html": "<p>__a<a href=\"http://foo.bar/?q=__\">http://foo.bar/?q=__</a></p>\n",
+    "example": 480,
+    "start_line": 7420,
+    "end_line": 7424,
+    "section": "Emphasis and strong emphasis",
+    "shouldFail": true
+  },
+  {
+    "markdown": "[link](/uri \"title\")\n",
+    "html": "<p><a href=\"/uri\" title=\"title\">link</a></p>\n",
+    "example": 481,
+    "start_line": 7503,
+    "end_line": 7507,
+    "section": "Links"
+  },
+  {
+    "markdown": "[link](/uri)\n",
+    "html": "<p><a href=\"/uri\">link</a></p>\n",
+    "example": 482,
+    "start_line": 7512,
+    "end_line": 7516,
+    "section": "Links"
+  },
+  {
+    "markdown": "[link]()\n",
+    "html": "<p><a href=\"\">link</a></p>\n",
+    "example": 483,
+    "start_line": 7521,
+    "end_line": 7525,
+    "section": "Links"
+  },
+  {
+    "markdown": "[link](<>)\n",
+    "html": "<p><a href=\"\">link</a></p>\n",
+    "example": 484,
+    "start_line": 7528,
+    "end_line": 7532,
+    "section": "Links"
+  },
+  {
+    "markdown": "[link](/my uri)\n",
+    "html": "<p>[link](/my uri)</p>\n",
+    "example": 485,
+    "start_line": 7537,
+    "end_line": 7541,
+    "section": "Links"
+  },
+  {
+    "markdown": "[link](</my uri>)\n",
+    "html": "<p><a href=\"/my%20uri\">link</a></p>\n",
+    "example": 486,
+    "start_line": 7543,
+    "end_line": 7547,
+    "section": "Links",
+    "shouldFail": true
+  },
+  {
+    "markdown": "[link](foo\nbar)\n",
+    "html": "<p>[link](foo\nbar)</p>\n",
+    "example": 487,
+    "start_line": 7552,
+    "end_line": 7558,
+    "section": "Links"
+  },
+  {
+    "markdown": "[link](<foo\nbar>)\n",
+    "html": "<p>[link](<foo\nbar>)</p>\n",
+    "example": 488,
+    "start_line": 7560,
+    "end_line": 7566,
+    "section": "Links"
+  },
+  {
+    "markdown": "[a](<b)c>)\n",
+    "html": "<p><a href=\"b)c\">a</a></p>\n",
+    "example": 489,
+    "start_line": 7571,
+    "end_line": 7575,
+    "section": "Links",
+    "shouldFail": true
+  },
+  {
+    "markdown": "[link](<foo\\>)\n",
+    "html": "<p>[link](&lt;foo&gt;)</p>\n",
+    "example": 490,
+    "start_line": 7579,
+    "end_line": 7583,
+    "section": "Links",
+    "shouldFail": true
+  },
+  {
+    "markdown": "[a](<b)c\n[a](<b)c>\n[a](<b>c)\n",
+    "html": "<p>[a](&lt;b)c\n[a](&lt;b)c&gt;\n[a](<b>c)</p>\n",
+    "example": 491,
+    "start_line": 7588,
+    "end_line": 7596,
+    "section": "Links",
+    "shouldFail": true
+  },
+  {
+    "markdown": "[link](\\(foo\\))\n",
+    "html": "<p><a href=\"(foo)\">link</a></p>\n",
+    "example": 492,
+    "start_line": 7600,
+    "end_line": 7604,
+    "section": "Links"
+  },
+  {
+    "markdown": "[link](foo(and(bar)))\n",
+    "html": "<p><a href=\"foo(and(bar))\">link</a></p>\n",
+    "example": 493,
+    "start_line": 7609,
+    "end_line": 7613,
+    "section": "Links"
+  },
+  {
+    "markdown": "[link](foo\\(and\\(bar\\))\n",
+    "html": "<p><a href=\"foo(and(bar)\">link</a></p>\n",
+    "example": 494,
+    "start_line": 7618,
+    "end_line": 7622,
+    "section": "Links"
+  },
+  {
+    "markdown": "[link](<foo(and(bar)>)\n",
+    "html": "<p><a href=\"foo(and(bar)\">link</a></p>\n",
+    "example": 495,
+    "start_line": 7625,
+    "end_line": 7629,
+    "section": "Links"
+  },
+  {
+    "markdown": "[link](foo\\)\\:)\n",
+    "html": "<p><a href=\"foo):\">link</a></p>\n",
+    "example": 496,
+    "start_line": 7635,
+    "end_line": 7639,
+    "section": "Links"
+  },
+  {
+    "markdown": "[link](#fragment)\n\n[link](http://example.com#fragment)\n\n[link](http://example.com?foo=3#frag)\n",
+    "html": "<p><a href=\"#fragment\">link</a></p>\n<p><a href=\"http://example.com#fragment\">link</a></p>\n<p><a href=\"http://example.com?foo=3#frag\">link</a></p>\n",
+    "example": 497,
+    "start_line": 7644,
+    "end_line": 7654,
+    "section": "Links"
+  },
+  {
+    "markdown": "[link](foo\\bar)\n",
+    "html": "<p><a href=\"foo%5Cbar\">link</a></p>\n",
+    "example": 498,
+    "start_line": 7660,
+    "end_line": 7664,
+    "section": "Links"
+  },
+  {
+    "markdown": "[link](foo%20b&auml;)\n",
+    "html": "<p><a href=\"foo%20b%C3%A4\">link</a></p>\n",
+    "example": 499,
+    "start_line": 7676,
+    "end_line": 7680,
+    "section": "Links",
+    "shouldFail": true
+  },
+  {
+    "markdown": "[link](\"title\")\n",
+    "html": "<p><a href=\"%22title%22\">link</a></p>\n",
+    "example": 500,
+    "start_line": 7687,
+    "end_line": 7691,
+    "section": "Links"
+  },
+  {
+    "markdown": "[link](/url \"title\")\n[link](/url 'title')\n[link](/url (title))\n",
+    "html": "<p><a href=\"/url\" title=\"title\">link</a>\n<a href=\"/url\" title=\"title\">link</a>\n<a href=\"/url\" title=\"title\">link</a></p>\n",
+    "example": 501,
+    "start_line": 7696,
+    "end_line": 7704,
+    "section": "Links"
+  },
+  {
+    "markdown": "[link](/url \"title \\\"&quot;\")\n",
+    "html": "<p><a href=\"/url\" title=\"title &quot;&quot;\">link</a></p>\n",
+    "example": 502,
+    "start_line": 7710,
+    "end_line": 7714,
+    "section": "Links"
+  },
+  {
+    "markdown": "[link](/url \"title\")\n",
+    "html": "<p><a href=\"/url%C2%A0%22title%22\">link</a></p>\n",
+    "example": 503,
+    "start_line": 7720,
+    "end_line": 7724,
+    "section": "Links",
+    "shouldFail": true
+  },
+  {
+    "markdown": "[link](/url \"title \"and\" title\")\n",
+    "html": "<p>[link](/url &quot;title &quot;and&quot; title&quot;)</p>\n",
+    "example": 504,
+    "start_line": 7729,
+    "end_line": 7733,
+    "section": "Links"
+  },
+  {
+    "markdown": "[link](/url 'title \"and\" title')\n",
+    "html": "<p><a href=\"/url\" title=\"title &quot;and&quot; title\">link</a></p>\n",
+    "example": 505,
+    "start_line": 7738,
+    "end_line": 7742,
+    "section": "Links"
+  },
+  {
+    "markdown": "[link](   /uri\n  \"title\"  )\n",
+    "html": "<p><a href=\"/uri\" title=\"title\">link</a></p>\n",
+    "example": 506,
+    "start_line": 7762,
+    "end_line": 7767,
+    "section": "Links"
+  },
+  {
+    "markdown": "[link] (/uri)\n",
+    "html": "<p>[link] (/uri)</p>\n",
+    "example": 507,
+    "start_line": 7773,
+    "end_line": 7777,
+    "section": "Links"
+  },
+  {
+    "markdown": "[link [foo [bar]]](/uri)\n",
+    "html": "<p><a href=\"/uri\">link [foo [bar]]</a></p>\n",
+    "example": 508,
+    "start_line": 7783,
+    "end_line": 7787,
+    "section": "Links",
+    "shouldFail": true
+  },
+  {
+    "markdown": "[link] bar](/uri)\n",
+    "html": "<p>[link] bar](/uri)</p>\n",
+    "example": 509,
+    "start_line": 7790,
+    "end_line": 7794,
+    "section": "Links"
+  },
+  {
+    "markdown": "[link [bar](/uri)\n",
+    "html": "<p>[link <a href=\"/uri\">bar</a></p>\n",
+    "example": 510,
+    "start_line": 7797,
+    "end_line": 7801,
+    "section": "Links"
+  },
+  {
+    "markdown": "[link \\[bar](/uri)\n",
+    "html": "<p><a href=\"/uri\">link [bar</a></p>\n",
+    "example": 511,
+    "start_line": 7804,
+    "end_line": 7808,
+    "section": "Links"
+  },
+  {
+    "markdown": "[link *foo **bar** `#`*](/uri)\n",
+    "html": "<p><a href=\"/uri\">link <em>foo <strong>bar</strong> <code>#</code></em></a></p>\n",
+    "example": 512,
+    "start_line": 7813,
+    "end_line": 7817,
+    "section": "Links"
+  },
+  {
+    "markdown": "[![moon](moon.jpg)](/uri)\n",
+    "html": "<p><a href=\"/uri\"><img src=\"moon.jpg\" alt=\"moon\" /></a></p>\n",
+    "example": 513,
+    "start_line": 7820,
+    "end_line": 7824,
+    "section": "Links"
+  },
+  {
+    "markdown": "[foo [bar](/uri)](/uri)\n",
+    "html": "<p>[foo <a href=\"/uri\">bar</a>](/uri)</p>\n",
+    "example": 514,
+    "start_line": 7829,
+    "end_line": 7833,
+    "section": "Links",
+    "shouldFail": true
+  },
+  {
+    "markdown": "[foo *[bar [baz](/uri)](/uri)*](/uri)\n",
+    "html": "<p>[foo <em>[bar <a href=\"/uri\">baz</a>](/uri)</em>](/uri)</p>\n",
+    "example": 515,
+    "start_line": 7836,
+    "end_line": 7840,
+    "section": "Links",
+    "shouldFail": true
+  },
+  {
+    "markdown": "![[[foo](uri1)](uri2)](uri3)\n",
+    "html": "<p><img src=\"uri3\" alt=\"[foo](uri2)\" /></p>\n",
+    "example": 516,
+    "start_line": 7843,
+    "end_line": 7847,
+    "section": "Links",
+    "shouldFail": true
+  },
+  {
+    "markdown": "*[foo*](/uri)\n",
+    "html": "<p>*<a href=\"/uri\">foo*</a></p>\n",
+    "example": 517,
+    "start_line": 7853,
+    "end_line": 7857,
+    "section": "Links"
+  },
+  {
+    "markdown": "[foo *bar](baz*)\n",
+    "html": "<p><a href=\"baz*\">foo *bar</a></p>\n",
+    "example": 518,
+    "start_line": 7860,
+    "end_line": 7864,
+    "section": "Links"
+  },
+  {
+    "markdown": "*foo [bar* baz]\n",
+    "html": "<p><em>foo [bar</em> baz]</p>\n",
+    "example": 519,
+    "start_line": 7870,
+    "end_line": 7874,
+    "section": "Links"
+  },
+  {
+    "markdown": "[foo <bar attr=\"](baz)\">\n",
+    "html": "<p>[foo <bar attr=\"](baz)\"></p>\n",
+    "example": 520,
+    "start_line": 7880,
+    "end_line": 7884,
+    "section": "Links",
+    "shouldFail": true
+  },
+  {
+    "markdown": "[foo`](/uri)`\n",
+    "html": "<p>[foo<code>](/uri)</code></p>\n",
+    "example": 521,
+    "start_line": 7887,
+    "end_line": 7891,
+    "section": "Links",
+    "shouldFail": true
+  },
+  {
+    "markdown": "[foo<http://example.com/?search=](uri)>\n",
+    "html": "<p>[foo<a href=\"http://example.com/?search=%5D(uri)\">http://example.com/?search=](uri)</a></p>\n",
+    "example": 522,
+    "start_line": 7894,
+    "end_line": 7898,
+    "section": "Links",
+    "shouldFail": true
+  },
+  {
+    "markdown": "[foo][bar]\n\n[bar]: /url \"title\"\n",
+    "html": "<p><a href=\"/url\" title=\"title\">foo</a></p>\n",
+    "example": 523,
+    "start_line": 7932,
+    "end_line": 7938,
+    "section": "Links"
+  },
+  {
+    "markdown": "[link [foo [bar]]][ref]\n\n[ref]: /uri\n",
+    "html": "<p><a href=\"/uri\">link [foo [bar]]</a></p>\n",
+    "example": 524,
+    "start_line": 7947,
+    "end_line": 7953,
+    "section": "Links",
+    "shouldFail": true
+  },
+  {
+    "markdown": "[link \\[bar][ref]\n\n[ref]: /uri\n",
+    "html": "<p><a href=\"/uri\">link [bar</a></p>\n",
+    "example": 525,
+    "start_line": 7956,
+    "end_line": 7962,
+    "section": "Links"
+  },
+  {
+    "markdown": "[link *foo **bar** `#`*][ref]\n\n[ref]: /uri\n",
+    "html": "<p><a href=\"/uri\">link <em>foo <strong>bar</strong> <code>#</code></em></a></p>\n",
+    "example": 526,
+    "start_line": 7967,
+    "end_line": 7973,
+    "section": "Links"
+  },
+  {
+    "markdown": "[![moon](moon.jpg)][ref]\n\n[ref]: /uri\n",
+    "html": "<p><a href=\"/uri\"><img src=\"moon.jpg\" alt=\"moon\" /></a></p>\n",
+    "example": 527,
+    "start_line": 7976,
+    "end_line": 7982,
+    "section": "Links"
+  },
+  {
+    "markdown": "[foo [bar](/uri)][ref]\n\n[ref]: /uri\n",
+    "html": "<p>[foo <a href=\"/uri\">bar</a>]<a href=\"/uri\">ref</a></p>\n",
+    "example": 528,
+    "start_line": 7987,
+    "end_line": 7993,
+    "section": "Links",
+    "shouldFail": true
+  },
+  {
+    "markdown": "[foo *bar [baz][ref]*][ref]\n\n[ref]: /uri\n",
+    "html": "<p>[foo <em>bar <a href=\"/uri\">baz</a></em>]<a href=\"/uri\">ref</a></p>\n",
+    "example": 529,
+    "start_line": 7996,
+    "end_line": 8002,
+    "section": "Links",
+    "shouldFail": true
+  },
+  {
+    "markdown": "*[foo*][ref]\n\n[ref]: /uri\n",
+    "html": "<p>*<a href=\"/uri\">foo*</a></p>\n",
+    "example": 530,
+    "start_line": 8011,
+    "end_line": 8017,
+    "section": "Links"
+  },
+  {
+    "markdown": "[foo *bar][ref]\n\n[ref]: /uri\n",
+    "html": "<p><a href=\"/uri\">foo *bar</a></p>\n",
+    "example": 531,
+    "start_line": 8020,
+    "end_line": 8026,
+    "section": "Links"
+  },
+  {
+    "markdown": "[foo <bar attr=\"][ref]\">\n\n[ref]: /uri\n",
+    "html": "<p>[foo <bar attr=\"][ref]\"></p>\n",
+    "example": 532,
+    "start_line": 8032,
+    "end_line": 8038,
+    "section": "Links",
+    "shouldFail": true
+  },
+  {
+    "markdown": "[foo`][ref]`\n\n[ref]: /uri\n",
+    "html": "<p>[foo<code>][ref]</code></p>\n",
+    "example": 533,
+    "start_line": 8041,
+    "end_line": 8047,
+    "section": "Links",
+    "shouldFail": true
+  },
+  {
+    "markdown": "[foo<http://example.com/?search=][ref]>\n\n[ref]: /uri\n",
+    "html": "<p>[foo<a href=\"http://example.com/?search=%5D%5Bref%5D\">http://example.com/?search=][ref]</a></p>\n",
+    "example": 534,
+    "start_line": 8050,
+    "end_line": 8056,
+    "section": "Links",
+    "shouldFail": true
+  },
+  {
+    "markdown": "[foo][BaR]\n\n[bar]: /url \"title\"\n",
+    "html": "<p><a href=\"/url\" title=\"title\">foo</a></p>\n",
+    "example": 535,
+    "start_line": 8061,
+    "end_line": 8067,
+    "section": "Links"
+  },
+  {
+    "markdown": "[Толпой][Толпой] is a Russian word.\n\n[ТОЛПОЙ]: /url\n",
+    "html": "<p><a href=\"/url\">Толпой</a> is a Russian word.</p>\n",
+    "example": 536,
+    "start_line": 8072,
+    "end_line": 8078,
+    "section": "Links"
+  },
+  {
+    "markdown": "[Foo\n  bar]: /url\n\n[Baz][Foo bar]\n",
+    "html": "<p><a href=\"/url\">Baz</a></p>\n",
+    "example": 537,
+    "start_line": 8084,
+    "end_line": 8091,
+    "section": "Links"
+  },
+  {
+    "markdown": "[foo] [bar]\n\n[bar]: /url \"title\"\n",
+    "html": "<p>[foo] <a href=\"/url\" title=\"title\">bar</a></p>\n",
+    "example": 538,
+    "start_line": 8097,
+    "end_line": 8103,
+    "section": "Links"
+  },
+  {
+    "markdown": "[foo]\n[bar]\n\n[bar]: /url \"title\"\n",
+    "html": "<p>[foo]\n<a href=\"/url\" title=\"title\">bar</a></p>\n",
+    "example": 539,
+    "start_line": 8106,
+    "end_line": 8114,
+    "section": "Links"
+  },
+  {
+    "markdown": "[foo]: /url1\n\n[foo]: /url2\n\n[bar][foo]\n",
+    "html": "<p><a href=\"/url1\">bar</a></p>\n",
+    "example": 540,
+    "start_line": 8147,
+    "end_line": 8155,
+    "section": "Links"
+  },
+  {
+    "markdown": "[bar][foo\\!]\n\n[foo!]: /url\n",
+    "html": "<p>[bar][foo!]</p>\n",
+    "example": 541,
+    "start_line": 8162,
+    "end_line": 8168,
+    "section": "Links"
+  },
+  {
+    "markdown": "[foo][ref[]\n\n[ref[]: /uri\n",
+    "html": "<p>[foo][ref[]</p>\n<p>[ref[]: /uri</p>\n",
+    "example": 542,
+    "start_line": 8174,
+    "end_line": 8181,
+    "section": "Links"
+  },
+  {
+    "markdown": "[foo][ref[bar]]\n\n[ref[bar]]: /uri\n",
+    "html": "<p>[foo][ref[bar]]</p>\n<p>[ref[bar]]: /uri</p>\n",
+    "example": 543,
+    "start_line": 8184,
+    "end_line": 8191,
+    "section": "Links"
+  },
+  {
+    "markdown": "[[[foo]]]\n\n[[[foo]]]: /url\n",
+    "html": "<p>[[[foo]]]</p>\n<p>[[[foo]]]: /url</p>\n",
+    "example": 544,
+    "start_line": 8194,
+    "end_line": 8201,
+    "section": "Links"
+  },
+  {
+    "markdown": "[foo][ref\\[]\n\n[ref\\[]: /uri\n",
+    "html": "<p><a href=\"/uri\">foo</a></p>\n",
+    "example": 545,
+    "start_line": 8204,
+    "end_line": 8210,
+    "section": "Links"
+  },
+  {
+    "markdown": "[bar\\\\]: /uri\n\n[bar\\\\]\n",
+    "html": "<p><a href=\"/uri\">bar\\</a></p>\n",
+    "example": 546,
+    "start_line": 8215,
+    "end_line": 8221,
+    "section": "Links"
+  },
+  {
+    "markdown": "[]\n\n[]: /uri\n",
+    "html": "<p>[]</p>\n<p>[]: /uri</p>\n",
+    "example": 547,
+    "start_line": 8226,
+    "end_line": 8233,
+    "section": "Links"
+  },
+  {
+    "markdown": "[\n ]\n\n[\n ]: /uri\n",
+    "html": "<p>[\n]</p>\n<p>[\n]: /uri</p>\n",
+    "example": 548,
+    "start_line": 8236,
+    "end_line": 8247,
+    "section": "Links"
+  },
+  {
+    "markdown": "[foo][]\n\n[foo]: /url \"title\"\n",
+    "html": "<p><a href=\"/url\" title=\"title\">foo</a></p>\n",
+    "example": 549,
+    "start_line": 8259,
+    "end_line": 8265,
+    "section": "Links"
+  },
+  {
+    "markdown": "[*foo* bar][]\n\n[*foo* bar]: /url \"title\"\n",
+    "html": "<p><a href=\"/url\" title=\"title\"><em>foo</em> bar</a></p>\n",
+    "example": 550,
+    "start_line": 8268,
+    "end_line": 8274,
+    "section": "Links"
+  },
+  {
+    "markdown": "[Foo][]\n\n[foo]: /url \"title\"\n",
+    "html": "<p><a href=\"/url\" title=\"title\">Foo</a></p>\n",
+    "example": 551,
+    "start_line": 8279,
+    "end_line": 8285,
+    "section": "Links"
+  },
+  {
+    "markdown": "[foo] \n[]\n\n[foo]: /url \"title\"\n",
+    "html": "<p><a href=\"/url\" title=\"title\">foo</a>\n[]</p>\n",
+    "example": 552,
+    "start_line": 8292,
+    "end_line": 8300,
+    "section": "Links"
+  },
+  {
+    "markdown": "[foo]\n\n[foo]: /url \"title\"\n",
+    "html": "<p><a href=\"/url\" title=\"title\">foo</a></p>\n",
+    "example": 553,
+    "start_line": 8312,
+    "end_line": 8318,
+    "section": "Links"
+  },
+  {
+    "markdown": "[*foo* bar]\n\n[*foo* bar]: /url \"title\"\n",
+    "html": "<p><a href=\"/url\" title=\"title\"><em>foo</em> bar</a></p>\n",
+    "example": 554,
+    "start_line": 8321,
+    "end_line": 8327,
+    "section": "Links"
+  },
+  {
+    "markdown": "[[*foo* bar]]\n\n[*foo* bar]: /url \"title\"\n",
+    "html": "<p>[<a href=\"/url\" title=\"title\"><em>foo</em> bar</a>]</p>\n",
+    "example": 555,
+    "start_line": 8330,
+    "end_line": 8336,
+    "section": "Links"
+  },
+  {
+    "markdown": "[[bar [foo]\n\n[foo]: /url\n",
+    "html": "<p>[[bar <a href=\"/url\">foo</a></p>\n",
+    "example": 556,
+    "start_line": 8339,
+    "end_line": 8345,
+    "section": "Links"
+  },
+  {
+    "markdown": "[Foo]\n\n[foo]: /url \"title\"\n",
+    "html": "<p><a href=\"/url\" title=\"title\">Foo</a></p>\n",
+    "example": 557,
+    "start_line": 8350,
+    "end_line": 8356,
+    "section": "Links"
+  },
+  {
+    "markdown": "[foo] bar\n\n[foo]: /url\n",
+    "html": "<p><a href=\"/url\">foo</a> bar</p>\n",
+    "example": 558,
+    "start_line": 8361,
+    "end_line": 8367,
+    "section": "Links"
+  },
+  {
+    "markdown": "\\[foo]\n\n[foo]: /url \"title\"\n",
+    "html": "<p>[foo]</p>\n",
+    "example": 559,
+    "start_line": 8373,
+    "end_line": 8379,
+    "section": "Links"
+  },
+  {
+    "markdown": "[foo*]: /url\n\n*[foo*]\n",
+    "html": "<p>*<a href=\"/url\">foo*</a></p>\n",
+    "example": 560,
+    "start_line": 8385,
+    "end_line": 8391,
+    "section": "Links"
+  },
+  {
+    "markdown": "[foo][bar]\n\n[foo]: /url1\n[bar]: /url2\n",
+    "html": "<p><a href=\"/url2\">foo</a></p>\n",
+    "example": 561,
+    "start_line": 8397,
+    "end_line": 8404,
+    "section": "Links"
+  },
+  {
+    "markdown": "[foo][]\n\n[foo]: /url1\n",
+    "html": "<p><a href=\"/url1\">foo</a></p>\n",
+    "example": 562,
+    "start_line": 8406,
+    "end_line": 8412,
+    "section": "Links"
+  },
+  {
+    "markdown": "[foo]()\n\n[foo]: /url1\n",
+    "html": "<p><a href=\"\">foo</a></p>\n",
+    "example": 563,
+    "start_line": 8416,
+    "end_line": 8422,
+    "section": "Links"
+  },
+  {
+    "markdown": "[foo](not a link)\n\n[foo]: /url1\n",
+    "html": "<p><a href=\"/url1\">foo</a>(not a link)</p>\n",
+    "example": 564,
+    "start_line": 8424,
+    "end_line": 8430,
+    "section": "Links"
+  },
+  {
+    "markdown": "[foo][bar][baz]\n\n[baz]: /url\n",
+    "html": "<p>[foo]<a href=\"/url\">bar</a></p>\n",
+    "example": 565,
+    "start_line": 8435,
+    "end_line": 8441,
+    "section": "Links"
+  },
+  {
+    "markdown": "[foo][bar][baz]\n\n[baz]: /url1\n[bar]: /url2\n",
+    "html": "<p><a href=\"/url2\">foo</a><a href=\"/url1\">baz</a></p>\n",
+    "example": 566,
+    "start_line": 8447,
+    "end_line": 8454,
+    "section": "Links"
+  },
+  {
+    "markdown": "[foo][bar][baz]\n\n[baz]: /url1\n[foo]: /url2\n",
+    "html": "<p>[foo]<a href=\"/url1\">bar</a></p>\n",
+    "example": 567,
+    "start_line": 8460,
+    "end_line": 8467,
+    "section": "Links"
+  },
+  {
+    "markdown": "![foo](/url \"title\")\n",
+    "html": "<p><img src=\"/url\" alt=\"foo\" title=\"title\" /></p>\n",
+    "example": 568,
+    "start_line": 8483,
+    "end_line": 8487,
+    "section": "Images"
+  },
+  {
+    "markdown": "![foo *bar*]\n\n[foo *bar*]: train.jpg \"train & tracks\"\n",
+    "html": "<p><img src=\"train.jpg\" alt=\"foo bar\" title=\"train &amp; tracks\" /></p>\n",
+    "example": 569,
+    "start_line": 8490,
+    "end_line": 8496,
+    "section": "Images",
+    "shouldFail": true
+  },
+  {
+    "markdown": "![foo ![bar](/url)](/url2)\n",
+    "html": "<p><img src=\"/url2\" alt=\"foo bar\" /></p>\n",
+    "example": 570,
+    "start_line": 8499,
+    "end_line": 8503,
+    "section": "Images",
+    "shouldFail": true
+  },
+  {
+    "markdown": "![foo [bar](/url)](/url2)\n",
+    "html": "<p><img src=\"/url2\" alt=\"foo bar\" /></p>\n",
+    "example": 571,
+    "start_line": 8506,
+    "end_line": 8510,
+    "section": "Images",
+    "shouldFail": true
+  },
+  {
+    "markdown": "![foo *bar*][]\n\n[foo *bar*]: train.jpg \"train & tracks\"\n",
+    "html": "<p><img src=\"train.jpg\" alt=\"foo bar\" title=\"train &amp; tracks\" /></p>\n",
+    "example": 572,
+    "start_line": 8520,
+    "end_line": 8526,
+    "section": "Images",
+    "shouldFail": true
+  },
+  {
+    "markdown": "![foo *bar*][foobar]\n\n[FOOBAR]: train.jpg \"train & tracks\"\n",
+    "html": "<p><img src=\"train.jpg\" alt=\"foo bar\" title=\"train &amp; tracks\" /></p>\n",
+    "example": 573,
+    "start_line": 8529,
+    "end_line": 8535,
+    "section": "Images",
+    "shouldFail": true
+  },
+  {
+    "markdown": "![foo](train.jpg)\n",
+    "html": "<p><img src=\"train.jpg\" alt=\"foo\" /></p>\n",
+    "example": 574,
+    "start_line": 8538,
+    "end_line": 8542,
+    "section": "Images"
+  },
+  {
+    "markdown": "My ![foo bar](/path/to/train.jpg  \"title\"   )\n",
+    "html": "<p>My <img src=\"/path/to/train.jpg\" alt=\"foo bar\" title=\"title\" /></p>\n",
+    "example": 575,
+    "start_line": 8545,
+    "end_line": 8549,
+    "section": "Images"
+  },
+  {
+    "markdown": "![foo](<url>)\n",
+    "html": "<p><img src=\"url\" alt=\"foo\" /></p>\n",
+    "example": 576,
+    "start_line": 8552,
+    "end_line": 8556,
+    "section": "Images"
+  },
+  {
+    "markdown": "![](/url)\n",
+    "html": "<p><img src=\"/url\" alt=\"\" /></p>\n",
+    "example": 577,
+    "start_line": 8559,
+    "end_line": 8563,
+    "section": "Images"
+  },
+  {
+    "markdown": "![foo][bar]\n\n[bar]: /url\n",
+    "html": "<p><img src=\"/url\" alt=\"foo\" /></p>\n",
+    "example": 578,
+    "start_line": 8568,
+    "end_line": 8574,
+    "section": "Images"
+  },
+  {
+    "markdown": "![foo][bar]\n\n[BAR]: /url\n",
+    "html": "<p><img src=\"/url\" alt=\"foo\" /></p>\n",
+    "example": 579,
+    "start_line": 8577,
+    "end_line": 8583,
+    "section": "Images"
+  },
+  {
+    "markdown": "![foo][]\n\n[foo]: /url \"title\"\n",
+    "html": "<p><img src=\"/url\" alt=\"foo\" title=\"title\" /></p>\n",
+    "example": 580,
+    "start_line": 8588,
+    "end_line": 8594,
+    "section": "Images"
+  },
+  {
+    "markdown": "![*foo* bar][]\n\n[*foo* bar]: /url \"title\"\n",
+    "html": "<p><img src=\"/url\" alt=\"foo bar\" title=\"title\" /></p>\n",
+    "example": 581,
+    "start_line": 8597,
+    "end_line": 8603,
+    "section": "Images",
+    "shouldFail": true
+  },
+  {
+    "markdown": "![Foo][]\n\n[foo]: /url \"title\"\n",
+    "html": "<p><img src=\"/url\" alt=\"Foo\" title=\"title\" /></p>\n",
+    "example": 582,
+    "start_line": 8608,
+    "end_line": 8614,
+    "section": "Images"
+  },
+  {
+    "markdown": "![foo] \n[]\n\n[foo]: /url \"title\"\n",
+    "html": "<p><img src=\"/url\" alt=\"foo\" title=\"title\" />\n[]</p>\n",
+    "example": 583,
+    "start_line": 8620,
+    "end_line": 8628,
+    "section": "Images"
+  },
+  {
+    "markdown": "![foo]\n\n[foo]: /url \"title\"\n",
+    "html": "<p><img src=\"/url\" alt=\"foo\" title=\"title\" /></p>\n",
+    "example": 584,
+    "start_line": 8633,
+    "end_line": 8639,
+    "section": "Images"
+  },
+  {
+    "markdown": "![*foo* bar]\n\n[*foo* bar]: /url \"title\"\n",
+    "html": "<p><img src=\"/url\" alt=\"foo bar\" title=\"title\" /></p>\n",
+    "example": 585,
+    "start_line": 8642,
+    "end_line": 8648,
+    "section": "Images",
+    "shouldFail": true
+  },
+  {
+    "markdown": "![[foo]]\n\n[[foo]]: /url \"title\"\n",
+    "html": "<p>![[foo]]</p>\n<p>[[foo]]: /url &quot;title&quot;</p>\n",
+    "example": 586,
+    "start_line": 8653,
+    "end_line": 8660,
+    "section": "Images"
+  },
+  {
+    "markdown": "![Foo]\n\n[foo]: /url \"title\"\n",
+    "html": "<p><img src=\"/url\" alt=\"Foo\" title=\"title\" /></p>\n",
+    "example": 587,
+    "start_line": 8665,
+    "end_line": 8671,
+    "section": "Images"
+  },
+  {
+    "markdown": "!\\[foo]\n\n[foo]: /url \"title\"\n",
+    "html": "<p>![foo]</p>\n",
+    "example": 588,
+    "start_line": 8677,
+    "end_line": 8683,
+    "section": "Images"
+  },
+  {
+    "markdown": "\\![foo]\n\n[foo]: /url \"title\"\n",
+    "html": "<p>!<a href=\"/url\" title=\"title\">foo</a></p>\n",
+    "example": 589,
+    "start_line": 8689,
+    "end_line": 8695,
+    "section": "Images"
+  },
+  {
+    "markdown": "<http://foo.bar.baz>\n",
+    "html": "<p><a href=\"http://foo.bar.baz\">http://foo.bar.baz</a></p>\n",
+    "example": 590,
+    "start_line": 8722,
+    "end_line": 8726,
+    "section": "Autolinks"
+  },
+  {
+    "markdown": "<http://foo.bar.baz/test?q=hello&id=22&boolean>\n",
+    "html": "<p><a href=\"http://foo.bar.baz/test?q=hello&amp;id=22&amp;boolean\">http://foo.bar.baz/test?q=hello&amp;id=22&amp;boolean</a></p>\n",
+    "example": 591,
+    "start_line": 8729,
+    "end_line": 8733,
+    "section": "Autolinks"
+  },
+  {
+    "markdown": "<irc://foo.bar:2233/baz>\n",
+    "html": "<p><a href=\"irc://foo.bar:2233/baz\">irc://foo.bar:2233/baz</a></p>\n",
+    "example": 592,
+    "start_line": 8736,
+    "end_line": 8740,
+    "section": "Autolinks"
+  },
+  {
+    "markdown": "<MAILTO:FOO@BAR.BAZ>\n",
+    "html": "<p><a href=\"MAILTO:FOO@BAR.BAZ\">MAILTO:FOO@BAR.BAZ</a></p>\n",
+    "example": 593,
+    "start_line": 8745,
+    "end_line": 8749,
+    "section": "Autolinks"
+  },
+  {
+    "markdown": "<a+b+c:d>\n",
+    "html": "<p><a href=\"a+b+c:d\">a+b+c:d</a></p>\n",
+    "example": 594,
+    "start_line": 8757,
+    "end_line": 8761,
+    "section": "Autolinks"
+  },
+  {
+    "markdown": "<made-up-scheme://foo,bar>\n",
+    "html": "<p><a href=\"made-up-scheme://foo,bar\">made-up-scheme://foo,bar</a></p>\n",
+    "example": 595,
+    "start_line": 8764,
+    "end_line": 8768,
+    "section": "Autolinks"
+  },
+  {
+    "markdown": "<http://../>\n",
+    "html": "<p><a href=\"http://../\">http://../</a></p>\n",
+    "example": 596,
+    "start_line": 8771,
+    "end_line": 8775,
+    "section": "Autolinks"
+  },
+  {
+    "markdown": "<localhost:5001/foo>\n",
+    "html": "<p><a href=\"localhost:5001/foo\">localhost:5001/foo</a></p>\n",
+    "example": 597,
+    "start_line": 8778,
+    "end_line": 8782,
+    "section": "Autolinks"
+  },
+  {
+    "markdown": "<http://foo.bar/baz bim>\n",
+    "html": "<p>&lt;http://foo.bar/baz bim&gt;</p>\n",
+    "example": 598,
+    "start_line": 8787,
+    "end_line": 8791,
+    "section": "Autolinks",
+    "shouldFail": true
+  },
+  {
+    "markdown": "<http://example.com/\\[\\>\n",
+    "html": "<p><a href=\"http://example.com/%5C%5B%5C\">http://example.com/\\[\\</a></p>\n",
+    "example": 599,
+    "start_line": 8796,
+    "end_line": 8800,
+    "section": "Autolinks"
+  },
+  {
+    "markdown": "<foo@bar.example.com>\n",
+    "html": "<p><a href=\"mailto:foo@bar.example.com\">foo@bar.example.com</a></p>\n",
+    "example": 600,
+    "start_line": 8818,
+    "end_line": 8822,
+    "section": "Autolinks"
+  },
+  {
+    "markdown": "<foo+special@Bar.baz-bar0.com>\n",
+    "html": "<p><a href=\"mailto:foo+special@Bar.baz-bar0.com\">foo+special@Bar.baz-bar0.com</a></p>\n",
+    "example": 601,
+    "start_line": 8825,
+    "end_line": 8829,
+    "section": "Autolinks"
+  },
+  {
+    "markdown": "<foo\\+@bar.example.com>\n",
+    "html": "<p>&lt;foo+@bar.example.com&gt;</p>\n",
+    "example": 602,
+    "start_line": 8834,
+    "end_line": 8838,
+    "section": "Autolinks"
+  },
+  {
+    "markdown": "<>\n",
+    "html": "<p>&lt;&gt;</p>\n",
+    "example": 603,
+    "start_line": 8843,
+    "end_line": 8847,
+    "section": "Autolinks"
+  },
+  {
+    "markdown": "< http://foo.bar >\n",
+    "html": "<p>&lt; http://foo.bar &gt;</p>\n",
+    "example": 604,
+    "start_line": 8850,
+    "end_line": 8854,
+    "section": "Autolinks",
+    "shouldFail": true
+  },
+  {
+    "markdown": "<m:abc>\n",
+    "html": "<p>&lt;m:abc&gt;</p>\n",
+    "example": 605,
+    "start_line": 8857,
+    "end_line": 8861,
+    "section": "Autolinks"
+  },
+  {
+    "markdown": "<foo.bar.baz>\n",
+    "html": "<p>&lt;foo.bar.baz&gt;</p>\n",
+    "example": 606,
+    "start_line": 8864,
+    "end_line": 8868,
+    "section": "Autolinks"
+  },
+  {
+    "markdown": "http://example.com\n",
+    "html": "<p>http://example.com</p>\n",
+    "example": 607,
+    "start_line": 8871,
+    "end_line": 8875,
+    "section": "Autolinks",
+    "shouldFail": true
+  },
+  {
+    "markdown": "foo@bar.example.com\n",
+    "html": "<p>foo@bar.example.com</p>\n",
+    "example": 608,
+    "start_line": 8878,
+    "end_line": 8882,
+    "section": "Autolinks",
+    "shouldFail": true
+  },
+  {
+    "markdown": "<a><bab><c2c>\n",
+    "html": "<p><a><bab><c2c></p>\n",
+    "example": 609,
+    "start_line": 8960,
+    "end_line": 8964,
+    "section": "Raw HTML"
+  },
+  {
+    "markdown": "<a/><b2/>\n",
+    "html": "<p><a/><b2/></p>\n",
+    "example": 610,
+    "start_line": 8969,
+    "end_line": 8973,
+    "section": "Raw HTML"
+  },
+  {
+    "markdown": "<a  /><b2\ndata=\"foo\" >\n",
+    "html": "<p><a  /><b2\ndata=\"foo\" ></p>\n",
+    "example": 611,
+    "start_line": 8978,
+    "end_line": 8984,
+    "section": "Raw HTML"
+  },
+  {
+    "markdown": "<a foo=\"bar\" bam = 'baz <em>\"</em>'\n_boolean zoop:33=zoop:33 />\n",
+    "html": "<p><a foo=\"bar\" bam = 'baz <em>\"</em>'\n_boolean zoop:33=zoop:33 /></p>\n",
+    "example": 612,
+    "start_line": 8989,
+    "end_line": 8995,
+    "section": "Raw HTML"
+  },
+  {
+    "markdown": "Foo <responsive-image src=\"foo.jpg\" />\n",
+    "html": "<p>Foo <responsive-image src=\"foo.jpg\" /></p>\n",
+    "example": 613,
+    "start_line": 9000,
+    "end_line": 9004,
+    "section": "Raw HTML"
+  },
+  {
+    "markdown": "<33> <__>\n",
+    "html": "<p>&lt;33&gt; &lt;__&gt;</p>\n",
+    "example": 614,
+    "start_line": 9009,
+    "end_line": 9013,
+    "section": "Raw HTML"
+  },
+  {
+    "markdown": "<a h*#ref=\"hi\">\n",
+    "html": "<p>&lt;a h*#ref=&quot;hi&quot;&gt;</p>\n",
+    "example": 615,
+    "start_line": 9018,
+    "end_line": 9022,
+    "section": "Raw HTML"
+  },
+  {
+    "markdown": "<a href=\"hi'> <a href=hi'>\n",
+    "html": "<p>&lt;a href=&quot;hi'&gt; &lt;a href=hi'&gt;</p>\n",
+    "example": 616,
+    "start_line": 9027,
+    "end_line": 9031,
+    "section": "Raw HTML"
+  },
+  {
+    "markdown": "< a><\nfoo><bar/ >\n<foo bar=baz\nbim!bop />\n",
+    "html": "<p>&lt; a&gt;&lt;\nfoo&gt;&lt;bar/ &gt;\n&lt;foo bar=baz\nbim!bop /&gt;</p>\n",
+    "example": 617,
+    "start_line": 9036,
+    "end_line": 9046,
+    "section": "Raw HTML"
+  },
+  {
+    "markdown": "<a href='bar'title=title>\n",
+    "html": "<p>&lt;a href='bar'title=title&gt;</p>\n",
+    "example": 618,
+    "start_line": 9051,
+    "end_line": 9055,
+    "section": "Raw HTML"
+  },
+  {
+    "markdown": "</a></foo >\n",
+    "html": "<p></a></foo ></p>\n",
+    "example": 619,
+    "start_line": 9060,
+    "end_line": 9064,
+    "section": "Raw HTML"
+  },
+  {
+    "markdown": "</a href=\"foo\">\n",
+    "html": "<p>&lt;/a href=&quot;foo&quot;&gt;</p>\n",
+    "example": 620,
+    "start_line": 9069,
+    "end_line": 9073,
+    "section": "Raw HTML"
+  },
+  {
+    "markdown": "foo <!-- this is a\ncomment - with hyphen -->\n",
+    "html": "<p>foo <!-- this is a\ncomment - with hyphen --></p>\n",
+    "example": 621,
+    "start_line": 9078,
+    "end_line": 9084,
+    "section": "Raw HTML"
+  },
+  {
+    "markdown": "foo <!-- not a comment -- two hyphens -->\n",
+    "html": "<p>foo &lt;!-- not a comment -- two hyphens --&gt;</p>\n",
+    "example": 622,
+    "start_line": 9087,
+    "end_line": 9091,
+    "section": "Raw HTML",
+    "shouldFail": true
+  },
+  {
+    "markdown": "foo <!--> foo -->\n\nfoo <!-- foo--->\n",
+    "html": "<p>foo &lt;!--&gt; foo --&gt;</p>\n<p>foo &lt;!-- foo---&gt;</p>\n",
+    "example": 623,
+    "start_line": 9096,
+    "end_line": 9103,
+    "section": "Raw HTML",
+    "shouldFail": true
+  },
+  {
+    "markdown": "foo <?php echo $a; ?>\n",
+    "html": "<p>foo <?php echo $a; ?></p>\n",
+    "example": 624,
+    "start_line": 9108,
+    "end_line": 9112,
+    "section": "Raw HTML"
+  },
+  {
+    "markdown": "foo <!ELEMENT br EMPTY>\n",
+    "html": "<p>foo <!ELEMENT br EMPTY></p>\n",
+    "example": 625,
+    "start_line": 9117,
+    "end_line": 9121,
+    "section": "Raw HTML"
+  },
+  {
+    "markdown": "foo <![CDATA[>&<]]>\n",
+    "html": "<p>foo <![CDATA[>&<]]></p>\n",
+    "example": 626,
+    "start_line": 9126,
+    "end_line": 9130,
+    "section": "Raw HTML"
+  },
+  {
+    "markdown": "foo <a href=\"&ouml;\">\n",
+    "html": "<p>foo <a href=\"&ouml;\"></p>\n",
+    "example": 627,
+    "start_line": 9136,
+    "end_line": 9140,
+    "section": "Raw HTML"
+  },
+  {
+    "markdown": "foo <a href=\"\\*\">\n",
+    "html": "<p>foo <a href=\"\\*\"></p>\n",
+    "example": 628,
+    "start_line": 9145,
+    "end_line": 9149,
+    "section": "Raw HTML"
+  },
+  {
+    "markdown": "<a href=\"\\\"\">\n",
+    "html": "<p>&lt;a href=&quot;&quot;&quot;&gt;</p>\n",
+    "example": 629,
+    "start_line": 9152,
+    "end_line": 9156,
+    "section": "Raw HTML"
+  },
+  {
+    "markdown": "foo  \nbaz\n",
+    "html": "<p>foo<br />\nbaz</p>\n",
+    "example": 630,
+    "start_line": 9166,
+    "end_line": 9172,
+    "section": "Hard line breaks"
+  },
+  {
+    "markdown": "foo\\\nbaz\n",
+    "html": "<p>foo<br />\nbaz</p>\n",
+    "example": 631,
+    "start_line": 9178,
+    "end_line": 9184,
+    "section": "Hard line breaks"
+  },
+  {
+    "markdown": "foo       \nbaz\n",
+    "html": "<p>foo<br />\nbaz</p>\n",
+    "example": 632,
+    "start_line": 9189,
+    "end_line": 9195,
+    "section": "Hard line breaks"
+  },
+  {
+    "markdown": "foo  \n     bar\n",
+    "html": "<p>foo<br />\nbar</p>\n",
+    "example": 633,
+    "start_line": 9200,
+    "end_line": 9206,
+    "section": "Hard line breaks"
+  },
+  {
+    "markdown": "foo\\\n     bar\n",
+    "html": "<p>foo<br />\nbar</p>\n",
+    "example": 634,
+    "start_line": 9209,
+    "end_line": 9215,
+    "section": "Hard line breaks"
+  },
+  {
+    "markdown": "*foo  \nbar*\n",
+    "html": "<p><em>foo<br />\nbar</em></p>\n",
+    "example": 635,
+    "start_line": 9221,
+    "end_line": 9227,
+    "section": "Hard line breaks"
+  },
+  {
+    "markdown": "*foo\\\nbar*\n",
+    "html": "<p><em>foo<br />\nbar</em></p>\n",
+    "example": 636,
+    "start_line": 9230,
+    "end_line": 9236,
+    "section": "Hard line breaks"
+  },
+  {
+    "markdown": "`code \nspan`\n",
+    "html": "<p><code>code  span</code></p>\n",
+    "example": 637,
+    "start_line": 9241,
+    "end_line": 9246,
+    "section": "Hard line breaks"
+  },
+  {
+    "markdown": "`code\\\nspan`\n",
+    "html": "<p><code>code\\ span</code></p>\n",
+    "example": 638,
+    "start_line": 9249,
+    "end_line": 9254,
+    "section": "Hard line breaks"
+  },
+  {
+    "markdown": "<a href=\"foo  \nbar\">\n",
+    "html": "<p><a href=\"foo  \nbar\"></p>\n",
+    "example": 639,
+    "start_line": 9259,
+    "end_line": 9265,
+    "section": "Hard line breaks"
+  },
+  {
+    "markdown": "<a href=\"foo\\\nbar\">\n",
+    "html": "<p><a href=\"foo\\\nbar\"></p>\n",
+    "example": 640,
+    "start_line": 9268,
+    "end_line": 9274,
+    "section": "Hard line breaks"
+  },
+  {
+    "markdown": "foo\\\n",
+    "html": "<p>foo\\</p>\n",
+    "example": 641,
+    "start_line": 9281,
+    "end_line": 9285,
+    "section": "Hard line breaks"
+  },
+  {
+    "markdown": "foo  \n",
+    "html": "<p>foo</p>\n",
+    "example": 642,
+    "start_line": 9288,
+    "end_line": 9292,
+    "section": "Hard line breaks"
+  },
+  {
+    "markdown": "### foo\\\n",
+    "html": "<h3>foo\\</h3>\n",
+    "example": 643,
+    "start_line": 9295,
+    "end_line": 9299,
+    "section": "Hard line breaks"
+  },
+  {
+    "markdown": "### foo  \n",
+    "html": "<h3>foo</h3>\n",
+    "example": 644,
+    "start_line": 9302,
+    "end_line": 9306,
+    "section": "Hard line breaks"
+  },
+  {
+    "markdown": "foo\nbaz\n",
+    "html": "<p>foo\nbaz</p>\n",
+    "example": 645,
+    "start_line": 9317,
+    "end_line": 9323,
+    "section": "Soft line breaks"
+  },
+  {
+    "markdown": "foo \n baz\n",
+    "html": "<p>foo\nbaz</p>\n",
+    "example": 646,
+    "start_line": 9329,
+    "end_line": 9335,
+    "section": "Soft line breaks"
+  },
+  {
+    "markdown": "hello $.;'there\n",
+    "html": "<p>hello $.;'there</p>\n",
+    "example": 647,
+    "start_line": 9349,
+    "end_line": 9353,
+    "section": "Textual content"
+  },
+  {
+    "markdown": "Foo χρῆν\n",
+    "html": "<p>Foo χρῆν</p>\n",
+    "example": 648,
+    "start_line": 9356,
+    "end_line": 9360,
+    "section": "Textual content"
+  },
+  {
+    "markdown": "Multiple     spaces\n",
+    "html": "<p>Multiple     spaces</p>\n",
+    "example": 649,
+    "start_line": 9365,
+    "end_line": 9369,
+    "section": "Textual content"
+  }
+]
diff --git a/packages/markdown/marked/test/specs/commonmark/getSpecs.js b/packages/markdown/marked/test/specs/commonmark/getSpecs.js
new file mode 100644
index 00000000..f22e00c0
--- /dev/null
+++ b/packages/markdown/marked/test/specs/commonmark/getSpecs.js
@@ -0,0 +1,24 @@
+const fetch = require('node-fetch');
+const marked = require('../../../');
+const htmlDiffer = require('../../helpers/html-differ.js');
+const fs = require('fs');
+
+fetch('https://raw.githubusercontent.com/commonmark/commonmark.js/master/package.json')
+  .then(res => res.json())
+  .then(pkg => pkg.version.replace(/^(\d+\.\d+).*$/, '$1'))
+  .then(version =>
+    fetch(`https://spec.commonmark.org/${version}/spec.json`)
+      .then(res => res.json())
+      .then(specs => {
+        specs.forEach(spec => {
+          const html = marked(spec.markdown, {headerIds: false});
+          if (!htmlDiffer.isEqual(html, spec.html)) {
+            spec.shouldFail = true;
+          }
+        });
+        fs.writeFileSync(`commonmark.${version}.json`, JSON.stringify(specs, null, 2) + '\n');
+      })
+  )
+  .catch((err) => {
+    console.error(err);
+  });
diff --git a/packages/markdown/marked/test/specs/gfm/getSpecs.js b/packages/markdown/marked/test/specs/gfm/getSpecs.js
new file mode 100644
index 00000000..2746bdbb
--- /dev/null
+++ b/packages/markdown/marked/test/specs/gfm/getSpecs.js
@@ -0,0 +1,44 @@
+const fetch = require('node-fetch');
+const cheerio = require('cheerio');
+const marked = require('../../../');
+const htmlDiffer = require('../../helpers/html-differ.js');
+const fs = require('fs');
+
+fetch('https://github.github.com/gfm/')
+  .then(res => res.text())
+  .then(html => cheerio.load(html))
+  .then($ => {
+    const version = $('.version').text().match(/\d+\.\d+/)[0];
+    if (!version) {
+      throw new Error('No version found');
+    }
+    const specs = [];
+    $('.extension').each((i, ext) => {
+      const section = $('.definition', ext).text().trim().replace(/^\d+\.\d+(.*?) \(extension\)[\s\S]*$/, '$1');
+      $('.example', ext).each((j, exa) => {
+        const example = +$(exa).attr('id').replace(/\D/g, '');
+        const markdown = $('.language-markdown', exa).text().trim();
+        const html = $('.language-html', exa).text().trim();
+        specs.push({
+          section,
+          html,
+          markdown,
+          example
+        });
+      });
+    });
+
+    return [version, specs];
+  })
+  .then(([version, specs]) => {
+    specs.forEach(spec => {
+      const html = marked(spec.markdown, {gfm: true});
+      if (!htmlDiffer.isEqual(html, spec.html)) {
+        spec.shouldFail = true;
+      }
+    });
+    fs.writeFileSync(`gfm.${version}.json`, JSON.stringify(specs, null, 2) + '\n');
+  })
+  .catch((err) => {
+    console.error(err);
+  });
diff --git a/packages/markdown/marked/test/specs/gfm/gfm.0.29.json b/packages/markdown/marked/test/specs/gfm/gfm.0.29.json
new file mode 100644
index 00000000..7d1d43e4
--- /dev/null
+++ b/packages/markdown/marked/test/specs/gfm/gfm.0.29.json
@@ -0,0 +1,147 @@
+[
+  {
+    "section": "Tables",
+    "html": "<table>\n<thead>\n<tr>\n<th>foo</th>\n<th>bar</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>baz</td>\n<td>bim</td>\n</tr>\n</tbody>\n</table>",
+    "markdown": "| foo | bar |\n| --- | --- |\n| baz | bim |",
+    "example": 198
+  },
+  {
+    "section": "Tables",
+    "html": "<table>\n<thead>\n<tr>\n<th align=\"center\">abc</th>\n<th align=\"right\">defghi</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td align=\"center\">bar</td>\n<td align=\"right\">baz</td>\n</tr>\n</tbody>\n</table>",
+    "markdown": "| abc | defghi |\n:-: | -----------:\nbar | baz",
+    "example": 199
+  },
+  {
+    "section": "Tables",
+    "html": "<table>\n<thead>\n<tr>\n<th>f|oo</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>b <code>|</code> az</td>\n</tr>\n<tr>\n<td>b <strong>|</strong> im</td>\n</tr>\n</tbody>\n</table>",
+    "markdown": "| f\\|oo  |\n| ------ |\n| b `\\|` az |\n| b **\\|** im |",
+    "example": 200
+  },
+  {
+    "section": "Tables",
+    "html": "<table>\n<thead>\n<tr>\n<th>abc</th>\n<th>def</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>bar</td>\n<td>baz</td>\n</tr>\n</tbody>\n</table>\n<blockquote>\n<p>bar</p>\n</blockquote>",
+    "markdown": "| abc | def |\n| --- | --- |\n| bar | baz |\n> bar",
+    "example": 201
+  },
+  {
+    "section": "Tables",
+    "html": "<table>\n<thead>\n<tr>\n<th>abc</th>\n<th>def</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>bar</td>\n<td>baz</td>\n</tr>\n<tr>\n<td>bar</td>\n<td></td>\n</tr>\n</tbody>\n</table>\n<p>bar</p>",
+    "markdown": "| abc | def |\n| --- | --- |\n| bar | baz |\nbar\n\nbar",
+    "example": 202
+  },
+  {
+    "section": "Tables",
+    "html": "<p>| abc | def |\n| --- |\n| bar |</p>",
+    "markdown": "| abc | def |\n| --- |\n| bar |",
+    "example": 203
+  },
+  {
+    "section": "Tables",
+    "html": "<table>\n<thead>\n<tr>\n<th>abc</th>\n<th>def</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>bar</td>\n<td></td>\n</tr>\n<tr>\n<td>bar</td>\n<td>baz</td>\n</tr>\n</tbody>\n</table>",
+    "markdown": "| abc | def |\n| --- | --- |\n| bar |\n| bar | baz | boo |",
+    "example": 204
+  },
+  {
+    "section": "Tables",
+    "html": "<table>\n<thead>\n<tr>\n<th>abc</th>\n<th>def</th>\n</tr>\n</thead>\n</table>",
+    "markdown": "| abc | def |\n| --- | --- |",
+    "example": 205
+  },
+  {
+    "section": "Task list items",
+    "html": "<ul>\n<li><input disabled=\"\" type=\"checkbox\"> foo</li>\n<li><input checked=\"\" disabled=\"\" type=\"checkbox\"> bar</li>\n</ul>",
+    "markdown": "- [ ] foo\n- [x] bar",
+    "example": 279
+  },
+  {
+    "section": "Task list items",
+    "html": "<ul>\n<li><input checked=\"\" disabled=\"\" type=\"checkbox\"> foo\n<ul>\n<li><input disabled=\"\" type=\"checkbox\"> bar</li>\n<li><input checked=\"\" disabled=\"\" type=\"checkbox\"> baz</li>\n</ul>\n</li>\n<li><input disabled=\"\" type=\"checkbox\"> bim</li>\n</ul>",
+    "markdown": "- [x] foo\n  - [ ] bar\n  - [x] baz\n- [ ] bim",
+    "example": 280
+  },
+  {
+    "section": "Strikethrough",
+    "html": "<p><del>Hi</del> Hello, world!</p>",
+    "markdown": "~~Hi~~ Hello, world!",
+    "example": 491
+  },
+  {
+    "section": "Strikethrough",
+    "html": "<p>This ~~has a</p>\n<p>new paragraph~~.</p>",
+    "markdown": "This ~~has a\n\nnew paragraph~~.",
+    "example": 492
+  },
+  {
+    "section": "Autolinks",
+    "html": "<p><a href=\"http://www.commonmark.org\">www.commonmark.org</a></p>",
+    "markdown": "www.commonmark.org",
+    "example": 621
+  },
+  {
+    "section": "Autolinks",
+    "html": "<p>Visit <a href=\"http://www.commonmark.org/help\">www.commonmark.org/help</a> for more information.</p>",
+    "markdown": "Visit www.commonmark.org/help for more information.",
+    "example": 622
+  },
+  {
+    "section": "Autolinks",
+    "html": "<p>Visit <a href=\"http://www.commonmark.org\">www.commonmark.org</a>.</p>\n<p>Visit <a href=\"http://www.commonmark.org/a.b\">www.commonmark.org/a.b</a>.</p>",
+    "markdown": "Visit www.commonmark.org.\n\nVisit www.commonmark.org/a.b.",
+    "example": 623
+  },
+  {
+    "section": "Autolinks",
+    "html": "<p><a href=\"http://www.google.com/search?q=Markup+(business)\">www.google.com/search?q=Markup+(business)</a></p>\n<p>(<a href=\"http://www.google.com/search?q=Markup+(business)\">www.google.com/search?q=Markup+(business)</a>)</p>",
+    "markdown": "www.google.com/search?q=Markup+(business)\n\n(www.google.com/search?q=Markup+(business))",
+    "example": 624
+  },
+  {
+    "section": "Autolinks",
+    "html": "<p><a href=\"http://www.google.com/search?q=(business))+ok\">www.google.com/search?q=(business))+ok</a></p>",
+    "markdown": "www.google.com/search?q=(business))+ok",
+    "example": 625
+  },
+  {
+    "section": "Autolinks",
+    "html": "<p><a href=\"http://www.google.com/search?q=commonmark&amp;hl=en\">www.google.com/search?q=commonmark&amp;hl=en</a></p>\n<p><a href=\"http://www.google.com/search?q=commonmark\">www.google.com/search?q=commonmark</a>&amp;hl;</p>",
+    "markdown": "www.google.com/search?q=commonmark&hl=en\n\nwww.google.com/search?q=commonmark&hl;",
+    "example": 626
+  },
+  {
+    "section": "Autolinks",
+    "html": "<p><a href=\"http://www.commonmark.org/he\">www.commonmark.org/he</a>&lt;lp</p>",
+    "markdown": "www.commonmark.org/he<lp",
+    "example": 627
+  },
+  {
+    "section": "Autolinks",
+    "html": "<p><a href=\"http://commonmark.org\">http://commonmark.org</a></p>\n<p>(Visit <a href=\"https://encrypted.google.com/search?q=Markup+(business)\">https://encrypted.google.com/search?q=Markup+(business)</a>)</p>\n<p>Anonymous FTP is available at <a href=\"ftp://foo.bar.baz\">ftp://foo.bar.baz</a>.</p>",
+    "markdown": "http://commonmark.org\n\n(Visit https://encrypted.google.com/search?q=Markup+(business))\n\nAnonymous FTP is available at ftp://foo.bar.baz.",
+    "example": 628
+  },
+  {
+    "section": "Autolinks",
+    "html": "<p><a href=\"mailto:foo@bar.baz\">foo@bar.baz</a></p>",
+    "markdown": "foo@bar.baz",
+    "example": 629
+  },
+  {
+    "section": "Autolinks",
+    "html": "<p>hello@mail+xyz.example isn't valid, but <a href=\"mailto:hello+xyz@mail.example\">hello+xyz@mail.example</a> is.</p>",
+    "markdown": "hello@mail+xyz.example isn't valid, but hello+xyz@mail.example is.",
+    "example": 630
+  },
+  {
+    "section": "Autolinks",
+    "html": "<p><a href=\"mailto:a.b-c_d@a.b\">a.b-c_d@a.b</a></p>\n<p><a href=\"mailto:a.b-c_d@a.b\">a.b-c_d@a.b</a>.</p>\n<p>a.b-c_d@a.b-</p>\n<p>a.b-c_d@a.b_</p>",
+    "markdown": "a.b-c_d@a.b\n\na.b-c_d@a.b.\n\na.b-c_d@a.b-\n\na.b-c_d@a.b_",
+    "example": 631
+  },
+  {
+    "section": "Disallowed Raw HTML",
+    "html": "<p><strong> &lt;title> &lt;style> <em></p>\n<blockquote>\n  &lt;xmp> is disallowed.  &lt;XMP> is also disallowed.\n</blockquote>",
+    "markdown": "<strong> <title> <style> <em>\n\n<blockquote>\n  <xmp> is disallowed.  <XMP> is also disallowed.\n</blockquote>",
+    "example": 653,
+    "shouldFail": true
+  }
+]
diff --git a/packages/markdown/marked/test/specs/original/specs-spec.js b/packages/markdown/marked/test/specs/original/specs-spec.js
new file mode 100644
index 00000000..82d300a5
--- /dev/null
+++ b/packages/markdown/marked/test/specs/original/specs-spec.js
@@ -0,0 +1,12 @@
+var specTests = require('../../');
+
+it('should run spec tests', () => {
+  // hide output
+  spyOn(console, 'log');
+  if (!specTests(['', '', '--stop'])) {
+    // if tests fail rerun tests and show output
+    console.log.and.callThrough();
+    specTests([]);
+    fail();
+  }
+});
diff --git a/packages/markdown/marked/test/specs/redos-spec.js b/packages/markdown/marked/test/specs/redos-spec.js
new file mode 100644
index 00000000..1f94a42e
--- /dev/null
+++ b/packages/markdown/marked/test/specs/redos-spec.js
@@ -0,0 +1,24 @@
+const path = require('path');
+const fs = require('fs');
+
+const redosDir = path.resolve(__dirname, '../redos');
+
+describe('ReDOS tests', () => {
+  const files = fs.readdirSync(redosDir);
+  files.forEach(file => {
+    if (!file.match(/\.js$/)) {
+      return;
+    }
+
+    it(file, () => {
+      const spec = require(path.resolve(redosDir, file));
+      const before = process.hrtime();
+      expect(spec).toRender(spec.html);
+      const elapsed = process.hrtime(before);
+      if (elapsed[0] > 0) {
+        const s = (elapsed[0] + elapsed[1] * 1e-9).toFixed(3);
+        fail(`took too long: ${s}s`);
+      }
+    });
+  });
+});
diff --git a/packages/markdown/marked/test/specs/run-spec.js b/packages/markdown/marked/test/specs/run-spec.js
new file mode 100644
index 00000000..3af0aa45
--- /dev/null
+++ b/packages/markdown/marked/test/specs/run-spec.js
@@ -0,0 +1,52 @@
+function runSpecs(title, file, options) {
+  const json = require(file);
+  let longestName = 0;
+  let maxSpecs = 0;
+  const specs = json.reduce((obj, spec) => {
+    if (!obj[spec.section]) {
+      longestName = Math.max(spec.section.length, longestName);
+      obj[spec.section] = {
+        specs: [],
+        pass: 0,
+        total: 0
+      };
+    }
+    obj[spec.section].total++;
+    maxSpecs = Math.max(obj[spec.section].total, maxSpecs);
+    if (!spec.shouldFail) {
+      obj[spec.section].pass++;
+    }
+    obj[spec.section].specs.push(spec);
+    return obj;
+  }, {});
+
+  describe(title, () => {
+    const maxSpecsLen = ('' + maxSpecs).length;
+    const spaces = maxSpecsLen * 2 + longestName + 11;
+    console.log('-'.padEnd(spaces + 4, '-'));
+    console.log(`| ${title.padStart(Math.ceil((spaces + title.length) / 2)).padEnd(spaces)} |`);
+    console.log(`| ${' '.padEnd(spaces)} |`);
+    Object.keys(specs).forEach(section => {
+      console.log(`| ${section.padEnd(longestName)} ${('' + specs[section].pass).padStart(maxSpecsLen)} of ${('' + specs[section].total).padStart(maxSpecsLen)} ${(100 * specs[section].pass / specs[section].total).toFixed().padStart(4)}% |`);
+      describe(section, () => {
+        specs[section].specs.forEach((spec) => {
+          if (options) {
+            spec.options = Object.assign({}, options, (spec.options || {}));
+          }
+          (spec.only ? fit : it)('should ' + (spec.shouldFail ? 'fail' : 'pass') + ' example ' + spec.example, () => {
+            if (spec.shouldFail) {
+              expect(spec).not.toRender(spec.html);
+            } else {
+              expect(spec).toRender(spec.html);
+            }
+          });
+        });
+      });
+    });
+    console.log('-'.padEnd(spaces + 4, '-'));
+    console.log();
+  });
+};
+
+runSpecs('GFM 0.29', './gfm/gfm.0.29.json', {gfm: true});
+runSpecs('CommonMark 0.29', './commonmark/commonmark.0.29.json', {headerIds: false});
diff --git a/packages/markdown/marked/test/unit/marked-spec.js b/packages/markdown/marked/test/unit/marked-spec.js
new file mode 100644
index 00000000..994c5dc8
--- /dev/null
+++ b/packages/markdown/marked/test/unit/marked-spec.js
@@ -0,0 +1,73 @@
+var marked = require('../../lib/marked.js');
+
+describe('Test heading ID functionality', () => {
+  it('should add id attribute by default', () => {
+    var renderer = new marked.Renderer();
+    var slugger = new marked.Slugger();
+    var header = renderer.heading('test', 1, 'test', slugger);
+    expect(header).toBe('<h1 id="test">test</h1>\n');
+  });
+
+  it('should NOT add id attribute when options set false', () => {
+    var renderer = new marked.Renderer({ headerIds: false });
+    var header = renderer.heading('test', 1, 'test');
+    expect(header).toBe('<h1>test</h1>\n');
+  });
+});
+
+describe('Test slugger functionality', () => {
+  it('should use lowercase slug', () => {
+    var slugger = new marked.Slugger();
+    expect(slugger.slug('Test')).toBe('test');
+  });
+
+  it('should be unique to avoid collisions 1280', () => {
+    var slugger = new marked.Slugger();
+    expect(slugger.slug('test')).toBe('test');
+    expect(slugger.slug('test')).toBe('test-1');
+    expect(slugger.slug('test')).toBe('test-2');
+  });
+
+  it('should be unique when slug ends with number', () => {
+    var slugger = new marked.Slugger();
+    expect(slugger.slug('test 1')).toBe('test-1');
+    expect(slugger.slug('test')).toBe('test');
+    expect(slugger.slug('test')).toBe('test-2');
+  });
+
+  it('should be unique when slug ends with hyphen number', () => {
+    var slugger = new marked.Slugger();
+    expect(slugger.slug('foo')).toBe('foo');
+    expect(slugger.slug('foo')).toBe('foo-1');
+    expect(slugger.slug('foo 1')).toBe('foo-1-1');
+    expect(slugger.slug('foo-1')).toBe('foo-1-2');
+    expect(slugger.slug('foo')).toBe('foo-2');
+  });
+
+  it('should allow non-latin chars', () => {
+    var slugger = new marked.Slugger();
+    expect(slugger.slug('привет')).toBe('привет');
+  });
+
+  it('should remove ampersands 857', () => {
+    var slugger = new marked.Slugger();
+    expect(slugger.slug('This & That Section')).toBe('this--that-section');
+  });
+
+  it('should remove periods', () => {
+    var slugger = new marked.Slugger();
+    expect(slugger.slug('file.txt')).toBe('filetxt');
+  });
+});
+
+describe('Test paragraph token type', () => {
+  it('should use the "paragraph" type on top level', () => {
+    const md = 'A Paragraph.\n\n> A blockquote\n\n- list item\n';
+
+    const tokens = marked.lexer(md);
+
+    expect(tokens[0].type).toBe('paragraph');
+    expect(tokens[3].type).toBe('paragraph');
+    expect(tokens[7].type).toBe('text');
+  });
+});
diff --git a/packages/markdown/package.js b/packages/markdown/package.js
new file mode 100755
index 00000000..ac725b8f
--- /dev/null
+++ b/packages/markdown/package.js
@@ -0,0 +1,24 @@
+// Source: https://github.com/chjj/marked
+
+Package.describe({
+	name: 'wekan-markdown',
+	summary: "GitHub flavored markdown parser for Meteor based on marked.js",
+	version: "1.0.7",
+	git: "https://github.com/wekan/markdown.git"
+});
+
+// Before Meteor 0.9?
+if(!Package.onUse) Package.onUse = Package.on_use;
+
+Package.onUse(function (api) {
+	if(api.versionsFrom) api.versionsFrom('METEOR@0.9.0');
+
+	api.use('templating');
+
+	api.add_files('marked/lib/marked.js', ['server', 'client']);
+	api.add_files('markdown.js', ['server', 'client']);
+	api.export('Markdown', ['server', 'client']);
+
+	api.use("ui", "client", {weak: true});
+	api.add_files("template-integration.js", "client");
+});
diff --git a/packages/markdown/smart.json b/packages/markdown/smart.json
new file mode 100755
index 00000000..dd443066
--- /dev/null
+++ b/packages/markdown/smart.json
@@ -0,0 +1,9 @@
+{
+  "name": "markdown",
+  "description": "GitHub flavored markdown parser for Meteor based on marked.js",
+  "homepage": "https://github.com/wekan/markdown",
+  "author": "Petar Korponaic",
+  "version": "1.0.7",
+  "git": "https://github.com/wekan/markdown.git",
+  "packages": {}
+}
diff --git a/packages/markdown/template-integration.js b/packages/markdown/template-integration.js
new file mode 100755
index 00000000..301bde31
--- /dev/null
+++ b/packages/markdown/template-integration.js
@@ -0,0 +1,16 @@
+if (Package.ui) {
+	var Template = Package.templating.Template;
+	var UI = Package.ui.UI;
+	var HTML = Package.htmljs.HTML;
+	var Blaze = Package.blaze.Blaze; // implied by `ui`
+
+	UI.registerHelper('markdown', new Template('markdown', function () {
+		var self = this;
+		var text = "";
+		if(self.templateContentBlock) {
+			text = Blaze._toText(self.templateContentBlock, HTML.TEXTMODE.STRING);
+		}
+
+		return HTML.Raw(Markdown(text));
+	}));
+}
diff --git a/packages/meteor-accounts-cas/.gitignore b/packages/meteor-accounts-cas/.gitignore
new file mode 100644
index 00000000..bed7713f
--- /dev/null
+++ b/packages/meteor-accounts-cas/.gitignore
@@ -0,0 +1,2 @@
+.build*
+node_modules/
diff --git a/packages/meteor-accounts-cas/LICENSE b/packages/meteor-accounts-cas/LICENSE
new file mode 100644
index 00000000..c2d69158
--- /dev/null
+++ b/packages/meteor-accounts-cas/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014-2019 The Wekan Team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/packages/meteor-accounts-cas/README.md b/packages/meteor-accounts-cas/README.md
new file mode 100644
index 00000000..3e246c4f
--- /dev/null
+++ b/packages/meteor-accounts-cas/README.md
@@ -0,0 +1,88 @@
+This is a merged repository of useful forks of: atoy40:accounts-cas
+===================
+([(https://atmospherejs.com/atoy40/accounts-cas](https://atmospherejs.com/atoy40/accounts-cas))
+
+## Essential improvements by ppoulard to atoy40 and xaionaro versions
+
+* Added support of CAS attributes
+
+With this plugin, you can pick CAS attributes : https://github.com/joshchan/node-cas/wiki/CAS-Attributes
+
+Moved to Wekan GitHub org from from https://github.com/ppoulard/meteor-accounts-cas
+
+## Install
+
+```
+cd ~site
+mkdir packages
+cd packages
+git clone https://github.com/wekan/meteor-accounts-cas
+cd ~site
+meteor add wekan:accounts-cas
+```
+
+## Usage
+
+Put CAS settings in Meteor.settings (for example using METEOR_SETTINGS env or --settings) like so:
+
+If casVersion is not defined, it will assume you use CAS 1.0. (note by xaionaro: option `casVersion` seems to be just ignored in the code, ATM).
+
+Server side settings:
+
+```
+Meteor.settings = {
+    "cas": {
+        "baseUrl": "https://cas.example.com/cas",
+        "autoClose": true,
+        "validateUrl":"https://cas.example.com/cas/p3/serviceValidate",
+        "casVersion": 3.0,
+        "attributes": {
+            "debug" : true
+        }
+    },
+}
+```
+
+CAS `attributes` settings :
+
+* `attributes`: by default `{}` : all default values below will apply
+* *  `debug` : by default `false` ; `true` will print to the server console the CAS attribute names to map, the CAS attributes values retrieved, if necessary the new user account created, and finally the user to use
+* *  `id` : by default, the CAS user is used for the user account, but you can specified another CAS attribute
+* *  `firstname` : by default `cas:givenName` ; but you can use your own CAS attribute
+* *  `lastname` : by default `cas:sn` (respectively) ; but you can use your own CAS attribute
+* *  `fullname` : by default unused, but if you specify your own CAS attribute, it will be used instead of the `firstname` + `lastname`
+* *  `mail` : by default `cas:mail`
+
+Client side settings:
+
+```
+Meteor.settings = {
+	"public": {
+		"cas": {
+			"loginUrl": "https://cas.example.com/login",
+			"serviceParam": "service",
+			"popupWidth": 810,
+			"popupHeight": 610,
+			"popup": true,
+		}
+	}
+}
+```
+
+`proxyUrl` is not required. Setup [ROOT_URL](http://docs.meteor.com/api/core.html#Meteor-absoluteUrl) environment variable instead.
+
+Then, to start authentication, you have to call the following method from the client (for example in a click handler) :
+
+```
+Meteor.loginWithCas([callback]);
+```
+
+It must open a popup containing you CAS login form or redirect to the CAS login form (depending on "popup" setting).
+
+If popup is disabled (== false), then it's required to execute `Meteor.initCas([callback])` in `Meteor.startup` of the client side. ATM, `Meteor.initCas()` completes authentication.
+
+## Examples
+
+* [https://devel.mephi.ru/dyokunev/start-mephi-ru](https://devel.mephi.ru/dyokunev/start-mephi-ru)
+
+
diff --git a/packages/meteor-accounts-cas/cas_client.js b/packages/meteor-accounts-cas/cas_client.js
new file mode 100644
index 00000000..bd94be6b
--- /dev/null
+++ b/packages/meteor-accounts-cas/cas_client.js
@@ -0,0 +1,112 @@
+
+function addParameterToURL(url, param){
+  var urlSplit = url.split('?');
+  return url+(urlSplit.length>0 ? '?':'&') + param;
+}
+
+Meteor.initCas = function(callback) {
+    const casTokenMatch = window.location.href.match(/[?&]casToken=([^&]+)/);
+    if (casTokenMatch == null) {
+        return;
+    }
+
+    window.history.pushState('', document.title, window.location.href.replace(/([&?])casToken=[^&]+[&]?/, '$1').replace(/[?&]+$/g, ''));
+
+    Accounts.callLoginMethod({
+        methodArguments: [{ cas: { credentialToken: casTokenMatch[1] } }],
+        userCallback: function(err){
+            if (err == null) {
+                // should we do anything on success?
+            }
+            if (callback != null) {
+                callback(err);
+            }
+        }
+    });
+}
+
+Meteor.loginWithCas = function(options, callback) {
+
+    var credentialToken = Random.id();
+
+    if (!Meteor.settings.public &&
+        !Meteor.settings.public.cas &&
+        !Meteor.settings.public.cas.loginUrl) {
+        return;
+    }
+
+    var settings = Meteor.settings.public.cas;
+
+    var backURL = window.location.href.replace('#', '');
+    if (options != null && options.redirectUrl != null)
+        backURL = options.redirectUrl;
+
+    var serviceURL = addParameterToURL(backURL, 'casToken='+credentialToken);
+
+    var loginUrl = settings.loginUrl +
+        "?" + (settings.serviceParam || "service") + "=" +
+        encodeURIComponent(serviceURL)
+
+    if (settings.popup == false) {
+      window.location = loginUrl;
+      return;
+    }
+
+    var popup = openCenteredPopup(
+        loginUrl,
+        settings.width || 800,
+        settings.height || 600
+    );
+
+    var checkPopupOpen = setInterval(function() {
+        try {
+	    if(popup && popup.document && popup.document.getElementById('popupCanBeClosed')) {
+                popup.close();
+      	    }
+            // Fix for #328 - added a second test criteria (popup.closed === undefined)
+            // to humour this Android quirk:
+            // http://code.google.com/p/android/issues/detail?id=21061
+            var popupClosed = popup.closed || popup.closed === undefined;
+        } catch (e) {
+            // For some unknown reason, IE9 (and others?) sometimes (when
+            // the popup closes too quickly?) throws "SCRIPT16386: No such
+            // interface supported" when trying to read 'popup.closed'. Try
+            // again in 100ms.
+            return;
+        }
+
+        if (popupClosed) {
+            clearInterval(checkPopupOpen);
+
+            // check auth on server.
+            Accounts.callLoginMethod({
+                methodArguments: [{ cas: { credentialToken: credentialToken } }],
+                userCallback: callback
+            });
+        }
+    }, 100);
+};
+
+var openCenteredPopup = function(url, width, height) {
+  var screenX = typeof window.screenX !== 'undefined'
+  ? window.screenX : window.screenLeft;
+  var screenY = typeof window.screenY !== 'undefined'
+  ? window.screenY : window.screenTop;
+  var outerWidth = typeof window.outerWidth !== 'undefined'
+  ? window.outerWidth : document.body.clientWidth;
+  var outerHeight = typeof window.outerHeight !== 'undefined'
+  ? window.outerHeight : (document.body.clientHeight - 22);
+  // XXX what is the 22?
+
+  // Use `outerWidth - width` and `outerHeight - height` for help in
+  // positioning the popup centered relative to the current window
+  var left = screenX + (outerWidth - width) / 2;
+  var top = screenY + (outerHeight - height) / 2;
+  var features = ('width=' + width + ',height=' + height +
+      ',left=' + left + ',top=' + top + ',scrollbars=yes');
+
+  var newwindow = window.open(url, '_blank', features);
+  if (newwindow.focus)
+    newwindow.focus();
+  return newwindow;
+};
diff --git a/packages/meteor-accounts-cas/cas_client_cordova.js b/packages/meteor-accounts-cas/cas_client_cordova.js
new file mode 100644
index 00000000..c7f95b50
--- /dev/null
+++ b/packages/meteor-accounts-cas/cas_client_cordova.js
@@ -0,0 +1,71 @@
+
+Meteor.loginWithCas = function(callback) {
+
+  var credentialToken = Random.id();
+
+  if (!Meteor.settings.public &&
+      !Meteor.settings.public.cas &&
+      !Meteor.settings.public.cas.loginUrl) {
+    return;
+  }
+
+  var settings = Meteor.settings.public.cas;
+
+  var loginUrl = settings.loginUrl +
+      "?" + (settings.service || "service") + "=" +
+      Meteor.absoluteUrl('_cas/') +
+      credentialToken;
+
+
+  var fail = function (err) {
+    Meteor._debug("Error from OAuth popup: " + JSON.stringify(err));
+  };
+
+  // When running on an android device, we sometimes see the
+  // `pageLoaded` callback fire twice for the final page in the OAuth
+  // popup, even though the page only loads once. This is maybe an
+  // Android bug or maybe something intentional about how onPageFinished
+  // works that we don't understand and isn't well-documented.
+  var oauthFinished = false;
+
+  var pageLoaded = function (event) {
+    if (oauthFinished) {
+      return;
+    }
+
+    if (event.url.indexOf(Meteor.absoluteUrl('_cas')) === 0) {
+
+      oauthFinished = true;
+
+      // On iOS, this seems to prevent "Warning: Attempt to dismiss from
+      // view controller <MainViewController: ...> while a presentation
+      // or dismiss is in progress". My guess is that the last
+      // navigation of the OAuth popup is still in progress while we try
+      // to close the popup. See
+      // https://issues.apache.org/jira/browse/CB-2285.
+      //
+      // XXX Can we make this timeout smaller?
+      setTimeout(function () {
+        popup.close();
+        // check auth on server.
+        Accounts.callLoginMethod({
+          methodArguments: [{ cas: { credentialToken: credentialToken } }],
+          userCallback: callback
+        });
+      }, 100);
+    }
+  };
+
+  var onExit = function () {
+    popup.removeEventListener('loadstop', pageLoaded);
+    popup.removeEventListener('loaderror', fail);
+    popup.removeEventListener('exit', onExit);
+  };
+
+  var popup = window.open(loginUrl, '_blank', 'location=no,hidden=no');
+  popup.addEventListener('loadstop', pageLoaded);
+  popup.addEventListener('loaderror', fail);
+  popup.addEventListener('exit', onExit);
+  popup.show();
+
+};
\ No newline at end of file
diff --git a/packages/meteor-accounts-cas/cas_server.js b/packages/meteor-accounts-cas/cas_server.js
new file mode 100644
index 00000000..15c1b174
--- /dev/null
+++ b/packages/meteor-accounts-cas/cas_server.js
@@ -0,0 +1,281 @@
+"use strict";
+
+const Fiber = Npm.require('fibers');
+const https = Npm.require('https');
+const url = Npm.require('url');
+const xmlParser = Npm.require('xml2js');
+
+// Library
+class CAS {
+  constructor(options) {
+    options = options || {};
+
+    if (!options.validate_url) {
+      throw new Error('Required CAS option `validateUrl` missing.');
+    }
+
+    if (!options.service) {
+      throw new Error('Required CAS option `service` missing.');
+    }
+
+    const cas_url = url.parse(options.validate_url);
+    if (cas_url.protocol != 'https:' ) {
+      throw new Error('Only https CAS servers are supported.');
+    } else if (!cas_url.hostname) {
+      throw new Error('Option `validateUrl` must be a valid url like: https://example.com/cas/serviceValidate');
+    } else {
+      this.hostname = cas_url.host;
+      this.port = 443;// Should be 443 for https
+      this.validate_path = cas_url.pathname;
+    }
+
+    this.service = options.service;
+  }
+
+  validate(ticket, callback) {
+    const httparams = {
+      host: this.hostname,
+      port: this.port,
+      path: url.format({
+        pathname: this.validate_path,
+        query: {ticket: ticket, service: this.service},
+      }),
+    };
+
+    https.get(httparams, (res) => {
+      res.on('error', (e) => {
+        console.log('error' + e);
+        callback(e);
+      });
+
+      // Read result
+      res.setEncoding('utf8');
+      let response = '';
+      res.on('data', (chunk) => {
+        response += chunk;
+      });
+
+      res.on('end', (error) => {
+        if (error) {
+          console.log('error callback');
+          console.log(error);
+          callback(undefined, false);
+        } else {
+          xmlParser.parseString(response, (err, result) => {
+            if (err) {
+              console.log('Bad response format.');
+              callback({message: 'Bad response format. XML could not parse it'});
+            } else {
+              if (result['cas:serviceResponse'] == null) {
+                console.log('Empty response.');
+                callback({message: 'Empty response.'});
+              }
+              if (result['cas:serviceResponse']['cas:authenticationSuccess']) {
+                var userData = {
+                  id: result['cas:serviceResponse']['cas:authenticationSuccess'][0]['cas:user'][0].toLowerCase(),
+                }
+                const attributes = result['cas:serviceResponse']['cas:authenticationSuccess'][0]['cas:attributes'][0];
+                for (var fieldName in attributes) {
+                  userData[fieldName] = attributes[fieldName][0];
+                };
+                callback(undefined, true, userData);
+              } else {
+                callback(undefined, false);
+              }
+            }
+          });
+        }
+      });
+    });
+  }
+}
+////// END OF CAS MODULE
+
+let _casCredentialTokens = {};
+let _userData = {};
+
+//RoutePolicy.declare('/_cas/', 'network');
+
+// Listen to incoming OAuth http requests
+WebApp.connectHandlers.use((req, res, next) => {
+  // Need to create a Fiber since we're using synchronous http calls and nothing
+  // else is wrapping this in a fiber automatically
+
+  Fiber(() => {
+    middleware(req, res, next);
+  }).run();
+});
+
+const middleware = (req, res, next) => {
+  // Make sure to catch any exceptions because otherwise we'd crash
+  // the runner
+  try {
+    urlParsed = url.parse(req.url, true);
+
+    // Getting the ticket (if it's defined in GET-params)
+    // If no ticket, then request will continue down the default
+    // middlewares.
+    const query = urlParsed.query;
+    if (query == null) {
+      next();
+      return;
+    }
+    const ticket = query.ticket;
+    if (ticket == null) {
+      next();
+      return;
+    }
+
+    const serviceUrl = Meteor.absoluteUrl(urlParsed.href.replace(/^\//g, '')).replace(/([&?])ticket=[^&]+[&]?/g, '$1').replace(/[?&]+$/g, '');
+    const redirectUrl = serviceUrl;//.replace(/([&?])casToken=[^&]+[&]?/g, '$1').replace(/[?&]+$/g, '');
+
+    // get auth token
+    const credentialToken = query.casToken;
+    if (!credentialToken) {
+      end(res, redirectUrl);
+      return;
+    }
+
+    // validate ticket
+    casValidate(req, ticket, credentialToken, serviceUrl, () => {
+      end(res, redirectUrl);
+    });
+
+  } catch (err) {
+    console.log("account-cas: unexpected error : " + err.message);
+    end(res, redirectUrl);
+  }
+};
+
+const casValidate = (req, ticket, token, service, callback) => {
+  // get configuration
+  if (!Meteor.settings.cas/* || !Meteor.settings.cas.validate*/) {
+    throw new Error('accounts-cas: unable to get configuration.');
+  }
+
+  const cas = new CAS({
+    validate_url: Meteor.settings.cas.validateUrl,
+    service: service,
+    version: Meteor.settings.cas.casVersion
+  });
+
+  cas.validate(ticket, (err, status, userData) => {
+    if (err) {
+      console.log("accounts-cas: error when trying to validate " + err);
+      console.log(err);
+    } else {
+      if (status) {
+        console.log(`accounts-cas: user validated ${userData.id}
+          (${JSON.stringify(userData)})`);
+        _casCredentialTokens[token] = { id: userData.id };
+        _userData = userData;
+      } else {
+        console.log("accounts-cas: unable to validate " + ticket);
+      }
+    }
+    callback();
+  });
+
+  return;
+};
+
+/*
+ * Register a server-side login handle.
+ * It is call after Accounts.callLoginMethod() is call from client.
+ */
+ Accounts.registerLoginHandler((options) => {
+  if (!options.cas)
+    return undefined;
+
+  if (!_hasCredential(options.cas.credentialToken)) {
+    throw new Meteor.Error(Accounts.LoginCancelledError.numericError,
+      'no matching login attempt found');
+  }
+
+  const result = _retrieveCredential(options.cas.credentialToken);
+
+  const attrs = Meteor.settings.cas.attributes || {};
+  // CAS keys
+  const fn = attrs.firstname || 'cas:givenName';
+  const ln = attrs.lastname || 'cas:sn';
+  const full = attrs.fullname;
+  const mail = attrs.mail || 'cas:mail'; // or 'email'
+  const uid = attrs.id || 'id';
+  if (attrs.debug) {
+    if (full) {
+      console.log(`CAS fields : id:"${uid}", fullname:"${full}", mail:"${mail}"`);
+    } else {
+      console.log(`CAS fields : id:"${uid}", firstname:"${fn}", lastname:"${ln}", mail:"${mail}"`);
+    }
+  }
+  const name = full ? _userData[full] : _userData[fn] + ' ' +  _userData[ln];
+  // https://docs.meteor.com/api/accounts.html#Meteor-users
+  options = {
+    // _id: Meteor.userId()
+    username: _userData[uid], // Unique name
+    emails: [
+      { address: _userData[mail], verified: true }
+    ],
+    createdAt: new Date(),
+    profile: {
+      // The profile is writable by the user by default.
+      name: name,
+      fullname : name,
+      email : _userData[mail]
+    },
+    active: true,
+    globalRoles: ['user']
+  };
+  if (attrs.debug) {
+    console.log(`CAS response : ${JSON.stringify(result)}`);
+  }
+  let user = Meteor.users.findOne({ 'username': options.username });
+  if (! user) {
+    if (attrs.debug) {
+      console.log(`Creating user account ${JSON.stringify(options)}`);
+    }
+    const userId = Accounts.insertUserDoc({}, options);
+    user = Meteor.users.findOne(userId);
+  }
+  if (attrs.debug) {
+    console.log(`Using user account ${JSON.stringify(user)}`);
+  }
+  return { userId: user._id };
+});
+
+const _hasCredential = (credentialToken) => {
+  return _.has(_casCredentialTokens, credentialToken);
+}
+
+/*
+ * Retrieve token and delete it to avoid replaying it.
+ */
+const _retrieveCredential = (credentialToken) => {
+  const result = _casCredentialTokens[credentialToken];
+  delete _casCredentialTokens[credentialToken];
+  return result;
+}
+
+const closePopup = (res) => {
+  if (Meteor.settings.cas && Meteor.settings.cas.popup == false) {
+    return;
+  }
+  res.writeHead(200, {'Content-Type': 'text/html'});
+  const content = '<html><body><div id="popupCanBeClosed"></div></body></html>';
+  res.end(content, 'utf-8');
+}
+
+const redirect = (res, whereTo) => {
+  res.writeHead(302, {'Location': whereTo});
+  const content = '<html><head><meta http-equiv="refresh" content="0; url='+whereTo+'" /></head><body>Redirection to <a href='+whereTo+'>'+whereTo+'</a></body></html>';
+  res.end(content, 'utf-8');
+  return
+}
+
+const end = (res, whereTo) => {
+  if (Meteor.settings.cas && Meteor.settings.cas.popup == false) {
+    redirect(res, whereTo);
+  } else {
+    closePopup(res);
+  }
+}
diff --git a/packages/meteor-accounts-cas/package.js b/packages/meteor-accounts-cas/package.js
new file mode 100644
index 00000000..670fe687
--- /dev/null
+++ b/packages/meteor-accounts-cas/package.js
@@ -0,0 +1,29 @@
+Package.describe({
+  summary: "CAS support for accounts",
+  version: "0.1.0",
+  name: "wekan:accounts-cas",
+  git: "https://github.com/wekan/meteor-accounts-cas"
+});
+
+Package.onUse(function(api) {
+  api.versionsFrom('METEOR@1.3.5.1');
+  api.use('routepolicy', 'server');
+  api.use('webapp', 'server');
+  api.use('accounts-base', ['client', 'server']);
+  // Export Accounts (etc) to packages using this one.
+  api.imply('accounts-base', ['client', 'server']);
+  api.use('underscore');
+  api.add_files('cas_client.js', 'web.browser');
+  api.add_files('cas_client_cordova.js', 'web.cordova');
+  api.add_files('cas_server.js', 'server');
+
+});
+
+Npm.depends({
+  xml2js: "0.4.17",
+  cas: "https://github.com/anrizal/node-cas/tarball/2baed530842e7a437f8f71b9346bcac8e84773cc"
+});
+
+Cordova.depends({
+  'cordova-plugin-inappbrowser': '1.2.0'
+});
diff --git a/packages/meteor-useraccounts-core/.editorconfig b/packages/meteor-useraccounts-core/.editorconfig
new file mode 100644
index 00000000..6667b413
--- /dev/null
+++ b/packages/meteor-useraccounts-core/.editorconfig
@@ -0,0 +1,18 @@
+#.editorconfig
+# Meteor adapted EditorConfig, http://EditorConfig.org
+# By RaiX 2013
+
+root = true
+
+[*.js]
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+charset = utf-8
+max_line_length = 80
+indent_brace_style = 1TBS
+spaces_around_operators = true
+quote_type = auto
+# curly_bracket_next_line = true
diff --git a/packages/meteor-useraccounts-core/.gitignore b/packages/meteor-useraccounts-core/.gitignore
new file mode 100644
index 00000000..0f1edf50
--- /dev/null
+++ b/packages/meteor-useraccounts-core/.gitignore
@@ -0,0 +1,2 @@
+.build*
+versions.json
diff --git a/packages/meteor-useraccounts-core/.jshintignore b/packages/meteor-useraccounts-core/.jshintignore
new file mode 100644
index 00000000..810f9466
--- /dev/null
+++ b/packages/meteor-useraccounts-core/.jshintignore
@@ -0,0 +1,2 @@
+client/compatibility
+packages
\ No newline at end of file
diff --git a/packages/meteor-useraccounts-core/.jshintrc b/packages/meteor-useraccounts-core/.jshintrc
new file mode 100644
index 00000000..7a0c90b0
--- /dev/null
+++ b/packages/meteor-useraccounts-core/.jshintrc
@@ -0,0 +1,132 @@
+//.jshintrc
+{
+  // JSHint Meteor Configuration File
+  // Match the Meteor Style Guide
+  //
+  // By @raix with contributions from @aldeed and @awatson1978
+  // Source https://github.com/raix/Meteor-jshintrc
+  //
+  // See http://jshint.com/docs/ for more details
+
+  "maxerr"        : 50,       // {int} Maximum error before stopping
+
+  // Enforcing
+  "bitwise"       : true,     // true: Prohibit bitwise operators (&, |, ^, etc.)
+  "camelcase"     : true,     // true: Identifiers must be in camelCase
+  "curly"         : true,     // true: Require {} for every new block or scope
+  "eqeqeq"        : true,     // true: Require triple equals (===) for comparison
+  "forin"         : true,     // true: Require filtering for..in loops with obj.hasOwnProperty()
+  "immed"         : false,    // true: Require immediate invocations to be wrapped in parens e.g. `(function () { } ());`
+  "indent"        : 2,        // {int} Number of spaces to use for indentation
+  "latedef"       : false,    // true: Require variables/functions to be defined before being used
+  "newcap"        : false,    // true: Require capitalization of all constructor functions e.g. `new F()`
+  "noarg"         : true,     // true: Prohibit use of `arguments.caller` and `arguments.callee`
+  "noempty"       : true,     // true: Prohibit use of empty blocks
+  "nonew"         : false,    // true: Prohibit use of constructors for side-effects (without assignment)
+  "plusplus"      : false,    // true: Prohibit use of `++` & `--`
+  "quotmark"      : false,    // Quotation mark consistency:
+  //   false    : do nothing (default)
+  //   true     : ensure whatever is used is consistent
+  //   "single" : require single quotes
+  //   "double" : require double quotes
+  "undef"         : true,     // true: Require all non-global variables to be declared (prevents global leaks)
+  "unused"        : true,     // true: Require all defined variables be used
+  "strict"        : true,     // true: Requires all functions run in ES5 Strict Mode
+  "trailing"      : true,     // true: Prohibit trailing whitespaces
+  "maxparams"     : false,    // {int} Max number of formal params allowed per function
+  "maxdepth"      : false,    // {int} Max depth of nested blocks (within functions)
+  "maxstatements" : false,    // {int} Max number statements per function
+  "maxcomplexity" : false,    // {int} Max cyclomatic complexity per function
+  "maxlen"        : 80,       // {int} Max number of characters per line
+
+  // Relaxing
+  "asi"           : false,     // true: Tolerate Automatic Semicolon Insertion (no semicolons)
+  "boss"          : false,     // true: Tolerate assignments where comparisons would be expected
+  "debug"         : false,     // true: Allow debugger statements e.g. browser breakpoints.
+  "eqnull"        : false,     // true: Tolerate use of `== null`
+  "es5"           : false,     // true: Allow ES5 syntax (ex: getters and setters)
+  "esnext"        : false,     // true: Allow ES.next (ES6) syntax (ex: `const`)
+  "moz"           : false,     // true: Allow Mozilla specific syntax (extends and overrides esnext features)
+  // (ex: `for each`, multiple try/catch, function expression…)
+  "evil"          : false,     // true: Tolerate use of `eval` and `new Function()`
+  "expr"          : false,     // true: Tolerate `ExpressionStatement` as Programs
+  "funcscope"     : false,     // true: Tolerate defining variables inside control statements"
+  "globalstrict"  : true,      // true: Allow global "use strict" (also enables 'strict')
+  "iterator"      : false,     // true: Tolerate using the `__iterator__` property
+  "lastsemic"     : false,     // true: Tolerate omitting a semicolon for the last statement of a 1-line block
+  "laxbreak"      : false,     // true: Tolerate possibly unsafe line breakings
+  "laxcomma"      : false,     // true: Tolerate comma-first style coding
+  "loopfunc"      : false,     // true: Tolerate functions being defined in loops
+  "multistr"      : false,     // true: Tolerate multi-line strings
+  "proto"         : false,     // true: Tolerate using the `__proto__` property
+  "scripturl"     : false,     // true: Tolerate script-targeted URLs
+  "smarttabs"     : false,     // true: Tolerate mixed tabs/spaces when used for alignment
+  "shadow"        : false,     // true: Allows re-define variables later in code e.g. `var x=1; x=2;`
+  "sub"           : false,     // true: Tolerate using `[]` notation when it can still be expressed in dot notation
+  "supernew"      : false,     // true: Tolerate `new function () { ... };` and `new Object;`
+  "validthis"     : false,     // true: Tolerate using this in a non-constructor function
+
+  // Environments
+  "browser"       : true,     // Web Browser (window, document, etc)
+  "couch"         : false,    // CouchDB
+  "devel"         : true,     // Development/debugging (alert, confirm, etc)
+  "dojo"          : false,    // Dojo Toolkit
+  "jquery"        : false,    // jQuery
+  "mootools"      : false,    // MooTools
+  "node"          : false,    // Node.js
+  "nonstandard"   : false,    // Widely adopted globals (escape, unescape, etc)
+  "prototypejs"   : false,    // Prototype and Scriptaculous
+  "rhino"         : false,    // Rhino
+  "worker"        : false,    // Web Workers
+  "wsh"           : false,    // Windows Scripting Host
+  "yui"           : false,    // Yahoo User Interface
+  //"meteor"        : false,    // Meteor.js
+
+  // Legacy
+  "nomen"         : false,    // true: Prohibit dangling `_` in variables
+  "onevar"        : false,    // true: Allow only one `var` statement per function
+  "passfail"      : false,    // true: Stop on first error
+  "white"         : false,    // true: Check against strict whitespace and indentation rules
+
+  // Custom globals, from http://docs.meteor.com, in the order they appear there
+  "globals"       : {
+    "Meteor": false,
+    "DDP": false,
+    "Mongo": false, //Meteor.Collection renamed to Mongo.Collection
+    "Session": false,
+    "Accounts": false,
+    "Template": false,
+    "Blaze": false,  //UI is being renamed Blaze
+    "UI": false,
+    "Match": false,
+    "check": false,
+    "Tracker": false, //Deps renamed to Tracker
+    "Deps": false,
+    "ReactiveVar": false,
+    "EJSON": false,
+    "HTTP": false,
+    "Email": false,
+    "Assets": false,
+    "Handlebars": false,      // https://github.com/meteor/meteor/wiki/Handlebars
+    "Package": false,
+
+    // Meteor internals
+    "DDPServer": false,
+    "global": false,
+    "Log": false,
+    "MongoInternals": false,
+    "process": false,
+    "WebApp": false,
+    "WebAppInternals": false,
+
+    // globals useful when creating Meteor packages
+    "Npm": false,
+    "Tinytest": false,
+
+    // common Meteor packages
+    "Random": false,
+    "_": false,               // Underscore.js
+    "$": false,               // jQuery
+    "Router": false           // iron-router
+  }
+}
diff --git a/packages/meteor-useraccounts-core/.travis.yml b/packages/meteor-useraccounts-core/.travis.yml
new file mode 100644
index 00000000..7846a282
--- /dev/null
+++ b/packages/meteor-useraccounts-core/.travis.yml
@@ -0,0 +1,8 @@
+sudo: required
+language: node_js
+node_js:
+  - "0.10"
+before_install:
+  - "curl -L http://git.io/ejPSng | /bin/sh"
+env:
+  - TEST_COMMAND=meteor
diff --git a/packages/meteor-useraccounts-core/Guide.md b/packages/meteor-useraccounts-core/Guide.md
new file mode 100644
index 00000000..c84b3f8b
--- /dev/null
+++ b/packages/meteor-useraccounts-core/Guide.md
@@ -0,0 +1,1433 @@
+User Accounts
+=============
+
+User Accounts is a suite of packages for the [Meteor.js](https://www.meteor.com/) platform. It provides highly customizable user accounts UI templates for many different front-end frameworks. At the moment it includes forms for sign in, sign up, forgot password, reset password, change password, enroll account, and link or remove of many 3rd party services.
+
+<a name="documentation"/>
+# Documentation
+
+* [Features](#features)
+* [Quick Start](#quickstart)
+  * [Available Versions](#available-versions)
+  * [Boilerplates](#boilerplates)
+  * [Setup](#setup)
+  * [Routing](#routing)
+  * [Templates](#templates)
+* [Basic Customization](#basic-customization)
+  * [I18n Support](#i18n)
+  * [Configuration API](#configuration-api)
+    * [Options](#options)
+    * [logout](#logout)
+  * [Internal States](#internal-states)
+  * [Content Protection](#content-protection)
+  * [reCaptcha Setup](#reCaptcha-setup)
+  * [Detect reactively when a form is being processed](#detect-reactively-when-a-form-is-being-processed)
+* [Advanced Customization](#advanced-customization)
+  * [Configuring Texts](#configuring-texts)
+    * [Form Title](#form-title)
+    * [Button Text](#button-text)
+    * [Social Button Icons](#social-button-icons)
+    * [Info Text](#info-text)
+    * [Errors Text](#errors-text)
+  * [Disabling Client-side Accounts Creation](#disabling-client-side-accounts-creation)
+  * [Form Fields Configuration](#form-fields-configuration)
+  * [Extending Templates](#extending-templates)
+    * [Grouping Fields](#grouping-fields)
+  * [CSS Rules](#css-rules)
+* [Wrapping Up for Famo.us](#wrapping-up-for-famo.us)
+* [Side Notes](#side-notes)
+  * [3rd Party Login Services Configuration](#3rd-party-login-services-configuration)
+
+
+<a name="features"/>
+## Features
+
+* fully customizable
+* security aware
+* internationalization support thanks to [accounts-t9n](https://github.com/softwarerero/meteor-accounts-t9n)
+* custom sign-up fields
+* robust server side sign-up field validation
+* easy content protection
+* return to previous route after sign-in (even for random sign in choice and not only after required sign-in)
+* fully reactive, Blaze fast!
+* no use of `Session` object
+* very easily stylizable for different font-end frameworks
+* ...[wrap it up for famo.us](#wrapping-up-for-famo.us) with a simple meteor line!
+
+
+
+<a name="quickstart"/>
+## Quick Start
+
+
+<a name="available-versions"/>
+### Available Versions
+
+* [useraccounts:bootstrap](https://atmospherejs.com/useraccounts/bootstrap) styled for [Twitter Bootstrap](http://getbootstrap.com/)
+* [useraccounts:foundation](https://atmospherejs.com/useraccounts/foundation) styled for [Zurb Foundation](http://foundation.zurb.com/)
+* [useraccounts:ionic](https://atmospherejs.com/useraccounts/ionic) styled for [Ionic](http://ionicframework.com/)
+* [useraccounts:materialize](https://atmospherejs.com/useraccounts/materialize) styled for [Materialize](http://materializecss.com/)
+* [useraccounts:polymer](https://atmospherejs.com/useraccounts/polymer) styled for [Polymer](https://www.polymer-project.org/) (WIP)
+* [useraccounts:ratchet](https://atmospherejs.com/useraccounts/ratchet) styled for [Ratchet](http://goratchet.com/)
+* [useraccounts:semantic-ui](https://atmospherejs.com/useraccounts/semantic-ui) styled for [Semantic UI](http://semantic-ui.com)
+* [useraccounts:unstyled](https://atmospherejs.com/useraccounts/unstyled) with plain html and no CSS rules
+* plus others coming soon...
+
+
+<a name="boilerplates"/>
+### Boilerplates
+
+For a very very quick start you can find some boilerplate examples inside [this repository](https://github.com/meteor-useraccounts/boilerplates).
+
+We'll try to make them richer and richer, while still keeping them as general as possible.
+
+<a name="setup"/>
+### Setup
+
+Just choose one of the packages among the [available styled versions](#available-versions) and install it:
+
+```Shell
+meteor add useraccounts:bootstrap
+meteor add <your preferred bootstrap package>
+```
+
+**Note 1:** no additional packages nor CSS/LESS/SASS files providing styles are included by useraccounts packages. This is to let you choose your preferred way to include them!
+
+**Note 2:** You don't have to add `useraccounts:core` to your app! It is automatically added when you add `useraccounts:<something>`...
+
+Then add at least one login service:
+
+```Shell
+meteor add accounts-password
+meteor add accounts-facebook
+meteor add accounts-google
+...
+```
+
+**Note**: 3rd party services need to be configured... more about this [here](http://docs.meteor.com/#meteor_loginwithexternalservice)
+
+And that's it!
+
+...but don't expect to see much without doing something more ;-)
+This is to let you configure your app exactly the way you wish, without imposing anything beforehand!
+
+
+<a name="routing"/>
+### Routing
+
+If you'd like to easily configure specific routes to deal with accounts management, you might be interested to check out
+[useraccounts:iron-routing](https://github.com/meteor-useraccounts/iron-routing) and [useraccounts:flow-routing](https://github.com/meteor-useraccounts/flow-routing) packages.
+They provide very easy routes set-up via the `AccountsTemplates.configureRoute` method.
+
+
+<a name="templates"/>
+### Templates
+
+There is **only one template** which is used to reactively draw appropriate sign in, sign up, forgot password, reset password, change password, and enroll account forms!
+
+It is `atForm` and can be used anywhere you wish like this:
+
+```html
+{{> atForm}}
+```
+
+Its design is as *transparent* as possible, making it play nicely with themes and your CSS customizations! Also, it is not wrapped inside any *container* so that you can put it anywhere, including complex multi-column layouts.
+
+In case you wish to *lock* the template to a particular state, you can specify that via the `state` parameter:
+
+```html
+{{> atForm state='signUp'}}
+```
+
+This will prevent the template from changing its content. See [internal states](#internal-states) for more details...
+
+
+Well, actually there is many, used inside `atForm`...
+
+...plus one another: `atNavButton` which can be used inside navbars to get a basic sign-in sign-out button which changes text and behaviour based on the user status (to get it working you should set up at least a `signIn` route).
+
+
+<a name="basic-customization"/>
+## Basic Customization
+
+
+<a name="i18n"/>
+### I18n Support
+
+i18n is achieved using [accounts-t9n](https://atmospherejs.com/softwarerero/accounts-t9n). The only thing you have to do is ensure
+
+```javascript
+T9n.setLanguage('<lang>');
+```
+
+is called somewhere, whenever you want to switch language.
+
+
+<a name="configuration-api"/>
+### Configuration API
+
+There are basically two different ways to interact with AccountsTemplates for basic configuration:
+
+* AccountsTemplates.configureRoute(route_code, options);
+* AccountsTemplates.configure(options);
+
+**These functions should be called in top-level code, not inside `Meteor.startup()`.**
+
+There is no specific order for the above calls to be effective, and you can call them more than once, possibly in different files.
+
+**The only other requirement is to make exactly the same calls on both the server and the client.** The best thing is to put everything inside a file shared between both. I suggest you use something like `lib/config/at_config.js`
+
+
+<a name="options"/>
+#### Options
+
+By calling `AccountsTemplates.configure(options)` you can specify a bunch of choices regarding both visual appearance and behavior.
+
+The following is an almost complete example of options configuration (with fields in alphabetical order):
+
+```javascript
+AccountsTemplates.configure({
+    // Behavior
+    confirmPassword: true,
+    enablePasswordChange: true,
+    forbidClientAccountCreation: false,
+    overrideLoginErrors: true,
+    sendVerificationEmail: false,
+    lowercaseUsername: false,
+    focusFirstInput: true,
+
+    // Appearance
+    showAddRemoveServices: false,
+    showForgotPasswordLink: false,
+    showLabels: true,
+    showPlaceholders: true,
+    showResendVerificationEmailLink: false,
+
+    // Client-side Validation
+    continuousValidation: false,
+    negativeFeedback: false,
+    negativeValidation: true,
+    positiveValidation: true,
+    positiveFeedback: true,
+    showValidating: true,
+
+    // Privacy Policy and Terms of Use
+    privacyUrl: 'privacy',
+    termsUrl: 'terms-of-use',
+
+    // Redirects
+    homeRoutePath: '/home',
+    redirectTimeout: 4000,
+
+    // Hooks
+    onLogoutHook: myLogoutFunc,
+    onSubmitHook: mySubmitFunc,
+    preSignUpHook: myPreSubmitFunc,
+    postSignUpHook: myPostSubmitFunc,
+
+    // Texts
+    texts: {
+      button: {
+          signUp: "Register Now!"
+      },
+      socialSignUp: "Register",
+      socialIcons: {
+          "meteor-developer": "fa fa-rocket"
+      },
+      title: {
+          forgotPwd: "Recover Your Password"
+      },
+    },
+});
+```
+
+Details for each of them follow.
+
+| Option                      | Type     | Default   | Description |
+| --------------------------- | -------- | --------- | ----------- |
+| **Behavior**               |          |           |             |
+| confirmPassword             | Boolean  | true      | Specifies whether to ask the password twice for confirmation. This has no effect on the sign in form. |
+| defaultState                | String   | "signIn"  | Specifies the state to be used initially when atForm is rendered. This is not considered when rendering atForm on configured routes. |
+| enablePasswordChange        | Boolean  | false     | Specifies whether to allow to show the form for password change. Note: In case the `changePwd` route is not configured, this is to be done *manually* inside some custom template. |
+| enforceEmailVerification    | Boolean  | false     | When set to true together with sendVerificationEmail, forbids user login unless the email address is verified. **Warning: experimental! Use it only if you have accounts-password as the only service!!!** |
+| focusFirstInput             | Boolean  | !Meteor.isCordova      | When set to true, asks to autofocus the first input of atForm when the template is rendered. Note: have a look at [this issue](https://github.com/meteor-useraccounts/core/issues/594) in case you're getting problems with cordova apps. |
+| forbidClientAccountCreation | Boolean  | false     | Specifies whether to forbid user registration from the client side. In case it is set to true, neither the link for user registration nor the sign up form will be shown. |
+| overrideLoginErrors         | Boolean  | true      | Asks to show a general `Login Forbidden` on a login failure, without specifying whether it was for a wrong email or for a wrong password. |
+| sendVerificationEmail       | Boolean  | false     | Specifies whether to send the verification email after successful registration. |
+| redirectTimeout             | Number   | 2000      | Specifies a timeout time for the redirect after successful form submit on `enrollAccount`, `forgotPwd`, `resetPwd`, and `verifyEmail` routes. |
+| socialLoginStyle            | String   | "popup"   | Specifies the login style for 3rd party services login. Valid values are `popup` or `redirect`. See `loginStyle` option of [Meteor.loginWith<ExternalService>](http://docs.meteor.com/#/full/meteor_loginwithexternalservice) for more information.  |
+| lowercaseUsername           | Boolean  | false     | Possibly asks to transform `username` field for user objects at registration time to be always in lowercase with no spaces. The original `username` value will be added to the `user.profile` field for later use.  |
+| **Appearance**              |          |           |             |
+| hideSignInLink              | Boolean  | false     | When set to true, asks to never show the link to the sign in page  |
+| hideSignUpLink              | Boolean  | false     | When set to true, asks to never show the link to the sign up page  |
+| showAddRemoveServices       | Boolean  | false     | Tells whether to show social account buttons also when the user is signed in. In case it is set to true, the text of buttons will change from 'Sign in With XXX' to 'Add XXX' or 'Remove XXX' when the user signs in. 'Add' will be used if that particular service is still not associated with the current account, while 'Remove' is used only in case a particular service is already used by the user **and** there are at least two services available for sign in operations. Clicks on 'Add XXX' trigger the call to `Meteor.loginWithXXX`, as usual, while click on 'Remove XXX' will call the method `ATRemoveService` provided by AccountsTemplates. This means you need to have some additional logic to deal with the call `Meteor.loginWithXXX` in order to actually add the service to the user account. One solution to this is to use the package [accounts-meld](https://atmospherejs.com/package/accounts-meld) which was build exactly for this purpose. |
+| showForgotPasswordLink      | Boolean  | false     | Specifies whether to display a link to the forgot password page/form |
+| showLabels                  | Boolean  | true      | Specifies whether to display text labels above input elements. |
+| showPlaceholders            | Boolean  | true      | Specifies whether to display place-holder text inside input elements. |
+| showResendVerificationEmailLink      | Boolean  | false     | Specifies whether to display a link to the resend verification email page/form |
+| **Texts**                   |          |           |             |
+| texts                       | Object   |           | Permits to specify texts to be shown on the atForm for each of its states (see [below](#configuring-texts)). |
+| **Client-side Validation**  |          |           |             |
+| continuousValidation        | Boolean  | false     | Specifies whether to continuously validate fields' value while the user is typing. *It is performed client-side only to save round trips with the server*. |
+| negativeValidation          | Boolean  | false     | Specifies whether to highlight input elements in case of negative validation. |
+| positiveValidation          | Boolean  | false     | Specifies whether to highlight input elements in case of positive validation. |
+| negativeFeedback            | Boolean  | false     | Specifies whether to display negative validation feed-back inside input elements. |
+| positiveFeedback            | Boolean  | false     | Specifies whether to display positive validation feed-back inside input elements. |
+| showValidating              | Boolean  | false     | Specifies whether to display a loading icon inside input elements while the validation process is in progress. |
+| **Links**                   |          |           |             |
+| homeRoutePath               | String   | '/'       | Path for the home route, to be possibly used for redirects after successful form submission. |
+| privacyUrl                  | String   | undefined | Path for the route displaying the privacy document. In case it is specified, a link to the page will be displayed at the bottom of the form (when appropriate). |
+| termsUrl                    | String   | undefined | Path for the route displaying the document about terms of use. In case it is specified, a link to the page will be displayed at the bottom of the form (when appropriate). |
+| **Hooks**                   |          |           |             |
+| onLogoutHook                | Function |           | Called on `AccountsTemplates.logout` invocation: allows for custom redirects or whatever custom action to be taken on user logout. |
+| onSubmitHook                | Function |           | `func(error, state)` Called when the `pwdForm` is being submitted: allows for custom actions to be taken on form submission. `error` contains possible errors occurred during the submission process, `state` specifies the `atForm` internal state from which the submission was triggered. A nice use case might be closing the modal or side-menu showing `atForm` |
+| preSignUpHook               | Function |           | `func(password, info)` Called just before submitting the `pwdForm` for sign-up: allows for custom actions on the data being submitted. A nice use could be extending the user profile object accessing `info.profile`.  to be taken on form submission. The plain text `password` is also provided for any reasonable use. |
+| postSignUpHook               | Function |           | `func(userId, info)` Called, **server side only**, just after a successfull user account creation, post submitting the `pwdForm` for sign-up: allows for custom actions on the data being submitted ___after___ we are sure a new user was ___successfully___ created.  A common use might be applying roles to the user, as this is only possible after fully completing user creation in alanning:roles.  The `userId` is available as the first parameter, so that user user object may be retrieved.  The `password` is not available as it's already encrypted, though the encrypted password may be found in `info` if of use. |
+
+##### onSubmitHook
+
+A straightforward configuration about how to detect when a user logs in or registers might look like the following:
+
+```javascript
+var mySubmitFunc = function(error, state){
+  if (!error) {
+    if (state === "signIn") {
+      // Successfully logged in
+      // ...
+    }
+    if (state === "signUp") {
+      // Successfully registered
+      // ...
+    }
+  }
+};
+
+AccountsTemplates.configure({
+    onSubmitHook: mySubmitFunc
+});
+```
+
+<a name="logout"/>
+##### AccountsTemplates.logout()
+
+Should be used in place of `Meteor.logout()`.  This function invokes the `onLogoutHook` specified in the optional configuration.
+Also note that `AccountsTemplates.logout()` is invoked when logging out using the `atNavButton`.
+
+
+```javascript
+//Use in  place of Meteor.logout() in your client code.  Also called automatically by atNavButton when clicking Sign Off
+AccountsTemplates.logout();
+
+```
+
+
+```javascript
+var myPostLogout = function(){
+    //example redirect after logout
+    Router.go('/home');
+};
+
+AccountsTemplates.configure({
+    onLogoutHook: myPostLogout
+});
+```
+
+<a name="internal-states"/>
+### Internal States
+
+The `atForm` template changes reactively based on the current internal state of AccountsTemplates.
+The current internal state can be queried with `AccountsTemplates.getState()` and set with `AccountsTemplates.setState(new_state)`
+
+
+Currently available states are:
+
+| Internal State          | What's shown                                                                          |
+| ----------------------- | ------------------------------------------------------------------------------------- |
+| changePwd               | Change password form asking to set a new password                                     |
+| enrollAccount           | Account Enrollment form asking to set a password                                      |
+| forgotPwd               | Forgot Password form asking for the email address where to send a reset password link |
+| hide                    | None at all...                                                                        |
+| resendVerificationEmail | Login form with an additional button to get another verification email                |
+| resetPwd                | Reset Password form asking to set a password                                          |
+| signIn                  | Login form                                                                            |
+| signUp                  | Registration form                                                                     |
+| verifyEmail             | Only the result about email verification                                              |
+
+
+
+<a name="content-protection"/>
+### Content Protection
+
+
+If you want to secure a specific template, you could add that template like this:
+
+```handlebars
+{{> ensureSignedIn template="myTemplate"}}
+```
+and that will render the default `fullPageAtForm` template from your chosen User Accounts templates package (bootstrap, materialize, etc).  Once signed in, it'll render `myTemplate` instead of the accounts form.
+
+If you want to declare a custom sign in template instead of `fullPageAtForm`, you would do this:
+
+```handlebars
+{{> ensureSignedIn template="myTemplate" auth="myLoginForm"}}
+```
+That custom auth template just needs to include `{{> atForm}}` somewhere in it.  The only reason you'd use this optional feature is if you wanted to modify the layout around the `atForm` template (like
+`fullPageAtForm` does).
+
+
+In case you're using one of the routing packages [useraccounts:iron-routing](https://github.com/meteor-useraccounts/iron-routing)
+or [useraccounts:flow-routing](https://github.com/meteor-useraccounts/flow-routing) refer to their documentation for more possibilities.
+
+
+<a name="reCaptcha-setup"/>
+### reCaptcha Setup
+To set up [reCaptcha](https://www.google.com/recaptcha/intro/index.html), you need to first obtain API keys.
+
+Then, a recommended setup is as follows.
+
+A [Meteor settings file](http://docs.meteor.com/#/full/meteor_settings) with the keys:
+
+```javascript
+{
+    "public": {
+        "reCaptcha": {
+            "siteKey": YOUR SITE KEY
+        }
+    },
+    "reCaptcha": {
+        "secretKey": YOUR SECRET KEY
+    }
+}
+```
+
+and configuration to show the reCaptcha widget:
+
+```javascript
+AccountsTemplates.configure({
+    showReCaptcha: true
+});
+```
+
+The reCaptcha plugin can likewise be set up with the following complete example:
+
+
+```javascript
+AccountsTemplates.configure({
+    reCaptcha: {
+        siteKey: YOUR SITE KEY,
+        theme: "light",
+        data_type: "image"
+    },
+    showReCaptcha: true
+});
+```
+
+And, in a separate file in the `/server` folder:
+
+```javascript
+AccountsTemplates.configure({
+    reCaptcha: {
+        secretKey: YOUR SECRET KEY.
+    },
+});
+```
+
+Each option is described below:
+
+| Option                      | Type     | Default   | Description |
+| --------------------------- | -------- | --------- | ----------- |
+| siteKey                     | String   | none      | The site key needed to create the reCaptcha widget. This can be specified in just the Meteor settings file. |
+| secretKey                   | String   | none      | The secret key needed to verify the reCaptcha response. ***Warning: Only set this in a file in `/server` or in a Meteor settings file. Otherwise, your private key can be read by anyone!*** |
+| theme                       | String   | "light"   | Sets the reCaptcha theme color. The options are "light" and "dark". |
+| data_type                   | String   | "image"   | Sets the verification method. Options are "image" or "audio". |
+| showReCaptcha               | Boolean  | false     | Whether to show the reCaptcha widget on sign in or not. No reCaptcha validation will occur if set to false. |
+
+<a name="detect-reactively-when-a-form-is-being-processed"/>
+### Detect reactively when a form is being processed
+
+`AccountsTemplates.disabled()` returns `true` when a submitted form is being processed and `false` once the submission process has been completed (successfully or not). `AccountsTemplate.disabled()` is reactive and can be used to trigger UI events, such as spinners, "Please wait" messages or to disable input elements, while the form is being processed. The function works irrespectively of form status (signIn, signUp, pwdReset etc.). A typical use-case would be in a template helper:
+
+```html
+<template name="myLogin">
+ {{#if atDisabled}}
+  Please wait...
+ {{/if}}
+ <div class="{{atClass}}">
+  {{> atForm}}
+ </div>
+</template>
+```
+
+```js
+Template.myLogin.helpers({
+ atDisabled: function() {
+  return AccountsTemplates.disabled();
+ },
+ atClass: function() {
+  return AccountsTemplates.disabled() ? 'disabled' : 'active';
+ }
+});
+```
+
+<a name="advanced-customization"/>
+## Advanced Customization
+
+
+<a name="configuring-texts"/>
+### Configuring Texts
+
+In case you wish to change texts on atForm, you can call:
+
+```javascript
+AccountsTemplates.configure({
+    texts: {
+        navSignIn: "signIn",
+        navSignOut: "signOut",
+        optionalField: "optional",
+        pwdLink_pre: "",
+        pwdLink_link: "forgotPassword",
+        pwdLink_suff: "",
+        resendVerificationEmailLink_pre: "Verification email lost?",
+        resendVerificationEmailLink_link: "Send again",
+        resendVerificationEmailLink_suff: "",
+        sep: "OR",
+        signInLink_pre: "ifYouAlreadyHaveAnAccount",
+        signInLink_link: "signin",
+        signInLink_suff: "",
+        signUpLink_pre: "dontHaveAnAccount",
+        signUpLink_link: "signUp",
+        signUpLink_suff: "",
+        socialAdd: "add",
+        socialConfigure: "configure",
+        socialIcons: {
+            "meteor-developer": "fa fa-rocket",
+        },
+        socialRemove: "remove",
+        socialSignIn: "signIn",
+        socialSignUp: "signUp",
+        socialWith: "with",
+        termsPreamble: "clickAgree",
+        termsPrivacy: "privacyPolicy",
+        termsAnd: "and",
+        termsTerms: "terms",
+    }
+});
+```
+
+the above example asks to change some of the available text configurations. You can specify only a subsets of them leaving default values unchanged.
+To learn how to change title, button, social buttons' icon, info, and errors text read below.
+
+
+<a name="form-title"/>
+#### Form Title
+
+In case you wish to change form titles, you can call:
+
+```javascript
+AccountsTemplates.configure({
+    texts: {
+      title: {
+        changePwd: "Password Title",
+        enrollAccount: "Enroll Title",
+        forgotPwd: "Forgot Pwd Title",
+        resetPwd: "Reset Pwd Title",
+        signIn: "Sign In Title",
+        signUp: "Sign Up Title",
+        verifyEmail: "Verify Email Title",
+      }
+    }
+});
+```
+
+the above example asks to change the title for all possible form states, but you can specify only a subset of them leaving default values unchanged.
+
+You can also *hide* a title by setting it to an empty string. For example with:
+
+```
+AccountsTemplates.configure({
+    texts: {
+      title: {
+        signIn: "",
+      }
+    }
+});
+```
+
+no title will be shown on the sign in form.
+
+
+<a name="button-text"/>
+#### Button Text
+
+In case you wish to change the text appearing inside the submission button, you can call:
+
+```javascript
+AccountsTemplates.configure({
+    texts: {
+        button: {
+          changePwd: "Password Text",
+          enrollAccount: "Enroll Text",
+          forgotPwd: "Forgot Pwd Text",
+          resetPwd: "Reset Pwd Text",
+          signIn: "Sign In Text",
+          signUp: "Sign Up Text",
+        }
+    }
+});
+```
+
+the above example asks to change the button text for all possible form states, but you can specify only a subset of them leaving default values unchanged.
+
+<a name="social-button-icons"/>
+#### Social Button Icons
+
+In case you wish to change the icon appearing on the left of social login buttons, you can call:
+
+```javascript
+AccountsTemplates.configure({
+    texts: {
+        socialIcons: {
+          google: "myGoogleIcon",
+          "meteor-developer": "myMeteorIcon",
+        }
+    }
+});
+```
+
+to specify a different icon classes to be used for services. By default the icon class is set to `fa fa-*service*`,
+but for the "meteor-developer" service for which `fa fa-rocket` is used. An exception is made for `useaccounts:semantic-ui`
+which sets them simply to `*service*`, which is the correct way to go.
+
+<a name="info-text"/>
+#### Info Text
+
+In case you wish to change the info text appearing inside the results box, you can call:
+
+```javascript
+AccountsTemplates.configure({
+    texts: {
+        info: {
+            emailSent: "info.emailSent",
+            emailVerified: "info.emailVerified",
+            pwdChanged: "info.passwordChanged",
+            pwdReset: "info.passwordReset",
+            pwdSet: "info.passwordReset",
+            signUpVerifyEmail: "Successful Registration! Please check your email and follow the instructions.",
+            verificationEmailSent: "A new email has been sent to you. If the email doesn't show up in your inbox, be sure to check your spam folder.",
+        }
+    }
+});
+```
+
+The above calls simply set all values as the current default ones.
+
+<a name="input-icons"/>
+#### Input Field Icons
+
+In case you wish to change the icon appearing on the right side of input fields to show their validation status, you can call:
+
+```javascript
+AccountsTemplates.configure({
+    texts: {
+      inputIcons: {
+          isValidating: "fa fa-spinner fa-spin",
+          hasSuccess: "fa fa-check",
+          hasError: "fa fa-times",
+      }
+    }
+});
+```
+
+<a name="errors-text"/>
+#### Errors Text
+
+In case you wish to change the text for errors appearing inside the error box, you can call:
+
+```javascript
+AccountsTemplates.configure({
+    texts: {
+        errors: {
+            accountsCreationDisabled: "Client side accounts creation is disabled!!!",
+            cannotRemoveService: "Cannot remove the only active service!",
+            captchaVerification: "Captcha verification failed!",
+            loginForbidden: "error.accounts.Login forbidden",
+            mustBeLoggedIn: "error.accounts.Must be logged in",
+            pwdMismatch: "error.pwdsDontMatch",
+            validationErrors: "Validation Errors",
+            verifyEmailFirst: "Please verify your email first. Check the email and follow the link!",
+        }
+    }
+});
+```
+
+The above calls simply set all values as the current default ones.
+*Note:* The above list of errors refers to those set directly by AccountsTemplates only!
+Errors which comes from the Accounts packages cannot be overwritten (at least not easily...)
+Please have a look at [Form Fields Configuration](#form-fields-configuration) to learn how to set validation errors on a field basis.
+
+
+<a name="disabling-client-side-accounts-creation"/>
+### Disabling Client-side Accounts Creation
+
+AccountsTemplates disables by default accounts creation on the client. This is done to use a dedicated method called `ATCreateUserServer` **(sending the password on the wire already hashed as usual...)** to create the new users server-side.
+This way a bulletproof profile fields full validation can be performed.
+But there is one more parameter to set in case you'd like to forbid client-side accounts creation, which is the following:
+
+* `forbidClientAccountCreation` - (Boolean, default false) Specifies whether to forbid accounts creation from the client.
+
+it is exactly the same provided by the Accounts object, so this means you need to do:
+
+```javascript
+AccountsTemplates.configure({
+    forbidClientAccountCreation: true
+});
+```
+
+instead of the usual:
+
+```javascript
+Accounts.config({
+  forbidClientAccountCreation : true
+});
+```
+
+
+<a name="form-fields-configuration"/>
+### Form Fields Configuration
+
+Every input field appearing inside AccountsTemplates forms can be easily customized both for appearance and validation behaviour. Additional (custom) fields can be added to the sign up and registration forms, and the properties of built-in fields, like `email` and `password` can be overridden (see [Remove fields](https://github.com/meteor-useraccounts/core/blob/master/Guide.md#remove-fields))
+
+Each field object is represented by the following properties:
+
+| Property             | Type             | Required | Description                                                                                                                                                                                                                            |
+| -------------------- | -----------------|:--------:| -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| _id                  | String           |    X     | A unique field's id/name (internal use only) to be also used as attribute name into `Meteor.user().profile` in case it identifies an additional sign up field. Usually all lowercase letters.                                       |
+| type                 | String           |    X     | Specifies the input element type. At the moment supported inputs are: `password`, `email`, `text`, `tel`, `url`, `checkbox`, `select`, `radio`, `hidden`.                                                                                        |
+| required             | Boolean          |          | When set to true the corresponding field cannot be left blank                                                                                                                                                                          |
+| displayName          | String or Object |          | The field name to be shown as text label above the input element. In case nothing is specified, the capitalized `_id` is used. The text label is shown only if `showLabels` options is set to true.                             |
+| placeholder          | String or Object |          | The placeholder text to be shown inside the input element. In case nothing is specified, the capitalized `_id` will be used. The place-holder is shown only if `showPlaceholders` option is set to true.                    |
+| select               | [Object]         |          | Lets you specify an array of choices to be displayed for select and radio inputs. See example below.                                                                                                                                   |
+| minLength            | Integer          |          | If specified, requires the content of the field to be at least `minLength` characters.                                                                                                                                                  |
+| maxLength            | Integer          |          | If specified, require the content of the field to be at most `maxLength` characters.                                                                                                                                                    |
+| re                   | RegExp           |          | Possibly specifies the regular expression to be used for the field's content validation. Validation is performed both client-side (at every input change if `continuousValidation` option is set to true) and server-side on form submit. |
+| func                 | Function         |          | Custom function to be used for validation.                                                                                                                                                                                             |
+| errStr               | String           |          | Error message to be displayed in case re or func validation fail.                                                                                                                                                                      |
+| trim                 | Boolean          |          | Trim the input value.                                                                                                                                                                                      |
+| lowercase            | Boolean          |          | Convert the input value to lowercase.                                                                                                                                                                      |
+| uppercase            | Boolean          |          | Convert the input value to uppercase.                                                                                                                                                                      |
+| transform            | Function         |          | Custom function to transform the input value.                                                                                                                                                                      |
+| continuousValidation | Boolean          |          | Continuously validate fields' value while the user is typing. *It is performed client-side only to save round trips with the server*. |
+| negativeValidation   | Boolean          |          | Highlight input elements in case of negative validation. |
+| positiveValidation   | Boolean          |          | Highlight input elements in case of positive validation. |
+| negativeFeedback     | Boolean          |          | Display negative validation feedback inside input elements. |
+| positiveFeedback     | Boolean          |          | Display positive validation feedback inside input elements. |
+| showValidating       | Boolean          |          | Display a loading icon inside input elements while the validation process is in progress. |
+| options              | Object           |          | Allows to pass in additional custom options to be possibly used to extend input templates (see [Extending Templates](https://github.com/meteor-useraccounts/core/blob/master/Guide.md#extending-templates))  |
+| template             | String           |          | The name of a custom template to be used in place of the default one. |
+
+
+`displayName`, `placeholder`, and `errStr` can also be an [accounts-t9n](https://atmospherejs.com/softwarerero/accounts-t9n) registered key, in which case it will be translated based on the currently selected language.
+In case you'd like to specify a key which is not already provided by accounts-t9n you can always map your own keys. To learn how to register new labels, please refer to the official [documentation](https://github.com/softwarerero/meteor-accounts-t9n#define-translations).
+
+`continuousValidation`, `negativeFeedback`, `negativeValidation`, `positiveValidation`, `positiveFeedback`, `showValidating` can be used to override global settings (see [Form Fields Configuration](#form-fields-configuration)) on a per field basis.
+
+Furthermore, you can pass an object for `displayName`, `placeholder` to specify different texts for different form states. The matched pattern is:
+
+```javascript
+{
+    default: Match.Optional(String),
+    changePwd: Match.Optional(String),
+    enrollAccount: Match.Optional(String),
+    forgotPwd: Match.Optional(String),
+    resetPwd: Match.Optional(String),
+    signIn: Match.Optional(String),
+    signUp: Match.Optional(String),
+}
+```
+
+which permits to specify a different text for each different state, or a default value to be used for states which are not explicitly provided. For example:
+
+```javascript
+AccountsTemplates.addField({
+    _id: 'password',
+    type: 'password',
+    placeholder: {
+        signUp: "At least six characters"
+    },
+    required: true,
+    minLength: 6,
+    re: /(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{6,}/,
+    errStr: 'At least 1 digit, 1 lowercase and 1 uppercase',
+});
+```
+
+asks AccountsTemplates to display "At least six characters" as the placeholder for the password field when the sign up form is display, and to display "Password" (the capitalized *_id*_) in any other case.
+
+##### Custom validation
+Custom validation can be achieved by providing a regular expression or a function. In case you go for the function solution, this:
+
+```javascript
+AccountsTemplates.addField({
+    _id: 'name',
+    type: 'text',
+    displayName: "Name",
+    func: function(value){return value !== 'Full Name';},
+    errStr: 'Only "Full Name" allowed!',
+});
+```
+
+will require the name input to be exactly "Full Name" (though this might not be that interesting...).
+If instead you do something along the following line:
+
+```javascript
+AccountsTemplates.addField({
+    _id: 'phone',
+    type: 'tel',
+    displayName: "Phone",
+    required: true,
+    func: function (number) {
+        if (Meteor.isServer){
+          if (isValidPhone(number))
+              return false; // meaning no error!
+          return true; // Validation error!
+        }
+    },
+    errStr: 'Invalid Phone number!',
+});
+```
+
+supposing `isValidPhone` is available only server-side, you will be validating the field only server-side, on form submission.
+
+If, differently, you do something like this:
+
+```javascript
+if (Meteor.isServer){
+    Meteor.methods({
+        "userExists": function(username){
+            return !!Meteor.users.findOne({username: username});
+        },
+    });
+}
+
+AccountsTemplates.addField({
+    _id: 'username',
+    type: 'text',
+    required: true,
+    func: function(value){
+        if (Meteor.isClient) {
+            console.log("Validating username...");
+            var self = this;
+            Meteor.call("userExists", value, function(err, userExists){
+                if (!userExists)
+                    self.setSuccess();
+                else
+                    self.setError(userExists);
+                self.setValidating(false);
+            });
+            return;
+        }
+        // Server
+        return Meteor.call("userExists", value);
+    },
+});
+```
+
+you can achieve also client-side and server-side validation calling a server method
+During the waiting time a loading icon will be displayed (if you configure `showValidating` to be true).
+To configure the loading icon see [Input Field Icons](#input-icons).
+
+*Note:* `field.setError(err)`, `field.setSuccess()`, and `field.setValidating()` are methods used to deal with inputs' validation states. A `null` value means non-validated, `false` means correctly validated, no error, and any other value evaluated as true (usually strings specifying the reason for the validation error), are finally interpreted as error and displayed where more appropriate.
+
+#### Checkboxes, Selects, Radios, and Hidden
+
+This is an example about how to add Checkboxes, Selects, and Radios to the sign up fields:
+
+```javascript
+AccountsTemplates.addField({
+    _id: "gender",
+    type: "select",
+    displayName: "Gender",
+    select: [
+        {
+            text: "Male",
+            value: "male",
+        },
+        {
+            text: "Female",
+            value: "female",
+        },
+    ],
+});
+
+AccountsTemplates.addField({
+    _id: "fruit",
+    type: "radio",
+    displayName: "Preferred Fruit",
+    select: [
+        {
+        text: "Apple",
+        value: "aa",
+      }, {
+        text: "Banana",
+        value: "bb",
+      }, {
+        text: "Carrot",
+        value: "cc",
+      },
+    ],
+});
+
+AccountsTemplates.addField({
+    _id: "mailing_list",
+    type: "checkbox",
+    displayName: "Subscribe me to mailing List",
+});
+
+AccountsTemplates.addField({
+    _id: 'reg_code',
+    type: 'hidden'
+});
+```
+
+please note the `select` list which lets you specify the values for the choice.
+The `value` value of corresponding selected `text` will be picked up and added into the `profile` field of the user object.
+
+Hidden inputs might be of help in case you want to consider to link to your registration page from around the web (emails, ads, discount campaigns, etc...) with links like this:
+
+```
+http://my.splendido.site/sign-up?email=giorgio@example.com&reg_code=123
+```
+
+exploiting the ability of AccountsTemplates to pick-up query parameters having the same key as field ids, this would permit to get `reg_code: "123"` under the `profile` field of the user object.
+**Please use this with caution!** ..never ever do something like:
+```
+http://my.splendido.site/sign-up?role=admin
+```
+and then set the role of the new user based on the hidden `role` field. I guess you can appreciate the security hole there ;-)
+
+#### Special Field's Ids
+
+There are a number of special ids used for basic input fields. These are:
+
+* current_password
+* email
+* password
+* password_again
+* username
+* username_and_email
+
+Any other id will be interpreted as an additional sign up field.
+In case a special field is not explicitly added, it will be automatically inserted at initialization time (with appropriate default properties). To customize special fields see [Remove fields](https://github.com/meteor-useraccounts/core/blob/master/Guide.md#remove-fields)
+
+#### Add a field
+
+You can use `AccountsTemplates.addField(options)` to configure an input field. This apply for both special fields and custom ones.
+For example you can do:
+
+```javascript
+AccountsTemplates.addField({
+    _id: 'phone',
+    type: 'tel',
+    displayName: "Landline Number",
+});
+```
+
+The above snippet asks `AccountsTemplates` to draw an additional input element within the sign-up form.
+
+#### Add many fields at once
+
+Another possibility is to add many additional fields at once using `addFields`:
+
+```javascript
+AccountsTemplates.addFields([
+    {
+        _id: 'phone',
+        type: 'tel',
+        displayName: "Landline Number",
+    },
+    {
+        _id: 'fax',
+        type: 'tel',
+        displayName: "Fax Number",
+    }
+]);
+```
+
+#### Remove fields
+
+There is also a `removeField` method which can be used to remove predefined required fields and adding them again specify different options.
+
+```javascript
+AccountsTemplates.removeField('password');
+AccountsTemplates.addField({
+    _id: 'password',
+    type: 'password',
+    required: true,
+    minLength: 6,
+    re: /(?=.*\\d)(?=.*[a-z])(?=.*[A-Z]).{6,}/,
+    errStr: 'At least 1 digit, 1 lower-case and 1 upper-case',
+});
+```
+
+#### Login with Username or Email
+
+In order to let the user register with both a `username` and an `email` address and let him the possibility to log in using one of them, both the `username` and `email` fields must be added.
+This is an example about how to configure such a behaviour:
+
+```javascript
+var pwd = AccountsTemplates.removeField('password');
+AccountsTemplates.removeField('email');
+AccountsTemplates.addFields([
+  {
+      _id: "username",
+      type: "text",
+      displayName: "username",
+      required: true,
+      minLength: 5,
+  },
+  {
+      _id: 'email',
+      type: 'email',
+      required: true,
+      displayName: "email",
+      re: /.+@(.+){2,}\.(.+){2,}/,
+      errStr: 'Invalid email',
+  },
+  pwd
+]);
+```
+
+This will trigger the automatic insertion of the special field `username_and_email` to be used for the sign in form.
+If you wish to further customize the `username_and_email` field you can add it together with the other two:
+
+```javascript
+var pwd = AccountsTemplates.removeField('password');
+AccountsTemplates.removeField('email');
+AccountsTemplates.addFields([
+  {
+      _id: "username",
+      type: "text",
+      displayName: "username",
+      required: true,
+      minLength: 5,
+  },
+  {
+      _id: 'email',
+      type: 'email',
+      required: true,
+      displayName: "email",
+      re: /.+@(.+){2,}\.(.+){2,}/,
+      errStr: 'Invalid email',
+  },
+  {
+      _id: 'username_and_email',
+      type: 'text',
+      required: true,
+      displayName: "Login",
+  },
+  pwd
+]);
+```
+
+
+<a name="extending-templates"/>
+### Extending Templates
+
+With the [aldeed:template-extension](https://github.com/aldeed/meteor-template-extension) package, the built-in templates or sub-templates of any `user-accounts` UI package may be replaced by custom templates. The purpose is to create more sophisticated or specialized layouts or styling.
+
+In case of input fields the option `template` (see [Form Fields Configuration](#form-fields-configuration)) can be directly used without the need to rely on `aldeed:template-extension` package.
+
+Here is a simple example of a template you can use for a field of type 'select':
+
+```html
+<template name="customSelectTemplate">
+  <select id="at-field-{{_id}}" name="at-field-{{_id}}" data-something="{{options.someOption}}">
+    {{#each select}}
+    <option value="{{value}}">{{text}}</option>
+    {{/each}}
+  </select>
+</template>
+```
+
+Custom properties that hold information about the look of the form may be attached to the `options` object of a field. It may then be used to change the output while looping the fields. Adding a divider might look like this:
+
+```javascript
+AccountsTemplates.addField({
+  _id: "address",
+  type: "text",
+
+  // Options object with custom properties for my layout. At the moment, there are
+  // no special properties; it is up the developer to invent them
+  options: {
+    // Put a divider before this field
+    dividerBefore: true
+  }
+});
+```
+
+```html
+<template name="appAtInput">
+  {{#if options.dividerBefore}}<hr>{{/if}}
+
+  {{> Template.dynamic template=templateName}}
+</template>
+```
+
+```javascript
+Template.appAtInput.replaces("atInput");
+```
+
+
+<a name="grouping-fields"/>
+#### Grouping fields
+
+Grouping fields together is a special problem in regard to layout. The issue is creating some container markup *while* iterating over the fields (the templating engine of Meteor doesn't allow outputting an opening tag inside a loop without closing it in the same iteration).
+
+A solution to the problem is demonstrated in [this gist](https://gist.github.com/dalgard/a844f6569d8f471db9a7) (Semantic UI version).
+
+
+<a name="css-rules"/>
+### CSS Rules
+
+The main atForm is build up of several pieces, appearing and disappearing based on configuration options as well as the current internal status.
+Each of these blocks is wrapped inside a `div` with class `at-<something>`: this should made your life easier if you're trying to write your own CSS rules to change templates' appearance.
+
+Social login buttons (`button.at-social-btn`) have an `id` in the form `at-<servicename>` and name `<servicename>`.
+
+Input fields for the password service form are wrapped inside a div with class `at-input`. The same div gets classes `has-error`, `has-success`, and `has-feedback` in case of negative validation result, positive validation and validation with feedback respectively.
+The input element itself has id and name in the form `at-field-<field_id>`.
+**Note:** `has-error`, `has-success`, and `has-feedback` names might change from framework to framework. These are valid for the *unstyled* and *bootstrap* versions...
+
+
+Below is a html snapshot of an over-complete `atForm` taken from the unstyled version in which you can find all elements possibly shown under different configurations and circumstances.
+
+```html
+<div class="at-form">
+  <!-- Title -->
+  <div class="at-title">
+    <h3>Create an Account</h3>
+  </div>
+  <!-- Social Buttons for Oauth Sign In / Sign Up-->
+  <div class="at-oauth">
+    <button class="at-social-btn" id="at-facebook" name="facebook">
+      <i class="fa fa-facebook"></i> Sign in with Facebook
+    </button>
+    <button class="at-social-btn" id="at-twitter" name="twitter">
+      <i class="fa fa-twitter"></i> Sign in with Twitter
+    </button>
+  </div>
+  <!-- Services Separator -->
+  <div class="at-sep">
+    <strong>OR</strong>
+  </div>
+  <!-- Global Error -->
+  <div class="at-error">
+      <p>Login forbidden</p>
+  </div>
+  <!-- Global Resutl -->
+  <div class="at-result">
+      <p>Email Sent!</p>
+  </div>
+  <!-- Password Service -->
+  <div class="at-pwd-form">
+    <form role="form" id="at-pwd-form" novalidate="">
+      <!-- Input -->
+      <div class="at-input">
+        <label for="at-field-username">
+          Username
+        </label>
+        <input type="text" id="at-field-username" name="at-field-username" placeholder="Username" autocapitalize="none" autocorrect="off">
+      </div>
+      <!-- Input with Validation Error -->
+      <div class="at-input has-error">
+        <label for="at-field-email">
+          Email
+        </label>
+        <input type="email" id="at-field-email" name="at-field-email" placeholder="Email" autocapitalize="none" autocorrect="off">
+        <span>Invalid email</span>
+      </div>
+      <!-- Input with Successful Validation -->
+      <div class="at-input has-success">
+        <label for="at-field-password">
+          Password
+        </label>
+        <input type="password" id="at-field-password" name="at-field-password" placeholder="Password" autocapitalize="none" autocorrect="off">
+      </div>
+      <!-- Forgot Password Link -->
+      <div class="at-pwd-link">
+        <p>
+          <a href="/forgot-password" id="at-forgotPwd" class="at-link at-pwd">Forgot your password?</a>
+        </p>
+      </div>
+      <!-- Form Submit Button -->
+      <button type="submit" class="at-btn submit disabled" id="at-btn">
+        Register
+      </button>
+    </form>
+  </div>
+  <!-- Link to Sign In -->
+  <div class="at-signin-link">
+    <p>
+      If you already have an account
+      <a href="/sign-in" id="at-signIn" class="at-link at-signin">sign in</a>
+    </p>
+  </div>
+  <!-- Link to Sign Up -->
+  <div class="at-signup-link">
+    <p>
+      Don't have an account?
+      <a href="/sign-up" id="at-signUp" class="at-link at-signup">Register</a>
+    </p>
+  </div>
+  <!-- Link to Privacy Policy and Terms of use -->
+  <div class="at-terms-link">
+    <p>
+      By clicking Register, you agree to our
+        <a href="/privacyPolicy">Privacy Policy</a>
+        and
+        <a href="/termsOfUse">Terms of Use</a>
+    </p>
+  </div>
+</div>
+```
+
+
+
+<a name="wrapping-up-for-famo.us"/>
+## Wrapping Up for Famo.us
+
+By simply typing
+
+```shell
+meteor add useraccounts:famous-wrapper
+```
+
+you'll be able to turn your preferred flavour of accounts templates into a package ready to be used within a [famous-views](https://atmospherejs.com/gadicohen/famous-views) + [Famo.us](http://famo.us) application.
+
+This means you can get an animated version of the `atForm` template without any effort! :-)
+
+To learn how to make animations you might want to check the following links:
+
+* http://famous-views.meteor.com
+* http://famous-views.meteor.com/examples/animate
+* http://famo.us/university/lessons/#/famous-101/animating/1
+* http://famo.us/guides/layout
+* http://famo.us/guides/animations
+* http://famo.us/docs/modifiers/StateModifier
+* http://famo.us/docs/transitions/Transitionable
+
+### configureAnimations
+
+...well, actually it might be that you don't like the default animations so you might consider to use `AccountsTemplates.configureAnimations` (provided by the wrapper...) to specify your custom animation functions.
+This is an example showing how to do it:
+
+```javascript
+var Transform;
+var Easing;
+if (Meteor.isClient){
+    FView.ready(function(require) {
+        Transform = famous.core.Transform;
+        Easing = famous.transitions.Easing;
+    });
+}
+
+var slideLeftDestroy = function(fview){
+    fview.modifier.setTransform(
+        Transform.translate(-$(window).width(),0),
+        { duration : 250, curve: Easing.easeOutSine },
+        function() { fview.destroy();}
+    );
+};
+
+
+AccountsTemplates.configureAnimations({
+    destroy: {
+        atSignupLink: slideLeftDestroy,
+    }
+});
+```
+
+this asks AT to use `slideLeftDestroy` to animate the template `atSignupLink` when it is to be destroyed.
+
+As you've just seen `configureAnimations` take an `options` object as parameter:
+
+```javascript
+AccountsTemplates.configureAnimations(options);
+```
+
+this options object can have three different keys at the first level:
+
+```javascript
+var options = {
+    render: {
+      // more stuff here...
+    },
+    destroy: {
+      // more stuff here...
+    },
+    state_change: {
+      // more stuff here...
+    },
+    animQueueDelay: 100,
+    animQueueStartDelay: 200,
+    setStateDelay: 300,
+
+};
+AccountsTemplates.configureAnimations(options);
+```
+
+they are `render`, `destroy`, `state_change`, `animQueueDelay`, `animQueueStartDelay`, and `setStateDelay`.
+The first three, what a surprise, they let you specify what to do when one of the templates building up the `atForm` is rendered, destroyed or when the form's state changes (respectively).
+
+...at the second level you can specify which animation has to be applied to which template:
+
+```javascript
+var options = {
+    render: {
+        default: animA,
+        atTitle: animB,
+        atSocial: animC,
+        atSep: animC,
+        atError: animB,
+        atResult: animB,
+        atPwdForm: null,
+        atSigninLink: null,
+        atSignupLink: animB,
+        atTermsLink: animD,
+    },
+    // ...
+};
+```
+
+the above one is the full list of available animated templates...
+The value you specify can be `null` (to remove a default animation...) or a function.
+If you specify a function it should be like the following:
+
+```javascript
+var animFunc = function(fview){
+    fview.modifier.setTransform(
+        Transform.<some_transform>( ... ),
+        { duration : <millisecs>, curve: Easing.<some_curve> }
+    );
+};
+```
+
+the `fview` parameter actually let you access the famous view associated with the template (so feel free to do whatever you wish with it...).
+
+**Warning:** when you specify an animation to be used on `destroy` you must take care of the actual destroy!
+...usually it is enough to call `fview.destroy()` when the animation completes:
+
+```javascript
+var animFunc = function(fview){
+    fview.modifier.setTransform(
+        Transform.<some_transform>( ... ),
+        { duration : <millisecs>, curve: Easing.<some_curve> },
+        function(){ fview.destroy();}
+    );
+};
+```
+
+**Warning2:** At the moment the animation for the state change is supposed to last for double the `setStateDelay` duration, and the state change is actually postponed by `setStateDelay` milliseconds. This let you divide your animation in two different part (so, e.g., you can hide things and show them again with the new content...).
+The following is the default animations used on state change:
+
+```javascript
+vFlip = function(fview){
+    fview.modifier.setTransform(
+        Transform.rotate(Math.PI-0.05,0,0),
+        {
+            duration : AccountsTemplates.animations.setStateDelay,
+            curve: "easeIn",
+        },
+        function() {
+            fview.modifier.setTransform(
+                Transform.rotate(-0.1,0,0),
+                {
+                    duration : AccountsTemplates.animations.setStateDelay,
+                    curve: "easeOut",
+                }
+            );
+        }
+    );
+};
+```
+
+and as you can see schedules two different animations, one after the another, lasting `setStateDelay` ms each.
+
+
+### pushToAnimationQueue
+
+In case you're interested in sequence animation, AT also provides an experimental animation cue you can use to schedule your animation with a bit of delay between them.
+To use it simply wrap the `modifier.setTransform` within an `AccountsTemplates.pushToAnimationQueue` call, like this:
+
+```jacascript
+var fallFromTop = function(fview){
+    fview.modifier.setTransform(Transform.translate(0, -$(window).height()));
+    AccountsTemplates.pushToAnimationQueue(function() {
+        fview.modifier.setTransform(
+            Transform.translate(0,0),
+            { duration : 450, curve: Easing.easeOutSine }
+        );
+    });
+};
+```
+
+the full signature for it is:
+
+```javascript
+AccountsTemplates.pushToAnimationQueue(func, at_begin);
+```
+
+and if pass `true` for `at_begin`, the function will be pushed to the begin of the cue rather than at the end.
+
+The first animation is started after `animQueueStartDelay` milliseconds from the first insertion and a delay of `animQueueStartDelay` milliseconds is applied between start of animations (you can configure these two values with `configureAnimations` function as listed above...).
+
+And that's it!
+Enjoy ;-)
+
+
+<a name="side-notes"/>
+## Side Notes
+
+
+<a name="3rd-party-login-services-configuration"/>
+### 3rd Party Login Services Configuration
+
+Normally, if you have not configured a social account with, e.g.,
+
+```javascript
+// Set up login services
+Meteor.startup(function() {
+    // Add Facebook configuration entry
+    ServiceConfiguration.configurations.update(
+      { "service": "facebook" },
+      {
+        $set: {
+          "appId": "XXXXXXXXXXXXXXX",
+          "secret": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
+        }
+      },
+      { upsert: true }
+    );
+
+    // Add GitHub configuration entry
+    ServiceConfiguration.configurations.update(
+      { "service": "github" },
+      {
+        $set: {
+          "clientId": "XXXXXXXXXXXXXXXXXXXX",
+          "secret": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
+        }
+      },
+      { upsert: true }
+    );
+});
+```
+
+3rd party login buttons are not shown. To allow display buttons with, e.g., 'Configure Foobook', simply add the packages `service-configuration` and `accounts-ui` with:
+
+```Shell
+meteor add service-configuration
+meteor add accounts-ui
+```
+
+**Warning**: At the moment the UI for service configuration is not supported and the one provided by `accounts-ui` will be shown!
diff --git a/packages/meteor-useraccounts-core/History.md b/packages/meteor-useraccounts-core/History.md
new file mode 100644
index 00000000..61bcfaf9
--- /dev/null
+++ b/packages/meteor-useraccounts-core/History.md
@@ -0,0 +1,353 @@
+## Master
+
+## v1.14.2
+
+* [flow-routing] fixed dependency on kadira:flow-router: now using the last non-Meteor@1.3 one
+
+## v1.14.1
+
+* fixed automatic update of weak dependencies on routing packages when publishing new versions
+
+## v1.14.0
+
+* [bulma] *new* `useraccounts:bulma` package to get UI templates styled for [Bulma](http://bulma.io/) (thanks to @dominikmayer)
+* [flow-routing] better error management (merged https://github.com/meteor-useraccounts/flow-routing/pull/23 thanks @stubailo)
+* [flow-routing] added support for FlowRouter 3 (merged https://github.com/meteor-useraccounts/flow-routing/pull/26 thanks @timothyarmes)
+* [foundation-sites] *new* `useraccounts:foundation-sites` package to get UI templates styled for [Foundation for Sites 6](http://foundation.zurb.com/sites.html) (thanks to @venetianthief)
+* [materialize] Added row around recaptcha (thanks @qwIvan)
+* some minor fixed to the Guide
+
+## v1.13.1
+
+* added language support to recaptcha (fixed https://github.com/meteor-useraccounts/core/issues/561 tnx @canesin)
+* fixed validation trigger for select inputs (see discussion within https://github.com/meteor-useraccounts/core/issues/569 tnx @cunneen)
+* change default value for `focusFirstInput` to get it disabled when running on Cordova (see https://github.com/meteor-useraccounts/core/issues/594 tnx @derwaldgeist)
+* fixed regression about reCaptcha reset due to https://github.com/meteor-useraccounts/core/pull/565 (merged https://github.com/meteor-useraccounts/core/pull/597 tnx @jebh)
+
+## v1.13.0
+
+* [mdl] *new* `useraccounts:mdl` package to get UI templates styled for [Material Design Lite](http://www.getmdl.io/) (kudos to @kctang and @liquidautumn, thank you guys!).
+* [flow-routing] added support for React-based layouts (merged https://github.com/meteor-useraccounts/flow-routing/pull/20 tnx @timothyarmes).
+* [materialize] fixed offset problem for fullPageAtForm on medium screens.
+* [materialize] fixed some margins (see https://github.com/meteor-useraccounts/materialize/issues/19).
+* [iron-routing] fixed a problem with route paths (merged https://github.com/meteor-useraccounts/iron-routing/pull/8 tnx @trave7er).
+* [core] updated dependency to softwarerero:accounts-t9n@1.1.7
+* [core] fixed a bug with reCaptcha (merged https://github.com/meteor-useraccounts/core/pull/565 tnx @scsirdx).
+* [core] added missing dependency on JQuery (merged https://github.com/meteor-useraccounts/core/pull/574 tnx @stubailo).
+* [core] added postSignUpHook hook to let people modify newly created user objects (merged https://github.com/meteor-useraccounts/core/pull/586 tnx @shwaydogg)
+* added [Meteor Icon](http://www.getmdl.io/) badges to all packages' README file.
+
+## v1.12.4
+
+* fixed input element classes for `useraccounts:materialize` (see https://github.com/meteor-useraccounts/materialize/pull/18)
+* fixed query parameters look-up for `useraccounts:iron-routing`
+* updated `useraccounts:polymer` to use Polimer 1.0 (see updated [boilerplate](https://github.com/meteor-useraccounts/boilerplates/tree/master/polymer) with some instructions for Meteor 1.2)
+* updates and fixes for `useraccounts:flow-rounting` (see https://github.com/meteor-useraccounts/flow-routing/issues/12)
+* improoved css for `useraccounts:semantic-ui`
+* disallowed use of `signUp` state in case `forbidClientAccountCreation` is set (see #547)
+* updated dependency on softwarerero:accounts-t9n to version 1.1.4
+* a bit of linting here and there...
+* a few typos correction and improvements to the [Guide](https://github.com/meteor-useraccounts/core/blob/master/Guide.md)
+
+## v1.12.3
+
+* fixed radio buttons for useraccounts:materialize (see https://github.com/meteor-useraccounts/core/issues/421)
+* fixed query parameters pick up for useraccounts:iron-routing (see meteor-useraccounts/core#367)
+* corrected few typos within the docs and removed unnecessary debug log
+
+## v1.12.2
+
+* various fixes and a bit of clean up for `useraccounts:flow-routing`
+
+
+## v1.12.1
+
+* fixed inifinite redirect loop for `ensuredSignedIn` within `useraccounts:flow-routing` (see https://github.com/meteor-useraccounts/flow-routing/issues/2)
+
+
+## v1.12.0
+
+* removed routing support from core: refer to [useraccounts:iron-routing](https://github.com/meteor-useraccounts/iron-routing) and [useraccounts:flow-routing](https://github.com/meteor-useraccounts/flow-routing) packages to get some ;-)
+* added template level content protection (see new [Content Protection](https://github.com/meteor-useraccounts/core/blob/master/Guide.md#content-protection) section)
+* updated `useraccounts:semantic-ui` to SUI v2.0 (thanks @lumatijev)
+* `displayName` configuration option for form fields now accepts also functions
+* added the `focusFirstInput` configuration option
+* fixed many typos and added/removed some sections in the Guide
+
+
+## v1.11.1
+
+* fixes for #410, #411, and #413
+* Added a section about available internal states to the Guide (see [Internal States](https://github.com/meteor-useraccounts/core/blob/master/Guide.md#internal-states)
+
+
+## v1.11.0
+
+* change `profile.username` to `profile.name` when using `lowercaseUsername` options (WARNING! this is a bit of a breaking change, see #388)
+* removed possibly annoying warning (see #398)
+* added a `preSignUpHook` to be possibly used to enrich the user profile just before new user registration (see #400)
+* route configuration now accepts additional parameters to be passed to IR (see #409)
+* some improvements to the docs
+
+## v1.10.0
+
+* more customizable texts (see 7d166b74f111e05b22ef2c7d93908441e242350d)
+* added autofocus for the first input field of `atPwdForm`.
+* fixed some texts configuration capability (see #380)
+* various corrections/improvements to the docs
+* allowed for `field.setError` to take in Boolean values (see #361)
+* fixed bug with `Must be logged in` error message shown after sign out (see #321)
+
+## v1.9.1
+
+* aligned `useraccounts:unstyled` with the latest PRs
+
+## v1.9.0
+
+* resend verification email (see #349, thanks @dalgard)
+* allow for a neutral message text to be displayed (see #314 and #317, thanks @dalgard)
+* more configurable error texts (see [Errors Text](https://github.com/meteor-useraccounts/core/blob/master/Guide.md#errors-text), plus #301 #342)
+* fixed little redirect bug (see #315)
+* added title configuration for `verifyEmail` state plus letting titles to be hidden by
+  setting the corresponding text to an empy string (see [Form Title](https://github.com/meteor-useraccounts/core/blob/master/Guide.md#form-title))
+
+## v1.8.1
+
+* made (a fake) `ensureSignedIn` plugin available also on server side code (fixed #291)
+
+## v1.8.0
+
+* added `lowercaseUsername` configuration option (see [Configuration API Options](https://github.com/meteor-useraccounts/core/blob/master/Guide.md#options))
+* added `ensureSignedIn` plugin for Iron Router (see [Content Protection](https://github.com/meteor-useraccounts/core/blob/master/Guide.md#content-protection))
+* fixed `ensureSignedIn` regression (see #286)
+
+## v1.7.1
+
+* fixed routing regression (see #284)
+* removed useless logs
+
+## v1.7.0
+
+* `useraccounts:materialize` to the suite! (Many thanks to @Kestanous!!!)
+* fixed glitch within `ensureSignedIn` (see #278)
+* added experimental support for [reChaptcha](https://www.google.com/recaptcha/intro/index.html) (see #268 and [reCaptcha Setup](https://github.com/meteor-useraccounts/core/blob/master/Guide.md#recaptcha-setup), great work @theplatapi!)
+* new `template` option for deeper input fields customization (see #273 and [Form Fields Configuration](https://github.com/meteor-useraccounts/core/blob/master/Guide.md#form-fields-configuration))
+* prevent access to `atChangePwd` for users not being logged in (see #207)
+* use `Meteor.userID()` in place of `Meteor.user()` where possible to reduce reactive re-computations
+* fixed bug with timed out redirects  (see #263)
+* fixed reactivity bug within `ensureSignedIn` (see #262)
+* removed warning about MAIL_URL not being configured (see #267, #210)
+* better `atNavButton` behaviour (see #265 tnx @adrianmc)
+
+## v1.6.1
+
+* updated deps for iron:router and softwarerero:accounts-t9n to latest versions
+
+## v1.6.0
+
+* moved the documentation to a separate file: [Guide](https://github.com/meteor-useraccounts/core/blob/master/Guide.md)
+* fixed bug about calling `sibmitHook` (see #249 #252 tnx @dalgard)
+* new `options` for field configuration (see #250 and [Extending Templates](https://github.com/meteor-useraccounts/core/blob/master/Guide.md#extending-templates) tnx @dalgard)
+* a bit of cleanup for docs (see #251 tnx @dalgard)
+* capitalazed default value for display name and placeholder (see #247)
+* switch to official `Accounts._hasPassword` (see [this](https://github.com/meteor/meteor/pull/2271) and [this](https://github.com/meteor/meteor/pull/3410), tnx @glasser)
+* more sites using useraccounts: congrats to @nate-strauser and @msamoylov on their launches! (see [the list](https://github.com/meteor-useraccounts/core#whos-using-this))
+* new landing page for the whole project and new live examples (still to be further improoved...) :) (see [useraccounts.meteor.com](https://useraccounts.meteor.com))
+* added `transform` among the options for [field configuration](https://github.com/meteor-useraccounts/core/blob/master/Guide.md#form-fields-configuration)
+* better behaviour for input value tranform/fix
+* terms and agreements now showed also on enrollment form (see #253)
+* link to singIn now shown also on forgot password form in case `forbidClientAccountCreation` is set to true (partial solution to #229)
+* moved terms and agreements link right after the submit button (see #239)
+
+## v1.5.0
+
+* added `useraccounts:polymer` to the suite! (WIP, Thanks @kevohagan!!!)
+* fixed a bug with atVerifyEmail route (see #241 and #173)
+* little docs improovements
+
+## v1.4.1
+
+* updated dependency to softwarerero:accounts-t9n@1.0.5 to include Turkish language
+* fixed `{{> atForm state='<state>'}}` which was no more working with Meteor@1.0.2 (see #217)
+* fixed some text configuration (see #209, thanks @bumbleblym)
+* fixed some typos into the docs (see #208, thanks @bumbleblym)
+
+## v1.4.0
+
+* added `useraccounts:ionic` to the suite! (Thanks @nickw!!!)
+* updated `useraccounts:semantic-ui` to SemanticUI@1.0.0 (Thanks @lumatijev!!!)
+* added `onLogoutHook` to be able to run code (custom redirects?) on `AccountsTemplates.logout` (see #191)
+* added `onSubmitHook` among configuration parameters to be able to run code on form submission (might be useful for modals! see #201 and #180)
+* submission button get now disabled also during fields (asynchronous) validation
+* `enforceEmailVerification` now works also with username login (fixed #196)
+* better IE compatibility (see #199)
+* better input field validation flows to recover from previous errors (see #177)
+* updated dependency to softwarerero:accounts-t9n@1.0.4
+* new [Contributing section](https://github.com/meteor-useraccounts/core#contributing) among docs
+* a few improvements and typo fixes for README.md
+
+## v1.3.2 / 2014/11/25
+
+* more robust logout pattern when dealing with routes protected with ensureSigndIn
+
+## v1.3.1 / 2014/11/25
+
+* updated dependency to iron:router@1.0.3
+* fixed bug in linkClick (see #170)
+* fixed bug in configureRoute
+
+## v1.3.0 / 2014/11/23
+
+* added support for [Ratchet](http://goratchet.com/): see [useraccounts:ratchet](https://atmospherejs.com/useraccounts/ratchet). Note: form validation is currently not supported by Ratchet!
+* fixed bug in custom validation flow
+* better default validation for `email` field (see #156)
+* few corrections inside docs
+* added `ensuredSignedIn` among configurable routes so that different `template` and `layoutTemplate` can be specified (fix for #160 and #98)
+* added `socialLoginStyle` among the configuration options to select the login flow (`popup` or `redirect`) for 3rd party login services (see #163)
+* fixed bug about fields ordering
+
+## v1.2.3 / 2014/11/13
+
+* put back in a `init` method dispalying a warning to preserve backward compatibility...
+
+## v1.2.2 / 2014/11/12
+
+* fixed bad redirect for cheange password route (see #154)
+
+## v1.2.1 / 2014/11/12
+
+* fixed regression due reactivity problems after fix for #139
+
+## v1.2.0 / 2014/11/12
+
+* **breaking change:** removed the need to call `Accounts.init()`
+* added support for fields' validating state to display a 'loading' icon
+* added support for fields' icon configuration
+* added support for social buttons' icon configuration (see [this](https://github.com/meteor-useraccounts/core#social-button-icons) new section)
+* added support for `meteor-developer` oauth service (see #147)
+* fixed (special) fields ordering, see #144
+* fixed ensureSignedIn (see #152)
+* removed `new_password` and `new_password_again` special fields, simply use `password` and `password_again` from now on!
+* better redirect behaviour when a logged in user lands on a sign-in/sign-up page: usual redirect is now performed. (see #139)
+* better field validation patterns...
+* updated dependency to irou:router@1.0.1
+* updated dependency to softwarerero:accounts-t9n@1.0.2
+* corrected many errors and typos inside the Documentation
+
+## v1.1.1
+## v1.1.0
+
+* fixed  `atNavButton` for useraccounts:unstyled
+* fixed variour names and links in README files
+
+## v1.1.0
+
+* new template `atNavButton`
+* added methos `AccountsTemplates.logout()` which redirects back to `homeRoutePath` when configured
+* support for hidden fields
+* url query parameters loaded into input fields -> useful mostly for hidden fields ;-)
+* granted full control over field ordering (except for special fields...). see #135
+* fixes for #130, #132
+
+## v1.0.1
+
+* fixed link to git repositories inside package.js files
+
+## v1.0.0
+
+* new names: no more splendido:accounts-templates:<somethig> but useraccounts:<somethig> !
+* updated iron:router to v1.0.0
+
+## v0.11.0
+
+* added support for checkbox, select, and radio inputs
+* added defaultState as referred in #125
+* fixes for #127
+
+## v0.10.0
+
+* better texts configuration API (as for #117)
+* prevPath fix
+
+
+## v0.9.16
+
+* updated iron:router to v0.9.4
+
+## v0.9.15
+
+* fixed #110
+
+## v0.9.14
+
+* fixed some redirection problems connected with `ensureSignedIn`
+
+## v0.9.13
+
+* experimental implementation for forbidding access with unverified email (see #108) through configuration flag `enforceEmailVerification`
+* added options to hide links: hideSignInLink, hideSignUpLink
+* fixed #107
+
+## v0.9.12
+
+* fixed #109
+
+## v0.9.11
+
+* better submit button disabling when no negative feedback is used
+* fixed #105
+
+## v0.9.10
+
+* added `defaultLayout` to configuration options
+* new callback parameter to `setState`
+* better rendering behaviour on `ensureSignedIn`
+
+## v0.9.9
+
+* Fixed links for `reset-password`, `enroll-account`, and `verify-email`
+
+## v0.9.8
+
+* fixed checks for login services (see #93)
+* minor updates to docs
+
+## v0.9.7
+
+* fixed #92, to permit the use of, e.g., `{{> atForm state="changePwd"}}` ( see [docs](https://github.com/splendido/accounts-templates-core#templates))
+
+## v0.9.6
+
+* fixed #91, pwdForm submission on signin page has no effect unless both password and usename/email are not empty
+
+## v0.9.5
+
+* show title on sign in also with other services
+* moved sign in link below pwd form
+* removed sign in link from forgot-pwd page (sign up link is still there!)
+* added class at-btn to submit button
+* added class at-signin to sign in link
+* added class at-signup to sign up link
+* added class at-pwd to forgot password link
+* accounts-t9n dependency updated to @1.0.0
+
+## v0.9.4
+
+
+## Older versions (to be written)
+
+* Fixes for #19, #24, #25, #26
+* layoutTemplate option
+* Better signup flow, with proper server side validation!
+* Fixes for #15, and #16
+* Do not show validation errors during sign in
+* Do not show sign up link when account creation is disabled
+* Better use of UnderscoreJS
+* Corrected documentation for showAddRemoveServices
+
+## v0.0.9
+
+* added configuration parameter [`showAddRemoveServices`](https://github.com/splendido/accounts-templates-core#appearance)
+* Fix ensureSignedIn for drawing correct template
+
+## v0.0.8
diff --git a/packages/meteor-useraccounts-core/LICENSE.md b/packages/meteor-useraccounts-core/LICENSE.md
new file mode 100644
index 00000000..aba77efb
--- /dev/null
+++ b/packages/meteor-useraccounts-core/LICENSE.md
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 [@splendido](https://github.com/splendido)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/packages/meteor-useraccounts-core/README.md b/packages/meteor-useraccounts-core/README.md
new file mode 100644
index 00000000..cc8d0bf8
--- /dev/null
+++ b/packages/meteor-useraccounts-core/README.md
@@ -0,0 +1,104 @@
+[![Meteor Icon](http://icon.meteor.com/package/useraccounts:core)](https://atmospherejs.com/useraccounts/core)
+[![Build Status](https://travis-ci.org/meteor-useraccounts/core.svg?branch=master)](https://travis-ci.org/meteor-useraccounts/core)
+
+# User Accounts
+
+User Accounts is a suite of packages for the [Meteor.js](https://www.meteor.com/) platform. It provides highly customizable user accounts UI templates for many different front-end frameworks. At the moment it includes forms for sign in, sign up, forgot password, reset password, change password, enroll account, and link or remove of many 3rd party services.
+
+## Some Details
+
+The package `useraccounts:core` contains all the core logic and templates' helpers and events used by dependant packages providing styled versions of the accounts UI.
+This means that developing a version of the UI with a different styling is just a matter of writing a few dozen of html lines, nothing more!
+
+Thanks to [accounts-t9n](https://github.com/softwarerero/meteor-accounts-t9n) you can switch to your preferred language on the fly! Available languages are now: Arabic, Czech, French, German, Italian, Polish, Portuguese, Russian, Slovenian, Spanish, Swedish, Turkish and Vietnamese.
+
+For basic routing and content protection, `useraccounts:core` integrates with either [flow-router](https://github.com/meteor-useraccounts/flow-routing) or [iron-router](https://atmospherejs.com/package/iron-router).
+
+Any comments, suggestions, testing efforts, and PRs are very very welcome! Please use the [repository](https://github.com/meteor-useraccounts/ui) issues tracker for reporting bugs, problems, ideas, discussions, etc..
+
+## The UserAccounts Guide
+Detailed explanations of features and configuration options can be found in the <a href="https://github.com/meteor-useraccounts/core/blob/master/Guide.md" target="_blank">Guide</a>.
+
+## Who's using this?
+
+* [Abesea](https://abesea.com/)
+* [backspace.academy](http://backspace.academy/)
+* [bootstrappers.io](http://www.bootstrappers.io/)
+* [crater.io](http://crater.io/)
+* [Dechiper Chinese](http://app.decipherchinese.com/)
+* [Henfood](http://labs.henesis.eu/henfood)
+* [meteorgigs.io](https://www.meteorgigs.io/)
+* [Orion](http://orionjs.org/)
+* [Telescope](http://www.telesc.pe/)
+* [We Work Meteor](http://www.weworkmeteor.com/)
+
+
+Aren't you on the list?!
+If you have a production app using accounts templates, let me know! I'd like to add your link to the above ones.
+
+## Contributing
+Contributors are very welcome. There are many things you can help with,
+including finding and fixing bugs and creating examples for the brand new [wiki](https://github.com/meteor-useraccounts/wiki).
+We're also working on `useraccounts@2.0` (see the [Milestone](https://github.com/meteor-useraccounts/core/milestones)) so you can also help
+with an improved design or adding features.
+
+Some guidelines below:
+
+* **Questions**: Please create a new issue and label it as a `question`.
+
+* **New Features**: If you'd like to work on a feature,
+  start by creating a 'Feature Design: Title' issue. This will let people bat it
+  around a bit before you send a full blown pull request. Also, you can create
+  an issue to discuss a design even if you won't be working on it.
+
+* **Bugs**: If you think you found a bug, please create a "reproduction." This is a small project that demonstrates the problem as concisely as possible. If you think the bug can be reproduced with only a few steps a description by words might be enough though. The project should be cloneable from Github. Any bug reports without a reproduction that don't have an obvious solution will be marked as "awaiting-reproduction" and closed after a bit of time.
+
+###  Working Locally
+This is useful if you're contributing code to useraccounts or just trying to modify something to suit your own specific needs.
+
+##### Scenario A
+
+1. Set up a local packages folder
+2. Add the PACKAGE_DIRS environment variable to your .bashrc file
+  - Example: `export PACKAGE_DIRS="/full/path/topackages/folder"`
+  - Screencast: https://www.eventedmind.com/posts/meteor-versioning-and-packages
+3. Clone the repository into your local packages directory
+4. Add the package just like any other meteor core package like this: `meteor
+   add useraccounts:unstyled`
+
+```bash
+> cd /full/path/topackages/folder
+> git clone https://github.com/meteor-useraccounts/semantic-ui.git
+> cd your/project/path
+> meteor add useraccounts:semantic-ui
+> meteor
+```
+
+##### Scenario B
+
+Like Scenario A, but skipping point 2.
+Add the official package as usual with `meteor add useraccounts:semantic-ui` but then run your project like this:
+
+```bash
+> PACKAGE_DIRS="/full/path/topackages/folder" meteor
+```
+
+##### Scenario C
+
+```bash
+> cd your/project/path
+> mkdir packages && cd packages
+> git clone https://github.com/meteor-useraccounts/semantic-ui.git
+> cd ..
+> meteor add useraccounts:semantic-ui
+> meteor
+```
+
+
+## Thanks
+
+Anyone is welcome to contribute. Fork, make your changes, and then submit a pull request.
+
+Thanks to [all those who have contributed code changes](https://github.com/meteor-useraccounts/ui/graphs/contributors) and all who have helped by submitting bug reports and feature ideas.
+
+[![Support via Gittip](https://rawgithub.com/twolfson/gittip-badge/0.2.0/dist/gittip.png)](https://www.gittip.com/splendido/)
diff --git a/packages/meteor-useraccounts-core/lib/client.js b/packages/meteor-useraccounts-core/lib/client.js
new file mode 100644
index 00000000..31c9db74
--- /dev/null
+++ b/packages/meteor-useraccounts-core/lib/client.js
@@ -0,0 +1,464 @@
+/* global
+  AT: false
+*/
+"use strict";
+
+// Allowed Internal (client-side) States
+AT.prototype.STATES = [
+  "changePwd", // Change Password
+  "enrollAccount", // Account Enrollment
+  "forgotPwd", // Forgot Password
+  "hide", // Nothing displayed
+  "resetPwd", // Reset Password
+  "signIn", // Sign In
+  "signUp", // Sign Up
+  "verifyEmail", // Email verification
+  "resendVerificationEmail", // Resend verification email
+];
+
+AT.prototype._loginType = "";
+
+// Flag telling whether the whole form should appear disabled
+AT.prototype._disabled = false;
+
+// State validation
+AT.prototype._isValidState = function(value) {
+  return _.contains(this.STATES, value);
+};
+
+// Flags used to avoid clearing errors and redirecting to previous route when
+// signing in/up as a results of a call to ensureSignedIn
+AT.prototype.avoidRedirect = false;
+AT.prototype.avoidClearError = false;
+
+// Token to be provided for routes like reset-password and enroll-account
+AT.prototype.paramToken = null;
+
+AT.prototype.loginType = function () {
+  return this._loginType;
+};
+
+AT.prototype.getparamToken = function() {
+  return this.paramToken;
+};
+
+// Getter for current state
+AT.prototype.getState = function() {
+  return this.state.form.get("state");
+};
+
+// Getter for disabled state
+AT.prototype.disabled = function() {
+  return this.state.form.equals("disabled", true) ? "disabled" : undefined;
+};
+
+// Setter for disabled state
+AT.prototype.setDisabled = function(value) {
+  check(value, Boolean);
+  return this.state.form.set("disabled", value);
+};
+
+// Setter for current state
+AT.prototype.setState = function(state, callback) {
+  check(state, String);
+
+  if (!this._isValidState(state) || (this.options.forbidClientAccountCreation && state === 'signUp')) {
+    throw new Meteor.Error(500, "Internal server error", "accounts-templates-core package got an invalid state value!");
+  }
+
+  this.state.form.set("state", state);
+  if (!this.avoidClearError) {
+    this.clearState();
+  }
+  this.avoidClearError = false;
+
+  if (_.isFunction(callback)) {
+    callback();
+  }
+};
+
+AT.prototype.clearState = function() {
+  _.each(this._fields, function(field) {
+    field.clearStatus();
+  });
+
+  var form = this.state.form;
+
+  form.set("error", null);
+  form.set("result", null);
+  form.set("message", null);
+
+  AccountsTemplates.setDisabled(false);
+};
+
+AT.prototype.clearError = function() {
+  this.state.form.set("error", null);
+};
+
+AT.prototype.clearResult = function() {
+  this.state.form.set("result", null);
+};
+
+AT.prototype.clearMessage = function() {
+  this.state.form.set("message", null);
+};
+
+// Initialization
+AT.prototype.init = function() {
+  console.warn("[AccountsTemplates] There is no more need to call AccountsTemplates.init()! Simply remove the call ;-)");
+};
+
+AT.prototype._init = function() {
+  if (this._initialized) {
+    return;
+  }
+
+  var usernamePresent = this.hasField("username");
+  var emailPresent = this.hasField("email");
+
+  if (usernamePresent && emailPresent) {
+    this._loginType = "username_and_email";
+  } else {
+    this._loginType = usernamePresent ? "username" : "email";
+  }
+
+  if (this._loginType === "username_and_email") {
+    // Possibly adds the field username_and_email in case
+    // it was not configured
+    if (!this.hasField("username_and_email")) {
+      this.addField({
+        _id: "username_and_email",
+        type: "text",
+        displayName: "usernameOrEmail",
+        placeholder: "usernameOrEmail",
+        required: true,
+      });
+    }
+  }
+
+  // Only in case password confirmation is required
+  if (this.options.confirmPassword) {
+    // Possibly adds the field password_again in case
+    // it was not configured
+    if (!this.hasField("password_again")) {
+      var pwdAgain = _.clone(this.getField("password"));
+
+      pwdAgain._id = "password_again";
+      pwdAgain.displayName = {
+        "default": "passwordAgain",
+        changePwd: "newPasswordAgain",
+        resetPwd: "newPasswordAgain",
+      };
+      pwdAgain.placeholder = {
+        "default": "passwordAgain",
+        changePwd: "newPasswordAgain",
+        resetPwd: "newPasswordAgain",
+      };
+      this.addField(pwdAgain);
+    }
+  } else {
+    if (this.hasField("password_again")) {
+      throw new Error("AccountsTemplates: a field password_again was added but confirmPassword is set to false!");
+    }
+  }
+
+  // Possibly adds the field current_password in case
+  // it was not configured
+  if (this.options.enablePasswordChange) {
+    if (!this.hasField("current_password")) {
+      this.addField({
+        _id: "current_password",
+        type: "password",
+        displayName: "currentPassword",
+        placeholder: "currentPassword",
+        required: true,
+      });
+    }
+  }
+
+  // Ensuser the right order of special fields
+  var moveFieldAfter = function(fieldName, referenceFieldName) {
+    var fieldIds = AccountsTemplates.getFieldIds();
+    var refFieldId = _.indexOf(fieldIds, referenceFieldName);
+    // In case the reference field is not present, just return...
+    if (refFieldId === -1) {
+      return;
+    }
+
+    var fieldId = _.indexOf(fieldIds, fieldName);
+    // In case the sought field is not present, just return...
+    if (fieldId === -1) {
+      return;
+    }
+
+    if (fieldId !== -1 && fieldId !== (refFieldId + 1)) {
+      // removes the field
+      var field = AccountsTemplates._fields.splice(fieldId, 1)[0];
+      // push the field right after the reference field position
+      var newFieldIds = AccountsTemplates.getFieldIds();
+      var newReferenceFieldId = _.indexOf(newFieldIds, referenceFieldName);
+      AccountsTemplates._fields.splice(newReferenceFieldId + 1, 0, field);
+    }
+  };
+
+  // Ensuser the right order of special fields
+  var moveFieldBefore = function(fieldName, referenceFieldName) {
+    var fieldIds = AccountsTemplates.getFieldIds();
+    var refFieldId = _.indexOf(fieldIds, referenceFieldName);
+    // In case the reference field is not present, just return...
+    if (refFieldId === -1) {
+      return;
+    }
+
+    var fieldId = _.indexOf(fieldIds, fieldName);
+    // In case the sought field is not present, just return...
+    if (fieldId === -1) {
+      return;
+    }
+
+    if (fieldId !== -1 && fieldId !== (refFieldId - 1)) {
+      // removes the field
+      var field = AccountsTemplates._fields.splice(fieldId, 1)[0];
+      // push the field right after the reference field position
+      var newFieldIds = AccountsTemplates.getFieldIds();
+      var newReferenceFieldId = _.indexOf(newFieldIds, referenceFieldName);
+      AccountsTemplates._fields.splice(newReferenceFieldId, 0, field);
+    }
+  };
+
+  // The final order should be something like:
+  // - username
+  // - email
+  // - username_and_email
+  // - password
+  // - password_again
+  //
+  // ...so lets do it in reverse order...
+  moveFieldAfter("username_and_email", "username");
+  moveFieldAfter("username_and_email", "email");
+  moveFieldBefore("current_password", "password");
+  moveFieldAfter("password", "current_password");
+  moveFieldAfter("password_again", "password");
+
+
+  // Sets visibility condition and validation flags for each field
+  var gPositiveValidation = !!AccountsTemplates.options.positiveValidation;
+  var gNegativeValidation = !!AccountsTemplates.options.negativeValidation;
+  var gShowValidating = !!AccountsTemplates.options.showValidating;
+  var gContinuousValidation = !!AccountsTemplates.options.continuousValidation;
+  var gNegativeFeedback = !!AccountsTemplates.options.negativeFeedback;
+  var gPositiveFeedback = !!AccountsTemplates.options.positiveFeedback;
+
+  _.each(this._fields, function(field) {
+    // Visibility
+    switch(field._id) {
+      case "current_password":
+        field.visible = ["changePwd"];
+        break;
+      case "email":
+        field.visible = ["forgotPwd", "signUp", "resendVerificationEmail"];
+        if (AccountsTemplates.loginType() === "email") {
+          field.visible.push("signIn");
+        }
+        break;
+      case "password":
+        field.visible = ["changePwd", "enrollAccount", "resetPwd", "signIn", "signUp"];
+        break;
+      case "password_again":
+        field.visible = ["changePwd", "enrollAccount", "resetPwd", "signUp"];
+        break;
+      case "username":
+        field.visible = ["signUp"];
+        if (AccountsTemplates.loginType() === "username") {
+          field.visible.push("signIn");
+        }
+        break;
+      case "username_and_email":
+        field.visible = [];
+        if (AccountsTemplates.loginType() === "username_and_email") {
+          field.visible.push("signIn");
+        }
+        break;
+      default:
+        field.visible = ["signUp"];
+    }
+
+      // Validation
+      var positiveValidation = field.positiveValidation;
+      if (_.isUndefined(positiveValidation)) {
+        field.positiveValidation = gPositiveValidation;
+      }
+
+      var negativeValidation = field.negativeValidation;
+      if (_.isUndefined(negativeValidation)) {
+        field.negativeValidation = gNegativeValidation;
+      }
+
+      field.validation = field.positiveValidation || field.negativeValidation;
+      if (_.isUndefined(field.continuousValidation)) {
+        field.continuousValidation = gContinuousValidation;
+      }
+
+      field.continuousValidation = field.validation && field.continuousValidation;
+      if (_.isUndefined(field.negativeFeedback)) {
+        field.negativeFeedback = gNegativeFeedback;
+      }
+
+      if (_.isUndefined(field.positiveFeedback)) {
+        field.positiveFeedback = gPositiveFeedback;
+      }
+
+      field.feedback = field.negativeFeedback || field.positiveFeedback;
+      // Validating icon
+      var showValidating = field.showValidating;
+      if (_.isUndefined(showValidating)) {
+        field.showValidating = gShowValidating;
+      }
+
+      // Custom Template
+      if (field.template) {
+        if (field.template in Template) {
+          Template[field.template].helpers(AccountsTemplates.atInputHelpers);
+        } else {
+          console.warn(
+            "[UserAccounts] Warning no template " + field.template + " found!"
+          );
+        }
+      }
+  });
+
+  // Initializes reactive states
+  var form = new ReactiveDict();
+
+  form.set("disabled", false);
+  form.set("state", "signIn");
+  form.set("result", null);
+  form.set("error", null);
+  form.set("message", null);
+  this.state = {
+    form: form,
+  };
+
+  // Possibly subscribes to extended user data (to get the list of registered services...)
+  if (this.options.showAddRemoveServices) {
+      Meteor.subscribe("userRegisteredServices");
+  }
+
+  //Check that reCaptcha site keys are available and no secret keys visible
+  if (this.options.showReCaptcha) {
+    var atSiteKey = null;
+    var atSecretKey = null;
+    var settingsSiteKey = null;
+    var settingsSecretKey = null;
+
+    if (AccountsTemplates.options.reCaptcha) {
+      atSiteKey = AccountsTemplates.options.reCaptcha.siteKey;
+      atSecretKey = AccountsTemplates.options.reCaptcha.secretKey;
+    }
+
+    if (Meteor.settings && Meteor.settings.public && Meteor.settings.public.reCaptcha) {
+      settingsSiteKey = Meteor.settings.public.reCaptcha.siteKey;
+      settingsSecretKey = Meteor.settings.public.reCaptcha.secretKey;
+    }
+
+    if (atSecretKey || settingsSecretKey) {
+      //erase the secret key
+      if (atSecretKey) {
+          AccountsTemplates.options.reCaptcha.secretKey = null;
+      }
+
+      if (settingsSecretKey) {
+          Meteor.settings.public.reCaptcha.secretKey = null;
+      }
+
+      var loc = atSecretKey ? "User Accounts configuration!" : "Meteor settings!";
+      throw new Meteor.Error(401, "User Accounts: DANGER - reCaptcha private key leaked to client from " + loc
+      + " Provide the key in server settings ONLY.");
+    }
+
+    if (!atSiteKey && !settingsSiteKey) {
+      throw new Meteor.Error(401, "User Accounts: reCaptcha site key not found! Please provide it or set showReCaptcha to false.");
+    }
+  }
+
+  // Marks AccountsTemplates as initialized
+  this._initialized = true;
+};
+
+AT.prototype.linkClick = function(route) {
+  if (AccountsTemplates.disabled()) {
+    return;
+  }
+
+  AccountsTemplates.setState(route);
+
+  if (AccountsTemplates.options.focusFirstInput) {
+    var firstVisibleInput = _.find(this.getFields(), function(f) {
+      return _.contains(f.visible, route);
+    });
+
+    if (firstVisibleInput) {
+      $("input#at-field-" + firstVisibleInput._id).focus();
+    }
+  }
+};
+
+AT.prototype.logout = function() {
+  var onLogoutHook = AccountsTemplates.options.onLogoutHook;
+
+  Meteor.logout(function() {
+    if (onLogoutHook) {
+      onLogoutHook();
+    }
+  });
+};
+
+AT.prototype.submitCallback = function(error, state, onSuccess) {
+  var onSubmitHook = AccountsTemplates.options.onSubmitHook;
+
+  if (onSubmitHook) {
+    onSubmitHook(error, state);
+  }
+
+  if (error) {
+    if (_.isObject(error.details)) {
+      // If error.details is an object, we may try to set fields errors from it
+      _.each(error.details, function(error, fieldId) {
+          AccountsTemplates.getField(fieldId).setError(error);
+      });
+    } else {
+      var err = "error.accounts.Unknown error";
+
+      if (error.reason) {
+        err = error.reason;
+      }
+
+      if (err.substring(0, 15) !== "error.accounts.") {
+        err = "error.accounts." + err;
+      }
+
+      AccountsTemplates.state.form.set("error", [err]);
+    }
+
+    AccountsTemplates.setDisabled(false);
+    // Possibly resets reCaptcha form
+    if (state === "signUp" && AccountsTemplates.options.showReCaptcha) {
+      grecaptcha.reset();
+    }
+  } else {
+    if (onSuccess) {
+      onSuccess();
+    }
+
+    if (state) {
+      AccountsTemplates.setDisabled(false);
+    }
+  }
+};
+
+AccountsTemplates = new AT();
+
+// Initialization
+Meteor.startup(function() {
+  AccountsTemplates._init();
+});
diff --git a/packages/meteor-useraccounts-core/lib/core.js b/packages/meteor-useraccounts-core/lib/core.js
new file mode 100644
index 00000000..1c7bc07a
--- /dev/null
+++ b/packages/meteor-useraccounts-core/lib/core.js
@@ -0,0 +1,593 @@
+// ---------------------------------------------------------------------------------
+// Patterns for methods" parameters
+// ---------------------------------------------------------------------------------
+
+STATE_PAT = {
+  changePwd: Match.Optional(String),
+  enrollAccount: Match.Optional(String),
+  forgotPwd: Match.Optional(String),
+  resetPwd: Match.Optional(String),
+  signIn: Match.Optional(String),
+  signUp: Match.Optional(String),
+  verifyEmail: Match.Optional(String),
+  resendVerificationEmail: Match.Optional(String),
+};
+
+ERRORS_PAT = {
+  accountsCreationDisabled: Match.Optional(String),
+  cannotRemoveService: Match.Optional(String),
+  captchaVerification: Match.Optional(String),
+  loginForbidden: Match.Optional(String),
+  mustBeLoggedIn: Match.Optional(String),
+  pwdMismatch: Match.Optional(String),
+  validationErrors: Match.Optional(String),
+  verifyEmailFirst: Match.Optional(String),
+};
+
+INFO_PAT = {
+  emailSent: Match.Optional(String),
+  emailVerified: Match.Optional(String),
+  pwdChanged: Match.Optional(String),
+  pwdReset: Match.Optional(String),
+  pwdSet: Match.Optional(String),
+  signUpVerifyEmail: Match.Optional(String),
+  verificationEmailSent: Match.Optional(String),
+};
+
+INPUT_ICONS_PAT = {
+  hasError: Match.Optional(String),
+  hasSuccess: Match.Optional(String),
+  isValidating: Match.Optional(String),
+};
+
+ObjWithStringValues = Match.Where(function (x) {
+  check(x, Object);
+  _.each(_.values(x), function(value) {
+      check(value, String);
+  });
+  return true;
+});
+
+TEXTS_PAT = {
+  button: Match.Optional(STATE_PAT),
+  errors: Match.Optional(ERRORS_PAT),
+  info: Match.Optional(INFO_PAT),
+  inputIcons: Match.Optional(INPUT_ICONS_PAT),
+  maxAllowedLength: Match.Optional(String),
+  minRequiredLength: Match.Optional(String),
+  navSignIn: Match.Optional(String),
+  navSignOut: Match.Optional(String),
+  optionalField: Match.Optional(String),
+  pwdLink_link: Match.Optional(String),
+  pwdLink_pre: Match.Optional(String),
+  pwdLink_suff: Match.Optional(String),
+  requiredField: Match.Optional(String),
+  resendVerificationEmailLink_pre: Match.Optional(String),
+  resendVerificationEmailLink_link: Match.Optional(String),
+  resendVerificationEmailLink_suff: Match.Optional(String),
+  sep: Match.Optional(String),
+  signInLink_link: Match.Optional(String),
+  signInLink_pre: Match.Optional(String),
+  signInLink_suff: Match.Optional(String),
+  signUpLink_link: Match.Optional(String),
+  signUpLink_pre: Match.Optional(String),
+  signUpLink_suff: Match.Optional(String),
+  socialAdd: Match.Optional(String),
+  socialConfigure: Match.Optional(String),
+  socialIcons: Match.Optional(ObjWithStringValues),
+  socialRemove: Match.Optional(String),
+  socialSignIn: Match.Optional(String),
+  socialSignUp: Match.Optional(String),
+  socialWith: Match.Optional(String),
+  termsAnd: Match.Optional(String),
+  termsPreamble: Match.Optional(String),
+  termsPrivacy: Match.Optional(String),
+  termsTerms: Match.Optional(String),
+  title: Match.Optional(STATE_PAT),
+};
+
+// Configuration pattern to be checked with check
+CONFIG_PAT = {
+  // Behaviour
+  confirmPassword: Match.Optional(Boolean),
+  defaultState: Match.Optional(String),
+  enablePasswordChange: Match.Optional(Boolean),
+  enforceEmailVerification: Match.Optional(Boolean),
+  focusFirstInput: Match.Optional(Boolean),
+  forbidClientAccountCreation: Match.Optional(Boolean),
+  lowercaseUsername: Match.Optional(Boolean),
+  overrideLoginErrors: Match.Optional(Boolean),
+  sendVerificationEmail: Match.Optional(Boolean),
+  socialLoginStyle: Match.Optional(Match.OneOf("popup", "redirect")),
+
+  // Appearance
+  defaultLayout: Match.Optional(String),
+  hideSignInLink: Match.Optional(Boolean),
+  hideSignUpLink: Match.Optional(Boolean),
+  showAddRemoveServices: Match.Optional(Boolean),
+  showForgotPasswordLink: Match.Optional(Boolean),
+  showResendVerificationEmailLink: Match.Optional(Boolean),
+  showLabels: Match.Optional(Boolean),
+  showPlaceholders: Match.Optional(Boolean),
+
+  // Client-side Validation
+  continuousValidation: Match.Optional(Boolean),
+  negativeFeedback: Match.Optional(Boolean),
+  negativeValidation: Match.Optional(Boolean),
+  positiveFeedback: Match.Optional(Boolean),
+  positiveValidation: Match.Optional(Boolean),
+  showValidating: Match.Optional(Boolean),
+
+  // Privacy Policy and Terms of Use
+  privacyUrl: Match.Optional(String),
+  termsUrl: Match.Optional(String),
+
+  // Redirects
+  homeRoutePath: Match.Optional(String),
+  redirectTimeout: Match.Optional(Number),
+
+  // Hooks
+  onLogoutHook: Match.Optional(Function),
+  onSubmitHook: Match.Optional(Function),
+  preSignUpHook: Match.Optional(Function),
+  postSignUpHook: Match.Optional(Function),
+
+  texts: Match.Optional(TEXTS_PAT),
+
+  //reCaptcha config
+  reCaptcha: Match.Optional({
+    data_type: Match.Optional(Match.OneOf("audio", "image")),
+    secretKey: Match.Optional(String),
+    siteKey: Match.Optional(String),
+    theme: Match.Optional(Match.OneOf("dark", "light")),
+  }),
+
+  showReCaptcha: Match.Optional(Boolean),
+};
+
+
+FIELD_SUB_PAT = {
+  "default": Match.Optional(String),
+  changePwd: Match.Optional(String),
+  enrollAccount: Match.Optional(String),
+  forgotPwd: Match.Optional(String),
+  resetPwd: Match.Optional(String),
+  signIn: Match.Optional(String),
+  signUp: Match.Optional(String),
+};
+
+
+// Field pattern
+FIELD_PAT = {
+  _id: String,
+  type: String,
+  required: Match.Optional(Boolean),
+  displayName: Match.Optional(Match.OneOf(String, Match.Where(_.isFunction), FIELD_SUB_PAT)),
+  placeholder: Match.Optional(Match.OneOf(String, FIELD_SUB_PAT)),
+  select: Match.Optional([{text: String, value: Match.Any}]),
+  minLength: Match.Optional(Match.Integer),
+  maxLength: Match.Optional(Match.Integer),
+  re: Match.Optional(RegExp),
+  func: Match.Optional(Match.Where(_.isFunction)),
+  errStr: Match.Optional(String),
+
+  // Client-side Validation
+  continuousValidation: Match.Optional(Boolean),
+  negativeFeedback: Match.Optional(Boolean),
+  negativeValidation: Match.Optional(Boolean),
+  positiveValidation: Match.Optional(Boolean),
+  positiveFeedback: Match.Optional(Boolean),
+
+  // Transforms
+  trim: Match.Optional(Boolean),
+  lowercase: Match.Optional(Boolean),
+  uppercase: Match.Optional(Boolean),
+  transform: Match.Optional(Match.Where(_.isFunction)),
+
+  // Custom options
+  options: Match.Optional(Object),
+  template: Match.Optional(String),
+};
+
+// -----------------------------------------------------------------------------
+// AccountsTemplates object
+// -----------------------------------------------------------------------------
+
+// -------------------
+// Client/Server stuff
+// -------------------
+
+// Constructor
+AT = function() {
+
+};
+
+AT.prototype.CONFIG_PAT = CONFIG_PAT;
+
+/*
+  Each field object is represented by the following properties:
+    _id:         String   (required)  // A unique field"s id / name
+    type:        String   (required)  // Displayed input type
+    required:    Boolean  (optional)  // Specifies Whether to fail or not when field is left empty
+    displayName: String   (optional)  // The field"s name to be displayed as a label above the input element
+    placeholder: String   (optional)  // The placeholder text to be displayed inside the input element
+    minLength:   Integer  (optional)  // Possibly specifies the minimum allowed length
+    maxLength:   Integer  (optional)  // Possibly specifies the maximum allowed length
+    re:          RegExp   (optional)  // Regular expression for validation
+    func:        Function (optional)  // Custom function for validation
+    errStr:      String   (optional)  // Error message to be displayed in case re validation fails
+*/
+
+
+// Allowed input types
+AT.prototype.INPUT_TYPES = [
+  "checkbox",
+  "email",
+  "hidden",
+  "password",
+  "radio",
+  "select",
+  "tel",
+  "text",
+  "url",
+];
+
+// Current configuration values
+AT.prototype.options = {
+  // Appearance
+  //defaultLayout: undefined,
+  showAddRemoveServices: false,
+  showForgotPasswordLink: false,
+  showResendVerificationEmailLink: false,
+  showLabels: true,
+  showPlaceholders: true,
+
+  // Behaviour
+  confirmPassword: true,
+  defaultState: "signIn",
+  enablePasswordChange: false,
+  focusFirstInput: !Meteor.isCordova,
+  forbidClientAccountCreation: false,
+  lowercaseUsername: false,
+  overrideLoginErrors: true,
+  sendVerificationEmail: false,
+  socialLoginStyle: "popup",
+
+  // Client-side Validation
+  //continuousValidation: false,
+  //negativeFeedback: false,
+  //negativeValidation: false,
+  //positiveValidation: false,
+  //positiveFeedback: false,
+  //showValidating: false,
+
+  // Privacy Policy and Terms of Use
+  privacyUrl: undefined,
+  termsUrl: undefined,
+
+  // Hooks
+  onSubmitHook: undefined,
+};
+
+AT.prototype.texts = {
+  button: {
+    changePwd: "updateYourPassword",
+    //enrollAccount: "createAccount",
+    enrollAccount: "signUp",
+    forgotPwd: "emailResetLink",
+    resetPwd: "setPassword",
+    signIn: "signIn",
+    signUp: "signUp",
+    resendVerificationEmail: "Send email again",
+  },
+  errors: {
+    accountsCreationDisabled: "Client side accounts creation is disabled!!!",
+    cannotRemoveService: "Cannot remove the only active service!",
+    captchaVerification: "Captcha verification failed!",
+    loginForbidden: "error.accounts.Login forbidden",
+    mustBeLoggedIn: "error.accounts.Must be logged in",
+    pwdMismatch: "error.pwdsDontMatch",
+    validationErrors: "Validation Errors",
+    verifyEmailFirst: "Please verify your email first. Check the email and follow the link!",
+  },
+  navSignIn: 'signIn',
+  navSignOut: 'signOut',
+  info: {
+    emailSent: "info.emailSent",
+    emailVerified: "info.emailVerified",
+    pwdChanged: "info.passwordChanged",
+    pwdReset: "info.passwordReset",
+    pwdSet: "Password Set",
+    signUpVerifyEmail: "Successful Registration! Please check your email and follow the instructions.",
+    verificationEmailSent: "A new email has been sent to you. If the email doesn't show up in your inbox, be sure to check your spam folder.",
+  },
+  inputIcons: {
+    isValidating: "fa fa-spinner fa-spin",
+    hasSuccess: "fa fa-check",
+    hasError: "fa fa-times",
+  },
+  maxAllowedLength: "Maximum allowed length",
+  minRequiredLength: "Minimum required length",
+  optionalField: "optional",
+  pwdLink_pre: "",
+  pwdLink_link: "forgotPassword",
+  pwdLink_suff: "",
+  requiredField: "Required Field",
+  resendVerificationEmailLink_pre: "Verification email lost?",
+  resendVerificationEmailLink_link: "Send again",
+  resendVerificationEmailLink_suff: "",
+  sep: "OR",
+  signInLink_pre: "ifYouAlreadyHaveAnAccount",
+  signInLink_link: "signin",
+  signInLink_suff: "",
+  signUpLink_pre: "dontHaveAnAccount",
+  signUpLink_link: "signUp",
+  signUpLink_suff: "",
+  socialAdd: "add",
+  socialConfigure: "configure",
+  socialIcons: {
+      "meteor-developer": "fa fa-rocket"
+  },
+  socialRemove: "remove",
+  socialSignIn: "signIn",
+  socialSignUp: "signUp",
+  socialWith: "with",
+  termsPreamble: "clickAgree",
+  termsPrivacy: "privacyPolicy",
+  termsAnd: "and",
+  termsTerms: "terms",
+  title: {
+    changePwd: "changePassword",
+    enrollAccount: "createAccount",
+    forgotPwd: "resetYourPassword",
+    resetPwd: "resetYourPassword",
+    signIn: "signIn",
+    signUp: "createAccount",
+    verifyEmail: "",
+    resendVerificationEmail: "Send the verification email again",
+  },
+};
+
+AT.prototype.SPECIAL_FIELDS = [
+  "password_again",
+  "username_and_email",
+];
+
+// SignIn / SignUp fields
+AT.prototype._fields = [
+  new Field({
+    _id: "email",
+    type: "email",
+    required: true,
+    lowercase: true,
+    trim: true,
+    func: function(email) {
+        return !_.contains(email, '@');
+    },
+    errStr: 'Invalid email',
+  }),
+  new Field({
+    _id: "password",
+    type: "password",
+    required: true,
+    minLength: 6,
+    displayName: {
+        "default": "password",
+        changePwd: "newPassword",
+        resetPwd: "newPassword",
+    },
+    placeholder: {
+        "default": "password",
+        changePwd: "newPassword",
+        resetPwd: "newPassword",
+    },
+  }),
+];
+
+
+AT.prototype._initialized = false;
+
+// Input type validation
+AT.prototype._isValidInputType = function(value) {
+    return _.indexOf(this.INPUT_TYPES, value) !== -1;
+};
+
+AT.prototype.addField = function(field) {
+    // Fields can be added only before initialization
+    if (this._initialized) {
+      throw new Error("AccountsTemplates.addField should strictly be called before AccountsTemplates.init!");
+    }
+
+    field = _.pick(field, _.keys(FIELD_PAT));
+    check(field, FIELD_PAT);
+    // Checks there"s currently no field called field._id
+    if (_.indexOf(_.pluck(this._fields, "_id"), field._id) !== -1) {
+      throw new Error("A field called " + field._id + " already exists!");
+    }
+    // Validates field.type
+    if (!this._isValidInputType(field.type)) {
+      throw new Error("field.type is not valid!");
+    }
+    // Checks field.minLength is strictly positive
+    if (typeof field.minLength !== "undefined" && field.minLength <= 0) {
+      throw new Error("field.minLength should be greater than zero!");
+    }
+    // Checks field.maxLength is strictly positive
+    if (typeof field.maxLength !== "undefined" && field.maxLength <= 0) {
+      throw new Error("field.maxLength should be greater than zero!");
+    }
+    // Checks field.maxLength is greater than field.minLength
+    if (typeof field.minLength !== "undefined" && typeof field.minLength !== "undefined" && field.maxLength < field.minLength) {
+      throw new Error("field.maxLength should be greater than field.maxLength!");
+    }
+
+    if (!(Meteor.isServer && _.contains(this.SPECIAL_FIELDS, field._id))) {
+      this._fields.push(new Field(field));
+    }
+
+    return this._fields;
+};
+
+AT.prototype.addFields = function(fields) {
+  var ok;
+
+  try { // don"t bother with `typeof` - just access `length` and `catch`
+    ok = fields.length > 0 && "0" in Object(fields);
+  } catch (e) {
+    throw new Error("field argument should be an array of valid field objects!");
+  }
+  if (ok) {
+    _.map(fields, function(field) {
+      this.addField(field);
+    }, this);
+  } else {
+    throw new Error("field argument should be an array of valid field objects!");
+  }
+
+  return this._fields;
+};
+
+AT.prototype.configure = function(config) {
+  // Configuration options can be set only before initialization
+  if (this._initialized) {
+    throw new Error("Configuration options must be set before AccountsTemplates.init!");
+  }
+
+  // Updates the current configuration
+  check(config, CONFIG_PAT);
+  var options = _.omit(config, "texts", "reCaptcha");
+  this.options = _.defaults(options, this.options);
+
+  // Possibly sets up reCaptcha options
+  var reCaptcha = config.reCaptcha;
+  if (reCaptcha) {
+    // Updates the current button object
+    this.options.reCaptcha = _.defaults(reCaptcha, this.options.reCaptcha || {});
+  }
+
+  // Possibly sets up texts...
+  if (config.texts) {
+    var texts = config.texts;
+    var simpleTexts = _.omit(texts, "button", "errors", "info", "inputIcons", "socialIcons", "title");
+
+    this.texts = _.defaults(simpleTexts, this.texts);
+
+    if (texts.button) {
+      // Updates the current button object
+      this.texts.button = _.defaults(texts.button, this.texts.button);
+    }
+
+    if (texts.errors) {
+      // Updates the current errors object
+      this.texts.errors = _.defaults(texts.errors, this.texts.errors);
+    }
+
+    if (texts.info) {
+      // Updates the current info object
+      this.texts.info = _.defaults(texts.info, this.texts.info);
+    }
+
+    if (texts.inputIcons) {
+      // Updates the current inputIcons object
+      this.texts.inputIcons = _.defaults(texts.inputIcons, this.texts.inputIcons);
+    }
+
+    if (texts.socialIcons) {
+      // Updates the current socialIcons object
+      this.texts.socialIcons = _.defaults(texts.socialIcons, this.texts.socialIcons);
+    }
+
+    if (texts.title) {
+      // Updates the current title object
+      this.texts.title = _.defaults(texts.title, this.texts.title);
+    }
+  }
+};
+
+
+AT.prototype.configureRoute = function(route, options) {
+  console.warn('You now need a routing package like useraccounts:iron-routing or useraccounts:flow-routing to be able to configure routes!');
+};
+
+
+AT.prototype.hasField = function(fieldId) {
+  return !!this.getField(fieldId);
+};
+
+AT.prototype.getField = function(fieldId) {
+  var field = _.filter(this._fields, function(field) {
+    return field._id === fieldId;
+  });
+
+  return (field.length === 1) ? field[0] : undefined;
+};
+
+AT.prototype.getFields = function() {
+    return this._fields;
+};
+
+AT.prototype.getFieldIds = function() {
+    return _.pluck(this._fields, "_id");
+};
+
+AT.prototype.getRoutePath = function(route) {
+    return "#";
+};
+
+AT.prototype.oauthServices = function() {
+  // Extracts names of available services
+  var names;
+
+  if (Meteor.isServer) {
+    names = (Accounts.oauth && Accounts.oauth.serviceNames()) || [];
+  } else {
+    names = (Accounts.oauth && Accounts.loginServicesConfigured() && Accounts.oauth.serviceNames()) || [];
+  }
+  // Extracts names of configured services
+  var configuredServices = [];
+
+  if (Accounts.loginServiceConfiguration) {
+    configuredServices = _.pluck(Accounts.loginServiceConfiguration.find().fetch(), "service");
+  }
+
+  // Builds a list of objects containing service name as _id and its configuration status
+  var services = _.map(names, function(name) {
+    return {
+      _id : name,
+      configured: _.contains(configuredServices, name),
+    };
+  });
+
+  // Checks whether there is a UI to configure services...
+  // XXX: this only works with the accounts-ui package
+  var showUnconfigured = typeof Accounts._loginButtonsSession !== "undefined";
+
+  // Filters out unconfigured services in case they"re not to be displayed
+  if (!showUnconfigured) {
+    services = _.filter(services, function(service) {
+      return service.configured;
+    });
+  }
+
+  // Sorts services by name
+  services = _.sortBy(services, function(service) {
+    return service._id;
+  });
+
+  return services;
+};
+
+AT.prototype.removeField = function(fieldId) {
+  // Fields can be removed only before initialization
+  if (this._initialized) {
+    throw new Error("AccountsTemplates.removeField should strictly be called before AccountsTemplates.init!");
+  }
+  // Tries to look up the field with given _id
+  var index = _.indexOf(_.pluck(this._fields, "_id"), fieldId);
+
+  if (index !== -1) {
+    return this._fields.splice(index, 1)[0];
+  } else if (!(Meteor.isServer && _.contains(this.SPECIAL_FIELDS, fieldId))) {
+    throw new Error("A field called " + fieldId + " does not exist!");
+  }
+};
diff --git a/packages/meteor-useraccounts-core/lib/field.js b/packages/meteor-useraccounts-core/lib/field.js
new file mode 100644
index 00000000..c3ecfbb9
--- /dev/null
+++ b/packages/meteor-useraccounts-core/lib/field.js
@@ -0,0 +1,292 @@
+// ---------------------------------------------------------------------------------
+// Field object
+// ---------------------------------------------------------------------------------
+
+Field = function(field) {
+  check(field, FIELD_PAT);
+  _.defaults(this, field);
+
+  this.validating = new ReactiveVar(false);
+  this.status = new ReactiveVar(null);
+};
+
+if (Meteor.isClient) {
+  Field.prototype.clearStatus = function() {
+    return this.status.set(null);
+  };
+}
+
+if (Meteor.isServer) {
+  Field.prototype.clearStatus = function() {
+    // Nothing to do server-side
+    return;
+  };
+}
+
+Field.prototype.fixValue = function(value) {
+  if (this.type === "checkbox") {
+    return !!value;
+  }
+
+  if (this.type === "select") {
+    // TODO: something working...
+    return value;
+  }
+
+  if (this.type === "radio") {
+    // TODO: something working...
+    return value;
+  }
+
+  // Possibly applies required transformations to the input value
+  if (this.trim) {
+    value = value.trim();
+  }
+
+  if (this.lowercase) {
+    value = value.toLowerCase();
+  }
+
+  if (this.uppercase) {
+    value = value.toUpperCase();
+  }
+
+  if (!!this.transform) {
+    value = this.transform(value);
+  }
+
+  return value;
+};
+
+if (Meteor.isClient) {
+  Field.prototype.getDisplayName = function(state) {
+    var displayName = this.displayName;
+
+    if (_.isFunction(displayName)) {
+      displayName = displayName();
+    } else if (_.isObject(displayName)) {
+      displayName = displayName[state] || displayName["default"];
+    }
+
+    if (!displayName) {
+      displayName = capitalize(this._id);
+    }
+
+    return displayName;
+  };
+}
+
+if (Meteor.isClient) {
+  Field.prototype.getPlaceholder = function(state) {
+    var placeholder = this.placeholder;
+
+    if (_.isObject(placeholder)) {
+      placeholder = placeholder[state] || placeholder["default"];
+    }
+
+    if (!placeholder) {
+      placeholder = capitalize(this._id);
+    }
+
+    return placeholder;
+  };
+}
+
+Field.prototype.getStatus = function() {
+  return this.status.get();
+};
+
+if (Meteor.isClient) {
+  Field.prototype.getValue = function(templateInstance) {
+    if (this.type === "checkbox") {
+      return !!(templateInstance.$("#at-field-" + this._id + ":checked").val());
+    }
+
+    if (this.type === "radio") {
+      return templateInstance.$("[name=at-field-"+ this._id + "]:checked").val();
+    }
+
+    return templateInstance.$("#at-field-" + this._id).val();
+  };
+}
+
+if (Meteor.isClient) {
+  Field.prototype.hasError = function() {
+    return this.negativeValidation && this.status.get();
+  };
+}
+
+if (Meteor.isClient) {
+  Field.prototype.hasIcon = function() {
+    if (this.showValidating && this.isValidating()) {
+      return true;
+    }
+
+    if (this.negativeFeedback && this.hasError()) {
+      return true;
+    }
+
+    if (this.positiveFeedback && this.hasSuccess()) {
+      return true;
+    }
+  };
+}
+
+if (Meteor.isClient) {
+  Field.prototype.hasSuccess = function() {
+    return this.positiveValidation && this.status.get() === false;
+  };
+}
+
+if (Meteor.isClient)
+  Field.prototype.iconClass = function() {
+    if (this.isValidating()) {
+      return AccountsTemplates.texts.inputIcons["isValidating"];
+    }
+
+    if (this.hasError()) {
+      return AccountsTemplates.texts.inputIcons["hasError"];
+    }
+
+    if (this.hasSuccess()) {
+      return AccountsTemplates.texts.inputIcons["hasSuccess"];
+    }
+  };
+
+if (Meteor.isClient) {
+  Field.prototype.isValidating = function() {
+    return this.validating.get();
+  };
+}
+
+if (Meteor.isClient) {
+  Field.prototype.setError = function(err) {
+    check(err, Match.OneOf(String, undefined, Boolean));
+
+    if (err === false) {
+      return this.status.set(false);
+    }
+
+    return this.status.set(err || true);
+  };
+}
+
+if (Meteor.isServer) {
+  Field.prototype.setError = function(err) {
+    // Nothing to do server-side
+    return;
+  };
+}
+
+if (Meteor.isClient) {
+  Field.prototype.setSuccess = function() {
+    return this.status.set(false);
+  };
+}
+
+if (Meteor.isServer) {
+  Field.prototype.setSuccess = function() {
+    // Nothing to do server-side
+    return;
+  };
+}
+
+if (Meteor.isClient) {
+  Field.prototype.setValidating = function(state) {
+    check(state, Boolean);
+    return this.validating.set(state);
+  };
+}
+
+if (Meteor.isServer) {
+  Field.prototype.setValidating = function(state) {
+    // Nothing to do server-side
+    return;
+  };
+}
+
+if (Meteor.isClient) {
+  Field.prototype.setValue = function(templateInstance, value) {
+    if (this.type === "checkbox") {
+      templateInstance.$("#at-field-" + this._id).prop('checked', true);
+      return;
+    }
+
+    if (this.type === "radio") {
+      templateInstance.$("[name=at-field-"+ this._id + "]").prop('checked', true);
+      return;
+    }
+
+    templateInstance.$("#at-field-" + this._id).val(value);
+  };
+}
+
+Field.prototype.validate = function(value, strict) {
+  check(value, Match.OneOf(undefined, String, Boolean));
+  this.setValidating(true);
+  this.clearStatus();
+
+  if (_.isUndefined(value) || value === '') {
+    if (!!strict) {
+      if (this.required) {
+        this.setError(AccountsTemplates.texts.requiredField);
+        this.setValidating(false);
+
+        return AccountsTemplates.texts.requiredField;
+      } else {
+        this.setSuccess();
+        this.setValidating(false);
+
+        return false;
+      }
+    } else {
+      this.clearStatus();
+      this.setValidating(false);
+
+      return null;
+    }
+  }
+
+  var valueLength = value.length;
+  var minLength = this.minLength;
+  if (minLength && valueLength < minLength) {
+    this.setError(AccountsTemplates.texts.minRequiredLength + ": " + minLength);
+    this.setValidating(false);
+
+    return AccountsTemplates.texts.minRequiredLength + ": " + minLength;
+  }
+
+  var maxLength = this.maxLength;
+  if (maxLength && valueLength > maxLength) {
+    this.setError(AccountsTemplates.texts.maxAllowedLength + ": " + maxLength);
+    this.setValidating(false);
+
+    return AccountsTemplates.texts.maxAllowedLength + ": " + maxLength;
+  }
+
+  if (this.re && valueLength && !value.match(this.re)) {
+    this.setError(this.errStr);
+    this.setValidating(false);
+
+    return this.errStr;
+  }
+
+  if (this.func) {
+    var result = this.func(value);
+    var err = result === true ? this.errStr || true : result;
+
+    if (_.isUndefined(result)) {
+      return err;
+    }
+
+    this.status.set(err);
+    this.setValidating(false);
+
+    return err;
+  }
+
+  this.setSuccess();
+  this.setValidating(false);
+
+  return false;
+};
diff --git a/packages/meteor-useraccounts-core/lib/methods.js b/packages/meteor-useraccounts-core/lib/methods.js
new file mode 100644
index 00000000..0d3a070d
--- /dev/null
+++ b/packages/meteor-useraccounts-core/lib/methods.js
@@ -0,0 +1,25 @@
+/* global
+  AccountsTemplates: false
+*/
+"use strict";
+
+Meteor.methods({
+  ATRemoveService: function(serviceName) {
+    check(serviceName, String);
+
+    var userId = this.userId;
+
+    if (userId) {
+      var user = Meteor.users.findOne(userId);
+      var numServices = _.keys(user.services).length; // including "resume"
+      var unset = {};
+
+      if (numServices === 2) {
+        throw new Meteor.Error(403, AccountsTemplates.texts.errors.cannotRemoveService, {});
+      }
+
+      unset["services." + serviceName] = "";
+      Meteor.users.update(userId, {$unset: unset});
+    }
+  },
+});
diff --git a/packages/meteor-useraccounts-core/lib/server.js b/packages/meteor-useraccounts-core/lib/server.js
new file mode 100644
index 00000000..2a925dc7
--- /dev/null
+++ b/packages/meteor-useraccounts-core/lib/server.js
@@ -0,0 +1,184 @@
+/* global
+  AT: false,
+  AccountsTemplates: false
+*/
+"use strict";
+
+// Initialization
+AT.prototype.init = function() {
+  console.warn("[AccountsTemplates] There is no more need to call AccountsTemplates.init()! Simply remove the call ;-)");
+};
+
+AT.prototype._init = function() {
+  if (this._initialized) {
+    return;
+  }
+
+  // Checks there is at least one account service installed
+  if (!Package["accounts-password"] && (!Accounts.oauth || Accounts.oauth.serviceNames().length === 0)) {
+    throw Error("AccountsTemplates: You must add at least one account service!");
+  }
+
+  // A password field is strictly required
+  var password = this.getField("password");
+  if (!password) {
+    throw Error("A password field is strictly required!");
+  }
+
+  if (password.type !== "password") {
+    throw Error("The type of password field should be password!");
+  }
+
+  // Then we can have "username" or "email" or even both of them
+  // but at least one of the two is strictly required
+  var username = this.getField("username");
+  var email = this.getField("email");
+
+  if (!username && !email) {
+    throw Error("At least one field out of username and email is strictly required!");
+  }
+
+  if (username && !username.required) {
+    throw Error("The username field should be required!");
+  }
+
+  if (email) {
+    if (email.type !== "email") {
+      throw Error("The type of email field should be email!");
+    }
+
+    if (username) {
+      // username and email
+      if (username.type !== "text") {
+        throw Error("The type of username field should be text when email field is present!");
+      }
+    } else {
+      // email only
+      if (!email.required) {
+        throw Error("The email field should be required when username is not present!");
+      }
+    }
+  } else {
+    // username only
+    if (username.type !== "text" && username.type !== "tel") {
+      throw Error("The type of username field should be text or tel!");
+    }
+  }
+
+  // Possibly publish more user data in order to be able to show add/remove
+  // buttons for 3rd-party services
+  if (this.options.showAddRemoveServices) {
+    // Publish additional current user info to get the list of registered services
+    // XXX TODO: use
+    // Accounts.addAutopublishFields({
+    //   forLoggedInUser: ['services.facebook'],
+    //   forOtherUsers: [],
+    // })
+    // ...adds only user.services.*.id
+    Meteor.publish("userRegisteredServices", function() {
+      var userId = this.userId;
+      return Meteor.users.find(userId, {fields: {services: 1}});
+      /*
+      if (userId) {
+        var user = Meteor.users.findOne(userId);
+        var services_id = _.chain(user.services)
+          .keys()
+          .reject(function(service) {return service === "resume";})
+          .map(function(service) {return "services." + service + ".id";})
+          .value();
+        var projection = {};
+        _.each(services_id, function(key) {projection[key] = 1;});
+        return Meteor.users.find(userId, {fields: projection});
+      }
+      */
+    });
+  }
+
+  // Security stuff
+  if (this.options.overrideLoginErrors) {
+    Accounts.validateLoginAttempt(function(attempt) {
+      if (attempt.error) {
+        var reason = attempt.error.reason;
+        if (reason === "User not found" || reason === "Incorrect password") {
+          throw new Meteor.Error(403, AccountsTemplates.texts.errors.loginForbidden);
+        }
+      }
+      return attempt.allowed;
+    });
+  }
+
+  if (this.options.sendVerificationEmail && this.options.enforceEmailVerification) {
+    Accounts.validateLoginAttempt(function(attempt) {
+      if (!attempt.allowed) {
+        return false;
+      }
+
+      if (attempt.type !== "password" || attempt.methodName !== "login") {
+        return attempt.allowed;
+      }
+
+      var user = attempt.user;
+      if (!user) {
+        return attempt.allowed;
+      }
+
+      var ok = true;
+      var loginEmail = attempt.methodArguments[0].user.email.toLowerCase();
+      if (loginEmail) {
+        var email = _.filter(user.emails, function(obj) {
+          return obj.address.toLowerCase() === loginEmail;
+        });
+        if (!email.length || !email[0].verified) {
+          ok = false;
+        }
+      } else {
+        // we got the username, lets check there's at lease one verified email
+        var emailVerified = _.chain(user.emails)
+        .pluck('verified')
+        .any()
+        .value();
+
+        if (!emailVerified) {
+          ok = false;
+        }
+      }
+      if (!ok) {
+        throw new Meteor.Error(401, AccountsTemplates.texts.errors.verifyEmailFirst);
+      }
+
+      return attempt.allowed;
+    });
+  }
+
+  //Check that reCaptcha secret keys are available
+  if (this.options.showReCaptcha) {
+    var atSecretKey = AccountsTemplates.options.reCaptcha && AccountsTemplates.options.reCaptcha.secretKey;
+    var settingsSecretKey = Meteor.settings.reCaptcha && Meteor.settings.reCaptcha.secretKey;
+
+    if (!atSecretKey && !settingsSecretKey) {
+      throw new Meteor.Error(401, "User Accounts: reCaptcha secret key not found! Please provide it or set showReCaptcha to false." );
+    }
+  }
+
+  // Marks AccountsTemplates as initialized
+  this._initialized = true;
+};
+
+AccountsTemplates = new AT();
+
+// Client side account creation is disabled by default:
+// the methos ATCreateUserServer is used instead!
+// to actually disable client side account creation use:
+//
+//    AccountsTemplates.config({
+//        forbidClientAccountCreation: true
+//    });
+
+Accounts.config({
+  forbidClientAccountCreation: true
+});
+
+// Initialization
+Meteor.startup(function() {
+  AccountsTemplates._init();
+});
diff --git a/packages/meteor-useraccounts-core/lib/server_methods.js b/packages/meteor-useraccounts-core/lib/server_methods.js
new file mode 100644
index 00000000..500440d7
--- /dev/null
+++ b/packages/meteor-useraccounts-core/lib/server_methods.js
@@ -0,0 +1,142 @@
+/* global
+  AccountsTemplates
+*/
+"use strict";
+
+Meteor.methods({
+  ATCreateUserServer: function(options) {
+    if (AccountsTemplates.options.forbidClientAccountCreation) {
+      throw new Meteor.Error(403, AccountsTemplates.texts.errors.accountsCreationDisabled);
+    }
+
+    // createUser() does more checking.
+    check(options, Object);
+    var allFieldIds = AccountsTemplates.getFieldIds();
+
+    // Picks-up whitelisted fields for profile
+    var profile = options.profile;
+    profile = _.pick(profile, allFieldIds);
+    profile = _.omit(profile, "username", "email", "password");
+
+    // Validates fields" value
+    var signupInfo = _.clone(profile);
+    if (options.username) {
+      signupInfo.username = options.username;
+
+      if (AccountsTemplates.options.lowercaseUsername) {
+        signupInfo.username = signupInfo.username.trim().replace(/\s+/gm, ' ');
+        options.profile.name = signupInfo.username;
+        signupInfo.username = signupInfo.username.toLowerCase().replace(/\s+/gm, '');
+        options.username = signupInfo.username;
+      }
+    }
+
+    if (options.email) {
+      signupInfo.email = options.email;
+
+      if (AccountsTemplates.options.lowercaseUsername) {
+        signupInfo.email = signupInfo.email.toLowerCase().replace(/\s+/gm, '');
+        options.email = signupInfo.email;
+      }
+    }
+
+    if (options.password) {
+      signupInfo.password = options.password;
+    }
+
+    var validationErrors = {};
+    var someError = false;
+
+    // Validates fields values
+    _.each(AccountsTemplates.getFields(), function(field) {
+      var fieldId = field._id;
+      var value = signupInfo[fieldId];
+
+      if (fieldId === "password") {
+        // Can"t Pick-up password here
+        // NOTE: at this stage the password is already encripted,
+        //       so there is no way to validate it!!!
+        check(value, Object);
+        return;
+      }
+
+      var validationErr = field.validate(value, "strict");
+      if (validationErr) {
+        validationErrors[fieldId] = validationErr;
+        someError = true;
+      }
+    });
+
+    if (AccountsTemplates.options.showReCaptcha) {
+      var secretKey = null;
+
+      if (AccountsTemplates.options.reCaptcha && AccountsTemplates.options.reCaptcha.secretKey) {
+        secretKey = AccountsTemplates.options.reCaptcha.secretKey;
+      } else {
+        secretKey = Meteor.settings.reCaptcha.secretKey;
+      }
+
+      var apiResponse = HTTP.post("https://www.google.com/recaptcha/api/siteverify", {
+        params: {
+          secret: secretKey,
+          response: options.profile.reCaptchaResponse,
+          remoteip: this.connection.clientAddress,
+        }
+      }).data;
+
+      if (!apiResponse.success) {
+        throw new Meteor.Error(403, AccountsTemplates.texts.errors.captchaVerification,
+          apiResponse['error-codes'] ? apiResponse['error-codes'].join(", ") : "Unknown Error.");
+      }
+    }
+
+    if (someError) {
+      throw new Meteor.Error(403, AccountsTemplates.texts.errors.validationErrors, validationErrors);
+    }
+
+    // Possibly removes the profile field
+    if (_.isEmpty(options.profile)) {
+      delete options.profile;
+    }
+
+    // Create user. result contains id and token.
+    var userId = Accounts.createUser(options);
+    // safety belt. createUser is supposed to throw on error. send 500 error
+    // instead of sending a verification email with empty userid.
+    if (! userId) {
+      throw new Error("createUser failed to insert new user");
+    }
+
+    // Call postSignUpHook, if any...
+    var postSignUpHook = AccountsTemplates.options.postSignUpHook;
+    if (postSignUpHook) {
+      postSignUpHook(userId, options);
+    }
+
+    // Send a email address verification email in case the context permits it
+    // and the specific configuration flag was set to true
+    if (options.email && AccountsTemplates.options.sendVerificationEmail) {
+      Accounts.sendVerificationEmail(userId, options.email);
+    }
+  },
+
+  // Resend a user's verification e-mail
+  ATResendVerificationEmail: function (email) {
+    check(email, String);
+
+    var user = Meteor.users.findOne({ "emails.address": email });
+
+    // Send the standard error back to the client if no user exist with this e-mail
+    if (!user) {
+      throw new Meteor.Error(403, "User not found");
+    }
+
+    try {
+      Accounts.sendVerificationEmail(user._id);
+    } catch (error) {
+      // Handle error when email already verified
+      // https://github.com/dwinston/send-verification-email-bug
+      throw new Meteor.Error(403, "Already verified");
+    }
+  },
+});
diff --git a/packages/meteor-useraccounts-core/lib/templates_helpers/at_error.js b/packages/meteor-useraccounts-core/lib/templates_helpers/at_error.js
new file mode 100644
index 00000000..5673dfe7
--- /dev/null
+++ b/packages/meteor-useraccounts-core/lib/templates_helpers/at_error.js
@@ -0,0 +1,26 @@
+AT.prototype.atErrorHelpers = {
+    singleError: function() {
+        var errors = AccountsTemplates.state.form.get("error");
+        return errors && errors.length === 1;
+    },
+    error: function() {
+        return AccountsTemplates.state.form.get("error");
+    },
+    errorText: function(){
+        var field, err;
+        if (this.field){
+            field = T9n.get(this.field, markIfMissing=false);
+            err = T9n.get(this.err, markIfMissing=false);
+        }
+        else
+            err = T9n.get(this.valueOf(), markIfMissing=false);
+
+        // Possibly removes initial prefix in case the key in not found inside t9n
+        if (err.substring(0, 15) === "error.accounts.")
+            err = err.substring(15);
+
+        if (field)
+            return field + ": " + err;
+        return err;
+    },
+};
diff --git a/packages/meteor-useraccounts-core/lib/templates_helpers/at_form.js b/packages/meteor-useraccounts-core/lib/templates_helpers/at_form.js
new file mode 100644
index 00000000..95a34c0c
--- /dev/null
+++ b/packages/meteor-useraccounts-core/lib/templates_helpers/at_form.js
@@ -0,0 +1,83 @@
+AT.prototype.atFormHelpers = {
+    hide: function(){
+        var state = this.state || AccountsTemplates.getState();
+        return state === "hide";
+    },
+    showTitle: function(next_state){
+        var state = next_state || this.state || AccountsTemplates.getState();
+        if (Meteor.userId() && state === "signIn")
+          return false;
+        return !!AccountsTemplates.texts.title[state];
+    },
+    showOauthServices: function(next_state){
+        var state = next_state || this.state || AccountsTemplates.getState();
+        if (!(state === "signIn" || state === "signUp"))
+            return false;
+        var services = AccountsTemplates.oauthServices();
+        if (!services.length)
+            return false;
+        if (Meteor.userId())
+            return AccountsTemplates.options.showAddRemoveServices;
+        return true;
+    },
+    showServicesSeparator: function(next_state){
+        var pwdService = Package["accounts-password"] !== undefined;
+        var state = next_state || this.state || AccountsTemplates.getState();
+        var rightState = (state === "signIn" || state === "signUp");
+        return rightState && !Meteor.userId() && pwdService && AccountsTemplates.oauthServices().length;
+    },
+    showError: function(next_state) {
+        return !!AccountsTemplates.state.form.get("error");
+    },
+    showResult: function(next_state) {
+        return !!AccountsTemplates.state.form.get("result");
+    },
+    showMessage: function(next_state) {
+        return !!AccountsTemplates.state.form.get("message");
+    },
+    showPwdForm: function(next_state) {
+        if (Package["accounts-password"] === undefined)
+            return false;
+        var state = next_state || this.state || AccountsTemplates.getState();
+        if ((state === "verifyEmail") || (state === "signIn" && Meteor.userId()))
+            return false;
+        return true;
+    },
+    showSignInLink: function(next_state){
+        if (AccountsTemplates.options.hideSignInLink)
+            return false;
+        var state = next_state || this.state || AccountsTemplates.getState();
+        if (AccountsTemplates.options.forbidClientAccountCreation && state === "forgotPwd")
+            return true;
+        return state === "signUp";
+    },
+    showSignUpLink: function(next_state){
+        if  (AccountsTemplates.options.hideSignUpLink)
+            return false;
+        var state = next_state || this.state || AccountsTemplates.getState();
+        return ((state === "signIn" && !Meteor.userId()) || state === "forgotPwd") && !AccountsTemplates.options.forbidClientAccountCreation;
+    },
+    showTermsLink: function(next_state){
+        //TODO: Add privacyRoute and termsRoute as alternatives (the point of named routes is
+        // being able to change the url in one place only)
+        if (!!AccountsTemplates.options.privacyUrl || !!AccountsTemplates.options.termsUrl) {
+            var state = next_state || this.state || AccountsTemplates.getState();
+            if (state === "signUp" || state === "enrollAccount" ) {
+              return true;
+            }
+        }
+        /*
+        if (state === "signIn"){
+            var pwdService = Package["accounts-password"] !== undefined;
+            if (!pwdService)
+                return true;
+        }
+        */
+        return false;
+    },
+    showResendVerificationEmailLink: function(){
+        var parentData = Template.currentData();
+        var state = (parentData && parentData.state) || AccountsTemplates.getState();
+        return (state === "signIn" || state === "forgotPwd") && AccountsTemplates.options.showResendVerificationEmailLink;
+    },
+};
diff --git a/packages/meteor-useraccounts-core/lib/templates_helpers/at_input.js b/packages/meteor-useraccounts-core/lib/templates_helpers/at_input.js
new file mode 100644
index 00000000..fe74eeb1
--- /dev/null
+++ b/packages/meteor-useraccounts-core/lib/templates_helpers/at_input.js
@@ -0,0 +1,124 @@
+AT.prototype.atInputRendered = [function(){
+    var fieldId = this.data._id;
+
+    var parentData = Template.currentData();
+    var state = (parentData && parentData.state) || AccountsTemplates.getState();
+
+    if (AccountsTemplates.options.focusFirstInput) {
+      var firstVisibleInput = _.find(AccountsTemplates.getFields(), function(f){
+        return _.contains(f.visible, state);
+      });
+
+      if (firstVisibleInput && firstVisibleInput._id === fieldId) {
+        this.$("input#at-field-" + fieldId).focus();
+      }
+  }
+}];
+
+AT.prototype.atInputHelpers = {
+    disabled: function() {
+        return AccountsTemplates.disabled();
+    },
+    showLabels: function() {
+        return AccountsTemplates.options.showLabels;
+    },
+    displayName: function() {
+        var parentData = Template.parentData();
+        var state = (parentData && parentData.state) || AccountsTemplates.getState();
+        var displayName = this.getDisplayName(state);
+        return T9n.get(displayName, markIfMissing=false);
+    },
+    optionalText: function(){
+        return "(" + T9n.get(AccountsTemplates.texts.optionalField, markIfMissing=false) + ")";
+    },
+    templateName: function() {
+        if (this.template)
+            return this.template;
+        if (this.type === "checkbox")
+            return "atCheckboxInput";
+        if (this.type === "select")
+            return "atSelectInput";
+        if (this.type === "radio")
+            return "atRadioInput";
+        if (this.type === "hidden")
+            return "atHiddenInput";
+        return "atTextInput";
+    },
+    values: function(){
+        var id = this._id;
+        return _.map(this.select, function(select){
+            var s = _.clone(select);
+            s._id = id + "-" + select.value;
+            s.id = id;
+            return s;
+        });
+    },
+    errorText: function() {
+        var err = this.getStatus();
+        return T9n.get(err, markIfMissing=false);
+    },
+    placeholder: function() {
+        if (AccountsTemplates.options.showPlaceholders) {
+            var parentData = Template.parentData();
+            var state = (parentData && parentData.state) || AccountsTemplates.getState();
+            var placeholder = this.getPlaceholder(state);
+            return T9n.get(placeholder, markIfMissing=false);
+        }
+    },
+};
+
+AT.prototype.atInputEvents = {
+    "focusin input": function(event, t){
+        var field = Template.currentData();
+        field.clearStatus();
+    },
+    "focusout input, change select": function(event, t){
+        var field = Template.currentData();
+        var fieldId = field._id;
+        var rawValue = field.getValue(t);
+        var value = field.fixValue(rawValue);
+        // Possibly updates the input value
+        if (value !== rawValue) {
+            field.setValue(t, value);
+        }
+
+        // Client-side only validation
+        if (!field.validation)
+            return;
+        var parentData = Template.parentData();
+        var state = (parentData && parentData.state) || AccountsTemplates.getState();
+        // No validation during signIn
+        if (state === "signIn")
+            return;
+        // Special case for password confirmation
+        if (value && fieldId === "password_again"){
+            if (value !== $("#at-field-password").val())
+                return field.setError(AccountsTemplates.texts.errors.pwdMismatch);
+        }
+        field.validate(value);
+    },
+    "keyup input": function(event, t){
+        var field = Template.currentData();
+        // Client-side only continuous validation
+        if (!field.continuousValidation)
+            return;
+        var parentData = Template.parentData();
+        var state = (parentData && parentData.state) || AccountsTemplates.getState();
+        // No validation during signIn
+        if (state === "signIn")
+            return;
+        var fieldId = field._id;
+        var rawValue = field.getValue(t);
+        var value = field.fixValue(rawValue);
+        // Possibly updates the input value
+        if (value !== rawValue) {
+            field.setValue(t, value);
+        }
+        // Special case for password confirmation
+        if (value && fieldId === "password_again"){
+            if (value !== $("#at-field-password").val())
+                return field.setError(AccountsTemplates.texts.errors.pwdMismatch);
+        }
+        field.validate(value);
+    },
+};
diff --git a/packages/meteor-useraccounts-core/lib/templates_helpers/at_message.js b/packages/meteor-useraccounts-core/lib/templates_helpers/at_message.js
new file mode 100644
index 00000000..baa9ca04
--- /dev/null
+++ b/packages/meteor-useraccounts-core/lib/templates_helpers/at_message.js
@@ -0,0 +1,7 @@
+AT.prototype.atMessageHelpers = {
+    message: function() {
+        var messageText = AccountsTemplates.state.form.get("message");
+        if (messageText)
+            return T9n.get(messageText, markIfMissing=false);
+    },
+};
\ No newline at end of file
diff --git a/packages/meteor-useraccounts-core/lib/templates_helpers/at_nav_button.js b/packages/meteor-useraccounts-core/lib/templates_helpers/at_nav_button.js
new file mode 100644
index 00000000..c434060d
--- /dev/null
+++ b/packages/meteor-useraccounts-core/lib/templates_helpers/at_nav_button.js
@@ -0,0 +1,16 @@
+AT.prototype.atNavButtonHelpers = {
+    text: function(){
+        var key = Meteor.userId() ? AccountsTemplates.texts.navSignOut : AccountsTemplates.texts.navSignIn;
+        return T9n.get(key, markIfMissing=false);
+    }
+};
+
+AT.prototype.atNavButtonEvents = {
+    'click #at-nav-button': function(event){
+        event.preventDefault();
+        if (Meteor.userId())
+            AccountsTemplates.logout();
+        else
+            AccountsTemplates.linkClick("signIn");
+    },
+};
diff --git a/packages/meteor-useraccounts-core/lib/templates_helpers/at_oauth.js b/packages/meteor-useraccounts-core/lib/templates_helpers/at_oauth.js
new file mode 100644
index 00000000..1b1d13c1
--- /dev/null
+++ b/packages/meteor-useraccounts-core/lib/templates_helpers/at_oauth.js
@@ -0,0 +1,5 @@
+AT.prototype.atOauthHelpers = {
+    oauthService: function() {
+        return AccountsTemplates.oauthServices();
+    },
+};
\ No newline at end of file
diff --git a/packages/meteor-useraccounts-core/lib/templates_helpers/at_pwd_form.js b/packages/meteor-useraccounts-core/lib/templates_helpers/at_pwd_form.js
new file mode 100644
index 00000000..2f8d53c4
--- /dev/null
+++ b/packages/meteor-useraccounts-core/lib/templates_helpers/at_pwd_form.js
@@ -0,0 +1,331 @@
+AT.prototype.atPwdFormHelpers = {
+    disabled: function() {
+        return AccountsTemplates.disabled();
+    },
+    fields: function() {
+        var parentData = Template.currentData();
+        var state = (parentData && parentData.state) || AccountsTemplates.getState();
+        return _.filter(AccountsTemplates.getFields(), function(s) {
+            return _.contains(s.visible, state);
+        });
+    },
+    showForgotPasswordLink: function() {
+        var parentData = Template.currentData();
+        var state = (parentData && parentData.state) || AccountsTemplates.getState();
+        return state === "signIn" && AccountsTemplates.options.showForgotPasswordLink;
+    },
+    showReCaptcha: function() {
+      var parentData = Template.currentData();
+      var state = (parentData && parentData.state) || AccountsTemplates.getState();
+      return state === "signUp" && AccountsTemplates.options.showReCaptcha;
+    },
+};
+
+
+var toLowercaseUsername = function(value){
+  return value.toLowerCase().replace(/\s+/gm, '');
+};
+
+AT.prototype.atPwdFormEvents = {
+    // Form submit
+    "submit #at-pwd-form": function(event, t) {
+        event.preventDefault();
+        t.$("#at-btn").blur();
+
+        AccountsTemplates.setDisabled(true);
+
+        var parentData = Template.currentData();
+        var state = (parentData && parentData.state) || AccountsTemplates.getState();
+        var preValidation = (state !== "signIn");
+
+        // Client-side pre-validation
+        // Validates fields values
+        // NOTE: This is the only place where password validation can be enforced!
+        var formData = {};
+        var someError = false;
+        var errList = [];
+        _.each(AccountsTemplates.getFields(), function(field){
+            // Considers only visible fields...
+            if (!_.contains(field.visible, state))
+                return;
+
+            var fieldId = field._id;
+
+            var rawValue = field.getValue(t);
+            var value = field.fixValue(rawValue);
+            // Possibly updates the input value
+            if (value !== rawValue) {
+                field.setValue(t, value);
+            }
+            if (value !== undefined && value !== "") {
+                formData[fieldId] = value;
+            }
+
+            // Validates the field value only if current state is not "signIn"
+            if (preValidation && field.getStatus() !== false){
+                var validationErr = field.validate(value, "strict");
+                if (validationErr) {
+                    if (field.negativeValidation)
+                        field.setError(validationErr);
+                    else{
+                        var fId = T9n.get(field.getDisplayName(), markIfMissing=false);
+                        //errList.push(fId + ": " + err);
+                        errList.push({
+                            field: field.getDisplayName(),
+                            err: validationErr
+                        });
+                    }
+                    someError = true;
+                }
+                else
+                    field.setSuccess();
+            }
+        });
+
+        // Clears error and result
+        AccountsTemplates.clearError();
+        AccountsTemplates.clearResult();
+        AccountsTemplates.clearMessage();
+        // Possibly sets errors
+        if (someError){
+            if (errList.length)
+                AccountsTemplates.state.form.set("error", errList);
+            AccountsTemplates.setDisabled(false);
+            //reset reCaptcha form
+            if (state === "signUp" && AccountsTemplates.options.showReCaptcha) {
+                grecaptcha.reset();
+            }
+            return;
+        }
+
+        // Extracts username, email, and pwds
+        var current_password = formData.current_password;
+        var email = formData.email;
+        var password = formData.password;
+        var password_again = formData.password_again;
+        var username = formData.username;
+        var username_and_email = formData.username_and_email;
+        // Clears profile data removing username, email, and pwd
+        delete formData.current_password;
+        delete formData.email;
+        delete formData.password;
+        delete formData.password_again;
+        delete formData.username;
+        delete formData.username_and_email;
+
+        if (AccountsTemplates.options.confirmPassword){
+            // Checks passwords for correct match
+            if (password_again && password !== password_again){
+                var pwd_again = AccountsTemplates.getField("password_again");
+                if (pwd_again.negativeValidation)
+                    pwd_again.setError(AccountsTemplates.texts.errors.pwdMismatch);
+                else
+                    AccountsTemplates.state.form.set("error", [{
+                        field: pwd_again.getDisplayName(),
+                        err: AccountsTemplates.texts.errors.pwdMismatch
+                    }]);
+                AccountsTemplates.setDisabled(false);
+                //reset reCaptcha form
+                if (state === "signUp" && AccountsTemplates.options.showReCaptcha) {
+                  grecaptcha.reset();
+                }
+                return;
+            }
+        }
+
+        // -------
+        // Sign In
+        // -------
+        if (state === "signIn") {
+            var pwdOk = !!password;
+            var userOk = true;
+            var loginSelector;
+            if (email) {
+                if (AccountsTemplates.options.lowercaseUsername) {
+                  email = toLowercaseUsername(email);
+                }
+
+                loginSelector = {email: email};
+            }
+            else if (username) {
+                if (AccountsTemplates.options.lowercaseUsername) {
+                  username = toLowercaseUsername(username);
+                }
+                loginSelector = {username: username};
+            }
+            else if (username_and_email) {
+                if (AccountsTemplates.options.lowercaseUsername) {
+                  username_and_email = toLowercaseUsername(username_and_email);
+                }
+                loginSelector = username_and_email;
+            }
+            else
+                userOk = false;
+
+            // Possibly exits if not both 'password' and 'username' are non-empty...
+            if (!pwdOk || !userOk){
+                AccountsTemplates.state.form.set("error", [AccountsTemplates.texts.errors.loginForbidden]);
+                AccountsTemplates.setDisabled(false);
+                return;
+            }
+
+
+            return Meteor.loginWithPassword(loginSelector, password, function(error) {
+                AccountsTemplates.submitCallback(error, state);
+            });
+        }
+
+        // -------
+        // Sign Up
+        // -------
+        if (state === "signUp") {
+            // Possibly gets reCaptcha response
+            if (AccountsTemplates.options.showReCaptcha) {
+              var response = grecaptcha.getResponse();
+              if (response === "") {
+                // recaptcha verification has not completed yet (or has expired)...
+                // ...simply ignore submit event!
+                AccountsTemplates.setDisabled(false);
+                return;
+              } else {
+                formData.reCaptchaResponse = response;
+              }
+            }
+
+            var hash = Accounts._hashPassword(password);
+            var options = {
+                username: username,
+                email: email,
+                password: hash,
+                profile: formData,
+            };
+
+            // Call preSignUpHook, if any...
+            var preSignUpHook = AccountsTemplates.options.preSignUpHook;
+            if (preSignUpHook) {
+              preSignUpHook(password, options);
+            }
+
+            return Meteor.call("ATCreateUserServer", options, function(error){
+                if (error && error.reason === 'Email already exists.') {
+                    if (AccountsTemplates.options.showReCaptcha) {
+                      grecaptcha.reset();
+                    }
+                }
+                AccountsTemplates.submitCallback(error, undefined, function(){
+                    if (AccountsTemplates.options.sendVerificationEmail && AccountsTemplates.options.enforceEmailVerification){
+                        AccountsTemplates.submitCallback(error, state, function () {
+                            AccountsTemplates.state.form.set("result", AccountsTemplates.texts.info.signUpVerifyEmail);
+                            // Cleans up input fields' content
+                            _.each(AccountsTemplates.getFields(), function(field){
+                                // Considers only visible fields...
+                                if (!_.contains(field.visible, state))
+                                    return;
+
+                                var elem = t.$("#at-field-" + field._id);
+
+                                // Naïve reset
+                                if (field.type === "checkbox") elem.prop('checked', false);
+                                else elem.val("");
+
+                            });
+                            AccountsTemplates.setDisabled(false);
+                            AccountsTemplates.avoidRedirect = true;
+                        });
+                    }
+                    else {
+                        var loginSelector;
+
+                        if (email) {
+                            if (AccountsTemplates.options.lowercaseUsername) {
+                              email = toLowercaseUsername(email);
+                            }
+
+                            loginSelector = {email: email};
+                        }
+                        else if (username) {
+                            if (AccountsTemplates.options.lowercaseUsername) {
+                              username = toLowercaseUsername(username);
+                            }
+                            loginSelector = {username: username};
+                        }
+                        else {
+                            if (AccountsTemplates.options.lowercaseUsername) {
+                              username_and_email = toLowercaseUsername(username_and_email);
+                            }
+                            loginSelector = username_and_email;
+                        }
+
+                        Meteor.loginWithPassword(loginSelector, password, function(error) {
+                            AccountsTemplates.submitCallback(error, state, function(){
+                                AccountsTemplates.setState("signIn");
+                            });
+                        });
+                    }
+                });
+            });
+        }
+
+        //----------------
+        // Forgot Password
+        //----------------
+        if (state === "forgotPwd"){
+            return Accounts.forgotPassword({
+                email: email
+            }, function(error) {
+                AccountsTemplates.submitCallback(error, state, function(){
+                    AccountsTemplates.state.form.set("result", AccountsTemplates.texts.info.emailSent);
+                    t.$("#at-field-email").val("");
+                });
+            });
+        }
+
+        //--------------------------------
+        // Reset Password / Enroll Account
+        //--------------------------------
+        if (state === "resetPwd" || state === "enrollAccount") {
+            var paramToken = AccountsTemplates.getparamToken();
+            return Accounts.resetPassword(paramToken, password, function(error) {
+                AccountsTemplates.submitCallback(error, state, function(){
+                    var pwd_field_id;
+                    if (state === "resetPwd")
+                        AccountsTemplates.state.form.set("result", AccountsTemplates.texts.info.pwdReset);
+                    else // Enroll Account
+                        AccountsTemplates.state.form.set("result", AccountsTemplates.texts.info.pwdSet);
+                    t.$("#at-field-password").val("");
+                    if (AccountsTemplates.options.confirmPassword)
+                        t.$("#at-field-password_again").val("");
+                });
+            });
+        }
+
+        //----------------
+        // Change Password
+        //----------------
+        if (state === "changePwd"){
+            return Accounts.changePassword(current_password, password, function(error) {
+                AccountsTemplates.submitCallback(error, state, function(){
+                    AccountsTemplates.state.form.set("result", AccountsTemplates.texts.info.pwdChanged);
+                    t.$("#at-field-current_password").val("");
+                    t.$("#at-field-password").val("");
+                    if (AccountsTemplates.options.confirmPassword)
+                        t.$("#at-field-password_again").val("");
+                });
+            });
+        }
+
+        //----------------
+        // Resend Verification E-mail
+        //----------------
+        if (state === "resendVerificationEmail"){
+            return Meteor.call("ATResendVerificationEmail", email, function (error) {
+                AccountsTemplates.submitCallback(error, state, function(){
+                    AccountsTemplates.state.form.set("result", AccountsTemplates.texts.info.verificationEmailSent);
+                    t.$("#at-field-email").val("");
+
+                    AccountsTemplates.avoidRedirect = true;
+                });
+            });
+        }
+    },
+};
diff --git a/packages/meteor-useraccounts-core/lib/templates_helpers/at_pwd_form_btn.js b/packages/meteor-useraccounts-core/lib/templates_helpers/at_pwd_form_btn.js
new file mode 100644
index 00000000..fc263623
--- /dev/null
+++ b/packages/meteor-useraccounts-core/lib/templates_helpers/at_pwd_form_btn.js
@@ -0,0 +1,18 @@
+AT.prototype.atPwdFormBtnHelpers = {
+    submitDisabled: function(){
+        var disable = _.chain(AccountsTemplates.getFields())
+            .map(function(field){
+                return field.hasError() || field.isValidating();
+            })
+            .some()
+            .value()
+        ;
+        if (disable)
+            return "disabled";
+    },
+    buttonText: function() {
+        var parentData = Template.currentData();
+        var state = (parentData && parentData.state) || AccountsTemplates.getState();
+        return T9n.get(AccountsTemplates.texts.button[state], markIfMissing=false);
+    },
+};
diff --git a/packages/meteor-useraccounts-core/lib/templates_helpers/at_pwd_link.js b/packages/meteor-useraccounts-core/lib/templates_helpers/at_pwd_link.js
new file mode 100644
index 00000000..dd93a398
--- /dev/null
+++ b/packages/meteor-useraccounts-core/lib/templates_helpers/at_pwd_link.js
@@ -0,0 +1,24 @@
+AT.prototype.atPwdLinkHelpers = {
+    disabled: function() {
+        return AccountsTemplates.disabled();
+    },
+    forgotPwdLink: function(){
+        return AccountsTemplates.getRoutePath("forgotPwd");
+    },
+    preText: function(){
+        return T9n.get(AccountsTemplates.texts.pwdLink_pre, markIfMissing=false);
+    },
+    linkText: function(){
+        return T9n.get(AccountsTemplates.texts.pwdLink_link, markIfMissing=false);
+    },
+    suffText: function(){
+        return T9n.get(AccountsTemplates.texts.pwdLink_suff, markIfMissing=false);
+    },
+};
+
+AT.prototype.atPwdLinkEvents = {
+    "click #at-forgotPwd": function(event, t) {
+        event.preventDefault();
+        AccountsTemplates.linkClick("forgotPwd");
+    },
+};
\ No newline at end of file
diff --git a/packages/meteor-useraccounts-core/lib/templates_helpers/at_reCaptcha.js b/packages/meteor-useraccounts-core/lib/templates_helpers/at_reCaptcha.js
new file mode 100644
index 00000000..ea0c0c69
--- /dev/null
+++ b/packages/meteor-useraccounts-core/lib/templates_helpers/at_reCaptcha.js
@@ -0,0 +1,19 @@
+AT.prototype.atReCaptchaRendered = function() {
+    $.getScript('//www.google.com/recaptcha/api.js?hl=' + T9n.getLanguage());
+};
+
+AT.prototype.atReCaptchaHelpers = {
+    key: function() {
+        if (AccountsTemplates.options.reCaptcha && AccountsTemplates.options.reCaptcha.siteKey)
+            return AccountsTemplates.options.reCaptcha.siteKey;
+        return Meteor.settings.public.reCaptcha.siteKey;
+    },
+
+    theme: function() {
+        return AccountsTemplates.options.reCaptcha && AccountsTemplates.options.reCaptcha.theme;
+    },
+
+    data_type: function() {
+        return AccountsTemplates.options.reCaptcha && AccountsTemplates.options.reCaptcha.data_type;
+    },
+};
diff --git a/packages/meteor-useraccounts-core/lib/templates_helpers/at_resend_verification_email_link.js b/packages/meteor-useraccounts-core/lib/templates_helpers/at_resend_verification_email_link.js
new file mode 100644
index 00000000..5587900c
--- /dev/null
+++ b/packages/meteor-useraccounts-core/lib/templates_helpers/at_resend_verification_email_link.js
@@ -0,0 +1,24 @@
+AT.prototype.atResendVerificationEmailLinkHelpers = {
+    disabled: function () {
+        return AccountsTemplates.disabled();
+    },
+    resendVerificationEmailLink: function () {
+        return AccountsTemplates.getRoutePath("resendVerificationEmail");
+    },
+    preText: function(){
+        return T9n.get(AccountsTemplates.texts.resendVerificationEmailLink_pre, markIfMissing=false);
+    },
+    linkText: function(){
+        return T9n.get(AccountsTemplates.texts.resendVerificationEmailLink_link, markIfMissing=false);
+    },
+    suffText: function(){
+        return T9n.get(AccountsTemplates.texts.resendVerificationEmailLink_suff, markIfMissing=false);
+    },
+};
+
+AT.prototype.atResendVerificationEmailLinkEvents = {
+    "click #at-resend-verification-email": function(event, t) {
+        event.preventDefault();
+        AccountsTemplates.linkClick('resendVerificationEmail');
+    },
+};
\ No newline at end of file
diff --git a/packages/meteor-useraccounts-core/lib/templates_helpers/at_result.js b/packages/meteor-useraccounts-core/lib/templates_helpers/at_result.js
new file mode 100644
index 00000000..d4b287dd
--- /dev/null
+++ b/packages/meteor-useraccounts-core/lib/templates_helpers/at_result.js
@@ -0,0 +1,7 @@
+AT.prototype.atResultHelpers = {
+    result: function() {
+        var resultText = AccountsTemplates.state.form.get("result");
+        if (resultText)
+            return T9n.get(resultText, markIfMissing=false);
+    },
+};
\ No newline at end of file
diff --git a/packages/meteor-useraccounts-core/lib/templates_helpers/at_sep.js b/packages/meteor-useraccounts-core/lib/templates_helpers/at_sep.js
new file mode 100644
index 00000000..7c27557d
--- /dev/null
+++ b/packages/meteor-useraccounts-core/lib/templates_helpers/at_sep.js
@@ -0,0 +1,5 @@
+AT.prototype.atSepHelpers = {
+    sepText: function(){
+        return T9n.get(AccountsTemplates.texts.sep, markIfMissing=false);
+    },
+};
\ No newline at end of file
diff --git a/packages/meteor-useraccounts-core/lib/templates_helpers/at_signin_link.js b/packages/meteor-useraccounts-core/lib/templates_helpers/at_signin_link.js
new file mode 100644
index 00000000..14f6e88c
--- /dev/null
+++ b/packages/meteor-useraccounts-core/lib/templates_helpers/at_signin_link.js
@@ -0,0 +1,24 @@
+AT.prototype.atSigninLinkHelpers = {
+    disabled: function() {
+        return AccountsTemplates.disabled();
+    },
+    signInLink: function(){
+        return AccountsTemplates.getRoutePath("signIn");
+    },
+    preText: function(){
+        return T9n.get(AccountsTemplates.texts.signInLink_pre, markIfMissing=false);
+    },
+    linkText: function(){
+        return T9n.get(AccountsTemplates.texts.signInLink_link, markIfMissing=false);
+    },
+    suffText: function(){
+        return T9n.get(AccountsTemplates.texts.signInLink_suff, markIfMissing=false);
+    },
+};
+
+AT.prototype.atSigninLinkEvents = {
+    "click #at-signIn": function(event, t) {
+        event.preventDefault();
+        AccountsTemplates.linkClick("signIn");
+    },
+};
diff --git a/packages/meteor-useraccounts-core/lib/templates_helpers/at_signup_link.js b/packages/meteor-useraccounts-core/lib/templates_helpers/at_signup_link.js
new file mode 100644
index 00000000..29c809a4
--- /dev/null
+++ b/packages/meteor-useraccounts-core/lib/templates_helpers/at_signup_link.js
@@ -0,0 +1,24 @@
+AT.prototype.atSignupLinkHelpers = {
+    disabled: function() {
+        return AccountsTemplates.disabled();
+    },
+    signUpLink: function(){
+        return AccountsTemplates.getRoutePath("signUp");
+    },
+    preText: function(){
+        return T9n.get(AccountsTemplates.texts.signUpLink_pre, markIfMissing=false);
+    },
+    linkText: function(){
+        return T9n.get(AccountsTemplates.texts.signUpLink_link, markIfMissing=false);
+    },
+    suffText: function(){
+        return T9n.get(AccountsTemplates.texts.signUpLink_suff, markIfMissing=false);
+    },
+};
+
+AT.prototype.atSignupLinkEvents = {
+    "click #at-signUp": function(event, t) {
+        event.preventDefault();
+        AccountsTemplates.linkClick('signUp');
+    },
+};
diff --git a/packages/meteor-useraccounts-core/lib/templates_helpers/at_social.js b/packages/meteor-useraccounts-core/lib/templates_helpers/at_social.js
new file mode 100644
index 00000000..912fd6e9
--- /dev/null
+++ b/packages/meteor-useraccounts-core/lib/templates_helpers/at_social.js
@@ -0,0 +1,105 @@
+AT.prototype.atSocialHelpers = {
+    disabled: function() {
+        if (AccountsTemplates.disabled())
+            return "disabled";
+        var user = Meteor.user();
+        if (user){
+            var numServices = 0;
+            if (user.services)
+                numServices = _.keys(user.services).length; // including "resume"
+            if (numServices === 2 && user.services[this._id])
+                return "disabled";
+        }
+    },
+    name: function(){
+        return this._id;
+    },
+    iconClass: function() {
+        var ic = AccountsTemplates.texts.socialIcons[this._id];
+        if (!ic)
+            ic = "fa fa-" + this._id;
+        return ic;
+    },
+    buttonText: function() {
+        var service = this;
+        var serviceName = this._id;
+        if (serviceName === "meteor-developer")
+            serviceName = "meteor";
+        serviceName = capitalize(serviceName);
+        if (!service.configured)
+            return T9n.get(AccountsTemplates.texts.socialConfigure, markIfMissing=false) + " " + serviceName;
+        var showAddRemove = AccountsTemplates.options.showAddRemoveServices;
+        var user = Meteor.user();
+        if (user && showAddRemove){
+            if (user.services && user.services[this._id]){
+                var numServices = _.keys(user.services).length; // including "resume"
+                if (numServices === 2)
+                    return serviceName;
+                else
+                    return T9n.get(AccountsTemplates.texts.socialRemove, markIfMissing=false) + " " + serviceName;
+            } else
+                    return T9n.get(AccountsTemplates.texts.socialAdd, markIfMissing=false) + " " + serviceName;
+        }
+        var parentData = Template.parentData();
+        var state = (parentData && parentData.state) || AccountsTemplates.getState();
+        var prefix = state === "signIn" ?
+            T9n.get(AccountsTemplates.texts.socialSignIn, markIfMissing=false) :
+            T9n.get(AccountsTemplates.texts.socialSignUp, markIfMissing=false);
+        return prefix + " " + T9n.get(AccountsTemplates.texts.socialWith, markIfMissing=false) + " " + serviceName;
+    },
+};
+
+AT.prototype.atSocialEvents = {
+    "click button": function(event, t) {
+        event.preventDefault();
+        event.currentTarget.blur();
+        if (AccountsTemplates.disabled())
+            return;
+        var user = Meteor.user();
+        if (user && user.services && user.services[this._id]){
+            var numServices = _.keys(user.services).length; // including "resume"
+            if (numServices === 2)
+                return;
+            else{
+                AccountsTemplates.setDisabled(true);
+                Meteor.call("ATRemoveService", this._id, function(error){
+                    AccountsTemplates.setDisabled(false);
+                });
+            }
+        } else {
+            AccountsTemplates.setDisabled(true);
+            var parentData = Template.parentData();
+            var state = (parentData && parentData.state) || AccountsTemplates.getState();
+            var serviceName = this._id;
+            var methodName;
+            if (serviceName === 'meteor-developer')
+                methodName = "loginWithMeteorDeveloperAccount";
+            else
+                methodName = "loginWith" + capitalize(serviceName);
+            var loginWithService = Meteor[methodName];
+            options = {
+                loginStyle: AccountsTemplates.options.socialLoginStyle,
+            };
+            if (Accounts.ui) {
+                if (Accounts.ui._options.requestPermissions[serviceName]) {
+                    options.requestPermissions = Accounts.ui._options.requestPermissions[serviceName];
+                }
+                if (Accounts.ui._options.requestOfflineToken[serviceName]) {
+                    options.requestOfflineToken = Accounts.ui._options.requestOfflineToken[serviceName];
+                }
+            }
+            loginWithService(options, function(err) {
+                AccountsTemplates.setDisabled(false);
+                if (err && err instanceof Accounts.LoginCancelledError) {
+                    // do nothing
+                }
+                else if (err && err instanceof ServiceConfiguration.ConfigError) {
+                    if (Accounts._loginButtonsSession)
+                        return Accounts._loginButtonsSession.configureService(serviceName);
+                }
+                else
+                    AccountsTemplates.submitCallback(err, state);
+            });
+        }
+    },
+};
diff --git a/packages/meteor-useraccounts-core/lib/templates_helpers/at_terms_link.js b/packages/meteor-useraccounts-core/lib/templates_helpers/at_terms_link.js
new file mode 100644
index 00000000..0ada35cb
--- /dev/null
+++ b/packages/meteor-useraccounts-core/lib/templates_helpers/at_terms_link.js
@@ -0,0 +1,33 @@
+AT.prototype.atTermsLinkHelpers = {
+    disabled: function() {
+        return AccountsTemplates.disabled();
+    },
+    text: function(){
+        return T9n.get(AccountsTemplates.texts.termsPreamble, markIfMissing=false);
+    },
+    privacyUrl: function(){
+        return AccountsTemplates.options.privacyUrl;
+    },
+    privacyLinkText: function(){
+        return T9n.get(AccountsTemplates.texts.termsPrivacy, markIfMissing=false);
+    },
+    showTermsAnd: function(){
+        return !!AccountsTemplates.options.privacyUrl && !!AccountsTemplates.options.termsUrl;
+    },
+    and: function(){
+        return T9n.get(AccountsTemplates.texts.termsAnd, markIfMissing=false);
+    },
+    termsUrl: function(){
+        return AccountsTemplates.options.termsUrl;
+    },
+    termsLinkText: function(){
+        return T9n.get(AccountsTemplates.texts.termsTerms, markIfMissing=false);
+    },
+};
+
+AT.prototype.atTermsLinkEvents = {
+    "click a": function(event) {
+        if (AccountsTemplates.disabled())
+            event.preventDefault();
+    },
+};
\ No newline at end of file
diff --git a/packages/meteor-useraccounts-core/lib/templates_helpers/at_title.js b/packages/meteor-useraccounts-core/lib/templates_helpers/at_title.js
new file mode 100644
index 00000000..74f711b9
--- /dev/null
+++ b/packages/meteor-useraccounts-core/lib/templates_helpers/at_title.js
@@ -0,0 +1,7 @@
+AT.prototype.atTitleHelpers = {
+  title: function() {
+    var parentData = Template.currentData();
+    var state = (parentData && parentData.state) || AccountsTemplates.getState();
+    return T9n.get(AccountsTemplates.texts.title[state], markIfMissing = false);
+  },
+};
diff --git a/packages/meteor-useraccounts-core/lib/templates_helpers/ensure_signed_in.html b/packages/meteor-useraccounts-core/lib/templates_helpers/ensure_signed_in.html
new file mode 100644
index 00000000..08c0d7e3
--- /dev/null
+++ b/packages/meteor-useraccounts-core/lib/templates_helpers/ensure_signed_in.html
@@ -0,0 +1,12 @@
+<!-- Template level auth -->
+<template name="ensureSignedIn">
+  {{#if signedIn}}
+    {{> Template.dynamic template=template}}
+  {{else}}
+    {{#if auth}}
+      {{> Template.dynamic template=auth}}
+    {{else}}
+      {{> fullPageAtForm}}
+    {{/if}}
+  {{/if}}
+</template>
diff --git a/packages/meteor-useraccounts-core/lib/templates_helpers/ensure_signed_in.js b/packages/meteor-useraccounts-core/lib/templates_helpers/ensure_signed_in.js
new file mode 100644
index 00000000..3d947aae
--- /dev/null
+++ b/packages/meteor-useraccounts-core/lib/templates_helpers/ensure_signed_in.js
@@ -0,0 +1,15 @@
+
+Template.ensureSignedIn.helpers({
+  signedIn: function () {
+    if (!Meteor.user()) {
+      AccountsTemplates.setState(AccountsTemplates.options.defaultState, function(){
+        var err = AccountsTemplates.texts.errors.mustBeLoggedIn;
+        AccountsTemplates.state.form.set('error', [err]);
+      });
+      return false;
+    } else {
+      AccountsTemplates.clearError();
+      return true;
+    }
+  }
+});
diff --git a/packages/meteor-useraccounts-core/lib/utils.js b/packages/meteor-useraccounts-core/lib/utils.js
new file mode 100644
index 00000000..30b108ca
--- /dev/null
+++ b/packages/meteor-useraccounts-core/lib/utils.js
@@ -0,0 +1,19 @@
+capitalize = function(str) {
+  return str.charAt(0).toUpperCase() + str.slice(1);
+};
+
+signedInAs =  function() {
+  var user = Meteor.user();
+
+  if (user) {
+    if (user.username) {
+      return user.username;
+    } else if (user.profile && user.profile.name) {
+      return user.profile.name;
+    } else if (user.emails && user.emails[0]) {
+      return user.emails[0].address;
+    } else {
+      return "Signed In";
+    }
+  }
+};
diff --git a/packages/meteor-useraccounts-core/package.js b/packages/meteor-useraccounts-core/package.js
new file mode 100644
index 00000000..f6e0ca32
--- /dev/null
+++ b/packages/meteor-useraccounts-core/package.js
@@ -0,0 +1,94 @@
+'use strict';
+
+Package.describe({
+  summary: 'Meteor sign up and sign in templates core package.',
+  version: '1.14.2',
+  name: 'useraccounts:core',
+  git: 'https://github.com/meteor-useraccounts/core.git',
+});
+
+Package.onUse(function(api) {
+  //api.versionsFrom('METEOR@1.0.3');
+
+  api.use([
+    'accounts-base',
+    'check',
+    'underscore',
+    'reactive-var',
+  ], ['client', 'server']);
+
+  api.use([
+    'blaze',
+    'reactive-dict',
+    'templating',
+    'jquery'
+  ], 'client');
+
+  api.use([
+    'http'
+  ], 'server');
+
+  api.imply([
+    'accounts-base',
+    'softwarerero:accounts-t9n@1.3.3',
+  ], ['client', 'server']);
+
+  api.imply([
+    'templating',
+  ], ['client']);
+
+  api.addFiles([
+    'lib/field.js',
+    'lib/core.js',
+    'lib/server.js',
+    'lib/methods.js',
+    'lib/server_methods.js',
+  ], ['server']);
+
+  api.addFiles([
+    'lib/utils.js',
+    'lib/field.js',
+    'lib/core.js',
+    'lib/client.js',
+    'lib/templates_helpers/at_error.js',
+    'lib/templates_helpers/at_form.js',
+    'lib/templates_helpers/at_input.js',
+    'lib/templates_helpers/at_nav_button.js',
+    'lib/templates_helpers/at_oauth.js',
+    'lib/templates_helpers/at_pwd_form.js',
+    'lib/templates_helpers/at_pwd_form_btn.js',
+    'lib/templates_helpers/at_pwd_link.js',
+    'lib/templates_helpers/at_reCaptcha.js',
+    'lib/templates_helpers/at_resend_verification_email_link.js',
+    'lib/templates_helpers/at_result.js',
+    'lib/templates_helpers/at_sep.js',
+    'lib/templates_helpers/at_signin_link.js',
+    'lib/templates_helpers/at_signup_link.js',
+    'lib/templates_helpers/at_social.js',
+    'lib/templates_helpers/at_terms_link.js',
+    'lib/templates_helpers/at_title.js',
+    'lib/templates_helpers/at_message.js',
+    'lib/templates_helpers/ensure_signed_in.html',
+    'lib/templates_helpers/ensure_signed_in.js',
+    'lib/methods.js',
+  ], ['client']);
+
+  api.export([
+    'AccountsTemplates',
+  ], ['client', 'server']);
+});
+
+Package.onTest(function(api) {
+  api.use('useraccounts:core@1.14.2');
+
+  api.use([
+    'accounts-password',
+    'tinytest',
+    'test-helpers',
+    'underscore',
+  ], ['client', 'server']);
+
+  api.addFiles([
+    'tests/tests.js',
+  ], ['client', 'server']);
+});
diff --git a/packages/meteor-useraccounts-core/tests/tests.js b/packages/meteor-useraccounts-core/tests/tests.js
new file mode 100644
index 00000000..985200a3
--- /dev/null
+++ b/packages/meteor-useraccounts-core/tests/tests.js
@@ -0,0 +1,215 @@
+Tinytest.add("AccountsTemplates - addField/removeField", function(test) {
+    // Calls after AccountsTemplates.init()
+    AccountsTemplates._initialized = true;
+    test.throws(function() {
+        AccountsTemplates.addField("");
+    }, function(err) {
+        if (err instanceof Error && err.message === "AccountsTemplates.addField should strictly be called before AccountsTemplates.init!")
+            return true;
+    });
+    test.throws(function() {
+        AccountsTemplates.removeField("");
+    }, function(err) {
+        if (err instanceof Error && err.message === "AccountsTemplates.removeField should strictly be called before AccountsTemplates.init!")
+            return true;
+    });
+    AccountsTemplates._initialized = false;
+
+    // Trying to remove a non-existing field
+    test.throws(function() {
+        AccountsTemplates.removeField("foo");
+    }, function(err) {
+        if (err instanceof Error && err.message == "A field called foo does not exist!")
+            return true;
+    });
+
+    // Trying to remove an existing field
+    var email = AccountsTemplates.removeField("email");
+    test.isUndefined(AccountsTemplates.getField("email"));
+    // ...and puts it back in for tests re-run
+    AccountsTemplates.addField(email);
+
+    // Trying to add an already existing field
+    test.throws(function() {
+        var pwd = AccountsTemplates.getField("password");
+        AccountsTemplates.addField(pwd);
+    }, function(err) {
+        if (err instanceof Error && err.message == "A field called password already exists!")
+            return true;
+    });
+
+    var login = {
+        _id: "login",
+        displayName: "Email",
+        type: "email"
+    };
+
+    // Successful add
+    AccountsTemplates.addField(login);
+    // ...and removes it for tests re-run
+    AccountsTemplates.removeField("login");
+
+    // Invalid field.type
+    test.throws(function() {
+        AccountsTemplates.addField({
+            _id: "foo",
+            displayName: "Foo",
+            type: "bar"
+        });
+    }, function(err) {
+        if (err instanceof Error && err.message == "field.type is not valid!")
+            return true;
+    });
+
+    // Invalid minLength
+    test.throws(function() {
+        AccountsTemplates.addField({
+            _id: "first-name",
+            displayName: "First Name",
+            type: "text",
+            minLength: 0
+        });
+    }, function(err) {
+        if (err instanceof Error && err.message == "field.minLength should be greater than zero!")
+            return true;
+    });
+    // Invalid maxLength
+    test.throws(function() {
+        AccountsTemplates.addField({
+            _id: "first-name",
+            displayName: "First Name",
+            type: "text",
+            maxLength: 0
+        });
+    }, function(err) {
+        if (err instanceof Error && err.message == "field.maxLength should be greater than zero!")
+            return true;
+    });
+    // maxLength < minLength
+    test.throws(function() {
+        AccountsTemplates.addField({
+            _id: "first-name",
+            displayName: "First Name",
+            type: "text",
+            minLength: 2,
+            maxLength: 1
+        });
+    }, function(err) {
+        if (err instanceof Error && err.message == "field.maxLength should be greater than field.maxLength!")
+            return true;
+    });
+
+    // Successful add
+    var first_name = {
+        _id: "first_name",
+        displayName: "First Name",
+        type: "text",
+        minLength: 2,
+        maxLength: 50,
+        required: true
+    };
+    AccountsTemplates.addField(first_name);
+    // Now removes it to be consistent with tests re-run
+    AccountsTemplates.removeField("first_name");
+});
+
+
+Tinytest.add("AccountsTemplates - addFields", function(test) {
+    // Fake uninitialized state...
+    AccountsTemplates._initialized = false;
+
+    if (Meteor.isClient) {
+        // addFields does not exist client-side
+        test.throws(function() {
+            AccountsTemplates.addFields();
+        });
+    } else {
+        // Not an array of objects
+        test.throws(function() {
+            AccountsTemplates.addFields("");
+        }, function(err) {
+            if (err instanceof Error && err.message === "field argument should be an array of valid field objects!")
+                return true;
+        });
+        test.throws(function() {
+            AccountsTemplates.addFields(100);
+        }, function(err) {
+            if (err instanceof Error && err.message === "field argument should be an array of valid field objects!")
+                return true;
+        });
+        // Empty array
+        test.throws(function() {
+            AccountsTemplates.addFields([]);
+        }, function(err) {
+            if (err instanceof Error && err.message === "field argument should be an array of valid field objects!")
+                return true;
+        });
+
+        // Successful add
+        var first_name = {
+            _id: "first_name",
+            displayName: "First Name",
+            type: "text",
+            minLength: 2,
+            maxLength: 50,
+            required: true
+        };
+        var last_name = {
+            _id: "last_name",
+            displayName: "Last Name",
+            type: "text",
+            minLength: 2,
+            maxLength: 100,
+            required: false
+        };
+        AccountsTemplates.addFields([first_name, last_name]);
+        // Now removes ot to be consistend with tests re-run
+        AccountsTemplates.removeField("first_name");
+        AccountsTemplates.removeField("last_name");
+    }
+    // Restores initialized state...
+    AccountsTemplates._initialized = true;
+});
+
+
+Tinytest.add("AccountsTemplates - setState/getState", function(test) {
+    if (Meteor.isServer) {
+        // getState does not exist server-side
+        test.throws(function() {
+            AccountsTemplates.getState();
+        });
+        // setState does not exist server-side
+        test.throws(function() {
+            AccountsTemplates.setState();
+        });
+    } else {
+        _.each(AccountsTemplates.STATES, function(state){
+            AccountsTemplates.setState(state);
+            test.equal(AccountsTemplates.getState(), state);
+        });
+        // Setting an invalid state should throw a Meteor.Error
+        test.throws(function() {
+            AccountsTemplates.setState("foo");
+        }, function(err) {
+            if (err instanceof Meteor.Error && err.details == "accounts-templates-core package got an invalid state value!")
+                return true;
+        });
+    }
+});
+
+
+// -------------------------------------
+// TODO: complite the following tests...
+// -------------------------------------
+
+
+Tinytest.add("AccountsTemplates - configure", function(test) {
+    if (Meteor.isClient) {
+        // configure does not exist client-side
+        test.throws(function() {
+            AccountsTemplates.configure({});
+        });
+    } else {
+        // TODO: write actual tests...
+    }
+});
\ No newline at end of file
diff --git a/packages/wekan-accounts-cas/LICENSE b/packages/wekan-accounts-cas/LICENSE
new file mode 100644
index 00000000..c2d69158
--- /dev/null
+++ b/packages/wekan-accounts-cas/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014-2019 The Wekan Team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/packages/wekan-accounts-cas/README.md b/packages/wekan-accounts-cas/README.md
new file mode 100644
index 00000000..3e246c4f
--- /dev/null
+++ b/packages/wekan-accounts-cas/README.md
@@ -0,0 +1,88 @@
+This is a merged repository of useful forks of: atoy40:accounts-cas
+===================
+([(https://atmospherejs.com/atoy40/accounts-cas](https://atmospherejs.com/atoy40/accounts-cas))
+
+## Essential improvements by ppoulard to atoy40 and xaionaro versions
+
+* Added support of CAS attributes
+
+With this plugin, you can pick CAS attributes : https://github.com/joshchan/node-cas/wiki/CAS-Attributes
+
+Moved to Wekan GitHub org from from https://github.com/ppoulard/meteor-accounts-cas
+
+## Install
+
+```
+cd ~site
+mkdir packages
+cd packages
+git clone https://github.com/wekan/meteor-accounts-cas
+cd ~site
+meteor add wekan:accounts-cas
+```
+
+## Usage
+
+Put CAS settings in Meteor.settings (for example using METEOR_SETTINGS env or --settings) like so:
+
+If casVersion is not defined, it will assume you use CAS 1.0. (note by xaionaro: option `casVersion` seems to be just ignored in the code, ATM).
+
+Server side settings:
+
+```
+Meteor.settings = {
+    "cas": {
+        "baseUrl": "https://cas.example.com/cas",
+        "autoClose": true,
+        "validateUrl":"https://cas.example.com/cas/p3/serviceValidate",
+        "casVersion": 3.0,
+        "attributes": {
+            "debug" : true
+        }
+    },
+}
+```
+
+CAS `attributes` settings :
+
+* `attributes`: by default `{}` : all default values below will apply
+* *  `debug` : by default `false` ; `true` will print to the server console the CAS attribute names to map, the CAS attributes values retrieved, if necessary the new user account created, and finally the user to use
+* *  `id` : by default, the CAS user is used for the user account, but you can specified another CAS attribute
+* *  `firstname` : by default `cas:givenName` ; but you can use your own CAS attribute
+* *  `lastname` : by default `cas:sn` (respectively) ; but you can use your own CAS attribute
+* *  `fullname` : by default unused, but if you specify your own CAS attribute, it will be used instead of the `firstname` + `lastname`
+* *  `mail` : by default `cas:mail`
+
+Client side settings:
+
+```
+Meteor.settings = {
+	"public": {
+		"cas": {
+			"loginUrl": "https://cas.example.com/login",
+			"serviceParam": "service",
+			"popupWidth": 810,
+			"popupHeight": 610,
+			"popup": true,
+		}
+	}
+}
+```
+
+`proxyUrl` is not required. Setup [ROOT_URL](http://docs.meteor.com/api/core.html#Meteor-absoluteUrl) environment variable instead.
+
+Then, to start authentication, you have to call the following method from the client (for example in a click handler) :
+
+```
+Meteor.loginWithCas([callback]);
+```
+
+It must open a popup containing you CAS login form or redirect to the CAS login form (depending on "popup" setting).
+
+If popup is disabled (== false), then it's required to execute `Meteor.initCas([callback])` in `Meteor.startup` of the client side. ATM, `Meteor.initCas()` completes authentication.
+
+## Examples
+
+* [https://devel.mephi.ru/dyokunev/start-mephi-ru](https://devel.mephi.ru/dyokunev/start-mephi-ru)
+
+
diff --git a/packages/wekan-accounts-cas/cas_client.js b/packages/wekan-accounts-cas/cas_client.js
new file mode 100644
index 00000000..bd94be6b
--- /dev/null
+++ b/packages/wekan-accounts-cas/cas_client.js
@@ -0,0 +1,112 @@
+
+function addParameterToURL(url, param){
+  var urlSplit = url.split('?');
+  return url+(urlSplit.length>0 ? '?':'&') + param;
+}
+
+Meteor.initCas = function(callback) {
+    const casTokenMatch = window.location.href.match(/[?&]casToken=([^&]+)/);
+    if (casTokenMatch == null) {
+        return;
+    }
+
+    window.history.pushState('', document.title, window.location.href.replace(/([&?])casToken=[^&]+[&]?/, '$1').replace(/[?&]+$/g, ''));
+
+    Accounts.callLoginMethod({
+        methodArguments: [{ cas: { credentialToken: casTokenMatch[1] } }],
+        userCallback: function(err){
+            if (err == null) {
+                // should we do anything on success?
+            }
+            if (callback != null) {
+                callback(err);
+            }
+        }
+    });
+}
+
+Meteor.loginWithCas = function(options, callback) {
+
+    var credentialToken = Random.id();
+
+    if (!Meteor.settings.public &&
+        !Meteor.settings.public.cas &&
+        !Meteor.settings.public.cas.loginUrl) {
+        return;
+    }
+
+    var settings = Meteor.settings.public.cas;
+
+    var backURL = window.location.href.replace('#', '');
+    if (options != null && options.redirectUrl != null)
+        backURL = options.redirectUrl;
+
+    var serviceURL = addParameterToURL(backURL, 'casToken='+credentialToken);
+
+    var loginUrl = settings.loginUrl +
+        "?" + (settings.serviceParam || "service") + "=" +
+        encodeURIComponent(serviceURL)
+
+    if (settings.popup == false) {
+      window.location = loginUrl;
+      return;
+    }
+
+    var popup = openCenteredPopup(
+        loginUrl,
+        settings.width || 800,
+        settings.height || 600
+    );
+
+    var checkPopupOpen = setInterval(function() {
+        try {
+	    if(popup && popup.document && popup.document.getElementById('popupCanBeClosed')) {
+                popup.close();
+      	    }
+            // Fix for #328 - added a second test criteria (popup.closed === undefined)
+            // to humour this Android quirk:
+            // http://code.google.com/p/android/issues/detail?id=21061
+            var popupClosed = popup.closed || popup.closed === undefined;
+        } catch (e) {
+            // For some unknown reason, IE9 (and others?) sometimes (when
+            // the popup closes too quickly?) throws "SCRIPT16386: No such
+            // interface supported" when trying to read 'popup.closed'. Try
+            // again in 100ms.
+            return;
+        }
+
+        if (popupClosed) {
+            clearInterval(checkPopupOpen);
+
+            // check auth on server.
+            Accounts.callLoginMethod({
+                methodArguments: [{ cas: { credentialToken: credentialToken } }],
+                userCallback: callback
+            });
+        }
+    }, 100);
+};
+
+var openCenteredPopup = function(url, width, height) {
+  var screenX = typeof window.screenX !== 'undefined'
+  ? window.screenX : window.screenLeft;
+  var screenY = typeof window.screenY !== 'undefined'
+  ? window.screenY : window.screenTop;
+  var outerWidth = typeof window.outerWidth !== 'undefined'
+  ? window.outerWidth : document.body.clientWidth;
+  var outerHeight = typeof window.outerHeight !== 'undefined'
+  ? window.outerHeight : (document.body.clientHeight - 22);
+  // XXX what is the 22?
+
+  // Use `outerWidth - width` and `outerHeight - height` for help in
+  // positioning the popup centered relative to the current window
+  var left = screenX + (outerWidth - width) / 2;
+  var top = screenY + (outerHeight - height) / 2;
+  var features = ('width=' + width + ',height=' + height +
+      ',left=' + left + ',top=' + top + ',scrollbars=yes');
+
+  var newwindow = window.open(url, '_blank', features);
+  if (newwindow.focus)
+    newwindow.focus();
+  return newwindow;
+};
diff --git a/packages/wekan-accounts-cas/cas_client_cordova.js b/packages/wekan-accounts-cas/cas_client_cordova.js
new file mode 100644
index 00000000..c7f95b50
--- /dev/null
+++ b/packages/wekan-accounts-cas/cas_client_cordova.js
@@ -0,0 +1,71 @@
+
+Meteor.loginWithCas = function(callback) {
+
+  var credentialToken = Random.id();
+
+  if (!Meteor.settings.public &&
+      !Meteor.settings.public.cas &&
+      !Meteor.settings.public.cas.loginUrl) {
+    return;
+  }
+
+  var settings = Meteor.settings.public.cas;
+
+  var loginUrl = settings.loginUrl +
+      "?" + (settings.service || "service") + "=" +
+      Meteor.absoluteUrl('_cas/') +
+      credentialToken;
+
+
+  var fail = function (err) {
+    Meteor._debug("Error from OAuth popup: " + JSON.stringify(err));
+  };
+
+  // When running on an android device, we sometimes see the
+  // `pageLoaded` callback fire twice for the final page in the OAuth
+  // popup, even though the page only loads once. This is maybe an
+  // Android bug or maybe something intentional about how onPageFinished
+  // works that we don't understand and isn't well-documented.
+  var oauthFinished = false;
+
+  var pageLoaded = function (event) {
+    if (oauthFinished) {
+      return;
+    }
+
+    if (event.url.indexOf(Meteor.absoluteUrl('_cas')) === 0) {
+
+      oauthFinished = true;
+
+      // On iOS, this seems to prevent "Warning: Attempt to dismiss from
+      // view controller <MainViewController: ...> while a presentation
+      // or dismiss is in progress". My guess is that the last
+      // navigation of the OAuth popup is still in progress while we try
+      // to close the popup. See
+      // https://issues.apache.org/jira/browse/CB-2285.
+      //
+      // XXX Can we make this timeout smaller?
+      setTimeout(function () {
+        popup.close();
+        // check auth on server.
+        Accounts.callLoginMethod({
+          methodArguments: [{ cas: { credentialToken: credentialToken } }],
+          userCallback: callback
+        });
+      }, 100);
+    }
+  };
+
+  var onExit = function () {
+    popup.removeEventListener('loadstop', pageLoaded);
+    popup.removeEventListener('loaderror', fail);
+    popup.removeEventListener('exit', onExit);
+  };
+
+  var popup = window.open(loginUrl, '_blank', 'location=no,hidden=no');
+  popup.addEventListener('loadstop', pageLoaded);
+  popup.addEventListener('loaderror', fail);
+  popup.addEventListener('exit', onExit);
+  popup.show();
+
+};
\ No newline at end of file
diff --git a/packages/wekan-accounts-cas/cas_server.js b/packages/wekan-accounts-cas/cas_server.js
new file mode 100644
index 00000000..15c1b174
--- /dev/null
+++ b/packages/wekan-accounts-cas/cas_server.js
@@ -0,0 +1,281 @@
+"use strict";
+
+const Fiber = Npm.require('fibers');
+const https = Npm.require('https');
+const url = Npm.require('url');
+const xmlParser = Npm.require('xml2js');
+
+// Library
+class CAS {
+  constructor(options) {
+    options = options || {};
+
+    if (!options.validate_url) {
+      throw new Error('Required CAS option `validateUrl` missing.');
+    }
+
+    if (!options.service) {
+      throw new Error('Required CAS option `service` missing.');
+    }
+
+    const cas_url = url.parse(options.validate_url);
+    if (cas_url.protocol != 'https:' ) {
+      throw new Error('Only https CAS servers are supported.');
+    } else if (!cas_url.hostname) {
+      throw new Error('Option `validateUrl` must be a valid url like: https://example.com/cas/serviceValidate');
+    } else {
+      this.hostname = cas_url.host;
+      this.port = 443;// Should be 443 for https
+      this.validate_path = cas_url.pathname;
+    }
+
+    this.service = options.service;
+  }
+
+  validate(ticket, callback) {
+    const httparams = {
+      host: this.hostname,
+      port: this.port,
+      path: url.format({
+        pathname: this.validate_path,
+        query: {ticket: ticket, service: this.service},
+      }),
+    };
+
+    https.get(httparams, (res) => {
+      res.on('error', (e) => {
+        console.log('error' + e);
+        callback(e);
+      });
+
+      // Read result
+      res.setEncoding('utf8');
+      let response = '';
+      res.on('data', (chunk) => {
+        response += chunk;
+      });
+
+      res.on('end', (error) => {
+        if (error) {
+          console.log('error callback');
+          console.log(error);
+          callback(undefined, false);
+        } else {
+          xmlParser.parseString(response, (err, result) => {
+            if (err) {
+              console.log('Bad response format.');
+              callback({message: 'Bad response format. XML could not parse it'});
+            } else {
+              if (result['cas:serviceResponse'] == null) {
+                console.log('Empty response.');
+                callback({message: 'Empty response.'});
+              }
+              if (result['cas:serviceResponse']['cas:authenticationSuccess']) {
+                var userData = {
+                  id: result['cas:serviceResponse']['cas:authenticationSuccess'][0]['cas:user'][0].toLowerCase(),
+                }
+                const attributes = result['cas:serviceResponse']['cas:authenticationSuccess'][0]['cas:attributes'][0];
+                for (var fieldName in attributes) {
+                  userData[fieldName] = attributes[fieldName][0];
+                };
+                callback(undefined, true, userData);
+              } else {
+                callback(undefined, false);
+              }
+            }
+          });
+        }
+      });
+    });
+  }
+}
+////// END OF CAS MODULE
+
+let _casCredentialTokens = {};
+let _userData = {};
+
+//RoutePolicy.declare('/_cas/', 'network');
+
+// Listen to incoming OAuth http requests
+WebApp.connectHandlers.use((req, res, next) => {
+  // Need to create a Fiber since we're using synchronous http calls and nothing
+  // else is wrapping this in a fiber automatically
+
+  Fiber(() => {
+    middleware(req, res, next);
+  }).run();
+});
+
+const middleware = (req, res, next) => {
+  // Make sure to catch any exceptions because otherwise we'd crash
+  // the runner
+  try {
+    urlParsed = url.parse(req.url, true);
+
+    // Getting the ticket (if it's defined in GET-params)
+    // If no ticket, then request will continue down the default
+    // middlewares.
+    const query = urlParsed.query;
+    if (query == null) {
+      next();
+      return;
+    }
+    const ticket = query.ticket;
+    if (ticket == null) {
+      next();
+      return;
+    }
+
+    const serviceUrl = Meteor.absoluteUrl(urlParsed.href.replace(/^\//g, '')).replace(/([&?])ticket=[^&]+[&]?/g, '$1').replace(/[?&]+$/g, '');
+    const redirectUrl = serviceUrl;//.replace(/([&?])casToken=[^&]+[&]?/g, '$1').replace(/[?&]+$/g, '');
+
+    // get auth token
+    const credentialToken = query.casToken;
+    if (!credentialToken) {
+      end(res, redirectUrl);
+      return;
+    }
+
+    // validate ticket
+    casValidate(req, ticket, credentialToken, serviceUrl, () => {
+      end(res, redirectUrl);
+    });
+
+  } catch (err) {
+    console.log("account-cas: unexpected error : " + err.message);
+    end(res, redirectUrl);
+  }
+};
+
+const casValidate = (req, ticket, token, service, callback) => {
+  // get configuration
+  if (!Meteor.settings.cas/* || !Meteor.settings.cas.validate*/) {
+    throw new Error('accounts-cas: unable to get configuration.');
+  }
+
+  const cas = new CAS({
+    validate_url: Meteor.settings.cas.validateUrl,
+    service: service,
+    version: Meteor.settings.cas.casVersion
+  });
+
+  cas.validate(ticket, (err, status, userData) => {
+    if (err) {
+      console.log("accounts-cas: error when trying to validate " + err);
+      console.log(err);
+    } else {
+      if (status) {
+        console.log(`accounts-cas: user validated ${userData.id}
+          (${JSON.stringify(userData)})`);
+        _casCredentialTokens[token] = { id: userData.id };
+        _userData = userData;
+      } else {
+        console.log("accounts-cas: unable to validate " + ticket);
+      }
+    }
+    callback();
+  });
+
+  return;
+};
+
+/*
+ * Register a server-side login handle.
+ * It is call after Accounts.callLoginMethod() is call from client.
+ */
+ Accounts.registerLoginHandler((options) => {
+  if (!options.cas)
+    return undefined;
+
+  if (!_hasCredential(options.cas.credentialToken)) {
+    throw new Meteor.Error(Accounts.LoginCancelledError.numericError,
+      'no matching login attempt found');
+  }
+
+  const result = _retrieveCredential(options.cas.credentialToken);
+
+  const attrs = Meteor.settings.cas.attributes || {};
+  // CAS keys
+  const fn = attrs.firstname || 'cas:givenName';
+  const ln = attrs.lastname || 'cas:sn';
+  const full = attrs.fullname;
+  const mail = attrs.mail || 'cas:mail'; // or 'email'
+  const uid = attrs.id || 'id';
+  if (attrs.debug) {
+    if (full) {
+      console.log(`CAS fields : id:"${uid}", fullname:"${full}", mail:"${mail}"`);
+    } else {
+      console.log(`CAS fields : id:"${uid}", firstname:"${fn}", lastname:"${ln}", mail:"${mail}"`);
+    }
+  }
+  const name = full ? _userData[full] : _userData[fn] + ' ' +  _userData[ln];
+  // https://docs.meteor.com/api/accounts.html#Meteor-users
+  options = {
+    // _id: Meteor.userId()
+    username: _userData[uid], // Unique name
+    emails: [
+      { address: _userData[mail], verified: true }
+    ],
+    createdAt: new Date(),
+    profile: {
+      // The profile is writable by the user by default.
+      name: name,
+      fullname : name,
+      email : _userData[mail]
+    },
+    active: true,
+    globalRoles: ['user']
+  };
+  if (attrs.debug) {
+    console.log(`CAS response : ${JSON.stringify(result)}`);
+  }
+  let user = Meteor.users.findOne({ 'username': options.username });
+  if (! user) {
+    if (attrs.debug) {
+      console.log(`Creating user account ${JSON.stringify(options)}`);
+    }
+    const userId = Accounts.insertUserDoc({}, options);
+    user = Meteor.users.findOne(userId);
+  }
+  if (attrs.debug) {
+    console.log(`Using user account ${JSON.stringify(user)}`);
+  }
+  return { userId: user._id };
+});
+
+const _hasCredential = (credentialToken) => {
+  return _.has(_casCredentialTokens, credentialToken);
+}
+
+/*
+ * Retrieve token and delete it to avoid replaying it.
+ */
+const _retrieveCredential = (credentialToken) => {
+  const result = _casCredentialTokens[credentialToken];
+  delete _casCredentialTokens[credentialToken];
+  return result;
+}
+
+const closePopup = (res) => {
+  if (Meteor.settings.cas && Meteor.settings.cas.popup == false) {
+    return;
+  }
+  res.writeHead(200, {'Content-Type': 'text/html'});
+  const content = '<html><body><div id="popupCanBeClosed"></div></body></html>';
+  res.end(content, 'utf-8');
+}
+
+const redirect = (res, whereTo) => {
+  res.writeHead(302, {'Location': whereTo});
+  const content = '<html><head><meta http-equiv="refresh" content="0; url='+whereTo+'" /></head><body>Redirection to <a href='+whereTo+'>'+whereTo+'</a></body></html>';
+  res.end(content, 'utf-8');
+  return
+}
+
+const end = (res, whereTo) => {
+  if (Meteor.settings.cas && Meteor.settings.cas.popup == false) {
+    redirect(res, whereTo);
+  } else {
+    closePopup(res);
+  }
+}
diff --git a/packages/wekan-accounts-cas/package.js b/packages/wekan-accounts-cas/package.js
new file mode 100644
index 00000000..d4b46c54
--- /dev/null
+++ b/packages/wekan-accounts-cas/package.js
@@ -0,0 +1,29 @@
+Package.describe({
+  summary: "CAS support for accounts",
+  version: "0.1.0",
+  name: "wekan-accounts-cas",
+  git: "https://github.com/wekan/wekan-accounts-cas"
+});
+
+Package.onUse(function(api) {
+  api.versionsFrom('METEOR@1.3.5.1');
+  api.use('routepolicy', 'server');
+  api.use('webapp', 'server');
+  api.use('accounts-base', ['client', 'server']);
+  // Export Accounts (etc) to packages using this one.
+  api.imply('accounts-base', ['client', 'server']);
+  api.use('underscore');
+  api.add_files('cas_client.js', 'web.browser');
+  api.add_files('cas_client_cordova.js', 'web.cordova');
+  api.add_files('cas_server.js', 'server');
+
+});
+
+Npm.depends({
+  xml2js: "0.4.17",
+  cas: "https://github.com/anrizal/node-cas/tarball/2baed530842e7a437f8f71b9346bcac8e84773cc"
+});
+
+Cordova.depends({
+  'cordova-plugin-inappbrowser': '1.2.0'
+});
diff --git a/packages/wekan-accounts-oidc/.gitignore b/packages/wekan-accounts-oidc/.gitignore
new file mode 100644
index 00000000..5379d4c3
--- /dev/null
+++ b/packages/wekan-accounts-oidc/.gitignore
@@ -0,0 +1 @@
+.versions
diff --git a/packages/wekan-accounts-oidc/LICENSE.txt b/packages/wekan-accounts-oidc/LICENSE.txt
new file mode 100644
index 00000000..c7be3264
--- /dev/null
+++ b/packages/wekan-accounts-oidc/LICENSE.txt
@@ -0,0 +1,14 @@
+Copyright (C) 2016 SWITCH 
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
diff --git a/packages/wekan-accounts-oidc/README.md b/packages/wekan-accounts-oidc/README.md
new file mode 100644
index 00000000..ce0b5738
--- /dev/null
+++ b/packages/wekan-accounts-oidc/README.md
@@ -0,0 +1,75 @@
+# salleman:accounts-oidc package
+
+A Meteor login service for OpenID Connect (OIDC).
+
+## Installation
+
+    meteor add salleman:accounts-oidc
+
+## Usage
+
+`Meteor.loginWithOidc(options, callback)`
+* `options` - object containing options, see below (optional)
+* `callback` - callback function (optional)
+
+#### Example
+
+```js
+Template.myTemplateName.events({
+  'click #login-button': function() {
+    Meteor.loginWithOidc();
+  }
+);
+```
+
+
+## Options
+
+These options override service configuration stored in the database.
+
+* `loginStyle`: `redirect` or `popup`
+* `redirectUrl`: Where to redirect after successful login. Only used if `loginStyle` is set to `redirect`
+
+## Manual Configuration Setup
+
+You can manually configure this package by upserting the service configuration on startup. First, add the `service-configuration` package:
+
+    meteor add service-configuration
+
+### Service Configuration
+
+The following service configuration are available:
+
+* `clientId`: OIDC client identifier
+* `secret`: OIDC client shared secret
+* `serverUrl`: URL of the OIDC server. e.g. `https://openid.example.org:8443`
+* `authorizationEndpoint`: Endpoint of the OIDC authorization service, e.g. `/oidc/authorize`
+* `tokenEndpoint`: Endpoint of the OIDC token service, e.g. `/oidc/token`
+* `userinfoEndpoint`: Endpoint of the OIDC userinfo service, e.g. `/oidc/userinfo`
+* `idTokenWhitelistFields`: A list of fields from IDToken to be added to Meteor.user().services.oidc object
+
+### Project Configuration
+
+Then in your project:
+
+```js
+if (Meteor.isServer) {
+  Meteor.startup(function () {
+    ServiceConfiguration.configurations.upsert(
+      { service: 'oidc' },
+      {
+        $set: {
+          loginStyle: 'redirect',
+          clientId: 'my-client-id-registered-with-the-oidc-server',
+          secret: 'my-client-shared-secret',
+          serverUrl: 'https://openid.example.org',
+          authorizationEndpoint: '/oidc/authorize',
+          tokenEndpoint: '/oidc/token',
+          userinfoEndpoint: '/oidc/userinfo',
+          idTokenWhitelistFields: []
+        }
+      }
+    );
+  });
+}
+```
diff --git a/packages/wekan-accounts-oidc/oidc.js b/packages/wekan-accounts-oidc/oidc.js
new file mode 100644
index 00000000..75cd89ae
--- /dev/null
+++ b/packages/wekan-accounts-oidc/oidc.js
@@ -0,0 +1,22 @@
+Accounts.oauth.registerService('oidc');
+
+if (Meteor.isClient) {
+  Meteor.loginWithOidc = function(options, callback) {
+    // support a callback without options
+    if (! callback && typeof options === "function") {
+      callback = options;
+      options = null;
+    }
+
+    var credentialRequestCompleteCallback = Accounts.oauth.credentialRequestCompleteHandler(callback);
+    Oidc.requestCredential(options, credentialRequestCompleteCallback);
+  };
+} else {
+  Accounts.addAutopublishFields({
+    // not sure whether the OIDC api can be used from the browser,
+    // thus not sure if we should be sending access tokens; but we do it
+    // for all other oauth2 providers, and it may come in handy.
+    forLoggedInUser: ['services.oidc'],
+    forOtherUsers: ['services.oidc.id']
+  });
+}
diff --git a/packages/wekan-accounts-oidc/oidc_login_button.css b/packages/wekan-accounts-oidc/oidc_login_button.css
new file mode 100644
index 00000000..da42120b
--- /dev/null
+++ b/packages/wekan-accounts-oidc/oidc_login_button.css
@@ -0,0 +1,3 @@
+#login-buttons-image-oidc {
+    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACQUlEQVQ4T5WTy2taQRTGv4kSXw0IoYIihCjFmhhfhUqW9a+o0I2LInTRRbtw05V2I9KQuuimi24KXQqChIhQQcQgGGNz0YpvMCG1yL1tGqvBZsKMIIXcjQcOcznnfL+ZOecOEUVx4/Ly8mQ6neqxhKlUKmltbc1Nut2uqJ/bEnJAkiTmEhEEgVqtViiVyjuAP70j/Pj6Htbglzu52WyGdrsNUq1Wqc1mk939+9sHPP7wTVM232g0QMrlMrXb7bIFndgcbAk3ZPP1eh2kVCrRra2tRcFoNEK1WoXf78fg3Rxsfl3H3t4e3G43dnd3wWrMZjNqtRpIsVhcAFKpFPL5PBfF43H8TDj49/2XAvb393F2dgaNRgNKKaLR6ByQz+epw+HAwcEBisUijEYjgsEg1Go1pA9ODtC/+MZFDCKKIo9FIhEIggCSy+Xozs4OYrEY2ChDoRAIIVww/ujhxdrnFTSbTX6Cfr+Pi4sLhMNhnJ6egmSzWepyuZBIJGAwGBAIBLiY2ezTI74qg2UoFIqFr6ys4OrqiveKHB4eckAmk8FgMMD29jZ8Ph8XKj4/5uu/ZyXZKXBAOp2mHo+H/0isD6zDOp0Om5ubsAuvcA+/8ffpkSygUqmApFIp6vV6+b2ZsNfrodVqYTgcwqXtwul04pfhiSzg+PgYJJlMUovFwhvIbHV1lTs70c3NDSaTCa6vr+8A2FvodDr8CmwuepPJtIDIbvdfkInPz89ZRCKFQmFjNBqdjMfjpZ6jVquV1tfX3bcYegI7CyIWlgAAAABJRU5ErkJggg==');
+}
diff --git a/packages/wekan-accounts-oidc/package.js b/packages/wekan-accounts-oidc/package.js
new file mode 100644
index 00000000..251fb265
--- /dev/null
+++ b/packages/wekan-accounts-oidc/package.js
@@ -0,0 +1,19 @@
+Package.describe({
+  summary: "OpenID Connect (OIDC) for Meteor accounts",
+  version: "1.0.10",
+  name: "wekan-accounts-oidc",
+  git: "https://github.com/wekan/meteor-accounts-oidc.git",
+
+});
+
+Package.onUse(function(api) {
+  api.use('accounts-base@1.2.0', ['client', 'server']);
+  // Export Accounts (etc) to packages using this one.
+  api.imply('accounts-base', ['client', 'server']);
+  api.use('accounts-oauth@1.1.0', ['client', 'server']);
+  api.use('wekan-oidc@1.0.10', ['client', 'server']);
+
+  api.addFiles('oidc_login_button.css', 'client');
+
+  api.addFiles('oidc.js');
+});
diff --git a/packages/wekan-ldap/LICENSE b/packages/wekan-ldap/LICENSE
new file mode 100644
index 00000000..c2d69158
--- /dev/null
+++ b/packages/wekan-ldap/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014-2019 The Wekan Team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/packages/wekan-ldap/README.md b/packages/wekan-ldap/README.md
new file mode 100644
index 00000000..4f41d023
--- /dev/null
+++ b/packages/wekan-ldap/README.md
@@ -0,0 +1,130 @@
+# meteor-ldap
+
+This packages is based on the RocketChat ldap login package
+
+# settings definition
+
+LDAP_Enable: Self explanatory
+
+LDAP_Port: The port of the LDAP server
+
+LDAP_Host: The host server for the LDAP server
+
+LDAP_BaseDN: The base DN for the LDAP Tree
+
+LDAP_Login_Fallback: Fallback on the default authentication method
+
+LDAP_Reconnect: Reconnect to the server if the connection is lost
+
+LDAP_Timeout: self explanatory
+
+LDAP_Idle_Timeout: self explanatory
+
+LDAP_Connect_Timeout: self explanatory
+
+LDAP_Authentication: If the LDAP needs a user account to search
+
+LDAP_Authentication_UserDN: The search user DN
+
+LDAP_Authentication_Password: The password for the search user
+
+LDAP_Internal_Log_Level: The logging level for the module
+
+LDAP_Background_Sync: If the sync of the users should be done in the
+background
+
+LDAP_Background_Sync_Interval: At which interval does the background task sync
+
+LDAP_Encryption: If using LDAPS, set it to 'ssl', else it will use 'ldap://'
+
+LDAP_CA_Cert: The certification for the LDAPS server
+
+LDAP_Reject_Unauthorized: Reject Unauthorized Certificate
+
+LDAP_User_Search_Filter:
+
+LDAP_User_Search_Scope:
+
+LDAP_User_Search_Field: Which field is used to find the user
+
+LDAP_Search_Page_Size:
+
+LDAP_Search_Size_Limit:
+
+LDAP_Group_Filter_Enable: enable group filtering
+
+LDAP_Group_Filter_ObjectClass: The object class for filtering
+
+LDAP_Group_Filter_Group_Id_Attribute:
+
+LDAP_Group_Filter_Group_Member_Attribute:
+
+LDAP_Group_Filter_Group_Member_Format:
+
+LDAP_Group_Filter_Group_Name:
+
+LDAP_Unique_Identifier_Field: This field is sometimes class GUID ( Globally Unique Identifier)
+
+UTF8_Names_Slugify: Convert the username to utf8
+
+LDAP_Username_Field: Which field contains the ldap username
+
+LDAP_Fullname_Field: Which field contains the ldap full name
+
+LDAP_Email_Match_Enable: Allow existing account matching by e-mail address when username does not match
+
+LDAP_Email_Match_Require: Require existing account matching by e-mail address when username does match
+
+LDAP_Email_Match_Verified: Require existing account email address to be verified for matching
+
+LDAP_Email_Field: Which field contains the LDAP e-mail address
+
+LDAP_Sync_User_Data:
+
+LDAP_Sync_User_Data_FieldMap:
+
+Accounts_CustomFields:
+
+LDAP_Default_Domain: The default domain of the ldap it is used to create email if the field is not map correctly with the LDAP_Sync_User_Data_FieldMap
+
+
+
+
+# example settings.json
+```
+{
+  "LDAP_Port": 389,
+  "LDAP_Host": "localhost",
+  "LDAP_BaseDN": "ou=user,dc=example,dc=org",
+  "LDAP_Login_Fallback": false,
+  "LDAP_Reconnect": true,
+  "LDAP_Timeout": 10000,
+  "LDAP_Idle_Timeout": 10000,
+  "LDAP_Connect_Timeout": 10000,
+  "LDAP_Authentication": true,
+  "LDAP_Authentication_UserDN": "cn=admin,dc=example,dc=org",
+  "LDAP_Authentication_Password": "admin",
+  "LDAP_Internal_Log_Level": "debug",
+  "LDAP_Background_Sync": false,
+  "LDAP_Background_Sync_Interval": "100",
+  "LDAP_Encryption": false,
+  "LDAP_Reject_Unauthorized": false,
+  "LDAP_Group_Filter_Enable": false,
+  "LDAP_Search_Page_Size": 0,
+  "LDAP_Search_Size_Limit": 0,
+  "LDAP_User_Search_Filter": "",
+  "LDAP_User_Search_Field": "uid",
+  "LDAP_User_Search_Scope": "",
+  "LDAP_Unique_Identifier_Field": "guid",
+  "LDAP_Username_Field": "uid",
+  "LDAP_Fullname_Field": "cn",
+  "LDAP_Email_Match_Enable": true,
+  "LDAP_Email_Match_Require": false,
+  "LDAP_Email_Match_Verified": false,
+  "LDAP_Email_Field": "mail",
+  "LDAP_Sync_User_Data": false,
+  "LDAP_Sync_User_Data_FieldMap": "{\"cn\":\"name\", \"mail\":\"email\"}",
+  "LDAP_Merge_Existing_Users": true,
+  "UTF8_Names_Slugify": true
+}
+```
diff --git a/packages/wekan-ldap/client/loginHelper.js b/packages/wekan-ldap/client/loginHelper.js
new file mode 100644
index 00000000..48a290c1
--- /dev/null
+++ b/packages/wekan-ldap/client/loginHelper.js
@@ -0,0 +1,52 @@
+// Pass in username, password as normal
+// customLdapOptions should be passed in if you want to override LDAP_DEFAULTS
+// on any particular call (if you have multiple ldap servers you'd like to connect to)
+// You'll likely want to set the dn value here {dn: "..."}
+Meteor.loginWithLDAP = function(username, password, customLdapOptions, callback) {
+  // Retrieve arguments as array
+  const args = [];
+  for (let i = 0; i < arguments.length; i++) {
+    args.push(arguments[i]);
+  }
+  // Pull username and password
+  username = args.shift();
+  password = args.shift();
+
+  // Check if last argument is a function
+  // if it is, pop it off and set callback to it
+  if (typeof args[args.length-1] === 'function') {
+    callback = args.pop();
+  } else {
+    callback = null;
+  }
+
+  // if args still holds options item, grab it
+  if (args.length > 0) {
+    customLdapOptions = args.shift();
+  } else {
+    customLdapOptions = {};
+  }
+
+  // Set up loginRequest object
+  const loginRequest = {
+    ldap: true,
+    username,
+    ldapPass: password,
+    ldapOptions: customLdapOptions,
+  };
+
+  Accounts.callLoginMethod({
+    // Call login method with ldap = true
+    // This will hook into our login handler for ldap
+    methodArguments: [loginRequest],
+    userCallback(error/*, result*/) {
+      if (error) {
+        if (callback) {
+          callback(error);
+        }
+      } else if (callback) {
+        callback();
+      }
+    },
+  });
+};
diff --git a/packages/wekan-ldap/package.js b/packages/wekan-ldap/package.js
new file mode 100644
index 00000000..feda02e9
--- /dev/null
+++ b/packages/wekan-ldap/package.js
@@ -0,0 +1,32 @@
+Package.describe({
+  name: 'wekan-ldap',
+  version: '0.0.2',
+  // Brief, one-line summary of the package.
+  summary: 'Basic meteor login with ldap',
+  // URL to the Git repository containing the source code for this package.
+  git: 'https://github.com/wekan/wekan-ldap',
+  // By default, Meteor will default to using README.md for documentation.
+  // To avoid submitting documentation, set this field to null.
+  documentation: 'README.md'
+});
+
+
+Package.onUse(function(api) {
+  api.versionsFrom('1.0.3.1');
+	api.use('yasaricli:slugify@0.0.5');
+	api.use('ecmascript@0.9.0');
+	api.use('underscore');
+	api.use('sha');
+	api.use('templating', 'client');
+
+	api.use('accounts-base', 'server');
+	api.use('accounts-password', 'server');
+
+	api.addFiles('client/loginHelper.js', 'client');
+
+	api.mainModule('server/index.js', 'server');
+});
+
+Npm.depends({
+  ldapjs: '1.0.2',
+});
diff --git a/packages/wekan-ldap/server/index.js b/packages/wekan-ldap/server/index.js
new file mode 100644
index 00000000..e3ff85a1
--- /dev/null
+++ b/packages/wekan-ldap/server/index.js
@@ -0,0 +1 @@
+import './loginHandler';
diff --git a/packages/wekan-ldap/server/ldap.js b/packages/wekan-ldap/server/ldap.js
new file mode 100644
index 00000000..555a30aa
--- /dev/null
+++ b/packages/wekan-ldap/server/ldap.js
@@ -0,0 +1,555 @@
+import ldapjs from 'ldapjs';
+import util from 'util';
+import Bunyan from 'bunyan';
+import { log_debug, log_info, log_warn, log_error } from './logger';
+
+export default class LDAP {
+  constructor(){
+    this.ldapjs = ldapjs;
+
+    this.connected = false;
+
+    this.options = {
+      host: this.constructor.settings_get('LDAP_HOST'),
+      port: this.constructor.settings_get('LDAP_PORT'),
+      Reconnect: this.constructor.settings_get('LDAP_RECONNECT'),
+      timeout: this.constructor.settings_get('LDAP_TIMEOUT'),
+      connect_timeout: this.constructor.settings_get('LDAP_CONNECT_TIMEOUT'),
+      idle_timeout: this.constructor.settings_get('LDAP_IDLE_TIMEOUT'),
+      encryption: this.constructor.settings_get('LDAP_ENCRYPTION'),
+      ca_cert: this.constructor.settings_get('LDAP_CA_CERT'),
+      reject_unauthorized: this.constructor.settings_get('LDAP_REJECT_UNAUTHORIZED') || false,
+      Authentication: this.constructor.settings_get('LDAP_AUTHENTIFICATION'),
+      Authentication_UserDN: this.constructor.settings_get('LDAP_AUTHENTIFICATION_USERDN'),
+      Authentication_Password: this.constructor.settings_get('LDAP_AUTHENTIFICATION_PASSWORD'),
+      Authentication_Fallback: this.constructor.settings_get('LDAP_LOGIN_FALLBACK'),
+      BaseDN: this.constructor.settings_get('LDAP_BASEDN'),
+      Internal_Log_Level: this.constructor.settings_get('INTERNAL_LOG_LEVEL'),
+      User_Search_Filter: this.constructor.settings_get('LDAP_USER_SEARCH_FILTER'),
+      User_Search_Scope: this.constructor.settings_get('LDAP_USER_SEARCH_SCOPE'),
+      User_Search_Field: this.constructor.settings_get('LDAP_USER_SEARCH_FIELD'),
+      Search_Page_Size: this.constructor.settings_get('LDAP_SEARCH_PAGE_SIZE'),
+      Search_Size_Limit: this.constructor.settings_get('LDAP_SEARCH_SIZE_LIMIT'),
+      group_filter_enabled: this.constructor.settings_get('LDAP_GROUP_FILTER_ENABLE'),
+      group_filter_object_class: this.constructor.settings_get('LDAP_GROUP_FILTER_OBJECTCLASS'),
+      group_filter_group_id_attribute: this.constructor.settings_get('LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE'),
+      group_filter_group_member_attribute: this.constructor.settings_get('LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE'),
+      group_filter_group_member_format: this.constructor.settings_get('LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT'),
+      group_filter_group_name: this.constructor.settings_get('LDAP_GROUP_FILTER_GROUP_NAME'),
+    };
+  }
+
+  static settings_get(name, ...args) {
+    let value = process.env[name];
+    if (value !== undefined) {
+      if (value === 'true' || value === 'false') {
+        value = JSON.parse(value);
+      } else if (value !== '' && !isNaN(value)) {
+        value = Number(value);
+      }
+      return value;
+    } else {
+      log_warn(`Lookup for unset variable: ${name}`);
+    }
+  }
+  connectSync(...args) {
+    if (!this._connectSync) {
+      this._connectSync = Meteor.wrapAsync(this.connectAsync, this);
+    }
+    return this._connectSync(...args);
+  }
+
+  searchAllSync(...args) {
+    if (!this._searchAllSync) {
+      this._searchAllSync = Meteor.wrapAsync(this.searchAllAsync, this);
+    }
+    return this._searchAllSync(...args);
+  }
+
+  connectAsync(callback) {
+    log_info('Init setup');
+
+    let replied = false;
+
+    const connectionOptions = {
+      url: `${ this.options.host }:${ this.options.port }`,
+      timeout: this.options.timeout,
+      connectTimeout: this.options.connect_timeout,
+      idleTimeout: this.options.idle_timeout,
+      reconnect: this.options.Reconnect,
+    };
+
+    if (this.options.Internal_Log_Level !== 'disabled') {
+      connectionOptions.log = new Bunyan({
+        name: 'ldapjs',
+        component: 'client',
+        stream: process.stderr,
+        level: this.options.Internal_Log_Level,
+      });
+    }
+
+    const tlsOptions = {
+      rejectUnauthorized: this.options.reject_unauthorized,
+    };
+
+    if (this.options.ca_cert && this.options.ca_cert !== '') {
+      // Split CA cert into array of strings
+      const chainLines = this.constructor.settings_get('LDAP_CA_CERT').split('\n');
+      let cert = [];
+      const ca = [];
+      chainLines.forEach((line) => {
+        cert.push(line);
+        if (line.match(/-END CERTIFICATE-/)) {
+          ca.push(cert.join('\n'));
+          cert = [];
+        }
+      });
+      tlsOptions.ca = ca;
+    }
+
+    if (this.options.encryption === 'ssl') {
+      connectionOptions.url = `ldaps://${ connectionOptions.url }`;
+      connectionOptions.tlsOptions = tlsOptions;
+    } else {
+      connectionOptions.url = `ldap://${ connectionOptions.url }`;
+    }
+
+    log_info('Connecting', connectionOptions.url);
+    log_debug(`connectionOptions${  util.inspect(connectionOptions)}`);
+
+    this.client = ldapjs.createClient(connectionOptions);
+
+    this.bindSync = Meteor.wrapAsync(this.client.bind, this.client);
+
+    this.client.on('error', (error) => {
+      log_error('connection', error);
+      if (replied === false) {
+        replied = true;
+        callback(error, null);
+      }
+    });
+
+    this.client.on('idle', () => {
+      log_info('Idle');
+      this.disconnect();
+    });
+
+    this.client.on('close', () => {
+      log_info('Closed');
+    });
+
+    if (this.options.encryption === 'tls') {
+      // Set host parameter for tls.connect which is used by ldapjs starttls. This shouldn't be needed in newer nodejs versions (e.g v5.6.0).
+      // https://github.com/RocketChat/Rocket.Chat/issues/2035
+      // https://github.com/mcavage/node-ldapjs/issues/349
+      tlsOptions.host = this.options.host;
+
+      log_info('Starting TLS');
+      log_debug('tlsOptions', tlsOptions);
+
+      this.client.starttls(tlsOptions, null, (error, response) => {
+        if (error) {
+          log_error('TLS connection', error);
+          if (replied === false) {
+            replied = true;
+            callback(error, null);
+          }
+          return;
+        }
+
+        log_info('TLS connected');
+        this.connected = true;
+        if (replied === false) {
+          replied = true;
+          callback(null, response);
+        }
+      });
+    } else {
+      this.client.on('connect', (response) => {
+        log_info('LDAP connected');
+        this.connected = true;
+        if (replied === false) {
+          replied = true;
+          callback(null, response);
+        }
+      });
+    }
+
+    setTimeout(() => {
+      if (replied === false) {
+        log_error('connection time out', connectionOptions.connectTimeout);
+        replied = true;
+        callback(new Error('Timeout'));
+      }
+    }, connectionOptions.connectTimeout);
+  }
+
+  getUserFilter(username) {
+    const filter = [];
+
+    if (this.options.User_Search_Filter !== '') {
+      if (this.options.User_Search_Filter[0] === '(') {
+        filter.push(`${ this.options.User_Search_Filter }`);
+      } else {
+        filter.push(`(${ this.options.User_Search_Filter })`);
+      }
+    }
+
+    const usernameFilter = this.options.User_Search_Field.split(',').map((item) => `(${ item }=${ username })`);
+
+    if (usernameFilter.length === 0) {
+      log_error('LDAP_LDAP_User_Search_Field not defined');
+    } else if (usernameFilter.length === 1) {
+      filter.push(`${ usernameFilter[0] }`);
+    } else {
+      filter.push(`(|${ usernameFilter.join('') })`);
+    }
+
+    return `(&${ filter.join('') })`;
+  }
+
+  bindIfNecessary() {
+    if (this.domainBinded === true) {
+      return;
+    }
+
+    if (this.options.Authentication !== true) {
+      return;
+    }
+
+    log_info('Binding UserDN', this.options.Authentication_UserDN);
+    this.bindSync(this.options.Authentication_UserDN, this.options.Authentication_Password);
+    this.domainBinded = true;
+  }
+
+  searchUsersSync(username, page) {
+    this.bindIfNecessary();
+
+    const searchOptions = {
+      filter: this.getUserFilter(username),
+      scope: this.options.User_Search_Scope || 'sub',
+      sizeLimit: this.options.Search_Size_Limit,
+    };
+
+    if (this.options.Search_Page_Size > 0) {
+      searchOptions.paged = {
+        pageSize: this.options.Search_Page_Size,
+        pagePause: !!page,
+      };
+    }
+
+    log_info('Searching user', username);
+    log_debug('searchOptions', searchOptions);
+    log_debug('BaseDN', this.options.BaseDN);
+
+    if (page) {
+      return this.searchAllPaged(this.options.BaseDN, searchOptions, page);
+    }
+
+    return this.searchAllSync(this.options.BaseDN, searchOptions);
+  }
+
+  getUserByIdSync(id, attribute) {
+    this.bindIfNecessary();
+
+    const Unique_Identifier_Field = this.constructor.settings_get('LDAP_UNIQUE_IDENTIFIER_FIELD').split(',');
+
+    let filter;
+
+    if (attribute) {
+      filter = new this.ldapjs.filters.EqualityFilter({
+        attribute,
+        value: new Buffer(id, 'hex'),
+      });
+    } else {
+      const filters = [];
+      Unique_Identifier_Field.forEach((item) => {
+        filters.push(new this.ldapjs.filters.EqualityFilter({
+          attribute: item,
+          value: new Buffer(id, 'hex'),
+        }));
+      });
+
+      filter = new this.ldapjs.filters.OrFilter({filters});
+    }
+
+    const searchOptions = {
+      filter,
+      scope: 'sub',
+    };
+
+    log_info('Searching by id', id);
+    log_debug('search filter', searchOptions.filter.toString());
+    log_debug('BaseDN', this.options.BaseDN);
+
+    const result = this.searchAllSync(this.options.BaseDN, searchOptions);
+
+    if (!Array.isArray(result) || result.length === 0) {
+      return;
+    }
+
+    if (result.length > 1) {
+      log_error('Search by id', id, 'returned', result.length, 'records');
+    }
+
+    return result[0];
+  }
+
+  getUserByUsernameSync(username) {
+    this.bindIfNecessary();
+
+    const searchOptions = {
+      filter: this.getUserFilter(username),
+      scope: this.options.User_Search_Scope || 'sub',
+    };
+
+    log_info('Searching user', username);
+    log_debug('searchOptions', searchOptions);
+    log_debug('BaseDN', this.options.BaseDN);
+
+    const result = this.searchAllSync(this.options.BaseDN, searchOptions);
+
+    if (!Array.isArray(result) || result.length === 0) {
+      return;
+    }
+
+    if (result.length > 1) {
+      log_error('Search by username', username, 'returned', result.length, 'records');
+    }
+
+    return result[0];
+  }
+
+  getUserGroups(username, ldapUser){
+    if (!this.options.group_filter_enabled) {
+      return true;
+    }
+
+    const filter = ['(&'];
+
+    if (this.options.group_filter_object_class !== '') {
+      filter.push(`(objectclass=${ this.options.group_filter_object_class })`);
+    }
+
+    if (this.options.group_filter_group_member_attribute !== '') {
+      const format_value = ldapUser[this.options.group_filter_group_member_format];
+      if( format_value ) {
+        filter.push(`(${ this.options.group_filter_group_member_attribute }=${ format_value })`);
+      }
+    }
+
+    filter.push(')');
+
+    const searchOptions = {
+      filter: filter.join('').replace(/#{username}/g, username),
+      scope: 'sub',
+    };
+
+    log_debug('Group list filter LDAP:', searchOptions.filter);
+
+    const result = this.searchAllSync(this.options.BaseDN, searchOptions);
+
+    if (!Array.isArray(result) || result.length === 0) {
+      return [];
+    }
+
+    const grp_identifier = this.options.group_filter_group_id_attribute || 'cn';
+    const groups = [];
+    result.map((item) => {
+      groups.push( item[ grp_identifier ] );
+    });
+    log_debug(`Groups: ${  groups.join(', ')}`);
+    return groups;
+
+  }
+
+  isUserInGroup(username, ldapUser) {
+    if (!this.options.group_filter_enabled) {
+      return true;
+    }
+
+    const grps = this.getUserGroups(username, ldapUser);
+
+    const filter = ['(&'];
+
+    if (this.options.group_filter_object_class !== '') {
+      filter.push(`(objectclass=${ this.options.group_filter_object_class })`);
+    }
+
+    if (this.options.group_filter_group_member_attribute !== '') {
+      const format_value = ldapUser[this.options.group_filter_group_member_format];
+      if( format_value ) {
+        filter.push(`(${ this.options.group_filter_group_member_attribute }=${ format_value })`);
+      }
+    }
+
+    if (this.options.group_filter_group_id_attribute !== '') {
+      filter.push(`(${ this.options.group_filter_group_id_attribute }=${ this.options.group_filter_group_name })`);
+    }
+    filter.push(')');
+
+    const searchOptions = {
+      filter: filter.join('').replace(/#{username}/g, username),
+      scope: 'sub',
+    };
+
+    log_debug('Group filter LDAP:', searchOptions.filter);
+
+    const result = this.searchAllSync(this.options.BaseDN, searchOptions);
+
+    if (!Array.isArray(result) || result.length === 0) {
+      return false;
+    }
+    return true;
+  }
+
+  extractLdapEntryData(entry) {
+    const values = {
+      _raw: entry.raw,
+    };
+
+    Object.keys(values._raw).forEach((key) => {
+      const value = values._raw[key];
+
+      if (!['thumbnailPhoto', 'jpegPhoto'].includes(key)) {
+        if (value instanceof Buffer) {
+          values[key] = value.toString();
+        } else {
+          values[key] = value;
+        }
+      }
+    });
+
+    return values;
+  }
+
+  searchAllPaged(BaseDN, options, page) {
+    this.bindIfNecessary();
+
+    const processPage = ({entries, title, end, next}) => {
+      log_info(title);
+      // Force LDAP idle to wait the record processing
+      this.client._updateIdle(true);
+      page(null, entries, {end, next: () => {
+        // Reset idle timer
+        this.client._updateIdle();
+        next && next();
+      }});
+    };
+
+    this.client.search(BaseDN, options, (error, res) => {
+      if (error) {
+        log_error(error);
+        page(error);
+        return;
+      }
+
+      res.on('error', (error) => {
+        log_error(error);
+        page(error);
+        return;
+      });
+
+      let entries = [];
+
+      const internalPageSize = options.paged && options.paged.pageSize > 0 ? options.paged.pageSize * 2 : 500;
+
+      res.on('searchEntry', (entry) => {
+        entries.push(this.extractLdapEntryData(entry));
+
+        if (entries.length >= internalPageSize) {
+          processPage({
+            entries,
+            title: 'Internal Page',
+            end: false,
+          });
+          entries = [];
+        }
+      });
+
+      res.on('page', (result, next) => {
+        if (!next) {
+          this.client._updateIdle(true);
+          processPage({
+            entries,
+            title: 'Final Page',
+            end: true,
+          });
+        } else if (entries.length) {
+          log_info('Page');
+          processPage({
+            entries,
+            title: 'Page',
+            end: false,
+            next,
+          });
+          entries = [];
+        }
+      });
+
+      res.on('end', () => {
+        if (entries.length) {
+          processPage({
+            entries,
+            title: 'Final Page',
+            end: true,
+          });
+          entries = [];
+        }
+      });
+    });
+  }
+
+  searchAllAsync(BaseDN, options, callback) {
+    this.bindIfNecessary();
+
+    this.client.search(BaseDN, options, (error, res) => {
+      if (error) {
+        log_error(error);
+        callback(error);
+        return;
+      }
+
+      res.on('error', (error) => {
+        log_error(error);
+        callback(error);
+        return;
+      });
+
+      const entries = [];
+
+      res.on('searchEntry', (entry) => {
+        entries.push(this.extractLdapEntryData(entry));
+      });
+
+      res.on('end', () => {
+        log_info('Search result count', entries.length);
+        callback(null, entries);
+      });
+    });
+  }
+
+  authSync(dn, password) {
+    log_info('Authenticating', dn);
+
+    try {
+      if (password === '') {
+        throw new Error('Password is not provided');
+      }
+      this.bindSync(dn, password);
+      log_info('Authenticated', dn);
+      return true;
+    } catch (error) {
+      log_info('Not authenticated', dn);
+      log_debug('error', error);
+      return false;
+    }
+  }
+
+  disconnect() {
+    this.connected = false;
+    this.domainBinded = false;
+    log_info('Disconecting');
+    this.client.unbind();
+  }
+}
diff --git a/packages/wekan-ldap/server/logger.js b/packages/wekan-ldap/server/logger.js
new file mode 100644
index 00000000..afd77112
--- /dev/null
+++ b/packages/wekan-ldap/server/logger.js
@@ -0,0 +1,15 @@
+const isLogEnabled = (process.env.LDAP_LOG_ENABLED === 'true');
+
+
+function log (level, message, data) { 
+    if (isLogEnabled) {
+        console.log(`[${level}] ${message} ${ data ? JSON.stringify(data, null, 2) : '' }`);
+    }
+}
+
+function log_debug (...args) { log('DEBUG', ...args); }
+function log_info (...args) { log('INFO', ...args); }
+function log_warn (...args) { log('WARN', ...args); }
+function log_error (...args) { log('ERROR', ...args); }
+
+export { log, log_debug, log_info, log_warn, log_error };
diff --git a/packages/wekan-ldap/server/loginHandler.js b/packages/wekan-ldap/server/loginHandler.js
new file mode 100644
index 00000000..a8f013d7
--- /dev/null
+++ b/packages/wekan-ldap/server/loginHandler.js
@@ -0,0 +1,224 @@
+import {slug, getLdapUsername, getLdapEmail, getLdapUserUniqueID, syncUserData, addLdapUser} from './sync';
+import LDAP from './ldap';
+import { log_debug, log_info, log_warn, log_error } from './logger';
+
+function fallbackDefaultAccountSystem(bind, username, password) {
+  if (typeof username === 'string') {
+    if (username.indexOf('@') === -1) {
+      username = {username};
+    } else {
+      username = {email: username};
+    }
+  }
+
+  log_info('Fallback to default account system: ', username );
+
+  const loginRequest = {
+    user: username,
+    password: {
+      digest: SHA256(password),
+      algorithm: 'sha-256',
+    },
+  };
+  log_debug('Fallback options: ', loginRequest);
+
+  return Accounts._runLoginHandlers(bind, loginRequest);
+}
+
+Accounts.registerLoginHandler('ldap', function(loginRequest) {
+  if (!loginRequest.ldap || !loginRequest.ldapOptions) {
+    return undefined;
+  }
+
+  log_info('Init LDAP login', loginRequest.username);
+
+  if (LDAP.settings_get('LDAP_ENABLE') !== true) {
+    return fallbackDefaultAccountSystem(this, loginRequest.username, loginRequest.ldapPass);
+  }
+
+  const self = this;
+  const ldap = new LDAP();
+  let ldapUser;
+
+  try {
+    ldap.connectSync();
+    const users = ldap.searchUsersSync(loginRequest.username);
+
+    if (users.length !== 1) {
+      log_info('Search returned', users.length, 'record(s) for', loginRequest.username);
+      throw new Error('User not Found');
+    }
+
+    if (ldap.authSync(users[0].dn, loginRequest.ldapPass) === true) {
+      if (ldap.isUserInGroup(loginRequest.username, users[0])) {
+        ldapUser = users[0];
+      } else {
+        throw new Error('User not in a valid group');
+      }
+    } else {
+      log_info('Wrong password for', loginRequest.username);
+    }
+  } catch (error) {
+    log_error(error);
+  }
+
+  if (ldapUser === undefined) {
+    if (LDAP.settings_get('LDAP_LOGIN_FALLBACK') === true) {
+      return fallbackDefaultAccountSystem(self, loginRequest.username, loginRequest.ldapPass);
+    }
+
+    throw new Meteor.Error('LDAP-login-error', `LDAP Authentication failed with provided username [${ loginRequest.username }]`);
+  }
+
+  // Look to see if user already exists
+
+  let userQuery;
+
+  const Unique_Identifier_Field = getLdapUserUniqueID(ldapUser);
+  let user;
+
+  // Attempt to find user by unique identifier
+
+  if (Unique_Identifier_Field) {
+    userQuery = {
+      'services.ldap.id': Unique_Identifier_Field.value,
+    };
+
+    log_info('Querying user');
+    log_debug('userQuery', userQuery);
+
+    user = Meteor.users.findOne(userQuery);
+  }
+
+  // Attempt to find user by username
+
+  let username;
+  let email;
+
+  if (LDAP.settings_get('LDAP_USERNAME_FIELD') !== '') {
+    username = slug(getLdapUsername(ldapUser));
+  } else {
+    username = slug(loginRequest.username);
+  }
+
+  if(LDAP.settings_get('LDAP_EMAIL_FIELD') !== '') {
+    email = getLdapEmail(ldapUser);
+  }
+
+  if (!user) {
+    if(email && LDAP.settings_get('LDAP_EMAIL_MATCH_REQUIRE') === true) {
+      if(LDAP.settings_get('LDAP_EMAIL_MATCH_VERIFIED') === true) {
+        userQuery = {
+          '_id' : username,
+          'emails.0.address' : email,
+          'emails.0.verified' : true
+        };
+      } else {
+        userQuery = {
+          '_id' : username,
+          'emails.0.address' : email
+        };
+      }
+    } else {
+      userQuery = {
+        username
+      };
+    }
+
+    log_debug('userQuery', userQuery);
+
+    user = Meteor.users.findOne(userQuery);
+  }
+
+  // Attempt to find user by e-mail address only
+
+  if (!user && email && LDAP.settings_get('LDAP_EMAIL_MATCH_ENABLE') === true) {
+
+    log_info('No user exists with username', username, '- attempting to find by e-mail address instead');
+
+    if(LDAP.settings_get('LDAP_EMAIL_MATCH_VERIFIED') === true) {
+      userQuery = {
+        'emails.0.address': email,
+        'emails.0.verified' : true
+      };
+    } else {
+      userQuery = {
+        'emails.0.address' : email
+      };
+    }
+
+    log_debug('userQuery', userQuery);
+
+    user = Meteor.users.findOne(userQuery);
+
+  }
+
+  // Login user if they exist
+  if (user) {
+    if (user.authenticationMethod !== 'ldap' && LDAP.settings_get('LDAP_MERGE_EXISTING_USERS') !== true) {
+      log_info('User exists without "authenticationMethod : ldap"');
+      throw new Meteor.Error('LDAP-login-error', `LDAP Authentication succeded, but there's already a matching Wekan account in MongoDB`);
+    }
+
+    log_info('Logging user');
+
+    const stampedToken = Accounts._generateStampedLoginToken();
+    const update_data = {
+      $push: {
+        'services.resume.loginTokens': Accounts._hashStampedToken(stampedToken),
+      },
+    };
+
+    if( LDAP.settings_get('LDAP_SYNC_GROUP_ROLES') === true ) {
+      log_debug('Updating Groups/Roles');
+      const groups = ldap.getUserGroups(username, ldapUser);
+
+      if( groups.length > 0 ) {
+        Roles.setUserRoles(user._id, groups );
+        log_info(`Updated roles to:${  groups.join(',')}`);
+      }
+    }
+
+    Meteor.users.update(user._id, update_data );
+
+    syncUserData(user, ldapUser);
+
+    if (LDAP.settings_get('LDAP_LOGIN_FALLBACK') === true) {
+      Accounts.setPassword(user._id, loginRequest.ldapPass, {logout: false});
+    }
+
+    return {
+      userId: user._id,
+      token: stampedToken.token,
+    };
+  }
+
+  // Create new user
+
+  log_info('User does not exist, creating', username);
+
+  if (LDAP.settings_get('LDAP_USERNAME_FIELD') === '') {
+    username = undefined;
+  }
+
+  if (LDAP.settings_get('LDAP_LOGIN_FALLBACK') !== true) {
+    loginRequest.ldapPass = undefined;
+  }
+
+  const result = addLdapUser(ldapUser, username, loginRequest.ldapPass);
+
+  if( LDAP.settings_get('LDAP_SYNC_GROUP_ROLES') === true ) {
+    const groups = ldap.getUserGroups(username, ldapUser);
+    if( groups.length > 0 ) {
+      Roles.setUserRoles(result.userId, groups );
+      log_info(`Set roles to:${  groups.join(',')}`);
+    }
+  }
+
+
+  if (result instanceof Error) {
+    throw result;
+  }
+
+  return result;
+});
diff --git a/packages/wekan-ldap/server/sync.js b/packages/wekan-ldap/server/sync.js
new file mode 100644
index 00000000..141ef349
--- /dev/null
+++ b/packages/wekan-ldap/server/sync.js
@@ -0,0 +1,447 @@
+import _ from 'underscore';
+import LDAP from './ldap';
+import { log_debug, log_info, log_warn, log_error } from './logger';
+
+Object.defineProperty(Object.prototype, "getLDAPValue", {
+  value: function (prop) {
+      const self = this;
+      for (let key in self) {
+          if (key.toLowerCase() == prop.toLowerCase()) {
+              return self[key];
+          }
+      }
+  },
+
+  enumerable: false
+});
+
+export function slug(text) {
+  if (LDAP.settings_get('LDAP_UTF8_NAMES_SLUGIFY') !== true) {
+    return text;
+  }
+  text = slugify(text, '.');
+  return text.replace(/[^0-9a-z-_.]/g, '');
+}
+
+function templateVarHandler (variable, object) {
+
+  const templateRegex = /#{([\w\-]+)}/gi;
+  let match = templateRegex.exec(variable);
+  let tmpVariable = variable;
+
+  if (match == null) {
+    if (!object.hasOwnProperty(variable)) {
+      return;
+    }
+    return object[variable];
+  } else {
+    while (match != null) {
+      const tmplVar = match[0];
+      const tmplAttrName = match[1];
+
+      if (!object.hasOwnProperty(tmplAttrName)) {
+        return;
+      }
+
+      const attrVal = object[tmplAttrName];
+      tmpVariable = tmpVariable.replace(tmplVar, attrVal);
+      match = templateRegex.exec(variable);
+    }
+    return tmpVariable;
+  }
+}
+
+export function getPropertyValue(obj, key) {
+  try {
+    return _.reduce(key.split('.'), (acc, el) => acc[el], obj);
+  } catch (err) {
+    return undefined;
+  }
+}
+
+export function getLdapUsername(ldapUser) {
+  const usernameField = LDAP.settings_get('LDAP_USERNAME_FIELD');
+
+  if (usernameField.indexOf('#{') > -1) {
+    return usernameField.replace(/#{(.+?)}/g, function(match, field) {
+      return ldapUser.getLDAPValue(field);
+    });
+  }
+
+  return ldapUser.getLDAPValue(usernameField);
+}
+
+export function getLdapEmail(ldapUser) {
+  const emailField = LDAP.settings_get('LDAP_EMAIL_FIELD');
+
+  if (emailField.indexOf('#{') > -1) {
+    return emailField.replace(/#{(.+?)}/g, function(match, field) {
+      return ldapUser.getLDAPValue(field);
+    });
+  }
+
+  return ldapUser.getLDAPValue(emailField);
+}
+
+export function getLdapFullname(ldapUser) {
+  const fullnameField = LDAP.settings_get('LDAP_FULLNAME_FIELD');
+  if (fullnameField.indexOf('#{') > -1) {
+    return fullnameField.replace(/#{(.+?)}/g, function(match, field) {
+      return ldapUser.getLDAPValue(field);
+    });
+  }
+  return ldapUser.getLDAPValue(fullnameField);
+}
+
+export function getLdapUserUniqueID(ldapUser) {
+  let Unique_Identifier_Field = LDAP.settings_get('LDAP_UNIQUE_IDENTIFIER_FIELD');
+
+  if (Unique_Identifier_Field !== '') {
+    Unique_Identifier_Field = Unique_Identifier_Field.replace(/\s/g, '').split(',');
+  } else {
+    Unique_Identifier_Field = [];
+  }
+
+  let User_Search_Field = LDAP.settings_get('LDAP_USER_SEARCH_FIELD');
+
+  if (User_Search_Field !== '') {
+    User_Search_Field = User_Search_Field.replace(/\s/g, '').split(',');
+  } else {
+    User_Search_Field = [];
+  }
+
+  Unique_Identifier_Field = Unique_Identifier_Field.concat(User_Search_Field);
+
+  if (Unique_Identifier_Field.length > 0) {
+    Unique_Identifier_Field = Unique_Identifier_Field.find((field) => {
+      return !_.isEmpty(ldapUser._raw.getLDAPValue(field));
+    });
+    if (Unique_Identifier_Field) {
+		    log_debug(`Identifying user with: ${  Unique_Identifier_Field}`);
+      Unique_Identifier_Field = {
+        attribute: Unique_Identifier_Field,
+        value: ldapUser._raw.getLDAPValue(Unique_Identifier_Field).toString('hex'),
+      };
+    }
+    return Unique_Identifier_Field;
+  }
+}
+
+export function getDataToSyncUserData(ldapUser, user) {
+  const syncUserData = LDAP.settings_get('LDAP_SYNC_USER_DATA');
+  const syncUserDataFieldMap = LDAP.settings_get('LDAP_SYNC_USER_DATA_FIELDMAP').trim();
+
+  const userData = {};
+
+  if (syncUserData && syncUserDataFieldMap) {
+    const whitelistedUserFields = ['email', 'name', 'customFields'];
+    const fieldMap = JSON.parse(syncUserDataFieldMap);
+    const emailList = [];
+    _.map(fieldMap, function(userField, ldapField) {
+		    log_debug(`Mapping field ${ldapField} -> ${userField}`);
+      switch (userField) {
+      case 'email':
+        if (!ldapUser.hasOwnProperty(ldapField)) {
+          log_debug(`user does not have attribute: ${ ldapField }`);
+          return;
+        }
+
+        if (_.isObject(ldapUser[ldapField])) {
+          _.map(ldapUser[ldapField], function(item) {
+            emailList.push({ address: item, verified: true });
+          });
+        } else {
+          emailList.push({ address: ldapUser[ldapField], verified: true });
+        }
+        break;
+
+      default:
+        const [outerKey, innerKeys] = userField.split(/\.(.+)/);
+
+        if (!_.find(whitelistedUserFields, (el) => el === outerKey)) {
+          log_debug(`user attribute not whitelisted: ${ userField }`);
+          return;
+        }
+
+        if (outerKey === 'customFields') {
+          let customFieldsMeta;
+
+          try {
+            customFieldsMeta = JSON.parse(LDAP.settings_get('Accounts_CustomFields'));
+          } catch (e) {
+            log_debug('Invalid JSON for Custom Fields');
+            return;
+          }
+
+          if (!getPropertyValue(customFieldsMeta, innerKeys)) {
+            log_debug(`user attribute does not exist: ${ userField }`);
+            return;
+          }
+        }
+
+        const tmpUserField = getPropertyValue(user, userField);
+        const tmpLdapField = templateVarHandler(ldapField, ldapUser);
+
+        if (tmpLdapField && tmpUserField !== tmpLdapField) {
+          // creates the object structure instead of just assigning 'tmpLdapField' to
+          // 'userData[userField]' in order to avoid the "cannot use the part (...)
+          // to traverse the element" (MongoDB) error that can happen. Do not handle
+          // arrays.
+          // TODO: Find a better solution.
+          const dKeys = userField.split('.');
+          const lastKey = _.last(dKeys);
+          _.reduce(dKeys, (obj, currKey) =>
+            (currKey === lastKey)
+              ? obj[currKey] = tmpLdapField
+              : obj[currKey] = obj[currKey] || {}
+            , userData);
+          log_debug(`user.${ userField } changed to: ${ tmpLdapField }`);
+        }
+      }
+    });
+
+    if (emailList.length > 0) {
+      if (JSON.stringify(user.emails) !== JSON.stringify(emailList)) {
+        userData.emails = emailList;
+      }
+    }
+  }
+
+  const uniqueId = getLdapUserUniqueID(ldapUser);
+
+  if (uniqueId && (!user.services || !user.services.ldap || user.services.ldap.id !== uniqueId.value || user.services.ldap.idAttribute !== uniqueId.attribute)) {
+    userData['services.ldap.id'] = uniqueId.value;
+    userData['services.ldap.idAttribute'] = uniqueId.attribute;
+  }
+
+  if (user.authenticationMethod !== 'ldap') {
+    userData.ldap = true;
+  }
+
+  if (_.size(userData)) {
+    return userData;
+  }
+}
+
+
+export function syncUserData(user, ldapUser) {
+  log_info('Syncing user data');
+  log_debug('user', {'email': user.email, '_id': user._id});
+  // log_debug('ldapUser', ldapUser.object);
+
+  if (LDAP.settings_get('LDAP_USERNAME_FIELD') !== '') {
+    const username = slug(getLdapUsername(ldapUser));
+    if (user && user._id && username !== user.username) {
+      log_info('Syncing user username', user.username, '->', username);
+      Meteor.users.findOne({ _id: user._id }, { $set: { username }});
+    }
+  }
+
+  if (LDAP.settings_get('LDAP_FULLNAME_FIELD') !== '') {
+    const fullname= getLdapFullname(ldapUser);
+    log_debug('fullname=',fullname);
+    if (user && user._id && fullname !== '') {
+      log_info('Syncing user fullname:', fullname);
+      Meteor.users.update({ _id:  user._id }, { $set: { 'profile.fullname' : fullname, }});
+    }
+  }
+
+}
+
+export function addLdapUser(ldapUser, username, password) {
+  const uniqueId = getLdapUserUniqueID(ldapUser);
+
+  const userObject = {
+  };
+
+  if (username) {
+    userObject.username = username;
+  }
+
+  const userData = getDataToSyncUserData(ldapUser, {});
+
+  if (userData && userData.emails && userData.emails[0] && userData.emails[0].address) {
+    if (Array.isArray(userData.emails[0].address)) {
+      userObject.email = userData.emails[0].address[0];
+    } else {
+      userObject.email = userData.emails[0].address;
+    }
+  } else if (ldapUser.mail && ldapUser.mail.indexOf('@') > -1) {
+    userObject.email = ldapUser.mail;
+  } else if (LDAP.settings_get('LDAP_DEFAULT_DOMAIN') !== '') {
+    userObject.email = `${ username || uniqueId.value }@${ LDAP.settings_get('LDAP_DEFAULT_DOMAIN') }`;
+  } else {
+    const error = new Meteor.Error('LDAP-login-error', 'LDAP Authentication succeded, there is no email to create an account. Have you tried setting your Default Domain in LDAP Settings?');
+    log_error(error);
+    throw error;
+  }
+
+  log_debug('New user data', userObject);
+
+  if (password) {
+    userObject.password = password;
+  }
+
+  try {
+    // This creates the account with password service
+    userObject.ldap = true;
+    userObject._id = Accounts.createUser(userObject);
+
+    // Add the services.ldap identifiers
+    Meteor.users.update({ _id:  userObject._id }, {
+		    $set: {
+		        'services.ldap': { id: uniqueId.value },
+		        'emails.0.verified': true,
+		        'authenticationMethod': 'ldap',
+		    }});
+  } catch (error) {
+    log_error('Error creating user', error);
+    return error;
+  }
+
+  syncUserData(userObject, ldapUser);
+
+  return {
+    userId: userObject._id,
+  };
+}
+
+export function importNewUsers(ldap) {
+  if (LDAP.settings_get('LDAP_ENABLE') !== true) {
+    log_error('Can\'t run LDAP Import, LDAP is disabled');
+    return;
+  }
+
+  if (!ldap) {
+    ldap = new LDAP();
+    ldap.connectSync();
+  }
+
+  let count = 0;
+  ldap.searchUsersSync('*', Meteor.bindEnvironment((error, ldapUsers, {next, end} = {}) => {
+    if (error) {
+      throw error;
+    }
+
+    ldapUsers.forEach((ldapUser) => {
+      count++;
+
+      const uniqueId = getLdapUserUniqueID(ldapUser);
+      // Look to see if user already exists
+      const userQuery = {
+        'services.ldap.id': uniqueId.value,
+      };
+
+      log_debug('userQuery', userQuery);
+
+      let username;
+      if (LDAP.settings_get('LDAP_USERNAME_FIELD') !== '') {
+        username = slug(getLdapUsername(ldapUser));
+      }
+
+      // Add user if it was not added before
+      let user = Meteor.users.findOne(userQuery);
+
+      if (!user && username && LDAP.settings_get('LDAP_MERGE_EXISTING_USERS') === true) {
+        const userQuery = {
+          username,
+        };
+
+        log_debug('userQuery merge', userQuery);
+
+        user = Meteor.users.findOne(userQuery);
+        if (user) {
+          syncUserData(user, ldapUser);
+        }
+      }
+
+      if (!user) {
+        addLdapUser(ldapUser, username);
+      }
+
+      if (count % 100 === 0) {
+        log_info('Import running. Users imported until now:', count);
+      }
+    });
+
+    if (end) {
+      log_info('Import finished. Users imported:', count);
+    }
+
+    next(count);
+  }));
+}
+
+function sync() {
+  if (LDAP.settings_get('LDAP_ENABLE') !== true) {
+    return;
+  }
+
+  const ldap = new LDAP();
+
+  try {
+    ldap.connectSync();
+
+    let users;
+    if (LDAP.settings_get('LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED') === true) {
+      users = Meteor.users.find({ 'services.ldap': { $exists: true }});
+    }
+
+    if (LDAP.settings_get('LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS') === true) {
+      importNewUsers(ldap);
+    }
+
+    if (LDAP.settings_get('LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED') === true) {
+      users.forEach(function(user) {
+        let ldapUser;
+
+        if (user.services && user.services.ldap && user.services.ldap.id) {
+          ldapUser = ldap.getUserByIdSync(user.services.ldap.id, user.services.ldap.idAttribute);
+        } else {
+          ldapUser = ldap.getUserByUsernameSync(user.username);
+        }
+
+        if (ldapUser) {
+          syncUserData(user, ldapUser);
+        } else {
+          log_info('Can\'t sync user', user.username);
+        }
+      });
+    }
+  } catch (error) {
+    log_error(error);
+    return error;
+  }
+  return true;
+}
+
+const jobName = 'LDAP_Sync';
+
+const addCronJob = _.debounce(Meteor.bindEnvironment(function addCronJobDebounced() {
+  if (LDAP.settings_get('LDAP_BACKGROUND_SYNC') !== true) {
+    log_info('Disabling LDAP Background Sync');
+    if (SyncedCron.nextScheduledAtDate(jobName)) {
+      SyncedCron.remove(jobName);
+    }
+    return;
+  }
+
+  if (LDAP.settings_get('LDAP_BACKGROUND_SYNC_INTERVAL')) {
+    log_info('Enabling LDAP Background Sync');
+    SyncedCron.add({
+      name: jobName,
+      schedule: (parser) => parser.text(LDAP.settings_get('LDAP_BACKGROUND_SYNC_INTERVAL')),
+      job() {
+        sync();
+      },
+    });
+    SyncedCron.start();
+  }
+}), 500);
+
+Meteor.startup(() => {
+  Meteor.defer(() => {
+    LDAP.settings_get('LDAP_BACKGROUND_SYNC', addCronJob);
+    LDAP.settings_get('LDAP_BACKGROUND_SYNC_INTERVAL', addCronJob);
+  });
+});
diff --git a/packages/wekan-ldap/server/syncUser.js b/packages/wekan-ldap/server/syncUser.js
new file mode 100644
index 00000000..763ea836
--- /dev/null
+++ b/packages/wekan-ldap/server/syncUser.js
@@ -0,0 +1,29 @@
+import {importNewUsers} from './sync';
+import LDAP from './ldap';
+
+Meteor.methods({
+  ldap_sync_now() {
+    const user = Meteor.user();
+    if (!user) {
+      throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'ldap_sync_users' });
+    }
+
+    //TODO: This needs to be fixed - security issue -> alanning:meteor-roles
+    //if (!RocketChat.authz.hasRole(user._id, 'admin')) {
+    //	throw new Meteor.Error('error-not-authorized', 'Not authorized', { method: 'ldap_sync_users' });
+    //}
+
+    if (LDAP.settings_get('LDAP_ENABLE') !== true) {
+      throw new Meteor.Error('LDAP_disabled');
+    }
+
+    this.unblock();
+
+    importNewUsers();
+
+    return {
+      message: 'Sync_in_progress',
+      params: [],
+    };
+  },
+});
diff --git a/packages/wekan-ldap/server/testConnection.js b/packages/wekan-ldap/server/testConnection.js
new file mode 100644
index 00000000..02866ce5
--- /dev/null
+++ b/packages/wekan-ldap/server/testConnection.js
@@ -0,0 +1,39 @@
+import LDAP from './ldap';
+
+Meteor.methods({
+  ldap_test_connection() {
+    const user = Meteor.user();
+    if (!user) {
+      throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'ldap_test_connection' });
+    }
+
+    //TODO: This needs to be fixed - security issue -> alanning:meteor-roles
+    //if (!RocketChat.authz.hasRole(user._id, 'admin')) {
+    //	throw new Meteor.Error('error-not-authorized', 'Not authorized', { method: 'ldap_test_connection' });
+    //}
+
+    if (LDAP.settings_get(LDAP_ENABLE) !== true) {
+      throw new Meteor.Error('LDAP_disabled');
+    }
+
+    let ldap;
+    try {
+      ldap = new LDAP();
+      ldap.connectSync();
+    } catch (error) {
+      console.log(error);
+      throw new Meteor.Error(error.message);
+    }
+
+    try {
+      ldap.bindIfNecessary();
+    } catch (error) {
+      throw new Meteor.Error(error.name || error.message);
+    }
+
+    return {
+      message: 'Connection_success',
+      params: [],
+    };
+  },
+});
diff --git a/packages/wekan-oidc/.gitignore b/packages/wekan-oidc/.gitignore
new file mode 100644
index 00000000..5379d4c3
--- /dev/null
+++ b/packages/wekan-oidc/.gitignore
@@ -0,0 +1 @@
+.versions
diff --git a/packages/wekan-oidc/LICENSE.txt b/packages/wekan-oidc/LICENSE.txt
new file mode 100644
index 00000000..c7be3264
--- /dev/null
+++ b/packages/wekan-oidc/LICENSE.txt
@@ -0,0 +1,14 @@
+Copyright (C) 2016 SWITCH 
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
diff --git a/packages/wekan-oidc/README.md b/packages/wekan-oidc/README.md
new file mode 100644
index 00000000..8948971c
--- /dev/null
+++ b/packages/wekan-oidc/README.md
@@ -0,0 +1,7 @@
+# salleman:oidc package
+
+A Meteor implementation of OpenID Connect Login flow
+
+## Usage and Documentation
+
+Look at the `salleman:accounts-oidc` package for the documentation about using OpenID Connect with Meteor.
diff --git a/packages/wekan-oidc/oidc_client.js b/packages/wekan-oidc/oidc_client.js
new file mode 100644
index 00000000..744bd841
--- /dev/null
+++ b/packages/wekan-oidc/oidc_client.js
@@ -0,0 +1,68 @@
+Oidc = {};
+
+// Request OpenID Connect credentials for the user
+// @param options {optional}
+// @param credentialRequestCompleteCallback {Function} Callback function to call on
+//   completion. Takes one argument, credentialToken on success, or Error on
+//   error.
+Oidc.requestCredential = function (options, credentialRequestCompleteCallback) {
+  // support both (options, callback) and (callback).
+  if (!credentialRequestCompleteCallback && typeof options === 'function') {
+    credentialRequestCompleteCallback = options;
+    options = {};
+  }
+
+  var config = ServiceConfiguration.configurations.findOne({service: 'oidc'});
+  if (!config) {
+    credentialRequestCompleteCallback && credentialRequestCompleteCallback(
+      new ServiceConfiguration.ConfigError('Service oidc not configured.'));
+    return;
+  }
+  
+  var credentialToken = Random.secret();
+  var loginStyle = OAuth._loginStyle('oidc', config, options);
+  var scope = config.requestPermissions || ['openid', 'profile', 'email'];
+
+  // options
+  options = options || {};
+  options.client_id = config.clientId;
+  options.response_type = options.response_type || 'code';
+  options.redirect_uri = OAuth._redirectUri('oidc', config);
+  options.state = OAuth._stateParam(loginStyle, credentialToken, options.redirectUrl);
+  options.scope = scope.join(' ');
+
+  if (config.loginStyle && config.loginStyle == 'popup') {
+    options.display = 'popup';
+  }
+
+  var loginUrl = config.serverUrl + config.authorizationEndpoint;
+  // check if the loginUrl already contains a "?"
+  var first = loginUrl.indexOf('?') === -1;
+  for (var k in options) {
+    if (first) {
+      loginUrl += '?';
+      first = false;
+    }
+    else {
+      loginUrl += '&'
+    }
+    loginUrl += encodeURIComponent(k) + '=' + encodeURIComponent(options[k]);
+  }
+
+  //console.log('XXX: loginURL: ' + loginUrl)
+
+  options.popupOptions = options.popupOptions || {};
+  var popupOptions = {
+    width:  options.popupOptions.width || 320,
+    height: options.popupOptions.height || 450
+  };
+
+  OAuth.launchLogin({
+    loginService: 'oidc',
+    loginStyle: loginStyle,
+    loginUrl: loginUrl,
+    credentialRequestCompleteCallback: credentialRequestCompleteCallback,
+    credentialToken: credentialToken,
+    popupOptions: popupOptions,
+  });
+};
diff --git a/packages/wekan-oidc/oidc_configure.html b/packages/wekan-oidc/oidc_configure.html
new file mode 100644
index 00000000..49282fc1
--- /dev/null
+++ b/packages/wekan-oidc/oidc_configure.html
@@ -0,0 +1,6 @@
+<template name="configureLoginServiceDialogForOidc">
+  <p>
+    You'll need to create an OpenID Connect client configuration with your provider.
+    Set App Callbacks URLs to: <span class="url">{{siteUrl}}_oauth/oidc</span>
+  </p>
+</template>
diff --git a/packages/wekan-oidc/oidc_configure.js b/packages/wekan-oidc/oidc_configure.js
new file mode 100644
index 00000000..5eedaa04
--- /dev/null
+++ b/packages/wekan-oidc/oidc_configure.js
@@ -0,0 +1,17 @@
+Template.configureLoginServiceDialogForOidc.helpers({
+    siteUrl: function () {
+        return Meteor.absoluteUrl();
+    }
+});
+
+Template.configureLoginServiceDialogForOidc.fields = function () {
+  return [
+    { property: 'clientId', label: 'Client ID'},
+    { property: 'secret', label: 'Client Secret'},
+    { property: 'serverUrl', label: 'OIDC Server URL'},
+    { property: 'authorizationEndpoint', label: 'Authorization Endpoint'},
+    { property: 'tokenEndpoint', label: 'Token Endpoint'},
+    { property: 'userinfoEndpoint', label: 'Userinfo Endpoint'},
+    { property: 'idTokenWhitelistFields', label: 'Id Token Fields'}
+  ];
+};
diff --git a/packages/wekan-oidc/oidc_server.js b/packages/wekan-oidc/oidc_server.js
new file mode 100644
index 00000000..ec615cd1
--- /dev/null
+++ b/packages/wekan-oidc/oidc_server.js
@@ -0,0 +1,143 @@
+Oidc = {};
+
+OAuth.registerService('oidc', 2, null, function (query) {
+
+  var debug = process.env.DEBUG || false;
+  var token = getToken(query);
+  if (debug) console.log('XXX: register token:', token);
+
+  var accessToken = token.access_token || token.id_token;
+  var expiresAt = (+new Date) + (1000 * parseInt(token.expires_in, 10));
+
+  var userinfo = getUserInfo(accessToken);
+  if (debug) console.log('XXX: userinfo:', userinfo);
+
+  var serviceData = {};
+  serviceData.id = userinfo[process.env.OAUTH2_ID_MAP] || userinfo["id"];
+  serviceData.username = userinfo[process.env.OAUTH2_USERNAME_MAP] || userinfo["uid"];
+  serviceData.fullname = userinfo[process.env.OAUTH2_FULLNAME_MAP] || userinfo["displayName"];
+  serviceData.accessToken = accessToken;
+  serviceData.expiresAt = expiresAt;
+  serviceData.email = userinfo[process.env.OAUTH2_EMAIL_MAP] || userinfo["email"];
+
+  if (accessToken) {
+    var tokenContent = getTokenContent(accessToken);
+    var fields = _.pick(tokenContent, getConfiguration().idTokenWhitelistFields);
+    _.extend(serviceData, fields);
+  }
+
+  if (token.refresh_token)
+    serviceData.refreshToken = token.refresh_token;
+  if (debug) console.log('XXX: serviceData:', serviceData);
+
+  var profile = {};
+  profile.name = userinfo[process.env.OAUTH2_FULLNAME_MAP] || userinfo["displayName"];
+  profile.email = userinfo[process.env.OAUTH2_EMAIL_MAP] || userinfo["email"];
+  if (debug) console.log('XXX: profile:', profile);
+
+  return {
+    serviceData: serviceData,
+    options: { profile: profile }
+  };
+});
+
+var userAgent = "Meteor";
+if (Meteor.release) {
+  userAgent += "/" + Meteor.release;
+}
+
+var getToken = function (query) {
+  var debug = process.env.DEBUG || false;
+  var config = getConfiguration();
+  var serverTokenEndpoint = config.serverUrl + config.tokenEndpoint;
+  var response;
+
+  try {
+    response = HTTP.post(
+      serverTokenEndpoint,
+      {
+        headers: {
+          Accept: 'application/json',
+          "User-Agent": userAgent
+        },
+        params: {
+          code: query.code,
+          client_id: config.clientId,
+          client_secret: OAuth.openSecret(config.secret),
+          redirect_uri: OAuth._redirectUri('oidc', config),
+          grant_type: 'authorization_code',
+          state: query.state
+        }
+      }
+    );
+  } catch (err) {
+    throw _.extend(new Error("Failed to get token from OIDC " + serverTokenEndpoint + ": " + err.message),
+      { response: err.response });
+  }
+  if (response.data.error) {
+    // if the http response was a json object with an error attribute
+    throw new Error("Failed to complete handshake with OIDC " + serverTokenEndpoint + ": " + response.data.error);
+  } else {
+    if (debug) console.log('XXX: getToken response: ', response.data);
+    return response.data;
+  }
+};
+
+var getUserInfo = function (accessToken) {
+  var debug = process.env.DEBUG || false;
+  var config = getConfiguration();
+  // Some userinfo endpoints use a different base URL than the authorization or token endpoints.
+  // This logic allows the end user to override the setting by providing the full URL to userinfo in their config.
+  if (config.userinfoEndpoint.includes("https://")) {
+    var serverUserinfoEndpoint = config.userinfoEndpoint;
+  } else {
+    var serverUserinfoEndpoint = config.serverUrl + config.userinfoEndpoint;
+  }
+  var response;
+  try {
+    response = HTTP.get(
+      serverUserinfoEndpoint,
+      {
+        headers: {
+          "User-Agent": userAgent,
+          "Authorization": "Bearer " + accessToken
+        }
+      }
+    );
+  } catch (err) {
+    throw _.extend(new Error("Failed to fetch userinfo from OIDC " + serverUserinfoEndpoint + ": " + err.message),
+                   {response: err.response});
+  }
+  if (debug) console.log('XXX: getUserInfo response: ', response.data);
+  return response.data;
+};
+
+var getConfiguration = function () {
+  var config = ServiceConfiguration.configurations.findOne({ service: 'oidc' });
+  if (!config) {
+    throw new ServiceConfiguration.ConfigError('Service oidc not configured.');
+  }
+  return config;
+};
+
+var getTokenContent = function (token) {
+  var content = null;
+  if (token) {
+    try {
+      var parts = token.split('.');
+      var header = JSON.parse(new Buffer(parts[0], 'base64').toString());
+      content = JSON.parse(new Buffer(parts[1], 'base64').toString());
+      var signature = new Buffer(parts[2], 'base64');
+      var signed = parts[0] + '.' + parts[1];
+    } catch (err) {
+      this.content = {
+        exp: 0
+      };
+    }
+  }
+  return content;
+}
+
+Oidc.retrieveCredential = function (credentialToken, credentialSecret) {
+  return OAuth.retrieveCredential(credentialToken, credentialSecret);
+};
diff --git a/packages/wekan-oidc/package.js b/packages/wekan-oidc/package.js
new file mode 100644
index 00000000..273ef612
--- /dev/null
+++ b/packages/wekan-oidc/package.js
@@ -0,0 +1,23 @@
+Package.describe({
+  summary: "OpenID Connect (OIDC) flow for Meteor",
+  version: "1.0.12",
+  name: "wekan-oidc",
+  git: "https://github.com/wekan/wekan-oidc.git",
+});
+
+Package.onUse(function(api) {
+  api.use('oauth2@1.1.0', ['client', 'server']);
+  api.use('oauth@1.1.0', ['client', 'server']);
+  api.use('http@1.1.0', ['server']);
+  api.use('underscore@1.0.0', 'client');
+  api.use('templating@1.1.0', 'client');
+  api.use('random@1.0.0', 'client');
+  api.use('service-configuration@1.0.0', ['client', 'server']);
+
+  api.export('Oidc');
+
+  api.addFiles(['oidc_configure.html', 'oidc_configure.js'], 'client');
+
+  api.addFiles('oidc_server.js', 'server');
+  api.addFiles('oidc_client.js', 'client');
+});
diff --git a/packages/wekan-scrollbar/.gitignore b/packages/wekan-scrollbar/.gitignore
new file mode 100644
index 00000000..8d195847
--- /dev/null
+++ b/packages/wekan-scrollbar/.gitignore
@@ -0,0 +1,14 @@
+.build*
+
+# Ignore OS generated files 
+.DS_Store
+.DS_Store?
+._*
+.Trashes
+Thumbs.db
+ehthumbs.db
+
+#Ignore temp files
+*~
+
+.idea
\ No newline at end of file
diff --git a/packages/wekan-scrollbar/LICENSE b/packages/wekan-scrollbar/LICENSE
new file mode 100644
index 00000000..c2d69158
--- /dev/null
+++ b/packages/wekan-scrollbar/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014-2019 The Wekan Team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/packages/wekan-scrollbar/jquery.mCustomScrollbar.css b/packages/wekan-scrollbar/jquery.mCustomScrollbar.css
new file mode 100644
index 00000000..45152c1b
--- /dev/null
+++ b/packages/wekan-scrollbar/jquery.mCustomScrollbar.css
@@ -0,0 +1,1267 @@
+/*
+== malihu jquery custom scrollbar plugin ==
+Plugin URI: http://manos.malihu.gr/jquery-custom-content-scroller
+*/
+
+
+
+/*
+CONTENTS: 
+	1. BASIC STYLE - Plugin's basic/essential CSS properties (normally, should not be edited). 
+	2. VERTICAL SCROLLBAR - Positioning and dimensions of vertical scrollbar. 
+	3. HORIZONTAL SCROLLBAR - Positioning and dimensions of horizontal scrollbar.
+	4. VERTICAL AND HORIZONTAL SCROLLBARS - Positioning and dimensions of 2-axis scrollbars. 
+	5. TRANSITIONS - CSS3 transitions for hover events, auto-expanded and auto-hidden scrollbars. 
+	6. SCROLLBAR COLORS, OPACITY AND BACKGROUNDS 
+		6.1 THEMES - Scrollbar colors, opacity, dimensions, backgrounds etc. via ready-to-use themes.
+*/
+
+
+
+/* 
+------------------------------------------------------------------------------------------------------------------------
+1. BASIC STYLE  
+------------------------------------------------------------------------------------------------------------------------
+*/
+
+	.mCustomScrollbar{ -ms-touch-action: pinch-zoom; touch-action: pinch-zoom; /* direct pointer events to js */ }
+	.mCustomScrollbar.mCS_no_scrollbar, .mCustomScrollbar.mCS_touch_action{ -ms-touch-action: auto; touch-action: auto; }
+	
+	.mCustomScrollBox{ /* contains plugin's markup */
+		position: relative;
+		overflow: hidden;
+		height: 100%;
+		max-width: 100%;
+		outline: none;
+		direction: ltr;
+	}
+
+	.mCSB_container{ /* contains the original content */
+		overflow: hidden;
+		width: auto;
+		height: auto;
+	}
+
+
+
+/* 
+------------------------------------------------------------------------------------------------------------------------
+2. VERTICAL SCROLLBAR 
+y-axis
+------------------------------------------------------------------------------------------------------------------------
+*/
+
+	.mCSB_inside > .mCSB_container{ margin-right: 30px; }
+
+	.mCSB_container.mCS_no_scrollbar_y.mCS_y_hidden{ margin-right: 0; } /* non-visible scrollbar */
+	
+	.mCS-dir-rtl > .mCSB_inside > .mCSB_container{ /* RTL direction/left-side scrollbar */
+		margin-right: 0;
+		margin-left: 30px;
+	}
+	
+	.mCS-dir-rtl > .mCSB_inside > .mCSB_container.mCS_no_scrollbar_y.mCS_y_hidden{ margin-left: 0; } /* RTL direction/left-side scrollbar */
+
+	.mCSB_scrollTools{ /* contains scrollbar markup (draggable element, dragger rail, buttons etc.) */
+		position: absolute;
+		width: 16px;
+		height: auto;
+		left: auto;
+		top: 0;
+		right: 0;
+		bottom: 0;
+	}
+
+	.mCSB_outside + .mCSB_scrollTools{ right: -26px; } /* scrollbar position: outside */
+	
+	.mCS-dir-rtl > .mCSB_inside > .mCSB_scrollTools, 
+	.mCS-dir-rtl > .mCSB_outside + .mCSB_scrollTools{ /* RTL direction/left-side scrollbar */
+		right: auto;
+		left: 0;
+	}
+	
+	.mCS-dir-rtl > .mCSB_outside + .mCSB_scrollTools{ left: -26px; } /* RTL direction/left-side scrollbar (scrollbar position: outside) */
+
+	.mCSB_scrollTools .mCSB_draggerContainer{ /* contains the draggable element and dragger rail markup */
+		position: absolute;
+		top: 0;
+		left: 0;
+		bottom: 0;
+		right: 0; 
+		height: auto;
+	}
+
+	.mCSB_scrollTools a + .mCSB_draggerContainer{ margin: 20px 0; }
+
+	.mCSB_scrollTools .mCSB_draggerRail{
+		width: 2px;
+		height: 100%;
+		margin: 0 auto;
+		-webkit-border-radius: 16px; -moz-border-radius: 16px; border-radius: 16px;
+	}
+
+	.mCSB_scrollTools .mCSB_dragger{ /* the draggable element */
+		cursor: pointer;
+		width: 100%;
+		height: 30px; /* minimum dragger height */
+		z-index: 1;
+	}
+
+	.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{ /* the dragger element */
+		position: relative;
+		width: 4px;
+		height: 100%;
+		margin: 0 auto;
+		-webkit-border-radius: 16px; -moz-border-radius: 16px; border-radius: 16px;
+		text-align: center;
+	}
+	
+	.mCSB_scrollTools_vertical.mCSB_scrollTools_onDrag_expand .mCSB_dragger.mCSB_dragger_onDrag_expanded .mCSB_dragger_bar, 
+	.mCSB_scrollTools_vertical.mCSB_scrollTools_onDrag_expand .mCSB_draggerContainer:hover .mCSB_dragger .mCSB_dragger_bar{ width: 12px; /* auto-expanded scrollbar */ }
+	
+	.mCSB_scrollTools_vertical.mCSB_scrollTools_onDrag_expand .mCSB_dragger.mCSB_dragger_onDrag_expanded + .mCSB_draggerRail, 
+	.mCSB_scrollTools_vertical.mCSB_scrollTools_onDrag_expand .mCSB_draggerContainer:hover .mCSB_draggerRail{ width: 8px; /* auto-expanded scrollbar */ }
+
+	.mCSB_scrollTools .mCSB_buttonUp,
+	.mCSB_scrollTools .mCSB_buttonDown{
+		display: block;
+		position: absolute;
+		height: 20px;
+		width: 100%;
+		overflow: hidden;
+		margin: 0 auto;
+		cursor: pointer;
+	}
+
+	.mCSB_scrollTools .mCSB_buttonDown{ bottom: 0; }
+
+
+
+/* 
+------------------------------------------------------------------------------------------------------------------------
+3. HORIZONTAL SCROLLBAR 
+x-axis
+------------------------------------------------------------------------------------------------------------------------
+*/
+
+	.mCSB_horizontal.mCSB_inside > .mCSB_container{
+		margin-right: 0;
+		margin-bottom: 30px;
+	}
+	
+	.mCSB_horizontal.mCSB_outside > .mCSB_container{ min-height: 100%; }
+
+	.mCSB_horizontal > .mCSB_container.mCS_no_scrollbar_x.mCS_x_hidden{ margin-bottom: 0; } /* non-visible scrollbar */
+
+	.mCSB_scrollTools.mCSB_scrollTools_horizontal{
+		width: auto;
+		height: 16px;
+		top: auto;
+		right: 0;
+		bottom: 0;
+		left: 0;
+	}
+
+	.mCustomScrollBox + .mCSB_scrollTools.mCSB_scrollTools_horizontal,
+	.mCustomScrollBox + .mCSB_scrollTools + .mCSB_scrollTools.mCSB_scrollTools_horizontal{ bottom: -26px; } /* scrollbar position: outside */
+
+	.mCSB_scrollTools.mCSB_scrollTools_horizontal a + .mCSB_draggerContainer{ margin: 0 20px; }
+
+	.mCSB_scrollTools.mCSB_scrollTools_horizontal .mCSB_draggerRail{
+		width: 100%;
+		height: 2px;
+		margin: 7px 0;
+	}
+
+	.mCSB_scrollTools.mCSB_scrollTools_horizontal .mCSB_dragger{
+		width: 30px; /* minimum dragger width */
+		height: 100%;
+		left: 0;
+	}
+
+	.mCSB_scrollTools.mCSB_scrollTools_horizontal .mCSB_dragger .mCSB_dragger_bar{
+		width: 100%;
+		height: 4px;
+		margin: 6px auto;
+	}
+	
+	.mCSB_scrollTools_horizontal.mCSB_scrollTools_onDrag_expand .mCSB_dragger.mCSB_dragger_onDrag_expanded .mCSB_dragger_bar, 
+	.mCSB_scrollTools_horizontal.mCSB_scrollTools_onDrag_expand .mCSB_draggerContainer:hover .mCSB_dragger .mCSB_dragger_bar{
+		height: 12px; /* auto-expanded scrollbar */
+		margin: 2px auto;
+	}
+	
+	.mCSB_scrollTools_horizontal.mCSB_scrollTools_onDrag_expand .mCSB_dragger.mCSB_dragger_onDrag_expanded + .mCSB_draggerRail, 
+	.mCSB_scrollTools_horizontal.mCSB_scrollTools_onDrag_expand .mCSB_draggerContainer:hover .mCSB_draggerRail{
+		height: 8px; /* auto-expanded scrollbar */
+		margin: 4px 0;
+	}
+
+	.mCSB_scrollTools.mCSB_scrollTools_horizontal .mCSB_buttonLeft,
+	.mCSB_scrollTools.mCSB_scrollTools_horizontal .mCSB_buttonRight{
+		display: block;
+		position: absolute;
+		width: 20px;
+		height: 100%;
+		overflow: hidden;
+		margin: 0 auto;
+		cursor: pointer;
+	}
+	
+	.mCSB_scrollTools.mCSB_scrollTools_horizontal .mCSB_buttonLeft{ left: 0; }
+
+	.mCSB_scrollTools.mCSB_scrollTools_horizontal .mCSB_buttonRight{ right: 0; }
+
+
+
+/* 
+------------------------------------------------------------------------------------------------------------------------
+4. VERTICAL AND HORIZONTAL SCROLLBARS 
+yx-axis 
+------------------------------------------------------------------------------------------------------------------------
+*/
+
+	.mCSB_container_wrapper{
+		position: absolute;
+		height: auto;
+		width: auto;
+		overflow: hidden;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		margin-right: 30px;
+		margin-bottom: 30px;
+	}
+	
+	.mCSB_container_wrapper > .mCSB_container{
+		padding-right: 30px;
+		padding-bottom: 30px;
+		-webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box;
+	}
+	
+	.mCSB_vertical_horizontal > .mCSB_scrollTools.mCSB_scrollTools_vertical{ bottom: 20px; }
+	
+	.mCSB_vertical_horizontal > .mCSB_scrollTools.mCSB_scrollTools_horizontal{ right: 20px; }
+	
+	/* non-visible horizontal scrollbar */
+	.mCSB_container_wrapper.mCS_no_scrollbar_x.mCS_x_hidden + .mCSB_scrollTools.mCSB_scrollTools_vertical{ bottom: 0; }
+	
+	/* non-visible vertical scrollbar/RTL direction/left-side scrollbar */
+	.mCSB_container_wrapper.mCS_no_scrollbar_y.mCS_y_hidden + .mCSB_scrollTools ~ .mCSB_scrollTools.mCSB_scrollTools_horizontal, 
+	.mCS-dir-rtl > .mCustomScrollBox.mCSB_vertical_horizontal.mCSB_inside > .mCSB_scrollTools.mCSB_scrollTools_horizontal{ right: 0; }
+	
+	/* RTL direction/left-side scrollbar */
+	.mCS-dir-rtl > .mCustomScrollBox.mCSB_vertical_horizontal.mCSB_inside > .mCSB_scrollTools.mCSB_scrollTools_horizontal{ left: 20px; }
+	
+	/* non-visible scrollbar/RTL direction/left-side scrollbar */
+	.mCS-dir-rtl > .mCustomScrollBox.mCSB_vertical_horizontal.mCSB_inside > .mCSB_container_wrapper.mCS_no_scrollbar_y.mCS_y_hidden + .mCSB_scrollTools ~ .mCSB_scrollTools.mCSB_scrollTools_horizontal{ left: 0; }
+	
+	.mCS-dir-rtl > .mCSB_inside > .mCSB_container_wrapper{ /* RTL direction/left-side scrollbar */
+		margin-right: 0;
+		margin-left: 30px;
+	}
+	
+	.mCSB_container_wrapper.mCS_no_scrollbar_y.mCS_y_hidden > .mCSB_container{ padding-right: 0; }
+	
+	.mCSB_container_wrapper.mCS_no_scrollbar_x.mCS_x_hidden > .mCSB_container{ padding-bottom: 0; }
+	
+	.mCustomScrollBox.mCSB_vertical_horizontal.mCSB_inside > .mCSB_container_wrapper.mCS_no_scrollbar_y.mCS_y_hidden{
+		margin-right: 0; /* non-visible scrollbar */
+		margin-left: 0;
+	}
+	
+	/* non-visible horizontal scrollbar */
+	.mCustomScrollBox.mCSB_vertical_horizontal.mCSB_inside > .mCSB_container_wrapper.mCS_no_scrollbar_x.mCS_x_hidden{ margin-bottom: 0; }
+
+
+
+/* 
+------------------------------------------------------------------------------------------------------------------------
+5. TRANSITIONS  
+------------------------------------------------------------------------------------------------------------------------
+*/
+
+	.mCSB_scrollTools, 
+	.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar, 
+	.mCSB_scrollTools .mCSB_buttonUp,
+	.mCSB_scrollTools .mCSB_buttonDown,
+	.mCSB_scrollTools .mCSB_buttonLeft,
+	.mCSB_scrollTools .mCSB_buttonRight{
+		-webkit-transition: opacity .2s ease-in-out, background-color .2s ease-in-out;
+		-moz-transition: opacity .2s ease-in-out, background-color .2s ease-in-out;
+		-o-transition: opacity .2s ease-in-out, background-color .2s ease-in-out;
+		transition: opacity .2s ease-in-out, background-color .2s ease-in-out;
+	}
+	
+	.mCSB_scrollTools_vertical.mCSB_scrollTools_onDrag_expand .mCSB_dragger_bar, /* auto-expanded scrollbar */
+	.mCSB_scrollTools_vertical.mCSB_scrollTools_onDrag_expand .mCSB_draggerRail, 
+	.mCSB_scrollTools_horizontal.mCSB_scrollTools_onDrag_expand .mCSB_dragger_bar, 
+	.mCSB_scrollTools_horizontal.mCSB_scrollTools_onDrag_expand .mCSB_draggerRail{
+		-webkit-transition: width .2s ease-out .2s, height .2s ease-out .2s, 
+					margin-left .2s ease-out .2s, margin-right .2s ease-out .2s, 
+					margin-top .2s ease-out .2s, margin-bottom .2s ease-out .2s,
+					opacity .2s ease-in-out, background-color .2s ease-in-out; 
+		-moz-transition: width .2s ease-out .2s, height .2s ease-out .2s, 
+					margin-left .2s ease-out .2s, margin-right .2s ease-out .2s, 
+					margin-top .2s ease-out .2s, margin-bottom .2s ease-out .2s,
+					opacity .2s ease-in-out, background-color .2s ease-in-out; 
+		-o-transition: width .2s ease-out .2s, height .2s ease-out .2s, 
+					margin-left .2s ease-out .2s, margin-right .2s ease-out .2s, 
+					margin-top .2s ease-out .2s, margin-bottom .2s ease-out .2s,
+					opacity .2s ease-in-out, background-color .2s ease-in-out; 
+		transition: width .2s ease-out .2s, height .2s ease-out .2s, 
+					margin-left .2s ease-out .2s, margin-right .2s ease-out .2s, 
+					margin-top .2s ease-out .2s, margin-bottom .2s ease-out .2s,
+					opacity .2s ease-in-out, background-color .2s ease-in-out; 
+	}
+
+
+
+/* 
+------------------------------------------------------------------------------------------------------------------------
+6. SCROLLBAR COLORS, OPACITY AND BACKGROUNDS  
+------------------------------------------------------------------------------------------------------------------------
+*/
+
+	/* 
+	----------------------------------------
+	6.1 THEMES 
+	----------------------------------------
+	*/
+	
+	/* default theme ("light") */
+
+	.mCSB_scrollTools{ opacity: 0.75; filter: "alpha(opacity=75)"; -ms-filter: "alpha(opacity=75)"; }
+	
+	.mCS-autoHide > .mCustomScrollBox > .mCSB_scrollTools,
+	.mCS-autoHide > .mCustomScrollBox ~ .mCSB_scrollTools{ opacity: 0; filter: "alpha(opacity=0)"; -ms-filter: "alpha(opacity=0)"; }
+	
+	.mCustomScrollbar > .mCustomScrollBox > .mCSB_scrollTools.mCSB_scrollTools_onDrag,
+	.mCustomScrollbar > .mCustomScrollBox ~ .mCSB_scrollTools.mCSB_scrollTools_onDrag,
+	.mCustomScrollBox:hover > .mCSB_scrollTools,
+	.mCustomScrollBox:hover ~ .mCSB_scrollTools,
+	.mCS-autoHide:hover > .mCustomScrollBox > .mCSB_scrollTools,
+	.mCS-autoHide:hover > .mCustomScrollBox ~ .mCSB_scrollTools{ opacity: 1; filter: "alpha(opacity=100)"; -ms-filter: "alpha(opacity=100)"; }
+
+	.mCSB_scrollTools .mCSB_draggerRail{
+		background-color: #000; background-color: rgba(0,0,0,0.4);
+		filter: "alpha(opacity=40)"; -ms-filter: "alpha(opacity=40)"; 
+	}
+
+	.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+		background-color: #fff; background-color: rgba(255,255,255,0.75);
+		filter: "alpha(opacity=75)"; -ms-filter: "alpha(opacity=75)"; 
+	}
+
+	.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar{
+		background-color: #fff; background-color: rgba(255,255,255,0.85);
+		filter: "alpha(opacity=85)"; -ms-filter: "alpha(opacity=85)"; 
+	}
+	.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
+	.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar{
+		background-color: #fff; background-color: rgba(255,255,255,0.9);
+		filter: "alpha(opacity=90)"; -ms-filter: "alpha(opacity=90)"; 
+	}
+
+	.mCSB_scrollTools .mCSB_buttonUp,
+	.mCSB_scrollTools .mCSB_buttonDown,
+	.mCSB_scrollTools .mCSB_buttonLeft,
+	.mCSB_scrollTools .mCSB_buttonRight{
+		background-image: url(mCSB_buttons.png); /* css sprites */
+		background-repeat: no-repeat;
+		opacity: 0.4; filter: "alpha(opacity=40)"; -ms-filter: "alpha(opacity=40)"; 
+	}
+
+	.mCSB_scrollTools .mCSB_buttonUp{
+		background-position: 0 0;
+		/* 
+		sprites locations 
+		light: 0 0, -16px 0, -32px 0, -48px 0, 0 -72px, -16px -72px, -32px -72px
+		dark: -80px 0, -96px 0, -112px 0, -128px 0, -80px -72px, -96px -72px, -112px -72px
+		*/
+	}
+
+	.mCSB_scrollTools .mCSB_buttonDown{
+		background-position: 0 -20px;
+		/* 
+		sprites locations
+		light: 0 -20px, -16px -20px, -32px -20px, -48px -20px, 0 -92px, -16px -92px, -32px -92px
+		dark: -80px -20px, -96px -20px, -112px -20px, -128px -20px, -80px -92px, -96px -92px, -112 -92px
+		*/
+	}
+
+	.mCSB_scrollTools .mCSB_buttonLeft{
+		background-position: 0 -40px;
+		/* 
+		sprites locations 
+		light: 0 -40px, -20px -40px, -40px -40px, -60px -40px, 0 -112px, -20px -112px, -40px -112px
+		dark: -80px -40px, -100px -40px, -120px -40px, -140px -40px, -80px -112px, -100px -112px, -120px -112px
+		*/
+	}
+
+	.mCSB_scrollTools .mCSB_buttonRight{
+		background-position: 0 -56px;
+		/* 
+		sprites locations 
+		light: 0 -56px, -20px -56px, -40px -56px, -60px -56px, 0 -128px, -20px -128px, -40px -128px
+		dark: -80px -56px, -100px -56px, -120px -56px, -140px -56px, -80px -128px, -100px -128px, -120px -128px
+		*/
+	}
+
+	.mCSB_scrollTools .mCSB_buttonUp:hover,
+	.mCSB_scrollTools .mCSB_buttonDown:hover,
+	.mCSB_scrollTools .mCSB_buttonLeft:hover,
+	.mCSB_scrollTools .mCSB_buttonRight:hover{ opacity: 0.75; filter: "alpha(opacity=75)"; -ms-filter: "alpha(opacity=75)"; }
+
+	.mCSB_scrollTools .mCSB_buttonUp:active,
+	.mCSB_scrollTools .mCSB_buttonDown:active,
+	.mCSB_scrollTools .mCSB_buttonLeft:active,
+	.mCSB_scrollTools .mCSB_buttonRight:active{ opacity: 0.9; filter: "alpha(opacity=90)"; -ms-filter: "alpha(opacity=90)"; }
+	
+
+	/* theme: "dark" */
+
+	.mCS-dark.mCSB_scrollTools .mCSB_draggerRail{ background-color: #000; background-color: rgba(0,0,0,0.15); }
+
+	.mCS-dark.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{ background-color: #000; background-color: rgba(0,0,0,0.75); }
+
+	.mCS-dark.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar{ background-color: rgba(0,0,0,0.85); }
+
+	.mCS-dark.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
+	.mCS-dark.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar{ background-color: rgba(0,0,0,0.9); }
+
+	.mCS-dark.mCSB_scrollTools .mCSB_buttonUp{ background-position: -80px 0; }
+
+	.mCS-dark.mCSB_scrollTools .mCSB_buttonDown{ background-position: -80px -20px; }
+
+	.mCS-dark.mCSB_scrollTools .mCSB_buttonLeft{ background-position: -80px -40px; }
+
+	.mCS-dark.mCSB_scrollTools .mCSB_buttonRight{ background-position: -80px -56px; }
+	
+	/* ---------------------------------------- */
+	
+
+
+	/* theme: "light-2", "dark-2" */
+
+	.mCS-light-2.mCSB_scrollTools .mCSB_draggerRail, 
+	.mCS-dark-2.mCSB_scrollTools .mCSB_draggerRail{
+		width: 4px;
+		background-color: #fff; background-color: rgba(255,255,255,0.1);
+		-webkit-border-radius: 1px; -moz-border-radius: 1px; border-radius: 1px;
+	}
+
+	.mCS-light-2.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-dark-2.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+		width: 4px;
+		background-color: #fff; background-color: rgba(255,255,255,0.75);
+		-webkit-border-radius: 1px; -moz-border-radius: 1px; border-radius: 1px;
+	}
+
+	.mCS-light-2.mCSB_scrollTools_horizontal .mCSB_draggerRail, 
+	.mCS-dark-2.mCSB_scrollTools_horizontal .mCSB_draggerRail, 
+	.mCS-light-2.mCSB_scrollTools_horizontal .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-dark-2.mCSB_scrollTools_horizontal .mCSB_dragger .mCSB_dragger_bar{
+		width: 100%;
+		height: 4px;
+		margin: 6px auto;
+	}
+
+	.mCS-light-2.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar{ background-color: #fff; background-color: rgba(255,255,255,0.85); }
+
+	.mCS-light-2.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
+	.mCS-light-2.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar{ background-color: #fff; background-color: rgba(255,255,255,0.9); }
+
+	.mCS-light-2.mCSB_scrollTools .mCSB_buttonUp{ background-position: -32px 0; }
+
+	.mCS-light-2.mCSB_scrollTools .mCSB_buttonDown{	background-position: -32px -20px; }
+
+	.mCS-light-2.mCSB_scrollTools .mCSB_buttonLeft{	background-position: -40px -40px; }
+
+	.mCS-light-2.mCSB_scrollTools .mCSB_buttonRight{ background-position: -40px -56px; }
+	
+	
+	/* theme: "dark-2" */
+
+	.mCS-dark-2.mCSB_scrollTools .mCSB_draggerRail{
+		background-color: #000; background-color: rgba(0,0,0,0.1);
+		-webkit-border-radius: 1px; -moz-border-radius: 1px; border-radius: 1px;
+	}
+
+	.mCS-dark-2.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+		background-color: #000; background-color: rgba(0,0,0,0.75);
+		-webkit-border-radius: 1px; -moz-border-radius: 1px; border-radius: 1px;
+	}
+
+	.mCS-dark-2.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar{ background-color: #000; background-color: rgba(0,0,0,0.85); }
+
+	.mCS-dark-2.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
+	.mCS-dark-2.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar{ background-color: #000; background-color: rgba(0,0,0,0.9); }
+
+	.mCS-dark-2.mCSB_scrollTools .mCSB_buttonUp{ background-position: -112px 0; }
+
+	.mCS-dark-2.mCSB_scrollTools .mCSB_buttonDown{ background-position: -112px -20px; }
+
+	.mCS-dark-2.mCSB_scrollTools .mCSB_buttonLeft{ background-position: -120px -40px; }
+
+	.mCS-dark-2.mCSB_scrollTools .mCSB_buttonRight{	background-position: -120px -56px; }
+	
+	/* ---------------------------------------- */
+	
+
+
+	/* theme: "light-thick", "dark-thick" */
+
+	.mCS-light-thick.mCSB_scrollTools .mCSB_draggerRail, 
+	.mCS-dark-thick.mCSB_scrollTools .mCSB_draggerRail{
+		width: 4px;
+		background-color: #fff; background-color: rgba(255,255,255,0.1);
+		-webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px;
+	}
+
+	.mCS-light-thick.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-dark-thick.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+		width: 6px;
+		background-color: #fff; background-color: rgba(255,255,255,0.75);
+		-webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px;
+	}
+
+	.mCS-light-thick.mCSB_scrollTools_horizontal .mCSB_draggerRail, 
+	.mCS-dark-thick.mCSB_scrollTools_horizontal .mCSB_draggerRail{
+		width: 100%;
+		height: 4px;
+		margin: 6px 0;
+	}
+
+	.mCS-light-thick.mCSB_scrollTools_horizontal .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-dark-thick.mCSB_scrollTools_horizontal .mCSB_dragger .mCSB_dragger_bar{
+		width: 100%;
+		height: 6px;
+		margin: 5px auto;
+	}
+
+	.mCS-light-thick.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar{ background-color: #fff; background-color: rgba(255,255,255,0.85); }
+
+	.mCS-light-thick.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
+	.mCS-light-thick.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar{ background-color: #fff; background-color: rgba(255,255,255,0.9); }
+
+	.mCS-light-thick.mCSB_scrollTools .mCSB_buttonUp{ background-position: -16px 0; }
+
+	.mCS-light-thick.mCSB_scrollTools .mCSB_buttonDown{	background-position: -16px -20px; }
+
+	.mCS-light-thick.mCSB_scrollTools .mCSB_buttonLeft{	background-position: -20px -40px; }
+
+	.mCS-light-thick.mCSB_scrollTools .mCSB_buttonRight{ background-position: -20px -56px; }
+
+
+	/* theme: "dark-thick" */
+	
+	.mCS-dark-thick.mCSB_scrollTools .mCSB_draggerRail{
+		background-color: #000; background-color: rgba(0,0,0,0.1);
+		-webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px;
+	}
+
+	.mCS-dark-thick.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+		background-color: #000; background-color: rgba(0,0,0,0.75);
+		-webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px;
+	}
+
+	.mCS-dark-thick.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar{ background-color: #000; background-color: rgba(0,0,0,0.85); }
+
+	.mCS-dark-thick.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
+	.mCS-dark-thick.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar{ background-color: #000; background-color: rgba(0,0,0,0.9); }
+
+	.mCS-dark-thick.mCSB_scrollTools .mCSB_buttonUp{ background-position: -96px 0; }
+
+	.mCS-dark-thick.mCSB_scrollTools .mCSB_buttonDown{ background-position: -96px -20px; }
+
+	.mCS-dark-thick.mCSB_scrollTools .mCSB_buttonLeft{ background-position: -100px -40px; }
+
+	.mCS-dark-thick.mCSB_scrollTools .mCSB_buttonRight{	background-position: -100px -56px; }
+	
+	/* ---------------------------------------- */
+	
+
+
+	/* theme: "light-thin", "dark-thin" */
+	
+	.mCS-light-thin.mCSB_scrollTools .mCSB_draggerRail{ background-color: #fff; background-color: rgba(255,255,255,0.1); }
+
+	.mCS-light-thin.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-dark-thin.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{ width: 2px; }
+
+	.mCS-light-thin.mCSB_scrollTools_horizontal .mCSB_draggerRail, 
+	.mCS-dark-thin.mCSB_scrollTools_horizontal .mCSB_draggerRail{ width: 100%; }
+
+	.mCS-light-thin.mCSB_scrollTools_horizontal .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-dark-thin.mCSB_scrollTools_horizontal .mCSB_dragger .mCSB_dragger_bar{
+		width: 100%;
+		height: 2px;
+		margin: 7px auto;
+	}
+
+
+	/* theme "dark-thin" */
+	
+	.mCS-dark-thin.mCSB_scrollTools .mCSB_draggerRail{ background-color: #000; background-color: rgba(0,0,0,0.15); }
+
+	.mCS-dark-thin.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{ background-color: #000; background-color: rgba(0,0,0,0.75); }
+	
+	.mCS-dark-thin.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar{ background-color: #000; background-color: rgba(0,0,0,0.85); }
+	
+	.mCS-dark-thin.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
+	.mCS-dark-thin.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar{ background-color: #000; background-color: rgba(0,0,0,0.9); }
+	
+	.mCS-dark-thin.mCSB_scrollTools .mCSB_buttonUp{	background-position: -80px 0; }
+
+	.mCS-dark-thin.mCSB_scrollTools .mCSB_buttonDown{ background-position: -80px -20px; }
+
+	.mCS-dark-thin.mCSB_scrollTools .mCSB_buttonLeft{ background-position: -80px -40px; }
+
+	.mCS-dark-thin.mCSB_scrollTools .mCSB_buttonRight{ background-position: -80px -56px; }
+	
+	/* ---------------------------------------- */
+	
+	
+	
+	/* theme "rounded", "rounded-dark", "rounded-dots", "rounded-dots-dark" */
+	
+	.mCS-rounded.mCSB_scrollTools .mCSB_draggerRail{ background-color: #fff; background-color: rgba(255,255,255,0.15); }
+	
+	.mCS-rounded.mCSB_scrollTools .mCSB_dragger, 
+	.mCS-rounded-dark.mCSB_scrollTools .mCSB_dragger, 
+	.mCS-rounded-dots.mCSB_scrollTools .mCSB_dragger, 
+	.mCS-rounded-dots-dark.mCSB_scrollTools .mCSB_dragger{ height: 14px; }
+	
+	.mCS-rounded.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-rounded-dark.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-rounded-dots.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-rounded-dots-dark.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+		width: 14px;
+		margin: 0 1px;
+	}
+	
+	.mCS-rounded.mCSB_scrollTools_horizontal .mCSB_dragger, 
+	.mCS-rounded-dark.mCSB_scrollTools_horizontal .mCSB_dragger, 
+	.mCS-rounded-dots.mCSB_scrollTools_horizontal .mCSB_dragger, 
+	.mCS-rounded-dots-dark.mCSB_scrollTools_horizontal .mCSB_dragger{ width: 14px; }
+	
+	.mCS-rounded.mCSB_scrollTools_horizontal .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-rounded-dark.mCSB_scrollTools_horizontal .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-rounded-dots.mCSB_scrollTools_horizontal .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-rounded-dots-dark.mCSB_scrollTools_horizontal .mCSB_dragger .mCSB_dragger_bar{
+		height: 14px;
+		margin: 1px 0;
+	}
+	
+	.mCS-rounded.mCSB_scrollTools_vertical.mCSB_scrollTools_onDrag_expand .mCSB_dragger.mCSB_dragger_onDrag_expanded .mCSB_dragger_bar, 
+	.mCS-rounded.mCSB_scrollTools_vertical.mCSB_scrollTools_onDrag_expand .mCSB_draggerContainer:hover .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-rounded-dark.mCSB_scrollTools_vertical.mCSB_scrollTools_onDrag_expand .mCSB_dragger.mCSB_dragger_onDrag_expanded .mCSB_dragger_bar, 
+	.mCS-rounded-dark.mCSB_scrollTools_vertical.mCSB_scrollTools_onDrag_expand .mCSB_draggerContainer:hover .mCSB_dragger .mCSB_dragger_bar{
+		width: 16px; /* auto-expanded scrollbar */
+		height: 16px;
+		margin: -1px 0;
+	}
+	
+	.mCS-rounded.mCSB_scrollTools_vertical.mCSB_scrollTools_onDrag_expand .mCSB_dragger.mCSB_dragger_onDrag_expanded + .mCSB_draggerRail, 
+	.mCS-rounded.mCSB_scrollTools_vertical.mCSB_scrollTools_onDrag_expand .mCSB_draggerContainer:hover .mCSB_draggerRail, 
+	.mCS-rounded-dark.mCSB_scrollTools_vertical.mCSB_scrollTools_onDrag_expand .mCSB_dragger.mCSB_dragger_onDrag_expanded + .mCSB_draggerRail, 
+	.mCS-rounded-dark.mCSB_scrollTools_vertical.mCSB_scrollTools_onDrag_expand .mCSB_draggerContainer:hover .mCSB_draggerRail{ width: 4px; /* auto-expanded scrollbar */ }
+	
+	.mCS-rounded.mCSB_scrollTools_horizontal.mCSB_scrollTools_onDrag_expand .mCSB_dragger.mCSB_dragger_onDrag_expanded .mCSB_dragger_bar, 
+	.mCS-rounded.mCSB_scrollTools_horizontal.mCSB_scrollTools_onDrag_expand .mCSB_draggerContainer:hover .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-rounded-dark.mCSB_scrollTools_horizontal.mCSB_scrollTools_onDrag_expand .mCSB_dragger.mCSB_dragger_onDrag_expanded .mCSB_dragger_bar, 
+	.mCS-rounded-dark.mCSB_scrollTools_horizontal.mCSB_scrollTools_onDrag_expand .mCSB_draggerContainer:hover .mCSB_dragger .mCSB_dragger_bar{
+		height: 16px; /* auto-expanded scrollbar */
+		width: 16px;
+		margin: 0 -1px;
+	}
+	
+	.mCS-rounded.mCSB_scrollTools_horizontal.mCSB_scrollTools_onDrag_expand .mCSB_dragger.mCSB_dragger_onDrag_expanded + .mCSB_draggerRail, 
+	.mCS-rounded.mCSB_scrollTools_horizontal.mCSB_scrollTools_onDrag_expand .mCSB_draggerContainer:hover .mCSB_draggerRail, 
+	.mCS-rounded-dark.mCSB_scrollTools_horizontal.mCSB_scrollTools_onDrag_expand .mCSB_dragger.mCSB_dragger_onDrag_expanded + .mCSB_draggerRail, 
+	.mCS-rounded-dark.mCSB_scrollTools_horizontal.mCSB_scrollTools_onDrag_expand .mCSB_draggerContainer:hover .mCSB_draggerRail{
+		height: 4px; /* auto-expanded scrollbar */
+		margin: 6px 0;
+	}
+	
+	.mCS-rounded.mCSB_scrollTools .mCSB_buttonUp{ background-position: 0 -72px; }
+	
+	.mCS-rounded.mCSB_scrollTools .mCSB_buttonDown{ background-position: 0 -92px; }
+	
+	.mCS-rounded.mCSB_scrollTools .mCSB_buttonLeft{ background-position: 0 -112px; }
+	
+	.mCS-rounded.mCSB_scrollTools .mCSB_buttonRight{ background-position: 0 -128px; }
+	
+	
+	/* theme "rounded-dark", "rounded-dots-dark" */
+	
+	.mCS-rounded-dark.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-rounded-dots-dark.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{ background-color: #000; background-color: rgba(0,0,0,0.75); }
+	
+	.mCS-rounded-dark.mCSB_scrollTools .mCSB_draggerRail{ background-color: #000; background-color: rgba(0,0,0,0.15); }
+	
+	.mCS-rounded-dark.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar, 
+	.mCS-rounded-dots-dark.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar{ background-color: #000; background-color: rgba(0,0,0,0.85); }
+	
+	.mCS-rounded-dark.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
+	.mCS-rounded-dark.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar, 
+	.mCS-rounded-dots-dark.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
+	.mCS-rounded-dots-dark.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar{ background-color: #000; background-color: rgba(0,0,0,0.9); }
+	
+	.mCS-rounded-dark.mCSB_scrollTools .mCSB_buttonUp{ background-position: -80px -72px; }
+	
+	.mCS-rounded-dark.mCSB_scrollTools .mCSB_buttonDown{ background-position: -80px -92px; }
+	
+	.mCS-rounded-dark.mCSB_scrollTools .mCSB_buttonLeft{ background-position: -80px -112px; }
+	
+	.mCS-rounded-dark.mCSB_scrollTools .mCSB_buttonRight{ background-position: -80px -128px; }
+	
+	
+	/* theme "rounded-dots", "rounded-dots-dark" */
+	
+	.mCS-rounded-dots.mCSB_scrollTools_vertical .mCSB_draggerRail, 
+	.mCS-rounded-dots-dark.mCSB_scrollTools_vertical .mCSB_draggerRail{ width: 4px; }
+	
+	.mCS-rounded-dots.mCSB_scrollTools .mCSB_draggerRail, 
+	.mCS-rounded-dots-dark.mCSB_scrollTools .mCSB_draggerRail, 
+	.mCS-rounded-dots.mCSB_scrollTools_horizontal .mCSB_draggerRail, 
+	.mCS-rounded-dots-dark.mCSB_scrollTools_horizontal .mCSB_draggerRail{
+		background-color: transparent;
+		background-position: center;
+	}
+	
+	.mCS-rounded-dots.mCSB_scrollTools .mCSB_draggerRail, 
+	.mCS-rounded-dots-dark.mCSB_scrollTools .mCSB_draggerRail{
+		background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAANElEQVQYV2NkIAAYiVbw//9/Y6DiM1ANJoyMjGdBbLgJQAX/kU0DKgDLkaQAvxW4HEvQFwCRcxIJK1XznAAAAABJRU5ErkJggg==");
+		background-repeat: repeat-y;
+		opacity: 0.3;
+		filter: "alpha(opacity=30)"; -ms-filter: "alpha(opacity=30)"; 
+	}
+	
+	.mCS-rounded-dots.mCSB_scrollTools_horizontal .mCSB_draggerRail, 
+	.mCS-rounded-dots-dark.mCSB_scrollTools_horizontal .mCSB_draggerRail{
+		height: 4px;
+		margin: 6px 0;
+		background-repeat: repeat-x;
+	}
+	
+	.mCS-rounded-dots.mCSB_scrollTools .mCSB_buttonUp{ background-position: -16px -72px; }
+	
+	.mCS-rounded-dots.mCSB_scrollTools .mCSB_buttonDown{ background-position: -16px -92px; }
+	
+	.mCS-rounded-dots.mCSB_scrollTools .mCSB_buttonLeft{ background-position: -20px -112px; }
+	
+	.mCS-rounded-dots.mCSB_scrollTools .mCSB_buttonRight{ background-position: -20px -128px; }
+	
+	
+	/* theme "rounded-dots-dark" */
+	
+	.mCS-rounded-dots-dark.mCSB_scrollTools .mCSB_draggerRail{
+		background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAALElEQVQYV2NkIAAYSVFgDFR8BqrBBEifBbGRTfiPZhpYjiQFBK3A6l6CvgAAE9kGCd1mvgEAAAAASUVORK5CYII=");
+	}
+	
+	.mCS-rounded-dots-dark.mCSB_scrollTools .mCSB_buttonUp{ background-position: -96px -72px; }
+	
+	.mCS-rounded-dots-dark.mCSB_scrollTools .mCSB_buttonDown{ background-position: -96px -92px; }
+	
+	.mCS-rounded-dots-dark.mCSB_scrollTools .mCSB_buttonLeft{ background-position: -100px -112px; }
+	
+	.mCS-rounded-dots-dark.mCSB_scrollTools .mCSB_buttonRight{ background-position: -100px -128px; }
+	
+	/* ---------------------------------------- */
+	
+	
+	
+	/* theme "3d", "3d-dark", "3d-thick", "3d-thick-dark" */
+	
+	.mCS-3d.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-3d-dark.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-3d-thick.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-3d-thick-dark.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+		background-repeat: repeat-y;
+		background-image: -moz-linear-gradient(left, rgba(255,255,255,0.5) 0%, rgba(255,255,255,0) 100%);
+		background-image: -webkit-gradient(linear, left top, right top, color-stop(0%,rgba(255,255,255,0.5)), color-stop(100%,rgba(255,255,255,0)));
+		background-image: -webkit-linear-gradient(left, rgba(255,255,255,0.5) 0%,rgba(255,255,255,0) 100%);
+		background-image: -o-linear-gradient(left, rgba(255,255,255,0.5) 0%,rgba(255,255,255,0) 100%);
+		background-image: -ms-linear-gradient(left, rgba(255,255,255,0.5) 0%,rgba(255,255,255,0) 100%);
+		background-image: linear-gradient(to right, rgba(255,255,255,0.5) 0%,rgba(255,255,255,0) 100%);
+	}
+	
+	.mCS-3d.mCSB_scrollTools_horizontal .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-3d-dark.mCSB_scrollTools_horizontal .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-3d-thick.mCSB_scrollTools_horizontal .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-3d-thick-dark.mCSB_scrollTools_horizontal .mCSB_dragger .mCSB_dragger_bar{
+		background-repeat: repeat-x;
+		background-image: -moz-linear-gradient(top, rgba(255,255,255,0.5) 0%, rgba(255,255,255,0) 100%);
+		background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(255,255,255,0.5)), color-stop(100%,rgba(255,255,255,0)));
+		background-image: -webkit-linear-gradient(top, rgba(255,255,255,0.5) 0%,rgba(255,255,255,0) 100%);
+		background-image: -o-linear-gradient(top, rgba(255,255,255,0.5) 0%,rgba(255,255,255,0) 100%);
+		background-image: -ms-linear-gradient(top, rgba(255,255,255,0.5) 0%,rgba(255,255,255,0) 100%);
+		background-image: linear-gradient(to bottom, rgba(255,255,255,0.5) 0%,rgba(255,255,255,0) 100%);
+	}
+	
+	
+	/* theme "3d", "3d-dark" */
+	
+	.mCS-3d.mCSB_scrollTools_vertical .mCSB_dragger, 
+	.mCS-3d-dark.mCSB_scrollTools_vertical .mCSB_dragger{ height: 70px; }
+	
+	.mCS-3d.mCSB_scrollTools_horizontal .mCSB_dragger, 
+	.mCS-3d-dark.mCSB_scrollTools_horizontal .mCSB_dragger{ width: 70px; }
+	
+	.mCS-3d.mCSB_scrollTools, 
+	.mCS-3d-dark.mCSB_scrollTools{
+		opacity: 1;
+		filter: "alpha(opacity=30)"; -ms-filter: "alpha(opacity=30)"; 
+	}
+	
+	.mCS-3d.mCSB_scrollTools .mCSB_draggerRail, 
+	.mCS-3d.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-3d-dark.mCSB_scrollTools .mCSB_draggerRail, 
+	.mCS-3d-dark.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{ -webkit-border-radius: 16px; -moz-border-radius: 16px; border-radius: 16px; }
+	
+	.mCS-3d.mCSB_scrollTools .mCSB_draggerRail, 
+	.mCS-3d-dark.mCSB_scrollTools .mCSB_draggerRail{
+		width: 8px;
+		background-color: #000; background-color: rgba(0,0,0,0.2);
+		box-shadow: inset 1px 0 1px rgba(0,0,0,0.5), inset -1px 0 1px rgba(255,255,255,0.2);
+	}
+	
+	.mCS-3d.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar, 	 
+	.mCS-3d.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar, 
+	.mCS-3d.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
+	.mCS-3d.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar, 
+	.mCS-3d-dark.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-3d-dark.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar, 
+	.mCS-3d-dark.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
+	.mCS-3d-dark.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar{ background-color: #555; }
+
+	.mCS-3d.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-3d-dark.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{ width: 8px; }
+
+	.mCS-3d.mCSB_scrollTools_horizontal .mCSB_draggerRail, 
+	.mCS-3d-dark.mCSB_scrollTools_horizontal .mCSB_draggerRail{
+		width: 100%;
+		height: 8px;
+		margin: 4px 0;
+		box-shadow: inset 0 1px 1px rgba(0,0,0,0.5), inset 0 -1px 1px rgba(255,255,255,0.2);
+	}
+
+	.mCS-3d.mCSB_scrollTools_horizontal .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-3d-dark.mCSB_scrollTools_horizontal .mCSB_dragger .mCSB_dragger_bar{
+		width: 100%;
+		height: 8px;
+		margin: 4px auto;
+	}
+	
+	.mCS-3d.mCSB_scrollTools .mCSB_buttonUp{ background-position: -32px -72px; }
+	
+	.mCS-3d.mCSB_scrollTools .mCSB_buttonDown{ background-position: -32px -92px; }
+	
+	.mCS-3d.mCSB_scrollTools .mCSB_buttonLeft{ background-position: -40px -112px; }
+	
+	.mCS-3d.mCSB_scrollTools .mCSB_buttonRight{ background-position: -40px -128px; }
+	
+	
+	/* theme "3d-dark" */
+	
+	.mCS-3d-dark.mCSB_scrollTools .mCSB_draggerRail{
+		background-color: #000; background-color: rgba(0,0,0,0.1);
+		box-shadow: inset 1px 0 1px rgba(0,0,0,0.1);
+	}
+	
+	.mCS-3d-dark.mCSB_scrollTools_horizontal .mCSB_draggerRail{ box-shadow: inset 0 1px 1px rgba(0,0,0,0.1); }
+	
+	.mCS-3d-dark.mCSB_scrollTools .mCSB_buttonUp{ background-position: -112px -72px; }
+
+	.mCS-3d-dark.mCSB_scrollTools .mCSB_buttonDown{ background-position: -112px -92px; }
+
+	.mCS-3d-dark.mCSB_scrollTools .mCSB_buttonLeft{ background-position: -120px -112px; }
+
+	.mCS-3d-dark.mCSB_scrollTools .mCSB_buttonRight{	background-position: -120px -128px; }
+	
+	/* ---------------------------------------- */
+	
+	
+	
+	/* theme: "3d-thick", "3d-thick-dark" */
+	
+	.mCS-3d-thick.mCSB_scrollTools, 
+	.mCS-3d-thick-dark.mCSB_scrollTools{
+		opacity: 1;
+		filter: "alpha(opacity=30)"; -ms-filter: "alpha(opacity=30)"; 
+	}
+	
+	.mCS-3d-thick.mCSB_scrollTools, 
+	.mCS-3d-thick-dark.mCSB_scrollTools, 
+	.mCS-3d-thick.mCSB_scrollTools .mCSB_draggerContainer, 
+	.mCS-3d-thick-dark.mCSB_scrollTools .mCSB_draggerContainer{ -webkit-border-radius: 7px; -moz-border-radius: 7px; border-radius: 7px; }
+	
+	.mCS-3d-thick.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-3d-thick-dark.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{ -webkit-border-radius: 5px; -moz-border-radius: 5px; border-radius: 5px; }
+	
+	.mCSB_inside + .mCS-3d-thick.mCSB_scrollTools_vertical, 
+	.mCSB_inside + .mCS-3d-thick-dark.mCSB_scrollTools_vertical{ right: 1px; }
+	
+	.mCS-3d-thick.mCSB_scrollTools_vertical, 
+	.mCS-3d-thick-dark.mCSB_scrollTools_vertical{ box-shadow: inset 1px 0 1px rgba(0,0,0,0.1), inset 0 0 14px rgba(0,0,0,0.5); }
+	
+	.mCS-3d-thick.mCSB_scrollTools_horizontal, 
+	.mCS-3d-thick-dark.mCSB_scrollTools_horizontal{
+		bottom: 1px;
+		box-shadow: inset 0 1px 1px rgba(0,0,0,0.1), inset 0 0 14px rgba(0,0,0,0.5);
+	}
+	
+	.mCS-3d-thick.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-3d-thick-dark.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+		box-shadow: inset 1px 0 0 rgba(255,255,255,0.4);
+		width: 12px;
+		margin: 2px;
+		position: absolute;
+		height: auto;
+		top: 0;
+		bottom: 0;
+		left: 0;
+		right: 0;
+	}
+	
+	.mCS-3d-thick.mCSB_scrollTools_horizontal .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-3d-thick-dark.mCSB_scrollTools_horizontal .mCSB_dragger .mCSB_dragger_bar{ box-shadow: inset 0 1px 0 rgba(255,255,255,0.4); }
+	
+	.mCS-3d-thick.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar,  
+	.mCS-3d-thick.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar, 
+	.mCS-3d-thick.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
+	.mCS-3d-thick.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar{ background-color: #555; }
+	
+	.mCS-3d-thick.mCSB_scrollTools_horizontal .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-3d-thick-dark.mCSB_scrollTools_horizontal .mCSB_dragger .mCSB_dragger_bar{
+		height: 12px;
+		width: auto;
+	}
+	
+	.mCS-3d-thick.mCSB_scrollTools .mCSB_draggerContainer{
+		background-color: #000; background-color: rgba(0,0,0,0.05);
+		box-shadow: inset 1px 1px 16px rgba(0,0,0,0.1);
+	}
+	
+	.mCS-3d-thick.mCSB_scrollTools .mCSB_draggerRail{ background-color: transparent; }
+	
+	.mCS-3d-thick.mCSB_scrollTools .mCSB_buttonUp{ background-position: -32px -72px; }
+	
+	.mCS-3d-thick.mCSB_scrollTools .mCSB_buttonDown{ background-position: -32px -92px; }
+
+	.mCS-3d-thick.mCSB_scrollTools .mCSB_buttonLeft{ background-position: -40px -112px; }
+
+	.mCS-3d-thick.mCSB_scrollTools .mCSB_buttonRight{	background-position: -40px -128px; }
+	
+	
+	/* theme: "3d-thick-dark" */
+	
+	.mCS-3d-thick-dark.mCSB_scrollTools{ box-shadow: inset 0 0 14px rgba(0,0,0,0.2); }
+	
+	.mCS-3d-thick-dark.mCSB_scrollTools_horizontal{ box-shadow: inset 0 1px 1px rgba(0,0,0,0.1), inset 0 0 14px rgba(0,0,0,0.2); }
+	
+	.mCS-3d-thick-dark.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{ box-shadow: inset 1px 0 0 rgba(255,255,255,0.4), inset -1px 0 0 rgba(0,0,0,0.2); }
+	 
+	.mCS-3d-thick-dark.mCSB_scrollTools_horizontal .mCSB_dragger .mCSB_dragger_bar{ box-shadow: inset 0 1px 0 rgba(255,255,255,0.4), inset 0 -1px 0 rgba(0,0,0,0.2); }
+	
+	.mCS-3d-thick-dark.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar,  
+	.mCS-3d-thick-dark.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar, 
+	.mCS-3d-thick-dark.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
+	.mCS-3d-thick-dark.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar{ background-color: #777; }
+	
+	.mCS-3d-thick-dark.mCSB_scrollTools .mCSB_draggerContainer{
+		background-color: #fff; background-color: rgba(0,0,0,0.05);
+		box-shadow: inset 1px 1px 16px rgba(0,0,0,0.1);
+	}
+	
+	.mCS-3d-thick-dark.mCSB_scrollTools .mCSB_draggerRail{ background-color: transparent; }
+	
+	.mCS-3d-thick-dark.mCSB_scrollTools .mCSB_buttonUp{ background-position: -112px -72px; }
+	
+	.mCS-3d-thick-dark.mCSB_scrollTools .mCSB_buttonDown{ background-position: -112px -92px; }
+
+	.mCS-3d-thick-dark.mCSB_scrollTools .mCSB_buttonLeft{ background-position: -120px -112px; }
+
+	.mCS-3d-thick-dark.mCSB_scrollTools .mCSB_buttonRight{	background-position: -120px -128px; }
+	
+	/* ---------------------------------------- */
+	
+	
+	
+	/* theme: "minimal", "minimal-dark" */
+	
+	.mCSB_outside + .mCS-minimal.mCSB_scrollTools_vertical, 
+	.mCSB_outside + .mCS-minimal-dark.mCSB_scrollTools_vertical{
+		right: 0; 
+		margin: 12px 0; 
+	}
+	
+	.mCustomScrollBox.mCS-minimal + .mCSB_scrollTools.mCSB_scrollTools_horizontal, 
+	.mCustomScrollBox.mCS-minimal + .mCSB_scrollTools + .mCSB_scrollTools.mCSB_scrollTools_horizontal, 
+	.mCustomScrollBox.mCS-minimal-dark + .mCSB_scrollTools.mCSB_scrollTools_horizontal, 
+	.mCustomScrollBox.mCS-minimal-dark + .mCSB_scrollTools + .mCSB_scrollTools.mCSB_scrollTools_horizontal{
+		bottom: 0; 
+		margin: 0 12px; 
+	}
+	
+	/* RTL direction/left-side scrollbar */
+	.mCS-dir-rtl > .mCSB_outside + .mCS-minimal.mCSB_scrollTools_vertical, 
+	.mCS-dir-rtl > .mCSB_outside + .mCS-minimal-dark.mCSB_scrollTools_vertical{
+		left: 0; 
+		right: auto;
+	}
+	
+	.mCS-minimal.mCSB_scrollTools .mCSB_draggerRail, 
+	.mCS-minimal-dark.mCSB_scrollTools .mCSB_draggerRail{ background-color: transparent; }
+	
+	.mCS-minimal.mCSB_scrollTools_vertical .mCSB_dragger, 
+	.mCS-minimal-dark.mCSB_scrollTools_vertical .mCSB_dragger{ height: 50px; }
+	
+	.mCS-minimal.mCSB_scrollTools_horizontal .mCSB_dragger, 
+	.mCS-minimal-dark.mCSB_scrollTools_horizontal .mCSB_dragger{ width: 50px; }
+	
+	.mCS-minimal.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+		background-color: #fff; background-color: rgba(255,255,255,0.2);
+		filter: "alpha(opacity=20)"; -ms-filter: "alpha(opacity=20)"; 
+	}
+	
+	.mCS-minimal.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
+	.mCS-minimal.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar{
+		background-color: #fff; background-color: rgba(255,255,255,0.5);
+		filter: "alpha(opacity=50)"; -ms-filter: "alpha(opacity=50)"; 
+	}
+	
+	
+	/* theme: "minimal-dark" */
+	
+	.mCS-minimal-dark.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+		background-color: #000; background-color: rgba(0,0,0,0.2);
+		filter: "alpha(opacity=20)"; -ms-filter: "alpha(opacity=20)"; 
+	}
+	
+	.mCS-minimal-dark.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
+	.mCS-minimal-dark.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar{
+		background-color: #000; background-color: rgba(0,0,0,0.5);
+		filter: "alpha(opacity=50)"; -ms-filter: "alpha(opacity=50)"; 
+	}
+	
+	/* ---------------------------------------- */
+	
+	
+	
+	/* theme "light-3", "dark-3" */
+	
+	.mCS-light-3.mCSB_scrollTools .mCSB_draggerRail, 
+	.mCS-dark-3.mCSB_scrollTools .mCSB_draggerRail{
+		width: 6px;
+		background-color: #000; background-color: rgba(0,0,0,0.2);
+	}
+
+	.mCS-light-3.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-dark-3.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{ width: 6px; }
+
+	.mCS-light-3.mCSB_scrollTools_horizontal .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-dark-3.mCSB_scrollTools_horizontal .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-light-3.mCSB_scrollTools_horizontal .mCSB_draggerRail, 
+	.mCS-dark-3.mCSB_scrollTools_horizontal .mCSB_draggerRail{
+		width: 100%;
+		height: 6px;
+		margin: 5px 0;
+	}
+	
+	.mCS-light-3.mCSB_scrollTools_vertical.mCSB_scrollTools_onDrag_expand .mCSB_dragger.mCSB_dragger_onDrag_expanded + .mCSB_draggerRail, 
+	.mCS-light-3.mCSB_scrollTools_vertical.mCSB_scrollTools_onDrag_expand .mCSB_draggerContainer:hover .mCSB_draggerRail, 
+	.mCS-dark-3.mCSB_scrollTools_vertical.mCSB_scrollTools_onDrag_expand .mCSB_dragger.mCSB_dragger_onDrag_expanded + .mCSB_draggerRail, 
+	.mCS-dark-3.mCSB_scrollTools_vertical.mCSB_scrollTools_onDrag_expand .mCSB_draggerContainer:hover .mCSB_draggerRail{
+		width: 12px;
+	}
+	
+	.mCS-light-3.mCSB_scrollTools_horizontal.mCSB_scrollTools_onDrag_expand .mCSB_dragger.mCSB_dragger_onDrag_expanded + .mCSB_draggerRail, 
+	.mCS-light-3.mCSB_scrollTools_horizontal.mCSB_scrollTools_onDrag_expand .mCSB_draggerContainer:hover .mCSB_draggerRail, 
+	.mCS-dark-3.mCSB_scrollTools_horizontal.mCSB_scrollTools_onDrag_expand .mCSB_dragger.mCSB_dragger_onDrag_expanded + .mCSB_draggerRail, 
+	.mCS-dark-3.mCSB_scrollTools_horizontal.mCSB_scrollTools_onDrag_expand .mCSB_draggerContainer:hover .mCSB_draggerRail{
+		height: 12px;
+		margin: 2px 0;
+	}
+	
+	.mCS-light-3.mCSB_scrollTools .mCSB_buttonUp{ background-position: -32px -72px; }
+	
+	.mCS-light-3.mCSB_scrollTools .mCSB_buttonDown{ background-position: -32px -92px; }
+	
+	.mCS-light-3.mCSB_scrollTools .mCSB_buttonLeft{ background-position: -40px -112px; }
+	
+	.mCS-light-3.mCSB_scrollTools .mCSB_buttonRight{ background-position: -40px -128px; }
+	
+	
+	/* theme "dark-3" */
+	
+	.mCS-dark-3.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{ background-color: #000; background-color: rgba(0,0,0,0.75); }
+
+	.mCS-dark-3.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar{ background-color: #000; background-color: rgba(0,0,0,0.85); }
+
+	.mCS-dark-3.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
+	.mCS-dark-3.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar{ background-color: #000; background-color: rgba(0,0,0,0.9); }
+	
+	.mCS-dark-3.mCSB_scrollTools .mCSB_draggerRail{ background-color: #000; background-color: rgba(0,0,0,0.1); }
+	
+	.mCS-dark-3.mCSB_scrollTools .mCSB_buttonUp{ background-position: -112px -72px; }
+
+	.mCS-dark-3.mCSB_scrollTools .mCSB_buttonDown{ background-position: -112px -92px; }
+
+	.mCS-dark-3.mCSB_scrollTools .mCSB_buttonLeft{ background-position: -120px -112px; }
+
+	.mCS-dark-3.mCSB_scrollTools .mCSB_buttonRight{	background-position: -120px -128px; }
+	
+	/* ---------------------------------------- */
+	
+	
+	
+	/* theme "inset", "inset-dark", "inset-2", "inset-2-dark", "inset-3", "inset-3-dark" */
+	
+	.mCS-inset.mCSB_scrollTools .mCSB_draggerRail, 
+	.mCS-inset-dark.mCSB_scrollTools .mCSB_draggerRail, 
+	.mCS-inset-2.mCSB_scrollTools .mCSB_draggerRail, 
+	.mCS-inset-2-dark.mCSB_scrollTools .mCSB_draggerRail, 
+	.mCS-inset-3.mCSB_scrollTools .mCSB_draggerRail, 
+	.mCS-inset-3-dark.mCSB_scrollTools .mCSB_draggerRail{
+		width: 12px;
+		background-color: #000; background-color: rgba(0,0,0,0.2);
+	}
+
+	.mCS-inset.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-inset-dark.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-inset-2.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-inset-2-dark.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-inset-3.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-inset-3-dark.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{ 
+		width: 6px;
+		margin: 3px 5px;
+		position: absolute;
+		height: auto;
+		top: 0;
+		bottom: 0;
+		left: 0;
+		right: 0;
+	}
+
+	.mCS-inset.mCSB_scrollTools_horizontal .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-inset-dark.mCSB_scrollTools_horizontal .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-inset-2.mCSB_scrollTools_horizontal .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-inset-2-dark.mCSB_scrollTools_horizontal .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-inset-3.mCSB_scrollTools_horizontal .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-inset-3-dark.mCSB_scrollTools_horizontal .mCSB_dragger .mCSB_dragger_bar{
+		height: 6px;
+		margin: 5px 3px;
+		position: absolute;
+		width: auto;
+		top: 0;
+		bottom: 0;
+		left: 0;
+		right: 0;
+	}
+	
+	.mCS-inset.mCSB_scrollTools_horizontal .mCSB_draggerRail, 
+	.mCS-inset-dark.mCSB_scrollTools_horizontal .mCSB_draggerRail, 
+	.mCS-inset-2.mCSB_scrollTools_horizontal .mCSB_draggerRail, 
+	.mCS-inset-2-dark.mCSB_scrollTools_horizontal .mCSB_draggerRail, 
+	.mCS-inset-3.mCSB_scrollTools_horizontal .mCSB_draggerRail, 
+	.mCS-inset-3-dark.mCSB_scrollTools_horizontal .mCSB_draggerRail{
+		width: 100%;
+		height: 12px;
+		margin: 2px 0;
+	}
+	
+	.mCS-inset.mCSB_scrollTools .mCSB_buttonUp, 
+	.mCS-inset-2.mCSB_scrollTools .mCSB_buttonUp, 
+	.mCS-inset-3.mCSB_scrollTools .mCSB_buttonUp{ background-position: -32px -72px; }
+	
+	.mCS-inset.mCSB_scrollTools .mCSB_buttonDown, 
+	.mCS-inset-2.mCSB_scrollTools .mCSB_buttonDown, 
+	.mCS-inset-3.mCSB_scrollTools .mCSB_buttonDown{ background-position: -32px -92px; }
+	
+	.mCS-inset.mCSB_scrollTools .mCSB_buttonLeft, 
+	.mCS-inset-2.mCSB_scrollTools .mCSB_buttonLeft, 
+	.mCS-inset-3.mCSB_scrollTools .mCSB_buttonLeft{ background-position: -40px -112px; }
+	
+	.mCS-inset.mCSB_scrollTools .mCSB_buttonRight, 
+	.mCS-inset-2.mCSB_scrollTools .mCSB_buttonRight, 
+	.mCS-inset-3.mCSB_scrollTools .mCSB_buttonRight{ background-position: -40px -128px; }
+	
+	
+	/* theme "inset-dark", "inset-2-dark", "inset-3-dark" */
+	
+	.mCS-inset-dark.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-inset-2-dark.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar, 
+	.mCS-inset-3-dark.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{ background-color: #000; background-color: rgba(0,0,0,0.75); }
+
+	.mCS-inset-dark.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar, 
+	.mCS-inset-2-dark.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar, 
+	.mCS-inset-3-dark.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar{ background-color: #000; background-color: rgba(0,0,0,0.85); }
+
+	.mCS-inset-dark.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
+	.mCS-inset-dark.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar, 
+	.mCS-inset-2-dark.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
+	.mCS-inset-2-dark.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar, 
+	.mCS-inset-3-dark.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
+	.mCS-inset-3-dark.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar{ background-color: #000; background-color: rgba(0,0,0,0.9); }
+	
+	.mCS-inset-dark.mCSB_scrollTools .mCSB_draggerRail, 
+	.mCS-inset-2-dark.mCSB_scrollTools .mCSB_draggerRail, 
+	.mCS-inset-3-dark.mCSB_scrollTools .mCSB_draggerRail{ background-color: #000; background-color: rgba(0,0,0,0.1); }
+	
+	.mCS-inset-dark.mCSB_scrollTools .mCSB_buttonUp, 
+	.mCS-inset-2-dark.mCSB_scrollTools .mCSB_buttonUp, 
+	.mCS-inset-3-dark.mCSB_scrollTools .mCSB_buttonUp{ background-position: -112px -72px; }
+
+	.mCS-inset-dark.mCSB_scrollTools .mCSB_buttonDown, 
+	.mCS-inset-2-dark.mCSB_scrollTools .mCSB_buttonDown, 
+	.mCS-inset-3-dark.mCSB_scrollTools .mCSB_buttonDown{ background-position: -112px -92px; }
+
+	.mCS-inset-dark.mCSB_scrollTools .mCSB_buttonLeft, 
+	.mCS-inset-2-dark.mCSB_scrollTools .mCSB_buttonLeft, 
+	.mCS-inset-3-dark.mCSB_scrollTools .mCSB_buttonLeft{ background-position: -120px -112px; }
+
+	.mCS-inset-dark.mCSB_scrollTools .mCSB_buttonRight, 
+	.mCS-inset-2-dark.mCSB_scrollTools .mCSB_buttonRight, 
+	.mCS-inset-3-dark.mCSB_scrollTools .mCSB_buttonRight{	background-position: -120px -128px; }
+	
+	
+	/* theme "inset-2", "inset-2-dark" */
+	
+	.mCS-inset-2.mCSB_scrollTools .mCSB_draggerRail, 
+	.mCS-inset-2-dark.mCSB_scrollTools .mCSB_draggerRail{
+		background-color: transparent;
+		border-width: 1px;
+		border-style: solid;
+		border-color: #fff;
+		border-color: rgba(255,255,255,0.2);
+		-webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box;
+	}
+	
+	.mCS-inset-2-dark.mCSB_scrollTools .mCSB_draggerRail{ border-color: #000; border-color: rgba(0,0,0,0.2); }
+	
+	
+	/* theme "inset-3", "inset-3-dark" */
+	
+	.mCS-inset-3.mCSB_scrollTools .mCSB_draggerRail{ background-color: #fff; background-color: rgba(255,255,255,0.6); }
+	
+	.mCS-inset-3-dark.mCSB_scrollTools .mCSB_draggerRail{ background-color: #000; background-color: rgba(0,0,0,0.6); }
+	
+	.mCS-inset-3.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{ background-color: #000; background-color: rgba(0,0,0,0.75); }
+	
+	.mCS-inset-3.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar{ background-color: #000; background-color: rgba(0,0,0,0.85); }
+	
+	.mCS-inset-3.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
+	.mCS-inset-3.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar{ background-color: #000; background-color: rgba(0,0,0,0.9); }
+	
+	.mCS-inset-3-dark.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{ background-color: #fff; background-color: rgba(255,255,255,0.75); }
+	
+	.mCS-inset-3-dark.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar{ background-color: #fff; background-color: rgba(255,255,255,0.85); }
+	
+	.mCS-inset-3-dark.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
+	.mCS-inset-3-dark.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar{ background-color: #fff; background-color: rgba(255,255,255,0.9); }
+	
+	/* ---------------------------------------- */
diff --git a/packages/wekan-scrollbar/jquery.mCustomScrollbar.js b/packages/wekan-scrollbar/jquery.mCustomScrollbar.js
new file mode 100644
index 00000000..b7883579
--- /dev/null
+++ b/packages/wekan-scrollbar/jquery.mCustomScrollbar.js
@@ -0,0 +1,2423 @@
+/*
+== malihu jquery custom scrollbar plugin ==
+Version: 3.1.3
+Plugin URI: http://manos.malihu.gr/jquery-custom-content-scroller
+Author: malihu
+Author URI: http://manos.malihu.gr
+License: MIT License (MIT)
+*/
+
+/*
+Copyright Manos Malihutsakis (email: manos@malihu.gr)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+
+/*
+The code below is fairly long, fully commented and should be normally used in development.
+For production, use either the minified jquery.mCustomScrollbar.min.js script or
+the production-ready jquery.mCustomScrollbar.concat.min.js which contains the plugin
+and dependencies (minified).
+*/
+
+(function(factory){
+	if(typeof module!=="undefined" && module.exports){
+		module.exports=factory;
+	}else{
+		factory(jQuery,window,document);
+	}
+}(function($){
+(function(init){
+	var _rjs=typeof define==="function" && define.amd, /* RequireJS */
+		_njs=typeof module !== "undefined" && module.exports; /* NodeJS */
+	if(!_rjs){
+		if(_njs){
+			require("jquery-mousewheel")($);
+		}else{
+			/* Only load locally jquery-mousewheel plugin.
+			(works when mCustomScrollbar fn is called on window load) */
+			$.event.special.mousewheel;
+		}
+	}
+	init();
+}(function(){
+
+	/*
+	----------------------------------------
+	PLUGIN NAMESPACE, PREFIX, DEFAULT SELECTOR(S)
+	----------------------------------------
+	*/
+
+	var pluginNS="mCustomScrollbar",
+		pluginPfx="mCS",
+		defaultSelector=".mCustomScrollbar",
+
+
+
+
+
+	/*
+	----------------------------------------
+	DEFAULT OPTIONS
+	----------------------------------------
+	*/
+
+		defaults={
+			/*
+			set element/content width/height programmatically
+			values: boolean, pixels, percentage
+				option						default
+				-------------------------------------
+				setWidth					false
+				setHeight					false
+			*/
+			/*
+			set the initial css top property of content
+			values: string (e.g. "-100px", "10%" etc.)
+			*/
+			setTop:0,
+			/*
+			set the initial css left property of content
+			values: string (e.g. "-100px", "10%" etc.)
+			*/
+			setLeft:0,
+			/*
+			scrollbar axis (vertical and/or horizontal scrollbars)
+			values (string): "y", "x", "yx"
+			*/
+			axis:"y",
+			/*
+			position of scrollbar relative to content
+			values (string): "inside", "outside" ("outside" requires elements with position:relative)
+			*/
+			scrollbarPosition:"inside",
+			/*
+			scrolling inertia
+			values: integer (milliseconds)
+			*/
+			scrollInertia:950,
+			/*
+			auto-adjust scrollbar dragger length
+			values: boolean
+			*/
+			autoDraggerLength:true,
+			/*
+			auto-hide scrollbar when idle
+			values: boolean
+				option						default
+				-------------------------------------
+				autoHideScrollbar			false
+			*/
+			/*
+			auto-expands scrollbar on mouse-over and dragging
+			values: boolean
+				option						default
+				-------------------------------------
+				autoExpandScrollbar			false
+			*/
+			/*
+			always show scrollbar, even when there's nothing to scroll
+			values: integer (0=disable, 1=always show dragger rail and buttons, 2=always show dragger rail, dragger and buttons), boolean
+			*/
+			alwaysShowScrollbar:0,
+			/*
+			scrolling always snaps to a multiple of this number in pixels
+			values: integer, array ([y,x])
+				option						default
+				-------------------------------------
+				snapAmount					null
+			*/
+			/*
+			when snapping, snap with this number in pixels as an offset
+			values: integer
+			*/
+			snapOffset:0,
+			/*
+			mouse-wheel scrolling
+			*/
+			mouseWheel:{
+				/*
+				enable mouse-wheel scrolling
+				values: boolean
+				*/
+				enable:true,
+				/*
+				scrolling amount in pixels
+				values: "auto", integer
+				*/
+				scrollAmount:"auto",
+				/*
+				mouse-wheel scrolling axis
+				the default scrolling direction when both vertical and horizontal scrollbars are present
+				values (string): "y", "x"
+				*/
+				axis:"y",
+				/*
+				prevent the default behaviour which automatically scrolls the parent element(s) when end of scrolling is reached
+				values: boolean
+					option						default
+					-------------------------------------
+					preventDefault				null
+				*/
+				/*
+				the reported mouse-wheel delta value. The number of lines (translated to pixels) one wheel notch scrolls.
+				values: "auto", integer
+				"auto" uses the default OS/browser value
+				*/
+				deltaFactor:"auto",
+				/*
+				normalize mouse-wheel delta to -1 or 1 (disables mouse-wheel acceleration)
+				values: boolean
+					option						default
+					-------------------------------------
+					normalizeDelta				null
+				*/
+				/*
+				invert mouse-wheel scrolling direction
+				values: boolean
+					option						default
+					-------------------------------------
+					invert						null
+				*/
+				/*
+				the tags that disable mouse-wheel when cursor is over them
+				*/
+				disableOver:["select","option","keygen","datalist","textarea"]
+			},
+			/*
+			scrollbar buttons
+			*/
+			scrollButtons:{
+				/*
+				enable scrollbar buttons
+				values: boolean
+					option						default
+					-------------------------------------
+					enable						null
+				*/
+				/*
+				scrollbar buttons scrolling type
+				values (string): "stepless", "stepped"
+				*/
+				scrollType:"stepless",
+				/*
+				scrolling amount in pixels
+				values: "auto", integer
+				*/
+				scrollAmount:"auto"
+				/*
+				tabindex of the scrollbar buttons
+				values: false, integer
+					option						default
+					-------------------------------------
+					tabindex					null
+				*/
+			},
+			/*
+			keyboard scrolling
+			*/
+			keyboard:{
+				/*
+				enable scrolling via keyboard
+				values: boolean
+				*/
+				enable:true,
+				/*
+				keyboard scrolling type
+				values (string): "stepless", "stepped"
+				*/
+				scrollType:"stepless",
+				/*
+				scrolling amount in pixels
+				values: "auto", integer
+				*/
+				scrollAmount:"auto"
+			},
+			/*
+			enable content touch-swipe scrolling
+			values: boolean, integer, string (number)
+			integer values define the axis-specific minimum amount required for scrolling momentum
+			*/
+			contentTouchScroll:25,
+			/*
+			enable/disable document (default) touch-swipe scrolling
+			*/
+			documentTouchScroll:true,
+			/*
+			advanced option parameters
+			*/
+			advanced:{
+				/*
+				auto-expand content horizontally (for "x" or "yx" axis)
+				values: boolean, integer (the value 2 forces the non scrollHeight/scrollWidth method, the value 3 forces the scrollHeight/scrollWidth method)
+					option						default
+					-------------------------------------
+					autoExpandHorizontalScroll	null
+				*/
+				/*
+				auto-scroll to elements with focus
+				*/
+				autoScrollOnFocus:"input,textarea,select,button,datalist,keygen,a[tabindex],area,object,[contenteditable='true']",
+				/*
+				auto-update scrollbars on content, element or viewport resize
+				should be true for fluid layouts/elements, adding/removing content dynamically, hiding/showing elements, content with images etc.
+				values: boolean
+				*/
+				updateOnContentResize:true,
+				/*
+				auto-update scrollbars each time each image inside the element is fully loaded
+				values: "auto", boolean
+				*/
+				updateOnImageLoad:"auto",
+				/*
+				auto-update scrollbars based on the amount and size changes of specific selectors
+				useful when you need to update the scrollbar(s) automatically, each time a type of element is added, removed or changes its size
+				values: boolean, string (e.g. "ul li" will auto-update scrollbars each time list-items inside the element are changed)
+				a value of true (boolean) will auto-update scrollbars each time any element is changed
+					option						default
+					-------------------------------------
+					updateOnSelectorChange		null
+				*/
+				/*
+				extra selectors that'll allow scrollbar dragging upon mousemove/up, pointermove/up, touchend etc. (e.g. "selector-1, selector-2")
+					option						default
+					-------------------------------------
+					extraDraggableSelectors		null
+				*/
+				/*
+				extra selectors that'll release scrollbar dragging upon mouseup, pointerup, touchend etc. (e.g. "selector-1, selector-2")
+					option						default
+					-------------------------------------
+					releaseDraggableSelectors	null
+				*/
+				/*
+				auto-update timeout
+				values: integer (milliseconds)
+				*/
+				autoUpdateTimeout:60
+			},
+			/*
+			scrollbar theme
+			values: string (see CSS/plugin URI for a list of ready-to-use themes)
+			*/
+			theme:"light",
+			/*
+			user defined callback functions
+			*/
+			callbacks:{
+				/*
+				Available callbacks:
+					callback					default
+					-------------------------------------
+					onCreate					null
+					onInit						null
+					onScrollStart				null
+					onScroll					null
+					onTotalScroll				null
+					onTotalScrollBack			null
+					whileScrolling				null
+					onOverflowY					null
+					onOverflowX					null
+					onOverflowYNone				null
+					onOverflowXNone				null
+					onImageLoad					null
+					onSelectorChange			null
+					onBeforeUpdate				null
+					onUpdate					null
+				*/
+				onTotalScrollOffset:0,
+				onTotalScrollBackOffset:0,
+				alwaysTriggerOffsets:true
+			}
+			/*
+			add scrollbar(s) on all elements matching the current selector, now and in the future
+			values: boolean, string
+			string values: "on" (enable), "once" (disable after first invocation), "off" (disable)
+			liveSelector values: string (selector)
+				option						default
+				-------------------------------------
+				live						false
+				liveSelector				null
+			*/
+		},
+
+
+
+
+
+	/*
+	----------------------------------------
+	VARS, CONSTANTS
+	----------------------------------------
+	*/
+
+		totalInstances=0, /* plugin instances amount */
+		liveTimers={}, /* live option timers */
+		oldIE=(window.attachEvent && !window.addEventListener) ? 1 : 0, /* detect IE < 9 */
+		touchActive=false,touchable, /* global touch vars (for touch and pointer events) */
+		/* general plugin classes */
+		classes=[
+			"mCSB_dragger_onDrag","mCSB_scrollTools_onDrag","mCS_img_loaded","mCS_disabled","mCS_destroyed","mCS_no_scrollbar",
+			"mCS-autoHide","mCS-dir-rtl","mCS_no_scrollbar_y","mCS_no_scrollbar_x","mCS_y_hidden","mCS_x_hidden","mCSB_draggerContainer",
+			"mCSB_buttonUp","mCSB_buttonDown","mCSB_buttonLeft","mCSB_buttonRight"
+		],
+
+
+
+
+
+	/*
+	----------------------------------------
+	METHODS
+	----------------------------------------
+	*/
+
+		methods={
+
+			/*
+			plugin initialization method
+			creates the scrollbar(s), plugin data object and options
+			----------------------------------------
+			*/
+
+			init:function(options){
+
+				var options=$.extend(true,{},defaults,options),
+					selector=_selector.call(this); /* validate selector */
+
+				/*
+				if live option is enabled, monitor for elements matching the current selector and
+				apply scrollbar(s) when found (now and in the future)
+				*/
+				if(options.live){
+					var liveSelector=options.liveSelector || this.selector || defaultSelector, /* live selector(s) */
+						$liveSelector=$(liveSelector); /* live selector(s) as jquery object */
+					if(options.live==="off"){
+						/*
+						disable live if requested
+						usage: $(selector).mCustomScrollbar({live:"off"});
+						*/
+						removeLiveTimers(liveSelector);
+						return;
+					}
+					liveTimers[liveSelector]=setTimeout(function(){
+						/* call mCustomScrollbar fn on live selector(s) every half-second */
+						$liveSelector.mCustomScrollbar(options);
+						if(options.live==="once" && $liveSelector.length){
+							/* disable live after first invocation */
+							removeLiveTimers(liveSelector);
+						}
+					},500);
+				}else{
+					removeLiveTimers(liveSelector);
+				}
+
+				/* options backward compatibility (for versions < 3.0.0) and normalization */
+				options.setWidth=(options.set_width) ? options.set_width : options.setWidth;
+				options.setHeight=(options.set_height) ? options.set_height : options.setHeight;
+				options.axis=(options.horizontalScroll) ? "x" : _findAxis(options.axis);
+				options.scrollInertia=options.scrollInertia>0 && options.scrollInertia<17 ? 17 : options.scrollInertia;
+				if(typeof options.mouseWheel!=="object" &&  options.mouseWheel==true){ /* old school mouseWheel option (non-object) */
+					options.mouseWheel={enable:true,scrollAmount:"auto",axis:"y",preventDefault:false,deltaFactor:"auto",normalizeDelta:false,invert:false}
+				}
+				options.mouseWheel.scrollAmount=!options.mouseWheelPixels ? options.mouseWheel.scrollAmount : options.mouseWheelPixels;
+				options.mouseWheel.normalizeDelta=!options.advanced.normalizeMouseWheelDelta ? options.mouseWheel.normalizeDelta : options.advanced.normalizeMouseWheelDelta;
+				options.scrollButtons.scrollType=_findScrollButtonsType(options.scrollButtons.scrollType);
+
+				_theme(options); /* theme-specific options */
+
+				/* plugin constructor */
+				return $(selector).each(function(){
+
+					var $this=$(this);
+
+					if(!$this.data(pluginPfx)){ /* prevent multiple instantiations */
+
+						/* store options and create objects in jquery data */
+						$this.data(pluginPfx,{
+							idx:++totalInstances, /* instance index */
+							opt:options, /* options */
+							scrollRatio:{y:null,x:null}, /* scrollbar to content ratio */
+							overflowed:null, /* overflowed axis */
+							contentReset:{y:null,x:null}, /* object to check when content resets */
+							bindEvents:false, /* object to check if events are bound */
+							tweenRunning:false, /* object to check if tween is running */
+							sequential:{}, /* sequential scrolling object */
+							langDir:$this.css("direction"), /* detect/store direction (ltr or rtl) */
+							cbOffsets:null, /* object to check whether callback offsets always trigger */
+							/*
+							object to check how scrolling events where last triggered
+							"internal" (default - triggered by this script), "external" (triggered by other scripts, e.g. via scrollTo method)
+							usage: object.data("mCS").trigger
+							*/
+							trigger:null,
+							/*
+							object to check for changes in elements in order to call the update method automatically
+							*/
+							poll:{size:{o:0,n:0},img:{o:0,n:0},change:{o:0,n:0}}
+						});
+
+						var d=$this.data(pluginPfx),o=d.opt,
+							/* HTML data attributes */
+							htmlDataAxis=$this.data("mcs-axis"),htmlDataSbPos=$this.data("mcs-scrollbar-position"),htmlDataTheme=$this.data("mcs-theme");
+
+						if(htmlDataAxis){o.axis=htmlDataAxis;} /* usage example: data-mcs-axis="y" */
+						if(htmlDataSbPos){o.scrollbarPosition=htmlDataSbPos;} /* usage example: data-mcs-scrollbar-position="outside" */
+						if(htmlDataTheme){ /* usage example: data-mcs-theme="minimal" */
+							o.theme=htmlDataTheme;
+							_theme(o); /* theme-specific options */
+						}
+
+						_pluginMarkup.call(this); /* add plugin markup */
+
+						if(d && o.callbacks.onCreate && typeof o.callbacks.onCreate==="function"){o.callbacks.onCreate.call(this);} /* callbacks: onCreate */
+
+						$("#mCSB_"+d.idx+"_container img:not(."+classes[2]+")").addClass(classes[2]); /* flag loaded images */
+
+						methods.update.call(null,$this); /* call the update method */
+
+					}
+
+				});
+
+			},
+			/* ---------------------------------------- */
+
+
+
+			/*
+			plugin update method
+			updates content and scrollbar(s) values, events and status
+			----------------------------------------
+			usage: $(selector).mCustomScrollbar("update");
+			*/
+
+			update:function(el,cb){
+
+				var selector=el || _selector.call(this); /* validate selector */
+
+				return $(selector).each(function(){
+
+					var $this=$(this);
+
+					if($this.data(pluginPfx)){ /* check if plugin has initialized */
+
+						var d=$this.data(pluginPfx),o=d.opt,
+							mCSB_container=$("#mCSB_"+d.idx+"_container"),
+							mCustomScrollBox=$("#mCSB_"+d.idx),
+							mCSB_dragger=[$("#mCSB_"+d.idx+"_dragger_vertical"),$("#mCSB_"+d.idx+"_dragger_horizontal")];
+
+						if(!mCSB_container.length){return;}
+
+						if(d.tweenRunning){_stop($this);} /* stop any running tweens while updating */
+
+						if(cb && d && o.callbacks.onBeforeUpdate && typeof o.callbacks.onBeforeUpdate==="function"){o.callbacks.onBeforeUpdate.call(this);} /* callbacks: onBeforeUpdate */
+
+						/* if element was disabled or destroyed, remove class(es) */
+						if($this.hasClass(classes[3])){$this.removeClass(classes[3]);}
+						if($this.hasClass(classes[4])){$this.removeClass(classes[4]);}
+
+						/* css flexbox fix, detect/set max-height */
+						mCustomScrollBox.css("max-height","none");
+						if(mCustomScrollBox.height()!==$this.height()){mCustomScrollBox.css("max-height",$this.height());}
+
+						_expandContentHorizontally.call(this); /* expand content horizontally */
+
+						if(o.axis!=="y" && !o.advanced.autoExpandHorizontalScroll){
+							mCSB_container.css("width",_contentWidth(mCSB_container));
+						}
+
+						d.overflowed=_overflowed.call(this); /* determine if scrolling is required */
+
+						_scrollbarVisibility.call(this); /* show/hide scrollbar(s) */
+
+						/* auto-adjust scrollbar dragger length analogous to content */
+						if(o.autoDraggerLength){_setDraggerLength.call(this);}
+
+						_scrollRatio.call(this); /* calculate and store scrollbar to content ratio */
+
+						_bindEvents.call(this); /* bind scrollbar events */
+
+						/* reset scrolling position and/or events */
+						var to=[Math.abs(mCSB_container[0].offsetTop),Math.abs(mCSB_container[0].offsetLeft)];
+						if(o.axis!=="x"){ /* y/yx axis */
+							if(!d.overflowed[0]){ /* y scrolling is not required */
+								_resetContentPosition.call(this); /* reset content position */
+								if(o.axis==="y"){
+									_unbindEvents.call(this);
+								}else if(o.axis==="yx" && d.overflowed[1]){
+									_scrollTo($this,to[1].toString(),{dir:"x",dur:0,overwrite:"none"});
+								}
+							}else if(mCSB_dragger[0].height()>mCSB_dragger[0].parent().height()){
+								_resetContentPosition.call(this); /* reset content position */
+							}else{ /* y scrolling is required */
+								_scrollTo($this,to[0].toString(),{dir:"y",dur:0,overwrite:"none"});
+								d.contentReset.y=null;
+							}
+						}
+						if(o.axis!=="y"){ /* x/yx axis */
+							if(!d.overflowed[1]){ /* x scrolling is not required */
+								_resetContentPosition.call(this); /* reset content position */
+								if(o.axis==="x"){
+									_unbindEvents.call(this);
+								}else if(o.axis==="yx" && d.overflowed[0]){
+									_scrollTo($this,to[0].toString(),{dir:"y",dur:0,overwrite:"none"});
+								}
+							}else if(mCSB_dragger[1].width()>mCSB_dragger[1].parent().width()){
+								_resetContentPosition.call(this); /* reset content position */
+							}else{ /* x scrolling is required */
+								_scrollTo($this,to[1].toString(),{dir:"x",dur:0,overwrite:"none"});
+								d.contentReset.x=null;
+							}
+						}
+
+						/* callbacks: onImageLoad, onSelectorChange, onUpdate */
+						if(cb && d){
+							if(cb===2 && o.callbacks.onImageLoad && typeof o.callbacks.onImageLoad==="function"){
+								o.callbacks.onImageLoad.call(this);
+							}else if(cb===3 && o.callbacks.onSelectorChange && typeof o.callbacks.onSelectorChange==="function"){
+								o.callbacks.onSelectorChange.call(this);
+							}else if(o.callbacks.onUpdate && typeof o.callbacks.onUpdate==="function"){
+								o.callbacks.onUpdate.call(this);
+							}
+						}
+
+						_autoUpdate.call(this); /* initialize automatic updating (for dynamic content, fluid layouts etc.) */
+
+					}
+
+				});
+
+			},
+			/* ---------------------------------------- */
+
+
+
+			/*
+			plugin scrollTo method
+			triggers a scrolling event to a specific value
+			----------------------------------------
+			usage: $(selector).mCustomScrollbar("scrollTo",value,options);
+			*/
+
+			scrollTo:function(val,options){
+
+				/* prevent silly things like $(selector).mCustomScrollbar("scrollTo",undefined); */
+				if(typeof val=="undefined" || val==null){return;}
+
+				var selector=_selector.call(this); /* validate selector */
+
+				return $(selector).each(function(){
+
+					var $this=$(this);
+
+					if($this.data(pluginPfx)){ /* check if plugin has initialized */
+
+						var d=$this.data(pluginPfx),o=d.opt,
+							/* method default options */
+							methodDefaults={
+								trigger:"external", /* method is by default triggered externally (e.g. from other scripts) */
+								scrollInertia:o.scrollInertia, /* scrolling inertia (animation duration) */
+								scrollEasing:"mcsEaseInOut", /* animation easing */
+								moveDragger:false, /* move dragger instead of content */
+								timeout:60, /* scroll-to delay */
+								callbacks:true, /* enable/disable callbacks */
+								onStart:true,
+								onUpdate:true,
+								onComplete:true
+							},
+							methodOptions=$.extend(true,{},methodDefaults,options),
+							to=_arr.call(this,val),dur=methodOptions.scrollInertia>0 && methodOptions.scrollInertia<17 ? 17 : methodOptions.scrollInertia;
+
+						/* translate yx values to actual scroll-to positions */
+						to[0]=_to.call(this,to[0],"y");
+						to[1]=_to.call(this,to[1],"x");
+
+						/*
+						check if scroll-to value moves the dragger instead of content.
+						Only pixel values apply on dragger (e.g. 100, "100px", "-=100" etc.)
+						*/
+						if(methodOptions.moveDragger){
+							to[0]*=d.scrollRatio.y;
+							to[1]*=d.scrollRatio.x;
+						}
+
+						methodOptions.dur=_isTabHidden() ? 0 : dur; //skip animations if browser tab is hidden
+
+						setTimeout(function(){
+							/* do the scrolling */
+							if(to[0]!==null && typeof to[0]!=="undefined" && o.axis!=="x" && d.overflowed[0]){ /* scroll y */
+								methodOptions.dir="y";
+								methodOptions.overwrite="all";
+								_scrollTo($this,to[0].toString(),methodOptions);
+							}
+							if(to[1]!==null && typeof to[1]!=="undefined" && o.axis!=="y" && d.overflowed[1]){ /* scroll x */
+								methodOptions.dir="x";
+								methodOptions.overwrite="none";
+								_scrollTo($this,to[1].toString(),methodOptions);
+							}
+						},methodOptions.timeout);
+
+					}
+
+				});
+
+			},
+			/* ---------------------------------------- */
+
+
+
+			/*
+			plugin stop method
+			stops scrolling animation
+			----------------------------------------
+			usage: $(selector).mCustomScrollbar("stop");
+			*/
+			stop:function(){
+
+				var selector=_selector.call(this); /* validate selector */
+
+				return $(selector).each(function(){
+
+					var $this=$(this);
+
+					if($this.data(pluginPfx)){ /* check if plugin has initialized */
+
+						_stop($this);
+
+					}
+
+				});
+
+			},
+			/* ---------------------------------------- */
+
+
+
+			/*
+			plugin disable method
+			temporarily disables the scrollbar(s)
+			----------------------------------------
+			usage: $(selector).mCustomScrollbar("disable",reset);
+			reset (boolean): resets content position to 0
+			*/
+			disable:function(r){
+
+				var selector=_selector.call(this); /* validate selector */
+
+				return $(selector).each(function(){
+
+					var $this=$(this);
+
+					if($this.data(pluginPfx)){ /* check if plugin has initialized */
+
+						var d=$this.data(pluginPfx);
+
+						_autoUpdate.call(this,"remove"); /* remove automatic updating */
+
+						_unbindEvents.call(this); /* unbind events */
+
+						if(r){_resetContentPosition.call(this);} /* reset content position */
+
+						_scrollbarVisibility.call(this,true); /* show/hide scrollbar(s) */
+
+						$this.addClass(classes[3]); /* add disable class */
+
+					}
+
+				});
+
+			},
+			/* ---------------------------------------- */
+
+
+
+			/*
+			plugin destroy method
+			completely removes the scrollbar(s) and returns the element to its original state
+			----------------------------------------
+			usage: $(selector).mCustomScrollbar("destroy");
+			*/
+			destroy:function(){
+
+				var selector=_selector.call(this); /* validate selector */
+
+				return $(selector).each(function(){
+
+					var $this=$(this);
+
+					if($this.data(pluginPfx)){ /* check if plugin has initialized */
+
+						var d=$this.data(pluginPfx),o=d.opt,
+							mCustomScrollBox=$("#mCSB_"+d.idx),
+							mCSB_container=$("#mCSB_"+d.idx+"_container"),
+							scrollbar=$(".mCSB_"+d.idx+"_scrollbar");
+
+						if(o.live){removeLiveTimers(o.liveSelector || $(selector).selector);} /* remove live timers */
+
+						_autoUpdate.call(this,"remove"); /* remove automatic updating */
+
+						_unbindEvents.call(this); /* unbind events */
+
+						_resetContentPosition.call(this); /* reset content position */
+
+						$this.removeData(pluginPfx); /* remove plugin data object */
+
+						_delete(this,"mcs"); /* delete callbacks object */
+
+						/* remove plugin markup */
+						scrollbar.remove(); /* remove scrollbar(s) first (those can be either inside or outside plugin's inner wrapper) */
+						mCSB_container.find("img."+classes[2]).removeClass(classes[2]); /* remove loaded images flag */
+						mCustomScrollBox.replaceWith(mCSB_container.contents()); /* replace plugin's inner wrapper with the original content */
+						/* remove plugin classes from the element and add destroy class */
+						$this.removeClass(pluginNS+" _"+pluginPfx+"_"+d.idx+" "+classes[6]+" "+classes[7]+" "+classes[5]+" "+classes[3]).addClass(classes[4]);
+
+					}
+
+				});
+
+			}
+			/* ---------------------------------------- */
+
+		},
+
+
+
+
+
+	/*
+	----------------------------------------
+	FUNCTIONS
+	----------------------------------------
+	*/
+
+		/* validates selector (if selector is invalid or undefined uses the default one) */
+		_selector=function(){
+			return (typeof $(this)!=="object" || $(this).length<1) ? defaultSelector : this;
+		},
+		/* -------------------- */
+
+
+		/* changes options according to theme */
+		_theme=function(obj){
+			var fixedSizeScrollbarThemes=["rounded","rounded-dark","rounded-dots","rounded-dots-dark"],
+				nonExpandedScrollbarThemes=["rounded-dots","rounded-dots-dark","3d","3d-dark","3d-thick","3d-thick-dark","inset","inset-dark","inset-2","inset-2-dark","inset-3","inset-3-dark"],
+				disabledScrollButtonsThemes=["minimal","minimal-dark"],
+				enabledAutoHideScrollbarThemes=["minimal","minimal-dark"],
+				scrollbarPositionOutsideThemes=["minimal","minimal-dark"];
+			obj.autoDraggerLength=$.inArray(obj.theme,fixedSizeScrollbarThemes) > -1 ? false : obj.autoDraggerLength;
+			obj.autoExpandScrollbar=$.inArray(obj.theme,nonExpandedScrollbarThemes) > -1 ? false : obj.autoExpandScrollbar;
+			obj.scrollButtons.enable=$.inArray(obj.theme,disabledScrollButtonsThemes) > -1 ? false : obj.scrollButtons.enable;
+			obj.autoHideScrollbar=$.inArray(obj.theme,enabledAutoHideScrollbarThemes) > -1 ? true : obj.autoHideScrollbar;
+			obj.scrollbarPosition=$.inArray(obj.theme,scrollbarPositionOutsideThemes) > -1 ? "outside" : obj.scrollbarPosition;
+		},
+		/* -------------------- */
+
+
+		/* live option timers removal */
+		removeLiveTimers=function(selector){
+			if(liveTimers[selector]){
+				clearTimeout(liveTimers[selector]);
+				_delete(liveTimers,selector);
+			}
+		},
+		/* -------------------- */
+
+
+		/* normalizes axis option to valid values: "y", "x", "yx" */
+		_findAxis=function(val){
+			return (val==="yx" || val==="xy" || val==="auto") ? "yx" : (val==="x" || val==="horizontal") ? "x" : "y";
+		},
+		/* -------------------- */
+
+
+		/* normalizes scrollButtons.scrollType option to valid values: "stepless", "stepped" */
+		_findScrollButtonsType=function(val){
+			return (val==="stepped" || val==="pixels" || val==="step" || val==="click") ? "stepped" : "stepless";
+		},
+		/* -------------------- */
+
+
+		/* generates plugin markup */
+		_pluginMarkup=function(){
+			var $this=$(this),d=$this.data(pluginPfx),o=d.opt,
+				expandClass=o.autoExpandScrollbar ? " "+classes[1]+"_expand" : "",
+				scrollbar=["<div id='mCSB_"+d.idx+"_scrollbar_vertical' class='mCSB_scrollTools mCSB_"+d.idx+"_scrollbar mCS-"+o.theme+" mCSB_scrollTools_vertical"+expandClass+"'><div class='"+classes[12]+"'><div id='mCSB_"+d.idx+"_dragger_vertical' class='mCSB_dragger' style='position:absolute;' oncontextmenu='return false;'><div class='mCSB_dragger_bar' /></div><div class='mCSB_draggerRail' /></div></div>","<div id='mCSB_"+d.idx+"_scrollbar_horizontal' class='mCSB_scrollTools mCSB_"+d.idx+"_scrollbar mCS-"+o.theme+" mCSB_scrollTools_horizontal"+expandClass+"'><div class='"+classes[12]+"'><div id='mCSB_"+d.idx+"_dragger_horizontal' class='mCSB_dragger' style='position:absolute;' oncontextmenu='return false;'><div class='mCSB_dragger_bar' /></div><div class='mCSB_draggerRail' /></div></div>"],
+				wrapperClass=o.axis==="yx" ? "mCSB_vertical_horizontal" : o.axis==="x" ? "mCSB_horizontal" : "mCSB_vertical",
+				scrollbars=o.axis==="yx" ? scrollbar[0]+scrollbar[1] : o.axis==="x" ? scrollbar[1] : scrollbar[0],
+				contentWrapper=o.axis==="yx" ? "<div id='mCSB_"+d.idx+"_container_wrapper' class='mCSB_container_wrapper' />" : "",
+				autoHideClass=o.autoHideScrollbar ? " "+classes[6] : "",
+				scrollbarDirClass=(o.axis!=="x" && d.langDir==="rtl") ? " "+classes[7] : "";
+			if(o.setWidth){$this.css("width",o.setWidth);} /* set element width */
+			if(o.setHeight){$this.css("height",o.setHeight);} /* set element height */
+			o.setLeft=(o.axis!=="y" && d.langDir==="rtl") ? "989999px" : o.setLeft; /* adjust left position for rtl direction */
+			$this.addClass(pluginNS+" _"+pluginPfx+"_"+d.idx+autoHideClass+scrollbarDirClass).wrapInner("<div id='mCSB_"+d.idx+"' class='mCustomScrollBox mCS-"+o.theme+" "+wrapperClass+"'><div id='mCSB_"+d.idx+"_container' class='mCSB_container' style='position:relative; top:"+o.setTop+"; left:"+o.setLeft+";' dir="+d.langDir+" /></div>");
+			var mCustomScrollBox=$("#mCSB_"+d.idx),
+				mCSB_container=$("#mCSB_"+d.idx+"_container");
+			if(o.axis!=="y" && !o.advanced.autoExpandHorizontalScroll){
+				mCSB_container.css("width",_contentWidth(mCSB_container));
+			}
+			if(o.scrollbarPosition==="outside"){
+				if($this.css("position")==="static"){ /* requires elements with non-static position */
+					$this.css("position","relative");
+				}
+				$this.css("overflow","visible");
+				mCustomScrollBox.addClass("mCSB_outside").after(scrollbars);
+			}else{
+				mCustomScrollBox.addClass("mCSB_inside").append(scrollbars);
+				mCSB_container.wrap(contentWrapper);
+			}
+			_scrollButtons.call(this); /* add scrollbar buttons */
+			/* minimum dragger length */
+			var mCSB_dragger=[$("#mCSB_"+d.idx+"_dragger_vertical"),$("#mCSB_"+d.idx+"_dragger_horizontal")];
+			mCSB_dragger[0].css("min-height",mCSB_dragger[0].height());
+			mCSB_dragger[1].css("min-width",mCSB_dragger[1].width());
+		},
+		/* -------------------- */
+
+
+		/* calculates content width */
+		_contentWidth=function(el){
+			var val=[el[0].scrollWidth,Math.max.apply(Math,el.children().map(function(){return $(this).outerWidth(true);}).get())],w=el.parent().width();
+			return val[0]>w ? val[0] : val[1]>w ? val[1] : "100%";
+		},
+		/* -------------------- */
+
+
+		/* expands content horizontally */
+		_expandContentHorizontally=function(){
+			var $this=$(this),d=$this.data(pluginPfx),o=d.opt,
+				mCSB_container=$("#mCSB_"+d.idx+"_container");
+			if(o.advanced.autoExpandHorizontalScroll && o.axis!=="y"){
+				/* calculate scrollWidth */
+				mCSB_container.css({"width":"auto","min-width":0,"overflow-x":"scroll"});
+				var w=Math.ceil(mCSB_container[0].scrollWidth);
+				if(o.advanced.autoExpandHorizontalScroll===3 || (o.advanced.autoExpandHorizontalScroll!==2 && w>mCSB_container.parent().width())){
+					mCSB_container.css({"width":w,"min-width":"100%","overflow-x":"inherit"});
+				}else{
+					/*
+					wrap content with an infinite width div and set its position to absolute and width to auto.
+					Setting width to auto before calculating the actual width is important!
+					We must let the browser set the width as browser zoom values are impossible to calculate.
+					*/
+					mCSB_container.css({"overflow-x":"inherit","position":"absolute"})
+						.wrap("<div class='mCSB_h_wrapper' style='position:relative; left:0; width:999999px;' />")
+						.css({ /* set actual width, original position and un-wrap */
+							/*
+							get the exact width (with decimals) and then round-up.
+							Using jquery outerWidth() will round the width value which will mess up with inner elements that have non-integer width
+							*/
+							"width":(Math.ceil(mCSB_container[0].getBoundingClientRect().right+0.4)-Math.floor(mCSB_container[0].getBoundingClientRect().left)),
+							"min-width":"100%",
+							"position":"relative"
+						}).unwrap();
+				}
+			}
+		},
+		/* -------------------- */
+
+
+		/* adds scrollbar buttons */
+		_scrollButtons=function(){
+			var $this=$(this),d=$this.data(pluginPfx),o=d.opt,
+				mCSB_scrollTools=$(".mCSB_"+d.idx+"_scrollbar:first"),
+				tabindex=!_isNumeric(o.scrollButtons.tabindex) ? "" : "tabindex='"+o.scrollButtons.tabindex+"'",
+				btnHTML=[
+					"<a href='#' class='"+classes[13]+"' oncontextmenu='return false;' "+tabindex+" />",
+					"<a href='#' class='"+classes[14]+"' oncontextmenu='return false;' "+tabindex+" />",
+					"<a href='#' class='"+classes[15]+"' oncontextmenu='return false;' "+tabindex+" />",
+					"<a href='#' class='"+classes[16]+"' oncontextmenu='return false;' "+tabindex+" />"
+				],
+				btn=[(o.axis==="x" ? btnHTML[2] : btnHTML[0]),(o.axis==="x" ? btnHTML[3] : btnHTML[1]),btnHTML[2],btnHTML[3]];
+			if(o.scrollButtons.enable){
+				mCSB_scrollTools.prepend(btn[0]).append(btn[1]).next(".mCSB_scrollTools").prepend(btn[2]).append(btn[3]);
+			}
+		},
+		/* -------------------- */
+
+
+		/* auto-adjusts scrollbar dragger length */
+		_setDraggerLength=function(){
+			var $this=$(this),d=$this.data(pluginPfx),
+				mCustomScrollBox=$("#mCSB_"+d.idx),
+				mCSB_container=$("#mCSB_"+d.idx+"_container"),
+				mCSB_dragger=[$("#mCSB_"+d.idx+"_dragger_vertical"),$("#mCSB_"+d.idx+"_dragger_horizontal")],
+				ratio=[mCustomScrollBox.height()/mCSB_container.outerHeight(false),mCustomScrollBox.width()/mCSB_container.outerWidth(false)],
+				l=[
+					parseInt(mCSB_dragger[0].css("min-height")),Math.round(ratio[0]*mCSB_dragger[0].parent().height()),
+					parseInt(mCSB_dragger[1].css("min-width")),Math.round(ratio[1]*mCSB_dragger[1].parent().width())
+				],
+				h=oldIE && (l[1]<l[0]) ? l[0] : l[1],w=oldIE && (l[3]<l[2]) ? l[2] : l[3];
+			mCSB_dragger[0].css({
+				"height":h,"max-height":(mCSB_dragger[0].parent().height()-10)
+			}).find(".mCSB_dragger_bar").css({"line-height":l[0]+"px"});
+			mCSB_dragger[1].css({
+				"width":w,"max-width":(mCSB_dragger[1].parent().width()-10)
+			});
+		},
+		/* -------------------- */
+
+
+		/* calculates scrollbar to content ratio */
+		_scrollRatio=function(){
+			var $this=$(this),d=$this.data(pluginPfx),
+				mCustomScrollBox=$("#mCSB_"+d.idx),
+				mCSB_container=$("#mCSB_"+d.idx+"_container"),
+				mCSB_dragger=[$("#mCSB_"+d.idx+"_dragger_vertical"),$("#mCSB_"+d.idx+"_dragger_horizontal")],
+				scrollAmount=[mCSB_container.outerHeight(false)-mCustomScrollBox.height(),mCSB_container.outerWidth(false)-mCustomScrollBox.width()],
+				ratio=[
+					scrollAmount[0]/(mCSB_dragger[0].parent().height()-mCSB_dragger[0].height()),
+					scrollAmount[1]/(mCSB_dragger[1].parent().width()-mCSB_dragger[1].width())
+				];
+			d.scrollRatio={y:ratio[0],x:ratio[1]};
+		},
+		/* -------------------- */
+
+
+		/* toggles scrolling classes */
+		_onDragClasses=function(el,action,xpnd){
+			var expandClass=xpnd ? classes[0]+"_expanded" : "",
+				scrollbar=el.closest(".mCSB_scrollTools");
+			if(action==="active"){
+				el.toggleClass(classes[0]+" "+expandClass); scrollbar.toggleClass(classes[1]);
+				el[0]._draggable=el[0]._draggable ? 0 : 1;
+			}else{
+				if(!el[0]._draggable){
+					if(action==="hide"){
+						el.removeClass(classes[0]); scrollbar.removeClass(classes[1]);
+					}else{
+						el.addClass(classes[0]); scrollbar.addClass(classes[1]);
+					}
+				}
+			}
+		},
+		/* -------------------- */
+
+
+		/* checks if content overflows its container to determine if scrolling is required */
+		_overflowed=function(){
+			var $this=$(this),d=$this.data(pluginPfx),
+				mCustomScrollBox=$("#mCSB_"+d.idx),
+				mCSB_container=$("#mCSB_"+d.idx+"_container"),
+				contentHeight=d.overflowed==null ? mCSB_container.height() : mCSB_container.outerHeight(false),
+				contentWidth=d.overflowed==null ? mCSB_container.width() : mCSB_container.outerWidth(false),
+				h=mCSB_container[0].scrollHeight,w=mCSB_container[0].scrollWidth;
+			if(h>contentHeight){contentHeight=h;}
+			if(w>contentWidth){contentWidth=w;}
+			return [contentHeight>mCustomScrollBox.height(),contentWidth>mCustomScrollBox.width()];
+		},
+		/* -------------------- */
+
+
+		/* resets content position to 0 */
+		_resetContentPosition=function(){
+			var $this=$(this),d=$this.data(pluginPfx),o=d.opt,
+				mCustomScrollBox=$("#mCSB_"+d.idx),
+				mCSB_container=$("#mCSB_"+d.idx+"_container"),
+				mCSB_dragger=[$("#mCSB_"+d.idx+"_dragger_vertical"),$("#mCSB_"+d.idx+"_dragger_horizontal")];
+			_stop($this); /* stop any current scrolling before resetting */
+			if((o.axis!=="x" && !d.overflowed[0]) || (o.axis==="y" && d.overflowed[0])){ /* reset y */
+				mCSB_dragger[0].add(mCSB_container).css("top",0);
+				_scrollTo($this,"_resetY");
+			}
+			if((o.axis!=="y" && !d.overflowed[1]) || (o.axis==="x" && d.overflowed[1])){ /* reset x */
+				var cx=dx=0;
+				if(d.langDir==="rtl"){ /* adjust left position for rtl direction */
+					cx=mCustomScrollBox.width()-mCSB_container.outerWidth(false);
+					dx=Math.abs(cx/d.scrollRatio.x);
+				}
+				mCSB_container.css("left",cx);
+				mCSB_dragger[1].css("left",dx);
+				_scrollTo($this,"_resetX");
+			}
+		},
+		/* -------------------- */
+
+
+		/* binds scrollbar events */
+		_bindEvents=function(){
+			var $this=$(this),d=$this.data(pluginPfx),o=d.opt;
+			if(!d.bindEvents){ /* check if events are already bound */
+				_draggable.call(this);
+				if(o.contentTouchScroll){_contentDraggable.call(this);}
+				_selectable.call(this);
+				if(o.mouseWheel.enable){ /* bind mousewheel fn when plugin is available */
+					function _mwt(){
+						mousewheelTimeout=setTimeout(function(){
+							if(!$.event.special.mousewheel){
+								_mwt();
+							}else{
+								clearTimeout(mousewheelTimeout);
+								_mousewheel.call($this[0]);
+							}
+						},100);
+					}
+					var mousewheelTimeout;
+					_mwt();
+				}
+				_draggerRail.call(this);
+				_wrapperScroll.call(this);
+				if(o.advanced.autoScrollOnFocus){_focus.call(this);}
+				if(o.scrollButtons.enable){_buttons.call(this);}
+				if(o.keyboard.enable){_keyboard.call(this);}
+				d.bindEvents=true;
+			}
+		},
+		/* -------------------- */
+
+
+		/* unbinds scrollbar events */
+		_unbindEvents=function(){
+			var $this=$(this),d=$this.data(pluginPfx),o=d.opt,
+				namespace=pluginPfx+"_"+d.idx,
+				sb=".mCSB_"+d.idx+"_scrollbar",
+				sel=$("#mCSB_"+d.idx+",#mCSB_"+d.idx+"_container,#mCSB_"+d.idx+"_container_wrapper,"+sb+" ."+classes[12]+",#mCSB_"+d.idx+"_dragger_vertical,#mCSB_"+d.idx+"_dragger_horizontal,"+sb+">a"),
+				mCSB_container=$("#mCSB_"+d.idx+"_container");
+			if(o.advanced.releaseDraggableSelectors){sel.add($(o.advanced.releaseDraggableSelectors));}
+			if(o.advanced.extraDraggableSelectors){sel.add($(o.advanced.extraDraggableSelectors));}
+			if(d.bindEvents){ /* check if events are bound */
+				/* unbind namespaced events from document/selectors */
+				$(document).add($(!_canAccessIFrame() || top.document)).unbind("."+namespace);
+				sel.each(function(){
+					$(this).unbind("."+namespace);
+				});
+				/* clear and delete timeouts/objects */
+				clearTimeout($this[0]._focusTimeout); _delete($this[0],"_focusTimeout");
+				clearTimeout(d.sequential.step); _delete(d.sequential,"step");
+				clearTimeout(mCSB_container[0].onCompleteTimeout); _delete(mCSB_container[0],"onCompleteTimeout");
+				d.bindEvents=false;
+			}
+		},
+		/* -------------------- */
+
+
+		/* toggles scrollbar visibility */
+		_scrollbarVisibility=function(disabled){
+			var $this=$(this),d=$this.data(pluginPfx),o=d.opt,
+				contentWrapper=$("#mCSB_"+d.idx+"_container_wrapper"),
+				content=contentWrapper.length ? contentWrapper : $("#mCSB_"+d.idx+"_container"),
+				scrollbar=[$("#mCSB_"+d.idx+"_scrollbar_vertical"),$("#mCSB_"+d.idx+"_scrollbar_horizontal")],
+				mCSB_dragger=[scrollbar[0].find(".mCSB_dragger"),scrollbar[1].find(".mCSB_dragger")];
+			if(o.axis!=="x"){
+				if(d.overflowed[0] && !disabled){
+					scrollbar[0].add(mCSB_dragger[0]).add(scrollbar[0].children("a")).css("display","block");
+					content.removeClass(classes[8]+" "+classes[10]);
+				}else{
+					if(o.alwaysShowScrollbar){
+						if(o.alwaysShowScrollbar!==2){mCSB_dragger[0].css("display","none");}
+						content.removeClass(classes[10]);
+					}else{
+						scrollbar[0].css("display","none");
+						content.addClass(classes[10]);
+					}
+					content.addClass(classes[8]);
+				}
+			}
+			if(o.axis!=="y"){
+				if(d.overflowed[1] && !disabled){
+					scrollbar[1].add(mCSB_dragger[1]).add(scrollbar[1].children("a")).css("display","block");
+					content.removeClass(classes[9]+" "+classes[11]);
+				}else{
+					if(o.alwaysShowScrollbar){
+						if(o.alwaysShowScrollbar!==2){mCSB_dragger[1].css("display","none");}
+						content.removeClass(classes[11]);
+					}else{
+						scrollbar[1].css("display","none");
+						content.addClass(classes[11]);
+					}
+					content.addClass(classes[9]);
+				}
+			}
+			if(!d.overflowed[0] && !d.overflowed[1]){
+				$this.addClass(classes[5]);
+			}else{
+				$this.removeClass(classes[5]);
+			}
+		},
+		/* -------------------- */
+
+
+		/* returns input coordinates of pointer, touch and mouse events (relative to document) */
+		_coordinates=function(e){
+			var t=e.type,o=e.target.ownerDocument!==document ? [$(frameElement).offset().top,$(frameElement).offset().left] : null,
+				io=_canAccessIFrame() && e.target.ownerDocument!==top.document ? [$(e.view.frameElement).offset().top,$(e.view.frameElement).offset().left] : [0,0];
+			switch(t){
+				case "pointerdown": case "MSPointerDown": case "pointermove": case "MSPointerMove": case "pointerup": case "MSPointerUp":
+					return o ? [e.originalEvent.pageY-o[0]+io[0],e.originalEvent.pageX-o[1]+io[1],false] : [e.originalEvent.pageY,e.originalEvent.pageX,false];
+					break;
+				case "touchstart": case "touchmove": case "touchend":
+					var touch=e.originalEvent.touches[0] || e.originalEvent.changedTouches[0],
+						touches=e.originalEvent.touches.length || e.originalEvent.changedTouches.length;
+					return e.target.ownerDocument!==document ? [touch.screenY,touch.screenX,touches>1] : [touch.pageY,touch.pageX,touches>1];
+					break;
+				default:
+					return o ? [e.pageY-o[0]+io[0],e.pageX-o[1]+io[1],false] : [e.pageY,e.pageX,false];
+			}
+		},
+		/* -------------------- */
+
+
+		/*
+		SCROLLBAR DRAG EVENTS
+		scrolls content via scrollbar dragging
+		*/
+		_draggable=function(){
+			var $this=$(this),d=$this.data(pluginPfx),o=d.opt,
+				namespace=pluginPfx+"_"+d.idx,
+				draggerId=["mCSB_"+d.idx+"_dragger_vertical","mCSB_"+d.idx+"_dragger_horizontal"],
+				mCSB_container=$("#mCSB_"+d.idx+"_container"),
+				mCSB_dragger=$("#"+draggerId[0]+",#"+draggerId[1]),
+				draggable,dragY,dragX,
+				rds=o.advanced.releaseDraggableSelectors ? mCSB_dragger.add($(o.advanced.releaseDraggableSelectors)) : mCSB_dragger,
+				eds=o.advanced.extraDraggableSelectors ? $(!_canAccessIFrame() || top.document).add($(o.advanced.extraDraggableSelectors)) : $(!_canAccessIFrame() || top.document);
+			mCSB_dragger.bind("mousedown."+namespace+" touchstart."+namespace+" pointerdown."+namespace+" MSPointerDown."+namespace,function(e){
+				e.stopImmediatePropagation();
+				e.preventDefault();
+				if(!_mouseBtnLeft(e)){return;} /* left mouse button only */
+				touchActive=true;
+				if(oldIE){document.onselectstart=function(){return false;}} /* disable text selection for IE < 9 */
+				_iframe(false); /* enable scrollbar dragging over iframes by disabling their events */
+				_stop($this);
+				draggable=$(this);
+				var offset=draggable.offset(),y=_coordinates(e)[0]-offset.top,x=_coordinates(e)[1]-offset.left,
+					h=draggable.height()+offset.top,w=draggable.width()+offset.left;
+				if(y<h && y>0 && x<w && x>0){
+					dragY=y;
+					dragX=x;
+				}
+				_onDragClasses(draggable,"active",o.autoExpandScrollbar);
+			}).bind("touchmove."+namespace,function(e){
+				e.stopImmediatePropagation();
+				e.preventDefault();
+				var offset=draggable.offset(),y=_coordinates(e)[0]-offset.top,x=_coordinates(e)[1]-offset.left;
+				_drag(dragY,dragX,y,x);
+			});
+			$(document).add(eds).bind("mousemove."+namespace+" pointermove."+namespace+" MSPointerMove."+namespace,function(e){
+				if(draggable){
+					var offset=draggable.offset(),y=_coordinates(e)[0]-offset.top,x=_coordinates(e)[1]-offset.left;
+					if(dragY===y && dragX===x){return;} /* has it really moved? */
+					_drag(dragY,dragX,y,x);
+				}
+			}).add(rds).bind("mouseup."+namespace+" touchend."+namespace+" pointerup."+namespace+" MSPointerUp."+namespace,function(e){
+				if(draggable){
+					_onDragClasses(draggable,"active",o.autoExpandScrollbar);
+					draggable=null;
+				}
+				touchActive=false;
+				if(oldIE){document.onselectstart=null;} /* enable text selection for IE < 9 */
+				_iframe(true); /* enable iframes events */
+			});
+			function _iframe(evt){
+				var el=mCSB_container.find("iframe");
+				if(!el.length){return;} /* check if content contains iframes */
+				var val=!evt ? "none" : "auto";
+				el.css("pointer-events",val); /* for IE11, iframe's display property should not be "block" */
+			}
+			function _drag(dragY,dragX,y,x){
+				mCSB_container[0].idleTimer=o.scrollInertia<233 ? 250 : 0;
+				if(draggable.attr("id")===draggerId[1]){
+					var dir="x",to=((draggable[0].offsetLeft-dragX)+x)*d.scrollRatio.x;
+				}else{
+					var dir="y",to=((draggable[0].offsetTop-dragY)+y)*d.scrollRatio.y;
+				}
+				_scrollTo($this,to.toString(),{dir:dir,drag:true});
+			}
+		},
+		/* -------------------- */
+
+
+		/*
+		TOUCH SWIPE EVENTS
+		scrolls content via touch swipe
+		Emulates the native touch-swipe scrolling with momentum found in iOS, Android and WP devices
+		*/
+		_contentDraggable=function(){
+			var $this=$(this),d=$this.data(pluginPfx),o=d.opt,
+				namespace=pluginPfx+"_"+d.idx,
+				mCustomScrollBox=$("#mCSB_"+d.idx),
+				mCSB_container=$("#mCSB_"+d.idx+"_container"),
+				mCSB_dragger=[$("#mCSB_"+d.idx+"_dragger_vertical"),$("#mCSB_"+d.idx+"_dragger_horizontal")],
+				draggable,dragY,dragX,touchStartY,touchStartX,touchMoveY=[],touchMoveX=[],startTime,runningTime,endTime,distance,speed,amount,
+				durA=0,durB,overwrite=o.axis==="yx" ? "none" : "all",touchIntent=[],touchDrag,docDrag,
+				iframe=mCSB_container.find("iframe"),
+				events=[
+					"touchstart."+namespace+" pointerdown."+namespace+" MSPointerDown."+namespace, //start
+					"touchmove."+namespace+" pointermove."+namespace+" MSPointerMove."+namespace, //move
+					"touchend."+namespace+" pointerup."+namespace+" MSPointerUp."+namespace //end
+				],
+				touchAction=document.body.style.touchAction!==undefined;
+			mCSB_container.bind(events[0],function(e){
+				_onTouchstart(e);
+			}).bind(events[1],function(e){
+				_onTouchmove(e);
+			});
+			mCustomScrollBox.bind(events[0],function(e){
+				_onTouchstart2(e);
+			}).bind(events[2],function(e){
+				_onTouchend(e);
+			});
+			if(iframe.length){
+				iframe.each(function(){
+					$(this).load(function(){
+						/* bind events on accessible iframes */
+						if(_canAccessIFrame(this)){
+							$(this.contentDocument || this.contentWindow.document).bind(events[0],function(e){
+								_onTouchstart(e);
+								_onTouchstart2(e);
+							}).bind(events[1],function(e){
+								_onTouchmove(e);
+							}).bind(events[2],function(e){
+								_onTouchend(e);
+							});
+						}
+					});
+				});
+			}
+			function _onTouchstart(e){
+				if(!_pointerTouch(e) || touchActive || _coordinates(e)[2]){touchable=0; return;}
+				touchable=1; touchDrag=0; docDrag=0; draggable=1;
+				$this.removeClass("mCS_touch_action");
+				var offset=mCSB_container.offset();
+				dragY=_coordinates(e)[0]-offset.top;
+				dragX=_coordinates(e)[1]-offset.left;
+				touchIntent=[_coordinates(e)[0],_coordinates(e)[1]];
+			}
+			function _onTouchmove(e){
+				if(!_pointerTouch(e) || touchActive || _coordinates(e)[2]){return;}
+				if(!o.documentTouchScroll){e.preventDefault();}
+				e.stopImmediatePropagation();
+				if(docDrag && !touchDrag){return;}
+				if(draggable){
+					runningTime=_getTime();
+					var offset=mCustomScrollBox.offset(),y=_coordinates(e)[0]-offset.top,x=_coordinates(e)[1]-offset.left,
+						easing="mcsLinearOut";
+					touchMoveY.push(y);
+					touchMoveX.push(x);
+					touchIntent[2]=Math.abs(_coordinates(e)[0]-touchIntent[0]); touchIntent[3]=Math.abs(_coordinates(e)[1]-touchIntent[1]);
+					if(d.overflowed[0]){
+						var limit=mCSB_dragger[0].parent().height()-mCSB_dragger[0].height(),
+							prevent=((dragY-y)>0 && (y-dragY)>-(limit*d.scrollRatio.y) && (touchIntent[3]*2<touchIntent[2] || o.axis==="yx"));
+					}
+					if(d.overflowed[1]){
+						var limitX=mCSB_dragger[1].parent().width()-mCSB_dragger[1].width(),
+							preventX=((dragX-x)>0 && (x-dragX)>-(limitX*d.scrollRatio.x) && (touchIntent[2]*2<touchIntent[3] || o.axis==="yx"));
+					}
+					if(prevent || preventX){ /* prevent native document scrolling */
+						if(!touchAction){e.preventDefault();}
+						touchDrag=1;
+					}else{
+						docDrag=1;
+						$this.addClass("mCS_touch_action");
+					}
+					if(touchAction){e.preventDefault();}
+					amount=o.axis==="yx" ? [(dragY-y),(dragX-x)] : o.axis==="x" ? [null,(dragX-x)] : [(dragY-y),null];
+					mCSB_container[0].idleTimer=250;
+					if(d.overflowed[0]){_drag(amount[0],durA,easing,"y","all",true);}
+					if(d.overflowed[1]){_drag(amount[1],durA,easing,"x",overwrite,true);}
+				}
+			}
+			function _onTouchstart2(e){
+				if(!_pointerTouch(e) || touchActive || _coordinates(e)[2]){touchable=0; return;}
+				touchable=1;
+				e.stopImmediatePropagation();
+				_stop($this);
+				startTime=_getTime();
+				var offset=mCustomScrollBox.offset();
+				touchStartY=_coordinates(e)[0]-offset.top;
+				touchStartX=_coordinates(e)[1]-offset.left;
+				touchMoveY=[]; touchMoveX=[];
+			}
+			function _onTouchend(e){
+				if(!_pointerTouch(e) || touchActive || _coordinates(e)[2]){return;}
+				draggable=0;
+				e.stopImmediatePropagation();
+				touchDrag=0; docDrag=0;
+				endTime=_getTime();
+				var offset=mCustomScrollBox.offset(),y=_coordinates(e)[0]-offset.top,x=_coordinates(e)[1]-offset.left;
+				if((endTime-runningTime)>30){return;}
+				speed=1000/(endTime-startTime);
+				var easing="mcsEaseOut",slow=speed<2.5,
+					diff=slow ? [touchMoveY[touchMoveY.length-2],touchMoveX[touchMoveX.length-2]] : [0,0];
+				distance=slow ? [(y-diff[0]),(x-diff[1])] : [y-touchStartY,x-touchStartX];
+				var absDistance=[Math.abs(distance[0]),Math.abs(distance[1])];
+				speed=slow ? [Math.abs(distance[0]/4),Math.abs(distance[1]/4)] : [speed,speed];
+				var a=[
+					Math.abs(mCSB_container[0].offsetTop)-(distance[0]*_m((absDistance[0]/speed[0]),speed[0])),
+					Math.abs(mCSB_container[0].offsetLeft)-(distance[1]*_m((absDistance[1]/speed[1]),speed[1]))
+				];
+				amount=o.axis==="yx" ? [a[0],a[1]] : o.axis==="x" ? [null,a[1]] : [a[0],null];
+				durB=[(absDistance[0]*4)+o.scrollInertia,(absDistance[1]*4)+o.scrollInertia];
+				var md=parseInt(o.contentTouchScroll) || 0; /* absolute minimum distance required */
+				amount[0]=absDistance[0]>md ? amount[0] : 0;
+				amount[1]=absDistance[1]>md ? amount[1] : 0;
+				if(d.overflowed[0]){_drag(amount[0],durB[0],easing,"y",overwrite,false);}
+				if(d.overflowed[1]){_drag(amount[1],durB[1],easing,"x",overwrite,false);}
+			}
+			function _m(ds,s){
+				var r=[s*1.5,s*2,s/1.5,s/2];
+				if(ds>90){
+					return s>4 ? r[0] : r[3];
+				}else if(ds>60){
+					return s>3 ? r[3] : r[2];
+				}else if(ds>30){
+					return s>8 ? r[1] : s>6 ? r[0] : s>4 ? s : r[2];
+				}else{
+					return s>8 ? s : r[3];
+				}
+			}
+			function _drag(amount,dur,easing,dir,overwrite,drag){
+				if(!amount){return;}
+				_scrollTo($this,amount.toString(),{dur:dur,scrollEasing:easing,dir:dir,overwrite:overwrite,drag:drag});
+			}
+		},
+		/* -------------------- */
+
+
+		/*
+		SELECT TEXT EVENTS
+		scrolls content when text is selected
+		*/
+		_selectable=function(){
+			var $this=$(this),d=$this.data(pluginPfx),o=d.opt,seq=d.sequential,
+				namespace=pluginPfx+"_"+d.idx,
+				mCSB_container=$("#mCSB_"+d.idx+"_container"),
+				wrapper=mCSB_container.parent(),
+				action;
+			mCSB_container.bind("mousedown."+namespace,function(e){
+				if(touchable){return;}
+				if(!action){action=1; touchActive=true;}
+			}).add(document).bind("mousemove."+namespace,function(e){
+				if(!touchable && action && _sel()){
+					var offset=mCSB_container.offset(),
+						y=_coordinates(e)[0]-offset.top+mCSB_container[0].offsetTop,x=_coordinates(e)[1]-offset.left+mCSB_container[0].offsetLeft;
+					if(y>0 && y<wrapper.height() && x>0 && x<wrapper.width()){
+						if(seq.step){_seq("off",null,"stepped");}
+					}else{
+						if(o.axis!=="x" && d.overflowed[0]){
+							if(y<0){
+								_seq("on",38);
+							}else if(y>wrapper.height()){
+								_seq("on",40);
+							}
+						}
+						if(o.axis!=="y" && d.overflowed[1]){
+							if(x<0){
+								_seq("on",37);
+							}else if(x>wrapper.width()){
+								_seq("on",39);
+							}
+						}
+					}
+				}
+			}).bind("mouseup."+namespace+" dragend."+namespace,function(e){
+				if(touchable){return;}
+				if(action){action=0; _seq("off",null);}
+				touchActive=false;
+			});
+			function _sel(){
+				return 	window.getSelection ? window.getSelection().toString() :
+						document.selection && document.selection.type!="Control" ? document.selection.createRange().text : 0;
+			}
+			function _seq(a,c,s){
+				seq.type=s && action ? "stepped" : "stepless";
+				seq.scrollAmount=10;
+				_sequentialScroll($this,a,c,"mcsLinearOut",s ? 60 : null);
+			}
+		},
+		/* -------------------- */
+
+
+		/*
+		MOUSE WHEEL EVENT
+		scrolls content via mouse-wheel
+		via mouse-wheel plugin (https://github.com/brandonaaron/jquery-mousewheel)
+		*/
+		_mousewheel=function(){
+			if(!$(this).data(pluginPfx)){return;} /* Check if the scrollbar is ready to use mousewheel events (issue: #185) */
+			var $this=$(this),d=$this.data(pluginPfx),o=d.opt,
+				namespace=pluginPfx+"_"+d.idx,
+				mCustomScrollBox=$("#mCSB_"+d.idx),
+				mCSB_dragger=[$("#mCSB_"+d.idx+"_dragger_vertical"),$("#mCSB_"+d.idx+"_dragger_horizontal")],
+				iframe=$("#mCSB_"+d.idx+"_container").find("iframe");
+			if(iframe.length){
+				iframe.each(function(){
+					$(this).load(function(){
+						/* bind events on accessible iframes */
+						if(_canAccessIFrame(this)){
+							$(this.contentDocument || this.contentWindow.document).bind("mousewheel."+namespace,function(e,delta){
+								_onMousewheel(e,delta);
+							});
+						}
+					});
+				});
+			}
+			mCustomScrollBox.bind("mousewheel."+namespace,function(e,delta){
+				_onMousewheel(e,delta);
+			});
+			function _onMousewheel(e,delta){
+				_stop($this);
+				if(_disableMousewheel($this,e.target)){return;} /* disables mouse-wheel when hovering specific elements */
+				var deltaFactor=o.mouseWheel.deltaFactor!=="auto" ? parseInt(o.mouseWheel.deltaFactor) : (oldIE && e.deltaFactor<100) ? 100 : e.deltaFactor || 100,
+					dur=o.scrollInertia;
+				if(o.axis==="x" || o.mouseWheel.axis==="x"){
+					var dir="x",
+						px=[Math.round(deltaFactor*d.scrollRatio.x),parseInt(o.mouseWheel.scrollAmount)],
+						amount=o.mouseWheel.scrollAmount!=="auto" ? px[1] : px[0]>=mCustomScrollBox.width() ? mCustomScrollBox.width()*0.9 : px[0],
+						contentPos=Math.abs($("#mCSB_"+d.idx+"_container")[0].offsetLeft),
+						draggerPos=mCSB_dragger[1][0].offsetLeft,
+						limit=mCSB_dragger[1].parent().width()-mCSB_dragger[1].width(),
+						dlt=e.deltaX || e.deltaY || delta;
+				}else{
+					var dir="y",
+						px=[Math.round(deltaFactor*d.scrollRatio.y),parseInt(o.mouseWheel.scrollAmount)],
+						amount=o.mouseWheel.scrollAmount!=="auto" ? px[1] : px[0]>=mCustomScrollBox.height() ? mCustomScrollBox.height()*0.9 : px[0],
+						contentPos=Math.abs($("#mCSB_"+d.idx+"_container")[0].offsetTop),
+						draggerPos=mCSB_dragger[0][0].offsetTop,
+						limit=mCSB_dragger[0].parent().height()-mCSB_dragger[0].height(),
+						dlt=e.deltaY || delta;
+				}
+				if((dir==="y" && !d.overflowed[0]) || (dir==="x" && !d.overflowed[1])){return;}
+				if(o.mouseWheel.invert || e.webkitDirectionInvertedFromDevice){dlt=-dlt;}
+				if(o.mouseWheel.normalizeDelta){dlt=dlt<0 ? -1 : 1;}
+				if((dlt>0 && draggerPos!==0) || (dlt<0 && draggerPos!==limit) || o.mouseWheel.preventDefault){
+					e.stopImmediatePropagation();
+					e.preventDefault();
+				}
+				if(e.deltaFactor<2 && !o.mouseWheel.normalizeDelta){
+					//very low deltaFactor values mean some kind of delta acceleration (e.g. osx trackpad), so adjusting scrolling accordingly
+					amount=e.deltaFactor; dur=17;
+				}
+				_scrollTo($this,(contentPos-(dlt*amount)).toString(),{dir:dir,dur:dur});
+			}
+		},
+		/* -------------------- */
+
+
+		/* checks if iframe can be accessed */
+		_canAccessIFrame=function(iframe){
+			var html=null;
+			if(!iframe){
+				try{
+					var doc=top.document;
+					html=doc.body.innerHTML;
+				}catch(err){/* do nothing */}
+				return(html!==null);
+			}else{
+				try{
+					var doc=iframe.contentDocument || iframe.contentWindow.document;
+					html=doc.body.innerHTML;
+				}catch(err){/* do nothing */}
+				return(html!==null);
+			}
+		},
+		/* -------------------- */
+
+
+		/* disables mouse-wheel when hovering specific elements like select, datalist etc. */
+		_disableMousewheel=function(el,target){
+			var tag=target.nodeName.toLowerCase(),
+				tags=el.data(pluginPfx).opt.mouseWheel.disableOver,
+				/* elements that require focus */
+				focusTags=["select","textarea"];
+			return $.inArray(tag,tags) > -1 && !($.inArray(tag,focusTags) > -1 && !$(target).is(":focus"));
+		},
+		/* -------------------- */
+
+
+		/*
+		DRAGGER RAIL CLICK EVENT
+		scrolls content via dragger rail
+		*/
+		_draggerRail=function(){
+			var $this=$(this),d=$this.data(pluginPfx),
+				namespace=pluginPfx+"_"+d.idx,
+				mCSB_container=$("#mCSB_"+d.idx+"_container"),
+				wrapper=mCSB_container.parent(),
+				mCSB_draggerContainer=$(".mCSB_"+d.idx+"_scrollbar ."+classes[12]),
+				clickable;
+			mCSB_draggerContainer.bind("mousedown."+namespace+" touchstart."+namespace+" pointerdown."+namespace+" MSPointerDown."+namespace,function(e){
+				touchActive=true;
+				if(!$(e.target).hasClass("mCSB_dragger")){clickable=1;}
+			}).bind("touchend."+namespace+" pointerup."+namespace+" MSPointerUp."+namespace,function(e){
+				touchActive=false;
+			}).bind("click."+namespace,function(e){
+				if(!clickable){return;}
+				clickable=0;
+				if($(e.target).hasClass(classes[12]) || $(e.target).hasClass("mCSB_draggerRail")){
+					_stop($this);
+					var el=$(this),mCSB_dragger=el.find(".mCSB_dragger");
+					if(el.parent(".mCSB_scrollTools_horizontal").length>0){
+						if(!d.overflowed[1]){return;}
+						var dir="x",
+							clickDir=e.pageX>mCSB_dragger.offset().left ? -1 : 1,
+							to=Math.abs(mCSB_container[0].offsetLeft)-(clickDir*(wrapper.width()*0.9));
+					}else{
+						if(!d.overflowed[0]){return;}
+						var dir="y",
+							clickDir=e.pageY>mCSB_dragger.offset().top ? -1 : 1,
+							to=Math.abs(mCSB_container[0].offsetTop)-(clickDir*(wrapper.height()*0.9));
+					}
+					_scrollTo($this,to.toString(),{dir:dir,scrollEasing:"mcsEaseInOut"});
+				}
+			});
+		},
+		/* -------------------- */
+
+
+		/*
+		FOCUS EVENT
+		scrolls content via element focus (e.g. clicking an input, pressing TAB key etc.)
+		*/
+		_focus=function(){
+			var $this=$(this),d=$this.data(pluginPfx),o=d.opt,
+				namespace=pluginPfx+"_"+d.idx,
+				mCSB_container=$("#mCSB_"+d.idx+"_container"),
+				wrapper=mCSB_container.parent();
+			mCSB_container.bind("focusin."+namespace,function(e){
+				var el=$(document.activeElement),
+					nested=mCSB_container.find(".mCustomScrollBox").length,
+					dur=0;
+				if(!el.is(o.advanced.autoScrollOnFocus)){return;}
+				_stop($this);
+				clearTimeout($this[0]._focusTimeout);
+				$this[0]._focusTimer=nested ? (dur+17)*nested : 0;
+				$this[0]._focusTimeout=setTimeout(function(){
+					var	to=[_childPos(el)[0],_childPos(el)[1]],
+						contentPos=[mCSB_container[0].offsetTop,mCSB_container[0].offsetLeft],
+						isVisible=[
+							(contentPos[0]+to[0]>=0 && contentPos[0]+to[0]<wrapper.height()-el.outerHeight(false)),
+							(contentPos[1]+to[1]>=0 && contentPos[0]+to[1]<wrapper.width()-el.outerWidth(false))
+						],
+						overwrite=(o.axis==="yx" && !isVisible[0] && !isVisible[1]) ? "none" : "all";
+					if(o.axis!=="x" && !isVisible[0]){
+						_scrollTo($this,to[0].toString(),{dir:"y",scrollEasing:"mcsEaseInOut",overwrite:overwrite,dur:dur});
+					}
+					if(o.axis!=="y" && !isVisible[1]){
+						_scrollTo($this,to[1].toString(),{dir:"x",scrollEasing:"mcsEaseInOut",overwrite:overwrite,dur:dur});
+					}
+				},$this[0]._focusTimer);
+			});
+		},
+		/* -------------------- */
+
+
+		/* sets content wrapper scrollTop/scrollLeft always to 0 */
+		_wrapperScroll=function(){
+			var $this=$(this),d=$this.data(pluginPfx),
+				namespace=pluginPfx+"_"+d.idx,
+				wrapper=$("#mCSB_"+d.idx+"_container").parent();
+			wrapper.bind("scroll."+namespace,function(e){
+				if(wrapper.scrollTop()!==0 || wrapper.scrollLeft()!==0){
+					$(".mCSB_"+d.idx+"_scrollbar").css("visibility","hidden"); /* hide scrollbar(s) */
+				}
+			});
+		},
+		/* -------------------- */
+
+
+		/*
+		BUTTONS EVENTS
+		scrolls content via up, down, left and right buttons
+		*/
+		_buttons=function(){
+			var $this=$(this),d=$this.data(pluginPfx),o=d.opt,seq=d.sequential,
+				namespace=pluginPfx+"_"+d.idx,
+				sel=".mCSB_"+d.idx+"_scrollbar",
+				btn=$(sel+">a");
+			btn.bind("mousedown."+namespace+" touchstart."+namespace+" pointerdown."+namespace+" MSPointerDown."+namespace+" mouseup."+namespace+" touchend."+namespace+" pointerup."+namespace+" MSPointerUp."+namespace+" mouseout."+namespace+" pointerout."+namespace+" MSPointerOut."+namespace+" click."+namespace,function(e){
+				e.preventDefault();
+				if(!_mouseBtnLeft(e)){return;} /* left mouse button only */
+				var btnClass=$(this).attr("class");
+				seq.type=o.scrollButtons.scrollType;
+				switch(e.type){
+					case "mousedown": case "touchstart": case "pointerdown": case "MSPointerDown":
+						if(seq.type==="stepped"){return;}
+						touchActive=true;
+						d.tweenRunning=false;
+						_seq("on",btnClass);
+						break;
+					case "mouseup": case "touchend": case "pointerup": case "MSPointerUp":
+					case "mouseout": case "pointerout": case "MSPointerOut":
+						if(seq.type==="stepped"){return;}
+						touchActive=false;
+						if(seq.dir){_seq("off",btnClass);}
+						break;
+					case "click":
+						if(seq.type!=="stepped" || d.tweenRunning){return;}
+						_seq("on",btnClass);
+						break;
+				}
+				function _seq(a,c){
+					seq.scrollAmount=o.scrollButtons.scrollAmount;
+					_sequentialScroll($this,a,c);
+				}
+			});
+		},
+		/* -------------------- */
+
+
+		/*
+		KEYBOARD EVENTS
+		scrolls content via keyboard
+		Keys: up arrow, down arrow, left arrow, right arrow, PgUp, PgDn, Home, End
+		*/
+		_keyboard=function(){
+			var $this=$(this),d=$this.data(pluginPfx),o=d.opt,seq=d.sequential,
+				namespace=pluginPfx+"_"+d.idx,
+				mCustomScrollBox=$("#mCSB_"+d.idx),
+				mCSB_container=$("#mCSB_"+d.idx+"_container"),
+				wrapper=mCSB_container.parent(),
+				editables="input,textarea,select,datalist,keygen,[contenteditable='true']",
+				iframe=mCSB_container.find("iframe"),
+				events=["blur."+namespace+" keydown."+namespace+" keyup."+namespace];
+			if(iframe.length){
+				iframe.each(function(){
+					$(this).load(function(){
+						/* bind events on accessible iframes */
+						if(_canAccessIFrame(this)){
+							$(this.contentDocument || this.contentWindow.document).bind(events[0],function(e){
+								_onKeyboard(e);
+							});
+						}
+					});
+				});
+			}
+			mCustomScrollBox.attr("tabindex","0").bind(events[0],function(e){
+				_onKeyboard(e);
+			});
+			function _onKeyboard(e){
+				switch(e.type){
+					case "blur":
+						if(d.tweenRunning && seq.dir){_seq("off",null);}
+						break;
+					case "keydown": case "keyup":
+						var code=e.keyCode ? e.keyCode : e.which,action="on";
+						if((o.axis!=="x" && (code===38 || code===40)) || (o.axis!=="y" && (code===37 || code===39))){
+							/* up (38), down (40), left (37), right (39) arrows */
+							if(((code===38 || code===40) && !d.overflowed[0]) || ((code===37 || code===39) && !d.overflowed[1])){return;}
+							if(e.type==="keyup"){action="off";}
+							if(!$(document.activeElement).is(editables)){
+								e.preventDefault();
+								e.stopImmediatePropagation();
+								_seq(action,code);
+							}
+						}else if(code===33 || code===34){
+							/* PgUp (33), PgDn (34) */
+							if(d.overflowed[0] || d.overflowed[1]){
+								e.preventDefault();
+								e.stopImmediatePropagation();
+							}
+							if(e.type==="keyup"){
+								_stop($this);
+								var keyboardDir=code===34 ? -1 : 1;
+								if(o.axis==="x" || (o.axis==="yx" && d.overflowed[1] && !d.overflowed[0])){
+									var dir="x",to=Math.abs(mCSB_container[0].offsetLeft)-(keyboardDir*(wrapper.width()*0.9));
+								}else{
+									var dir="y",to=Math.abs(mCSB_container[0].offsetTop)-(keyboardDir*(wrapper.height()*0.9));
+								}
+								_scrollTo($this,to.toString(),{dir:dir,scrollEasing:"mcsEaseInOut"});
+							}
+						}else if(code===35 || code===36){
+							/* End (35), Home (36) */
+							if(!$(document.activeElement).is(editables)){
+								if(d.overflowed[0] || d.overflowed[1]){
+									e.preventDefault();
+									e.stopImmediatePropagation();
+								}
+								if(e.type==="keyup"){
+									if(o.axis==="x" || (o.axis==="yx" && d.overflowed[1] && !d.overflowed[0])){
+										var dir="x",to=code===35 ? Math.abs(wrapper.width()-mCSB_container.outerWidth(false)) : 0;
+									}else{
+										var dir="y",to=code===35 ? Math.abs(wrapper.height()-mCSB_container.outerHeight(false)) : 0;
+									}
+									_scrollTo($this,to.toString(),{dir:dir,scrollEasing:"mcsEaseInOut"});
+								}
+							}
+						}
+						break;
+				}
+				function _seq(a,c){
+					seq.type=o.keyboard.scrollType;
+					seq.scrollAmount=o.keyboard.scrollAmount;
+					if(seq.type==="stepped" && d.tweenRunning){return;}
+					_sequentialScroll($this,a,c);
+				}
+			}
+		},
+		/* -------------------- */
+
+
+		/* scrolls content sequentially (used when scrolling via buttons, keyboard arrows etc.) */
+		_sequentialScroll=function(el,action,trigger,e,s){
+			var d=el.data(pluginPfx),o=d.opt,seq=d.sequential,
+				mCSB_container=$("#mCSB_"+d.idx+"_container"),
+				once=seq.type==="stepped" ? true : false,
+				steplessSpeed=o.scrollInertia < 26 ? 26 : o.scrollInertia, /* 26/1.5=17 */
+				steppedSpeed=o.scrollInertia < 1 ? 17 : o.scrollInertia;
+			switch(action){
+				case "on":
+					seq.dir=[
+						(trigger===classes[16] || trigger===classes[15] || trigger===39 || trigger===37 ? "x" : "y"),
+						(trigger===classes[13] || trigger===classes[15] || trigger===38 || trigger===37 ? -1 : 1)
+					];
+					_stop(el);
+					if(_isNumeric(trigger) && seq.type==="stepped"){return;}
+					_on(once);
+					break;
+				case "off":
+					_off();
+					if(once || (d.tweenRunning && seq.dir)){
+						_on(true);
+					}
+					break;
+			}
+
+			/* starts sequence */
+			function _on(once){
+				if(o.snapAmount){seq.scrollAmount=!(o.snapAmount instanceof Array) ? o.snapAmount : seq.dir[0]==="x" ? o.snapAmount[1] : o.snapAmount[0];} /* scrolling snapping */
+				var c=seq.type!=="stepped", /* continuous scrolling */
+					t=s ? s : !once ? 1000/60 : c ? steplessSpeed/1.5 : steppedSpeed, /* timer */
+					m=!once ? 2.5 : c ? 7.5 : 40, /* multiplier */
+					contentPos=[Math.abs(mCSB_container[0].offsetTop),Math.abs(mCSB_container[0].offsetLeft)],
+					ratio=[d.scrollRatio.y>10 ? 10 : d.scrollRatio.y,d.scrollRatio.x>10 ? 10 : d.scrollRatio.x],
+					amount=seq.dir[0]==="x" ? contentPos[1]+(seq.dir[1]*(ratio[1]*m)) : contentPos[0]+(seq.dir[1]*(ratio[0]*m)),
+					px=seq.dir[0]==="x" ? contentPos[1]+(seq.dir[1]*parseInt(seq.scrollAmount)) : contentPos[0]+(seq.dir[1]*parseInt(seq.scrollAmount)),
+					to=seq.scrollAmount!=="auto" ? px : amount,
+					easing=e ? e : !once ? "mcsLinear" : c ? "mcsLinearOut" : "mcsEaseInOut",
+					onComplete=!once ? false : true;
+				if(once && t<17){
+					to=seq.dir[0]==="x" ? contentPos[1] : contentPos[0];
+				}
+				_scrollTo(el,to.toString(),{dir:seq.dir[0],scrollEasing:easing,dur:t,onComplete:onComplete});
+				if(once){
+					seq.dir=false;
+					return;
+				}
+				clearTimeout(seq.step);
+				seq.step=setTimeout(function(){
+					_on();
+				},t);
+			}
+			/* stops sequence */
+			function _off(){
+				clearTimeout(seq.step);
+				_delete(seq,"step");
+				_stop(el);
+			}
+		},
+		/* -------------------- */
+
+
+		/* returns a yx array from value */
+		_arr=function(val){
+			var o=$(this).data(pluginPfx).opt,vals=[];
+			if(typeof val==="function"){val=val();} /* check if the value is a single anonymous function */
+			/* check if value is object or array, its length and create an array with yx values */
+			if(!(val instanceof Array)){ /* object value (e.g. {y:"100",x:"100"}, 100 etc.) */
+				vals[0]=val.y ? val.y : val.x || o.axis==="x" ? null : val;
+				vals[1]=val.x ? val.x : val.y || o.axis==="y" ? null : val;
+			}else{ /* array value (e.g. [100,100]) */
+				vals=val.length>1 ? [val[0],val[1]] : o.axis==="x" ? [null,val[0]] : [val[0],null];
+			}
+			/* check if array values are anonymous functions */
+			if(typeof vals[0]==="function"){vals[0]=vals[0]();}
+			if(typeof vals[1]==="function"){vals[1]=vals[1]();}
+			return vals;
+		},
+		/* -------------------- */
+
+
+		/* translates values (e.g. "top", 100, "100px", "#id") to actual scroll-to positions */
+		_to=function(val,dir){
+			if(val==null || typeof val=="undefined"){return;}
+			var $this=$(this),d=$this.data(pluginPfx),o=d.opt,
+				mCSB_container=$("#mCSB_"+d.idx+"_container"),
+				wrapper=mCSB_container.parent(),
+				t=typeof val;
+			if(!dir){dir=o.axis==="x" ? "x" : "y";}
+			var contentLength=dir==="x" ? mCSB_container.outerWidth(false) : mCSB_container.outerHeight(false),
+				contentPos=dir==="x" ? mCSB_container[0].offsetLeft : mCSB_container[0].offsetTop,
+				cssProp=dir==="x" ? "left" : "top";
+			switch(t){
+				case "function": /* this currently is not used. Consider removing it */
+					return val();
+					break;
+				case "object": /* js/jquery object */
+					var obj=val.jquery ? val : $(val);
+					if(!obj.length){return;}
+					return dir==="x" ? _childPos(obj)[1] : _childPos(obj)[0];
+					break;
+				case "string": case "number":
+					if(_isNumeric(val)){ /* numeric value */
+						return Math.abs(val);
+					}else if(val.indexOf("%")!==-1){ /* percentage value */
+						return Math.abs(contentLength*parseInt(val)/100);
+					}else if(val.indexOf("-=")!==-1){ /* decrease value */
+						return Math.abs(contentPos-parseInt(val.split("-=")[1]));
+					}else if(val.indexOf("+=")!==-1){ /* inrease value */
+						var p=(contentPos+parseInt(val.split("+=")[1]));
+						return p>=0 ? 0 : Math.abs(p);
+					}else if(val.indexOf("px")!==-1 && _isNumeric(val.split("px")[0])){ /* pixels string value (e.g. "100px") */
+						return Math.abs(val.split("px")[0]);
+					}else{
+						if(val==="top" || val==="left"){ /* special strings */
+							return 0;
+						}else if(val==="bottom"){
+							return Math.abs(wrapper.height()-mCSB_container.outerHeight(false));
+						}else if(val==="right"){
+							return Math.abs(wrapper.width()-mCSB_container.outerWidth(false));
+						}else if(val==="first" || val==="last"){
+							var obj=mCSB_container.find(":"+val);
+							return dir==="x" ? _childPos(obj)[1] : _childPos(obj)[0];
+						}else{
+							if($(val).length){ /* jquery selector */
+								return dir==="x" ? _childPos($(val))[1] : _childPos($(val))[0];
+							}else{ /* other values (e.g. "100em") */
+								mCSB_container.css(cssProp,val);
+								methods.update.call(null,$this[0]);
+								return;
+							}
+						}
+					}
+					break;
+			}
+		},
+		/* -------------------- */
+
+
+		/* calls the update method automatically */
+		_autoUpdate=function(rem){
+			var $this=$(this),d=$this.data(pluginPfx),o=d.opt,
+				mCSB_container=$("#mCSB_"+d.idx+"_container");
+			if(rem){
+				/*
+				removes autoUpdate timer
+				usage: _autoUpdate.call(this,"remove");
+				*/
+				clearTimeout(mCSB_container[0].autoUpdate);
+				_delete(mCSB_container[0],"autoUpdate");
+				return;
+			}
+			upd();
+			function upd(){
+				clearTimeout(mCSB_container[0].autoUpdate);
+				if($this.parents("html").length===0){
+					/* check element in dom tree */
+					$this=null;
+					return;
+				}
+				mCSB_container[0].autoUpdate=setTimeout(function(){
+					/* update on specific selector(s) length and size change */
+					if(o.advanced.updateOnSelectorChange){
+						d.poll.change.n=sizesSum();
+						if(d.poll.change.n!==d.poll.change.o){
+							d.poll.change.o=d.poll.change.n;
+							doUpd(3);
+							return;
+						}
+					}
+					/* update on main element and scrollbar size changes */
+					if(o.advanced.updateOnContentResize){
+						d.poll.size.n=$this[0].scrollHeight+$this[0].scrollWidth+mCSB_container[0].offsetHeight+$this[0].offsetHeight+$this[0].offsetWidth;
+						if(d.poll.size.n!==d.poll.size.o){
+							d.poll.size.o=d.poll.size.n;
+							doUpd(1);
+							return;
+						}
+					}
+					/* update on image load */
+					if(o.advanced.updateOnImageLoad){
+						if(!(o.advanced.updateOnImageLoad==="auto" && o.axis==="y")){ //by default, it doesn't run on vertical content
+							d.poll.img.n=mCSB_container.find("img").length;
+							if(d.poll.img.n!==d.poll.img.o){
+								d.poll.img.o=d.poll.img.n;
+								mCSB_container.find("img").each(function(){
+									imgLoader(this);
+								});
+								return;
+							}
+						}
+					}
+					if(o.advanced.updateOnSelectorChange || o.advanced.updateOnContentResize || o.advanced.updateOnImageLoad){upd();}
+				},o.advanced.autoUpdateTimeout);
+			}
+			/* a tiny image loader */
+			function imgLoader(el){
+				if($(el).hasClass(classes[2])){doUpd(); return;}
+				var img=new Image();
+				function createDelegate(contextObject,delegateMethod){
+					return function(){return delegateMethod.apply(contextObject,arguments);}
+				}
+				function imgOnLoad(){
+					this.onload=null;
+					$(el).addClass(classes[2]);
+					doUpd(2);
+				}
+				img.onload=createDelegate(img,imgOnLoad);
+				img.src=el.src;
+			}
+			/* returns the total height and width sum of all elements matching the selector */
+			function sizesSum(){
+				if(o.advanced.updateOnSelectorChange===true){o.advanced.updateOnSelectorChange="*";}
+				var total=0,sel=mCSB_container.find(o.advanced.updateOnSelectorChange);
+				if(o.advanced.updateOnSelectorChange && sel.length>0){sel.each(function(){total+=this.offsetHeight+this.offsetWidth;});}
+				return total;
+			}
+			/* calls the update method */
+			function doUpd(cb){
+				clearTimeout(mCSB_container[0].autoUpdate);
+				methods.update.call(null,$this[0],cb);
+			}
+		},
+		/* -------------------- */
+
+
+		/* snaps scrolling to a multiple of a pixels number */
+		_snapAmount=function(to,amount,offset){
+			return (Math.round(to/amount)*amount-offset);
+		},
+		/* -------------------- */
+
+
+		/* stops content and scrollbar animations */
+		_stop=function(el){
+			var d=el.data(pluginPfx),
+				sel=$("#mCSB_"+d.idx+"_container,#mCSB_"+d.idx+"_container_wrapper,#mCSB_"+d.idx+"_dragger_vertical,#mCSB_"+d.idx+"_dragger_horizontal");
+			sel.each(function(){
+				_stopTween.call(this);
+			});
+		},
+		/* -------------------- */
+
+
+		/*
+		ANIMATES CONTENT
+		This is where the actual scrolling happens
+		*/
+		_scrollTo=function(el,to,options){
+			var d=el.data(pluginPfx),o=d.opt,
+				defaults={
+					trigger:"internal",
+					dir:"y",
+					scrollEasing:"mcsEaseOut",
+					drag:false,
+					dur:o.scrollInertia,
+					overwrite:"all",
+					callbacks:true,
+					onStart:true,
+					onUpdate:true,
+					onComplete:true
+				},
+				options=$.extend(defaults,options),
+				dur=[options.dur,(options.drag ? 0 : options.dur)],
+				mCustomScrollBox=$("#mCSB_"+d.idx),
+				mCSB_container=$("#mCSB_"+d.idx+"_container"),
+				wrapper=mCSB_container.parent(),
+				totalScrollOffsets=o.callbacks.onTotalScrollOffset ? _arr.call(el,o.callbacks.onTotalScrollOffset) : [0,0],
+				totalScrollBackOffsets=o.callbacks.onTotalScrollBackOffset ? _arr.call(el,o.callbacks.onTotalScrollBackOffset) : [0,0];
+			d.trigger=options.trigger;
+			if(wrapper.scrollTop()!==0 || wrapper.scrollLeft()!==0){ /* always reset scrollTop/Left */
+				$(".mCSB_"+d.idx+"_scrollbar").css("visibility","visible");
+				wrapper.scrollTop(0).scrollLeft(0);
+			}
+			if(to==="_resetY" && !d.contentReset.y){
+				/* callbacks: onOverflowYNone */
+				if(_cb("onOverflowYNone")){o.callbacks.onOverflowYNone.call(el[0]);}
+				d.contentReset.y=1;
+			}
+			if(to==="_resetX" && !d.contentReset.x){
+				/* callbacks: onOverflowXNone */
+				if(_cb("onOverflowXNone")){o.callbacks.onOverflowXNone.call(el[0]);}
+				d.contentReset.x=1;
+			}
+			if(to==="_resetY" || to==="_resetX"){return;}
+			if((d.contentReset.y || !el[0].mcs) && d.overflowed[0]){
+				/* callbacks: onOverflowY */
+				if(_cb("onOverflowY")){o.callbacks.onOverflowY.call(el[0]);}
+				d.contentReset.x=null;
+			}
+			if((d.contentReset.x || !el[0].mcs) && d.overflowed[1]){
+				/* callbacks: onOverflowX */
+				if(_cb("onOverflowX")){o.callbacks.onOverflowX.call(el[0]);}
+				d.contentReset.x=null;
+			}
+			if(o.snapAmount){ /* scrolling snapping */
+				var snapAmount=!(o.snapAmount instanceof Array) ? o.snapAmount : options.dir==="x" ? o.snapAmount[1] : o.snapAmount[0];
+				to=_snapAmount(to,snapAmount,o.snapOffset);
+			}
+			switch(options.dir){
+				case "x":
+					var mCSB_dragger=$("#mCSB_"+d.idx+"_dragger_horizontal"),
+						property="left",
+						contentPos=mCSB_container[0].offsetLeft,
+						limit=[
+							mCustomScrollBox.width()-mCSB_container.outerWidth(false),
+							mCSB_dragger.parent().width()-mCSB_dragger.width()
+						],
+						scrollTo=[to,to===0 ? 0 : (to/d.scrollRatio.x)],
+						tso=totalScrollOffsets[1],
+						tsbo=totalScrollBackOffsets[1],
+						totalScrollOffset=tso>0 ? tso/d.scrollRatio.x : 0,
+						totalScrollBackOffset=tsbo>0 ? tsbo/d.scrollRatio.x : 0;
+					break;
+				case "y":
+					var mCSB_dragger=$("#mCSB_"+d.idx+"_dragger_vertical"),
+						property="top",
+						contentPos=mCSB_container[0].offsetTop,
+						limit=[
+							mCustomScrollBox.height()-mCSB_container.outerHeight(false),
+							mCSB_dragger.parent().height()-mCSB_dragger.height()
+						],
+						scrollTo=[to,to===0 ? 0 : (to/d.scrollRatio.y)],
+						tso=totalScrollOffsets[0],
+						tsbo=totalScrollBackOffsets[0],
+						totalScrollOffset=tso>0 ? tso/d.scrollRatio.y : 0,
+						totalScrollBackOffset=tsbo>0 ? tsbo/d.scrollRatio.y : 0;
+					break;
+			}
+			if(scrollTo[1]<0 || (scrollTo[0]===0 && scrollTo[1]===0)){
+				scrollTo=[0,0];
+			}else if(scrollTo[1]>=limit[1]){
+				scrollTo=[limit[0],limit[1]];
+			}else{
+				scrollTo[0]=-scrollTo[0];
+			}
+			if(!el[0].mcs){
+				_mcs();  /* init mcs object (once) to make it available before callbacks */
+				if(_cb("onInit")){o.callbacks.onInit.call(el[0]);} /* callbacks: onInit */
+			}
+			clearTimeout(mCSB_container[0].onCompleteTimeout);
+			_tweenTo(mCSB_dragger[0],property,Math.round(scrollTo[1]),dur[1],options.scrollEasing);
+			if(!d.tweenRunning && ((contentPos===0 && scrollTo[0]>=0) || (contentPos===limit[0] && scrollTo[0]<=limit[0]))){return;}
+			_tweenTo(mCSB_container[0],property,Math.round(scrollTo[0]),dur[0],options.scrollEasing,options.overwrite,{
+				onStart:function(){
+					if(options.callbacks && options.onStart && !d.tweenRunning){
+						/* callbacks: onScrollStart */
+						if(_cb("onScrollStart")){_mcs(); o.callbacks.onScrollStart.call(el[0]);}
+						d.tweenRunning=true;
+						_onDragClasses(mCSB_dragger);
+						d.cbOffsets=_cbOffsets();
+					}
+				},onUpdate:function(){
+					if(options.callbacks && options.onUpdate){
+						/* callbacks: whileScrolling */
+						if(_cb("whileScrolling")){_mcs(); o.callbacks.whileScrolling.call(el[0]);}
+					}
+				},onComplete:function(){
+					if(options.callbacks && options.onComplete){
+						if(o.axis==="yx"){clearTimeout(mCSB_container[0].onCompleteTimeout);}
+						var t=mCSB_container[0].idleTimer || 0;
+						mCSB_container[0].onCompleteTimeout=setTimeout(function(){
+							/* callbacks: onScroll, onTotalScroll, onTotalScrollBack */
+							if(_cb("onScroll")){_mcs(); o.callbacks.onScroll.call(el[0]);}
+							if(_cb("onTotalScroll") && scrollTo[1]>=limit[1]-totalScrollOffset && d.cbOffsets[0]){_mcs(); o.callbacks.onTotalScroll.call(el[0]);}
+							if(_cb("onTotalScrollBack") && scrollTo[1]<=totalScrollBackOffset && d.cbOffsets[1]){_mcs(); o.callbacks.onTotalScrollBack.call(el[0]);}
+							d.tweenRunning=false;
+							mCSB_container[0].idleTimer=0;
+							_onDragClasses(mCSB_dragger,"hide");
+						},t);
+					}
+				}
+			});
+			/* checks if callback function exists */
+			function _cb(cb){
+				return d && o.callbacks[cb] && typeof o.callbacks[cb]==="function";
+			}
+			/* checks whether callback offsets always trigger */
+			function _cbOffsets(){
+				return [o.callbacks.alwaysTriggerOffsets || contentPos>=limit[0]+tso,o.callbacks.alwaysTriggerOffsets || contentPos<=-tsbo];
+			}
+			/*
+			populates object with useful values for the user
+			values:
+				content: this.mcs.content
+				content top position: this.mcs.top
+				content left position: this.mcs.left
+				dragger top position: this.mcs.draggerTop
+				dragger left position: this.mcs.draggerLeft
+				scrolling y percentage: this.mcs.topPct
+				scrolling x percentage: this.mcs.leftPct
+				scrolling direction: this.mcs.direction
+			*/
+			function _mcs(){
+				var cp=[mCSB_container[0].offsetTop,mCSB_container[0].offsetLeft], /* content position */
+					dp=[mCSB_dragger[0].offsetTop,mCSB_dragger[0].offsetLeft], /* dragger position */
+					cl=[mCSB_container.outerHeight(false),mCSB_container.outerWidth(false)], /* content length */
+					pl=[mCustomScrollBox.height(),mCustomScrollBox.width()]; /* content parent length */
+				el[0].mcs={
+					content:mCSB_container, /* original content wrapper as jquery object */
+					top:cp[0],left:cp[1],draggerTop:dp[0],draggerLeft:dp[1],
+					topPct:Math.round((100*Math.abs(cp[0]))/(Math.abs(cl[0])-pl[0])),leftPct:Math.round((100*Math.abs(cp[1]))/(Math.abs(cl[1])-pl[1])),
+					direction:options.dir
+				};
+				/*
+				this refers to the original element containing the scrollbar(s)
+				usage: this.mcs.top, this.mcs.leftPct etc.
+				*/
+			}
+		},
+		/* -------------------- */
+
+
+		/*
+		CUSTOM JAVASCRIPT ANIMATION TWEEN
+		Lighter and faster than jquery animate() and css transitions
+		Animates top/left properties and includes easings
+		*/
+		_tweenTo=function(el,prop,to,duration,easing,overwrite,callbacks){
+			if(!el._mTween){el._mTween={top:{},left:{}};}
+			var callbacks=callbacks || {},
+				onStart=callbacks.onStart || function(){},onUpdate=callbacks.onUpdate || function(){},onComplete=callbacks.onComplete || function(){},
+				startTime=_getTime(),_delay,progress=0,from=el.offsetTop,elStyle=el.style,_request,tobj=el._mTween[prop];
+			if(prop==="left"){from=el.offsetLeft;}
+			var diff=to-from;
+			tobj.stop=0;
+			if(overwrite!=="none"){_cancelTween();}
+			_startTween();
+			function _step(){
+				if(tobj.stop){return;}
+				if(!progress){onStart.call();}
+				progress=_getTime()-startTime;
+				_tween();
+				if(progress>=tobj.time){
+					tobj.time=(progress>tobj.time) ? progress+_delay-(progress-tobj.time) : progress+_delay-1;
+					if(tobj.time<progress+1){tobj.time=progress+1;}
+				}
+				if(tobj.time<duration){tobj.id=_request(_step);}else{onComplete.call();}
+			}
+			function _tween(){
+				if(duration>0){
+					tobj.currVal=_ease(tobj.time,from,diff,duration,easing);
+					elStyle[prop]=Math.round(tobj.currVal)+"px";
+				}else{
+					elStyle[prop]=to+"px";
+				}
+				onUpdate.call();
+			}
+			function _startTween(){
+				_delay=1000/60;
+				tobj.time=progress+_delay;
+				_request=(!window.requestAnimationFrame) ? function(f){_tween(); return setTimeout(f,0.01);} : window.requestAnimationFrame;
+				tobj.id=_request(_step);
+			}
+			function _cancelTween(){
+				if(tobj.id==null){return;}
+				if(!window.requestAnimationFrame){clearTimeout(tobj.id);
+				}else{window.cancelAnimationFrame(tobj.id);}
+				tobj.id=null;
+			}
+			function _ease(t,b,c,d,type){
+				switch(type){
+					case "linear": case "mcsLinear":
+						return c*t/d + b;
+						break;
+					case "mcsLinearOut":
+						t/=d; t--; return c * Math.sqrt(1 - t*t) + b;
+						break;
+					case "easeInOutSmooth":
+						t/=d/2;
+						if(t<1) return c/2*t*t + b;
+						t--;
+						return -c/2 * (t*(t-2) - 1) + b;
+						break;
+					case "easeInOutStrong":
+						t/=d/2;
+						if(t<1) return c/2 * Math.pow( 2, 10 * (t - 1) ) + b;
+						t--;
+						return c/2 * ( -Math.pow( 2, -10 * t) + 2 ) + b;
+						break;
+					case "easeInOut": case "mcsEaseInOut":
+						t/=d/2;
+						if(t<1) return c/2*t*t*t + b;
+						t-=2;
+						return c/2*(t*t*t + 2) + b;
+						break;
+					case "easeOutSmooth":
+						t/=d; t--;
+						return -c * (t*t*t*t - 1) + b;
+						break;
+					case "easeOutStrong":
+						return c * ( -Math.pow( 2, -10 * t/d ) + 1 ) + b;
+						break;
+					case "easeOut": case "mcsEaseOut": default:
+						var ts=(t/=d)*t,tc=ts*t;
+						return b+c*(0.499999999999997*tc*ts + -2.5*ts*ts + 5.5*tc + -6.5*ts + 4*t);
+				}
+			}
+		},
+		/* -------------------- */
+
+
+		/* returns current time */
+		_getTime=function(){
+			if(window.performance && window.performance.now){
+				return window.performance.now();
+			}else{
+				if(window.performance && window.performance.webkitNow){
+					return window.performance.webkitNow();
+				}else{
+					if(Date.now){return Date.now();}else{return new Date().getTime();}
+				}
+			}
+		},
+		/* -------------------- */
+
+
+		/* stops a tween */
+		_stopTween=function(){
+			var el=this;
+			if(!el._mTween){el._mTween={top:{},left:{}};}
+			var props=["top","left"];
+			for(var i=0; i<props.length; i++){
+				var prop=props[i];
+				if(el._mTween[prop].id){
+					if(!window.requestAnimationFrame){clearTimeout(el._mTween[prop].id);
+					}else{window.cancelAnimationFrame(el._mTween[prop].id);}
+					el._mTween[prop].id=null;
+					el._mTween[prop].stop=1;
+				}
+			}
+		},
+		/* -------------------- */
+
+
+		/* deletes a property (avoiding the exception thrown by IE) */
+		_delete=function(c,m){
+			try{delete c[m];}catch(e){c[m]=null;}
+		},
+		/* -------------------- */
+
+
+		/* detects left mouse button */
+		_mouseBtnLeft=function(e){
+			return !(e.which && e.which!==1);
+		},
+		/* -------------------- */
+
+
+		/* detects if pointer type event is touch */
+		_pointerTouch=function(e){
+			var t=e.originalEvent.pointerType;
+			return !(t && t!=="touch" && t!==2);
+		},
+		/* -------------------- */
+
+
+		/* checks if value is numeric */
+		_isNumeric=function(val){
+			return !isNaN(parseFloat(val)) && isFinite(val);
+		},
+		/* -------------------- */
+
+
+		/* returns element position according to content */
+		_childPos=function(el){
+			var p=el.parents(".mCSB_container");
+			return [el.offset().top-p.offset().top,el.offset().left-p.offset().left];
+		},
+		/* -------------------- */
+
+
+		/* checks if browser tab is hidden/inactive via Page Visibility API */
+		_isTabHidden=function(){
+			var prop=_getHiddenProp();
+			if(!prop) return false;
+			return document[prop];
+			function _getHiddenProp(){
+				var pfx=["webkit","moz","ms","o"];
+				if("hidden" in document) return "hidden"; //natively supported
+				for(var i=0; i<pfx.length; i++){ //prefixed
+				    if((pfx[i]+"Hidden") in document)
+				        return pfx[i]+"Hidden";
+				}
+				return null; //not supported
+			}
+		};
+		/* -------------------- */
+
+
+
+
+
+	/*
+	----------------------------------------
+	PLUGIN SETUP
+	----------------------------------------
+	*/
+
+	/* plugin constructor functions */
+	$.fn[pluginNS]=function(method){ /* usage: $(selector).mCustomScrollbar(); */
+		if(methods[method]){
+			return methods[method].apply(this,Array.prototype.slice.call(arguments,1));
+		}else if(typeof method==="object" || !method){
+			return methods.init.apply(this,arguments);
+		}else{
+			$.error("Method "+method+" does not exist");
+		}
+	};
+	$[pluginNS]=function(method){ /* usage: $.mCustomScrollbar(); */
+		if(methods[method]){
+			return methods[method].apply(this,Array.prototype.slice.call(arguments,1));
+		}else if(typeof method==="object" || !method){
+			return methods.init.apply(this,arguments);
+		}else{
+			$.error("Method "+method+" does not exist");
+		}
+	};
+
+	/*
+	allow setting plugin default options.
+	usage: $.mCustomScrollbar.defaults.scrollInertia=500;
+	to apply any changed default options on default selectors (below), use inside document ready fn
+	e.g.: $(document).ready(function(){ $.mCustomScrollbar.defaults.scrollInertia=500; });
+	*/
+	$[pluginNS].defaults=defaults;
+
+	/*
+	add window object (window.mCustomScrollbar)
+	usage: if(window.mCustomScrollbar){console.log("custom scrollbar plugin loaded");}
+	*/
+	window[pluginNS]=true;
+
+	$(window).load(function(){
+
+		$(defaultSelector)[pluginNS](); /* add scrollbars automatically on default selector */
+
+		/* extend jQuery expressions */
+		$.extend($.expr[":"],{
+			/* checks if element is within scrollable viewport */
+			mcsInView:$.expr[":"].mcsInView || function(el){
+				var $el=$(el),content=$el.parents(".mCSB_container"),wrapper,cPos;
+				if(!content.length){return;}
+				wrapper=content.parent();
+				cPos=[content[0].offsetTop,content[0].offsetLeft];
+				return 	cPos[0]+_childPos($el)[0]>=0 && cPos[0]+_childPos($el)[0]<wrapper.height()-$el.outerHeight(false) &&
+						cPos[1]+_childPos($el)[1]>=0 && cPos[1]+_childPos($el)[1]<wrapper.width()-$el.outerWidth(false);
+			},
+			/* checks if element is overflowed having visible scrollbar(s) */
+			mcsOverflow:$.expr[":"].mcsOverflow || function(el){
+				var d=$(el).data(pluginPfx);
+				if(!d){return;}
+				return d.overflowed[0] || d.overflowed[1];
+			}
+		});
+
+	});
+
+}))}));
diff --git a/packages/wekan-scrollbar/jquery.mousewheel.js b/packages/wekan-scrollbar/jquery.mousewheel.js
new file mode 100644
index 00000000..3eadb7ed
--- /dev/null
+++ b/packages/wekan-scrollbar/jquery.mousewheel.js
@@ -0,0 +1,221 @@
+/*!
+ * jQuery Mousewheel 3.1.13
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license
+ * http://jquery.org/license
+ */
+
+(function (factory) {
+    if ( typeof define === 'function' && define.amd ) {
+        // AMD. Register as an anonymous module.
+        define(['jquery'], factory);
+    } else if (typeof exports === 'object') {
+        // Node/CommonJS style for Browserify
+        module.exports = factory;
+    } else {
+        // Browser globals
+        factory(jQuery);
+    }
+}(function ($) {
+
+    var toFix  = ['wheel', 'mousewheel', 'DOMMouseScroll', 'MozMousePixelScroll'],
+        toBind = ( 'onwheel' in document || document.documentMode >= 9 ) ?
+                    ['wheel'] : ['mousewheel', 'DomMouseScroll', 'MozMousePixelScroll'],
+        slice  = Array.prototype.slice,
+        nullLowestDeltaTimeout, lowestDelta;
+
+    if ( $.event.fixHooks ) {
+        for ( var i = toFix.length; i; ) {
+            $.event.fixHooks[ toFix[--i] ] = $.event.mouseHooks;
+        }
+    }
+
+    var special = $.event.special.mousewheel = {
+        version: '3.1.12',
+
+        setup: function() {
+            if ( this.addEventListener ) {
+                for ( var i = toBind.length; i; ) {
+                    this.addEventListener( toBind[--i], handler, false );
+                }
+            } else {
+                this.onmousewheel = handler;
+            }
+            // Store the line height and page height for this particular element
+            $.data(this, 'mousewheel-line-height', special.getLineHeight(this));
+            $.data(this, 'mousewheel-page-height', special.getPageHeight(this));
+        },
+
+        teardown: function() {
+            if ( this.removeEventListener ) {
+                for ( var i = toBind.length; i; ) {
+                    this.removeEventListener( toBind[--i], handler, false );
+                }
+            } else {
+                this.onmousewheel = null;
+            }
+            // Clean up the data we added to the element
+            $.removeData(this, 'mousewheel-line-height');
+            $.removeData(this, 'mousewheel-page-height');
+        },
+
+        getLineHeight: function(elem) {
+            var $elem = $(elem),
+                $parent = $elem['offsetParent' in $.fn ? 'offsetParent' : 'parent']();
+            if (!$parent.length) {
+                $parent = $('body');
+            }
+            return parseInt($parent.css('fontSize'), 10) || parseInt($elem.css('fontSize'), 10) || 16;
+        },
+
+        getPageHeight: function(elem) {
+            return $(elem).height();
+        },
+
+        settings: {
+            adjustOldDeltas: true, // see shouldAdjustOldDeltas() below
+            normalizeOffset: true  // calls getBoundingClientRect for each event
+        }
+    };
+
+    $.fn.extend({
+        mousewheel: function(fn) {
+            return fn ? this.bind('mousewheel', fn) : this.trigger('mousewheel');
+        },
+
+        unmousewheel: function(fn) {
+            return this.unbind('mousewheel', fn);
+        }
+    });
+
+
+    function handler(event) {
+        var orgEvent   = event || window.event,
+            args       = slice.call(arguments, 1),
+            delta      = 0,
+            deltaX     = 0,
+            deltaY     = 0,
+            absDelta   = 0,
+            offsetX    = 0,
+            offsetY    = 0;
+        event = $.event.fix(orgEvent);
+        event.type = 'mousewheel';
+
+        // Old school scrollwheel delta
+        if ( 'detail'      in orgEvent ) { deltaY = orgEvent.detail * -1;      }
+        if ( 'wheelDelta'  in orgEvent ) { deltaY = orgEvent.wheelDelta;       }
+        if ( 'wheelDeltaY' in orgEvent ) { deltaY = orgEvent.wheelDeltaY;      }
+        if ( 'wheelDeltaX' in orgEvent ) { deltaX = orgEvent.wheelDeltaX * -1; }
+
+        // Firefox < 17 horizontal scrolling related to DOMMouseScroll event
+        if ( 'axis' in orgEvent && orgEvent.axis === orgEvent.HORIZONTAL_AXIS ) {
+            deltaX = deltaY * -1;
+            deltaY = 0;
+        }
+
+        // Set delta to be deltaY or deltaX if deltaY is 0 for backwards compatabilitiy
+        delta = deltaY === 0 ? deltaX : deltaY;
+
+        // New school wheel delta (wheel event)
+        if ( 'deltaY' in orgEvent ) {
+            deltaY = orgEvent.deltaY * -1;
+            delta  = deltaY;
+        }
+        if ( 'deltaX' in orgEvent ) {
+            deltaX = orgEvent.deltaX;
+            if ( deltaY === 0 ) { delta  = deltaX * -1; }
+        }
+
+        // No change actually happened, no reason to go any further
+        if ( deltaY === 0 && deltaX === 0 ) { return; }
+
+        // Need to convert lines and pages to pixels if we aren't already in pixels
+        // There are three delta modes:
+        //   * deltaMode 0 is by pixels, nothing to do
+        //   * deltaMode 1 is by lines
+        //   * deltaMode 2 is by pages
+        if ( orgEvent.deltaMode === 1 ) {
+            var lineHeight = $.data(this, 'mousewheel-line-height');
+            delta  *= lineHeight;
+            deltaY *= lineHeight;
+            deltaX *= lineHeight;
+        } else if ( orgEvent.deltaMode === 2 ) {
+            var pageHeight = $.data(this, 'mousewheel-page-height');
+            delta  *= pageHeight;
+            deltaY *= pageHeight;
+            deltaX *= pageHeight;
+        }
+
+        // Store lowest absolute delta to normalize the delta values
+        absDelta = Math.max( Math.abs(deltaY), Math.abs(deltaX) );
+
+        if ( !lowestDelta || absDelta < lowestDelta ) {
+            lowestDelta = absDelta;
+
+            // Adjust older deltas if necessary
+            if ( shouldAdjustOldDeltas(orgEvent, absDelta) ) {
+                lowestDelta /= 40;
+            }
+        }
+
+        // Adjust older deltas if necessary
+        if ( shouldAdjustOldDeltas(orgEvent, absDelta) ) {
+            // Divide all the things by 40!
+            delta  /= 40;
+            deltaX /= 40;
+            deltaY /= 40;
+        }
+
+        // Get a whole, normalized value for the deltas
+        delta  = Math[ delta  >= 1 ? 'floor' : 'ceil' ](delta  / lowestDelta);
+        deltaX = Math[ deltaX >= 1 ? 'floor' : 'ceil' ](deltaX / lowestDelta);
+        deltaY = Math[ deltaY >= 1 ? 'floor' : 'ceil' ](deltaY / lowestDelta);
+
+        // Normalise offsetX and offsetY properties
+        if ( special.settings.normalizeOffset && this.getBoundingClientRect ) {
+            var boundingRect = this.getBoundingClientRect();
+            offsetX = event.clientX - boundingRect.left;
+            offsetY = event.clientY - boundingRect.top;
+        }
+
+        // Add information to the event object
+        event.deltaX = deltaX;
+        event.deltaY = deltaY;
+        event.deltaFactor = lowestDelta;
+        event.offsetX = offsetX;
+        event.offsetY = offsetY;
+        // Go ahead and set deltaMode to 0 since we converted to pixels
+        // Although this is a little odd since we overwrite the deltaX/Y
+        // properties with normalized deltas.
+        event.deltaMode = 0;
+
+        // Add event and delta to the front of the arguments
+        args.unshift(event, delta, deltaX, deltaY);
+
+        // Clearout lowestDelta after sometime to better
+        // handle multiple device types that give different
+        // a different lowestDelta
+        // Ex: trackpad = 3 and mouse wheel = 120
+        if (nullLowestDeltaTimeout) { clearTimeout(nullLowestDeltaTimeout); }
+        nullLowestDeltaTimeout = setTimeout(nullLowestDelta, 200);
+
+        return ($.event.dispatch || $.event.handle).apply(this, args);
+    }
+
+    function nullLowestDelta() {
+        lowestDelta = null;
+    }
+
+    function shouldAdjustOldDeltas(orgEvent, absDelta) {
+        // If this is an older event and the delta is divisable by 120,
+        // then we are assuming that the browser is treating this as an
+        // older mouse wheel event and that we should divide the deltas
+        // by 40 to try and get a more usable deltaFactor.
+        // Side note, this actually impacts the reported scroll distance
+        // in older browsers and can cause scrolling to be slower than native.
+        // Turn this off by setting $.event.special.mousewheel.settings.adjustOldDeltas to false.
+        return special.settings.adjustOldDeltas && orgEvent.type === 'mousewheel' && absDelta % 120 === 0;
+    }
+
+}));
diff --git a/packages/wekan-scrollbar/package.js b/packages/wekan-scrollbar/package.js
new file mode 100644
index 00000000..b2711c82
--- /dev/null
+++ b/packages/wekan-scrollbar/package.js
@@ -0,0 +1,22 @@
+Package.describe({
+  name: 'wekan-scrollbar',
+  summary: "A wrapper for Malihu Custom Scrollbar. Highly customizable custom scrollbar jQuery plugin",
+  version: "3.1.3",
+  git: "https://github.com/wekan/wekan-scrollbar.git"
+});
+
+Package.onUse(function(api) {
+  api.versionsFrom('METEOR@0.9.0.1');
+
+  api.use('jquery');
+
+  // JS
+  api.addFiles('jquery.mousewheel.js', 'client');
+  api.addFiles('jquery.mCustomScrollbar.js', 'client');
+
+  // CSS
+
+  api.addFiles('jquery.mCustomScrollbar.css', 'client');
+
+});
+
diff --git a/packages/wekan-scrollbar/readme.md b/packages/wekan-scrollbar/readme.md
new file mode 100644
index 00000000..0e2fbb5c
--- /dev/null
+++ b/packages/wekan-scrollbar/readme.md
@@ -0,0 +1,17 @@
+## Meteor Wrapper for Malihu jQuery Custom Scrollbar plugin
+
+Add to your Meteor app
+
+```
+meteor add wekan:wekan-scrollbar
+```
+
+### OLD
+
+Add to your Meteor app
+
+```
+meteor add maazalik:malihu-jquery-custom-scrollbar
+```
+
+Compatible with Meteor v0.9.0.1
diff --git a/public/card-colors.png b/public/card-colors.png
new file mode 100644
index 00000000..91d3a587
--- /dev/null
+++ b/public/card-colors.png
diff --git a/public/wekan-logo-header.png b/public/logo-header.png
index 16ffa102..16ffa102 100644
--- a/public/wekan-logo-header.png
+++ b/public/logo-header.png
diff --git a/public/wekan-150.png b/public/wekan-logo-150.png
index e8e89c62..e8e89c62 100644
--- a/public/wekan-150.png
+++ b/public/wekan-logo-150.png
diff --git a/public/wekan-150.svg b/public/wekan-logo-150.svg
index 51d4eede..51d4eede 100644
--- a/public/wekan-150.svg
+++ b/public/wekan-logo-150.svg
diff --git a/public/wekan-manifest.json b/public/wekan-manifest.json
index a1c18518..ee223e8c 100644
--- a/public/wekan-manifest.json
+++ b/public/wekan-manifest.json
@@ -1,16 +1,16 @@
 {
   "name": "Wekan",
   "short_name": "Wekan",
-  "description": "The open-source Trello-like kanban",
+  "description": "The open-source kanban",
   "lang": "en-US",
   "icons": [
     {
-      "src": "/wekan-150.png",
+      "src": "/wekan-logo-150.png",
       "type": "image/png",
       "sizes": "150x150"
     },
     {
-      "src": "/wekan-150.svg",
+      "src": "/wekan-logo-150.svg",
       "type": "image/svg+xml",
       "sizes": "150x150"
     }
diff --git a/rebuild-wekan.bat b/rebuild-wekan.bat
new file mode 100644
index 00000000..784adb82
--- /dev/null
+++ b/rebuild-wekan.bat
@@ -0,0 +1,56 @@
+@ECHO OFF

+

+REM NOTE: THIS .BAT DOES NOT WORK !!

+REM Use instead this webpage instructions to build on Windows:

+REM https://github.com/wekan/wekan/wiki/Install-Wekan-from-source-on-Windows

+REM Please add fix PRs, like config of MongoDB etc.

+

+md C:\repos

+cd C:\repos

+

+REM Install chocolatey

+@"%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe" -NoProfile -InputFormat None -ExecutionPolicy Bypass -Command "iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET "PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin"

+

+choco install -y git curl python2 dotnet4.5.2 nano mongodb-3 mongoclient meteor

+

+curl -O https://nodejs.org/dist/v8.12.0/node-v8.12.0-x64.msi

+call node-v8.12.0-x64.msi

+

+call npm config -g set msvs_version 2015

+call meteor npm config -g set msvs_version 2015

+

+call npm -g install npm

+call npm -g install node-gyp

+call npm -g install fibers@2.0.0

+cd C:\repos

+git clone https://github.com/wekan/wekan.git

+cd wekan

+git checkout edge

+echo "Building Wekan."

+REM del /S /F /Q packages

+REM ## REPOS BELOW ARE INCLUDED TO WEKAN

+REM md packages

+REM cd packages

+REM git clone --depth 1 -b master https://github.com/wekan/flow-router.git kadira-flow-router

+REM git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core

+REM git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git

+REM git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git

+REM git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git

+REM git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-oidc.git

+REM git clone --depth 1 -b master --recurse-submodules https://github.com/wekan/markdown.git

+REM move meteor-accounts-oidc/packages/switch_accounts-oidc wekan_accounts-oidc

+REM move meteor-accounts-oidc/packages/switch_oidc wekan_oidc

+REM del /S /F /Q meteor-accounts-oidc

+REM sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/repos/wekan/packages/meteor-useraccounts-core/package.js

+cd ..

+REM del /S /F /Q node_modules

+call meteor npm install

+REM del /S /F /Q .build

+call meteor build .build --directory

+copy fix-download-unicode\cfs_access-point.txt .build\bundle\programs\server\packages\cfs_access-point.js

+cd .build\bundle\programs\server

+call meteor npm install

+REM cd C:\repos\wekan\.meteor\local\build\programs\server

+REM del node_modules

+cd C:\repos\wekan

+call start-wekan.bat

diff --git a/rebuild-wekan.sh b/rebuild-wekan.sh
new file mode 100755
index 00000000..c473f414
--- /dev/null
+++ b/rebuild-wekan.sh
@@ -0,0 +1,161 @@
+#!/bin/bash
+
+echo "Note: If you use other locale than en_US.UTF-8 , you need to additionally install en_US.UTF-8"
+echo "      with 'sudo dpkg-reconfigure locales' , so that MongoDB works correctly."
+echo "      You can still use any other locale as your main locale."
+
+#Below script installs newest node 8.x for Debian/Ubuntu/Mint.
+#NODE_VERSION=8.16.0
+#X64NODE="https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz"
+
+function pause(){
+	read -p "$*"
+}
+
+function cprec(){
+	if [[ -d "$1" ]]; then
+		if [[ ! -d "$2" ]]; then
+			sudo mkdir -p "$2"
+		fi
+
+		for i in $(ls -A "$1"); do
+			cprec "$1/$i" "$2/$i"
+		done
+	else
+		sudo cp "$1" "$2"
+	fi
+}
+
+# sudo npm doesn't work right, so this is a workaround
+function npm_call(){
+	TMPDIR="/tmp/tmp_npm_prefix"
+	if [[ -d "$TMPDIR" ]]; then
+		rm -rf $TMPDIR
+	fi
+	mkdir $TMPDIR
+	NPM_PREFIX="$(npm config get prefix)"
+	npm config set prefix $TMPDIR
+	npm "$@"
+	npm config set prefix "$NPM_PREFIX"
+
+	echo "Moving files to $NPM_PREFIX"
+	for i in $(ls -A $TMPDIR); do
+		cprec "$TMPDIR/$i" "$NPM_PREFIX/$i"
+	done
+	rm -rf $TMPDIR
+}
+
+#function wekan_repo_check(){
+## UNCOMMENTING, IT'S NOT REQUIRED THAT /HOME/USERNAME IS /HOME/WEKAN
+#	git_remotes="$(git remote show 2>/dev/null)"
+#	res=""
+#	for i in $git_remotes; do
+#		res="$(git remote get-url $i | sed 's/.*wekan\/wekan.*/wekan\/wekan/')"
+#		if [[ "$res" == "wekan/wekan" ]]; then
+#		    break
+#		fi
+#	done
+#
+#	if [[ "$res" != "wekan/wekan" ]]; then
+#		echo "$PWD is not a wekan repository"
+#		exit;
+#	fi
+#}
+
+echo
+PS3='Please enter your choice: '
+options=("Install Wekan dependencies" "Build Wekan" "Quit")
+select opt in "${options[@]}"
+do
+    case $opt in
+        "Install Wekan dependencies")
+
+		if [[ "$OSTYPE" == "linux-gnu" ]]; then
+	                echo "Linux";
+			# Debian, Ubuntu, Mint
+			sudo apt-get install -y build-essential gcc g++ make git curl wget
+			curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash -
+			sudo apt-get install -y nodejs
+		elif [[ "$OSTYPE" == "darwin"* ]]; then
+		        echo "macOS";
+			pause '1) Install XCode 2) Install Node 8.x from https://nodejs.org/en/ 3) Press [Enter] key to continue.'
+		elif [[ "$OSTYPE" == "cygwin" ]]; then
+		        # POSIX compatibility layer and Linux environment emulation for Windows
+		        echo "TODO: Add Cygwin";
+			exit;
+		elif [[ "$OSTYPE" == "msys" ]]; then
+		        # Lightweight shell and GNU utilities compiled for Windows (part of MinGW)
+		        echo "TODO: Add msys on Windows";
+			exit;
+		elif [[ "$OSTYPE" == "win32" ]]; then
+		        # I'm not sure this can happen.
+		        echo "TODO: Add Windows";
+			exit;
+		elif [[ "$OSTYPE" == "freebsd"* ]]; then
+		        echo "TODO: Add FreeBSD";
+			exit;
+		else
+		        echo "Unknown"
+			echo ${OSTYPE}
+			exit;
+		fi
+
+	        ## Latest npm with Meteor 1.6
+	        npm_call -g install npm
+	        npm_call -g install node-gyp
+	        # Latest fibers for Meteor 1.6
+	        npm_call -g install fibers@2.0.0
+	        # Install Meteor, if it's not yet installed
+	        curl https://install.meteor.com | bash
+		break
+		;;
+        "Build Wekan")
+		echo "Building Wekan."
+		#wekan_repo_check
+		# REPOS BELOW ARE INCLUDED TO WEKAN REPO
+		#rm -rf packages/kadira-flow-router packages/meteor-useraccounts-core packages/meteor-accounts-cas packages/wekan-ldap packages/wekan-ldap packages/wekan-scrfollbar packages/meteor-accounts-oidc packages/markdown
+		#mkdir packages
+		#cd packages
+		#git clone --depth 1 -b master https://github.com/wekan/flow-router.git kadira-flow-router
+		#git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core
+		#git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git
+		#git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git
+		#git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git
+		#git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-oidc.git
+		#git clone --depth 1 -b master --recurse-submodules https://github.com/wekan/markdown.git
+                #mv meteor-accounts-oidc/packages/switch_accounts-oidc wekan_accounts-oidc
+                #mv meteor-accounts-oidc/packages/switch_oidc wekan_oidc
+                #rm -rf meteor-accounts-oidc
+		#if [[ "$OSTYPE" == "darwin"* ]]; then
+		#	echo "sed at macOS";
+		#	sed -i '' 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/repos/wekan/packages/meteor-useraccounts-core/package.js
+		#else
+		#	echo "sed at ${OSTYPE}"
+		#	sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/repos/wekan/packages/meteor-useraccounts-core/package.js
+		#fi
+		#cd ..
+		rm -rf node_modules
+		meteor npm install
+		rm -rf .build
+		meteor build .build --directory
+		cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/packages/cfs_access-point.js
+		#Removed binary version of bcrypt because of security vulnerability that is not fixed yet.
+		#https://github.com/wekan/wekan/commit/4b2010213907c61b0e0482ab55abb06f6a668eac
+		#https://github.com/wekan/wekan/commit/7eeabf14be3c63fae2226e561ef8a0c1390c8d3c
+		#cd ~/repos/wekan/.build/bundle/programs/server/npm/node_modules/meteor/npm-bcrypt
+		#rm -rf node_modules/bcrypt
+		#meteor npm install bcrypt
+		cd .build/bundle/programs/server
+		rm -rf node_modules
+		meteor npm install
+		#meteor npm install bcrypt
+		cd ../../../..
+		echo Done.
+		break
+		;;
+        "Quit")
+		break
+            ;;
+        *) echo invalid option;;
+    esac
+done
diff --git a/releases/README.md b/releases/README.md
new file mode 100644
index 00000000..86601ad2
--- /dev/null
+++ b/releases/README.md
@@ -0,0 +1,12 @@
+## Wekan release scripts
+
+Sorry about the mess. I try to cleanup it sometime.
+
+I usually use these:
+- release.sh 
+- release-sandstorm.sh
+- release-snap.sh
+
+https://github.com/wekan/wekan-snap/wiki/Making-releases-from-source
+
+https://github.com/wekan/wekan-maintainer/wiki/Building-Wekan-for-Sandstorm
diff --git a/releases/add-tag.sh b/releases/add-tag.sh
new file mode 100755
index 00000000..c43617fe
--- /dev/null
+++ b/releases/add-tag.sh
@@ -0,0 +1,5 @@
+# Add tag to repo of new release
+# Example: add-tag.sh v1.62
+
+git tag -a $1 -m "$1"
+git push origin $1
diff --git a/releases/commit.sh b/releases/commit.sh
new file mode 100755
index 00000000..5b973177
--- /dev/null
+++ b/releases/commit.sh
@@ -0,0 +1,4 @@
+
+# --- Add commit with showing editor where it's easy to add multiline commit
+git commit
+# ----
diff --git a/releases/delete-branch-local-and-remote.sh b/releases/delete-branch-local-and-remote.sh
new file mode 100755
index 00000000..b362f56f
--- /dev/null
+++ b/releases/delete-branch-local-and-remote.sh
@@ -0,0 +1,3 @@
+# https://makandracards.com/makandra/621-git-delete-a-branch-local-or-remote
+#git push origin --delete feature-oauth
+git push origin --delete $1
diff --git a/releases/rebuild-release.sh b/releases/rebuild-release.sh
new file mode 100755
index 00000000..30814c73
--- /dev/null
+++ b/releases/rebuild-release.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+echo "Building Wekan."
+cd ~/repos/wekan
+#rm -rf packages
+#mkdir -p ~/repos/wekan/packages
+#cd ~/repos/wekan/packages
+#git clone --depth 1 -b master https://github.com/wekan/flow-router.git kadira-flow-router
+#git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core
+#git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git
+#git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git
+#git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git
+#git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-oidc.git
+#git clone --depth 1 -b master --recurse-submodules https://github.com/wekan/markdown.git
+#mv meteor-accounts-oidc/packages/switch_accounts-oidc wekan_accounts-oidc
+#mv meteor-accounts-oidc/packages/switch_oidc wekan_oidc
+#
+#if [[ "$OSTYPE" == "darwin"* ]]; then
+#	echo "sed at macOS";
+#	sed -i '' 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/repos/wekan/packages/meteor-useraccounts-core/package.js
+#else
+#	echo "sed at ${OSTYPE}"
+#	sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/repos/wekan/packages/meteor-useraccounts-core/package.js
+#fi
+#
+cd ~/repos/wekan
+rm -rf node_modules
+meteor npm install
+rm -rf .build
+meteor build .build --directory
+cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/packages/cfs_access-point.js
+#Removed binary version of bcrypt because of security vulnerability that is not fixed yet.
+#https://github.com/wekan/wekan/commit/4b2010213907c61b0e0482ab55abb06f6a668eac
+#https://github.com/wekan/wekan/commit/7eeabf14be3c63fae2226e561ef8a0c1390c8d3c
+#cd ~/repos/wekan/.build/bundle/programs/server/npm/node_modules/meteor/npm-bcrypt
+#rm -rf node_modules/bcrypt
+#meteor npm install bcrypt
+cd ~/repos/wekan/.build/bundle/programs/server
+rm -rf node_modules
+meteor npm install
+#meteor npm install bcrypt
+cd ~/repos
+echo Building Wekan Done.
diff --git a/releases/rebuild-wekan.sh b/releases/rebuild-wekan.sh
new file mode 100755
index 00000000..2f3e3eeb
--- /dev/null
+++ b/releases/rebuild-wekan.sh
@@ -0,0 +1,136 @@
+#!/bin/bash
+
+echo "Note: If you use other locale than en_US.UTF-8 , you need to additionally install en_US.UTF-8"
+echo "      with 'sudo dpkg-reconfigure locales' , so that MongoDB works correctly."
+echo "      You can still use any other locale as your main locale."
+
+X64NODE="https://releases.wekan.team/node-v8.11.3-linux-x64.tar.gz"
+
+function pause(){
+	read -p "$*"
+}
+
+echo
+PS3='Please enter your choice: '
+options=("Install Wekan dependencies" "Build Wekan" "Quit")
+select opt in "${options[@]}"
+do
+    case $opt in
+        "Install Wekan dependencies")
+
+		if [[ "$OSTYPE" == "linux-gnu" ]]; then
+	                echo "Linux";
+
+			if [ "$(grep -Ei 'buntu|mint' /etc/*release)" ]; then
+				sudo apt install -y build-essential git curl wget
+#				sudo apt -y install nodejs npm
+#				sudo npm -g install n
+#				sudo n 8.11.3
+			fi
+
+#			if [ "$(grep -Ei 'debian' /etc/*release)" ]; then
+#				sudo apt install -y build-essential git curl wget
+#				echo "Debian, or Debian on Windows Subsystem for Linux"
+#				curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash -
+#				sudo apt install -y nodejs
+#			fi
+
+			# TODO: Add Sandstorm for version of Node.js install
+			#MACHINE_TYPE=`uname -m`
+			#if [ ${MACHINE_TYPE} == 'x86_64' ]; then
+			#	# 64-bit stuff here
+			#	wget ${X64NODE}
+			#	sudo tar -C /usr/local --strip-components 1 -xzf ${X64NODE}
+			#elif [ ${MACHINE_TYPE} == '32bit' ]; then
+			#	echo "TODO: 32-bit Linux install here"
+			#	exit
+			#fi
+		elif [[ "$OSTYPE" == "darwin"* ]]; then
+		        echo "macOS";
+			pause '1) Install XCode 2) Install Node 8.x from https://nodejs.org/en/ 3) Press [Enter] key to continue.'
+		elif [[ "$OSTYPE" == "cygwin" ]]; then
+		        # POSIX compatibility layer and Linux environment emulation for Windows
+		        echo "TODO: Add Cygwin";
+			exit;
+		elif [[ "$OSTYPE" == "msys" ]]; then
+		        # Lightweight shell and GNU utilities compiled for Windows (part of MinGW)
+		        echo "TODO: Add msys on Windows";
+			exit;
+		elif [[ "$OSTYPE" == "win32" ]]; then
+		        # I'm not sure this can happen.
+		        echo "TODO: Add Windows";
+			exit;
+		elif [[ "$OSTYPE" == "freebsd"* ]]; then
+		        echo "TODO: Add FreeBSD";
+			exit;
+		else
+		        echo "Unknown"
+			echo ${OSTYPE}
+			exit;
+		fi
+
+	        ## Latest npm with Meteor 1.6
+	        sudo npm -g install npm
+	        sudo npm -g install node-gyp
+	        # Latest fibers for Meteor 1.6
+	        sudo npm -g install fibers@2.0.0
+	        # Install Meteor, if it's not yet installed
+	        curl https://install.meteor.com | bash
+#	        mkdir ~/repos
+#	        cd ~/repos
+#	        git clone https://github.com/wekan/wekan.git
+#	        cd wekan
+#	        git checkout devel
+		break
+		;;
+        "Build Wekan")
+		echo "Building Wekan."
+		cd ~/repos/wekan
+		rm -rf packages
+		mkdir -p ~/repos/wekan/packages
+		cd ~/repos/wekan/packages
+		git clone --depth 1 -b master https://github.com/wekan/flow-router.git kadira-flow-router
+		git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core
+		git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git
+		git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git
+		git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git
+                git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-oidc.git
+		git clone --depth 1 -b master --recurse-submodules https://github.com/wekan/markdown.git
+                mv meteor-accounts-oidc/packages/switch_accounts-oidc wekan_accounts-oidc
+                mv meteor-accounts-oidc/packages/switch_oidc wekan_oidc
+                rm -rf meteor-accounts-oidc
+
+		if [[ "$OSTYPE" == "darwin"* ]]; then
+			echo "sed at macOS";
+			sed -i '' 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/repos/wekan/packages/meteor-useraccounts-core/package.js
+		else
+			echo "sed at ${OSTYPE}"
+			sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/repos/wekan/packages/meteor-useraccounts-core/package.js
+		fi
+
+		cd ~/repos/wekan
+		rm -rf node_modules
+		meteor npm install
+		rm -rf .build
+		meteor build .build --directory
+		cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/packages/cfs_access-point.js
+		#Removed binary version of bcrypt because of security vulnerability that is not fixed yet.
+		#https://github.com/wekan/wekan/commit/4b2010213907c61b0e0482ab55abb06f6a668eac
+		#https://github.com/wekan/wekan/commit/7eeabf14be3c63fae2226e561ef8a0c1390c8d3c
+		#cd ~/repos/wekan/.build/bundle/programs/server/npm/node_modules/meteor/npm-bcrypt
+		#rm -rf node_modules/bcrypt
+		#meteor npm install bcrypt
+		cd ~/repos/wekan/.build/bundle/programs/server
+		rm -rf node_modules
+		meteor npm install
+		#meteor npm install bcrypt
+		cd ~/repos
+		echo Done.
+		break
+		;;
+        "Quit")
+		break
+            ;;
+        *) echo invalid option;;
+    esac
+done
diff --git a/releases/release-cleanup.sh b/releases/release-cleanup.sh
new file mode 100755
index 00000000..ed49638e
--- /dev/null
+++ b/releases/release-cleanup.sh
@@ -0,0 +1,19 @@
+# Usage: ./release.sh 1.36
+
+# Delete old stuff
+cd ~/
+sudo rm -rf .npm
+cd ~/repos/wekan
+sudo rm -rf parts prime stage .meteor-spk
+
+# Set permissions
+cd ~/repos
+sudo chown user:user wekan -R
+cd ~/
+sudo chown user:user .meteor -R
+#sudo chown user:user .cache/snapcraft -R
+sudo rm -rf .cache/snapcraft
+sudo chown user:user .config -R
+
+# Back
+cd ~/repos
diff --git a/releases/release-sandstorm.sh b/releases/release-sandstorm.sh
new file mode 100755
index 00000000..89dfc4fc
--- /dev/null
+++ b/releases/release-sandstorm.sh
@@ -0,0 +1,21 @@
+# Usage: ./release.sh 1.36
+
+# Delete old stuff
+cd ~/repos
+./release-cleanup.sh
+
+# Build Source
+cd ~/repos
+./rebuild-release.sh
+
+# Build Sandstorm
+cd ~/repos/wekan
+meteor-spk pack wekan-$1.spk
+spk publish wekan-$1.spk
+#scp wekan-$1.spk x2:/var/snap/wekan/common/releases.wekan.team/
+scp wekan-$1.spk x2:/var/www/releases.wekan.team/
+mv wekan-$1.spk ..
+
+# Delete old stuff
+cd ~/repos
+./release-cleanup.sh
diff --git a/releases/release-snap.sh b/releases/release-snap.sh
new file mode 100755
index 00000000..6ef37bff
--- /dev/null
+++ b/releases/release-snap.sh
@@ -0,0 +1,27 @@
+# Usage: ./release.sh 1.36
+
+# Cleanup
+cd ~/repos
+./release-cleanup.sh
+
+# Build Source
+cd ~/repos
+./rebuild-release.sh
+
+# Build Snap
+cd ~/repos/wekan
+rm -rf packages
+sudo snapcraft
+
+# Cleanup
+cd ~/repos
+./release-cleanup.sh
+
+# Push snap
+cd ~/repos/wekan
+sudo snap install --dangerous wekan_$1_amd64.snap
+echo "Now you can test local installed snap."
+snapcraft push wekan_$1_amd64.snap
+#scp wekan_$1_amd64.snap x2:/var/snap/wekan/common/releases.wekan.team/
+scp wekan_$1_amd64.snap x2:/var/www/releases.wekan.team/
+mv wekan_$1_amd64.snap ..
diff --git a/releases/release.sh b/releases/release.sh
new file mode 100755
index 00000000..3206b7f1
--- /dev/null
+++ b/releases/release.sh
@@ -0,0 +1,7 @@
+# Usage: ./release.sh 1.36
+
+# Build Sandstorm
+./release-sandstorm.sh $1
+
+# Build Snap
+./release-snap.sh $1
diff --git a/releases/sandstorm-make-spk.sh b/releases/sandstorm-make-spk.sh
new file mode 100755
index 00000000..8db2a4c3
--- /dev/null
+++ b/releases/sandstorm-make-spk.sh
@@ -0,0 +1 @@
+meteor-spk pack wekan-1.11.spk
diff --git a/releases/sandstorm-test-dev.sh b/releases/sandstorm-test-dev.sh
new file mode 100755
index 00000000..5aae36b1
--- /dev/null
+++ b/releases/sandstorm-test-dev.sh
@@ -0,0 +1 @@
+meteor-spk dev
diff --git a/releases/snap-edge.sh b/releases/snap-edge.sh
new file mode 100755
index 00000000..2b5197c8
--- /dev/null
+++ b/releases/snap-edge.sh
@@ -0,0 +1,2 @@
+# Change to snap edge
+sudo snap refresh wekan --edge --amend
diff --git a/releases/snap-install.sh b/releases/snap-install.sh
new file mode 100755
index 00000000..bdb0b7a2
--- /dev/null
+++ b/releases/snap-install.sh
@@ -0,0 +1 @@
+sudo snap install --dangerous wekan_1.23-17-g9c94ea5_amd64.snap
diff --git a/releases/snap-push-to-store.sh b/releases/snap-push-to-store.sh
new file mode 100755
index 00000000..dca942fd
--- /dev/null
+++ b/releases/snap-push-to-store.sh
@@ -0,0 +1 @@
+snapcraft push $1
diff --git a/releases/snap-stable.sh b/releases/snap-stable.sh
new file mode 100755
index 00000000..b8633100
--- /dev/null
+++ b/releases/snap-stable.sh
@@ -0,0 +1,2 @@
+# Change to snap stable
+sudo snap refresh wekan --stable --amend
diff --git a/releases/snapcraft-help.sh b/releases/snapcraft-help.sh
new file mode 100755
index 00000000..fa576b30
--- /dev/null
+++ b/releases/snapcraft-help.sh
@@ -0,0 +1 @@
+snapcraft help topics
diff --git a/releases/translations/pull-translations.sh b/releases/translations/pull-translations.sh
new file mode 100755
index 00000000..fc8186b7
--- /dev/null
+++ b/releases/translations/pull-translations.sh
@@ -0,0 +1,151 @@
+cd ~/repos/wekan
+
+echo "Arabic:"
+tx pull -f -l ar
+
+echo "Bulgarian:"
+tx pull -f -l bg_BG
+
+echo "Breton:"
+tx pull -f -l br
+
+echo "Catalan:"
+tx pull -f -l ca
+
+echo "Czech:"
+tx pull -f -l cs
+
+echo "Danish:"
+tx pull -f -l da
+
+echo "Georgian:"
+tx pull -f -l ka
+
+echo "German:"
+tx pull -f -l de
+
+echo "Hindi:"
+tx pull -f -l hi
+
+echo "Esperanto:"
+tx pull -f -l eo
+
+echo "English (United Kingdom):"
+tx pull -f -l en_GB
+
+echo "Greek:"
+tx pull -f -l el
+
+echo "Spanish:"
+tx pull -f -l es
+
+echo "Spanish (Argentina):"
+tx pull -f -l es_AR
+
+echo "Basque:"
+tx pull -f -l eu
+
+echo "Persian:"
+tx pull -f -l fa
+
+echo "Finnish:"
+tx pull -f -l fi
+
+echo "French:"
+tx pull -f -l fr
+
+echo "Galician:"
+tx pull -f -l gl
+
+echo "Hebrew:"
+tx pull -f -l he
+
+echo "Hungarian:"
+tx pull -f -l hu_HU
+
+echo "Armenian:"
+tx pull -f -l hy
+
+echo "Indonesian (Indonesia):"
+tx pull -f -l id_ID
+
+echo "Igbo:"
+tx pull -f -l ig
+
+echo "Italian:"
+tx pull -f -l it
+
+echo "Japanese:"
+tx pull -f -l ja
+
+echo "Khmer:"
+tx pull -f -l km
+
+echo "Korean:"
+tx pull -f -l ko
+
+echo "Latvian (Latvia):"
+tx pull -f -l lv_LV
+
+echo "Macedonian:"
+tx pull -f -l mk
+
+echo "Mongolian (Mongolia):"
+tx pull -f -l mn_MN
+
+echo "Dutch:"
+tx pull -f -l nl
+
+echo "Norwegian:"
+tx pull -f -l no
+
+echo "Occitan:"
+tx pull -f -l oc
+
+echo "Polish:"
+tx pull -f -l pl
+
+echo "Portuguese:"
+tx pull -f -l pt
+
+echo "Portuguese (Brazil):"
+tx pull -f -l pt_BR
+
+echo "Romanian (Romania):"
+tx pull -f -l ro
+
+echo "Russian:"
+tx pull -f -l ru
+
+echo "Serbian:"
+tx pull -f -l sr
+
+echo "Swahili:"
+tx pull -f -l sw
+
+echo "Swedish:"
+tx pull -f -l sv
+
+echo "Tamil:"
+tx pull -f -l ta
+
+echo "Thai:"
+tx pull -f -l th
+
+echo "Turkish:"
+tx pull -f -l tr
+
+echo "Ukrainian:"
+tx pull -f -l uk
+
+echo "Vietnamese:"
+tx pull -f -l vi
+
+echo "Chinese (China):"
+tx pull -f -l zh_CN
+
+echo "Chinese (Taiwan)"
+tx pull -f -l zh_TW
+
+echo "Chinese (Hong Kong)"
+tx pull -f -l zh_HK
diff --git a/releases/translations/push-english-base-translation.sh b/releases/translations/push-english-base-translation.sh
new file mode 100755
index 00000000..1d29fd0d
--- /dev/null
+++ b/releases/translations/push-english-base-translation.sh
@@ -0,0 +1,2 @@
+cd ~/repos/wekan
+tx push -s
diff --git a/releases/translations/push-translation.sh b/releases/translations/push-translation.sh
new file mode 100755
index 00000000..fb92c723
--- /dev/null
+++ b/releases/translations/push-translation.sh
@@ -0,0 +1 @@
+tx push -t -l $1
diff --git a/releases/virtualbox/README.txt b/releases/virtualbox/README.txt
new file mode 100644
index 00000000..04beeba8
--- /dev/null
+++ b/releases/virtualbox/README.txt
@@ -0,0 +1,6 @@
+Wekan
+-----
+- NOTE: VirtualBox script use Wekan stable (master+devel branch). Edge scripts are at wekan-maintainer/releases/ directory.
+- Wekan is started at boot at /etc/rc.local
+- scripts are at ~/repos
+- this README.txt is at VirtualBox Ubuntu desktop
diff --git a/releases/virtualbox/etc-rc.local.txt b/releases/virtualbox/etc-rc.local.txt
new file mode 100644
index 00000000..7c951a8c
--- /dev/null
+++ b/releases/virtualbox/etc-rc.local.txt
@@ -0,0 +1,20 @@
+#!/bin/sh -e
+#
+# rc.local
+#
+# This script is executed at the end of each multiuser runlevel.
+# Make sure that the script will "exit 0" on success or any other
+# value on error.
+#
+# In order to enable or disable this script just change the execution
+# bits.
+#
+# By default this script does nothing.
+
+# node-allow-port-80.sh
+sudo setcap cap_net_bind_service=+ep /usr/local/bin/node
+
+# Start Wekan at boot at Ubuntu 14.04
+sudo -H -u wekan bash -c '/home/wekan/repos/wekan/releases/virtualbox/start-wekan.sh'
+
+exit 0
diff --git a/releases/virtualbox/ipaddress.sh b/releases/virtualbox/ipaddress.sh
new file mode 100755
index 00000000..0d79d43d
--- /dev/null
+++ b/releases/virtualbox/ipaddress.sh
@@ -0,0 +1,2 @@
+# ifdata -pa eth0
+ip address
diff --git a/releases/virtualbox/node-allow-port-80.sh b/releases/virtualbox/node-allow-port-80.sh
new file mode 100755
index 00000000..4f1861b6
--- /dev/null
+++ b/releases/virtualbox/node-allow-port-80.sh
@@ -0,0 +1 @@
+sudo setcap cap_net_bind_service=+ep /usr/local/bin/node
diff --git a/releases/virtualbox/old-rebuild-wekan.sh b/releases/virtualbox/old-rebuild-wekan.sh
new file mode 100755
index 00000000..a3941d55
--- /dev/null
+++ b/releases/virtualbox/old-rebuild-wekan.sh
@@ -0,0 +1,42 @@
+## Most of these are uncommented, because they are already installed.
+#sudo rm -rf /usr/local/lib/node_modules
+#sudo rm -rf ~/.npm
+#sudo apt install build-essential c++ capnproto npm git curl
+#sudo npm -g install n
+#sudo n 4.8.6
+#sudo npm -g install npm@4.6.1
+#sudo npm -g install node-gyp
+#sudo npm -g install node-pre-gyp
+#sudo npm -g install fibers@1.0.15
+sudo rm -rf wekan
+git clone https://github.com/wekan/wekan
+cd ~/repos
+#curl https://install.meteor.com -o ./install_meteor.sh
+#sed -i "s|RELEASE=.*|RELEASE=${METEOR_RELEASE}\"\"|g" ./install_meteor.sh
+#echo "Starting meteor ${METEOR_RELEASE} installation...   \n"
+#chown wekan:wekan ./install_meteor.sh 
+#sh ./install_meteor.sh
+mkdir -p ~/repos/wekan/packages
+cd ~/repos/wekan/packages
+rm -rf kadira-flow-router
+rm -rf meteor-useraccounts-core
+git clone https://github.com/wekan/flow-router.git kadira-flow-router
+git clone https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core
+sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/repos/wekan/packages/meteor-useraccounts-core/package.js
+cd ~/repos/wekan
+
+rm -rf node_modules
+npm install
+rm -rf .build
+meteor build .build --directory
+cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/packages/cfs_access-point.js
+sed -i "s|build\/Release\/bson|browser_build\/bson|g" ~/repos/wekan/.build/bundle/programs/server/npm/node_modules/meteor/cfs_gridfs/node_modules/mongodb/node_modules/bson/ext/index.js
+cd ~/repos/wekan/.build/bundle/programs/server/npm/node_modules/meteor/npm-bcrypt
+rm -rf node_modules/bcrypt
+meteor npm install --save bcrypt
+cd ~/repos/wekan/.build/bundle/programs/server
+rm -rf node_modules
+npm install
+meteor npm install --save bcrypt
+cd ~/repos
+echo Done.
diff --git a/releases/virtualbox/rebuild-wekan.sh b/releases/virtualbox/rebuild-wekan.sh
new file mode 100755
index 00000000..c1adaf78
--- /dev/null
+++ b/releases/virtualbox/rebuild-wekan.sh
@@ -0,0 +1,111 @@
+#!/bin/bash
+
+echo "Note: If you use other locale than en_US.UTF-8 , you need to additionally install en_US.UTF-8"
+echo "      with 'sudo dpkg-reconfigure locales' , so that MongoDB works correctly."
+echo "      You can still use any other locale as your main locale."
+
+function pause(){
+	read -p "$*"
+}
+
+echo
+PS3='Please enter your choice: '
+options=("Install Wekan dependencies" "Build Wekan" "Quit")
+select opt in "${options[@]}"
+do
+    case $opt in
+        "Install Wekan dependencies")
+
+		if [[ "$OSTYPE" == "linux-gnu" ]]; then
+	                echo "Linux";
+			echo "Ubuntu, Mint, Debian, or Debian on Windows Subsystem for Linux";
+                        sudo apt-get install -y build-essential git curl wget;
+			curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash -;
+		elif [[ "$OSTYPE" == "darwin"* ]]; then
+		        echo "macOS";
+			pause '1) Install XCode 2) Install Node 8.x from https://nodejs.org/en/ 3) Press [Enter] key to continue.'
+		elif [[ "$OSTYPE" == "cygwin" ]]; then
+		        # POSIX compatibility layer and Linux environment emulation for Windows
+		        echo "TODO: Add Cygwin";
+			exit;
+		elif [[ "$OSTYPE" == "msys" ]]; then
+		        # Lightweight shell and GNU utilities compiled for Windows (part of MinGW)
+		        echo "TODO: Add msys on Windows";
+			exit;
+		elif [[ "$OSTYPE" == "win32" ]]; then
+		        # I'm not sure this can happen.
+		        echo "TODO: Add Windows";
+			exit;
+		elif [[ "$OSTYPE" == "freebsd"* ]]; then
+		        echo "TODO: Add FreeBSD";
+			exit;
+		else
+		        echo "Unknown"
+			echo ${OSTYPE}
+			exit;
+		fi
+
+	        ## Latest npm with Meteor 1.6
+	        sudo npm -g install npm
+	        sudo npm -g install node-gyp
+	        # Latest fibers for Meteor 1.6
+	        sudo npm -g install fibers@2.0.0
+	        # Install Meteor, if it's not yet installed
+	        curl https://install.meteor.com | bash
+	        mkdir ~/repos
+	        cd ~/repos
+	        git clone https://github.com/wekan/wekan.git
+	        cd wekan
+	        git checkout devel
+		break
+		;;
+        "Build Wekan")
+		echo "Building Wekan."
+		cd ~/repos/wekan
+		## REPOS BELOW ARE INCLUDED TO WEKAN
+		#mkdir -p ~/repos/wekan/packages
+		#cd ~/repos/wekan/packages
+		#git clone --depth 1 -b master https://github.com/wekan/flow-router.git kadira-flow-router
+		#git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core
+		#git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git
+		#git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git
+		#git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git
+		#git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-oidc.git
+		#git clone --depth 1 -b master --recurse-submodules https://github.com/wekan/markdown.git
+                #mv meteor-accounts-oidc/packages/switch_accounts-oidc wekan_accounts-oidc
+                #mv meteor-accounts-oidc/packages/switch_oidc wekan_oidc
+                #rm -rf meteor-accounts-oidc
+		if [[ "$OSTYPE" == "darwin"* ]]; then
+			echo "sed at macOS";
+			sed -i '' 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/repos/wekan/packages/meteor-useraccounts-core/package.js
+		else
+			echo "sed at ${OSTYPE}"
+			sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/repos/wekan/packages/meteor-useraccounts-core/package.js
+		fi
+
+		cd ~/repos/wekan
+		rm -rf node_modules
+		meteor npm install
+		rm -rf .build
+		meteor build .build --directory
+		cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/packages/cfs_access-point.js
+		#Removed binary version of bcrypt because of security vulnerability that is not fixed yet.
+		#https://github.com/wekan/wekan/commit/4b2010213907c61b0e0482ab55abb06f6a668eac
+		#https://github.com/wekan/wekan/commit/7eeabf14be3c63fae2226e561ef8a0c1390c8d3c
+		#cd ~/repos/wekan/.build/bundle/programs/server/npm/node_modules/meteor/npm-bcrypt
+		#rm -rf node_modules/bcrypt
+		#meteor npm install bcrypt
+		cd ~/repos/wekan/.build/bundle/programs/server
+		rm -rf node_modules
+		meteor npm install
+		#meteor npm install bcrypt
+		cd ~/repos
+		echo Done.
+		break
+		;;
+        "Quit")
+		break
+            ;;
+        *) echo invalid option;;
+    esac
+done
diff --git a/releases/virtualbox/start-wekan.sh b/releases/virtualbox/start-wekan.sh
new file mode 100755
index 00000000..14a86dc3
--- /dev/null
+++ b/releases/virtualbox/start-wekan.sh
@@ -0,0 +1,291 @@
+# If you want to restart even on crash, uncomment while and done lines.
+
+#while true; do
+        cd ~/repos/wekan/.build/bundle
+        #---------------------------------------------
+        # Debug OIDC OAuth2 etc.
+        #export export DEBUG=true
+        #---------------------------------------------
+        export MONGO_URL='mongodb://127.0.0.1:27017/admin'
+        # ROOT_URL EXAMPLES FOR WEBSERVERS: https://github.com/wekan/wekan/wiki/Settings
+        # Production: https://example.com/wekan
+        # Local: http://localhost:3000
+        #export ipaddress=$(ifdata -pa eth0)
+        export ROOT_URL='http://localhost'
+        #---------------------------------------------
+        # Working email IS NOT REQUIRED to use Wekan.
+        # https://github.com/wekan/wekan/wiki/Adding-users
+        # https://github.com/wekan/wekan/wiki/Troubleshooting-Mail
+        # https://github.com/wekan/wekan-mongodb/blob/master/docker-compose.yml
+        export MAIL_URL='smtp://user:pass@mailserver.example.com:25/'
+        export MAIL_FROM='Wekan Support <support@example.com>'
+        # This is local port where Wekan Node.js runs, same as below on Caddyfile settings.
+        export PORT=80
+        #---------------------------------------------
+        # Wekan Export Board works when WITH_API='true'.
+        # If you disable Wekan API, Export Board does not work.
+        export WITH_API='true'
+        #---------------------------------------------------------------
+        # ==== PASSWORD BRUTE FORCE PROTECTION ====
+        #https://atmospherejs.com/lucasantoniassi/accounts-lockout
+        #Defaults below. Uncomment to change. wekan/server/accounts-lockout.js
+        #export ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE=3
+        #export ACCOUNTS_LOCKOUT_KNOWN_USERS_PERIOD=60
+        #export ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURE_WINDOW=15
+        #export ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURES_BERORE=3
+        #export ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD=60
+        #export ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW=15
+        #---------------------------------------------
+        # CORS: Set Access-Control-Allow-Origin header. Example: *
+        #export CORS=*
+        #---------------------------------------------
+        ## Optional: Integration with Matomo https://matomo.org that is installed to your server
+        ## The address of the server where Matomo is hosted:
+        ##export MATOMO_ADDRESS=https://example.com/matomo
+        #export MATOMO_ADDRESS=
+        ## The value of the site ID given in Matomo server for Wekan
+        # Example: export MATOMO_SITE_ID=123456789
+        #export MATOMO_SITE_ID=''
+        ## The option do not track which enables users to not be tracked by matomo"
+        #Example: export MATOMO_DO_NOT_TRACK=false
+        #export MATOMO_DO_NOT_TRACK=true
+        ## The option that allows matomo to retrieve the username:
+        # Example: export MATOMO_WITH_USERNAME=true
+        #export MATOMO_WITH_USERNAME='false'
+        # Enable browser policy and allow one trusted URL that can have iframe that has Wekan embedded inside.
+        # Setting this to false is not recommended, it also disables all other browser policy protections
+        # and allows all iframing etc. See wekan/server/policy.js
+        # Default value: true
+        export BROWSER_POLICY_ENABLED=true
+        # When browser policy is enabled, HTML code at this Trusted URL can have iframe that embeds Wekan inside.
+        # Example: export TRUSTED_URL=http://example.com
+        export TRUSTED_URL=''
+        # What to send to Outgoing Webhook, or leave out. Example, that includes all that are default: cardId,listId,oldListId,boardId,comment,user,card,commentId .
+        # Example: export WEBHOOKS_ATTRIBUTES=cardId,listId,oldListId,boardId,comment,user,card,commentId
+        export WEBHOOKS_ATTRIBUTES=''
+        #---------------------------------------------
+        # ==== OAUTH2 AZURE ====
+        # https://github.com/wekan/wekan/wiki/Azure
+        # 1) Register the application with Azure. Make sure you capture
+        #    the application ID as well as generate a secret key.
+        # 2) Configure the environment variables. This differs slightly
+        #     by installation type, but make sure you have the following:
+        #export OAUTH2_ENABLED=true
+        # OAuth2 login style: popup or redirect.
+        #export OAUTH2_LOGIN_STYLE=redirect
+        # Application GUID captured during app registration:
+        #export OAUTH2_CLIENT_ID=xxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxx
+        # Secret key generated during app registration:
+        #export OAUTH2_SECRET=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+        #export OAUTH2_SERVER_URL=https://login.microsoftonline.com/
+        #export OAUTH2_AUTH_ENDPOINT=/oauth2/v2.0/authorize
+        #export OAUTH2_USERINFO_ENDPOINT=https://graph.microsoft.com/oidc/userinfo
+        #export OAUTH2_TOKEN_ENDPOINT=/oauth2/v2.0/token
+        # The claim name you want to map to the unique ID field:
+        #export OAUTH2_ID_MAP=email
+        # The claim name you want to map to the username field:
+        #export OAUTH2_USERNAME_MAP=email
+        # The claim name you want to map to the full name field:
+        #export OAUTH2_FULLNAME_MAP=name
+        # Tthe claim name you want to map to the email field:
+        #export OAUTH2_EMAIL_MAP=email
+        #-----------------------------------------------------------------
+        # ==== OAUTH2 KEYCLOAK ====
+        # https://github.com/wekan/wekan/wiki/Keycloak  <== MAPPING INFO, REQUIRED
+        #export OAUTH2_ENABLED=true
+        # OAuth2 login style: popup or redirect.
+        #export OAUTH2_LOGIN_STYLE=redirect
+        #export OAUTH2_CLIENT_ID=<Keycloak create Client ID>
+        #export OAUTH2_SERVER_URL=<Keycloak server name>/auth
+        #export OAUTH2_AUTH_ENDPOINT=/realms/<keycloak realm>/protocol/openid-connect/auth
+        #export OAUTH2_USERINFO_ENDPOINT=/realms/<keycloak realm>/protocol/openid-connect/userinfo
+        #export OAUTH2_TOKEN_ENDPOINT=/realms/<keycloak realm>/protocol/openid-connect/token
+        #export OAUTH2_SECRET=<keycloak client secret>
+        #-----------------------------------------------------------------
+        # ==== OAUTH2 DOORKEEPER ====
+        # OAuth2 docs: https://github.com/wekan/wekan/wiki/OAuth2
+        # https://github.com/wekan/wekan/issues/1874
+        # https://github.com/wekan/wekan/wiki/OAuth2
+        # Enable the OAuth2 connection
+        #export OAUTH2_ENABLED=true
+        # OAuth2 login style: popup or redirect.
+        #export OAUTH2_LOGIN_STYLE=redirect
+        # OAuth2 Client ID.
+        #export OAUTH2_CLIENT_ID=abcde12345
+        # OAuth2 Secret.
+        #export OAUTH2_SECRET=54321abcde
+        # OAuth2 Server URL.
+        #export OAUTH2_SERVER_URL=https://chat.example.com
+        # OAuth2 Authorization Endpoint.
+        #export OAUTH2_AUTH_ENDPOINT=/oauth/authorize
+        # OAuth2 Userinfo Endpoint.
+        #export OAUTH2_USERINFO_ENDPOINT=/oauth/userinfo
+        # OAuth2 Token Endpoint.
+        #export OAUTH2_TOKEN_ENDPOINT=/oauth/token
+        # OAuth2 ID Mapping
+        #export OAUTH2_ID_MAP=
+        # OAuth2 Username Mapping
+        #export OAUTH2_USERNAME_MAP=
+        # OAuth2 Fullname Mapping
+        #export OAUTH2_FULLNAME_MAP=
+        # OAuth2 Email Mapping
+        #export OAUTH2_EMAIL_MAP=
+        #---------------------------------------------
+        # LDAP_ENABLE : Enable or not the connection by the LDAP
+        # example :  export LDAP_ENABLE=true
+        #export LDAP_ENABLE=false
+        # LDAP_PORT : The port of the LDAP server
+        # example :  export LDAP_PORT=389
+        #export LDAP_PORT=389
+        # LDAP_HOST : The host server for the LDAP server
+        # example :  export LDAP_HOST=localhost
+        #export LDAP_HOST=
+        # LDAP_BASEDN : The base DN for the LDAP Tree
+        # example :  export LDAP_BASEDN=ou=user,dc=example,dc=org
+        #export LDAP_BASEDN=
+        # LDAP_LOGIN_FALLBACK : Fallback on the default authentication method
+        # example :  export LDAP_LOGIN_FALLBACK=true
+        #export LDAP_LOGIN_FALLBACK=false
+        # LDAP_RECONNECT : Reconnect to the server if the connection is lost
+        # example :  export LDAP_RECONNECT=false
+        #export LDAP_RECONNECT=true
+        # LDAP_TIMEOUT : Overall timeout, in milliseconds
+        # example :  export LDAP_TIMEOUT=12345
+        #export LDAP_TIMEOUT=10000
+        # LDAP_IDLE_TIMEOUT : Specifies the timeout for idle LDAP connections in milliseconds
+        # example :  export LDAP_IDLE_TIMEOUT=12345
+        #export LDAP_IDLE_TIMEOUT=10000
+        # LDAP_CONNECT_TIMEOUT : Connection timeout, in milliseconds
+        # example :  export LDAP_CONNECT_TIMEOUT=12345
+        #export LDAP_CONNECT_TIMEOUT=10000
+        # LDAP_AUTHENTIFICATION : If the LDAP needs a user account to search
+        # example :  export LDAP_AUTHENTIFICATION=true
+        #export LDAP_AUTHENTIFICATION=false
+        # LDAP_AUTHENTIFICATION_USERDN : The search user DN
+        # example :  export LDAP_AUTHENTIFICATION_USERDN=cn=admin,dc=example,dc=org
+        #export LDAP_AUTHENTIFICATION_USERDN=
+        # LDAP_AUTHENTIFICATION_PASSWORD : The password for the search user
+        # example : AUTHENTIFICATION_PASSWORD=admin
+        #export LDAP_AUTHENTIFICATION_PASSWORD=
+        # LDAP_LOG_ENABLED : Enable logs for the module
+        # example :  export LDAP_LOG_ENABLED=true
+        #export LDAP_LOG_ENABLED=false
+        # LDAP_BACKGROUND_SYNC : If the sync of the users should be done in the background
+        # example :  export LDAP_BACKGROUND_SYNC=true
+        #export LDAP_BACKGROUND_SYNC=false
+        # LDAP_BACKGROUND_SYNC_INTERVAL : At which interval does the background task sync in milliseconds
+        # example :  export LDAP_BACKGROUND_SYNC_INTERVAL=12345
+        #export LDAP_BACKGROUND_SYNC_INTERVAL=100
+        # LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED :
+        # example :  export LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED=true
+        #export LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED=false
+        # LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS :
+        # example :  export LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=true
+        #export LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=false
+        # LDAP_ENCRYPTION : If using LDAPS
+        # example :  export LDAP_ENCRYPTION=ssl
+        #export LDAP_ENCRYPTION=false
+        # LDAP_CA_CERT : The certification for the LDAPS server. Certificate needs to be included in this docker-compose.yml file.
+        # example :  export LDAP_CA_CERT=-----BEGIN CERTIFICATE-----MIIE+zCCA+OgAwIBAgIkAhwR/6TVLmdRY6hHxvUFWc0+Enmu/Hu6cj+G2FIdAgIC...-----END CERTIFICATE-----
+        #export LDAP_CA_CERT=
+        # LDAP_REJECT_UNAUTHORIZED : Reject Unauthorized Certificate
+        # example :  export LDAP_REJECT_UNAUTHORIZED=true
+        #export LDAP_REJECT_UNAUTHORIZED=false
+        # LDAP_USER_SEARCH_FILTER : Optional extra LDAP filters. Don't forget the outmost enclosing parentheses if needed
+        # example :  export LDAP_USER_SEARCH_FILTER=
+        #export LDAP_USER_SEARCH_FILTER=
+        # LDAP_USER_SEARCH_SCOPE : base (search only in the provided DN), one (search only in the provided DN and one level deep), or sub (search the whole subtree)
+        # example :  export LDAP_USER_SEARCH_SCOPE=one
+        #export LDAP_USER_SEARCH_SCOPE=
+        # LDAP_USER_SEARCH_FIELD : Which field is used to find the user
+        # example :  export LDAP_USER_SEARCH_FIELD=uid
+        #export LDAP_USER_SEARCH_FIELD=
+        # LDAP_SEARCH_PAGE_SIZE : Used for pagination (0=unlimited)
+        # example :  export LDAP_SEARCH_PAGE_SIZE=12345
+        #export LDAP_SEARCH_PAGE_SIZE=0
+        # LDAP_SEARCH_SIZE_LIMIT : The limit number of entries (0=unlimited)
+        # example :  export LDAP_SEARCH_SIZE_LIMIT=12345
+        #export LDAP_SEARCH_SIZE_LIMIT=0
+        # LDAP_GROUP_FILTER_ENABLE : Enable group filtering
+        # example :  export LDAP_GROUP_FILTER_ENABLE=true
+        #export LDAP_GROUP_FILTER_ENABLE=false
+        # LDAP_GROUP_FILTER_OBJECTCLASS : The object class for filtering
+        # example :  export LDAP_GROUP_FILTER_OBJECTCLASS=group
+        #export LDAP_GROUP_FILTER_OBJECTCLASS=
+        # LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE :
+        # example :
+        #export LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE=
+        # LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE :
+        # example :
+        #export LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE=
+        # LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT :
+        # example :
+        #export LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT=
+        # LDAP_GROUP_FILTER_GROUP_NAME :
+        # example :
+        #export LDAP_GROUP_FILTER_GROUP_NAME=
+        # LDAP_UNIQUE_IDENTIFIER_FIELD : This field is sometimes class GUID (Globally Unique Identifier)
+        # example :  export LDAP_UNIQUE_IDENTIFIER_FIELD=guid
+        #export LDAP_UNIQUE_IDENTIFIER_FIELD=
+        # LDAP_UTF8_NAMES_SLUGIFY : Convert the username to utf8
+        # example :  export LDAP_UTF8_NAMES_SLUGIFY=false
+        #export LDAP_UTF8_NAMES_SLUGIFY=true
+        # LDAP_USERNAME_FIELD : Which field contains the ldap username
+        # example :  export LDAP_USERNAME_FIELD=username
+        #export LDAP_USERNAME_FIELD=
+        # LDAP_FULLNAME_FIELD : Which field contains the ldap fullname
+        # example :  export LDAP_FULLNAME_FIELD=fullname
+        #export LDAP_FULLNAME_FIELD=
+        # LDAP_MERGE_EXISTING_USERS :
+        # example :  export LDAP_MERGE_EXISTING_USERS=true
+        #export LDAP_MERGE_EXISTING_USERS=false
+        # LDAP_EMAIL_MATCH_ENABLE : allow existing account matching by e-mail address when username does not match
+        # example: LDAP_EMAIL_MATCH_ENABLE=true
+        #export LDAP_EMAIL_MATCH_ENABLE=false
+        # LDAP_EMAIL_MATCH_REQUIRE : require existing account matching by e-mail address when username does match
+        # example: LDAP_EMAIL_MATCH_REQUIRE=true
+        #export LDAP_EMAIL_MATCH_REQUIRE=false
+        # LDAP_EMAIL_MATCH_VERIFIED : require existing account email address to be verified for matching
+        # example: LDAP_EMAIL_MATCH_VERIFIED=true
+        #export LDAP_EMAIL_MATCH_VERIFIED=false
+        # LDAP_EMAIL_FIELD : which field contains the LDAP e-mail address
+        # example: LDAP_EMAIL_FIELD=mail
+        #export LDAP_EMAIL_FIELD=
+        # LDAP_SYNC_USER_DATA :
+        # example :  export LDAP_SYNC_USER_DATA=true
+        #export LDAP_SYNC_USER_DATA=false
+        # LDAP_SYNC_USER_DATA_FIELDMAP :
+        # example :  export LDAP_SYNC_USER_DATA_FIELDMAP={"cn":"name", "mail":"email"}
+        #export LDAP_SYNC_USER_DATA_FIELDMAP=
+        # LDAP_SYNC_GROUP_ROLES :
+        # example :
+        #export LDAP_SYNC_GROUP_ROLES=
+        # LDAP_DEFAULT_DOMAIN : The default domain of the ldap it is used to create email if the field is not map correctly with the LDAP_SYNC_USER_DATA_FIELDMAP
+        # example :
+        #export LDAP_DEFAULT_DOMAIN=
+        # Enable/Disable syncing of admin status based on ldap groups:
+        #export LDAP_SYNC_ADMIN_STATUS=true
+        # Comma separated list of admin group names.
+        #export LDAP_SYNC_ADMIN_GROUPS=group1,group2
+        #---------------------------------------------------------------------
+        # Login to LDAP automatically with HTTP header.
+        # In below example for siteminder, at right side of = is header name.
+        #export HEADER_LOGIN_ID=HEADERUID
+        #export HEADER_LOGIN_FIRSTNAME=HEADERFIRSTNAME
+        #export HEADER_LOGIN_LASTNAME=HEADERLASTNAME
+        #export HEADER_LOGIN_EMAIL=HEADEREMAILADDRESS
+        #---------------------------------------------------------------------
+        # LOGOUT_WITH_TIMER : Enables or not the option logout with timer
+        # example : LOGOUT_WITH_TIMER=true
+        #export LOGOUT_WITH_TIMER=
+        # LOGOUT_IN : The number of days
+        # example : LOGOUT_IN=1
+        #export LOGOUT_IN=
+        #export LOGOUT_ON_HOURS=
+        # LOGOUT_ON_MINUTES : The number of minutes
+        # example : LOGOUT_ON_MINUTES=55
+        #export LOGOUT_ON_MINUTES=
+
+        node main.js & >> ~/repos/wekan.log
+        cd ~/repos
+#done
diff --git a/releases/virtualbox/stop-wekan.sh b/releases/virtualbox/stop-wekan.sh
new file mode 100755
index 00000000..a7adf03b
--- /dev/null
+++ b/releases/virtualbox/stop-wekan.sh
@@ -0,0 +1 @@
+pkill -f "node main.js"
diff --git a/releases/wekan-snap-help.sh b/releases/wekan-snap-help.sh
new file mode 100755
index 00000000..cbeb7426
--- /dev/null
+++ b/releases/wekan-snap-help.sh
@@ -0,0 +1 @@
+wekan.help | less
diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp
index 12a001c2..fc5393d0 100644
--- a/sandstorm-pkgdef.capnp
+++ b/sandstorm-pkgdef.capnp
@@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = (
     appTitle = (defaultText = "Wekan"),
     # The name of the app as it is displayed to the user.
 
-    appVersion = 79,
+    appVersion = 268,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "0.94.0~2018-05-03"),
+    appMarketingVersion = (defaultText = "2.66.0~2019-05-09"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,
@@ -226,7 +226,7 @@ const pkgdef :Spk.PackageDefinition = (
         verbPhrase = (defaultText = "removed from card"),
       ), ],
     ),
-
+    apiPath = "/",
     saveIdentityCaps = true,
   ),
 );
@@ -237,6 +237,22 @@ const myCommand :Spk.Manifest.Command = (
   environ = [
     # Note that this defines the *entire* environment seen by your app.
     (key = "PATH", value = "/usr/local/bin:/usr/bin:/bin"),
+    (key = "WITH_API", value = "true"),
+    (key = "MATOMO_ADDRESS", value=""),
+    (key = "MATOMO_SITE_ID", value=""),
+    (key = "MATOMO_DO_NOT_TRACK", value="true"),
+    (key = "MATOMO_WITH_USERNAME", value="false"),
+    (key = "BROWSER_POLICY_ENABLED", value="true"),
+    (key = "TRUSTED_URL", value=""),
+    (key = "WEBHOOKS_ATTRIBUTES", value=""),
+    (key = "OAUTH2_ENABLED", value=""),
+    (key = "OAUTH2_CLIENT_ID", value="false"),
+    (key = "OAUTH2_SECRET", value=""),
+    (key = "OAUTH2_SERVER_URL", value=""),
+    (key = "OAUTH2_AUTH_ENDPOINT", value=""),
+    (key = "OAUTH2_USERINFO_ENDPOINT", value=""),
+    (key = "OAUTH2_TOKEN_ENDPOINT", value=""),
+    (key = "LDAP_ENABLE", value="false"),
     (key = "SANDSTORM", value = "1"),
     (key = "METEOR_SETTINGS", value = "{\"public\": {\"sandstorm\": true}}")
   ]
diff --git a/sandstorm.js b/sandstorm.js
index 3ea85fef..de003a6f 100644
--- a/sandstorm.js
+++ b/sandstorm.js
@@ -75,7 +75,7 @@ if (isSandstorm && Meteor.isServer) {
         session.claimRequest(token).then((response) => {
           const identity = response.cap.castAs(Identity.Identity);
           const promises = [api.getIdentityId(identity), identity.getProfile(),
-                            httpBridge.saveIdentity(identity)];
+            httpBridge.saveIdentity(identity)];
           return Promise.all(promises).then((responses) => {
             const identityId = responses[0].id.toString('hex').slice(0, 32);
             const profile = responses[1].profile;
@@ -115,9 +115,9 @@ if (isSandstorm && Meteor.isServer) {
           const identity = response.identity;
           return identity.getProfile().then(() => {
             return { identity,
-                     mentioned: !!user.mentioned,
-                     subscribed: !!user.subscribed,
-                   };
+              mentioned: !!user.mentioned,
+              subscribed: !!user.subscribed,
+            };
           });
         }).catch(() => {
           // Ignore identities that fail to restore. Either they were added before we set
@@ -132,7 +132,7 @@ if (isSandstorm && Meteor.isServer) {
 
         return session.activity(event);
       }).then(() => done(),
-              (e) => done(e));
+        (e) => done(e));
     })();
   }
 
@@ -208,7 +208,8 @@ if (isSandstorm && Meteor.isServer) {
     const isActive = permissions.indexOf('participate') > -1;
     const isAdmin = permissions.indexOf('configure') > -1;
     const isCommentOnly = false;
-    const permissionDoc = { userId, isActive, isAdmin, isCommentOnly };
+    const isNoComments = false;
+    const permissionDoc = { userId, isActive, isAdmin, isNoComments, isCommentOnly };
 
     const boardMembers = Boards.findOne(sandstormBoard._id).members;
     const memberIndex = _.pluck(boardMembers, 'userId').indexOf(userId);
@@ -434,12 +435,12 @@ if (isSandstorm && Meteor.isClient) {
   //
   // XXX Hack. The home route is already defined at this point so we need to
   // add the redirection trigger to the internal route object.
-  FlowRouter._routesMap.home._triggersEnter.push((context, redirect) => {
-    redirect(FlowRouter.path('board', {
-      id: sandstormBoard._id,
-      slug: sandstormBoard.slug,
-    }));
-  });
+  //FlowRouter._routesMap.home._triggersEnter.push((context, redirect) => {
+  //  redirect(FlowRouter.path('board', {
+  //    id: sandstormBoard._id,
+  //    slug: sandstormBoard.slug,
+  //  }));
+  //});
 
   // XXX Hack. `Meteor.absoluteUrl` doesn't work in Sandstorm, since every
   // session has a different URL whereas Meteor computes absoluteUrl based on
@@ -456,9 +457,9 @@ if (isSandstorm && Meteor.isClient) {
   // XXX Hack to fix https://github.com/wefork/wekan/issues/27
   // Sandstorm Wekan instances only ever have a single board, so there is no need
   // to cache per-board subscriptions.
-  SubsManager.prototype.subscribe = function(...params) {
-    return Meteor.subscribe(...params);
-  };
+  //SubsManager.prototype.subscribe = function(...params) {
+  //  return Meteor.subscribe(...params);
+  //};
 }
 
 // We use this blaze helper in the UI to hide some templates that does not make
diff --git a/scalingo.json b/scalingo.json
index 57acbacc..78601a45 100644
--- a/scalingo.json
+++ b/scalingo.json
@@ -1,8 +1,8 @@
 {
   "name": "wekan",
-  "description": "The open-source Trello-like kanban (build with Meteor)",
+  "description": "The open-source kanban (built with Meteor)",
   "repository": "https://github.com/wekan/wekan/",
   "logo": "https://raw.githubusercontent.com/wekan/wekan/master/meta/icons/wekan-150.png",
-  "website": "https://wekan.io",
+  "website": "https://wekan.github.io",
   "addons": ["scalingo-mongodb"]
 }
diff --git a/server/accounts-lockout.js b/server/accounts-lockout.js
new file mode 100644
index 00000000..a9b9e311
--- /dev/null
+++ b/server/accounts-lockout.js
@@ -0,0 +1,16 @@
+// https://atmospherejs.com/lucasantoniassi/accounts-lockout
+// server
+import { AccountsLockout } from 'meteor/lucasantoniassi:accounts-lockout';
+
+(new AccountsLockout({
+  knownUsers: {
+    failuresBeforeLockout: process.env.ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE || 3,
+    lockoutPeriod: process.env.ACCOUNTS_LOCKOUT_KNOWN_USERS_PERIOD || 60,
+    failureWindow: process.env.ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURE_WINDOW || 15,
+  },
+  unknownUsers: {
+    failuresBeforeLockout: process.env.ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURES_BERORE || 3,
+    lockoutPeriod: process.env.ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD || 60,
+    failureWindow: process.env.ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW || 15,
+  },
+})).startup();
diff --git a/server/authentication.js b/server/authentication.js
index 8059f176..5ca45b68 100644
--- a/server/authentication.js
+++ b/server/authentication.js
@@ -62,5 +62,27 @@ Meteor.startup(() => {
     Authentication.checkAdminOrCondition(userId, normalAccess);
   };
 
+  if (Meteor.isServer) {
+    if(process.env.OAUTH2_CLIENT_ID !== '') {
+
+      ServiceConfiguration.configurations.upsert( // eslint-disable-line no-undef
+        { service: 'oidc' },
+        {
+          $set: {
+            loginStyle: process.env.OAUTH2_LOGIN_STYLE,
+            clientId: process.env.OAUTH2_CLIENT_ID,
+            secret: process.env.OAUTH2_SECRET,
+            serverUrl: process.env.OAUTH2_SERVER_URL,
+            authorizationEndpoint: process.env.OAUTH2_AUTH_ENDPOINT,
+            userinfoEndpoint: process.env.OAUTH2_USERINFO_ENDPOINT,
+            tokenEndpoint: process.env.OAUTH2_TOKEN_ENDPOINT,
+            idTokenWhitelistFields: [],
+            requestPermissions: ['openid'],
+          },
+        }
+      );
+    }
+  }
+
 });
 
diff --git a/server/cors.js b/server/cors.js
new file mode 100644
index 00000000..80369a83
--- /dev/null
+++ b/server/cors.js
@@ -0,0 +1,11 @@
+Meteor.startup(() => {
+
+  if ( process.env.CORS ) {
+    // Listen to incoming HTTP requests, can only be used on the server
+    WebApp.rawConnectHandlers.use(function(req, res, next) {
+      res.setHeader('Access-Control-Allow-Origin', process.env.CORS);
+      return next();
+    });
+  }
+
+});
diff --git a/server/header-login.js b/server/header-login.js
new file mode 100644
index 00000000..51144c2d
--- /dev/null
+++ b/server/header-login.js
@@ -0,0 +1,10 @@
+Meteor.startup(() => {
+
+  if ( process.env.HEADER_LOGIN_ID ) {
+    Meteor.settings.public.headerLoginId = process.env.HEADER_LOGIN_ID;
+    Meteor.settings.public.headerLoginEmail = process.env.HEADER_LOGIN_EMAIL;
+    Meteor.settings.public.headerLoginFirstname = process.env.HEADER_LOGIN_FIRSTNAME;
+    Meteor.settings.public.headerLoginLastname = process.env.HEADER_LOGIN_LASTNAME;
+  }
+
+});
diff --git a/server/lib/utils.js b/server/lib/utils.js
index c7763933..3b4412fe 100644
--- a/server/lib/utils.js
+++ b/server/lib/utils.js
@@ -6,10 +6,20 @@ allowIsBoardMember = function(userId, board) {
   return board && board.hasMember(userId);
 };
 
-allowIsBoardMemberNonComment = function(userId, board) {
+allowIsAnyBoardMember = function(userId, boards) {
+  return _.some(boards, (board) => {
+    return board && board.hasMember(userId);
+  });
+};
+
+allowIsBoardMemberCommentOnly = function(userId, board) {
   return board && board.hasMember(userId) && !board.hasCommentOnly(userId);
 };
 
+allowIsBoardMemberNoComments = function(userId, board) {
+  return board && board.hasMember(userId) && !board.hasNoComments(userId);
+};
+
 allowIsBoardMemberByCard = function(userId, card) {
   const board = card.board();
   return board && board.hasMember(userId);
diff --git a/server/migrations.js b/server/migrations.js
index 684a8bbe..09852495 100644
--- a/server/migrations.js
+++ b/server/migrations.js
@@ -140,7 +140,7 @@ Migrations.add('add-sort-checklists', () => {
         noValidate
       );
     }
-    checklist.items.find().forEach((item, index) => {
+    checklist.items.forEach((item, index) => {
       if (!item.hasOwnProperty('sort')) {
         Checklists.direct.update(
           { _id: checklist._id, 'items._id': item._id },
@@ -154,22 +154,13 @@ Migrations.add('add-sort-checklists', () => {
 
 Migrations.add('add-swimlanes', () => {
   Boards.find().forEach((board) => {
-    const swimlane = Swimlanes.findOne({ boardId: board._id });
-    let swimlaneId = '';
-    if (swimlane)
-      swimlaneId = swimlane._id;
-    else
-      swimlaneId = Swimlanes.direct.insert({
-        boardId: board._id,
-        title: 'Default',
-      });
-
+    const swimlaneId = board.getDefaultSwimline()._id;
     Cards.find({ boardId: board._id }).forEach((card) => {
       if (!card.hasOwnProperty('swimlaneId')) {
         Cards.direct.update(
-            { _id: card._id },
-            { $set: { swimlaneId } },
-            noValidate
+          { _id: card._id },
+          { $set: { swimlaneId } },
+          noValidate
         );
       }
     });
@@ -180,9 +171,9 @@ Migrations.add('add-views', () => {
   Boards.find().forEach((board) => {
     if (!board.hasOwnProperty('view')) {
       Boards.direct.update(
-          { _id: board._id },
-          { $set: { view: 'board-view-swimlanes' } },
-          noValidate
+        { _id: board._id },
+        { $set: { view: 'board-view-swimlanes' } },
+        noValidate
       );
     }
   });
@@ -193,7 +184,7 @@ Migrations.add('add-checklist-items', () => {
     // Create new items
     _.sortBy(checklist.items, 'sort').forEach((item, index) => {
       ChecklistItems.direct.insert({
-        title: item.title,
+        title: (item.title ? item.title : 'Checklist'),
         sort: index,
         isFinished: item.isFinished,
         checklistId: checklist._id,
@@ -211,11 +202,339 @@ Migrations.add('add-checklist-items', () => {
 
 Migrations.add('add-profile-view', () => {
   Users.find().forEach((user) => {
-    // Set default view
-    Users.direct.update(
-      { _id: user._id },
-      { $set: { 'profile.boardView': 'board-view-lists' } },
+    if (!user.hasOwnProperty('profile.boardView')) {
+      // Set default view
+      Users.direct.update(
+        { _id: user._id },
+        { $set: { 'profile.boardView': 'board-view-lists' } },
+        noValidate
+      );
+    }
+  });
+});
+
+Migrations.add('add-card-types', () => {
+  Cards.find().forEach((card) => {
+    Cards.direct.update(
+      { _id: card._id },
+      { $set: {
+        type: 'cardType-card',
+        linkedId: null } },
       noValidate
     );
   });
 });
+
+Migrations.add('add-custom-fields-to-cards', () => {
+  Cards.update({
+    customFields: {
+      $exists: false,
+    },
+  }, {
+    $set: {
+      customFields:[],
+    },
+  }, noValidateMulti);
+});
+
+Migrations.add('add-requester-field', () => {
+  Cards.update({
+    requestedBy: {
+      $exists: false,
+    },
+  }, {
+    $set: {
+      requestedBy:'',
+    },
+  }, noValidateMulti);
+});
+
+Migrations.add('add-assigner-field', () => {
+  Cards.update({
+    assignedBy: {
+      $exists: false,
+    },
+  }, {
+    $set: {
+      assignedBy:'',
+    },
+  }, noValidateMulti);
+});
+
+Migrations.add('add-parent-field-to-cards', () => {
+  Cards.update({
+    parentId: {
+      $exists: false,
+    },
+  }, {
+    $set: {
+      parentId:'',
+    },
+  }, noValidateMulti);
+});
+
+Migrations.add('add-subtasks-boards', () => {
+  Boards.update({
+    subtasksDefaultBoardId: {
+      $exists: false,
+    },
+  }, {
+    $set: {
+      subtasksDefaultBoardId: null,
+      subtasksDefaultListId: null,
+    },
+  }, noValidateMulti);
+});
+
+Migrations.add('add-subtasks-sort', () => {
+  Boards.update({
+    subtaskSort: {
+      $exists: false,
+    },
+  }, {
+    $set: {
+      subtaskSort: -1,
+    },
+  }, noValidateMulti);
+});
+
+Migrations.add('add-subtasks-allowed', () => {
+  Boards.update({
+    allowsSubtasks: {
+      $exists: false,
+    },
+  }, {
+    $set: {
+      allowsSubtasks: true,
+    },
+  }, noValidateMulti);
+});
+
+Migrations.add('add-subtasks-allowed', () => {
+  Boards.update({
+    presentParentTask: {
+      $exists: false,
+    },
+  }, {
+    $set: {
+      presentParentTask: 'no-parent',
+    },
+  }, noValidateMulti);
+});
+
+Migrations.add('add-authenticationMethod', () => {
+  Users.update({
+    'authenticationMethod': {
+      $exists: false,
+    },
+  }, {
+    $set: {
+      'authenticationMethod': 'password',
+    },
+  }, noValidateMulti);
+});
+
+Migrations.add('remove-tag', () => {
+  Users.update({
+  }, {
+    $unset: {
+      'profile.tags':1,
+    },
+  }, noValidateMulti);
+});
+
+Migrations.add('remove-customFields-references-broken', () => {
+  Cards.update({'customFields.$value': null},
+    { $pull: {
+      customFields: {value: null},
+    },
+    }, noValidateMulti);
+});
+
+Migrations.add('add-product-name', () => {
+  Settings.update({
+    productName: {
+      $exists: false,
+    },
+  }, {
+    $set: {
+      productName:'',
+    },
+  }, noValidateMulti);
+});
+
+Migrations.add('add-hide-logo', () => {
+  Settings.update({
+    hideLogo: {
+      $exists: false,
+    },
+  }, {
+    $set: {
+      hideLogo: false,
+    },
+  }, noValidateMulti);
+});
+
+Migrations.add('add-custom-html-after-body-start', () => {
+  Settings.update({
+    customHTMLafterBodyStart: {
+      $exists: false,
+    },
+  }, {
+    $set: {
+      customHTMLafterBodyStart:'',
+    },
+  }, noValidateMulti);
+});
+
+Migrations.add('add-custom-html-before-body-end', () => {
+  Settings.update({
+    customHTMLbeforeBodyEnd: {
+      $exists: false,
+    },
+  }, {
+    $set: {
+      customHTMLbeforeBodyEnd:'',
+    },
+  }, noValidateMulti);
+});
+
+Migrations.add('add-displayAuthenticationMethod', () => {
+  Settings.update({
+    displayAuthenticationMethod: {
+      $exists: false,
+    },
+  }, {
+    $set: {
+      displayAuthenticationMethod: true,
+    },
+  }, noValidateMulti);
+});
+
+Migrations.add('add-defaultAuthenticationMethod', () => {
+  Settings.update({
+    defaultAuthenticationMethod: {
+      $exists: false,
+    },
+  }, {
+    $set: {
+      defaultAuthenticationMethod: 'password',
+    },
+  }, noValidateMulti);
+});
+
+Migrations.add('add-templates', () => {
+  Boards.update({
+    type: {
+      $exists: false,
+    },
+  }, {
+    $set: {
+      type: 'board',
+    },
+  }, noValidateMulti);
+  Swimlanes.update({
+    type: {
+      $exists: false,
+    },
+  }, {
+    $set: {
+      type: 'swimlane',
+    },
+  }, noValidateMulti);
+  Lists.update({
+    type: {
+      $exists: false,
+    },
+    swimlaneId: {
+      $exists: false,
+    },
+  }, {
+    $set: {
+      type: 'list',
+      swimlaneId: '',
+    },
+  }, noValidateMulti);
+  Users.find({
+    'profile.templatesBoardId': {
+      $exists: false,
+    },
+  }).forEach((user) => {
+    // Create board and swimlanes
+    Boards.insert({
+      title: TAPi18n.__('templates'),
+      permission: 'private',
+      type: 'template-container',
+      members: [
+        {
+          userId: user._id,
+          isAdmin: true,
+          isActive: true,
+          isNoComments: false,
+          isCommentOnly: false,
+        },
+      ],
+    }, (err, boardId) => {
+
+      // Insert the reference to our templates board
+      Users.update(user._id, {$set: {'profile.templatesBoardId': boardId}});
+
+      // Insert the card templates swimlane
+      Swimlanes.insert({
+        title: TAPi18n.__('card-templates-swimlane'),
+        boardId,
+        sort: 1,
+        type: 'template-container',
+      }, (err, swimlaneId) => {
+
+        // Insert the reference to out card templates swimlane
+        Users.update(user._id, {$set: {'profile.cardTemplatesSwimlaneId': swimlaneId}});
+      });
+
+      // Insert the list templates swimlane
+      Swimlanes.insert({
+        title: TAPi18n.__('list-templates-swimlane'),
+        boardId,
+        sort: 2,
+        type: 'template-container',
+      }, (err, swimlaneId) => {
+
+        // Insert the reference to out list templates swimlane
+        Users.update(user._id, {$set: {'profile.listTemplatesSwimlaneId': swimlaneId}});
+      });
+
+      // Insert the board templates swimlane
+      Swimlanes.insert({
+        title: TAPi18n.__('board-templates-swimlane'),
+        boardId,
+        sort: 3,
+        type: 'template-container',
+      }, (err, swimlaneId) => {
+
+        // Insert the reference to out board templates swimlane
+        Users.update(user._id, {$set: {'profile.boardTemplatesSwimlaneId': swimlaneId}});
+      });
+    });
+  });
+});
+
+Migrations.add('fix-circular-reference_', () => {
+  Cards.find().forEach((card) => {
+    if (card.parentId === card._id) {
+      Cards.update(card._id, {$set: {parentId: ''}}, noValidateMulti);
+    }
+  });
+});
+
+Migrations.add('mutate-boardIds-in-customfields', () => {
+  CustomFields.find().forEach((cf) => {
+    CustomFields.update(cf, {
+      $set: {
+        boardIds: [cf.boardId],
+      },
+      $unset: {
+        boardId: '',
+      },
+    }, noValidateMulti);
+  });
+});
diff --git a/server/notifications/email.js b/server/notifications/email.js
index 2af6381e..857c5d70 100644
--- a/server/notifications/email.js
+++ b/server/notifications/email.js
@@ -36,6 +36,8 @@ Meteor.startup(() => {
       } catch (e) {
         return;
       }
-    }, 30000);
+    }, process.env.EMAIL_NOTIFICATION_TIMEOUT || 30000);
   });
 });
+
+
diff --git a/server/notifications/notifications.js b/server/notifications/notifications.js
index bc5557e1..fa8b2ee2 100644
--- a/server/notifications/notifications.js
+++ b/server/notifications/notifications.js
@@ -19,24 +19,13 @@ Notifications = {
       delete notifyServices[serviceName];
   },
 
-  // filter recipients according to user settings for notification
-  getUsers: (participants, watchers) => {
-    const userMap = {};
-    participants.forEach((userId) => {
-      if (userMap[userId]) return;
-      const user = Users.findOne(userId);
-      if (user && user.hasTag('notify-participate')) {
-        userMap[userId] = user;
-      }
-    });
+  getUsers: (watchers) => {
+    const users = [];
     watchers.forEach((userId) => {
-      if (userMap[userId]) return;
       const user = Users.findOne(userId);
-      if (user && user.hasTag('notify-watch')) {
-        userMap[userId] = user;
-      }
+      if (user) users.push(user);
     });
-    return _.map(userMap, (v) => v);
+    return users;
   },
 
   notify: (user, title, description, params) => {
diff --git a/server/notifications/outgoing.js b/server/notifications/outgoing.js
index 779d41a0..30744555 100644
--- a/server/notifications/outgoing.js
+++ b/server/notifications/outgoing.js
@@ -8,18 +8,21 @@ const postCatchError = Meteor.wrapAsync((url, options, resolve) => {
   });
 });
 
+const webhooksAtbts = ( (process.env.WEBHOOKS_ATTRIBUTES && process.env.WEBHOOKS_ATTRIBUTES.split(',') ) || ['cardId', 'listId', 'oldListId', 'boardId', 'comment', 'user', 'card', 'commentId', 'swimlaneId']);
+
 Meteor.methods({
   outgoingWebhooks(integrations, description, params) {
     check(integrations, Array);
     check(description, String);
     check(params, Object);
 
+    // label activity did not work yet, see wekan/models/activities.js
     const quoteParams = _.clone(params);
-    ['card', 'list', 'oldList', 'board', 'comment'].forEach((key) => {
+    ['card', 'list', 'oldList', 'board', 'oldBoard', 'comment', 'checklist', 'swimlane', 'oldSwimlane', 'label'].forEach((key) => {
       if (quoteParams[key]) quoteParams[key] = `"${params[key]}"`;
     });
 
-    const userId = (params.userId)?params.userId:integrations[0].userId;
+    const userId = (params.userId) ? params.userId : integrations[0].userId;
     const user = Users.findOne(userId);
     const text = `${params.user} ${TAPi18n.__(description, quoteParams, user.getLanguage())}\n${params.url}`;
 
@@ -29,10 +32,7 @@ Meteor.methods({
       text: `${text}`,
     };
 
-    [   'cardId', 'listId', 'oldListId',
-      'boardId', 'comment', 'user',
-      'card', 'commentId',
-    ].forEach((key) => {
+    webhooksAtbts.forEach((key) => {
       if (params[key]) value[key] = params[key];
     });
     value.description = description;
diff --git a/server/policy.js b/server/policy.js
new file mode 100644
index 00000000..02a42cd4
--- /dev/null
+++ b/server/policy.js
@@ -0,0 +1,34 @@
+import { BrowserPolicy } from 'meteor/browser-policy-common';
+
+Meteor.startup(() => {
+
+  if ( process.env.BROWSER_POLICY_ENABLED === 'true' ) {
+    // Trusted URL that can embed Wekan in iFrame.
+    const trusted = process.env.TRUSTED_URL;
+    BrowserPolicy.framing.disallow();
+    //Allow inline scripts, otherwise there is errors in browser/inspect/console
+    //BrowserPolicy.content.disallowInlineScripts();
+    //BrowserPolicy.content.disallowEval();
+    //BrowserPolicy.content.allowInlineStyles();
+    //BrowserPolicy.content.allowFontDataUrl();
+    BrowserPolicy.framing.restrictToOrigin(trusted);
+    //BrowserPolicy.content.allowScriptOrigin(trusted);
+  }
+  else {
+    // Disable browser policy and allow all framing and including.
+    // Use only at internal LAN, not at Internet.
+    BrowserPolicy.framing.allowAll();
+    //BrowserPolicy.content.allowDataUrlForAll();
+  }
+
+  // Allow all images from anywhere
+  //BrowserPolicy.content.allowImageOrigin('*');
+
+  // If Matomo URL is set, allow it.
+  const matomoUrl = process.env.MATOMO_ADDRESS;
+  if (matomoUrl){
+    //BrowserPolicy.content.allowScriptOrigin(matomoUrl);
+    //BrowserPolicy.content.allowImageOrigin(matomoUrl);
+  }
+
+});
diff --git a/server/publications/boards.js b/server/publications/boards.js
index 17d87f3a..52940739 100644
--- a/server/publications/boards.js
+++ b/server/publications/boards.js
@@ -10,7 +10,7 @@ Meteor.publish('boards', function() {
 
   // Defensive programming to verify that starredBoards has the expected
   // format -- since the field is in the `profile` a user can modify it.
-  const {starredBoards = []} = Users.findOne(this.userId).profile;
+  const {starredBoards = []} = Users.findOne(this.userId).profile || {};
   check(starredBoards, [String]);
 
   return Boards.find({
@@ -32,6 +32,7 @@ Meteor.publish('boards', function() {
       color: 1,
       members: 1,
       permission: 1,
+      type: 1,
     },
   });
 });
@@ -59,6 +60,7 @@ Meteor.publish('archivedBoards', function() {
 });
 
 Meteor.publishRelations('board', function(boardId) {
+  this.unblock();
   check(boardId, String);
   const thisUserId = this.userId;
 
@@ -71,10 +73,12 @@ Meteor.publishRelations('board', function(boardId) {
       { permission: 'public' },
       { members: { $elemMatch: { userId: this.userId, isActive: true }}},
     ],
-  }, { limit: 1 }), function(boardId, board) {
+  // Sort required to ensure oplog usage
+  }, { limit: 1, sort: { _id: 1 } }), function(boardId, board) {
     this.cursor(Lists.find({ boardId }));
     this.cursor(Swimlanes.find({ boardId }));
     this.cursor(Integrations.find({ boardId }));
+    this.cursor(CustomFields.find({ boardIds: {$in: [boardId]} }, { sort: { name: 1 } }));
 
     // Cards and cards comments
     // XXX Originally we were publishing the card documents as a child of the
@@ -97,13 +101,48 @@ Meteor.publishRelations('board', function(boardId) {
     //
     // And in the meantime our code below works pretty well -- it's not even a
     // hack!
-    this.cursor(Cards.find({ boardId }), function(cardId) {
-      this.cursor(CardComments.find({ cardId }));
-      this.cursor(Attachments.find({ cardId }));
-      this.cursor(Checklists.find({ cardId }));
-      this.cursor(ChecklistItems.find({ cardId }));
+
+    // Gather queries and send in bulk
+    const cardComments = this.join(CardComments);
+    cardComments.selector = (_ids) => ({ cardId: _ids });
+    const attachments = this.join(Attachments);
+    attachments.selector = (_ids) => ({ cardId: _ids });
+    const checklists = this.join(Checklists);
+    checklists.selector = (_ids) => ({ cardId: _ids });
+    const checklistItems = this.join(ChecklistItems);
+    checklistItems.selector = (_ids) => ({ cardId: _ids });
+    const parentCards = this.join(Cards);
+    parentCards.selector = (_ids) => ({ parentId: _ids });
+    const boards = this.join(Boards);
+    const subCards = this.join(Cards);
+
+    this.cursor(Cards.find({ boardId: {$in: [boardId,  board.subtasksDefaultBoardId]}}), function(cardId, card) {
+      if (card.type === 'cardType-linkedCard') {
+        const impCardId = card.linkedId;
+        subCards.push(impCardId);
+        cardComments.push(impCardId);
+        attachments.push(impCardId);
+        checklists.push(impCardId);
+        checklistItems.push(impCardId);
+      } else if (card.type === 'cardType-linkedBoard') {
+        boards.push(card.linkedId);
+      }
+      cardComments.push(cardId);
+      attachments.push(cardId);
+      checklists.push(cardId);
+      checklistItems.push(cardId);
+      parentCards.push(cardId);
     });
 
+    // Send bulk queries for all found ids
+    subCards.send();
+    cardComments.send();
+    attachments.send();
+    checklists.send();
+    checklistItems.send();
+    boards.send();
+    parentCards.send();
+
     if (board.members) {
       // Board members. This publication also includes former board members that
       // aren't members anymore but may have some activities attached to them in
diff --git a/server/publications/customFields.js b/server/publications/customFields.js
new file mode 100644
index 00000000..25dada59
--- /dev/null
+++ b/server/publications/customFields.js
@@ -0,0 +1,3 @@
+Meteor.publish('customFields', function() {
+  return CustomFields.find();
+});
diff --git a/server/publications/fast-render.js b/server/publications/fast-render.js
index e28b6f2e..7c54c686 100644
--- a/server/publications/fast-render.js
+++ b/server/publications/fast-render.js
@@ -1,3 +1,5 @@
+import { FastRender } from 'meteor/staringatlights:fast-render';
+
 FastRender.onAllRoutes(function() {
   this.subscribe('boards');
 });
diff --git a/server/publications/people.js b/server/publications/people.js
index f3c2bdfe..56187732 100644
--- a/server/publications/people.js
+++ b/server/publications/people.js
@@ -1,7 +1,26 @@
-Meteor.publish('people', (limit) => {
+Meteor.publish('people', function(limit) {
   check(limit, Number);
-  return Users.find({}, {
-    limit,
-    sort: {createdAt: -1},
-  });
+
+  if (!Match.test(this.userId, String)) {
+    return [];
+  }
+
+  const user = Users.findOne(this.userId);
+  if (user && user.isAdmin) {
+    return Users.find({}, {
+      limit,
+      sort: {createdAt: -1},
+      fields: {
+        'username': 1,
+        'profile.fullname': 1,
+        'isAdmin': 1,
+        'emails': 1,
+        'createdAt': 1,
+        'loginDisabled': 1,
+        'authenticationMethod': 1,
+      },
+    });
+  } else {
+    return [];
+  }
 });
diff --git a/server/publications/rules.js b/server/publications/rules.js
new file mode 100644
index 00000000..d0864893
--- /dev/null
+++ b/server/publications/rules.js
@@ -0,0 +1,18 @@
+Meteor.publish('rules', (ruleId) => {
+  check(ruleId, String);
+  return Rules.find({
+    _id: ruleId,
+  });
+});
+
+Meteor.publish('allRules', () => {
+  return Rules.find({});
+});
+
+Meteor.publish('allTriggers', () => {
+  return Triggers.find({});
+});
+
+Meteor.publish('allActions', () => {
+  return Actions.find({});
+});
diff --git a/server/publications/settings.js b/server/publications/settings.js
index c2d9fdff..a8f8a969 100644
--- a/server/publications/settings.js
+++ b/server/publications/settings.js
@@ -1,5 +1,15 @@
 Meteor.publish('setting', () => {
-  return Settings.find({}, {fields:{disableRegistration: 1}});
+  return Settings.find({}, {
+    fields:{
+      disableRegistration: 1,
+      productName: 1,
+      hideLogo: 1,
+      customHTMLafterBodyStart: 1,
+      customHTMLbeforeBodyEnd: 1,
+      displayAuthenticationMethod: 1,
+      defaultAuthenticationMethod: 1,
+    },
+  });
 });
 
 Meteor.publish('mailServer', function () {
diff --git a/server/publications/users.js b/server/publications/users.js
index 4fd98e13..f0c94153 100644
--- a/server/publications/users.js
+++ b/server/publications/users.js
@@ -17,3 +17,12 @@ Meteor.publish('user-admin', function() {
     },
   });
 });
+
+Meteor.publish('user-authenticationMethod', function(match) {
+  check(match, String);
+  return Users.find({$or: [{_id: match}, {email: match}, {username: match}]}, {
+    fields: {
+      'authenticationMethod': 1,
+    },
+  });
+});
diff --git a/server/rulesHelper.js b/server/rulesHelper.js
new file mode 100644
index 00000000..197e3756
--- /dev/null
+++ b/server/rulesHelper.js
@@ -0,0 +1,175 @@
+RulesHelper = {
+  executeRules(activity){
+    const matchingRules = this.findMatchingRules(activity);
+    for(let i = 0; i< matchingRules.length; i++){
+      const action = matchingRules[i].getAction();
+      if(action !== undefined){
+        this.performAction(activity, action);
+      }
+    }
+  },
+  findMatchingRules(activity){
+    const activityType = activity.activityType;
+    if(TriggersDef[activityType] === undefined){
+      return [];
+    }
+    const matchingFields = TriggersDef[activityType].matchingFields;
+    const matchingMap = this.buildMatchingFieldsMap(activity, matchingFields);
+    const matchingTriggers = Triggers.find(matchingMap);
+    const matchingRules = [];
+    matchingTriggers.forEach(function(trigger){
+      const rule = trigger.getRule();
+      // Check that for some unknown reason there are some leftover triggers
+      // not connected to any rules
+      if(rule !== undefined){
+        matchingRules.push(trigger.getRule());
+      }
+    });
+    return matchingRules;
+  },
+  buildMatchingFieldsMap(activity, matchingFields){
+    const matchingMap = {'activityType':activity.activityType};
+    for(let i = 0; i< matchingFields.length; i++){
+      // Creating a matching map with the actual field of the activity
+      // and with the wildcard (for example: trigger when a card is added
+      // in any [*] board
+      matchingMap[matchingFields[i]] = { $in: [activity[matchingFields[i]], '*']};
+    }
+    return matchingMap;
+  },
+  performAction(activity, action){
+    const card = Cards.findOne({_id:activity.cardId});
+    const boardId = activity.boardId;
+    if(action.actionType === 'moveCardToTop'){
+      let listId;
+      let list;
+      if(action.listTitle === '*'){
+        listId = card.listId;
+        list = card.list();
+      }else{
+        list = Lists.findOne({title: action.listTitle, boardId });
+        listId = list._id;
+      }
+      const minOrder = _.min(list.cardsUnfiltered(card.swimlaneId).map((c) => c.sort));
+      card.move(card.swimlaneId, listId, minOrder - 1);
+    }
+    if(action.actionType === 'moveCardToBottom'){
+      let listId;
+      let list;
+      if(action.listTitle === '*'){
+        listId = card.listId;
+        list = card.list();
+      }else{
+        list = Lists.findOne({title: action.listTitle, boardId});
+        listId = list._id;
+      }
+      const maxOrder = _.max(list.cardsUnfiltered(card.swimlaneId).map((c) => c.sort));
+      card.move(card.swimlaneId, listId, maxOrder + 1);
+    }
+    if(action.actionType === 'sendEmail'){
+      const to = action.emailTo;
+      const text = action.emailMsg || '';
+      const subject = action.emailSubject || '';
+      try {
+        Email.send({
+          to,
+          from: Accounts.emailTemplates.from,
+          subject,
+          text,
+        });
+      } catch (e) {
+        // eslint-disable-next-line no-console
+        console.error(e);
+        return;
+      }
+    }
+    if(action.actionType === 'archive'){
+      card.archive();
+    }
+    if(action.actionType === 'unarchive'){
+      card.restore();
+    }
+    if(action.actionType === 'setColor'){
+      card.setColor(action.selectedColor);
+    }
+    if(action.actionType === 'addLabel'){
+      card.addLabel(action.labelId);
+    }
+    if(action.actionType === 'removeLabel'){
+      card.removeLabel(action.labelId);
+    }
+    if(action.actionType === 'addMember'){
+      const memberId = Users.findOne({username:action.username})._id;
+      card.assignMember(memberId);
+    }
+    if(action.actionType === 'removeMember'){
+      if(action.username === '*'){
+        const members = card.members;
+        for(let i = 0; i< members.length; i++){
+          card.unassignMember(members[i]);
+        }
+      }else{
+        const memberId = Users.findOne({username:action.username})._id;
+        card.unassignMember(memberId);
+      }
+    }
+    if(action.actionType === 'checkAll'){
+      const checkList = Checklists.findOne({'title':action.checklistName, 'cardId':card._id});
+      checkList.checkAllItems();
+    }
+    if(action.actionType === 'uncheckAll'){
+      const checkList = Checklists.findOne({'title':action.checklistName, 'cardId':card._id});
+      checkList.uncheckAllItems();
+    }
+    if(action.actionType === 'checkItem'){
+      const checkList = Checklists.findOne({'title':action.checklistName, 'cardId':card._id});
+      const checkItem = ChecklistItems.findOne({'title':action.checkItemName, 'checkListId':checkList._id});
+      checkItem.check();
+    }
+    if(action.actionType === 'uncheckItem'){
+      const checkList = Checklists.findOne({'title':action.checklistName, 'cardId':card._id});
+      const checkItem = ChecklistItems.findOne({'title':action.checkItemName, 'checkListId':checkList._id});
+      checkItem.uncheck();
+    }
+    if(action.actionType === 'addChecklist'){
+      Checklists.insert({'title':action.checklistName, 'cardId':card._id, 'sort':0});
+    }
+    if(action.actionType === 'removeChecklist'){
+      Checklists.remove({'title':action.checklistName, 'cardId':card._id, 'sort':0});
+    }
+    if(action.actionType === 'addSwimlane'){
+      Swimlanes.insert({
+        title: action.swimlaneName,
+        boardId,
+        sort: 0,
+      });
+    }
+    if(action.actionType === 'addChecklistWithItems'){
+      const checkListId = Checklists.insert({'title':action.checklistName, 'cardId':card._id, 'sort':0});
+      const itemsArray = action.checklistItems.split(',');
+      const checkList = Checklists.findOne({_id:checkListId});
+      for(let i = 0; i <itemsArray.length; i++){
+        ChecklistItems.insert({title:itemsArray[i], checklistId:checkListId, cardId:card._id, 'sort':checkList.itemCount()});
+      }
+    }
+    if(action.actionType === 'createCard'){
+      const list = Lists.findOne({title:action.listName, boardId});
+      let listId = '';
+      let swimlaneId = '';
+      const swimlane = Swimlanes.findOne({title:action.swimlaneName, boardId});
+      if(list === undefined){
+        listId = '';
+      }else{
+        listId = list._id;
+      }
+      if(swimlane === undefined){
+        swimlaneId = Swimlanes.findOne({title:'Default', boardId})._id;
+      }else{
+        swimlaneId = swimlane._id;
+      }
+      Cards.insert({title:action.cardName, listId, swimlaneId, sort:0, boardId});
+    }
+
+  },
+
+};
diff --git a/server/triggersDef.js b/server/triggersDef.js
new file mode 100644
index 00000000..56d0a84f
--- /dev/null
+++ b/server/triggersDef.js
@@ -0,0 +1,58 @@
+TriggersDef = {
+  createCard:{
+    matchingFields: ['boardId', 'listName', 'userId', 'swimlaneName', 'cardTitle'],
+  },
+  moveCard:{
+    matchingFields: ['boardId', 'listName', 'oldListName', 'userId', 'swimlaneName', 'cardTitle'],
+  },
+  archivedCard:{
+    matchingFields: ['boardId', 'userId', 'cardTitle'],
+  },
+  restoredCard:{
+    matchingFields: ['boardId', 'userId', 'cardTitle'],
+  },
+  joinMember:{
+    matchingFields: ['boardId', 'username', 'userId'],
+  },
+  unjoinMember:{
+    matchingFields: ['boardId', 'username', 'userId'],
+  },
+  addChecklist:{
+    matchingFields: ['boardId', 'checklistName', 'userId'],
+  },
+  removeChecklist:{
+    matchingFields: ['boardId', 'checklistName', 'userId'],
+  },
+  completeChecklist:{
+    matchingFields: ['boardId', 'checklistName', 'userId'],
+  },
+  uncompleteChecklist:{
+    matchingFields: ['boardId', 'checklistName', 'userId'],
+  },
+  addedChecklistItem:{
+    matchingFields: ['boardId', 'checklistItemName', 'userId'],
+  },
+  removedChecklistItem:{
+    matchingFields: ['boardId', 'checklistItemName', 'userId'],
+  },
+  checkedItem:{
+    matchingFields: ['boardId', 'checklistItemName', 'userId'],
+  },
+  uncheckedItem:{
+    matchingFields: ['boardId', 'checklistItemName', 'userId'],
+  },
+  addAttachment:{
+    matchingFields: ['boardId', 'userId'],
+  },
+  deleteAttachment:{
+    matchingFields: ['boardId', 'userId'],
+  },
+  addedLabel:{
+    matchingFields: ['boardId', 'labelId', 'userId'],
+  },
+  removedLabel:{
+    matchingFields: ['boardId', 'labelId', 'userId'],
+  },
+};
+
+
diff --git a/settings.json b/settings.json
new file mode 100644
index 00000000..9e26dfee
--- /dev/null
+++ b/settings.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/snap-src/Caddyfile b/snap-src/Caddyfile
index 07ed4143..2a9867d8 100644
--- a/snap-src/Caddyfile
+++ b/snap-src/Caddyfile
@@ -3,3 +3,16 @@ proxy / localhost:3001 {
   websocket
   transparent
 }
+
+## SSL/TLS example. Firefox Inspect Console does not support http/2, so turning it off
+## so that Firefox would not show wss websocket errors. Chrome console supports http/2.
+#
+#wekan.example.com {
+#  tls {
+#    alpn http/1.1
+#  }
+#   proxy / localhost:3001 {
+#     websocket
+#     transparent
+#  }
+#}
diff --git a/snap-src/bin/caddy-control b/snap-src/bin/caddy-control
index 46d36c6b..1905603c 100755
--- a/snap-src/bin/caddy-control
+++ b/snap-src/bin/caddy-control
@@ -4,7 +4,7 @@
 source $SNAP/bin/wekan-read-settings
 
 if [ "$CADDY_ENABLED" = "true" ]; then
-    env LC_ALL=C caddy -conf=$SNAP_COMMON/Caddyfile -host=localhost:${CADDY_PORT}
+    env LC_ALL=C caddy -conf=$SNAP_COMMON/Caddyfile -host=localhost:${CADDY_PORT} -agree
 else
     echo "caddy is disabled. Stop service"
     snapctl stop --disable ${SNAP_NAME}.caddy
diff --git a/snap-src/bin/config b/snap-src/bin/config
index 813c3d3f..e09cfc19 100755
--- a/snap-src/bin/config
+++ b/snap-src/bin/config
@@ -3,13 +3,17 @@
 # All supported keys are defined here together with descriptions and default values
 
 # list of supported keys
-keys="MONGODB_BIND_UNIX_SOCKET MONGODB_BIND_IP MONGODB_PORT MAIL_URL MAIL_FROM ROOT_URL PORT DISABLE_MONGODB CADDY_ENABLED CADDY_BIND_PORT"
+keys="DEBUG MONGODB_BIND_UNIX_SOCKET MONGODB_BIND_IP MONGODB_PORT MAIL_URL MAIL_FROM ROOT_URL PORT DISABLE_MONGODB CADDY_ENABLED CADDY_BIND_PORT WITH_API ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE ACCOUNTS_LOCKOUT_KNOWN_USERS_PERIOD ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURE_WINDOW ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURES_BERORE ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW EMAIL_NOTIFICATION_TIMEOUT CORS MATOMO_ADDRESS MATOMO_SITE_ID MATOMO_DO_NOT_TRACK MATOMO_WITH_USERNAME BROWSER_POLICY_ENABLED TRUSTED_URL WEBHOOKS_ATTRIBUTES OAUTH2_ENABLED OAUTH2_LOGIN_STYLE OAUTH2_CLIENT_ID OAUTH2_SECRET OAUTH2_SERVER_URL OAUTH2_AUTH_ENDPOINT OAUTH2_USERINFO_ENDPOINT OAUTH2_TOKEN_ENDPOINT OAUTH2_ID_MAP OAUTH2_USERNAME_MAP OAUTH2_FULLNAME_MAP OAUTH2_EMAIL_MAP LDAP_ENABLE LDAP_PORT LDAP_HOST LDAP_BASEDN LDAP_LOGIN_FALLBACK LDAP_RECONNECT LDAP_TIMEOUT LDAP_IDLE_TIMEOUT LDAP_CONNECT_TIMEOUT LDAP_AUTHENTIFICATION LDAP_AUTHENTIFICATION_USERDN LDAP_AUTHENTIFICATION_PASSWORD LDAP_LOG_ENABLED LDAP_BACKGROUND_SYNC LDAP_BACKGROUND_SYNC_INTERVAL LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS LDAP_ENCRYPTION LDAP_CA_CERT LDAP_REJECT_UNAUTHORIZED LDAP_USER_SEARCH_FILTER LDAP_USER_SEARCH_SCOPE LDAP_USER_SEARCH_FIELD LDAP_SEARCH_PAGE_SIZE LDAP_SEARCH_SIZE_LIMIT LDAP_GROUP_FILTER_ENABLE LDAP_GROUP_FILTER_OBJECTCLASS LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT LDAP_GROUP_FILTER_GROUP_NAME LDAP_UNIQUE_IDENTIFIER_FIELD LDAP_UTF8_NAMES_SLUGIFY LDAP_USERNAME_FIELD LDAP_FULLNAME_FIELD LDAP_MERGE_EXISTING_USERS LDAP_SYNC_USER_DATA LDAP_SYNC_USER_DATA_FIELDMAP LDAP_SYNC_GROUP_ROLES LDAP_DEFAULT_DOMAIN LDAP_EMAIL_MATCH_ENABLE LDAP_EMAIL_MATCH_REQUIRE LDAP_EMAIL_MATCH_VERIFIED LDAP_EMAIL_FIELD LDAP_SYNC_ADMIN_STATUS LDAP_SYNC_ADMIN_GROUPS HEADER_LOGIN_ID HEADER_LOGIN_FIRSTNAME HEADER_LOGIN_LASTNAME HEADER_LOGIN_EMAIL LOGOUT_WITH_TIMER LOGOUT_IN LOGOUT_ON_HOURS LOGOUT_ON_MINUTES DEFAULT_AUTHENTICATION_METHOD"
 
 # default values
+DESCRIPTION_DEBUG="Debug OIDC OAuth2 etc. Example: sudo snap set wekan debug='true'"
+DEFAULT_DEBUG="false"
+KEY_DEBUG="debug"
+
 DESCRIPTION_MONGODB_BIND_UNIX_SOCKET="mongodb binding unix socket:\n"\
 "\t\t\t Default behaviour will preffer binding over unix socket, to disable unix socket binding set value to 'nill' string\n"\
 "\t\t\t To bind to instance of mongodb provided through content interface,set value to relative path to the socket inside '$SNAP_DATA/shared' directory"
-DEFAULT_MONGODB_BIND_UNIX_SOCKET="$SNAP_DATA/share"
+DEFAULT_MONGODB_BIND_UNIX_SOCKET="/var/snap/wekan/current/share"
 KEY_MONGODB_BIND_UNIX_SOCKET="mongodb-bind-unix-socket"
 
 DESCRIPTION_MONGODB_PORT="mongodb binding port: eg 27017 when using localhost"
@@ -17,7 +21,7 @@ DEFAULT_MONGODB_PORT="27019"
 KEY_MONGODB_PORT='mongodb-port'
 
 DESCRIPTION_MONGODB_BIND_IP="mongodb binding ip address: eg 127.0.0.1 for localhost\n\t\tIf not defined default unix socket is used instead"
-DEFAULT_MONGODB_BIND_IP=""
+DEFAULT_MONGODB_BIND_IP="127.0.0.1"
 KEY_MONGODB_BIND_IP="mongodb-bind-ip"
 
 DESCRIPTION_MAIL_URL="wekan mail binding"
@@ -47,3 +51,341 @@ KEY_CADDY_ENABLED="caddy-enabled"
 DESCRIPTION_CADDY_BIND_PORT="Port on which caddy will expect proxy, value set here will be set in $SNAP_COMMON/Caddyfile"
 DEFAULT_CADDY_BIND_PORT="3001"
 KEY_CADDY_BIND_PORT="caddy-bind-port"
+
+DESCRIPTION_WITH_API="Enable/disable the api of wekan"
+DEFAULT_WITH_API="true"
+KEY_WITH_API="with-api"
+
+DESCRIPTION_ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE="Accounts lockout known users failures before, greater than 0. Default: 3"
+DEFAULT_ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE="3"
+KEY_ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE="accounts-lockout-known-users-failures-before"
+
+DESCRIPTION_ACCOUNTS_LOCKOUT_KNOWN_USERS_PERIOD="Accounts lockout know users period, in seconds. Default: 60"
+DEFAULT_ACCOUNTS_LOCKOUT_KNOWN_USERS_PERIOD="60"
+KEY_ACCOUNTS_LOCKOUT_KNOWN_USERS_PERIOD="accounts-lockout-known-users-period"
+
+DESCRIPTION_ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURE_WINDOW="Accounts lockout unknown failure window, in seconds. Default: 15"
+DEFAULT_ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURE_WINDOW="15"
+KEY_ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURE_WINDOW="accounts-lockout-known-users-failure-window"
+
+DESCRIPTION_ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURES_BERORE="Accounts lockout unknown users failures before, greater than 0. Default: 3"
+DEFAULT_ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURES_BERORE="3"
+KEY_ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURES_BERORE="accounts-lockout-unknown-users-failures-before"
+
+DESCRIPTION_ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD="Accounts lockout unknown users lockout period, in seconds. Default: 60"
+DEFAULT_ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD="60"
+KEY_ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD="accounts-lockout-unknown-users-lockout-period"
+
+DESCRIPTION_ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW="Accounts lockout unknown users failure window, in seconds. Default: 15"
+DEFAULT_ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW="15"
+KEY_ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW="accounts-lockout-unknown-users-failure-window"
+
+DESCRIPTION_EMAIL_NOTIFICATION_TIMEOUT="Email notification timeout, ms. Default: 30000 (=30s)."
+DEFAULT_EMAIL_NOTIFICATION_TIMEOUT="30000"
+KEY_EMAIL_NOTIFICATION_TIMEOUT="email-notification-timeout"
+
+DESCRIPTION_CORS="Enable/disable CORS: Set Access-Control-Allow-Origin header. Example: *"
+DEFAULT_CORS=""
+KEY_CORS="cors"
+
+DESCRIPTION_MATOMO_ADDRESS="The address of the server where matomo is hosted"
+DEFAULT_MATOMO_ADDRESS=""
+KEY_MATOMO_ADDRESS="matomo-address"
+
+DESCRIPTION_MATOMO_SITE_ID="The value of the site ID given in matomo server for wekan"
+DEFAULT_MATOMO_SITE_ID=""
+KEY_MATOMO_SITE_ID="matomo-site-id"
+
+DESCRIPTION_MATOMO_DO_NOT_TRACK="The option do not track which enables users to not be tracked by matomo"
+DEFAULT_MATOMO_DO_NOT_TRACK="true"
+KEY_MATOMO_DO_NOT_TRACK="matomo-do-not-track"
+
+DESCRIPTION_MATOMO_WITH_USERNAME="The option that allows matomo to retrieve the username"
+DEFAULT_MATOMO_WITH_USERNAME="false"
+KEY_MATOMO_WITH_USERNAME="matomo-with-username"
+
+DESCRIPTION_BROWSER_POLICY_ENABLED="Enable browser policy and allow one trusted URL that can have iframe that has Wekan embedded inside.\n"\
+"\t\t\t Setting this to false is not recommended, it also disables all other browser policy protections\n"\
+"\t\t\t and allows all iframing etc. See wekan/server/policy.js"
+DEFAULT_BROWSER_POLICY_ENABLED="true"
+KEY_BROWSER_POLICY_ENABLED="browser-policy-enabled"
+
+DESCRIPTION_TRUSTED_URL="When browser policy is enabled, HTML code at this Trusted URL can have iframe that embeds Wekan inside."
+DEFAULT_TRUSTED_URL=""
+KEY_TRUSTED_URL="trusted-url"
+
+DESCRIPTION_WEBHOOKS_ATTRIBUTES="What to send to Outgoing Webhook, or leave out. Example, that includes all that are default: cardId,listId,oldListId,boardId,comment,user,card,commentId ."
+DEFAULT_WEBHOOKS_ATTRIBUTES=""
+KEY_WEBHOOKS_ATTRIBUTES="webhooks-attributes"
+
+DESCRIPTION_OAUTH2_ENABLED="Enable the OAuth2 connection"
+DEFAULT_OAUTH2_ENABLED="false"
+KEY_OAUTH2_ENABLED="oauth2-enabled"
+
+DESCRIPTION_OAUTH2_LOGIN_STYLE="OAuth2 login style: popup or redirect. Default: redirect"
+DEFAULT_OAUTH2_LOGIN_STYLE="redirect"
+KEY_OAUTH2_LOGIN_STYLE="oauth2-login-style"
+
+DESCRIPTION_OAUTH2_CLIENT_ID="OAuth2 Client ID, for example from Rocket.Chat. Example: abcde12345"
+DEFAULT_OAUTH2_CLIENT_ID=""
+KEY_OAUTH2_CLIENT_ID="oauth2-client-id"
+
+DESCRIPTION_OAUTH2_SECRET="OAuth2 Secret, for example from Rocket.Chat: Example: 54321abcde"
+DEFAULT_OAUTH2_SECRET=""
+KEY_OAUTH2_SECRET="oauth2-secret"
+
+DESCRIPTION_OAUTH2_SERVER_URL="OAuth2 Server URL, for example Rocket.Chat. Example: https://chat.example.com"
+DEFAULT_OAUTH2_SERVER_URL=""
+KEY_OAUTH2_SERVER_URL="oauth2-server-url"
+
+DESCRIPTION_OAUTH2_AUTH_ENDPOINT="OAuth2 authorization endpoint. Example: /oauth/authorize"
+DEFAULT_OAUTH2_AUTH_ENDPOINT=""
+KEY_OAUTH2_AUTH_ENDPOINT="oauth2-auth-endpoint"
+
+DESCRIPTION_OAUTH2_USERINFO_ENDPOINT="OAuth2 userinfo endpoint. Example: /oauth/userinfo"
+DEFAULT_OAUTH2_USERINFO_ENDPOINT=""
+KEY_OAUTH2_USERINFO_ENDPOINT="oauth2-userinfo-endpoint"
+
+DESCRIPTION_OAUTH2_TOKEN_ENDPOINT="OAuth2 token endpoint. Example: /oauth/token"
+DEFAULT_OAUTH2_TOKEN_ENDPOINT=""
+KEY_OAUTH2_TOKEN_ENDPOINT="oauth2-token-endpoint"
+
+DESCRIPTION_OAUTH2_ID_MAP="OAuth2 ID Mapping. Example: email"
+DEFAULT_OAUTH2_ID_MAP=""
+KEY_OAUTH2_ID_MAP="oauth2-id-map"
+
+DESCRIPTION_OAUTH2_USERNAME_MAP="OAuth2 Username Mapping. Example: email"
+DEFAULT_OAUTH2_USERNAME_MAP=""
+KEY_OAUTH2_USERNAME_MAP="oauth2-username-map"
+
+DESCRIPTION_OAUTH2_FULLNAME_MAP="OAuth2 Fullname Mapping. Example: name"
+DEFAULT_OAUTH2_FULLNAME_MAP=""
+KEY_OAUTH2_FULLNAME_MAP="oauth2-fullname-map"
+
+DESCRIPTION_OAUTH2_FULLNAME_MAP="OAuth2 Fullname Mapping. Example: name"
+DEFAULT_OAUTH2_FULLNAME_MAP=""
+KEY_OAUTH2_FULLNAME_MAP="oauth2-fullname-map"
+
+DESCRIPTION_OAUTH2_EMAIL_MAP="OAuth2 Email Mapping. Example: email"
+DEFAULT_OAUTH2_EMAIL_MAP=""
+KEY_OAUTH2_EMAIL_MAP="oauth2-email-map"
+
+DESCRIPTION_LDAP_ENABLE="Enable or not the connection by the LDAP"
+DEFAULT_LDAP_ENABLE="false"
+KEY_LDAP_ENABLE="ldap-enable"
+
+DESCRIPTION_LDAP_PORT="The port of the LDAP server"
+DEFAULT_LDAP_PORT="389"
+KEY_LDAP_PORT="ldap-port"
+
+DESCRIPTION_LDAP_HOST="The host server for the LDAP server"
+DEFAULT_LDAP_HOST=""
+KEY_LDAP_HOST="ldap-host"
+
+DESCRIPTION_LDAP_BASEDN="The base DN for the LDAP Tree"
+DEFAULT_LDAP_BASEDN=""
+KEY_LDAP_BASEDN="ldap-basedn"
+
+DESCRIPTION_LDAP_LOGIN_FALLBACK="Fallback on the default authentication method"
+DEFAULT_LDAP_LOGIN_FALLBACK="false"
+KEY_LDAP_LOGIN_FALLBACK="ldap-login-fallback"
+
+DESCRIPTION_LDAP_RECONNECT="Reconnect to the server if the connection is lost"
+DEFAULT_LDAP_RECONNECT="true"
+KEY_LDAP_RECONNECT="ldap-reconnect"
+
+DESCRIPTION_LDAP_TIMEOUT="Overall timeout, in milliseconds."
+DEFAULT_LDAP_TIMEOUT="10000"
+KEY_LDAP_TIMEOUT="ldap-timeout"
+
+DESCRIPTION_LDAP_IDLE_TIMEOUT="Specifies the timeout for idle LDAP connections in milliseconds"
+DEFAULT_LDAP_IDLE_TIMEOUT="10000"
+KEY_LDAP_IDLE_TIMEOUT="ldap-idle-timeout"
+
+DESCRIPTION_LDAP_CONNECT_TIMEOUT="Connection timeout, in milliseconds."
+DEFAULT_LDAP_CONNECT_TIMEOUT="10000"
+KEY_LDAP_CONNECT_TIMEOUT="ldap-connect-timeout"
+
+DESCRIPTION_LDAP_AUTHENTIFICATION="If the LDAP needs a user account to search"
+DEFAULT_LDAP_AUTHENTIFICATION="false"
+KEY_LDAP_AUTHENTIFICATION="ldap-authentication"
+
+DESCRIPTION_LDAP_AUTHENTIFICATION_USERDN="The search user DN"
+DEFAULT_LDAP_AUTHENTIFICATION_USERDN=""
+KEY_LDAP_AUTHENTIFICATION_USERDN="ldap-authentication-userdn"
+
+DESCRIPTION_LDAP_AUTHENTIFICATION_PASSWORD="The password for the search user"
+DEFAULT_LDAP_AUTHENTIFICATION_PASSWORD=""
+KEY_LDAP_AUTHENTIFICATION_PASSWORD="ldap-authentication-password"
+
+DESCRIPTION_LDAP_LOG_ENABLED="Enable logs for the module"
+DEFAULT_LDAP_LOG_ENABLED="false"
+KEY_LDAP_LOG_ENABLED="ldap-log-enabled"
+
+DESCRIPTION_LDAP_BACKGROUND_SYNC="If the sync of the users should be done in the background"
+DEFAULT_LDAP_BACKGROUND_SYNC="false"
+KEY_LDAP_BACKGROUND_SYNC="ldap-background-sync"
+
+DESCRIPTION_LDAP_BACKGROUND_SYNC_INTERVAL="At which interval does the background task sync in milliseconds"
+DEFAULT_LDAP_BACKGROUND_SYNC_INTERVAL="100"
+KEY_LDAP_BACKGROUND_SYNC_INTERVAL="ldap-background-sync-interval"
+
+DESCRIPTION_LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED=""
+DEFAULT_LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED="false"
+KEY_LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED="ldap-background-sync-keep-existant-users-updated"
+
+DESCRIPTION_LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=""
+DEFAULT_LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS="false"
+KEY_LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS="ldap-background-sync-import-new-users"
+
+DESCRIPTION_LDAP_ENCRYPTION="If using LDAPS, use LDAP_ENCRYPTION=ssl"
+DEFAULT_LDAP_ENCRYPTION="false"
+KEY_LDAP_ENCRYPTION="ldap-encryption"
+
+DESCRIPTION_LDAP_CA_CERT="The certification for the LDAPS server"
+DEFAULT_LDAP_CA_CERT=""
+KEY_LDAP_CA_CERT="ldap-ca-cert"
+
+DESCRIPTION_LDAP_REJECT_UNAUTHORIZED="Reject Unauthorized Certificate"
+DEFAULT_LDAP_REJECT_UNAUTHORIZED="false"
+KEY_LDAP_REJECT_UNAUTHORIZED="ldap-reject-unauthorized"
+
+DESCRIPTION_LDAP_USER_SEARCH_FILTER="Optional extra LDAP filters. Don't forget the outmost enclosing parentheses if needed"
+DEFAULT_LDAP_USER_SEARCH_FILTER=""
+KEY_LDAP_USER_SEARCH_FILTER="ldap-user-search-filter"
+
+DESCRIPTION_LDAP_USER_SEARCH_SCOPE="base (search only in the provided DN), one (search only in the provided DN and one level deep), or sub (search the whole subtree). Example: one"
+DEFAULT_LDAP_USER_SEARCH_SCOPE=""
+KEY_LDAP_USER_SEARCH_SCOPE="ldap-user-search-scope"
+
+DESCRIPTION_LDAP_USER_SEARCH_FIELD="Which field is used to find the user"
+DEFAULT_LDAP_USER_SEARCH_FIELD=""
+KEY_LDAP_USER_SEARCH_FIELD="ldap-user-search-field"
+
+DESCRIPTION_LDAP_SEARCH_PAGE_SIZE="Used for pagination (0=unlimited)"
+DEFAULT_LDAP_SEARCH_PAGE_SIZE="0"
+KEY_LDAP_SEARCH_PAGE_SIZE="ldap-search-page-size"
+
+DESCRIPTION_LDAP_SEARCH_SIZE_LIMIT="The limit number of entries (0=unlimited)"
+DEFAULT_LDAP_SEARCH_SIZE_LIMIT="0"
+KEY_LDAP_SEARCH_SIZE_LIMIT="ldap-search-size-limit"
+
+DESCRIPTION_LDAP_GROUP_FILTER_ENABLE="Enable group filtering"
+DEFAULT_LDAP_GROUP_FILTER_ENABLE="false"
+KEY_LDAP_GROUP_FILTER_ENABLE="ldap-group-filter-enable"
+
+DESCRIPTION_LDAP_GROUP_FILTER_OBJECTCLASS="The object class for filtering"
+DEFAULT_LDAP_GROUP_FILTER_OBJECTCLASS=""
+KEY_LDAP_GROUP_FILTER_OBJECTCLASS="ldap-group-filter-objectclass"
+
+DESCRIPTION_LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE="ldap-group-filter-id-attribute. Default: ''"
+DEFAULT_LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE=""
+KEY_LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE="ldap-group-filter-id-attribute"
+
+DESCRIPTION_LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE="ldap-group-filter-member-attibute. Default: ''"
+DEFAULT_LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE=""
+KEY_LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE="ldap-group-filter-member-attribute"
+
+DESCRIPTION_LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT="ldap-group-filter-group-member-format. Default: ''"
+DEFAULT_LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT=""
+KEY_LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT="ldap-group-filter-member-format"
+
+DESCRIPTION_LDAP_GROUP_FILTER_GROUP_NAME="ldap-group-filter-group-name. Default: ''"
+DEFAULT_LDAP_GROUP_FILTER_GROUP_NAME=""
+KEY_LDAP_GROUP_FILTER_GROUP_NAME="ldap-group-filter-member-name"
+
+DESCRIPTION_LDAP_UNIQUE_IDENTIFIER_FIELD="This field is sometimes class GUID (Globally Unique Identifier)"
+DEFAULT_LDAP_UNIQUE_IDENTIFIER_FIELD=""
+KEY_LDAP_UNIQUE_IDENTIFIER_FIELD="ldap-unique-identifier-field"
+
+DESCRIPTION_LDAP_UTF8_NAMES_SLUGIFY="Convert the username to utf8"
+DEFAULT_LDAP_UTF8_NAMES_SLUGIFY="true"
+KEY_LDAP_UTF8_NAMES_SLUGIFY="ldap-utf8-names-slugify"
+
+DESCRIPTION_LDAP_USERNAME_FIELD="Which field contains the ldap username"
+DEFAULT_LDAP_USERNAME_FIELD=""
+KEY_LDAP_USERNAME_FIELD="ldap-username-field"
+
+DESCRIPTION_LDAP_FULLNAME_FIELD="Which field contains the ldap fullname"
+DEFAULT_LDAP_FULLNAME_FIELD=""
+KEY_LDAP_FULLNAME_FIELD="ldap-fullname-field"
+
+DESCRIPTION_LDAP_MERGE_EXISTING_USERS="ldap-merge-existing-users . Default: false"
+DEFAULT_LDAP_MERGE_EXISTING_USERS="false"
+KEY_LDAP_MERGE_EXISTING_USERS="ldap-merge-existing-users"
+
+DESCRIPTION_LDAP_EMAIL_MATCH_ENABLE="ldap-email-match-enable . Default: false"
+DEFAULT_LDAP_EMAIL_MATCH_ENABLE="false"
+KEY_LDAP_EMAIL_MATCH_ENABLE="ldap-email-match-enable"
+
+DESCRIPTION_LDAP_EMAIL_MATCH_REQUIRE="ldap-email-match-require . Default: false"
+DEFAULT_LDAP_EMAIL_MATCH_REQUIRE="false"
+KEY_LDAP_EMAIL_MATCH_REQUIRE="ldap-email-match-require"
+
+DESCRIPTION_LDAP_EMAIL_MATCH_VERIFIED="ldap-email-match-verified . Default: false"
+DEFAULT_LDAP_EMAIL_MATCH_VERIFIED="false"
+KEY_LDAP_EMAIL_MATCH_VERIFIED="ldap-email-match-verified"
+
+DESCRIPTION_LDAP_EMAIL_FIELD="Which field contains the ldap e-mail address"
+DEFAULT_LDAP_EMAIL_FIELD=""
+KEY_LDAP_EMAIL_FIELD="ldap-email-field"
+
+DESCRIPTION_LDAP_SYNC_USER_DATA="ldap-sync-user-data . Default: false"
+DEFAULT_LDAP_SYNC_USER_DATA="false"
+KEY_LDAP_SYNC_USER_DATA="ldap-sync-user-data"
+
+DESCRIPTION_LDAP_SYNC_USER_DATA_FIELDMAP="LDAP Sync User Data Fieldmap. Example: ldap-sync-user-data-fieldmap='{\"cn\":\"name\", \"mail\":\"email\"}'"
+DEFAULT_LDAP_SYNC_USER_DATA_FIELDMAP=""
+KEY_LDAP_SYNC_USER_DATA_FIELDMAP="ldap-sync-user-data-fieldmap"
+
+DESCRIPTION_LDAP_SYNC_GROUP_ROLES="ldap-sync-group-roles . Default: '' (empty)."
+DEFAULT_LDAP_SYNC_GROUP_ROLES=""
+KEY_LDAP_SYNC_GROUP_ROLES="ldap-sync-group-roles"
+
+DESCRIPTION_LDAP_SYNC_ADMIN_STATUS="Enable/Disable syncing of admin status based on LDAP groups. Example: true"
+DEFAULT_LDAP_SYNC_ADMIN_STATUS=""
+KEY_LDAP_SYNC_ADMIN_STATUS="ldap-sync-admin-status"
+
+DESCRIPTION_LDAP_SYNC_ADMIN_GROUPS="Comma separated list of admin group names to sync. Example: group1, group2"
+DEFAULT_LDAP_SYNC_ADMIN_GROUPS=""
+KEY_LDAP_SYNC_ADMIN_GROUPS="ldap-sync-admin-groups"
+
+DESCRIPTION_LDAP_DEFAULT_DOMAIN="The default domain of the ldap it is used to create email if the field is not map correctly with the LDAP_SYNC_USER_DATA_FIELDMAP"
+DEFAULT_LDAP_DEFAULT_DOMAIN=""
+KEY_LDAP_DEFAULT_DOMAIN="ldap-default-domain"
+
+DESCRIPTION_HEADER_LOGIN_ID="Header login ID. Example for siteminder: HEADERUID"
+DEFAULT_HEADER_LOGIN_ID=""
+KEY_HEADER_LOGIN_ID="header-login-id"
+
+DESCRIPTION_HEADER_LOGIN_FIRSTNAME="Header login firstname. Example for siteminder: HEADERFIRSTNAME"
+DEFAULT_HEADER_LOGIN_FIRSTNAME="Header login firstname. Example for siteminder: HEADERFIRSTNAME"
+KEY_HEADER_LOGIN_FIRSTNAME="header-login-firstname"
+
+DESCRIPTION_HEADER_LOGIN_LASTNAME="Header login lastname. Example for siteminder: HEADERLASTNAME"
+DEFAULT_HEADER_LOGIN_LASTNAME="Header login firstname. Example for siteminder: HEADERLASTNAME"
+KEY_HEADER_LOGIN_LASTNAME="header-login-lastname"
+
+DESCRIPTION_HEADER_LOGIN_EMAIL="Header login email. Example for siteminder: HEADEREMAILADDRESS"
+DEFAULT_HEADER_LOGIN_EMAIL="Header login email. Example for siteminder: HEADEREMAILADDRESS"
+KEY_HEADER_LOGIN_EMAIL="header-login-email"
+
+DESCRIPTION_LOGOUT_WITH_TIMER="Enables or not the option logout with timer"
+DEFAULT_LOGOUT_WITH_TIMER="false"
+KEY_LOGOUT_WITH_TIMER="logout-with-timer"
+
+DESCRIPTION_LOGOUT_IN="The number of days"
+DEFAULT_LOGOUT_IN=""
+KEY_LOGOUT_IN="logout-in"
+
+DESCRIPTION_LOGOUT_ON_HOURS="The number of hours"
+DEFAULT_LOGOUT_ON_HOURS=""
+KEY_LOGOUT_ON_HOURS="logout-on-hours"
+
+DESCRIPTION_LOGOUT_ON_MINUTES="The number of minutes"
+DEFAULT_LOGOUT_ON_MINUTES=""
+KEY_LOGOUT_ON_MINUTES="logout-on-minutes"
+
+DESCRIPTION_DEFAULT_AUTHENTICATION_METHOD="The default authentication method used if a user does not exist to create and authenticate. Method can be password or ldap."
+DEFAULT_DEFAULT_AUTHENTICATION_METHOD=""
+KEY_DEFAULT_AUTHENTICATION_METHOD="default-authentication-method"
diff --git a/snap-src/bin/mongodb-control b/snap-src/bin/mongodb-control
index a7a98739..d6d795bc 100755
--- a/snap-src/bin/mongodb-control
+++ b/snap-src/bin/mongodb-control
@@ -29,4 +29,4 @@ if [ "x" != "x${MONGODB_PORT}" ]; then
 fi
 echo "mongodb bind options: $BIND_OPTIONS"
 
-mongod --dbpath $SNAP_COMMON --logpath $SNAP_COMMON/mongodb.log --logappend --journal $BIND_OPTIONS
+mongod --dbpath $SNAP_COMMON --logpath $SNAP_COMMON/mongodb.log --logappend --journal $BIND_OPTIONS --smallfiles
diff --git a/snap-src/bin/wekan-help b/snap-src/bin/wekan-help
index ee565500..64d41d17 100755
--- a/snap-src/bin/wekan-help
+++ b/snap-src/bin/wekan-help
@@ -7,7 +7,14 @@ if [ "$CADDY_ENABLED" = "true" ]; then
     export PORT=${CADDY_PORT} &>/dev/null
 fi
 
-echo -e "Wekan: The open-source Trello-like kanban.\n"
+echo -e "Wekan: The open-source kanban.\n"
+echo -e "\n"
+echo -e "Debug OIDC OAuth2 etc."
+echo -e "To enable the Debug of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME debug='true'"
+echo -e "\t-Disable the Debug of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME debug='false'"
+echo -e "\n"
 echo -e "Make sure you have connected all interfaces, check more by calling $ snap interfaces ${SNAP_NAME}"
 echo -e "\n"
 echo -e "${SNAP_NAME} has multiple services, to check status use systemctl"
@@ -28,6 +35,325 @@ echo -e "\t\t-connect mongodb-plug with slot from snap providing mongodb"
 echo -e "\t\t-disable mongodb in $SNAP_NAME by calling: $ snap set $SNAP_NAME set disable-mongodb='true'"
 echo -e "\t\t-set mongodb-bind-unix-socket to point to serving mongodb. Use relative path inside shared directory, e.g run/mongodb-27017.sock"
 echo -e "\n"
+echo -e "To enable the API of wekan:"
+echo -e "\t$ snap set $SNAP_NAME with-api='true'"
+echo -e "\t-Disable the API:"
+echo -e "\t$ snap set $SNAP_NAME with-api='false'"
+echo -e "\n"
+echo -e "Accounts lockout known users failures before, greater than 0. Default: 3"
+echo -e "\t$ snap set $SNAP_NAME accounts-lockout-known-users-failures-before='3'"
+echo -e "\n"
+echo -e "Accounts lockout know users period, in seconds. Default: 60"
+echo -e "\t$ snap set $SNAP_NAME accounts-lockout-known-users-period='60'"
+echo -e "\n"
+echo -e "Accounts lockout unknown failure window, in seconds. Default: 15"
+echo -e "\t$ snap set $SNAP_NAME accounts-lockout-known-users-failure-window='15'"
+echo -e "\n"
+echo -e "Accounts lockout unknown users failures before, greater than 0. Default: 3"
+echo -e "\t$ snap set $SNAP_NAME accounts-lockout-unknown-users-failures-before='3'"
+echo -e "\n"
+echo -e "Accounts lockout unknown users lockout period, in seconds. Default: 60"
+echo -e "\t$ snap set $SNAP_NAME accounts-lockout-unknown-users-lockout-period='60'"
+echo -e "\n"
+echo -e "Accounts lockout unknown users failure window, in seconds. Default: 15"
+echo -e "\t$ snap set $SNAP_NAME accounts-lockout-unknown-users-failure-window='15'"
+echo -e "\n"
+echo -e "To enable the Email Notification Timeout of wekan in ms, default 30000 (=30s):"
+echo -e "\t$ snap set $SNAP_NAME email-notification-timeout='10000'"
+echo -e "\t-Disable the Email Notification Timeout of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME email-notification-timeout='30000'"
+echo -e "\n"
+echo -e "To enable the CORS of wekan, to set Access-Control-Allow-Origin header:"
+echo -e "\t$ snap set $SNAP_NAME cors='*'"
+echo -e "\t-Disable the CORS:"
+echo -e "\t$ snap set $SNAP_NAME cors=''"
+echo -e "\n"
+echo -e "Enable browser policy and allow one trusted URL that can have iframe that has Wekan embedded inside."
+echo -e "\t\t Setting this to false is not recommended, it also disables all other browser policy protections"
+echo -e "\t\t and allows all iframing etc. See wekan/server/policy.js"
+echo -e "To enable the Browser Policy of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME browser-policy-enabled='true'"
+echo -e "\t-Disable the Browser Policy of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME browser-policy-enabled='false'"
+echo -e "\n"
+echo -e "When browser policy is enabled, HTML code at this URL can have iframe that embeds Wekan inside."
+echo -e "To enable the Trusted URL of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME trusted-url='https://example.com'"
+echo -e "\t-Disable the Trusted URL of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME trusted-url=''"
+echo -e "\n"
+echo -e "What to send to Outgoing Webhook, or leave out. Example, that includes all that are default: cardId,listId,oldListId,boardId,comment,user,card,commentId ."
+echo -e "To enable the Webhooks Attributes of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME webhooks-attributes='cardId,listId,oldListId,boardId,comment,user,card,commentId'"
+echo -e "\t-Disable the Webhooks Attributes of Wekan to send all default ones:"
+echo -e "\t$ snap set $SNAP_NAME webhooks-attributes=''"
+echo -e "\n"
+echo -e "OAuth2 Client ID."
+echo -e "To enable the OAuth2 Client ID of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME oauth2-client-id='54321abcde'"
+echo -e "\t-Disable the OAuth2 Client ID of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME oauth2-client-id=''"
+echo -e "\n"
+echo -e "OAuth2 login style: popup or redirect. Default: redirect"
+echo -e "To enable the OAuth2 login style popup of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME oauth2-login-style='popup'"
+echo -e "\t-Disable the OAuth2 login style popup of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME oauth2-login-style='redirect'"
+echo -e "\n"
+echo -e "OAuth2 Secret."
+echo -e "To enable the OAuth2 Secret of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME oauth2-secret='54321abcde'"
+echo -e "\t-Disable the OAuth2 Secret of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME oauth2-secret=''"
+echo -e "\n"
+echo -e "OAuth2 Server URL."
+echo -e "To enable the OAuth2 Server URL of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME oauth2-server-url='https://chat.example.com'"
+echo -e "\t-Disable the OAuth2 Server URL of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME oauth2-server-url=''"
+echo -e "\n"
+echo -e "OAuth2 Authorization Endpoint."
+echo -e "To enable the OAuth2 Authorization Endpoint of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME oauth2-auth-endpoint='/oauth/authorize'"
+echo -e "\t-Disable the OAuth2 Authorization Endpoint of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME oauth2-auth-endpoint=''"
+echo -e "\n"
+echo -e "OAuth2 Userinfo Endpoint."
+echo -e "To enable the OAuth2 Userinfo Endpoint of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME oauth2-userinfo-endpoint='/oauth/authorize'"
+echo -e "\t-Disable the OAuth2 Userinfo Endpoint of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME oauth2-userinfo-endpoint=''"
+echo -e "\n"
+echo -e "OAuth2 Token Endpoint."
+echo -e "To enable the OAuth2 Token Endpoint of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME oauth2-token-endpoint='/oauth/token'"
+echo -e "\t-Disable the OAuth2 Token Endpoint of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME oauth2-token-endpoint=''"
+echo -e "\n"
+echo -e "OAuth2 ID Mapping."
+echo -e "To enable the OAuth2 ID Mapping of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME oauth2-id-map='username.uid'"
+echo -e "\t-Disable the OAuth2 ID Mapping of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME oauth2-id-map=''"
+echo -e "\n"
+echo -e "OAuth2 Username Mapping."
+echo -e "To enable the OAuth2 Username Mapping of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME oauth2-username-map='username'"
+echo -e "\t-Disable the OAuth2 Username Mapping of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME oauth2-username-map=''"
+echo -e "\n"
+echo -e "OAuth2 Fullname Mapping."
+echo -e "To enable the OAuth2 Fullname Mapping of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME oauth2-fullname-map='fullname'"
+echo -e "\t-Disable the OAuth2 Fullname Mapping of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME oauth2-fullname-map=''"
+echo -e "\n"
+echo -e "OAuth2 Email Mapping."
+echo -e "To enable the OAuth2 Email Mapping of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME oauth2-email-map='email'"
+echo -e "\t-Disable the OAuth2 Email Mapping of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME oauth2-email-map=''"
+echo -e "\n"
+echo -e "Ldap Enable."
+echo -e "To enable the ldap of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME ldap-enable='true'"
+echo -e "\t-Disable the ldap of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME ldap-enable='false'"
+echo -e "\n"
+echo -e "Ldap Port."
+echo -e "The port of the ldap server:"
+echo -e "\t$ snap set $SNAP_NAME ldap-port='12345'"
+echo -e "\n"
+echo -e "Ldap Host."
+echo -e "The host server for the LDAP server:"
+echo -e "\t$ snap set $SNAP_NAME ldap-host='localhost'"
+echo -e "\n"
+echo -e "Ldap Base Dn."
+echo -e "The base DN for the LDAP Tree:"
+echo -e "\t$ snap set $SNAP_NAME ldap-basedn='ou=user,dc=example,dc=org'"
+echo -e "\n"
+echo -e "Ldap Login Fallback."
+echo -e "Fallback on the default authentication method:"
+echo -e "\t$ snap set $SNAP_NAME ldap-login-fallback='true'"
+echo -e "\n"
+echo -e "Ldap Reconnect."
+echo -e "Reconnect to the server if the connection is lost:"
+echo -e "\t$ snap set $SNAP_NAME ldap-reconnect='false'"
+echo -e "\n"
+echo -e "Ldap Timeout."
+echo -e "Overall timeout, in milliseconds:"
+echo -e "\t$ snap set $SNAP_NAME ldap-timeout='12345'"
+echo -e "\n"
+echo -e "Ldap Idle Timeout."
+echo -e "Specifies the timeout for idle LDAP connections in milliseconds:"
+echo -e "\t$ snap set $SNAP_NAME ldap-idle-timeout='12345'"
+echo -e "\n"
+echo -e "Ldap Connect Timeout."
+echo -e "Connection timeout, in milliseconds:"
+echo -e "\t$ snap set $SNAP_NAME ldap-connect-timeout='12345'"
+echo -e "\n"
+echo -e "Ldap Authentication."
+echo -e "If the LDAP needs a user account to search:"
+echo -e "\t$ snap set $SNAP_NAME ldap-authentication='true'"
+echo -e "\n"
+echo -e "Ldap Authentication User Dn."
+echo -e "The search user Dn:"
+echo -e "\t$ snap set $SNAP_NAME ldap-authentication-userdn='cn=admin,dc=example,dc=org'"
+echo -e "\n"
+echo -e "Ldap Authentication Password."
+echo -e "The password for the search user:"
+echo -e "\t$ snap set $SNAP_NAME ldap-authentication-password='admin'"
+echo -e "\n"
+echo -e "Ldap Log Enabled."
+echo -e "Enable logs for the module:"
+echo -e "\t$ snap set $SNAP_NAME ldap-log-enabled='true'"
+echo -e "\n"
+echo -e "Ldap Background Sync."
+echo -e "If the sync of the users should be done in the background:"
+echo -e "\t$ snap set $SNAP_NAME ldap-background-sync='true'"
+echo -e "\n"
+echo -e "Ldap Background Sync Interval."
+echo -e "At which interval does the background task sync in milliseconds:"
+echo -e "\t$ snap set $SNAP_NAME ldap-background-sync-interval='12345'"
+echo -e "\n"
+echo -e "Ldap Background Sync Keep Existant Users Updated."
+echo -e "\t$ snap set $SNAP_NAME ldap-background-sync-keep-existant-users-updated='true'"
+echo -e "\n"
+echo -e "Ldap Background Sync Import New Users."
+echo -e "\t$ snap set $SNAP_NAME ldap-background-sync-import-new-users='true'"
+echo -e "\n"
+echo -e "Ldap Encryption."
+echo -e "Allow LDAPS:"
+echo -e "\t$ snap set $SNAP_NAME ldap-encryption='ssl'"
+echo -e "\n"
+echo -e "Ldap Ca Cert."
+echo -e "The certification for the LDAPS server:"
+echo -e "\t$ snap set $SNAP_NAME ldap-ca-cert=-----BEGIN CERTIFICATE-----MIIE+zCCA+OgAwIBAgIkAhwR/6TVLmdRY6hHxvUFWc0+Enmu/Hu6cj+G2FIdAgIC...-----END CERTIFICATE-----"
+echo -e "\n"
+echo -e "Ldap Reject Unauthorized."
+echo -e "Reject Unauthorized Certificate:"
+echo -e "\t$ snap set $SNAP_NAME ldap-reject-unauthorized='true'"
+echo -e "\n"
+echo -e "Ldap User Search Filter."
+echo -e "Optional extra LDAP filters. Don't forget the outmost enclosing parentheses if needed:"
+echo -e "\t$ snap set $SNAP_NAME ldap-user-search-filter=''"
+echo -e "\n"
+echo -e "Ldap User Search Scope."
+echo -e "base (search only in the provided DN), one (search only in the provided DN and one level deep), or sub (search the whole subtree). Example: one"
+echo -e "\t$ snap set $SNAP_NAME ldap-user-search-scope=one"
+echo -e "\n"
+echo -e "Ldap User Search Field."
+echo -e "Which field is used to find the user:"
+echo -e "\t$ snap set $SNAP_NAME ldap-user-search-field='uid'"
+echo -e "\n"
+echo -e "Ldap Search Page Size."
+echo -e "Used for pagination (0=unlimited):"
+echo -e "\t$ snap set $SNAP_NAME ldap-search-page-size='12345'"
+echo -e "\n"
+echo -e "Ldap Search Size Limit."
+echo -e "The limit number of entries (0=unlimited):"
+echo -e "\t$ snap set $SNAP_NAME ldap-search-size-limit='12345'"
+echo -e "\n"
+echo -e "Ldap Group Filter Enable."
+echo -e "Enable group filtering:"
+echo -e "\t$ snap set $SNAP_NAME ldap-group-filter-enable='true'"
+echo -e "\n"
+echo -e "Ldap Group Filter ObjectClass."
+echo -e "The object class for filtering:"
+echo -e "\t$ snap set $SNAP_NAME ldap-group-filter-objectclass='group'"
+echo -e "\n"
+echo -e "Ldap Group Filter Id Attribute."
+echo -e "\t$ snap set $SNAP_NAME ldap-group-filter-group-id-attribute=''"
+echo -e "\n"
+echo -e "Ldap Group Filter Member Attribute."
+echo -e "\t$ snap set $SNAP_NAME ldap-group-filter-group-member-attribute=''"
+echo -e "\n"
+echo -e "Ldap Group Filter Member Format."
+echo -e "\t$ snap set $SNAP_NAME ldap-group-filter-group-member-format=''"
+echo -e "\n"
+echo -e "Ldap Group Filter Group Name."
+echo -e "\t$ snap set $SNAP_NAME ldap-group-filter-group-name=''"
+echo -e "\n"
+echo -e "Ldap Unique Identifier Field."
+echo -e "This field is sometimes class GUID (Globally Unique Identifier):"
+echo -e "\t$ snap set $SNAP_NAME ldap-unique-identifier-field=guid"
+echo -e "\n"
+echo -e "Ldap Utf8 Names Slugify."
+echo -e "Convert the username to utf8:"
+echo -e "\t$ snap set $SNAP_NAME ldap-utf8-names-slugify='false'"
+echo -e "\n"
+echo -e "Ldap Username Field."
+echo -e "Which field contains the ldap username:"
+echo -e "\t$ snap set $SNAP_NAME ldap-username-field='username'"
+echo -e "\n"
+echo -e "Ldap Fullname Field."
+echo -e "Which field contains the ldap fullname:"
+echo -e "\t$ snap set $SNAP_NAME ldap-fullname-field='fullname'"
+echo -e "\n"
+echo -e "Ldap Merge Existing Users."
+echo -e "\t$ snap set $SNAP_NAME ldap-merge-existing-users='true'"
+echo -e "\n"
+echo -e "Ldap Email Match Enable."
+echo -e "\t$ snap set $SNAP_NAME ldap-email-match-enable='true'"
+echo -e "\n"
+echo -e "Ldap Email Match Require."
+echo -e "\t$ snap set $SNAP_NAME ldap-email-match-require='true'"
+echo -e "\n"
+echo -e "Ldap Email Match Verified."
+echo -e "\t$ snap set $SNAP_NAME ldap-email-match-verfied='false'"
+echo -e "\n"
+echo -e "Ldap Fullname Field."
+echo -e "Which field contains the ldap email address:"
+echo -e "\t$ snap set $SNAP_NAME ldap-fullname-field='fullname'"
+echo -e "\n"
+echo -e "Ldap Sync User Data."
+echo -e "Enable synchronization of user data:"
+echo -e "\t$ snap set $SNAP_NAME ldap-sync-user-data='true'"
+echo -e "\n"
+echo -e "Ldap Sync User Data Fieldmap."
+echo -e "A field map for the matching:"
+echo -e "\t$ snap set $SNAP_NAME ldap-sync-user-data-fieldmap={\"cn\":\"name\", \"mail\":\"email\"}"
+echo -e "\n"
+echo -e "Ldap Sync Group Roles."
+echo -e "\t$ snap set $SNAP_NAME ldap-sync-group-roles=''"
+echo -e "\n"
+echo -e "Ldap Default Domain."
+echo -e "The default domain of the ldap it is used to create email if the field is not map correctly with the LDAP_SYNC_USER_DATA_FIELDMAP:"
+echo -e "\t$ snap set $SNAP_NAME ldap-default-domain=''"
+echo -e "\n"
+echo -e "Enable/Disable syncing of admin status based on LDAP groups."
+echo -e "\t$ snap set $SNAP_NAME ldap-sync-admin-status='true'"
+echo -e "\n"
+echo -e "Comma separated list of admin group names to sync."
+echo -e "\t$ snap set $SNAP_NAME ldap-sync-admin-groups='group1,group2'"
+echo -e "\n"
+echo -e "Logout with timer."
+echo -e "Enable or not the option that allows to disconnect an user after a given time:"
+echo -e "\t$ snap set $SNAP_NAME logout-with-timer='true'"
+echo -e "\n"
+echo -e "Login to LDAP automatically with HTTP header."
+echo -e "In below example for siteminder, at right side of = is header name."
+echo -e "\t$ snap set $SNAP_NAME header-login-id='HEADERUID'"
+echo -e "\t$ snap set $SNAP_NAME header-login-firstname='HEADERFIRSTNAME'"
+echo -e "\t$ snap set $SNAP_NAME header-login-lastname='HEADERLASTNAME'"
+echo -e "\t$ snap set $SNAP_NAME header-login-email='HEADEREMAILADDRESS'"
+echo -e "\n"
+echo -e "Logout in."
+echo -e "Logout in how many days:"
+echo -e "\t$ snap set $SNAP_NAME logout-in='1'"
+echo -e "\n"
+echo -e "Logout on hours."
+echo -e "Logout in how many hours:"
+echo -e "\t$ snap set $SNAP_NAME logout-on-hours='9'"
+echo -e "\n"
+echo -e "Logout on minutes."
+echo -e "Logout in how many minutes:"
+echo -e "\t$ snap set $SNAP_NAME logout-on-minutes='5'"
+echo -e "\n"
+echo -e "Default authentication method."
+echo -e "The default authentication method used if a user does not exist to create and authenticate. Method can be password or ldap."
+echo -e "\t$ snap set $SNAP_NAME default-authentication-method='ldap'"
+echo -e "\n"
 # parse config file for supported settings keys
 echo -e "wekan supports settings keys"
 echo -e "values can be changed by calling\n$ snap set $SNAP_NAME <key name>='<key value>'"
diff --git a/snap-src/bin/wekan-read-settings b/snap-src/bin/wekan-read-settings
index f216c2a8..236667e9 100755
--- a/snap-src/bin/wekan-read-settings
+++ b/snap-src/bin/wekan-read-settings
@@ -12,10 +12,10 @@ do
     value=$(snapctl get ${!snappy_key})
     if [ "x$value" == "x" ]; then
         echo -e "$key=${!default_value} (default value)"
-        export $key=${!default_value}
+        export $key="${!default_value}"
     else
         echo -e "$key=$value"
-        export $key=$value
+        export $key="$value"
     fi
 done
 
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 088e1524..5a1c6b9f 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,7 +1,7 @@
 name: wekan
 version: 0
 version-script: git describe --dirty --tags |  cut -c 2-
-summary: The open-source Trello-like kanban
+summary: The open-source kanban
 description: |
    Wekan is an open-source and collaborative kanban board application.
 
@@ -57,7 +57,7 @@ apps:
         plugs: [network, network-bind]
 
     database-list-backups:
-        command: ls -ald $SNAP_COMMON/db-backups/*
+        command: ls -al $SNAP_COMMON/db-backups/
 
     database-restore:
         command: mongodb-restore
@@ -65,7 +65,7 @@ apps:
 
 parts:
     mongodb:
-        source: https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-3.2.19.tgz
+        source: https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-3.2.22.tgz
         plugin: dump
         stage-packages: [libssl1.0.0]
         filesets:
@@ -81,9 +81,8 @@ parts:
     wekan:
         source: .
         plugin: nodejs
-        node-engine: 8.11.1
+        node-engine: 8.16.0
         node-packages:
-            - npm@5.5.1
             - node-gyp
             - node-pre-gyp
             - fibers@2.0.0
@@ -91,14 +90,34 @@ parts:
             - ca-certificates
             - apt-utils
             - python
+            - python3
             - g++
             - capnproto
-            - npm
             - curl
             - execstack
+            - nodejs
+            - npm
+        stage-packages:
+            - libfontconfig1
         override-build: |
             echo "Cleaning environment first"
             rm -rf ~/.meteor ~/.npm /usr/local/lib/node_modules
+            # Create the OpenAPI specification
+            rm -rf .build
+            mkdir -p .build/python
+            cd .build/python
+            git clone --depth 1 -b master https://github.com/Kronuz/esprima-python
+            cd esprima-python
+            python3 setup.py install
+            cd ../../..
+            mkdir -p ./public/api
+            python3 ./openapi/generate_openapi.py --release $(git describe --tags --abbrev=0) > ./public/api/wekan.yml
+            # we temporary need api2html and mkdirp
+            npm install -g api2html@0.3.0
+            npm install -g mkdirp
+            api2html -c ./public/logo-header.png -o ./public/api/wekan.html ./public/api/wekan.yml
+            npm uninstall -g mkdirp
+            npm uninstall -g api2html
             # Node Fibers 100% CPU usage issue:
             # https://github.com/wekan/wekan-mongodb/issues/2#issuecomment-381453161
             # https://github.com/meteor/meteor/issues/9796#issuecomment-381676326
@@ -106,53 +125,98 @@ parts:
             # Also see beginning of wekan/server/authentication.js
             #   import Fiber from "fibers";
             #   Fiber.poolSize = 1e9;
-            # Download node version 8.11.1 that has fix included, node binary copied from Sandstorm
+            # OLD: Download node version 8.12.0 prerelease build => Official node 8.12.0 has been released
             # Description at https://releases.wekan.team/node.txt
-            # SHA256SUM: 18c99d5e79e2fe91e75157a31be30e5420787213684d4048eb91e602e092725d
-            echo "18c99d5e79e2fe91e75157a31be30e5420787213684d4048eb91e602e092725d  node" >> node-SHASUMS256.txt.asc
-            curl https://releases.wekan.team/node -o node
+            ##echo "375bd8db50b9c692c0bbba6e96d4114cd29bee3770f901c1ff2249d1038f1348  node" >> node-SHASUMS256.txt.asc
+            ##curl https://releases.wekan.team/node -o node
             # Verify Fibers patched node authenticity
-            echo "Fibers 100% CPU issue patched node authenticity:"
-            grep node node-SHASUMS256.txt.asc | shasum -a 256 -c -
-            rm -f node-SHASUMS256.txt.asc
-            chmod +x node
-            mv node `which node`
+            ##echo "Fibers 100% CPU issue patched node authenticity:"
+            ##grep node node-SHASUMS256.txt.asc | shasum -a 256 -c -
+            ##rm -f node-SHASUMS256.txt.asc
+            ##chmod +x node
+            ##mv node `which node`
             # DOES NOT WORK: paxctl fix.
             # Removed from build-packages: - paxctl
             #echo "Applying paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303"
             #paxctl -mC `which node`
+            #echo "Installing npm"
+            #curl -L https://www.npmjs.com/install.sh | sh
             echo "Installing meteor"
             curl https://install.meteor.com/ -o install_meteor.sh
-            sed -i "s|RELEASE=.*|RELEASE=\"1.6.0.1\"|g" install_meteor.sh
+            #sed -i "s|RELEASE=.*|RELEASE=\"1.8.1-beta.0\"|g" install_meteor.sh
             chmod +x install_meteor.sh
             sh install_meteor.sh
             rm install_meteor.sh
-            mkdir packages
-            cd packages
-            git clone --depth 1 -b master https://github.com/wekan/flow-router.git kadira-flow-router
-            git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core
-            sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' meteor-useraccounts-core/package.js
-            cd ..
+            # REPOS BELOW ARE INCLUDED TO WEKAN REPO
+            #if [ ! -d "packages" ]; then
+            #  mkdir packages
+            #fi
+            #if [ ! -d "packages/kadira-flow-router" ]; then
+            #  cd packages
+            #  git clone --depth 1 -b master https://github.com/wekan/flow-router.git kadira-flow-router
+            #  cd ..
+            #fi
+            #if [ ! -d "packages/meteor-useraccounts-core" ]; then
+            #  cd packages
+            #  git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core
+            #  sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' meteor-useraccounts-core/package.js
+            #  cd ..
+            #fi
+            #if [ ! -d "packages/meteor-accounts-cas" ]; then
+            #  cd packages
+            #  git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git meteor-accounts-cas
+            #  cd ..
+            #fi
+            #if [ ! -d "packages/wekan-ldap" ]; then
+            #  cd packages
+            #  git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git
+            #  cd ..
+            #fi
+            #if [ ! -d "packages/wekan-scrollbar" ]; then
+            #  cd packages
+            #  git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git
+            #  cd ..
+            #fi
+            #if [ ! -d "packages/wekan_accounts-oidc" ]; then
+            #  cd packages
+            #  git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-oidc.git
+            #  mv meteor-accounts-oidc/packages/switch_accounts-oidc wekan-accounts-oidc
+            #  mv meteor-accounts-oidc/packages/switch_oidc wekan-oidc
+            #  rm -rf meteor-accounts-oidc
+            #  cd ..
+            #fi
+            #if [ ! -d "packages/markdown" ]; then
+            #  cd packages
+            #  git clone --depth 1 -b master --recurse-submodules https://github.com/wekan/markdown.git
+            #  cd ..
+            #fi
             rm -rf package-lock.json .build
             meteor add standard-minifier-js --allow-superuser
             meteor npm install --allow-superuser
             meteor build .build --directory --allow-superuser
             cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/packages/cfs_access-point.js
-            cd .build/bundle/programs/server/npm/node_modules/meteor/npm-bcrypt
-            rm -rf node_modules/bcrypt
-            meteor npm install --save bcrypt
+            #Removed binary version of bcrypt because of security vulnerability that is not fixed yet.
+            #https://github.com/wekan/wekan/commit/4b2010213907c61b0e0482ab55abb06f6a668eac
+            #https://github.com/wekan/wekan/commit/7eeabf14be3c63fae2226e561ef8a0c1390c8d3c
+            #cd .build/bundle/programs/server/npm/node_modules/meteor/npm-bcrypt
+            #rm -rf node_modules/bcrypt
+            #meteor npm install --save bcrypt
+            # Change from npm-bcrypt directory back to .build/bundle/programs/server directory.
+            #cd ../../../../
             # Change to directory .build/bundle/programs/server
-            cd ../../../../
+            cd .build/bundle/programs/server
             npm install
-            meteor npm install --save bcrypt
+            #meteor npm install --save bcrypt
             # Change back to Wekan source directory
             cd ../../../..
             cp -r .build/bundle/* $SNAPCRAFT_PART_INSTALL/
             cp .build/bundle/.node_version.txt $SNAPCRAFT_PART_INSTALL/
             rm $SNAPCRAFT_PART_INSTALL/lib/node_modules/wekan
-            execstack --clear-execstack $SNAPCRAFT_PART_INSTALL/programs/server/npm/node_modules/meteor/rajit_bootstrap3-datepicker/lib/bootstrap-datepicker/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs
+            rm $SNAPCRAFT_PART_INSTALL/programs/server/npm/node_modules/meteor/rajit_bootstrap3-datepicker/lib/bootstrap-datepicker/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs
         organize:
             README: README.wekan
+        prime:
+            - -lib/node_modules/node-pre-gyp/node_modules/tar/lib/.unpack.js.swp
 
     helpers:
         source: snap-src
@@ -160,7 +224,7 @@ parts:
 
     caddy:
         plugin: dump
-        source: https://caddyserver.com/download/linux/amd64?license=personal
+        source: https://caddyserver.com/download/linux/amd64?license=personal&telemetry=off
         source-type: tar
         organize:
           caddy: bin/caddy
diff --git a/stacksmith/user-scripts/boot.sh b/stacksmith/user-scripts/boot.sh
new file mode 100755
index 00000000..bd95102f
--- /dev/null
+++ b/stacksmith/user-scripts/boot.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+set -euxo pipefail
+
+# This file will store the config env variables needed by the app
+readonly CONF=/build/env.config
+
+# EMAIL_URL can also be set here by injecting another env variable in the template
+# ROOT_URL can also be set at runtime, by querying AWS api or by using ingress annotations in the template for k8s.
+
+cat >"${CONF}" <<'EOF'
+export MONGO_URL=mongodb://{{DATABASE_USER}}:{{DATABASE_PASSWORD}}@{{DATABASE_HOST}}:{{DATABASE_PORT}}/{{DATABASE_NAME}}
+export ROOT_URL=http://localhost
+export PORT=3000
+EOF
+
+sed -i -e "s/{{DATABASE_USER}}/${DATABASE_USER}/" "${CONF}"
+sed -i -e "s/{{DATABASE_PASSWORD}}/${DATABASE_PASSWORD}/" "${CONF}"
+sed -i -e "s/{{DATABASE_HOST}}/${DATABASE_HOST}/" "${CONF}"
+sed -i -e "s/{{DATABASE_PORT}}/${DATABASE_PORT}/" "${CONF}"
+sed -i -e "s/{{DATABASE_NAME}}/${DATABASE_NAME}/" "${CONF}"
+
diff --git a/stacksmith/user-scripts/build.sh b/stacksmith/user-scripts/build.sh
new file mode 100755
index 00000000..9363c349
--- /dev/null
+++ b/stacksmith/user-scripts/build.sh
@@ -0,0 +1,99 @@
+#!/bin/bash
+set -euxo pipefail
+
+BUILD_DEPS="bsdtar gnupg wget curl bzip2 python git ca-certificates perl-Digest-SHA"
+NODE_VERSION=v8.16.0
+#METEOR_RELEASE=1.6.0.1 - for Stacksmith, meteor-1.8 branch that could have METEOR@1.8.1-beta.8 or newer
+USE_EDGE=false
+METEOR_EDGE=1.5-beta.17
+NPM_VERSION=latest
+FIBERS_VERSION=2.0.0
+ARCHITECTURE=linux-x64
+#NODE_VERSION=v10.14.1
+
+sudo yum groupinstall -y 'Development Tools'
+sudo yum install -y http://opensource.wandisco.com/centos/7/git/x86_64/wandisco-git-release-7-2.noarch.rpm
+sudo yum install -y git
+
+sudo useradd --user-group --system --home-dir /home/wekan wekan
+sudo mkdir -p /home/wekan
+sudo chown wekan:wekan /home/wekan/
+
+# meteor-1.8 branch that has newer Meteor that is compatible with MongoDB 4.x
+sudo -u wekan git clone -b meteor-1.8 https://github.com/wekan/wekan.git /home/wekan/app
+
+# OLD: Using Meteor 1.6.x version of Wekan
+#sudo -u wekan git clone https://github.com/wekan/wekan.git /home/wekan/app
+
+sudo yum install -y ${BUILD_DEPS}
+
+# Meteor installer doesn't work with the default tar binary, so using bsdtar while installing.
+# https://github.com/coreos/bugs/issues/1095#issuecomment-350574389
+sudo cp $(which tar) $(which tar)~
+sudo ln -sf $(which bsdtar) $(which tar)
+
+# Install nodejs
+wget https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz
+wget https://nodejs.org/dist/${NODE_VERSION}/SHASUMS256.txt.asc
+
+grep ${NODE_VERSION}-${ARCHITECTURE}.tar.gz SHASUMS256.txt.asc | shasum -a 256 -c -
+
+tar xvzf node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz
+rm node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz
+sudo mv node-${NODE_VERSION}-${ARCHITECTURE} /opt/nodejs
+sudo rm -f /usr/bin/node
+sudo rm -f /usr/bin/npm
+sudo ln -s /opt/nodejs/bin/node /usr/bin/node || true
+sudo ln -s /opt/nodejs/bin/npm /usr/bin/npm || true
+
+sudo npm install -g npm@${NPM_VERSION}
+sudo npm install -g node-gyp
+sudo npm install -g --unsafe-perm fibers@${FIBERS_VERSION}
+
+cd /home/wekan
+
+#install meteor
+sudo curl "https://install.meteor.com" -o /home/wekan/install_meteor.sh
+sudo chmod +x /home/wekan/install_meteor.sh
+sudo sed -i 's/VERBOSITY="--silent"/VERBOSITY="--progress-bar"/' ./install_meteor.sh
+echo "Starting installation of "
+sudo cat /home/wekan/app/.meteor/release
+echo " ...\n"
+
+# Check if opting for a release candidate instead of major release
+if [ "$USE_EDGE" = false ]; then
+  sudo su -c '/home/wekan/install_meteor.sh' - wekan
+else
+  sudo -u wekan git clone --recursive --depth 1 -b release/METEOR@${METEOR_EDGE} https://github.com/meteor/meteor.git /home/wekan/.meteor;
+fi;
+
+# Get additional packages
+sudo mkdir -p /home/wekan/app/packages
+sudo chown wekan:wekan --recursive /home/wekan/app
+cd /home/wekan/app/packages
+sudo -u wekan git clone --depth 1 -b master https://github.com/wekan/flow-router.git kadira-flow-router
+sudo -u wekan git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core
+sudo -u wekan git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git
+sudo -u wekan git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git
+sudo -u wekan git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git
+sudo -u wekan git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-oidc.git
+sudo -u wekan mv meteor-accounts-oidc/packages/switch_accounts-oidc wekan_accounts-oidc
+sudo -u wekan mv meteor-accounts-oidc/packages/switch_oidc wekan_oidc
+sudo -u wekan rm -rf meteor-accounts-oidc
+
+sudo sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' /home/wekan/app/packages/meteor-useraccounts-core/package.js
+sudo -u wekan /home/wekan/.meteor/meteor -- help
+
+# Build app
+cd /home/wekan/app
+meteor=/home/wekan/.meteor/meteor
+sudo -u wekan ${meteor} add standard-minifier-js
+sudo -u wekan ${meteor} npm install
+sudo -u wekan ${meteor} build --directory /home/wekan/app_build
+sudo cp /home/wekan/app/fix-download-unicode/cfs_access-point.txt /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js
+sudo chown wekan:wekan /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js
+sudo rm /home/wekan/app_build/bundle/programs/server/npm/node_modules/meteor/rajit_bootstrap3-datepicker/lib/bootstrap-datepicker/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs
+cd /home/wekan/app_build/bundle/programs/server/
+sudo npm install
+sudo chown -R wekan:wekan ./node_modules
+sudo mv /home/wekan/app_build/bundle /build
diff --git a/stacksmith/user-scripts/run.sh b/stacksmith/user-scripts/run.sh
new file mode 100755
index 00000000..2aea7ea0
--- /dev/null
+++ b/stacksmith/user-scripts/run.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+set -euo pipefail
+
+readonly CONF=/build/env.config
+
+source ${CONF}
+
+# wait for DB
+check_db() {
+    mongo $MONGO_URL --eval "db.runCommand( { connectionStatus: 1} )" --quiet |  python -c 'import json,sys;obj=json.load(sys.stdin);code = 0 if obj["ok"]==1 else 1; sys.exit(code);'
+}
+until check_db; do
+    period=5
+    echo "Cannot connect to db, waiting ${period} seconds before trying again..."
+    sleep ${period}
+done
+
+cd /build
+echo "starting the wekan service..."
+node main.js
diff --git a/start-wekan.bat b/start-wekan.bat
new file mode 100755
index 00000000..d94605bb
--- /dev/null
+++ b/start-wekan.bat
@@ -0,0 +1,301 @@
+REM ------------------------------------------------------------
+
+REM NOTE: THIS .BAT DOES NOT WORK !!
+REM Use instead this webpage instructions to build on Windows:
+REM https://github.com/wekan/wekan/wiki/Install-Wekan-from-source-on-Windows
+REM Please add fix PRs, like config of MongoDB etc.
+
+REM ------------------------------------------------------------
+
+REM # Debug OIDC OAuth2 etc.
+REM SET DEBUG=true
+
+REM ------------------------------------------------------------
+
+SET MONGO_URL=mongodb://127.0.0.1:27017/wekan
+SET ROOT_URL=http://127.0.0.1:2000/
+SET MAIL_URL=smtp://user:pass@mailserver.example.com:25/
+SET MAIL_FROM=admin@example.com
+SET PORT=2000
+
+REM # If you disable Wekan API with false, Export Board does not work.
+SET WITH_API=true
+
+REM # ==== PASSWORD BRUTE FORCE PROTECTION ====
+REM #https://atmospherejs.com/lucasantoniassi/accounts-lockout
+REM #Defaults below. Uncomment to change. wekan/server/accounts-lockout.js
+REM SET ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE=3
+REM SET ACCOUNTS_LOCKOUT_KNOWN_USERS_PERIOD=60
+REM SET ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURE_WINDOW=15
+REM SET ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURES_BERORE=3
+REM SET ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD=60
+REM SET ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW=15
+
+REM # Optional: Integration with Matomo https://matomo.org that is installed to your server
+REM # The address of the server where Matomo is hosted.
+REM # example: - MATOMO_ADDRESS=https://example.com/matomo
+REM SET MATOMO_ADDRESS=
+
+REM # The value of the site ID given in Matomo server for Wekan
+REM # example: - MATOMO_SITE_ID=12345
+REM SET MATOMO_SITE_ID=
+
+REM # The option do not track which enables users to not be tracked by matomo
+REM # example:  - MATOMO_DO_NOT_TRACK=false
+REM SET MATOMO_DO_NOT_TRACK=
+
+REM # The option that allows matomo to retrieve the username:
+REM # example: MATOMO_WITH_USERNAME=true
+REM SET MATOMO_WITH_USERNAME=false
+
+REM # Enable browser policy and allow one trusted URL that can have iframe that has Wekan embedded inside.
+REM # Setting this to false is not recommended, it also disables all other browser policy protections
+REM # and allows all iframing etc. See wekan/server/policy.js
+SET BROWSER_POLICY_ENABLED=true
+
+REM # When browser policy is enabled, HTML code at this Trusted URL can have iframe that embeds Wekan inside.
+REM SET TRUSTED_URL=
+
+REM # What to send to Outgoing Webhook, or leave out. Example, that includes all that are default: cardId,listId,oldListId,boardId,comment,user,card,commentId .
+REM # example: WEBHOOKS_ATTRIBUTES=cardId,listId,oldListId,boardId,comment,user,card,commentId
+REM SET WEBHOOKS_ATTRIBUTES=
+
+REM ------------------------------------------------------------
+
+REM # Enable the OAuth2 connection
+REM # OAuth2 docs: https://github.com/wekan/wekan/wiki/OAuth2
+REM # example: OAUTH2_ENABLED=true
+REM SET OAUTH2_ENABLED=false
+
+REM # OAuth2 Client ID, for example from Rocket.Chat. Example: abcde12345
+REM # example: OAUTH2_CLIENT_ID=abcde12345
+REM SET OAUTH2_CLIENT_ID=
+
+REM # OAuth2 Secret, for example from Rocket.Chat: Example: 54321abcde
+REM # example: OAUTH2_SECRET=54321abcde
+REM SET OAUTH2_SECRET=
+
+REM # OAuth2 Server URL, for example Rocket.Chat. Example: https://chat.example.com
+REM # example: OAUTH2_SERVER_URL=https://chat.example.com
+REM SET OAUTH2_SERVER_URL=
+
+REM # OAuth2 Authorization Endpoint. Example: /oauth/authorize
+REM # example: OAUTH2_AUTH_ENDPOINT=/oauth/authorize
+REM SET OAUTH2_AUTH_ENDPOINT=
+
+REM # OAuth2 Userinfo Endpoint. Example: /oauth/userinfo
+REM # example: OAUTH2_USERINFO_ENDPOINT=/oauth/userinfo
+REM SET OAUTH2_USERINFO_ENDPOINT=
+
+REM # OAuth2 Token Endpoint. Example: /oauth/token
+REM # example: OAUTH2_TOKEN_ENDPOINT=/oauth/token
+REM SET OAUTH2_TOKEN_ENDPOINT=
+
+REM ------------------------------------------------------------
+
+REM # LDAP_ENABLE : Enable or not the connection by the LDAP
+REM # example : LDAP_ENABLE=true
+REM SET LDAP_ENABLE=false
+
+REM # LDAP_PORT : The port of the LDAP server
+REM # example : LDAP_PORT=389
+REM SET LDAP_PORT=389
+
+REM # LDAP_HOST : The host server for the LDAP server
+REM # example : LDAP_HOST=localhost
+REM SET LDAP_HOST=
+
+REM # LDAP_BASEDN : The base DN for the LDAP Tree
+REM # example : LDAP_BASEDN=ou=user,dc=example,dc=org
+REM SET LDAP_BASEDN=
+
+REM # LDAP_LOGIN_FALLBACK : Fallback on the default authentication method
+REM # example : LDAP_LOGIN_FALLBACK=true
+REM SET LDAP_LOGIN_FALLBACK=false
+
+REM # LDAP_RECONNECT : Reconnect to the server if the connection is lost
+REM # example : LDAP_RECONNECT=false
+REM SET LDAP_RECONNECT=true
+
+REM # LDAP_TIMEOUT : Overall timeout, in milliseconds
+REM # example : LDAP_TIMEOUT=12345
+REM SET LDAP_TIMEOUT=10000
+
+REM # LDAP_IDLE_TIMEOUT : Specifies the timeout for idle LDAP connections in milliseconds
+REM # example : LDAP_IDLE_TIMEOUT=12345
+REM SET LDAP_IDLE_TIMEOUT=10000
+
+REM # LDAP_CONNECT_TIMEOUT : Connection timeout, in milliseconds
+REM # example : LDAP_CONNECT_TIMEOUT=12345
+REM SET LDAP_CONNECT_TIMEOUT=10000
+
+REM # LDAP_AUTHENTIFICATION : If the LDAP needs a user account to search
+REM # example : LDAP_AUTHENTIFICATION=true
+REM SET LDAP_AUTHENTIFICATION=false
+
+REM # LDAP_AUTHENTIFICATION_USERDN : The search user DN
+REM # example: LDAP_AUTHENTIFICATION_USERDN=cn=admin,dc=example,dc=org
+REM SET LDAP_AUTHENTIFICATION_USERDN=
+
+REM # LDAP_AUTHENTIFICATION_PASSWORD : The password for the search user
+REM # example : AUTHENTIFICATION_PASSWORD=admin
+REM SET LDAP_AUTHENTIFICATION_PASSWORD=
+
+REM # LDAP_LOG_ENABLED : Enable logs for the module
+REM # example : LDAP_LOG_ENABLED=true
+REM SET LDAP_LOG_ENABLED=false
+
+REM # LDAP_BACKGROUND_SYNC : If the sync of the users should be done in the background
+REM # example : LDAP_BACKGROUND_SYNC=true
+REM SET LDAP_BACKGROUND_SYNC=false
+
+REM # LDAP_BACKGROUND_SYNC_INTERVAL : At which interval does the background task sync in milliseconds
+REM # example : LDAP_BACKGROUND_SYNC_INTERVAL=12345
+REM SET LDAP_BACKGROUND_SYNC_INTERVAL=100
+
+REM # LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED :
+REM # example : LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED=true
+REM SET LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED=false
+
+REM # LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS :
+REM # example : LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=true
+REM SET LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=false
+
+REM # LDAP_ENCRYPTION : If using LDAPS
+REM # example : LDAP_ENCRYPTION=ssl
+REM SET LDAP_ENCRYPTION=false
+
+REM # LDAP_CA_CERT : The certification for the LDAPS server. Certificate needs to be included in this docker-compose.yml file.
+REM # example : LDAP_CA_CERT=-----BEGIN CERTIFICATE-----MIIE+zCCA+OgAwIBAgIkAhwR/6TVLmdRY6hHxvUFWc0+Enmu/Hu6cj+G2FIdAgIC...-----END CERTIFICATE-----
+REM SET LDAP_CA_CERT=
+
+REM # LDAP_REJECT_UNAUTHORIZED : Reject Unauthorized Certificate
+REM # example : LDAP_REJECT_UNAUTHORIZED=true
+REM SET LDAP_REJECT_UNAUTHORIZED=false
+
+REM # LDAP_USER_SEARCH_FILTER : Optional extra LDAP filters. Don't forget the outmost enclosing parentheses if needed
+REM # example : LDAP_USER_SEARCH_FILTER=
+REM SET LDAP_USER_SEARCH_FILTER=
+
+REM # LDAP_USER_SEARCH_SCOPE : base (search only in the provided DN), one (search only in the provided DN and one level deep), or sub (search the whole subtree)
+REM # example : LDAP_USER_SEARCH_SCOPE=one
+REM SET LDAP_USER_SEARCH_SCOPE=
+
+REM # LDAP_USER_SEARCH_FIELD : Which field is used to find the user
+REM # example : LDAP_USER_SEARCH_FIELD=uid
+REM SET LDAP_USER_SEARCH_FIELD=
+
+REM # LDAP_SEARCH_PAGE_SIZE : Used for pagination (0=unlimited)
+REM # example : LDAP_SEARCH_PAGE_SIZE=12345
+REM SET LDAP_SEARCH_PAGE_SIZE=0
+
+REM # LDAP_SEARCH_SIZE_LIMIT : The limit number of entries (0=unlimited)
+REM #33 example : LDAP_SEARCH_SIZE_LIMIT=12345
+REM SET LDAP_SEARCH_SIZE_LIMIT=0
+
+REM # LDAP_GROUP_FILTER_ENABLE : Enable group filtering
+REM # example : LDAP_GROUP_FILTER_ENABLE=true
+REM SET LDAP_GROUP_FILTER_ENABLE=false
+
+REM # LDAP_GROUP_FILTER_OBJECTCLASS : The object class for filtering
+REM # example : LDAP_GROUP_FILTER_OBJECTCLASS=group
+REM SET LDAP_GROUP_FILTER_OBJECTCLASS=
+
+REM # LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE :
+REM # example :
+REM SET LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE=
+
+REM # LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE :
+REM # example :
+REM SET LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE=
+
+REM # LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT :
+REM # example :
+REM SET LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT=
+
+REM # LDAP_GROUP_FILTER_GROUP_NAME :
+REM # example :
+REM SET LDAP_GROUP_FILTER_GROUP_NAME=
+
+REM # LDAP_UNIQUE_IDENTIFIER_FIELD : This field is sometimes class GUID (Globally Unique Identifier)
+REM # example : LDAP_UNIQUE_IDENTIFIER_FIELD=guid
+REM SET LDAP_UNIQUE_IDENTIFIER_FIELD=
+
+REM # LDAP_UTF8_NAMES_SLUGIFY : Convert the username to utf8
+REM # example : LDAP_UTF8_NAMES_SLUGIFY=false
+REM SET LDAP_UTF8_NAMES_SLUGIFY=true
+
+REM # LDAP_USERNAME_FIELD : Which field contains the ldap username
+REM # example : LDAP_USERNAME_FIELD=username
+REM SET LDAP_USERNAME_FIELD=
+
+REM # LDAP_MERGE_EXISTING_USERS :
+REM # example : LDAP_MERGE_EXISTING_USERS=true
+REM SET LDAP_MERGE_EXISTING_USERS=false
+
+REM # LDAP_EMAIL_MATCH_ENABLE : allow existing account matching by e-mail address when username does not match
+REM # example: LDAP_EMAIL_MATCH_ENABLE=true
+REM SET LDAP_EMAIL_MATCH_ENABLE=false
+
+REM # LDAP_EMAIL_MATCH_REQUIRE : require existing account matching by e-mail address when username does match
+REM # example: LDAP_EMAIL_MATCH_REQUIRE=true
+REM SET LDAP_EMAIL_MATCH_REQUIRE=false
+
+REM # LDAP_EMAIL_MATCH_VERIFIED : require existing account email address to be verified for matching
+REM # example: LDAP_EMAIL_MATCH_VERIFIED=true
+REM SET LDAP_EMAIL_MATCH_VERIFIED=false
+
+REM # LDAP_EMAIL_FIELD : which field contains the LDAP e-mail address
+REM # example: LDAP_EMAIL_FIELD=mail
+REM SET LDAP_EMAIL_FIELD=
+
+REM # LDAP_SYNC_USER_DATA :
+REM # example : LDAP_SYNC_USER_DATA=true
+REM SET LDAP_SYNC_USER_DATA=false
+
+REM # LDAP_SYNC_USER_DATA_FIELDMAP :
+REM # example : LDAP_SYNC_USER_DATA_FIELDMAP={"cn":"name", "mail":"email"}
+REM SET LDAP_SYNC_USER_DATA_FIELDMAP=
+
+REM # LDAP_SYNC_GROUP_ROLES :
+REM # example :
+REM # SET LDAP_SYNC_GROUP_ROLES=
+
+REM # LDAP_DEFAULT_DOMAIN : The default domain of the ldap it is used to create email if the field is not map correctly with the LDAP_SYNC_USER_DATA_FIELDMAP
+REM # example :
+REM SET LDAP_DEFAULT_DOMAIN=
+
+REM # Enable/Disable syncing of admin status based on ldap groups:
+REM SET LDAP_SYNC_ADMIN_STATUS=true
+
+REM # Comma separated list of admin group names to sync.
+REM SET LDAP_SYNC_ADMIN_GROUPS=group1,group2
+
+REM # Login to LDAP automatically with HTTP header.
+REM # In below example for siteminder, at right side of = is header name.
+REM SET HEADER_LOGIN_ID=HEADERUID
+REM SET HEADER_LOGIN_FIRSTNAME=HEADERFIRSTNAME
+REM SET HEADER_LOGIN_LASTNAME=HEADERLASTNAME
+REM SET HEADER_LOGIN_EMAIL=HEADEREMAILADDRESS
+
+REM ------------------------------------------------
+
+REM # LOGOUT_WITH_TIMER : Enables or not the option logout with timer
+REM # example : LOGOUT_WITH_TIMER=true
+REM SET LOGOUT_WITH_TIMER=
+
+REM # LOGOUT_IN : The number of days
+REM # example : LOGOUT_IN=1
+REM SET LOGOUT_IN=
+
+REM # LOGOUT_ON_HOURS : The number of hours
+REM # example : LOGOUT_ON_HOURS=9
+REM SET LOGOUT_ON_HOURS=
+
+REM # LOGOUT_ON_MINUTES : The number of minutes
+REM # example : LOGOUT_ON_MINUTES=55
+REM SET LOGOUT_ON_MINUTES=
+
+cd .build\bundle
+node main.js
+cd ..\..
diff --git a/start-wekan.sh b/start-wekan.sh
new file mode 100755
index 00000000..931494d0
--- /dev/null
+++ b/start-wekan.sh
@@ -0,0 +1,311 @@
+#!/bin/bash
+
+function wekan_repo_check(){
+      git_remotes="$(git remote show 2>/dev/null)"
+      res=""
+      for i in $git_remotes; do
+            res="$(git remote get-url $i | sed 's/.*wekan\/wekan.*/wekan\/wekan/')"
+            if [[ "$res" == "wekan/wekan" ]]; then
+                break
+            fi
+      done
+
+      if [[ "$res" != "wekan/wekan" ]]; then
+            echo "$PWD is not a wekan repository"
+            exit;
+      fi
+}
+
+# If you want to restart even on crash, uncomment while and done lines.
+#while true; do
+      wekan_repo_check
+      cd .build/bundle
+      #---------------------------------------------
+      # Debug OIDC OAuth2 etc.
+      #export DEBUG=true
+      #---------------------------------------------
+      export MONGO_URL='mongodb://127.0.0.1:27019/wekan'
+      #---------------------------------------------
+      # Production: https://example.com/wekan
+      # Local: http://localhost:2000
+      #export ipaddress=$(ifdata -pa eth0)
+      export ROOT_URL='http://localhost:2000'
+      #---------------------------------------------
+      # https://github.com/wekan/wekan/wiki/Troubleshooting-Mail
+      # https://github.com/wekan/wekan-mongodb/blob/master/docker-compose.yml
+      export MAIL_URL='smtp://user:pass@mailserver.example.com:25/'
+      #---------------------------------------------
+      #export KADIRA_OPTIONS_ENDPOINT=http://127.0.0.1:11011
+      #---------------------------------------------
+      # This is local port where Wekan Node.js runs, same as below on Caddyfile settings.
+      export PORT=2000
+      #---------------------------------------------
+      # Wekan Export Board works when WITH_API=true.
+      # If you disable Wekan API with false, Export Board does not work.
+      export WITH_API='true'
+      #---------------------------------------------------------------
+      # ==== PASSWORD BRUTE FORCE PROTECTION ====
+      #https://atmospherejs.com/lucasantoniassi/accounts-lockout
+      #Defaults below. Uncomment to change. wekan/server/accounts-lockout.js
+      #export ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE=3
+      #export ACCOUNTS_LOCKOUT_KNOWN_USERS_PERIOD=60
+      #export ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURE_WINDOW=15
+      #export ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURES_BERORE=3
+      #export ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD=60
+      #export ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW=15
+      #---------------------------------------------
+      # CORS: Set Access-Control-Allow-Origin header. Example: *
+      #export CORS=*
+      #---------------------------------------------
+      ## Optional: Integration with Matomo https://matomo.org that is installed to your server
+      ## The address of the server where Matomo is hosted:
+      ##export MATOMO_ADDRESS=https://example.com/matomo
+      #export MATOMO_ADDRESS=
+      ## The value of the site ID given in Matomo server for Wekan
+      # Example: export MATOMO_SITE_ID=123456789
+      #export MATOMO_SITE_ID=''
+      ## The option do not track which enables users to not be tracked by matomo"
+      #Example: export MATOMO_DO_NOT_TRACK=false
+      #export MATOMO_DO_NOT_TRACK=true
+      ## The option that allows matomo to retrieve the username:
+      # Example: export MATOMO_WITH_USERNAME=true
+      #export MATOMO_WITH_USERNAME='false'
+      # Enable browser policy and allow one trusted URL that can have iframe that has Wekan embedded inside.
+      # Setting this to false is not recommended, it also disables all other browser policy protections
+      # and allows all iframing etc. See wekan/server/policy.js
+      # Default value: true
+      export BROWSER_POLICY_ENABLED=true
+      # When browser policy is enabled, HTML code at this Trusted URL can have iframe that embeds Wekan inside.
+      # Example: export TRUSTED_URL=http://example.com
+      export TRUSTED_URL=''
+      # What to send to Outgoing Webhook, or leave out. Example, that includes all that are default: cardId,listId,oldListId,boardId,comment,user,card,commentId .
+      # Example: export WEBHOOKS_ATTRIBUTES=cardId,listId,oldListId,boardId,comment,user,card,commentId
+      export WEBHOOKS_ATTRIBUTES=''
+      #---------------------------------------------
+      # ==== OAUTH2 AZURE ====
+      # https://github.com/wekan/wekan/wiki/Azure
+      # 1) Register the application with Azure. Make sure you capture
+      #    the application ID as well as generate a secret key.
+      # 2) Configure the environment variables. This differs slightly
+      #     by installation type, but make sure you have the following:
+      #export OAUTH2_ENABLED=true
+      # OAuth2 docs: https://github.com/wekan/wekan/wiki/OAuth2
+      # OAuth2 login style: popup or redirect.
+      #export OAUTH2_LOGIN_STYLE=redirect
+      # Application GUID captured during app registration:
+      #export OAUTH2_CLIENT_ID=xxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxx
+      # Secret key generated during app registration:
+      #export OAUTH2_SECRET=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+      #export OAUTH2_SERVER_URL=https://login.microsoftonline.com/
+      #export OAUTH2_AUTH_ENDPOINT=/oauth2/v2.0/authorize
+      #export OAUTH2_USERINFO_ENDPOINT=https://graph.microsoft.com/oidc/userinfo
+      #export OAUTH2_TOKEN_ENDPOINT=/oauth2/v2.0/token
+      # The claim name you want to map to the unique ID field:
+      #export OAUTH2_ID_MAP=email
+      # The claim name you want to map to the username field:
+      #export OAUTH2_USERNAME_MAP=email
+      # The claim name you want to map to the full name field:
+      #export OAUTH2_FULLNAME_MAP=name
+      # The claim name you want to map to the email field:
+      #export OAUTH2_EMAIL_MAP=email
+      #-----------------------------------------------------------------
+      # ==== OAUTH2 KEYCLOAK ====
+      # https://github.com/wekan/wekan/wiki/Keycloak  <== MAPPING INFO, REQUIRED
+      #export OAUTH2_ENABLED=true
+      # OAuth2 login style: popup or redirect.
+      #export OAUTH2_LOGIN_STYLE=redirect
+      #export OAUTH2_CLIENT_ID=<Keycloak create Client ID>
+      #export OAUTH2_SERVER_URL=<Keycloak server name>/auth
+      #export OAUTH2_AUTH_ENDPOINT=/realms/<keycloak realm>/protocol/openid-connect/auth
+      #export OAUTH2_USERINFO_ENDPOINT=/realms/<keycloak realm>/protocol/openid-connect/userinfo
+      #export OAUTH2_TOKEN_ENDPOINT=/realms/<keycloak realm>/protocol/openid-connect/token
+      #export OAUTH2_SECRET=<keycloak client secret>
+      #-----------------------------------------------------------------
+      # ==== OAUTH2 DOORKEEPER ====
+      # OAuth2 docs: https://github.com/wekan/wekan/wiki/OAuth2
+      # https://github.com/wekan/wekan/issues/1874
+      # https://github.com/wekan/wekan/wiki/OAuth2
+      # Enable the OAuth2 connection
+      #export OAUTH2_ENABLED=true
+      # OAuth2 login style: popup or redirect.
+      #export OAUTH2_LOGIN_STYLE=redirect
+      # OAuth2 Client ID.
+      #export OAUTH2_CLIENT_ID=abcde12345
+      # OAuth2 Secret.
+      #export OAUTH2_SECRET=54321abcde
+      # OAuth2 Server URL.
+      #export OAUTH2_SERVER_URL=https://chat.example.com
+      # OAuth2 Authorization Endpoint.
+      #export OAUTH2_AUTH_ENDPOINT=/oauth/authorize
+      # OAuth2 Userinfo Endpoint.
+      #export OAUTH2_USERINFO_ENDPOINT=/oauth/userinfo
+      # OAuth2 Token Endpoint.
+      #export OAUTH2_TOKEN_ENDPOINT=/oauth/token
+      # OAuth2 ID Mapping
+      #export OAUTH2_ID_MAP=
+      # OAuth2 Username Mapping
+      #export OAUTH2_USERNAME_MAP=
+      # OAuth2 Fullname Mapping
+      #export OAUTH2_FULLNAME_MAP=
+      # OAuth2 Email Mapping
+      #export OAUTH2_EMAIL_MAP=
+      #---------------------------------------------
+      # LDAP_ENABLE : Enable or not the connection by the LDAP
+      # example :  export LDAP_ENABLE=true
+      #export LDAP_ENABLE=false
+      # LDAP_PORT : The port of the LDAP server
+      # example :  export LDAP_PORT=389
+      #export LDAP_PORT=389
+      # LDAP_HOST : The host server for the LDAP server
+      # example :  export LDAP_HOST=localhost
+      #export LDAP_HOST=
+      # LDAP_BASEDN : The base DN for the LDAP Tree
+      # example :  export LDAP_BASEDN=ou=user,dc=example,dc=org
+      #export LDAP_BASEDN=
+      # LDAP_LOGIN_FALLBACK : Fallback on the default authentication method
+      # example :  export LDAP_LOGIN_FALLBACK=true
+      #export LDAP_LOGIN_FALLBACK=false
+      # LDAP_RECONNECT : Reconnect to the server if the connection is lost
+      # example :  export LDAP_RECONNECT=false
+      #export LDAP_RECONNECT=true
+      # LDAP_TIMEOUT : Overall timeout, in milliseconds
+      # example :  export LDAP_TIMEOUT=12345
+      #export LDAP_TIMEOUT=10000
+      # LDAP_IDLE_TIMEOUT : Specifies the timeout for idle LDAP connections in milliseconds
+      # example :  export LDAP_IDLE_TIMEOUT=12345
+      #export LDAP_IDLE_TIMEOUT=10000
+      # LDAP_CONNECT_TIMEOUT : Connection timeout, in milliseconds
+      # example :  export LDAP_CONNECT_TIMEOUT=12345
+      #export LDAP_CONNECT_TIMEOUT=10000
+      # LDAP_AUTHENTIFICATION : If the LDAP needs a user account to search
+      # example :  export LDAP_AUTHENTIFICATION=true
+      #export LDAP_AUTHENTIFICATION=false
+      # LDAP_AUTHENTIFICATION_USERDN : The search user DN
+      # example :  export LDAP_AUTHENTIFICATION_USERDN=cn=admin,dc=example,dc=org
+      #export LDAP_AUTHENTIFICATION_USERDN=
+      # LDAP_AUTHENTIFICATION_PASSWORD : The password for the search user
+      # example : AUTHENTIFICATION_PASSWORD=admin
+      #export LDAP_AUTHENTIFICATION_PASSWORD=
+      # LDAP_LOG_ENABLED : Enable logs for the module
+      # example :  export LDAP_LOG_ENABLED=true
+      #export LDAP_LOG_ENABLED=false
+      # LDAP_BACKGROUND_SYNC : If the sync of the users should be done in the background
+      # example :  export LDAP_BACKGROUND_SYNC=true
+      #export LDAP_BACKGROUND_SYNC=false
+      # LDAP_BACKGROUND_SYNC_INTERVAL : At which interval does the background task sync in milliseconds
+      # example :  export LDAP_BACKGROUND_SYNC_INTERVAL=12345
+      #export LDAP_BACKGROUND_SYNC_INTERVAL=100
+      # LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED :
+      # example :  export LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED=true
+      #export LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED=false
+      # LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS :
+      # example :  export LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=true
+      #export LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=false
+      # LDAP_ENCRYPTION : If using LDAPS
+      # example :  export LDAP_ENCRYPTION=ssl
+      #export LDAP_ENCRYPTION=false
+      # LDAP_CA_CERT : The certification for the LDAPS server. Certificate needs to be included in this docker-compose.yml file.
+      # example :  export LDAP_CA_CERT=-----BEGIN CERTIFICATE-----MIIE+zCCA+OgAwIBAgIkAhwR/6TVLmdRY6hHxvUFWc0+Enmu/Hu6cj+G2FIdAgIC...-----END CERTIFICATE-----
+      #export LDAP_CA_CERT=
+      # LDAP_REJECT_UNAUTHORIZED : Reject Unauthorized Certificate
+      # example :  export LDAP_REJECT_UNAUTHORIZED=true
+      #export LDAP_REJECT_UNAUTHORIZED=false
+      # LDAP_USER_SEARCH_FILTER : Optional extra LDAP filters. Don't forget the outmost enclosing parentheses if needed
+      # example :  export LDAP_USER_SEARCH_FILTER=
+      #export LDAP_USER_SEARCH_FILTER=
+      # LDAP_USER_SEARCH_SCOPE : base (search only in the provided DN), one (search only in the provided DN and one level deep), or sub (search the whole subtree)
+      # example :  export LDAP_USER_SEARCH_SCOPE=one
+      #export LDAP_USER_SEARCH_SCOPE=
+      # LDAP_USER_SEARCH_FIELD : Which field is used to find the user
+      # example :  export LDAP_USER_SEARCH_FIELD=uid
+      #export LDAP_USER_SEARCH_FIELD=
+      # LDAP_SEARCH_PAGE_SIZE : Used for pagination (0=unlimited)
+      # example :  export LDAP_SEARCH_PAGE_SIZE=12345
+      #export LDAP_SEARCH_PAGE_SIZE=0
+      # LDAP_SEARCH_SIZE_LIMIT : The limit number of entries (0=unlimited)
+      # example :  export LDAP_SEARCH_SIZE_LIMIT=12345
+      #export LDAP_SEARCH_SIZE_LIMIT=0
+      # LDAP_GROUP_FILTER_ENABLE : Enable group filtering
+      # example :  export LDAP_GROUP_FILTER_ENABLE=true
+      #export LDAP_GROUP_FILTER_ENABLE=false
+      # LDAP_GROUP_FILTER_OBJECTCLASS : The object class for filtering
+      # example :  export LDAP_GROUP_FILTER_OBJECTCLASS=group
+      #export LDAP_GROUP_FILTER_OBJECTCLASS=
+      # LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE :
+      # example :
+      #export LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE=
+      # LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE :
+      # example :
+      #export LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE=
+      # LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT :
+      # example :
+      #export LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT=
+      # LDAP_GROUP_FILTER_GROUP_NAME :
+      # example :
+      #export LDAP_GROUP_FILTER_GROUP_NAME=
+      # LDAP_UNIQUE_IDENTIFIER_FIELD : This field is sometimes class GUID (Globally Unique Identifier)
+      # example :  export LDAP_UNIQUE_IDENTIFIER_FIELD=guid
+      #export LDAP_UNIQUE_IDENTIFIER_FIELD=
+      # LDAP_UTF8_NAMES_SLUGIFY : Convert the username to utf8
+      # example :  export LDAP_UTF8_NAMES_SLUGIFY=false
+      #export LDAP_UTF8_NAMES_SLUGIFY=true
+      # LDAP_USERNAME_FIELD : Which field contains the ldap username
+      # example :  export LDAP_USERNAME_FIELD=username
+      #export LDAP_USERNAME_FIELD=
+      # LDAP_FULLNAME_FIELD : Which field contains the ldap fullname
+      # example :  export LDAP_FULLNAME_FIELD=fullname
+      #export LDAP_FULLNAME_FIELD=
+      # LDAP_MERGE_EXISTING_USERS :
+      # example :  export LDAP_MERGE_EXISTING_USERS=true
+      #export LDAP_MERGE_EXISTING_USERS=false
+      # LDAP_EMAIL_MATCH_ENABLE : allow existing account matching by e-mail address when username does not match
+      # example: LDAP_EMAIL_MATCH_ENABLE=true
+      #export LDAP_EMAIL_MATCH_ENABLE=false
+      # LDAP_EMAIL_MATCH_REQUIRE : require existing account matching by e-mail address when username does match
+      # example: LDAP_EMAIL_MATCH_REQUIRE=true
+      #export LDAP_EMAIL_MATCH_REQUIRE=false
+      # LDAP_EMAIL_MATCH_VERIFIED : require existing account email address to be verified for matching
+      # example: LDAP_EMAIL_MATCH_VERIFIED=true
+      #export LDAP_EMAIL_MATCH_VERIFIED=false
+      # LDAP_EMAIL_FIELD : which field contains the LDAP e-mail address
+      # example: LDAP_EMAIL_FIELD=mail
+      #export LDAP_EMAIL_FIELD=
+      # LDAP_SYNC_USER_DATA :
+      # example :  export LDAP_SYNC_USER_DATA=true
+      #export LDAP_SYNC_USER_DATA=false
+      # LDAP_SYNC_USER_DATA_FIELDMAP :
+      # example :  export LDAP_SYNC_USER_DATA_FIELDMAP={"cn":"name", "mail":"email"}
+      #export LDAP_SYNC_USER_DATA_FIELDMAP=
+      # LDAP_SYNC_GROUP_ROLES :
+      # example :
+      #export LDAP_SYNC_GROUP_ROLES=
+      # LDAP_DEFAULT_DOMAIN : The default domain of the ldap it is used to create email if the field is not map correctly with the LDAP_SYNC_USER_DATA_FIELDMAP
+      # example :
+      #export LDAP_DEFAULT_DOMAIN=
+      # Enable/Disable syncing of admin status based on ldap groups:
+      #export LDAP_SYNC_ADMIN_STATUS=true
+      # Comma separated list of admin group names to sync.
+      #export LDAP_SYNC_ADMIN_GROUPS=group1,group2
+      #---------------------------------------------------------------------
+      # Login to LDAP automatically with HTTP header.
+      # In below example for siteminder, at right side of = is header name.
+      #export HEADER_LOGIN_ID=HEADERUID
+      #export HEADER_LOGIN_FIRSTNAME=HEADERFIRSTNAME
+      #export HEADER_LOGIN_LASTNAME=HEADERLASTNAME
+      #export HEADER_LOGIN_EMAIL=HEADEREMAILADDRESS
+      #---------------------------------------------------------------------
+      # LOGOUT_WITH_TIMER : Enables or not the option logout with timer
+      # example : LOGOUT_WITH_TIMER=true
+      #export LOGOUT_WITH_TIMER=
+      # LOGOUT_IN : The number of days
+      # example : LOGOUT_IN=1
+      #export LOGOUT_IN=
+      #export LOGOUT_ON_HOURS=
+      # LOGOUT_ON_MINUTES : The number of minutes
+      # example : LOGOUT_ON_MINUTES=55
+      #export LOGOUT_ON_MINUTES=
+
+      node main.js
+      # & >> ../../wekan.log
+      cd ../..
+#done
diff --git a/status-wekan.sh b/status-wekan.sh
new file mode 100755
index 00000000..3b0f232d
--- /dev/null
+++ b/status-wekan.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+echo -e "\nWekan node.js:"
+ps aux | grep "node main.js" | grep -v grep
+echo -e "\nWekan mongodb:"
+ps aux | grep mongo | grep -v grep
+echo -e "\nWekan logs are at $PWD/wekan.log\n"
diff --git a/stop-wekan.sh b/stop-wekan.sh
new file mode 100755
index 00000000..8865a83a
--- /dev/null
+++ b/stop-wekan.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+pkill -f "node main.js"
diff --git a/torodb-postgresql/CHANGELOG.md b/torodb-postgresql/CHANGELOG.md
new file mode 100644
index 00000000..2f7b98c7
--- /dev/null
+++ b/torodb-postgresql/CHANGELOG.md
@@ -0,0 +1,72 @@
+# v0.9 2018-12-22
+
+* Update docker-compose.yml:
+  * Add more docs and environment settings
+  * Add latest Wekan and ToroDB.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v0.8 2018-08-25
+
+* Add OAuth2.
+
+Thanks to GitHub users salleman33 and xet7 for their contributions.
+
+# v0.7 2018-08-22
+
+* Add browser-policy, trusted-url and webhooks-settings.
+
+Thanks to GitHub users omarsy and xet7 for their contribution.
+
+# v0.6 2018-08-03
+
+* Update wekan-app container internal port to 8080.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v0.5 2018-08-01
+
+* Enable Wekan API by default, so that Export Board works.
+* Add Matomo options.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v0.4 2017-08-18
+
+This release fixes following bugs:
+
+* [ToroDB exits because of compound indexes not supported](https://github.com/torodb/stampede/issues/202).
+
+Thanks to GitHub user teoincontatto for contributions.
+
+# v0.3 2017-05-18
+
+This release adds following new features:
+
+* Use latest tag of Docker image.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v0.2 2017-04-06
+
+This release adds following new features:
+
+* Use Meteor 1.4 based Docker image.
+
+Thanks to GitHub users brylie and stephenmoloney for
+their contributions.
+
+MongoDB is kept at 3.2 because ToroDB is compatible
+with it.
+
+# v0.1 2017-02-13
+
+This release adds following new features:
+
+* Wekan <=> MongoDB <=> ToroDB => PostgreSQL read-only
+  mirroring for SQL access with any programming language
+  or Office package that has PostgreSQL support, like
+  newest LibreOffice 3.5.
+
+Thanks to GitHub users mquandalle, stephenmoloney and xet7
+for their contributions.
diff --git a/torodb-postgresql/LICENSE b/torodb-postgresql/LICENSE
new file mode 100644
index 00000000..eb38072c
--- /dev/null
+++ b/torodb-postgresql/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017-2019 The Wekan team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/torodb-postgresql/README.md b/torodb-postgresql/README.md
new file mode 100644
index 00000000..6e8decdb
--- /dev/null
+++ b/torodb-postgresql/README.md
@@ -0,0 +1,56 @@
+# Docker: Wekan to PostgreSQL read-only mirroring
+
+* [Wekan kanban board, made with Meteor.js framework, running on
+  Node.js](https://wekan.github.io) -- [GitHub](https://github.com/wekan/wekan)
+* [MongoDB NoSQL database](https://www.mongodb.com)
+* [ToroDB: MongoDB to PostgreSQL read-only mirroring, programmed with Java](https://www.8kdata.com/products) --
+  [GitHub](https://github.com/torodb/stampede) --
+  [Interview at FLOSS Weekly](https://twit.tv/shows/floss-weekly/episodes/377)
+* [LibreOffice with native PostgreSQL support](https://www.libreoffice.org)
+
+## Screenshot
+
+![Screenshot of PostgreSQL with LibreOffice][screenshot]
+
+## Install
+
+1) Install docker-compose.
+
+2) Clone this repo.
+
+```bash
+git clone https://github.com/wekan/wekan-postgresql.git
+cd wekan-postgresql
+```
+
+3) IMPORTANT: In docker-compose.yml, to use Wekan on local network, change ROOT_URL=http://localhost to http://IPADRESS like http://192.168.10.100 or http://example.com
+
+4) OPTIONAL: In docker-compose.yml, change PostgreSQL database name, username and password from wekan to something else.
+
+5) Write:
+
+```bash
+docker-compose up -d
+```
+
+6) Wekan is at http://IPADDRESS or http://example.com (port 80)
+
+7) PostgreSQL connection URL for LibreOffice is `dbname=wekan hostaddr=127.0.0.1 port=15432 user=wekan password=wekan`.
+   In some other apps URL could be postgresql://127.0.0.1:15432/wekan , and
+   Username: wekan, Password: wekan , or others if you changed those at docker-compose.yml.
+   Do not write to PostgreSQL, as it's readonly mirror. Write to MongoDB or make
+   changes in Wekan. If server port 15432 open, PostgreSQL can be accessed also
+   remotely at local network at http://IPADDRESS:15432/wekan
+
+8) MongoDB is at 127.0.0.1:28017
+
+9) Wekan and databases bind to address 0.0.0.0 so could be also available to other
+   computers in network. I have not tested this.
+
+10) [Restore your MongoDB data](https://github.com/wekan/wekan/wiki/Export-Docker-Mongo-Data).
+
+## Feedback
+
+[GitHub issue 787](https://github.com/wekan/wekan/issues/787)
+
+[screenshot]: https://wekan.github.io/ToroDB.png
diff --git a/torodb-postgresql/docker-compose.yml b/torodb-postgresql/docker-compose.yml
new file mode 100644
index 00000000..c81d19b5
--- /dev/null
+++ b/torodb-postgresql/docker-compose.yml
@@ -0,0 +1,498 @@
+version: '2'
+
+# Note: Do not add single quotes '' to variables. Having spaces still works without quotes where required.
+#---------------------------------------------------------------------------------------------------------
+# ==== CREATING USERS AND LOGGING IN TO WEKAN ====
+# https://github.com/wekan/wekan/wiki/Adding-users
+#---------------------------------------------------------------------------------------------------------
+# ==== FORGOT PASSWORD ====
+# https://github.com/wekan/wekan/wiki/Forgot-Password
+#---------------------------------------------------------------------------------------------------------
+# ==== Upgrading Wekan to new version =====
+# 1) Stop Wekan:
+#      docker-compose stop
+# 2) Download new version:
+#      docker-compose pull wekan
+# 3) If you have more networks for VPN etc as described at bottom of
+#    this config, download for them too:
+#      docker-compose pull wekan2
+# 4) Start Wekan:
+#      docker-compose start
+#----------------------------------------------------------------------------------
+# ==== OPTIONAL: DEDICATED DOCKER USER ====
+# 1) Optionally create a dedicated user for Wekan, for example:
+#      sudo useradd -d /home/wekan -m -s /bin/bash wekan
+# 2) Add this user to the docker group, then logout+login or reboot:
+#      sudo usermod -aG docker wekan
+# 3) Then login as user wekan.
+# 4) Create this file /home/wekan/docker-compose.yml with your modifications.
+#----------------------------------------------------------------------------------
+# ==== RUN DOCKER AS SERVICE ====
+# 1a) Running Docker as service, on Systemd like Debian 9, Ubuntu 16.04, CentOS 7:
+#      sudo systemctl enable docker
+#      sudo systemctl start docker
+# 1b) Running Docker as service, on init.d like Debian 8, Ubuntu 14.04, CentOS 6:
+#      sudo update-rc.d docker defaults
+#      sudo service docker start
+# ----------------------------------------------------------------------------------
+# ==== USAGE OF THIS docker-compose.yml ====
+# 1) For seeing does Wekan work, try this and check with your webbroser:
+#      docker-compose up
+# 2) Stop Wekan and start Wekan in background:
+#     docker-compose stop
+#     docker-compose up -d
+# 3) See running Docker containers:
+#     docker ps
+# 4) Stop Docker containers:
+#     docker-compose stop
+# ----------------------------------------------------------------------------------
+# ===== INSIDE DOCKER CONTAINERS, AND BACKUP/RESTORE ====
+# https://github.com/wekan/wekan/wiki/Backup
+# If really necessary, repair MongoDB: https://github.com/wekan/wekan-mongodb/issues/6#issuecomment-424004116
+# 1) Going inside containers:
+#    a) Wekan app, does not contain data
+#         docker exec -it wekan-app bash
+#    b) MongoDB, contains all data
+#         docker exec -it wekan-db bash
+# 2) Copying database to outside of container:
+#      docker exec -it wekan-db bash
+#      cd /data
+#      mongodump
+#      exit
+#      docker cp wekan-db:/data/dump .
+# 3) Restoring database
+#      # 1) Stop wekan
+#             docker stop wekan-app
+#      # 2) Go inside database container
+#             docker exec -it wekan-db bash
+#      # 3) and data directory
+#             cd /data
+#      # 4) Remove previos dump
+#             rm -rf dump
+#      # 5) Exit db container
+#             exit
+#      # 6) Copy dump to inside docker container
+#             docker cp dump wekan-db:/data/
+#      # 7) Go inside database container
+#             docker exec -it wekan-db bash
+#      # 8) and data directory
+#             cd /data
+#      # 9) Restore
+#             mongorestore --drop
+#      # 10) Exit db container
+#             exit
+#      # 11) Start wekan
+#             docker start wekan-app
+#-------------------------------------------------------------------------
+
+services:
+  torodb-stampede:
+    image: torodb/stampede:latest
+    networks:
+      - wekan-tier
+    links:
+      - postgres
+      - mongodb
+    environment:
+      - POSTGRES_PASSWORD
+      - TORODB_SETUP=true
+      - TORODB_SYNC_SOURCE=mongodb:27017
+      - TORODB_BACKEND_HOST=postgres
+      - TORODB_BACKEND_PORT=5432
+      - TORODB_BACKEND_DATABASE=wekan
+      - TORODB_BACKEND_USER=wekan
+      - TORODB_BACKEND_PASSWORD=wekan
+      - DEBUG
+  postgres:
+    image: postgres:9.6
+    networks:
+      - wekan-tier
+    environment:
+      - POSTGRES_PASSWORD
+    ports:
+      - "5432:5432"
+  mongodb:
+    image: mongo:3.2
+    networks:
+      - wekan-tier
+    ports:
+      - "27017:27017"
+    entrypoint:
+      - /bin/bash
+      - "-c"
+      - mongo --nodb --eval '
+            var db;
+            while (!db) {
+                try {
+                  db = new Mongo("mongodb:27017").getDB("local");
+                } catch(ex) {}
+                sleep(3000);
+            };
+            rs.initiate({_id:"rs1",members:[{_id:0,host:"mongodb:27017"}]});
+        ' 1>/dev/null 2>&1 &
+        mongod --replSet rs1
+  wekan:
+    image: quay.io/wekan/wekan
+    container_name: wekan-app
+    restart: always
+    networks:
+      - wekan-tier
+    ports:
+      # Docker outsideport:insideport. Do not add anything extra here.
+      # For example, if you want to have wekan on port 3001,
+      # use 3001:8080 . Do not add any extra address etc here, that way it does not work.
+      - 80:8080
+    environment:
+      - MONGO_URL=mongodb://mongodb:27017/wekan
+      #---------------------------------------------------------------
+      # ==== ROOT_URL SETTING ====
+      # Change ROOT_URL to your real Wekan URL, for example:
+      # If you have Caddy/Nginx/Apache providing SSL
+      #  - https://example.com
+      #  - https://boards.example.com
+      # This can be problematic with avatars https://github.com/wekan/wekan/issues/1776
+      #  - https://example.com/wekan
+      # If without https, can be only wekan node, no need for Caddy/Nginx/Apache if you don't need them
+      #  - http://example.com
+      #  - http://boards.example.com
+      #  - http://192.168.1.100    <=== using at local LAN
+      - ROOT_URL=http://localhost  #   <=== using only at same laptop/desktop where Wekan is installed
+      # ==== EMAIL SETTINGS ====
+      # Email settings are required in both MAIL_URL and Admin Panel,
+      #   see https://github.com/wekan/wekan/wiki/Troubleshooting-Mail
+      #   For SSL in email, change smtp:// to smtps://
+      # NOTE: Special characters need to be url-encoded in MAIL_URL.
+      #       You can encode those characters for example at: https://www.urlencoder.org
+      - MAIL_URL=smtp://user:pass@mailserver.example.com:25/
+      - MAIL_FROM='Example Wekan Support <support@example.com>'
+      #---------------------------------------------------------------
+      # ==== OPTIONAL: MONGO OPLOG SETTINGS =====
+      # https://github.com/wekan/wekan-mongodb/issues/2#issuecomment-378343587
+      # We've fixed our CPU usage problem today with an environment
+      # change around Wekan. I wasn't aware during implementation
+      # that if you're using more than 1 instance of Wekan
+      # (or any MeteorJS based tool) you're supposed to set
+      # MONGO_OPLOG_URL as an environment variable.
+      # Without setting it, Meteor will perform a pull-and-diff
+      # update of it's dataset. With it, Meteor will update from
+      # the OPLOG. See here
+      #   https://blog.meteor.com/tuning-meteor-mongo-livedata-for-scalability-13fe9deb8908
+      # After setting
+      # MONGO_OPLOG_URL=mongodb://<username>:<password>@<mongoDbURL>/local?authSource=admin&replicaSet=rsWekan
+      # the CPU usage for all Wekan instances dropped to an average
+      # of less than 10% with only occasional spikes to high usage
+      # (I guess when someone is doing a lot of work)
+      # - MONGO_OPLOG_URL=mongodb://<username>:<password>@<mongoDbURL>/local?authSource=admin&replicaSet=rsWekan
+      #---------------------------------------------------------------
+      # ==== OPTIONAL: KADIRA PERFORMANCE MONITORING FOR METEOR ====
+      # https://github.com/smeijer/kadira
+      # https://blog.meteor.com/kadira-apm-is-now-open-source-490469ffc85f
+      # - export KADIRA_OPTIONS_ENDPOINT=http://127.0.0.1:11011
+      #---------------------------------------------------------------
+      # ==== OPTIONAL: LOGS AND STATS ====
+      # https://github.com/wekan/wekan/wiki/Logs
+      #
+      # Daily export of Wekan changes as JSON to Logstash and ElasticSearch / Kibana (ELK)
+      # https://github.com/wekan/wekan-logstash
+      #
+      # Statistics Python script for Wekan Dashboard
+      # https://github.com/wekan/wekan-stats
+      #
+      # Console, file, and zulip logger on database changes https://github.com/wekan/wekan/pull/1010
+      # with fix to replace console.log by winston logger https://github.com/wekan/wekan/pull/1033
+      # but there could be bug https://github.com/wekan/wekan/issues/1094
+      #
+      # There is Feature Request: Logging date and time of all activity with summary reports,
+      # and requesting reason for changing card to other column https://github.com/wekan/wekan/issues/1598
+      #---------------------------------------------------------------
+      # ==== WEKAN API AND EXPORT BOARD ====
+      # Wekan Export Board works when WITH_API=true.
+      # https://github.com/wekan/wekan/wiki/REST-API
+      # https://github.com/wekan/wekan-gogs
+      # If you disable Wekan API with false, Export Board does not work.
+      - WITH_API=true
+      #-----------------------------------------------------------------
+      # ==== CORS =====
+      # CORS: Set Access-Control-Allow-Origin header. Example: *
+      #- CORS=*
+      #-----------------------------------------------------------------
+      # ==== MATOMO INTEGRATION ====
+      # Optional: Integration with Matomo https://matomo.org that is installed to your server
+      # The address of the server where Matomo is hosted.
+      # example: - MATOMO_ADDRESS=https://example.com/matomo
+      #- MATOMO_ADDRESS=
+      # The value of the site ID given in Matomo server for Wekan
+      # example: - MATOMO_SITE_ID=12345
+      #- MATOMO_SITE_ID=
+      # The option do not track which enables users to not be tracked by matomo
+      # example:  - MATOMO_DO_NOT_TRACK=false
+      #- MATOMO_DO_NOT_TRACK=
+      # The option that allows matomo to retrieve the username:
+      # example: MATOMO_WITH_USERNAME=true
+      #- MATOMO_WITH_USERNAME=false
+      #-----------------------------------------------------------------
+      # ==== BROWSER POLICY AND TRUSTED IFRAME URL ====
+      # Enable browser policy and allow one trusted URL that can have iframe that has Wekan embedded inside.
+      # Setting this to false is not recommended, it also disables all other browser policy protections
+      # and allows all iframing etc. See wekan/server/policy.js
+      - BROWSER_POLICY_ENABLED=true
+      # When browser policy is enabled, HTML code at this Trusted URL can have iframe that embeds Wekan inside.
+      #- TRUSTED_URL=
+      #-----------------------------------------------------------------
+      # ==== OUTGOING WEBHOOKS ====
+      # What to send to Outgoing Webhook, or leave out. Example, that includes all that are default: cardId,listId,oldListId,boardId,comment,user,card,commentId .
+      # example: WEBHOOKS_ATTRIBUTES=cardId,listId,oldListId,boardId,comment,user,card,commentId
+      #- WEBHOOKS_ATTRIBUTES=
+      #-----------------------------------------------------------------
+      # ==== OAUTH2 ONLY WITH OIDC AND DOORKEEPER AS INDENTITY PROVIDER
+      # https://github.com/wekan/wekan/issues/1874
+      # https://github.com/wekan/wekan/wiki/OAuth2
+      # Enable the OAuth2 connection
+      # example: OAUTH2_ENABLED=true
+      #- OAUTH2_ENABLED=false
+      # OAuth2 docs: https://github.com/wekan/wekan/wiki/OAuth2
+      # OAuth2 Client ID, for example from Rocket.Chat. Example: abcde12345
+      # example: OAUTH2_CLIENT_ID=abcde12345
+      #- OAUTH2_CLIENT_ID=
+      # OAuth2 Secret, for example from Rocket.Chat: Example: 54321abcde
+      # example: OAUTH2_SECRET=54321abcde
+      #- OAUTH2_SECRET=
+      # OAuth2 Server URL, for example Rocket.Chat. Example: https://chat.example.com
+      # example: OAUTH2_SERVER_URL=https://chat.example.com
+      #- OAUTH2_SERVER_URL=
+      # OAuth2 Authorization Endpoint. Example: /oauth/authorize
+      # example: OAUTH2_AUTH_ENDPOINT=/oauth/authorize
+      #- OAUTH2_AUTH_ENDPOINT=
+      # OAuth2 Userinfo Endpoint. Example: /oauth/userinfo
+      # example: OAUTH2_USERINFO_ENDPOINT=/oauth/userinfo
+      #- OAUTH2_USERINFO_ENDPOINT=
+      # OAuth2 Token Endpoint. Example: /oauth/token
+      # example: OAUTH2_TOKEN_ENDPOINT=/oauth/token
+      #- OAUTH2_TOKEN_ENDPOINT=
+      #-----------------------------------------------------------------
+      # ==== LDAP ====
+      # https://github.com/wekan/wekan/wiki/LDAP
+      # For Snap settings see https://github.com/wekan/wekan-snap/wiki/Supported-settings-keys
+      # Most settings work both on Snap and Docker below.
+      # Note: Do not add single quotes '' to variables. Having spaces still works without quotes where required.
+      #
+      # DEFAULT_AUTHENTICATION_METHOD : The default authentication method used if a user does not exist to create and authenticate. Can be set as ldap.
+      # example : DEFAULT_AUTHENTICATION_METHOD=ldap
+      #- DEFAULT_AUTHENTICATION_METHOD=
+      #
+      # LDAP_ENABLE : Enable or not the connection by the LDAP
+      # example : LDAP_ENABLE=true
+      #- LDAP_ENABLE=false
+      #
+      # LDAP_PORT : The port of the LDAP server
+      # example : LDAP_PORT=389
+      #- LDAP_PORT=389
+      #
+      # LDAP_HOST : The host server for the LDAP server
+      # example : LDAP_HOST=localhost
+      #- LDAP_HOST=
+      #
+      # LDAP_BASEDN : The base DN for the LDAP Tree
+      # example : LDAP_BASEDN=ou=user,dc=example,dc=org
+      #- LDAP_BASEDN=
+      #
+      # LDAP_LOGIN_FALLBACK : Fallback on the default authentication method
+      # example : LDAP_LOGIN_FALLBACK=true
+      #- LDAP_LOGIN_FALLBACK=false
+      #
+      # LDAP_RECONNECT : Reconnect to the server if the connection is lost
+      # example : LDAP_RECONNECT=false
+      #- LDAP_RECONNECT=true
+      #
+      # LDAP_TIMEOUT : Overall timeout, in milliseconds
+      # example : LDAP_TIMEOUT=12345
+      #- LDAP_TIMEOUT=10000
+      #
+      # LDAP_IDLE_TIMEOUT : Specifies the timeout for idle LDAP connections in milliseconds
+      # example : LDAP_IDLE_TIMEOUT=12345
+      #- LDAP_IDLE_TIMEOUT=10000
+      #
+      # LDAP_CONNECT_TIMEOUT : Connection timeout, in milliseconds
+      # example : LDAP_CONNECT_TIMEOUT=12345
+      #- LDAP_CONNECT_TIMEOUT=10000
+      #
+      # LDAP_AUTHENTIFICATION : If the LDAP needs a user account to search
+      # example : LDAP_AUTHENTIFICATION=true
+      #- LDAP_AUTHENTIFICATION=false
+      #
+      # LDAP_AUTHENTIFICATION_USERDN : The search user DN
+      # example : LDAP_AUTHENTIFICATION_USERDN=cn=admin,dc=example,dc=org
+      #- LDAP_AUTHENTIFICATION_USERDN=
+      #
+      # LDAP_AUTHENTIFICATION_PASSWORD : The password for the search user
+      # example : AUTHENTIFICATION_PASSWORD=admin
+      #- LDAP_AUTHENTIFICATION_PASSWORD=
+      #
+      # LDAP_LOG_ENABLED : Enable logs for the module
+      # example : LDAP_LOG_ENABLED=true
+      #- LDAP_LOG_ENABLED=false
+      #
+      # LDAP_BACKGROUND_SYNC : If the sync of the users should be done in the background
+      # example : LDAP_BACKGROUND_SYNC=true
+      #- LDAP_BACKGROUND_SYNC=false
+      #
+      # LDAP_BACKGROUND_SYNC_INTERVAL : At which interval does the background task sync in milliseconds
+      # example : LDAP_BACKGROUND_SYNC_INTERVAL=12345
+      #- LDAP_BACKGROUND_SYNC_INTERVAL=100
+      #
+      # LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED :
+      # example : LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED=true
+      #- LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED=false
+      #
+      # LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS :
+      # example : LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=true
+      #- LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=false
+      #
+      # LDAP_ENCRYPTION : If using LDAPS
+      # example : LDAP_ENCRYPTION=ssl
+      #- LDAP_ENCRYPTION=false
+      #
+      # LDAP_CA_CERT : The certification for the LDAPS server. Certificate needs to be included in this docker-compose.yml file.
+      # example : LDAP_CA_CERT=-----BEGIN CERTIFICATE-----MIIE+zCCA+OgAwIBAgIkAhwR/6TVLmdRY6hHxvUFWc0+Enmu/Hu6cj+G2FIdAgIC...-----END CERTIFICATE-----
+      #- LDAP_CA_CERT=
+      #
+      # LDAP_REJECT_UNAUTHORIZED : Reject Unauthorized Certificate
+      # example : LDAP_REJECT_UNAUTHORIZED=true
+      #- LDAP_REJECT_UNAUTHORIZED=false
+      #
+      # LDAP_USER_SEARCH_FILTER : Optional extra LDAP filters. Don't forget the outmost enclosing parentheses if needed
+      # example : LDAP_USER_SEARCH_FILTER=
+      #- LDAP_USER_SEARCH_FILTER=
+      #
+      # LDAP_USER_SEARCH_SCOPE : base (search only in the provided DN), one (search only in the provided DN and one level deep), or sub (search the whole subtree)
+      # example : LDAP_USER_SEARCH_SCOPE=one
+      #- LDAP_USER_SEARCH_SCOPE=
+      #
+      # LDAP_USER_SEARCH_FIELD : Which field is used to find the user
+      # example : LDAP_USER_SEARCH_FIELD=uid
+      #- LDAP_USER_SEARCH_FIELD=
+      #
+      # LDAP_SEARCH_PAGE_SIZE : Used for pagination (0=unlimited)
+      # example : LDAP_SEARCH_PAGE_SIZE=12345
+      #- LDAP_SEARCH_PAGE_SIZE=0
+      #
+      # LDAP_SEARCH_SIZE_LIMIT : The limit number of entries (0=unlimited)
+      # example : LDAP_SEARCH_SIZE_LIMIT=12345
+      #- LDAP_SEARCH_SIZE_LIMIT=0
+      #
+      # LDAP_GROUP_FILTER_ENABLE : Enable group filtering
+      # example : LDAP_GROUP_FILTER_ENABLE=true
+      #- LDAP_GROUP_FILTER_ENABLE=false
+      #
+      # LDAP_GROUP_FILTER_OBJECTCLASS : The object class for filtering
+      # example : LDAP_GROUP_FILTER_OBJECTCLASS=group
+      #- LDAP_GROUP_FILTER_OBJECTCLASS=
+      #
+      # LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE :
+      # example :
+      #- LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE=
+      #
+      # LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE :
+      # example :
+      #- LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE=
+      #
+      # LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT :
+      # example :
+      #- LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT=
+      #
+      # LDAP_GROUP_FILTER_GROUP_NAME :
+      # example :
+      #- LDAP_GROUP_FILTER_GROUP_NAME=
+      #
+      # LDAP_UNIQUE_IDENTIFIER_FIELD : This field is sometimes class GUID (Globally Unique Identifier)
+      # example : LDAP_UNIQUE_IDENTIFIER_FIELD=guid
+      #- LDAP_UNIQUE_IDENTIFIER_FIELD=
+      #
+      # LDAP_UTF8_NAMES_SLUGIFY : Convert the username to utf8
+      # example : LDAP_UTF8_NAMES_SLUGIFY=false
+      #- LDAP_UTF8_NAMES_SLUGIFY=true
+      #
+      # LDAP_USERNAME_FIELD : Which field contains the ldap username
+      # example : LDAP_USERNAME_FIELD=username
+      #- LDAP_USERNAME_FIELD=
+      #
+      # LDAP_FULLNAME_FIELD : Which field contains the ldap fullname
+      # example : LDAP_FULLNAME_FIELD=fullname
+      #- LDAP_FULLNAME_FIELD=
+      #
+      # LDAP_MERGE_EXISTING_USERS :
+      # example : LDAP_MERGE_EXISTING_USERS=true
+      #- LDAP_MERGE_EXISTING_USERS=false
+      #-----------------------------------------------------------------
+      # LDAP_SYNC_USER_DATA :
+      # example : LDAP_SYNC_USER_DATA=true
+      #- LDAP_SYNC_USER_DATA=false
+      #
+      # LDAP_SYNC_USER_DATA_FIELDMAP :
+      # example : LDAP_SYNC_USER_DATA_FIELDMAP={"cn":"name", "mail":"email"}
+      #- LDAP_SYNC_USER_DATA_FIELDMAP=
+      #
+      # LDAP_SYNC_GROUP_ROLES :
+      # example :
+      #- LDAP_SYNC_GROUP_ROLES=
+      #
+      # LDAP_DEFAULT_DOMAIN : The default domain of the ldap it is used to create email if the field is not map correctly with the LDAP_SYNC_USER_DATA_FIELDMAP
+      # example :
+      #- LDAP_DEFAULT_DOMAIN=
+      #---------------------------------------------------------------------
+      # ==== LOGOUT TIMER, probably does not work yet ====
+      # LOGOUT_WITH_TIMER : Enables or not the option logout with timer
+      # example : LOGOUT_WITH_TIMER=true
+      #- LOGOUT_WITH_TIMER=
+      #
+      # LOGOUT_IN : The number of days
+      # example : LOGOUT_IN=1
+      #- LOGOUT_IN=
+      #
+      # LOGOUT_ON_HOURS : The number of hours
+      # example : LOGOUT_ON_HOURS=9
+      #- LOGOUT_ON_HOURS=
+      #
+      # LOGOUT_ON_MINUTES : The number of minutes
+      # example : LOGOUT_ON_MINUTES=55
+      #- LOGOUT_ON_MINUTES=
+      #-------------------------------------------------------------------
+
+    depends_on:
+      - mongodb
+
+#---------------------------------------------------------------------------------
+# ==== OPTIONAL: SHARE DATABASE TO OFFICE LAN AND REMOTE VPN ====
+#  When using Wekan both at office LAN and remote VPN:
+#    1) Have above Wekan docker container config with LAN IP address
+#    2) Copy all of above wekan container config below, look above of this part above and all config below it,
+#       before above depends_on: part:
+#
+#         wekan:
+#            #-------------------------------------------------------------------------------------
+#            # ==== MONGODB AND METEOR VERSION ====
+#            # a) For Wekan Meteor 1.8.x version at meteor-1.8 branch, .....
+#
+#
+#       and change name to different name like wekan2 or wekanvpn, and change ROOT_URL to server VPN IP
+#       address.
+#    3) This way both Wekan containers can use same MongoDB database
+#       and see the same Wekan boards.
+#    4) You could also add 3rd Wekan container for 3rd network etc.
+# EXAMPLE:
+#  wekan2:
+#    ....COPY CONFIG FROM ABOVE TO HERE...
+#    environment:
+#      - ROOT_URL='http://10.10.10.10'
+#      ...COPY CONFIG FROM ABOVE TO HERE...
+#---------------------------------------------------------------------------------
+
+volumes:
+  mongodb:
+    driver: local
+  mongodb-dump:
+    driver: local
+
+networks:
+  wekan-tier:
+    driver: bridge