diff --git a/CHANGELOG.md b/CHANGELOG.md
index bcb7e9230..fe07777de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,28 +1,236 @@
 # WIP
 
-* fix opening links from temporary shared folders on iphone or other contexts that do not support shared workers
-* add checkup test for disabling google FLoC
-* update lodash devDependency
+* Sheet export
+  * most exports broken by Chrome 92, mostly fixed
+  * we discovered that CSV export was not working in any major browser, though it's unclear why. We've disabled CSV export in the meantime
+  * updated translation to stop referring to Microsoft since we support OpenDocument formats
+  * some new browser-specific checkup tests to make it easier to detect future regressions in the APIs
+* drive bug fixes
+  * guard against a few possible type errors
+
+# 4.9.0
+
+## Goals and announcements
+
+We allocated most of this release cycle towards a schedule of one-on-one user interviews and some broad usage studies leveraging our new Form app. The remainder of our time was spent on some minor improvements. We'll continue at a slightly slower pace of implementation for the coming weeks while we complete our scheduled interviews and take some much-needed vacations.
+
+## Update notes
+
+It appears our promotion of the checkup page through our recent release notes and the inclusion of a link to it from the instance admin have been moderately successful. We've observed that more instance admins are noticing and fixing some common configuration issues.
+
+This release features some minor changes to one instance configuration test which incorrectly provided an exemption for the use of `http://localhost:3000` as an `httpUnsafeOrigin` value. This exemption was provided because this value is valid for local development. However, it suppressed errors when this configuration was used for production instances where it could cause a variety of problems. As usual, we recommend checking your instance's admin page after updating to confirm that you are passing the latest tests. Information about the checkup page is included in [our documentation](https://docs.cryptpad.fr/en/admin_guide/admin_panel.html#network).
+
+To update from 4.8.0 to 4.9.0:
+
+1. Stop your server
+2. Get the latest code with git
+3. Install the latest dependencies with `bower update` and `npm i`
+4. Restart your server
+5. Confirm that your instance is passing all the tests included on the `/checkup/` page
+
+## Features
+
+* We've added the ability to store URLs in user and team drives as requested in a private support ticket and [this issue](https://github.com/xwiki-labs/cryptpad/issues/732). Links can be shared directly with contacts. Unlike pads, links are not collaborative objects, so updating a link's name will not update the entry in another user's drive if you've already shared it with them. Links are integrated into our apps' _insert_ menu to facilitate quick insertion of links you've stored into your documents. We're interested in measuring how this functionality is used in practice so we can decide whether it's worth spending more time on it. We have added some telemetry to measure (in aggregate) how often its components are used. We anonymize IP addresses in the logs for CryptPad.fr, but as always, you can disable telemetry via your settings panel.
+* Our rich text editor now supports indentation with the tab key, as per [issue #634](https://github.com/xwiki-labs/cryptpad/issues/634).
+* Forms received another round of improvements to styles, workflows, and some basic survey functionality to yield more accurate results.
+  * Ordered lists are now shuffled for each survey participant so that their initial order has less effect on the final results.
+  * CSV export now uses one column for each option in polls, making them easier to read.
+  * Unregistered users can now add a name to their response.
+  * Form results are displayed automatically (when available) to those who have answered.
+  * Authors and auditors can now click on usernames in polls to jump directly to other answers from the same user.
+* Users with very large drives might notice that their account loads slightly faster now, due to some minor optimizations in an integrity check that the client performs when loading accounts.
+
+## Bugs
+
+* We've added a guard against a type error that could be triggered when loading teams under certain rare conditions.
+* Unregistered users' drives now show the "bread-crumb" UI for navigating between folders when viewing a shared folder in read-only mode. We've also suppressed the "Files" button for displaying the tree view which was non-functional for such users.
+* A change in the format of support tickets caused tickets recently created by premium users to not be recognized as such. We've fixed the categorization in the admin panel's support ticket view.
+* We've fixed a number of minor issues with forms:
+  * The maximum number of selectable choices for checkbox questions can no longer exceed the number of available choices.
+  * We guard against a type error that could occur when parsing dates.
+  * Forms imported from templates now have their initial title corrected.
+  * We've disabled the use of our indexedDB caching system for form results, since it was quietly dropping older responses when more than 100 responses had been submitted. We plan to re-enable caching for results once we've updated the eviction metric to better handle the response format.
+
+# 4.8.0
+
+## Goals
+
+This release cycle we decided to give people a chance to try our forms app and provide feedback before we begin developing its second round of major features and improvements. In the meantime we planned to work mostly on the activities of our [NGI DAPSI](https://dapsi.ngi.eu/) project which concerns client-side file format conversions. Otherwise, we dedicated some of our independently funded time towards some internal code review and security best-practices as a follow-up to the recent quick-scan performed by [Radically Open Security](https://radicallyopensecurity.com/) that was funded by [NLnet](https://nlnet.nl) as a part of our now-closing _CryptPad for Communities_ project.
+
+## Update notes
+
+We are still accepting feedback concerning our Form application via [a form hosted on CryptPad.fr](https://cryptpad.fr/form/#/2/form/view/gYs4QS7DetInCXy0z2CQoUW6CwN6kaR2utGsftDzp58/). We will accept feedback here until July 12th, 2021, so if you'd like your opinions to be represented in the app's second round of development act quickly!
+
+Following our last release we sent out an email to the admins of each outdated instance that had included their addresses in the server's daily telemetry. This appears to have been successful, as more than half of the 700+ instances that provide this telemetry are now running **4.7.0**. Previously, only 15% of instances were running the latest version. It's worth noting that of those admins that are hosting the latest version, less than 10% have opted into future emails warning them of security issues. In case you missed it, this can be done on the admin panel's _Network_ tab. Unlike most companies, we consider excess data collection a liability rather than an asset. As such, administrator emails are no longer included in server telemetry unless the admin has consented to be contacted.
+
+The same HTTP request that communicates server telemetry will soon begin responding with the URL of our latest release notes if it is detected that the remote instance is running an older version. The admin panel's _Network_ tab for instances running 4.7.0 or later will begin prompting admins to view the release notes and update once 4.8.0 is available.
+
+The Network tab now includes a multiple choice form as well. If you have not disabled your instance's telemetry you can use this field to answer _why you run your instance_ (for a business, an academic institution, personal use, etc.). We intend to use this data to inform our development roadmap, though as always, the fastest way to get us to prioritize your needs is to contact us for a support contract (sales@cryptpad.fr).
+
+Server telemetry will also include an `installMethod` property. By default this is `"unspecified"`, but we are planning to work with packagers of alternate install methods to modify this property in their installation scripts. This will help us assess what proportion of instances are installed via the steps included in our installation guide vs other methods such as the various docker images. We hope that it will also allow us to determine the source of some common misconfigurations so we can propose some improvements to the root cause.
+
+Getting off the topic of telemetry: two types of data that were previously deleted outright (pin logs and login blocks) are now archived when the client sends a _remove_ command. This provides for the ability to restore old user credentials in cases where users claim that their new credentials do not work following a password change. Some discretion is required in such cases as a user might have intentionally invalidated their old credentials due to shoulder-surfing or the breach of another service's database where they'd reused credentials. Neither of these types of data are currently included in the scripts which evict old data as they are not likely to consume a significant amount of storage space. In any case, CryptPad's data is stored on the filesystem, so it's always possible to remove outdated files by removing them from `cryptpad/data/archive/*` or whatever path you've configured for your archives.
+
+This release introduces some minor changes to the provided NGINX configuration file to enable support for WebAssembly where it is required for client-side file format conversions. We've added some new tests on the /checkup/ page that determine whether these changes have been applied. This page can be found via a button on the admin panel.
+
+To update from 4.7.0 to 4.8.0:
+
+1. Apply the documented NGINX configuration
+2. Stop your server
+3. Get the latest code with git
+4. Install the latest dependencies with `bower update` and `npm i`
+5. Restart your server
+6. Confirm that your instance is passing all the tests included on the `/checkup/` page
+
+## Features
+
+* Those who prefer using tools localized in Japanese can thank [@Suguru](https://mstdn.progressiv.dev/@suguru) for completing the Japanese translation of the platform's text! CryptPad is a fairly big platform with a lot of text to translate, so we really appreciate how much effort went into this.
+  * While we're on the topic, CryptPad's _Deutsch_ translation is kept up to date largely by a single member of the German Pirate Party (Piratenpartei Deutschland). This is a huge job and we appreciate your work too!
+  * Anyone else who wishes to give back to the project by doing the same can contribute translations on an ongoing basis through [our Weblate instance](https://weblate.cryptpad.fr/projects/cryptpad/app/).
+* We've implemented a new app for file format conversions as a part of our _INTEROFFICE_ project. At this point this page is largely a test-case for the conversion engine that we hope to integrate more tightly into the rest of the platform. It allows users to load a variety of file formats into their browser and convert to any other format that has a defined conversion process from the original format. What's special about this is that files are converted entirely in your browser, unlike other platforms which do so in the cloud and expose their contents in the process. Currently we support conversion between the following formats in every browser that supports modern web standards (ie. not safari):
+  * XLSX and ODS
+  * DOCX and ODT and TXT
+  * PPTX and ODP
+* In addition to the /convert/ page which supports office file formats, we also put some time into improving interoperability for our existing apps. We're introducing the ability to export rich text documents as Markdown (via the [turndown](https://github.com/mixmark-io/turndown) library), to import trello's JSON format into our Kanban app (with some loss of attributes because we don't support all the same features), and to export form summaries as CSV files.
+* We've added another extension to our customized markdown renderer which replaces markdown images with a warning that CryptPad blocks remote content to prevent malicious users from tracking visitors to certain pages. Such images should already be blocked by our strict use of Content-Security-Policy headers, but this will provide a better indication why images are failing to load on instances that are correctly configured and a modest improvement to users' privacy on instances that aren't.
+* Up until now it was possible to include style tags in markdown documents, which some of our more advanced users used in order to customize the appearance of their rendered documents. Unfortunately, these styles were not applied strictly to the markdown preview window, but to the page as a whole, making it possible to break the platform's interface (for that pad) through the use of overly broad and powerful style rules. As of this release style tags are now treated as special elements, such that their contents are compiled as [LESS](https://lesscss.org/) within a scope that is only applied to the preview pane. This was intended as a bug fix, but it's included here as a _feature_ because advanced users might see it as such and use it to do neat things. We have no funding for further work in this direction, however, and presently have no intent of providing documentation about this behaviour.
+* The checkup page uses some slightly nicer methods of displaying values returned by tests when the expected value of `true` is not returned. Some tests have been revised to return the problematic value instead of `false` when the test fails, since there were some cases where it was not clear why the test was failing, such as when a header was present but duplicated.
+* We've made some server requests related to _pinning files_ moderately faster by skipping an expensive calculation and omitting the value it returned. This value was meant to be used as a checksum to ensure that all of a user's documents were included in the list which should be associated with their account, however, clients used a separate command to fetch this checksum. The value provided in response to the other commands was never used by the client.
+* We've implemented a system on the client for defining default templates for particular types of documents across an entire instance in addition to the use of documents in the _templates_ section of the users drive (or that of their teams). This is intended more as a generic system for us to reuse throughout the platform's source than an API for instance admins to use. If there is sufficient interest (and funding) from other admins we'll implement this as an instance configuration point. We now provide a _poll_ template to replicate the features of our old poll app which has been deprecated in favour of forms.
+* We've included some more non-sensitive information about users' teams to the debugging data to which is automatically submitted along with support tickets, such as the id of the team's drive, roster, and how large the drive's contents are.
+* The _Log out everywhere_ option that is displayed in the user admin menu in the top-right corner of the page for logged-in users now displays a confirmation before terminating all remote sessions.
+
+## Bug fixes
+
+* It was brought to our attention that the registration page was not trimming leading and trailing whitespace from usernames as intended. We've updated the page to do so, however, accounts created with such characters in their username field must enter their credentials exactly as they were at registration time in order to log in. We have no means of detecting such accounts on the server, as usernames are not visible to server admins. We'll consider this behaviour in the future if we introduce an option to change usernames as we do with passwords.
+* We now double-check that login blocks (account credentials encrypted with a key derived from a username and password) can be accessed by the client when registering or changing passwords. It should be sufficient to rely on the server to report whether the encrypted credentials were stored successfully when uploading them, but in instances where these resources don't load due to a misbehaving browser extension it's better that we detect it at registration time rather than after the user creates content that will be difficult to access without assistance determining which extension or browser customization is to blame.
+* We learned that the Javascript engine used on iOS has trouble parsing an alternative representation of data strings that every other platform seems to handle. This caused calendars to display incorrect data. Because Apple prevents third-party browsers from including their own JavaScript engines this means that users were affected by this Safari bug regardless of whether they used browsers branded as Safari, Firefox, Chrome, or otherwise.
+* After some internal review we now guard against a variety of cases where user-crafted input could trigger a DOMException error and prevent a whole page worth of markdown content to fail to render. While there is no impact for users' privacy or security in this bug, a malicious user could exploit it to be annoying.
+* Shortly after our last release a user reported being unable to access their account due to a typeError which we were able to [guard against](https://github.com/xwiki-labs/cryptpad/commit/abc9466abe71a76d1d31ef6a3c2c9bba4d2233e4).
+* Images appearing in the 'lightbox' preview modal no longer appear stretched.
+* Before applying actions that modify the team's membership we now confirm that server-enforced permissions match our local state.
+
+# 4.7.0
+
+## Goals
+
+Our main goal for this release was to prepare a BETA version of our new forms app, however, it also includes a number of nice bug fixes and minor features.  
+
+## Update notes
+
+As this release includes a new app you'll want to compare your current NGINX config against our example (`cryptpad/docs/example.nginx.conf`) and update yours to match the updated sections which rewrites URLs to include trailing slashes. We've also introduced a number of new variables to our color scheme which might conflict with customizations you've made to your stylesheets. As always, it's recommended that you test your customizations on a updated non-production instance before deploying.  
+
+We've been steadily adding new tests to our recently developed checkup page each time we observe particular types of instance misconfigurations in the wild. Unfortunately, it seems the admins that have the most trouble with instance configuration are those that haven't read the numerous mentions of this page throughout the last few release notes. For that reason we've made it so the server prints a link to this page at launch time if it detects that some important value is left unconfigured.  
+
+On the topic of instance configuration, admins that have enabled their instance's admin panel may notice that it contains a new "Network" tab. On this pane you may find a button that links to the instance's checkup page to make it even easier to identify configuration problems. You should also notice options for configuring a number of values, some of which could previously only be set by modifying the server's configuration file and restarting.  
+
+* One checkbox allows you to opt out of the server telemetry which tells our server that your server exists. This is mostly so that we have a rough idea of how many admins are running CryptPad and what version they have installed. It was clearly documented in the config file, but now it's even easier to opt out if you don't want us to know you exist. In the interest of transparency, everything that is sent to our server as a part of this telemetry is also printed to your application server's logs, so you always check what information has been shared.
+* Another setting opts in to listing your server in public directories. At present there is no public directory of CryptPad instances that are suitable for public use, but we plan to launch one in the coming months. For now this checkbox will serve to inform us how many instance admins are interested in offering their server to the public. This setting will have no effect if you've disabled telemetry as that is how your server informs ours of your preferences. We reserve the right to exclude instances from our listing for _any reason_.
+* A third option allows admins to consent to be contacted by email. We aren't interested in spamming anyone with marketing email, rather, it's so that we can inform administrators of vulnerabilities in the software before they are publicly disclosed. Leave this unchecked if you prefer to be surprised by security flaws.
+* The option to disable crowdfunding notices in the UI can be disabled via a simple checkbox.
+* Starting with our next release (4.8.0) anyone running 4.7.0 should also notice that a button appears on this pane informing them that an update is available. We regularly fix security flaws and improve general safeguards against them, so if you aren't up to date you might be putting your users' data at risk.
+
+To update from 4.6.0 to 4.7.0:  
+
+1. Apply the documented NGINX configuration
+2. Stop your server
+3. Get the latest code with git
+4. Install the latest dependencies with `bower update` and `npm i`
+5. Restart your server
+
+Please note that the new _Forms_ app depends on an update to our cryptography library. If you omit `bower update` from the upgrade sequence above, the app will not work.  
+
+## Features
+
+* This release introduces our new _Forms_ app. This app allows users to create complex forms and to collect answers. Three roles are available with granular permissions:
+
+  * Authors can collaboratively create surveys with different types of questions and generate links to share with participants.
+  * Participants can respond to forms and view responses if these are made public (this can be set by authors).
+  * Auditors can view responses, but cannot necessarily add their own answers unless they have the correct participant key.
+
+  This new app addresses many of the shortcomings of our current _Polls_ and vastly expands the feature set. Polls are effectively one of the many question types now available in _Forms_. For this reason we are deprecating the _Polls_ app. It will remain available to view and respond to existing polls, but we discourage the creation of new polls and all future improvements will be focused on _Forms_.  
+
+* In response to a GitHub issue we've added an option to the toolbar's _File_ menu to add the current pad to your drive regardless of whether it is already stored in one of your teams' drives.
+* Likewise, we received some reports that some users found it frustrating that the home page automatically redirected them to their drive when they were logged in. We've disabled this behaviour by default but added an option in the settings page through which you may re-enable the old behaviour. This can be found at the top of the "CryptDrive" pane.
+* Embedded markdown editors' toolbars (such as that in the kanban and form apps) now include an "embed file" option.
+* We've revised some text on the checkup page to better explain what some headers do and how to correct them.
+* Some error messages printed by the server under rare conditions now include a little more debugging information.
+* We've improved some of the UI of the "report" page (which diagnoses possible reasons why your drive, shared folders, or teams might be failing to load now includes) so that users can now copy the output of the report directly to their clipboard instead of having to select that page's text and use their OS's copy to clipboard functionality.
+
+## Bug fixes
+
+* The home page now displays the appropriate text ("Features" or "Pricing") for the features page depending on whether the instance in question supports subscriptions. We had made some changes to this before but missed an instance where the text was displayed.
+* The admin page will now display the "General" pane if for some reason the hash in its URL does not contain a supported value.
+* We found that there were two cases where localForage (a library that manages an in-browser cache) could throw a DOMExceptionerror because we didn't supply a handler. This caused the calendar app's UI to incorrectly treat a newly created event as though it had not been saved.
+* A user brought it to our attention that the share menu was returning incorrect URLs for password-protected files. This has now been fixed.
+* The code that is responsible for preserving your cursor position when using the code editor collaboratively was capable of interfering with active scrolling when other users' edits were applied. This is now handled more gracefully. Another fix addresses an issue that prevented the markdown preview pane from being resized under certain conditions.
+* Finally, as a part of a routine security scan funded by [NLnet](https://nlnet.nl/) and executed by [Radically Open Security](https://www.radicallyopensecurity.com/) it was discovered that an unsanitized _account name_ was displayed in the users own toolbar. As a consequence, users could trigger a cross-site scripting vulnerability on themself by entering `<script>alert("pew")</script>` for their username at registration time. On a correctly configured instance this was blocked everywhere except in the sheet editor due to its more lax Content-Security Policy. This unsanitized value was never displayed for remote accounts, so the impact is extremely limited. Even so, we recommend that you update.
+
+# 4.6.0
+
+## Goals
+
+Our main goal for this release cycle was to get a strong start on our upcoming _Forms_ app. This is a big job which we didn't expect to finish in the course of a few weeks, so in the meantime we've taken the opportunity to address many minor issues, stabilize the codebase, and implement a number of new tests.  
+
+## Update notes
+
+Over the years the example configuration file has grown to include a large number of parameters. We've seen that this can make it hard to pick out which configuration parameters are important for a newly installed or migrated instance. We're trying to address this by moving more configuration options to the admin panel.  
+
+4.6.0 introduces the ability to generate credentials for your instance's support ticket mailbox and publish the corresponding public key with the push of a button. Previously it was necessary to run a script, copy its value, update the config file, restart the server, and enter the private component of the keypair into an input on the admin panel. The relevant button can be found in the admin panel's _Support_ tab.  
+
+We've also introduced the ability to update your _adminEmail_ settings via a field on the _General_ tab of the admin panel. This value is used by the contact page so that your users can contact you (instead of us) in case they encounter any problems when using your instance. Both the `supportMailbox` and `adminEmail` values are distributed by the `/api/config` endpoint which is typically cached by clients. You probably need to use the _Flush cache_ button to ensure that everyone loads the latest value. This button can also found on the _General_ tab.  
+
+One admin reported difficulty customizing their instance because they copy-pasted code from `cryptpad/www/common/application_config_internal.js` directly into `cryptpad/customize/application_config.js`. Unfortunately the internal variable name for the configuration object in the former did not match the value in the latter, so this led to a reference error. We've updated the variable name in the internal configuration file which provides the default options to match the customizable one, making it easier to copy-paste code examples without understanding what it's really doing.  
+
+We also introduced a new configuration option in `application_config_internal.js` which prevents unregistered users from creating new pads. Add `AppConfig.disableAnonymousPadCreation = true;` to your `customize/application_config.js` to disable anonymous pad creation. If you read the adjacent comment above the default example you'll see that this barrier is only enforced on the client, so it will keep out honest users but won't stop malicious ones from messaging the server directly.  
+
+This release also includes a number of new tests on the `/checkup/` page. Most notably it now checks for headers on certain assets which can only be checked from within the sandboxed iframe. These new tests automate the manual checks we were performing when admins reported that everything was working except for sheets, and go a little bit further to report which particular headers are incorrect. We also fixed some bugs that were checking headers on resources which could be cached, added a test for the recently added anti-FLoC header, fixed the styles on the page to respond to both light and dark mode, and made sure that websocket connections that were opened by tests were closed when they finished.  
+
+Some of the tests we implemented checked the headers on resources that were particularly prone to misconfiguration because its headers were set by both NGINX and the NodeJS application server (see [#694](https://github.com/xwiki-labs/cryptpad/issues/694)). We tested in a variety of configurations and ultimately decided that the most resilient solution was to give up on using heuristics in the application server and just update the example NGINX config to use a patch proposed by another admin which fully overrides the settings of the application server. You can find this patch in the `/api/(config|broadcast)` section of the example config.  
+
+Finally, we've made some minor changes to the provided `package-lock.json` file because `npm` reported some "Regular Expression Denial of Service" vulnerabilities. One of these was easy to fix, but another two were reported shortly thereafter. These "vulnerabilities" only affect some developer dependencies and will have no effect on regular usage of our software. The "risk" is essentially that malicious modifications to our source code can be tailored to make our style linting software run particularly slowly. This can only be triggered by integrating such malicious changes into your local repository and running `npm run lint:less`, so maybe don't do that.  
+
+To update from 4.5.0 to 4.6.0:  
+
+1. Apply the documented NGINX configuration
+2. Stop your server
+3. Get the latest code with git
+4. Install the latest dependencies with `bower update` and `npm i`
+5. Restart your server
+
+## Features
+
+This release includes very few new features aside from those already mentioned in the _Update notes_ section. One very minor improvement is that formatted code blocks in the code editor's markdown preview use the full width of their parent container instead of being indented.  
+
+## Bug fixes
+
+* Once again we fixed a bug that only occurs on Safari because Apple refuses to implement APIs that make the web a viable competitor to their app store. This one was triggered by opening a shared folder from its link as an unregistered user, then trying to open a pad stored only in that folder and not elsewhere in your drive. Literally every other browser supports _SharedWorkers_, which allow tabs on the same domain to share a background process, reducing consumption of CPU, RAM, and electricity, as well as allowing the newly opened tab to read the document's credentials from the temporarily loaded shared folder. On Safari the new tab failed to load. We fixed it by checking whether the shared folder would be accessible from newly opened tabs, and choosing to use the document's "unsafe link" instead of its "safe link".
+* We updated the "Features" page to be displayed as "Pricing" in the footer when some prospective clients reported that they couldn't find a mention of what they would get by creating a premium subscription. [#683](https://github.com/xwiki-labs/cryptpad/issues/683) had the opposite problem, that they didn't support payment and they wanted to only show features. Now the footer displays the appropriate string depending on your instance's configuration.
+* We fixed some inconsistent UI in our recently introduced date picker. The time formats displayed in the text field and date picker interface should now match the localization settings provided to your browser by your OS. Previously it was possible for one of these elements to appear in 24 hour time while the other appeared in 12 hour time.
+* Another time-related issue appeared in the calendar for users in Hawai'i, who reported that some events were displayed on the wrong day due to the incorrect initialization of a reference date.
+* We've applied a minor optimization which should reduce the size of shared folders.
+* Some functionality on the admin panel has been improved with some better error handling.
+* Finally, one user reported that one of their PDFs was displaying only blank pages. After a short investigation we found that the problematic PDF was trying to run some scripts which were being blocked by our strict Content-Security-Policy headers. We've updated our PDF renderer to avoid compiling and running such scripts. As a result, such PDFs should not be prevented from rendering, though they may lack some dynamic functionality that you might be expecting. We'd welcome an example of such a PDF so we can assess if there is a safe way to load their embedded scripts and how much work would be required to do so.
 
 # 4.5.0
 
 ## Goals
 
-This release cycle we aimed to complete three major milestones: the official release of our calendar app, the ability for admins to close registration on their instance, and the deployment of the admin section of our [official documentation](https://docs.cryptpad.fr/en/admin_guide/index.html). We spent the remainder of our time addressing a growing backlog of issues on GitHub by fixing a number of weird bugs.
+This release cycle we aimed to complete three major milestones: the official release of our calendar app, the ability for admins to close registration on their instance, and the deployment of the admin section of our [official documentation](https://docs.cryptpad.fr/en/admin_guide/index.html). We spent the remainder of our time addressing a growing backlog of issues on GitHub by fixing a number of weird bugs.  
 
 ## Update notes
 
-This release includes a new GitHub issue template (`cryptpad/.github/ISSUE_TEMPLATE/initial-instance-configuration.md`). The intent of this file is to make it clear that _Bug Reports_ are for intended for bugs in the software itself, not for soliciting help in configuring your personal server. Such issues take away time that we'd rather spend improving the platform for everybody's benefit, rather than for single administrators.
+This release includes a new GitHub issue template (`cryptpad/.github/ISSUE_TEMPLATE/initial-instance-configuration.md`). The intent of this file is to make it clear that _Bug Reports_ are for intended for bugs in the software itself, not for soliciting help in configuring your personal server. Such issues take away time that we'd rather spend improving the platform for everybody's benefit, rather than for single administrators.  
 
-Sometimes difficulty configuring an instance does stem from an actual bug, however, most of the time these issues relate to the use of an unsupported configuration or failure to correctly follow installation instructions. The issue template includes some basic debugging steps which should identify the vast majority of problems. Beyond its primary goal of narrowing the scope of our issue tracker, we hope it will also be useful as an offline reference for administrators attempting to debug their instance.
+Sometimes difficulty configuring an instance does stem from an actual bug, however, most of the time these issues relate to the use of an unsupported configuration or failure to correctly follow installation instructions. The issue template includes some basic debugging steps which should identify the vast majority of problems. Beyond its primary goal of narrowing the scope of our issue tracker, we hope it will also be useful as an offline reference for administrators attempting to debug their instance.  
 
-This template references the /checkup/ page that we've been steadily improving over the last few releases. It now includes even more tests to diagnose instance configuration problems, each with their own messages that provide some fairly detailed hints about what is wrong when an error is detected. This release introduces a number of tests that print _warnings_ that won't break an instance but might detract from users' experience. We recommend checking this page on your instance with each release as we will continue to improve it on an regular basis, and it might detect some errors of which you were unaware.
+This template references the /checkup/ page that we've been steadily improving over the last few releases. It now includes even more tests to diagnose instance configuration problems, each with their own messages that provide some fairly detailed hints about what is wrong when an error is detected. This release introduces a number of tests that print _warnings_ that won't break an instance but might detract from users' experience. We recommend checking this page on your instance with each release as we will continue to improve it on an regular basis, and it might detect some errors of which you were unaware.  
 
-Otherwise, this release includes some changes to the provided example NGINX config file. It now includes a header designed to disable clients' participation in Google's [FLoC network](https://www.eff.org/deeplinks/2021/03/googles-floc-terrible-idea), as well as some basic rules related to the addition of our calendar app and OnlyOffice's two remaining editors (which are still not officially supported despite their inclusion here).
+Otherwise, this release includes some changes to the provided example NGINX config file. It now includes a header designed to disable clients' participation in Google's [FLoC network](https://www.eff.org/deeplinks/2021/03/googles-floc-terrible-idea), as well as some basic rules related to the addition of our calendar app and OnlyOffice's two remaining editors (which are still not officially supported despite their inclusion here).  
 
-Lastly, any instance administrators that have had to customize their instance in order to disable registration can instead rely on a built-in feature that is available on the main page of the admin panel. Checking the "Close registration" checkbox will cause the application server to reject the creation of new "login blocks" (which store users' encrypted account credentials) while permitting existing users to change their passwords. Clients will be informed that registration is closed via the `/api/config` endpoint, causing the registration page to display a notice instead of the usual form. You may need to use the `FLUSH CACHE` button which can found on the same page of the admin panel in order to force clients to load the updated server config.
+Lastly, any instance administrators that have had to customize their instance in order to disable registration can instead rely on a built-in feature that is available on the main page of the admin panel. Checking the "Close registration" checkbox will cause the application server to reject the creation of new "login blocks" (which store users' encrypted account credentials) while permitting existing users to change their passwords. Clients will be informed that registration is closed via the `/api/config` endpoint, causing the registration page to display a notice instead of the usual form. You may need to use the `FLUSH CACHE` button which can found on the same page of the admin panel in order to force clients to load the updated server config.  
 
-To update from 4.4.0 to 4.5.0:
+To update from 4.4.0 to 4.5.0:  
 
 1. Apply the documented NGINX configuration
 2. Stop your server
@@ -54,21 +262,21 @@ To update from 4.4.0 to 4.5.0:
 
 ## Goals
 
-Our main goal for this release was to complete the first steps of our ["Dialogue" project](https://nlnet.nl/project/CryptPadForms/), which will introduce surveys into CryptPad. We've also put considerable effort towards addressing some configuration issues, correcting some inconsistently translated UI, and writing some new documentation.
+Our main goal for this release was to complete the first steps of our ["Dialogue" project](https://nlnet.nl/project/CryptPadForms/), which will introduce surveys into CryptPad. We've also put considerable effort towards addressing some configuration issues, correcting some inconsistently translated UI, and writing some new documentation.  
 
 ## Update notes
 
-This release removes the default privacy policy that has been included in CryptPad up until now. It included some assertions that were true of our own instance (CryptPad.fr) which we couldn't guarantee on third-party instances. We've updated our custom configuration to link to a privacy policy that was written in a rich text pad. You can do the same on your instance by editing `cryptpad/customize/application_config.js` to include the absolute URL of your instance, like so: `AppConfig.privacy = "https://cryptpad.your.website/privacy.html";`.
+This release removes the default privacy policy that has been included in CryptPad up until now. It included some assertions that were true of our own instance (CryptPad.fr) which we couldn't guarantee on third-party instances. We've updated our custom configuration to link to a privacy policy that was written in a rich text pad. You can do the same on your instance by editing `cryptpad/customize/application_config.js` to include the absolute URL of your instance, like so: `AppConfig.privacy = "https://cryptpad.your.website/privacy.html";`.  
 
-We've clarified a point about telemetry in the notes of our 4.3.1 release. The text suggested that users on your instance would send telemetry to OUR webserver. It has been clarified to reflect that telemetry from your users is only ever sent to your instance.
+We've clarified a point about telemetry in the notes of our 4.3.1 release. The text suggested that users on your instance would send telemetry to OUR webserver. It has been clarified to reflect that telemetry from your users is only ever sent to your instance.  
 
-We've spent some time working on improving our (officially) unreleased integrations of OnlyOffice's presentation and document editors. We've advised against enabling these editors on your instance. This release includes changes that may not be fully backwards compatible. If your users rely on either editor we advise that you not update until they have had an opportunity to back up their documents. We still aren't officially supporting either editor and we may make further breaking changes in the future. Consider this a warning and not an advertizement of their readiness!
+We've spent some time working on improving our (officially) unreleased integrations of OnlyOffice's presentation and document editors. We've advised against enabling these editors on your instance. This release includes changes that may not be fully backwards compatible. If your users rely on either editor we advise that you not update until they have had an opportunity to back up their documents. We still aren't officially supporting either editor and we may make further breaking changes in the future. Consider this a warning and not an advertizement of their readiness!  
 
-This release also includes changes to the recommended NGINX configuration. Compare your instance's config against `cryptpad/docs/example.nginx.conf` and apply all the new changes before updating. In particular, you'll want to pay attention to the configuration for a newly exposed server API (`/api/broadcast`). This should work much the same as `/api/config`, so if you're using a non-standard configuration that uses more than one server you may want to proxy it in a similar fashion.
+This release also includes changes to the recommended NGINX configuration. Compare your instance's config against `cryptpad/docs/example.nginx.conf` and apply all the new changes before updating. In particular, you'll want to pay attention to the configuration for a newly exposed server API (`/api/broadcast`). This should work much the same as `/api/config`, so if you're using a non-standard configuration that uses more than one server you may want to proxy it in a similar fashion.  
 
-Lastly, we've made some big improvements to the `/checkup/` page which performs some basic tests to confirm that your instance is configured correctly. It now provides some much more detailed descriptions of what might be wrong and how you can start debugging any issues that were identified. If you experience any problems after updating please review this page to assess your instance for any known issues before asking for help.
+Lastly, we've made some big improvements to the `/checkup/` page which performs some basic tests to confirm that your instance is configured correctly. It now provides some much more detailed descriptions of what might be wrong and how you can start debugging any issues that were identified. If you experience any problems after updating please review this page to assess your instance for any known issues before asking for help.  
 
-To update from 4.3.1 to 4.4.0:
+To update from 4.3.1 to 4.4.0:  
 
 1. Apply the documented NGINX configuration
 2. Stop your server
@@ -76,7 +284,7 @@ To update from 4.3.1 to 4.4.0:
 4. Install the latest dependencies with `bower update` and `npm i`
 5. Restart your server
 
-This release requires updates to both clientside and serverside dependencies. **You will experience problems if you skip any of the above steps.**
+This release requires updates to both clientside and serverside dependencies. **You will experience problems if you skip any of the above steps.**  
 
 ## Features
 
@@ -108,7 +316,7 @@ This release requires updates to both clientside and serverside dependencies. **
 
 # 4.3.1
 
-This minor release addresses some bugs discovered after deploying and tagging 4.3.0
+This minor release addresses some bugs discovered after deploying and tagging 4.3.0  
 
 * We found that some browser extensions interfered with checks to determine whether a registered user was correctly logged in, which resulted in some disabled functionality. If you are running extensions that actively delete the tokens that keep you logged your session should now stay alive until you close all its active tabs, after which you will have to log back in.
 * Our 4.2.0 update introduced a new internal format for spreadsheets which broke support for spreadsheet templates using the older format. This release implements a compatibility layer.
@@ -122,13 +330,13 @@ This minor release addresses some bugs discovered after deploying and tagging 4.
 
 ## Goals
 
-This release is a continuation of our recent efforts to stabilize the platform, fixing small bugs and inconsistencies that we missed when developing larger features. In the meantime we've received reports of the platform performing poorly under various unusual circumstances, so we've developed some targeted fixes to both improve user experience and decrease the load on our server.
+This release is a continuation of our recent efforts to stabilize the platform, fixing small bugs and inconsistencies that we missed when developing larger features. In the meantime we've received reports of the platform performing poorly under various unusual circumstances, so we've developed some targeted fixes to both improve user experience and decrease the load on our server.  
 
 ## Update notes
 
-This release should be fairly simple for admins.
+This release should be fairly simple for admins.  
 
-To update from 4.2.1 to 4.3.0:
+To update from 4.2.1 to 4.3.0:  
 
 1. Stop your server
 2. Get the latest code with git
@@ -162,7 +370,7 @@ To update from 4.2.1 to 4.3.0:
 
 # 4.2.1
 
-This minor release addresses a few bugs discovered after deploying 4.2.0:
+This minor release addresses a few bugs discovered after deploying 4.2.0:  
 
 * The 4.2.0 release included major improvements to the sheet application. This introduced breaking changes to the "lock" system in the application. Existing spreadsheets (before 4.2.0) that were closed by a user without "unlocking" all cells first became impossible to open after the 4.2.0 changes. This has been fixed.
 * Team owners can now properly upload a team avatar.
@@ -176,21 +384,21 @@ This minor release addresses a few bugs discovered after deploying 4.2.0:
 
 ## Goals
 
-We've made a lot of big changes to the platform lately. This release has largely been an attempt to stabilize the codebase by fixing bugs and merging features that we hadn't had a chance to test until now, all while updating our documentation and removing unused or outdated code.
+We've made a lot of big changes to the platform lately. This release has largely been an attempt to stabilize the codebase by fixing bugs and merging features that we hadn't had a chance to test until now, all while updating our documentation and removing unused or outdated code.  
 
 ## Update notes
 
-This release includes an update to the sheet editor which is not backwards-compatible. Clients running the new version will not be able to correctly communicate with clients running older versions. Clients will automatically detect that a new version is available upon reconnecting to the server after a restart, so as long as you follow the steps recommended below this should be fine.
+This release includes an update to the sheet editor which is not backwards-compatible. Clients running the new version will not be able to correctly communicate with clients running older versions. Clients will automatically detect that a new version is available upon reconnecting to the server after a restart, so as long as you follow the steps recommended below this should be fine.  
 
-We've also updated a server-side dependency that is not backwards-compatible. Failure to update both the platform and its dependencies together will result in errors.
+We've also updated a server-side dependency that is not backwards-compatible. Failure to update both the platform and its dependencies together will result in errors.  
 
-The `scripts` directory now includes a script to identify unused translations. We used this to reduce the size of our localization files (`cryptpad/www/common/translations/*.json`). We reviewed the changes carefully and did our best to test, but it's always possible that a string was erroneously removed. If you notice any bugs in the UI where text seems to be missing, please let us (the developers) know via a GitHub issue.
+The `scripts` directory now includes a script to identify unused translations. We used this to reduce the size of our localization files (`cryptpad/www/common/translations/*.json`). We reviewed the changes carefully and did our best to test, but it's always possible that a string was erroneously removed. If you notice any bugs in the UI where text seems to be missing, please let us (the developers) know via a GitHub issue.  
 
-CryptPad.fr now stores more than a terabyte of data, making it quite intensive to run the scripts to remove inactive files from the disk. To help alleviate this strain we've moved the code responsible for deleting files that have been archived for longer than the configured retention period into its own script (`./scripts/evict-archived.js`). For the moment this script is not integrated into the server and will not automatically run in the background as the main eviction script does. It's recommended that you run it manually if you find you are low on disk space.
+CryptPad.fr now stores more than a terabyte of data, making it quite intensive to run the scripts to remove inactive files from the disk. To help alleviate this strain we've moved the code responsible for deleting files that have been archived for longer than the configured retention period into its own script (`./scripts/evict-archived.js`). For the moment this script is not integrated into the server and will not automatically run in the background as the main eviction script does. It's recommended that you run it manually if you find you are low on disk space.  
 
-Since early in the pandemic we've been serving a custom home page on CryptPad.fr to inform users that we've increased the amount of storage provided for free. This was originally intended as a temporary measure, but since almost a year has passed we figured it was about time we integrate this custom code into the platform itself. Admins can now add a custom note to the home page, using customized HTML in `customize/application_config.js`. To do this, define an `AppConfig.homeNotice` attribute like so: `AppConfig.homeNotice = "<b>pewpew</b>";`.
+Since early in the pandemic we've been serving a custom home page on CryptPad.fr to inform users that we've increased the amount of storage provided for free. This was originally intended as a temporary measure, but since almost a year has passed we figured it was about time we integrate this custom code into the platform itself. Admins can now add a custom note to the home page, using customized HTML in `customize/application_config.js`. To do this, define an `AppConfig.homeNotice` attribute like so: `AppConfig.homeNotice = "<b>pewpew</b>";`.  
 
-To update from 4.1.0 to 4.2.0:
+To update from 4.1.0 to 4.2.0:  
 
 1. Stop your server
 2. Get the latest code from the 4.2.0 tag (`git fetch origin && git checkout 4.2.0`, or just `git pull origin main`)
@@ -245,13 +453,13 @@ To update from 4.1.0 to 4.2.0:
 
 ## Goals
 
-Our recent 4.0.0 release introduced major changes to CryptPad's style-sheets which likely caused some difficulty for admins who'd made extensive changes to their instance's appearance. We figure it's best to make more changes now instead of making small breaking changes more frequently, so we decided now is a good time to refactor a lot of our styles to implement an often-requested dark mode in CryptPad.
+Our recent 4.0.0 release introduced major changes to CryptPad's style-sheets which likely caused some difficulty for admins who'd made extensive changes to their instance's appearance. We figure it's best to make more changes now instead of making small breaking changes more frequently, so we decided now is a good time to refactor a lot of our styles to implement an often-requested dark mode in CryptPad.  
 
 ## Update notes
 
-As noted above, this release introduces some major changes to CryptPad styles. If you have customized the look of your instance we recommend testing this new version locally before deploying it to your server to ensure that there are no critical conflicts.
+As noted above, this release introduces some major changes to CryptPad styles. If you have customized the look of your instance we recommend testing this new version locally before deploying it to your server to ensure that there are no critical conflicts.  
 
-Otherwise, to update from 4.0.0 to 4.1.0:
+Otherwise, to update from 4.0.0 to 4.1.0:  
 
 1. Stop your server
 2. Get the latest code from the 4.1.0 tag (`git fetch origin && git checkout 4.1.0`, or just `git pull origin main`)
@@ -288,25 +496,25 @@ Otherwise, to update from 4.0.0 to 4.1.0:
 
 # 4.0.0 (A)
 
-We're very happy to introduce CryptPad v4.0!
+We're very happy to introduce CryptPad v4.0!  
 
-This release is the culmination of a great deal of work over the last year, in which we searched for the right metaphors and imagery to clearly represent what CryptPad is all about. We've reworked our logo, color theme, text on our static pages, and the icons throughout the platform to convey the calm and safety we want our users to feel.
+This release is the culmination of a great deal of work over the last year, in which we searched for the right metaphors and imagery to clearly represent what CryptPad is all about. We've reworked our logo, color theme, text on our static pages, and the icons throughout the platform to convey the calm and safety we want our users to feel.  
 
-Our release schedule typically follows an alphabetical naming scheme, ranging from A for the first (or zero-th) release of the cycle to Z for the last, with a thematic name for each letter. In the rush of preparing translations and double-checking all of our changes we never found time to settle on a theme for this release, but we do find there's some value in maintaining the otherwise arbitrary rhythm we've followed all this time. The progression through the alphabet gives a sense of pace to what can otherwise seem like a endless stream of problems that need solving, and the end of the alphabet prompts us to build towards major milestones like this one.
+Our release schedule typically follows an alphabetical naming scheme, ranging from A for the first (or zero-th) release of the cycle to Z for the last, with a thematic name for each letter. In the rush of preparing translations and double-checking all of our changes we never found time to settle on a theme for this release, but we do find there's some value in maintaining the otherwise arbitrary rhythm we've followed all this time. The progression through the alphabet gives a sense of pace to what can otherwise seem like a endless stream of problems that need solving, and the end of the alphabet prompts us to build towards major milestones like this one.  
 
-With that in mind, you can expect 25 more major releases in this cycle before version 5.0, roughly every three weeks or so depending on circumstances.
+With that in mind, you can expect 25 more major releases in this cycle before version 5.0, roughly every three weeks or so depending on circumstances.  
 
 ## Goals
 
-The main intent of this release was to deploy our `rebrand` branch which had been in development for some time. Along the way we also made notable improvements to the sheet editor which will be mentioned below.
+The main intent of this release was to deploy our `rebrand` branch which had been in development for some time. Along the way we also made notable improvements to the sheet editor which will be mentioned below.  
 
 ## Update notes
 
-In the process of redesigning the platform we started using some new features of the LESS CSS pre-processor language that were not supported by the version of lesshint that we were using to scan for errors. We've updated that dev dependency to a newer version (4.5.0 => 6.3.7) which introduced a rather large number of minor dependencies. These are only used during development, not by the server itself, so this is unlikely to have any impact on the software itself.
+In the process of redesigning the platform we started using some new features of the LESS CSS pre-processor language that were not supported by the version of lesshint that we were using to scan for errors. We've updated that dev dependency to a newer version (4.5.0 => 6.3.7) which introduced a rather large number of minor dependencies. These are only used during development, not by the server itself, so this is unlikely to have any impact on the software itself.  
 
-Otherwise, this release includes lots of changes to the platform's style sheets and static pages. If you've applied heavy customizations to your instance you might notice errors due to incompatibilities with your local changes. We recommend that you test your customizations against the latest release locally before updating a public instance to avoid service outages.
+Otherwise, this release includes lots of changes to the platform's style sheets and static pages. If you've applied heavy customizations to your instance you might notice errors due to incompatibilities with your local changes. We recommend that you test your customizations against the latest release locally before updating a public instance to avoid service outages.  
 
-To update from 3.25.1 to 4.0.0:
+To update from 3.25.1 to 4.0.0:  
 
 1. Stop your server
 2. Get the latest code from the 4.0.0 tag
@@ -319,7 +527,7 @@ To update from 3.25.1 to 4.0.0:
 * We found that certain issues reported via the built-in support ticket system were not easy to debug without knowing the id of the user's drive. Support tickets now include a `driveChannel` attribute to simplify this process.
 * We've added a variety of settings for the control of how your browser uses a local database to speed up loading times and display cached versions of documents even when disconnected from our server. These are available in the "confidentiality" section of the settings page (https://cryptpad.fr/settings/#security).
 
-Finally, the "rebrand" part of this release:
+Finally, the "rebrand" part of this release:  
 
 * Our home page features our new logo, a cleaner layout, new text (notably dropping the use of "zero-knowledge" from our explanation), new app icons, softer colors, neater fonts, and a custom illustration of a document shredder that hints at how CryptPad works.
 * We no longer include a FAQ page with each instance, and instead link to relevant parts of our dedicated documentation platform (https://docs.cryptpad.fr) from any place that previously referenced the FAQ. This will make it easier for translators to focus on text for the platform's interface if they wish. An updated Frequently Asked Questions will be added to the documentation in the near future.
@@ -337,9 +545,9 @@ Finally, the "rebrand" part of this release:
 
 # ZyzomysPedunculatus' revenge (3.25.1)
 
-This minor release is primarily intended to fix some minor issues that were introduced or detected following our 3.25.0 release, but it also includes some major improvements that we want to test and stabilize before our upcoming 4.0.0 release.
+This minor release is primarily intended to fix some minor issues that were introduced or detected following our 3.25.0 release, but it also includes some major improvements that we want to test and stabilize before our upcoming 4.0.0 release.  
 
-Features
+Features  
 
 * Our recent introduction of a clientside cache for document content now allows us to load and display a readable copy of a document before the most recent history has been fully loaded from the server. You might notice that your drive and some document typees are now displayed in a "DISCONNECTED" of "OFFLINE" state until they gets the latest history. For now this just means the loading screen is removed soon so you can start reading, but it's also an essential improvement that will become even more useful when we introduce the use of service-workers for offline usage.
 * We've added an `offline` mode to the server so that anyone developing features in CryptPad can test its offline and caching features by disabling the websocket components of the server. Use `npm run offline` to launch in this mode.
@@ -348,7 +556,7 @@ Features
 * Errors that occur when loading teams now trigger some basic telemetry to the server to indicate the error code. This should help us determine the origin of some annoying teams issues that several users have reported.
 * Users of the rich text editor should now find that their scroll position is maintained when they are at the bottom of the document and a remote users adds more text.
 
-Bug fixes
+Bug fixes  
 
 * Shortly after deploying 3.25.0 we identified several cases in which its cache invalidation logic was not correctly detecting corrupted cache entries. This caused some documents to fail to load. We quickly disabled most caching until we got the chance to review. Since then, we've tested it much more thoroughly under situations which made it more likely to become corrupt. Our new cache invalidation logic seems to catch all the known cases, so we're re-enabling the use of the cache for encrypted files and most of our supported document types.
 * We found that a race condition in the logout process prevented the document cache from being cleared correctly. We now wait until the asynchronous cache eviction process completes before redirecting users to the login page.
@@ -360,7 +568,7 @@ Bug fixes
 * The recent replacement of a link to our faq with a link to our documentation platform violated some security headers and prevented the link from loading. We've fixed the inline link with some code to open this link in a compatible way.
 * Finally, we found a bug that caused custom colors in the slide app to revert to the default settings on page reloads. Custom slide colors should now be preserved.
 
-To update from 3.25.0 to 3.25.1:
+To update from 3.25.0 to 3.25.1:  
 
 1. Stop your server
 2. Get the latest code with `git checkout 3.25.1`
@@ -371,17 +579,17 @@ To update from 3.25.0 to 3.25.1:
 
 ## Goals
 
-This is the last major release of our 3.0.0 release cycle. We wanted to mark the occasion with some big improvements to keep everyone happy in case we need to take some more time to prepare our upcoming 4.0.0 release.
+This is the last major release of our 3.0.0 release cycle. We wanted to mark the occasion with some big improvements to keep everyone happy in case we need to take some more time to prepare our upcoming 4.0.0 release.  
 
 ## Update notes
 
-This update introduces some major database optimizations that should decrease both CPU and disk usage over time as users request resources and prime an on-disk cache for the next time.
+This update introduces some major database optimizations that should decrease both CPU and disk usage over time as users request resources and prime an on-disk cache for the next time.  
 
-We've also introduce the ability to archive illegal or otherwise objectionable material from the admin panel assuming you possess the ability to load the content in question. It's also possible to restore archived content via an adjacent form field on the admin panel as long as it has not been permanently deleted. Due to a quirk in how ownership of uploaded files works, restored files will not retain their "owners" property. We hope to fix this in a future release.
+We've also introduce the ability to archive illegal or otherwise objectionable material from the admin panel assuming you possess the ability to load the content in question. It's also possible to restore archived content via an adjacent form field on the admin panel as long as it has not been permanently deleted. Due to a quirk in how ownership of uploaded files works, restored files will not retain their "owners" property. We hope to fix this in a future release.  
 
-We've also made some minor changes to the example NGINX config file provided in `cryptpad/docs/example.nginx.confg`, specifically in [this commit](https://github.com/xwiki-labs/cryptpad/commit/2647acbb78643e651b71d2d4f74c2f66e264a258). CryptPad will probably work if you don't apply these changes to your nginx conf, but some functional improvements depend on the exposed headers.
+We've also made some minor changes to the example NGINX config file provided in `cryptpad/docs/example.nginx.confg`, specifically in [this commit](https://github.com/xwiki-labs/cryptpad/commit/2647acbb78643e651b71d2d4f74c2f66e264a258). CryptPad will probably work if you don't apply these changes to your nginx conf, but some functional improvements depend on the exposed headers.  
 
-To upgrade from 3.24.0 to 3.25.0:
+To upgrade from 3.24.0 to 3.25.0:  
 
 1. Update your NGINX config as mentioned above.
 2. Stop your nodejs server.
@@ -392,7 +600,7 @@ To upgrade from 3.24.0 to 3.25.0:
 ## Features
 
 * This release makes a lot of changes to how content is loaded over the network.
-  * Most notably, CryptPad now employs a client-side cache based on the the _indexedDB API_. Browsers that support this functionality will opportunistically store messages in a local cache for the next time they need them. This should make a considerable difference in how quickly you're able to load a pad, particularly if you accessing the server over a low-bandwidth network.
+  * Most notably, CryptPad now employs a client-side cache based on the _indexedDB API_. Browsers that support this functionality will opportunistically store messages in a local cache for the next time they need them. This should make a considerable difference in how quickly you're able to load a pad, particularly if you accessing the server over a low-bandwidth network.
   * Uploaded files (images, PDFs, etc.) are also cached in a similar way. Once you'd loaded an asset, your client will prefer to load its local copy instead of the server.
   * We've updated the code for our _full drive backup_ functionality so that it uses the local cache to load files more quickly. In addition to this, backing up the contents of your drive will also populate the cache as though you had loaded your documents in the normal fashion. This cache will persist until it is invalidated (due to the authoritative document having been deleted or had its history trimmed) or until you have logged out.
   * We've added the ability to configure the maximum size for automatically downloaded files. Any encrypted files that are above this size will instead require manual interaction to begin downloading. Files that are larger than this limit which are already loaded in your cache will still be automatically displayed.
@@ -427,13 +635,13 @@ To upgrade from 3.24.0 to 3.25.0:
 
 ## Goals
 
-We are once again working to develop some significant new features. This release is fairly small but includes some significant changes to detect and handle a variety of errors.
+We are once again working to develop some significant new features. This release is fairly small but includes some significant changes to detect and handle a variety of errors.  
 
 ## Update notes
 
-This release includes some minor corrections the recommended NGINX configuration supplied in `cryptpad/docs/example.nginx.conf`.
+This release includes some minor corrections the recommended NGINX configuration supplied in `cryptpad/docs/example.nginx.conf`.  
 
-To update from 3.23.2 to 3.24.0:
+To update from 3.23.2 to 3.24.0:  
 
 1. Update your NGINX config to replicate the most recent changes and reload NGINX to apply them.
 2. Stop the nodejs server.
@@ -462,13 +670,13 @@ To update from 3.23.2 to 3.24.0:
 
 # XerusDaamsi reloaded (3.23.2)
 
-A number of instance administrators reported issues following our 3.23.1 release. We suspect the issues were caused by applying the recommended update steps out of order which would result in the incorrect HTTP header values getting cached for the most recent version of a file. Since the most recently updated headers modified some security settings, this caused a catastrophic error on clients receiving the incorrect headers which caused them to fail to load under certain circumstances.
+A number of instance administrators reported issues following our 3.23.1 release. We suspect the issues were caused by applying the recommended update steps out of order which would result in the incorrect HTTP header values getting cached for the most recent version of a file. Since the most recently updated headers modified some security settings, this caused a catastrophic error on clients receiving the incorrect headers which caused them to fail to load under certain circumstances.  
 
-Regardless of the reasons behind this, we want CryptPad to be resilient against misconfiguration. This minor release includes a number of measures to override the unruly caching mechanisms employed internally by two of our most stubborn dependencies (CKEditor and OnlyOffice). Deploying 3.23.2 should force these editors to load the most recent versions of these dependencies according to the same policies as the rest of CryptPad and instruct clients to ignore any incorrect server responses they might have cached over the last few updates.
+Regardless of the reasons behind this, we want CryptPad to be resilient against misconfiguration. This minor release includes a number of measures to override the unruly caching mechanisms employed internally by two of our most stubborn dependencies (CKEditor and OnlyOffice). Deploying 3.23.2 should force these editors to load the most recent versions of these dependencies according to the same policies as the rest of CryptPad and instruct clients to ignore any incorrect server responses they might have cached over the last few updates.  
 
-This release also includes a number of bug fixes which had been tested in the meantime.
+This release also includes a number of bug fixes which had been tested in the meantime.  
 
-Other bug fixes
+Other bug fixes  
 
 * We removed a hardcoded translation pertaining to the recently introduced "snapshot" functionality.
 * Inspection of our server logs revealed a number of rare race conditions and type errors that have since been addressed. These included:
@@ -479,11 +687,11 @@ Other bug fixes
   * it was possible to click the buttons on the "team invitation response dialog" multiple times before the first action completed. In some cases this could result in attempting to join a single team multiple times.
   * it was also possible to activate trigger several actions that would modify your access rights for a team when the team had not fully synchronized with the server. Some of the time this was recoverable, but it could occasionally result in your team membership getting stuck in a bad state.
 
-We've implemented some measures to correct any team data that might have become corrupted due to the issues described above. Access rights from duplicated teams should be merged back into one set of cryptographic keys wherever possible. In cases where this isn't possible your role in the team will be automatically downgraded to the rank conferred by the keys you still have. For instance, somebody listed as an administrator who only has the keys required to view the team will downgrade themself to be a viewer. Subsequent promotions back to your previous team role should restore your possession of the required keys.
+We've implemented some measures to correct any team data that might have become corrupted due to the issues described above. Access rights from duplicated teams should be merged back into one set of cryptographic keys wherever possible. In cases where this isn't possible your role in the team will be automatically downgraded to the rank conferred by the keys you still have. For instance, somebody listed as an administrator who only has the keys required to view the team will downgrade themself to be a viewer. Subsequent promotions back to your previous team role should restore your possession of the required keys.  
 
-To update to 3.23.2 from 3.23.0 or 3.23.1:
+To update to 3.23.2 from 3.23.0 or 3.23.1:  
 
-Perform the same upgrade steps listed for 3.23.0 including the most recent configuration changes listed in `cryptpad/docs/example.nginx.conf...
+Perform the same upgrade steps listed for 3.23.0 including the most recent configuration changes listed in `cryptpad/docs/example.nginx.conf...  
 
 1. Modify your server's NGINX config file (but don't apply its changes until step 6)
 2. Stop CryptPad's nodejs server
@@ -495,9 +703,9 @@ Perform the same upgrade steps listed for 3.23.0 including the most recent confi
 
 # XerusDaamsi's revenge (3.23.1)
 
-We discovered a number of minor bugs after deploying 3.23.0. This minor release addresses them.
+We discovered a number of minor bugs after deploying 3.23.0. This minor release addresses them.  
 
-Features
+Features  
 
 * On instances with a lot of data (like our own) the background process responsible for evicting inactive data could time out. We've increased its permitted duration to a sufficient timeframe.
   * This process also aggregates some statistics about your database while it runs. Upon its completion a report is now stored in memory until it is overwritten by the next eviction process. This report will most likely be displayed on the admin panel in a future release.
@@ -507,14 +715,14 @@ Features
   * When creating a shared folder we now indicate that the password field will be used to add a layer of protection to the folder.
   * The "destroy" button on the access modal now indicates that it will completely destroy the file or folder in question, rather than its access list or other parameters.
 
-Bug fixes
+Bug fixes  
 
 * We received a number of support tickets related to users being unable to open rich text pads and sheets. We determined the issue to have been caused by our deployment of new HTTP headers to enable XLSX export on Firefox. These headers conflicted with the those on some cached files. The issue seemed to affect users randomly and did not occur when we tested the new features. We deployed some one-time cache-busting code to force clients to load the latest versions of these files (and their headers).
 * We addressed a regression introduced in 3.23.0 which incorrectly disabled the support ticket panels for users and admins.
 * We also fixed some layout issues on the admin panel's new _User storage_ pane.
 * Finally, we added a few guards against type errors in the drive which were most commonly triggered when viewing ranges of your drive's history which contained shared folders that had since been deleted.
 
-To update from 3.23.0 to 3.23.1:
+To update from 3.23.0 to 3.23.1:  
 
 0. Read the 3.23.0 release notes carefully and apply all configuration changes if you haven't already done so.
 1. Stop your server
@@ -526,23 +734,23 @@ To update from 3.23.0 to 3.23.1:
 
 ## Goals
 
-We plan to produce an updated installation guide for CryptPad instance administrators to coincide with the release of our 4.0.0 release. As we get closer to the end of the alphabet we're working to simplify the process of configuring instances. This release features several new admin panel features intended to supersede the usage of the server configuration file and provide the ability to modify instance settings at runtime.
+We plan to produce an updated installation guide for CryptPad instance administrators to coincide with the release of our 4.0.0 release. As we get closer to the end of the alphabet we're working to simplify the process of configuring instances. This release features several new admin panel features intended to supersede the usage of the server configuration file and provide the ability to modify instance settings at runtime.  
 
-We also spent some time finalizing some major improvements to the history mode which is available in most of our document editors. More on that in the _Features_ section.
+We also spent some time finalizing some major improvements to the history mode which is available in most of our document editors. More on that in the _Features_ section.  
 
 ## Update notes
 
-This release introduces some behaviour which may require manual configuration on the part of the administrator. Read the following sections carefully or proceed at your own risk!
+This release introduces some behaviour which may require manual configuration on the part of the administrator. Read the following sections carefully or proceed at your own risk!  
 
 ### Automatic database maintenance
 
-When a user employs the _destroy_ functionality to make a pad unavailable it isn't typically deleted. Instead it is made unavailable by moving it into the server's archive directory. Archived files are intended to be removed after another configurable amount of time (`archiveRetentionTime` in your config file). The deletion of old files from your archive is handled by `evict-inactive.js`, which can be found in `cryptpad/scripts/`. Up until now this script needed to be run manually (typically as a cron job) with `node ./scripts/evict-inactive.js`. Since this isn't widely known we decided to integrate it directly into the server by automatically running the script once per day.
+When a user employs the _destroy_ functionality to make a pad unavailable it isn't typically deleted. Instead it is made unavailable by moving it into the server's archive directory. Archived files are intended to be removed after another configurable amount of time (`archiveRetentionTime` in your config file). The deletion of old files from your archive is handled by `evict-inactive.js`, which can be found in `cryptpad/scripts/`. Up until now this script needed to be run manually (typically as a cron job) with `node ./scripts/evict-inactive.js`. Since this isn't widely known we decided to integrate it directly into the server by automatically running the script once per day.  
 
-The same _eviction_ process is also responsible for scanning your server's database for inactive documents (defined as those which haven't been accessed in a number of days specified in your config under `inactiveTime`). Such inactive documents are archived unless they have been stored within a registered users drive. Starting with this release we have added the ability to specify the number of days before an account will be considered inactive (`accountRetentionTime`). This will take into account whether they added any new documents to their drive, or whether any of the existing documents were accessed or modified by other users.
+The same _eviction_ process is also responsible for scanning your server's database for inactive documents (defined as those which haven't been accessed in a number of days specified in your config under `inactiveTime`). Such inactive documents are archived unless they have been stored within a registered users drive. Starting with this release we have added the ability to specify the number of days before an account will be considered inactive (`accountRetentionTime`). This will take into account whether they added any new documents to their drive, or whether any of the existing documents were accessed or modified by other users.  
 
-If you prefer to run the eviction script manually you can disable its integration into the server by adding `disableIntegratedEviction: true` to your config file. An example is given in `cryptpad/config/config.example.js`. If you want this process to run manually you may set the same value to `false`, or comment it out if you prefer. Likewise, if you prefer to never remove accounts and their data due to account inactivity, you may also comment it out.
+If you prefer to run the eviction script manually you can disable its integration into the server by adding `disableIntegratedEviction: true` to your config file. An example is given in `cryptpad/config/config.example.js`. If you want this process to run manually you may set the same value to `false`, or comment it out if you prefer. Likewise, if you prefer to never remove accounts and their data due to account inactivity, you may also comment it out.  
 
-If you haven't been manually running the eviction scripts we recommend that you carefully review all of the values mentioned above to ensure that you will not be surprised by the sudden and unintended removal of any data. As a reminder, they are:
+If you haven't been manually running the eviction scripts we recommend that you carefully review all of the values mentioned above to ensure that you will not be surprised by the sudden and unintended removal of any data. As a reminder, they are:  
 
 * `inactiveTime` (number of days before a file is considered inactive)
 * `archiveRetentionTime` (number of days that an archived file will be retained before it is permanently deleted)
@@ -551,19 +759,19 @@ If you haven't been manually running the eviction scripts we recommend that you
 
 ### NGINX Configuration update
 
-After some testing on our part we've included an update to the example NGINX config file available in `cryptpad/docs/example.nginx.conf` which will enable a relatively new browser API which is required for XLSX export from our sheet editor. The relevant lines can be found beneath the comment `# Enable SharedArrayBuffer in Firefox (for .xlsx export)`.
+After some testing on our part we've included an update to the example NGINX config file available in `cryptpad/docs/example.nginx.conf` which will enable a relatively new browser API which is required for XLSX export from our sheet editor. The relevant lines can be found beneath the comment `# Enable SharedArrayBuffer in Firefox (for .xlsx export)`.  
 
 ### Quota management
 
-Up until now the configuration file found in `cryptpad/config/config.js` has been the primary means of configuring a CryptPad instance. Unfortunately, as the server's behaviour becomes increasingly complex due to interest in a broad variety of use-cases this config file tends to grow. The kinds of questions that administrators ask via email, GitHub issues, and via our Matrix channel often suggest that admins haven't read through the comments in these files. Additionally, changes to the server's configuration can only be applied by restarting the server, which is increasingly disruptive as the service becomes more popular. To address these issues we've decided to start improving the instance admin panel such that it becomes the predominant means of modifying common server behaviours.
+Up until now the configuration file found in `cryptpad/config/config.js` has been the primary means of configuring a CryptPad instance. Unfortunately, as the server's behaviour becomes increasingly complex due to interest in a broad variety of use-cases this config file tends to grow. The kinds of questions that administrators ask via email, GitHub issues, and via our Matrix channel often suggest that admins haven't read through the comments in these files. Additionally, changes to the server's configuration can only be applied by restarting the server, which is increasingly disruptive as the service becomes more popular. To address these issues we've decided to start improving the instance admin panel such that it becomes the predominant means of modifying common server behaviours.  
 
-We've started by making it possible to update storage settings from the _User storage_ section of the admin panel. Administrators can now update the default storage limit for users registered on the instance from the default quota of 50MB. It's also possible to allocate storage limits to particular users on the basis of their _Public Signing Key_, which can be found at the top of the _Accounts_ section on the settings page.
+We've started by making it possible to update storage settings from the _User storage_ section of the admin panel. Administrators can now update the default storage limit for users registered on the instance from the default quota of 50MB. It's also possible to allocate storage limits to particular users on the basis of their _Public Signing Key_, which can be found at the top of the _Accounts_ section on the settings page.  
 
-Storage limits configured in this way will supercede those set via the server's config file, such that any modifications to a quota already set in the file will be ignored once you have modified or removed that user's quota via the admin panel. Admins are also able to view the parameters of all existing custom quotas loaded from either source.
+Storage limits configured in this way will supercede those set via the server's config file, such that any modifications to a quota already set in the file will be ignored once you have modified or removed that user's quota via the admin panel. Admins are also able to view the parameters of all existing custom quotas loaded from either source.  
 
 ### How to update
 
-Once you've reviewed these settings and you're ready to update from 3.22.0 to 3.23.0:
+Once you've reviewed these settings and you're ready to update from 3.22.0 to 3.23.0:  
 
 1. Modify your server's NGINX config file to include the new headers enabling XLSX export
 2. Stop CryptPad's nodejs server
@@ -575,7 +783,6 @@ Once you've reviewed these settings and you're ready to update from 3.22.0 to 3.
 
 ## Features
 
-
 * As mentioned in the update notes, this release features a server update which will enable XLSX export from our sheet editor in Firefox. XLSX files are generated entirely on the client, so all information will remain confidential, it only required a server update to enable a feature in Firefox which is required to perform the conversion.
 * We've also made some considerable improvements to the _history mode_ available in most of our document editors. We now display a more detailed timeline of changes according to who was present in the session, and group contiguous modifications made by a single user. Our intent is to provide an overview of the document's history which exposes the details which are most relevant to humans, rather than only allowing users to step through each individual change.
 * Another change which is related to our history mode improvements is support for "version links", which allow you to link to a specific historical version of a document while you scroll through the timeline of its modifications. You can also create _named snapshots_ of documents which will subsequently be displayed as highlights in the document's timeline.
@@ -595,11 +802,11 @@ Once you've reviewed these settings and you're ready to update from 3.22.0 to 3.
 
 ## Goals
 
-We've been working on some long-term projects that we hope to deliver over the course of the next few releases. In the meantime, this release includes a number of minor improvements.
+We've been working on some long-term projects that we hope to deliver over the course of the next few releases. In the meantime, this release includes a number of minor improvements.  
 
 ## Update notes
 
-To upgrade from 3.21.0 to 3.22.0:
+To upgrade from 3.21.0 to 3.22.0:  
 
 1. Stop your server
 2. Get the latest platform code with git
@@ -623,21 +830,21 @@ To upgrade from 3.21.0 to 3.22.0:
 
 ## Goals
 
-This release was developed over a longer period than usual due to holidays, our yearly company seminar, and generally working on some important software-adjacent projects. As such, we opted not to aim for any major features and instead introduce some minor improvements and address some users' complaints.
+This release was developed over a longer period than usual due to holidays, our yearly company seminar, and generally working on some important software-adjacent projects. As such, we opted not to aim for any major features and instead introduce some minor improvements and address some users' complaints.  
 
 ## Update notes
 
-We've had a few disgruntled administrators contact us about our apparent _failure to provide a docker image_ or to otherwise support their preferred configuration. With that in mind, this is a periodic reminder that CryptPad is provided to the public under the terms of the AGPL (found within this repository in the [LICENSE file](./LICENSE)) which implies on our part no warranty, liability, or responsibility to configure your server for you. We do our best to provide the necessary information to correctly launch your own instance of the software given our limited budget, however, all such files are provided **AS IS** and are only intended to function under the narrow circumstances of usage which we recommend within the comments of the provided example configuration files.
+We've had a few disgruntled administrators contact us about our apparent _failure to provide a docker image_ or to otherwise support their preferred configuration. With that in mind, this is a periodic reminder that CryptPad is provided to the public under the terms of the AGPL (found within this repository in the [LICENSE file](./LICENSE)) which implies on our part no warranty, liability, or responsibility to configure your server for you. We do our best to provide the necessary information to correctly launch your own instance of the software given our limited budget, however, all such files are provided **AS IS** and are only intended to function under the narrow circumstances of usage which we recommend within the comments of the provided example configuration files.  
 
-With that said, the vast majority of our community acts kindly and courteously towards us and each other. We really do appreciate it, and we'll continue to help you to the best of our ability. With that in mind, we're happy to announce that we've written and deployed a first version of our user guide, available at https://docs.cryptpad.fr. The work that went into this was funded by NLnet foundation as an NGI Zero PET (Privacy-Enhancing Technology) grant. We are currently working on two more guides intended for developers and administrators, and will deploy them to the same domain as they are completed. In the meantime we have begun to update our README, GitHub wiki, and other resources to reflect the current recommended practices and remove references to unsupported configurations.
+With that said, the vast majority of our community acts kindly and courteously towards us and each other. We really do appreciate it, and we'll continue to help you to the best of our ability. With that in mind, we're happy to announce that we've written and deployed a first version of our user guide, available at https://docs.cryptpad.fr. The work that went into this was funded by NLnet foundation as an NGI Zero PET (Privacy-Enhancing Technology) grant. We are currently working on two more guides intended for developers and administrators, and will deploy them to the same domain as they are completed. In the meantime we have begun to update our README, GitHub wiki, and other resources to reflect the current recommended practices and remove references to unsupported configurations.  
 
-If you're only reading this for instructions on how to update your instance from 3.20.1 to 3.21.0:
+If you're only reading this for instructions on how to update your instance from 3.20.1 to 3.21.0:  
 
 1. Stop your server
 2. Get the latest platform code with git
 3. Install client-side dependencies with `bower update`
 4. Install server-side dependencies with `npm install`
-4. Restart the CryptPad API server
+5. Restart the CryptPad API server
 
 ## Features
 
@@ -657,10 +864,10 @@ If you're only reading this for instructions on how to update your instance from
 
 # UplandMoa's revenge (3.20.1)
 
-Once again we've decided to follow up our last major release with a minor "revenge" release that we wanted to make available as soon as possible.
-We expect to deploy and release version 3.21.0 on Tuesday, July 28th, 2020.
+Once again we've decided to follow up our last major release with a minor "revenge" release that we wanted to make available as soon as possible.  
+We expect to deploy and release version 3.21.0 on Tuesday, July 28th, 2020.  
 
-Features
+Features  
 
 * The _markmap_ rendering mode which was recently added to markdown preview pane implements some click event handlers which overlap with our existing handlers which open the embedded mindmap in our full screen "lightbox". You can now use _ctrl-click_ to trigger its built-in events (collapsing subtrees of the mindmap) without opening the lightbox.
 * We've made a few improvement to user and team drives:
@@ -670,7 +877,7 @@ Features
 * Our rich text, code, slide, and poll apps now intercept pasted images and prompt the user to upload them, matching the existing experience of dragging an image into the same editable area.
 * We've received new contributions to our Romanian translation via [our weblate instance](https://weblate.cryptpad.fr/projects/cryptpad/app/).
 
-Bug fixes
+Bug fixes  
 
 * We identified some race conditions in our spreadsheet app that were responsible for some corrupted data during the period leading up to our 3.20.0 release, however, we wanted to take a little more time to test before releasing the fixes. As of this release we're moving to a third version of our internal data format. This requires a client-side migration for each older sheet which will be performed by the first registered user to open a sheet in edit mode, after which a page reload will be required. Unregistered users with edit rights will only be able to view older sheets until they have been migrated by a registered user.
 * We now guard against empty _mathjax_ and _markmap_ code blocks in their respective markdown preview rendering extensions, as we discovered that empty inputs resulted in the display of "undefined" in the rendered element.
@@ -680,26 +887,26 @@ Bug fixes
 * We've updated to a new version of `lodash` as a dependency of the linters that we use to validate our code. Unless you were actively using those linters while developing CryptPad this should have no effect for you.
 * Finally, when users open a link to a "self-destructing pad" we now check to make sure that the deletion key they possess has not been revoked before displaying a warning indicating that the pad in question will be deleted once they open it.
 
-To update from 3.20.0 to 3.20.1:
+To update from 3.20.0 to 3.20.1:  
 
 1. Stop your server
 2. Get the latest code with `git checkout 3.20.1`
 3. Install the latest dependencies with `bower update` and `npm i`
-3. Restart your server
+4. Restart your server
 
 # UplandMoa (3.20.0)
 
 ## Goals
 
-We've held off on deploying any major features while we work towards deploying some documentation we've been busy organizing. This release features a wide range of minor features intended to address a number of github issues and frequent causes of support tickets.
+We've held off on deploying any major features while we work towards deploying some documentation we've been busy organizing. This release features a wide range of minor features intended to address a number of github issues and frequent causes of support tickets.  
 
 ## Update notes
 
-This release features a modification to the recommended Content Security Policy headers as demonstrated in `./cryptpad/docs/example.nginx.conf`. CryptPad will work without making this change, however, we highly recommend updating your instance's nginx.conf as it will mitigate a variety of potential security vulnerabilities.
+This release features a modification to the recommended Content Security Policy headers as demonstrated in `./cryptpad/docs/example.nginx.conf`. CryptPad will work without making this change, however, we highly recommend updating your instance's nginx.conf as it will mitigate a variety of potential security vulnerabilities.  
 
-Otherwise, we've introduced a new client-side dependency (_Mathjax_) and changed some server-side code that will require a server restart.
+Otherwise, we've introduced a new client-side dependency (_Mathjax_) and changed some server-side code that will require a server restart.  
 
-To update from 3.19.1 to 3.20.0:
+To update from 3.19.1 to 3.20.0:  
 
 1. Apply the recommended changes to  your `nginx.conf`
 2. Stop your server
@@ -748,9 +955,9 @@ To update from 3.19.1 to 3.20.0:
 
 # Thylacine's revenge (3.19.1)
 
-Our upcoming 3.20.0 release is planned for July 7th, 2020, but we are once again releasing a minor version featuring some nice bug fixes and usability improvements which are ready to be deployed now. In case you missed [our announcement](https://social.weho.st/@cryptpad/104360490068671089) we are phasing out our usage of the `master` and basing our releases on the `main` branch. For best results we recommend explicitly checking out code by its tag.
+Our upcoming 3.20.0 release is planned for July 7th, 2020, but we are once again releasing a minor version featuring some nice bug fixes and usability improvements which are ready to be deployed now. In case you missed [our announcement](https://social.weho.st/@cryptpad/104360490068671089) we are phasing out our usage of the `master` and basing our releases on the `main` branch. For best results we recommend explicitly checking out code by its tag.  
 
-New features:
+New features:  
 
 * We've spent a little time making support tickets a little bit easier for both users and admins.
   * Users can now label their tickets with a set of predefined categories, making it easier for admins to sort through related reports.
@@ -758,7 +965,7 @@ New features:
 * Teams now take advantage of the same "mailbox" functionality that powers user accounts' notification center. Team members with the "viewer" role can now use this feature to share documents with their team using the "share menu" as they already can with other users. Anyone with the ability to add a document to the team's drive will then be able to receive the notification and add the document to the team's drive for them. Going forward we'll use this functionality to implement more behaviour to make teams function more like shared user accounts.
 * The "pad creation screen" which is displayed to registered users when they first create a pad will no longer remember the settings used when they last created a pad. While this behaviour was intended to streamline the process of creating documents, in practice it led to some user's documents getting deleted because they didn't realize they were set to automatically expire. If you prefer not to use the defaults (owned, non-expiring) then you'll have to click a few more times to create a document, but we think that's a worthwhile tradeoff to avoid data loss.
 
-Bug fixes:
+Bug fixes:  
 
 * Hitting _ctrl-A_ in the drive used to select lots of the page's elements which had no business being selected. Now it will select the contents of the directory currently being displayed.
 * Due to some complications in OnlyOffice (which we use for spreadsheets) remote updates made to a sheet were not displayed for users who had opened the document in "view mode". We still don't have the means to apply these remote changes in real-time, but we now prompt users to click a button to refresh the editor (not the full page) to display the latest document state.
@@ -767,25 +974,25 @@ Bug fixes:
 * We noticed that the zip file constructed in the browser when you downloaded a subtree of a shared folder in your drive contained the correct directory structure but did not contain the files that were supposed to be there. This has been fixed.
 * Finally, we've tweaked our styles to use more specific CSS selectors to prevent a variety of styles from being accidentally applied to the wrong elements. This should make the platform a little easier to maintain and help us improve the visual consistency of a variety of elements on different pages.
 
-To update from 3.19.0 to 3.19.1:
+To update from 3.19.0 to 3.19.1:  
 
 1. Stop your server
 2. Get the latest code with `git checkout 3.19.1`
 3. Restart your server
 
-If you're updating from anything other than 3.19.0 you may need other clientside dependencies (available with `bower update` and `npm i`).
+If you're updating from anything other than 3.19.0 you may need other clientside dependencies (available with `bower update` and `npm i`).  
 
 # Thylacine release (3.19.0)
 
 ## Goals
 
-The intent of this release was to catch up on our backlog of bug fixes and minor usability improvements.
+The intent of this release was to catch up on our backlog of bug fixes and minor usability improvements.  
 
 ## Update notes
 
-This release features an update to our clientside dependencies.
+This release features an update to our clientside dependencies.  
 
-To update to 3.19.0 from 3.18.1:
+To update to 3.19.0 from 3.18.1:  
 
 1. Stop your server
 2. Get the latest code with git
@@ -830,17 +1037,17 @@ To update to 3.19.0 from 3.18.1:
 
 # Smilodon's revenge (3.18.1)
 
-Our next major release (3.19.0) is still a few weeks away.
-In the meantime we've been working on some minor improvements and bug fixes that we wanted to ship as soon as possible.
+Our next major release (3.19.0) is still a few weeks away.  
+In the meantime we've been working on some minor improvements and bug fixes that we wanted to ship as soon as possible.  
 
-New features:
+New features:  
 
 * Rich text pads can now be exported to .doc format. A few features don't translate well to the exported format (some fonts, embedded videos and pdfs), but for the most part your documents should work
 * Items in the "Recent pads" section of your drive can now be dragged to other folders via the filesystem tree UI
 * The user admin menu (found in the top-right corner) now includes an option to display the current version of the CryptPad instance you're using. We plan to add some more information here in the near future.
 * The kanban app now offers better support for editing markdown within cards with autocompleted parentheses. We've also added support for embedded media, allowing users to drag images and other content into the card content editor.
 
-Bug fixes:
+Bug fixes:  
 
 * Account deletion via the settings page works once again
 * Some small layout and usability issues in the drive have been addressed
@@ -852,7 +1059,7 @@ Bug fixes:
 * We've updated the parameters of the XLSX import/export functionality to prevent an "out of memory" error that primarily affected large spreadsheets. It should now allocate more memory instead of failing silently.
 * Finally, members of a team can now directly share or transfer ownership of a document owned by their team to their own account without having to go through the additional steps of offering it to themself and accepting the offer.
 
-Updating from 3.18.0 to 3.18.1 is pretty standard:
+Updating from 3.18.0 to 3.18.1 is pretty standard:  
 
 1. Stop your server
 2. Get the latest code with git
@@ -862,17 +1069,17 @@ Updating from 3.18.0 to 3.18.1 is pretty standard:
 
 ## Goals
 
-This is a big one! A lot of people are going to love it and a few are probably going to hate it.
+This is a big one! A lot of people are going to love it and a few are probably going to hate it.  
 
-This release introduces some major changes to our apps' appearances with the intent of making it easier to use, easier for us to support, and easier to maintain.
+This release introduces some major changes to our apps' appearances with the intent of making it easier to use, easier for us to support, and easier to maintain.  
 
 ## Update notes
 
-If you're using a mostly standard CryptPad installation this should be a rather easy update.
+If you're using a mostly standard CryptPad installation this should be a rather easy update.  
 
-If you've customized your styles, particularly for the purpose of overriding the default colors, you may encounter some problems. **We recommend that you test this version in a staging environment** before deploying to ensure that it is compatible with your modifications.
+If you've customized your styles, particularly for the purpose of overriding the default colors, you may encounter some problems. **We recommend that you test this version in a staging environment** before deploying to ensure that it is compatible with your modifications.  
 
-Otherwise, update to 3.18.0 from 3.17.0 in the following manner:
+Otherwise, update to 3.18.0 from 3.17.0 in the following manner:  
 
 1. stop your server
 2. fetch the latest code with git
@@ -899,13 +1106,13 @@ Otherwise, update to 3.18.0 from 3.17.0 in the following manner:
 
 # RedGazelle's revenge release (3.17.1)
 
-In recent months a growing amount of our time has been going towards answering support tickets, emails, and GitHub issues. This has made it a little more difficult to also maintain a bi-weekly release schedule, since there's some overhead involved in deploying our latest code and producing release notes.
+In recent months a growing amount of our time has been going towards answering support tickets, emails, and GitHub issues. This has made it a little more difficult to also maintain a bi-weekly release schedule, since there's some overhead involved in deploying our latest code and producing release notes.  
 
-To ease our workload, we've decided to switch to producing a full release every three weeks, with an optional patch release at some point in the middle. Patch releases may fix major issues that can't wait three weeks or may simply consist of a few minor fixes that are trivial to deploy.
+To ease our workload, we've decided to switch to producing a full release every three weeks, with an optional patch release at some point in the middle. Patch releases may fix major issues that can't wait three weeks or may simply consist of a few minor fixes that are trivial to deploy.  
 
-This release fixes a few spreadsheet issues and introduces a more responsive layout for user drives in list mode.
+This release fixes a few spreadsheet issues and introduces a more responsive layout for user drives in list mode.  
 
-Updating to 3.17.1 from 3.17.0 is pretty standard:
+Updating to 3.17.1 from 3.17.0 is pretty standard:  
 
 1. Stop your server
 2. Get the latest code with git
@@ -915,25 +1122,25 @@ Updating to 3.17.1 from 3.17.0 is pretty standard:
 
 ## Goals
 
-Our goal for this release was to introduce a first version of comments and mentions in our rich text editor as a part of a second R&D project funded by [NLnet](https://nlnet.nl/). We also received the results of an "accessibility audit" that was conducted as a part of our first NLnet PET project and so we've begun to integrate the auditor's feedback into the platform.
+Our goal for this release was to introduce a first version of comments and mentions in our rich text editor as a part of a second R&D project funded by [NLnet](https://nlnet.nl/). We also received the results of an "accessibility audit" that was conducted as a part of our first NLnet PET project and so we've begun to integrate the auditor's feedback into the platform.  
 
-Otherwise we've continued with our major goal of continuing to support a growing number of users on our instance via server improvements (without introducing any regressions).
+Otherwise we've continued with our major goal of continuing to support a growing number of users on our instance via server improvements (without introducing any regressions).  
 
 ## Update notes
 
-The most drastic change in this release is that we've removed all docker-related files from the platform's repository. These files were all added via community contributions. Having them in the main repo gave the impression that we support installation via docker (which we do not).
+The most drastic change in this release is that we've removed all docker-related files from the platform's repository. These files were all added via community contributions. Having them in the main repo gave the impression that we support installation via docker (which we do not).  
 
-Docker-related files can now be found in the community-support [cryptpad-docker](https://github.com/xwiki-labs/cryptpad-docker/) repository.
-If you have an existing instance that you've installed using docker and you'd like to update, you may review the [migration guide](https://github.com/xwiki-labs/cryptpad-docker/blob/master/MIGRATION.md). If you encounter any problems in the process we advise that you create an issue in the repository's issue-tracker.
+Docker-related files can now be found in the community-support [cryptpad-docker](https://github.com/xwiki-labs/cryptpad-docker/) repository.  
+If you have an existing instance that you've installed using docker and you'd like to update, you may review the [migration guide](https://github.com/xwiki-labs/cryptpad-docker/blob/master/MIGRATION.md). If you encounter any problems in the process we advise that you create an issue in the repository's issue-tracker.  
 
-Once again, this repository is **community-maintained**. If you are using this repository then _you are a part of the community_! Bug reports are useful, but fixes are even better!
+Once again, this repository is **community-maintained**. If you are using this repository then _you are a part of the community_! Bug reports are useful, but fixes are even better!  
 
-Otherwise, this is a fairly standard release. We've updated two of our client-side dependencies:
+Otherwise, this is a fairly standard release. We've updated two of our client-side dependencies:  
 
 1. ChainPad features a memory management optimization which is particularly relevant to editing very large documents or loading a drive with a large number of files. In one test we were able to reduce memory consumption in Chrome from 1.7GB to 20MB.
 2. CKEditor (the third-party library we use for our rich-text editor) has been updated so that we could make use of some more recent APIs for the _comments_ feature.
 
-To update from **3.16.0** to **3.17.0**:
+To update from **3.16.0** to **3.17.0**:  
 
 1. Stop your server
 2. Fetch the latest source with git
@@ -963,15 +1170,15 @@ To update from **3.16.0** to **3.17.0**:
 
 ## Goals
 
-We've continued to keep a close eye on server performance since our last release while making minimal changes. Our goal for this release has been to improve server scalability further while also addressing user needs with updates to our client code.
+We've continued to keep a close eye on server performance since our last release while making minimal changes. Our goal for this release has been to improve server scalability further while also addressing user needs with updates to our client code.  
 
-We were pleasantly surprised to receive a pull request implementing a basic version of [author colors](https://github.com/xwiki-labs/cryptpad/issues/41) in our code editor. Since it was nearly ready to go we set some time aside to polish it up a little bit to include it in this release.
+We were pleasantly surprised to receive a pull request implementing a basic version of [author colors](https://github.com/xwiki-labs/cryptpad/issues/41) in our code editor. Since it was nearly ready to go we set some time aside to polish it up a little bit to include it in this release.  
 
 ## Update notes
 
-We've updated the example nginx config in order to include an `Access-Control-Allow-Origin` header that was not included. We've also added a new configuration point in response to [this issue](https://github.com/xwiki-labs/cryptpad/issues/529) about the server's child processes using too many threads. Administrators may not set a maximum number of child processes via `config.js` using `maxWorkers: <number of child processes>`. We recommend using one less than the number of available cores, though one worker should be sufficient as long as your server is not under heavy load.
+We've updated the example nginx config in order to include an `Access-Control-Allow-Origin` header that was not included. We've also added a new configuration point in response to [this issue](https://github.com/xwiki-labs/cryptpad/issues/529) about the server's child processes using too many threads. Administrators may not set a maximum number of child processes via `config.js` using `maxWorkers: <number of child processes>`. We recommend using one less than the number of available cores, though one worker should be sufficient as long as your server is not under heavy load.  
 
-As usual, updating from the previous release can be accomplished by:
+As usual, updating from the previous release can be accomplished by:  
 
 1. stopping your server
 2. pulling the latest code with git
@@ -1004,13 +1211,13 @@ As usual, updating from the previous release can be accomplished by:
 
 ## Goals
 
-Our plan for this release was to allow our server's code to stabilize after a prologued period of major changes. The massive surge of new users on cryptpad.fr forced us to change our plans and focus instead on increasing performance and scalability of our serverside code and its supporting infrastructure. Most of this release's changes have been thoroughly tested as they've been deployed to our instance on an ongoing basis, however, we're still looking forward to stabilizing as planned.
+Our plan for this release was to allow our server's code to stabilize after a prologued period of major changes. The massive surge of new users on cryptpad.fr forced us to change our plans and focus instead on increasing performance and scalability of our serverside code and its supporting infrastructure. Most of this release's changes have been thoroughly tested as they've been deployed to our instance on an ongoing basis, however, we're still looking forward to stabilizing as planned.  
 
-We also ended up making significant improvements to our clientside code, since the increased load on the server seemed to exacerbate a few race conditions which occurred less frequently under the previous circumstances.
+We also ended up making significant improvements to our clientside code, since the increased load on the server seemed to exacerbate a few race conditions which occurred less frequently under the previous circumstances.  
 
 ## Update notes
 
-Updating from version 3.14.0 should follow the usual process:
+Updating from version 3.14.0 should follow the usual process:  
 
 1. stop your server
 2. fetch the latest code with git
@@ -1018,7 +1225,7 @@ Updating from version 3.14.0 should follow the usual process:
 4. install serverside dependencies with `npm i`
 5. start your server
 
-You may notice that the server now launches a number of child processes named `crypto-worker.js` and `db-worker.js`. These worker processes make use of however many cores your server has available to perform more CPU-intensive tasks in parallel.
+You may notice that the server now launches a number of child processes named `crypto-worker.js` and `db-worker.js`. These worker processes make use of however many cores your server has available to perform more CPU-intensive tasks in parallel.  
 
 ## Features
 
@@ -1034,7 +1241,7 @@ You may notice that the server now launches a number of child processes named `c
 
 ## Bug fixes
 
-This release contains fixes for a lot of bugs. We'll provide a brief overview, but in the interest of putting more time towards development I'll just put my strong recommendation that you update.
+This release contains fixes for a lot of bugs. We'll provide a brief overview, but in the interest of putting more time towards development I'll just put my strong recommendation that you update.  
 
 * The server process didn't always close file descriptors that it opened, resulting in an EMFILE error when the system ran out of available file descriptors. Now it closes them.
 * The server also kept an unbounded amount of data in an in-memory cache under certain circumstances. Now it doesn't.
@@ -1051,15 +1258,15 @@ This release contains fixes for a lot of bugs. We'll provide a brief overview, b
 
 ## Goals
 
-We planned a one-week release cycle in order to finish up some major features that were already in development during our last release.
+We planned a one-week release cycle in order to finish up some major features that were already in development during our last release.  
 
-In the meantime, the reaction to the COVID-19 pandemic has resulted in a greatly increased load on our servers, so we've begun to focus on improving stability to ensure that we are able to keep up with demand.
+In the meantime, the reaction to the COVID-19 pandemic has resulted in a greatly increased load on our servers, so we've begun to focus on improving stability to ensure that we are able to keep up with demand.  
 
 ## Update notes
 
-We had some trouble during the week of March 9th, 2020, as the CryptPad.fr server started throwing EMFILE errors. This means that it was trying to open new files (for reading or writing) but there were too many files open already. We've added some new code to help debug the issue, but there is not yet a fix in place. The maximum number of open files on our host OS had been increased by several orders of magnitude (several years ago) but we're now aware that the systemd service file that launches the API server does not respect this global limit. As such, we've updated the example service file to indicate how you can update this limit yourself. For an example of how to update this limit at the OS level, see this page: https://docs.oracle.com/cd/E19623-01/820-6168/file-descriptor-requirements.html
+We had some trouble during the week of March 9th, 2020, as the CryptPad.fr server started throwing EMFILE errors. This means that it was trying to open new files (for reading or writing) but there were too many files open already. We've added some new code to help debug the issue, but there is not yet a fix in place. The maximum number of open files on our host OS had been increased by several orders of magnitude (several years ago) but we're now aware that the systemd service file that launches the API server does not respect this global limit. As such, we've updated the example service file to indicate how you can update this limit yourself. For an example of how to update this limit at the OS level, see this page: https://docs.oracle.com/cd/E19623-01/820-6168/file-descriptor-requirements.html  
 
-Otherwise, updating from 3.13.0 to 3.14.0 is as usual:
+Otherwise, updating from 3.13.0 to 3.14.0 is as usual:  
 
 1. stop your server
 2. fetch the latest source
@@ -1069,7 +1276,7 @@ Otherwise, updating from 3.13.0 to 3.14.0 is as usual:
 
 ## Features
 
-We're very happy to announce a major update to our kanban application! We've made a lot of changes, but the most notables ones are:
+We're very happy to announce a major update to our kanban application! We've made a lot of changes, but the most notables ones are:  
 
 * the ability to add markdown content to your cards and edit it collaboratively in real-time
 * tags on cards and the ability to filter cards by tags at the top of the application
@@ -1079,7 +1286,7 @@ We're very happy to announce a major update to our kanban application! We've mad
 * a smaller palette of pre-chosen colors for cards and boards instead of a color-picker, to make it easier to choose matching colors for tasks
 * the ability to drag cards and boards to the trash instead of having to click a small X and confirm their deletion
 
-We've also improved message throughput for our server by splitting cryptographic signature validation into separate processes. On a quad core server this means you should be able to handle (roughly) four times the messages.
+We've also improved message throughput for our server by splitting cryptographic signature validation into separate processes. On a quad core server this means you should be able to handle (roughly) four times the messages.  
 
 ## Bug fixes
 
@@ -1098,39 +1305,39 @@ We've also improved message throughput for our server by splitting cryptographic
 
 ## Goals
 
-This release cycle we prioritized the completion of "access lists", a major feature that we're excited to introduce.
+This release cycle we prioritized the completion of "access lists", a major feature that we're excited to introduce.  
 
 ## Update notes
 
-Nearly every week (sometimes more than once) we end up taking time away from development to help administrators to configure their CryptPad instances. We're happy to see more instances popping up, but ideally we'd like to spend more of our time working on new features. With this in mind we devoted some time to simplify instance configuration and to clarify some points where people commonly have difficulty.
+Nearly every week (sometimes more than once) we end up taking time away from development to help administrators to configure their CryptPad instances. We're happy to see more instances popping up, but ideally we'd like to spend more of our time working on new features. With this in mind we devoted some time to simplify instance configuration and to clarify some points where people commonly have difficulty.  
 
-If you review `cryptpad/config.example.js` you'll notice it is significantly smaller than it was last release.
-Old configuration files should be backwards compatible (if you copied `config.example.js` to `config.js` in order to customize it).
-The example has been reorganized so that the most important parts (which people seemed to miss most of the time) are at the top.
-Most of the fields which were defined within the config file now have defaults defined within the server itself.
-If you supply these values they will override the default, but for the most part they can be removed.
+If you review `cryptpad/config.example.js` you'll notice it is significantly smaller than it was last release.  
+Old configuration files should be backwards compatible (if you copied `config.example.js` to `config.js` in order to customize it).  
+The example has been reorganized so that the most important parts (which people seemed to miss most of the time) are at the top.  
+Most of the fields which were defined within the config file now have defaults defined within the server itself.  
+If you supply these values they will override the default, but for the most part they can be removed.  
 
-We advise that you read the comments at the top of the example, in particular the points related to `httpUnsafeOrigin` and `httpSafeOrigin` which are used to protect users' cryptographic keys in the event of a cross-site scripting (XSS) vulnerability.
-If these values are not correctly set then your users will not benefit from all the security measures we've spent lots of time implemented.
+We advise that you read the comments at the top of the example, in particular the points related to `httpUnsafeOrigin` and `httpSafeOrigin` which are used to protect users' cryptographic keys in the event of a cross-site scripting (XSS) vulnerability.  
+If these values are not correctly set then your users will not benefit from all the security measures we've spent lots of time implemented.  
 
-A lot of the fields that were present as modifiable defaults have been removed or commented out in the example config.
-If you supply them then they will override the default behaviour, however, you probably won't need to and doing so might break important functionality.
-Content-Security Policy (CSP) definitions should be safe to remove, as should `httpAddress`, `httpPort`, and `httpSafePort` (unless you need to run the nodejs API server on an address other than `localhost` or port 3000.
+A lot of the fields that were present as modifiable defaults have been removed or commented out in the example config.  
+If you supply them then they will override the default behaviour, however, you probably won't need to and doing so might break important functionality.  
+Content-Security Policy (CSP) definitions should be safe to remove, as should `httpAddress`, `httpPort`, and `httpSafePort` (unless you need to run the nodejs API server on an address other than `localhost` or port 3000.  
 
-Up until now it's been possible for administrators to allow users to pay for accounts (on their server) via https://accounts.cryptpad.fr.
-Our intent was to securely handle payment and then split the proceeds between ourselves and the instance's administrator.
-In practice this just created extra work for us because we ended up having to contact admins, all of whom have opted to treat the subscription as a donation to support development.
-As such we have disabled the ability of users to pay for premium subscriptions (on https://accounts.cryptpad.fr) for any instance other than our own.
+Up until now it's been possible for administrators to allow users to pay for accounts (on their server) via https://accounts.cryptpad.fr.  
+Our intent was to securely handle payment and then split the proceeds between ourselves and the instance's administrator.  
+In practice this just created extra work for us because we ended up having to contact admins, all of whom have opted to treat the subscription as a donation to support development.  
+As such we have disabled the ability of users to pay for premium subscriptions (on https://accounts.cryptpad.fr) for any instance other than our own.  
 
-Servers with premium subscriptions enabled were configured to check whether anyone had subscribed to a premium account by querying our accounts server on a daily basis.
-We've left this daily check in place despite premium subscriptions being disabled because it informs us how many third-party instances exist and what versions they are running.
-We don't sell or share this information with anyone, but it is useful to us because it informs us what older data structures we have to continue to support.
-For instance, we retain code for migrating documents to newer data formats as long as we know that there are still instances that have not run those migrations.
-We also cite the number of third-party instances when applying for grants as an indicator of the value of funding our project.
-In any case, you can disable this daily check-in by setting `blockDailyCheck` to `true` in `config/config.js`.
+Servers with premium subscriptions enabled were configured to check whether anyone had subscribed to a premium account by querying our accounts server on a daily basis.  
+We've left this daily check in place despite premium subscriptions being disabled because it informs us how many third-party instances exist and what versions they are running.  
+We don't sell or share this information with anyone, but it is useful to us because it informs us what older data structures we have to continue to support.  
+For instance, we retain code for migrating documents to newer data formats as long as we know that there are still instances that have not run those migrations.  
+We also cite the number of third-party instances when applying for grants as an indicator of the value of funding our project.  
+In any case, you can disable this daily check-in by setting `blockDailyCheck` to `true` in `config/config.js`.  
 
-Finally, we've implemented the ability to set a higher limit on the maximum size of uploaded files for premium users (paying users on CryptPad.fr and users with entries in `customLimits` on other instances).
-Set this limit as a number (of bytes) with `premiumUploadSize` in your config file.
+Finally, we've implemented the ability to set a higher limit on the maximum size of uploaded files for premium users (paying users on CryptPad.fr and users with entries in `customLimits` on other instances).  
+Set this limit as a number (of bytes) with `premiumUploadSize` in your config file.  
 
 ## Features
 
@@ -1152,21 +1359,21 @@ Set this limit as a number (of bytes) with `premiumUploadSize` in your config fi
 
 ## Goals
 
-As of our last release our 'history trim' functionality was almost ready to go. We took this release period to do some extensive testing and to prepare the 'allow list' functionality which will be included in our next release.
+As of our last release our 'history trim' functionality was almost ready to go. We took this release period to do some extensive testing and to prepare the 'allow list' functionality which will be included in our next release.  
 
-In the meantime, we also aimed to improve performance, add a few small but nice features, and fix a number of bugs.
+In the meantime, we also aimed to improve performance, add a few small but nice features, and fix a number of bugs.  
 
 ## Update notes
 
-This release includes updates to:
+This release includes updates to:  
 
 1. the server and its dependencies
 2. the example nginx configuration which we recommend for production installations
-4. the client code and its dependencies
+3. the client code and its dependencies
 
-Our ability to debug CryptPad's usage of shared workers (on the client) has been complicated by the fact that Firefox's shared worker debugging panel was not working for our instance. We finally traced the problem back to a Content-Security Policy setting in our configuration file. The issue can be addressed by adding a `resource:` entry in the `connect-src` header. We've updated the example nginx config to reflect this. You can deploy this version of CryptPad without this modification, but without it our ability to debug and fix issues related to shared worker will be extremely limited.
+Our ability to debug CryptPad's usage of shared workers (on the client) has been complicated by the fact that Firefox's shared worker debugging panel was not working for our instance. We finally traced the problem back to a Content-Security Policy setting in our configuration file. The issue can be addressed by adding a `resource:` entry in the `connect-src` header. We've updated the example nginx config to reflect this. You can deploy this version of CryptPad without this modification, but without it our ability to debug and fix issues related to shared worker will be extremely limited.  
 
-Otherwise, updating from CryptPad v3.11.0 is pretty much the same as normal:
+Otherwise, updating from CryptPad v3.11.0 is pretty much the same as normal:  
 
 1. stop your server
 2. pull the latest code via git
@@ -1208,21 +1415,21 @@ Otherwise, updating from CryptPad v3.11.0 is pretty much the same as normal:
 
 ## Goals
 
-For this release we aimed to phase in two major features that we've been anticipating for a while: "history trim" and "safe links".
+For this release we aimed to phase in two major features that we've been anticipating for a while: "history trim" and "safe links".  
 
-History trim will allow users to remove the old versions of their documents which continue to count against their storage quotas. It will be formally introduced in our next release, even though its server-side components are all ready. We had to reorganize and modify a lot of our server code, so we wanted to wait and make sure there were no regressions in our existing functionality before moving ahead.
+History trim will allow users to remove the old versions of their documents which continue to count against their storage quotas. It will be formally introduced in our next release, even though its server-side components are all ready. We had to reorganize and modify a lot of our server code, so we wanted to wait and make sure there were no regressions in our existing functionality before moving ahead.  
 
-We're introducing the concept of "safe links" in CryptPad. Users can continue to share links to documents which include the cryptographic secrets necessary to read or edit them, but whenever possible we will replace those secrets with a document id. This will make it less likely for encryption keys to be exposed to third parties through invasive browser extensions or passive behaviour like history synchronization across devices.
+We're introducing the concept of "safe links" in CryptPad. Users can continue to share links to documents which include the cryptographic secrets necessary to read or edit them, but whenever possible we will replace those secrets with a document id. This will make it less likely for encryption keys to be exposed to third parties through invasive browser extensions or passive behaviour like history synchronization across devices.  
 
 ## Update notes
 
-This release features a few changes to the server:
+This release features a few changes to the server:  
 
 1. The "legal notice" feature which we included in the previous release turned out to be incorrect. We've since fixed it. We document this functionality [here](https://github.com/xwiki-labs/cryptpad/blob/e8b905282a2cde826ad9100dcad6b59a50c70e8b/www/common/application_config_internal.js#L35-L41), but you'll need to implement the recommended changes in `cryptpad/customize/application_config.js` for best effect.
 2. We've dropped server-side support for the `retainData` attribute in `cryptpad/config/config.js`. Previously you could configure CryptPad to delete unpinned, inactive data immediately or to move it into an archive for a configurable retention period. We've removed the option to delete data outright, since it introduces additional complexity in the server which we don't regularly test. We also figure that administrators will appreciate this default in the event of a bug which incorrectly flags data as inactive.
 3. We've fixed an incorrect line in [the example nginx configuration file](https://github.com/xwiki-labs/cryptpad/commit/1be01c07eee3431218d0b40a58164f60fec6df31). If you're using nginx as a reverse proxy for your CryptPad instance you should correct this line. It is used to set Content-Security Policy headers for the sandboxed-iframe which provides an additional layer of security for users in the event of a cross-site-scripting (XSS) vulnerability within CryptPad. If you find that your instance stops working after applying this change it is likely that you have not correctly configured your instance to use a secondary domain for its sandbox. See [this section of `cryptpad/config/config.example.js`](https://github.com/xwiki-labs/cryptpad/blob/c388641479128303363d8a4247f64230c08a7264/config/config.example.js#L94-L96) for more information.
 
-Otherwise, deploying the new code should be fairly simple:
+Otherwise, deploying the new code should be fairly simple:  
 
 1. stop your server
 2. fetch the latest code from the git repository
@@ -1254,22 +1461,24 @@ Otherwise, deploying the new code should be fairly simple:
 
 ## Goals
 
-For this release we aimed to finish the last major feature of our CryptPad Teams project as well as some long-awaited features that we've planned to demo at FOSDEM 2020.
+For this release we aimed to finish the last major feature of our CryptPad Teams project as well as some long-awaited features that we've planned to demo at FOSDEM 2020.  
 
 ## Update notes
 
-The CryptPad repository's _docs_ directory now includes a _systemd service file_ which you can use to ensure that CryptPad stays up and running. We're working on some step-by-step documentation to describe how to make use of it, but for now you can probably find some instructions by searching the web.
+The CryptPad repository's _docs_ directory now includes a _systemd service file_ which you can use to ensure that CryptPad stays up and running. We're working on some step-by-step documentation to describe how to make use of it, but for now you can probably find some instructions by searching the web.  
 
-We've also updated the provided example.nginx.conf to include a minor but important change to the CSP settings for our OnlyOffice spreadsheet integration.
+We've also updated the provided example.nginx.conf to include a minor but important change to the CSP settings for our OnlyOffice spreadsheet integration.  
 
-Up until now we have not been deleting unowned encrypted files from our server. As of this release `cryptpad/scripts/evict-inactive.js` includes logic to identify inactive, unpinned files. Identified files are first moved to your instance's _archive_ directory for a configurable period, after which they are deleted. This script is not run automatically, so if you haven't configured a cron job to run periodically then inactive files will not be removed. We recommend running the script once per day at a time when you expect your server to be relatively idle, since it consumes a non-negligible amount of server resources.
+Up until now we have not been deleting unowned encrypted files from our server. As of this release `cryptpad/scripts/evict-inactive.js` includes logic to identify inactive, unpinned files. Identified files are first moved to your instance's _archive_ directory for a configurable period, after which they are deleted. This script is not run automatically, so if you haven't configured a cron job to run periodically then inactive files will not be removed. We recommend running the script once per day at a time when you expect your server to be relatively idle, since it consumes a non-negligible amount of server resources.  
 
-Finally, in case you live in a political jurisdiction that requires web site administrators to display their legal information, we've made it easier to add a link to a custom page. See `cryptpad/www/common/application_config_internal.js` for details, particularly the comments above `config.imprint`.
+Finally, in case you live in a political jurisdiction that requires web site administrators to display their legal information, we've made it easier to add a link to a custom page. See `cryptpad/www/common/application_config_internal.js` for details, particularly the comments above `config.imprint`.  
 
-To update from v3.9.0:
+To update from v3.9.0:  
 
 1. update the CSP settings in your reverse proxy's configuration file to match those in nginx.example.conf
-  * don't forget to reload your server to ensure that your changes are deployed
+
+* don't forget to reload your server to ensure that your changes are deployed
+
 2. stop your API server
 3. pull the latest server/client code with `git pull origin master`
 4. install the latest clientside dependencies with `bower update`
@@ -1309,17 +1518,17 @@ To update from v3.9.0:
 
 ## Goals
 
-Over time we've added many small configuration values to CryptPad's `config/config.js`.
-As the number of possible variations grew it became increasingly difficult to test the platform and to provide clear documentation.
-Ultimately this has made the platform more difficult to understand and consequently to host.
+Over time we've added many small configuration values to CryptPad's `config/config.js`.  
+As the number of possible variations grew it became increasingly difficult to test the platform and to provide clear documentation.  
+Ultimately this has made the platform more difficult to understand and consequently to host.  
 
-This release features relatively few bug fixes or features.
-Instead, we took the calm period of the northern winter holidays to simplify the process of running a server and to begin working on some comprehensive documentation.
+This release features relatively few bug fixes or features.  
+Instead, we took the calm period of the northern winter holidays to simplify the process of running a server and to begin working on some comprehensive documentation.  
 
 ## Update notes
 
-We have chosen to drop support for a number of parameters which we believe are not widely used.
-Read the following list carefully before updating, as you could be relying on behaviour which no longer exists.
+We have chosen to drop support for a number of parameters which we believe are not widely used.  
+Read the following list carefully before updating, as you could be relying on behaviour which no longer exists.  
 
 * Due to reasons of security and performance we have long advised that administrators make their instance available only over HTTPS provided by a reverse proxy such as nginx instead of loading TLS certificates via the node process itself. We have removed the option of serving HTTPS traffic directly from node by removing all support for HTTPS in this process.
 * Over the years many administrators have had to migrate their instance from one machine to another and have had difficulty identifying which directories were responsible for storing user data. We are beginning to migrate all user-generated data from the repository's root into the `data` directory as a new default, allowing for admins to migrate content by copying this single directory.
@@ -1348,7 +1557,7 @@ Read the following list carefully before updating, as you could be relying on be
   * if your instance is configured in the default manner you shouldn't actually need this value, as it will default to using `/cryptpad_websocket`.
   * if you have configured your instance to serve all static assets over one domain and to host your API server on another, set `externalWebsocketURL` to `wss://your-domain.tld/cryptpad_websocket` or whatever URL will be correctly forwarded to your API server.
 
-Once you have reviewed your configuration files and ensured that they are correct, update to 3.9.0 with the following steps:
+Once you have reviewed your configuration files and ensured that they are correct, update to 3.9.0 with the following steps:  
 
 1. take your server down
 2. get the latest code with `git pull origin master`
@@ -1370,26 +1579,26 @@ Once you have reviewed your configuration files and ensured that they are correc
 
 # IsolobodonPortoricensis release (3.8.0)
 
-We had some trouble finding an extinct animal whose name started with "I", and we had to resort to using a scientific name.
-Despite this long name, this was a very short release cycle.
-It's the last release of 2019, so we hope you like it!
+We had some trouble finding an extinct animal whose name started with "I", and we had to resort to using a scientific name.  
+Despite this long name, this was a very short release cycle.  
+It's the last release of 2019, so we hope you like it!  
 
 ## Goals
 
-During this release cycle we prioritized the mitigation of some social abuse vectors and the ability to invite users to a team via a link.
-We have more improvements planned for both features, but we wanted to release what we had before the end of the year as our team is taking a little time off to recharge for 2020.
+During this release cycle we prioritized the mitigation of some social abuse vectors and the ability to invite users to a team via a link.  
+We have more improvements planned for both features, but we wanted to release what we had before the end of the year as our team is taking a little time off to recharge for 2020.  
 
 ## Update notes
 
-This is a small and simple release. We made a very minor improvement to the server which will require a restart, but everything will still work if you choose not to.
+This is a small and simple release. We made a very minor improvement to the server which will require a restart, but everything will still work if you choose not to.  
 
-Update from 3.7.0 to 3.8.0 with the following procedure:
+Update from 3.7.0 to 3.8.0 with the following procedure:  
 
 1. Take your server down
 2. Get the latest code with `git pull origin master`
 3. Bring your server back up
 
-Or if you've set up your admin interface:
+Or if you've set up your admin interface:  
 
 1. Pull the latest code
 2. Click the admin panel's "Flush cache" button
@@ -1419,22 +1628,22 @@ Or if you've set up your admin interface:
 
 ## Goals
 
-As we are getting closer to the end of our CryptPad Teams project we planned to spend this release addressing some of the difficulties that users have reported regarding the usage of our newer social features.
+As we are getting closer to the end of our CryptPad Teams project we planned to spend this release addressing some of the difficulties that users have reported regarding the usage of our newer social features.  
 
 ## Update notes
 
-This release includes an upgrade to a newer version of JQuery which mitigates a minor vulnerability which could have contributed to the presence of an XSS attack. We weren't using the affected methods in the library, but there's no harm in updating as it will protect against the vulnerability affecting user data in the future.
+This release includes an upgrade to a newer version of JQuery which mitigates a minor vulnerability which could have contributed to the presence of an XSS attack. We weren't using the affected methods in the library, but there's no harm in updating as it will protect against the vulnerability affecting user data in the future.  
 
-We've also made some non-critical fixes to the server code, so you'll need to restart after pulling the latest code to take advantage of these improvements.
+We've also made some non-critical fixes to the server code, so you'll need to restart after pulling the latest code to take advantage of these improvements.  
 
-Update to 3.7.0 from 3.6.0 using the normal update procedure:
+Update to 3.7.0 from 3.6.0 using the normal update procedure:  
 
 1. stop your server
 2. pull the latest code via git
 3. run `bower update`
 4. restart your server
 
-If you're using an up-to-date version of NPM you should find that running `npm update` prints a notice that one of the packages you've installed is seeking funding. Entering `npm fund` will print information about our OpenCollective funding campaign. If you're running a slightly older version of NPM and you wish to support CryptPad's development you can do so by visiting https://opencollective.com/cryptpad .
+If you're using an up-to-date version of NPM you should find that running `npm update` prints a notice that one of the packages you've installed is seeking funding. Entering `npm fund` will print information about our OpenCollective funding campaign. If you're running a slightly older version of NPM and you wish to support CryptPad's development you can do so by visiting https://opencollective.com/cryptpad .  
 
 ## Features
 
@@ -1466,11 +1675,11 @@ If you're using an up-to-date version of NPM you should find that running `npm u
 
 ## Goals
 
-We're following up our last few releases of major core developments with an effort to improve reliability in some unstable areas and make some superficial tweaks to improve usability of some critical interfaces.
+We're following up our last few releases of major core developments with an effort to improve reliability in some unstable areas and make some superficial tweaks to improve usability of some critical interfaces.  
 
 ## Update notes
 
-Update to 3.6.0 from 3.5.0 using the normal update procedure:
+Update to 3.6.0 from 3.5.0 using the normal update procedure:  
 
 1. stop your server
 2. pull the latest code via git
@@ -1502,13 +1711,13 @@ Update to 3.6.0 from 3.5.0 using the normal update procedure:
 
 ## Goals
 
-This release features work that we've been planning for a long time centered around sharing collections of documents in a more granular way.
+This release features work that we've been planning for a long time centered around sharing collections of documents in a more granular way.  
 
-This is our first release since David Benqué joined our team, so in addition to these team-centric updates we also worked on integrating some UI/UX improvements.
+This is our first release since David Benqué joined our team, so in addition to these team-centric updates we also worked on integrating some UI/UX improvements.  
 
 ## Update notes
 
-Updating to 3.5.0 from 3.4.0 is simple.
+Updating to 3.5.0 from 3.4.0 is simple.  
 
 1. stop your server
 2. pull the latest code via git
@@ -1541,11 +1750,11 @@ Updating to 3.5.0 from 3.4.0 is simple.
 
 ## Goals
 
-This is a small release, focused on bug fixes and UI improvements, while we're finalizing bigger team-centric features planned for the next release.
+This is a small release, focused on bug fixes and UI improvements, while we're finalizing bigger team-centric features planned for the next release.  
 
 ## Update notes
 
-This is a pretty basic release:
+This is a pretty basic release:  
 
 1. stop your server
 2. pull the latest source code
@@ -1575,11 +1784,11 @@ This is a pretty basic release:
 
 ## Goals
 
-We've continued to prioritize the development of team-centric features in CryptPad. This release was focused on stabilizing the code for Teams and making them available to the users.
+We've continued to prioritize the development of team-centric features in CryptPad. This release was focused on stabilizing the code for Teams and making them available to the users.  
 
 ## Update notes
 
-This is a pretty basic release:
+This is a pretty basic release:  
 
 1. stop your server
 2. pull the latest source code
@@ -1587,7 +1796,7 @@ This is a pretty basic release:
 4. install the latest clientside dependencies with `bower update`
 5. restart your server
 
-Note: we've updated our Nginx configuration to fix any missing trailing slash in the URL for the newest applications: https://github.com/xwiki-labs/cryptpad/commit/d4e5b98c140c28417e008379ec7af7cdc235792b
+Note: we've updated our Nginx configuration to fix any missing trailing slash in the URL for the newest applications: https://github.com/xwiki-labs/cryptpad/commit/d4e5b98c140c28417e008379ec7af7cdc235792b  
 
 ## Features
 
@@ -1620,13 +1829,13 @@ Note: we've updated our Nginx configuration to fix any missing trailing slash in
 
 ## Goals
 
-We've continued to prioritize the development of team-centric features in CryptPad. This release implements most of the core functionality for fully-functional teams as a core part of CryptPad, though they're not quite ready for use just yet.
+We've continued to prioritize the development of team-centric features in CryptPad. This release implements most of the core functionality for fully-functional teams as a core part of CryptPad, though they're not quite ready for use just yet.  
 
-Beyond teams we did a little work to standardize some serverside APIs related to storage.
+Beyond teams we did a little work to standardize some serverside APIs related to storage.  
 
 ## Update notes
 
-This is a pretty basic release:
+This is a pretty basic release:  
 
 1. stop your server
 2. pull the latest source code
@@ -1658,7 +1867,7 @@ This is a pretty basic release:
 
 ## Goals
 
-For CryptPad 3.1.0 we prioritized our work on team-centric features. In particular we wanted to finish some improvements to make our notifications system more private and start making use of our prior work on editable pad metadata.
+For CryptPad 3.1.0 we prioritized our work on team-centric features. In particular we wanted to finish some improvements to make our notifications system more private and start making use of our prior work on editable pad metadata.  
 
 ## Update notes
 
@@ -1683,15 +1892,15 @@ For CryptPad 3.1.0 we prioritized our work on team-centric features. In particul
     * checking disk usage (global and for particular users)
     * loading a user's pin log
 
-Baiji depends on updates to clientside and serverside dependencies.
+Baiji depends on updates to clientside and serverside dependencies.  
 
-To update:
+To update:  
 
 1. Take down your server
 2. Pull the latest code
-2. `npm install`
-3. `bower update`
-4. Launch your server
+3. `npm install`
+4. `bower update`
+5. Launch your server
 
 ## Features
 
@@ -1727,18 +1936,18 @@ To update:
 
 # Aurochs release (v3.0.0)
 
-The move to 3.0 is mostly because we ran out of letters in the alphabet for our 2.0 release cycle.
-Releases in this cycle will be named according to a theme of "extinct animals", a list which is unfortunately getting longer all the time.
+The move to 3.0 is mostly because we ran out of letters in the alphabet for our 2.0 release cycle.  
+Releases in this cycle will be named according to a theme of "extinct animals", a list which is unfortunately getting longer all the time.  
 
 ## Goals
 
-In this release, we took more time than usual to make some big changes to the way the platform works, taking great care to maintain or improve stability.
+In this release, we took more time than usual to make some big changes to the way the platform works, taking great care to maintain or improve stability.  
 
-Up until now it has been necessary to create documents with the whatever settings they might require in the future, after which point it was not possible to change them. This release introduces the ability of the server to store and read amendments to document metadata. This will soon allow users of owned documents to delegate that ownership to their friends, add or modify expiration times, and make other modifications that will greatly improve their control over their data.
+Up until now it has been necessary to create documents with the whatever settings they might require in the future, after which point it was not possible to change them. This release introduces the ability of the server to store and read amendments to document metadata. This will soon allow users of owned documents to delegate that ownership to their friends, add or modify expiration times, and make other modifications that will greatly improve their control over their data.  
 
 ## Update notes
 
-During this development period we performed an extensive audit of our existing features and discovered a few potential security issues which we've addressed. We plan to announce the details of these flaws once administrators have had sufficient time to update their instances. If you are running a CryptPad instance, we advise you to update to 3.0.0 at your earliest opportunity.
+During this development period we performed an extensive audit of our existing features and discovered a few potential security issues which we've addressed. We plan to announce the details of these flaws once administrators have had sufficient time to update their instances. If you are running a CryptPad instance, we advise you to update to 3.0.0 at your earliest opportunity.  
 
 * It was brought to our attention that while expired pads were not being served beyond their expiration time, they were not being removed as intended. The cause was due to our failure to document a configuration point (`enableTaskScheduling`) that was added to make expiration optional in the example configuration file. We've removed this configuration point so that tasks like expiration will always be scheduled. Expiration of tasks was already integrated into the main server process, but we have added a new configuration point to the server in case any administrators would like to run the expiration tasks in a dedicated process for performance reasons. To disable the integration, change `disableIntegratedTasks` from `false` to `true` in the server configuration file.
 * This release depends on updates to three clientside libraries (`netflux-websocket@0.1.20`, `chainpad-netflux@0.9.0`, and `chainpad-listmap@0.7.0`). These changes are **not compatible with older versions of the server**. To update:
@@ -1822,25 +2031,29 @@ During this development period we performed an extensive audit of our existing f
 
 ## Goals
 
-This release coincided with XWiki's yearly seminar, so our regular schedule was interrupted a bit. We spent the time we had working towards implementing components of "editable metadata", which will allow pad owners to add new owners or transfer ownership to friends, among other things.
+This release coincided with XWiki's yearly seminar, so our regular schedule was interrupted a bit. We spent the time we had working towards implementing components of "editable metadata", which will allow pad owners to add new owners or transfer ownership to friends, among other things.  
 
-Otherwise we wanted to deploy a built-in support system to improve our ability to debug issues as well as to make it easier for users to report problems. Along the way we did our best to improve usability and fix small annoying bugs.
+Otherwise we wanted to deploy a built-in support system to improve our ability to debug issues as well as to make it easier for users to report problems. Along the way we did our best to improve usability and fix small annoying bugs.  
 
-As this is the last release in our 2.0 cycle, we're going to take some extra time to prepare some big features for our 3.0.0 release, which we expect to deploy on August 20th, 2019.
+As this is the last release in our 2.0 cycle, we're going to take some extra time to prepare some big features for our 3.0.0 release, which we expect to deploy on August 20th, 2019.  
 
 ## Update notes
 
 * We've updated some dependencies that are used to lint the CryptPad codebase to detect errors. Run `npm install` if you plan to develop for CryptPad and you want to use the linter
 * This release introduces a _support_ tab within the admin panel. If you generate an asymmetric keypair and add it to your server-side configuration file then users will have the option of opening support tickets if they encounter errors. Their support tickets will include some basic information about their account which might help you to solve their issues. To set up your _"encrypted support mailbox"_:
+
   1. run `node ./scripts/generate-admin-keys.js`
   2. copy the "public key" and add it to your config.js file like so:
-    * `supportMailboxPublicKey: "BL3kgYBM0HNw5ms8ULWU1wMTb5ePBbxAPjDZKamkuB8=",
+
+  * `supportMailboxPublicKey: "BL3kgYBM0HNw5ms8ULWU1wMTb5ePBbxAPjDZKamkuB8=",
+
   3. copy the private key and store it in a safe place
   4. navigate to the "support" tab in the admin panel and enter the private key
   5. share the private key with any other administrators who should be able to read the support tickets
   6. restart so that your users receive the public key stored in your configuration file
-    * this will allow them to submit tickets via the support page
-    * if you don't know how to fix the issue and want to open a ticket on our public tracker, include the information submitted along with their ticket
+
+  * this will allow them to submit tickets via the support page
+  * if you don't know how to fix the issue and want to open a ticket on our public tracker, include the information submitted along with their ticket
 
 ## Features
 
@@ -1854,14 +2067,14 @@ As this is the last release in our 2.0 cycle, we're going to take some extra tim
 
 ## Goals
 
-We've recently had an intern join our team, so this release and those until the end of summer are likely to feature a lot of small usability fixes.
-Otherwise, we've continued to develop team-centric features, particularly the way that registered users share pads with friends.
-Finally, we prioritized the ability to archive files for a period instead of deleting them, which we've been planning for a while.
+We've recently had an intern join our team, so this release and those until the end of summer are likely to feature a lot of small usability fixes.  
+Otherwise, we've continued to develop team-centric features, particularly the way that registered users share pads with friends.  
+Finally, we prioritized the ability to archive files for a period instead of deleting them, which we've been planning for a while.  
 
 ## Update notes
 
 * There are some important steps in this release:
-    * **make sure you read the full update notes before proceeding!**
+  * **make sure you read the full update notes before proceeding!**
 * [@zimbatm](https://github.com/zimbatm) added the ability to configure the location of your configuration file via environment variables when launching the server:
   * `CRYPTPAD_CONFIG=/home/cryptpad/cryptpad/cryptpad-config/config.js /home/cryptpad/cryptpad/server.js`
 * We discovered a bug in our Xenops release which resulted in the server's list of pads stored for each user to be incorrect.
@@ -1892,7 +2105,7 @@ Finally, we prioritized the ability to archive files for a period instead of del
   3. pull the latest clientside and serverside code via git
   4. `npm update` to get the latest serverside dependencies
   5. update the cache-busting string if you are handling the cache manually, otherwise allow the server to handle this as per its default
-  5. restart the server: clients with open tabs should be prompted to reload instead of reconnecting because the server's version has changed
+  6. restart the server: clients with open tabs should be prompted to reload instead of reconnecting because the server's version has changed
 * We recommend that you test a local version of CryptPad before deploying this latest code, as aspects of the above-mentioned migrations are not backwards-compatible.
   * you can roll back, but users' CryptDrives might have errors coping with data introduced by newer features.
 
@@ -1907,7 +2120,7 @@ Finally, we prioritized the ability to archive files for a period instead of del
 * Users with existing friends on the platform will run a migration to allow them to share pads with friends directly instead of sending them a link.
   * they'll receive a notification indicating the title of the pad and who shared it
   * if you've already added friends on the platform, you can send them pads from the usual "sharing menu"
-* Our code editor already offered the ability to set their color theme and highlighting mode, but now those values will be previewed when mousing over the the option in the dropdown.
+* Our code editor already offered the ability to set their color theme and highlighting mode, but now those values will be previewed when mousing over the option in the dropdown.
   * Our slide editor now offers the same theme selection as the code editor
 * It's now possible to view the history of a shared folder by clicking the history button while viewing the shared folder's contents.
 
@@ -1930,9 +2143,9 @@ Finally, we prioritized the ability to archive files for a period instead of del
 
 ## Goals
 
-For this release we wanted to focus on releasing a small set of features built on top of some foundations established in our last release. Since we were able to complete this feature set in less than a week, we decided to bundle them together so users could take benefit from them sooner.
+For this release we wanted to focus on releasing a small set of features built on top of some foundations established in our last release. Since we were able to complete this feature set in less than a week, we decided to bundle them together so users could take benefit from them sooner.  
 
-This work is being funded by the grant we received from NLnet foundation as a part of their PET (Privacy Enhancing Technology) fund. You can read all about this grant on our latest blog post (https://blog.cryptpad.fr/2019/05/27/Our-future-is-collaborative/).
+This work is being funded by the grant we received from NLnet foundation as a part of their PET (Privacy Enhancing Technology) fund. You can read all about this grant on our latest blog post (https://blog.cryptpad.fr/2019/05/27/Our-future-is-collaborative/).  
 
 ## Update notes
 
@@ -1954,7 +2167,7 @@ This work is being funded by the grant we received from NLnet foundation as a pa
 
 ## Goals
 
-This release coincided with a little time off for the team, so we planned to include only a few things. We recognized that the "Recent pads" view in the CryptDrive was not very useful for us because it did not include documents stored in _Shared folders_, so we decided to fix that. Otherwise, we're beginning a new project which we'll announce soon, so we've started working on some of its basic features.
+This release coincided with a little time off for the team, so we planned to include only a few things. We recognized that the "Recent pads" view in the CryptDrive was not very useful for us because it did not include documents stored in _Shared folders_, so we decided to fix that. Otherwise, we're beginning a new project which we'll announce soon, so we've started working on some of its basic features.  
 
 ## Update notes
 
@@ -1977,7 +2190,7 @@ This release coincided with a little time off for the team, so we planned to inc
 
 ## Goals
 
-For this release cycle we decided to fix some deep bugs and reduce the likelihood of regressions. This included not just errors in the code, but issues that were likely to arise from incorrect configuration. There's still some work to do, but the process of setting up a CryptPad server should be slightly easier now.
+For this release cycle we decided to fix some deep bugs and reduce the likelihood of regressions. This included not just errors in the code, but issues that were likely to arise from incorrect configuration. There's still some work to do, but the process of setting up a CryptPad server should be slightly easier now.  
 
 ## Update notes
 
@@ -1993,7 +2206,7 @@ For this release cycle we decided to fix some deep bugs and reduce the likelihoo
     * `bower update`
   * restart your server
   * run the migration to optimize for expiring channels:
-     * From your CryptPad source directory, run `node scripts/migrations/migrate-tasks-v1.js`
+    * From your CryptPad source directory, run `node scripts/migrations/migrate-tasks-v1.js`
 * Administrators who want to restrict the translation languages available on their server can do so by defining an array of available language codes.
   * In your `cryptpad/customize/application_config.js`, define an array containing the langauges you want:
     * for Example: `AppConfig.availableLanguages = ['en', 'de', 'fr']`
@@ -2022,11 +2235,11 @@ For this release cycle we decided to fix some deep bugs and reduce the likelihoo
 
 ## Goals
 
-After all the features we've added over time, the root of the CryptPad repository had gotten to be something of a mess. We decided to spend a lot of this release period cleaning things up. We also prioritized some other features which make it easier to manage a CryptPad instance.
+After all the features we've added over time, the root of the CryptPad repository had gotten to be something of a mess. We decided to spend a lot of this release period cleaning things up. We also prioritized some other features which make it easier to manage a CryptPad instance.  
 
 ## Update notes
 
-This release makes a number of serverside changes. Read the following notes carefully before updating from an earlier version of CryptPad!
+This release makes a number of serverside changes. Read the following notes carefully before updating from an earlier version of CryptPad!  
 
 * We realized that docker images persisted `config.js` by copying it into the `customize` volume. Since customize is exposed by the webserver, this meant that potentially private information in the configuration file would be accessible over the web. We've moved `config.js` to a `cryptpad/config/`, along with `config.example.js` and modified the docker setup so that nothing in this folder will be exposed to the web.
   * Consequently, you'll need to move your own `config.js` to the new location in order for your server to read it when you restart.
@@ -2067,8 +2280,8 @@ This release makes a number of serverside changes. Read the following notes care
 
 ## Goals
 
-As we're very busy wrapping up the project which has funded CryptPad's development so far, this release is very small.
-We've requested assistance improving the state of our translations, and received some very helpful contributions.
+As we're very busy wrapping up the project which has funded CryptPad's development so far, this release is very small.  
+We've requested assistance improving the state of our translations, and received some very helpful contributions.  
 
 ## Update notes
 
@@ -2092,8 +2305,8 @@ We've requested assistance improving the state of our translations, and received
 
 ## Goals
 
-This release was developed during a busy period, so it contains fewer features than normal.
-In particular we aimed to improve some aspects of our infrastructure, including finishing our deployment of _weblate_ for translations.
+This release was developed during a busy period, so it contains fewer features than normal.  
+In particular we aimed to improve some aspects of our infrastructure, including finishing our deployment of _weblate_ for translations.  
 
 ## Features
 
@@ -2114,7 +2327,7 @@ In particular we aimed to improve some aspects of our infrastructure, including
 
 ## Goals
 
-For this release we planned to resolve issues discovered in our beta release of encrypted spreadsheets, work towards providing an easier experience for contributors who wish to translate CryptPad, and resolve some minor usability issues that had been bothering us.
+For this release we planned to resolve issues discovered in our beta release of encrypted spreadsheets, work towards providing an easier experience for contributors who wish to translate CryptPad, and resolve some minor usability issues that had been bothering us.  
 
 ## Update notes
 
@@ -2145,12 +2358,12 @@ For this release we planned to resolve issues discovered in our beta release of
 
 ## Goals
 
-We set aside an additional week for this release in order to deploy _encrypted spreadsheets_, which we've been working toward for a long time.
-This feature combines our usual focus on privacy with OnlyOffice's spreadsheet editor.
+We set aside an additional week for this release in order to deploy _encrypted spreadsheets_, which we've been working toward for a long time.  
+This feature combines our usual focus on privacy with OnlyOffice's spreadsheet editor.  
 
-At least for this first release we're still considering this functionality to be **highly experimental**.
-We've done our best to make this new application fun and easy to use, however, it will still require a lot of work before it supports all the features that you can expect from our other editors.
-We welcome you to try it out and report any difficulties you encounter, though you may want to wait before you start using it for all your financial documents.
+At least for this first release we're still considering this functionality to be **highly experimental**.  
+We've done our best to make this new application fun and easy to use, however, it will still require a lot of work before it supports all the features that you can expect from our other editors.  
+We welcome you to try it out and report any difficulties you encounter, though you may want to wait before you start using it for all your financial documents.  
 
 ## Update notes
 
@@ -2175,12 +2388,12 @@ We welcome you to try it out and report any difficulties you encounter, though y
 
 ## Goals
 
-For this release we planned to improve upon last release's introduction of the display of other users' cursors in our code and slide editors by adding the same functionality to our rich text editor.
+For this release we planned to improve upon last release's introduction of the display of other users' cursors in our code and slide editors by adding the same functionality to our rich text editor.  
 
-Beyond just producing software, the CryptPad team has also begun to produce peer-reviewed papers.
-We have previously published [Private Document Editing with Some Trust](https://dl.acm.org/citation.cfm?doid=3209280.3209535) as a part of the 2018 proceedings of the ACM Symposium on Document Engineering.
-We have recently been accepted for publication as a part of [HCI-CPT](http://2019.hci.international/hci-cpt): the first international conference on HCI (Human Computer Interaction) for cybersecurity, privacy and trust.
-In preparation for this publication we've begun to collect additional usage data in order to inform the wider community of our findings regarding usability of cryptography-based collaboration systems.
+Beyond just producing software, the CryptPad team has also begun to produce peer-reviewed papers.  
+We have previously published [Private Document Editing with Some Trust](https://dl.acm.org/citation.cfm?doid=3209280.3209535) as a part of the 2018 proceedings of the ACM Symposium on Document Engineering.  
+We have recently been accepted for publication as a part of [HCI-CPT](http://2019.hci.international/hci-cpt): the first international conference on HCI (Human Computer Interaction) for cybersecurity, privacy and trust.  
+In preparation for this publication we've begun to collect additional usage data in order to inform the wider community of our findings regarding usability of cryptography-based collaboration systems.  
 
 ## Update notes
 
@@ -2219,7 +2432,7 @@ In preparation for this publication we've begun to collect additional usage data
 
 ## Goals
 
-For this release we chose to focus on our in-pad chat functionality and the ability to show your cursor's position to other users in the same pad.
+For this release we chose to focus on our in-pad chat functionality and the ability to show your cursor's position to other users in the same pad.  
 
 ## Update notes
 
@@ -2246,8 +2459,8 @@ For this release we chose to focus on our in-pad chat functionality and the abil
 
 ## Goals
 
-This release features long-awaited improvements to our Rich Text Pad.
-This work was done over a short period, and we're releasing it now so that users can take advantage of the improvements as soon as possible.
+This release features long-awaited improvements to our Rich Text Pad.  
+This work was done over a short period, and we're releasing it now so that users can take advantage of the improvements as soon as possible.  
 
 ## Update notes
 
@@ -2271,7 +2484,7 @@ This work was done over a short period, and we're releasing it now so that users
 
 ## Goals
 
-For this release we aimed to address usability concerns in our Rich Text Pad, since it's our most widely used application. During this time we also received an unexpected security disclusure which we treated as being top priority.
+For this release we aimed to address usability concerns in our Rich Text Pad, since it's our most widely used application. During this time we also received an unexpected security disclusure which we treated as being top priority.  
 
 ## Update notes
 
@@ -2296,7 +2509,7 @@ For this release we aimed to address usability concerns in our Rich Text Pad, si
 
 ## Goals
 
-This release continued the work on better customization features for community instances. We also worked on usability improvements and UI issues.
+This release continued the work on better customization features for community instances. We also worked on usability improvements and UI issues.  
 
 ## Update notes
 
@@ -2326,7 +2539,7 @@ This release continued the work on better customization features for community i
 
 ## Goals
 
-This release continued to improve our _shared folder_ functionality, addressed user concerns about data portability, and implemented various features for customization for different CryptPad instances.
+This release continued to improve our _shared folder_ functionality, addressed user concerns about data portability, and implemented various features for customization for different CryptPad instances.  
 
 ## Update notes
 
@@ -2337,15 +2550,15 @@ This release continued to improve our _shared folder_ functionality, addressed u
 * Administrators can now do more to customize their CryptPad server, most notably via the ability to override specific translations. For example, the home page now features a short message which, by default, says that the server is a community-hosted instance of the CryptPad open-source project. On CryptPad.fr, we have replaced this text to talk about our organization. You can do the same by modifying files in `cryptpad/customize/translations/`, like so:
 
 ```
-define(['/common/translations/messages.js'], function (Messages) {
-    // Replace the existing keys in your copied file here:
-    Messages.home_host = "CryptPad.fr is the official instance of the open-source CryptPad project. It is administered by XWiki SAS, the employee-owned French company which created and maintains the product.";
+define(['/common/translations/messages.js'], function (Messages) {  
+    // Replace the existing keys in your copied file here:  
+    Messages.home_host = "CryptPad.fr is the official instance of the open-source CryptPad project. It is administered by XWiki SAS, the employee-owned French company which created and maintains the product.";  
 
-    return Messages;
-});
+    return Messages;  
+});  
 ```
 
-Simply change the text assigned to `home_host` with a blurb about your own organization. We'll update the wiki soon with more info about customization.
+Simply change the text assigned to `home_host` with a blurb about your own organization. We'll update the wiki soon with more info about customization.  
 
 ### Features
 
@@ -2373,11 +2586,11 @@ Simply change the text assigned to `home_host` with a blurb about your own organ
 
 ## Goals
 
-Since last release introduced several big features, this release was allocated towards usability improvements largely related to those new features.
+Since last release introduced several big features, this release was allocated towards usability improvements largely related to those new features.  
 
 ## Update notes
 
-This is a simple release. Just deploy the latest source.
+This is a simple release. Just deploy the latest source.  
 
 ### Features
 
@@ -2394,8 +2607,8 @@ This is a simple release. Just deploy the latest source.
 
 ## Goals
 
-We've been making use of some hidden features for a while, to make sure that they were safe to deploy.
-This release, we worked on making _contextual chat_ and _shared folders_ available to everyone.
+We've been making use of some hidden features for a while, to make sure that they were safe to deploy.  
+This release, we worked on making _contextual chat_ and _shared folders_ available to everyone.  
 
 ## Update notes
 
@@ -2421,12 +2634,12 @@ This release, we worked on making _contextual chat_ and _shared folders_ availab
 
 ## Goals
 
-This release overlapped with the publication and presentation of a paper written about CryptPad's architecture.
-As such, we didn't plan for any very ambitious new features, and instead focused on bug fixes and some new workflows.
+This release overlapped with the publication and presentation of a paper written about CryptPad's architecture.  
+As such, we didn't plan for any very ambitious new features, and instead focused on bug fixes and some new workflows.  
 
 ## Update notes
 
-This is a fairly simple release. Just download the latest commits and update your cache-busting string.
+This is a fairly simple release. Just download the latest commits and update your cache-busting string.  
 
 ### Features
 
@@ -2445,19 +2658,19 @@ This is a fairly simple release. Just download the latest commits and update you
 
 ## Goals
 
-For this release we focused on deploying two very large changes in CryptPad.
-For one, we'd worked on a large refactoring of the system we use to compile CSS from LESS, so as to make it more efficient.
-Secondly, we reworked the architecture we use for implementing the CryptDrive functionality, so as to integrate support for shared folders.
+For this release we focused on deploying two very large changes in CryptPad.  
+For one, we'd worked on a large refactoring of the system we use to compile CSS from LESS, so as to make it more efficient.  
+Secondly, we reworked the architecture we use for implementing the CryptDrive functionality, so as to integrate support for shared folders.  
 
 ## Update notes
 
-To test the _shared folders_ functionality, users can run the following command in their browser console:
+To test the _shared folders_ functionality, users can run the following command in their browser console:  
 
-`localStorage.CryptPad_SF = "1";`
+`localStorage.CryptPad_SF = "1";`  
 
-Alternatively, if the instance administrator would like to enable shared folders for all users, they can do so via their `/customize/application_config.js` file, by adding the following line:
+Alternatively, if the instance administrator would like to enable shared folders for all users, they can do so via their `/customize/application_config.js` file, by adding the following line:  
 
-`config.disableSharedFolders = true;`
+`config.disableSharedFolders = true;`  
 
 ### Features
 
@@ -2476,10 +2689,10 @@ Alternatively, if the instance administrator would like to enable shared folders
 
 ## Goals
 
-This release took longer than usual - three weeks instead of two - due to our plans involving a complete redesign of how login and registration function.
-Any time we rework a critical system within CryptPad we're very cautious about deploying it, however, this update should bring considerable value for users.
-From now on, users will be able to change their passwords without losing access to their old data, however, this is very different from _password recovery_.
-While we will still be unable to help you if you have forgotten your password, this update will address our inability up until this point to change your password in the event that it has been compromised in some way.
+This release took longer than usual - three weeks instead of two - due to our plans involving a complete redesign of how login and registration function.  
+Any time we rework a critical system within CryptPad we're very cautious about deploying it, however, this update should bring considerable value for users.  
+From now on, users will be able to change their passwords without losing access to their old data, however, this is very different from _password recovery_.  
+While we will still be unable to help you if you have forgotten your password, this update will address our inability up until this point to change your password in the event that it has been compromised in some way.  
 
 ## Update notes
 
@@ -2507,7 +2720,7 @@ While we will still be unable to help you if you have forgotten your password, t
 
 ## Goals
 
-For version 2.4.0 we chose to use our time to address difficulties that some users had, and to release some features which have been in development for some time. With the recent release of the _password-protected-pads_ feature, some users desired to be able to change the passwords that they'd already set, or to add a password to a pad retroactively. Other users wanted to recover information that had accidentally been deleted from their pads, but found that the history feature was difficult to use on networks with poor connectivity. Others still found that loading pads in general was too slow.
+For version 2.4.0 we chose to use our time to address difficulties that some users had, and to release some features which have been in development for some time. With the recent release of the _password-protected-pads_ feature, some users desired to be able to change the passwords that they'd already set, or to add a password to a pad retroactively. Other users wanted to recover information that had accidentally been deleted from their pads, but found that the history feature was difficult to use on networks with poor connectivity. Others still found that loading pads in general was too slow.  
 
 ## Update notes
 
@@ -2549,7 +2762,7 @@ For version 2.4.0 we chose to use our time to address difficulties that some use
 
 ## Goals
 
-For this release we wanted to deploy some new features related to our encrypted file functionality.
+For this release we wanted to deploy some new features related to our encrypted file functionality.  
 
 ## Update notes
 
@@ -2577,7 +2790,7 @@ For this release we wanted to deploy some new features related to our encrypted
 
 ## Goals
 
-For this release we wanted to continue our efforts towards improving CryptPad usability. We've also added a new Kanban application which was in its final stage for quite some time.
+For this release we wanted to continue our efforts towards improving CryptPad usability. We've also added a new Kanban application which was in its final stage for quite some time.  
 
 ## What's new
 
@@ -2604,14 +2817,14 @@ For this release we wanted to continue our efforts towards improving CryptPad us
 
 ## Goals
 
-This is a small release due to a surplus of holidays in France during the Month of May.
-We'd been planning to implement _Password-protected Pads_ for a long time, but we had not found a good opportunity to do so within our roadmap.
-After a generous donation from one of our users who considered this a critical feature, we were able to dedicate some resources towards delivering it to all of our users.
+This is a small release due to a surplus of holidays in France during the Month of May.  
+We'd been planning to implement _Password-protected Pads_ for a long time, but we had not found a good opportunity to do so within our roadmap.  
+After a generous donation from one of our users who considered this a critical feature, we were able to dedicate some resources towards delivering it to all of our users.  
 
 ## Update notes
 
-This release depends on new APIs in our `chainpad-crypto` module. Additionally, we have fixed a critical bug in `chainpad-listmap`.
-Admins will need to update their clientside dependencies with `bower update` when deploying.
+This release depends on new APIs in our `chainpad-crypto` module. Additionally, we have fixed a critical bug in `chainpad-listmap`.  
+Admins will need to update their clientside dependencies with `bower update` when deploying.  
 
 ## What's new
 
@@ -2637,19 +2850,19 @@ Admins will need to update their clientside dependencies with `bower update` whe
 
 # Alpaca release (v2.0.0)
 
-This is the first release of our 2.0 cycle.
+This is the first release of our 2.0 cycle.  
 
-After careful consideration we've decided to name each release in this cycle after a cute animal, iterating through the letters of the Latin alphabet from A to Z.
+After careful consideration we've decided to name each release in this cycle after a cute animal, iterating through the letters of the Latin alphabet from A to Z.  
 
 ## Goals
 
-We wanted to update CryptPad's appearance once more, adopting the colors from our logo throughout more of its interface.
+We wanted to update CryptPad's appearance once more, adopting the colors from our logo throughout more of its interface.  
 
 ## Update notes
 
-This release coincides with the introduction of new APIs in ChainPad, so we recommend that adminstrators update their clientside dependencies by running `bower update`.
+This release coincides with the introduction of new APIs in ChainPad, so we recommend that adminstrators update their clientside dependencies by running `bower update`.  
 
-As recent updates have updated serverside dependencies, we also recommend that you run `npm update` and _restart your server_.
+As recent updates have updated serverside dependencies, we also recommend that you run `npm update` and _restart your server_.  
 
 ## What's new
 
@@ -2671,7 +2884,7 @@ As recent updates have updated serverside dependencies, we also recommend that y
 * we've updated the example configuration file (`config.example.js`) to no longer require a leading space before the domain, as we found it to be a common source of confusion. This will only affect newly generated config files.
 * our webserver has been configured to support HTTP access of the client datastore, to facilitate scripts which parse and decrypt history without having to go through our websocket infrastructure
 * we no longer use a single image for our favicon and our loading screen icon, allowing admins to customize either feature of their instance independently
-* We've also moved the rest of the styles for the loading screen from `/common/` into `/customize.dist/`, 
+* We've also moved the rest of the styles for the loading screen from `/common/` into `/customize.dist/`,
 * move loading screen implementation from `/common/` to `/customize.dist/`
 
 ## Bug fixes
@@ -2688,47 +2901,47 @@ As recent updates have updated serverside dependencies, we also recommend that y
 
 ## Goals
 
-For this release we wanted to direct our effort towards improving user experience issues surrounding user accounts.
+For this release we wanted to direct our effort towards improving user experience issues surrounding user accounts.  
 
 ## Update notes
 
-This release features breaking changes to some clientside dependencies. Administrators must make sure to deploy the
-latest server with npm update before updating your clientside dependencies with bower update.
+This release features breaking changes to some clientside dependencies. Administrators must make sure to deploy the  
+latest server with npm update before updating your clientside dependencies with bower update.  
 
 ## What's new
 
 * newly registered users are now able to delete their accounts automatically, along with any personal
- information which had been created:
+  information which had been created:  
   * ToDo list data is automatically deleted, along with user profiles
   * all of a user's owned pads are also removed immediately in their account deletion process
 * users who predate account deletion will not benefit from automatic account deletion, since the server
-  does not have sufficient knowledge to guarantee that the information they could request to have deleted is strictly
-  their own. For this reason, we've started working on scripts for validating user requests, so as to enable manual
-  deletion by the server administrator.
+  does not have sufficient knowledge to guarantee that the information they could request to have deleted is strictly  
+  their own. For this reason, we've started working on scripts for validating user requests, so as to enable manual  
+  deletion by the server administrator.  
   * the script can be found in cryptpad/check-account-deletion.js, and it will be a part of an ongoing
-    effort to improve administrator tooling for situations like this
+    effort to improve administrator tooling for situations like this  
 * users who have not logged in, but wish to use their drive now see a ghost icon which they can use to create pads.
-  We hope this makes it easier to get started as a new user.
-* registered users who have saved templates in their drives can now use those templates at any time, rather than only
-  using them to create new pads
+  We hope this makes it easier to get started as a new user.  
+* REGistered users who have saved templates in their drives can now use those templates at any time, rather than only
+  using them to create new pads  
 * we've updated our file encryption code such that it does not interfere with other scripts which may be running at
-  the same time (synchronous blocking, for those who are interested)
+  the same time (synchronous blocking, for those who are interested)  
 * we now validate message signatures clientside, except when they are coming from the history keeper because clients
-  trust that the server has already validated those signatures
+  trust that the server has already validated those signatures  
 
 ## Bug fixes
 
 * we've removed some dependencies from our home page that were introduced when we updated to use bootstrap4
 * we now import fontawesome as css, and not less, which saves processing time and saves room in our localStorage cache
 * templates which do not have a 'type' attribute set are migrated such that the pads which are created with their
-  content are valid
+  content are valid  
 * thumbnail creation for pads is now disabled by default, due to poor performance
   * users can enable thumbnail creation in their settings page
 * we've fixed a significant bug in how our server handles checkpoints (special patches in history which contain the
-  entire pads content)
+  entire pads content)  
   * it was possible for two users to independently create checkpoints in close proximity while the document was in a
-    forked state. New users joining while the session was in this state would get stuck on one side of the fork,
-    and could lose data if the users on the opposing fork overrode their changes
+    forked state. New users joining while the session was in this state would get stuck on one side of the fork,  
+    and could lose data if the users on the opposing fork overrode their changes  
 * we've updated our tests, which have been failing for some time because their success conditions were no longer valid
 * while trying to register a previously registered user, users could cancel the prompt to login as that user.
-  If they did so, the registration form remained locked. This has been fixed.
+  If they did so, the registration form remained locked. This has been fixed.  
diff --git a/config/config.example.js b/config/config.example.js
index f53f3bb5b..96914fa92 100644
--- a/config/config.example.js
+++ b/config/config.example.js
@@ -122,46 +122,6 @@ module.exports = {
     ],
 */
 
-    /*  CryptPad's administration panel includes a "support" tab
-     *  wherein administrators with a secret key can view messages
-     *  sent from users via the encrypted forms on the /support/ page
-     *
-     *  To enable this functionality:
-     *    run `node ./scripts/generate-admin-keys.js`
-     *    save the public key in your config in the value below
-     *    add the private key via the admin panel
-     *    and back it up in a secure manner
-     *
-     */
-    // supportMailboxPublicKey: "",
-
-    /*  We're very proud that CryptPad is available to the public as free software!
-     *  We do, however, still need to pay our bills as we develop the platform.
-     *
-     *  By default CryptPad will prompt users to consider donating to
-     *  our OpenCollective campaign. We publish the state of our finances periodically
-     *  so you can decide for yourself whether our expenses are reasonable.
-     *
-     *  You can disable any solicitations for donations by setting 'removeDonateButton' to true,
-     *  but we'd appreciate it if you didn't!
-     */
-    //removeDonateButton: false,
-
-    /*  CryptPad will display a point of contact for your instance on its contact page
-     *  (/contact.html) if you provide it below.
-     */
-    adminEmail: 'i.did.not.read.my.config@cryptpad.fr',
-
-    /*
-     *  By default, CryptPad contacts one of our servers once a day.
-     *  This check-in will also send some very basic information about your instance including its
-     *  version and the adminEmail so we can reach you if we are aware of a serious problem.
-     *  We will never sell it or send you marketing mail.
-     *
-     *  If you want to block this check-in and remain set 'blockDailyCheck' to true.
-     */
-    //blockDailyCheck: false,
-
     /* =====================
      *        STORAGE
      * ===================== */
@@ -316,4 +276,13 @@ module.exports = {
      *  (false by default)
      */
     verbose: false,
+
+    /*  Surplus information:
+     *
+     *  'installMethod' is included in server telemetry to voluntarily
+     *  indicate how many instances are using unofficial installation methods
+     *  such as Docker.
+     *
+     */
+    installMethod: 'unspecified',
 };
diff --git a/customize.dist/favicon/alt-favicon-form.png b/customize.dist/favicon/alt-favicon-form.png
new file mode 100644
index 000000000..2194e35b7
Binary files /dev/null and b/customize.dist/favicon/alt-favicon-form.png differ
diff --git a/customize.dist/favicon/main-favicon-form.png b/customize.dist/favicon/main-favicon-form.png
new file mode 100644
index 000000000..05c8ebf45
Binary files /dev/null and b/customize.dist/favicon/main-favicon-form.png differ
diff --git a/customize.dist/fonts/cptools/fonts/cptools.svg b/customize.dist/fonts/cptools/fonts/cptools.svg
index 776b66ba3..12d2fe9d6 100644
--- a/customize.dist/fonts/cptools/fonts/cptools.svg
+++ b/customize.dist/fonts/cptools/fonts/cptools.svg
@@ -23,9 +23,19 @@
 <glyph unicode="&#xe90d;" glyph-name="code" horiz-adv-x="878" d="M827.746 734.667l-173.333 173.333c-20.556 20.556-61.667 37.778-91.111 37.778h-497.778c-29.444 0-53.333-23.889-53.333-53.333v-888.889c0-29.444 23.889-53.333 53.333-53.333h746.667c29.444 0 53.333 23.889 53.333 53.333v640c0 29.444-17.222 70.556-37.778 91.111zM581.079 870.222c9.444-3.333 18.889-8.333 22.778-12.222l173.889-173.889c3.889-3.889 8.889-13.333 12.222-22.778h-208.889zM794.413 21.333h-711.111v853.333h426.667v-231.111c0-29.444 23.889-53.333 53.333-53.333h231.111zM278.857 519.111l-125.556-167.222c-4.444-6.111-4.444-15 0-21.111l125.556-167.222c6.111-7.778 17.222-9.444 25-3.333l28.333 21.111c7.778 6.111 9.444 17.222 3.333 25l-101.111 135 101.111 135c6.111 7.778 4.444 18.889-3.333 25l-28.333 21.111c-7.777 6.111-18.889 4.444-25-3.333zM724.413 351.889l-125.556 167.222c-6.111 7.778-17.222 9.444-25 3.333l-28.333-21.111c-7.777-6.111-9.444-17.222-3.333-25l101.111-135-101.111-135c-6.111-7.778-4.444-18.889 3.333-25l28.333-21.111c7.778-6.111 18.889-4.444 25 3.333l125.556 167.222c4.444 6.111 4.444 15 0 21.111zM379.968 95.778l35-5.556c9.444-1.667 18.889 4.444 20.556 14.444l76.667 461.667c1.667 9.444-4.444 18.889-14.444 20.556l-35 5.556c-9.444 1.667-18.889-4.444-20.556-14.444l-76.667-461.667c-1.667-9.444 4.444-18.889 14.444-20.556z" />
 <glyph unicode="&#xe90e;" glyph-name="richtext" horiz-adv-x="878" d="M827.746 734.667l-173.333 173.333c-20.556 20.556-61.667 37.778-91.111 37.778h-497.778c-29.444 0-53.333-23.889-53.333-53.333v-888.889c0-29.444 23.889-53.333 53.333-53.333h746.667c29.444 0 53.333 23.889 53.333 53.333v640c0 29.444-17.222 70.556-37.778 91.111zM581.079 870.222c9.444-3.333 18.889-8.333 22.778-12.222l173.889-173.889c3.889-3.889 8.889-13.333 12.222-22.778h-208.889zM794.413 21.333h-711.111v853.333h426.667v-231.111c0-29.444 23.889-53.333 53.333-53.333h231.111zM225.524 501.333v-35.556c0-10 7.778-17.778 17.778-17.778h391.111c10 0 17.778 7.778 17.778 17.778v35.556c0 10-7.778 17.778-17.778 17.778h-391.111c-10 0-17.778-7.778-17.778-17.778zM634.413 376.889h-391.111c-10 0-17.778-7.778-17.778-17.778v-35.556c0-10 7.778-17.778 17.778-17.778h391.111c10 0 17.778 7.778 17.778 17.778v35.556c0 10-7.778 17.778-17.778 17.778zM634.413 234.667h-391.111c-10 0-17.778-7.778-17.778-17.778v-35.556c0-10 7.778-17.778 17.778-17.778h391.111c10 0 17.778 7.778 17.778 17.778v35.556c0 10-7.778 17.778-17.778 17.778z" />
 <glyph unicode="&#xe90f;" glyph-name="file" horiz-adv-x="878" d="M827.745 734.666l-173.333 173.333c-20.556 20.556-61.667 37.778-91.111 37.778h-497.777c-29.444 0-53.333-23.889-53.333-53.333v-888.887c0-29.444 23.889-53.333 53.333-53.333h746.665c29.444 0 53.333 23.889 53.333 53.333v639.999c0 29.444-17.222 70.555-37.778 91.111zM581.079 870.221c9.444-3.333 18.889-8.333 22.778-12.222l173.889-173.889c3.889-3.889 8.889-13.333 12.222-22.778h-208.889zM794.412 21.334h-711.11v853.332h426.666v-231.111c0-29.444 23.889-53.333 53.333-53.333h231.111z" />
+<glyph unicode="&#xe910;" glyph-name="form-poll" horiz-adv-x="1094" d="M667.572 771.752c0 3.87-1.548 7.739-4.335 10.525l-21.050 21.051c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-101.54-101.694-45.507 45.662c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-21.051-21.051c-2.787-2.786-4.335-6.656-4.335-10.525s1.548-7.739 4.335-10.525l77.083-77.083c2.787-2.786 6.655-4.334 10.525-4.334s7.739 1.548 10.525 4.334l133.116 133.116c2.787 2.786 4.335 6.656 4.335 10.525zM964.853 659.687c0 3.87-1.548 7.739-4.335 10.525l-45.506 45.507 45.507 45.507c2.787 2.786 4.335 6.656 4.335 10.525s-1.548 7.739-4.335 10.525l-21.051 21.051c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-45.507-45.507-45.507 45.507c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-21.051-21.051c-2.787-2.786-4.335-6.656-4.335-10.525s1.548-7.739 4.335-10.525l45.507-45.507-45.507-45.507c-2.787-2.786-4.335-6.656-4.335-10.525s1.548-7.739 4.335-10.525l21.051-21.051c2.787-2.786 6.655-4.334 10.525-4.334s7.739 1.548 10.525 4.334l45.507 45.507 45.507-45.507c2.787-2.786 6.655-4.334 10.525-4.334s7.739 1.548 10.525 4.334l21.051 21.051c2.787 2.786 4.335 6.656 4.335 10.525zM300.535 659.687c0 3.87-1.548 7.739-4.335 10.525l-45.506 45.507 45.507 45.507c2.787 2.786 4.335 6.656 4.335 10.525s-1.548 7.739-4.335 10.525l-21.051 21.051c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-45.507-45.507-45.507 45.507c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-21.051-21.051c-2.787-2.786-4.335-6.656-4.335-10.525s1.548-7.739 4.335-10.525l45.507-45.507-45.507-45.507c-2.787-2.786-4.335-6.656-4.335-10.525s1.548-7.739 4.335-10.525l21.051-21.051c2.787-2.786 6.655-4.334 10.525-4.334s7.739 1.548 10.525 4.334l45.507 45.507 45.507-45.507c2.787-2.786 6.655-4.334 10.525-4.334s7.739 1.548 10.525 4.334l21.051 21.051c2.787 2.786 4.335 6.656 4.335 10.525zM330.094 505.894c0 3.87-1.548 7.739-4.335 10.525l-21.050 21.051c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-101.54-101.694-45.507 45.662c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-21.051-21.051c-2.787-2.786-4.335-6.656-4.335-10.525s1.548-7.739 4.335-10.525l77.083-77.083c2.787-2.786 6.655-4.334 10.525-4.334s7.739 1.548 10.525 4.334l133.116 133.116c2.787 2.786 4.335 6.656 4.335 10.525zM665.995 505.894c0 3.87-1.548 7.739-4.335 10.525l-21.050 21.051c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-101.54-101.694-45.507 45.662c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-21.051-21.051c-2.787-2.786-4.335-6.656-4.335-10.525s1.548-7.739 4.335-10.525l77.083-77.083c2.787-2.786 6.655-4.334 10.525-4.334s7.739 1.548 10.525 4.334l133.116 133.116c2.787 2.786 4.335 6.656 4.335 10.525zM665.995 237.227c0 3.87-1.548 7.739-4.335 10.525l-21.050 21.051c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-101.54-101.694-45.507 45.662c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-21.051-21.051c-2.787-2.786-4.335-6.656-4.335-10.525s1.548-7.739 4.335-10.525l77.083-77.083c2.787-2.786 6.655-4.334 10.525-4.334s7.739 1.548 10.525 4.334l133.116 133.116c2.787 2.786 4.335 6.656 4.335 10.525zM999.093 237.227c0 3.87-1.548 7.739-4.335 10.525l-21.050 21.051c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-101.54-101.694-45.507 45.662c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-21.051-21.051c-2.787-2.786-4.335-6.656-4.335-10.525s1.548-7.739 4.335-10.525l77.083-77.083c2.787-2.786 6.655-4.334 10.525-4.334s7.739 1.548 10.525 4.334l133.116 133.116c2.787 2.786 4.335 6.656 4.335 10.525zM832.205 352.915h-31.571q-16.264 26.256-24.024 49.855-7.76 23.705-7.76 46.985t7.76 47.091q7.866 23.918 24.024 49.961h31.571q-13.606-25.193-20.41-49.323-6.803-24.024-6.803-47.516t6.697-47.623q6.803-24.13 20.516-49.43zM913.617 352.915q13.607 25.3 20.41 49.43t6.804 47.623-6.804 47.516q-6.803 24.13-20.41 49.323h31.571q16.158-26.044 23.918-49.961 7.866-23.811 7.866-47.091t-7.76-46.985q-7.76-23.599-24.024-49.855zM169.429 84.249h-31.571q-16.264 26.256-24.024 49.855-7.76 23.705-7.76 46.985t7.76 47.091q7.866 23.918 24.024 49.961h31.571q-13.606-25.193-20.41-49.323-6.803-24.024-6.803-47.516t6.697-47.623q6.803-24.13 20.516-49.43zM250.84 84.249q13.607 25.3 20.41 49.43t6.804 47.623-6.804 47.516q-6.803 24.13-20.41 49.323h31.571q16.158-26.044 23.918-49.961 7.866-23.811 7.866-47.091t-7.76-46.985q-7.76-23.599-24.024-49.855z" />
 <glyph unicode="&#xe911;" glyph-name="palette" d="M408.6 950c-198.8-38.8-359-198.6-398.2-396.8-74-374 263.4-652.8 517.6-613.4 82.4 12.8 122.8 109.2 85 183.4-46.2 90.8 19.8 196.8 121.8 196.8h159.4c71.6 0 129.6 59.2 129.8 130.6-1 315.2-287.8 563.2-615.4 499.4zM192 320c-35.4 0-64 28.6-64 64s28.6 64 64 64 64-28.6 64-64-28.6-64-64-64zM256 576c-35.4 0-64 28.6-64 64s28.6 64 64 64 64-28.6 64-64-28.6-64-64-64zM512 704c-35.4 0-64 28.6-64 64s28.6 64 64 64 64-28.6 64-64-28.6-64-64-64zM768 576c-35.4 0-64 28.6-64 64s28.6 64 64 64 64-28.6 64-64-28.6-64-64-64z" />
 <glyph unicode="&#xe912;" glyph-name="folder-upload" d="M829.44 727.251h-296.84l-47.104 62.886c-25.923 34.066-66.406 55.898-111.999 56.139h-178.938c-77.457-0.137-140.211-62.891-140.348-140.335v-515.868c0.137-77.457 62.891-140.211 140.335-140.348h634.893c77.457 0.137 140.211 62.891 140.348 140.335v396.482c0 0.036 0 0.078 0 0.121 0 77.561-62.807 140.452-140.335 140.589h-0.013zM911.119 190.072c-0.068-45.083-36.597-81.611-81.673-81.679h-634.887c-45.083 0.068-81.611 36.597-81.679 81.673v515.862c0.068 45.083 36.597 81.611 81.673 81.679h178.906c26.48-0.030 50.004-12.656 64.908-32.207l0.146-0.199 47.104-62.765 17.709-24.094h326.114c45.125-0.069 81.679-36.665 81.679-81.799 0 0 0 0 0 0v0zM562.838 166.883h-102.039v203.957h-72.523l123.723 214.076 123.723-214.076h-72.885v-203.957z" />
 <glyph unicode="&#xe913;" glyph-name="add-bottom" d="M108.793 271.501c-15.312 0-27.996 12.684-27.996 27.996v55.992c0 15.312 12.684 28.006 27.996 28.006h225.414v-111.993zM108.793 495.478c-15.312 0-27.996 12.694-27.996 28.006v55.992c0 15.312 12.684 27.996 27.996 27.996h403.491v-111.993zM108.793 719.465c-15.312 0-27.996 12.694-27.996 28.006v55.992c0 15.312 12.684 27.996 27.996 27.996h615.968c15.312 0 27.996-12.684 27.996-27.996v-55.992c0-15.312-12.684-28.006-27.996-28.006zM943.202 287.839c0-19.465-15.792-35.257-35.258-35.257h-152.782v-152.782c0-19.465-15.792-35.257-35.258-35.257h-70.515c-19.465 0-35.257 15.792-35.257 35.257v152.782h-152.782c-19.465 0-35.257 15.792-35.257 35.257v70.515c0 19.465 15.792 35.258 35.257 35.258h152.782v152.782c0 19.465 15.792 35.258 35.257 35.258h70.515c19.465 0 35.258-15.792 35.258-35.258v-152.782h152.782c19.465 0 35.258-15.792 35.258-35.258z" />
 <glyph unicode="&#xe914;" glyph-name="add-top" d="M108.793 624.499c-15.312 0-27.996-12.684-27.996-27.996v-55.992c0-15.312 12.684-28.006 27.996-28.006h225.414v111.993zM108.793 400.522c-15.312 0-27.996-12.694-27.996-28.006v-55.992c0-15.312 12.684-27.996 27.996-27.996h403.491v111.993zM108.793 176.535c-15.312 0-27.996-12.694-27.996-28.006v-55.992c0-15.312 12.684-27.996 27.996-27.996h615.968c15.312 0 27.996 12.684 27.996 27.996v55.992c0 15.312-12.684 28.006-27.996 28.006zM943.202 608.161c0 19.465-15.792 35.257-35.258 35.257h-152.782v152.782c0 19.465-15.792 35.257-35.258 35.257h-70.515c-19.465 0-35.257-15.792-35.257-35.257v-152.782h-152.782c-19.465 0-35.257-15.792-35.257-35.257v-70.515c0-19.465 15.792-35.258 35.257-35.258h152.782v-152.782c0-19.465 15.792-35.258 35.257-35.258h70.515c19.465 0 35.258 15.792 35.258 35.258v152.782h152.782c19.465 0 35.258 15.792 35.258 35.258z" />
-<glyph unicode="&#xe915;" glyph-name="destroy" d="M193.049 938.213c-25.264 0-45.745-20.492-45.745-45.757v-443.97h-67.453c-26.649-0.003-48.252-21.606-48.255-48.255 0.023-26.635 21.62-48.216 48.255-48.219h157.56l-80.102-86.481 86.481-94.352-86.396-94.23 109.353-119.164 39.535 49.965-63.439 69.247 86.347 94.181-86.262 94.085 80.344 86.748h171.688l-80.102-86.481 86.481-94.352-86.347-94.23 109.305-119.164 39.535 49.965-63.439 69.247 86.347 94.181-86.262 94.085 80.344 86.748h171.688l-80.102-86.481 86.529-94.352-86.396-94.23 109.341-119.164 39.499 49.965-63.451 69.199 86.396 94.23-86.299 94.133 80.344 86.699h105.763c26.64-0.004 48.244 21.579 48.267 48.219-0.003 26.654-21.613 48.259-48.267 48.255h-64.663v230.418c0 25.264-14.779 60.536-32.417 78.174l-148.718 148.719c-17.637 17.637-52.909 32.417-78.173 32.417zM208.317 877.2h366.078v-198.296c0-25.264 20.505-45.769 45.769-45.769h198.296v-184.65h-610.143zM635.409 873.392c8.104-2.86 16.213-7.154 19.549-10.49l149.204-149.204c3.337-3.336 7.63-11.446 10.49-19.549h-179.243z" />
+<glyph unicode="&#xe915;" glyph-name="destroy" horiz-adv-x="1094" d="M191.671 946.511c-28.024 0-50.742-22.731-50.742-50.756v-399.384h-74.822c-29.561-0.003-53.524-23.966-53.527-53.527 0.025-29.545 23.982-53.484 53.527-53.487h174.773l-88.853-95.929 95.929-104.66-95.835-104.524 121.3-132.182 43.855 55.423-70.369 76.813 95.781 104.471-95.687 104.364 89.122 96.225h190.445l-88.853-95.929 95.929-104.66-95.781-104.524 121.246-132.182 43.855 55.423-70.369 76.813 95.781 104.471-95.687 104.364 89.122 96.225h190.445l-88.853-95.929 95.983-104.66-95.835-104.524 121.286-132.182 43.815 55.423-70.383 76.759 95.835 104.524-95.727 104.417 89.122 96.171h117.318c29.55-0.004 53.515 23.936 53.54 53.487-0.003 29.566-23.974 53.531-53.54 53.527h-71.728v162.501c0 28.024-16.394 67.15-35.958 86.714l-164.966 164.966c-19.564 19.564-58.69 35.958-86.714 35.958zM208.607 878.832h406.073v-219.96c0-28.024 22.745-50.769 50.769-50.769h219.96v-111.732h-676.802zM682.359 874.608c8.989-3.172 17.984-7.936 21.685-11.636l165.505-165.505c3.702-3.7 8.463-12.696 11.636-21.685h-198.826z" />
+<glyph unicode="&#xe916;" glyph-name="form-list-check" horiz-adv-x="1094" d="M1012.362 763.843c0 8.831-7.792 16.623-16.623 16.623h-631.687c-8.831 0-16.623-7.792-16.623-16.623v-99.74c0-8.831 7.792-16.623 16.623-16.623h631.687c8.831 0 16.623 7.792 16.623 16.623zM1012.362 497.87c0 8.831-7.792 16.623-16.623 16.623h-631.687c-8.831 0-16.623-7.792-16.623-16.623v-99.74c0-8.831 7.792-16.623 16.623-16.623h631.687c8.831 0 16.623 7.792 16.623 16.623zM1012.362 231.897c0 8.831-7.792 16.623-16.623 16.623h-631.687c-8.831 0-16.623-7.792-16.623-16.623v-99.74c0-8.831 7.792-16.623 16.623-16.623h631.687c8.831 0 16.623 7.792 16.623 16.623zM279.136 239.834c0 22.077-17.911 39.988-39.988 39.988h-115.521c-22.077 0-39.988-17.911-39.988-39.988v-115.521c0-22.077 17.911-39.988 39.988-39.988h115.521c22.077 0 39.988 17.911 39.988 39.988zM307.396 779.338c0 3.87-1.548 7.739-4.335 10.525l-21.050 21.051c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-101.54-101.694-45.507 45.662c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-21.051-21.051c-2.787-2.786-4.335-6.656-4.335-10.525s1.548-7.739 4.335-10.525l77.083-77.083c2.787-2.786 6.655-4.334 10.525-4.334s7.739 1.548 10.525 4.334l133.116 133.116c2.787 2.786 4.335 6.656 4.335 10.525zM307.396 513.228c0 3.87-1.548 7.739-4.335 10.525l-21.050 21.051c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-101.54-101.694-45.507 45.662c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-21.051-21.051c-2.787-2.786-4.335-6.656-4.335-10.525s1.548-7.739 4.335-10.525l77.083-77.083c2.787-2.786 6.655-4.334 10.525-4.334s7.739 1.548 10.525 4.334l133.116 133.116c2.787 2.786 4.335 6.656 4.335 10.525z" />
+<glyph unicode="&#xe917;" glyph-name="form-grid-check" horiz-adv-x="1094" d="M645.063 506.257c0 22.077-17.911 39.988-39.988 39.988h-115.521c-22.077 0-39.988-17.911-39.988-39.988v-115.521c0-22.077 17.911-39.988 39.988-39.988h115.521c22.077 0 39.988 17.911 39.988 39.988zM1011.782 771.036c0 22.077-17.911 39.988-39.988 39.988h-115.521c-22.077 0-39.988-17.911-39.988-39.988v-115.521c0-22.077 17.911-39.988 39.988-39.988h115.521c22.077 0 39.988 17.911 39.988 39.988zM279.090 506.257c0 22.077-17.911 39.988-39.988 39.988h-115.521c-22.077 0-39.988-17.911-39.988-39.988v-115.521c0-22.077 17.911-39.988 39.988-39.988h115.521c22.077 0 39.988 17.911 39.988 39.988zM279.136 239.834c0 22.077-17.911 39.988-39.988 39.988h-115.521c-22.077 0-39.988-17.911-39.988-39.988v-115.521c0-22.077 17.911-39.988 39.988-39.988h115.521c22.077 0 39.988 17.911 39.988 39.988zM1011.753 239.834c0 22.077-17.911 39.988-39.988 39.988h-115.521c-22.077 0-39.988-17.911-39.988-39.988v-115.521c0-22.077 17.911-39.988 39.988-39.988h115.521c22.077 0 39.988 17.911 39.988 39.988zM1047.594 513.673c0 3.87-1.548 7.739-4.335 10.525l-21.050 21.051c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-101.54-101.694-45.507 45.662c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-21.051-21.051c-2.787-2.786-4.335-6.656-4.335-10.525s1.548-7.739 4.335-10.525l77.083-77.083c2.787-2.786 6.655-4.334 10.525-4.334s7.739 1.548 10.525 4.334l133.116 133.116c2.787 2.786 4.335 6.656 4.335 10.525zM676.789 238.106c0 3.87-1.548 7.739-4.335 10.525l-21.050 21.051c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-101.54-101.694-45.507 45.662c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-21.051-21.051c-2.787-2.786-4.335-6.656-4.335-10.525s1.548-7.739 4.335-10.525l77.083-77.083c2.787-2.786 6.655-4.334 10.525-4.334s7.739 1.548 10.525 4.334l133.116 133.116c2.787 2.786 4.335 6.656 4.335 10.525zM676.789 771.743c0 3.87-1.548 7.739-4.335 10.525l-21.050 21.051c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-101.54-101.694-45.507 45.662c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-21.051-21.051c-2.787-2.786-4.335-6.656-4.335-10.525s1.548-7.739 4.335-10.525l77.083-77.083c2.787-2.786 6.655-4.334 10.525-4.334s7.739 1.548 10.525 4.334l133.116 133.116c2.787 2.786 4.335 6.656 4.335 10.525zM318.428 771.743c0 3.87-1.548 7.739-4.335 10.525l-21.050 21.051c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-101.54-101.694-45.507 45.662c-2.787 2.786-6.655 4.334-10.525 4.334s-7.739-1.548-10.525-4.334l-21.051-21.051c-2.787-2.786-4.335-6.656-4.335-10.525s1.548-7.739 4.335-10.525l77.083-77.083c2.787-2.786 6.655-4.334 10.525-4.334s7.739 1.548 10.525 4.334l133.116 133.116c2.787 2.786 4.335 6.656 4.335 10.525z" />
+<glyph unicode="&#xe918;" glyph-name="form-grid-radio" horiz-adv-x="1094" d="M181.227 823.091c-60.1 0-109.091-48.991-109.091-109.091s48.991-109.091 109.091-109.091c60.1 0 108.955 48.991 108.955 109.091s-48.855 109.091-108.955 109.091zM545.091 823.091c-60.1 0-109.091-48.991-109.091-109.091s48.991-109.091 109.091-109.091c60.1 0 109.091 48.991 109.091 109.091s-48.991 109.091-109.091 109.091zM908.955 823.091c-60.1 0-109.091-48.991-109.091-109.091s48.991-109.091 109.091-109.091c60.1 0 109.091 48.991 109.091 109.091s-48.991 109.091-109.091 109.091zM181.227 747.318c19.623 0 33.364-13.695 33.364-33.318 0-19.583-13.943-33.5-33.364-33.5-19.381 0-33.5 14.119-33.5 33.5 0 19.421 13.917 33.318 33.5 33.318zM181.227 556.955c-60.1 0-109.091-48.809-109.091-108.909s48.991-109.091 109.091-109.091c60.1 0 108.955 48.991 108.955 109.091s-48.855 108.909-108.955 108.909zM545.091 556.955c-60.1 0-109.091-48.809-109.091-108.909s48.991-109.091 109.091-109.091c60.1 0 109.091 48.991 109.091 109.091s-48.991 108.909-109.091 108.909zM908.955 556.955c-60.1 0-109.091-48.809-109.091-108.909s48.991-109.091 109.091-109.091c60.1 0 109.091 48.991 109.091 109.091s-48.991 108.909-109.091 108.909zM909.045 481.364c19.623 0 33.318-13.74 33.318-33.364 0-19.583-13.897-33.5-33.318-33.5-19.381 0-33.5 14.119-33.5 33.5 0 19.421 13.917 33.364 33.5 33.364zM181.227 291.045c-60.1 0-109.091-48.855-109.091-108.955s48.991-109.091 109.091-109.091c60.1 0 108.955 48.991 108.955 109.091s-48.855 108.955-108.955 108.955zM545.091 291.045c-60.1 0-109.091-48.855-109.091-108.955s48.991-109.091 109.091-109.091c60.1 0 109.091 48.991 109.091 109.091s-48.991 108.955-109.091 108.955zM908.955 291.045c-60.1 0-109.091-48.855-109.091-108.955s48.991-109.091 109.091-109.091c60.1 0 109.091 48.991 109.091 109.091s-48.991 108.955-109.091 108.955zM545.318 214c19.623 0 33.318-13.695 33.318-33.318 0-19.583-13.897-33.5-33.318-33.5-19.381 0-33.5 14.119-33.5 33.5 0 19.421 13.917 33.318 33.5 33.318z" />
+<glyph unicode="&#xe919;" glyph-name="form-list-radio" horiz-adv-x="1094" d="M1012.362 763.843c0 8.831-7.792 16.623-16.623 16.623h-631.687c-8.831 0-16.623-7.792-16.623-16.623v-99.74c0-8.831 7.792-16.623 16.623-16.623h631.687c8.831 0 16.623 7.792 16.623 16.623zM1012.362 497.87c0 8.831-7.792 16.623-16.623 16.623h-631.687c-8.831 0-16.623-7.792-16.623-16.623v-99.74c0-8.831 7.792-16.623 16.623-16.623h631.687c8.831 0 16.623 7.792 16.623 16.623zM181.227 823.091c-60.1 0-109.091-48.991-109.091-109.091s48.991-109.091 109.091-109.091c60.1 0 108.955 48.991 108.955 109.091s-48.855 109.091-108.955 109.091zM181.227 747.318c19.623 0 33.364-13.695 33.364-33.318 0-19.583-13.943-33.5-33.364-33.5-19.381 0-33.5 14.119-33.5 33.5 0 19.421 13.917 33.318 33.5 33.318zM181.227 556.955c-60.1 0-109.091-48.809-109.091-108.909s48.991-109.091 109.091-109.091c60.1 0 108.955 48.991 108.955 109.091s-48.855 108.909-108.955 108.909zM181.227 291.045c-60.1 0-109.091-48.855-109.091-108.955s48.991-109.091 109.091-109.091c60.1 0 108.955 48.991 108.955 109.091s-48.855 108.955-108.955 108.955zM1012.362 231.897c0 8.831-7.792 16.623-16.623 16.623h-631.687c-8.831 0-16.623-7.792-16.623-16.623v-99.74c0-8.831 7.792-16.623 16.623-16.623h631.687c8.831 0 16.623 7.792 16.623 16.623z" />
+<glyph unicode="&#xe91a;" glyph-name="form-page-break" horiz-adv-x="1094" d="M190.545 923.136c-28.106 0-50.909-22.803-50.909-50.909v-410.318h67.864v393.364h407.273v-220.591c0-28.106 22.803-50.909 50.909-50.909h220.636v-121.864h67.864v172.773c0 28.106-16.424 67.333-36.045 86.955l-165.455 165.455c-19.621 19.621-58.894 36.045-87 36.045zM682.682 851.046c9.015-3.182 18.015-7.97 21.727-11.682l166-166c3.712-3.712 8.455-12.712 11.636-21.727h-199.364zM139.636 236.273v-212.5c0-28.106 22.803-50.909 50.909-50.909h712.727c28.106 0 50.909 22.803 50.909 50.909v212.5h-67.864v-195.545h-678.818v195.545zM66.394 387.23v-65.283h195.505v65.283zM327.009 387.23v-65.283h195.505v65.283zM587.797 387.23v-65.283h195.505v65.283zM848.412 387.23v-65.283h179.012v65.283z" />
+<glyph unicode="&#xe91b;" glyph-name="form-paragraph" horiz-adv-x="1094" d="M1012.362 182.027c0 18.182-15.065 33.247-33.247 33.247h-864.413c-18.182 0-33.247-15.065-33.247-33.247v-66.493c0-18.182 15.065-33.247 33.247-33.247h864.413c18.182 0 33.247 15.065 33.247 33.247zM812.882 381.507c0 18.182-15.065 33.247-33.247 33.247h-664.933c-18.182 0-33.247-15.065-33.247-33.247v-66.493c0-18.182 15.065-33.247 33.247-33.247h664.933c18.182 0 33.247 15.065 33.247 33.247zM945.869 580.987c0 18.182-15.065 33.247-33.247 33.247h-797.92c-18.182 0-33.247-15.065-33.247-33.247v-66.493c0-18.182 15.065-33.247 33.247-33.247h797.92c18.182 0 33.247 15.065 33.247 33.247zM746.389 780.467c0 18.182-15.065 33.247-33.247 33.247h-598.44c-18.182 0-33.247-15.065-33.247-33.247v-66.493c0-18.182 15.065-33.247 33.247-33.247h598.44c18.182 0 33.247 15.065 33.247 33.247z" />
+<glyph unicode="&#xe91c;" glyph-name="form-text" horiz-adv-x="1094" d="M1012.362 481.247c0 18.182-15.065 33.247-33.247 33.247h-864.413c-18.182 0-33.247-15.065-33.247-33.247v-66.493c0-18.182 15.065-33.247 33.247-33.247h864.413c18.182 0 33.247 15.065 33.247 33.247z" />
+<glyph unicode="&#xe91d;" glyph-name="form-list-ordered" horiz-adv-x="1094" d="M279.377 71.897c0 35.844-22.857 62.857-57.662 71.169l49.351 59.74v45.714h-172.987v-78.961h55.065v27.532c16.623 0 33.766 1.039 50.389 1.039v-0.52c-22.338-20.259-39.48-46.753-58.182-70.649l13.506-29.091c21.299 1.558 54.545 0 54.545-29.091 0-20.779-19.221-29.61-37.402-29.61-19.74 0-41.039 10.39-55.065 23.376l-29.61-45.714c23.377-23.377 56.623-34.286 89.35-34.286 54.026 0 98.701 32.208 98.701 89.35zM280.416 397.611h-54.545v-31.169h-65.974c1.558 40.519 114.285 57.662 114.285 134.545 0 51.428-41.558 80-89.87 80-39.48 0-74.805-20.26-91.948-56.104l44.156-30.649c8.831 14.545 23.896 30.13 42.078 30.13 17.143 0 28.052-9.351 28.052-27.013 0-43.636-117.402-58.182-117.402-154.285 0-9.351 1.558-18.701 3.117-28.052h188.051zM1012.362 231.897c0 9.351-7.792 16.623-16.623 16.623h-631.687c-9.351 0-16.623-7.273-16.623-16.623v-99.74c0-8.831 7.273-16.623 16.623-16.623h631.687c8.831 0 16.623 7.792 16.623 16.623zM280.936 698.908h-56.104v209.87h-55.065l-70.649-65.974 36.883-39.48c9.87 8.831 20.26 16.623 25.974 28.052h1.039v-6.234c0-42.078-0.52-84.156-0.52-126.233h-55.584v-51.428h174.025zM1012.362 497.87c0 9.351-7.792 16.623-16.623 16.623h-631.687c-9.351 0-16.623-7.273-16.623-16.623v-99.74c0-8.831 7.273-16.623 16.623-16.623h631.687c8.831 0 16.623 7.792 16.623 16.623zM1012.362 763.843c0 8.831-7.792 16.623-16.623 16.623h-631.687c-9.351 0-16.623-7.792-16.623-16.623v-99.74c0-8.831 7.273-16.623 16.623-16.623h631.687c8.831 0 16.623 7.792 16.623 16.623z" />
+<glyph unicode="&#xe91e;" glyph-name="form-poll-maybe" horiz-adv-x="1094" d="M856.492 569.333c0 9.987-3.996 19.973-11.187 27.163l-54.325 54.327c-7.191 7.191-17.175 11.185-27.163 11.185s-19.972-3.995-27.163-11.185l-262.048-262.447-117.442 117.841c-7.191 7.19-17.175 11.185-27.163 11.185s-19.972-3.995-27.163-11.185l-54.327-54.327c-7.191-7.191-11.187-17.177-11.187-27.163s3.995-19.973 11.187-27.163l198.932-198.932c7.191-7.191 17.175-11.185 27.163-11.185s19.972 3.995 27.163 11.185l343.538 343.537c7.192 7.191 11.187 17.177 11.187 27.163zM65.903 444.364q0 120.454 35 225.454 35.454 105 101.818 184.090h73.636q-65.454-87.727-98.636-192.727-32.727-105-32.727-215.908 0-109.091 33.636-213.181t96.818-189.999h-72.727q-66.818 77.273-101.818 180.454t-35 221.818zM1027.916 444.364q0-119.545-35.454-222.727-35-103.182-101.363-179.545h-72.727q63.182 85.454 96.818 189.545 33.636 104.545 33.636 213.636 0 110.909-33.182 215.908-32.727 105-98.182 192.727h73.636q66.818-79.545 101.818-184.999 35-105 35-224.545z" />
 </font></defs></svg>
\ No newline at end of file
diff --git a/customize.dist/fonts/cptools/fonts/cptools.ttf b/customize.dist/fonts/cptools/fonts/cptools.ttf
index cfc9d1e3c..788b7f881 100644
Binary files a/customize.dist/fonts/cptools/fonts/cptools.ttf and b/customize.dist/fonts/cptools/fonts/cptools.ttf differ
diff --git a/customize.dist/fonts/cptools/fonts/cptools.woff b/customize.dist/fonts/cptools/fonts/cptools.woff
index 80432d647..f2faf5aa2 100644
Binary files a/customize.dist/fonts/cptools/fonts/cptools.woff and b/customize.dist/fonts/cptools/fonts/cptools.woff differ
diff --git a/customize.dist/fonts/cptools/style.css b/customize.dist/fonts/cptools/style.css
index 7fad69146..874b6068f 100644
--- a/customize.dist/fonts/cptools/style.css
+++ b/customize.dist/fonts/cptools/style.css
@@ -1,9 +1,10 @@
 @font-face {
   font-family: 'cptools';
-  src:
-    url('fonts/cptools.ttf?n9y2kz') format('truetype'),
-    url('fonts/cptools.woff?n9y2kz') format('woff'),
-    url('fonts/cptools.svg?n9y2kz#cptools') format('svg');
+  src:  url('fonts/cptools.eot?chd5a1');
+  src:  url('fonts/cptools.eot?chd5a1#iefix') format('embedded-opentype'),
+    url('fonts/cptools.ttf?chd5a1') format('truetype'),
+    url('fonts/cptools.woff?chd5a1') format('woff'),
+    url('fonts/cptools.svg?chd5a1#cptools') format('svg');
   font-weight: normal;
   font-style: normal;
   font-display: block;
@@ -25,11 +26,38 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.cptools-sheet:before {
-  content: "\e908";
+.cptools-form-poll:before {
+  content: "\e910";
 }
-.cptools-slide:before {
-  content: "\e907";
+.cptools-form-poll-maybe:before {
+  content: "\e91e";
+}
+.cptools-form-list-check:before {
+  content: "\e916";
+}
+.cptools-form-grid-check:before {
+  content: "\e917";
+}
+.cptools-form-grid-radio:before {
+  content: "\e918";
+}
+.cptools-form-list-radio:before {
+  content: "\e919";
+}
+.cptools-form-page-break:before {
+  content: "\e91a";
+}
+.cptools-form-paragraph:before {
+  content: "\e91b";
+}
+.cptools-form-text:before {
+  content: "\e91c";
+}
+.cptools-form-list-ordered:before {
+  content: "\e91d";
+}
+.cptools-folder-no-color:before {
+  content: "\e900";
 }
 .cptools-whiteboard:before {
   content: "\e901";
@@ -37,6 +65,9 @@
 .cptools-new-template:before {
   content: "\e902";
 }
+.cptools-shared-folder:before {
+  content: "\e903";
+}
 .cptools-file-upload:before {
   content: "\e904";
 }
@@ -46,9 +77,24 @@
 .cptools-poll:before {
   content: "\e906";
 }
+.cptools-slide:before {
+  content: "\e907";
+}
+.cptools-sheet:before {
+  content: "\e908";
+}
+.cptools-folder-open:before {
+  content: "\e909";
+}
 .cptools-kanban:before {
   content: "\e90a";
 }
+.cptools-folder:before {
+  content: "\e90b";
+}
+.cptools-shared-folder-open:before {
+  content: "\e90c";
+}
 .cptools-code:before {
   content: "\e90d";
 }
@@ -58,8 +104,11 @@
 .cptools-file:before {
   content: "\e90f";
 }
-.cptools-destroy:before {
-  content: "\e915";
+.cptools-palette:before {
+  content: "\e911";
+}
+.cptools-folder-upload:before {
+  content: "\e912";
 }
 .cptools-add-bottom:before {
   content: "\e913";
@@ -67,24 +116,6 @@
 .cptools-add-top:before {
   content: "\e914";
 }
-.cptools-folder-upload:before {
-  content: "\e912";
-}
-.cptools-folder-no-color:before {
-  content: "\e900";
-}
-.cptools-shared-folder:before {
-  content: "\e903";
-}
-.cptools-folder-open:before {
-  content: "\e909";
-}
-.cptools-folder:before {
-  content: "\e90b";
-}
-.cptools-shared-folder-open:before {
-  content: "\e90c";
-}
-.cptools-palette:before {
-  content: "\e911";
+.cptools-destroy:before {
+  content: "\e915";
 }
diff --git a/customize.dist/images/YannFlory.jpg b/customize.dist/images/YannFlory.jpg
deleted file mode 100644
index 9c358d1a6..000000000
Binary files a/customize.dist/images/YannFlory.jpg and /dev/null differ
diff --git a/customize.dist/images/logo_white.png b/customize.dist/images/logo_white.png
deleted file mode 100644
index 8219cc2b0..000000000
Binary files a/customize.dist/images/logo_white.png and /dev/null differ
diff --git a/customize.dist/images/logo_white.svg b/customize.dist/images/logo_white.svg
deleted file mode 100644
index d1cd2bc73..000000000
--- a/customize.dist/images/logo_white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512"><defs><linearGradient id="bt" gradientUnits="userSpaceOnUse" y1="354.011" x2="1" y2="354.011" gradientTransform="matrix(0 -25.2612 -25.2612 0 9080.407 42.484)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="bs" gradientUnits="userSpaceOnUse" y1="354.011" x2="1" y2="354.011" gradientTransform="matrix(0 -25.2612 -25.2612 0 9493.767 42.484)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="br" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -25.2612 -25.2612 0 9183.814 42.484)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="bq" gradientUnits="userSpaceOnUse" y1="354.012" x2="1" y2="354.012" gradientTransform="matrix(0 -25.2612 -25.2612 0 9217.845 42.484)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="bp" gradientUnits="userSpaceOnUse" y1="354.012" x2="1" y2="354.012" gradientTransform="matrix(0 -25.2612 -25.2612 0 9424.095 42.484)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="bo" gradientUnits="userSpaceOnUse" y1="354.003" x2="1" y2="354.003" gradientTransform="matrix(0 -27.3335 -27.3335 0 9703.824 38.634)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="bn" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -25.2612 -25.2612 0 9044.204 42.484)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="bm" gradientUnits="userSpaceOnUse" y1="354.011" x2="1" y2="354.011" gradientTransform="matrix(0 -25.2612 -25.2612 0 9286.907 42.484)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="bl" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -25.2612 -25.2612 0 9253.017 42.484)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="bk" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -25.2612 -25.2612 0 9388.673 42.484)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="bj" gradientUnits="userSpaceOnUse" y1="354" x2="1" y2="354" gradientTransform="matrix(0 -28 -28 0 9976.164 39.336)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="bi" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -25.2612 -25.2612 0 9116.298 42.484)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="bh" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -25.2612 -25.2612 0 9321.157 42.484)"><stop offset="0" stop-color="#2a2929"/><stop offset=".648" stop-color="#2a2929"/><stop offset=".681" stop-color="#4d4d4d"/><stop offset="1" stop-color="#4d4d4d"/></linearGradient><linearGradient id="bg" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -25.2612 -25.2612 0 9149.845 42.484)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="bf" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -25.2612 -25.2612 0 9459.626 42.484)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="be" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -25.2612 -25.2612 0 9353.923 42.484)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="bd" gradientUnits="userSpaceOnUse" y1="354.009" x2="1" y2="354.009" gradientTransform="matrix(0 -28.8237 -28.8237 0 10444.907 171.905)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="bc" gradientUnits="userSpaceOnUse" y1="354.009" x2="1" y2="354.009" gradientTransform="matrix(0 -28.8237 -28.8237 0 10581.673 171.905)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="bb" gradientUnits="userSpaceOnUse" y1="354.009" x2="1" y2="354.009" gradientTransform="matrix(0 -28.8237 -28.8237 0 10548.532 171.905)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="ba" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -28.8237 -28.8237 0 10685.392 171.905)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="aZ" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -28.8237 -28.8237 0 10514.501 171.905)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="aY" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -28.8237 -28.8237 0 10478.61 171.905)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="aX" gradientUnits="userSpaceOnUse" y1="354.009" x2="1" y2="354.009" gradientTransform="matrix(0 -28.8237 -28.8237 0 10304.267 171.905)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="aW" gradientUnits="userSpaceOnUse" y1="354.009" x2="1" y2="354.009" gradientTransform="matrix(0 -28.8237 -28.8237 0 10340.642 171.905)"><stop offset="0" stop-color="#686868"/><stop offset="1" stop-color="#4b4a4a"/></linearGradient><linearGradient id="aV" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -28.8237 -28.8237 0 10411.673 171.905)"><stop offset="0" stop-color="#686868"/><stop offset="1" stop-color="#4b4a4a"/></linearGradient><linearGradient id="aU" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -28.8237 -28.8237 0 10376.751 171.905)"><stop offset="0" stop-color="#686868"/><stop offset="1" stop-color="#4b4a4a"/></linearGradient><linearGradient id="aT" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -28.8237 -28.8237 0 10650.142 171.905)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="aS" gradientUnits="userSpaceOnUse" y1="354.009" x2="1" y2="354.009" gradientTransform="matrix(0 -28.8237 -28.8237 0 10720.642 171.905)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="aR" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -28.8237 -28.8237 0 10232.142 171.905)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="aQ" gradientUnits="userSpaceOnUse" y1="354.009" x2="1" y2="354.009" gradientTransform="matrix(0 -28.8237 -28.8237 0 10268.47 171.905)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="aP" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -28.8237 -28.8237 0 10754.689 171.905)"><stop offset="0" stop-color="#686868"/><stop offset="1" stop-color="#4b4a4a"/></linearGradient><linearGradient id="aO" gradientUnits="userSpaceOnUse" y1="354.009" x2="1" y2="354.009" gradientTransform="matrix(0 -28.8237 -28.8237 0 10614.829 171.905)"><stop offset="0" stop-color="#686868"/><stop offset="1" stop-color="#4b4a4a"/></linearGradient><linearGradient id="aN" gradientUnits="userSpaceOnUse" y1="354.002" x2="1" y2="354.002" gradientTransform="matrix(0 -24.6665 -24.6665 0 9248.77 82.022)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="aM" gradientUnits="userSpaceOnUse" y1="354.002" x2="1" y2="354.002" gradientTransform="matrix(0 -24.6665 -24.6665 0 9213.91 82.022)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="aL" gradientUnits="userSpaceOnUse" y1="354.002" x2="1" y2="354.002" gradientTransform="matrix(0 -24.6665 -24.6665 0 9076.176 82.022)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="aK" gradientUnits="userSpaceOnUse" y1="354.002" x2="1" y2="354.002" gradientTransform="matrix(0 -24.6665 -24.6665 0 9109.957 82.022)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="aJ" gradientUnits="userSpaceOnUse" y1="354.001" x2="1" y2="354.001" gradientTransform="matrix(0 -24.6665 -24.6665 0 9178.082 82.022)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="aI" gradientUnits="userSpaceOnUse" y1="354.001" x2="1" y2="354.001" gradientTransform="matrix(0 -24.6665 -24.6665 0 9042.113 82.022)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="aH" gradientUnits="userSpaceOnUse" y1="354.002" x2="1" y2="354.002" gradientTransform="matrix(0 -24.6665 -24.6665 0 8972.77 82.022)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="aG" gradientUnits="userSpaceOnUse" y1="354.002" x2="1" y2="354.002" gradientTransform="matrix(0 -24.6665 -24.6665 0 8905.129 82.022)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="aF" gradientUnits="userSpaceOnUse" y1="354.002" x2="1" y2="354.002" gradientTransform="matrix(0 -24.6665 -24.6665 0 8759.004 82.022)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="aE" gradientUnits="userSpaceOnUse" y1="354.002" x2="1" y2="354.002" gradientTransform="matrix(0 -24.6665 -24.6665 0 8939.02 82.022)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="aD" gradientUnits="userSpaceOnUse" y1="354.002" x2="1" y2="354.002" gradientTransform="matrix(0 -24.6665 -24.6665 0 9282.332 82.022)"><stop offset="0" stop-color="#686868"/><stop offset="1" stop-color="#4b4a4a"/></linearGradient><linearGradient id="aC" gradientUnits="userSpaceOnUse" y1="354.001" x2="1" y2="354.001" gradientTransform="matrix(0 -24.6665 -24.6665 0 9142.848 82.022)"><stop offset="0" stop-color="#686868"/><stop offset="1" stop-color="#4b4a4a"/></linearGradient><linearGradient id="aB" gradientUnits="userSpaceOnUse" y1="354.002" x2="1" y2="354.002" gradientTransform="matrix(0 -24.6665 -24.6665 0 8795.426 82.022)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="aA" gradientUnits="userSpaceOnUse" y1="354.008" x2="1" y2="354.008" gradientTransform="matrix(0 -24.6665 -24.6665 0 8832.613 82.022)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="az" gradientUnits="userSpaceOnUse" y1="354" x2="1" y2="354" gradientTransform="matrix(0 -24.6665 -24.6665 0 8869.254 82.022)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="ay" gradientUnits="userSpaceOnUse" y1="354.002" x2="1" y2="354.002" gradientTransform="matrix(0 -24.6665 -24.6665 0 9007.145 82.022)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="ax" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -25.8794 -25.8794 0 9678.838 122.619)"><stop offset="0"/><stop offset=".017"/><stop offset=".407" stop-color="#252526"/><stop offset=".488" stop-color="#323334"/><stop offset=".522" stop-color="#393a3b"/><stop offset=".632" stop-color="#262728"/><stop offset=".989" stop-color="#040404"/><stop offset="1" stop-color="#040404"/></linearGradient><linearGradient id="aw" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -25.8794 -25.8794 0 9539.197 122.603)"><stop offset="0"/><stop offset=".017"/><stop offset=".407" stop-color="#252526"/><stop offset=".488" stop-color="#323334"/><stop offset=".522" stop-color="#393a3b"/><stop offset=".632" stop-color="#262728"/><stop offset=".989" stop-color="#040404"/><stop offset="1" stop-color="#040404"/></linearGradient><linearGradient id="av" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -25.8794 -25.8794 0 9188.65 122.619)"><stop offset="0"/><stop offset=".017"/><stop offset=".407" stop-color="#252526"/><stop offset=".488" stop-color="#323334"/><stop offset=".522" stop-color="#393a3b"/><stop offset=".632" stop-color="#262728"/><stop offset=".989" stop-color="#040404"/><stop offset="1" stop-color="#040404"/></linearGradient><linearGradient id="au" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -25.8794 -25.8794 0 9606.932 122.619)"><stop offset="0"/><stop offset=".017"/><stop offset=".407" stop-color="#252526"/><stop offset=".488" stop-color="#323334"/><stop offset=".522" stop-color="#393a3b"/><stop offset=".632" stop-color="#262728"/><stop offset=".989" stop-color="#040404"/><stop offset="1" stop-color="#040404"/></linearGradient><linearGradient id="at" gradientUnits="userSpaceOnUse" y1="353.999" x2="1" y2="353.999" gradientTransform="matrix(0 -25.8794 -25.8794 0 9402.478 122.635)"><stop offset="0"/><stop offset=".017"/><stop offset=".407" stop-color="#252526"/><stop offset=".488" stop-color="#323334"/><stop offset=".522" stop-color="#393a3b"/><stop offset=".632" stop-color="#262728"/><stop offset=".989" stop-color="#040404"/><stop offset="1" stop-color="#040404"/></linearGradient><linearGradient id="as" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -25.8794 -25.8794 0 9505.728 122.603)"><stop offset="0"/><stop offset=".017"/><stop offset=".407" stop-color="#252526"/><stop offset=".488" stop-color="#323334"/><stop offset=".522" stop-color="#393a3b"/><stop offset=".632" stop-color="#262728"/><stop offset=".989" stop-color="#040404"/><stop offset="1" stop-color="#040404"/></linearGradient><linearGradient id="ar" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -25.8794 -25.8794 0 9712.12 122.619)"><stop offset="0" stop-color="#474646"/><stop offset=".017" stop-color="#474646"/><stop offset=".407" stop-color="#575657"/><stop offset=".522" stop-color="#605f60"/><stop offset=".632" stop-color="#575758"/><stop offset=".989" stop-color="#484848"/><stop offset="1" stop-color="#484848"/></linearGradient><linearGradient id="aq" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -25.8794 -25.8794 0 9225.416 122.619)"><stop offset="0"/><stop offset=".017"/><stop offset=".407" stop-color="#252526"/><stop offset=".488" stop-color="#323334"/><stop offset=".522" stop-color="#393a3b"/><stop offset=".632" stop-color="#262728"/><stop offset=".989" stop-color="#040404"/><stop offset="1" stop-color="#040404"/></linearGradient><linearGradient id="ap" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -25.8794 -25.8794 0 9436.291 122.619)"><stop offset="0"/><stop offset=".017"/><stop offset=".407" stop-color="#252526"/><stop offset=".488" stop-color="#323334"/><stop offset=".522" stop-color="#393a3b"/><stop offset=".632" stop-color="#262728"/><stop offset=".989" stop-color="#040404"/><stop offset="1" stop-color="#040404"/></linearGradient><linearGradient id="ao" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -25.8794 -25.8794 0 9261.838 122.619)"><stop offset="0"/><stop offset=".017"/><stop offset=".407" stop-color="#252526"/><stop offset=".488" stop-color="#323334"/><stop offset=".522" stop-color="#393a3b"/><stop offset=".632" stop-color="#262728"/><stop offset=".989" stop-color="#040404"/><stop offset="1" stop-color="#040404"/></linearGradient><linearGradient id="an" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -25.8794 -25.8794 0 9642.775 122.619)"><stop offset="0"/><stop offset=".017"/><stop offset=".407" stop-color="#252526"/><stop offset=".488" stop-color="#323334"/><stop offset=".522" stop-color="#393a3b"/><stop offset=".632" stop-color="#262728"/><stop offset=".989" stop-color="#040404"/><stop offset="1" stop-color="#040404"/></linearGradient><linearGradient id="am" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -25.8794 -25.8794 0 9471.9 122.619)"><stop offset="0"/><stop offset=".017"/><stop offset=".407" stop-color="#252526"/><stop offset=".488" stop-color="#323334"/><stop offset=".522" stop-color="#393a3b"/><stop offset=".632" stop-color="#262728"/><stop offset=".989" stop-color="#040404"/><stop offset="1" stop-color="#040404"/></linearGradient><linearGradient id="al" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -25.8794 -25.8794 0 9368.228 122.619)"><stop offset="0" stop-color="#474646"/><stop offset=".017" stop-color="#474646"/><stop offset=".407" stop-color="#575657"/><stop offset=".522" stop-color="#605f60"/><stop offset=".632" stop-color="#575758"/><stop offset=".989" stop-color="#484848"/><stop offset="1" stop-color="#484848"/></linearGradient><linearGradient id="ak" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -25.8794 -25.8794 0 9573.01 122.619)"><stop offset="0"/><stop offset=".017"/><stop offset=".407" stop-color="#252526"/><stop offset=".488" stop-color="#323334"/><stop offset=".522" stop-color="#393a3b"/><stop offset=".632" stop-color="#262728"/><stop offset=".989" stop-color="#040404"/><stop offset="1" stop-color="#040404"/></linearGradient><linearGradient id="aj" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -25.8794 -25.8794 0 9333.775 122.619)"><stop offset="0"/><stop offset=".017"/><stop offset=".407" stop-color="#252526"/><stop offset=".488" stop-color="#323334"/><stop offset=".522" stop-color="#393a3b"/><stop offset=".632" stop-color="#262728"/><stop offset=".989" stop-color="#040404"/><stop offset="1" stop-color="#040404"/></linearGradient><linearGradient id="ai" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -25.8794 -25.8794 0 9297.791 122.619)"><stop offset="0"/><stop offset=".017"/><stop offset=".407" stop-color="#252526"/><stop offset=".488" stop-color="#323334"/><stop offset=".522" stop-color="#393a3b"/><stop offset=".632" stop-color="#262728"/><stop offset=".989" stop-color="#040404"/><stop offset="1" stop-color="#040404"/></linearGradient><linearGradient id="ah" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -28.667 -28.667 0 10559.391 337.276)"><stop offset="0" stop-color="#4b4a4b"/><stop offset=".533" stop-color="#131111"/><stop offset="1" stop-color="#131111"/></linearGradient><linearGradient id="ag" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -28.667 -28.667 0 10525.828 337.276)"><stop offset="0" stop-color="#4b4a4b"/><stop offset=".533" stop-color="#131111"/><stop offset="1" stop-color="#131111"/></linearGradient><linearGradient id="af" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -28.667 -28.667 0 10423.203 337.276)"><stop offset="0" stop-color="#4b4a4b"/><stop offset=".533" stop-color="#131111"/><stop offset="1" stop-color="#131111"/></linearGradient><linearGradient id="ae" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -28.667 -28.667 0 10458.172 337.276)"><stop offset="0" stop-color="#787778"/><stop offset=".533" stop-color="#535252"/><stop offset="1" stop-color="#535252"/></linearGradient><linearGradient id="ad" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -28.667 -28.667 0 10492.141 337.276)"><stop offset="0" stop-color="#787778"/><stop offset=".533" stop-color="#535252"/><stop offset="1" stop-color="#535252"/></linearGradient><linearGradient id="ac" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -28.667 -28.667 0 10354.391 337.245)"><stop offset="0" stop-color="#787778"/><stop offset=".533" stop-color="#535252"/><stop offset="1" stop-color="#535252"/></linearGradient><linearGradient id="ab" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -28.667 -28.667 0 10388.891 337.276)"><stop offset="0" stop-color="#787778"/><stop offset=".533" stop-color="#535252"/><stop offset="1" stop-color="#535252"/></linearGradient><linearGradient id="aa" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -28.667 -28.667 0 10176.141 337.245)"><stop offset="0" stop-color="#787778"/><stop offset=".533" stop-color="#535252"/><stop offset="1" stop-color="#535252"/></linearGradient><linearGradient id="Z" gradientUnits="userSpaceOnUse" y1="353.997" x2="1" y2="353.997" gradientTransform="matrix(0 -28.667 -28.667 0 10212.109 337.245)"><stop offset="0" stop-color="#787778"/><stop offset=".533" stop-color="#535252"/><stop offset="1" stop-color="#535252"/></linearGradient><linearGradient id="Y" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -28.667 -28.667 0 10321.25 337.276)"><stop offset="0" stop-color="#787778"/><stop offset=".533" stop-color="#535252"/><stop offset="1" stop-color="#535252"/></linearGradient><linearGradient id="X" gradientUnits="userSpaceOnUse" y1="353.997" x2="1" y2="353.997" gradientTransform="matrix(0 -28.667 -28.667 0 10249.391 337.276)"><stop offset="0" stop-color="#787778"/><stop offset=".533" stop-color="#535252"/><stop offset="1" stop-color="#535252"/></linearGradient><linearGradient id="W" gradientUnits="userSpaceOnUse" y1="353.996" x2="1" y2="353.996" gradientTransform="matrix(0 -28.667 -28.667 0 10285.359 337.276)"><stop offset="0" stop-color="#787778"/><stop offset=".533" stop-color="#535252"/><stop offset="1" stop-color="#535252"/></linearGradient><linearGradient id="V" gradientUnits="userSpaceOnUse" y1="354.008" x2=".999" y2="354.008" gradientTransform="matrix(0 -27.9365 -27.9365 0 10234.173 297.782)"><stop offset="0"/><stop offset=".017"/><stop offset=".456" stop-color="#545456"/><stop offset=".489" stop-color="#606163"/><stop offset=".522" stop-color="#717275"/><stop offset=".654" stop-color="#4c4c4d"/><stop offset=".989" stop-color="#0e0c0c"/><stop offset="1" stop-color="#0e0c0c"/></linearGradient><linearGradient id="U" gradientUnits="userSpaceOnUse" x1=".001" y1="354.015" x2="1.001" y2="354.015" gradientTransform="matrix(0 -24.5898 -24.5898 0 9222.492 293.449)"><stop offset="0"/><stop offset=".017"/><stop offset=".456" stop-color="#545456"/><stop offset=".489" stop-color="#606163"/><stop offset=".522" stop-color="#717275"/><stop offset=".654" stop-color="#4c4c4d"/><stop offset=".989" stop-color="#0e0c0c"/><stop offset="1" stop-color="#0e0c0c"/></linearGradient><linearGradient id="T" gradientUnits="userSpaceOnUse" x1="-.001" y1="354" x2=".999" y2="354" gradientTransform="matrix(0 -30.9502 -30.9502 0 11231.597 298.962)"><stop offset="0"/><stop offset=".017"/><stop offset=".456" stop-color="#545456"/><stop offset=".489" stop-color="#606163"/><stop offset=".522" stop-color="#717275"/><stop offset=".654" stop-color="#4c4c4d"/><stop offset=".989" stop-color="#0e0c0c"/><stop offset="1" stop-color="#0e0c0c"/></linearGradient><linearGradient id="S" gradientUnits="userSpaceOnUse" x1="-.001" y1="353.99" x2=".999" y2="353.99" gradientTransform="matrix(0 -29.6348 -29.6348 0 10553.986 296.69)"><stop offset="0"/><stop offset=".017"/><stop offset=".456" stop-color="#545456"/><stop offset=".489" stop-color="#606163"/><stop offset=".522" stop-color="#717275"/><stop offset=".654" stop-color="#4c4c4d"/><stop offset=".989" stop-color="#0e0c0c"/><stop offset="1" stop-color="#0e0c0c"/></linearGradient><linearGradient id="R" gradientUnits="userSpaceOnUse" y1="354.008" x2="1" y2="354.008" gradientTransform="matrix(0 -26.7031 -26.7031 0 9480.878 298.032)"><stop offset="0"/><stop offset=".017"/><stop offset=".456" stop-color="#545456"/><stop offset=".489" stop-color="#606163"/><stop offset=".522" stop-color="#717275"/><stop offset=".654" stop-color="#4c4c4d"/><stop offset=".989" stop-color="#0e0c0c"/><stop offset="1" stop-color="#0e0c0c"/></linearGradient><linearGradient id="Q" gradientUnits="userSpaceOnUse" y1="353.992" x2="1" y2="353.992" gradientTransform="matrix(0 -27.126 -27.126 0 9981.826 295.796)"><stop offset="0"/><stop offset=".017"/><stop offset=".456" stop-color="#545456"/><stop offset=".489" stop-color="#606163"/><stop offset=".522" stop-color="#717275"/><stop offset=".654" stop-color="#4c4c4d"/><stop offset=".989" stop-color="#0e0c0c"/><stop offset="1" stop-color="#0e0c0c"/></linearGradient><linearGradient id="P" gradientUnits="userSpaceOnUse" y1="353.998" x2=".999" y2="353.998" gradientTransform="matrix(0 -28.8799 -28.8799 0 10706.974 297.2)"><stop offset="0"/><stop offset=".017"/><stop offset=".456" stop-color="#545456"/><stop offset=".489" stop-color="#606163"/><stop offset=".522" stop-color="#717275"/><stop offset=".654" stop-color="#4c4c4d"/><stop offset=".989" stop-color="#0e0c0c"/><stop offset="1" stop-color="#0e0c0c"/></linearGradient><linearGradient id="O" gradientUnits="userSpaceOnUse" y1="354.003" x2="1" y2="354.003" gradientTransform="matrix(0 -30.4287 -30.4287 0 11219.801 298.817)"><stop offset="0"/><stop offset=".017"/><stop offset=".456" stop-color="#545456"/><stop offset=".489" stop-color="#606163"/><stop offset=".522" stop-color="#717275"/><stop offset=".654" stop-color="#4c4c4d"/><stop offset=".989" stop-color="#0e0c0c"/><stop offset="1" stop-color="#0e0c0c"/></linearGradient><linearGradient id="N" gradientUnits="userSpaceOnUse" x1=".001" y1="354" x2="1.001" y2="354" gradientTransform="matrix(0 -31.5498 -31.5498 0 11409.372 299.569)"><stop offset="0"/><stop offset=".017"/><stop offset=".456" stop-color="#545456"/><stop offset=".489" stop-color="#606163"/><stop offset=".522" stop-color="#717275"/><stop offset=".654" stop-color="#4c4c4d"/><stop offset=".989" stop-color="#0e0c0c"/><stop offset="1" stop-color="#0e0c0c"/></linearGradient><linearGradient id="M" gradientUnits="userSpaceOnUse" y1="353.99" x2="1" y2="353.99" gradientTransform="matrix(0 -30.168 -30.168 0 10816.912 297.846)"><stop offset="0"/><stop offset=".017"/><stop offset=".456" stop-color="#545456"/><stop offset=".489" stop-color="#606163"/><stop offset=".522" stop-color="#717275"/><stop offset=".654" stop-color="#4c4c4d"/><stop offset=".989" stop-color="#0e0c0c"/><stop offset="1" stop-color="#0e0c0c"/></linearGradient><linearGradient id="L" gradientUnits="userSpaceOnUse" y1="354.014" x2="1" y2="354.014" gradientTransform="matrix(0 -24.7734 -24.7734 0 9321.173 293.81)"><stop offset="0"/><stop offset=".017"/><stop offset=".456" stop-color="#545456"/><stop offset=".489" stop-color="#606163"/><stop offset=".522" stop-color="#717275"/><stop offset=".654" stop-color="#4c4c4d"/><stop offset=".989" stop-color="#0e0c0c"/><stop offset="1" stop-color="#0e0c0c"/></linearGradient><linearGradient id="K" gradientUnits="userSpaceOnUse" y1="354.007" x2=".999" y2="354.007" gradientTransform="matrix(0 -29.0283 -29.0283 0 10449.482 297.377)"><stop offset="0"/><stop offset=".017"/><stop offset=".456" stop-color="#545456"/><stop offset=".489" stop-color="#606163"/><stop offset=".522" stop-color="#717275"/><stop offset=".654" stop-color="#4c4c4d"/><stop offset=".989" stop-color="#0e0c0c"/><stop offset="1" stop-color="#0e0c0c"/></linearGradient><linearGradient id="J" gradientUnits="userSpaceOnUse" y1="353.99" x2="1" y2="353.99" gradientTransform="matrix(0 -27.043 -27.043 0 9882.772 295.549)"><stop offset="0"/><stop offset=".017"/><stop offset=".456" stop-color="#545456"/><stop offset=".489" stop-color="#606163"/><stop offset=".522" stop-color="#717275"/><stop offset=".654" stop-color="#4c4c4d"/><stop offset=".989" stop-color="#0e0c0c"/><stop offset="1" stop-color="#0e0c0c"/></linearGradient><linearGradient id="I" gradientUnits="userSpaceOnUse" y1="353.997" x2="1" y2="353.997" gradientTransform="matrix(0 -27.4922 -27.4922 0 10144.057 295.59)"><stop offset="0"/><stop offset=".017"/><stop offset=".456" stop-color="#545456"/><stop offset=".489" stop-color="#606163"/><stop offset=".522" stop-color="#717275"/><stop offset=".654" stop-color="#4c4c4d"/><stop offset=".989" stop-color="#0e0c0c"/><stop offset="1" stop-color="#0e0c0c"/></linearGradient><linearGradient id="H" gradientUnits="userSpaceOnUse" y1="354.008" x2=".999" y2="354.008" gradientTransform="matrix(0 -27.7197 -27.7197 0 9913.817 296.047)"><stop offset="0"/><stop offset=".017"/><stop offset=".456" stop-color="#545456"/><stop offset=".489" stop-color="#606163"/><stop offset=".522" stop-color="#717275"/><stop offset=".654" stop-color="#4c4c4d"/><stop offset=".989" stop-color="#0e0c0c"/><stop offset="1" stop-color="#0e0c0c"/></linearGradient><linearGradient id="G" gradientUnits="userSpaceOnUse" y1="354.007" x2="1" y2="354.007" gradientTransform="matrix(0 -24.3867 -24.3867 0 8840.371 293.627)"><stop offset="0"/><stop offset=".017"/><stop offset=".456" stop-color="#545456"/><stop offset=".489" stop-color="#606163"/><stop offset=".522" stop-color="#717275"/><stop offset=".654" stop-color="#4c4c4d"/><stop offset=".989" stop-color="#0e0c0c"/><stop offset="1" stop-color="#0e0c0c"/></linearGradient><linearGradient id="F" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 29.4881 29.4881 0 -10230.546 227.623)"><stop offset="0" stop-color="#231f20"/><stop offset=".33" stop-color="#231f20"/><stop offset=".348" stop-color="#141213"/><stop offset=".374" stop-color="#090808"/><stop offset=".41" stop-color="#020202"/><stop offset=".511"/><stop offset="1"/></linearGradient><linearGradient id="E" gradientUnits="userSpaceOnUse" y1="353.99" x2="1" y2="353.99" gradientTransform="matrix(0 29.2974 29.2974 0 -10306.82 227.982)"><stop offset="0" stop-color="#231f20"/><stop offset=".33" stop-color="#231f20"/><stop offset=".348" stop-color="#141213"/><stop offset=".374" stop-color="#090808"/><stop offset=".41" stop-color="#020202"/><stop offset=".511"/><stop offset="1"/></linearGradient><linearGradient id="D" gradientUnits="userSpaceOnUse" y1="353.994" x2="1" y2="353.994" gradientTransform="matrix(0 29.5051 29.5051 0 -9997.478 227.665)"><stop offset="0" stop-color="#231f20"/><stop offset=".33" stop-color="#231f20"/><stop offset=".348" stop-color="#141213"/><stop offset=".374" stop-color="#090808"/><stop offset=".41" stop-color="#020202"/><stop offset=".511"/><stop offset="1"/></linearGradient><linearGradient id="C" gradientUnits="userSpaceOnUse" y1="353.996" x2="1" y2="353.996" gradientTransform="matrix(0 29.3592 29.3592 0 -10117.164 227.7)"><stop offset="0" stop-color="#231f20"/><stop offset=".33" stop-color="#231f20"/><stop offset=".348" stop-color="#141213"/><stop offset=".374" stop-color="#090808"/><stop offset=".41" stop-color="#020202"/><stop offset=".511"/><stop offset="1"/></linearGradient><linearGradient id="B" gradientUnits="userSpaceOnUse" y1="353.992" x2="1" y2="353.992" gradientTransform="matrix(0 29.5067 29.5067 0 -10272.606 227.766)"><stop offset="0" stop-color="#231f20"/><stop offset=".33" stop-color="#231f20"/><stop offset=".348" stop-color="#141213"/><stop offset=".374" stop-color="#090808"/><stop offset=".41" stop-color="#020202"/><stop offset=".511"/><stop offset="1"/></linearGradient><linearGradient id="A" gradientUnits="userSpaceOnUse" y1="354.013" x2="1" y2="354.013" gradientTransform="matrix(0 29.3444 29.3444 0 -9871.076 227.321)"><stop offset="0" stop-color="#231f20"/><stop offset=".33" stop-color="#231f20"/><stop offset=".348" stop-color="#141213"/><stop offset=".374" stop-color="#090808"/><stop offset=".41" stop-color="#020202"/><stop offset=".511"/><stop offset="1"/></linearGradient><linearGradient id="z" gradientUnits="userSpaceOnUse" y1="353.996" x2="1" y2="353.996" gradientTransform="matrix(0 29.4637 29.4637 0 -10292.313 227.666)"><stop offset="0" stop-color="#231f20"/><stop offset=".33" stop-color="#231f20"/><stop offset=".348" stop-color="#141213"/><stop offset=".374" stop-color="#090808"/><stop offset=".41" stop-color="#020202"/><stop offset=".511"/><stop offset="1"/></linearGradient><linearGradient id="y" gradientUnits="userSpaceOnUse" y1="354.012" x2="1" y2="354.012" gradientTransform="matrix(0 29.3817 29.3817 0 -10160.138 227.313)"><stop offset="0" stop-color="#231f20"/><stop offset=".33" stop-color="#231f20"/><stop offset=".348" stop-color="#141213"/><stop offset=".374" stop-color="#090808"/><stop offset=".41" stop-color="#020202"/><stop offset=".511"/><stop offset="1"/></linearGradient><linearGradient id="x" gradientUnits="userSpaceOnUse" y1="354.011" x2="1" y2="354.011" gradientTransform="matrix(0 29.4437 29.4437 0 -10394.877 227.3)"><stop offset="0" stop-color="#231f20"/><stop offset=".33" stop-color="#231f20"/><stop offset=".348" stop-color="#141213"/><stop offset=".374" stop-color="#090808"/><stop offset=".41" stop-color="#020202"/><stop offset=".511"/><stop offset="1"/></linearGradient><linearGradient id="w" gradientUnits="userSpaceOnUse" y1="353.996" x2="1" y2="353.996" gradientTransform="matrix(0 29.4184 29.4184 0 -9862.78 227.65)"><stop offset="0" stop-color="#231f20"/><stop offset=".33" stop-color="#231f20"/><stop offset=".348" stop-color="#141213"/><stop offset=".374" stop-color="#090808"/><stop offset=".41" stop-color="#020202"/><stop offset=".511"/><stop offset="1"/></linearGradient><linearGradient id="v" gradientUnits="userSpaceOnUse" y1="353.997" x2="1" y2="353.997" gradientTransform="matrix(0 29.4228 29.4228 0 -10004.189 227.648)"><stop offset="0" stop-color="#231f20"/><stop offset=".33" stop-color="#231f20"/><stop offset=".348" stop-color="#141213"/><stop offset=".374" stop-color="#090808"/><stop offset=".41" stop-color="#020202"/><stop offset=".511"/><stop offset="1"/></linearGradient><linearGradient id="u" gradientUnits="userSpaceOnUse" y1="354.014" x2="1" y2="354.014" gradientTransform="matrix(0 29.3306 29.3306 0 -10039.308 227.233)"><stop offset="0" stop-color="#231f20"/><stop offset=".33" stop-color="#231f20"/><stop offset=".348" stop-color="#141213"/><stop offset=".374" stop-color="#090808"/><stop offset=".41" stop-color="#020202"/><stop offset=".511"/><stop offset="1"/></linearGradient><linearGradient id="t" gradientUnits="userSpaceOnUse" y1="354.006" x2="1" y2="354.006" gradientTransform="matrix(0 29.4326 29.4326 0 -10109.542 227.388)"><stop offset="0" stop-color="#231f20"/><stop offset=".33" stop-color="#231f20"/><stop offset=".348" stop-color="#141213"/><stop offset=".374" stop-color="#090808"/><stop offset=".41" stop-color="#020202"/><stop offset=".511"/><stop offset="1"/></linearGradient><linearGradient id="s" gradientUnits="userSpaceOnUse" y1="354.009" x2="1" y2="354.009" gradientTransform="matrix(0 29.5123 29.5123 0 -10346.728 227.216)"><stop offset="0" stop-color="#231f20"/><stop offset=".33" stop-color="#231f20"/><stop offset=".348" stop-color="#141213"/><stop offset=".374" stop-color="#090808"/><stop offset=".41" stop-color="#020202"/><stop offset=".511"/><stop offset="1"/></linearGradient><linearGradient id="r" gradientUnits="userSpaceOnUse" y1="354.008" x2="1" y2="354.008" gradientTransform="matrix(0 29.4018 29.4018 0 -10031.091 227.383)"><stop offset="0" stop-color="#231f20"/><stop offset=".33" stop-color="#231f20"/><stop offset=".348" stop-color="#141213"/><stop offset=".374" stop-color="#090808"/><stop offset=".41" stop-color="#020202"/><stop offset=".511"/><stop offset="1"/></linearGradient><linearGradient id="q" gradientUnits="userSpaceOnUse" y1="354.011" x2="1" y2="354.011" gradientTransform="matrix(0 29.0914 29.0914 0 -9815.855 227.482)"><stop offset="0" stop-color="#231f20"/><stop offset=".33" stop-color="#231f20"/><stop offset=".348" stop-color="#141213"/><stop offset=".374" stop-color="#090808"/><stop offset=".41" stop-color="#020202"/><stop offset=".511"/><stop offset="1"/></linearGradient><linearGradient id="p" gradientUnits="userSpaceOnUse" y1="354" x2="1" y2="354" gradientTransform="matrix(0 -26 -26 0 9651.21 209.336)"><stop offset="0" stop-color="#7c7b7b"/><stop offset="1" stop-color="#515050"/></linearGradient><linearGradient id="o" gradientUnits="userSpaceOnUse" y1="354" x2="1" y2="354" gradientTransform="matrix(0 -26 -26 0 9615.602 209.336)"><stop offset="0" stop-color="#7c7b7b"/><stop offset="1" stop-color="#515050"/></linearGradient><linearGradient id="n" gradientUnits="userSpaceOnUse" y1="354" x2="1" y2="354" gradientTransform="matrix(0 -26 -26 0 9720.273 209.32)"><stop offset="0" stop-color="#7c7b7b"/><stop offset="1" stop-color="#515050"/></linearGradient><linearGradient id="m" gradientUnits="userSpaceOnUse" y1="354.001" x2="1" y2="354.001" gradientTransform="matrix(0 -26 -26 0 9581.883 209.336)"><stop offset="0" stop-color="#616161"/><stop offset="1" stop-color="#0d0c0c"/></linearGradient><linearGradient id="l" gradientUnits="userSpaceOnUse" y1="354" x2="1" y2="354" gradientTransform="matrix(0 -26 -26 0 9267.93 209.352)"><stop offset="0" stop-color="#616161"/><stop offset="1" stop-color="#0d0c0c"/></linearGradient><linearGradient id="k" gradientUnits="userSpaceOnUse" y1="354.001" x2="1" y2="354.001" gradientTransform="matrix(0 -26 -26 0 9377.07 209.336)"><stop offset="0" stop-color="#616161"/><stop offset="1" stop-color="#0d0c0c"/></linearGradient><linearGradient id="j" gradientUnits="userSpaceOnUse" y1="354.001" x2="1" y2="354.001" gradientTransform="matrix(0 -26 -26 0 9479.523 209.336)"><stop offset="0" stop-color="#616161"/><stop offset="1" stop-color="#0d0c0c"/></linearGradient><linearGradient id="i" gradientUnits="userSpaceOnUse" y1="354" x2="1" y2="354" gradientTransform="matrix(0 -26 -26 0 9232.195 209.336)"><stop offset="0" stop-color="#616161"/><stop offset="1" stop-color="#0d0c0c"/></linearGradient><linearGradient id="h" gradientUnits="userSpaceOnUse" y1="354" x2="1" y2="354" gradientTransform="matrix(0 -26 -26 0 9754.664 209.336)"><stop offset="0" stop-color="#616161"/><stop offset="1" stop-color="#0d0c0c"/></linearGradient><linearGradient id="g" gradientUnits="userSpaceOnUse" y1="353.999" x2="1" y2="353.999" gradientTransform="matrix(0 -26 -26 0 9304.523 209.32)"><stop offset="0" stop-color="#616161"/><stop offset="1" stop-color="#0d0c0c"/></linearGradient><linearGradient id="f" gradientUnits="userSpaceOnUse" y1="354.001" x2="1" y2="354.001" gradientTransform="matrix(0 -26 -26 0 9444.79 209.336)"><stop offset="0" stop-color="#616161"/><stop offset="1" stop-color="#0d0c0c"/></linearGradient><linearGradient id="e" gradientUnits="userSpaceOnUse" y1="354.001" x2="1" y2="354.001" gradientTransform="matrix(0 -26 -26 0 9340.773 209.336)"><stop offset="0" stop-color="#616161"/><stop offset="1" stop-color="#0d0c0c"/></linearGradient><linearGradient id="d" gradientUnits="userSpaceOnUse" y1="354" x2="1" y2="354" gradientTransform="matrix(0 -26 -26 0 9685.742 209.336)"><stop offset="0" stop-color="#7c7b7b"/><stop offset="1" stop-color="#515050"/></linearGradient><linearGradient id="c" gradientUnits="userSpaceOnUse" y1="354" x2="1" y2="354" gradientTransform="matrix(0 -26 -26 0 9513.32 209.336)"><stop offset="0" stop-color="#7c7b7b"/><stop offset="1" stop-color="#515050"/></linearGradient><linearGradient id="b" gradientUnits="userSpaceOnUse" y1="353.999" x2="1" y2="353.999" gradientTransform="matrix(0 -26 -26 0 9548.352 209.32)"><stop offset="0" stop-color="#7c7b7b"/><stop offset="1" stop-color="#515050"/></linearGradient><linearGradient id="a" gradientUnits="userSpaceOnUse" y1="354.001" x2="1" y2="354.001" gradientTransform="matrix(0 -26 -26 0 9411.414 209.336)"><stop offset="0" stop-color="#7c7b7b"/><stop offset="1" stop-color="#515050"/></linearGradient><linearGradient id="dN" gradientUnits="userSpaceOnUse" y1="354.011" x2="1" y2="354.011" gradientTransform="matrix(0 -25.2612 -25.2612 0 9080.407 42.484)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="dM" gradientUnits="userSpaceOnUse" y1="354.011" x2="1" y2="354.011" gradientTransform="matrix(0 -25.2612 -25.2612 0 9493.767 42.484)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="dL" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -25.2612 -25.2612 0 9183.814 42.484)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="dK" gradientUnits="userSpaceOnUse" y1="354.012" x2="1" y2="354.012" gradientTransform="matrix(0 -25.2612 -25.2612 0 9217.845 42.484)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="dJ" gradientUnits="userSpaceOnUse" y1="354.012" x2="1" y2="354.012" gradientTransform="matrix(0 -25.2612 -25.2612 0 9424.095 42.484)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="dI" gradientUnits="userSpaceOnUse" y1="354.003" x2="1" y2="354.003" gradientTransform="matrix(0 -27.3335 -27.3335 0 9703.824 38.634)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="dH" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -25.2612 -25.2612 0 9044.204 42.484)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="dG" gradientUnits="userSpaceOnUse" y1="354.011" x2="1" y2="354.011" gradientTransform="matrix(0 -25.2612 -25.2612 0 9286.907 42.484)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="dF" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -25.2612 -25.2612 0 9253.017 42.484)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="dE" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -25.2612 -25.2612 0 9388.673 42.484)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="dD" gradientUnits="userSpaceOnUse" y1="354" x2="1" y2="354" gradientTransform="matrix(0 -28 -28 0 9976.164 39.336)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="dC" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -25.2612 -25.2612 0 9116.298 42.484)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="dB" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -25.2612 -25.2612 0 9321.157 42.484)"><stop offset="0" stop-color="#2a2929"/><stop offset=".648" stop-color="#2a2929"/><stop offset=".681" stop-color="#4d4d4d"/><stop offset="1" stop-color="#4d4d4d"/></linearGradient><linearGradient id="dA" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -25.2612 -25.2612 0 9149.845 42.484)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="dz" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -25.2612 -25.2612 0 9459.626 42.484)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="dy" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -25.2612 -25.2612 0 9353.923 42.484)"><stop offset="0"/><stop offset=".648"/><stop offset=".681" stop-color="#2a2a2a"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="dx" gradientUnits="userSpaceOnUse" y1="354.009" x2="1" y2="354.009" gradientTransform="matrix(0 -28.8237 -28.8237 0 10444.907 171.905)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="dw" gradientUnits="userSpaceOnUse" y1="354.009" x2="1" y2="354.009" gradientTransform="matrix(0 -28.8237 -28.8237 0 10581.673 171.905)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="dv" gradientUnits="userSpaceOnUse" y1="354.009" x2="1" y2="354.009" gradientTransform="matrix(0 -28.8237 -28.8237 0 10548.532 171.905)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="du" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -28.8237 -28.8237 0 10685.392 171.905)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="dt" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -28.8237 -28.8237 0 10514.501 171.905)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="ds" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -28.8237 -28.8237 0 10478.61 171.905)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="dr" gradientUnits="userSpaceOnUse" y1="354.009" x2="1" y2="354.009" gradientTransform="matrix(0 -28.8237 -28.8237 0 10304.267 171.905)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="dq" gradientUnits="userSpaceOnUse" y1="354.009" x2="1" y2="354.009" gradientTransform="matrix(0 -28.8237 -28.8237 0 10340.642 171.905)"><stop offset="0" stop-color="#686868"/><stop offset="1" stop-color="#4b4a4a"/></linearGradient><linearGradient id="dp" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -28.8237 -28.8237 0 10411.673 171.905)"><stop offset="0" stop-color="#686868"/><stop offset="1" stop-color="#4b4a4a"/></linearGradient><linearGradient id="do" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -28.8237 -28.8237 0 10376.751 171.905)"><stop offset="0" stop-color="#686868"/><stop offset="1" stop-color="#4b4a4a"/></linearGradient><linearGradient id="dn" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -28.8237 -28.8237 0 10650.142 171.905)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="dm" gradientUnits="userSpaceOnUse" y1="354.009" x2="1" y2="354.009" gradientTransform="matrix(0 -28.8237 -28.8237 0 10720.642 171.905)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="dl" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -28.8237 -28.8237 0 10232.142 171.905)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="dk" gradientUnits="userSpaceOnUse" y1="354.009" x2="1" y2="354.009" gradientTransform="matrix(0 -28.8237 -28.8237 0 10268.47 171.905)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="dj" gradientUnits="userSpaceOnUse" y1="354.01" x2="1" y2="354.01" gradientTransform="matrix(0 -28.8237 -28.8237 0 10754.689 171.905)"><stop offset="0" stop-color="#686868"/><stop offset="1" stop-color="#4b4a4a"/></linearGradient><linearGradient id="di" gradientUnits="userSpaceOnUse" y1="354.009" x2="1" y2="354.009" gradientTransform="matrix(0 -28.8237 -28.8237 0 10614.829 171.905)"><stop offset="0" stop-color="#686868"/><stop offset="1" stop-color="#4b4a4a"/></linearGradient><linearGradient id="dh" gradientUnits="userSpaceOnUse" y1="354.002" x2="1" y2="354.002" gradientTransform="matrix(0 -24.6665 -24.6665 0 9248.77 82.022)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="dg" gradientUnits="userSpaceOnUse" y1="354.002" x2="1" y2="354.002" gradientTransform="matrix(0 -24.6665 -24.6665 0 9213.91 82.022)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="df" gradientUnits="userSpaceOnUse" y1="354.002" x2="1" y2="354.002" gradientTransform="matrix(0 -24.6665 -24.6665 0 9076.176 82.022)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="de" gradientUnits="userSpaceOnUse" y1="354.002" x2="1" y2="354.002" gradientTransform="matrix(0 -24.6665 -24.6665 0 9109.957 82.022)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="dd" gradientUnits="userSpaceOnUse" y1="354.001" x2="1" y2="354.001" gradientTransform="matrix(0 -24.6665 -24.6665 0 9178.082 82.022)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="dc" gradientUnits="userSpaceOnUse" y1="354.001" x2="1" y2="354.001" gradientTransform="matrix(0 -24.6665 -24.6665 0 9042.113 82.022)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="db" gradientUnits="userSpaceOnUse" y1="354.002" x2="1" y2="354.002" gradientTransform="matrix(0 -24.6665 -24.6665 0 8972.77 82.022)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="da" gradientUnits="userSpaceOnUse" y1="354.002" x2="1" y2="354.002" gradientTransform="matrix(0 -24.6665 -24.6665 0 8905.129 82.022)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="cZ" gradientUnits="userSpaceOnUse" y1="354.002" x2="1" y2="354.002" gradientTransform="matrix(0 -24.6665 -24.6665 0 8759.004 82.022)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="cY" gradientUnits="userSpaceOnUse" y1="354.002" x2="1" y2="354.002" gradientTransform="matrix(0 -24.6665 -24.6665 0 8939.02 82.022)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="cX" gradientUnits="userSpaceOnUse" y1="354.002" x2="1" y2="354.002" gradientTransform="matrix(0 -24.6665 -24.6665 0 9282.332 82.022)"><stop offset="0" stop-color="#686868"/><stop offset="1" stop-color="#4b4a4a"/></linearGradient><linearGradient id="cW" gradientUnits="userSpaceOnUse" y1="354.001" x2="1" y2="354.001" gradientTransform="matrix(0 -24.6665 -24.6665 0 9142.848 82.022)"><stop offset="0" stop-color="#686868"/><stop offset="1" stop-color="#4b4a4a"/></linearGradient><linearGradient id="cV" gradientUnits="userSpaceOnUse" y1="354.002" x2="1" y2="354.002" gradientTransform="matrix(0 -24.6665 -24.6665 0 8795.426 82.022)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="cU" gradientUnits="userSpaceOnUse" y1="354.008" x2="1" y2="354.008" gradientTransform="matrix(0 -24.6665 -24.6665 0 8832.613 82.022)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="cT" gradientUnits="userSpaceOnUse" y1="354" x2="1" y2="354" gradientTransform="matrix(0 -24.6665 -24.6665 0 8869.254 82.022)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="cS" gradientUnits="userSpaceOnUse" y1="354.002" x2="1" y2="354.002" gradientTransform="matrix(0 -24.6665 -24.6665 0 9007.145 82.022)"><stop offset="0" stop-color="#4d4d4d"/><stop offset="1" stop-color="#0b090a"/></linearGradient><linearGradient id="cR" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -25.8794 -25.8794 0 9678.838 122.619)"><stop offset="0"/><stop offset=".017"/><stop offset=".407" stop-color="#252526"/><stop offset=".488" stop-color="#323334"/><stop offset=".522" stop-color="#393a3b"/><stop offset=".632" stop-color="#262728"/><stop offset=".989" stop-color="#040404"/><stop offset="1" stop-color="#040404"/></linearGradient><linearGradient id="cQ" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -25.8794 -25.8794 0 9539.197 122.603)"><stop offset="0"/><stop offset=".017"/><stop offset=".407" stop-color="#252526"/><stop offset=".488" stop-color="#323334"/><stop offset=".522" stop-color="#393a3b"/><stop offset=".632" stop-color="#262728"/><stop offset=".989" stop-color="#040404"/><stop offset="1" stop-color="#040404"/></linearGradient><linearGradient id="cP" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -25.8794 -25.8794 0 9188.65 122.619)"><stop offset="0"/><stop offset=".017"/><stop offset=".407" stop-color="#252526"/><stop offset=".488" stop-color="#323334"/><stop offset=".522" stop-color="#393a3b"/><stop offset=".632" stop-color="#262728"/><stop offset=".989" stop-color="#040404"/><stop offset="1" stop-color="#040404"/></linearGradient><linearGradient id="cO" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -25.8794 -25.8794 0 9606.932 122.619)"><stop offset="0"/><stop offset=".017"/><stop offset=".407" stop-color="#252526"/><stop offset=".488" stop-color="#323334"/><stop offset=".522" stop-color="#393a3b"/><stop offset=".632" stop-color="#262728"/><stop offset=".989" stop-color="#040404"/><stop offset="1" stop-color="#040404"/></linearGradient><linearGradient id="cN" gradientUnits="userSpaceOnUse" y1="353.999" x2="1" y2="353.999" gradientTransform="matrix(0 -25.8794 -25.8794 0 9402.478 122.635)"><stop offset="0"/><stop offset=".017"/><stop offset=".407" stop-color="#252526"/><stop offset=".488" stop-color="#323334"/><stop offset=".522" stop-color="#393a3b"/><stop offset=".632" stop-color="#262728"/><stop offset=".989" stop-color="#040404"/><stop offset="1" stop-color="#040404"/></linearGradient><linearGradient id="cM" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -25.8794 -25.8794 0 9505.728 122.603)"><stop offset="0"/><stop offset=".017"/><stop offset=".407" stop-color="#252526"/><stop offset=".488" stop-color="#323334"/><stop offset=".522" stop-color="#393a3b"/><stop offset=".632" stop-color="#262728"/><stop offset=".989" stop-color="#040404"/><stop offset="1" stop-color="#040404"/></linearGradient><linearGradient id="cL" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -25.8794 -25.8794 0 9712.12 122.619)"><stop offset="0" stop-color="#474646"/><stop offset=".017" stop-color="#474646"/><stop offset=".407" stop-color="#575657"/><stop offset=".522" stop-color="#605f60"/><stop offset=".632" stop-color="#575758"/><stop offset=".989" stop-color="#484848"/><stop offset="1" stop-color="#484848"/></linearGradient><linearGradient id="cK" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -25.8794 -25.8794 0 9225.416 122.619)"><stop offset="0"/><stop offset=".017"/><stop offset=".407" stop-color="#252526"/><stop offset=".488" stop-color="#323334"/><stop offset=".522" stop-color="#393a3b"/><stop offset=".632" stop-color="#262728"/><stop offset=".989" stop-color="#040404"/><stop offset="1" stop-color="#040404"/></linearGradient><linearGradient id="cJ" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -25.8794 -25.8794 0 9436.291 122.619)"><stop offset="0"/><stop offset=".017"/><stop offset=".407" stop-color="#252526"/><stop offset=".488" stop-color="#323334"/><stop offset=".522" stop-color="#393a3b"/><stop offset=".632" stop-color="#262728"/><stop offset=".989" stop-color="#040404"/><stop offset="1" stop-color="#040404"/></linearGradient><linearGradient id="cI" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -25.8794 -25.8794 0 9261.838 122.619)"><stop offset="0"/><stop offset=".017"/><stop offset=".407" stop-color="#252526"/><stop offset=".488" stop-color="#323334"/><stop offset=".522" stop-color="#393a3b"/><stop offset=".632" stop-color="#262728"/><stop offset=".989" stop-color="#040404"/><stop offset="1" stop-color="#040404"/></linearGradient><linearGradient id="cH" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -25.8794 -25.8794 0 9642.775 122.619)"><stop offset="0"/><stop offset=".017"/><stop offset=".407" stop-color="#252526"/><stop offset=".488" stop-color="#323334"/><stop offset=".522" stop-color="#393a3b"/><stop offset=".632" stop-color="#262728"/><stop offset=".989" stop-color="#040404"/><stop offset="1" stop-color="#040404"/></linearGradient><linearGradient id="cG" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -25.8794 -25.8794 0 9471.9 122.619)"><stop offset="0"/><stop offset=".017"/><stop offset=".407" stop-color="#252526"/><stop offset=".488" stop-color="#323334"/><stop offset=".522" stop-color="#393a3b"/><stop offset=".632" stop-color="#262728"/><stop offset=".989" stop-color="#040404"/><stop offset="1" stop-color="#040404"/></linearGradient><linearGradient id="cF" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -25.8794 -25.8794 0 9368.228 122.619)"><stop offset="0" stop-color="#474646"/><stop offset=".017" stop-color="#474646"/><stop offset=".407" stop-color="#575657"/><stop offset=".522" stop-color="#605f60"/><stop offset=".632" stop-color="#575758"/><stop offset=".989" stop-color="#484848"/><stop offset="1" stop-color="#484848"/></linearGradient><linearGradient id="cE" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -25.8794 -25.8794 0 9573.01 122.619)"><stop offset="0"/><stop offset=".017"/><stop offset=".407" stop-color="#252526"/><stop offset=".488" stop-color="#323334"/><stop offset=".522" stop-color="#393a3b"/><stop offset=".632" stop-color="#262728"/><stop offset=".989" stop-color="#040404"/><stop offset="1" stop-color="#040404"/></linearGradient><linearGradient id="cD" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -25.8794 -25.8794 0 9333.775 122.619)"><stop offset="0"/><stop offset=".017"/><stop offset=".407" stop-color="#252526"/><stop offset=".488" stop-color="#323334"/><stop offset=".522" stop-color="#393a3b"/><stop offset=".632" stop-color="#262728"/><stop offset=".989" stop-color="#040404"/><stop offset="1" stop-color="#040404"/></linearGradient><linearGradient id="cC" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -25.8794 -25.8794 0 9297.791 122.619)"><stop offset="0"/><stop offset=".017"/><stop offset=".407" stop-color="#252526"/><stop offset=".488" stop-color="#323334"/><stop offset=".522" stop-color="#393a3b"/><stop offset=".632" stop-color="#262728"/><stop offset=".989" stop-color="#040404"/><stop offset="1" stop-color="#040404"/></linearGradient><linearGradient id="cB" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -28.667 -28.667 0 10559.391 337.276)"><stop offset="0" stop-color="#4b4a4b"/><stop offset=".533" stop-color="#131111"/><stop offset="1" stop-color="#131111"/></linearGradient><linearGradient id="cA" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -28.667 -28.667 0 10525.828 337.276)"><stop offset="0" stop-color="#4b4a4b"/><stop offset=".533" stop-color="#131111"/><stop offset="1" stop-color="#131111"/></linearGradient><linearGradient id="cz" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -28.667 -28.667 0 10423.203 337.276)"><stop offset="0" stop-color="#4b4a4b"/><stop offset=".533" stop-color="#131111"/><stop offset="1" stop-color="#131111"/></linearGradient><linearGradient id="cy" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -28.667 -28.667 0 10458.172 337.276)"><stop offset="0" stop-color="#787778"/><stop offset=".533" stop-color="#535252"/><stop offset="1" stop-color="#535252"/></linearGradient><linearGradient id="cx" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -28.667 -28.667 0 10492.141 337.276)"><stop offset="0" stop-color="#787778"/><stop offset=".533" stop-color="#535252"/><stop offset="1" stop-color="#535252"/></linearGradient><linearGradient id="cw" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -28.667 -28.667 0 10354.391 337.245)"><stop offset="0" stop-color="#787778"/><stop offset=".533" stop-color="#535252"/><stop offset="1" stop-color="#535252"/></linearGradient><linearGradient id="cv" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -28.667 -28.667 0 10388.891 337.276)"><stop offset="0" stop-color="#787778"/><stop offset=".533" stop-color="#535252"/><stop offset="1" stop-color="#535252"/></linearGradient><linearGradient id="cu" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -28.667 -28.667 0 10176.141 337.245)"><stop offset="0" stop-color="#787778"/><stop offset=".533" stop-color="#535252"/><stop offset="1" stop-color="#535252"/></linearGradient><linearGradient id="ct" gradientUnits="userSpaceOnUse" y1="353.997" x2="1" y2="353.997" gradientTransform="matrix(0 -28.667 -28.667 0 10212.109 337.245)"><stop offset="0" stop-color="#787778"/><stop offset=".533" stop-color="#535252"/><stop offset="1" stop-color="#535252"/></linearGradient><linearGradient id="cs" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 -28.667 -28.667 0 10321.25 337.276)"><stop offset="0" stop-color="#787778"/><stop offset=".533" stop-color="#535252"/><stop offset="1" stop-color="#535252"/></linearGradient><linearGradient id="cr" gradientUnits="userSpaceOnUse" y1="353.997" x2="1" y2="353.997" gradientTransform="matrix(0 -28.667 -28.667 0 10249.391 337.276)"><stop offset="0" stop-color="#787778"/><stop offset=".533" stop-color="#535252"/><stop offset="1" stop-color="#535252"/></linearGradient><linearGradient id="cq" gradientUnits="userSpaceOnUse" y1="353.996" x2="1" y2="353.996" gradientTransform="matrix(0 -28.667 -28.667 0 10285.359 337.276)"><stop offset="0" stop-color="#787778"/><stop offset=".533" stop-color="#535252"/><stop offset="1" stop-color="#535252"/></linearGradient><linearGradient id="cp" gradientUnits="userSpaceOnUse" y1="354.008" x2=".999" y2="354.008" gradientTransform="matrix(0 -27.9365 -27.9365 0 10234.173 297.782)"><stop offset="0"/><stop offset=".017"/><stop offset=".456" stop-color="#545456"/><stop offset=".489" stop-color="#606163"/><stop offset=".522" stop-color="#717275"/><stop offset=".654" stop-color="#4c4c4d"/><stop offset=".989" stop-color="#0e0c0c"/><stop offset="1" stop-color="#0e0c0c"/></linearGradient><linearGradient id="co" gradientUnits="userSpaceOnUse" x1=".001" y1="354.015" x2="1.001" y2="354.015" gradientTransform="matrix(0 -24.5898 -24.5898 0 9222.492 293.449)"><stop offset="0"/><stop offset=".017"/><stop offset=".456" stop-color="#545456"/><stop offset=".489" stop-color="#606163"/><stop offset=".522" stop-color="#717275"/><stop offset=".654" stop-color="#4c4c4d"/><stop offset=".989" stop-color="#0e0c0c"/><stop offset="1" stop-color="#0e0c0c"/></linearGradient><linearGradient id="cn" gradientUnits="userSpaceOnUse" x1="-.001" y1="354" x2=".999" y2="354" gradientTransform="matrix(0 -30.9502 -30.9502 0 11231.597 298.962)"><stop offset="0"/><stop offset=".017"/><stop offset=".456" stop-color="#545456"/><stop offset=".489" stop-color="#606163"/><stop offset=".522" stop-color="#717275"/><stop offset=".654" stop-color="#4c4c4d"/><stop offset=".989" stop-color="#0e0c0c"/><stop offset="1" stop-color="#0e0c0c"/></linearGradient><linearGradient id="cm" gradientUnits="userSpaceOnUse" x1="-.001" y1="353.99" x2=".999" y2="353.99" gradientTransform="matrix(0 -29.6348 -29.6348 0 10553.986 296.69)"><stop offset="0"/><stop offset=".017"/><stop offset=".456" stop-color="#545456"/><stop offset=".489" stop-color="#606163"/><stop offset=".522" stop-color="#717275"/><stop offset=".654" stop-color="#4c4c4d"/><stop offset=".989" stop-color="#0e0c0c"/><stop offset="1" stop-color="#0e0c0c"/></linearGradient><linearGradient id="cl" gradientUnits="userSpaceOnUse" y1="354.008" x2="1" y2="354.008" gradientTransform="matrix(0 -26.7031 -26.7031 0 9480.878 298.032)"><stop offset="0"/><stop offset=".017"/><stop offset=".456" stop-color="#545456"/><stop offset=".489" stop-color="#606163"/><stop offset=".522" stop-color="#717275"/><stop offset=".654" stop-color="#4c4c4d"/><stop offset=".989" stop-color="#0e0c0c"/><stop offset="1" stop-color="#0e0c0c"/></linearGradient><linearGradient id="ck" gradientUnits="userSpaceOnUse" y1="353.992" x2="1" y2="353.992" gradientTransform="matrix(0 -27.126 -27.126 0 9981.826 295.796)"><stop offset="0"/><stop offset=".017"/><stop offset=".456" stop-color="#545456"/><stop offset=".489" stop-color="#606163"/><stop offset=".522" stop-color="#717275"/><stop offset=".654" stop-color="#4c4c4d"/><stop offset=".989" stop-color="#0e0c0c"/><stop offset="1" stop-color="#0e0c0c"/></linearGradient><linearGradient id="cj" gradientUnits="userSpaceOnUse" y1="353.998" x2=".999" y2="353.998" gradientTransform="matrix(0 -28.8799 -28.8799 0 10706.974 297.2)"><stop offset="0"/><stop offset=".017"/><stop offset=".456" stop-color="#545456"/><stop offset=".489" stop-color="#606163"/><stop offset=".522" stop-color="#717275"/><stop offset=".654" stop-color="#4c4c4d"/><stop offset=".989" stop-color="#0e0c0c"/><stop offset="1" stop-color="#0e0c0c"/></linearGradient><linearGradient id="ci" gradientUnits="userSpaceOnUse" y1="354.003" x2="1" y2="354.003" gradientTransform="matrix(0 -30.4287 -30.4287 0 11219.801 298.817)"><stop offset="0"/><stop offset=".017"/><stop offset=".456" stop-color="#545456"/><stop offset=".489" stop-color="#606163"/><stop offset=".522" stop-color="#717275"/><stop offset=".654" stop-color="#4c4c4d"/><stop offset=".989" stop-color="#0e0c0c"/><stop offset="1" stop-color="#0e0c0c"/></linearGradient><linearGradient id="ch" gradientUnits="userSpaceOnUse" x1=".001" y1="354" x2="1.001" y2="354" gradientTransform="matrix(0 -31.5498 -31.5498 0 11409.372 299.569)"><stop offset="0"/><stop offset=".017"/><stop offset=".456" stop-color="#545456"/><stop offset=".489" stop-color="#606163"/><stop offset=".522" stop-color="#717275"/><stop offset=".654" stop-color="#4c4c4d"/><stop offset=".989" stop-color="#0e0c0c"/><stop offset="1" stop-color="#0e0c0c"/></linearGradient><linearGradient id="cg" gradientUnits="userSpaceOnUse" y1="353.99" x2="1" y2="353.99" gradientTransform="matrix(0 -30.168 -30.168 0 10816.912 297.846)"><stop offset="0"/><stop offset=".017"/><stop offset=".456" stop-color="#545456"/><stop offset=".489" stop-color="#606163"/><stop offset=".522" stop-color="#717275"/><stop offset=".654" stop-color="#4c4c4d"/><stop offset=".989" stop-color="#0e0c0c"/><stop offset="1" stop-color="#0e0c0c"/></linearGradient><linearGradient id="cf" gradientUnits="userSpaceOnUse" y1="354.014" x2="1" y2="354.014" gradientTransform="matrix(0 -24.7734 -24.7734 0 9321.173 293.81)"><stop offset="0"/><stop offset=".017"/><stop offset=".456" stop-color="#545456"/><stop offset=".489" stop-color="#606163"/><stop offset=".522" stop-color="#717275"/><stop offset=".654" stop-color="#4c4c4d"/><stop offset=".989" stop-color="#0e0c0c"/><stop offset="1" stop-color="#0e0c0c"/></linearGradient><linearGradient id="ce" gradientUnits="userSpaceOnUse" y1="354.007" x2=".999" y2="354.007" gradientTransform="matrix(0 -29.0283 -29.0283 0 10449.482 297.377)"><stop offset="0"/><stop offset=".017"/><stop offset=".456" stop-color="#545456"/><stop offset=".489" stop-color="#606163"/><stop offset=".522" stop-color="#717275"/><stop offset=".654" stop-color="#4c4c4d"/><stop offset=".989" stop-color="#0e0c0c"/><stop offset="1" stop-color="#0e0c0c"/></linearGradient><linearGradient id="cd" gradientUnits="userSpaceOnUse" y1="353.99" x2="1" y2="353.99" gradientTransform="matrix(0 -27.043 -27.043 0 9882.772 295.549)"><stop offset="0"/><stop offset=".017"/><stop offset=".456" stop-color="#545456"/><stop offset=".489" stop-color="#606163"/><stop offset=".522" stop-color="#717275"/><stop offset=".654" stop-color="#4c4c4d"/><stop offset=".989" stop-color="#0e0c0c"/><stop offset="1" stop-color="#0e0c0c"/></linearGradient><linearGradient id="cc" gradientUnits="userSpaceOnUse" y1="353.997" x2="1" y2="353.997" gradientTransform="matrix(0 -27.4922 -27.4922 0 10144.057 295.59)"><stop offset="0"/><stop offset=".017"/><stop offset=".456" stop-color="#545456"/><stop offset=".489" stop-color="#606163"/><stop offset=".522" stop-color="#717275"/><stop offset=".654" stop-color="#4c4c4d"/><stop offset=".989" stop-color="#0e0c0c"/><stop offset="1" stop-color="#0e0c0c"/></linearGradient><linearGradient id="cb" gradientUnits="userSpaceOnUse" y1="354.008" x2=".999" y2="354.008" gradientTransform="matrix(0 -27.7197 -27.7197 0 9913.817 296.047)"><stop offset="0"/><stop offset=".017"/><stop offset=".456" stop-color="#545456"/><stop offset=".489" stop-color="#606163"/><stop offset=".522" stop-color="#717275"/><stop offset=".654" stop-color="#4c4c4d"/><stop offset=".989" stop-color="#0e0c0c"/><stop offset="1" stop-color="#0e0c0c"/></linearGradient><linearGradient id="ca" gradientUnits="userSpaceOnUse" y1="354.007" x2="1" y2="354.007" gradientTransform="matrix(0 -24.3867 -24.3867 0 8840.371 293.627)"><stop offset="0"/><stop offset=".017"/><stop offset=".456" stop-color="#545456"/><stop offset=".489" stop-color="#606163"/><stop offset=".522" stop-color="#717275"/><stop offset=".654" stop-color="#4c4c4d"/><stop offset=".989" stop-color="#0e0c0c"/><stop offset="1" stop-color="#0e0c0c"/></linearGradient><linearGradient id="bZ" gradientUnits="userSpaceOnUse" y1="353.998" x2="1" y2="353.998" gradientTransform="matrix(0 29.4881 29.4881 0 -10230.546 227.623)"><stop offset="0" stop-color="#231f20"/><stop offset=".33" stop-color="#231f20"/><stop offset=".348" stop-color="#141213"/><stop offset=".374" stop-color="#090808"/><stop offset=".41" stop-color="#020202"/><stop offset=".511"/><stop offset="1"/></linearGradient><linearGradient id="bY" gradientUnits="userSpaceOnUse" y1="353.99" x2="1" y2="353.99" gradientTransform="matrix(0 29.2974 29.2974 0 -10306.82 227.982)"><stop offset="0" stop-color="#231f20"/><stop offset=".33" stop-color="#231f20"/><stop offset=".348" stop-color="#141213"/><stop offset=".374" stop-color="#090808"/><stop offset=".41" stop-color="#020202"/><stop offset=".511"/><stop offset="1"/></linearGradient><linearGradient id="bX" gradientUnits="userSpaceOnUse" y1="353.994" x2="1" y2="353.994" gradientTransform="matrix(0 29.5051 29.5051 0 -9997.478 227.665)"><stop offset="0" stop-color="#231f20"/><stop offset=".33" stop-color="#231f20"/><stop offset=".348" stop-color="#141213"/><stop offset=".374" stop-color="#090808"/><stop offset=".41" stop-color="#020202"/><stop offset=".511"/><stop offset="1"/></linearGradient><linearGradient id="bW" gradientUnits="userSpaceOnUse" y1="353.996" x2="1" y2="353.996" gradientTransform="matrix(0 29.3592 29.3592 0 -10117.164 227.7)"><stop offset="0" stop-color="#231f20"/><stop offset=".33" stop-color="#231f20"/><stop offset=".348" stop-color="#141213"/><stop offset=".374" stop-color="#090808"/><stop offset=".41" stop-color="#020202"/><stop offset=".511"/><stop offset="1"/></linearGradient><linearGradient id="bV" gradientUnits="userSpaceOnUse" y1="353.992" x2="1" y2="353.992" gradientTransform="matrix(0 29.5067 29.5067 0 -10272.606 227.766)"><stop offset="0" stop-color="#231f20"/><stop offset=".33" stop-color="#231f20"/><stop offset=".348" stop-color="#141213"/><stop offset=".374" stop-color="#090808"/><stop offset=".41" stop-color="#020202"/><stop offset=".511"/><stop offset="1"/></linearGradient><linearGradient id="bU" gradientUnits="userSpaceOnUse" y1="354.013" x2="1" y2="354.013" gradientTransform="matrix(0 29.3444 29.3444 0 -9871.076 227.321)"><stop offset="0" stop-color="#231f20"/><stop offset=".33" stop-color="#231f20"/><stop offset=".348" stop-color="#141213"/><stop offset=".374" stop-color="#090808"/><stop offset=".41" stop-color="#020202"/><stop offset=".511"/><stop offset="1"/></linearGradient><linearGradient id="bT" gradientUnits="userSpaceOnUse" y1="353.996" x2="1" y2="353.996" gradientTransform="matrix(0 29.4637 29.4637 0 -10292.313 227.666)"><stop offset="0" stop-color="#231f20"/><stop offset=".33" stop-color="#231f20"/><stop offset=".348" stop-color="#141213"/><stop offset=".374" stop-color="#090808"/><stop offset=".41" stop-color="#020202"/><stop offset=".511"/><stop offset="1"/></linearGradient><linearGradient id="bS" gradientUnits="userSpaceOnUse" y1="354.012" x2="1" y2="354.012" gradientTransform="matrix(0 29.3817 29.3817 0 -10160.138 227.313)"><stop offset="0" stop-color="#231f20"/><stop offset=".33" stop-color="#231f20"/><stop offset=".348" stop-color="#141213"/><stop offset=".374" stop-color="#090808"/><stop offset=".41" stop-color="#020202"/><stop offset=".511"/><stop offset="1"/></linearGradient><linearGradient id="bR" gradientUnits="userSpaceOnUse" y1="354.011" x2="1" y2="354.011" gradientTransform="matrix(0 29.4437 29.4437 0 -10394.877 227.3)"><stop offset="0" stop-color="#231f20"/><stop offset=".33" stop-color="#231f20"/><stop offset=".348" stop-color="#141213"/><stop offset=".374" stop-color="#090808"/><stop offset=".41" stop-color="#020202"/><stop offset=".511"/><stop offset="1"/></linearGradient><linearGradient id="bQ" gradientUnits="userSpaceOnUse" y1="353.996" x2="1" y2="353.996" gradientTransform="matrix(0 29.4184 29.4184 0 -9862.78 227.65)"><stop offset="0" stop-color="#231f20"/><stop offset=".33" stop-color="#231f20"/><stop offset=".348" stop-color="#141213"/><stop offset=".374" stop-color="#090808"/><stop offset=".41" stop-color="#020202"/><stop offset=".511"/><stop offset="1"/></linearGradient><linearGradient id="bP" gradientUnits="userSpaceOnUse" y1="353.997" x2="1" y2="353.997" gradientTransform="matrix(0 29.4228 29.4228 0 -10004.189 227.648)"><stop offset="0" stop-color="#231f20"/><stop offset=".33" stop-color="#231f20"/><stop offset=".348" stop-color="#141213"/><stop offset=".374" stop-color="#090808"/><stop offset=".41" stop-color="#020202"/><stop offset=".511"/><stop offset="1"/></linearGradient><linearGradient id="bO" gradientUnits="userSpaceOnUse" y1="354.014" x2="1" y2="354.014" gradientTransform="matrix(0 29.3306 29.3306 0 -10039.308 227.233)"><stop offset="0" stop-color="#231f20"/><stop offset=".33" stop-color="#231f20"/><stop offset=".348" stop-color="#141213"/><stop offset=".374" stop-color="#090808"/><stop offset=".41" stop-color="#020202"/><stop offset=".511"/><stop offset="1"/></linearGradient><linearGradient id="bN" gradientUnits="userSpaceOnUse" y1="354.006" x2="1" y2="354.006" gradientTransform="matrix(0 29.4326 29.4326 0 -10109.542 227.388)"><stop offset="0" stop-color="#231f20"/><stop offset=".33" stop-color="#231f20"/><stop offset=".348" stop-color="#141213"/><stop offset=".374" stop-color="#090808"/><stop offset=".41" stop-color="#020202"/><stop offset=".511"/><stop offset="1"/></linearGradient><linearGradient id="bM" gradientUnits="userSpaceOnUse" y1="354.009" x2="1" y2="354.009" gradientTransform="matrix(0 29.5123 29.5123 0 -10346.728 227.216)"><stop offset="0" stop-color="#231f20"/><stop offset=".33" stop-color="#231f20"/><stop offset=".348" stop-color="#141213"/><stop offset=".374" stop-color="#090808"/><stop offset=".41" stop-color="#020202"/><stop offset=".511"/><stop offset="1"/></linearGradient><linearGradient id="bL" gradientUnits="userSpaceOnUse" y1="354.008" x2="1" y2="354.008" gradientTransform="matrix(0 29.4018 29.4018 0 -10031.091 227.383)"><stop offset="0" stop-color="#231f20"/><stop offset=".33" stop-color="#231f20"/><stop offset=".348" stop-color="#141213"/><stop offset=".374" stop-color="#090808"/><stop offset=".41" stop-color="#020202"/><stop offset=".511"/><stop offset="1"/></linearGradient><linearGradient id="bK" gradientUnits="userSpaceOnUse" y1="354.011" x2="1" y2="354.011" gradientTransform="matrix(0 29.0914 29.0914 0 -9815.855 227.482)"><stop offset="0" stop-color="#231f20"/><stop offset=".33" stop-color="#231f20"/><stop offset=".348" stop-color="#141213"/><stop offset=".374" stop-color="#090808"/><stop offset=".41" stop-color="#020202"/><stop offset=".511"/><stop offset="1"/></linearGradient><linearGradient id="bJ" gradientUnits="userSpaceOnUse" y1="354" x2="1" y2="354" gradientTransform="matrix(0 -26 -26 0 9651.21 209.336)"><stop offset="0" stop-color="#7c7b7b"/><stop offset="1" stop-color="#515050"/></linearGradient><linearGradient id="bI" gradientUnits="userSpaceOnUse" y1="354" x2="1" y2="354" gradientTransform="matrix(0 -26 -26 0 9615.602 209.336)"><stop offset="0" stop-color="#7c7b7b"/><stop offset="1" stop-color="#515050"/></linearGradient><linearGradient id="bH" gradientUnits="userSpaceOnUse" y1="354" x2="1" y2="354" gradientTransform="matrix(0 -26 -26 0 9720.273 209.32)"><stop offset="0" stop-color="#7c7b7b"/><stop offset="1" stop-color="#515050"/></linearGradient><linearGradient id="bG" gradientUnits="userSpaceOnUse" y1="354.001" x2="1" y2="354.001" gradientTransform="matrix(0 -26 -26 0 9581.883 209.336)"><stop offset="0" stop-color="#616161"/><stop offset="1" stop-color="#0d0c0c"/></linearGradient><linearGradient id="bF" gradientUnits="userSpaceOnUse" y1="354" x2="1" y2="354" gradientTransform="matrix(0 -26 -26 0 9267.93 209.352)"><stop offset="0" stop-color="#616161"/><stop offset="1" stop-color="#0d0c0c"/></linearGradient><linearGradient id="bE" gradientUnits="userSpaceOnUse" y1="354.001" x2="1" y2="354.001" gradientTransform="matrix(0 -26 -26 0 9377.07 209.336)"><stop offset="0" stop-color="#616161"/><stop offset="1" stop-color="#0d0c0c"/></linearGradient><linearGradient id="bD" gradientUnits="userSpaceOnUse" y1="354.001" x2="1" y2="354.001" gradientTransform="matrix(0 -26 -26 0 9479.523 209.336)"><stop offset="0" stop-color="#616161"/><stop offset="1" stop-color="#0d0c0c"/></linearGradient><linearGradient id="bC" gradientUnits="userSpaceOnUse" y1="354" x2="1" y2="354" gradientTransform="matrix(0 -26 -26 0 9232.195 209.336)"><stop offset="0" stop-color="#616161"/><stop offset="1" stop-color="#0d0c0c"/></linearGradient><linearGradient id="bB" gradientUnits="userSpaceOnUse" y1="354" x2="1" y2="354" gradientTransform="matrix(0 -26 -26 0 9754.664 209.336)"><stop offset="0" stop-color="#616161"/><stop offset="1" stop-color="#0d0c0c"/></linearGradient><linearGradient id="bA" gradientUnits="userSpaceOnUse" y1="353.999" x2="1" y2="353.999" gradientTransform="matrix(0 -26 -26 0 9304.523 209.32)"><stop offset="0" stop-color="#616161"/><stop offset="1" stop-color="#0d0c0c"/></linearGradient><linearGradient id="bz" gradientUnits="userSpaceOnUse" y1="354.001" x2="1" y2="354.001" gradientTransform="matrix(0 -26 -26 0 9444.79 209.336)"><stop offset="0" stop-color="#616161"/><stop offset="1" stop-color="#0d0c0c"/></linearGradient><linearGradient id="by" gradientUnits="userSpaceOnUse" y1="354.001" x2="1" y2="354.001" gradientTransform="matrix(0 -26 -26 0 9340.773 209.336)"><stop offset="0" stop-color="#616161"/><stop offset="1" stop-color="#0d0c0c"/></linearGradient><linearGradient id="bx" gradientUnits="userSpaceOnUse" y1="354" x2="1" y2="354" gradientTransform="matrix(0 -26 -26 0 9685.742 209.336)"><stop offset="0" stop-color="#7c7b7b"/><stop offset="1" stop-color="#515050"/></linearGradient><linearGradient id="bw" gradientUnits="userSpaceOnUse" y1="354" x2="1" y2="354" gradientTransform="matrix(0 -26 -26 0 9513.32 209.336)"><stop offset="0" stop-color="#7c7b7b"/><stop offset="1" stop-color="#515050"/></linearGradient><linearGradient id="bv" gradientUnits="userSpaceOnUse" y1="353.999" x2="1" y2="353.999" gradientTransform="matrix(0 -26 -26 0 9548.352 209.32)"><stop offset="0" stop-color="#7c7b7b"/><stop offset="1" stop-color="#515050"/></linearGradient><linearGradient id="bu" gradientUnits="userSpaceOnUse" y1="354.001" x2="1" y2="354.001" gradientTransform="matrix(0 -26 -26 0 9411.414 209.336)"><stop offset="0" stop-color="#7c7b7b"/><stop offset="1" stop-color="#515050"/></linearGradient></defs><path d="M256 5.479L101.305 34.055c-5.467-3.893-12.21-6.096-19.432-6.096-18.322 0-33.148 14.827-33.148 33.149 0 12.492 6.942 23.487 17.145 29.148v223.088c0 21.002 9.397 43.685 28.006 67.44 16.486 21.017 39.798 42.58 69.345 64.012 21.11 15.26 41.994 27.898 59.82 37.912 4.026 13.809 16.897 23.813 32.006 23.813 14.621 0 27-9.356 31.435-22.48 18.316-10.193 40.176-23.254 62.297-39.245 29.56-21.433 52.859-42.995 69.345-64.012 18.623-23.783 28.005-46.438 28.005-67.44V90.065c10.126-5.685 17.146-16.529 17.146-28.957 0-18.322-15.017-33.15-33.339-33.15-7.126 0-13.661 2.285-19.05 6.097zm-.381 32.958l141.359 26.1c.201 2.075.385 3.96.952 5.906l-82.872 53.914c-14.824-16.08-36.127-26.29-59.63-26.29-23.671 0-45.104 10.378-60.01 26.671l-81.92-53.152c.75-2.297 1.102-4.754 1.333-7.24zm152.408 47.437c2.762 2.426 6.066 4.498 9.526 5.906V308.77c0 2.857-.255 5.915-.762 8.954-3.333 13.26-10.646 27.148-21.909 41.532-14.112 17.99-34.135 36.33-59.44 54.676-20.467 14.797-40.832 26.833-57.153 35.816-5.993-5.895-14.17-9.525-23.242-9.525-8.72 0-16.554 3.456-22.48 8.954-16.147-8.93-36-20.78-56.01-35.245-25.292-18.346-45.136-36.686-59.249-54.676-13.444-17.163-21.311-33.61-23.433-49.152-.01-.434 0-.904 0-1.334V92.161c3.368-1.294 6.41-3.268 9.145-5.525l104.971 67.631c9.03-16.904 26.854-28.386 47.437-28.386 20.753 0 38.565 11.441 47.438 28.577l105.161-68.584zm-230.518 70.68c-2.192 7.338-3.429 15.028-3.429 23.051 0 23.123 9.93 43.661 25.529 58.487l-28.577 57.534c-.128-.002-.252 0-.381 0-13.528 0-24.576 11.048-24.576 24.576s11.048 24.385 24.576 24.385c7.31 0 13.83-3.144 18.289-8.192h42.293V308.771h-35.816l33.72-67.821c2.92-5.867.987-13.768-4.381-17.527-13.895-9.699-23.052-25.485-23.052-43.818 0-2.367.278-4.764.571-7.049l-24.766-16.003zm155.838.19l-24.957 16.193c.266 2.189.571 4.403.571 6.668 0 18.277-9.017 33.912-22.86 43.627-5.369 3.758-7.302 11.66-4.383 17.527l33.53 68.012h-35.816V336.395h43.818c4.509 5.031 10.993 8.192 18.289 8.192a24.309 24.309 0 0 0 24.385-24.386c0-13.527-10.858-24.575-24.385-24.575-.586 0-1.14.15-1.715.19L311.057 237.9c15.527-14.81 25.528-35.227 25.528-58.296 0-7.921-1.111-15.604-3.238-22.861zm-78.3 2.476c-12.329 0-22.29 10.151-22.29 22.48 0 12.33 9.961 22.29 22.29 22.29 12.33 0 22.29-9.96 22.29-22.29 0-12.329-9.96-22.48-22.29-22.48z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/customize.dist/login.js b/customize.dist/login.js
index 74e5e86f6..3309190c0 100644
--- a/customize.dist/login.js
+++ b/customize.dist/login.js
@@ -153,7 +153,7 @@ define([
             register: isRegister,
         };
 
-        var RT, blockKeys, blockHash, Pinpad, rpc, userHash;
+        var RT, blockKeys, blockHash, blockUrl, Pinpad, rpc, userHash;
 
         nThen(function (waitFor) {
             // derive a predefined number of bytes from the user's inputs,
@@ -171,7 +171,7 @@ define([
             // the rest of their data
 
             // determine where a block for your set of keys would be stored
-            var blockUrl = Block.getBlockUrl(res.opt.blockKeys);
+            blockUrl = Block.getBlockUrl(res.opt.blockKeys);
 
             // Check whether there is a block at that location
             Util.fetch(blockUrl, waitFor(function (err, block) {
@@ -412,12 +412,21 @@ define([
             toPublish.edPublic = RT.proxy.edPublic;
 
             var blockRequest = Block.serialize(JSON.stringify(toPublish), res.opt.blockKeys);
-
             rpc.writeLoginBlock(blockRequest, waitFor(function (e) {
                 if (e) {
                     console.error(e);
+                    waitFor.abort();
                     return void cb(e);
                 }
+            }));
+        }).nThen(function (waitFor) {
+            // confirm that the block was actually written before considering registration successful
+            Util.fetch(blockUrl, waitFor(function (err /*, block */) {
+                if (err) {
+                    console.error(err);
+                    waitFor.abort();
+                    return void cb(err);
+                }
 
                 console.log("blockInfo available at:", blockHash);
                 LocalStore.setBlockHash(blockHash);
diff --git a/customize.dist/main.js b/customize.dist/main.js
index 44ef51d0d..5969c6c71 100644
--- a/customize.dist/main.js
+++ b/customize.dist/main.js
@@ -12,7 +12,7 @@ define([
         // Make sure we don't display non-translated content (empty button)
         $main.find('#data').removeClass('hidden');
 
-        if (LocalStore.isLoggedIn()) {
+        if (LocalStore.isLoggedIn() && LocalStore.getDriveRedirectPreference()) {
             if (window.location.pathname === '/') {
                 window.location = '/drive/';
                 return;
diff --git a/customize.dist/messages.js b/customize.dist/messages.js
index 977405db1..7d9af710a 100755
--- a/customize.dist/messages.js
+++ b/customize.dist/messages.js
@@ -9,6 +9,7 @@ var map = {
     'fr': 'Français',
     //'hi': 'हिन्दी',
     'it': 'Italiano',
+    'ja': '日本語',
     'nb': 'Norwegian Bokmål',
     //'pl': 'Polski',
     'pt-br': 'Português do Brasil',
diff --git a/customize.dist/old_logos/CryptPad-white-logo.svg b/customize.dist/old_logos/CryptPad-white-logo.svg
deleted file mode 100644
index 26131b502..000000000
--- a/customize.dist/old_logos/CryptPad-white-logo.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="121.477" width="462.395"><path d="M127.704 81.639c-3.028 0-5.552-.252-7.571-.757-2.02-.505-3.635-1.312-4.846-2.423-1.212-1.11-2.07-2.564-2.575-4.361-.506-1.798-.758-4.01-.758-6.634V54.502c0-2.585.252-4.786.758-6.603.505-1.817 1.363-3.281 2.575-4.392 1.211-1.111 2.826-1.919 4.846-2.424 2.02-.504 4.543-.757 7.57-.757h28.652v7.936H128.13c-1.414 0-2.575.111-3.484.333-.909.222-1.626.596-2.15 1.12-.526.526-.89 1.222-1.091 2.09-.202.869-.304 1.929-.304 3.18v12.117c0 1.291.102 2.361.304 3.21.202.848.565 1.535 1.09 2.059.525.524 1.252.888 2.18 1.09.93.202 2.1.303 3.514.303h28.167v7.875zm34.598 0v-19.02c0-2.464.283-4.564.849-6.3.565-1.737 1.464-3.16 2.696-4.27 1.232-1.11 2.816-1.929 4.754-2.454 1.938-.525 4.3-.787 7.087-.787h5.877v7.33h-5.635c-1.25 0-2.3.1-3.149.302-.848.201-1.525.545-2.03 1.03-.504.484-.868 1.15-1.09 1.999-.221.848-.332 1.918-.332 3.21v18.96zm35.464-15.75c0 1.818.393 3.08 1.18 3.787.788.707 2.111 1.06 3.97 1.06h20.17V48.808h8.785v32.225c0 3.675-.91 6.33-2.726 7.965-1.817 1.636-4.786 2.453-8.906 2.453h-13.143v-7.388h12.356c1.252 0 2.17-.243 2.756-.728.585-.485.878-1.414.878-2.787v-2.665H202.37c-2.463 0-4.553-.232-6.269-.696-1.716-.464-3.11-1.181-4.18-2.15-1.07-.97-1.847-2.181-2.332-3.635-.484-1.453-.726-3.17-.726-5.149V48.808h8.903zm68.398-17.081c3.069 0 5.613.252 7.632.757 2.02.505 3.634 1.312 4.846 2.422 1.211 1.11 2.07 2.575 2.574 4.392.505 1.817.757 4.038.757 6.663v4.422c0 2.625-.252 4.836-.757 6.634-.505 1.797-1.363 3.251-2.574 4.361-1.212 1.11-2.827 1.918-4.846 2.423-2.02.505-4.563.757-7.632.757H247.87v9.812h-9.027V63.042c0-2.625.253-4.846.757-6.663.505-1.817 1.363-3.281 2.576-4.392 1.212-1.11 2.827-1.917 4.846-2.422 2.018-.505 4.563-.757 7.632-.757zm6.784 14.476c0-1.453-.111-2.624-.333-3.512-.223-.889-.637-1.575-1.243-2.06-.605-.485-1.423-.808-2.453-.97-1.03-.161-2.332-.242-3.907-.242h-10.054c-1.414 0-2.585.101-3.515.303-.929.202-1.656.556-2.18 1.06-.526.505-.89 1.191-1.09 2.06-.202.868-.303 1.969-.303 3.302v10.72h17.203c1.575 0 2.867-.07 3.877-.212 1.009-.14 1.817-.453 2.422-.938.606-.484 1.02-1.17 1.243-2.06.222-.888.333-2.08.333-3.574zm17.706 18.355V56.138h-4.603v-7.33h4.603v-9.269h9.208v9.269h10.358v7.33h-10.358v25.501zm33.121-11.813V81.64h-9.207V40.326h33.075c2.948 0 5.41.233 7.39.697 1.978.465 3.573 1.233 4.785 2.303 1.211 1.07 2.07 2.453 2.574 4.149.504 1.696.757 3.755.757 6.178v3.573c0 2.464-.242 4.504-.727 6.12-.484 1.615-1.322 2.907-2.513 3.877-1.191.969-2.776 1.645-4.755 2.029-1.98.383-4.483.574-7.511.574zm30.168-15.809c0-2.22-.475-3.735-1.425-4.543-.95-.808-2.655-1.211-5.117-1.212h-23.626v14.115h23.746c2.423 0 4.099-.374 5.028-1.122.93-.747 1.394-2.21 1.394-4.391zm26.135 27.622c-2.382 0-4.34-.202-5.875-.605-1.534-.404-2.756-.98-3.664-1.727-.91-.747-1.546-1.656-1.91-2.726-.363-1.07-.544-2.271-.544-3.605v-3.089c0-1.372.171-2.594.514-3.664a6.016 6.016 0 0 1 1.788-2.726c.849-.747 2.01-1.312 3.484-1.696 1.474-.384 3.341-.576 5.603-.576h24.29v-.727c0-2.1-.424-3.503-1.272-4.21-.849-.707-2.282-1.06-4.301-1.06h-8.966v-6.42h8.966c2.625 0 4.856.242 6.694.726 1.837.485 3.341 1.222 4.512 2.211 1.17.99 2.029 2.242 2.574 3.756.546 1.514.818 3.32.818 5.42v7.998c0 2.382-.232 4.38-.697 5.996-.464 1.615-1.272 2.927-2.422 3.937-1.15 1.01-2.685 1.727-4.603 2.151-1.919.424-4.332.636-7.24.636zm23.686-14.84h-23.322c-1.05 0-1.877.232-2.483.696-.606.465-.909 1.343-.909 2.635v2.24c0 1.172.323 1.98.97 2.425.646.444 1.555.666 2.726.666h16.96c1.05 0 1.96-.08 2.726-.242.767-.162 1.393-.455 1.878-.88.484-.424.847-1.02 1.09-1.787.243-.767.364-1.756.364-2.968zm31.371 14.84c-3.069 0-5.623-.252-7.662-.757-2.04-.505-3.665-1.312-4.877-2.423-1.211-1.11-2.07-2.564-2.574-4.361-.505-1.798-.757-4.01-.757-6.634v-4.422c0-2.625.252-4.846.757-6.663.505-1.817 1.363-3.281 2.574-4.392 1.212-1.11 2.837-1.917 4.877-2.422 2.04-.505 4.593-.757 7.662-.757h18.233V38.206h9.027v29.258c0 2.625-.253 4.836-.758 6.634-.506 1.797-1.364 3.251-2.575 4.361-1.212 1.11-2.827 1.918-4.847 2.423-2.019.505-4.563.757-7.631.757zm-6.845-14.417c0 1.454.11 2.625.333 3.514.223.889.637 1.575 1.243 2.06.605.484 1.423.807 2.453.968 1.03.161 2.352.242 3.968.242h10.054c1.414 0 2.575-.09 3.483-.273.908-.181 1.625-.525 2.15-1.03.525-.504.889-1.19 1.09-2.059.203-.868.304-1.988.304-3.361V56.56h-17.142c-1.575 0-2.878.08-3.907.242-1.03.162-1.848.485-2.453.97-.606.485-1.02 1.171-1.243 2.059-.222.888-.333 2.059-.333 3.513z" style="line-height:125%;-inkscape-font-specification:'Neuropolitical Rg';text-align:start" font-weight="400" font-size="40" font-family="Neuropolitical Rg" letter-spacing="0" word-spacing="0" fill="#fff"/><path d="M50.245 0L12.746 6.927c-1.325-.943-2.96-1.478-4.71-1.478A8.031 8.031 0 0 0 0 13.485a8.094 8.094 0 0 0 4.156 7.066v54.078c0 5.092 2.278 10.59 6.79 16.349 3.996 5.094 9.647 10.321 16.81 15.517 8.94 6.464 18.062 11.246 22.49 13.438 4.43-2.192 13.548-6.974 22.49-13.438 7.166-5.196 12.814-10.423 16.81-15.517 4.514-5.766 6.789-11.257 6.789-16.349V20.505c2.454-1.379 4.156-4.007 4.156-7.02 0-4.441-3.64-8.036-8.082-8.036a7.959 7.959 0 0 0-4.618 1.478zm-.092 7.99l34.267 6.326c.05.503.093.96.231 1.432l-20.089 13.07c-3.593-3.899-8.757-6.374-14.455-6.374-5.738 0-10.933 2.516-14.547 6.466L15.702 16.025c.182-.557.267-1.152.323-1.755zM87.1 19.488c.67.588 1.47 1.09 2.309 1.431V73.52c0 .693-.062 1.434-.185 2.17-.808 3.215-2.58 6.581-5.31 10.068-3.422 4.361-8.275 8.807-14.41 13.254-7.654 5.533-15.464 9.668-19.257 11.546-3.79-1.878-11.604-6.013-19.258-11.546-6.13-4.447-10.941-8.893-14.362-13.254-3.26-4.16-5.166-8.147-5.68-11.915v-52.83c.816-.314 1.553-.793 2.216-1.34l25.446 16.395a13.008 13.008 0 0 1 11.499-6.881c5.03 0 9.348 2.773 11.5 6.927l25.491-16.625z" fill="#fff"/><g fill="#fff" color="#000" font-weight="400" font-family="Sans"><path style="line-height:normal;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;marker:none" d="M29.564 70.338c-3.28 0-5.958 2.678-5.958 5.957 0 3.28 2.678 5.911 5.958 5.911a5.893 5.893 0 0 0 5.91-5.91c0-3.28-2.631-5.958-5.91-5.958z" overflow="visible"/><path style="line-height:normal;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;marker:none" d="M31.235 36.619c-.531 1.779-.855 3.633-.855 5.578 0 5.605 2.429 10.574 6.21 14.168l-9.445 19.002c-1.003 2.035.743 4.838 3.012 4.834H44.25v-6.694h-8.702l8.181-16.435c.708-1.423.223-3.329-1.078-4.24-3.369-2.35-5.578-6.19-5.578-10.635 0-.574.077-1.12.148-1.673z" overflow="visible"/></g><g fill="#fff" color="#000" font-weight="400" font-family="Sans"><path style="line-height:normal;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;marker:none" d="M70.989 70.338c-3.28 0-5.958 2.678-5.958 5.957 0 3.28 2.678 5.911 5.958 5.911a5.893 5.893 0 0 0 5.91-5.91c0-3.28-2.631-5.958-5.91-5.958z" overflow="visible"/><path style="line-height:normal;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;marker:none" d="M68.98 36.656l-6.025 3.942c.065.53.112 1.05.112 1.599 0 4.43-2.148 8.243-5.504 10.598-1.301.911-1.786 2.817-1.078 4.24l8.106 16.473h-8.664V80.2H70.02c2.268.003 4.014-2.799 3.012-4.834l-9.446-19.04c3.764-3.59 6.173-8.538 6.173-14.13 0-1.92-.265-3.782-.78-5.54z" overflow="visible"/></g><path d="M55.425 42.703a5.411 5.411 0 1 1-10.823 0 5.411 5.411 0 0 1 10.823 0zm2.639 70.724a8.05 8.05 0 1 1-16.1 0 8.05 8.05 0 0 1 16.1 0z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/customize.dist/old_logos/CryptPad_logo_color.svg b/customize.dist/old_logos/CryptPad_logo_color.svg
deleted file mode 100644
index 64fc86682..000000000
--- a/customize.dist/old_logos/CryptPad_logo_color.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 360.4 94.7"><defs><style>.cls-1{fill:#4591c4}.cls-2{fill:#999}</style></defs><title>CryptPad_logo_color</title><g id="Layer_2" data-name="Layer 2"><g id="svg2"><g id="g4845"><path id="path4811" class="cls-1" d="M99.5 63.6a24.8 24.8 0 0 1-5.9-.6 8.5 8.5 0 0 1-3.8-1.9 7.1 7.1 0 0 1-2-3.4 19.4 19.4 0 0 1-.6-5.2v-10a19.4 19.4 0 0 1 .6-5.1 7.1 7.1 0 0 1 2-3.4 8.5 8.5 0 0 1 3.8-2 24.8 24.8 0 0 1 5.9-.6h22.3v6.2h-22a11.8 11.8 0 0 0-2.7.3 3.5 3.5 0 0 0-1.7.9 3.3 3.3 0 0 0-.9 1.6 11.1 11.1 0 0 0-.2 2.5v9.4a11.1 11.1 0 0 0 .2 2.5 3.3 3.3 0 0 0 .9 1.6 3.3 3.3 0 0 0 1.7.8l2.7.2h22v6.1z"/><path id="path4813" class="cls-1" d="M126.5 63.6V48.8a16 16 0 0 1 .7-4.9 7.5 7.5 0 0 1 2.1-3.3 8.9 8.9 0 0 1 3.7-1.9 21.4 21.4 0 0 1 5.5-.6h4.6v5.7h-4.4l-2.5.2a3.3 3.3 0 0 0-1.6.8 3.2 3.2 0 0 0-.8 1.6 10.1 10.1 0 0 0-.3 2.5v14.7z"/><path id="path4815" class="cls-1" d="M154.1 51.4a3.8 3.8 0 0 0 .9 3 4.6 4.6 0 0 0 3.1.8h15.7V38h6.8v25.2q0 4.3-2.1 6.2t-6.9 1.9h-10.2v-5.8h9.6a3.3 3.3 0 0 0 2.1-.6 2.7 2.7 0 0 0 .7-2.2v-2h-16.1a19 19 0 0 1-4.9-.5 7.8 7.8 0 0 1-3.3-1.7 6.5 6.5 0 0 1-1.8-2.8 12.7 12.7 0 0 1-.6-4V38h6.9z"/><path id="path4817" class="cls-1" d="M207.5 38a25.1 25.1 0 0 1 5.9.6 8.5 8.5 0 0 1 3.8 1.9 7.1 7.1 0 0 1 2 3.4 19.7 19.7 0 0 1 .6 5.2v3.4a19.4 19.4 0 0 1-.6 5.2 7.1 7.1 0 0 1-2 3.4 8.5 8.5 0 0 1-3.8 1.9 25.1 25.1 0 0 1-5.9.6h-14.3v7.6h-7V49.1a19.7 19.7 0 0 1 .6-5.2 7.1 7.1 0 0 1 2-3.4 8.6 8.6 0 0 1 3.8-1.9 25.1 25.1 0 0 1 5.9-.6zm5.3 11.3a11.7 11.7 0 0 0-.3-2.7 2.9 2.9 0 0 0-1-1.6 4 4 0 0 0-1.9-.8l-3-.2h-7.8l-2.7.2a3.5 3.5 0 0 0-1.7.8 3.2 3.2 0 0 0-.8 1.6 11.7 11.7 0 0 0-.2 2.6v8.4h13.4l3-.2a3.8 3.8 0 0 0 1.9-.7 2.9 2.9 0 0 0 1-1.6 11.9 11.9 0 0 0 .3-2.8z"/><path id="path4819" class="cls-1" d="M226.5 63.6V43.8H223V38h3.6v-7.2h7.2V38h8.1v5.7h-8.1v19.9z"/><path id="path4821" class="cls-2" d="M252.4 54.4v9.2h-7.2V31.4H271a25.7 25.7 0 0 1 5.8.5 8.4 8.4 0 0 1 3.7 1.8 6.8 6.8 0 0 1 2 3.2 17.1 17.1 0 0 1 .6 4.8v2.8a16.9 16.9 0 0 1-.6 4.8 6 6 0 0 1-2 3 8.3 8.3 0 0 1-3.7 1.6 31.6 31.6 0 0 1-5.9.4zm23.5-12.3q0-2.6-1.1-3.5t-4-.9h-18.4v11h18.5a6.5 6.5 0 0 0 3.9-.9q1.1-.9 1.1-3.4z"/><path id="path4823" class="cls-2" d="M296.2 63.6a18.4 18.4 0 0 1-4.6-.5 7.4 7.4 0 0 1-2.9-1.3 4.6 4.6 0 0 1-1.5-2.1 8.7 8.7 0 0 1-.4-2.8v-2.4a9.3 9.3 0 0 1 .4-2.9 4.7 4.7 0 0 1 1.4-2.1 6.5 6.5 0 0 1 2.7-1.3 17.7 17.7 0 0 1 4.4-.4h18.9v-.6q0-2.5-1-3.3a5.3 5.3 0 0 0-3.4-.8h-7V38h7a20.7 20.7 0 0 1 5.2.6 8.9 8.9 0 0 1 3.5 1.7 6.7 6.7 0 0 1 2 2.9 12.5 12.5 0 0 1 .6 4.2v6.2a17.2 17.2 0 0 1-.5 4.7 6.3 6.3 0 0 1-1.9 3.1 7.9 7.9 0 0 1-3.6 1.7 26.8 26.8 0 0 1-5.6.5zM314.7 52h-18.2a3.1 3.1 0 0 0-1.9.5 2.5 2.5 0 0 0-.7 2.1v1.7a2.1 2.1 0 0 0 .8 1.9 3.7 3.7 0 0 0 2.1.5H310l2.1-.2a3.2 3.2 0 0 0 1.5-.7 3 3 0 0 0 .9-1.4 7.8 7.8 0 0 0 .3-2.3z"/><path id="path4825" class="cls-2" d="M339.1 63.6a25.4 25.4 0 0 1-6-.6 8.6 8.6 0 0 1-3.8-1.9 7.1 7.1 0 0 1-2-3.4 19.4 19.4 0 0 1-.6-5.2v-3.4a19.7 19.7 0 0 1 .6-5.2 7.1 7.1 0 0 1 2-3.4 8.6 8.6 0 0 1 3.8-1.9 25.4 25.4 0 0 1 6-.6h14.2v-8.2h7v22.8a19.4 19.4 0 0 1-.6 5.2 7.1 7.1 0 0 1-2 3.4A8.5 8.5 0 0 1 354 63a25.1 25.1 0 0 1-5.9.6zm-5.3-11.2a11.7 11.7 0 0 0 .3 2.7 2.9 2.9 0 0 0 1 1.6 4 4 0 0 0 1.9.8l3.1.2h7.8l2.7-.2a3.3 3.3 0 0 0 1.7-.8 3.2 3.2 0 0 0 .9-1.6 11.9 11.9 0 0 0 .2-2.6v-8.4H340l-3 .2a4 4 0 0 0-1.9.8 2.9 2.9 0 0 0-1 1.6 11.7 11.7 0 0 0-.3 2.7z"/><path id="path4827" class="cls-1" d="M39.2 0L9.9 5.4A6.3 6.3 0 1 0 3.2 16v42.2c0 4 1.8 8.3 5.3 12.7A65.5 65.5 0 0 0 21.6 83a128.2 128.2 0 0 0 17.6 10.5A128.1 128.1 0 0 0 56.7 83a65.4 65.4 0 0 0 13.1-12.1c3.5-4.5 5.3-8.8 5.3-12.7V16A6.3 6.3 0 0 0 72 4.2a6.2 6.2 0 0 0-3.6 1.2zm-.1 6.2l26.7 4.9a5.9 5.9 0 0 0 .2 1.1L50.3 22.5a15.3 15.3 0 0 0-22.6.1l-15.5-10a6.3 6.3 0 0 0 .3-1.4zm28.8 9a6.5 6.5 0 0 0 1.8 1.1v41a10.4 10.4 0 0 1-.1 1.7 21.5 21.5 0 0 1-4.1 7.8 56.1 56.1 0 0 1-11.3 10.4 110.6 110.6 0 0 1-15 9 110.8 110.8 0 0 1-15-9A55.8 55.8 0 0 1 13 66.8a19.8 19.8 0 0 1-4.4-9.3V16.4a6.3 6.3 0 0 0 1.7-1l19.8 12.7a10.1 10.1 0 0 1 9-5.4 10 10 0 0 1 9 5.4z"/><g id="g4829"><path id="path4831" class="cls-2" d="M23 54.8a4.6 4.6 0 1 0 0 9.3 4.6 4.6 0 0 0 0-9.3z"/><path id="path4833" class="cls-2" d="M24.3 28.5a14.9 14.9 0 0 0 4.2 15.4l-7.3 14.8a2.8 2.8 0 0 0 2.3 3.8h11v-5.2h-6.8l6.4-12.8a2.7 2.7 0 0 0-.8-3.3 9.7 9.7 0 0 1-4.3-9.6z"/></g><g id="g4835"><path id="path4837" class="cls-2" d="M55.3 54.8a4.6 4.6 0 1 0 0 9.3 4.6 4.6 0 0 0 0-9.3z"/><path id="path4839" class="cls-2" d="M53.8 28.6l-4.7 3.1a10.2 10.2 0 0 1 .1 1.2 10 10 0 0 1-4.3 8.3 2.7 2.7 0 0 0-.8 3.3l6.3 12.8h-6.8v5.2h11a2.8 2.8 0 0 0 2.3-3.8l-7.3-14.8a15.2 15.2 0 0 0 4.8-11 15.3 15.3 0 0 0-.6-4.3z"/></g><path id="path4841" class="cls-1" d="M43.2 33.3a4.2 4.2 0 1 1-4.2-4.2 4.2 4.2 0 0 1 4.2 4.2z"/><path id="path4843" class="cls-1" d="M45.3 88.4a6.3 6.3 0 1 1-6.3-6.3 6.3 6.3 0 0 1 6.3 6.3z"/></g></g></g></svg>
\ No newline at end of file
diff --git a/customize.dist/old_logos/CryptPadlogo_op5.svg b/customize.dist/old_logos/CryptPadlogo_op5.svg
deleted file mode 100644
index aa5acb201..000000000
--- a/customize.dist/old_logos/CryptPadlogo_op5.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 393.94 476.2"><defs><style>.cls-1{opacity:0.04;}.cls-2{fill:#999;}.cls-3{fill:#4591c4;}</style></defs><title>CryptPadlogo</title><g id="Layer_2" data-name="Layer 2"><g id="svg2"><g id="g4764" class="cls-1"><path class="cls-2" d="M139.36,288.16l32.07-64.43a13.59,13.59,0,0,0-4.23-16.62,48.65,48.65,0,0,1-21.28-48.25l-23.47-15.31a75.74,75.74,0,0,0-3.36,21.87c0,22,9.52,41.45,24.35,55.54l-27.24,54.8c-.11,0-.2,0-.31,0a23.27,23.27,0,1,0,0,46.53,23,23,0,0,0,17.31-7.86h40.27V288.16Z"/><path class="cls-2" d="M278.28,275.73c-.57,0-1.11.13-1.68.17l-27.33-55.09c14.75-14.07,24.2-33.47,24.2-55.39a77.13,77.13,0,0,0-3.06-21.72l-23.62,15.45a51.69,51.69,0,0,1,.44,6.27A50.21,50.21,0,0,1,225.65,207a13.58,13.58,0,0,0-4.22,16.62l31.77,64.58h-34V314.4h41.63a23.23,23.23,0,1,0,17.41-38.67Z"/><polygon class="cls-2" points="270.41 143.7 270.41 143.7 270.41 143.7 270.41 143.7"/><circle class="cls-3" cx="196.06" cy="167.4" r="21.21"/><path class="cls-3" d="M362.25,21.36a31.14,31.14,0,0,0-18.1,5.8L197,0,50,27.16a31.62,31.62,0,1,0-33.68,53.4v212c0,19.95,8.93,41.51,26.62,64.08,15.66,20,37.82,40.46,65.89,60.83a603,603,0,0,0,57,36.21,31.54,31.54,0,0,0,60,1.25,606,606,0,0,0,59.26-37.46c28.09-20.37,50.23-40.86,65.9-60.83,17.7-22.6,26.61-44.13,26.61-64.08V80.38a31.46,31.46,0,0,0-15.39-59ZM62.82,55.94,196.61,31.32l134.33,24.8a29.58,29.58,0,0,0,.9,5.61L253.09,113a76.78,76.78,0,0,0-113.69.36L61.55,62.82A31.8,31.8,0,0,0,62.82,55.94ZM350.49,288.21a51.41,51.41,0,0,1-.73,8.51c-3.16,12.6-10.11,25.8-20.82,39.47-13.41,17.09-32.43,34.52-56.48,51.95a532.75,532.75,0,0,1-54.19,34.09,31.5,31.5,0,0,0-43.73-.62,534,534,0,0,1-53.06-33.47c-24-17.43-42.9-34.86-56.31-51.95-12.77-16.31-20.25-31.94-22.26-46.71,0-.41,0-.86,0-1.27V82.37a31.51,31.51,0,0,0,8.69-5.25l88.88,57.75.37-.36,10.5,6.88a51,51,0,0,1,45.07-27,50.37,50.37,0,0,1,45.08,27.15l22.09-14.3L341.44,76.4A32.55,32.55,0,0,0,350.49,82Z"/></g></g></g></svg>
\ No newline at end of file
diff --git a/customize.dist/old_logos/cryptofist_mini.png b/customize.dist/old_logos/cryptofist_mini.png
deleted file mode 100644
index 73845e455..000000000
Binary files a/customize.dist/old_logos/cryptofist_mini.png and /dev/null differ
diff --git a/customize.dist/old_logos/cryptofist_small.png b/customize.dist/old_logos/cryptofist_small.png
deleted file mode 100644
index 9c818eb45..000000000
Binary files a/customize.dist/old_logos/cryptofist_small.png and /dev/null differ
diff --git a/customize.dist/old_logos/cryptpad-new-logo-colors-logoonly.png b/customize.dist/old_logos/cryptpad-new-logo-colors-logoonly.png
deleted file mode 100644
index 722438d54..000000000
Binary files a/customize.dist/old_logos/cryptpad-new-logo-colors-logoonly.png and /dev/null differ
diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index e3ae2b83e..18d65c680 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -43,6 +43,17 @@ define([
         return Pages.externalLink(el, Pages.localizeDocsLink(href));
     };
 
+    var accounts = Pages.accounts = {
+        donateURL: AppConfig.donateURL || "https://opencollective.com/cryptpad/",
+        upgradeURL: AppConfig.upgradeURL
+    };
+
+    Pages.areSubscriptionsAllowed = function () {
+        try {
+            return ApiConfig.allowSubscriptions && accounts.upgradeURL && !ApiConfig.restrictRegistration;
+        } catch (err) { return void console.error(err); }
+    };
+
     var languageSelector = function () {
         var options = [];
         var languages = Msg._languages;
@@ -94,7 +105,7 @@ define([
     var imprintUrl = AppConfig.imprint && (typeof(AppConfig.imprint) === "boolean" ?
                         '/imprint.html' : AppConfig.imprint);
 
-    Pages.versionString = "v4.5.0";
+    Pages.versionString = "v4.9.0";
 
 
     // used for the about menu
@@ -133,7 +144,7 @@ define([
                     footerCol('footer_product', [
                         footLink('/what-is-cryptpad.html', 'topbar_whatIsCryptpad'),
                         Pages.docsLink,
-                        footLink('/features.html', 'pricing'),
+                        footLink('/features.html', Pages.areSubscriptionsAllowed()? 'pricing': 'features'), // Messages.pricing, Messages.features
                         Pages.githubLink,
                         footLink('https://opencollective.com/cryptpad/contribute/', 'footer_donate'),
                     ]),
@@ -204,7 +215,7 @@ define([
             h('div.collapse.navbar-collapse.justify-content-end#menuCollapse', [
                 h('a.nav-item.nav-link', { href: '/what-is-cryptpad.html'}, Msg.about),
                 h('a.nav-item.nav-link', { href: 'https://docs.cryptpad.fr'}, Msg.docs_link),
-                h('a.nav-item.nav-link', { href: '/features.html'}, Msg.pricing),
+                h('a.nav-item.nav-link', { href: '/features.html'}, Pages.areSubscriptionsAllowed()? Msg.pricing: Msg.features),
             ].concat(rightLinks))
         );
     };
diff --git a/customize.dist/pages/features.js b/customize.dist/pages/features.js
index ee82d5d67..1dfd2417f 100644
--- a/customize.dist/pages/features.js
+++ b/customize.dist/pages/features.js
@@ -8,10 +8,7 @@ define([
     '/api/config',
     '/common/common-ui-elements.js',
 ], function ($, h, Msg, AppConfig, LocalStore, Pages, Config, UIElements) {
-    var accounts = {
-        donateURL: AppConfig.donateURL || "https://opencollective.com/cryptpad/",
-        upgradeURL: AppConfig.upgradeURL
-    };
+    var accounts = Pages.accounts;
 
     return function () {
         Msg.features_f_apps_note = AppConfig.availablePadTypes.map(function (app) {
@@ -145,10 +142,11 @@ define([
                     ]),
                 ]),
             ]);
-        var availableFeatures =
-            (Config.allowSubscriptions && accounts.upgradeURL && !Config.restrictRegistration) ?
-                [anonymousFeatures, registeredFeatures, premiumFeatures] :
-                [anonymousFeatures, registeredFeatures];
+        var availableFeatures = [
+            anonymousFeatures,
+            registeredFeatures,
+            Pages.areSubscriptionsAllowed() ? premiumFeatures: undefined,
+        ];
 
         return h('div#cp-main', [
             Pages.infopageTopbar(),
diff --git a/customize.dist/pages/index.js b/customize.dist/pages/index.js
index 3257126e9..8ea334667 100644
--- a/customize.dist/pages/index.js
+++ b/customize.dist/pages/index.js
@@ -31,7 +31,7 @@ define([
                 [ 'code', Msg.type.code],
                 [ 'slide', Msg.type.slide],
                 [ 'sheet', Msg.type.sheet],
-                [ 'poll', Msg.type.poll],
+                [ 'form', Msg.type.form],
                 [ 'kanban', Msg.type.kanban],
                 [ 'whiteboard', Msg.type.whiteboard],
                 [ 'drive', Msg.type.drive]
diff --git a/customize.dist/src/less2/include/colortheme-dark.less b/customize.dist/src/less2/include/colortheme-dark.less
index 588d1888e..5c1649850 100644
--- a/customize.dist/src/less2/include/colortheme-dark.less
+++ b/customize.dist/src/less2/include/colortheme-dark.less
@@ -10,6 +10,7 @@
     code: #EAA000;
     slide: #e57614;
     poll: #2c9e98;
+    form: #2c9e98;
     whiteboard: #a72ba7;
     kanban: #8C4;
     sheet: #40865c;
@@ -52,7 +53,7 @@
 @cryptpad_color_light_blue: #00b7d8;
 @cryptpad_color_red: #ff1100;
 @cryptpad_color_red_fade: fade(@cryptpad_color_red, 50%);
-@cryptpad_color_red_fader: fade(@cryptpad_color_red, 25%);
+@cryptpad_color_red_fader: fade(@cryptpad_color_red, 15%);
 @cryptpad_color_warn_red: @cryptpad_color_red_fade;
 @cryptpad_color_dark_red: #9e0000;
 @cryptpad_color_light_red: #FFD4D4;
@@ -63,7 +64,8 @@
 @cryptpad_color_light_green: #c5ffa8;
 @cryptpad_color_light_green_fade: fade(@cryptpad_color_light_green, 20%);
 @cryptpad_color_light_yellow: #FFE69C;
-@cryptpad_color_yellow_fade: fade(#FFE69C, 15%);
+@cryptpad_color_yellow_fade: fade(@cryptpad_color_light_yellow, 50%);
+@cryptpad_color_yellow_fader: fade(#FFE69C, 15%); // not in light theme
 @cryptpad_color_lighter_blue: #d2e1f2;
 
 @cryptpad_color_link:@cryptpad_color_brand_300;
@@ -114,7 +116,7 @@
 @cp_forms-disabled: @cryptpad_color_grey_500;
 
 // Bootstrap alerts
-@cp_alerts-warning-bg: @cryptpad_color_yellow_fade;
+@cp_alerts-warning-bg: @cryptpad_color_yellow_fader;
 @cp_alerts-warning-fg: @cryptpad_color_light_yellow;
 @cp_alerts-warning-text: @cryptpad_color_light_yellow;
 @cp_alerts-danger-bg: @cryptpad_color_red_fader;
@@ -426,3 +428,13 @@
 @cp_calendar-now: @cryptpad_color_brand_300;
 @cp_calendar-now-fg: @cryptpad_color_grey_800;
 
+// Forms
+@cp_form-bg1: @cryptpad_color_grey_800;
+@cp_form-bg2: @cryptpad_color_grey_900;
+@cp_form-border: @cryptpad_color_grey_800;
+@cp_form-poll-color: @cryptpad_color_grey_800;
+@cp_form-poll-no: fade(@cryptpad_color_red, 25%);
+@cp_form-poll-yes: fade(@cryptpad_color_green, 25%);
+@cp_form-poll-maybe: @cryptpad_color_grey_700;
+@cp_form-poll-yes-color: @cryptpad_color_green;
+@cp_form-invalid: @cryptpad_color_light_red;
diff --git a/customize.dist/src/less2/include/colortheme.less b/customize.dist/src/less2/include/colortheme.less
index 3ab249f9f..18dcb1c0a 100644
--- a/customize.dist/src/less2/include/colortheme.less
+++ b/customize.dist/src/less2/include/colortheme.less
@@ -10,6 +10,7 @@
     code: #EAA000;
     slide: #e57614;
     poll: #2c9e98;
+    form: #2c9e98;
     whiteboard: #a72ba7;
     kanban: #8C4;
     sheet: #40865c;
@@ -52,7 +53,7 @@
 @cryptpad_color_light_blue: #00b7d8;
 @cryptpad_color_red: #ff1100;
 @cryptpad_color_red_fade: fade(@cryptpad_color_red, 50%);
-@cryptpad_color_red_fader: fade(@cryptpad_color_red, 25%);
+@cryptpad_color_red_fader: fade(@cryptpad_color_red, 15%);
 @cryptpad_color_warn_red: @cryptpad_color_red_fade;
 @cryptpad_color_dark_red: #9e0000;
 @cryptpad_color_light_red: #FFD4D4;
@@ -425,3 +426,14 @@
 @cp_calendar-border: @cryptpad_color_grey_300;
 @cp_calendar-now: @cryptpad_color_brand;
 @cp_calendar-now-fg: @cryptpad_color_grey_200;
+
+// Forms
+@cp_form-bg1: @cryptpad_color_grey_200;
+@cp_form-bg2: @cryptpad_color_grey_100;
+@cp_form-border: @cryptpad_color_grey_200;
+@cp_form-poll-color: @cryptpad_color_grey_800;
+@cp_form-poll-no: fade(@cryptpad_color_light_red, 75%);
+@cp_form-poll-yes: fade(@cryptpad_color_light_green, 75%);
+@cp_form-poll-maybe: @cryptpad_color_grey_300;
+@cp_form-poll-yes-color: @cryptpad_color_green;
+@cp_form-invalid: @cryptpad_color_red;
diff --git a/customize.dist/src/less2/include/forms.less b/customize.dist/src/less2/include/forms.less
index ffe061fa3..4fb799e13 100644
--- a/customize.dist/src/less2/include/forms.less
+++ b/customize.dist/src/less2/include/forms.less
@@ -71,6 +71,12 @@
 
     div.cp-button-confirm {
         display: inline-block;
+        &.new {
+            vertical-align: top;
+            button {
+                height: 35px;
+            }
+        }
         button {
             margin: 0 !important;
         }
@@ -85,7 +91,7 @@
             }
         }
     }
-    button.cp-button-confirm-placeholder {
+    button.cp-button-confirm-placeholder:not(.new) {
         margin-bottom: 3px !important;
     }
 
diff --git a/customize.dist/src/less2/include/markdown.less b/customize.dist/src/less2/include/markdown.less
index 717b49990..43732187a 100644
--- a/customize.dist/src/less2/include/markdown.less
+++ b/customize.dist/src/less2/include/markdown.less
@@ -154,6 +154,38 @@
         color: @cp_markdown-block-fg;
         text-align: left;
     }
+
+    div.cp-inline-img-warning {
+        display: inline-block;
+        padding: 10px;
+        color: @cryptpad_text_col;
+        background-color: @cryptpad_color_red_fader;
+        border: 1px solid @cryptpad_color_red;
+        .cp-inline-img {
+            display: flex;
+            margin-bottom: 10px;
+        }
+        .cp-alt-txt {
+            margin-left: 10px;
+            font-family: monospace;
+            font-size: 0.8em;
+            color: fade(@cryptpad_text_col, 90%);
+        }
+        a {
+            color: @cryptpad_text_col;
+            font-size: 0.8em;
+            &.cp-remote-img::before { // .fa.fa-question-circle
+                font-family: FontAwesome;
+                //content: "\f08e\00a0";
+                content: "\f08e\00a0\00a0";
+            }
+            &.cp-learn-more::before { // .fa.fa-external-link
+                font-family: FontAwesome;
+                content: "\f059\00a0";
+                //content: "\f059\00a0\00a0";
+            }
+        }
+    }
 }
 
 .markdown_cryptpad() {
@@ -194,7 +226,7 @@
     pre > code {
         display: block;
         position: relative;
-        width: 90%;
+        width: 100%;
         margin: auto;
         padding: 5px;
         overflow-x: auto;
diff --git a/customize.dist/src/less2/include/modals-ui-elements.less b/customize.dist/src/less2/include/modals-ui-elements.less
index 92fef68d0..7ec19a699 100644
--- a/customize.dist/src/less2/include/modals-ui-elements.less
+++ b/customize.dist/src/less2/include/modals-ui-elements.less
@@ -221,6 +221,9 @@
                     button {
                         line-height: 1.5;
                     }
+                    img {
+                        align-self: center;
+                    }
                     & > iframe {
                         width: 100%;
                         height: 100%;
diff --git a/customize.dist/src/less2/pages/page-report.less b/customize.dist/src/less2/pages/page-report.less
index bd2cd6c60..220240237 100644
--- a/customize.dist/src/less2/pages/page-report.less
+++ b/customize.dist/src/less2/pages/page-report.less
@@ -12,6 +12,18 @@ html, body {
     background-color: @cp_static-bg !important;
     color: @cryptpad_text_col;
     font-family: "IBM Plex Mono";
+
+    #cp-report, #cp-report-ui {
+        max-width: 900px;
+        margin: auto;
+        padding: 15px;
+    }
+    #cp-report {
+        border: 1px solid @cryptpad_text_col;
+    }
+    #cp-report-ui {
+        text-align: right;
+    }
 }
 
 
diff --git a/docs/example.nginx.conf b/docs/example.nginx.conf
index 78e4f30ce..8bc47d9f8 100644
--- a/docs/example.nginx.conf
+++ b/docs/example.nginx.conf
@@ -64,7 +64,7 @@ server {
     add_header Permissions-Policy interest-cohort=();
 
     set $coop '';
-    if ($uri ~ ^\/(sheet|presentation|doc)\/.*$) { set $coop 'same-origin'; }
+    if ($uri ~ ^\/(sheet|presentation|doc|convert)\/.*$) { set $coop 'same-origin'; }
 
     # Enable SharedArrayBuffer in Firefox (for .xlsx export)
     add_header Cross-Origin-Resource-Policy cross-origin;
@@ -167,6 +167,13 @@ server {
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header Host $host;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
+        # These settings prevent both NGINX and the API server
+        # from setting the same headers and creating duplicates
+        proxy_hide_header Cross-Origin-Resource-Policy;
+        add_header Cross-Origin-Resource-Policy cross-origin;
+        proxy_hide_header Cross-Origin-Embedder-Policy;
+        add_header Cross-Origin-Embedder-Policy require-corp;
     }
 
     # encrypted blobs are immutable and are thus cached for a year
@@ -207,7 +214,7 @@ server {
     # The nodejs server has some built-in forwarding rules to prevent
     # URLs like /pad from resulting in a 404. This simply adds a trailing slash
     # to a variety of applications.
-    location ~ ^/(register|login|settings|user|pad|drive|poll|slide|code|whiteboard|file|media|profile|contacts|todo|filepicker|debug|kanban|sheet|support|admin|notifications|teams|calendar|presentation|doc)$ {
+    location ~ ^/(register|login|settings|user|pad|drive|poll|slide|code|whiteboard|file|media|profile|contacts|todo|filepicker|debug|kanban|sheet|support|admin|notifications|teams|calendar|presentation|doc|form|report|convert)$ {
         rewrite ^(.*)$ $1/ redirect;
     }
 
diff --git a/lib/api.js b/lib/api.js
index 7152f75b9..277d085fa 100644
--- a/lib/api.js
+++ b/lib/api.js
@@ -10,6 +10,7 @@ module.exports.create = function (Env) {
 
 nThen(function (w) {
     Decrees.load(Env, w(function (err) {
+        Env.flushCache();
         if (err) {
             log.error('DECREES_LOADING', {
                 error: err.code || err,
diff --git a/lib/commands/admin-rpc.js b/lib/commands/admin-rpc.js
index 9ab86bdf2..59750571e 100644
--- a/lib/commands/admin-rpc.js
+++ b/lib/commands/admin-rpc.js
@@ -317,6 +317,16 @@ var instanceStatus = function (Env, Server, cb) {
 
         maxUploadSize: Env.maxUploadSize,
         premiumUploadSize: Env.premiumUploadSize,
+
+        consentToContact: Env.consentToContact,
+        listMyInstance: Env.listMyInstance,
+        provideAggregateStatistics: Env.provideAggregateStatistics,
+
+        removeDonateButton: Env.removeDonateButton,
+        blockDailyCheck: Env.blockDailyCheck,
+
+        updateAvailable: Env.updateAvailable,
+        instancePurpose: Env.instancePurpose,
     });
 };
 
diff --git a/lib/commands/block.js b/lib/commands/block.js
index 8180cb68e..4af32af70 100644
--- a/lib/commands/block.js
+++ b/lib/commands/block.js
@@ -1,14 +1,10 @@
 /*jshint esversion: 6 */
 /* globals Buffer*/
-var Block = module.exports;
-
-const Fs = require("fs");
-const Fse = require("fs-extra");
-const Path = require("path");
+const Block = module.exports;
 const Nacl = require("tweetnacl/nacl-fast");
 const nThen = require("nthen");
-
 const Util = require("../common-util");
+const BlockStore = require("../storage/block");
 
 /*
     We assume that the server is secured against MitM attacks
@@ -31,7 +27,9 @@ const Util = require("../common-util");
     author of the block, since we assume that the block will have been
     encrypted with xsalsa20-poly1305 which is authenticated.
 */
-var validateLoginBlock = function (Env, publicKey, signature, block, cb) { // FIXME BLOCKS
+Block.validateLoginBlock = function (Env, publicKey, signature, block, _cb) {
+    var cb = Util.once(Util.mkAsync(_cb));
+
     // convert the public key to a Uint8Array and validate it
     if (typeof(publicKey) !== 'string') { return void cb('E_INVALID_KEY'); }
 
@@ -69,21 +67,7 @@ var validateLoginBlock = function (Env, publicKey, signature, block, cb) { // FI
     // call back with (err) if unsuccessful
     if (!verified) { return void cb("E_COULD_NOT_VERIFY"); }
 
-    return void cb(null, u8_block);
-};
-
-var createLoginBlockPath = function (Env, publicKey) { // FIXME BLOCKS
-    // prepare publicKey to be used as a file name
-    var safeKey = Util.escapeKeyCharacters(publicKey);
-
-    // validate safeKey
-    if (typeof(safeKey) !== 'string') {
-        return;
-    }
-
-    // derive the full path
-    // /home/cryptpad/cryptpad/block/fg/fg32kefksjdgjkewrjksdfksjdfsdfskdjfsfd
-    return Path.join(Env.paths.block, safeKey.slice(0, 2), safeKey);
+    return void cb(null, block);
 };
 
 Block.validateAncestorProof = function (Env, proof, _cb) {
@@ -103,31 +87,26 @@ Block.validateAncestorProof = function (Env, proof, _cb) {
                 return void cb('E_INVALID_ANCESTOR_PROOF');
             }
             // else fall through to next step
-        }).nThen(function (w) {
-            var path = createLoginBlockPath(Env, pub);
-            Fs.access(path, Fs.constants.F_OK, w(function (err) {
-                if (!err) { return; }
-                w.abort(); // else
-                return void cb("E_MISSING_ANCESTOR");
-            }));
         }).nThen(function () {
-            cb(void 0, pub);
+            BlockStore.check(Env, pub, function (err) {
+                if (err) { return void cb('E_MISSING_ANCESTOR'); }
+                cb(void 0, pub);
+            });
         });
     } catch (err) {
         return void cb(err);
     }
 };
 
-Block.writeLoginBlock = function (Env, safeKey, msg, _cb) { // FIXME BLOCKS
+Block.writeLoginBlock = function (Env, safeKey, msg, _cb) {
     var cb = Util.once(Util.mkAsync(_cb));
-    //console.log(msg);
     var publicKey = msg[0];
     var signature = msg[1];
     var block = msg[2];
     var registrationProof = msg[3];
     var previousKey;
 
-    var validatedBlock, parsed, path;
+    var validatedBlock, path;
     nThen(function (w) {
         if (Util.escapeKeyCharacters(publicKey) !== safeKey) {
             w.abort();
@@ -156,44 +135,26 @@ Block.writeLoginBlock = function (Env, safeKey, msg, _cb) { // FIXME BLOCKS
             previousKey = provenKey;
         }));
     }).nThen(function (w) {
-        validateLoginBlock(Env, publicKey, signature, block, w(function (e, _validatedBlock) {
+        Env.validateLoginBlock(publicKey, signature, block, w(function (e, _validatedBlock) {
             if (e) {
                 w.abort();
                 return void cb(e);
             }
-            if (!(_validatedBlock instanceof Uint8Array)) {
+            if (typeof(_validatedBlock) !== 'string') {
                 w.abort();
-                return void cb('E_INVALID_BLOCK');
+                return void cb('E_INVALID_BLOCK_RETURNED');
             }
 
             validatedBlock = _validatedBlock;
-
-            // derive the filepath
-            path = createLoginBlockPath(Env, publicKey);
-
-            // make sure the path is valid
-            if (typeof(path) !== 'string') {
-                return void cb('E_INVALID_BLOCK_PATH');
-            }
-
-            parsed = Path.parse(path);
-            if (!parsed || typeof(parsed.dir) !== 'string') {
-                w.abort();
-                return void cb("E_INVALID_BLOCK_PATH_2");
-            }
-        }));
-    }).nThen(function (w) {
-        // make sure the path to the file exists
-        Fse.mkdirp(parsed.dir, w(function (e) {
-            if (e) {
-                w.abort();
-                cb(e);
-            }
         }));
     }).nThen(function () {
-        // actually write the block
-        Fs.writeFile(path, Buffer.from(validatedBlock), { encoding: "binary", }, function (err) {
-            if (err) { return void cb(err); }
+        var buffer;
+        try {
+            buffer = Buffer.from(Nacl.util.decodeBase64(validatedBlock));
+        } catch (err) {
+            return void cb('E_BLOCK_DESERIALIZATION');
+        }
+        BlockStore.write(Env, publicKey, buffer, function (err) {
             Env.Log.info('BLOCK_WRITE_BY_OWNER', {
                 safeKey: safeKey,
                 blockId: publicKey,
@@ -201,11 +162,13 @@ Block.writeLoginBlock = function (Env, safeKey, msg, _cb) { // FIXME BLOCKS
                 previousKey: previousKey,
                 path: path,
             });
-            cb();
+            cb(err);
         });
     });
 };
 
+const DELETE_BLOCK = Nacl.util.encodeBase64(Nacl.util.decodeUTF8('DELETE_BLOCK'));
+
 /*
     When users write a block, they upload the block, and provide
     a signature proving that they deserve to be able to write to
@@ -216,10 +179,11 @@ Block.writeLoginBlock = function (Env, safeKey, msg, _cb) { // FIXME BLOCKS
     information, we can just sign some constant and use that as proof.
 
 */
-Block.removeLoginBlock = function (Env, safeKey, msg, cb) { // FIXME BLOCKS
+Block.removeLoginBlock = function (Env, safeKey, msg, _cb) {
+    var cb = Util.once(Util.mkAsync(_cb));
+
     var publicKey = msg[0];
     var signature = msg[1];
-    var block = Nacl.util.decodeUTF8('DELETE_BLOCK'); // clients and the server will have to agree on this constant
 
     nThen(function (w) {
         if (Util.escapeKeyCharacters(publicKey) !== safeKey) {
@@ -227,26 +191,14 @@ Block.removeLoginBlock = function (Env, safeKey, msg, cb) { // FIXME BLOCKS
             return void cb("INCORRECT_KEY");
         }
     }).nThen(function () {
-        validateLoginBlock(Env, publicKey, signature, block, function (e /*::, validatedBlock */) {
+        Env.validateLoginBlock(publicKey, signature, DELETE_BLOCK, function (e) {
             if (e) { return void cb(e); }
-            // derive the filepath
-            var path = createLoginBlockPath(Env, publicKey);
-
-            // make sure the path is valid
-            if (typeof(path) !== 'string') {
-                return void cb('E_INVALID_BLOCK_PATH');
-            }
-
-            // FIXME COLDSTORAGE
-            Fs.unlink(path, function (err) {
-                Env.Log.info('DELETION_BLOCK_BY_OWNER_RPC', {
+            BlockStore.archive(Env, publicKey, function (err) {
+                Env.Log.info('ARCHIVAL_BLOCK_BY_OWNER_RPC', {
                     publicKey: publicKey,
-                    path: path,
                     status: err? String(err): 'SUCCESS',
                 });
-
-                if (err) { return void cb(err); }
-                cb();
+                cb(err);
             });
         });
     });
diff --git a/lib/commands/pin-rpc.js b/lib/commands/pin-rpc.js
index 93d922620..89afc4ee8 100644
--- a/lib/commands/pin-rpc.js
+++ b/lib/commands/pin-rpc.js
@@ -8,7 +8,7 @@ const nThen = require("nthen");
 //const escapeKeyCharacters = Util.escapeKeyCharacters;
 const unescapeKeyCharacters = Util.unescapeKeyCharacters;
 
-var sumChannelSizes = function (sizes) {
+var sumChannelSizes = function (sizes) { // FIXME this synchronous code could be done by a worker
     return Object.keys(sizes).map(function (id) { return sizes[id]; })
         .filter(function (x) {
             // only allow positive numbers
@@ -115,8 +115,8 @@ Pinning.getTotalSize = function (Env, safeKey, cb) {
 */
 Pinning.removePins = function (Env, safeKey, cb) {
     // FIXME respect the queue
-    Env.pinStore.removeChannel(safeKey, function (err) {
-        Env.Log.info('DELETION_PIN_BY_OWNER_RPC', {
+    Env.pinStore.archiveChannel(safeKey, function (err) {
+        Env.Log.info('ARCHIVAL_PIN_BY_OWNER_RPC', {
             safeKey: safeKey,
             status: err? String(err): 'SUCCESS',
         });
@@ -145,7 +145,7 @@ var getFreeSpace = Pinning.getFreeSpace = function (Env, safeKey, cb) {
     });
 };
 
-var getHash = Pinning.getHash = function (Env, safeKey, cb) {
+Pinning.getHash = function (Env, safeKey, cb) {
     getChannelList(Env, safeKey, function (channels) {
         Env.hashChannelList(channels, cb);
     });
@@ -166,12 +166,12 @@ Pinning.pinChannel = function (Env, safeKey, channels, cb) {
         });
 
         if (toStore.length === 0) {
-            return void getHash(Env, safeKey, cb);
+            return void cb();
         }
 
         getMultipleFileSize(Env, toStore, function (e, sizes) {
             if (typeof(sizes) === 'undefined') { return void cb(e); }
-            var pinSize = sumChannelSizes(sizes);
+            var pinSize = sumChannelSizes(sizes); // FIXME don't do this in the main thread...
 
             getFreeSpace(Env, safeKey, function (e, free) {
                 if (typeof(free) === 'undefined') {
@@ -186,7 +186,7 @@ Pinning.pinChannel = function (Env, safeKey, channels, cb) {
                     toStore.forEach(function (channel) {
                         session.channels[channel] = true;
                     });
-                    getHash(Env, safeKey, cb);
+                    cb();
                 });
             });
         });
@@ -208,7 +208,7 @@ Pinning.unpinChannel = function (Env, safeKey, channels, cb) {
         });
 
         if (toStore.length === 0) {
-            return void getHash(Env, safeKey, cb);
+            return void cb();
         }
 
         Env.pinStore.message(safeKey, JSON.stringify(['UNPIN', toStore, +new Date()]),
@@ -217,20 +217,19 @@ Pinning.unpinChannel = function (Env, safeKey, channels, cb) {
             toStore.forEach(function (channel) {
                 delete session.channels[channel];
             });
-            getHash(Env, safeKey, cb);
+            cb();
         });
     });
 };
 
-Pinning.resetUserPins = function (Env, safeKey, channelList, cb) {
+Pinning.resetUserPins = function (Env, safeKey, channelList, _cb) {
+    var cb = Util.once(Util.mkAsync(_cb));
     if (!Array.isArray(channelList)) { return void cb('INVALID_PIN_LIST'); }
     var session = Core.getSession(Env.Sessions, safeKey);
 
+
     if (!channelList.length) {
-        return void getHash(Env, safeKey, function (e, hash) {
-            if (e) { return cb(e); }
-            cb(void 0, hash);
-        });
+        return void cb();
     }
 
     var pins = {};
@@ -270,9 +269,7 @@ Pinning.resetUserPins = function (Env, safeKey, channelList, cb) {
 
                 // update in-memory cache IFF the reset was allowed.
                 session.channels = pins;
-                getHash(Env, safeKey, function (e, hash) {
-                    cb(e, hash);
-                });
+                cb();
             });
         });
     });
diff --git a/lib/commands/quota.js b/lib/commands/quota.js
index b779d8e56..1bf9203f6 100644
--- a/lib/commands/quota.js
+++ b/lib/commands/quota.js
@@ -4,9 +4,9 @@ const Quota = module.exports;
 
 //const Util = require("../common-util");
 const Keys = require("../keys");
-const Package = require('../../package.json');
 const Https = require("https");
 const Util = require("../common-util");
+const Stats = require("../stats");
 
 var validLimitFields = ['limit', 'plan', 'note', 'users', 'origin'];
 
@@ -51,24 +51,66 @@ Quota.applyCustomLimits = function (Env) {
     // console.log(Env.limits);
 };
 
+var isRemoteVersionNewer = function (local, remote) {
+    try {
+        local = local.split('.').map(Number);
+        remote = remote.split('.').map(Number);
+        for (var i = 0; i < 3; i++) {
+            if (remote[i] < local[i]) { return false; }
+            if (remote[i] > local[i]) { return true; }
+        }
+    } catch (err) {
+        // if anything goes wrong just fall through and return false
+        // false negatives are better than false positives
+    }
+    return false;
+};
+
 /*
-Env = {
-    myDomain,
-    mySubdomain,
-    adminEmail,
-    Package.version,
+var Assert = require("assert");
+[
+// remote versions
+    ['4.5.0', '4.5.0', false], // equal semver should not prompt
+    ['4.5.0', '4.5.1', true], // patch versions should prompt
+    ['4.5.0', '4.6.0', true], // minor versions should prompt
+    ['4.5.0', '5.0.0', true], // major versions should prompt
+// local
+    ['5.3.1', '4.9.0', false], // newer major should not prompt
+    ['4.7.0', '4.6.0', false], // newer minor should not prompt
+    ['4.7.0', '4.6.1', false], // newer patch should not prompt if other values are greater
+].forEach(function (x) {
+    var result = isRemoteVersionNewer(x[0], x[1]);
+    Assert.equal(result, x[2]);
+});
+*/
 
+// check if the remote endpoint reported an available server version
+// which is newer than your current version (Env.version)
+// if so, set Env.updateAvailable to the URL of its release notes
+var checkUpdateAvailability = function (Env, json) {
+    if (!(json && typeof(json.updateAvailable) === 'string' && typeof(json.version) === 'string')) { return; }
+    // expects {updateAvailable: 'https://github.com/xwiki-labs/cryptpad/releases/4.7.0', version: '4.7.0'}
+    // the version string is provided explicitly even though it could be parsed from GitHub's URL
+    // this will allow old instances to understand responses of arbitrary URLs
+    // as long as we keep using semver for 'version'
+    if (!isRemoteVersionNewer(Env.version, json.version)) {
+        Env.updateAvailable = undefined;
+        return;
+    }
+    Env.updateAvailable = json.updateAvailable;
+    Env.Log.info('AN_UPDATE_IS_AVAILABLE', {
+        version: json.version,
+        updateAvailable: json.updateAvaiable,
+    });
 };
-*/
+
 var queryAccountServer = function (Env, cb) {
     var done = Util.once(Util.mkAsync(cb));
 
-    var body = JSON.stringify({
-        domain: Env.myDomain,
-        subdomain: Env.mySubdomain || null,
-        adminEmail: Env.adminEmail,
-        version: Package.version
-    });
+    var rawBody = Stats.instanceData(Env);
+    Env.Log.info("SERVER_TELEMETRY", rawBody);
+    var body = JSON.stringify(rawBody);
+
     var options = {
         host: 'accounts.cryptpad.fr',
         path: '/api/getauthorized',
@@ -92,6 +134,7 @@ var queryAccountServer = function (Env, cb) {
         response.on('end', function () {
             try {
                 var json = JSON.parse(str);
+                checkUpdateAvailability(Env, json);
                 // don't overwrite the limits with junk data
                 if (json && json.message === 'EINVAL') { return void cb(); }
                 done(void 0, json);
diff --git a/lib/decrees.js b/lib/decrees.js
index eed840057..5f599705e 100644
--- a/lib/decrees.js
+++ b/lib/decrees.js
@@ -34,6 +34,13 @@ SET_MAINTENANCE
 SET_ADMIN_EMAIL
 SET_SUPPORT_MAILBOX
 
+// COMMUNITY PARTICIPATION AND GOVERNANCE
+CONSENT_TO_CONTACT
+LIST_MY_INSTANCE
+PROVIDE_AGGREGATE_STATISTICS
+REMOVE_DONATE_BUTTON
+BLOCK_DAILY_CHECK
+
 NOT IMPLEMENTED:
 
 // RESTRICTED REGISTRATION
@@ -89,6 +96,21 @@ commands.DISABLE_INTEGRATED_EVICTION = makeBooleanSetter('disableIntegratedEvict
 // CryptPad_AsyncStore.rpc.send('ADMIN', [ 'ADMIN_DECREE', ['DISABLE_INTEGRATED_TASKS', [true]]], console.log)
 commands.DISABLE_INTEGRATED_TASKS = makeBooleanSetter('disableIntegratedTasks');
 
+// CryptPad_AsyncStore.rpc.send('ADMIN', [ 'ADMIN_DECREE', ['CONSENT_TO_CONTACT', [true]]], console.log)
+commands.CONSENT_TO_CONTACT = makeBooleanSetter('consentToContact');
+
+// CryptPad_AsyncStore.rpc.send('ADMIN', [ 'ADMIN_DECREE', ['LIST_MY_INSTANCE', [true]]], console.log)
+commands.LIST_MY_INSTANCE = makeBooleanSetter('listMyInstance');
+
+// CryptPad_AsyncStore.rpc.send('ADMIN', [ 'ADMIN_DECREE', ['PROVIDE_AGGREGATE_STATISTICS', [true]]], console.log)
+commands.PROVIDE_AGGREGATE_STATISTICS = makeBooleanSetter('provideAggregateStatistics');
+
+// CryptPad_AsyncStore.rpc.send('ADMIN', [ 'ADMIN_DECREE', ['REMOVE_DONATE_BUTTON', [true]]], console.log)
+commands.REMOVE_DONATE_BUTTON = makeBooleanSetter('removeDonateButton');
+
+// CryptPad_AsyncStore.rpc.send('ADMIN', [ 'ADMIN_DECREE', ['BLOCK_DAILY_CHECK', [true]]], console.log)
+commands.BLOCK_DAILY_CHECK = makeBooleanSetter('blockDailyCheck');
+
 /*
 var isNonNegativeNumber = function (n) {
     return !(typeof(n) !== 'number' || isNaN(n) || n < 0);
@@ -151,6 +173,9 @@ commands.SET_SUPPORT_MAILBOX = makeGenericSetter('supportMailbox', function (arg
     return args_isString(args) && Core.isValidPublicKey(args[0]);
 });
 
+// CryptPad_AsyncStore.rpc.send('ADMIN', [ 'ADMIN_DECREE', ['SET_INSTANCE_PURPOSE', ["development"]]], console.log)
+commands.SET_INSTANCE_PURPOSE = makeGenericSetter('instancePurpose', args_isString);
+
 // Maintenance: Empty string or an object with a start and end time
 var isNumber = function (value) {
     return typeof(value) === "number" && !isNaN(value);
diff --git a/lib/env.js b/lib/env.js
index 389f059f6..4db282d77 100644
--- a/lib/env.js
+++ b/lib/env.js
@@ -10,10 +10,22 @@ const Core = require("./commands/core");
 
 const Quota = require("./commands/quota");
 const Util = require("./common-util");
+const Package = require("../package.json");
 
-module.exports.create = function (config) {
+var canonicalizeOrigin = function (s) {
+    if (typeof(s) === 'undefined') { return; }
+    return (s || '').trim().replace(/\/+$/, '');
+};
 
+module.exports.create = function (config) {
     const Env = {
+        version: Package.version,
+        installMethod: config.installMethod || undefined,
+
+        httpUnsafeOrigin: canonicalizeOrigin(config.httpUnsafeOrigin),
+        httpSafeOrigin: canonicalizeOrigin(config.httpSafeOrigin),
+        removeDonateButton: config.removeDonateButton,
+
         OFFLINE_MODE: false,
         FRESH_KEY: '',
         FRESH_MODE: true,
@@ -97,6 +109,11 @@ module.exports.create = function (config) {
         allowSubscriptions: config.allowSubscriptions === true,
         blockDailyCheck: config.blockDailyCheck === true,
 
+        consentToContact: false,
+        listMyInstance: false,
+        provideAggregateStatistics: false,
+        updateAvailable: undefined,
+
         myDomain: config.myDomain,
         mySubdomain: config.mySubdomain, // only exists for the accounts integration
         customLimits: {},
@@ -106,7 +123,7 @@ module.exports.create = function (config) {
 
         maxWorkers: config.maxWorkers,
         disableIntegratedTasks: config.disableIntegratedTasks || false,
-        disableIntegratedEviction: config.disableIntegratedEviction || false,
+        disableIntegratedEviction: typeof(config.disableIntegratedEviction) === 'undefined'? true: config.disableIntegratedEviction, // XXX 4.10.0 false,
         lastEviction: +new Date(),
         evictionReport: {},
         commandTimers: {},
diff --git a/lib/historyKeeper.js b/lib/historyKeeper.js
index daa041b5f..44afe0ae0 100644
--- a/lib/historyKeeper.js
+++ b/lib/historyKeeper.js
@@ -123,6 +123,8 @@ module.exports.create = function (Env, cb) {
         Store.create({
             filePath: pinPath,
             archivePath: Env.paths.archive,
+            // indicate that archives should be put in a 'pins' archvie folder
+            volumeId: 'pins',
         }, w(function (err, s) {
             if (err) { throw err; }
             Env.pinStore = s;
diff --git a/lib/hk-util.js b/lib/hk-util.js
index 7c244c174..276ac3e6f 100644
--- a/lib/hk-util.js
+++ b/lib/hk-util.js
@@ -701,6 +701,7 @@ const handleGetHistory = function (Env, Server, seq, userId, parsed) {
             }
 
             if (msgCount === 0 && !metadata_cache[channelName] && Server.channelContainsUser(channelName, userId)) {
+                // TODO this might be a good place to reject channel creation by anonymous users
                 handleFirstMessage(Env, channelName, metadata);
                 Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify(metadata)]);
             }
@@ -962,7 +963,11 @@ HK.onChannelMessage = function (Env, Server, channel, msgStruct, cb) {
                 // validation can fail in multiple ways
                 if (err === 'FAILED') {
                     // we log this case, but not others for some reason
-                    Log.info("HK_SIGNED_MESSAGE_REJECTED", 'Channel '+channel.id);
+                    Log.info("HK_SIGNED_MESSAGE_REJECTED", {
+                        channel: channel.id,
+                        validateKey: metadata.validayKey,
+                        message: signedMsg,
+                    });
                 }
                 // always abort if there was an error...
                 cb('FAILED_VALIDATION');
diff --git a/lib/stats.js b/lib/stats.js
new file mode 100644
index 000000000..1dbbb2ad9
--- /dev/null
+++ b/lib/stats.js
@@ -0,0 +1,68 @@
+/*jshint esversion: 6 */
+const Stats = module.exports;
+
+Stats.instanceData = function (Env) {
+    var data = {
+        version: Env.version,
+        installMethod: Env.installMethod,
+
+        domain: Env.myDomain,
+        subdomain: Env.mySubdomain,
+
+        httpUnsafeOrigin: Env.httpUnsafeOrigin,
+        httpSafeOrigin: Env.httpSafeOrigin,
+
+        adminEmail: Env.consentToContact? Env.adminEmail: undefined,
+        consentToContact: Boolean(Env.consentToContact),
+
+        instancePurpose: Env.instancePurpose === 'noanswer'? undefined: Env.instancePurpose,
+    };
+
+/*  We reserve the right to choose not to include instances
+    in our public directory at our discretion.
+
+    The following details will be included in your telemetry
+    as factors that may contribute to that decision.
+
+    These values are publicly available via /api/config
+    posting them to our server just makes it easier for us.
+*/
+    if (Env.listMyInstance) {
+        // clearly indicate that you want to be listed
+        data.listMyInstance = Env.listMyInstance;
+
+        // you should have enabled your admin panel
+        data.adminKeys = Env.admins.length > 0;
+
+        // we expect that you enable your support mailbox
+        data.supportMailbox = Boolean(Env.supportMailbox);
+
+        // do you allow registration?
+        data.restrictRegistration = Boolean(Env.restrictRegistration);
+
+        // have you removed the donate button?
+        data.removeDonateButton = Boolean(Env.removeDonateButton);
+
+        // after how long do you consider a document to be inactive?
+        data.inactiveTime = Env.inactiveTime;
+
+        // how much storage do you offer to registered users?
+        data.defaultStorageLimit = Env.defaultStorageLimit;
+
+        // what size file upload do you permit
+        data.maxUploadSize = Env.maxUploadSize;
+
+        // how long do you retain inactive accounts?
+        data.accountRetentionTime = Env.accountRetentionTime;
+
+        // how long do you retain archived data?
+        //data.archiveRetentionTime = Env.archiveRetentionTime,
+    }
+
+    // we won't consider instances for public listings
+    // unless they opt to provide more info about themselves
+    if (!Env.provideAggregateStatistics) { return data; }
+
+    return data;
+};
+
diff --git a/lib/storage/block.js b/lib/storage/block.js
new file mode 100644
index 000000000..1078f6d2e
--- /dev/null
+++ b/lib/storage/block.js
@@ -0,0 +1,88 @@
+/*jshint esversion: 6 */
+const Block = module.exports;
+const Util = require("../common-util");
+const Path = require("path");
+const Fs = require("fs");
+const Fse = require("fs-extra");
+const nThen = require("nthen");
+
+Block.mkPath = function (Env, publicKey) {
+    // prepare publicKey to be used as a file name
+    var safeKey = Util.escapeKeyCharacters(publicKey);
+
+    // validate safeKey
+    if (typeof(safeKey) !== 'string') { return; }
+
+    // derive the full path
+    // /home/cryptpad/cryptpad/block/fg/fg32kefksjdgjkewrjksdfksjdfsdfskdjfsfd
+    return Path.join(Env.paths.block, safeKey.slice(0, 2), safeKey);
+};
+
+Block.mkArchivePath = function (Env, publicKey) {
+    // prepare publicKey to be used as a file name
+    var safeKey = Util.escapeKeyCharacters(publicKey);
+
+    // validate safeKey
+    if (typeof(safeKey) !== 'string') {
+        return;
+    }
+
+    // derive the full path
+    // /home/cryptpad/cryptpad/block/fg/fg32kefksjdgjkewrjksdfksjdfsdfskdjfsfd
+    return Path.join(Env.paths.archive, 'block', safeKey.slice(0, 2), safeKey);
+};
+
+Block.archive = function (Env, publicKey, _cb) {
+    var cb = Util.once(Util.mkAsync(_cb));
+
+    // derive the filepath
+    var currentPath = Block.mkPath(Env, publicKey);
+
+    // make sure the path is valid
+    if (typeof(currentPath) !== 'string') {
+        return void cb('E_INVALID_BLOCK_PATH');
+    }
+
+    var archivePath = Block.mkArchivePath(Env, publicKey);
+    // make sure the path is valid
+    if (typeof(archivePath) !== 'string') {
+        return void cb('E_INVALID_BLOCK_ARCHIVAL_PATH');
+    }
+
+    Fse.move(currentPath, archivePath, {
+        overwrite: true,
+    }, cb);
+};
+
+Block.check = function (Env, publicKey, _cb) { // 'check' because 'exists' implies boolean
+    var cb = Util.once(Util.mkAsync(_cb));
+    var path = Block.mkPath(Env, publicKey);
+    Fs.access(path, Fs.constants.F_OK, cb);
+};
+
+Block.write = function (Env, publicKey, buffer, _cb) {
+    var cb = Util.once(Util.mkAsync(_cb));
+    var path = Block.mkPath(Env, publicKey);
+    if (typeof(path) !== 'string') { return void cb('INVALID_PATH'); }
+    var parsed = Path.parse(path);
+
+    nThen(function (w) {
+        Fse.mkdirp(parsed.dir, w(function (err) {
+            if (!err) { return; }
+            w.abort();
+            cb(err);
+        }));
+    }).nThen(function (w) {
+        Block.archive(Env, publicKey, w(function (/* err */) {
+    /*
+        we proceed even if there are errors.
+        it might be ENOENT (there is no file to archive)
+        or EACCES (bad filesystem permissions for the existing archived block?)
+        or lots of other things, none of which justify preventing the write
+    */
+        }));
+    }).nThen(function () {
+        Fs.writeFile(path, buffer, { encoding: 'binary' }, cb);
+    });
+};
+
diff --git a/lib/storage/file.js b/lib/storage/file.js
index 825f14066..30e6c7644 100644
--- a/lib/storage/file.js
+++ b/lib/storage/file.js
@@ -51,7 +51,7 @@ var mkPath = function (env, channelId) {
 };
 
 var mkArchivePath = function (env, channelId) {
-    return Path.join(env.archiveRoot, 'datastore', channelId.slice(0, 2), channelId) + '.ndjson';
+    return Path.join(env.archiveRoot, env.volumeId, channelId.slice(0, 2), channelId) + '.ndjson';
 };
 
 var mkMetadataPath = function (env, channelId) {
@@ -59,7 +59,7 @@ var mkMetadataPath = function (env, channelId) {
 };
 
 var mkArchiveMetadataPath = function (env, channelId) {
-    return Path.join(env.archiveRoot, 'datastore', channelId.slice(0, 2), channelId) + '.metadata.ndjson';
+    return Path.join(env.archiveRoot, env.volumeId, channelId.slice(0, 2), channelId) + '.metadata.ndjson';
 };
 
 var mkTempPath = function (env, channelId) {
@@ -1044,6 +1044,9 @@ module.exports.create = function (conf, _cb) {
     var env = {
         root: conf.filePath || './datastore',
         archiveRoot: conf.archivePath || './data/archive',
+        // supply a volumeId if you want a store to archive channels to and from
+        // to its own subpath within the archive directory
+        volumeId: conf.volumeId || 'datastore',
         channels: { },
         batchGetChannel: BatchRead('store_batch_channel'),
     };
@@ -1076,7 +1079,7 @@ module.exports.create = function (conf, _cb) {
             }
         }));
         // make sure the cold storage directory exists
-        Fse.mkdirp(env.archiveRoot, PERMISSIVE, w(function (err) {
+        Fse.mkdirp(Path.join(env.archiveRoot, env.volumeId), PERMISSIVE, w(function (err) {
             if (err && err.code !== 'EEXIST') {
                 w.abort();
                 return void cb(err);
diff --git a/lib/workers/db-worker.js b/lib/workers/db-worker.js
index 8585cc3f6..2371240ec 100644
--- a/lib/workers/db-worker.js
+++ b/lib/workers/db-worker.js
@@ -66,6 +66,9 @@ const init = function (config, _cb) {
         Store.create({
             filePath: config.pinPath,
             archivePath: config.archivePath,
+            // important to initialize the pinstore with its own volume id
+            // otherwise archived pin logs will get mixed in with channels
+            volumeId: 'pins',
         }, w(function (err, _pinStore) {
             if (err) {
                 w.abort();
@@ -694,6 +697,10 @@ COMMANDS.VALIDATE_ANCESTOR_PROOF = function (data, cb) {
     Block.validateAncestorProof(Env, data && data.proof, cb);
 };
 
+COMMANDS.VALIDATE_LOGIN_BLOCK = function (data, cb) {
+    Block.validateLoginBlock(Env, data.publicKey, data.signature, data.block, cb);
+};
+
 process.on('message', function (data) {
     if (!data || !data.txid || !data.pid) {
         return void process.send({
diff --git a/lib/workers/index.js b/lib/workers/index.js
index 85c66eeb5..c2bfb5740 100644
--- a/lib/workers/index.js
+++ b/lib/workers/index.js
@@ -451,6 +451,15 @@ Workers.initialize = function (Env, config, _cb) {
             }, cb);
         };
 
+        Env.validateLoginBlock = function (publicKey, signature, block, cb) {
+            sendCommand({
+                command: 'VALIDATE_LOGIN_BLOCK',
+                publicKey: publicKey,
+                signature: signature,
+                block: block,
+            }, cb);
+        };
+
         cb(void 0);
     });
 };
diff --git a/package-lock.json b/package-lock.json
index 75b03cfe1..42136e238 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "cryptpad",
-  "version": "4.5.0",
+  "version": "4.9.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -36,15 +36,15 @@
       }
     },
     "@types/minimatch": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
-      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA==",
       "dev": true
     },
     "@types/node": {
-      "version": "14.14.16",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.16.tgz",
-      "integrity": "sha512-naXYePhweTi+BMv11TgioE2/FXU4fSl29HAH1ffxVciNsH3rYXjNP2yM8wqmSm7jS20gM8TIklKiTen+1iVncw==",
+      "version": "15.12.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.12.2.tgz",
+      "integrity": "sha512-zjQ69G564OCIWIOHSXyQEEDpdpGl+G348RAKY0XXy9Z5kU9Vzv1GMNnkar/ZJ8dzXB3COzD9Mo9NtRZ4xfgUww==",
       "dev": true
     },
     "accepts": {
@@ -57,9 +57,9 @@
       }
     },
     "ajv": {
-      "version": "6.12.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz",
-      "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==",
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
       "optional": true,
       "requires": {
@@ -187,16 +187,16 @@
       "optional": true
     },
     "aws4": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz",
-      "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
+      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
       "dev": true,
       "optional": true
     },
     "balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "dev": true
     },
     "base": {
@@ -389,9 +389,9 @@
       "optional": true
     },
     "chainpad-crypto": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/chainpad-crypto/-/chainpad-crypto-0.2.5.tgz",
-      "integrity": "sha512-K9vRsAspuX+uU1goXPz0CawpLIaOHq+1JP3WfDLqaz67LbCX/MLIUt9aMcSeIJcwZ9uMpqnbMGRktyVPoz6MCA==",
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/chainpad-crypto/-/chainpad-crypto-0.2.6.tgz",
+      "integrity": "sha512-yk7bBj22rs9PaX6LiqQxiw+Vj/afBStsNP1xP/B4Uh9a8iyJ7JrSZJ2Hj3d6fyqxJlBrMAX82Aj5PCZb5dzzHw==",
       "requires": {
         "tweetnacl": "git+https://github.com/dchest/tweetnacl-js.git#v0.12.2"
       },
@@ -688,15 +688,15 @@
       },
       "dependencies": {
         "domelementtype": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz",
-          "integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==",
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
+          "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
           "dev": true
         },
         "entities": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz",
-          "integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==",
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+          "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
           "dev": true
         }
       }
@@ -754,9 +754,9 @@
       "dev": true
     },
     "errno": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
-      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
+      "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
       "dev": true,
       "optional": true,
       "requires": {
@@ -973,9 +973,9 @@
       "optional": true
     },
     "fast-deep-equal": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
-      "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
       "dev": true,
       "optional": true
     },
@@ -1069,9 +1069,9 @@
       }
     },
     "forwarded": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ="
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="
     },
     "fragment-cache": {
       "version": "0.2.1",
@@ -1134,9 +1134,9 @@
       }
     },
     "glob": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "version": "7.1.7",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
       "dev": true,
       "requires": {
         "fs.realpath": "^1.0.0",
@@ -1191,9 +1191,9 @@
       }
     },
     "graceful-fs": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
-      "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="
+      "version": "4.2.6",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
+      "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ=="
     },
     "har-schema": {
       "version": "2.0.0",
@@ -1203,13 +1203,13 @@
       "optional": true
     },
     "har-validator": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
+      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
       "dev": true,
       "optional": true,
       "requires": {
-        "ajv": "^6.5.5",
+        "ajv": "^6.12.3",
         "har-schema": "^2.0.0"
       }
     },
@@ -1346,9 +1346,9 @@
       "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
     "ipaddr.js": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz",
-      "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA=="
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="
     },
     "is-accessor-descriptor": {
       "version": "0.1.6",
@@ -1527,16 +1527,16 @@
       "optional": true
     },
     "jshint": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.11.0.tgz",
-      "integrity": "sha512-ooaD/hrBPhu35xXW4gn+o3SOuzht73gdBuffgJzrZBJZPGgGiiTvJEgTyxFvBO2nz0+X1G6etF8SzUODTlLY6Q==",
+      "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.13.0.tgz",
+      "integrity": "sha512-Nd+md9wIeyfDK+RGrbOBzwLONSTdihGMtyGYU/t7zYcN2EgUa4iuY3VK2oxtPYrW5ycTj18iC+UbhNTxe4C66g==",
       "dev": true,
       "requires": {
         "cli": "~1.0.0",
         "console-browserify": "1.1.x",
         "exit": "0.1.x",
         "htmlparser2": "3.8.x",
-        "lodash": "~4.17.11",
+        "lodash": "~4.17.21",
         "minimatch": "~3.0.2",
         "shelljs": "0.3.x",
         "strip-json-comments": "1.0.x"
@@ -1591,9 +1591,9 @@
       }
     },
     "jszip": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.2.2.tgz",
-      "integrity": "sha512-NmKajvAFQpbg3taXQXr/ccS2wcucR1AZ+NtyWp2Nq7HHVsXhcJFR8p0Baf32C2yVvBylFWVeKf+WI2AnvlPhpA==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.6.0.tgz",
+      "integrity": "sha512-jgnQoG9LKnWO3mnVNBnfhkh0QknICd1FGSrXcgrl67zioyJ4wgx25o9ZqwNtrROSflGBCGYnJfjrIyRIby1OoQ==",
       "dev": true,
       "requires": {
         "lie": "~3.3.0",
@@ -1654,15 +1654,6 @@
         "promise": "^7.1.1",
         "request": "^2.83.0",
         "source-map": "~0.6.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true,
-          "optional": true
-        }
       }
     },
     "lesshint": {
@@ -1791,16 +1782,16 @@
       "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="
     },
     "mime-db": {
-      "version": "1.43.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz",
-      "integrity": "sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ=="
+      "version": "1.48.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz",
+      "integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ=="
     },
     "mime-types": {
-      "version": "2.1.26",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz",
-      "integrity": "sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==",
+      "version": "2.1.31",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz",
+      "integrity": "sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==",
       "requires": {
-        "mime-db": "1.43.0"
+        "mime-db": "1.48.0"
       }
     },
     "minimatch": {
@@ -1841,9 +1832,9 @@
       }
     },
     "mkdirp": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz",
-      "integrity": "sha512-P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg==",
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
       "dev": true,
       "optional": true,
       "requires": {
@@ -1880,9 +1871,9 @@
       "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="
     },
     "netflux-websocket": {
-      "version": "0.1.20",
-      "resolved": "https://registry.npmjs.org/netflux-websocket/-/netflux-websocket-0.1.20.tgz",
-      "integrity": "sha512-svFkw4ol4gmkcXKnx5kF/8tR9mmtTCDzUlLy4mSlcNl/4iWlbDmgwp/+aJ3nqtv8fg12m+DAFGX2+fbC0//dcg=="
+      "version": "0.1.21",
+      "resolved": "https://registry.npmjs.org/netflux-websocket/-/netflux-websocket-0.1.21.tgz",
+      "integrity": "sha512-Zjl5lefg8urC0a0T7YCPGiUgRsISZBsTZl1STylmQz8Bq4ohcZ8cP3r6VoCpeVcvJ1Y/e3ZCXPxndWlNP9Jfug=="
     },
     "nthen": {
       "version": "0.1.8",
@@ -2049,22 +2040,14 @@
       "dev": true
     },
     "postcss": {
-      "version": "7.0.35",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-      "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
+      "version": "7.0.36",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz",
+      "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==",
       "dev": true,
       "requires": {
         "chalk": "^2.4.2",
         "source-map": "^0.6.1",
         "supports-color": "^6.1.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
       }
     },
     "postcss-less": {
@@ -2115,12 +2098,12 @@
       }
     },
     "proxy-addr": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz",
-      "integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
       "requires": {
-        "forwarded": "~0.1.2",
-        "ipaddr.js": "1.9.0"
+        "forwarded": "0.2.0",
+        "ipaddr.js": "1.9.1"
       }
     },
     "prr": {
@@ -2131,9 +2114,9 @@
       "optional": true
     },
     "psl": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz",
-      "integrity": "sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
+      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
       "dev": true,
       "optional": true
     },
@@ -2193,9 +2176,9 @@
       }
     },
     "repeat-element": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
-      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
+      "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
       "dev": true
     },
     "repeat-string": {
@@ -2412,6 +2395,12 @@
           "requires": {
             "is-extendable": "^0.1.0"
           }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
         }
       }
     },
@@ -2495,9 +2484,9 @@
       }
     },
     "source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true
     },
     "source-map-resolve": {
@@ -2514,9 +2503,9 @@
       }
     },
     "source-map-url": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
-      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
+      "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
       "dev": true
     },
     "split-string": {
@@ -2793,9 +2782,9 @@
       }
     },
     "uri-js": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
       "dev": true,
       "optional": true,
       "requires": {
diff --git a/package.json b/package.json
index 3314ffd17..68a315891 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "cryptpad",
   "description": "realtime collaborative visual editor with zero knowlege server",
-  "version": "4.5.0",
+  "version": "4.9.0",
   "license": "AGPL-3.0+",
   "repository": {
     "type": "git",
diff --git a/readme.md b/readme.md
index 2213b9e27..f4b979bf3 100644
--- a/readme.md
+++ b/readme.md
@@ -1,20 +1,18 @@
-[![An XWiki Labs Project](https://raw.githubusercontent.com/xwiki-labs/xwiki-labs-logo/master/projects/xwikilabs/xlabs-project.png "XWiki labs")](https://labs.xwiki.com/xwiki/bin/view/Main/WebHome)
+# CryptPad
+
+CryptPad is a collaboration suite that is end-to-end-encrypted and open-source. It is built to enable collaboration, synchronizing changes to documents in real time. Because all data is encrypted, the service and its administrators have no way of seeing the content being edited and stored.
 
 ![CryptPad screenshot](screenshot.png "Private real-time collaboration on a Rich Text document.")
 
-CryptPad is the **Zero Knowledge** realtime collaborative editor.
+# Installation
 
-Encryption carried out in your web browser protects the data from the server, the cloud
-and the NSA. It relies on the [ChainPad] realtime engine.
+## For development
 
-<!--If you'd like to know more, please read [the Whitepaper]().-->
+Our [developer guide](https://docs.cryptpad.fr/en/dev_guide/setup.html) provides instructions for setting up a local instance without HTTPS or our more advanced security features.
 
-# Installation
+## For production
 
-Installing CryptPad is pretty straightforward. You can read all about it in the
-[installation guide](https://github.com/xwiki-labs/cryptpad/wiki/Installation-guide).
-
-It also contains information on keeping your instance of CryptPad up to date.
+Configuring CryptPad for production requires a little more work, but the process is described in our [admin installation guide](https://docs.cryptpad.fr/en/admin_guide/installation.html). From there you can find more information about customization and maintenance.
 
 ## Current version
 
@@ -24,33 +22,40 @@ The most recent version and all past release notes can be found [here](https://g
 
 See [Cryptpad-Docker](https://github.com/xwiki-labs/cryptpad-docker) repository for details on how to get up-and-running with Cryptpad in Docker. This repository is maintained by the community and not officially supported.
 
-
 # Security
 
-CryptPad is *private*, not *anonymous*. Privacy protects your data, anonymity protects you.
-As such, it is possible for a collaborator on the pad to include some silly/ugly/nasty things
-in a CryptPad such as an image which reveals your IP address when your browser automatically
-loads it or a script which plays Rick Astleys's greatest hits. It is possible for anyone
-who does not have the key to be able to change anything in the pad or add anything, even the
-server, however the clients will notice this because the content hashes in CryptPad will fail to
-validate.
-
-The server does have a certain power, it can send you evil javascript which does the wrong
-thing (leaks the key or the data back to the server or to someone else). This is however an
-[active attack] which makes it detectable. The NSA really hates doing these because they might
-get caught and laughed at and humiliated in front of the whole world (again). If you're making
-the NSA mad enough for them to use an active attack against you, Great Success Highfive, now take
-the battery out of your computer before it spawns Agent Smith.
-
-Still there are other low-lives in the world so using CryptPad over HTTPS is probably a good idea.
+CryptPad offers a variety of collaborative tools that encrypt your data in your browser
+before it is sent to the server and your collaborators. In the event that the server is
+compromized the database holds encrypted data that is not of much value to attackers.
+
+The code which performs the encryption is still loaded from the host server like any
+other web page, so you still need to trust the administrator to keep their server secure
+and to send you the right code. An expert can download code from the server and check
+that it isn't doing anything malicious like leaking your encryption keys, which is why
+this is considered an [active attack].
+
+The platform is designed to minimize what data is exposed to its operators. User registration
+and account access is based on a cryptographic key that is derived from your username
+and password so the server never needs to see either and you don't need to worry about
+whether they are being stored securely. It is impossible to verify whether a server's
+operators are logging your IP or other activity, so if you consider this information
+sensitive it is safest to assume it is being recorded and access your preferred instance
+via [Tor browser].
+
+A correctly configured instance has safeguards to prevent collaborators from doing some
+nasty things like injecting scripts into collaborative documents or uploads. The project
+is actively maintained and bugs that our safeguards don't catch tend to get fixed quickly.
+For this reason it is best to only use instances that are running the most recent version,
+which is currently on a three-week release cycle. It is difficult for a non-expert to
+determine whether an instance is otherwise configured correctly, so we are actively
+working on allowing administrators to opt in to a public directory of servers that
+meet our strict criteria for safety.
 
 # Translations
 
-We'd like to make it easy for more people to use encryption in their routine activities.
-As such, we've tried to make language-specific parts of CryptPad translatable. If you're
-able to translate CryptPad's interface, and would like to help, please contact us!
-
-You can also see [our translation guide](/customize.dist/translations/README.md).
+CryptPad can be translated with nothing more than a web browser via our
+[Weblate instance](https://weblate.cryptpad.fr/projects/cryptpad/app/).
+More information about this can be found in [our translation guide](/customize.dist/translations/README.md).
 
 # Contacting Us
 
@@ -61,13 +66,13 @@ via our [GitHub issue tracker](https://github.com/xwiki-labs/cryptpad/issues/),
 
 # Team
 
-CryptPad is actively developed by a team at [XWiki SAS](https://www.xwiki.com), a company that has been building Open-Source software since 2004 with contributors from around the world. Between 2015 and 2019 it was funded by a research grant from the French state through [BPI France](https://www.bpifrance.fr/). It is currently financed by [NLnet PET](https://nlnet.nl/PET/), subscribers of CryptPad.fr and donations to our [Open-Collective campaign](https://opencollective.com/cryptpad).
+CryptPad is actively developed by a team at [XWiki SAS](https://www.xwiki.com), a company that has been building Open-Source software since 2004 with contributors from around the world. Between 2015 and 2019 it was funded by a research grant from the French state through [BPI France](https://www.bpifrance.fr/). In the years since we have been funded by [NLnet PET](https://nlnet.nl/PET/), [NGI TRUST](https://www.ngi.eu/ngi-projects/ngi-trust/), [NGI DAPSI](https://dapsi.ngi.eu/), subscribers of CryptPad.fr, and donations to our [Open-Collective campaign](https://opencollective.com/cryptpad).
 
 # Contributing
 
 We love Open Source and we love contribution. Learn more about [contributing](https://docs.cryptpad.fr/en/how_to_contribute.html). 
 
-If you have any questions or comments, or if you're interested in contributing to Cryptpad, come say hi on IRC, `#cryptpad` on Freenode.
+If you have any questions or comments, or if you're interested in contributing to Cryptpad, come say hi in our [Matrix channel](https://app.element.io/#/room/#cryptpad:matrix.xwiki.com).
 
 # License
 
@@ -78,5 +83,6 @@ published by the Free Software Foundation, either version 3 of the License, or (
 any later version. If you wish to use this technology in a proprietary product, please contact
 sales@xwiki.com.
 
-[ChainPad]: https://github.com/xwiki-contrib/chainpad
+[Tor browser]: https://www.torproject.org/download/
 [active attack]: https://en.wikipedia.org/wiki/Attack_(computing)#Types_of_attack
+
diff --git a/scripts/evict-archived.js b/scripts/evict-archived.js
index 7f90f9ff5..255246e99 100644
--- a/scripts/evict-archived.js
+++ b/scripts/evict-archived.js
@@ -56,6 +56,8 @@ var prepareEnv = function (Env, cb) {
 
         Store.create({
             filePath: config.pinPath,
+            // archive pin logs to their own subpath
+            volumeId: 'pins',
         }, w(function (err, _) {
             if (err) {
                 w.abort();
diff --git a/scripts/evict-inactive.js b/scripts/evict-inactive.js
index bf7e1ca5b..2521e014f 100644
--- a/scripts/evict-inactive.js
+++ b/scripts/evict-inactive.js
@@ -56,6 +56,8 @@ var prepareEnv = function (Env, cb) {
 
         Store.create({
             filePath: config.pinPath,
+            // archive pin logs to their own subpath
+            volumeId: 'pins',
         }, w(function (err, _) {
             if (err) {
                 w.abort();
diff --git a/scripts/find-html-translations.js b/scripts/find-html-translations.js
index dabdbac4b..fc1d4a18e 100644
--- a/scripts/find-html-translations.js
+++ b/scripts/find-html-translations.js
@@ -9,6 +9,7 @@ var simpleTags = [
 
     // FIXME
     "<a href='#'>",
+    '<a href="#docs">',
     '<h3>',
     '</h3>',
 
@@ -70,7 +71,7 @@ processLang(EN, 'en', true);
 
 [
   'ar',
-  'bn_BD',
+  //'bn_BD',
   'ca',
   'de',
   'es',
@@ -86,11 +87,15 @@ processLang(EN, 'en', true);
   'ro',
   'ru',
   'sv',
-  'te',
+  //'te',
   'tr',
   'zh',
 ].forEach(function (lang) {
-    var map = require("../www/common/translations/messages." + lang + ".json");
-    if (!Object.keys(map).length) { return; }
-    processLang(map, lang);
+    try {
+        var map = require("../www/common/translations/messages." + lang + ".json");
+        if (!Object.keys(map).length) { return; }
+        processLang(map, lang);
+    } catch (err) {
+        console.error(err);
+    }
 });
diff --git a/scripts/lint-translations.js b/scripts/lint-translations.js
new file mode 100644
index 000000000..a38cd615a
--- /dev/null
+++ b/scripts/lint-translations.js
@@ -0,0 +1,8 @@
+// TODO unify the following scripts
+    // unused-translations.js
+    // find-html-translations
+
+// more linting
+    // Search for 'Cryptpad' string (should be 'CryptPad')
+    // Search English for -ise\s
+
diff --git a/scripts/tests/test-rpc.js b/scripts/tests/test-rpc.js
index 0fd0abc37..b92cf6287 100644
--- a/scripts/tests/test-rpc.js
+++ b/scripts/tests/test-rpc.js
@@ -122,14 +122,11 @@ var createUser = function (config, cb) {
             });
         }));
     }).nThen(function (w) {
-        user.rpc.reset([], w(function (err, hash) {
+        user.rpc.reset([], w(function (err) {
             if (err) {
                 w.abort();
                 user.shutdown();
-                return console.log("RESET_ERR");
-            }
-            if (!hash || hash !== EMPTY_ARRAY_HASH) {
-                throw new Error("EXPECTED EMPTY ARRAY HASH");
+                return console.log("TEST_RESET_ERR");
             }
         }));
     }).nThen(function (w) {
@@ -214,17 +211,17 @@ var createUser = function (config, cb) {
         // TODO check your quota usage
 
     }).nThen(function (w) {
-        user.rpc.unpin([user.mailboxChannel], w(function (err, hash) {
+        user.rpc.unpin([user.mailboxChannel], w(function (err) {
             if (err) {
                 w.abort();
                 return void cb(err);
             }
+        }));
+    }).nThen(function (w) {
+        user.rpc.getServerHash(w(function (err, hash) {
+            console.log(hash);
 
-            if (hash[0] !== EMPTY_ARRAY_HASH) {
-                //console.log('UNPIN_RESPONSE', hash);
-                throw new Error("UNPIN_DIDNT_WORK");
-            }
-            user.latestPinHash = hash[0];
+            user.latestPinHash = hash;
         }));
     }).nThen(function (w) {
         // clean up the pin list to avoid lots of accounts on the server
@@ -304,7 +301,8 @@ nThen(function  (w) {
     }, w(function (err, roster) {
         if (err) {
             w.abort();
-            return void console.trace(err);
+            console.error(err);
+            return void console.error("ROSTER_ERROR");
         }
         oscar.roster = roster;
         oscar.destroy.reg(function () {
diff --git a/server.js b/server.js
index 3a71f83b8..3cea171c6 100644
--- a/server.js
+++ b/server.js
@@ -4,7 +4,6 @@
 var Express = require('express');
 var Http = require('http');
 var Fs = require('fs');
-var Package = require('./package.json');
 var Path = require("path");
 var nThen = require("nthen");
 var Util = require("./lib/common-util");
@@ -16,21 +15,20 @@ var Env = require("./lib/env").create(config);
 
 var app = Express();
 
-var canonicalizeOrigin = function (s) {
-    return (s || '').trim().replace(/\/+$/, '');
+var fancyURL = function (domain, path) {
+    try {
+        if (domain && path) { return new URL(path, domain).href; }
+        return new URL(domain);
+    } catch (err) {}
+    return false;
 };
 
 (function () {
-    // you absolutely must provide an 'httpUnsafeOrigin'
-    if (typeof(config.httpUnsafeOrigin) !== 'string') {
+    // you absolutely must provide an 'httpUnsafeOrigin' (a truthy string)
+    if (!Env.httpUnsafeOrigin || typeof(Env.httpUnsafeOrigin) !== 'string') {
         throw new Error("No 'httpUnsafeOrigin' provided");
     }
 
-    config.httpUnsafeOrigin = canonicalizeOrigin(config.httpUnsafeOrigin);
-    if (typeof(config.httpSafeOrigin) === 'string') {
-        config.httpSafeOrigin = canonicalizeOrigin(config.httpSafeOrigin);
-    }
-
     // fall back to listening on a local address
     // if httpAddress is not a string
     if (typeof(config.httpAddress) !== 'string') {
@@ -42,26 +40,11 @@ var canonicalizeOrigin = function (s) {
         config.httpPort = 3000;
     }
 
-    if (typeof(config.httpSafeOrigin) !== 'string') {
+    if (typeof(Env.httpSafeOrigin) !== 'string') {
         Env.NO_SANDBOX = true;
         if (typeof(config.httpSafePort) !== 'number') {
             config.httpSafePort = config.httpPort + 1;
         }
-
-        if (Env.DEV_MODE) { return; }
-        console.log(`
-    m     m   mm   mmmmm  mm   m mmmmm  mm   m   mmm    m
-    #  #  #   ##   #   "# #"m  #   #    #"m  # m"   "   #
-    " #"# #  #  #  #mmmm" # #m #   #    # #m # #   mm   #
-     ## ##"  #mm#  #   "m #  # #   #    #  # # #    #
-     #   #  #    # #    " #   ## mm#mm  #   ##  "mmm"   #
-`);
-
-        console.log("\nNo 'httpSafeOrigin' provided.");
-        console.log("Your configuration probably isn't taking advantage of all of CryptPad's security features!");
-        console.log("This is acceptable for development, otherwise your users may be at risk.\n");
-
-        console.log("Serving sandboxed content via port %s.\nThis is probably not what you want for a production instance!\n", config.httpSafePort);
     }
 }());
 
@@ -94,42 +77,35 @@ var setHeaders = (function () {
         }
     } else {
         // use the default CSP headers constructed with your domain
-        headers['Content-Security-Policy'] = Default.contentSecurity(config.httpUnsafeOrigin);
+        headers['Content-Security-Policy'] = Default.contentSecurity(Env.httpUnsafeOrigin);
     }
 
     const padHeaders = Util.clone(headers);
     if (typeof(config.padContentSecurity) === 'string') {
         padHeaders['Content-Security-Policy'] = config.padContentSecurity;
     } else {
-        padHeaders['Content-Security-Policy'] = Default.padContentSecurity(config.httpUnsafeOrigin);
+        padHeaders['Content-Security-Policy'] = Default.padContentSecurity(Env.httpUnsafeOrigin);
     }
     if (Object.keys(headers).length) {
         return function (req, res) {
             // apply a bunch of cross-origin headers for XLSX export in FF and printing elsewhere
             applyHeaderMap(res, {
-                "Cross-Origin-Opener-Policy": /^\/sheet\//.test(req.url)? 'same-origin': '',
-                "Cross-Origin-Embedder-Policy": 'require-corp',
+                "Cross-Origin-Opener-Policy": /^\/(sheet|presentation|doc|convert)\//.test(req.url)? 'same-origin': '',
             });
 
             if (Env.NO_SANDBOX) { // handles correct configuration for local development
             // https://stackoverflow.com/questions/11531121/add-duplicate-http-response-headers-in-nodejs
                 applyHeaderMap(res, {
                     "Cross-Origin-Resource-Policy": 'cross-origin',
+                    "Cross-Origin-Embedder-Policy": 'require-corp',
                 });
             }
 
-            // Don't set CSP headers on /api/config because they aren't necessary and they cause problems
+            // Don't set CSP headers on /api/ endpoints
+            // because they aren't necessary and they cause problems
             // when duplicated by NGINX in production environments
-            if (/^\/api\/(broadcast|config)/.test(req.url)) {
-                /*
-                if (Env.NO_SANDBOX) {
-                    applyHeaderMap(res, {
-                        "Cross-Origin-Resource-Policy": 'cross-origin',
-                    });
-                }
-                */
-                return;
-            }
+            if (/^\/api\/(broadcast|config)/.test(req.url)) { return; }
+
             applyHeaderMap(res, {
                 "Cross-Origin-Resource-Policy": 'cross-origin',
             });
@@ -165,7 +141,7 @@ app.head(/^\/common\/feedback\.html/, function (req, res, next) {
 
 app.use('/blob', function (req, res, next) {
     if (req.method === 'HEAD') {
-        Express.static(Path.join(__dirname, (config.blobPath || './blob')), {
+        Express.static(Path.join(__dirname, Env.paths.blob), {
             setHeaders: function (res, path, stat) {
                 res.set('Access-Control-Allow-Origin', '*');
                 res.set('Access-Control-Allow-Headers', 'Content-Length');
@@ -205,13 +181,13 @@ var mainPagePattern = new RegExp('^\/(' + mainPages.join('|') + ').html$');
 app.get(mainPagePattern, Express.static(__dirname + '/customize'));
 app.get(mainPagePattern, Express.static(__dirname + '/customize.dist'));
 
-app.use("/blob", Express.static(Path.join(__dirname, (config.blobPath || './blob')), {
+app.use("/blob", Express.static(Path.join(__dirname, Env.paths.blob), {
     maxAge: Env.DEV_MODE? "0d": "365d"
 }));
-app.use("/datastore", Express.static(Path.join(__dirname, (config.filePath || './datastore')), {
+app.use("/datastore", Express.static(Path.join(__dirname, Env.paths.data), {
     maxAge: "0d"
 }));
-app.use("/block", Express.static(Path.join(__dirname, (config.blockPath || '/block')), {
+app.use("/block", Express.static(Path.join(__dirname, Env.paths.block), {
     maxAge: "0d",
 }));
 
@@ -266,12 +242,12 @@ var serveConfig = makeRouteCache(function (host) {
         'var obj = ' + JSON.stringify({
             requireConf: {
                 waitSeconds: 600,
-                urlArgs: 'ver=' + Package.version + cacheString(),
+                urlArgs: 'ver=' + Env.version + cacheString(),
             },
-            removeDonateButton: (config.removeDonateButton === true),
-            allowSubscriptions: (config.allowSubscriptions === true),
+            removeDonateButton: (Env.removeDonateButton === true),
+            allowSubscriptions: (Env.allowSubscriptions === true),
             websocketPath: config.externalWebsocketURL,
-            httpUnsafeOrigin: config.httpUnsafeOrigin,
+            httpUnsafeOrigin: Env.httpUnsafeOrigin,
             adminEmail: Env.adminEmail,
             adminKeys: Env.admins,
             inactiveTime: Env.inactiveTime,
@@ -279,10 +255,10 @@ var serveConfig = makeRouteCache(function (host) {
             defaultStorageLimit: Env.defaultStorageLimit,
             maxUploadSize: Env.maxUploadSize,
             premiumUploadSize: Env.premiumUploadSize,
-            restrictRegistration: Env.restrictRegistration, // FIXME see the race condition in env.js
+            restrictRegistration: Env.restrictRegistration,
         }, null, '\t'),
         'obj.httpSafeOrigin = ' + (function () {
-            if (config.httpSafeOrigin) { return '"' + config.httpSafeOrigin + '"'; }
+            if (Env.httpSafeOrigin) { return '"' + Env.httpSafeOrigin + '"'; }
             if (config.httpSafePort) {
                 return "(function () { return window.location.origin.replace(/\:[0-9]+$/, ':" +
                     config.httpSafePort + "'); }())";
@@ -345,7 +321,19 @@ nThen(function (w) {
         var port = config.httpPort;
         var ps = port === 80? '': ':' + port;
 
-        console.log('[%s] server available http://%s%s', new Date().toISOString(), hostName, ps);
+        var roughAddress = 'http://' + hostName + ps;
+        var betterAddress = fancyURL(Env.httpUnsafeOrigin);
+
+        if (betterAddress) {
+            console.log('Serving content for %s via %s.\n', betterAddress, roughAddress);
+        } else {
+            console.log('Serving content via %s.\n', roughAddress);
+        }
+        if (!Env.admins.length) {
+            console.log("Your instance is not correctly configured for safe use in production.\nSee %s for more information.\n",
+                fancyURL(Env.httpUnsafeOrigin, '/checkup/') || 'https://your-domain.com/checkup/'
+            );
+        }
     });
 
     if (config.httpSafePort) {
diff --git a/www/admin/app-admin.less b/www/admin/app-admin.less
index 17450361c..227792540 100644
--- a/www/admin/app-admin.less
+++ b/www/admin/app-admin.less
@@ -203,6 +203,17 @@
         }
     }
 
+    .cp-admin-radio-container {
+        display: flex;
+        align-items: left; //center;
+        flex-wrap: wrap;
+        flex-direction: column;
+        label {
+            margin-right: 40px;
+            margin-top: 5px;
+        }
+    }
+
     .cp-admin-broadcast-form {
         input.flatpickr-input {
             width: 307.875px !important; // same width as flatpickr calendar
diff --git a/www/admin/inner.js b/www/admin/inner.js
index ffc9a561c..e8d567d41 100644
--- a/www/admin/inner.js
+++ b/www/admin/inner.js
@@ -16,6 +16,7 @@ define([
     '/support/ui.js',
 
     '/lib/datepicker/flatpickr.js',
+    '/bower_components/tweetnacl/nacl-fast.min.js',
 
     'css!/lib/datepicker/flatpickr.min.css',
     'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
@@ -44,6 +45,7 @@ define([
         'instanceStatus': {}
     };
 
+    var Nacl = window.nacl;
     var common;
     var sFrameChan;
 
@@ -54,6 +56,7 @@ define([
             'cp-admin-archive',
             'cp-admin-unarchive',
             'cp-admin-registration',
+            'cp-admin-email'
         ],
         'quota': [ // Msg.admin_cat_quota
             'cp-admin-defaultlimit',
@@ -71,7 +74,8 @@ define([
         ],
         'support': [ // Msg.admin_cat_support
             'cp-admin-support-list',
-            'cp-admin-support-init'
+            'cp-admin-support-init',
+            'cp-admin-support-priv',
         ],
         'broadcast': [ // Msg.admin_cat_broadcast
             'cp-admin-maintenance',
@@ -81,15 +85,28 @@ define([
         'performance': [ // Msg.admin_cat_performance
             'cp-admin-refresh-performance',
             'cp-admin-performance-profiling',
-        ]
+        ],
+        'network': [ // Msg.admin_cat_network
+            'cp-admin-update-available',
+            'cp-admin-checkup',
+            'cp-admin-block-daily-check',
+            //'cp-admin-provide-aggregate-statistics',
+            'cp-admin-list-my-instance',
+            'cp-admin-consent-to-contact',
+            'cp-admin-remove-donate-button',
+            'cp-admin-instance-purpose',
+        ],
     };
 
     var create = {};
 
+    var keyToCamlCase = function (key) {
+        return key.replace(/-([a-z])/g, function (g) { return g[1].toUpperCase(); });
+    };
+
     var makeBlock = function (key, addButton) { // Title, Hint, maybeButton
         // Convert to camlCase for translation keys
-        var safeKey = key.replace(/-([a-z])/g, function (g) { return g[1].toUpperCase(); });
-
+        var safeKey = keyToCamlCase(key);
         var $div = $('<div>', {'class': 'cp-admin-' + key + ' cp-sidebarlayout-element'});
         $('<label>').text(Messages['admin_'+safeKey+'Title'] || key).appendTo($div);
         $('<span>', {'class': 'cp-sidebarlayout-description'})
@@ -256,7 +273,7 @@ define([
         var $div = makeBlock(key); // Msg.admin_registrationHint, .admin_registrationTitle, .admin_registrationButton
 
         var state = APP.instanceStatus.restrictRegistration;
-        var $cbox = $(UI.createCheckbox('cp-settings-userfeedback',
+        var $cbox = $(UI.createCheckbox('cp-settings-' + key,
             Messages.admin_registrationTitle,
             state, { label: { class: 'noTitle' } }));
         var spinner = UI.makeSpinner($cbox);
@@ -267,8 +284,11 @@ define([
             sFrameChan.query('Q_ADMIN_RPC', {
                 cmd: 'ADMIN_DECREE',
                 data: ['RESTRICT_REGISTRATION', [val]]
-            }, function (e) {
-                if (e) { UI.warn(Messages.error); console.error(e); }
+            }, function (e, response) {
+                if (e || response.error) {
+                    UI.warn(Messages.error);
+                    console.error(e, response);
+                }
                 APP.updateStatus(function () {
                     spinner.done();
                     state = APP.instanceStatus.restrictRegistration;
@@ -282,6 +302,94 @@ define([
         return $div;
     };
 
+    var makeAdminCheckbox = function (data) {
+        return function () {
+            var state = data.getState();
+            var key = data.key;
+            var $div = makeBlock(key);
+
+            var labelKey = 'admin_' + keyToCamlCase(key) + 'Label';
+            var titleKey = 'admin_' + keyToCamlCase(key) + 'Title';
+            var $cbox = $(UI.createCheckbox('cp-admin-' + key,
+                Messages[labelKey] || Messages[titleKey],
+                state, { label: { class: 'noTitle' } }));
+            var spinner = UI.makeSpinner($cbox);
+            var $checkbox = $cbox.find('input').on('change', function() {
+                spinner.spin();
+                var val = $checkbox.is(':checked') || false;
+                $checkbox.attr('disabled', 'disabled');
+                data.query(val, function (state) {
+                    spinner.done();
+                    $checkbox[0].checked = state;
+                    $checkbox.removeAttr('disabled');
+                });
+            });
+            $cbox.appendTo($div);
+            return $div;
+        };
+    };
+
+    // Msg.admin_registrationHint, .admin_registrationTitle, .admin_registrationButton
+    create['registration'] = makeAdminCheckbox({
+        key: 'registration',
+        getState: function () {
+            return APP.instanceStatus.restrictRegistration;
+        },
+        query: function (val, setState) {
+            sFrameChan.query('Q_ADMIN_RPC', {
+                cmd: 'ADMIN_DECREE',
+                data: ['RESTRICT_REGISTRATION', [val]]
+            }, function (e, response) {
+                if (e || response.error) {
+                    UI.warn(Messages.error);
+                    console.error(e, response);
+                }
+                APP.updateStatus(function () {
+                    setState(APP.instanceStatus.restrictRegistration);
+                });
+            });
+        },
+    });
+
+    create['email'] = function () {
+        var key = 'email';
+        var $div = makeBlock(key, true); // Msg.admin_emailHint, Msg.admin_emailTitle, Msg.admin_emailButton
+        var $button = $div.find('button');
+
+        var input = h('input', {
+            type: 'email',
+            value: ApiConfig.adminEmail || ''
+        });
+        var $input = $(input);
+        var innerDiv = h('div.cp-admin-setlimit-form', input);
+        var spinner = UI.makeSpinner($(innerDiv));
+
+        $button.click(function () {
+            if (!$input.val()) { return; }
+            spinner.spin();
+            $button.attr('disabled', 'disabled');
+            sFrameChan.query('Q_ADMIN_RPC', {
+                cmd: 'ADMIN_DECREE',
+                data: ['SET_ADMIN_EMAIL', [$input.val()]]
+            }, function (e, response) {
+                $button.removeAttr('disabled');
+                if (e || response.error) {
+                    UI.warn(Messages.error);
+                    $input.val('');
+                    console.error(e, response);
+                    spinner.hide();
+                    return;
+                }
+                spinner.done();
+                UI.log(Messages.saved);
+            });
+        });
+
+        $button.before(innerDiv);
+
+        return $div;
+    };
+
     var getPrettySize = UIElements.prettySize;
 
     create['defaultlimit'] = function () {
@@ -316,8 +424,11 @@ define([
             sFrameChan.query('Q_ADMIN_RPC', {
                 cmd: 'ADMIN_DECREE',
                 data: ['UPDATE_DEFAULT_STORAGE', data]
-            }, function (e) {
-                if (e) { UI.warn(Messages.error); return void console.error(e); }
+            }, function (e, response) {
+                if (e || response.error) {
+                    UI.warn(Messages.error);
+                    return void console.error(e, response);
+                }
                 var limit = getPrettySize(l);
                 $div.find('.cp-admin-defaultlimit-value').text(Messages._getKey('admin_limit', [limit]));
             });
@@ -448,8 +559,12 @@ define([
             sFrameChan.query('Q_ADMIN_RPC', {
                 cmd: 'ADMIN_DECREE',
                 data: ['RM_QUOTA', data]
-            }, function (e) {
-                if (e) { UI.warn(Messages.error); console.error(e); }
+            }, function (e, response) {
+                if (e || response.error) {
+                    UI.warn(Messages.error);
+                    console.error(e, response);
+                    return;
+                }
                 APP.refreshLimits();
                 $key.val('');
             });
@@ -462,8 +577,12 @@ define([
             sFrameChan.query('Q_ADMIN_RPC', {
                 cmd: 'ADMIN_DECREE',
                 data: ['SET_QUOTA', data]
-            }, function (e) {
-                if (e) { UI.warn(Messages.error); console.error(e); }
+            }, function (e, response) {
+                if (e || response.error) {
+                    UI.warn(Messages.error);
+                    console.error(e, response);
+                    return;
+                }
                 APP.refreshLimits();
                 $key.val('');
             });
@@ -637,8 +756,13 @@ define([
     };
 
     var supportKey = ApiConfig.supportMailbox;
+    var checkAdminKey = function (priv) {
+        if (!supportKey) { return; }
+        return Hash.checkBoxKeyPair(priv, supportKey);
+    };
+
     create['support-list'] = function () {
-        if (!supportKey || !APP.privateKey) { return; }
+        if (!supportKey || !APP.privateKey || !checkAdminKey(APP.privateKey)) { return; }
         var $container = makeBlock('support-list'); // Msg.admin_supportListHint, .admin_supportListTitle
         var $div = $(h('div.cp-support-container')).appendTo($container);
 
@@ -709,7 +833,8 @@ define([
             var premium = t.some(function (msg) {
                 var _ed = Util.find(msg, ['content', 'msg', 'content', 'sender', 'edPublic']);
                 if (ed !== _ed) { return; }
-                return Util.find(msg, ['content', 'msg', 'content', 'sender', 'plan']);
+                return Util.find(msg, ['content', 'msg', 'content', 'sender', 'plan']) ||
+                       Util.find(msg, ['content', 'msg', 'content', 'sender', 'quota', 'plan']);
             });
             var lastMsg = t[t.length - 1];
             var lastMsgEd = Util.find(lastMsg, ['content', 'msg', 'content', 'sender', 'edPublic']);
@@ -898,16 +1023,63 @@ define([
         return $container;
     };
 
+    create['support-priv'] = function () {
+        if (!supportKey || !APP.privateKey || !checkAdminKey(APP.privateKey)) { return; }
 
-    var checkAdminKey = function (priv) {
-        if (!supportKey) { return; }
-        return Hash.checkBoxKeyPair(priv, supportKey);
+        var $div = makeBlock('support-priv', true); // Msg.admin_supportPrivHint, .admin_supportPrivTitle, .admin_supportPrivButton
+        var $button = $div.find('button').click(function () {
+            $button.remove();
+            var $selectable = $(UI.dialog.selectable(APP.privateKey)).css({ 'max-width': '28em' });
+            $div.append($selectable);
+        });
+        return $div;
     };
-
     create['support-init'] = function () {
         var $div = makeBlock('support-init'); // Msg.admin_supportInitHint, .admin_supportInitTitle
         if (!supportKey) {
-            $div.append(h('p', Messages.admin_supportInitHelp));
+            (function () {
+                $div.append(h('p', Messages.admin_supportInitHelp));
+                var button = h('button.btn.btn-primary', Messages.admin_supportInitGenerate);
+                var $button = $(button).appendTo($div);
+                $div.append($button);
+                var spinner = UI.makeSpinner($div);
+                $button.click(function () {
+                    spinner.spin();
+                    $button.attr('disabled', 'disabled');
+                    var keyPair = Nacl.box.keyPair();
+                    var pub = Nacl.util.encodeBase64(keyPair.publicKey);
+                    var priv = Nacl.util.encodeBase64(keyPair.secretKey);
+                    // Store the private key first. It won't be used until the decree is accepted.
+                    sFrameChan.query("Q_ADMIN_MAILBOX", priv, function (err, obj) {
+                        if (err || (obj && obj.error)) {
+                            console.error(err || obj.error);
+                            UI.warn(Messages.error);
+                            spinner.hide();
+                            return;
+                        }
+                        // Then send the decree
+                        sFrameChan.query('Q_ADMIN_RPC', {
+                            cmd: 'ADMIN_DECREE',
+                            data: ['SET_SUPPORT_MAILBOX', [pub]]
+                        }, function (e, response) {
+                            $button.removeAttr('disabled');
+                            if (e || response.error) {
+                                UI.warn(Messages.error);
+                                console.error(e, response);
+                                spinner.hide();
+                                return;
+                            }
+                            spinner.done();
+                            UI.log(Messages.saved);
+                            supportKey = pub;
+                            APP.privateKey = priv;
+                            $('.cp-admin-support-init').hide();
+                            APP.$rightside.append(create['support-list']());
+                            APP.$rightside.append(create['support-priv']());
+                        });
+                    });
+                });
+            })();
             return $div;
         }
         if (!APP.privateKey || !checkAdminKey(APP.privateKey)) {
@@ -937,6 +1109,7 @@ define([
                     APP.privateKey = key;
                     $('.cp-admin-support-init').hide();
                     APP.$rightside.append(create['support-list']());
+                    APP.$rightside.append(create['support-priv']());
                 });
             });
             return $div;
@@ -1030,9 +1203,10 @@ define([
                 sFrameChan.query('Q_ADMIN_RPC', {
                     cmd: 'ADMIN_DECREE',
                     data: ['SET_LAST_BROADCAST_HASH', [lastHash]]
-                }, function (e) {
-                    if (e) {
-                        console.error(e);
+                }, function (e, response) {
+                    if (e || response.error) {
+                        UI.warn(Messages.error);
+                        console.error(e, response);
                         return;
                     }
                     console.log('lastBroadcastHash updated');
@@ -1298,20 +1472,21 @@ define([
             var end = h('input');
             var $start = $(start);
             var $end = $(end);
-            var is24h = false;
-            try {
-                is24h = !new Intl.DateTimeFormat(navigator.language, { hour: 'numeric' }).format(0).match(/AM/);
-            } catch (e) {}
+            var is24h = UIElements.is24h();
+            var dateFormat = "Y-m-d H:i";
+            if (!is24h) { dateFormat = "Y-m-d h:i K"; }
 
             var endPickr = Flatpickr(end, {
                 enableTime: true,
                 time_24hr: is24h,
+                dateFormat: dateFormat,
                 minDate: new Date()
             });
             Flatpickr(start, {
                 enableTime: true,
                 time_24hr: is24h,
                 minDate: new Date(),
+                dateFormat: dateFormat,
                 onChange: function () {
                     endPickr.set('minDate', new Date($start.val()));
                 }
@@ -1336,9 +1511,10 @@ define([
                 sFrameChan.query('Q_ADMIN_RPC', {
                     cmd: 'ADMIN_DECREE',
                     data: ['SET_MAINTENANCE', [data]]
-                }, function (e) {
-                    if (e) {
-                        UI.warn(Messages.error); console.error(e);
+                }, function (e, response) {
+                    if (e || response.error) {
+                        UI.warn(Messages.error);
+                        console.error(e, response);
                         $button.prop('disabled', '');
                         return;
                     }
@@ -1419,7 +1595,7 @@ define([
             var getData = function () {
                 var url = $input.val();
                 if (!Util.isValidURL(url)) {
-                    console.error('Invalid URL');
+                    console.error('Invalid URL', url);
                     return false;
                 }
                 return url;
@@ -1430,10 +1606,11 @@ define([
                 sFrameChan.query('Q_ADMIN_RPC', {
                     cmd: 'ADMIN_DECREE',
                     data: ['SET_SURVEY_URL', [data]]
-                }, function (e) {
-                    if (e) {
+                }, function (e, response) {
+                    if (e || response.error) {
                         $button.prop('disabled', '');
-                        UI.warn(Messages.error); console.error(e);
+                        UI.warn(Messages.error);
+                        console.error(e, response);
                         return;
                     }
                     // Maintenance applied, send notification
@@ -1529,11 +1706,12 @@ define([
             sFrameChan.query('Q_ADMIN_RPC', {
                 cmd: 'GET_WORKER_PROFILES',
             }, function (e, data) {
-                if (e) { return void console.error(e); }
+                if (e || data.error) {
+                    UI.warn(Messages.error);
+                    return void console.error(e, data);
+                }
                 //console.info(data);
                 $div.find("table").remove();
-
-
                 process(data);
                 $div.append(table);
             });
@@ -1545,6 +1723,202 @@ define([
         return $div;
     };
 
+    create['update-available'] = function () { // Messages.admin_updateAvailableTitle.admin_updateAvailableHint.admin_updateAvailableLabel.admin_updateAvailableButton
+        if (!APP.instanceStatus.updateAvailable) { return; }
+        var $div = makeBlock('update-available', true);
+
+        var updateURL = 'https://github.com/xwiki-labs/cryptpad/releases/latest';
+        if (typeof(APP.instanceStatus.updateAvailable) === 'string') {
+            updateURL = APP.instanceStatus.updateAvailable;
+        }
+
+        $div.find('button').click(function () {
+            common.openURL(updateURL);
+        });
+
+        return $div;
+    };
+
+    create['checkup'] = function () {
+        var $div = makeBlock('checkup', true); // Messages.admin_checkupButton.admin_checkupHint.admin_checkupTitle
+        $div.find('button').click(function () {
+            common.openURL('/checkup/');
+        });
+        return $div;
+    };
+
+    create['consent-to-contact'] = makeAdminCheckbox({ // Messages.admin_consentToContactTitle.admin_consentToContactHint.admin_consentToContactLabel
+        key: 'consent-to-contact',
+        getState: function () {
+            return APP.instanceStatus.consentToContact;
+        },
+        query: function (val, setState) {
+            sFrameChan.query('Q_ADMIN_RPC', {
+                cmd: 'ADMIN_DECREE',
+                data: ['CONSENT_TO_CONTACT', [val]]
+            }, function (e, response) {
+                if (e || response.error) {
+                    UI.warn(Messages.error);
+                    console.error(e, response);
+                }
+                APP.updateStatus(function () {
+                    setState(APP.instanceStatus.consentToContact);
+                });
+            });
+        },
+    });
+
+    create['list-my-instance'] = makeAdminCheckbox({ // Messages.admin_listMyInstanceTitle.admin_listMyInstanceHint.admin_listMyInstanceLabel
+        key: 'list-my-instance',
+        getState: function () {
+            return APP.instanceStatus.listMyInstance;
+        },
+        query: function (val, setState) {
+            sFrameChan.query('Q_ADMIN_RPC', {
+                cmd: 'ADMIN_DECREE',
+                data: ['LIST_MY_INSTANCE', [val]]
+            }, function (e, response) {
+                if (e || response.error) {
+                    UI.warn(Messages.error);
+                    console.error(e, response);
+                }
+                APP.updateStatus(function () {
+                    setState(APP.instanceStatus.listMyInstance);
+                });
+            });
+        },
+    });
+
+    create['provide-aggregate-statistics'] = makeAdminCheckbox({ // Messages.admin_provideAggregateStatisticsTitle.admin_provideAggregateStatisticsHint.admin_provideAggregateStatisticsLabel
+        key: 'provide-aggregate-statistics',
+        getState: function () {
+            return APP.instanceStatus.provideAggregateStatistics;
+        },
+        query: function (val, setState) {
+            sFrameChan.query('Q_ADMIN_RPC', {
+                cmd: 'ADMIN_DECREE',
+                data: ['PROVIDE_AGGREGATE_STATISTICS', [val]]
+            }, function (e, response) {
+                if (e || response.error) {
+                    UI.warn(Messages.error);
+                    console.error(e, response);
+                }
+                APP.updateStatus(function () {
+                    setState(APP.instanceStatus.provideAggregateStatistics);
+                });
+            });
+        },
+    });
+
+    create['remove-donate-button'] = makeAdminCheckbox({ // Messages.admin_removeDonateButtonTitle.admin_removeDonateButtonHint.admin_removeDonateButtonLabel
+        key: 'remove-donate-button',
+        getState: function () {
+            return APP.instanceStatus.removeDonateButton;
+        },
+        query: function (val, setState) {
+            sFrameChan.query('Q_ADMIN_RPC', {
+                cmd: 'ADMIN_DECREE',
+                data: ['REMOVE_DONATE_BUTTON', [val]]
+            }, function (e, response) {
+                if (e || response.error) {
+                    UI.warn(Messages.error);
+                    console.error(e, response);
+                }
+                APP.updateStatus(function () {
+                    setState(APP.instanceStatus.removeDonateButton);
+                });
+            });
+        },
+    });
+
+    create['block-daily-check'] = makeAdminCheckbox({ // Messages.admin_blockDailyCheckTitle.admin_blockDailyCheckHint.admin_blockDailyCheckLabel
+        key: 'block-daily-check',
+        getState: function () {
+            return APP.instanceStatus.blockDailyCheck;
+        },
+        query: function (val, setState) {
+            sFrameChan.query('Q_ADMIN_RPC', {
+                cmd: 'ADMIN_DECREE',
+                data: ['BLOCK_DAILY_CHECK', [val]]
+            }, function (e, response) {
+                if (e || response.error) {
+                    UI.warn(Messages.error);
+                    console.error(e, response);
+                }
+                APP.updateStatus(function () {
+                    setState(APP.instanceStatus.blockDailyCheck);
+                });
+            });
+        },
+    });
+
+    var sendDecree = function (data, cb) {
+        sFrameChan.query('Q_ADMIN_RPC', {
+            cmd: 'ADMIN_DECREE',
+            data: data,
+        }, cb);
+    };
+
+    create['instance-purpose'] = function () {
+        var key = 'instance-purpose';
+        var $div = makeBlock(key); // Messages.admin_instancePurposeTitle.admin_instancePurposeHint
+
+        var values = [
+            'noanswer', // Messages.admin_purpose_noanswer
+            'experiment', // Messages.admin_purpose_experiment
+            'personal', // Messages.admin_purpose_personal
+            'education', // Messages.admin_purpose_education
+            'org', // Messages.admin_purpose_org
+            'business', // Messages.admin_purpose_business
+            'public', // Messages.admin_purpose_public
+        ];
+
+        var defaultPurpose = 'noanswer';
+        var purpose = APP.instanceStatus.instancePurpose || defaultPurpose;
+
+        var opts = h('div.cp-admin-radio-container', [
+            values.map(function (key) {
+                var full_key = 'admin_purpose_' + key;
+                return UI.createRadio('cp-instance-purpose-radio', 'cp-instance-purpose-radio-'+key,
+                    Messages[full_key] || Messages._getKey(full_key, [defaultPurpose]),
+                    key === purpose, {
+                        input: { value: key },
+                        label: { class: 'noTitle' }
+                    });
+            })
+        ]);
+
+        var $opts = $(opts);
+        //var $br = $(h('br',));
+        //$div.append($br);
+
+        $div.append(opts);
+
+        var setPurpose = function (value, cb) {
+            sendDecree([
+                'SET_INSTANCE_PURPOSE',
+                [ value]
+            ], cb);
+        };
+
+        $opts.on('change', function () {
+            var val = $opts.find('input:radio:checked').val();
+            console.log(val);
+            //spinner.spin();
+            setPurpose(val, function (e, response) {
+                if (e || response.error) {
+                    UI.warn(Messages.error);
+                    //spinner.hide();
+                    return;
+                }
+                //spinner.done();
+                UI.log(Messages.saved);
+            });
+        });
+
+        return $div;
+    };
+
     var hideCategories = function () {
         APP.$rightside.find('> div').hide();
     };
@@ -1562,6 +1936,7 @@ define([
         support: 'fa fa-life-ring',
         broadcast: 'fa fa-bullhorn',
         performance: 'fa fa-heartbeat',
+        network: 'fa fa-sitemap', // or fa-university ?
     };
 
     var createLeftside = function () {
@@ -1573,6 +1948,7 @@ define([
         if (active.indexOf('-') !== -1) {
             active = active.split('-')[0];
         }
+        if (!categories[active]) { active = 'general'; }
         common.setHash(active);
         Object.keys(categories).forEach(function (key) {
             var $category = $('<div>', {'class': 'cp-sidebarlayout-category'}).appendTo($categories);
diff --git a/www/assert/main.js b/www/assert/main.js
index 07f532f05..de10261ba 100644
--- a/www/assert/main.js
+++ b/www/assert/main.js
@@ -250,6 +250,12 @@ define([
             secret.hashData.ownerKey === "uPmJDtDJ9okhdIyQ-8zphYlpaAonJDOC6MAcYY6iBwWBQr+XmrQ9uGY9WkApJTfEfAu5QcqaDCw1Ul+JXKcYkA" &&
             !secret.hashData.present);
     }, "test support for owner key in version 1 file hash failed to parse");
+    assert(function (cb) {
+        var parsed = Hash.parsePadUrl('/file/#/2/file/JQU88aX+ieXR58L5T787434a/');
+        var secret = Hash.getSecrets('file', parsed.hash);
+        return cb(secret.type === 'file' && secret.password === undefined &&
+            secret.channel === "2031a9b51247a07ad398227367c1b95efaad969b209a279c");
+    }, "test support for v2 file hash");
 
     assert(function (cb) {
         var secret = Hash.parsePadUrl('/invite/#/2/invite/edit/oRE0oLCtEXusRDyin7GyLGcS/p/');
diff --git a/www/calendar/inner.js b/www/calendar/inner.js
index 58262f956..21cb12789 100644
--- a/www/calendar/inner.js
+++ b/www/calendar/inner.js
@@ -17,6 +17,7 @@ define([
     '/customize/application_config.js',
     '/lib/calendar/tui-calendar.min.js',
     '/calendar/export.js',
+    '/lib/datepicker/flatpickr.js',
 
     '/common/inner/share.js',
     '/common/inner/access.js',
@@ -46,6 +47,7 @@ define([
     AppConfig,
     Calendar,
     Export,
+    Flatpickr,
     Share, Access, Properties
     )
 {
@@ -119,7 +121,7 @@ define([
     };
 
     var getWeekDays = function (large) {
-        var baseDate = new Date(Date.UTC(2017, 0, 1)); // just a Sunday
+        var baseDate = new Date(2017, 0, 1); // just a Sunday
         var weekDays = [];
         for(var i = 0; i < 7; i++) {
             weekDays.push(baseDate.toLocaleDateString(undefined, { weekday: 'long' }));
@@ -169,9 +171,9 @@ define([
                 var obj = data.content[uid];
                 obj.title = obj.title || "";
                 obj.location = obj.location || "";
-                if (obj.isAllDay && obj.startDay) { obj.start = +new Date(obj.startDay); }
+                if (obj.isAllDay && obj.startDay) { obj.start = +Flatpickr.parseDate((obj.startDay)); }
                 if (obj.isAllDay && obj.endDay) {
-                    var endDate = new Date(obj.endDay);
+                    var endDate = Flatpickr.parseDate(obj.endDay);
                     endDate.setHours(23);
                     endDate.setMinutes(59);
                     endDate.setSeconds(59);
diff --git a/www/checkup/app-checkup.less b/www/checkup/app-checkup.less
index 40e6a1add..026d1952c 100644
--- a/www/checkup/app-checkup.less
+++ b/www/checkup/app-checkup.less
@@ -14,13 +14,17 @@ html, body {
 
     .report {
         font-size: 30px;
-        max-width: 50%;
+        max-width: 26em;
         margin: auto;
         padding-top: 15px;
     }
 
+    .summary, .failure, .error, .success {
+        margin-bottom: 1em;
+    }
+
     .pending {
-        border: 1px solid white;
+        border: 1px solid @cryptpad_text_col;
         .fa {
             margin-right: 20px;
         }
@@ -42,10 +46,18 @@ html, body {
         padding: 15px;
     }
 
-    table {
-        td {
-            padding: 5px;
-            border: 1px solid white;
+    .table-container {
+        overflow-x: auto;
+        width: 100%;
+        table {
+            td {
+                padding: 5px;
+                border: 1px solid @cryptpad_text_col;
+                font-size: 60%;
+            }
+            td:nth-child(2) {
+                word-break: break-word;
+            }
         }
     }
 
@@ -72,7 +84,12 @@ html, body {
             color: @cryptpad_color_link;
         }
     }
-    .cp-app-checkup-version {
+
+    .cp-notice-browser, .cp-notice-details, .cp-notice-other {
+        font-size: 70%;
+    }
+
+    .cp-app-checkup-version, .cp-app-checkup-browser {
         text-decoration: underline;
     }
 
diff --git a/www/checkup/checkup-tools.js b/www/checkup/checkup-tools.js
new file mode 100644
index 000000000..79fe1c4b3
--- /dev/null
+++ b/www/checkup/checkup-tools.js
@@ -0,0 +1,36 @@
+define([
+], function () {
+    var Tools = {};
+    Tools.supportsSharedArrayBuffers = function () {
+        try {
+            return Object.prototype.toString.call(new window.WebAssembly.Memory({
+                shared: true,
+                initial: 0,
+                maximum: 0,
+            }).buffer) === '[object SharedArrayBuffer]';
+        } catch (err) {
+            console.error(err);
+        }
+        return false;
+    };
+
+
+    Tools.isSafari = function () {
+        return navigator.vendor.match(/apple/i);
+    };
+
+    Tools.isChrome = function () {
+        return navigator.vendor.match(/google/i);
+    };
+
+    Tools.guessBrowser = function () {
+        if (Tools.isChrome()) { return 'chrome/blink'; }
+        if (Tools.isSafari()) { return 'safari/webkit'; }
+        if (navigator.userAgent.match(/firefox\//i)) { return 'firefox/gecko'; }
+        if (navigator.userAgent.match(/edge\//i)) { return 'edge/edgehtml'; }
+        if (navigator.userAgent.match(/trident\//i)) { return 'ie/trident'; }
+        return navigator.userAgent + "\n" + navigator.vendor;
+    };
+
+    return Tools;
+});
diff --git a/www/checkup/main.js b/www/checkup/main.js
index 87e310e32..a1e458f34 100644
--- a/www/checkup/main.js
+++ b/www/checkup/main.js
@@ -13,13 +13,14 @@ define([
     '/common/pinpad.js',
     '/common/outer/network-config.js',
     '/customize/pages.js',
+    '/checkup/checkup-tools.js',
 
     '/bower_components/tweetnacl/nacl-fast.min.js',
     'css!/bower_components/components-font-awesome/css/font-awesome.min.css',
     'less!/checkup/app-checkup.less',
 ], function ($, ApiConfig, Assertions, h, Messages, DomReady,
             nThen, SFCommonO, Login, Hash, Util, Pinpad,
-            NetConfig, Pages) {
+            NetConfig, Pages, Tools) {
     var Assert = Assertions();
     var trimSlashes = function (s) {
         if (typeof(s) !== 'string') { return s; }
@@ -30,8 +31,12 @@ define([
         Assert(f, msg || h('span.advisory-text.cp-danger'));
     };
 
+    var code = function (content) {
+        return h('code', content);
+    };
+
     var CONFIG_PATH = function () {
-        return h('code', 'cryptpad/config/config.js');
+        return code('cryptpad/config/config.js');
     };
     var API_CONFIG_LINK = function () {
         return h('a', {
@@ -50,15 +55,31 @@ define([
         ]);
     };
 
+    var link = function (href, text) {
+        return h('a', {
+            href: href,
+            rel: 'noopener noreferrer',
+            target: '_blank',
+        }, text);
+    };
+
+    var setWarningClass = function (msg) {
+        $(msg).removeClass('cp-danger').addClass('cp-warning');
+    };
+
+    var cacheBuster = function (url) {
+        return url + '?test=' + (+new Date());
+    };
+
     var trimmedSafe = trimSlashes(ApiConfig.httpSafeOrigin);
     var trimmedUnsafe = trimSlashes(ApiConfig.httpUnsafeOrigin);
 
     assert(function (cb, msg) {
         msg.appendChild(h('span', [
             "CryptPad's sandbox requires that both ",
-            h('code', 'httpUnsafeOrigin'),
+            code('httpUnsafeOrigin'),
             ' and ',
-            h('code', 'httpSafeOrigin'),
+            code('httpSafeOrigin'),
             " be configured in ",
             CONFIG_PATH(),
             '. ',
@@ -71,9 +92,9 @@ define([
 
     assert(function (cb, msg) {
         msg.appendChild(h('span', [
-            h('code', 'httpUnsafeOrigin'),
+            code('httpUnsafeOrigin'),
             ' and ',
-            h('code', 'httpSafeOrigin'),
+            code('httpSafeOrigin'),
             ' are equivalent. ',
             "In order for CryptPad's security features to be as effective as intended they must be different. ",
             "See ",
@@ -87,9 +108,9 @@ define([
 
     assert(function (cb, msg) {
         msg.appendChild(h('span', [
-            h('code', 'httpUnsafeOrigin'),
+            code('httpUnsafeOrigin'),
             ' and ',
-            h('code', 'httpSafeOrigin'),
+            code('httpSafeOrigin'),
             ' must not contain trailing slashes. This can be configured in ',
             CONFIG_PATH(),
             '. ',
@@ -101,10 +122,10 @@ define([
     assert(function (cb, msg) {
         msg.appendChild(h("span", [
             "It appears that you are trying to load this page via an origin other than its main domain (",
-            h('code', ApiConfig.httpUnsafeOrigin),
+            code(ApiConfig.httpUnsafeOrigin),
 
             "). See the ",
-            h('code', 'httpUnsafeOrigin'),
+            code('httpUnsafeOrigin'),
             " option in ",
             CONFIG_PATH(),
             " which is exposed via ",
@@ -117,7 +138,7 @@ define([
 
     var checkAvailability = function (url, cb) {
         $.ajax({
-            url: url,
+            url: cacheBuster(url),
             data: {},
             complete: function (xhr) {
                 cb(xhr.status === 200);
@@ -128,7 +149,7 @@ define([
     assert(function (cb, msg) {
         msg.appendChild(h('span', [
             "The main domain (configured via ",
-            h('code', 'httpUnsafeOrigin'),
+            code('httpUnsafeOrigin'),
             ' as ',
             ApiConfig.httpUnsafeOrigin,
             ' in ',
@@ -145,13 +166,13 @@ define([
     assert(function (cb, msg) {
         msg.appendChild(h('span', [
             "Your browser was not able to load an iframe using the origin specified as ",
-            h('code', "httpSafeOrigin"),
+            code("httpSafeOrigin"),
             " (",
             ApiConfig.httpSafeOrigin,
             ") in ",
             CONFIG_PATH(),
             ". This can be caused by an invalid ",
-            h('code', 'httpUnsafeDomain'),
+            code('httpUnsafeDomain'),
             ', invalid CSP configuration in your reverse proxy, invalid SSL certificates, and many other factors. ',
             'More information about your particular error may be found in your browser console. ',
             RESTART_WARNING(),
@@ -169,10 +190,13 @@ define([
         }).nThen(function () {
             // Iframe is loaded
             clearTimeout(to);
+            console.log("removing sandbox iframe");
+            $('iframe#sbox-iframe').remove();
             cb(true);
         });
     });
 
+    var shared_websocket;
     // Test Websocket
     var evWSError = Util.mkEvent(true);
     assert(function (_cb, msg) {
@@ -185,6 +209,7 @@ define([
         }));
 
         var ws = new WebSocket(NetConfig.getWebsocketURL());
+        shared_websocket = ws;
         var to = setTimeout(function () {
             console.error('Websocket TIMEOUT');
             evWSError.fire();
@@ -203,6 +228,7 @@ define([
     });
 
     // Test login block
+    var shared_realtime;
     assert(function (_cb, msg) {
         var websocketErr = "No WebSocket available";
         var cb = Util.once(Util.both(_cb, function (status) {
@@ -221,7 +247,7 @@ define([
             msg.appendChild(h('span', [
                 "Unable to create, retrieve, or remove encrypted credentials from the server. ",
                 "This is most commonly caused by a mismatch between the value of the  ",
-                h('code', 'blockPath'),
+                code('blockPath'),
                 ' value configured in ',
                 CONFIG_PATH(),
                 " and the corresponding settings in your reverse proxy's configuration file,",
@@ -230,6 +256,11 @@ define([
             ]));
         }));
 
+        // time out after 30 seconds
+        setTimeout(function () {
+            cb('TIMEOUT');
+        }, 30000);
+
         var bytes = new Uint8Array(Login.requiredBytes);
 
         var opt = Login.allocateBytes(bytes);
@@ -237,7 +268,7 @@ define([
         var blockUrl = Login.Block.getBlockUrl(opt.blockKeys);
         var blockRequest = Login.Block.serialize("{}", opt.blockKeys);
         var removeRequest = Login.Block.remove(opt.blockKeys);
-        console.log('Test block URL:', blockUrl);
+        console.warn('Testing block URL (%s). One 404 is normal.', blockUrl);
 
         var userHash = '/2/drive/edit/000000000000000000000000';
         var secret = Hash.getSecrets('drive', userHash);
@@ -264,7 +295,7 @@ define([
                     console.error("Can't create new channel. This may also be a websocket issue.");
                     return void cb(false);
                 }
-                RT = rt;
+                shared_realtime = RT = rt;
                 var proxy = rt.proxy;
                 proxy.edPublic = opt.edPublic;
                 proxy.edPrivate = opt.edPrivate;
@@ -330,14 +361,13 @@ define([
         }).nThen(function () {
             cb(true);
         });
-
     });
 
     var sheetURL = '/common/onlyoffice/v4/web-apps/apps/spreadsheeteditor/main/index.html';
 
     assert(function (cb, msg) {
         msg.innerText = "Missing HTTP headers required for .xlsx export from sheets. ";
-        var url = sheetURL;
+        var url = cacheBuster(sheetURL);
         var expect = {
             'cross-origin-resource-policy': 'cross-origin',
             'cross-origin-embedder-policy': 'require-corp',
@@ -351,11 +381,11 @@ define([
                     if (response !== expect[k]) {
                         msg.appendChild(h('span', [
                             'A value of ',
-                            h('code', expect[k]),
+                            code(expect[k]),
                             ' was expected for the ',
-                            h('code', k),
+                            code(k),
                             ' HTTP header, but instead a value of "',
-                            h('code', response),
+                            code(response),
                             '" was received.',
                         ]));
                         return true; // returning true indicates that a value is incorrect
@@ -366,67 +396,55 @@ define([
     });
 
     assert(function (cb, msg) {
-        msg.innerText = "Missing HTTP header required to disable Google's Floc.";
-        $.ajax('/?'+ (+new Date()), {
-            complete: function (xhr) {
-                cb(xhr.getResponseHeader('permissions-policy') === 'interest-cohort=()');
-            },
-        });
-    });
+        setWarningClass(msg);
 
-    assert(function (cb, msg) {
-        msg = msg;
-        return void cb(true);
-        /*
-        msg.appendChild(h('span', [
-            "The spreadsheet editor's code was not served with the required Content-Security Policy headers. ",
-            "This is most often caused by incorrectly configured sandbox parameters (",
-            h('code', 'httpUnsafeOrigin'),
-            ' and ',
-            h('code', 'httpSafeOrigin'),
-            ' in ',
-            CONFIG_PATH,
-            "), or settings in your reverse proxy's configuration which don't match your application server's config. ",
-            RESTART_WARNING(),
-        ]));
+        var printMessage = function (value) {
+            msg.appendChild(h('span', [
+                "This instance hasn't opted out of participation in Google's ",
+                code('FLoC'),
+                " targeted advertizing network. ",
+
+                "This can be done by setting a ",
+                code('permissions-policy'),
+                " HTTP header with a value of ",
+                code('"interest-cohort=()"'),
+                " in the configuration of its reverse proxy instead of the current value (",
+                code(value),
+                "). See the provided NGINX configuration file for an example. ",
+
+                h('p', [
+                    link("https://www.eff.org/deeplinks/2021/04/am-i-floced-launch", 'Learn more'),
+                ]),
+            ]));
+        };
 
-        $.ajax(sheetURL, {
+        $.ajax('/?'+ (+new Date()), {
             complete: function (xhr) {
-                var csp = xhr.getResponseHeader('Content-Security-Policy');
-                if (!/unsafe\-eval/.test(csp)) {
-                    // OnlyOffice requires unsafe-eval
-                    console.error('CSP', csp);
-                    return cb("expected 'unsafe-eval'");
-                }
-                if (!/unsafe\-inline/.test(csp)) {
-                    // OnlyOffice also requires unsafe-inline
-                    console.error('CSP', csp);
-                    return cb("expected 'unsafe-inline'");
-                }
-                cb(true);
+                var header = xhr.getResponseHeader('permissions-policy');
+                printMessage(JSON.stringify(header));
+                cb(header === 'interest-cohort=()' || header);
             },
-        }); */
+        });
     });
 
     assert(function (cb, msg) {
         msg.appendChild(h('span', [
-            h('code', '/api/broadcast'),
+            code('/api/broadcast'),
             " could not be loaded. This can be caused by an outdated application server or an incorrectly configured reverse proxy. ",
             "Even if the most recent code has been downloaded it's possible the application server has not been restarted. ",
             "Your browser console may provide more details as to why this resource could not be loaded. ",
         ]));
 
-        $.ajax('/api/broadcast', {
+        $.ajax(cacheBuster('/api/broadcast'), {
             dataType: 'text',
             complete: function (xhr) {
-                console.log(xhr);
                 cb(xhr.status === 200);
             },
         });
     });
 
-    var checkAPIHeaders = function (url, cb) {
-        $.ajax(url, {
+    var checkAPIHeaders = function (url, msg, cb) {
+        $.ajax(cacheBuster(url), {
             dataType: 'text',
             complete: function (xhr) {
                 var allHeaders = xhr.getAllResponseHeaders();
@@ -445,15 +463,31 @@ define([
 
                 var expect = {
                     'cross-origin-resource-policy': 'cross-origin',
+                    'cross-origin-embedder-policy': 'require-corp',
                 };
-                var incorrect = Object.keys(expect).some(function (k) {
+                var incorrect = false;
+
+                Object.keys(expect).forEach(function (k) {
                     var response = xhr.getResponseHeader(k);
-                    if (response !== expect[k]) {
-                        return true;
+                    var expected = expect[k];
+                    if (response !== expected) {
+                        incorrect = true;
+                        msg.appendChild(h('p', [
+                            'The ',
+                            code(k),
+                            ' header for ',
+                            code(url),
+                            " is '",
+                            code(response),
+                            "' instead of '",
+                            code(expected),
+                            "' as expected.",
+                        ]));
+
                     }
                 });
 
-                if (duplicated || incorrect) { console.error(allHeaders); }
+                if (duplicated || incorrect) { console.debug(allHeaders); }
                 cb(!duplicated && !incorrect);
             },
         });
@@ -464,19 +498,15 @@ define([
     assert(function (cb, msg) {
         var url = '/api/config';
         msg.innerText = url + INCORRECT_HEADER_TEXT;
-        checkAPIHeaders(url, cb);
+        checkAPIHeaders(url, msg, cb);
     });
 
     assert(function (cb, msg) {
         var url = '/api/broadcast';
         msg.innerText = url + INCORRECT_HEADER_TEXT;
-        checkAPIHeaders(url, cb);
+        checkAPIHeaders(url, msg, cb);
     });
 
-    var setWarningClass = function (msg) {
-        $(msg).removeClass('cp-danger').addClass('cp-warning');
-    };
-
     assert(function (cb, msg) {
         var email = ApiConfig.adminEmail;
         if (typeof(email) === 'string' && email && email !== 'i.did.not.read.my.config@cryptpad.fr') {
@@ -486,10 +516,11 @@ define([
         setWarningClass(msg);
         msg.appendChild(h('span', [
             'This instance does not provide a valid ',
-            h('code', 'adminEmail'),
+            code('adminEmail'),
             ' which can make it difficult to contact its adminstrator to report vulnerabilities or abusive content.',
-            ' This can be configured in ', CONFIG_PATH(), '. ',
-            RESTART_WARNING(),
+            " This can be configured on your instance's admin panel. Use the provided ",
+            code("Flush cache'"),
+            " button for this change to take effect for all users.",
         ]));
         cb(email);
     });
@@ -499,12 +530,9 @@ define([
         setWarningClass(msg);
         msg.appendChild(h('span', [
             "This instance's encrypted support ticket functionality has not been enabled. This can make it difficult for its users to safely report issues that concern sensitive information. ",
-            "This can be configured via the ",
-            h('code', 'supportMailbox'),
-            " attribute in ",
-            CONFIG_PATH(),
-            ". ",
-            RESTART_WARNING(),
+            "This can be configured via the admin panel's ",
+            code('Support'),
+            " tab.",
         ]));
         cb(support && typeof(support) === 'string' && support.length === 44);
     });
@@ -517,7 +545,7 @@ define([
         setWarningClass(msg);
         msg.appendChild(h('span', [
             "This instance has not been configured to support web administration. This can be enabled by adding a registered user's public signing key to the ",
-            h('code', 'adminKeys'),
+            code('adminKeys'),
             ' array in ',
             CONFIG_PATH(),
             '. ',
@@ -526,6 +554,331 @@ define([
         cb(false);
     });
 
+    var response = Util.response(function (err) {
+        console.error('SANDBOX_ERROR', err);
+    });
+
+    var sandboxIframe = h('iframe', {
+        class: 'sandbox-test',
+        src: cacheBuster(trimmedSafe + '/checkup/sandbox/index.html'),
+    });
+    document.body.appendChild(sandboxIframe);
+
+    var sandboxIframeReady = Util.mkEvent(true);
+    setTimeout(function () {
+        sandboxIframeReady.fire("TIMEOUT");
+    }, 10 * 1000);
+
+    var postMessage = function (content, cb) {
+        try {
+            var txid = Util.uid();
+            content.txid = txid;
+            response.expect(txid, cb, 15000);
+            sandboxIframe.contentWindow.postMessage(JSON.stringify(content), '*');
+        } catch (err) {
+            console.error(err);
+        }
+    };
+
+    var deferredPostMessage = function (content, _cb) {
+        var cb = Util.once(Util.mkAsync(_cb));
+        nThen(function (w) {
+            sandboxIframeReady.reg(w(function (err) {
+                if (!err) { return; }
+                w.abort();
+                cb(err);
+            }));
+        }).nThen(function () {
+            postMessage(content, cb);
+        });
+    };
+
+    window.addEventListener('message', function (event) {
+        try {
+            var msg = JSON.parse(event.data);
+            if (msg.command === 'READY') { return void sandboxIframeReady.fire(); }
+            if (msg.q === "READY") { return; } // ignore messages from the usual sandboxed iframe
+            var txid = msg.txid;
+            if (!txid) { return console.log("no handler for ", txid); }
+            response.handle(txid, msg.content);
+        } catch (err) {
+            console.error(event);
+            console.error(err);
+        }
+    });
+
+    var parseCSP = function (CSP) {
+        //console.error(CSP);
+        var CSP_headers = {};
+        CSP.split(";")
+        .forEach(function (rule) {
+            rule = (rule || "").trim();
+            if (!rule) { return; }
+            var parts = rule.split(/\s/);
+                var first = parts[0];
+                var rest = rule.slice(first.length + 1);
+                CSP_headers[first] = rest;
+                //console.error(rule.trim());
+                //console.info("[%s] '%s'", first, rest);
+            });
+        return CSP_headers;
+    };
+
+    var hasUnsafeEval = function (CSP_headers) {
+        return /unsafe\-eval/.test(CSP_headers['script-src']);
+    };
+
+    var hasUnsafeInline = function (CSP_headers) {
+        return /unsafe\-inline/.test(CSP_headers['script-src']);
+    };
+
+    var hasOnlyOfficeHeaders = function (CSP_headers) {
+        if (!hasUnsafeEval(CSP_headers)) {
+            console.error("NO_UNSAFE_EVAL");
+            console.log(CSP_headers);
+            return false;
+        }
+        if (!hasUnsafeInline(CSP_headers)) {
+            console.error("NO_UNSAFE_INLINE");
+            return void false;
+        }
+        return true;
+    };
+
+    var CSP_WARNING = function (url) {
+         return h('span', [
+            code(url),
+            ' does not have the required ',
+            code("'content-security-policy'"),
+            ' headers set. This is most often related to incorrectly configured sandbox domains or reverse proxies.',
+        ]);
+    };
+
+    assert(function (_cb, msg) {
+        var url = '/sheet/inner.html';
+        var cb = Util.once(Util.mkAsync(_cb));
+        msg.appendChild(CSP_WARNING(url));
+        deferredPostMessage({
+            command: 'GET_HEADER',
+            content: {
+                url: url,
+                header: 'content-security-policy',
+            },
+        }, function (content) {
+            var CSP_headers = parseCSP(content);
+            cb(hasOnlyOfficeHeaders(CSP_headers));
+        });
+    });
+
+    assert(function (cb, msg) {
+        var url = '/common/onlyoffice/v4/web-apps/apps/spreadsheeteditor/main/index.html';
+        msg.appendChild(CSP_WARNING(url));
+        deferredPostMessage({
+            command: 'GET_HEADER',
+            content: {
+                url: url,
+                header: 'content-security-policy',
+            },
+        }, function (content) {
+            var CSP_headers = parseCSP(content);
+            cb(hasOnlyOfficeHeaders(CSP_headers));
+        });
+    });
+
+    assert(function (cb, msg) {
+        var url = '/sheet/inner.html';
+        msg.appendChild(h('span', [
+            code(url),
+            ' does not have the required ',
+            code("'cross-origin-opener-policy'"),
+            ' headers set.',
+        ]));
+        deferredPostMessage({
+            command: 'GET_HEADER',
+            content: {
+                url: url,
+                header: 'cross-origin-opener-policy',
+            },
+        }, function (content) {
+            cb(content === 'same-origin');
+        });
+    });
+
+    var safariGripe = function () {
+        return h('p.cp-notice-other', 'This is expected because Safari and platforms that use its engine lack commonly supported functionality.');
+    };
+
+    var browserIssue = function () {
+        return h('p.cp-notice-other', 'This test checks for the presence of features in your browser and is not necessarily caused by server misconfiguration.');
+    };
+
+    assert(function (cb, msg) {
+        cb = Util.once(cb);
+        setWarningClass(msg);
+        var notice = h('span', [
+            h('p', 'It appears that some features required for Office file format conversion are not present.'),
+            Tools.isSafari()? safariGripe(): undefined,
+            browserIssue(),
+        ]);
+
+        msg.appendChild(notice);
+
+        var expected = [
+            'Atomics',
+            'SharedArrayBuffer',
+            'WebAssembly',
+            ['WebAssembly', 'Memory'],
+            ['WebAssembly', 'instantiate'],
+            ['WebAssembly', 'instantiateStreaming'],
+            ['Buffer', 'from'],
+
+            'SharedWorker',
+            'worker',
+            'crossOriginIsolated',
+        ];
+
+        var responses = {};
+
+        nThen(function (w) {
+            deferredPostMessage({
+                command: 'CHECK_JS_APIS',
+                content: {
+                    globals: expected,
+                },
+            }, w(function (response) {
+                Util.extend(responses, response);
+            }));
+
+            deferredPostMessage({
+                command: 'FANCY_API_CHECKS',
+                content: {
+                },
+            }, w(function (response) {
+                Util.extend(responses, response);
+            }));
+        }).nThen(function () {
+            if (!responses.Atomics || !responses.WebAssembly) {
+                return void cb(responses);
+            }
+            if (responses.SharedArrayBuffer || responses.SharedArrayBufferFallback) {
+                return cb(true);
+            }
+            return void cb(response);
+        });
+    });
+
+    var isHTTPS = function (host) {
+        return /^https:\/\//.test(host);
+    };
+
+    var isOnion = function (host) {
+        return /\.onion$/.test(host);
+    };
+    var isLocalhost = function (host) {
+        return /^http:\/\/localhost/.test(host);
+    };
+
+    assert(function (cb, msg) {
+        // provide an exception for development instances
+        if (isLocalhost(trimmedUnsafe) && isLocalhost(window.location.href)) { return void cb(true); }
+
+        // if both the main and sandbox domains are onion addresses
+        // then the HTTPS requirement is unnecessary
+        if (isOnion(trimmedUnsafe) && isOnion(trimmedSafe)) { return void cb(true); }
+
+        // otherwise expect that both inner and outer domains use HTTPS
+        msg.appendChild(h('span', [
+            "Both ",
+            code('httpUnsafeOrigin'),
+            ' and ',
+            code('httpSafeOrigin'),
+            ' should be accessed via HTTPS for production use. ',
+            "This can be configured via ",
+            CONFIG_PATH(),
+            '. ',
+            RESTART_WARNING(),
+        ]));
+        cb(isHTTPS(trimmedUnsafe) && isHTTPS(trimmedSafe));
+    });
+
+    [
+        'sheet',
+        'presentation',
+        'doc',
+        'convert',
+    ].forEach(function (url) {
+        assert(function (cb, msg) {
+            var header = 'cross-origin-opener-policy';
+            var expected = 'same-origin';
+            deferredPostMessage({
+                command: 'GET_HEADER',
+                content: {
+                    url: '/' + url + '/',
+                    header: header,
+                }
+            }, function (content) {
+                msg.appendChild(h('span', [
+                    code(url),
+                    ' was served without the correct ',
+                    code(header),
+                    ' HTTP header value (',
+                    code(expected),
+                    '). This will interfere with your ability to convert between office file formats.'
+                ]));
+                cb(content === expected);
+            });
+        });
+    });
+
+/*
+    assert(function (cb, msg) {
+        setWarningClass(msg);
+        $.ajax(cacheBuster('/'), {
+            dataType: 'text',
+            complete: function (xhr) {
+                var serverToken = xhr.getResponseHeader('server');
+                if (serverToken === null) { return void cb(true); }
+
+                var lowered = (serverToken || '').toLowerCase();
+                var family;
+
+                ['Apache', 'Caddy', 'NGINX'].some(function (pattern) {
+                    if (lowered.indexOf(pattern.toLowerCase()) !== -1) {
+                        family = pattern;
+                        return true;
+                    }
+                });
+
+                var text = [
+                    "This instance is set to respond with an HTTP ",
+                    code("server"),
+                    " header. This information can make it easier for attackers to find and exploit known vulnerabilities. ",
+                ];
+
+                if (family === 'NGINX') { // FIXME incorrect instructions for HTTP2. needs a recompile?
+                    msg.appendChild(h('span', text.concat([
+                        "This can be addressed by setting ",
+                        code("server_tokens off"),
+                        " in your global NGINX config."
+                    ])));
+                    return void cb(serverToken);
+                }
+
+                // handle other
+                msg.appendChild(h('span', text.concat([
+                    "In this case, it appears that the host server is running ",
+                    code(serverToken),
+                    " instead of ",
+                    code("NGINX"),
+                    " as recommended. As such, you may not benefit from the latest security enhancements that are tested and maintained by the CryptPad development team.",
+                ])));
+
+                cb(serverToken);
+            }
+        });
+    });
+*/
+
     if (false) {
         assert(function (cb, msg) {
             msg.innerText = 'fake test to simulate failure';
@@ -540,12 +893,21 @@ define([
     };
 
     var failureReport = function (obj) {
+        var printableValue = obj.output;
+        try {
+            printableValue = JSON.stringify(obj.output, null, ' ');
+        } catch (err) {
+            console.error(err);
+        }
+
         return h('div.error', [
             h('h5', obj.message),
-            h('table', [
-                row(["Failed test number", obj.test + 1]),
-                row(["Returned value", obj.output]),
-            ]),
+            h('div.table-container',
+                h('table', [
+                    row(["Failed test number", obj.test + 1]),
+                    row(["Returned value", h('pre', code(printableValue))]),
+                ])
+            ),
         ]);
     };
 
@@ -553,7 +915,7 @@ define([
     var $progress = $('#cp-progress');
 
     var versionStatement = function () {
-        return h('p', [
+        return h('p.cp--notice-version', [
             "This instance is running ",
             h('span.cp-app-checkup-version',[
                 "CryptPad",
@@ -564,6 +926,16 @@ define([
         ]);
     };
 
+    var browserStatement = function () {
+        var name = Tools.guessBrowser();
+        if (!name) { return; }
+        return h('p.cp-notice-browser', [
+            "You appear to be using a ",
+            h('span.cp-app-checkup-browser', name),
+            ' browser to view this page.',
+        ]);
+    };
+
     Assert.run(function (state) {
         var errors = state.errors;
         var failed = errors.length;
@@ -574,10 +946,11 @@ define([
 
         var failedDetails = "Details found below";
         var successDetails = "This checkup only tests the most common configuration issues. You may still experience errors or incorrect behaviour.";
-        var details = h('p', failed? failedDetails: successDetails);
+        var details = h('p.cp-notice-details', failed? failedDetails: successDetails);
 
         var summary = h('div.summary.' + statusClass, [
             versionStatement(),
+            browserStatement(),
             h('p', Messages._getKey('assert_numberOfTestsPassed', [
                 state.passed,
                 state.total
@@ -592,6 +965,14 @@ define([
 
         $progress.remove();
         $('body').prepend(report);
+        try {
+            console.log('closing shared websocket');
+            shared_websocket.close();
+        } catch (err) { console.error(err); }
+        try {
+            console.log('closing shared realtime');
+            shared_realtime.network.disconnect();
+        } catch (err) { console.error(err); }
     }, function (i, total) {
         console.log('test '+ i +' completed');
         completed++;
diff --git a/www/checkup/sandbox/index.html b/www/checkup/sandbox/index.html
new file mode 100644
index 000000000..04a9502d3
--- /dev/null
+++ b/www/checkup/sandbox/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+    <script data-bootload="main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
+</head>
+<body>
+<div id="cp-progress"></div>
+<iframe-placeholder>
+
diff --git a/www/checkup/sandbox/main.js b/www/checkup/sandbox/main.js
new file mode 100644
index 000000000..272db91a4
--- /dev/null
+++ b/www/checkup/sandbox/main.js
@@ -0,0 +1,78 @@
+define([
+    'jquery',
+    '/common/common-util.js',
+    '/checkup/checkup-tools.js',
+
+    '/bower_components/tweetnacl/nacl-fast.min.js',
+    'css!/bower_components/components-font-awesome/css/font-awesome.min.css',
+    'less!/checkup/app-checkup.less',
+], function ($, Util, Tools) {
+    var postMessage = function (content) {
+        window.parent.postMessage(JSON.stringify(content), '*');
+    };
+    postMessage({ command: "READY", });
+    var getHeaders = function (url, cb) {
+        $.ajax(url + "?test=" + (+new Date()), {
+            dataType: 'text',
+            complete: function (xhr) {
+                var allHeaders = xhr.getAllResponseHeaders();
+                return void cb(void 0, allHeaders, xhr);
+            },
+        });
+    };
+    var COMMANDS = {};
+    COMMANDS.GET_HEADER = function (content, cb) {
+        var url = content.url;
+        getHeaders(url, function (err, headers, xhr) {
+            cb(xhr.getResponseHeader(content.header));
+        });
+    };
+
+    COMMANDS.CHECK_JS_APIS = function (content, cb) {
+        var globalAPIs = content['globals'] || [];
+        var response = {};
+        globalAPIs.forEach(function (key) {
+            if (Array.isArray(key)) {
+                response[key.join('.')] = Boolean(Util.find(window, key));
+                return;
+            }
+
+            response[key] = Boolean(window[key]);
+        });
+        cb(response);
+    };
+
+    COMMANDS.FANCY_API_CHECKS = function (content, cb) {
+        cb({
+            SharedArrayBufferFallback: Tools.supportsSharedArrayBuffers(),
+        });
+    };
+
+    window.addEventListener("message", function (event) {
+        var txid, command;
+        if (event && event.data) {
+            try {
+                //console.log(JSON.parse(event.data));
+                var msg = JSON.parse(event.data);
+                command = msg.command;
+                txid = msg.txid;
+                if (!txid) { return; }
+                COMMANDS[command](msg.content, function (response) {
+                    // postMessage with same txid
+                    postMessage({
+                        txid: txid,
+                        content: response,
+                    });
+                });
+            } catch (err) {
+                postMessage({
+                    txid: txid,
+                    content: err,
+                });
+                console.error(err, command);
+            }
+        } else {
+            console.error(event);
+        }
+    });
+});
diff --git a/www/code/inner.js b/www/code/inner.js
index 2eb433c01..4f6c0308e 100644
--- a/www/code/inner.js
+++ b/www/code/inner.js
@@ -257,8 +257,8 @@ define([
                 'class': 'cp-splitter'
             }).appendTo($previewContainer);
 
-            $preview.on('scroll', function() {
-                splitter.css('top', $preview.scrollTop() + 'px');
+            $previewContainer.on('scroll', function() {
+                splitter.css('top', $previewContainer.scrollTop() + 'px');
             });
 
             var $target = $codeMirrorContainer;
@@ -368,7 +368,7 @@ define([
     var mkFilePicker = function (framework, editor, evModeChange) {
         evModeChange.reg(function (mode) {
             if (MEDIA_TAG_MODES.indexOf(mode) !== -1) {
-                // Embedding is endabled
+                // Embedding is enabled
                 framework.setMediaTagEmbedder(function (mt) {
                     editor.focus();
                     editor.replaceSelection($(mt)[0].outerHTML);
@@ -507,7 +507,7 @@ define([
                     var fileHost = privateData.fileHost || privateData.origin;
                     var src = fileHost + Hash.getBlobPathFromHex(secret.channel);
                     var key = Hash.encodeBase64(secret.keys.cryptKey);
-                    var mt = '<media-tag src="' + src + '" data-crypto-key="cryptpad:' + key + '"></media-tag>';
+                    var mt = UI.mediaTag(src, key).outerHTML;
                     editor.replaceSelection(mt);
                 }
             };
diff --git a/www/common/application_config_internal.js b/www/common/application_config_internal.js
index c7b66c1e5..3be979f17 100644
--- a/www/common/application_config_internal.js
+++ b/www/common/application_config_internal.js
@@ -4,15 +4,15 @@
  * file (make a copy from /customize.dist/application_config.js)
  */
 define(function() {
-    var config = {};
+    var AppConfig = {};
 
     /* Select the buttons displayed on the main page to create new collaborative sessions.
      * Removing apps from the list will prevent users from accessing them. They will instead be
      * redirected to the drive.
      * You should never remove the drive from this list.
      */
-    config.availablePadTypes = ['drive', 'teams', 'pad', 'sheet', 'code', 'slide', 'poll', 'kanban', 'whiteboard',
-                                /*'doc', 'presentation',*/ 'file', /*'todo',*/ 'contacts' /*, 'calendar' */];
+    AppConfig.availablePadTypes = ['drive', 'teams', 'pad', 'sheet', 'code', 'slide', 'poll', 'kanban', 'whiteboard',
+                                /*'doc', 'presentation',*/ 'file', /*'todo',*/ 'contacts', 'form', 'convert'];
     /* The registered only types are apps restricted to registered users.
      * You should never remove apps from this list unless you know what you're doing. The apps
      * listed here by default can't work without a user account.
@@ -20,7 +20,13 @@ define(function() {
      * users and these users will be redirected to the login page if they still try to access
      * the app
      */
-    config.registeredOnlyTypes = ['file', 'contacts', 'notifications', 'support'];
+    AppConfig.registeredOnlyTypes = ['file', 'contacts', 'notifications', 'support'];
+
+    // to prevent apps that aren't officially supported from showing up
+    // in the document creation modal
+    AppConfig.hiddenTypes = ['drive', 'teams', 'contacts', 'todo', 'file', 'accounts', 'calendar', 'poll', 'convert',
+    //'doc', 'presentation'
+    ];
 
     /* CryptPad is available is multiple languages, but only English and French are maintained
      * by the developers. The other languages may be outdated, and any missing string for a langauge
@@ -30,37 +36,37 @@ define(function() {
      * can be found at the top of the file `/customize.dist/messages.js`. The list should only
      * contain languages code ('en', 'fr', 'de', 'pt-br', etc.), not their full name.
      */
-    //config.availableLanguages = ['en', 'fr', 'de'];
+    //AppConfig.availableLanguages = ['en', 'fr', 'de'];
 
     /* You can display a link to the imprint (legal notice) of your website in the static pages
      * footer. To do so, you can either set the following value to `true` and create an imprint.html page
      * in the `customize` directory. You can also set it to an absolute URL if your imprint page already exists.
      */
-    config.imprint = false;
-    // config.imprint = true;
-    // config.imprint = 'https://xwiki.com/en/company/legal-notice';
+    AppConfig.imprint = false;
+    // AppConfig.imprint = true;
+    // AppConfig.imprint = 'https://xwiki.com/en/company/legal-notice';
 
     /* You can display a link to your own privacy policy in the static pages footer.
      * To do so, set the following value to the absolute URL of your privacy policy.
      */
-    // config.privacy = 'https://xwiki.com/en/company/PrivacyPolicy';
+    // AppConfig.privacy = 'https://xwiki.com/en/company/PrivacyPolicy';
 
     /* We (the project's developers) include the ability to display a 'Roadmap' in static pages footer.
      * This is disabled by default.
      * We use this to publish the project's development roadmap, but you can use it however you like.
      * To do so, set the following value to an absolute URL.
      */
-    //config.roadmap = 'https://cryptpad.fr/kanban/#/2/kanban/view/PLM0C3tFWvYhd+EPzXrbT+NxB76Z5DtZhAA5W5hG9wo/';
+    //AppConfig.roadmap = 'https://cryptpad.fr/kanban/#/2/kanban/view/PLM0C3tFWvYhd+EPzXrbT+NxB76Z5DtZhAA5W5hG9wo/';
 
     /*  Cryptpad apps use a common API to display notifications to users
      *  by default, notifications are hidden after 5 seconds
      *  You can change their duration here (measured in milliseconds)
      */
-    config.notificationTimeout = 5000;
-    config.disableUserlistNotifications = false;
+    AppConfig.notificationTimeout = 5000;
+    AppConfig.disableUserlistNotifications = false;
 
     // Update the default colors available in the whiteboard application
-    config.whiteboardPalette = [
+    AppConfig.whiteboardPalette = [
         '#000000', // black
         '#FFFFFF', // white
         '#848484', // grey
@@ -82,14 +88,14 @@ define(function() {
     // Background color in the apps with centered content:
     // - file app in view mode
     // - rich text app when editor's width reduced in settings
-    config.appBackgroundColor = '#666';
+    AppConfig.appBackgroundColor = '#666';
 
     // Set enableTemplates to false to remove the button allowing users to save a pad as a template
     // and remove the template category in CryptDrive
-    config.enableTemplates = true;
+    AppConfig.enableTemplates = true;
 
     // Set enableHistory to false to remove the "History" button in all the apps.
-    config.enableHistory = true;
+    AppConfig.enableHistory = true;
 
     /*  user passwords are hashed with scrypt, and salted with their username.
         this value will be appended to the username, causing the resulting hash
@@ -101,22 +107,24 @@ define(function() {
         created. Changing it at a later time will break logins for all existing
         users.
     */
-    config.loginSalt = '';
-    config.minimumPasswordLength = 8;
+    AppConfig.loginSalt = '';
+    AppConfig.minimumPasswordLength = 8;
 
     // Amount of time (ms) before aborting the session when the algorithm cannot synchronize the pad
-    config.badStateTimeout = 30000;
+    AppConfig.badStateTimeout = 30000;
 
     // Customize the icon used for each application.
     // You can update the colors by making a copy of /customize.dist/src/less2/include/colortheme.less
-    config.applicationsIcon = {
+    AppConfig.applicationsIcon = {
         file: 'cptools-file',
         fileupload: 'cptools-file-upload',
         folderupload: 'cptools-folder-upload',
+        link: 'fa-link',
         pad: 'cptools-richtext',
         code: 'cptools-code',
         slide: 'cptools-slide',
         poll: 'cptools-poll',
+        form: 'cptools-poll',
         whiteboard: 'cptools-whiteboard',
         todo: 'cptools-todo',
         contacts: 'fa-address-book',
@@ -130,50 +138,49 @@ define(function() {
 
     // Ability to create owned pads and expiring pads through a new pad creation screen.
     // The new screen can be disabled by the users in their settings page
-    config.displayCreationScreen = true;
+    AppConfig.displayCreationScreen = true;
 
     // Prevent anonymous users from storing pads in their drive
-    config.disableAnonymousStore = false;
+    // NOTE: this is only enforced client-side as the server does not distinguish between users drives and pads
+    AppConfig.disableAnonymousStore = false;
+    // Prevent anonymous users from creating new pads (they can still access and edit existing ones)
+    // NOTE: this is only enforced client-side and will not prevent malicious clients from storing data
+    AppConfig.disableAnonymousPadCreation = false;
 
     // Hide the usage bar in settings and drive
-    //config.hideUsageBar = true;
+    //AppConfig.hideUsageBar = true;
 
     // Disable feedback for all the users and hide the settings part about feedback
-    //config.disableFeedback = true;
-
-    // Add new options in the share modal (extend an existing tab or add a new tab).
-    // More info about how to use it on the wiki:
-    // https://github.com/xwiki-labs/cryptpad/wiki/Application-config#configcustomizeshareoptions
-    //config.customizeShareOptions = function (hashes, tabs, config) {};
+    //AppConfig.disableFeedback = true;
 
     // Add code to be executed on every page before loading the user object. `isLoggedIn` (bool) is
     // indicating if the user is registered or anonymous. Here you can change the way anonymous users
     // work in CryptPad, use an external SSO or even force registration
     // *NOTE*: You have to call the `callback` function to continue the loading process
-    //config.beforeLogin = function(isLoggedIn, callback) {};
+    //AppConfig.beforeLogin = function(isLoggedIn, callback) {};
 
     // Add code to be executed on every page after the user object is loaded (also work for
     // unregistered users). This allows you to interact with your users' drive
     // *NOTE*: You have to call the `callback` function to continue the loading process
-    //config.afterLogin = function(api, callback) {};
+    //AppConfig.afterLogin = function(api, callback) {};
 
     // Disabling the profile app allows you to import the profile informations (display name, avatar)
     // from an external source and make sure the users can't change them from CryptPad.
-    // You can use config.afterLogin to import these values in the users' drive.
-    //config.disableProfile = true;
+    // You can use AppConfig.afterLogin to import these values in the users' drive.
+    //AppConfig.disableProfile = true;
 
     // Disable the use of webworkers and sharedworkers in CryptPad.
     // Workers allow us to run the websockets connection and open the user drive in a separate thread.
     // SharedWorkers allow us to load only one websocket and one user drive for all the browser tabs,
     // making it much faster to open new tabs.
-    config.disableWorkers = false;
+    AppConfig.disableWorkers = false;
 
     // Teams are always loaded during the initial loading screen (for the first tab only if
     // SharedWorkers are available). Allowing users to be members of multiple teams can
     // make them have a very slow loading time. To avoid impacting the user experience
     // significantly, we're limiting the number of teams per user to 3 by default.
     // You can change this value here.
-    //config.maxTeamsSlots = 5;
+    //AppConfig.maxTeamsSlots = 5;
 
     // Each team is considered as a registered user by the server. Users and teams are indistinguishable
     // in the database so teams will offer the same storage limits as users by default.
@@ -181,7 +188,7 @@ define(function() {
     // We're limiting the number of teams each user is able to own to 1 in order to make sure
     // users don't use "fake" teams (1 member) just to increase their storage limit.
     // You can change the value here.
-    // config.maxOwnedTeams = 5;
+    // AppConfig.maxOwnedTeams = 5;
 
     // The userlist displayed in collaborative documents is stored alongside the document data.
     // Everytime someone with edit rights joins a document or modify their user data (display
@@ -192,14 +199,14 @@ define(function() {
     // position of other users' cursor. You can configure the number of user from which the session
     // will enter into degraded mode. A big number may result in collaborative edition being broken,
     // but this number depends on the network and CPU performances of each user's device.
-    config.degradedLimit = 8;
+    AppConfig.degradedLimit = 8;
 
     // In "legacy" mode, one-time users were always creating an "anonymous" drive when visiting CryptPad
     // in which they could store their pads. The new "driveless" mode allow users to open an existing
     // pad without creating a drive in the background. The drive will only be created if they visit
     // a different page (Drive, Settings, etc.) or try to create a new pad themselves. You can disable
     // the driveless mode by changing the following value to "false"
-    config.allowDrivelessMode = true;
+    AppConfig.allowDrivelessMode = true;
 
-    return config;
+    return AppConfig;
 });
diff --git a/www/common/clipboard.js b/www/common/clipboard.js
index 191895dfd..7d93e15f3 100644
--- a/www/common/clipboard.js
+++ b/www/common/clipboard.js
@@ -1,13 +1,15 @@
 define(['jquery'], function ($) {
     var Clipboard = {};
 
-    // copy arbitrary text to the clipboard
-    // return boolean indicating success
-    Clipboard.copy = function (text) {
+    var copy = function (text, multiline) {
         var $ta = $('<input>', {
             type: 'text',
         }).val(text);
 
+        if (multiline) {
+            $ta = $('<textarea>').val(text);
+        }
+
         $('body').append($ta);
 
         if (!($ta.length && $ta[0].select)) {
@@ -29,5 +31,15 @@ define(['jquery'], function ($) {
         return success;
     };
 
+    // copy arbitrary text to the clipboard
+    // return boolean indicating success
+    Clipboard.copy = function (text) {
+        return copy(text);
+    };
+
+    Clipboard.copy.multiline = function (text) {
+        return copy(text, true);
+    };
+
     return Clipboard;
 });
diff --git a/www/common/common-constants.js b/www/common/common-constants.js
index 0a1c1d7f6..fd4d1474b 100644
--- a/www/common/common-constants.js
+++ b/www/common/common-constants.js
@@ -10,6 +10,7 @@ define(['/customize/application_config.js'], function (AppConfig) {
         oldStorageKey: 'CryptPad_RECENTPADS',
         storageKey: 'filesData',
         tokenKey: 'loginToken',
+        prefersDriveRedirectKey: 'prefersDriveRedirect',
         displayPadCreationScreen: 'displayPadCreationScreen',
         deprecatedKey: 'deprecated',
         MAX_TEAMS_SLOTS: AppConfig.maxTeamsSlots || 5,
diff --git a/www/common/common-hash.js b/www/common/common-hash.js
index cf3ca76a4..4b30d7100 100644
--- a/www/common/common-hash.js
+++ b/www/common/common-hash.js
@@ -34,6 +34,12 @@ var factory = function (Util, Crypto, Keys, Nacl) {
         var keyPair = Nacl.sign.keyPair.fromSecretKey(privateKey);
         return Nacl.util.encodeBase64(keyPair.publicKey);
     };
+    Hash.getCurvePublicFromPrivate = function (curvePrivateSafeStr) {
+        var curvePrivateStr = Crypto.b64AddSlashes(curvePrivateSafeStr);
+        var privateKey = Nacl.util.decodeBase64(curvePrivateStr);
+        var keyPair = Nacl.box.keyPair.fromSecretKey(privateKey);
+        return Nacl.util.encodeBase64(keyPair.publicKey);
+    };
 
     var getEditHashFromKeys = Hash.getEditHashFromKeys = function (secret) {
         var version = secret.version;
@@ -209,6 +215,17 @@ Version 4: Data URL when not a realtime link yet (new pad or "static" app)
         });
         return k ? Crypto.b64AddSlashes(k) : '';
     };
+    var getAuditorKey = function (hashArr) {
+        var k;
+        // Check if we have a ownerKey for this pad
+        hashArr.some(function (data) {
+            if (/^auditor=/.test(data)) {
+                k = data.slice(8);
+                return true;
+            }
+        });
+        return k ? Crypto.b64AddSlashes(k) : '';
+    };
     var getOwnerKey = function (hashArr) {
         var k;
         // Check if we have a ownerKey for this pad
@@ -231,6 +248,7 @@ Version 4: Data URL when not a realtime link yet (new pad or "static" app)
             parsed.present = options.indexOf('present') !== -1;
             parsed.embed = options.indexOf('embed') !== -1;
             parsed.versionHash = getVersionHash(options);
+            parsed.auditorKey = getAuditorKey(options);
             parsed.newPadOpts = getNewPadOpts(options);
             parsed.loginOpts = getLoginOpts(options);
             parsed.ownerKey = getOwnerKey(options);
@@ -272,6 +290,7 @@ Version 4: Data URL when not a realtime link yet (new pad or "static" app)
                     present: parsed.present,
                     ownerKey: parsed.ownerKey,
                     versionHash: parsed.versionHash,
+                    auditorKey: parsed.auditorKey,
                     newPadOpts: parsed.newPadOpts,
                     loginOpts: parsed.loginOpts,
                     password: parsed.password
@@ -298,6 +317,10 @@ Version 4: Data URL when not a realtime link yet (new pad or "static" app)
                 if (versionHash) {
                     hash += 'hash=' + Crypto.b64RemoveSlashes(versionHash) + '/';
                 }
+                var auditorKey = typeof(opts.auditorKey) !== "undefined" ? opts.auditorKey : parsed.auditorKey;
+                if (auditorKey) {
+                    hash += 'auditor=' + Crypto.b64RemoveSlashes(auditorKey) + '/';
+                }
                 if (opts.newPadOpts) { hash += 'newpad=' + opts.newPadOpts + '/'; }
                 if (opts.loginOpts) { hash += 'login=' + opts.loginOpts + '/'; }
                 return hash;
@@ -621,6 +644,27 @@ Version 4: Data URL when not a realtime link yet (new pad or "static" app)
         return hashes;
     };
 
+    Hash.getFormData = function (secret, hash, password) {
+        secret = secret || Hash.getSecrets('form', hash, password);
+        var keys = secret && secret.keys;
+        var secondary = keys && keys.secondaryKey;
+        if (!secondary) { return; }
+        var curvePair = Nacl.box.keyPair.fromSecretKey(Nacl.util.decodeUTF8(secondary).slice(0,32));
+        var ret = {};
+        ret.form_public = Nacl.util.encodeBase64(curvePair.publicKey);
+        var privateKey = ret.form_private = Nacl.util.encodeBase64(curvePair.secretKey);
+
+        var auditorHash = Hash.getViewHashFromKeys({
+            version: 1,
+            channel: secret.channel,
+            keys: { viewKeyStr: Nacl.util.encodeBase64(keys.cryptKey) }
+        });
+        var _parsed = Hash.parseTypeHash('pad', auditorHash);
+        ret.form_auditorHash = _parsed.getHash({auditorKey: privateKey});
+
+        return ret;
+    };
+
     // STORAGE
     Hash.hrefToHexChannelId = function (href, password) {
         var parsed = Hash.parsePadUrl(href);
diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index dbcb089f3..5aea35c78 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -41,6 +41,15 @@ define([
         return e;
     };
 
+    // FIXME almost everywhere this is used would also be
+    // a good candidate for sframe-common's getMediatagFromHref
+    UI.mediaTag = function (src, key) {
+        return h('media-tag', {
+            src: src,
+            'data-crypto-key': 'cryptpad:' + key,
+        });
+    };
+
     var findCancelButton = UI.findCancelButton = function (root) {
         if (root) {
             return $(root).find('button.cancel').last();
@@ -747,6 +756,7 @@ define([
             cb = Util.once(cb);
         }
         var classes = 'btn ' + (config.classes || 'btn-primary');
+        var newCls = config.new ? '.new' : '';
 
         var button = h('button', {
             "class": classes,
@@ -759,7 +769,7 @@ define([
         });
         var timer = h('div.cp-button-timer', div);
 
-        var content = h('div.cp-button-confirm', [
+        var content = h('div.cp-button-confirm'+newCls, [
             button,
             timer
         ]);
@@ -795,7 +805,8 @@ define([
             to = setTimeout(todo, INTERVAL);
         };
 
-        $(originalBtn).addClass('cp-button-confirm-placeholder').click(function (e) {
+        var newCls2 = config.new ? 'new' : '';
+        $(originalBtn).addClass('cp-button-confirm-placeholder').addClass(newCls2).click(function (e) {
             e.stopPropagation();
             // If we have a validation function, continue only if it's true
             if (config.validate && !config.validate()) { return; }
@@ -1039,6 +1050,7 @@ define([
             var font = icon.indexOf('cptools') === 0 ? 'cptools' : 'fa';
             if (type === 'fileupload') { type = 'file'; }
             if (type === 'folderupload') { type = 'file'; }
+            if (type === 'link') { type = 'drive'; }
             var appClass = ' cp-icon cp-icon-color-'+type;
             $icon = $('<span>', {'class': font + ' ' + icon + appClass});
         }
@@ -1050,6 +1062,7 @@ define([
         if (!data) { return $icon; }
         var href = data.href || data.roHref;
         var type = data.type;
+        if (data.static) { type = 'link'; }
         if (!href && !type) { return $icon; }
 
         if (!type) { type = Hash.parsePadUrl(href).type; }
@@ -1175,6 +1188,7 @@ define([
         var label = h('span.cp-checkmark-label', labelTxt);
 
         $mark.keydown(function (e) {
+            if ($input.is(':disabled')) { return; }
             if (e.which === 32) {
                 e.stopPropagation();
                 e.preventDefault();
@@ -1220,20 +1234,22 @@ define([
         $.extend(markOpts, opts.mark || {});
 
         var input = h('input', inputOpts);
+        var $input = $(input);
         var mark = h('span.cp-radio-mark', markOpts);
         var label = h('span.cp-checkmark-label', labelTxt);
 
         $(mark).keydown(function (e) {
+            if ($input.is(':disabled')) { return; }
             if (e.which === 32) {
                 e.stopPropagation();
                 e.preventDefault();
-                if ($(input).is(':checked')) { return; }
-                $(input).prop('checked', !$(input).is(':checked'));
-                $(input).change();
+                if ($input.is(':checked')) { return; }
+                $input.prop('checked', !$input.is(':checked'));
+                $input.change();
             }
         });
 
-        $(input).change(function () { $(mark).focus(); });
+        $input.change(function () { $(mark).focus(); });
 
         var radio =  h('label', labelOpts, [
             input,
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 887eb147a..c0b052737 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -936,7 +936,8 @@ define([
         return button;
     };
 
-    var createMdToolbar = function (common, editor) {
+    var createMdToolbar = function (common, editor, cfg) {
+        cfg = cfg || {};
         var $toolbar = $('<div>', {
             'class': 'cp-markdown-toolbar'
         });
@@ -1025,9 +1026,50 @@ define([
                 icon: 'fa-newspaper-o'
             }
         };
+
+        if (typeof(cfg.embed) === "function") {
+            actions.embed = { // Messages.mdToolbar_embed
+                icon: 'fa-picture-o',
+                action: function () {
+                    var _cfg = {
+                        types: ['file', 'link'],
+                        where: ['root']
+                    };
+                    common.openFilePicker(_cfg, function (data) {
+                        // Embed links
+                        if (data.static) {
+                            var a = h('a', {
+                                href: data.href
+                            }, data.name);
+                            cfg.embed(a, data);
+                            return;
+                        }
+                        // Embed files
+                        if (data.type !== 'file') {
+                            console.log("Unexpected data type picked " + data.type);
+                            return;
+                        }
+                        if (data.type !== 'file') { console.log('unhandled embed type ' + data.type); return; }
+                        common.setPadAttribute('atime', +new Date(), null, data.href);
+                        var privateDat = common.getMetadataMgr().getPrivateData();
+                        var origin = privateDat.fileHost || privateDat.origin;
+                        var src = data.src = data.src.slice(0,1) === '/' ? origin + data.src : data.src;
+                        cfg.embed(h('media-tag', {
+                            src: src,
+                            'data-crypto-key': 'cryptpad:' + data.key,
+                        }), data);
+                    });
+
+                }
+            };
+        }
+
         var onClick = function () {
             var type = $(this).attr('data-type');
             var texts = editor.getSelections();
+            if (actions[type].action) {
+                return actions[type].action();
+            }
             var newTexts = texts.map(function (str) {
                 str = str || Messages.mdToolbar_defaultText;
                 if (actions[type].apply) {
@@ -1054,7 +1096,7 @@ define([
         }).appendTo($toolbar);
         return $toolbar;
     };
-    UIElements.createMarkdownToolbar = function (common, editor) {
+    UIElements.createMarkdownToolbar = function (common, editor, opts) {
         var readOnly = common.getMetadataMgr().getPrivateData().readOnly;
         if (readOnly) {
             return {
@@ -1064,7 +1106,7 @@ define([
             };
         }
 
-        var $toolbar = createMdToolbar(common, editor);
+        var $toolbar = createMdToolbar(common, editor, opts);
         var cfg = {
             title: Messages.mdToolbar_button,
             element: $toolbar
@@ -1133,6 +1175,7 @@ define([
             sheet: 'sheets',
             poll: 'poll',
             kanban: 'kanban',
+            form: 'form',
             whiteboard: 'whiteboard',
         };
 
@@ -1472,11 +1515,13 @@ define([
         if (config.isSelect) {
             var pressed = '';
             var to;
+            $container.onChange = Util.mkEvent();
             $container.on('click', 'a', function () {
                 value = $(this).data('value');
                 var $val = $(this);
                 var textValue = $val.html() || value;
                 $button.find('.cp-dropdown-button-title').html(textValue);
+                $container.onChange.fire(textValue, value);
             });
             $container.keydown(function (e) {
                 var $value = $innerblock.find('[data-value].cp-dropdown-element-active:visible');
@@ -1616,7 +1661,7 @@ define([
         var $displayedName = $('<span>', {'class': displayNameCls});
 
         var priv = metadataMgr.getPrivateData();
-        var accountName = priv.accountName;
+        var accountName = Util.fixHTML(priv.accountName);
         var origin = priv.origin;
         var padType = metadataMgr.getMetadata().type;
 
@@ -1626,7 +1671,8 @@ define([
             var $userAdminContent = $('<p>');
             if (accountName) {
                 var $userAccount = $('<span>').append(Messages.user_accountName + ': ');
-                $userAdminContent.append($userAccount).append(Util.fixHTML(accountName));
+
+                $userAdminContent.append($userAccount).append(accountName);
                 $userAdminContent.append($('<br>'));
             }
             if (config.displayName && !AppConfig.disableProfile) {
@@ -1849,8 +1895,11 @@ define([
                 },
                 content: h('span', Messages.logoutEverywhere),
                 action: function () {
-                    Common.getSframeChannel().query('Q_LOGOUT_EVERYWHERE', null, function () {
-                        Common.gotoURL(origin + '/');
+                    UI.confirm(Messages.settings_logoutEverywhereConfirm, function (yes) {
+                        if (!yes) { return; }
+                        Common.getSframeChannel().query('Q_LOGOUT_EVERYWHERE', null, function () {
+                            Common.gotoURL(origin + '/');
+                        });
                     });
                 },
             });
@@ -2038,14 +2087,9 @@ define([
 
         var $container = $('<div>');
         var i = 0;
+
         var types = AppConfig.availablePadTypes.filter(function (p) {
-            if (p === 'drive') { return; }
-            if (p === 'teams') { return; }
-            if (p === 'contacts') { return; }
-            if (p === 'todo') { return; }
-            if (p === 'file') { return; }
-            if (p === 'accounts') { return; }
-            if (p === 'calendar') { return; }
+            if (AppConfig.hiddenTypes.indexOf(p) !== -1) { return; }
             if (!common.isLoggedIn() && AppConfig.registeredOnlyTypes &&
                 AppConfig.registeredOnlyTypes.indexOf(p) !== -1) { return; }
             return true;
@@ -2224,7 +2268,7 @@ define([
 
         // Title
         //$creation.append(h('h2.cp-creation-title', Messages.newButtonTitle));
-        var newPadH3Title = Messages['button_new' + type];
+        var newPadH3Title = Messages['button_new' + type]; // Messages.button_newform
 
         var title = h('div.cp-creation-title', [
             UI.getFileIcon({type: type})[0],
@@ -2414,6 +2458,7 @@ define([
                         'title': name,
                     }).appendTo($container);
                     $span.data('id', obj.id);
+                    if (obj.content) { $span.data('content', obj.content); }
                     if (idx === selected) { $span.addClass('cp-creation-template-selected'); }
                     if (!obj.thumbnail) {
                         $span.append(obj.icon || h('span.cptools.cptools-template'));
@@ -2569,6 +2614,7 @@ define([
 
             var $template = $creation.find('.cp-creation-template-selected');
             var templateId = $template.data('id') || undefined;
+            var templateContent = $template.data('content') || undefined;
             // Team
             var team;
             if (teamValue) {
@@ -2581,6 +2627,7 @@ define([
                 password: passwordVal,
                 expire: expireVal,
                 templateId: templateId,
+                templateContent: templateContent,
                 team: team
             };
         };
@@ -2626,6 +2673,17 @@ define([
         $creation.focus();
     };
 
+    UIElements.loginErrorScreenContent = function (common) {
+        var msg = Pages.setHTML(h('span'), Messages.restrictedLoginPrompt);
+        $(msg).find('a').attr({
+            href: '/login/',
+        }).click(function (ev) {
+            ev.preventDefault();
+            common.setLoginRedirect('login');
+        });
+        return msg;
+    };
+
     var autoStoreModal = {};
     UIElements.onServerError = function (common, err, toolbar, cb) {
         //if (["EDELETED", "EEXPIRED", "ERESTRICTED"].indexOf(err.type) === -1) { return; }
@@ -2673,6 +2731,10 @@ define([
             if (toolbar && typeof toolbar.deleted === "function") { toolbar.deleted(); }
         } else if (err.type === 'ERESTRICTED') {
             msg = Messages.restrictedError;
+            if (!common.isLoggedIn()) {
+                msg = UIElements.loginErrorScreenContent(common);
+            }
+
             if (toolbar && typeof toolbar.failed === "function") { toolbar.failed(true); }
         } else if (err.type === 'HASH_NOT_FOUND' && priv.isHistoryVersion) {
             msg = Messages.oo_deletedVersion;
@@ -2833,7 +2895,13 @@ define([
     UIElements.displayStorePadPopup = function (common, data) {
         if (storePopupState) { return; }
         storePopupState = true;
-        if (data && data.stored) { return; } // We won't display the popup for dropped files
+        // We won't display the popup for dropped files or already stored pads
+        if (data && data.stored) {
+            if (!data.inMyDrive) {
+                $('.cp-toolbar-storeindrive').show();
+            }
+            return;
+        }
         var priv = common.getMetadataMgr().getPrivateData();
 
         // This pad will be deleted automatically, it shouldn't be stored
@@ -2962,6 +3030,75 @@ define([
         UI.proposal(content, todo);
     };
 
+    UIElements.displayOpenLinkModal = function (common, data, dismiss) {
+        var name = Util.fixHTML(data.title);
+        var url = data.href;
+        var user = data.name;
+        //Messages.link_open = "Open URL";
+            // openLinkInNewTab ("Open Link in New Tab")
+            // fc_open ("Open")
+            // share_linkOpen ("Preview")
+            // resources_openInNewTab ("Open it in a new tab")
+        Messages.link_open = Messages.fc_open; // XXX 4.10.0
+
+        //Messages.link_store = "Store link in drive";
+            // toolbar_storeInDrive ? ("Store in CryptDrive")
+            // autostore_store ? ("Store")
+        Messages.link_store = Messages.toolbar_storeInDrive; // XXX 4.10.0
+
+
+        var content = h('div', [
+            UI.setHTML(h('p'), Messages._getKey('notification_openLink', [name, user])),
+            h('pre', url),
+            UIElements.getVerifiedFriend(common, data.curve, user)
+        ]);
+        var clicked = false;
+        var modal;
+        var buttons = [{
+            name: Messages.friendRequest_later,
+            onClick: function () {
+                if (clicked) { return true; }
+                clicked = true;
+                Feedback.send('LINK_RECEIVED_LATER');
+            },
+            keys: [27]
+        }, {
+            className: 'primary',
+            name: Messages.link_open,
+            onClick: function () {
+                if (clicked) { return true; }
+                clicked = true;
+                common.openUnsafeURL(url);
+                Feedback.send("LINK_RECEIVED_OPEN");
+            },
+            keys: [13]
+        }, {
+            className: 'primary',
+            name: Messages.link_store,
+            onClick: function () {
+                if (clicked) { return; }
+                clicked = true;
+                common.getSframeChannel().query("Q_DRIVE_USEROBJECT", {
+                    cmd: "addLink",
+                    data: {
+                        name: name,
+                        href: url,
+                        path: ['root']
+                    }
+                }, function () {
+                    modal.closeModal();
+                    dismiss();
+                    Feedback.send("LINK_RECEIVED_STORE");
+                });
+                return true;
+            },
+            keys: [[13, 'ctrl']]
+        }];
+        var _modal = UI.dialog.customModal(content, {buttons: buttons});
+        modal = UI.openCustomModal(_modal);
+        return modal;
+    };
+
     UIElements.displayAddOwnerModal = function (common, data) {
         var priv = common.getMetadataMgr().getPrivateData();
         var sframeChan = common.getSframeChannel();
@@ -3012,6 +3149,7 @@ define([
                 // ACCEPT
                 sframeChan.query('Q_SET_PAD_METADATA', {
                     channel: msg.content.channel,
+                    channels: msg.content.channels,
                     command: 'ADD_OWNERS',
                     value: [priv.edPublic]
                 }, function (err, res) {
@@ -3061,6 +3199,7 @@ define([
                     // Remove yourself from the pending owners
                     sframeChan.query('Q_SET_PAD_METADATA', {
                         channel: msg.content.channel,
+                        channels: msg.content.channels,
                         command: 'RM_PENDING_OWNERS',
                         value: [priv.edPublic]
                     }, function (err, res) {
@@ -3077,6 +3216,7 @@ define([
             // Remove yourself from the pending owners
             sframeChan.query('Q_SET_PAD_METADATA', {
                 channel: msg.content.channel,
+                channels: msg.content.channels,
                 command: 'RM_PENDING_OWNERS',
                 value: [priv.edPublic]
             }, function (err, res) {
@@ -3556,6 +3696,13 @@ define([
         return (pos.bottom < size) && (pos.y > 0);
     };
 
+    UIElements.is24h = function () {
+        try {
+            return !new Intl.DateTimeFormat(navigator.language, { hour: 'numeric' }).format(0).match(/AM/);
+        } catch (e) {}
+        return false;
+    };
+
     UIElements.openSnapshotsModal = function (common, load, make, remove) {
         var modal;
         var readOnly = common.getMetadataMgr().getPrivateData().readOnly;
diff --git a/www/common/common-util.js b/www/common/common-util.js
index 9101749f8..ac50a1f24 100644
--- a/www/common/common-util.js
+++ b/www/common/common-util.js
@@ -9,6 +9,15 @@
         return Array.prototype.slice.call(A, start, end);
     };
 
+    Util.shuffleArray = function (a) {
+        for (var i = a.length - 1; i > 0; i--) {
+            var j = Math.floor(Math.random() * (i + 1));
+            var tmp = a[i];
+            a[i] = a[j];
+            a[j] = tmp;
+        }
+    };
+
     Util.bake = function (f, args) {
         if (typeof(args) === 'undefined') { args = []; }
         if (!Array.isArray(args)) { args = [args]; }
@@ -152,6 +161,10 @@
         };
     };
 
+    Util.inc = function (map, key, val) {
+        map[key] = (map[key] || 0) + (typeof(val) === 'number'? val: 1);
+    };
+
     Util.find = function (map, path) {
         var l = path.length;
         for (var i = 0; i < l; i++) {
@@ -559,8 +572,8 @@
             '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|'+ // domain name
             '((\\d{1,3}\\.){3}\\d{1,3}))'+ // OR ip (v4) address
             '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*'+ // port and path
-            '(\\?[;&a-z\\d%_.~+=-]*)?'+ // query string
-            '(\\#[-a-z\\d_]*)?$','i'); // fragment locator
+            '(\\?[;&a-z\\d%_.~+=-]*)?'); // query string
+            //'(\\#[-a-z\\d_]*)?$','i'); // fragment locator
         return !!pattern.test(str);
     };
 
diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index e9635d5b5..15234c35e 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -76,7 +76,7 @@ define([
             postMessage("GET", {
                 key: ['edPrivate'],
             }, waitFor(function (obj) {
-                if (obj.error) { return; }
+                if (!obj || obj.error) { return; }
                 try {
                     keys.push({
                         edPrivate: obj,
@@ -84,14 +84,21 @@ define([
                     });
                 } catch (e) { console.error(e); }
             }));
+
             // Push teams keys
             postMessage("GET", {
                 key: ['teams'],
             }, waitFor(function (obj) {
-                if (obj.error) { return; }
+                if (!obj || obj.error) { return; }
                 Object.keys(obj || {}).forEach(function (id) {
                     var t = obj[id];
-                    var _keys = t.keys.drive || {};
+                    var _keys = {};
+                    try {
+                        _keys = t.keys.drive || {};
+                    } catch (err) {
+                        console.error(err);
+                    }
+                    _keys.id = id;
                     if (!_keys.edPrivate) { return; }
                     keys.push(t.keys.drive);
                 });
@@ -101,6 +108,57 @@ define([
         });
     };
 
+    common.getFormKeys = function (cb) {
+        var curvePrivate;
+        var formSeed;
+        Nthen(function (waitFor) {
+            postMessage("GET", {
+                key: ['curvePrivate'],
+            }, waitFor(function (obj) {
+                if (!obj || obj.error) { return; }
+                curvePrivate = obj;
+            }));
+            postMessage("GET", {
+                key: ['form_seed'],
+            }, waitFor(function (obj) {
+                if (!obj || obj.error) { return; }
+                formSeed = obj;
+            }));
+        }).nThen(function () {
+            cb({
+                curvePrivate: curvePrivate,
+                curvePublic: curvePrivate && Hash.getCurvePublicFromPrivate(curvePrivate),
+                formSeed: formSeed
+            });
+        });
+    };
+    common.getFormAnswer = function (data, cb) {
+        postMessage("GET", {
+            key: ['forms', data.channel],
+        }, cb);
+    };
+    common.storeFormAnswer = function (data) {
+        postMessage("SET", {
+            key: ['forms', data.channel],
+            value: {
+                hash: data.hash,
+                curvePrivate: data.curvePrivate,
+                anonymous: data.anonymous
+            }
+        }, function (obj) {
+            if (obj && obj.error) {
+                if (obj.error === "ENODRIVE") {
+                    var answered = JSON.parse(localStorage.CP_formAnswered || "[]");
+                    if (answered.indexOf(data.channel) === -1) { answered.push(data.channel); }
+                    localStorage.CP_formAnswered = JSON.stringify(answered);
+                    return;
+                }
+                console.error(obj.error);
+            }
+        });
+
+    };
+
     common.makeNetwork = function (cb) {
         require([
             '/bower_components/netflux-websocket/netflux-client.js',
@@ -712,6 +770,10 @@ define([
             delete meta.chat2;
             delete meta.chat;
             delete meta.cursor;
+
+            if (meta.type === "form") {
+                delete parsed.answers;
+            }
         }
     };
 
@@ -1103,6 +1165,11 @@ define([
         postMessage('BURN_PAD', data);
     };
 
+    common.setDriveRedirectPreference = function (data, cb) {
+        LocalStore.setDriveRedirectPreference(data && data.value);
+        cb();
+    };
+
     common.changePadPassword = function (Crypt, Crypto, data, cb) {
         var href = data.href;
         var oldPassword = data.oldPassword;
@@ -1870,6 +1937,17 @@ define([
                     waitFor.abort();
                     return void cb(obj);
                 }
+            }));
+        }).nThen(function (waitFor) {
+            var blockUrl = Block.getBlockUrl(blockKeys);
+            Util.fetch(blockUrl, waitFor(function (err /* block */) {
+                if (err) {
+                    console.error(err);
+                    waitFor.abort();
+                    return cb({
+                        error: err,
+                    });
+                }
                 console.log("new login block written");
                 var newBlockHash = Block.getBlockHash(blockKeys);
                 LocalStore.setBlockHash(newBlockHash);
@@ -2506,6 +2584,11 @@ define([
                         }
                         if (data.anonHash && !cfg.userHash) { LocalStore.setFSHash(data.anonHash); }
 
+                        var prefersDriveRedirect = data[Constants.prefersDriveRedirectKey];
+                        if (typeof(prefersDriveRedirect) === 'boolean') {
+                            LocalStore.setDriveRedirectPreference(prefersDriveRedirect);
+                        }
+
                         initialized = true;
                         channelIsReady();
                     });
diff --git a/www/common/diffMarked.js b/www/common/diffMarked.js
index cb95f37aa..0fe8aed0a 100644
--- a/www/common/diffMarked.js
+++ b/www/common/diffMarked.js
@@ -8,11 +8,14 @@ define([
     '/common/inner/common-mediatag.js',
     '/common/media-tag.js',
     '/customize/messages.js',
+    '/common/less.min.js',
+    '/customize/pages.js',
+
     '/common/highlight/highlight.pack.js',
     '/lib/diff-dom/diffDOM.js',
     '/bower_components/tweetnacl/nacl-fast.min.js',
     'css!/common/highlight/styles/'+ (window.CryptPad_theme === 'dark' ? 'dark.css' : 'github.css')
-],function ($, ApiConfig, Marked, Hash, Util, h, MT, MediaTag, Messages) {
+],function ($, ApiConfig, Marked, Hash, Util, h, MT, MediaTag, Messages, Less, Pages) {
     var DiffMd = {};
 
     var Highlight = window.hljs;
@@ -172,12 +175,16 @@ define([
         return h('div.cp-md-toc', content).outerHTML;
     };
 
-    DiffMd.render = function (md, sanitize, restrictedMd) {
+    var noHeadingId = false;
+    DiffMd.render = function (md, sanitize, restrictedMd, noId) {
         Marked.setOptions({
             renderer: restrictedMd ? restrictedRenderer : renderer,
         });
+        noHeadingId = noId;
         var r = Marked(md, {
-            sanitize: sanitize
+            sanitize: sanitize,
+            headerIds: !noId,
+            gfm: true,
         });
 
         // Add Table of Content
@@ -207,7 +214,11 @@ define([
     };
     restrictedRenderer.code = renderer.code;
 
+    var _heading = renderer.heading;
     renderer.heading = function (text, level) {
+        if (noHeadingId) {
+            return _heading.apply(this, arguments);
+        }
         var i = 0;
         var safeText = text.toLowerCase().replace(/[^\w]+/g, '-');
         var getId = function () {
@@ -266,9 +277,43 @@ define([
         return '<li>' + text + '</li>\n';
     };
 
+
+    var qualifiedHref = function (href) {
+        if (typeof(window.URL) === 'undefined') { return href; }
+        try {
+            var url = new URL(href, ApiConfig.httpUnsafeOrigin);
+            return url.href;
+        } catch (err) {
+            console.error(err);
+            return href;
+        }
+    };
+
+    var isLocalURL = function (href) {
+        // treat all URLs as remote if you are using an ancient browser
+        if (typeof(window.URL) === 'undefined') { return false; }
+        try {
+            var url = new URL(href, ApiConfig.httpUnsafeOrigin);
+            // FIXME data URLs can be quite large, but that should be addressed
+            // in the source markdown's, not the renderer
+            if (url.protocol === 'data:') { return true; }
+            var localURL = new URL(ApiConfig.httpUnsafeOrigin);
+            return url.host === localURL.host;
+        } catch (err) {
+            return true;
+        }
+    };
+
     renderer.image = function (href, title, text) {
+        if (isLocalURL(href) && href.slice(0, 6) !== '/file/') {
+            return h('img', {
+                src: href,
+                title: title || '',
+                alt: text,
+            }).outerHTML;
+        }
+
         if (href.slice(0,6) === '/file/') {
-            // DEPRECATED
             // Mediatag using markdown syntax should not be used anymore so they don't support
             // password-protected files
             console.log('DEPRECATED: mediatag using markdown syntax!');
@@ -276,19 +321,38 @@ define([
             var secret = Hash.getSecrets('file', parsed.hash);
             var src = (ApiConfig.fileHost || '') +Hash.getBlobPathFromHex(secret.channel);
             var key = Hash.encodeBase64(secret.keys.cryptKey);
-            var mt = '<media-tag src="' + src + '" data-crypto-key="cryptpad:' + key + '"></media-tag>';
-            if (mediaMap[src]) {
-                mt += mediaMap[src];
-            }
-            mt += '</media-tag>';
-            return mt;
-        }
-        var out = '<img src="' + href + '" alt="' + text + '"';
-        if (title) {
-            out += ' title="' + title + '"';
+            var mt = h('media-tag', {
+                src: src,
+                'data-crypto-key': 'cryptpad:' + key,
+            });
+            return mt.outerHTML;
         }
-        out += this.options.xhtml ? '/>' : '>';
-        return out;
+
+        var warning = h('div.cp-inline-img-warning', [
+            h('div.cp-inline-img', [
+                h('img.cp-inline-img', {
+                    src: '/images/broken.png',
+                    //title: title || '', // FIXME sort out tippy issues (double-title)
+                }),
+                h('p.cp-alt-txt', text),
+            ]),
+            h('span.cp-img-block-notice', {
+            }, Messages.resources_imageBlocked),
+            h('br'),
+            h('a.cp-remote-img', {
+                href: qualifiedHref(href),
+            }, [
+                Messages.resources_openInNewTab
+            ]),
+            h('br'),
+            h('a.cp-learn-more', {
+                href: Pages.localizeDocsLink('https://docs.cryptpad.fr/en/user_guide/security.html#remote-content'),
+            }, [
+                Messages.resources_learnWhy
+            ]),
+        ]);
+
+        return warning.outerHTML;
     };
     restrictedRenderer.image = renderer.image;
 
@@ -473,6 +537,75 @@ define([
         }
     };
 
+    var applyCSS = function (el, css) {
+        var style = h('style');
+        style.appendChild(document.createTextNode(css));
+        el.innerText = '';
+        el.appendChild(style);
+    };
+
+    // trim non-functional text from less input so that
+    // the compiler is only triggered when there has been a functional change
+    var canonicalizeLess = function (source) {
+        return (source || '')
+        // leading and trailing spaces are irrelevant
+            .trim()
+        // line comments are easy to disregard
+            .replace(/\/\/[^\n]*/g, '')
+        // lines with nothing but spaces and tabs can be ignored
+            .replace(/^[ \t]*$/g, '')
+        // consecutive newlines make no difference
+            .replace(/\n+/g, '');
+    };
+
+    var rendered_less = {};
+    var getRenderedLess = (function () {
+        var timeouts = {};
+        return function (src) {
+            if (!rendered_less[src]) { return; }
+            if (timeouts[src]) {
+                clearTimeout(timeouts[src]);
+            }
+            // avoid memory leaks by deleting cached content
+            // 15s after it was last accessed
+            timeouts[src] = setTimeout(function () {
+                delete rendered_less[src];
+                delete timeouts[src];
+            }, 15000);
+            return rendered_less[src];
+        };
+    }());
+
+    plugins.less = {
+        name: 'less',
+        attr: 'less-src',
+        render: function renderLess ($el, opt) {
+            var src = canonicalizeLess($el.text());
+            if (!src) { return; }
+            var el = $el[0];
+            var rendered = getRenderedLess(src);
+            if (rendered) { return void applyCSS(el, rendered); }
+
+            var scope = opt.scope.attr('id') || 'cp-app-code-preview-content';
+            var scoped_src = '#' + scope + ' { ' + src + '}';
+            //console.error("RENDERING LESS");
+            Less.render(scoped_src, {}, function (err, result) {
+        // the console is the only feedback for users to know that they did something wrong
+        // but less rendering isn't intended so much as a feature but a useful tool to avoid
+        // leaking styles from the preview into the rest of the DOM. This is an improvement.
+                if (err) {
+        // we assume the compiler is deterministic. Something that returns an error once
+        // will do it again, so avoid successive calls by caching a truthy
+        // but non-functional string to block them.
+                    rendered_less[src] = ' ';
+                    return void console.error(err);
+                }
+                var css = rendered_less[src] = result.css;
+                applyCSS(el, css);
+            });
+        },
+    };
+
     var getAvailableCachedElement = function ($content, cache, src) {
         var cached = cache[src];
         if (!Array.isArray(cached)) { return; }
@@ -546,7 +679,8 @@ define([
         // caching their source as you go
         $(newDomFixed).find('pre[data-plugin]').each(function (index, el) {
             if (el.childNodes.length === 1 && el.childNodes[0].nodeType === 3) {
-                var plugin = plugins[el.getAttribute('data-plugin')];
+                var type = el.getAttribute('data-plugin');
+                var plugin = plugins[type];
                 if (!plugin) { return; }
                 var src = canonicalizeMermaidSource(el.childNodes[0].wholeText);
                 el.setAttribute(plugin.attr, src);
@@ -559,7 +693,8 @@ define([
         var scrollTop = $parent.scrollTop();
         // iterate over rendered mermaid charts
         $content.find('pre[data-plugin]:not([processed="true"])').each(function (index, el) {
-            var plugin = plugins[el.getAttribute('data-plugin')];
+            var type = el.getAttribute('data-plugin');
+            var plugin = plugins[type];
             if (!plugin) { return; }
 
             // retrieve the attached source code which it was drawn
@@ -666,7 +801,11 @@ define([
         if (typeof(patch) === 'string') {
             throw new Error(patch);
         } else {
-            DD.apply($content[0], patch);
+            try {
+                DD.apply($content[0], patch);
+            } catch (err) {
+                console.error(err);
+            }
             var $mts = $content.find('media-tag');
             $mts.each(function (i, el) {
                 var $mt = $(el).contextmenu(function (e) {
@@ -721,9 +860,35 @@ define([
                 if (target) { target.scrollIntoView(); }
             });
 
+            // replace remote images with links to those images
+            $content.find('div.cp-inline-img-warning').each(function (index, el) {
+                if (!el) { return; }
+                var link = el.querySelector('a.cp-remote-img');
+                if (!link) { return; }
+                link.onclick = function (ev) {
+                    ev.preventDefault();
+                    ev.stopPropagation();
+                    common.openURL(link.href);
+                };
+            });
+
+            // transform style tags into pre tags with the same content
+            // to be handled by the less rendering plugin
+            $content.find('style').each(function (index, el) {
+                var parent = el.parentElement;
+                var pre = h('pre', {
+                    'data-plugin': 'less',
+                    'less-src': canonicalizeLess(el.innerText),
+                    style: 'display: none',
+                }, el.innerText);
+                parent.replaceChild(pre, el);
+            });
+
             // loop over plugin elements in the rendered content
             $content.find('pre[data-plugin]').each(function (index, el) {
-                var plugin = plugins[el.getAttribute('data-plugin')];
+                var type = el.getAttribute('data-plugin');
+                var plugin = plugins[type];
+
                 if (!plugin) { return; }
                 var $el = $(el);
                 $el.off('contextmenu').on('contextmenu', function (e) {
@@ -742,13 +907,17 @@ define([
                 // you can assume that the index of your rendered charts matches that
                 // of those in the markdown source. 
                 var src = plugin.source[index];
-                el.setAttribute(plugin.attr, src);
+                if (src) {
+                    el.setAttribute(plugin.attr, src);
+                }
                 var cached = getAvailableCachedElement($content, plugin.cache, src);
 
                 // check if you had cached a pre-rendered instance of the supplied source
                 if (typeof(cached) !== 'object') {
                     try {
-                        plugin.render($el);
+                        plugin.render($el, {
+                            scope: $content,
+                        });
                     } catch (e) { console.error(e); }
                     return;
                 }
diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index aea222188..15558cf18 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -351,7 +351,7 @@ define([
                 h('li', h('a.cp-app-drive-context-openro.dropdown-item', {
                     'tabindex': '-1',
                     'data-icon': faReadOnly,
-                }, Messages.fc_open_ro)),
+                }, h('span.cp-text', Messages.fc_open_ro))),
                 h('li', h('a.cp-app-drive-context-openincode.dropdown-item', {
                     'tabindex': '-1',
                     'data-icon': faOpenInCode,
@@ -443,6 +443,11 @@ define([
                             'data-icon': AppConfig.applicationsIcon.poll,
                             'data-type': 'poll'
                         }, Messages.button_newpoll)),
+                        h('li', h('a.cp-app-drive-context-newdoc.dropdown-item.cp-app-drive-context-editable', {
+                            'tabindex': '-1',
+                            'data-icon': AppConfig.applicationsIcon.link,
+                            'data-type': 'link'
+                        }, Messages.fm_link_new)),
                     ]),
                 ]),
                 $separator.clone()[0],
@@ -1106,11 +1111,24 @@ define([
             common.getMediaTagPreview(mts, idx);
         };
 
+        var refresh = APP.refresh = function () {
+            APP.displayDirectory(currentPath);
+        };
+
         // `app`: true (force open wiht the app), false (force open in preview),
         //        falsy (open in preview if default is not using the app)
         var defaultInApp = ['application/pdf'];
         var openFile = function (el, isRo, app) {
             var data = manager.getFileData(el);
+
+            if (data.static) {
+                if (data.href) {
+                    common.openUnsafeURL(data.href);
+                    manager.updateStaticAccess(el, refresh);
+                }
+                return;
+            }
+
             if (!data || (!data.href && !data.roHref)) {
                 return void logError("Missing data for the file", el, data);
             }
@@ -1147,10 +1165,6 @@ define([
             common.openURL(Hash.getNewPadURL(href, obj));
         };
 
-        var refresh = APP.refresh = function () {
-            APP.displayDirectory(currentPath);
-        };
-
 
         var pickFolderColor = function ($element, currentColor, cb) {
             var colors = ["", "#f23c38", "#ff0073", "#da0eba", "#9d00ac", "#6c19b3", "#4a42b1", "#3d8af0", "#30a0f1", "#1fb9d1", "#009686", "#45b354", "#84c750", "#c6e144", "#faf147", "#fbc423", "#fc9819", "#fd5227", "#775549", "#9c9c9c", "#607a89"];
@@ -1263,6 +1277,9 @@ define([
                     if ($element.is('.cp-border-color-sheet')) {
                         hide.push('download');
                     }
+                    if ($element.is('.cp-app-drive-static')) {
+                        hide.push('access', 'hashtag', 'properties', 'download');
+                    }
                     if ($element.is('.cp-app-drive-element-file')) {
                         // No folder in files
                         hide.push('color');
@@ -1646,6 +1663,19 @@ define([
                     }
 
                     paths = getSelectedPaths($element);
+
+                    $('.cp-app-drive-context-openro .cp-text').text(Messages.fc_open_ro);
+                    if (paths.length === 1) {
+                        var metadata = manager.getFileData(manager.find(paths[0].path));
+                        if (metadata.roHref) {
+                            var parsed = Hash.parsePadUrl(metadata.roHref);
+                            // Forms: change "Open (read-only)" to "Open (as participant)"
+                            if (parsed.type === "form") {
+                                $('.cp-app-drive-context-openro .cp-text').text(Messages.fc_open_formro);
+                            }
+                        }
+                    }
+
                 }
 
                 $contextMenu.attr('data-menu-type', type);
@@ -1886,6 +1916,31 @@ define([
 
 
         // In list mode, display metadata from the filesData object
+        var addStaticData = function (element, $element, data) {
+            $element.addClass('cp-border-color-drive');
+            var name = data.name;
+            var $name = $('<span>', {'class': 'cp-app-drive-element-name'}).text(name);
+            $element.append($name);
+            if (getViewMode() === 'grid') {
+                //console.error(name, Util.fixHTML(name));
+                // this is only safe because our build of tippy sets titles as
+                // 'textContent' instead of innerHTML, otherwise
+                // we would need to use Util.fixHTML
+                $element.attr('title', name);
+            }
+
+            var type = Messages.fm_link_type;
+            var $type = $('<span>', {
+                'class': 'cp-app-drive-element-type cp-app-drive-element-list'
+            }).text(type);
+            var $adate = $('<span>', {
+                'class': 'cp-app-drive-element-atime cp-app-drive-element-list'
+            }).text(getDate(data.atime));
+            var $cdate = $('<span>', {
+                'class': 'cp-app-drive-element-ctime cp-app-drive-element-list'
+            }).text(getDate(data.ctime));
+            $element.append($type).append($adate).append($cdate);
+        };
         var _addOwnership = function ($span, $state, data) {
             if (data && Array.isArray(data.owners) && data.owners.indexOf(edPublic) !== -1) {
                 var $owned = $ownedIcon.clone().appendTo($state);
@@ -1901,6 +1956,9 @@ define([
             if (!manager.isFile(element)) { return; }
 
             var data = manager.getFileData(element);
+            if (data.static) {
+                return addStaticData(element, $element, data);
+            }
 
             if (!Object.keys(data).length) {
                 return true;
@@ -2054,6 +2112,7 @@ define([
             // can't share the read-only URL and we don't have access to the edit one.
             // We should hide the share button.
             if (!data.href && !ro) { return; }
+
             $shareBlock.click(function () {
                 Share.getShareModal(common, {
                     teamId: APP.team,
@@ -2110,7 +2169,9 @@ define([
                 $icon = manager.isFolderEmpty(root[key]) ? $folderEmptyIcon.clone() : $folderIcon.clone();
                 $icon.css("color", getFolderColor(path.concat(elPath)));
             }
-            var classes = restrictedClass + roClass + liClass;
+
+            var staticClass = manager.isStaticFile(element) ? '.cp-app-drive-static' : '';
+            var classes = restrictedClass + roClass + liClass + staticClass;
             var $element = $(h('li.cp-app-drive-element.cp-app-drive-element-row' + classes, {
                 draggable: true
             }));
@@ -2275,7 +2336,8 @@ define([
         var createTitle = function ($container, path, noStyle) {
             if (!path || path.length === 0) { return; }
             var isTrash = manager.isPathIn(path, [TRASH]);
-            if (APP.mobile() && !noStyle) { // noStyle means title in search result
+            // we assume that users viewing shared folders may want to see the "bread-crumb"
+            if (!APP.newSharedFolder && APP.mobile() && !noStyle) { // noStyle means title in search result
                 return $container;
             }
             var isVirtual = virtualCategories.indexOf(path[0]) !== -1;
@@ -2387,7 +2449,14 @@ define([
             }
             if (!APP.loggedIn) {
                 msg = APP.newSharedFolder ? Messages.fm_info_sharedFolder : Messages._getKey('fm_info_anonymous', [ApiConfig.inactiveTime || 90]);
-                return $(common.fixLinks($box.html(msg)));
+                var docsLink = 'https://docs.cryptpad.fr/en/user_guide/user_account.html#account-types';
+                $box.html(msg).find('a[href="#docs"]').each(function () {
+                    $(this).attr({
+                        href: Pages.localizeDocsLink(docsLink),
+                        target: '_blank',
+                    });
+                });
+                return $(common.fixLinks($box));
             }
             if (!msg || APP.store['hide-info-' + path[0]] === '1') {
                 $box.hide();
@@ -2437,8 +2506,7 @@ define([
             setViewMode(viewMode || 'grid');
             showMode(viewMode);
 
-            $button.click(function (e) {
-                console.error(e);
+            $button.click(function () {
                 var viewMode = getViewMode();
                 var newViewMode = getOppositeViewMode(viewMode);
                 setViewMode(newViewMode);
@@ -2550,13 +2618,7 @@ define([
         var getNewPadTypes = function () {
             var arr = [];
             AppConfig.availablePadTypes.forEach(function (type) {
-                if (type === 'drive') { return; }
-                if (type === 'teams') { return; }
-                if (type === 'contacts') { return; }
-                if (type === 'todo') { return; }
-                if (type === 'file') { return; }
-                if (type === 'accounts') { return; }
-                if (type === 'calendar') { return; }
+                if (AppConfig.hiddenTypes.indexOf(type) !== -1) { return; }
                 if (!APP.loggedIn && AppConfig.registeredOnlyTypes &&
                     AppConfig.registeredOnlyTypes.indexOf(type) !== -1) {
                     return;
@@ -2670,6 +2732,74 @@ define([
             });
             $input.click();
         };
+        var showLinkModal = function () {
+            var name, url;
+            var warning = h('div.alert.alert-warning', [
+                h('i.fa.fa-exclamation-triangle'),
+                h('span', Messages.fm_link_warning)
+            ]);
+            var content = h('p', [
+                h('label', {for: 'cp-app-drive-link-name'}, Messages.fm_link_name),
+                name = h('input#cp-app-drive-link-name', { autocomplete: 'off', placeholder: Messages.fm_link_name_placeholder }),
+                h('label', {for: 'cp-app-drive-link-url'}, Messages.fm_link_url),
+                url = h('input#cp-app-drive-link-url', { type: 'url', autocomplete: 'off', placeholder: Messages.form_input_ph_url }),
+                warning,
+            ]);
+
+            var protocolPattern = /https*:\/\//;
+            var fragmentPattern = /#.*$/;
+            var setNamePlaceholder = function (val) {
+                var temp = val.replace(protocolPattern, '').replace(fragmentPattern, '').trim().slice(0, 48);
+                if (!protocolPattern.test(val) || !temp) {
+                    temp = Messages.fm_link_name_placeholder;
+                }
+                name.setAttribute('placeholder', temp);
+            };
+
+            var $warning = $(warning).hide();
+            var $url = $(url).on('change keypress keyup keydown', function () {
+                var v = $url.val().trim();
+                if (v.length > 200) {
+                    $warning.show();
+                    return;
+                }
+                setNamePlaceholder(v);
+                $warning.hide();
+            });
+            var buttons = [{
+                className: 'cancel',
+                name: Messages.cancelButton,
+                onClick: function () {},
+                keys: [27]
+            }];
+            buttons.push({
+                className: 'primary',
+                // We may want to use a new key here
+                iconClass: '.fa.fa-plus',
+                name: Messages.tag_add,
+                onClick: function () {
+                    var $name = $(name);
+                    var n = $name.val().trim() || $name.attr('placeholder');
+                    var u = $url.val().trim();
+                    if (!n || !u) { return true; }
+                    if (!Util.isValidURL(u)) {
+                        // XXX 4.10.0 add style for invalid input? input:invalid
+                        UI.warn(Messages.fm_link_invalid);
+                        return true;
+                    }
+                    manager.addLink(currentPath, {
+                        name: n,
+                        url: u
+                    }, refresh);
+                    Feedback.send("LINK_CREATED");
+                },
+                keys: [13]
+            });
+            var m = UI.dialog.customModal(content, {
+                buttons: buttons
+            });
+            UI.openCustomModal(m);
+        };
         var addNewPadHandlers = function ($block, isInRoot) {
             // Handlers
             if (isInRoot) {
@@ -2698,6 +2828,7 @@ define([
                 }
                 $block.find('a.cp-app-drive-new-fileupload, li.cp-app-drive-new-fileupload').click(showUploadFilesModal);
                 $block.find('a.cp-app-drive-new-folderupload, li.cp-app-drive-new-folderupload').click(showUploadFolderModal);
+                $block.find('a.cp-app-drive-new-link, li.cp-app-drive-new-link').click(showLinkModal);
             }
             $block.find('a.cp-app-drive-new-doc, li.cp-app-drive-new-doc')
                 .click(function () {
@@ -2741,6 +2872,12 @@ define([
                     });
                 }
                 options.push({tag: 'hr'});
+                options.push({
+                    tag: 'a',
+                    attributes: {'class': 'cp-app-drive-new-link'},
+                    content: $('<div>').append(getIcon('link')).html() + Messages.fm_link_new
+                });
+                options.push({tag: 'hr'});
             }
             getNewPadTypes().forEach(function (type) {
                 var attributes = {
@@ -3057,6 +3194,13 @@ define([
                     $elementFolderUpload.append($('<span>', {'class': 'cp-app-drive-new-name'})
                         .text(Messages.uploadFolderButton));
                 }
+                // Link
+                var $elementLink = $('<li>', {
+                    'class': 'cp-app-drive-new-link cp-app-drive-element-row ' +
+                        'cp-app-drive-element-grid'
+                }).prepend(getIcon('link')).appendTo($container);
+                $elementLink.append($('<span>', {'class': 'cp-app-drive-new-name'})
+                    .text(Messages.fm_link_type));
             }
             // Pads
             getNewPadTypes().forEach(function (type) {
@@ -3132,7 +3276,8 @@ define([
             if (APP.$burnThisDrive) {
                 APP.toolbar.$bottomR.append(APP.$burnThisDrive);
             }
-            collapseTreeButton();
+            // this button is not useful for unregistered users who do not have a tree worth looking at
+            if (APP.loggedIn) { collapseTreeButton(); }
             return $toolbar;
         };
 
@@ -3462,6 +3607,7 @@ define([
                 var path = paths[0];
                 if (manager.isPathIn(path, [TRASH])) { return; }
 
+                if (!file.channel) { file.channel = id; }
                 if (channels.indexOf(file.channel) !== -1) { return; }
                 channels.push(file.channel);
 
@@ -4434,6 +4580,17 @@ define([
                         data = sf ? manager.getSharedFolderData(el) : manager.getFileData(el);
                     }
                     parsed = (data.href && data.href.indexOf('#') !== -1) ? Hash.parsePadUrl(data.href) : {};
+
+                    // Form: get auditor hash
+                    var auditorHash;
+                    if (parsed.hash && parsed.type === "form") {
+                        var formData = Hash.getFormData(null, parsed.hash, data.password);
+                        console.log(formData);
+                        if (formData) {
+                            auditorHash = formData.form_auditorHash;
+                        }
+                    }
+
                     var roParsed = Hash.parsePadUrl(data.roHref);
                     var padType = parsed.type || roParsed.type;
                     var ro = !sf || (folders[el] && folders[el].version >= 2);
@@ -4448,13 +4605,15 @@ define([
                             viewHash: ro && roParsed.hash,
                             fileHash: parsed.hash
                         },
+                        auditorHash: auditorHash,
                         fileData: {
                             hash: parsed.hash,
                             password: data.password
                         },
                         isTemplate: paths[0].path[0] === 'template',
-                        title: data.title,
+                        title: data.title || data.name,
                         sharedFolder: sf,
+                        static: data.static ? data.href : undefined,
                         common: common
                     };
                     if (padType === 'file') {
@@ -4472,6 +4631,20 @@ define([
                     data = manager.getSharedFolderData(el);
                 }
                 if (!data) { return; }
+                if (data.static) {
+                    sframeChan.query("Q_DRIVE_USEROBJECT", {
+                        cmd: "addLink",
+                        teamId: -1,
+                        data: {
+                            name: data.name,
+                            href: data.href,
+                            path: ['root']
+                        }
+                    }, function () {
+                        UI.log(Messages.saved);
+                    });
+                    return;
+                }
                 sframeChan.query('Q_STORE_IN_TEAM', {
                     href: data.href || data.rohref,
                     password: data.password,
@@ -4510,6 +4683,9 @@ define([
             }
             else if ($this.hasClass("cp-app-drive-context-newdoc")) {
                 var ntype = $this.data('type') || 'pad';
+                if (ntype === 'link') {
+                    return void showLinkModal();
+                }
                 var path2 = manager.isPathIn(currentPath, [TRASH]) ? '' : currentPath;
                 openIn(ntype, path2, APP.team);
             }
diff --git a/www/common/inner/access.js b/www/common/inner/access.js
index 693b8d236..a1d2c37a1 100644
--- a/www/common/inner/access.js
+++ b/www/common/inner/access.js
@@ -32,6 +32,12 @@ define([
         var teamOwner = data.teamId;
         var title = opts.title;
 
+        var p = priv.propChannels;
+        var otherChan;
+        if (p && p.answersChannel) {
+            otherChan = [p.answersChannel];
+        }
+
         opts = opts || {};
         var redrawAll = function () {};
 
@@ -255,6 +261,7 @@ define([
                     // Send the command
                     sframeChan.query('Q_SET_PAD_METADATA', {
                         channel: channel,
+                        channels: otherChan,
                         command: 'ADD_OWNERS',
                         value: toAddTeams.map(function (obj) { return obj.edPublic; }),
                         teamId: teamOwner
@@ -290,6 +297,7 @@ define([
                     // Send the command
                     sframeChan.query('Q_SET_PAD_METADATA', {
                         channel: channel,
+                        channels: otherChan,
                         command: 'ADD_PENDING_OWNERS',
                         value: toAdd,
                         teamId: teamOwner
@@ -310,6 +318,7 @@ define([
                     // Send the command
                     sframeChan.query('Q_SET_PAD_METADATA', {
                         channel: channel,
+                        channels: otherChan,
                         command: 'ADD_OWNERS',
                         value: [priv.edPublic],
                         teamId: teamOwner
@@ -338,6 +347,7 @@ define([
                     if (!friend) { return; }
                     common.mailbox.sendTo("ADD_OWNER", {
                         channel: channel,
+                        channels: otherChan,
                         href: href,
                         calendar: opts.calendar,
                         password: data.password || priv.password,
@@ -417,6 +427,12 @@ define([
         var allowed = data.allowed || [];
         var teamOwner = data.teamId;
 
+        var p = priv.propChannels;
+        var otherChan;
+        if (p && p.answersChannel) {
+            otherChan = [p.answersChannel];
+        }
+
         var redrawAll = function () {};
 
         var addBtn = h('button.btn.btn-primary.cp-access-add', [h('i.fa.fa-arrow-left'), h('i.fa.fa-arrow-up')]);
@@ -495,6 +511,7 @@ define([
                     // Send the command
                     sframeChan.query('Q_SET_PAD_METADATA', {
                         channel: channel,
+                        channels: otherChan,
                         command: 'RM_ALLOWED',
                         value: [ed],
                         teamId: teamOwner
@@ -524,6 +541,7 @@ define([
                 var val = $checkbox.is(':checked');
                 sframeChan.query('Q_SET_PAD_METADATA', {
                     channel: channel,
+                    channels: otherChan,
                     command: 'RESTRICT_ACCESS',
                     value: [Boolean(val)],
                     teamId: teamOwner
@@ -659,6 +677,7 @@ define([
                     // Send the command
                     sframeChan.query('Q_SET_PAD_METADATA', {
                         channel: channel,
+                        channels: otherChan,
                         command: 'ADD_ALLOWED',
                         value: toAdd,
                         teamId: teamOwner
@@ -987,6 +1006,15 @@ define([
                         UI.findCancelButton().click();
                         if (err || (obj && obj.error)) { UI.warn(Messages.error); }
                     });
+
+                    // If this is a form wiht a answer channel, delete it too
+                    var p = priv.propChannels;
+                    if (p.answersChannel) {
+                        sframeChan.query('Q_DELETE_OWNED', {
+                            teamId: typeof(owned) !== "boolean" ? owned : undefined,
+                            channel: p.answersChannel
+                        }, function () {});
+                    }
                 });
                 if (!opts.noEditPassword) { $d.append(h('br')); }
                 $d.append(h('div', [
@@ -1020,7 +1048,7 @@ define([
             var owned = Modal.isOwned(Env, data);
 
             // Request edit access
-            if (common.isLoggedIn() && ((data.roHref && !data.href) || data.fakeHref) && !owned && !opts.calendar) {
+            if (common.isLoggedIn() && ((data.roHref && !data.href) || data.fakeHref) && !owned && !opts.calendar && priv.app !== 'form') {
                 var requestButton = h('button.btn.btn-secondary.no-margin.cp-access-margin-right',
                                         Messages.requestEdit_button);
                 var requestBlock = h('p', requestButton);
@@ -1058,7 +1086,7 @@ define([
             var canMute = data.mailbox && owned === true && (
                     (typeof (data.mailbox) === "string" && data.owners[0] === edPublic) ||
                     data.mailbox[edPublic]);
-            if (owned === true && !opts.calendar) {
+            if (owned === true && !opts.calendar && priv.app !== 'form') {
                 var cbox = UI.createCheckbox('cp-access-mute', Messages.access_muteRequests, !canMute);
                 var $cbox = $(cbox);
                 var spinner = UI.makeSpinner($cbox);
diff --git a/www/common/inner/common-mediatag.js b/www/common/inner/common-mediatag.js
index 966724fa1..b8550fcac 100644
--- a/www/common/inner/common-mediatag.js
+++ b/www/common/inner/common-mediatag.js
@@ -127,9 +127,8 @@ define([
                 if (e || !data) { return void displayDefault(); }
                 if (typeof data !== "number") { return void displayDefault(); }
                 if (Util.bytesToMegabytes(data) > 0.5) { return void displayDefault(); }
-                var $img = $('<media-tag>').appendTo($container);
-                $img.attr('src', src);
-                $img.attr('data-crypto-key', 'cryptpad:' + cryptKey);
+                var mt = UI.mediaTag(src, cryptKey);
+                var $img = $(mt).appendTo($container);
                 MT.displayMediatagImage(common, $img, function (err, $image) {
                     if (err) { return void console.error(err); }
                     centerImage($img, $image);
diff --git a/www/common/inner/properties.js b/www/common/inner/properties.js
index ddbf017fc..c946ed208 100644
--- a/www/common/inner/properties.js
+++ b/www/common/inner/properties.js
@@ -24,6 +24,7 @@ define([
         if (privateData.propChannels) {
             var p = privateData.propChannels;
             data.channel = data.channel || p.channel;
+            data.answersChannel = data.answersChannel || p.answersChannel;
             data.rtChannel = data.rtChannel || p.rtChannel;
             data.lastVersion = data.lastVersion || p.lastVersion;
             data.lastCpHash = data.lastCpHash || p.lastCpHash;
@@ -75,6 +76,7 @@ define([
         var bytes = 0;
         var historyBytes;
         var chan = [data.channel];
+        if (data.answersChannel) { chan.push(data.answersChannel); }
         if (data.rtChannel) { chan.push(data.rtChannel); }
         if (data.lastVersion) { chan.push(Hash.hrefToHexChannelId(data.lastVersion)); }
 
diff --git a/www/common/inner/share.js b/www/common/inner/share.js
index f2eb2e953..4bcf0d621 100644
--- a/www/common/inner/share.js
+++ b/www/common/inner/share.js
@@ -90,7 +90,11 @@ define([
                         setTimeout(w);
                     });
                     if (res && /^http/.test(res)) {
-                        href = Hash.getRelativeHref(res);
+                        var _href = Hash.getRelativeHref(res);
+                        if (_href) { href = _href; }
+                        else {
+                            href = res;
+                        }
                         setTimeout(w);
                         return;
                     }
@@ -109,6 +113,7 @@ define([
                             if (mailbox.notifications && mailbox.curvePublic) {
                                 common.mailbox.sendTo("SHARE_PAD", {
                                     href: href,
+                                    isStatic: Boolean(config.static),
                                     password: config.password,
                                     isTemplate: config.isTemplate,
                                     name: myName,
@@ -119,6 +124,9 @@ define([
                                     channel: mailbox.notifications,
                                     curvePublic: mailbox.curvePublic
                                 });
+                                if (config.static) {
+                                    Feedback.send("LINK_SHARED_WITH_CONTACT");
+                                }
                                 return;
                             }
                         }
@@ -137,6 +145,21 @@ define([
                             });
                             return;
                         }
+                        if (config.static) {
+                            common.getSframeChannel().query("Q_DRIVE_USEROBJECT", {
+                                cmd: "addLink",
+                                teamId: team.id,
+                                data: {
+                                    name: title,
+                                    href: href,
+                                    path: ['root']
+                                }
+                            }, function () {
+                                UI.log(Messages.saved);
+                            });
+                            Feedback.send("LINK_ADDED_TO_DRIVE");
+                            return;
+                        }
                         sframeChan.query('Q_STORE_IN_TEAM', {
                             href: href,
                             password: config.password,
@@ -346,6 +369,9 @@ define([
         ] : [
             UI.createCheckbox('cp-share-embed', Messages.share_linkEmbed, false, { mark: {tabindex:1} }),
         ];
+
+        if (opts.static) { linkContent = []; }
+
         linkContent.push(h('div.cp-spacer'));
         linkContent.push(UI.dialog.selectableArea('', { id: 'cp-share-link-preview', tabindex: 1, rows:3}));
 
@@ -361,7 +387,7 @@ define([
         // warning about sharing links
         // when sharing a version hash, there is a similar warning and we want
         // to avoid alert fatigue
-        if (!opts.versionHash) {
+        if (!opts.versionHash && !opts.static) {
             var localStore = window.cryptpadStore;
             var dismissButton = h('span.fa.fa-times');
             var shareLinkWarning = h('div.alert.alert-warning.dismissable',
@@ -405,6 +431,10 @@ define([
                     var v = opts.getLinkValue({
                         embed: Util.isChecked($link.find('#cp-share-embed'))
                     });
+                    if (opts.static) {
+                        common.openUnsafeURL(v);
+                        return true;
+                    }
                     window.open(v);
                     return true;
                 },
@@ -494,7 +524,20 @@ define([
         var parsed = Hash.parsePadUrl(pathname);
         var canPresent = ['code', 'slide'].indexOf(parsed.type) !== -1;
         var versionHash = hashes.viewHash && opts.versionHash;
-        var canBAR = parsed.type !== 'drive' && !versionHash;
+        var isForm = parsed.type === "form"; // && opts.auditorHash;
+        var canBAR = parsed.type !== 'drive' && !versionHash && !isForm;
+
+        var labelEdit = Messages.share_linkEdit;
+        var labelView = Messages.share_linkView;
+
+        var auditor;
+        if (isForm) {
+            labelEdit = Messages.share_formEdit;
+            labelView = Messages.share_formView;
+            auditor = UI.createRadio('accessRights', 'cp-share-form', Messages.share_formAuditor, false, {
+                mark: {tabindex:1},
+            });
+        }
 
         var burnAfterReading = (hashes.viewHash && canBAR) ?
                     UI.createRadio('accessRights', 'cp-share-bar', Messages.burnAfterReading_linkBurnAfterReading, false, {
@@ -505,12 +548,13 @@ define([
             h('label', Messages.share_linkAccess),
             h('div.radio-group',[
             UI.createRadio('accessRights', 'cp-share-editable-false',
-                           Messages.share_linkView, true, { mark: {tabindex:1} }),
+                            labelView, true, { mark: {tabindex:1} }),
             canPresent ? UI.createRadio('accessRights', 'cp-share-present',
                             Messages.share_linkPresent, false, { mark: {tabindex:1} }) : undefined,
             UI.createRadio('accessRights', 'cp-share-editable-true',
-                           Messages.share_linkEdit, false, { mark: {tabindex:1} })]),
-            burnAfterReading
+                            labelEdit, false, { mark: {tabindex:1} }),
+            auditor]),
+            burnAfterReading,
         ]);
 
         // Burn after reading
@@ -548,11 +592,13 @@ define([
             });
         };
         opts.getLinkValue = function (initValue, cb) {
+            if (opts.static) { return opts.static; }
             var val = initValue || {};
             var edit = val.edit !== undefined ? val.edit : Util.isChecked($rights.find('#cp-share-editable-true'));
             var embed = val.embed;
             var present = val.present !== undefined ? val.present : Util.isChecked($rights.find('#cp-share-present'));
             var burnAfterReading = Util.isChecked($rights.find('#cp-share-bar'));
+            var formAuditor = Util.isChecked($rights.find('#cp-share-form'));
             if (versionHash) {
                 edit = false;
                 present = false;
@@ -569,6 +615,9 @@ define([
             }
             var hash = (!hashes.viewHash || (edit && hashes.editHash)) ? hashes.editHash
                                                                        : hashes.viewHash;
+            if (formAuditor && opts.auditorHash) {
+                hash = opts.auditorHash;
+            }
             var href = burnAfterReading ? opts.burnAfterReadingUrl
                                              : (origin + pathname + '#' + hash);
             var parsed = Hash.parsePadUrl(href);
@@ -594,6 +643,9 @@ define([
             $rights.find('#cp-share-present').removeAttr('checked').attr('disabled', true);
             $rights.find('#cp-share-editable-true').attr('checked', true);
         }
+        if (isForm && !opts.auditorHash) {
+            $rights.find('#cp-share-form').removeAttr('checked').attr('disabled', true);
+        }
 
         var getLink = function () {
             return $rights.parent().find('#cp-share-link-preview');
@@ -665,7 +717,7 @@ define([
         opts.access = true; // Allow the use of the modal even if the pad is not stored
 
         var hashes = opts.hashes;
-        if (!hashes || (!hashes.editHash && !hashes.viewHash)) { return; }
+        if (!hashes || (!hashes.editHash && !hashes.viewHash && !opts.static)) { return; }
 
         var teams = getEditableTeams(common, opts);
         opts.teams = teams;
@@ -684,19 +736,23 @@ define([
 
         var $rights = opts.$rights = getRightsHeader(common, opts);
         var resetTab = function () {
+            if (opts.static) { return; }
             $rights.show();
             $rights.find('label.cp-radio').show();
         };
         var onShowEmbed = function () {
+            if (opts.static) { return; }
             $rights.find('#cp-share-bar').closest('label').hide();
             $rights.find('input[type="radio"]:enabled').first().prop('checked', 'checked');
             $rights.find('input[type="radio"]').trigger('change');
         };
         var onShowContacts = function () {
+            if (opts.static) { return; }
             if (!hasFriends || priv.offline) {
                 $rights.hide();
             }
         };
+        if (opts.static) { $rights.hide(); }
 
         var contactsActive = hasFriends && !priv.offline;
         var tabs = [{
@@ -711,13 +767,16 @@ define([
             title: Messages.share_linkCategory,
             icon: "fa fa-link",
             active: !contactsActive,
-        }, {
-            getTab: getEmbedTab,
-            title: Messages.share_embedCategory,
-            icon: "fa fa-code",
-            onShow: onShowEmbed,
-            onHide: resetTab
         }];
+        if (!opts.static) {
+            tabs.push({
+                getTab: getEmbedTab,
+                title: Messages.share_embedCategory,
+                icon: "fa fa-code",
+                onShow: onShowEmbed,
+                onHide: resetTab
+            });
+        }
         Modal.getModal(common, opts, tabs, function (err, modal) {
             // Hide the burn-after-reading option by default
             var $modal = $(modal);
diff --git a/www/common/notifications.js b/www/common/notifications.js
index e6cad99e2..83052ff68 100644
--- a/www/common/notifications.js
+++ b/www/common/notifications.js
@@ -8,7 +8,8 @@ define([
     '/common/common-constants.js',
     '/customize/messages.js',
     '/customize/pages.js',
-], function($, h, Hash, UI, UIElements, Util, Constants, Messages, Pages) {
+    '/lib/datepicker/flatpickr.js',
+], function($, h, Hash, UI, UIElements, Util, Constants, Messages, Pages, Flatpickr) {
 
     var handlers = {};
 
@@ -91,6 +92,10 @@ define([
             (type === 'file' ? 'notification_fileShared' :  // Msg.notification_fileSharedTeam
                 'notification_padShared'); // Msg.notification_padSharedTeam
 
+        if (msg.content.isStatic) {
+            key = 'notification_linkShared'; // Msg.notification_linkShared;
+        }
+
         var teamNotification = /^team-/.test(data.type) && Number(data.type.slice(5));
         var teamName = '';
         if (teamNotification) {
@@ -108,6 +113,15 @@ define([
             return Messages._getKey(key, [name, title, teamName]);
         };
         content.handler = function() {
+            if (msg.content.isStatic) {
+                UIElements.displayOpenLinkModal(common, {
+                    curve: msg.author,
+                    href: msg.content.href,
+                    name: name,
+                    title: title
+                }, defaultDismiss(common, data));
+                return;
+            }
             var obj = {
                 p: msg.content.isTemplate ? ['template'] : undefined,
                 t: teamNotification || undefined,
@@ -477,7 +491,7 @@ define([
             var nowDateStr = new Date().toLocaleDateString();
             var startDate = new Date(start);
             if (msg.isAllDay && msg.startDay) {
-                startDate = new Date(msg.startDay);
+                startDate = Flatpickr.parseDate(msg.startDay);
             }
 
             // Missed events
diff --git a/www/common/notify.js b/www/common/notify.js
index ac8461104..d289d6da8 100644
--- a/www/common/notify.js
+++ b/www/common/notify.js
@@ -1,7 +1,7 @@
 define(['/api/config'], function (ApiConfig) {
     var Module = {};
 
-    var apps = ['code', 'slide', 'pad', 'kanban', 'whiteboard', 'sheet', 'poll', 'teams'];
+    var apps = ['code', 'slide', 'pad', 'kanban', 'whiteboard', 'sheet', 'poll', 'teams', 'form'];
     var app = window.location.pathname.slice(1, -1); // remove "/" at the beginnin and the end
     var suffix = apps.indexOf(app) !== -1 ? '-'+app : '';
 
diff --git a/www/common/onlyoffice/inner.js b/www/common/onlyoffice/inner.js
index 4a0a56be0..2afef4978 100644
--- a/www/common/onlyoffice/inner.js
+++ b/www/common/onlyoffice/inner.js
@@ -72,8 +72,31 @@ define([
         return JSONSortify(obj);
     };
 
+    /*  Chrome 92 dropped support for SharedArrayBuffer in cross-origin contexts
+        where window.crossOriginIsolated is false.
+
+        Their blog (https://blog.chromium.org/2021/02/restriction-on-sharedarraybuffers.html)
+        isn't clear about why they're doing this, but since it's related to site-isolation
+        it seems they're trying to do vague security things.
+
+        In any case, there seems to be a workaround where you can still create them
+        by using `new WebAssembly.Memory({shared: true, ...})` instead of `new SharedArrayBuffer`.
+
+        This seems unreliable, but it's better than not being able to export, since
+        we actively rely on postMessage between iframes and therefore can't afford
+        to opt for full isolation.
+    */
+    var supportsSharedArrayBuffers = function () {
+        try {
+            return Object.prototype.toString.call(new window.WebAssembly.Memory({shared: true, initial: 0, maximum: 0}).buffer) === '[object SharedArrayBuffer]';
+        } catch (err) {
+            console.error(err);
+        }
+        return false;
+    };
+
     var supportsXLSX = function () {
-        return !(typeof(Atomics) === "undefined" || typeof (SharedArrayBuffer) === "undefined" || typeof(WebAssembly) === 'undefined');
+        return !(typeof(Atomics) === "undefined" || !supportsSharedArrayBuffers() /* || typeof (SharedArrayBuffer) === "undefined" */ || typeof(WebAssembly) === 'undefined');
     };
 
 
@@ -1915,7 +1938,9 @@ define([
         var exportXLSXFile = function() {
             var text = getContent();
             var suggestion = Title.suggestTitle(Title.defaultTitle);
-            var ext = ['.xlsx', '.ods', '.bin', '.csv', '.pdf'];
+            var ext = ['.xlsx', '.ods', '.bin',
+            //'.csv', // XXX
+            '.pdf'];
             var type = common.getMetadataMgr().getPrivateData().ooType;
             var warning = '';
             if (type==="presentation") {
diff --git a/www/common/onlyoffice/v4/sdkjs/cell/sdk-all.js b/www/common/onlyoffice/v4/sdkjs/cell/sdk-all.js
index b8d012784..cdefc6082 100644
--- a/www/common/onlyoffice/v4/sdkjs/cell/sdk-all.js
+++ b/www/common/onlyoffice/v4/sdkjs/cell/sdk-all.js
@@ -12867,13 +12867,13 @@ deleted){self.dependencyFormulas.delColumnTable(tableName,deleted);var wsActive=
 wsActive.getHidden())wsActive.setHidden(false);if(!bNoBuildDep)this.dependencyFormulas.initOpen();if(bSnapshot)this.snapshot=this._getSnapshot()};Workbook.prototype.initPostOpenZip=function(pivotCaches){var t=this;this.forEach(function(ws){ws.initPostOpenZip(pivotCaches,t.oNumFmtsOpen)})};Workbook.prototype.setCommonIndexObjectsFrom=function(wb){this.oStyleManager=wb.oStyleManager;this.sharedStrings=wb.sharedStrings;this.workbookFormulas=wb.workbookFormulas};Workbook.prototype.forEach=function(callback,
 isCopyPaste){if(isCopyPaste||isCopyPaste===false)callback(this.getActiveWs(),this.getActive());else for(var i=0,l=this.aWorksheets.length;i<l;++i)callback(this.aWorksheets[i],i)};Workbook.prototype.rebuildColors=function(){AscCommonExcel.g_oColorManager.rebuildColors();this.forEach(function(ws){ws.rebuildColors()})};Workbook.prototype.getDefaultFont=function(){return g_oDefaultFormat.Font.getName()};Workbook.prototype.getDefaultSize=function(){return g_oDefaultFormat.Font.getSize()};Workbook.prototype.getActive=
 function(){return this.nActive};Workbook.prototype.getActiveWs=function(){return this.getWorksheet(this.nActive)};Workbook.prototype.setActive=function(index){if(index>=0&&index<this.aWorksheets.length){this.nActive=index;this.cleanFindResults();return true}return false};Workbook.prototype.setActiveById=function(sheetId){var ws=this.getWorksheetById(sheetId);if(!ws&&Array.isArray(this.aWorksheets))ws=this.aWorksheets[this.aWorksheets.length-1];return this.setActive(ws.getIndex())};Workbook.prototype.getSheetIdByIndex=
-function(index){var ws=this.getWorksheet(index);return ws?ws.getId():null};Workbook.prototype.getWorksheet=function(index){if(index>=0&&index<this.aWorksheets.length)return this.aWorksheets[index];return null};Workbook.prototype.getWorksheetById=function(id){return this.aWorksheetsById[id]};Workbook.prototype.getWorksheetByName=function(name){for(var i=0;i<this.aWorksheets.length;i++)if(this.aWorksheets[i].getName()==name)return this.aWorksheets[i];return null};Workbook.prototype.getWorksheetIndexByName=
-function(name){for(var i=0;i<this.aWorksheets.length;i++)if(this.aWorksheets[i].getName()==name)return i;return null};Workbook.prototype.getWorksheetCount=function(){return this.aWorksheets.length};Workbook.prototype.createWorksheet=function(indexBefore,sName,sId){this.dependencyFormulas.lockRecal();History.Create_NewPoint();History.TurnOff();var wsActive=this.getActiveWs();var oNewWorksheet=new Worksheet(this,this.aWorksheets.length,sId);if(this.checkValidSheetName(sName))oNewWorksheet.sName=sName;
-oNewWorksheet.initPostOpen(this.wsHandlers,{});if(null!=indexBefore&&indexBefore>=0&&indexBefore<this.aWorksheets.length)this.aWorksheets.splice(indexBefore,0,oNewWorksheet);else{indexBefore=this.aWorksheets.length;this.aWorksheets.push(oNewWorksheet)}this.aWorksheetsById[oNewWorksheet.getId()]=oNewWorksheet;this._updateWorksheetIndexes(wsActive);History.TurnOn();this._insertWorksheetFormula(oNewWorksheet.index);History.Add(AscCommonExcel.g_oUndoRedoWorkbook,AscCH.historyitem_Workbook_SheetAdd,null,
-null,new UndoRedoData_SheetAdd(indexBefore,oNewWorksheet.getName(),null,oNewWorksheet.getId()));History.SetSheetUndo(wsActive.getId());History.SetSheetRedo(oNewWorksheet.getId());this.dependencyFormulas.unlockRecal();return oNewWorksheet};Workbook.prototype.copyWorksheet=function(index,insertBefore,sName,sId,bFromRedo,tableNames,opt_sheet,opt_base64){var renameParams;if(index>=0&&index<this.aWorksheets.length){this.dependencyFormulas.buildDependency();History.TurnOff();var wsActive=this.getActiveWs();
-var wsFrom=opt_sheet?opt_sheet:this.aWorksheets[index];var newSheet=new Worksheet(this,-1,sId);if(null!=insertBefore&&insertBefore>=0&&insertBefore<this.aWorksheets.length)this.aWorksheets.splice(insertBefore,0,newSheet);else this.aWorksheets.push(newSheet);if(opt_sheet)this.addingWorksheet=newSheet;this.aWorksheetsById[newSheet.getId()]=newSheet;this._updateWorksheetIndexes(wsActive);renameParams=newSheet.copyFrom(wsFrom,sName,tableNames);newSheet.copyFromFormulas(renameParams);newSheet.initPostOpen(this.wsHandlers,
-{},{});History.TurnOn();this.dependencyFormulas.copyDefNameByWorksheet(wsFrom,newSheet,renameParams,opt_sheet);if(opt_sheet)this.dependencyFormulas.copyDefNameByWorkbook(wsFrom,newSheet,renameParams,opt_sheet);this._insertWorksheetFormula(insertBefore);if(!tableNames)tableNames=newSheet.getTableNames();History.Add(AscCommonExcel.g_oUndoRedoWorkbook,AscCH.historyitem_Workbook_SheetAdd,null,null,new UndoRedoData_SheetAdd(insertBefore,newSheet.getName(),wsFrom.getId(),newSheet.getId(),tableNames,opt_base64));
-History.SetSheetUndo(wsActive.getId());History.SetSheetRedo(newSheet.getId());newSheet.copyFromAfterInsert(wsFrom);if(!(bFromRedo===true)){wsFrom.copyObjects(newSheet,renameParams);var i;if(wsFrom.aNamedSheetViews)for(i=0;i<wsFrom.aNamedSheetViews.length;++i)newSheet.addNamedSheetView(wsFrom.aNamedSheetViews[i].clone(renameParams.tableNameMap));if(wsFrom.dataValidations&&wsFrom.dataValidations.elems)for(i=0;i<wsFrom.dataValidations.elems.length;++i)newSheet.addDataValidation(wsFrom.dataValidations.elems[i].clone(),
+function(index){var ws=this.getWorksheet(index);return ws?ws.getId():null};Workbook.prototype.getWorksheet=function(index){if(index>=0&&index<this.aWorksheets.length)return this.aWorksheets[index];return null};Workbook.prototype.getWorksheetById=function(id){if(this.aWorksheetsById[id])return this.aWorksheetsById[id];var s;this.aWorksheets.some(function(_s){if(_s.Id===id){s=_s;return true}});return s};Workbook.prototype.getWorksheetByName=function(name){for(var i=0;i<this.aWorksheets.length;i++)if(this.aWorksheets[i].getName()==
+name)return this.aWorksheets[i];return null};Workbook.prototype.getWorksheetIndexByName=function(name){for(var i=0;i<this.aWorksheets.length;i++)if(this.aWorksheets[i].getName()==name)return i;return null};Workbook.prototype.getWorksheetCount=function(){return this.aWorksheets.length};Workbook.prototype.createWorksheet=function(indexBefore,sName,sId){this.dependencyFormulas.lockRecal();History.Create_NewPoint();History.TurnOff();var wsActive=this.getActiveWs();var oNewWorksheet=new Worksheet(this,
+this.aWorksheets.length,sId);if(this.checkValidSheetName(sName))oNewWorksheet.sName=sName;oNewWorksheet.initPostOpen(this.wsHandlers,{});if(null!=indexBefore&&indexBefore>=0&&indexBefore<this.aWorksheets.length)this.aWorksheets.splice(indexBefore,0,oNewWorksheet);else{indexBefore=this.aWorksheets.length;this.aWorksheets.push(oNewWorksheet)}this.aWorksheetsById[oNewWorksheet.getId()]=oNewWorksheet;this._updateWorksheetIndexes(wsActive);History.TurnOn();this._insertWorksheetFormula(oNewWorksheet.index);
+History.Add(AscCommonExcel.g_oUndoRedoWorkbook,AscCH.historyitem_Workbook_SheetAdd,null,null,new UndoRedoData_SheetAdd(indexBefore,oNewWorksheet.getName(),null,oNewWorksheet.getId()));History.SetSheetUndo(wsActive.getId());History.SetSheetRedo(oNewWorksheet.getId());this.dependencyFormulas.unlockRecal();return oNewWorksheet};Workbook.prototype.copyWorksheet=function(index,insertBefore,sName,sId,bFromRedo,tableNames,opt_sheet,opt_base64){var renameParams;if(index>=0&&index<this.aWorksheets.length){this.dependencyFormulas.buildDependency();
+History.TurnOff();var wsActive=this.getActiveWs();var wsFrom=opt_sheet?opt_sheet:this.aWorksheets[index];var newSheet=new Worksheet(this,-1,sId);if(null!=insertBefore&&insertBefore>=0&&insertBefore<this.aWorksheets.length)this.aWorksheets.splice(insertBefore,0,newSheet);else this.aWorksheets.push(newSheet);if(opt_sheet)this.addingWorksheet=newSheet;this.aWorksheetsById[newSheet.getId()]=newSheet;this._updateWorksheetIndexes(wsActive);renameParams=newSheet.copyFrom(wsFrom,sName,tableNames);newSheet.copyFromFormulas(renameParams);
+newSheet.initPostOpen(this.wsHandlers,{},{});History.TurnOn();this.dependencyFormulas.copyDefNameByWorksheet(wsFrom,newSheet,renameParams,opt_sheet);if(opt_sheet)this.dependencyFormulas.copyDefNameByWorkbook(wsFrom,newSheet,renameParams,opt_sheet);this._insertWorksheetFormula(insertBefore);if(!tableNames)tableNames=newSheet.getTableNames();History.Add(AscCommonExcel.g_oUndoRedoWorkbook,AscCH.historyitem_Workbook_SheetAdd,null,null,new UndoRedoData_SheetAdd(insertBefore,newSheet.getName(),wsFrom.getId(),
+newSheet.getId(),tableNames,opt_base64));History.SetSheetUndo(wsActive.getId());History.SetSheetRedo(newSheet.getId());newSheet.copyFromAfterInsert(wsFrom);if(!(bFromRedo===true)){wsFrom.copyObjects(newSheet,renameParams);var i;if(wsFrom.aNamedSheetViews)for(i=0;i<wsFrom.aNamedSheetViews.length;++i)newSheet.addNamedSheetView(wsFrom.aNamedSheetViews[i].clone(renameParams.tableNameMap));if(wsFrom.dataValidations&&wsFrom.dataValidations.elems)for(i=0;i<wsFrom.dataValidations.elems.length;++i)newSheet.addDataValidation(wsFrom.dataValidations.elems[i].clone(),
 true)}this.sortDependency();if(opt_sheet)this.addingWorksheet=null}return renameParams};Workbook.prototype.insertWorksheet=function(index,sheet){var wsActive=this.getActiveWs();if(null!=index&&index>=0&&index<this.aWorksheets.length)this.aWorksheets.splice(index,0,sheet);else this.aWorksheets.push(sheet);this.aWorksheetsById[sheet.getId()]=sheet;this._updateWorksheetIndexes(wsActive);this._insertWorksheetFormula(index);this._insertTablePartsName(sheet);sheet._BuildDependencies(sheet.getCwf());this.sortDependency()};
 Workbook.prototype._insertTablePartsName=function(sheet){if(sheet&&sheet.TableParts&&sheet.TableParts.length)for(var i=0;i<sheet.TableParts.length;i++){var tablePart=sheet.TableParts[i];this.dependencyFormulas.addTableName(sheet,tablePart);tablePart.buildDependencies()}};Workbook.prototype._insertWorksheetFormula=function(index){if(index>0&&index<this.aWorksheets.length){var oWsBefore=this.aWorksheets[index-1];this.dependencyFormulas.changeSheet(this.dependencyFormulas.prepareChangeSheet(oWsBefore.getId(),
 {insert:index}))}};Workbook.prototype.replaceWorksheet=function(indexFrom,indexTo){if(indexFrom>=0&&indexFrom<this.aWorksheets.length&&indexTo>=0&&indexTo<this.aWorksheets.length){var wsActive=this.getActiveWs();var oWsFrom=this.aWorksheets[indexFrom];var tempW={wF:oWsFrom,wFI:indexFrom,wTI:indexTo};if(tempW.wFI<tempW.wTI)tempW.wTI++;this.dependencyFormulas.lockRecal();var prepared=this.dependencyFormulas.prepareChangeSheet(oWsFrom.getId(),{replace:tempW},null);var movedSheet=this.aWorksheets.splice(indexFrom,
diff --git a/www/common/onlyoffice/v4/sdkjs/slide/sdk-all.js b/www/common/onlyoffice/v4/sdkjs/slide/sdk-all.js
index c8d2c2233..12d49664b 100644
--- a/www/common/onlyoffice/v4/sdkjs/slide/sdk-all.js
+++ b/www/common/onlyoffice/v4/sdkjs/slide/sdk-all.js
@@ -10071,13 +10071,13 @@ deleted){self.dependencyFormulas.delColumnTable(tableName,deleted);var wsActive=
 wsActive.getHidden())wsActive.setHidden(false);if(!bNoBuildDep)this.dependencyFormulas.initOpen();if(bSnapshot)this.snapshot=this._getSnapshot()};Workbook.prototype.initPostOpenZip=function(pivotCaches){var t=this;this.forEach(function(ws){ws.initPostOpenZip(pivotCaches,t.oNumFmtsOpen)})};Workbook.prototype.setCommonIndexObjectsFrom=function(wb){this.oStyleManager=wb.oStyleManager;this.sharedStrings=wb.sharedStrings;this.workbookFormulas=wb.workbookFormulas};Workbook.prototype.forEach=function(callback,
 isCopyPaste){if(isCopyPaste||isCopyPaste===false)callback(this.getActiveWs(),this.getActive());else for(var i=0,l=this.aWorksheets.length;i<l;++i)callback(this.aWorksheets[i],i)};Workbook.prototype.rebuildColors=function(){AscCommonExcel.g_oColorManager.rebuildColors();this.forEach(function(ws){ws.rebuildColors()})};Workbook.prototype.getDefaultFont=function(){return g_oDefaultFormat.Font.getName()};Workbook.prototype.getDefaultSize=function(){return g_oDefaultFormat.Font.getSize()};Workbook.prototype.getActive=
 function(){return this.nActive};Workbook.prototype.getActiveWs=function(){return this.getWorksheet(this.nActive)};Workbook.prototype.setActive=function(index){if(index>=0&&index<this.aWorksheets.length){this.nActive=index;this.cleanFindResults();return true}return false};Workbook.prototype.setActiveById=function(sheetId){var ws=this.getWorksheetById(sheetId);if(!ws&&Array.isArray(this.aWorksheets))ws=this.aWorksheets[this.aWorksheets.length-1];return this.setActive(ws.getIndex())};Workbook.prototype.getSheetIdByIndex=
-function(index){var ws=this.getWorksheet(index);return ws?ws.getId():null};Workbook.prototype.getWorksheet=function(index){if(index>=0&&index<this.aWorksheets.length)return this.aWorksheets[index];return null};Workbook.prototype.getWorksheetById=function(id){return this.aWorksheetsById[id]};Workbook.prototype.getWorksheetByName=function(name){for(var i=0;i<this.aWorksheets.length;i++)if(this.aWorksheets[i].getName()==name)return this.aWorksheets[i];return null};Workbook.prototype.getWorksheetIndexByName=
-function(name){for(var i=0;i<this.aWorksheets.length;i++)if(this.aWorksheets[i].getName()==name)return i;return null};Workbook.prototype.getWorksheetCount=function(){return this.aWorksheets.length};Workbook.prototype.createWorksheet=function(indexBefore,sName,sId){this.dependencyFormulas.lockRecal();History.Create_NewPoint();History.TurnOff();var wsActive=this.getActiveWs();var oNewWorksheet=new Worksheet(this,this.aWorksheets.length,sId);if(this.checkValidSheetName(sName))oNewWorksheet.sName=sName;
-oNewWorksheet.initPostOpen(this.wsHandlers,{});if(null!=indexBefore&&indexBefore>=0&&indexBefore<this.aWorksheets.length)this.aWorksheets.splice(indexBefore,0,oNewWorksheet);else{indexBefore=this.aWorksheets.length;this.aWorksheets.push(oNewWorksheet)}this.aWorksheetsById[oNewWorksheet.getId()]=oNewWorksheet;this._updateWorksheetIndexes(wsActive);History.TurnOn();this._insertWorksheetFormula(oNewWorksheet.index);History.Add(AscCommonExcel.g_oUndoRedoWorkbook,AscCH.historyitem_Workbook_SheetAdd,null,
-null,new UndoRedoData_SheetAdd(indexBefore,oNewWorksheet.getName(),null,oNewWorksheet.getId()));History.SetSheetUndo(wsActive.getId());History.SetSheetRedo(oNewWorksheet.getId());this.dependencyFormulas.unlockRecal();return oNewWorksheet};Workbook.prototype.copyWorksheet=function(index,insertBefore,sName,sId,bFromRedo,tableNames,opt_sheet,opt_base64){var renameParams;if(index>=0&&index<this.aWorksheets.length){this.dependencyFormulas.buildDependency();History.TurnOff();var wsActive=this.getActiveWs();
-var wsFrom=opt_sheet?opt_sheet:this.aWorksheets[index];var newSheet=new Worksheet(this,-1,sId);if(null!=insertBefore&&insertBefore>=0&&insertBefore<this.aWorksheets.length)this.aWorksheets.splice(insertBefore,0,newSheet);else this.aWorksheets.push(newSheet);if(opt_sheet)this.addingWorksheet=newSheet;this.aWorksheetsById[newSheet.getId()]=newSheet;this._updateWorksheetIndexes(wsActive);renameParams=newSheet.copyFrom(wsFrom,sName,tableNames);newSheet.copyFromFormulas(renameParams);newSheet.initPostOpen(this.wsHandlers,
-{},{});History.TurnOn();this.dependencyFormulas.copyDefNameByWorksheet(wsFrom,newSheet,renameParams,opt_sheet);if(opt_sheet)this.dependencyFormulas.copyDefNameByWorkbook(wsFrom,newSheet,renameParams,opt_sheet);this._insertWorksheetFormula(insertBefore);if(!tableNames)tableNames=newSheet.getTableNames();History.Add(AscCommonExcel.g_oUndoRedoWorkbook,AscCH.historyitem_Workbook_SheetAdd,null,null,new UndoRedoData_SheetAdd(insertBefore,newSheet.getName(),wsFrom.getId(),newSheet.getId(),tableNames,opt_base64));
-History.SetSheetUndo(wsActive.getId());History.SetSheetRedo(newSheet.getId());newSheet.copyFromAfterInsert(wsFrom);if(!(bFromRedo===true)){wsFrom.copyObjects(newSheet,renameParams);var i;if(wsFrom.aNamedSheetViews)for(i=0;i<wsFrom.aNamedSheetViews.length;++i)newSheet.addNamedSheetView(wsFrom.aNamedSheetViews[i].clone(renameParams.tableNameMap));if(wsFrom.dataValidations&&wsFrom.dataValidations.elems)for(i=0;i<wsFrom.dataValidations.elems.length;++i)newSheet.addDataValidation(wsFrom.dataValidations.elems[i].clone(),
+function(index){var ws=this.getWorksheet(index);return ws?ws.getId():null};Workbook.prototype.getWorksheet=function(index){if(index>=0&&index<this.aWorksheets.length)return this.aWorksheets[index];return null};Workbook.prototype.getWorksheetById=function(id){if(this.aWorksheetsById[id])return this.aWorksheetsById[id];var s;this.aWorksheets.some(function(_s){if(_s.Id===id){s=_s;return true}});return s};Workbook.prototype.getWorksheetByName=function(name){for(var i=0;i<this.aWorksheets.length;i++)if(this.aWorksheets[i].getName()==
+name)return this.aWorksheets[i];return null};Workbook.prototype.getWorksheetIndexByName=function(name){for(var i=0;i<this.aWorksheets.length;i++)if(this.aWorksheets[i].getName()==name)return i;return null};Workbook.prototype.getWorksheetCount=function(){return this.aWorksheets.length};Workbook.prototype.createWorksheet=function(indexBefore,sName,sId){this.dependencyFormulas.lockRecal();History.Create_NewPoint();History.TurnOff();var wsActive=this.getActiveWs();var oNewWorksheet=new Worksheet(this,
+this.aWorksheets.length,sId);if(this.checkValidSheetName(sName))oNewWorksheet.sName=sName;oNewWorksheet.initPostOpen(this.wsHandlers,{});if(null!=indexBefore&&indexBefore>=0&&indexBefore<this.aWorksheets.length)this.aWorksheets.splice(indexBefore,0,oNewWorksheet);else{indexBefore=this.aWorksheets.length;this.aWorksheets.push(oNewWorksheet)}this.aWorksheetsById[oNewWorksheet.getId()]=oNewWorksheet;this._updateWorksheetIndexes(wsActive);History.TurnOn();this._insertWorksheetFormula(oNewWorksheet.index);
+History.Add(AscCommonExcel.g_oUndoRedoWorkbook,AscCH.historyitem_Workbook_SheetAdd,null,null,new UndoRedoData_SheetAdd(indexBefore,oNewWorksheet.getName(),null,oNewWorksheet.getId()));History.SetSheetUndo(wsActive.getId());History.SetSheetRedo(oNewWorksheet.getId());this.dependencyFormulas.unlockRecal();return oNewWorksheet};Workbook.prototype.copyWorksheet=function(index,insertBefore,sName,sId,bFromRedo,tableNames,opt_sheet,opt_base64){var renameParams;if(index>=0&&index<this.aWorksheets.length){this.dependencyFormulas.buildDependency();
+History.TurnOff();var wsActive=this.getActiveWs();var wsFrom=opt_sheet?opt_sheet:this.aWorksheets[index];var newSheet=new Worksheet(this,-1,sId);if(null!=insertBefore&&insertBefore>=0&&insertBefore<this.aWorksheets.length)this.aWorksheets.splice(insertBefore,0,newSheet);else this.aWorksheets.push(newSheet);if(opt_sheet)this.addingWorksheet=newSheet;this.aWorksheetsById[newSheet.getId()]=newSheet;this._updateWorksheetIndexes(wsActive);renameParams=newSheet.copyFrom(wsFrom,sName,tableNames);newSheet.copyFromFormulas(renameParams);
+newSheet.initPostOpen(this.wsHandlers,{},{});History.TurnOn();this.dependencyFormulas.copyDefNameByWorksheet(wsFrom,newSheet,renameParams,opt_sheet);if(opt_sheet)this.dependencyFormulas.copyDefNameByWorkbook(wsFrom,newSheet,renameParams,opt_sheet);this._insertWorksheetFormula(insertBefore);if(!tableNames)tableNames=newSheet.getTableNames();History.Add(AscCommonExcel.g_oUndoRedoWorkbook,AscCH.historyitem_Workbook_SheetAdd,null,null,new UndoRedoData_SheetAdd(insertBefore,newSheet.getName(),wsFrom.getId(),
+newSheet.getId(),tableNames,opt_base64));History.SetSheetUndo(wsActive.getId());History.SetSheetRedo(newSheet.getId());newSheet.copyFromAfterInsert(wsFrom);if(!(bFromRedo===true)){wsFrom.copyObjects(newSheet,renameParams);var i;if(wsFrom.aNamedSheetViews)for(i=0;i<wsFrom.aNamedSheetViews.length;++i)newSheet.addNamedSheetView(wsFrom.aNamedSheetViews[i].clone(renameParams.tableNameMap));if(wsFrom.dataValidations&&wsFrom.dataValidations.elems)for(i=0;i<wsFrom.dataValidations.elems.length;++i)newSheet.addDataValidation(wsFrom.dataValidations.elems[i].clone(),
 true)}this.sortDependency();if(opt_sheet)this.addingWorksheet=null}return renameParams};Workbook.prototype.insertWorksheet=function(index,sheet){var wsActive=this.getActiveWs();if(null!=index&&index>=0&&index<this.aWorksheets.length)this.aWorksheets.splice(index,0,sheet);else this.aWorksheets.push(sheet);this.aWorksheetsById[sheet.getId()]=sheet;this._updateWorksheetIndexes(wsActive);this._insertWorksheetFormula(index);this._insertTablePartsName(sheet);sheet._BuildDependencies(sheet.getCwf());this.sortDependency()};
 Workbook.prototype._insertTablePartsName=function(sheet){if(sheet&&sheet.TableParts&&sheet.TableParts.length)for(var i=0;i<sheet.TableParts.length;i++){var tablePart=sheet.TableParts[i];this.dependencyFormulas.addTableName(sheet,tablePart);tablePart.buildDependencies()}};Workbook.prototype._insertWorksheetFormula=function(index){if(index>0&&index<this.aWorksheets.length){var oWsBefore=this.aWorksheets[index-1];this.dependencyFormulas.changeSheet(this.dependencyFormulas.prepareChangeSheet(oWsBefore.getId(),
 {insert:index}))}};Workbook.prototype.replaceWorksheet=function(indexFrom,indexTo){if(indexFrom>=0&&indexFrom<this.aWorksheets.length&&indexTo>=0&&indexTo<this.aWorksheets.length){var wsActive=this.getActiveWs();var oWsFrom=this.aWorksheets[indexFrom];var tempW={wF:oWsFrom,wFI:indexFrom,wTI:indexTo};if(tempW.wFI<tempW.wTI)tempW.wTI++;this.dependencyFormulas.lockRecal();var prepared=this.dependencyFormulas.prepareChangeSheet(oWsFrom.getId(),{replace:tempW},null);var movedSheet=this.aWorksheets.splice(indexFrom,
diff --git a/www/common/onlyoffice/v4/sdkjs/word/sdk-all.js b/www/common/onlyoffice/v4/sdkjs/word/sdk-all.js
index 19d3f1d2e..7aaab4232 100644
--- a/www/common/onlyoffice/v4/sdkjs/word/sdk-all.js
+++ b/www/common/onlyoffice/v4/sdkjs/word/sdk-all.js
@@ -10019,13 +10019,13 @@ deleted){self.dependencyFormulas.delColumnTable(tableName,deleted);var wsActive=
 wsActive.getHidden())wsActive.setHidden(false);if(!bNoBuildDep)this.dependencyFormulas.initOpen();if(bSnapshot)this.snapshot=this._getSnapshot()};Workbook.prototype.initPostOpenZip=function(pivotCaches){var t=this;this.forEach(function(ws){ws.initPostOpenZip(pivotCaches,t.oNumFmtsOpen)})};Workbook.prototype.setCommonIndexObjectsFrom=function(wb){this.oStyleManager=wb.oStyleManager;this.sharedStrings=wb.sharedStrings;this.workbookFormulas=wb.workbookFormulas};Workbook.prototype.forEach=function(callback,
 isCopyPaste){if(isCopyPaste||isCopyPaste===false)callback(this.getActiveWs(),this.getActive());else for(var i=0,l=this.aWorksheets.length;i<l;++i)callback(this.aWorksheets[i],i)};Workbook.prototype.rebuildColors=function(){AscCommonExcel.g_oColorManager.rebuildColors();this.forEach(function(ws){ws.rebuildColors()})};Workbook.prototype.getDefaultFont=function(){return g_oDefaultFormat.Font.getName()};Workbook.prototype.getDefaultSize=function(){return g_oDefaultFormat.Font.getSize()};Workbook.prototype.getActive=
 function(){return this.nActive};Workbook.prototype.getActiveWs=function(){return this.getWorksheet(this.nActive)};Workbook.prototype.setActive=function(index){if(index>=0&&index<this.aWorksheets.length){this.nActive=index;this.cleanFindResults();return true}return false};Workbook.prototype.setActiveById=function(sheetId){var ws=this.getWorksheetById(sheetId);if(!ws&&Array.isArray(this.aWorksheets))ws=this.aWorksheets[this.aWorksheets.length-1];return this.setActive(ws.getIndex())};Workbook.prototype.getSheetIdByIndex=
-function(index){var ws=this.getWorksheet(index);return ws?ws.getId():null};Workbook.prototype.getWorksheet=function(index){if(index>=0&&index<this.aWorksheets.length)return this.aWorksheets[index];return null};Workbook.prototype.getWorksheetById=function(id){return this.aWorksheetsById[id]};Workbook.prototype.getWorksheetByName=function(name){for(var i=0;i<this.aWorksheets.length;i++)if(this.aWorksheets[i].getName()==name)return this.aWorksheets[i];return null};Workbook.prototype.getWorksheetIndexByName=
-function(name){for(var i=0;i<this.aWorksheets.length;i++)if(this.aWorksheets[i].getName()==name)return i;return null};Workbook.prototype.getWorksheetCount=function(){return this.aWorksheets.length};Workbook.prototype.createWorksheet=function(indexBefore,sName,sId){this.dependencyFormulas.lockRecal();History.Create_NewPoint();History.TurnOff();var wsActive=this.getActiveWs();var oNewWorksheet=new Worksheet(this,this.aWorksheets.length,sId);if(this.checkValidSheetName(sName))oNewWorksheet.sName=sName;
-oNewWorksheet.initPostOpen(this.wsHandlers,{});if(null!=indexBefore&&indexBefore>=0&&indexBefore<this.aWorksheets.length)this.aWorksheets.splice(indexBefore,0,oNewWorksheet);else{indexBefore=this.aWorksheets.length;this.aWorksheets.push(oNewWorksheet)}this.aWorksheetsById[oNewWorksheet.getId()]=oNewWorksheet;this._updateWorksheetIndexes(wsActive);History.TurnOn();this._insertWorksheetFormula(oNewWorksheet.index);History.Add(AscCommonExcel.g_oUndoRedoWorkbook,AscCH.historyitem_Workbook_SheetAdd,null,
-null,new UndoRedoData_SheetAdd(indexBefore,oNewWorksheet.getName(),null,oNewWorksheet.getId()));History.SetSheetUndo(wsActive.getId());History.SetSheetRedo(oNewWorksheet.getId());this.dependencyFormulas.unlockRecal();return oNewWorksheet};Workbook.prototype.copyWorksheet=function(index,insertBefore,sName,sId,bFromRedo,tableNames,opt_sheet,opt_base64){var renameParams;if(index>=0&&index<this.aWorksheets.length){this.dependencyFormulas.buildDependency();History.TurnOff();var wsActive=this.getActiveWs();
-var wsFrom=opt_sheet?opt_sheet:this.aWorksheets[index];var newSheet=new Worksheet(this,-1,sId);if(null!=insertBefore&&insertBefore>=0&&insertBefore<this.aWorksheets.length)this.aWorksheets.splice(insertBefore,0,newSheet);else this.aWorksheets.push(newSheet);if(opt_sheet)this.addingWorksheet=newSheet;this.aWorksheetsById[newSheet.getId()]=newSheet;this._updateWorksheetIndexes(wsActive);renameParams=newSheet.copyFrom(wsFrom,sName,tableNames);newSheet.copyFromFormulas(renameParams);newSheet.initPostOpen(this.wsHandlers,
-{},{});History.TurnOn();this.dependencyFormulas.copyDefNameByWorksheet(wsFrom,newSheet,renameParams,opt_sheet);if(opt_sheet)this.dependencyFormulas.copyDefNameByWorkbook(wsFrom,newSheet,renameParams,opt_sheet);this._insertWorksheetFormula(insertBefore);if(!tableNames)tableNames=newSheet.getTableNames();History.Add(AscCommonExcel.g_oUndoRedoWorkbook,AscCH.historyitem_Workbook_SheetAdd,null,null,new UndoRedoData_SheetAdd(insertBefore,newSheet.getName(),wsFrom.getId(),newSheet.getId(),tableNames,opt_base64));
-History.SetSheetUndo(wsActive.getId());History.SetSheetRedo(newSheet.getId());newSheet.copyFromAfterInsert(wsFrom);if(!(bFromRedo===true)){wsFrom.copyObjects(newSheet,renameParams);var i;if(wsFrom.aNamedSheetViews)for(i=0;i<wsFrom.aNamedSheetViews.length;++i)newSheet.addNamedSheetView(wsFrom.aNamedSheetViews[i].clone(renameParams.tableNameMap));if(wsFrom.dataValidations&&wsFrom.dataValidations.elems)for(i=0;i<wsFrom.dataValidations.elems.length;++i)newSheet.addDataValidation(wsFrom.dataValidations.elems[i].clone(),
+function(index){var ws=this.getWorksheet(index);return ws?ws.getId():null};Workbook.prototype.getWorksheet=function(index){if(index>=0&&index<this.aWorksheets.length)return this.aWorksheets[index];return null};Workbook.prototype.getWorksheetById=function(id){if(this.aWorksheetsById[id])return this.aWorksheetsById[id];var s;this.aWorksheets.some(function(_s){if(_s.Id===id){s=_s;return true}});return s};Workbook.prototype.getWorksheetByName=function(name){for(var i=0;i<this.aWorksheets.length;i++)if(this.aWorksheets[i].getName()==
+name)return this.aWorksheets[i];return null};Workbook.prototype.getWorksheetIndexByName=function(name){for(var i=0;i<this.aWorksheets.length;i++)if(this.aWorksheets[i].getName()==name)return i;return null};Workbook.prototype.getWorksheetCount=function(){return this.aWorksheets.length};Workbook.prototype.createWorksheet=function(indexBefore,sName,sId){this.dependencyFormulas.lockRecal();History.Create_NewPoint();History.TurnOff();var wsActive=this.getActiveWs();var oNewWorksheet=new Worksheet(this,
+this.aWorksheets.length,sId);if(this.checkValidSheetName(sName))oNewWorksheet.sName=sName;oNewWorksheet.initPostOpen(this.wsHandlers,{});if(null!=indexBefore&&indexBefore>=0&&indexBefore<this.aWorksheets.length)this.aWorksheets.splice(indexBefore,0,oNewWorksheet);else{indexBefore=this.aWorksheets.length;this.aWorksheets.push(oNewWorksheet)}this.aWorksheetsById[oNewWorksheet.getId()]=oNewWorksheet;this._updateWorksheetIndexes(wsActive);History.TurnOn();this._insertWorksheetFormula(oNewWorksheet.index);
+History.Add(AscCommonExcel.g_oUndoRedoWorkbook,AscCH.historyitem_Workbook_SheetAdd,null,null,new UndoRedoData_SheetAdd(indexBefore,oNewWorksheet.getName(),null,oNewWorksheet.getId()));History.SetSheetUndo(wsActive.getId());History.SetSheetRedo(oNewWorksheet.getId());this.dependencyFormulas.unlockRecal();return oNewWorksheet};Workbook.prototype.copyWorksheet=function(index,insertBefore,sName,sId,bFromRedo,tableNames,opt_sheet,opt_base64){var renameParams;if(index>=0&&index<this.aWorksheets.length){this.dependencyFormulas.buildDependency();
+History.TurnOff();var wsActive=this.getActiveWs();var wsFrom=opt_sheet?opt_sheet:this.aWorksheets[index];var newSheet=new Worksheet(this,-1,sId);if(null!=insertBefore&&insertBefore>=0&&insertBefore<this.aWorksheets.length)this.aWorksheets.splice(insertBefore,0,newSheet);else this.aWorksheets.push(newSheet);if(opt_sheet)this.addingWorksheet=newSheet;this.aWorksheetsById[newSheet.getId()]=newSheet;this._updateWorksheetIndexes(wsActive);renameParams=newSheet.copyFrom(wsFrom,sName,tableNames);newSheet.copyFromFormulas(renameParams);
+newSheet.initPostOpen(this.wsHandlers,{},{});History.TurnOn();this.dependencyFormulas.copyDefNameByWorksheet(wsFrom,newSheet,renameParams,opt_sheet);if(opt_sheet)this.dependencyFormulas.copyDefNameByWorkbook(wsFrom,newSheet,renameParams,opt_sheet);this._insertWorksheetFormula(insertBefore);if(!tableNames)tableNames=newSheet.getTableNames();History.Add(AscCommonExcel.g_oUndoRedoWorkbook,AscCH.historyitem_Workbook_SheetAdd,null,null,new UndoRedoData_SheetAdd(insertBefore,newSheet.getName(),wsFrom.getId(),
+newSheet.getId(),tableNames,opt_base64));History.SetSheetUndo(wsActive.getId());History.SetSheetRedo(newSheet.getId());newSheet.copyFromAfterInsert(wsFrom);if(!(bFromRedo===true)){wsFrom.copyObjects(newSheet,renameParams);var i;if(wsFrom.aNamedSheetViews)for(i=0;i<wsFrom.aNamedSheetViews.length;++i)newSheet.addNamedSheetView(wsFrom.aNamedSheetViews[i].clone(renameParams.tableNameMap));if(wsFrom.dataValidations&&wsFrom.dataValidations.elems)for(i=0;i<wsFrom.dataValidations.elems.length;++i)newSheet.addDataValidation(wsFrom.dataValidations.elems[i].clone(),
 true)}this.sortDependency();if(opt_sheet)this.addingWorksheet=null}return renameParams};Workbook.prototype.insertWorksheet=function(index,sheet){var wsActive=this.getActiveWs();if(null!=index&&index>=0&&index<this.aWorksheets.length)this.aWorksheets.splice(index,0,sheet);else this.aWorksheets.push(sheet);this.aWorksheetsById[sheet.getId()]=sheet;this._updateWorksheetIndexes(wsActive);this._insertWorksheetFormula(index);this._insertTablePartsName(sheet);sheet._BuildDependencies(sheet.getCwf());this.sortDependency()};
 Workbook.prototype._insertTablePartsName=function(sheet){if(sheet&&sheet.TableParts&&sheet.TableParts.length)for(var i=0;i<sheet.TableParts.length;i++){var tablePart=sheet.TableParts[i];this.dependencyFormulas.addTableName(sheet,tablePart);tablePart.buildDependencies()}};Workbook.prototype._insertWorksheetFormula=function(index){if(index>0&&index<this.aWorksheets.length){var oWsBefore=this.aWorksheets[index-1];this.dependencyFormulas.changeSheet(this.dependencyFormulas.prepareChangeSheet(oWsBefore.getId(),
 {insert:index}))}};Workbook.prototype.replaceWorksheet=function(indexFrom,indexTo){if(indexFrom>=0&&indexFrom<this.aWorksheets.length&&indexTo>=0&&indexTo<this.aWorksheets.length){var wsActive=this.getActiveWs();var oWsFrom=this.aWorksheets[indexFrom];var tempW={wF:oWsFrom,wFI:indexFrom,wTI:indexTo};if(tempW.wFI<tempW.wTI)tempW.wTI++;this.dependencyFormulas.lockRecal();var prepared=this.dependencyFormulas.prepareChangeSheet(oWsFrom.getId(),{replace:tempW},null);var movedSheet=this.aWorksheets.splice(indexFrom,
diff --git a/www/common/onlyoffice/x2t/x2t.js b/www/common/onlyoffice/x2t/x2t.js
index 181b2db8f..9c1289c56 100644
--- a/www/common/onlyoffice/x2t/x2t.js
+++ b/www/common/onlyoffice/x2t/x2t.js
@@ -1,3 +1,8 @@
+function SUPPORTS_SHARED_MEMORY() {
+    return typeof(SharedArrayBuffer) !== 'undefined';
+}
+
+
 // Support for growable heap + pthreads, where the buffer may change, so JS views
 // must be updated.
 function GROWABLE_HEAP_STORE_I8(ptr, value) {
@@ -1030,7 +1035,7 @@ if (ENVIRONMENT_IS_PTHREAD) {
    "maximum": 1073741824 / WASM_PAGE_SIZE,
    "shared": true
   });
-  if (!(wasmMemory.buffer instanceof SharedArrayBuffer)) {
+  if (Object.prototype.toString.call(wasmMemory.buffer) !== '[object SharedArrayBuffer]') {
    err("requested a shared WebAssembly.Memory but the returned buffer is not a SharedArrayBuffer, indicating that while the browser has SharedArrayBuffer it does not have WebAssembly threads support - you may need to set a flag");
    if (ENVIRONMENT_HAS_NODE) {
     console.log("(on node you may need: --experimental-wasm-threads --experimental-wasm-bulk-memory and also use a recent version)");
@@ -2161,7 +2166,7 @@ var PThread = {
  }),
  receiveObjectTransfer: (function(data) {}),
  allocateUnusedWorkers: (function(numWorkers, onFinishedLoading) {
-  if (typeof SharedArrayBuffer === "undefined") return;
+  if (!SUPPORTS_SHARED_MEMORY()) return;
   var workers = [];
   var numWorkersToCreate = numWorkers;
   if (PThread.preallocatedWorkers.length > 0) {
@@ -2276,7 +2281,7 @@ var PThread = {
   }
  }),
  createNewWorkers: (function(numWorkers) {
-  if (typeof SharedArrayBuffer === "undefined") return [];
+  if (!SUPPORTS_SHARED_MEMORY()) return [];
   var pthreadMainJs = "x2t.worker.js";
   pthreadMainJs = locateFile(pthreadMainJs);
   var newWorkers = [];
@@ -5683,7 +5688,7 @@ function _emscripten_get_sbrk_ptr() {
 }
 Module["_emscripten_get_sbrk_ptr"] = _emscripten_get_sbrk_ptr;
 function _emscripten_has_threading_support() {
- return typeof SharedArrayBuffer !== "undefined";
+ return SUPPORTS_SHARED_MEMORY();
 }
 Module["_emscripten_has_threading_support"] = _emscripten_has_threading_support;
 function _emscripten_is_main_browser_thread() {
@@ -6761,7 +6766,7 @@ function _pthread_self() {
 }
 Module["_pthread_self"] = _pthread_self;
 function _pthread_create(pthread_ptr, attr, start_routine, arg) {
- if (typeof SharedArrayBuffer === "undefined") {
+ if (!SUPPORTS_SHARED_MEMORY()) {
   err("Current environment does not support SharedArrayBuffer, pthreads are not available!");
   return 6;
  }
diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index 21bc77798..d8e558dad 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -112,6 +112,7 @@ define([
         Store.set = function (clientId, data, cb) {
             var s = getStore(data.teamId);
             if (!s) { return void cb({ error: 'ENOTFOUND' }); }
+            if (!s.proxy) { return void cb({ error: 'ENODRIVE' }); }
             var path = data.key.slice();
             var key = path.pop();
             var obj = Util.find(s.proxy, path);
@@ -273,9 +274,9 @@ define([
             }
 
             var pads = data.pads || data;
-            s.rpc.pin(pads, function (e, hash) {
+            s.rpc.pin(pads, function (e) {
                 if (e) { return void cb({error: e}); }
-                cb({hash: hash});
+                cb({});
             });
         };
 
@@ -288,9 +289,9 @@ define([
             if (!s.rpc) { return void cb({error: 'RPC_NOT_READY'}); }
 
             var pads = data.pads || data;
-            s.rpc.unpin(pads, function (e, hash) {
+            s.rpc.unpin(pads, function (e) {
                 if (e) { return void cb({error: e}); }
-                cb({hash: hash});
+                cb({});
             });
         };
 
@@ -393,9 +394,9 @@ define([
             if (!store.rpc) { return void cb({error: 'RPC_NOT_READY'}); }
 
             var list = getCanonicalChannelList(false);
-            store.rpc.reset(list, function (e, hash) {
+            store.rpc.reset(list, function (e) {
                 if (e) { return void cb(e); }
-                cb(null, hash);
+                cb(null);
             });
         };
 
@@ -629,6 +630,7 @@ define([
             if (!proxy.uid) {
                 store.noDriveUid = store.noDriveUid || Hash.createChannelId();
             }
+
             var metadata = {
                 // "user" is shared with everybody via the userlist
                 user: {
@@ -655,7 +657,7 @@ define([
                     accountName: proxy.login_name || '',
                     offline: store.proxy && store.offline,
                     teams: teams,
-                    plan: account.plan
+                    plan: account.plan,
                 }
             };
             cb(JSON.parse(JSON.stringify(metadata)));
@@ -1226,7 +1228,7 @@ define([
             });
 
             // Add the pad if it does not exist in our drive
-            if (!contains) { // || (ownedByMe && !inMyDrive)) {
+            if (!contains || (data.forceSave && !inMyDrive)) {
                 var autoStore = Util.find(store.proxy, ['settings', 'general', 'autostore']);
                 if (autoStore !== 1 && !data.forceSave && !data.path) {
                     // send event to inner to display the corner popup
@@ -1267,7 +1269,8 @@ define([
             });
             // Let inner know that dropped files shouldn't trigger the popup
             postMessage(clientId, "AUTOSTORE_DISPLAY_POPUP", {
-                stored: true
+                stored: true,
+                inMyDrive: inMyDrive
             });
             nThen(function (waitFor) {
                 sendTo.forEach(function (teamId) {
@@ -1303,9 +1306,14 @@ define([
             getAllStores().forEach(function (s) {
                 s.manager.getSecureFilesList(where).forEach(function (obj) {
                     var data = obj.data;
-                    if (channels.indexOf(data.channel) !== -1) { return; }
+                    if (channels.indexOf(data.channel || data.id) !== -1) { return; }
                     var id = obj.id;
-                    if (data.channel) { channels.push(data.channel); }
+                    if (data.channel) { channels.push(data.channel || data.id); }
+                    // Only include static links if "link" is requested
+                    if (data.static) {
+                        if (types.indexOf('link') !== -1) { list[id] = data; }
+                        return;
+                    }
                     var parsed = Hash.parsePadUrl(data.href || data.roHref);
                     if ((!types || types.length === 0 || types.indexOf(parsed.type) !== -1) &&
                         !isFiltered(parsed.type, data)) {
@@ -2050,8 +2058,17 @@ define([
             } catch (e) {
                 console.error(e);
             }
+
             // Tell all the owners that the pad was deleted from the server
-            var curvePublic = store.proxy.curvePublic;
+            var curvePublic;
+            try {
+                // users in noDrive mode don't have a proxy and
+                // unregistered users don't have a curvePublic
+                curvePublic = store.proxy.curvePublic;
+            } catch (err) {
+                console.error(err);
+                return;
+            }
             m.forEach(function (obj) {
                 var mb = JSON.parse(obj);
                 if (mb.curvePublic === curvePublic) { return; }
@@ -2139,11 +2156,23 @@ define([
             if (!data.channel) { return void cb({ error: 'ENOTFOUND'}); }
             if (!data.command) { return void cb({ error: 'EINVAL' }); }
             var s = getStore(data.teamId);
+            var otherChannels = data.channels;
+            delete data.channels;
             s.rpc.setMetadata(data, function (err, res) {
                 if (err) { return void cb({ error: err }); }
                 if (!Array.isArray(res) || !res.length) { return void cb({}); }
                 cb(res[0]);
             });
+            // If we have other related channels, send the command for them too
+            if (Array.isArray(otherChannels)) {
+                otherChannels.forEach(function (chan) {
+                    var _d = Util.clone(data);
+                    _d.channel = chan;
+                    Store.setPadMetadata(clientId, _d, function () {
+
+                    });
+                });
+            }
         };
 
         // GET_FULL_HISTORY from sframe-common-outer
@@ -2696,7 +2725,12 @@ define([
 
             nThen(function (waitFor) {
                 if (!proxy.settings) { proxy.settings = NEW_USER_SETTINGS; }
+                if (!proxy.forms) { proxy.forms = {}; }
                 if (!proxy.friends_pending) { proxy.friends_pending = {}; }
+                // Form seed is used to generate a box encryption keypair when
+                // answering a form anonymously
+                if (!proxy.form_seed) { proxy.form_seed = Hash.createChannelId(); }
+
 
                 // Call onCacheReady if the manager is not yet defined
                 if (!manager) {
@@ -3167,6 +3201,10 @@ define([
                     initialized = false;
                 }
 
+                var redirect = Constants.prefersDriveRedirectKey;
+                var redirectPreference = Util.find(store, [ 'proxy', 'settings', 'general', redirect, ]);
+                ret[redirect] = redirectPreference;
+
                 callback(ret);
             });
 
diff --git a/www/common/outer/cache-store.js b/www/common/outer/cache-store.js
index 884d98914..93bc0d0c6 100644
--- a/www/common/outer/cache-store.js
+++ b/www/common/outer/cache-store.js
@@ -49,7 +49,10 @@ define([
                 }
                 cb(null, obj.c);
                 obj.t = +new Date();
-                cache.setItem(id, obj);
+                cache.setItem(id, obj, function (err) {
+                    if (!err) { return; }
+                    console.error(err);
+                });
             });
         });
     };
@@ -81,7 +84,10 @@ define([
                 }
                 cb(null, obj);
                 obj.t = +new Date();
-                cache.setItem(id, obj);
+                cache.setItem(id, obj, function (err) {
+                    if (!err) { return; }
+                    console.error(err);
+                });
             });
         });
     };
@@ -91,7 +97,7 @@ define([
     var checkCheckpoints = function (array) {
         if (!Array.isArray(array)) { return; }
         // Keep the last 100 messages
-        if (array.length > 100) {
+        if (array.length > 100) { // XXX 4.10.0
             array.splice(0, array.length - 100);
         }
         // Remove every message before the first checkpoint
diff --git a/www/common/outer/local-store.js b/www/common/outer/local-store.js
index 9b62fbbde..fb49d084d 100644
--- a/www/common/outer/local-store.js
+++ b/www/common/outer/local-store.js
@@ -76,6 +76,16 @@ define([
         return window.CP_logged_in || typeof getUserHash() === "string";
     };
 
+    LocalStore.getDriveRedirectPreference = function () {
+        try {
+            return JSON.parse(localStorage[Constants.redirectToDriveKey]);
+        } catch (err) { return; }
+    };
+
+    LocalStore.setDriveRedirectPreference = function (bool) {
+        localStorage.setItem(Constants.redirectToDriveKey, Boolean(bool));
+    };
+
     LocalStore.login = function (hash, name, cb) {
         if (!hash) { throw new Error('expected a user hash'); }
         if (!name) { throw new Error('expected a user name'); }
diff --git a/www/common/outer/mailbox-handlers.js b/www/common/outer/mailbox-handlers.js
index 7f7e20d2a..88e43352b 100644
--- a/www/common/outer/mailbox-handlers.js
+++ b/www/common/outer/mailbox-handlers.js
@@ -238,8 +238,9 @@ define([
         // content.name, content.title, content.href, content.password
 
         if (isMuted(ctx, data)) { return void cb(true); }
-
-        var channel = Hash.hrefToHexChannelId(content.href, content.password);
+        // if the shared content is a 'link' then we can't use the channel to deduplicate notifications
+        // use href instead.
+        var channel = content.isStatic ? content.href : Hash.hrefToHexChannelId(content.href, content.password);
         var parsed = Hash.parsePadUrl(content.href);
         var mode = parsed.hashData && parsed.hashData.mode || 'n/a';
 
diff --git a/www/common/outer/team.js b/www/common/outer/team.js
index 0ec224984..94f91c807 100644
--- a/www/common/outer/team.js
+++ b/www/common/outer/team.js
@@ -195,7 +195,7 @@ define([
             Pinpad.create(ctx.store.network, data, function (e, call) {
                 if (e) { return void cb(e); }
                 team.rpc = call;
-                team.onRpcReadyEvt.fire();
+                if (team && team.onRpcReadyEvt) { team.onRpcReadyEvt.fire(); }
                 cb();
             }, Cache);
         });
@@ -986,47 +986,60 @@ define([
         var state = team.roster.getState() || {};
         var members = state.members || {};
 
-        // Get pending owners
-        var md = team.listmap.metadata || {};
-        if (Array.isArray(md.pending_owners)) {
-            // Get the members associated to the pending_owners' edPublic and mark them as such
-            md.pending_owners.forEach(function (ed) {
-                var member;
-                Object.keys(members).some(function (curve) {
-                    if (members[curve].edPublic === ed) {
-                        member = members[curve];
-                        return true;
-                    }
-                });
-                if (!member && teamData.owner) {
-                    var removeOwnership = function (chan) {
-                        ctx.Store.setPadMetadata(null, {
-                            channel: chan,
-                            command: 'RM_PENDING_OWNERS',
-                            value: [ed],
-                        }, function () {});
-                    };
-                    removeOwnership(teamData.channel);
-                    removeOwnership(Util.find(teamData, ['keys', 'roster', 'channel']));
-                    removeOwnership(Util.find(teamData, ['keys', 'chat', 'channel']));
+        var md;
+        nThen(function (waitFor) {
+            // Get pending owners
+            ctx.Store.getPadMetadata(null, {
+                channel: teamData.channel
+            }, waitFor(function (obj) {
+                if (obj && obj.error) {
+                    md = team.listmap.metadata || {};
                     return;
                 }
-                member.pendingOwner = true;
-            });
-        }
+                md = obj;
+            }));
+        }).nThen(function () {
+            ctx.pending_owners = md.pending_owners;
+            if (Array.isArray(md.pending_owners)) {
+                // Get the members associated to the pending_owners' edPublic and mark them as such
+                md.pending_owners.forEach(function (ed) {
+                    var member;
+                    Object.keys(members).some(function (curve) {
+                        if (members[curve].edPublic === ed) {
+                            member = members[curve];
+                            return true;
+                        }
+                    });
+                    if (!member && teamData.owner) {
+                        var removeOwnership = function (chan) {
+                            ctx.Store.setPadMetadata(null, {
+                                channel: chan,
+                                command: 'RM_PENDING_OWNERS',
+                                value: [ed],
+                            }, function () {});
+                        };
+                        removeOwnership(teamData.channel);
+                        removeOwnership(Util.find(teamData, ['keys', 'roster', 'channel']));
+                        removeOwnership(Util.find(teamData, ['keys', 'chat', 'channel']));
+                        return;
+                    }
+                    member.pendingOwner = true;
+                });
+            }
 
-        // Add online status (using messenger data)
-        if (ctx.store.messenger) {
-            var chatData = team.getChatData();
-            var online = ctx.store.messenger.getOnlineList(chatData.channel) || [];
-            online.forEach(function (curve) {
-                if (members[curve]) {
-                    members[curve].online = true;
-                }
-            });
-        }
+            // Add online status (using messenger data)
+            if (ctx.store.messenger) {
+                var chatData = team.getChatData();
+                var online = ctx.store.messenger.getOnlineList(chatData.channel) || [];
+                online.forEach(function (curve) {
+                    if (members[curve]) {
+                        members[curve].online = true;
+                    }
+                });
+            }
 
-        cb(members);
+            cb(members);
+        });
     };
 
     // Return folders with edit rights available to everybody (decrypted pad href)
@@ -1144,8 +1157,7 @@ define([
         if (!teamData) { return void cb ({error: 'ENOENT'}); }
         var team = ctx.teams[teamId];
         if (!team) { return void cb ({error: 'ENOENT'}); }
-        var md = team.listmap.metadata || {};
-        var isPendingOwner = (md.pending_owners || []).indexOf(user.edPublic) !== -1;
+        var isPendingOwner = user.pendingOwner;
         nThen(function (waitFor) {
             var cmd = isPendingOwner ? 'RM_PENDING_OWNERS' : 'RM_OWNERS';
 
@@ -1364,42 +1376,60 @@ define([
     var describeUser = function (ctx, data, cId, cb) {
         var teamId = data.teamId;
         if (!teamId) { return void cb({error: 'EINVAL'}); }
+        var teamData = Util.find(ctx, ['store', 'proxy', 'teams', teamId]);
         var team = ctx.teams[teamId];
-        if (!team) { return void cb ({error: 'ENOENT'}); }
+        if (!teamData || !team) { return void cb ({error: 'ENOENT'}); }
         if (!team.roster) { return void cb({error: 'NO_ROSTER'}); }
         if (!data.curvePublic || !data.data) { return void cb({error: 'MISSING_DATA'}); }
         var state = team.roster.getState();
         var user = state.members[data.curvePublic];
 
-        // It it is an ownership revocation, we have to set it in pad metadata first
-        if (user.role === "OWNER" && data.data.role !== "OWNER") {
-            revokeOwnership(ctx, teamId, user, function (err) {
-                if (!err) { return void cb(); }
-                console.error(err);
-                return void cb({error: err});
-            });
-            return;
-        }
+        var md;
+        nThen(function (waitFor) {
+            // Get pending owners
+            ctx.Store.getPadMetadata(null, {
+                channel: teamData.channel
+            }, waitFor(function (obj) {
+                if (obj && obj.error) {
+                    md = team.listmap.metadata || {};
+                    return;
+                }
+                md = obj;
+            }));
+        }).nThen(function () {
+            user.pendingOwner = Array.isArray(md.pending_owners) &&
+                                md.pending_owners.indexOf(user.edPublic) !== -1;
 
-        // Viewer to editor
-        if (user.role === "VIEWER" && data.data.role !== "VIEWER") {
-            changeEditRights(ctx, teamId, user, true, function (obj) {
-                return void cb(obj);
-            });
-        }
+            // It it is an ownership revocation, we have to set it in pad metadata first
+            if (user.role === "OWNER" && data.data.role !== "OWNER") {
+                revokeOwnership(ctx, teamId, user, function (err) {
+                    if (!err) { return void cb(); }
+                    console.error(err);
+                    return void cb({error: err});
+                });
+                return;
+            }
 
-        // Editor to viewer
-        if (user.role !== "VIEWER" && data.data.role === "VIEWER") {
-            changeEditRights(ctx, teamId, user, false, function (obj) {
-                return void cb(obj);
-            });
-        }
+            // Viewer to editor
+            if (user.role === "VIEWER" && data.data.role !== "VIEWER") {
+                changeEditRights(ctx, teamId, user, true, function (obj) {
+                    return void cb(obj);
+                });
+            }
 
-        var obj = {};
-        obj[data.curvePublic] = data.data;
-        team.roster.describe(obj, function (err) {
-            if (err) { return void cb({error: err}); }
-            cb();
+            // Editor to viewer
+            if (user.role !== "VIEWER" && data.data.role === "VIEWER") {
+                changeEditRights(ctx, teamId, user, false, function (obj) {
+                    return void cb(obj);
+                });
+            }
+
+            var obj = {};
+            obj[data.curvePublic] = data.data;
+            team.roster.describe(obj, function (err) {
+                if (err) { return void cb({error: err}); }
+                cb();
+            });
         });
     };
 
@@ -2010,9 +2040,16 @@ define([
             if (['drive', 'teams', 'settings'].indexOf(app) !== -1) { safe = true; }
             Object.keys(teams).forEach(function (id) {
                 if (!ctx.teams[id]) { return; }
+                var proxy = ctx.teams[id].proxy || {};
+                var nPads = proxy.drive && Object.keys(proxy.drive.filesData || {}).length;
+                var nSf = proxy.drive && Object.keys(proxy.drive.sharedFolders || {}).length;
                 t[id] = {
                     owner: teams[id].owner,
                     name: teams[id].metadata.name,
+                    channel: teams[id].channel,
+                    numberPads: nPads,
+                    numberSf: nSf,
+                    roster: Util.find(teams[id], ['keys', 'roster', 'channel']),
                     edPublic: Util.find(teams[id], ['keys', 'drive', 'edPublic']),
                     avatar: Util.find(teams[id], ['metadata', 'avatar']),
                     viewer: !Util.find(teams[id], ['keys', 'drive', 'edPrivate']),
diff --git a/www/common/outer/userObject.js b/www/common/outer/userObject.js
index e7c55da67..7108da936 100644
--- a/www/common/outer/userObject.js
+++ b/www/common/outer/userObject.js
@@ -20,6 +20,7 @@ define([
 
         var ROOT = exp.ROOT;
         var FILES_DATA = exp.FILES_DATA;
+        var STATIC_DATA = exp.STATIC_DATA;
         var OLD_FILES_DATA = exp.OLD_FILES_DATA;
         var UNSORTED = exp.UNSORTED;
         var TRASH = exp.TRASH;
@@ -78,6 +79,14 @@ define([
             files[FILES_DATA][id] = data;
             cb(null, id);
         };
+        exp.pushLink = function (_data, cb) {
+            if (typeof cb !== "function") { cb = function () {}; }
+            if (readOnly) { return void cb('EFORBIDDEN'); }
+            var id = Util.createRandomInteger();
+            var data = clone(_data);
+            files[STATIC_DATA][id] = data;
+            cb(null, id);
+        };
 
         exp.pushSharedFolder = function (_data, cb) {
             if (typeof cb !== "function") { cb = function () {}; }
@@ -136,7 +145,7 @@ define([
 
             var filesList = exp.getFiles([ROOT, 'hrefArray', TRASH]);
             var toClean = [];
-            exp.getFiles([FILES_DATA, SHARED_FOLDERS]).forEach(function (id) {
+            exp.getFiles([FILES_DATA, SHARED_FOLDERS, STATIC_DATA]).forEach(function (id) {
                 if (filesList.indexOf(id) === -1) {
                     var fd = exp.isSharedFolder(id) ? files[SHARED_FOLDERS][id] : exp.getFileData(id);
                     var channelId = fd.channel;
@@ -146,6 +155,8 @@ define([
                     if (exp.isSharedFolder(id)) {
                         delete files[SHARED_FOLDERS][id];
                         if (config.removeProxy) { config.removeProxy(id); }
+                    } else if (files[STATIC_DATA][id]) {
+                        delete files[STATIC_DATA][id];
                     } else {
                         spliceFileData(id);
                     }
@@ -242,6 +253,12 @@ define([
                 id = Number(id);
                 // Find and maybe update existing pads with the same channel id
                 var d = data[id];
+                // If we were given a static link, copy to STATIC_DATA
+                if (d.static) {
+                    delete d.static;
+                    files[STATIC_DATA][id] = d;
+                    return;
+                }
                 // If we were given an edit link, encrypt its value if needed
                 if (d.href) { d.href = exp.cryptor.encrypt(d.href); }
                 var found = false;
@@ -398,7 +415,7 @@ define([
 
             if (!loggedIn && !config.testMode) { return; }
             id = Number(id);
-            var data = files[FILES_DATA][id] || files[SHARED_FOLDERS][id];
+            var data = files[FILES_DATA][id] || files[STATIC_DATA][id] || files[SHARED_FOLDERS][id];
             if (!data || typeof(data) !== "object") { return; }
             var newPath = path, parentEl;
             if (path && !Array.isArray(path)) {
@@ -599,13 +616,18 @@ define([
                 var element = elem || files[ROOT];
                 if (!element) { return console.error("Invalid element in root"); }
                 var nbMetadataFolders = 0;
+                // caching this variables saves a lot of hashmap lookups in this loop
+                var static_data = files[STATIC_DATA];
+                var files_data = files[FILES_DATA];
+                var element_el;
                 for (var el in element) {
-                    if (element[el] === null) {
+                    element_el = element[el];
+                    if (element_el === null) {
                         console.error('element[%s] is null', el);
                         delete element[el];
                         continue;
                     }
-                    if (exp.isFolderData(element[el])) {
+                    if (exp.isFolderData(element_el)) {
                         if (nbMetadataFolders !== 0) {
                             debug("Multiple metadata files in folder");
                             delete element[el];
@@ -613,30 +635,30 @@ define([
                         nbMetadataFolders++;
                         continue;
                     }
-                    if (!exp.isFile(element[el], true) && !exp.isFolder(element[el])) {
-                        debug("An element in ROOT was not a folder nor a file. ", element[el]);
+                    if (!exp.isFile(element_el, true) && !exp.isFolder(element_el)) {
+                        debug("An element in ROOT was not a folder nor a file. ", element_el);
                         delete element[el];
                         continue;
                     }
-                    if (exp.isFolder(element[el])) {
-                        fixRoot(element[el]);
+                    if (exp.isFolder(element_el)) {
+                        fixRoot(element_el);
                         continue;
                     }
-                    if (typeof element[el] === "string") {
+                    if (typeof element_el === "string") {
                         // We have an old file (href) which is not in filesData: add it
                         var id = Util.createRandomInteger();
                         var key = Hash.createChannelId();
-                        files[FILES_DATA][id] = {
-                            href: exp.cryptor.encrypt(element[el]),
+                        files_data[id] = {
+                            href: exp.cryptor.encrypt(element_el),
                             filename: el
                         };
                         element[key] = id;
                         delete element[el];
                     }
-                    if (typeof element[el] === "number") {
-                        var data = files[FILES_DATA][element[el]];
+                    if (typeof element_el === "number") {
+                        var data = files_data[element_el] || static_data[element_el];
                         if (!data) {
-                            debug("An element in ROOT doesn't have associated data", element[el], el);
+                            debug("An element in ROOT doesn't have associated data", element_el, el);
                             delete element[el];
                         }
                     }
@@ -845,6 +867,26 @@ define([
                 toClean.forEach(function (id) {
                     spliceFileData(id);
                 });
+                // make sure that links are displayed at least once in your drive if you are going to keep them
+                var sd = files[STATIC_DATA];
+                var toCleanSD = [];
+                for (var id2 in sd) {
+                    id2 = Number(id2);
+                    var el2 = sd[id2];
+                    if (!el2 || typeof(el2) !== "object" || !el2.href) {
+                        toCleanSD.push(id2);
+                        continue;
+                    }
+                    if ((loggedIn || config.testMode) && rootFiles.indexOf(id2) === -1) {
+                        toCleanSD.push(id2);
+                        continue;
+                    }
+                }
+                var spliceSD = function (id) {
+                    if (readOnly) { return; }
+                    delete files[STATIC_DATA][id];
+                };
+                toCleanSD.forEach(spliceSD);
             };
             var fixSharedFolders = function () {
                 if (sharedFolder) { return; }
@@ -892,6 +934,12 @@ define([
                     }
                 }
             };
+            var fixStaticData = function () {
+                if (!Util.isObject(files[STATIC_DATA])) {
+                    debug("STATIC_DATA was not an object");
+                    files[STATIC_DATA] = {};
+                }
+            };
 
 
             var fixDrive = function () {
@@ -900,6 +948,7 @@ define([
                 });
             };
 
+            fixStaticData();
             fixRoot();
             fixTrashRoot();
             fixTemplate();
diff --git a/www/common/pdfjs/build/pdf.worker.js b/www/common/pdfjs/build/pdf.worker.js
index 753d5c5d2..2e1bb365e 100644
--- a/www/common/pdfjs/build/pdf.worker.js
+++ b/www/common/pdfjs/build/pdf.worker.js
@@ -5355,10 +5355,12 @@ var PDFFunction = function PDFFunctionClosure() {
       var domain = IR[1];
       var range = IR[2];
       var code = IR[3];
+/*
       var compiled = new PostScriptCompiler().compile(code, domain, range);
       if (compiled) {
         return new Function('src', 'srcOffset', 'dest', 'destOffset', compiled);
       }
+*/
       (0, _util.info)('Unable to compile PS function');
       var numOutputs = range.length >> 1;
       var numInputs = domain.length >> 1;
@@ -38545,4 +38547,4 @@ if (typeof PDFJS === 'undefined' || !PDFJS.compatibilityChecked) {
 /***/ })
 /******/ ]);
 });
-//# sourceMappingURL=pdf.worker.js.map
\ No newline at end of file
+//# sourceMappingURL=pdf.worker.js.map
diff --git a/www/common/pinpad.js b/www/common/pinpad.js
index 7e9cd4ee2..de93f066f 100644
--- a/www/common/pinpad.js
+++ b/www/common/pinpad.js
@@ -26,23 +26,19 @@ var factory = function (Util, Rpc) {
             exp.send = rpc.send;
 
             // you can ask the server to pin a particular channel for you
-            exp.pin = function (channels, cb) {
+            exp.pin = function (channels, _cb) {
+                var cb = Util.once(Util.mkAsync(_cb));
                 if (!Array.isArray(channels)) {
-                    setTimeout(function () {
-                        cb('[TypeError] pin expects an array');
-                    });
-                    return;
+                    return void cb('[TypeError] pin expects an array');
                 }
                 rpc.send('PIN', channels, cb);
             };
 
             // you can also ask to unpin a particular channel
-            exp.unpin = function (channels, cb) {
+            exp.unpin = function (channels, _cb) {
+                var cb = Util.once(Util.mkAsync(_cb));
                 if (!Array.isArray(channels)) {
-                    setTimeout(function () {
-                        cb('[TypeError] pin expects an array');
-                    });
-                    return;
+                    return void cb('[TypeError] pin expects an array');
                 }
                 rpc.send('UNPIN', channels, cb);
             };
@@ -70,23 +66,12 @@ var factory = function (Util, Rpc) {
             };
 
             // if local and remote hashes don't match, send a reset
-            exp.reset = function (channels, cb) {
+            exp.reset = function (channels, _cb) {
+                var cb = Util.once(Util.mkAsync(_cb));
                 if (!Array.isArray(channels)) {
-                    setTimeout(function () {
-                        cb('[TypeError] pin expects an array');
-                    });
-                    return;
+                    return void cb('[TypeError] pin expects an array');
                 }
-                rpc.send('RESET', channels, function (e, response) {
-                    if (e) {
-                        return void cb(e);
-                    }
-                    if (!response.length) {
-                        console.log(response);
-                        return void cb('INVALID_RESPONSE');
-                    }
-                    cb(e, response[0]);
-                });
+                rpc.send('RESET', channels, cb);
             };
 
             // get the combined size of all channels (in bytes) for all the
diff --git a/www/common/proxy-manager.js b/www/common/proxy-manager.js
index 9371b9e8b..d6492c68c 100644
--- a/www/common/proxy-manager.js
+++ b/www/common/proxy-manager.js
@@ -22,11 +22,11 @@ define([
             // a cached version
             if (Env.folders[id].offline && !lm.cache) {
                 Env.folders[id].offline = false;
+                if (Env.folders[id].userObject.fixFiles) { Env.folders[id].userObject.fixFiles(); }
                 Env.Store.refreshDriveUI();
             }
             return;
         }
-        if (Env.folders[id]) { console.warn(Env.folders[id]); }
         var cfg = getConfig(Env);
         cfg.sharedFolder = true;
         cfg.id = id;
@@ -237,7 +237,15 @@ define([
 
     var getSharedFolderData = function (Env, id) {
         if (!Env.folders[id]) { return {}; }
-        var obj = Env.folders[id].proxy.metadata || {};
+        var proxy = Env.folders[id].proxy;
+
+        // Clean deprecated values
+        if (Object.keys(proxy.metadata || {}).length > 1) {
+            proxy.metadata = { title: proxy.metadata.title };
+        }
+
+        var obj = Util.clone(proxy.metadata || {});
+
         for (var k in Env.user.proxy[UserObject.SHARED_FOLDERS][id] || {}) {
             if (typeof(Env.user.proxy[UserObject.SHARED_FOLDERS][id][k]) === "undefined") { // XXX "deleted folder" for restricted shared folders when viewer in a team
                 continue;
@@ -576,6 +584,24 @@ define([
             });
         });
     };
+    // Add a link
+    var _addLink = function (Env, data, cb) {
+        data = data || {};
+        var resolved = _resolvePath(Env, data.path);
+        if (!resolved || !resolved.userObject) { return void cb({error: 'E_NOTFOUND'}); }
+        var uo = resolved.userObject;
+        var now = +new Date();
+        uo.pushLink({
+            name: data.name,
+            href: data.href,
+            atime: now,
+            ctime: now
+        }, function (e, id) {
+            if (e) { return void cb({error: e}); }
+            uo.add(id, resolved.path);
+            Env.onSync(cb);
+        });
+    };
 
     var _restoreSharedFolder = function (Env, _data, cb) {
         var fId = _data.id;
@@ -810,6 +836,7 @@ define([
             _findChannels(Env, toUnpin).forEach(function (id) {
                 var data = _getFileData(Env, id);
                 var arr = [data.channel];
+                if (data.answersChannel) { arr.push(data.answersChannel); }
                 if (data.rtChannel) { arr.push(data.rtChannel); }
                 if (data.lastVersion) { arr.push(Hash.hrefToHexChannelId(data.lastVersion)); }
                 Array.prototype.push.apply(toKeep, arr);
@@ -1010,35 +1037,40 @@ define([
         });
 
     };
+
+    var _updateStaticAccess = function (Env, id, cb) {
+        var uo = _getUserObjectFromId(Env, id);
+        var sd = uo.getFileData(id, true);
+        sd.atime = +new Date();
+        Env.onSync(cb);
+    };
+
+    var COMMANDS = {
+        move: _move,
+        restore: _restore,
+        addFolder: _addFolder,
+        addSharedFolder: _addSharedFolder,
+        addLink: _addLink,
+        restoreSharedFolder: _restoreSharedFolder,
+        convertFolderToSharedFolder: _convertFolderToSharedFolder,
+        delete: _delete,
+        deleteOwned: _deleteOwned,
+        emptyTrash: _emptyTrash,
+        rename: _rename,
+        setFolderData: _setFolderData,
+        updateStaticAccess: _updateStaticAccess,
+    };
+
     var onCommand = function (Env, cmdData, cb) {
         var cmd = cmdData.cmd;
         var data = cmdData.data || {};
-        switch (cmd) {
-            case 'move':
-                _move(Env, data, cb); break;
-            case 'restore':
-                _restore(Env, data, cb); break;
-            case 'addFolder':
-                _addFolder(Env, data, cb); break;
-            case 'addSharedFolder':
-                _addSharedFolder(Env, data, cb); break;
-            case 'restoreSharedFolder':
-                _restoreSharedFolder(Env, data, cb); break;
-            case 'convertFolderToSharedFolder':
-                _convertFolderToSharedFolder(Env, data, cb); break;
-            case 'delete':
-                _delete(Env, data, cb); break;
-            case 'deleteOwned':
-                _deleteOwned(Env, data, cb); break;
-            case 'emptyTrash':
-                _emptyTrash(Env, data, cb); break;
-            case 'rename':
-                _rename(Env, data, cb); break;
-            case 'setFolderData':
-                _setFolderData(Env, data, cb); break;
-            default:
-                cb();
+        var method = COMMANDS[cmd];
+
+        if (typeof(method) === 'function') {
+            return void method(Env, data, cb);
         }
+        // if the command was not handled then call back
+        cb();
     };
 
     // Set the value everywhere the given pad is stored (main and shared folders)
@@ -1120,8 +1152,8 @@ define([
                     data: uo.getFileData(id)
                 };
             }).filter(function (d) {
-                if (channels.indexOf(d.data.channel) === -1) {
-                    channels.push(d.data.channel);
+                if (channels.indexOf(d.data.channel || d.id) === -1) {
+                    channels.push(d.data.channel || d.id);
                     return true;
                 }
             });
@@ -1176,6 +1208,10 @@ define([
                             result.push(otherChan);
                         }
                     }
+                    // Pin form answers channels
+                    if (data.answersChannel && result.indexOf(data.answersChannel) === -1) {
+                        result.push(data.answersChannel);
+                    }
                     // Pin onlyoffice realtime patches
                     if (data.rtChannel && result.indexOf(data.rtChannel) === -1) {
                         result.push(data.rtChannel);
@@ -1220,7 +1256,10 @@ define([
             Array.prototype.push.apply(result, sfChannels);
         }
 
-        return result;
+        return result.filter(function (channel) {
+            if (typeof(channel) !== 'string') { return; }
+            return [32, 48].indexOf(channel.length) !== -1;
+        });
     };
 
     var addPad = function (Env, path, pad, cb) {
@@ -1370,6 +1409,16 @@ define([
             }
         }, cb);
     };
+    var addLinkInner = function (Env, path, data, cb) {
+        return void Env.sframeChan.query("Q_DRIVE_USEROBJECT", {
+            cmd: "addLink",
+            data: {
+                path: path,
+                name: data.name,
+                href: data.url
+            }
+        }, cb);
+    };
     var restoreSharedFolderInner = function (Env, fId, password, cb) {
         return void Env.sframeChan.query("Q_DRIVE_USEROBJECT", {
             cmd: "restoreSharedFolder",
@@ -1420,6 +1469,14 @@ define([
         }, cb);
     };
 
+    var updateStaticAccessInner = function (Env, id, cb) {
+        return void Env.sframeChan.query("Q_DRIVE_USEROBJECT", {
+            cmd: "updateStaticAccess",
+            data: id
+        }, cb);
+
+    };
+
     /* Tools */
 
     var findChannels = _findChannels;
@@ -1437,6 +1494,11 @@ define([
         return String(uo.getTitle(id, type));
     };
 
+    var isStaticFile = function (Env, id) {
+        var uo = _getUserObjectFromId(Env, id);
+        return uo.isStaticFile(id);
+    };
+
     var isReadOnlyFile = function (Env, id) {
         var uo = _getUserObjectFromId(Env, id);
         return uo.isReadOnlyFile(id);
@@ -1478,7 +1540,7 @@ define([
         var files = [];
         var userObjects = _getUserObjects(Env);
         userObjects.forEach(function (uo) {
-            var data = uo.getFiles([UserObject.FILES_DATA]).map(function (id) {
+            var data = uo.getFiles([UserObject.FILES_DATA, UserObject.STATIC_DATA]).map(function (id) {
                 return [Number(id), uo.getFileData(id)];
             });
             Array.prototype.push.apply(files, data);
@@ -1595,17 +1657,20 @@ define([
             emptyTrash: callWithEnv(emptyTrashInner),
             addFolder: callWithEnv(addFolderInner),
             addSharedFolder: callWithEnv(addSharedFolderInner),
+            addLink: callWithEnv(addLinkInner),
             restoreSharedFolder: callWithEnv(restoreSharedFolderInner),
             convertFolderToSharedFolder: callWithEnv(convertFolderToSharedFolderInner),
             delete: callWithEnv(deleteInner),
             deleteOwned: callWithEnv(deleteOwnedInner),
             restore: callWithEnv(restoreInner),
             setFolderData: callWithEnv(setFolderDataInner),
+            updateStaticAccess: callWithEnv(updateStaticAccessInner),
             // Tools
             getFileData: callWithEnv(getFileData),
             find: callWithEnv(find),
             getTitle: callWithEnv(getTitle),
             isReadOnlyFile: callWithEnv(isReadOnlyFile),
+            isStaticFile: callWithEnv(isStaticFile),
             getFiles: callWithEnv(getFiles),
             search: callWithEnv(search),
             getRecentPads: callWithEnv(getRecentPads),
diff --git a/www/common/sframe-app-framework.js b/www/common/sframe-app-framework.js
index e99cc4187..96997cd06 100644
--- a/www/common/sframe-app-framework.js
+++ b/www/common/sframe-app-framework.js
@@ -572,7 +572,9 @@ define([
                 if (!readOnly) { onLocal(); }
                 evOnReady.fire(newPad);
 
-                common.openPadChat(onLocal);
+                // In forms, only editors can see the chat
+                if (!readOnly || type !== 'form') { common.openPadChat(onLocal); }
+
                 if (!readOnly && cursorGetter) {
                     common.openCursorChannel(onLocal);
                     cursor = common.createCursor(onLocal);
@@ -731,11 +733,20 @@ define([
             if (!common.isLoggedIn()) { return; }
             $embedButton = common.createButton('mediatag', true).click(function () {
                 var cfg = {
-                    types: ['file'],
+                    types: ['file', 'link'],
                     where: ['root']
                 };
                 if ($embedButton.data('filter')) { cfg.filter = $embedButton.data('filter'); }
                 common.openFilePicker(cfg, function (data) {
+                    // Embed links
+                    if (data.static) {
+                        var a = h('a', {
+                            href: data.href
+                        }, data.name);
+                        mediaTagEmbedder($(a), data);
+                        return;
+                    }
+                    // Embed files
                     if (data.type !== 'file') {
                         console.log("Unexpected data type picked " + data.type);
                         return;
@@ -746,8 +757,8 @@ define([
                     var privateDat = cpNfInner.metadataMgr.getPrivateData();
                     var origin = privateDat.fileHost || privateDat.origin;
                     var src = data.src = data.src.slice(0,1) === '/' ? origin + data.src : data.src;
-                    mediaTagEmbedder($('<media-tag src="' + src +
-                        '" data-crypto-key="cryptpad:' + data.key + '"></media-tag>'), data);
+                    var mt = UI.mediaTag(src, data.key);
+                    mediaTagEmbedder($(mt), data);
                 });
             }).appendTo(toolbar.$bottomL).hide();
         };
@@ -925,7 +936,9 @@ define([
             }
 
             var $importTemplateButton = common.createButton('importtemplate', true);
-            toolbar.$drawer.append($importTemplateButton);
+            if (!readOnly) {
+                toolbar.$drawer.append($importTemplateButton);
+            }
 
             /* add a forget button */
             toolbar.$drawer.append(common.createButton('forget', true, {}, function (err) {
diff --git a/www/common/sframe-common-codemirror.js b/www/common/sframe-common-codemirror.js
index 970272124..58475bbed 100644
--- a/www/common/sframe-common-codemirror.js
+++ b/www/common/sframe-common-codemirror.js
@@ -73,6 +73,8 @@ define([
         else {
             editor.setSelection(posToCursor(selects[0], remoteDoc), posToCursor(selects[1], remoteDoc));
         }
+
+        editor.scrollTo(scroll.left, scroll.top);
     };
 
     module.handleImagePaste = function (editor) {
diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index 198d17099..575971368 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -570,7 +570,7 @@ define([
             var defaultTitle = Utils.UserObject.getDefaultName(parsed);
             var edPublic, curvePublic, notifications, isTemplate;
             var settings = {};
-            var isSafe = ['debug', 'profile', 'drive', 'teams', 'calendar'].indexOf(currentPad.app) !== -1;
+            var isSafe = ['debug', 'profile', 'drive', 'teams', 'calendar', 'file'].indexOf(currentPad.app) !== -1;
 
             var isDeleted = isNewFile && currentPad.hash.length > 0;
             if (isDeleted) {
@@ -615,6 +615,7 @@ define([
                         newTemplate: Array.isArray(Cryptpad.initialPath)
                                         && Cryptpad.initialPath[0] === "template",
                         feedbackAllowed: Utils.Feedback.state,
+                        prefersDriveRedirect: Utils.LocalStore.getDriveRedirectPreference(),
                         isPresent: parsed.hashData && parsed.hashData.present,
                         isEmbed: parsed.hashData && parsed.hashData.embed,
                         oldVersionHash: parsed.hashData && parsed.hashData.version < 2, // password
@@ -1477,28 +1478,45 @@ define([
                 return 'thumbnail-' + parsed.type + '-' + channel;
             };
             sframeChan.on('Q_CREATE_TEMPLATES', function (type, cb) {
-                Cryptpad.getSecureFilesList({
-                    types: [type],
-                    where: ['template']
-                }, function (err, data) {
-                    // NOTE: Never return data directly!
-                    if (err) { return void cb({error: err}); }
-
-                    var res = [];
-                    nThen(function (waitFor) {
-                        Object.keys(data).map(function (el) {
-                            var k = getKey(data[el].href, data[el].channel);
-                            Utils.LocalStore.getThumbnail(k, waitFor(function (e, thumb) {
-                                res.push({
-                                    id: el,
-                                    name: data[el].filename || data[el].title || '?',
-                                    thumbnail: thumb,
-                                    used: data[el].used || 0
+                var templates;
+                nThen(function (waitFor) {
+                    var next = waitFor();
+                    require([
+                        '/'+type+'/templates.js'
+                    ], function (Templates) {
+                        templates = Templates;
+                        next();
+                    }, function () {
+                        next();
+                    });
+                }).nThen(function () {
+                    Cryptpad.getSecureFilesList({
+                        types: [type],
+                        where: ['template']
+                    }, function (err, data) {
+                        // NOTE: Never return data directly!
+                        if (err) { return void cb({error: err}); }
+                        var res = [];
+                        nThen(function (waitFor) {
+                            Object.keys(data).map(function (el) {
+                                var k = getKey(data[el].href, data[el].channel);
+                                Utils.LocalStore.getThumbnail(k, waitFor(function (e, thumb) {
+                                    res.push({
+                                        id: el,
+                                        name: data[el].filename || data[el].title || '?',
+                                        thumbnail: thumb,
+                                        used: data[el].used || 0
+                                    });
+                                }));
+                            });
+                        }).nThen(function () {
+                            if (Array.isArray(templates)) {
+                                templates.forEach(function (obj) {
+                                    res.push(obj);
                                 });
-                            }));
+                            }
+                            cb({data: res});
                         });
-                    }).nThen(function () {
-                        cb({data: res});
                     });
                 });
             });
@@ -1891,6 +1909,7 @@ define([
                 Utils.rtConfig = rtConfig;
                 var templatePw;
                 nThen(function(waitFor) {
+                    if (data.templateContent) { return; }
                     if (data.templateId) {
                         if (data.templateId === -1) {
                             isTemplate = true;
@@ -1904,6 +1923,13 @@ define([
                     }
                 }).nThen(function () {
                     var cryptputCfg = $.extend(true, {}, rtConfig, {password: password});
+                    if (data.templateContent) {
+                        Cryptget.put(currentPad.hash, JSON.stringify(data.templateContent), function () {
+                            startRealtime();
+                            cb();
+                        }, cryptputCfg);
+                        return;
+                    }
                     if (data.template) {
                         // Start OO with a template...
                         // Cryptget and give href, password and content to inner
@@ -1977,6 +2003,8 @@ define([
 
             sframeChan.on('EV_BURN_AFTER_READING', function () {
                 startRealtime();
+                // feedback fails for users in noDrive mode
+                Utils.Feedback.send("BURN_AFTER_READING", Boolean(cfg.noDrive));
             });
 
             sframeChan.ready();
diff --git a/www/common/sframe-common-title.js b/www/common/sframe-common-title.js
index 2539d1542..d1b06df73 100644
--- a/www/common/sframe-common-title.js
+++ b/www/common/sframe-common-title.js
@@ -23,6 +23,12 @@ define([
         var $title;
         exp.setToolbar = function (toolbar) {
             $title = toolbar && (toolbar.title || toolbar.pageTitle);
+            if ($title && exp.defaultTitle) {
+                var md = metadataMgr.getMetadata();
+                $title.find('input').prop('placeholder', md.defaultTitle);
+                $title.find('span.cp-toolbar-title-value').text(md.title || md.defaultTitle);
+                $title.find('input').val(md.title || md.defaultTitle);
+            }
         };
 
         exp.getTitle = function () { return exp.title; };
diff --git a/www/common/sframe-common.js b/www/common/sframe-common.js
index 70c239d67..6a7e3effd 100644
--- a/www/common/sframe-common.js
+++ b/www/common/sframe-common.js
@@ -145,8 +145,7 @@ define([
             var hexFileName = secret.channel;
             var origin = data.fileHost || data.origin;
             var src = origin + Hash.getBlobPathFromHex(hexFileName);
-            return '<media-tag src="' + src + '" data-crypto-key="cryptpad:' + key + '">' +
-                   '</media-tag>';
+            return UI.mediaTag(src, key).outerHTML;
         }
         return;
     };
@@ -448,13 +447,18 @@ define([
         }
     };
     funcs.createPad = function (cfg, cb) {
+        //var priv = ctx.metadataMgr.getPrivateData();
+        if (AppConfig.disableAnonymousPadCreation && !funcs.isLoggedIn()) {
+            return void UI.errorLoadingScreen(Messages.mustLogin);
+        }
         ctx.sframeChan.query("Q_CREATE_PAD", {
             owned: cfg.owned,
             expire: cfg.expire,
             password: cfg.password,
             team: cfg.team,
             template: cfg.template,
-            templateId: cfg.templateId
+            templateId: cfg.templateId,
+            templateContent: cfg.templateContent
         }, cb);
     };
 
@@ -917,7 +921,7 @@ define([
             });
 
             ctx.sframeChan.on('EV_WORKER_TIMEOUT', function () {
-                UI.errorLoadingScreen(Messages.timeoutError, false, function () {
+                UI.errorLoadingScreen(Messages.timeoutError, false, function () { // XXX mobile users can't necessarily hit 'ESC' as this message suggests. provice a click option
                     funcs.gotoURL('');
                 });
             });
diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index 119d7fb3d..5b53aa9a1 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -166,6 +166,7 @@ MessengerUI, Messages, Pages) {
     var showColors = false;
     var updateUserList = function (toolbar, config, forceOffline) {
         if (!config.displayed || config.displayed.indexOf('userlist') === -1) { return; }
+        if (toolbar.isAlone) { return; }
         // Make sure the elements are displayed
         var $userButtons = toolbar.userlist;
         var $userlistContent = toolbar.userlistContent;
@@ -553,11 +554,13 @@ MessengerUI, Messages, Pages) {
             if (toolbar.isDeleted) {
                 return void UI.warn(Messages.deletedFromServer);
             }
+            var privateData = config.metadataMgr.getPrivateData();
             var title = (config.title && config.title.getTitle && config.title.getTitle())
                         || (config.title && config.title.defaultName)
                         || "";
             Common.getSframeChannel().event('EV_SHARE_OPEN', {
-                title: title
+                title: title,
+                auditorHash: privateData.form_auditorHash
             });
         });
 
@@ -864,10 +867,6 @@ MessengerUI, Messages, Pages) {
             'class': "cp-toolbar-link-logo"
         }).append(UIElements.getSvgLogo());
 
-        /*.append($('<img>', {
-            //src: '/customize/images/logo_white.png?' + ApiConfig.requireConf.urlArgs
-            src: '/customize/favicon/main-favicon.png?' + ApiConfig.requireConf.urlArgs
-        }));*/
         var onClick = function (e) {
             e.preventDefault();
             if (e.ctrlKey) {
@@ -1214,6 +1213,7 @@ MessengerUI, Messages, Pages) {
         if (!config.metadataMgr) { return; }
         var metadataMgr = config.metadataMgr;
         var notify = function(type, name, oldname) {
+            if (toolbar.isAlone) { return; }
             // type : 1 (+1 user), 0 (rename existing user), -1 (-1 user)
             if (typeof name === "undefined") { return; }
             name = name || Messages.anonymous;
@@ -1513,6 +1513,15 @@ MessengerUI, Messages, Pages) {
             }
         };
 
+        // disable notification, userlist and chat
+        toolbar.alone = function () {
+            toolbar.userlist.hide();
+            toolbar.chat.hide();
+            $('.cp-toolbar-userlist-drawer').remove();
+            $('.cp-toolbar-chat-drawer').remove();
+            toolbar.isAlone = true;
+        };
+
         // On log out, remove permanently the realtime elements of the toolbar
         Common.onLogout(function () {
             failed();
diff --git a/www/common/translations/messages.bn_BD.json b/www/common/translations/archive/messages.bn_BD.json
similarity index 100%
rename from www/common/translations/messages.bn_BD.json
rename to www/common/translations/archive/messages.bn_BD.json
diff --git a/www/common/translations/messages.te.json b/www/common/translations/archive/messages.te.json
similarity index 100%
rename from www/common/translations/messages.te.json
rename to www/common/translations/archive/messages.te.json
diff --git a/www/common/translations/archive/messages.uk.json b/www/common/translations/archive/messages.uk.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/www/common/translations/archive/messages.uk.json
@@ -0,0 +1 @@
+{}
diff --git a/www/common/translations/messages.ca.json b/www/common/translations/messages.ca.json
index ad8254798..a45919644 100644
--- a/www/common/translations/messages.ca.json
+++ b/www/common/translations/messages.ca.json
@@ -13,7 +13,8 @@
         "todo": "Tasques",
         "contacts": "Contactes",
         "sheet": "Full de càlcul",
-        "teams": "Equips"
+        "teams": "Equips",
+        "form": "Formulari"
     },
     "button_newpad": "Nou document",
     "button_newcode": "Nova pàgina de codi",
@@ -28,18 +29,18 @@
     "padNotPinned": "Aquest document caducarà després de 3 mesos d'inactivitat, {0}connecteu-vos{1} o {2}registreu-vos{3} per conservar-lo.",
     "anonymousStoreDisabled": "L'administració d'aquesta instància de CryptPad ha desactivat l'emmagatzematge pels comptes anònims. Cal que inicieu la sessió per utilitzar el CryptDrive.",
     "expiredError": "Aquest document ha caducat i ja no està disponible.",
-    "deletedError": "La persona que va crear aquest document l'ha esborrat i ja no està disponible.",
+    "deletedError": "Aquest document ha estat esborrat i ja no està disponible.",
     "inactiveError": "Donada la seva inactivitat, aquest document s'ha esborrat. Premeu Esc per crear un nou document.",
     "chainpadError": "Hi ha hagut un error crític mentre s'actualitzava el vostre contingut. Aquesta pàgina es manté en mode només de lectura per assegurar que no perdreu el que ja heu fet.<br>Premeu <em>Esc</em> per continuar veient aquest document o torneu a carregar la pàgina per provar de continuar editant-lo.",
     "invalidHashError": "El document que heu demanat té una adreça URL no vàlida.",
-    "errorCopy": " Encara podeu accedir al contingut prement <em>Esc</em>.<br>Un cop tanqueu aquesta finestra no hi podreu tornar a accedir.",
+    "errorCopy": " Encara podeu usar la versió actual en mode \"només lectura\" prement <em>Esc</em>.",
     "errorRedirectToHome": "Premeu <em>Esc</em> per tornar al vostre CryptDrive.",
     "newVersionError": "Hi ha una nova versió disponible de CryptPad.<br><a href='#'>Torneu a carregar</a> la pàgina per utilitzar la versió nova o premeu Esc per accedir al vostre contingut en mode <b>fora de línia</b>.",
     "loading": "Carregant...",
     "error": "Error",
     "saved": "Desat",
     "deleted": "Esborrat",
-    "deletedFromServer": "Document esborrat del servidor",
+    "deletedFromServer": "Document destruït",
     "mustLogin": "Cal que inicieu la sessió per accedir a aquesta pàgina",
     "disabledApp": "Aquesta aplicació està dehabilitada. Per a més informació, contacteu l'administració d'aquest CryptPad.",
     "realtime_unrecoverableError": "Hi ha hagut un error irreparable. Cliqueu D'acord per tornar a carregar la pàgina.",
@@ -93,7 +94,7 @@
     "newButton": "Nou/Nova",
     "newButtonTitle": "Crea un nou document",
     "uploadButton": "Carregar fitxers",
-    "uploadButtonTitle": "Carrega un fitxer nou a la carpeta actual",
+    "uploadButtonTitle": "Carrega un fitxer nou al vostre CryptDrive",
     "saveTemplateButton": "Desa com una plantilla",
     "saveTemplatePrompt": "Trieu un títol per la plantilla",
     "templateSaved": "Plantilla desada!",
@@ -128,7 +129,7 @@
     "filePicker_description": "Trieu un fitxer del vostre CryptDrive per incrustar-lo o carregueu-ne un de nou",
     "filePicker_filter": "Filtra els fitxers pel nom",
     "tags_title": "Etiquetes (només vostres)",
-    "tags_add": "Actualitza les etiquetes d'aquesta pàgina",
+    "tags_add": "Actualitza les etiquetes dels documents seleccionats",
     "tags_notShared": "Les vostres etiquetes no es comparteixen amb altres persones usuàries",
     "tags_duplicate": "Etiquetes duplicades: {0}",
     "tags_noentry": "No podeu etiquetar un document esborrat!",
@@ -155,12 +156,12 @@
     "help_button": "Ajuda",
     "historyText": "Historial",
     "historyButton": "Mostra l'historial del document",
-    "history_next": "La versió més nova",
-    "history_prev": "La versió més antiga",
+    "history_next": "Següent versió",
+    "history_prev": "Versió anterior",
     "history_loadMore": "Carrega més historial",
     "history_closeTitle": "Tanca l'historial",
     "history_restoreTitle": "Restaura la versió seleccionada del document",
-    "history_restorePrompt": "Segur que voleu reemplaçar la versió actual del document per la que es mostra?",
+    "history_restorePrompt": "De debò voleu substituir la versió actual del document per la versió que es mostra?",
     "history_restoreDone": "S'ha restaurat el document",
     "openLinkInNewTab": "Obre l'enllaç en una pestanya nova",
     "pad_mediatagTitle": "Configuració de l'Etiqueta Multimèdia",
@@ -252,7 +253,7 @@
     "fm_sharedFolderName": "Carpeta compartida",
     "fm_searchPlaceholder": "Cercant...",
     "fm_newButton": "Nou",
-    "fm_newButtonTitle": "Crea un nou document o carpeta, importa un fitxer a la carpeta actual",
+    "fm_newButtonTitle": "Crea un nou document o carpeta, importa un fitxer a la carpeta actual.",
     "fm_newFolder": "Carpeta nova",
     "fm_newFile": "Document de text nou",
     "fm_folder": "Carpeta",
@@ -269,8 +270,8 @@
     "fm_openParent": "Veure a la carpeta",
     "fm_noname": "Document sense títol",
     "fm_emptyTrashDialog": "De debò voleu buidar la paperera?",
-    "fm_removeSeveralPermanentlyDialog": "De debò voleu suprimir permanentment aquests {0} elements del vostre CryptDrive?",
-    "fm_removePermanentlyDialog": "De debò voleu suprimir permanentment aquest element del vostre CryptDrive?",
+    "fm_removeSeveralPermanentlyDialog": "De debò voleu suprimir aquests {0} elements de la vostra unitat? Es mantindran a les unitats de qui els hagis desat.",
+    "fm_removePermanentlyDialog": "De debò voleu suprimir permanentment aquest element de la vostra unitat? Es mantindrà  a les unitats de qui l'hagi desat.",
     "fm_deleteOwnedPad": "De debò voleu suprimir permanentment aquest document del servidor?",
     "fm_deleteOwnedPads": "De debò voleu suprimir permanentment aquests documents del servidor?",
     "fm_restoreDialog": "De debò voleu restaurar {0} a la seva ubicació prèvia?",
@@ -282,7 +283,7 @@
     "fm_info_template": "Conté tots els documents desats com plantilles i que podeu reutilitzar quan vulgueu crear un nou document.",
     "fm_info_recent": "Aquests documents s'han modificat o obert darrerament, per vós o per alguna persona col·laboradora.",
     "fm_info_trash": "Buideu la paperera per alliberar espai al vostre CryptDrive.",
-    "fm_info_anonymous": "No heu iniciat la sessió, per tant, els vostres documents caducaran d'aquí a 3 mesos (<a href=\"https://blog.cryptpad.fr/2017/05/17/You-gotta-log-in/\" target=\"_blank\">saber-ne més</a>). Es desen al vostre navegador, per tant, si netegeu el vostre historial podríeu perdre'ls.<br><a href=\"/register/\">Registreu-vos</a> o <a href=\"/login/\">Inicieu la sessió</a> per mantenir-los accessibles.<br>",
+    "fm_info_anonymous": "No heu iniciat la sessió, per tant, els vostres documents caducaran d'aquí a {0} dies. Si esborreu l'historial del vostre navegador podríeu perdre'ls.<br><a href=\"/register/\">Registreu-vos</a> (no es demanen dades personals) o <a href=\"/login/\">Inicieu la sessió</a> per desar-los indefinidament a la vostra unitat. <a href=\"#docs\">Llegiu més sobre els comptes registrats</a>",
     "fm_info_sharedFolder": "Aquesta és una carpeta compartida. No heu iniciat cap sessió, pel que només podeu accedir en mode només de lectura.<br><a href=\"/register/\">Registreu-vos</a> o <a href=\"/login/\">Inicieu la sessió</a> per poder importar-ho al vostre CryptDrive i modificar-ho.",
     "fm_info_owned": "Es documents que es mostren són de la vostra propietat. Això vol dir que podeu eliminar-los permanentment del servidor quan vulgueu. Si ho feu, la resta de persones no podran accedir-hi mai més.",
     "fm_error_cantPin": "Error intern del servidor. Si us plau, torneu a garregar la pàgina i torneu a provar-ho.",
@@ -307,9 +308,9 @@
     "fc_open": "Obre",
     "fc_open_ro": "Obre (només de lectura)",
     "fc_delete": "Desplaça a la paperera",
-    "fc_delete_owned": "Elimina del servidor",
+    "fc_delete_owned": "Destrueix",
     "fc_restore": "Restaura",
-    "fc_remove": "Suprimeix del vostre CryptDrive",
+    "fc_remove": "Suprimeix",
     "fc_remove_sharedfolder": "Suprimeix",
     "fc_empty": "Buida la paperera",
     "fc_prop": "Propietats",
@@ -330,16 +331,16 @@
     "login_invalUser": "Cal introduir l'identificador",
     "login_invalPass": "Cal introduir la contrasenya",
     "login_unhandledError": "Hi ha hagut un error inesperat :(",
-    "register_importRecent": "Importeu els documents de la vostra sessió anònima",
+    "register_importRecent": "Importa documents de la vostra sessió no registrada",
     "register_acceptTerms": "Accepto les <a>condicions del servei</a>",
     "register_passwordsDontMatch": "Les contrasenyes no coincideixen!",
     "register_passwordTooShort": "Les contrasenyes han de tenir, com a mínim, {0} caràcters.",
     "register_mustAcceptTerms": "Cal que accepteu les condicions del servei.",
     "register_whyRegister": "Per què cal registrar-se?",
-    "register_header": "Us donem la benvinguda a CryptPad",
+    "register_header": "Registreu-vos",
     "register_writtenPassword": "He introduït el meu identificador i la contrasenya, continua",
-    "register_cancel": "Torna",
-    "register_warning": "Sense Rastre significa que no podem recuperar les vostres dades si perdeu o oblideu la vostra contrasenya.",
+    "register_cancel": "Cancel·la",
+    "register_warning": "Atenció",
     "register_alreadyRegistered": "Aquest identificador ja existeix, voleu iniciar la sessió?",
     "settings_cat_account": "Compte",
     "settings_cat_drive": "CryptDrive",
@@ -353,7 +354,7 @@
     "settings_backupHint": "Deseu o recupereu tot el contingut del vostre CryptDrive. No es desarà el contingut dels vostres documents, només les claus per accedir-hi.",
     "settings_backup": "Còpia de seguretat",
     "settings_restore": "Recupera",
-    "settings_backupHint2": "Descarregueu el contingut actual de tots els vostres documents. Els documents es descarregaran en un format llegible, sempre que el format estigui disponible.",
+    "settings_backupHint2": "Descarregueu tots els documents. a la vostra unitat. Els documents es descarregaran en un format llegible per altres aplicacions sempre que el format estigui disponible. Quan el format no estigui disponible, els documents es descarregaran en un format llegible per CryptPad.",
     "settings_backup2": "Descarrega el meu CryptDrive",
     "settings_backup2Confirm": "Això descarregarà tots els documents i fitxers des del vostre CryptDrive. Si voleu continuar, seleccioneu un nom i premeu D'acord",
     "settings_exportTitle": "Exporta el vostre CryptDrive",
@@ -431,7 +432,7 @@
     "settings_codeUseTabs": "Espaiar utilitzant tabulacions (enlloc d'espais)",
     "settings_codeFontSize": "Mida de la lletra a l'editor de codi",
     "settings_padWidth": "Amplada màxima de l'editor",
-    "settings_padWidthHint": "Els documents de text enriquit utilitzen, per defecte, l'amplada màxima de la vostra pantalla, fet que pot dificultar la lectura. Aquí podeu reduir l'amplada de l'editor.",
+    "settings_padWidthHint": "Canvieu entre el mode pàgina (per defecte) que limita l'amplada de l'editor de text i el mode pantalla completa que utilitza tota l'amplada.",
     "settings_padWidthLabel": "Redueix l'amplada de l'editor",
     "settings_padSpellcheckTitle": "Correcció ortogràfica",
     "settings_padSpellcheckHint": "Aquesta opció us permet habilitar la correcció ortogràfica als documents de text. Les errades es subratllaran en vermell i haureu de mantenir apretada la tecla Ctrl o Meta mentre cliqueu el botó dret per veure les opcions correctes.",
@@ -473,7 +474,7 @@
     "upload_notEnoughSpace": "No hi ha prou espai al CryptDrive per aquest fitxer.",
     "upload_notEnoughSpaceBrief": "No hi ha prou espai",
     "upload_tooLarge": "Aquest fitxer supera la mida màxima permesa pel vostre compte",
-    "upload_tooLargeBrief": "El fitxer és massa gran",
+    "upload_tooLargeBrief": "El fitxer supera el límit de {0}MB",
     "upload_choose": "Trieu un fitxer",
     "upload_pending": "Pendent",
     "upload_cancelled": "Cancel·lat",
@@ -505,14 +506,39 @@
     "download_step2": "Desxifrant",
     "download_step1": "Descarregant",
     "download_dl": "Descarrega",
-    "main_catch_phrase": "El Núvol Coneixement Zero",
+    "main_catch_phrase": "Utilitats col·laboratives<br> encriptades d'extrem a extrem i de codi obert",
     "footer_aboutUs": "Sobre nosaltres",
     "about": "Sobre",
     "contact": "Contacte",
     "blog": "Bloc",
     "topbar_whatIsCryptpad": "Què és CryptPad",
-    "whatis_collaboration": "Col·laboració fàcil i ràpida",
-    "whatis_title": "Què és CryptPad",
+    "whatis_collaboration": "Col·laboració privada",
+    "whatis_title": "Què és CryptPad?",
     "terms": "Condicions d'ús",
-    "privacy": "Privacitat"
+    "privacy": "Política de privacitat",
+    "settings_padOpenLinkLabel": "Activa l'obertura directa d'enllaços",
+    "features": "Característiques",
+    "features_f_cryptdrive0_note": "Possibilitat d'emmagatzemar els documents visitats al vostre navegador per poder-los obrir més tard",
+    "features_f_storage0": "Durada d'emmagatzematge limitada",
+    "settings_padOpenLinkTitle": "Obre els enllaços amb només un clic",
+    "settings_padOpenLinkHint": "Aquesta opció us permet d'obrir els enllaços dins d'un document de text sense obrir cap finestra",
+    "features_premium": "Prèmium",
+    "features_f_core": "Característiques comunes",
+    "features_f_file0_note": "Veure i descarregar documents compartits per altres membres",
+    "features_f_anon": "Totes les característiques dels membres anònims",
+    "features_f_cryptdrive1": "Funcionalitat completa de CryptDrive",
+    "whatis_drive": "Organització amb CryptPad",
+    "features_f_cryptdrive0": "Accés limitat a CryptDrive",
+    "features_f_core_note": "Editar, importar i exportar, historial, llistat de membres, xat",
+    "features_anon": "No registrat",
+    "features_f_apps": "Accés a totes les aplicacions",
+    "features_f_file0": "Obrir documents",
+    "features_f_storage0_note": "Els documents s'eliminen després de {0} dies d'inactivitat",
+    "features_registered": "Registrat",
+    "features_f_anon_note": "Amb funcionalitat addicional",
+    "features_title": "Característiques",
+    "features_f_social": "Característiques socials",
+    "features_f_devices_note": "Accés al CryptDrive des de tot arreu amb el teu compte",
+    "features_f_devices": "Les teves llibretes en tots els teus dispositius",
+    "features_f_cryptdrive1_note": "Carpetes, carpetes compartides, models, etiquetes"
 }
diff --git a/www/common/translations/messages.cs.json b/www/common/translations/messages.cs.json
new file mode 100644
index 000000000..5a1dd3bbd
--- /dev/null
+++ b/www/common/translations/messages.cs.json
@@ -0,0 +1,61 @@
+{
+    "register_whyRegister": "Proč se registrovat?",
+    "register_mustAcceptTerms": "Musíte souhlasit s podmínkami služby.",
+    "register_passwordTooShort": "Heslo musí být alespoň {0} znaků dlouhé.",
+    "register_passwordsDontMatch": "Hesla nejsou stejná!",
+    "register_acceptTerms": "Potvrzuji <a>podmínky služby</a>",
+    "register_importRecent": "Importovat dokumenty z Vašeho neregistrovaného sezení",
+    "login_unhandledError": "Stala se neočekávaná chyba :(",
+    "login_invalPass": "Heslo je povinné",
+    "login_invalUser": "Uživatelské jméno je povinné",
+    "login_noSuchUser": "Chybné uživatelské jméno nebo heslo. Opakujte nebo se registrujte",
+    "login_hashing": "Hashuji Vaše heslo, to může chvíli trvat.",
+    "login_confirm": "Opakujte heslo",
+    "login_password": "Heslo",
+    "login_username": "Uživatelské jméno",
+    "padNotPinned": "Tento dokument expiruje za 3 měsíce neaktivity, {0}přihlašte se{1} nebo {2}se registrujte{3} pro jeho uchování.",
+    "onLogout": "Jste odhlášení, {0}klikněte zde{1} pro přihlášení<br>nebo zmáčkněte <em>Escape</em> pro čtení dokumentu.",
+    "typeError": "Tento dokument není kompatibilní s vybranou aplikací",
+    "common_connectionLost": "<b>Spojení se serverem ztraceno</b><br>Nyní jste v režimu čtení, dokud nebude spojení obnoveno.",
+    "button_newsheet": "Nová tabulka",
+    "button_newwhiteboard": "Nová tabule",
+    "button_newslide": "Nová prezentace",
+    "button_newpoll": "Nové hlasování",
+    "button_newcode": "Nový kód",
+    "button_newpad": "Nový formátovaný dokument",
+    "type": {
+        "teams": "Týmy",
+        "sheet": "Tabulka",
+        "contacts": "Kontakty",
+        "todo": "Úkol",
+        "media": "Média",
+        "file": "Soubor",
+        "whiteboard": "Tabule",
+        "drive": "CryptDrive",
+        "slide": "Prezentace",
+        "poll": "Hlasování",
+        "code": "Kód",
+        "pad": "Formátovaný text"
+    },
+    "logoutEverywhere": "Odhlásit se všude",
+    "login_login": "Přihlásit se",
+    "login_register": "Registrovat",
+    "logoutButton": "Odhlásit se",
+    "settingsButton": "Nastavení",
+    "register_emailWarning0": "Vypadá to, že byl vyplněn email jako uživatelské jméno.",
+    "register_alreadyRegistered": "Tento uživatel již existuje, chcete se přihlásit?",
+    "register_warning": "Varování",
+    "register_cancel": "Zrušit",
+    "register_writtenPassword": "Své uživatelské jméno a heslo jsem si zapsal, pokračovat",
+    "register_header": "Registrovat",
+    "deletedFromServer": "Dokument zničen",
+    "deleted": "Smazáno",
+    "saved": "Uloženo",
+    "error": "Chyba",
+    "loading": "Načítání...",
+    "invalidHashError": "Požadovaný dokument má neplatné URL.",
+    "inactiveError": "Tento dokument byl smazán kvůli neaktivitě. Zmáčkněte Escape pro vytvoření nového dokumentu.",
+    "deletedError": "Tento dokument byl smazán a není již dostupný.",
+    "expiredError": "Tento dokument expiroval a není již dostupný.",
+    "padNotPinnedVariable": "Tento dokument expiruje za {4} dny neaktivity, {0}přihlašte se{1} nebo {2}se registrujte{3} pro jeho uchování."
+}
diff --git a/www/common/translations/messages.de.json b/www/common/translations/messages.de.json
index 3177b4c75..259a19928 100644
--- a/www/common/translations/messages.de.json
+++ b/www/common/translations/messages.de.json
@@ -13,7 +13,8 @@
         "todo": "Aufgaben",
         "contacts": "Kontakte",
         "sheet": "Tabelle",
-        "teams": "Teams"
+        "teams": "Teams",
+        "form": "Formular"
     },
     "button_newpad": "Neues Rich-Text-Pad",
     "button_newcode": "Neues Code-Pad",
@@ -26,7 +27,7 @@
     "onLogout": "Du bist ausgeloggt. {0}Klicke hier{1}, um dich wieder einzuloggen,<br>oder drücke <em>Escape</em>, um dein Pad schreibgeschützt zu benutzen.",
     "padNotPinned": "Dieses Pad wird nach 3 Monaten ohne Aktivität auslaufen, {0}logge dich ein{1} oder {2}registriere dich{3}, um das Auslaufen zu verhindern.",
     "anonymousStoreDisabled": "Der Webmaster dieses CryptPad-Servers hat die anonyme Verwendung des Speichers deaktiviert. Du musst dich einloggen, um CryptDrive zu verwenden.",
-    "expiredError": "Dieses Pad ist abgelaufen und ist nicht mehr verfügbar.",
+    "expiredError": "Dieses Pad ist abgelaufen und nicht mehr verfügbar.",
     "deletedError": "Dieses Dokument wurde gelöscht und ist nicht mehr verfügbar.",
     "inactiveError": "Dieses Pad ist wegen Inaktivität gelöscht worden. Drücke Esc, um ein neues Pad zu erstellen.",
     "chainpadError": "Ein kritischer Fehler ist beim Aktualisieren deines Inhalts aufgetreten. Diese Seite ist schreibgeschützt, damit du sicherstellen kannst, dass kein Inhalt verloren geht.<br>Drücke <em>Esc</em>, um das Pad schreibgeschützt zu lesen oder lade es neu, um die Bearbeitung fortzusetzen.",
@@ -40,7 +41,7 @@
     "deletedFromServer": "Dokument zerstört",
     "mustLogin": "Du musst angemeldet sein, um auf diese Seite zuzugreifen",
     "disabledApp": "Diese Anwendung wurde deaktiviert. Kontaktiere den Administrator dieses CryptPads, um mehr Informationen zu erhalten.",
-    "realtime_unrecoverableError": "Es ist ein nicht reparierbarer Fehler aufgetreten. Klicke auf OK, um neu zu laden.",
+    "realtime_unrecoverableError": "Ein nicht reparierbarer Fehler ist aufgetreten. Klicke auf OK, um neu zu laden.",
     "disconnected": "Getrennt",
     "synchronizing": "Synchronisieren",
     "reconnecting": "Verbindung wird aufgebaut",
@@ -91,7 +92,7 @@
     "newButton": "Neu",
     "newButtonTitle": "Neues Pad erstellen",
     "uploadButton": "Hochladen",
-    "uploadButtonTitle": "Eine neue Datei zum CryptDrive hochladen",
+    "uploadButtonTitle": "Eine neue Datei ins CryptDrive hochladen",
     "saveTemplateButton": "Als Vorlage speichern",
     "saveTemplatePrompt": "Bitte gib einen Titel für die Vorlage ein",
     "templateSaved": "Vorlage gespeichert!",
@@ -114,7 +115,7 @@
     "printSlideNumber": "Foliennummer anzeigen",
     "printDate": "Datum anzeigen",
     "printTitle": "Titel der Präsentation anzeigen",
-    "printCSS": "Benutzerdefinierte Stil-Regeln (CSS):",
+    "printCSS": "Benutzerdefinierte Stilregeln (CSS):",
     "printTransition": "Animierte Übergänge aktivieren",
     "printBackground": "Ein Hintergrundbild verwenden",
     "printBackgroundButton": "Bitte ein Bild wählen",
@@ -278,7 +279,7 @@
     "fm_info_template": "Hier sind alle Dokumente enthalten, die als Vorlage gespeichert wurden und die du wiederverwenden kannst, um ein neues Pad zu erstellen.",
     "fm_info_recent": "Diese Pads wurden kürzlich von dir oder von Personen, mit denen du zusammenarbeitest, geöffnet oder geändert.",
     "fm_info_trash": "Leere den Papierkorb, um mehr freien Platz in deinem CryptDrive zu erhalten.",
-    "fm_info_anonymous": "Du bist nicht eingeloggt, daher laufen deine Dokumente nach {0} Tagen aus. Sie könnten durch Löschen des Browserverlaufs verloren gehen. <br><a href=\"/register/\">Registriere dich</a> (keine persönlichen Informationen benötigt) oder <a href=\"/login/\">logge dich ein</a>, um sie dauerhaft in deinem Drive zu speichern. <a href=\"https://docs.cryptpad.fr/de/user_guide/user_account.html#account-types\" target=\"_blank\">Mehr zu registrierten Accounts</a>.",
+    "fm_info_anonymous": "Du bist nicht eingeloggt, daher laufen deine Dokumente nach {0} Tagen aus. Sie könnten durch Löschen des Browserverlaufs verloren gehen. <br><a href=\"/register/\">Registriere dich</a> (keine persönlichen Informationen benötigt) oder <a href=\"/login/\">logge dich ein</a>, um sie dauerhaft in deinem Drive zu speichern. <a href=\"#docs\">Mehr zu registrierten Accounts</a>.",
     "fm_info_sharedFolder": "Dieser Ordner ist geteilt. Da du aber nicht eingeloggt bist, hast du nur einen schreibgeschützen Zugriff.<br><a href=\"/register/\">Registriere</a> oder <a href=\"/login/\">logge ich ein</a>, damit du diesen Ordner in dein CryptDrive importieren und bearbeiten kannst.",
     "fm_info_owned": "Diese Pads sind deine eigenen. Das heißt, dass du sie jederzeit vom Server entfernen kannst. Wenn du das machst, sind sie auch für andere Nutzer nicht mehr zugänglich.",
     "fm_error_cantPin": "Interner Serverfehler. Bitte lade die Seite neu und versuche es erneut.",
@@ -383,7 +384,7 @@
     "settings_resetThumbnailsDone": "Alle Vorschaubilder wurden entfernt.",
     "settings_importTitle": "Importiere die kürzlich besuchten Dokumente in dein CryptDrive",
     "settings_import": "Importieren",
-    "settings_importConfirm": "Bist du sicher, dass du die kürzlich besuchten Pads in das CryptDrive deines Accounts importieren möchtest??",
+    "settings_importConfirm": "Bist du sicher, dass du die kürzlich besuchten Pads in das CryptDrive deines Accounts importieren möchtest?",
     "settings_importDone": "Import abgeschlossen",
     "settings_autostoreTitle": "Speichern von Pads im CryptDrive",
     "settings_autostoreHint": "<b>Automatisch:</b> Alle Pads werden in deinem CryptDrive gespeichert.<br><b>Manuell (immer nachfragen):</b> Wenn du ein Pad noch nicht gespeichert hast, wirst du gefragt, ob du es im CryptDrive speichern willst.<br><b>Manuell (nie nachfragen):</b> Pads werden nicht automatisch im CryptDrive gespeichert. Die Option zum Speichern wird versteckt.",
@@ -1230,5 +1231,153 @@
     "register_registrationIsClosed": "Die Registrierung ist geschlossen.",
     "mediatag_defaultImageName": "Bild",
     "oo_importBin": "Klicke auf OK, um CryptPads interne Format .bin zu importieren.",
-    "oo_conversionSupport": "Dein Browser unterstützt die Konvertierung von und in Microsoft-Office-Formaten nicht. Wir empfehlen die Verwendung einer aktuellen Version von Firefox oder Chrome."
+    "oo_conversionSupport": "Dein Browser unterstützt die Konvertierung von und in Microsoft-Office-Formaten nicht. Wir empfehlen die Verwendung einer aktuellen Version von Firefox oder Chrome.",
+    "admin_emailTitle": "E-Mail-Adresse der Administratoren",
+    "admin_emailHint": "Lege hier die Kontaktadresse für deine Instanz fest",
+    "admin_supportPrivHint": "Lasse dir den privaten Schlüssel anzeigen, den andere Administratoren zum Zugriff auf die Support-Tickets benötigen. Ein Formular zur Eingabe dieses Schlüssels wird in ihrem Administrationsbereich angezeigt.",
+    "admin_supportPrivTitle": "Privater Schlüssel für das Support-Postfach",
+    "admin_emailButton": "Aktualisieren",
+    "admin_supportPrivButton": "Schlüssel anzeigen",
+    "admin_supportInitGenerate": "Support-Schlüssel generieren",
+    "form_invalid": "Ungültiges Formular",
+    "button_newform": "Neues Formular",
+    "form_page": "Seite {0}/{1}",
+    "form_anonymous_on": "Erlaubt",
+    "form_anonymous": "Anonyme Antworten",
+    "form_removeEnd": "Enddatum entfernen",
+    "form_setEnd": "Enddatum festlegen",
+    "form_isPrivate": "Antworten sind privat",
+    "form_isPublic": "Antworten sind öffentlich",
+    "form_makePublicWarning": "Bist du sicher, dass du die Antworten veröffentlichen möchtest? Dies kann nicht rückgängig gemacht werden.",
+    "form_makePublic": "Antworten veröffentlichen",
+    "form_invalidQuestion": "Frage {0}",
+    "form_input_ph_url": "https://example.com",
+    "form_input_ph_email": "email@example.com",
+    "form_backButton": "Zurück",
+    "form_showSummary": "Zusammenfassung anzeigen",
+    "form_results_empty": "Es gibt keine Antworten",
+    "form_results": "Antworten",
+    "form_delete": "Löschen",
+    "form_reset": "Zurücksetzen",
+    "form_maxOptions": "Maximal {0} Antwort(en)",
+    "form_duplicates": "Doppelte Einträge wurden entfernt",
+    "form_description_default": "Dein Text hier",
+    "form_type_page": "Seitenumbruch",
+    "form_type_md": "Beschreibung",
+    "form_type_sort": "Geordnete Liste",
+    "form_type_input": "Text",
+    "form_default": "Deine Frage hier?",
+    "form_text_url": "Link",
+    "form_text_text": "Text",
+    "form_pollYourAnswers": "Deine Antworten",
+    "form_poll_switch": "Achsen vertauschen",
+    "form_poll_time": "Zeit",
+    "share_formView": "Teilnehmer",
+    "share_formEdit": "Autor",
+    "form_type_textarea": "Absatz",
+    "form_text_number": "Zahl",
+    "form_text_email": "E-Mail-Adresse",
+    "form_poll_day": "Tag",
+    "form_poll_text": "Text",
+    "form_editBlock": "Bearbeiten",
+    "admin_blockDailyCheckHint": "CryptPad-Instanzen senden beim Start und danach einmal pro Tag eine Nachricht an den Server der Entwickler. So können sie verfolgen, auf wie vielen Servern welche Versionen der Software eingesetzt werden. Du kannst diese Auswertung nachfolgend deaktivieren. Der Inhalt dieser Nachricht kann im Protokoll des Anwendungsservers überprüft werden.",
+    "admin_removeDonateButtonHint": "Die Entwicklung von CryptPad wird teilweise durch öffentliche Zuschüsse und Spenden finanziert. Werbung für unsere Spendenaktionen auf deiner Instanz hilft den Entwicklern, die Plattform für alle weiter zu verbessern, aber du kannst diese Hinweise deaktivieren, wenn du sie für unangemessen hältst.",
+    "admin_provideAggregateStatisticsHint": "Du kannst zustimmen, den Entwicklern zusätzliche Nutzungsstatistiken zur Verfügung zu stellen, z. B. die ungefähre Anzahl der registrierten und täglichen Benutzer deiner Instanz.",
+    "admin_listMyInstanceHint": "Wenn deine Instanz für die öffentliche Nutzung geeignet ist, kannst du der Auflistung in Webverzeichnissen zustimmen. Die Server-Telemetrie muss aktiviert sein, damit dies wirksam wird.",
+    "admin_consentToContactHint": "Die Server-Telemetrie beinhaltet die E-Mail-Adresse der Administratoren, damit dich die Entwickler über ernste Probleme mit der Software oder deiner Konfiguration informieren können. Sie wird niemals geteilt, verkauft oder zu Marketingzwecken verwendet. Stimme zu, wenn du über kritische Probleme mit deinem Server informiert werden möchtest.",
+    "admin_provideAggregateStatisticsTitle": "Aggregierte Statistiken",
+    "admin_listMyInstanceLabel": "Diese Instanz auflisten",
+    "admin_checkupHint": "CryptPad enthält eine Seite, die automatisch häufige Konfigurationsprobleme diagnostiziert und gegebenenfalls Vorschläge zu deren Behebung gibt.",
+    "admin_updateAvailableButton": "Versionshinweise ansehen",
+    "settings_driveRedirectHint": "Die automatische Weiterleitung für eingeloggte Benutzer von der Hauptseite zum Drive ist nicht mehr standardmäßig aktiviert. Du kannst das alte Verhalten nachfolgend aktivieren.",
+    "settings_driveRedirectTitle": "Weiterleitung von Hauptseite",
+    "settings_driveRedirect": "Mich automatisch weiterleiten",
+    "form_add_item": "Eintrag hinzufügen",
+    "form_newItem": "Neuer Eintrag",
+    "form_defaultItem": "Eintrag {0}",
+    "form_addMultipleHint": "Mehrere Daten und Zeiten hinzufügen",
+    "form_addMultiple": "Alle hinzufügen",
+    "form_add_option": "Option hinzufügen",
+    "form_newOption": "Neue Option",
+    "form_defaultOption": "Option {0}",
+    "form_editType": "Optionstyp",
+    "form_textType": "Texttyp",
+    "form_pollTotal": "Summe",
+    "form_editor": "Editor",
+    "admin_provideAggregateStatisticsLabel": "Aggregierte Statistiken bereitstellen",
+    "admin_blockDailyCheckLabel": "Server-Telemetrie deaktivieren",
+    "admin_blockDailyCheckTitle": "Server-Telemetrie",
+    "admin_removeDonateButtonLabel": "Keine Werbung für Crowdfunding-Kampagnen",
+    "admin_removeDonateButtonTitle": "Teilnahme am Crowdfunding",
+    "admin_listMyInstanceTitle": "Meine Instanz in öffentlichen Verzeichnissen auflisten",
+    "admin_consentToContactLabel": "Ich stimme zu",
+    "admin_consentToContactTitle": "Zustimmung zur Kontaktaufnahme",
+    "admin_checkupTitle": "Konfiguration der Instanz überprüfen",
+    "admin_updateAvailableHint": "Eine neue Version von CryptPad ist verfügbar",
+    "admin_updateAvailableTitle": "Neue Versionen",
+    "admin_cat_network": "Netzwerk",
+    "restrictedLoginPrompt": "Du bist nicht berechtigt, auf dieses Dokument zuzugreifen. <a>Logge dich ein</a>, wenn du denkst, dass dein Account dazu berechtigt sein sollte.",
+    "copyToClipboard": "In Zwischenablage kopieren",
+    "form_showIndividual": "Einzelne Antworten anzeigen",
+    "form_answerWarning": "Unbestätigte Identität",
+    "form_answerName": "Antwort von {0} am {1}",
+    "form_answerAnonymous": "Anonyme Antwort am {0}",
+    "form_anonymousBox": "Anonym antworten",
+    "form_anonymous_blocked": "Anonyme Antworten sind in diesem Formular nicht erlaubt. Du musst dich <a href=\"/login/\">einloggen</a> oder <a href=\"/register/\">registrieren</a>, um Antworten abzusenden.",
+    "form_anonymous_off": "Blockiert",
+    "form_invalidWarning": "Es gibt fehlerhafte Antworten:",
+    "form_notAnswered": "<b>{0}</b> leere Antworten",
+    "form_form": "Formular",
+    "form_answered": "Du hast dieses Formular bereits beantwortet",
+    "form_cantFindAnswers": "Deine vorigen Antworten für dieses Formular konnten nicht geladen werden.",
+    "form_updateWarning": "Trotzdem aktualisieren",
+    "form_submitWarning": "Trotzdem absenden",
+    "form_sent": "Deine Antwort wurde gesendet",
+    "form_update": "Aktualisieren",
+    "form_submit": "Absenden",
+    "form_type_checkbox": "Mehrfachauswahl",
+    "form_type_radio": "Einfachauswahl",
+    "form_maxLength": "Zeichenbegrenzung: {0}/{1}",
+    "form_sort_hint": "Bitte ziehe diese Elemente in die gewünschte Reihenfolge von am meisten (1) bis am wenigsten ({0}) bevorzugt.",
+    "form_type_poll": "Umfrage",
+    "form_editMaxLength": "Maximale Zeichenanzahl",
+    "mdToolbar_embed": "Datei einbetten",
+    "admin_checkupButton": "Diagnose ausführen",
+    "share_formAuditor": "Prüfer",
+    "form_type_multicheck": "Mehrfachauswahl-Matrix",
+    "form_type_multiradio": "Einfachauswahl-Matrix",
+    "form_editMax": "Maximal auswählbare Optionen",
+    "form_clear": "Leeren",
+    "form_willClose": "Dieses Formular wird geschlossen am {0}",
+    "form_isClosed": "Dieses Formular wurde geschlossen am {0}",
+    "form_isOpen": "Dieses Formular ist offen",
+    "form_open": "Öffnen",
+    "form_viewButton": "Anzeigen",
+    "form_poll_hint": "<i></i>: Ja, <i></i>: Nein, <i></i>: Akzeptabel",
+    "fc_open_formro": "Öffnen (als Teilnehmer)",
+    "resources_openInNewTab": "In neuem Tab öffnen",
+    "resources_imageBlocked": "CryptPad hat ein externes Bild blockiert",
+    "admin_purpose_noanswer": "Möchte ich nicht sagen",
+    "admin_purpose_business": "Für ein Unternehmen oder eine kommerzielle Organisation",
+    "admin_purpose_education": "Für eine Schule, Hochschule oder Universität",
+    "admin_purpose_org": "Für eine gemeinnützige Organisation oder eine Interessengruppe",
+    "admin_purpose_personal": "Für mich selbst, Familie oder Freunde",
+    "admin_purpose_experiment": "Zum Testen der Plattform oder zur Entwicklung neuer Funktionen",
+    "admin_instancePurposeTitle": "Zweck der Instanz",
+    "admin_instancePurposeHint": "Warum betreibst du diese Instanz? Deine Antwort wird mit den Entwicklern geteilt, sofern die Telemetrie aktiviert ist.",
+    "admin_purpose_public": "Zur Bereitstellung eines kostenlosen Dienstes für die Allgemeinheit",
+    "resources_learnWhy": "Mehr über die Gründe erfahren",
+    "team_leaveOwner": "Bitte entferne dich von der Rolle des Eigentümers, bevor du das Teams verlässt. Beachte, dass Teams mindestens einen Eigentümer haben müssen. Bitte füge daher zunächst einen weiteren Eigentümer hinzu, sofern du derzeit der alleinige Eigentümer bist.",
+    "form_exportCSV": "Als CSV exportieren",
+    "form_answerAs": "Antworten als",
+    "notification_openLink": "Du hast einen Link <b>{0}</b> von {1} erhalten:",
+    "fm_link_warning": "Warnung: URL ist länger als 200 Zeichen",
+    "notification_linkShared": "{0} hat einen Link mit dir geteilt: <b>{1}</b>",
+    "fm_link_name": "Bezeichnung des Links",
+    "fm_link_invalid": "Ungültige URL",
+    "form_anonName": "Dein Name",
+    "fm_link_name_placeholder": "Mein Link",
+    "fm_link_url": "URL",
+    "fm_link_type": "Link",
+    "fm_link_new": "Neuer Link"
 }
diff --git a/www/common/translations/messages.el.json b/www/common/translations/messages.el.json
index 67c2e30a8..7bbcaf861 100644
--- a/www/common/translations/messages.el.json
+++ b/www/common/translations/messages.el.json
@@ -224,7 +224,7 @@
     "fm_info_template": "Περιέχει όλα τα pads που έχουν αποθηκευτεί ως πρότυπα και μπορείτε να ξαναχρησιμοποιήσετε όταν δημιουργείτε ένα νέο pad.",
     "fm_info_recent": "Λίστα των πρόσφατα τροποποιημένων ή ανοιγμένων pads.",
     "fm_info_trash": "Αδειάστε τον κάδο σας για να απελευθερώσετε χώρο στο CryptDrive σας.",
-    "fm_info_anonymous": "Δεν έχετε συνδεθεί, οπότε τα pads σας θα διαγραφούν μετά από 3 μήνες (<a href=\"https://blog.cryptpad.fr/2017/05/17/You-gotta-log-in/\" target=\"_blank\">μάθετε περισσότερα</a>). <a href=\"/register/\">Εγγραφείτε</a> ή <a href=\"/login/\">Συνδεθείτε</a> για να τα κρατήσετε επ' αόριστον.",
+    "fm_info_anonymous": "Δεν έχετε συνδεθεί, οπότε τα pads σας θα διαγραφούν μετά από 3 μήνες. <a href=\"/register/\">Εγγραφείτε</a> ή <a href=\"/login/\">Συνδεθείτε</a> για να τα κρατήσετε επ' αόριστον.",
     "fm_error_cantPin": "Εσωτερικό σφάλμα διακομιστή. Παρακαλούμε επαναφορτώστε τη σελίδα και προσπαθήστε ξανά.",
     "fm_viewListButton": "Προβολή λίστας",
     "fm_viewGridButton": "Προβολή πλέγματος",
diff --git a/www/common/translations/messages.es.json b/www/common/translations/messages.es.json
index 59b0b16db..34b53ef47 100644
--- a/www/common/translations/messages.es.json
+++ b/www/common/translations/messages.es.json
@@ -216,7 +216,7 @@
     "upload_success": "Tu archivo ({0}) ha sido subido con éxito y fue añadido a tu drive.",
     "pinLimitReachedAlertNoAccounts": "Has llegado a tu límite de espacio",
     "previewButtonTitle": "Mostrar/esconder la vista previa Markdown",
-    "fm_info_anonymous": "No has iniciado sesión, por lo que tus documentos expirarán después de {0} días. Borrar el historial de tu navegador puede hacer que desaparezcan.<br><a href=\"/register/\">Inscríbete</a> (no se requieren datos personales) o <a href=\"/login/\">Ingresa</a> para almacenarlos en tu disco de forma indefinida. <a href=\"https://docs.cryptpad.fr/en/user_guide/user_account.html#account-types\" target=\"_blank\">Más información sobre las cuentas registradas</a>.",
+    "fm_info_anonymous": "No has iniciado sesión, por lo que tus documentos expirarán después de {0} días. Borrar el historial de tu navegador puede hacer que desaparezcan.<br><a href=\"/register/\">Inscríbete</a> (no se requieren datos personales) o <a href=\"/login/\">Ingresa</a> para almacenarlos en tu disco de forma indefinida. <a href=\"#docs\">Más información sobre las cuentas registradas</a>.",
     "fm_error_cantPin": "Error del servidor. Por favor, recarga la página e inténtalo de nuevo.",
     "upload_notEnoughSpace": "No tienes suficiente espacio para este archivo en tu CryptDrive",
     "upload_tooLarge": "Este archivo supera el límite de carga permitido por tu cuenta.",
diff --git a/www/common/translations/messages.fi.json b/www/common/translations/messages.fi.json
index d1c5b9bb3..960853bc8 100644
--- a/www/common/translations/messages.fi.json
+++ b/www/common/translations/messages.fi.json
@@ -12,7 +12,8 @@
         "todo": "Tehtävälista",
         "contacts": "Yhteystiedot",
         "sheet": "Taulukko",
-        "teams": "Teams"
+        "teams": "Teams",
+        "form": "Lomake"
     },
     "button_newpad": "Uusi Teksti-padi",
     "button_newcode": "Uusi Koodi-padi",
@@ -28,12 +29,12 @@
     "padNotPinnedVariable": "Tämä padi vanhenee {4} päivän käyttämättömyyden jälkeen, {0}kirjaudu sisään{1} tai {2}rekisteröidy{3} säilyttääksesi sen.",
     "anonymousStoreDisabled": "Tämän CryptPad-instanssin ylläpitäjä on estänyt anonyymien käyttäjien pääsyn tallennustilaan. Kirjaudu sisään käyttääksesi CryptDrivea.",
     "expiredError": "Tämä padi on vanhentunut, eikä se ole enää saatavilla.",
-    "deletedError": "Tämä padi on poistettu omistajansa toimesta, eikä se ole enää saatavilla.",
+    "deletedError": "Tämä padi on poistettu, eikä se ole enää saatavilla.",
     "inactiveError": "Tämä padi on poistettu käyttämättömyyden vuoksi. Paina Esc-näppäintä luodaksesi uuden padin.",
     "chainpadError": "Sisältöä päivitettäessä tapahtui vakava virhe. Tämä sivu on vain luku-tilassa, jotta tekemäsi muutokset eivät katoaisi.<br>Paina <em>Esc-näppäintä</em> jatkaaksesi padin katselua vain luku-tilassa, tai lataa sivu uudelleen yrittääksesi muokkaamista.",
     "invalidHashError": "Pyytämäsi asiakirjan URL-osoite on virheellinen.",
     "main_title": "CryptPad: Reaaliaikaista, kollaboratiivista editointia nollatietoperiaatteella",
-    "errorCopy": " Pääset yhä käyttämään asiakirjan sisältöä painamalla <em>Esc</em>-näppäintä.<br>Suljettuasi tämän ikkunan sisältö katoaa, etkä voi enää käyttää sitä.",
+    "errorCopy": " Voit yhä käyttää nykyistä versiota vain luku-tilassa painamalla <em>Esc</em>-näppäintä.",
     "errorRedirectToHome": "Paina<em>Esc</em>-näppäintä ohjautuaksesi CryptDriveen.",
     "newVersionError": "Uusi versio CryptPadista on saatavilla.<br><a href='#'>Lataa sivu uudelleen</a> siirtyäksesi uuteen versioon, tai paina <em>Esc</em>-näppäintä käyttääksesi sisältöäsi <b>offline-tilassa</b>.",
     "loading": "Ladataan...",
@@ -255,7 +256,7 @@
     "fm_sharedFolderName": "Jaettu kansio",
     "fm_searchPlaceholder": "Hae...",
     "fm_newButton": "Uusi",
-    "fm_newButtonTitle": "Luo uusi padi tai kansio, tuo tiedosto nykyiseen kansioon",
+    "fm_newButtonTitle": "Luo uusi asiakirja tai kansio, tuo tiedosto nykyiseen kansioon.",
     "fm_newFolder": "Uusi kansio",
     "fm_newFile": "Uusi padi",
     "fm_morePads": "Lisää",
@@ -286,7 +287,7 @@
     "fm_info_template": "Sisältää kaikki mallipohjiksi tallennetut padit, joita voit käyttää uudelleen luodessasi uuden padin.",
     "fm_info_recent": "Tässä näytetään sinun tai yhteistyökumppaniesi äskettäin avaamat tai muokkaamat padit.",
     "fm_info_trash": "Tyhjennä roskakorisi vapauttaaksesi CryptDrive-tallennustilaa.",
-    "fm_info_anonymous": "Et ole kirjautunut sisään, joten luomasi asiakirjat vanhenevat {0} päivän päästä. Selaushistorian tyhjentäminen saattaa myös hävittää ne.<br><a href=\"/register/\">Rekisteröidy</a> (henkilötietoja ei tarvita) tai <a href=\"/login/\">kirjaudu sisään</a> säilyttääksesi luomasi asiakirjat pysyvästi CryptDrivessa. <a href=\"https://docs.cryptpad.fr/en/user_guide/user_account.html#account-types\" target=\"_blank\">Lue lisää rekisteröitymisestä ja käyttäjätileistä</a>.",
+    "fm_info_anonymous": "Et ole kirjautunut sisään, joten luomasi asiakirjat vanhenevat {0} päivän päästä. Selaushistorian tyhjentäminen saattaa myös hävittää ne.<br><a href=\"/register/\">Rekisteröidy</a> (henkilötietoja ei tarvita) tai <a href=\"/login/\">kirjaudu sisään</a> säilyttääksesi luomasi asiakirjat pysyvästi CryptDrivessa. <a href=\"#docs\">Lue lisää rekisteröitymisestä ja käyttäjätileistä</a>.",
     "fm_info_sharedFolder": "Tämä on jaettu kansio. Et ole kirjautunut sisään, joten voit käyttää sitä ainoastaan vain luku-tilassa.<br><a href=\"/register/\">Rekisteröidy</a> tai <a href=\"/login/\">kirjaudu sisään</a> tuodaksesi kansion omaan CryptDriveesi ja muokataksesi sen sisältöä.",
     "fm_info_owned": "Omistat tässä näytetyt padit. Se tarkoittaa, että voit halutessasi poistaa ne palvelimelta. Jos teet niin, muut käyttäjät eivät voi enää käyttää niitä.",
     "fm_error_cantPin": "Sisäinen palvelinvirhe. Ole hyvä ja lataa sivu uudelleen.",
@@ -503,7 +504,7 @@
     "mdToolbar_code": "Koodi",
     "mdToolbar_toc": "Sisällysluettelo",
     "home_host": "Tämä on itsenäinen yhteisön ylläpitämä Cryptpad-instanssi.",
-    "main_catch_phrase": "Avoimen lähdekoodin salattu kollaboraatioalusta",
+    "main_catch_phrase": "Kollaboraatioalusta<br>päästä päähän -salattu ja avoin lähdekoodi",
     "footer_aboutUs": "Tietoa meistä",
     "about": "Tietoa meistä",
     "privacy": "Yksityisyys",
@@ -963,9 +964,9 @@
     "properties_addPassword": "Lisää salasana",
     "password_submit": "Lähetä",
     "password_placeholder": "Kirjoita salasana tähän...",
-    "password_error": "Padia ei löytynyt!<br>Tämä virhe voi johtua kahdesta syystä: joko salasana on virheellinen tai padi on poistettu palvelimelta.",
-    "password_info": "Padia, jota yrität avata ei ole enää olemassa tai se on suojattu salasanalla. Syötä oikea salasana käyttääksesi padin sisältöä.",
-    "creation_newPadModalDescription": "Napsauta padityyppiä luodaksesi sellainen. Voit myös painaa <b>Tab</b>-näppäintä valitaksesi tyypin ja <b>Enter</b> vahvistaaksesi valinnan.",
+    "password_error": "Asiakirjaa ei löytynyt<br>Tämä virhe voi johtua kahdesta syystä: joko salasana on virheellinen tai asiakirja on poistettu palvelimelta.",
+    "password_info": "Asiakirja, jota yrität avata ei ole enää olemassa tai se on suojattu uudella salasanalla. Syötä oikea salasana käyttääksesi asiakirjan sisältöä.",
+    "creation_newPadModalDescription": "Napsauta haluamaasi asiakirjatyyppiä luodaksesi sellaisen. Voit myös painaa <b>Tab</b>-näppäintä valitaksesi tyypin ja <b>Enter</b>-näppäintä vahvistaaksesi valinnan.",
     "creation_passwordValue": "Salasana",
     "creation_expiration": "Vanhenemispäivämäärä",
     "creation_noOwner": "Ei omistajaa",
@@ -984,7 +985,7 @@
     "creation_404": "Tätä padia ei ole enää olemassa. Käytä seuraavaa lomaketta uuden padin luontiin.",
     "feedback_optout": "Jos haluat jättäytyä pois tästä toiminnallisuudesta, voit tehdä sen <a>Käyttäjäasetukset</a>-sivulta löytyvän käyttäjäpalautevalintaruudun avulla.",
     "feedback_privacy": "Välitämme yksityisyydestäsi, ja haluamme samalla tehdä CryptPadista mahdollisimman helppokäyttöisen. Käytämme tätä tiedostoa selvittääksemme, mitkä käyttöliittymätoiminnot ovat tärkeitä käyttäjillemme, pyytämällä sitä tehdyn toiminnon kertovan parametrin yhteydessä.",
-    "feedback_about": "Jos luet tätä, haluat todennäköisesti tietää, miksi CryptPad lähettää pyyntöjä web-sivuille tiettyjen toimintojen yhteydessä",
+    "feedback_about": "Jos luet tätä, haluat todennäköisesti tietää, miksi CryptPad lähettää pyyntöjä web-sivuille tiettyjen toimintojen yhteydessä.",
     "settings_cat_kanban": "Kanban",
     "kanban_body": "Sisältö",
     "logoutEverywhere": "Kirjaudu ulos kaikkialta",
@@ -1102,5 +1103,12 @@
     "admin_archiveTitle": "Arkistoi asiakirjoja",
     "errorPopupBlocked": "CryptPadin täytyy pystyä avaamaan uusia välilehtiä toimiakseen. Ole hyvä ja salli ponnahdusikkunat selaimesi osoitekentästä. Ponnahdusikkunoita ei koskaan käytetä mainostamiseen.",
     "unableToDisplay": "Asiakirjan näyttäminen epäonnistui. Paina Esc-näppäintä ladataksesi sivun uudelleen. Jos ongelma ei ratkea, ota yhteyttä käyttäjätukeen.",
-    "documentID": "Asiakirjan tunniste"
+    "documentID": "Asiakirjan tunniste",
+    "whatis_collaboration_info": "<p>CryptPad on rakennettu yhteistyötä varten. Se synkronoi asiakirjoihin tehdyt muutokset reaaliajassa. Kaikki data on salattua, eivätkä palvelu ja sen ylläpitäjät pääse tarkkailemaan asiakirjojen muokkausta tai niihin tallennettua sisältöä.</p>",
+    "register_warning_note": "CryptPadin salausrakenteesta johtuen palvelun ylläpitäjät eivät voi palauttaa tietojasi, jos unohdat käyttäjätunnuksesi ja/tai salasanasi. Säilytäthän ne turvallisessa paikassa.",
+    "register_notes": "<ul class=\"cp-notes-list\"><li>Salasanasi on avain, joka salaa kaikki asiakirjasti.<span class=\"red\">Jos kadotat salasanasi, emme voi palauttaa tietojasi.</span></li><li>Jos käytät jaettua tietokonetta,<span class=\"red\">muista kirjautua ulos</span> lopettaessasi. Pelkkä selainikkunan sulkeminen jättää käyttäjätunnuksesi haavoittuvaiseksi.</li><li>Säilyttääksesi kirjautumattomana tekemäsi tai tallentamasi asiakirjat, valitse \"Tuo asiakirjat anonyymistä istunnosta\".</li></ul>",
+    "home_support": "<p>Kehitystiimi ei hyödy käyttäjädatasta millään tavalla. Tämä kuuluu näkemykseemme yksityisyyttä kunnioittavista verkkopalveluista. Toisin kuin itseään \"ilmaisina\" mainostavat verkkoalustat, jotka monetisoivat käyttäjädataa, haluamme rakentaa kestävän käyttäjien omaan tahtoon perustuvan rahoitusmallin.</p><p>Voit tukea projektia kertaluonteisella tai jatkuvalla lahjoituksella Open Collective -palvelussamme. Budjettimme on läpinäkyvä ja päivityksiä siihen julkaistaan säännöllisesti. Voit osallistua myös <a>muilla kuin rahallisilla tavoilla</a>.</p>",
+    "settings_padOpenLinkLabel": "Ota käyttöön suora linkkien avaus",
+    "settings_padOpenLinkHint": "Tämä asetus avaa upotetut linkit suoraan napsauttamalla ilman esikatseluikkunaa",
+    "settings_padOpenLinkTitle": "Avaa linkit ensimmäisellä napsautuksella"
 }
diff --git a/www/common/translations/messages.fr.json b/www/common/translations/messages.fr.json
index 1e29c418a..5974401e7 100644
--- a/www/common/translations/messages.fr.json
+++ b/www/common/translations/messages.fr.json
@@ -13,7 +13,8 @@
         "todo": "Todo",
         "contacts": "Contacts",
         "sheet": "Tableur",
-        "teams": "Équipes"
+        "teams": "Équipes",
+        "form": "Formulaire"
     },
     "button_newpad": "Nouveau document texte",
     "button_newcode": "Nouvelle page de code",
@@ -282,7 +283,7 @@
     "fm_info_template": "Contient tous les fichiers que vous avez sauvés en tant que modèle afin de les réutiliser lors de la création d'un nouveau pad.",
     "fm_info_recent": "Ces pads ont été récemment ouverts ou modifiés par vous ou vos collaborateurs.",
     "fm_info_trash": "Vider la corbeille permet de libérer de l'espace dans votre CryptDrive.",
-    "fm_info_anonymous": "Vous n'êtes pas connecté, ces documents seront donc supprimés après {0} jours. Nettoyer l'historique de votre navigateur peut les faire disparaître.<br><a href=\"/register/\">Enregistrez vous</a> (aucune information personelle requise) ou <a href=\"/login/\">Connectez vous</a> pour les stocker de manière permanente dans votre drive. <a href=\"https://docs.cryptpad.fr/fr/user_guide/user_account.html#account-types\" target=\"_blank\">En lire plus sur les comptes utilisateurs</a>.",
+    "fm_info_anonymous": "Vous n'êtes pas connecté, ces documents seront donc supprimés après {0} jours. Nettoyer l'historique de votre navigateur peut les faire disparaître.<br><a href=\"/register/\">Enregistrez vous</a> (aucune information personelle requise) ou <a href=\"/login/\">Connectez vous</a> pour les stocker de manière permanente dans votre drive. <a href=\"#docs\">En lire plus sur les comptes utilisateurs</a>.",
     "fm_info_sharedFolder": "Voici le contenu d'un dossier partagé. Il n'est accessible qu'en lecture seule car vous n'êtes pas connecté.<br><a href=\"/register/\">Inscrivez-vous</a> ou <a href=\"/login/\">connectez-vous</a> pour pouvoir l'importer dans votre CryptDrive et le modifier.",
     "fm_info_owned": "Vous êtes propriétaire des pads affichés dans cette catégorie. Cela signifie que vous pouvez choisir de les supprimer définitivement du serveur à n'importe quel moment. Ils seront alors inaccessibles pour tous les autres utilisateurs.",
     "fm_error_cantPin": "Erreur interne du serveur. Veuillez recharger la page et essayer de nouveau.",
@@ -1230,5 +1231,153 @@
     "mediatag_defaultImageName": "image",
     "register_registrationIsClosed": "Les inscriptions sont fermées.",
     "oo_conversionSupport": "Votre navigateur ne gère pas la conversion vers et depuis les formats Microsoft Office. Il est recommandé d'utiliser une version récente de Firefox ou Chrome.",
-    "oo_importBin": "Cliquez sur OK pour importer au format .bin interne à CryptPad."
+    "oo_importBin": "Cliquez sur OK pour importer au format .bin interne à CryptPad.",
+    "admin_emailButton": "Valider",
+    "admin_supportPrivButton": "Afficher la clé",
+    "admin_supportPrivHint": "Afficher la clé privée et la transmettre aux autres administrateurs pour leur permettre de consulter les tickets de support. Un formulaire permettant de saisir cette clé est affiché dans leur espace d'administration.",
+    "admin_supportInitGenerate": "Créer les clés",
+    "admin_supportPrivTitle": "Clé privée de la messagerie de support",
+    "admin_emailHint": "Entrez ici l'adresse email de contact pour votre instance",
+    "admin_emailTitle": "Email de l'administrateur",
+    "form_poll_hint": "<i></i> : Oui, <i></i> : Non, <i></i> : Acceptable",
+    "fc_open_formro": "Ouvrir (en tant que participant)",
+    "admin_provideAggregateStatisticsHint": "Vous pouvez choisir de fournir des mesures d'utilisation supplémentaires aux développeurs, telles que le nombre approximatif d'utilisateurs enregistrés et quotidiens de votre instance.",
+    "admin_provideAggregateStatisticsLabel": "Fournir des statistiques agrégées",
+    "admin_blockDailyCheckLabel": "Désactiver la télémétrie du serveur",
+    "admin_provideAggregateStatisticsTitle": "Agrégation statistique",
+    "admin_blockDailyCheckHint": "Les instances CryptPad envoient un message au serveur de l'équipe de développement lors de leur installation et une fois par jour par la suite. Cela permet à l'équipe de savoir quelles versions du logiciel sont en circulation. Vous pouvez refuser cette collecte de données ci-dessous. Le contenu de ces messages peut être examiné dans le log du serveur d'application.",
+    "admin_blockDailyCheckTitle": "Télémétrie du serveur",
+    "admin_removeDonateButtonLabel": "Ne pas promouvoir la campagnes de financement",
+    "admin_removeDonateButtonHint": "Le développement de CryptPad est partiellement financé par des bourses et des dons publics. Faire de la publicité pour notre campagne de financement sur votre instance aide l'équipe de développement à continuer son travail. Vous pouvez désactiver ces notifications.",
+    "admin_removeDonateButtonTitle": "Participation au financement participatif",
+    "admin_consentToContactLabel": "Je consens",
+    "admin_listMyInstanceTitle": "Lister mon instance dans les répertoires publics",
+    "admin_listMyInstanceHint": "Si votre instance est destinée à un usage public, vous pouvez la répertorier dans les listes d'instances. La télémétrie du serveur doit être activée pour que cela ait un effet.",
+    "admin_listMyInstanceLabel": "Lister cette instance",
+    "admin_consentToContactHint": "La télémétrie du serveur comprend l'addresse email de l'administrateur afin que l'équipe de développement puissent vous informer de problèmes sérieux avec le logiciel ou votre configuration. Elle ne sera jamais partagée, vendue ou utilisée à des fins de marketing. Consentez à être contacté si vous souhaitez être informé des problèmes critiques concernant votre serveur.",
+    "admin_consentToContactTitle": "Consentement à la prise de contact",
+    "admin_checkupButton": "Exécuter le diagnostic",
+    "admin_updateAvailableTitle": "Nouvelles versions",
+    "admin_updateAvailableHint": "Une nouvelle version de Cryptpad est disponible",
+    "admin_checkupHint": "CryptPad est doté d'une page qui diagnostique automatiquement les problèmes de configuration courants et suggère comment les corriger si nécessaire.",
+    "admin_checkupTitle": "Valider la configuration de l'instance",
+    "admin_updateAvailableButton": "Lire les notes de mise à jour",
+    "admin_cat_network": "Réseau",
+    "mdToolbar_embed": "Insérer un fichier",
+    "restrictedLoginPrompt": "Vous n'êtes pas autorisé à accéder à ce document. <a>Connectez-vous</a> si vous pensez que votre compte devrait y avoir accès.",
+    "copyToClipboard": "Copier",
+    "settings_driveRedirect": "Rediriger automatiquement",
+    "settings_driveRedirectHint": "La redirection de la page d'accueil vers le drive lors de la connexion n'est plus automatique. L'ancien comportement peut être activé ci-dessous.",
+    "settings_driveRedirectTitle": "Redirection depuis la page d'accueil",
+    "form_anonymousBox": "Répondre de manière anonyme",
+    "form_page": "Page {0}/{1}",
+    "form_clear": "Effacer",
+    "form_addMultipleHint": "Ajouter plusieurs dates et heures",
+    "form_addMultiple": "Tout ajouter",
+    "form_anonymous_blocked": "Les réponses anonymes sont bloquées pour ce formulaire. Merci de vous <a href=\"/login/\">connecter</a> ou de vous <a href=\"/register/\">enregistrer</a> pour répondre.",
+    "form_add_item": "Ajouter un objet",
+    "form_add_option": "Ajouter une option",
+    "form_newItem": "Nouvel objet",
+    "form_newOption": "Nouvelle option",
+    "form_defaultItem": "Objet {0}",
+    "form_defaultOption": "Option {0}",
+    "form_anonymous_off": "Bloquées",
+    "form_anonymous_on": "Autorisées",
+    "form_anonymous": "Réponses anonymes",
+    "form_willClose": "Ce formulaire fermera le {0}",
+    "form_isClosed": "Ce formulaire a été fermé le {0}",
+    "form_isOpen": "Ce formulaire est ouvert",
+    "form_removeEnd": "Annuler la clôture",
+    "form_setEnd": "Date de clôture",
+    "form_open": "Ouvrir",
+    "form_isPrivate": "Les réponses sont privées",
+    "form_isPublic": "Les réponses sont publiques",
+    "form_makePublicWarning": "Êtes-vous sûr de vouloir rendre les réponses à ce formulaire publiques ? Cette opération ne peut pas être annulée.",
+    "form_makePublic": "Publier les réponses",
+    "form_invalidQuestion": "Questions {0}",
+    "form_invalidWarning": "Certaines résponses contiennent des erreurs :",
+    "form_input_ph_url": "https://exemple.fr",
+    "form_input_ph_email": "courriel@exemple.fr",
+    "form_notAnswered": "<b>{0}</b> réponses vides",
+    "form_answerWarning": "Identité non confirmée",
+    "form_answerName": "Réponse de {0} le {1}",
+    "form_backButton": "Retour",
+    "form_viewButton": "Voir",
+    "form_answerAnonymous": "Réponse anonyme le {0}",
+    "form_showSummary": "Voir le résumé",
+    "form_showIndividual": "Voir les réponses individuelles",
+    "form_form": "Formulaire",
+    "form_editor": "Éditeur",
+    "form_results_empty": "Il n'y a pas de réponses",
+    "form_results": "Réponses",
+    "form_answered": "Vous avez déjà répondu à ce formulaire",
+    "form_cantFindAnswers": "Vos réponses à ce formulaire n'ont pas pu être récupérées.",
+    "form_updateWarning": "Mettre à jour avec erreurs",
+    "form_submitWarning": "Envoyer avec erreurs",
+    "form_delete": "Supprimer",
+    "form_sent": "Votre réponse a été envoyée",
+    "form_reset": "Effacer",
+    "form_update": "Mettre à jour",
+    "form_submit": "Envoyer",
+    "form_maxLength": "Limite de caractères : {0}/{1}",
+    "form_maxOptions": "{0} réponse(s) maximum",
+    "form_duplicates": "Les doublons ont été supprimés",
+    "form_description_default": "Votre texte ici",
+    "form_type_page": "Saut de page",
+    "form_type_md": "Description",
+    "form_sort_hint": "Veuillez faire glisser ces éléments par ordre de préférence de 1 à {0}.",
+    "form_type_sort": "Liste ordonnée",
+    "form_type_poll": "Sondage",
+    "form_type_multicheck": "Grille de cases",
+    "form_type_checkbox": "Cases",
+    "form_type_multiradio": "Grille de Choix",
+    "form_type_radio": "Choix",
+    "form_type_textarea": "Paragraphe",
+    "form_type_input": "Texte",
+    "form_default": "Votre question ici ?",
+    "form_text_number": "Nombre",
+    "form_text_email": "Email",
+    "form_text_url": "Lien",
+    "form_text_text": "Texte",
+    "form_textType": "Type de texte",
+    "form_pollYourAnswers": "Vos réponses",
+    "form_pollTotal": "Total",
+    "form_poll_switch": "Inverser les axes",
+    "form_poll_time": "Heure",
+    "form_poll_day": "Jour",
+    "form_poll_text": "Texte",
+    "form_editType": "Type d'option",
+    "form_editMaxLength": "Nombre maximum de caractères",
+    "form_editMax": "Nombre maximum de réponses",
+    "form_editBlock": "Modifier",
+    "form_invalid": "Formulaire invalide",
+    "button_newform": "Nouveau formulaire",
+    "share_formView": "Participant",
+    "share_formAuditor": "Auditeur",
+    "share_formEdit": "Auteur",
+    "admin_purpose_noanswer": "Je préfère ne pas répondre",
+    "admin_purpose_experiment": "Pour tester la plateforme ou développer de nouvelles fonctionnalités",
+    "resources_imageBlocked": "CryptPad a bloqué une image distante",
+    "resources_openInNewTab": "Ouvrir dans un nouvel onglet",
+    "resources_learnWhy": "En savoir plus sur les images bloquées",
+    "admin_instancePurposeTitle": "Usage de l'instance",
+    "admin_purpose_personal": "Usage personnel, famille ou amis",
+    "admin_purpose_org": "Usage associatif",
+    "admin_purpose_education": "Usage éducatif, école ou université",
+    "admin_purpose_public": "Service gratuit ouvert au public",
+    "admin_purpose_business": "Usage en entreprise",
+    "admin_instancePurposeHint": "À quel usage cette instance est-elle destinée ? Votre réponse sera utilisée pour définir la planification de nouvelles fonctionnalités (si votre télémétrie est activée).",
+    "team_leaveOwner": "Veuillez vous rétrograder de votre rôle de propriétaire avant de quitter l'équipe. Notez que les équipes doivent avoir au moins un propriétaire, veuillez en ajouter un autre avant de poursuivre si vous êtes actuellement le seul propriétaire.",
+    "form_exportCSV": "Exporter en CSV",
+    "fm_link_invalid": "URL invalide",
+    "fm_link_warning": "Attention : l'URL dépasse 200 caractères",
+    "form_answerAs": "Répondre en tant que",
+    "form_anonName": "Votre nom",
+    "notification_linkShared": "{0} a partagé un lien avec vous : <b>{1}</b>",
+    "fm_link_name_placeholder": "Nouveau lien",
+    "fm_link_url": "URL",
+    "fm_link_name": "Titre du lien",
+    "fm_link_type": "Lien",
+    "fm_link_new": "Nouveau Lien",
+    "notification_openLink": "Vous avez reçu un lien <b>{0}</b> de {1} :"
 }
diff --git a/www/common/translations/messages.hi.json b/www/common/translations/messages.hi.json
index 2c63c0851..56d0531fc 100644
--- a/www/common/translations/messages.hi.json
+++ b/www/common/translations/messages.hi.json
@@ -1,2 +1,9 @@
 {
+    "type": {
+        "pad": "रिच टेक्स्ट",
+        "code": "कोड",
+        "poll": "मतदान",
+        "kanban": "कानबन"
+    },
+    "main_title": "क्रिप्टपैड: शून्य ज्ञान, सहयोगात्मक रीयल टाइम संपादन"
 }
diff --git a/www/common/translations/messages.id.json b/www/common/translations/messages.id.json
new file mode 100644
index 000000000..a66724a75
--- /dev/null
+++ b/www/common/translations/messages.id.json
@@ -0,0 +1,27 @@
+{
+    "type": {
+        "pad": "Teks kaya",
+        "sheet": "Lembar Kerja",
+        "teams": "Tim",
+        "contacts": "Kontak",
+        "todo": "Tugas",
+        "media": "Media",
+        "file": "Berkas",
+        "whiteboard": "Papan tulis",
+        "drive": "CryptDrive",
+        "slide": "Presentasi",
+        "kanban": "Kanban",
+        "poll": "Pemilihan",
+        "code": "Kode"
+    },
+    "typeError": "Papan ini tidak sesuai dengan aplikasi yang dipilih",
+    "common_connectionLost": "<b>Koneksi Server Terputus</b><br>Kau sekarang di mode baca hingga koneksi kembali.",
+    "button_newsheet": "Lembar Kerja Baru",
+    "button_newkanban": "Kanban Baru",
+    "button_newwhiteboard": "Papan Tulis Baru",
+    "button_newslide": "Presentasi Baru",
+    "button_newpoll": "Pemilihan Baru",
+    "button_newcode": "papan Kode Baru",
+    "button_newpad": "papan Teks Kaya Baru",
+    "main_title": "Cryptpad: Informasi Aman, Kolaborasi Waktu Nyata"
+}
diff --git a/www/common/translations/messages.it.json b/www/common/translations/messages.it.json
index 2910e0ce2..5cade40ab 100644
--- a/www/common/translations/messages.it.json
+++ b/www/common/translations/messages.it.json
@@ -282,7 +282,7 @@
     "fm_info_template": "Contiene tutti i pad salvati come modelli e che puoi riutilizzare per creare nuovi pad.",
     "fm_info_recent": "Questi pad sono stati recentemente aperti o modificati da te o da persone con le quali tu collabori.",
     "fm_info_trash": "Svuota il tuo cestino per liberare spazio nel tuo CryptDrive.",
-    "fm_info_anonymous": "Non hai effettuato l'accesso, quindi i tuoi pad scadranno fra tre mesi (<a href=\"https://blog.cryptpad.fr/2017/05/17/You-gotta-log-in/\" target=\"_blank\">scopri di più</a>). Sono conservati nel tuo browser, quindi cancellando la cronologia potresti farli scomparire.<br><a href=\"/register/\">Registrati</a> o <a href=\"/login/\">Accedi</a> per conservarli permanentemente.<br>",
+    "fm_info_anonymous": "Non hai effettuato l'accesso, quindi i tuoi pad scadranno fra tre mesi. Sono conservati nel tuo browser, quindi cancellando la cronologia potresti farli scomparire.<br><a href=\"/register/\">Registrati</a> o <a href=\"/login/\">Accedi</a> per conservarli permanentemente.<br>",
     "fm_info_sharedFolder": "Questa è una cartella condivisa. Non hai effettuato l'accesso, quindi puoi visualizzarla solo in modalità di sola lettura.<br><a href=\"/register/\">Registrati</a> o <a href=\"/login/\">Accedi</a> per poterla importare nel tuo CryptDrive e per modificarla.",
     "fm_info_owned": "Sei il proprietario dei pad mostrati qui. Questo significa che puoi rimuoverli permanentemente dal server quando lo desideri. Se lo fai, gli altri utenti non potranno più accedervi.",
     "fm_error_cantPin": "Errore interno del server. Ricarica la pagina e prova di nuovo.",
diff --git a/www/common/translations/messages.ja.json b/www/common/translations/messages.ja.json
index 3751f0cbb..84fe9a3ae 100644
--- a/www/common/translations/messages.ja.json
+++ b/www/common/translations/messages.ja.json
@@ -1,7 +1,7 @@
 {
-    "common_connectionLost": "サーバーとの接続が切断しました。\nサーバーと再接続するまで閲覧モードになります。",
+    "common_connectionLost": "<b>サーバーとの接続が切断しました</b><br>再接続するまで閲覧モードになります。",
     "button_newsheet": "新規スプレッドシート",
-    "button_newkanban": "新規看板",
+    "button_newkanban": "新規カンバン",
     "button_newwhiteboard": "新規ホワイトボード",
     "button_newslide": "新規プレゼンテーション",
     "button_newpoll": "新規投票・アンケート",
@@ -10,24 +10,25 @@
     "type": {
         "teams": "チーム",
         "contacts": "連絡先",
-        "todo": "やることリスト",
+        "todo": "タスクリスト",
         "media": "メディア",
         "file": "ファイル",
         "whiteboard": "ホワイトボード",
         "drive": "CryptDrive",
-        "slide": "プレゼン",
-        "kanban": "看板",
+        "slide": "プレゼンテーション",
+        "kanban": "カンバン",
         "poll": "投票",
         "code": "コード",
         "pad": "リッチテキスト",
-        "sheet": "シート"
+        "sheet": "スプレッドシート",
+        "form": "フォーム"
     },
-    "main_title": "CryptPad - 安全にリアルタイム編集可能なコラボレーションツール",
+    "main_title": "CryptPad - 安全にリアルタイムで編集可能なコラボレーションツール",
     "support_formButton": "送信",
     "support_formMessage": "メッセージを入力…",
     "support_formContentError": "エラー：内容が空です",
     "support_formTitleError": "エラー：件名が空です",
-    "support_formTitle": "チケットの件名",
+    "support_formTitle": "新しいチケット",
     "support_cat_new": "新しいチケット",
     "support_answer": "返信",
     "support_remove": "チケットを削除",
@@ -59,21 +60,21 @@
     "fm_folder": "フォルダ",
     "fm_folderName": "フォルダ名",
     "fm_fileName": "ファイル名",
-    "crowdfunding_button2": "CryptPad を助ける",
+    "crowdfunding_button2": "CryptPadを支援",
     "fm_padIsOwned": "あなたはこのパッドの所有者です",
-    "creation_expiration": "有効期限",
-    "owner_removeText": "所有者",
-    "creation_owners": "所有者",
+    "creation_expiration": "有効期限を設定",
+    "owner_removeText": "オーナー",
+    "creation_owners": "オーナー",
     "download_mt_button": "ダウンロード",
     "fc_rename": "名前を変更",
-    "forgotten": "ごみ箱へ移動",
+    "forgotten": "ごみ箱へ移動しました",
     "filePicker_close": "閉じる",
     "upload_size": "容量",
     "propertiesButton": "プロパティ",
     "fm_creation": "作成日時",
     "fm_lastAccess": "最終アクセス日時",
     "fm_type": "種類",
-    "team_inviteLinkLoading": "あなたのリンクを生成中",
+    "team_inviteLinkLoading": "リンクを生成しています",
     "download_step1": "ダウンロード中",
     "loading": "読み込み中...",
     "fm_searchPlaceholder": "検索...",
@@ -100,7 +101,7 @@
     "settings_changePasswordNew": "新しいパスワード",
     "settings_changePasswordCurrent": "現在のパスワード",
     "settings_changePasswordButton": "パスワードを変更",
-    "settings_changePasswordHint": "アカウントのパスワードを変更します。「現在のパスワード」と、「新しいパスワード」および「新しいパスワードの確認」を入力してください。<br><b>あなたがパスワードを忘れた場合、パスワードをリセットする方法はありません。細心の注意を払って、パスワードを安全に管理してください。</b>",
+    "settings_changePasswordHint": "アカウントのパスワードを変更します。「現在のパスワード」と、「新しいパスワード」および「新しいパスワードの確認」を入力してください。<br><b>パスワードを忘れた場合、再設定する方法はありません。細心の注意を払って、パスワードを安全に管理してください。</b>",
     "settings_changePasswordTitle": "パスワードの変更",
     "languageButton": "言語",
     "language": "言語",
@@ -110,7 +111,7 @@
     "settings_backupCategory": "バックアップ",
     "settings_backup": "バックアップ",
     "settings_title": "設定",
-    "settings_cat_subscription": "サブスクリプション",
+    "settings_cat_subscription": "定額利用",
     "settings_cat_drive": "CryptDrive",
     "settings_cat_account": "アカウント",
     "settings_save": "保存",
@@ -119,28 +120,28 @@
     "profile_addLink": "あなたのウェブサイトへのリンクを追加",
     "shareSuccess": "リンクをクリップボードにコピーしました",
     "shareButton": "共有",
-    "login_hashing": "パスワードをハッシュ化しています、この処理には時間がかかる場合があります。",
+    "login_hashing": "パスワードをハッシュ化しています。この処理には時間がかかる場合があります。",
     "login_invalPass": "パスワードを入力してください",
     "login_invalUser": "ユーザー名を入力してください",
-    "register_importRecent": "匿名セッション中のパッドをインポート",
+    "register_importRecent": "匿名セッションのドキュメントをインポート",
     "importButton": "インポート",
-    "main_catch_phrase": "コラボレーションスイート<br>暗号化されかつオープンソース",
-    "tos_3rdparties": "私たちは、法律で義務付けられている場合を除き、個別のデータを第三者に提供しません。",
+    "main_catch_phrase": "コラボレーションスイート<br>端末間暗号化とオープンソース",
+    "tos_3rdparties": "私たちは、法令に基づく場合を除き、個人情報を第三者に提供しません。",
     "tos_logs": "あなたのブラウザからサーバーに送信されたメタデータは、サービスを維持するために記録される場合があります。",
     "tos_availability": "私たちはこのサービスがあなたの役に立つことを願っていますが、可用性や性能は保証できません。定期的にデータをエクスポートしてください。",
     "tos_legal": "悪意ある行為、乱用する行為、または何らかの違法な行為を行わないでください。",
-    "tos_title": "CryptPad サービス利用規約",
-    "whatis_title": "CryptPad とは？",
-    "topbar_whatIsCryptpad": "CryptPad とは何か",
+    "tos_title": "CryptPadサービス利用規約",
+    "whatis_title": "CryptPadとは？",
+    "topbar_whatIsCryptpad": "CryptPadとは何か",
     "footer_tos": "利用規約",
     "footer_donate": "寄付",
     "footer_legal": "法的情報",
     "footer_aboutUs": "私たちについて",
     "pricing": "料金",
     "contact": "連絡先",
-    "privacy": "プライバシー",
+    "privacy": "プライバシーポリシー",
     "blog": "ブログ",
-    "register_header": "CryptPad へようこそ",
+    "register_header": "登録",
     "login_confirm": "パスワードの確認",
     "login_register": "新規登録",
     "login_username": "ユーザー名",
@@ -149,8 +150,8 @@
     "logoutButton": "ログアウト",
     "login_login": "ログイン",
     "autostore_hide": "保存しない",
-    "autostore_store": "保存する",
-    "autostore_notstored": "この {0} は、あなたの CryptDrive に保存されていません。今すぐ保存しますか？",
+    "autostore_store": "保存",
+    "autostore_notstored": "この{0}はあなたのCryptDriveに保存されていません。今すぐ保存しますか？",
     "user_displayName": "表示名",
     "exportButton": "エクスポート",
     "user_rename": "表示名を変更",
@@ -158,36 +159,36 @@
     "saved": "保存しました",
     "error": "エラー",
     "deleted": "削除しました",
-    "profile_editDescription": "説明を編集",
-    "profile_addDescription": "説明を追加",
+    "profile_editDescription": "説明文を編集",
+    "profile_addDescription": "説明文を追加",
     "profileButton": "プロフィール",
     "profile_avatar": "アバター",
     "profile_upload": " 新しいアバターをアップロード",
     "teams_table_generic_edit": "編集: フォルダとパッドの作成、変更、削除が可能。",
     "teams_table_generic_view": "表示: フォルダとパッドへのアクセス（閲覧のみ）。",
-    "teams_table_generic_own": "チームの管理: チーム名とチームアバターの変更、所有者の追加または削除、チームのサブスクリプションの変更、チームの削除が可能。",
+    "teams_table_generic_own": "チームの管理: チーム名とチームのアバターの変更、オーナーの追加または削除、チームの定額利用に関する変更、チームの削除が可能。",
     "teams_table_owners": "チームの管理",
     "teams_table_generic_admin": "メンバーの管理: メンバーの招待および取り消し、メンバーに管理者までの権限の付与が可能。",
     "teams_table_admins": "メンバーの管理",
     "teams_table_generic": "権限一覧",
     "teams_table": "権限",
-    "contacts_fetchHistory": "古い履歴を取得する",
-    "contacts_warning": "ここに入力したすべてのものは永続的であり、このパッドの現在および将来のすべてのユーザーが利用できます。機密情報の入力は推奨されません！",
-    "contacts_typeHere": "メッセージを入力...",
+    "contacts_fetchHistory": "古い履歴を取得",
+    "contacts_warning": "ここに入力した全てのメッセージは永続的であり、このパッドの現在および将来の全てのユーザーが確認できます。機密情報の入力には注意してください！",
+    "contacts_typeHere": "ここにメッセージを入力...",
     "team_cat_drive": "ドライブ",
     "team_cat_chat": "チャット",
     "team_cat_members": "メンバー",
     "team_cat_admin": "管理",
     "adminPage": "管理",
     "team_deleteButton": "削除",
-    "team_deleteHint": "チーム自体とチームが所有しているすべてのドキュメントを削除します。",
+    "team_deleteHint": "チームと、チームが所有している全てのドキュメントを削除します。",
     "team_deleteTitle": "チームの削除",
     "team_avatarHint": "容量 500KB 以下 (png 、jpg 、jpeg 、gif)",
-    "team_avatarTitle": "チームアバター",
+    "team_avatarTitle": "チームのアバター",
     "team_nameHint": "チームの名前を設定します",
     "team_nameTitle": "チーム名",
     "team_members": "メンバー",
-    "team_owner": "所有者",
+    "team_owner": "オーナー",
     "team_admins": "管理者",
     "viewers": "閲覧者",
     "contacts_padTitle": "チャット",
@@ -220,65 +221,65 @@
     "support_languagesPreamble": "サポートチームは次の言語に対応可能です:",
     "support_listHint": "管理者に送信されたチケットとその回答のリストは以下の通りです。閉じたチケットを再開することはできませんが、新しいチケットを作成することはできます。閉じたチケットは非表示にできます。",
     "support_listTitle": "サポートチケット",
-    "settings_padNotifCheckbox": "コメント通知を無効化",
+    "settings_padNotifCheckbox": "コメント通知を無効にする",
     "settings_padNotifTitle": "コメント通知",
     "notifications_dismissAll": "全て確認済みにする",
     "notifications_cat_archived": "履歴",
     "notifications_cat_friends": "連絡先リクエスト",
     "notifications_dismiss": "確認済みにする",
     "settings_autostoreMaybe": "手動 (確認しない)",
-    "settings_autostoreNo": "手動 (常に確認する)",
-    "settings_autostoreHint": "<b>自動</b> あなたがアクセスしたすべてのパッドを、あなたの CryptDrive に保存します。<br><b>手動 (常に確認する)</b> まだ保存していないパッドにアクセスした場合に、あなたの CryptDrive に保存するかどうか尋ねます。<br><b>手動 (確認しない)</b> アクセス先のパッドがあなたの CryptDrive に自動的に保存されなくなります。保存オプションは表示されなくなります。",
+    "settings_autostoreNo": "手動（常に確認）",
+    "settings_autostoreHint": "<b>自動</b> アクセスした全てのパッドをCryptDriveに保存します。<br><b>手動（常に確認）</b> 保存していないパッドにアクセスした際、CryptDriveに保存するかどうかを確認します。<br><b>手動（確認しない）</b> アクセス先のパッドはCryptDriveに自動で保存されません。保存オプションは表示されません。",
     "settings_userFeedback": "ユーザーフィードバックを有効にする",
     "settings_userFeedbackHint2": "あなたのパッドのコンテンツがサーバーと共有されることはありません。",
-    "settings_userFeedbackHint1": "CryptPad は、あなたの経験を向上させる方法を知るために、サーバーにいくつかの非常に基本的なフィードバックを提供します。 ",
+    "settings_userFeedbackHint1": "CryptPadは、ユーザーエクスペリエンスの向上のため、いくつかの非常に基本的なフィードバックを、サーバーに提供します。 ",
     "settings_userFeedbackTitle": "フィードバック",
     "settings_autostoreYes": "自動",
-    "settings_importConfirm": "このブラウザで最近使用したパッドを、あなたのユーザーアカウントの CryptDrive にインポートしますか？",
+    "settings_importConfirm": "このブラウザで最近利用したパッドを、あなたのユーザーアカウントのCryptDriveにインポートしますか？",
     "settings_importDone": "インポートが完了しました",
     "settings_import": "インポート",
-    "settings_importTitle": "このブラウザでの最近のパッドをあなたの CryptDrive にインポートします",
+    "settings_importTitle": "このブラウザでの最近のパッドをあなたのCryptDriveにインポートします",
     "settings_trimHistoryHint": "ドライブと通知の履歴を削除して、ストレージ容量を節約します。これはパッドの履歴には影響しません。パッドの履歴は、プロパティダイアログから削除できます。",
     "trimHistory_currentSize": "現在の履歴容量: <b>{0}</b>",
     "support_cat_other": "その他",
-    "user_about": "CryptPad について",
+    "user_about": "CryptPadについて",
     "fc_delete": "ごみ箱へ移動",
     "fc_remove": "削除",
     "fc_restore": "復元",
-    "fc_delete_owned": "完全削除",
+    "fc_delete_owned": "破棄",
     "creation_create": "作成",
-    "creation_password": "パスワードの追加",
+    "creation_password": "パスワード\n",
     "creation_expireMonths": "か月",
     "creation_expireDays": "日",
     "creation_expireHours": "時間",
     "creation_expireFalse": "無制限",
     "pad_wordCount": "単語数: {0}",
     "teams_table_role": "権限",
-    "templateSaved": "テンプレートを保存しました",
+    "templateSaved": "テンプレートを保存しました！",
     "saveTemplateButton": "テンプレートとして保存",
     "fm_rootName": "ドキュメント",
     "team_listTitle": "あなたのチーム",
     "team_createName": "チーム名",
-    "features_f_devices_note": "ユーザーアカウントでどこからでも CryptDrive にアクセスできます",
+    "features_f_devices_note": "ユーザーアカウントでどこからでもCryptDriveにアクセスできます",
     "features_f_devices": "全てのデバイスであなたのパッドを利用",
     "features_f_cryptdrive1_note": "フォルダ、共有フォルダ、テンプレート、タグ",
-    "features_f_cryptdrive1": "CryptDrive への完全なアクセス",
-    "features_f_anon_note": "匿名ユーザーが利用可能な全機能を利用できます",
+    "features_f_cryptdrive1": "CryptDriveの全機能",
+    "features_f_anon_note": "追加機能あり",
     "features_f_anon": "匿名ユーザーの全機能",
-    "features_f_storage0_note": "作成されたパッドは、3か月以上使用されないと削除される可能性があります",
+    "features_f_storage0_note": "ドキュメントは{0}日以上利用されないと削除されます",
     "features_f_storage0": "一時的な保存",
-    "features_f_cryptdrive0_note": "後で開けるようにブラウザにアクセスしたパッドを保存する機能",
-    "features_f_cryptdrive0": "CryptDrive への限定的なアクセス",
-    "features_f_file0_note": "他のユーザーが共有したファイルを表示およびダウンロードできます",
-    "features_f_file0": "ファイルを開く",
+    "features_f_cryptdrive0_note": "アクセスしたパッドをブラウザに保存して、後で開くことができます",
+    "features_f_cryptdrive0": "CryptDriveへの限定的なアクセス",
+    "features_f_file0_note": "他のユーザーが共有したドキュメントを表示およびダウンロードできます",
+    "features_f_file0": "ドキュメントを開く",
     "features_f_core_note": "編集、インポートとエクスポート、履歴、ユーザーリスト、チャット",
-    "features_f_core": "アプリケーションの一般的な機能",
-    "features_f_apps": "主なアプリケーションへのアクセス",
-    "features_premium": "プレミアムユーザー",
-    "features_registered": "登録ユーザー",
-    "features_title": "機能の比較",
-    "features_anon": "匿名ユーザー",
-    "register_whyRegister": "登録するとどの様な利点がありますか？",
+    "features_f_core": "一般的な機能",
+    "features_f_apps": "全アプリケーションへのアクセス",
+    "features_premium": "プレミアム",
+    "features_registered": "登録済",
+    "features_title": "機能",
+    "features_anon": "未登録",
+    "register_whyRegister": "登録するメリットをご紹介します",
     "historyText": "履歴",
     "help_button": "ヘルプ",
     "show_help_button": "ヘルプを表示",
@@ -287,63 +288,63 @@
     "okButton": "OK (enter)",
     "mustLogin": "このページにアクセスするにはログインする必要があります",
     "fm_noResult": "見つかりませんでした",
-    "fm_info_trash": "ごみ箱を空にすると、あなたの CryptDrive の使用可能容量を増やせます。",
+    "fm_info_trash": "ごみ箱を空にするとCryptDriveの使用可能容量を増やせます。",
     "features_f_file1": "ファイルのアップロードと共有",
-    "features_f_social_note": "プロフィールの作成、アバターの使用、連絡先とのチャット",
-    "features_f_social": "特別なアプリケーション",
-    "tos_e2ee": "CryptPad のコンテンツは、パッドのフラグメント識別子を推測または取得できる人物なら誰でも閲覧や編集が行えます。エンドツーエンド暗号化(E2EE)を採用したメッセンジャーサービスなどを使用してリンクを共有し、リンク漏洩が発生しないよう対策を行ってください。",
+    "features_f_social_note": "追加した連絡先との安全なコラボレーション、プロフィールの作成、きめ細かいアクセス権のコントロール",
+    "features_f_social": "ソーシャル機能",
+    "tos_e2ee": "CryptPadのコンテンツは、パッドのフラグメント識別子を推測または取得できる人物なら誰でも閲覧や編集が行えます。エンドツーエンド暗号化（E2EE）を採用したメッセンジャーサービスなどを使用してリンクを共有し、リンクの漏洩が発生しないよう対策を行ってください。リンクが漏洩した際に、責任を負うことはできません。",
     "contact_chat": "チャット",
     "contact_bug": "バグの報告",
     "footer_product": "製品",
-    "features_f_subscribe": "プレミアムプランに登録",
+    "features_f_subscribe": "定額利用を申し込む",
     "features_pricing": "月額 {0}€ ～ {2}€",
     "features_emailRequired": "メールアドレスが必要です",
-    "features_f_subscribe_note": "まず CryptPad にログインする必要があります",
-    "features_f_supporter": "プライバシーの支援者になる",
-    "features_f_supporter_note": "プライバシーを保護するソフトウェアが標準であることを世界に示すのを手伝うことができます",
-    "features_f_support_note": "チームプランには電子メールによる高度なサポートが付属します",
+    "features_f_subscribe_note": "定額利用の登録には、アカウントの登録が必要です",
+    "features_f_supporter": "プライバシーを支援",
+    "features_f_supporter_note": "CryptPadが財政的に持続可能になること、また、ユーザーが積極的に資金を提供するプライバシー強化ソフトウェアが標準でなければならないことを示す手助けをする",
+    "features_f_support_note": "電子メールとチケットシステムで、管理チームが優先対応",
     "features_f_support": "優先的なサポート",
-    "features_f_storage2_note": "選択したプランに応じて 5GB から 50GB までの追加ストレージ容量が利用可能です",
+    "features_f_storage2_note": "プランに応じて 5GB から 50GB までの追加ストレージ容量が利用でき、ファイルのアップロードの最大容量（{0}MB）を増加",
     "features_f_storage2": "追加のストレージ容量",
-    "features_f_reg_note": "その上で CryptPad の開発者を支援できます",
+    "features_f_reg_note": "追加のメリット付き",
     "features_f_reg": "登録ユーザーの全機能",
     "homePage": "ホームページ",
     "features_noData": "登録に個人情報は必要ありません",
     "features_f_register": "無料登録",
-    "features_f_storage1_note": "CryptDrive に保存されたパッドが有効期限切れで削除されることはありません",
-    "features_f_storage1": "永続的ストレージ (50MB)",
-    "oo_sheetMigration_complete": "新しいバージョンが利用可能です。「OK」を押して再読み込みしてください。",
-    "oo_sheetMigration_loading": "あなたのスプレッドシートを最新バージョンにアップグレードしています",
+    "features_f_storage1_note": "CryptDriveに保存したドキュメントは、有効期限切れで削除されることはありません",
+    "features_f_storage1": "個人用ストレージ（{0}）",
+    "oo_sheetMigration_complete": "新しいバージョンが利用可能です。OKを押して再読み込みしてください。",
+    "oo_sheetMigration_loading": "あなたのスプレッドシートを最新バージョンにアップグレードしています。1分程度お待ちください。",
     "settings_ownDriveButton": "アカウントをアップグレード",
-    "features_f_file1_note": "連絡先とファイルを共有したり、パッドを埋め込む",
-    "crowdfunding_button": "CryptPad を支援",
+    "features_f_file1_note": "CryptDriveに画像ファイル、PDF、動画などを保存できます。保存したファイルは、連絡先と共有したり、ドキュメントに埋め込んだりできます。（最大容量は{0}MB）",
+    "crowdfunding_button": "CryptPadを支援",
     "contacts_removeHistoryTitle": "チャット履歴を削除",
     "properties_passwordSuccessFile": "パスワードは正常に変更されました。",
     "drive_sfPasswordError": "誤ったパスワードです",
     "team_title": "チーム: {0}",
-    "password_error": "パッドが存在しません！<br>このエラーは「誤ったパスワードが入力された」場合、または「パッドがサーバーから削除された」場合に発生します。",
+    "password_error": "ドキュメントが存在しません！<br>このエラーは、誤ったパスワードが入力された場合、またはドキュメントがサーバーから破棄された場合に発生します。",
     "password_error_seed": "パッドが存在しません！<br>このエラーは「パスワードが追加・変更された」場合、または「パッドがサーバーから削除された」場合に発生します。",
     "password_submit": "送信",
     "password_placeholder": "パスワードを入力...",
-    "password_info": "開こうとしているパッドが存在しないか、パスワードで保護されています。コンテンツにアクセスするには、正しいパスワードを入力してください。",
+    "password_info": "開こうとしているドキュメントが存在しないか、新しいパスワードで保護されています。コンテンツにアクセスするには、正しいパスワードを入力してください。",
     "properties_confirmNew": "パスワードを追加すると、このパッドの URL が変更され、履歴が削除されます。パスワードを知らないユーザーは、このパッドへアクセスできなくなります。続行してよろしいですか？",
     "properties_changePassword": "パスワードの変更",
-    "properties_addPassword": "パスワードの追加",
+    "properties_addPassword": "パスワードを設定",
     "history_close": "閉じる",
     "history_restore": "復元",
-    "fm_emptyTrashOwned": "ごみ箱に、あなたが所有しているドキュメントが入っています。あなたのドライブからのみ<b>削除</b>するか、すべてのユーザーから<b>完全削除</b>するかを選択できます。",
+    "fm_emptyTrashOwned": "ごみ箱に、あなたの所有するドキュメントが入っています。あなたのドライブからのみ<b>削除</b>するか、全てのユーザーから<b>破棄</b>するかを選択できます。",
     "access_destroyPad": "このドキュメントまたはフォルダを完全に削除する",
     "accessButton": "アクセス",
     "access_allow": "リスト",
     "makeACopy": "コピーを作成",
     "trimHistory_noHistory": "削除可能な履歴がありません",
-    "areYouSure": "クリックして実行",
-    "settings_safeLinksCheckbox": "安全なリンクを有効にする",
-    "settings_safeLinksTitle": "安全なリンク",
-    "settings_safeLinksHint": "CryptPad では、あなたのパッドを解読するための鍵がリンクに含まれています。これは、あなたのブラウザの閲覧履歴にアクセスできる人が、潜在的にあなたの CryptPad のデータを解読・閲覧できることを意味します。この「ブラウザの閲覧履歴にアクセスできる人」には、デバイス間で履歴を同期させる侵入的なブラウザ拡張機能やブラウザが含まれます。「安全なリンク」を有効にすると、鍵がブラウザの閲覧履歴に残ったり、アドレスバーに表示されたりするのを可能な限り防ぐことができます。この機能を有効にした上で共有メニューを使用することを強く推奨します。",
-    "settings_autostoreTitle": "CryptDrive へのパッドの保存",
-    "settings_logoutEverywhereConfirm": "すべてのデバイスでログインが取り消されるため、今後利用する際にもう一度ログインするよう求められます。続行しますか？",
-    "settings_logoutEverywhere": "他のすべてのウェブセッションからログアウトします",
+    "areYouSure": "よろしいですか？",
+    "settings_safeLinksCheckbox": "セーフリンクを有効にする",
+    "settings_safeLinksTitle": "セーフリンク",
+    "settings_safeLinksHint": "CryptPadでは、リンクの中にパッドを解読するための鍵が含まれています。ブラウザの閲覧履歴にアクセスできる人は、誰でもCryptPadのデータを閲覧することができます。ここにはデバイス間で履歴を同期するブラウザやその拡張機能も含まれます。「セーフリンク」を有効にすると、鍵がブラウザの閲覧履歴に残ったり、アドレスバーに表示されたりするのを可能な限り防ぐことができます。この機能を有効にして{0}の共有メニューを使用することを強く推奨します。",
+    "settings_autostoreTitle": "CryptDriveへのパッドの保存",
+    "settings_logoutEverywhereConfirm": "全てのデバイスで改めてログインしなければならなくなります。よろしいですか？",
+    "settings_logoutEverywhere": "他の全てのウェブセッションからログアウト",
     "settings_logoutEverywhereTitle": "リモートセッションを閉じる",
     "loading_state_5": "ドキュメントを再構築",
     "loading_state_4": "チームを読み込み",
@@ -368,8 +369,8 @@
     "snapshots_new": "新規スナップショット",
     "snaphot_title": "スナップショット",
     "snapshots_button": "スナップショット",
-    "filePicker_description": "埋め込むファイルを CryptDrive から選択するか、新規にアップロードしてください",
-    "uploadButtonTitle": "CryptDrive に新規ファイルをアップロード",
+    "filePicker_description": "埋め込むファイルをCryptDriveから選択するか、新規にアップロードしてください",
+    "uploadButtonTitle": "CryptDriveに新規ファイルをアップロード",
     "uploadFolderButton": "フォルダをアップロード",
     "uploadButton": "ファイルをアップロード",
     "filePicker_filter": "ファイル名で検索",
@@ -385,11 +386,998 @@
     "previewButtonTitle": "マークダウンのプレビューを表示または非表示にします",
     "whatis_model": "ビジネスモデル",
     "whatis_collaboration": "プライベートコラボレーション",
-    "home_support_title": "CryptPad を支援する",
-    "home_opensource": "CryptPad は、個人やプロなど誰でもホストすることができます。ソースコードは <a>GitHub</a> で確認できます。",
+    "home_support_title": "CryptPadを支援",
+    "home_opensource": "誰でもCryptPadを運営し、個人的または専門的な規模でサービスを提供することができます。ソースコードは<a>GitHub</a>で確認できます。",
     "home_opensource_title": "オープンソース",
     "home_host_title": "このインスタンスについて",
-    "home_privacy_text": "CryptPad は、データをプライベートに保護しながらコラボレーションを可能にするように構築されています。すべてのコンテンツは、あなたのブラウザ上で暗号化および復号されます。つまり、ドキュメント、チャット、およびファイルは、あなたがログインしているセッション以外では読み取れません。サービス管理者でさえ、あなたの情報にアクセスすることはできません。",
-    "home_privacy_title": "プライバシーバイデザイン",
-    "mdToolbar_tutorial": "https://www.markdowntutorial.com/jp/"
+    "home_privacy_text": "CryptPadは、データをプライベートに保護しながらコラボレーションを可能にするように構築されています。のコンテンツは、あなたのブラウザ上で暗号化および復号化されます。ドキュメント、チャット、およびファイルは、あなたがログインしているセッション以外では読み取れません。サービスの管理者でも、あなたの情報にアクセスすることはできません。",
+    "home_privacy_title": "プライバシー・バイ・デザイン",
+    "mdToolbar_tutorial": "https://www.markdowntutorial.com/jp/",
+    "languageButtonTitle": "シンタックスハイライトを行う言語を選択してください",
+    "useTemplate": "テンプレートで始めますか？",
+    "oo_uploaded": "アップロードが完了しました。OKをクリックしてページを再読み込みするか、キャンセルをクリックして閲覧モードを継続してください。",
+    "poll_descriptionHint": "投票の詳細を記入してください。入力が終了したら✓（公開）ボタンをクリックしてください。\n詳細はマークダウンの構文で記入できます。CryptDriveのメディアファイルを埋め込むこともできます。\nリンクを知っているひとは誰でも詳細を変更できますが、推奨されません。",
+    "pad_mediatagBorder": "枠線の幅（ピクセル）",
+    "openLinkInNewTab": "新しいタブでリンクを開く",
+    "history_restorePrompt": "ドキュメントの現在のバージョンを、表示しているバージョンに置き換えてよろしいですか？",
+    "slideOptionsTitle": "スライドをカスタマイズ",
+    "propertiesButtonTitle": "パッドのプロパティを表示",
+    "driveOfflineError": "CryptPadへの接続が切断されています。このパッドに加えられる変更はCryptDriveに保存されません。CryptPadののタブを閉じて、新しいウィンドウで開いてみてください。 ",
+    "properties_passwordWarningFile": "パスワードは変更されましたが、新しいデータでCryptDriveを更新することができませんでした。古いバージョンのファイルを手動で削除する必要があるかもしれません。",
+    "properties_confirmNewFile": "よろしいですか？パスワードを追加するとファイルのURLが変わります。パスワードをもたないユーザーは、このファイルにアクセスできなくなります。",
+    "properties_confirmChangeFile": "よろしいですか？新しいパスワードをもたないユーザーは、このファイルにアクセスできなくなります。",
+    "team_quota": "あなたのチームのストレージの容量制限",
+    "team_pendingOwner": "（保留中）",
+    "fm_contextMenuError": "そのアイテムのコンテクストメニューを開けません。問題が続くなら、ページを再読み込みしてみてください。",
+    "fm_selectError": "そのアイテムを選択できません。問題が続くなら、ページを再読み込みしてみてください。",
+    "fm_unknownFolderError": "選択、もしくは最後に開いたディレクトリは存在しません。親フォルダを開きます…",
+    "fm_restoreDialog": "{0}を元の場所に復元してよろしいですか？",
+    "fm_removeSeveralPermanentlyDialog": "ドライブから{0}個のアイテムを削除してよろしいですか？他のユーザーのドライブからは削除されません。",
+    "fm_removePermanentlyDialog": "ドライブからこのアイテムを削除してよろしいですか？他のユーザーのドライブからは削除されません。",
+    "fm_noname": "無題のドキュメント",
+    "fm_openParent": "フォルダに表示",
+    "fm_newButtonTitle": "新しいドキュメントやフォルダを作成したり、ファイルを現在のフォルダにインポートしたりできます。",
+    "contacts_info4": "チャットの参加者は誰でも履歴を消去できます",
+    "contacts_info2": "連絡先のアイコンをクリックしてチャットを開始",
+    "contacts_confirmRemove": "<em>{0}</em>をあなたの連絡先から削除してよろしいですか？",
+    "profile_error": "プロフィールの作成時にエラーが発生しました: {0}",
+    "profile_uploadSizeError": "エラー： アバターは{0}より小さい必要があります",
+    "kanban_addBoard": "ボードを追加",
+    "viewShare": "読み込み専用のリンク",
+    "mediatag_loadButton": "添付ファイルを読み込む",
+    "settings_disableThumbnailsAction": "CryptDriveでのサムネイルの作成を無効にする",
+    "settings_resetError": "入力した確認文が正しくありません。CryptDriveのデータは消去されていません。",
+    "settings_resetDone": "データが消去されました！",
+    "settings_resetPrompt": "あなたのドライブからのパッドを削除します。<br>本当に続けてよろしいですか？<br>続けるには「I love CryptPad」と入力してください。",
+    "settings_reset": "CryptDriveの全てのファイルとフォルダを削除",
+    "settings_exportErrorOther": "ドキュメントのエクスポート中にエラーが発生しました: {0}",
+    "drive_activeOld": "以前のパッド",
+    "settings_codeSpellcheckLabel": "コードエディターでスペルチェックを有効にする",
+    "cba_writtenBy": "著者: {0}",
+    "profile_copyKey": "公開鍵をコピー",
+    "oo_isLocked": "変更を同期しています。お待ちください",
+    "kanban_editBoard": "このボードを編集",
+    "kanban_editCard": "このカードを編集",
+    "kanban_clearFilter": "フィルターを消去",
+    "kanban_tags": "タグでフィルタリング",
+    "allow_text": "アクセスリストを使用すると、選択したユーザーとオーナーだけがドキュメントにアクセスできます。",
+    "admin_defaultlimitTitle": "ストレージの制限（MB）",
+    "owner_add": "{0}があなたをパッド「<b>{1}</b>」のオーナーになるよう希望しています。 承諾しますか？",
+    "owner_removeConfirm": "選択したユーザーのオーナー権を削除してよろしいですか？ ユーザーには通知が送られます。",
+    "owner_removePendingText": "保留中",
+    "properties_unknownUser": "{0}人の不明なユーザー",
+    "requestEdit_viewPad": "パッドを新しいタブで開く",
+    "requestEdit_button": "編集権限を要求",
+    "support_notification": "管理人がサポートチケットに返答しました",
+    "support_showData": "ユーザーデータを表示/隠す",
+    "upload_mustLogin": "ファイルのアップロードにはログインが必要です",
+    "upload_choose": "ファイルを選択",
+    "form_page": "{0}/{1}ページ",
+    "form_addMultiple": "全て追加",
+    "admin_consentToContactLabel": "同意する",
+    "admin_updateAvailableButton": "リリースノートを見る",
+    "admin_updateAvailableHint": "CryptPadの新しいバージョンが利用可能です",
+    "admin_updateAvailableTitle": "新しいバージョン",
+    "userlist_addAsFriendTitle": "「{0}」に連絡先のリクエストを送信",
+    "contacts_remove": "この連絡先を削除",
+    "profile_register": "プロフィールの作成にはログインが必要です！",
+    "poll_removeOption": "このオプションを削除してよろしいですか？",
+    "share_linkTeam": "チームのドライブに追加",
+    "sharedFolders_create": "共有フォルダを作成",
+    "share_mediatagCopy": "Mediaタグをクリップボードにコピー",
+    "header_homeTitle": "CryptPadのホームページを開く",
+    "header_logoTitle": "CryptDriveを開く",
+    "settings_cursorShareTitle": "カーソルの位置を共有",
+    "settings_padWidthLabel": "エディターの幅を減らす",
+    "settings_codeIndentation": "コードエディターのインデント（空白スペース）",
+    "settings_export_done": "ダウンロードの準備ができました！",
+    "fc_openInCode": "コードエディターで開く",
+    "poll_create_option": "新しいオプションを追加",
+    "poll_create_user": "新しいユーザーを追加",
+    "pad_mediatagImport": "あなたのCryptDriveに保存",
+    "admin_listMyInstanceLabel": "このインスタンスをリストに表示",
+    "admin_checkupTitle": "インスタンスの設定を検証",
+    "cba_disable": "消去して無効にする",
+    "upload_pending": "保留中",
+    "settings_resetTips": "ヒント",
+    "chrome68": "バージョン68のChromeもしくはChromiumを使用しているようです。このバージョンには、数秒経過した後でページが白紙になったり、クリックにページが反応しなくなったりするバグがあります。この問題を解決するには、別のタブを表示して改めて表示するか、このページでスクロールを試みてください。このバグは次のバージョンで解決される予定となっています。",
+    "register_notes": "<ul class=\"cp-notes-list\"><li>ドキュメントは、パスワードによって暗号化されます。<span class=\"red\">パスワードを紛失すると、データを復元することはできません。</span></li><li>共有のコンピュータを使用している場合は、作業完了時に<span class=\"red\">忘れずログアウトしてください。</span> ブラウザーのウインドウを閉じても、アカウントからはログアウトされません。</li><li>未ログインで作成、共有したファイルを保存するには、 「匿名セッションのドキュメントをインポート」にチェックをしてください。 </li></ul>",
+    "poll_commit": "送信",
+    "admin_removeDonateButtonTitle": "クラウドファンディングへの参加",
+    "mediatag_notReady": "ダウンロードを完了してください",
+    "pad_mediatagOpen": "ファイルを開く",
+    "pad_mediatagShare": "ファイルを共有",
+    "allowNotifications": "通知を許可",
+    "archivedFromServer": "ドキュメントがアーカイブされました",
+    "restoredFromServer": "ドキュメントが復元されました",
+    "admin_archiveInval": "無効なドキュメント",
+    "admin_archiveInput2": "ドキュメントのパスワード",
+    "admin_archiveInput": "ドキュメントのURL",
+    "admin_unarchiveTitle": "ドキュメントを復元",
+    "admin_archiveTitle": "ドキュメントをアーカイブ",
+    "fm_deletedFolder": "削除されたフォルダ",
+    "history_restoreDriveDone": "CryptDriveが復元されました",
+    "share_bar": "リンクを作成",
+    "settings_kanbanTagsTitle": "タグのフィルター",
+    "slide_textCol": "テキストの色",
+    "slide_backCol": "背景色",
+    "code_editorTheme": "エディターのテーマ",
+    "unknownPad": "不明なパッド",
+    "admin_openFilesTitle": "開かれているファイル",
+    "kanban_conflicts": "編集中:",
+    "kanban_noTags": "タグがありません",
+    "historyTrim_historySize": "履歴: {0}",
+    "team_links": "招待用リンク",
+    "team_cat_link": "招待用リンク",
+    "team_inviteTitle": "チームへの招待",
+    "team_inviteJoin": "チームに参加",
+    "team_inviteLinkCopy": "リンクをコピー",
+    "team_inviteLinkCreate": "リンクを作成",
+    "contacts_mutedUsers": "ミュートしたアカウント",
+    "sent": "メッセージが送信されました",
+    "team_inviteButton": "メンバーを招待",
+    "requestEdit_sent": "リクエストが送信されました",
+    "later": "あとで決める",
+    "admin_supportListTitle": "メールボックスのサポート",
+    "friendRequest_later": "あとで決める",
+    "admin_flushCacheButton": "キャッシュを消去",
+    "admin_registeredTitle": "登録ユーザー",
+    "crowdfunding_popup_no": "あとで",
+    "sharedFolders_create_name": "フォルダ名",
+    "creation_newTemplate": "新しいテンプレート",
+    "creation_noTemplate": "テンプレートがありません",
+    "creation_expire": "期限切れのパッド",
+    "mdToolbar_list": "箇条書き",
+    "uploadFolder_modal_filesPassword": "ファイルのパスワード",
+    "upload_title": "ファイルをアップロード",
+    "settings_cursorShowLabel": "カーソルを表示",
+    "settings_cursorColorTitle": "カーソルの色",
+    "settings_ownDriveTitle": "アカウントを更新",
+    "settings_driveDuplicateLabel": "重複したパッドを隠す",
+    "settings_export_compressing": "データを圧縮しています…",
+    "settings_cat_pad": "リッチテキスト",
+    "fc_collapseAll": "全て折りたたむ",
+    "fc_expandAll": "全て展開",
+    "fc_open_ro": "開く（読み取り専用）",
+    "fc_color": "色を変更",
+    "fm_passwordProtected": "パスワードで保護",
+    "poll_userPlaceholder": "あなたの名前",
+    "kanban_working": "作業中",
+    "kanban_newBoard": "新しいボード",
+    "pad_mediatagOptions": "画像のプロパティ",
+    "pad_mediatagRatio": "比率を維持",
+    "pad_mediatagHeight": "高さ（ピクセル）",
+    "pad_mediatagWidth": "幅（ピクセル）",
+    "pad_mediatagTitle": "Mediaタグの設定",
+    "admin_cat_network": "ネットワーク",
+    "form_clear": "消去",
+    "form_anonymous_on": "許可",
+    "form_open": "開く",
+    "form_input_ph_url": "https://example.com",
+    "form_input_ph_email": "email@example.com",
+    "form_backButton": "戻る",
+    "form_viewButton": "表示",
+    "form_form": "フォーム",
+    "form_editor": "エディタ",
+    "form_delete": "削除",
+    "form_sent": "回答を送信しました",
+    "form_reset": "リセット",
+    "form_update": "更新",
+    "form_submit": "送信",
+    "form_type_md": "説明文",
+    "form_type_poll": "投票",
+    "form_type_checkbox": "チェックボックス",
+    "form_type_textarea": "段落",
+    "form_type_input": "文",
+    "form_text_number": "数",
+    "form_text_email": "Eメール",
+    "form_text_url": "リンク",
+    "settings_colortheme_light": "ライト",
+    "settings_colortheme_dark": "ダーク",
+    "settings_cat_style": "表示モード",
+    "admin_performanceKeyHeading": "コマンド",
+    "admin_performanceProfilingTitle": "性能",
+    "admin_cat_performance": "性能",
+    "redo": "やり直す",
+    "undo": "取り消す",
+    "settings_cacheTitle": "キャッシュ",
+    "admin_support_open": "表示",
+    "mediatag_saveButton": "保存",
+    "Offline": "オフライン",
+    "admin_unarchiveButton": "復元",
+    "admin_archiveButton": "アーカイブ",
+    "oo_version_latest": "最新",
+    "settings_cat_kanban": "カンバン",
+    "settings_kanbanTagsOr": "または",
+    "settings_kanbanTagsAnd": "かつ",
+    "pad_tocHide": "アウトライン",
+    "oo_refresh": "再読み込み",
+    "toolbar_file": "ファイル",
+    "drive_treeButton": "ファイル",
+    "toolbar_insert": "挿入",
+    "fm_sort": "並び替える",
+    "comments_comment": "コメント",
+    "comments_resolve": "解決",
+    "comments_reply": "返信",
+    "comments_submit": "送信",
+    "comments_edited": "編集済",
+    "cba_enable": "有効にする",
+    "canvas_select": "選択",
+    "kanban_body": "内容",
+    "kanban_title": "タイトル",
+    "teams": "チーム",
+    "teams_table_specific": "例外",
+    "properties_changePasswordButton": "送信",
+    "terms": "利用規約",
+    "poll_publish_button": "公開",
+    "team_viewers": "閲覧者",
+    "team_pending": "招待済",
+    "team_cat_create": "新規",
+    "team_inviteModalButton": "招待",
+    "owner_unknownUser": "不明",
+    "admin_cat_support": "サポート",
+    "supportPage": "サポート",
+    "share_withFriends": "共有",
+    "friendRequest_decline": "拒否",
+    "settings_codeSpellcheckTitle": "スペルチェック",
+    "contact_email": "Eメール",
+    "admin_cat_stats": "統計",
+    "markdown_toc": "コンテンツ",
+    "autostore_pad": "パッド",
+    "autostore_sf": "フォルダ",
+    "autostore_file": "ファイル",
+    "share_linkCopy": "コピー",
+    "creation_passwordValue": "パスワード",
+    "edit": "編集",
+    "features": "機能",
+    "mdToolbar_code": "コード",
+    "mdToolbar_quote": "引用",
+    "mdToolbar_link": "リンク",
+    "mdToolbar_strikethrough": "打ち消し線",
+    "mdToolbar_bold": "太字",
+    "mdToolbar_italic": "イタリック",
+    "mdToolbar_help": "ヘルプ",
+    "todo_title": "CryptTodo",
+    "download_step2": "復号化中",
+    "download_dl": "ダウンロード",
+    "upload_up": "アップロード",
+    "upload_cancelled": "キャンセル済",
+    "settings_padSpellcheckTitle": "スペルチェック",
+    "settings_resetThumbnailsAction": "消去",
+    "settings_thumbnails": "サムネイル",
+    "settings_resetTipsAction": "リセット",
+    "settings_resetButton": "削除",
+    "settings_cat_code": "コード",
+    "settings_cat_cursor": "カーソル",
+    "fc_hashtag": "タグ",
+    "fc_prop": "プロパティ",
+    "fc_remove_sharedfolder": "削除",
+    "contacts_send": "送信",
+    "contacts_title": "連絡先",
+    "poll_comment_list": "コメント",
+    "poll_optionPlaceholder": "オプション",
+    "kanban_done": "完了",
+    "kanban_delete": "削除",
+    "kanban_color": "色",
+    "calendar_import_temp": "このカレンダーをインポート",
+    "settings_deleteContinue": "アカウントを削除",
+    "admin_emailButton": "更新",
+    "button_newform": "新しいフォーム",
+    "form_editBlock": "編集",
+    "fm_deleteOwnedPads": "これらのパッドをサーバーから完全に削除してよろしいですか？",
+    "fm_deleteOwnedPad": "このパッドをサーバーから完全に削除してよろしいですか？",
+    "fm_sharedFolder": "共有フォルダ",
+    "fm_newFile": "新しいパッド",
+    "fm_newFolder": "新しいフォルダ",
+    "fm_newButton": "新規",
+    "fm_sharedFolderName": "共有フォルダ",
+    "fm_tagsName": "タグ",
+    "fm_filesDataName": "全てのファイル",
+    "contacts_leaveRoom": "このルームから退出",
+    "contacts_rooms": "ルーム",
+    "contacts_removeHistoryServerError": "チャットの履歴を削除する際にエラーが発生しました。後ほど再試行してください",
+    "contacts_confirmRemoveHistory": "チャットの履歴を削除してよろしいですか？データは復元できません",
+    "contacts_info3": "アイコンをダブルクリックしてプロフィールを表示",
+    "history_restoreDone": "ドキュメントが復元されました",
+    "history_restoreTitle": "選択したバージョンを復元",
+    "history_closeTitle": "履歴を閉じる",
+    "history_loadMore": "さらに履歴を読み込む",
+    "history_prev": "前のバージョン",
+    "history_next": "次のバージョン",
+    "historyButton": "ドキュメントの履歴を表示",
+    "notifyLeft": "{0}が共同セッションから退出しました",
+    "fileEmbedTag": "その後、ファイルを埋め込みたい任意のページの箇所に、このMedia Tagを配置してください：",
+    "themeButtonTitle": "コードとスライドのエディタのテーマ色を選択",
+    "printTransition": "遷移アニメーションを有効にする",
+    "admin_blockDailyCheckTitle": "サーバーのテレメトリー",
+    "admin_blockDailyCheckLabel": "サーバーのテレメトリーを無効にする",
+    "fc_open_formro": "開く（参加者として）",
+    "poll_unlocked": "編集可",
+    "poll_locked": "編集不可",
+    "poll_edit": "編集",
+    "poll_remove": "削除",
+    "poll_removeUser": "このユーザーを削除してよろしいですか？",
+    "oo_importInProgress": "インポート中です",
+    "register_emailWarning2": "他のサービスと異なり、メールアドレスを使ってパスワードをリセットすることはできません。",
+    "register_alreadyRegistered": "このユーザーは既に存在します。ログインしますか？",
+    "register_warning": "注意",
+    "register_cancel": "キャンセル",
+    "register_writtenPassword": "ユーザー名とパスワードをメモしました。続行",
+    "register_mustAcceptTerms": "利用規約に同意する必要があります。",
+    "register_passwordTooShort": "パスワードは最低{0}文字でなければなりません。",
+    "register_passwordsDontMatch": "パスワードが一致しません！",
+    "register_acceptTerms": "<a>利用規約</a>に同意",
+    "canvas_widthLabel": "幅: {0}",
+    "canvas_width": "幅",
+    "canvas_delete": "選択箇所を削除",
+    "canvas_clear": "消去",
+    "oo_cantUpload": "他のユーザーが在席中にアップロードすることはできません。",
+    "poll_comment_placeholder": "あなたのコメント",
+    "poll_comment_remove": "このコメントを削除",
+    "poll_comment_submit": "送信",
+    "poll_comment_add": "コメントを追加",
+    "imprint": "法定通知",
+    "oo_exportInProgress": "エクスポート中です",
+    "notifyJoined": "{0}が共同セッションに参加しました",
+    "viewEmbedTag": "パッドを埋め込むには、以下のiframeを任意の箇所に含めてください。CSSまたはHTMLの属性を使って装飾できます。",
+    "slideOptionsText": "オプション",
+    "tags_noentry": "削除したパッドにはタグ付けできません！",
+    "tags_duplicate": "重複タグ: {0}",
+    "tags_notShared": "タグは他のユーザーと共有されません",
+    "tags_add": "選択したパッドのタグを更新",
+    "tags_title": "タグ（あなた用）",
+    "filePickerButton": "CryptDriveに保存したファイルを埋め込む",
+    "printBackgroundRemove": "背景画像を削除",
+    "printBackgroundValue": "<b>現在の背景：</b> <em>{0}</em>",
+    "printBackgroundButton": "画像を選択",
+    "printBackground": "背景画像を使用",
+    "printTitle": "パッドのタイトルを表示",
+    "printDate": "日付を表示",
+    "printSlideNumber": "スライドの番号を表示",
+    "printOptions": "レイアウトのオプション",
+    "printButtonTitle2": "ドキュメントを印刷するかPDFファイルでエクスポート",
+    "printButton": "印刷（Enter）",
+    "printText": "印刷",
+    "backgroundButtonTitle": "プレゼンテーションの背景色を変更",
+    "template_empty": "利用できるテンプレートがありません",
+    "template_import": "テンプレートをインポート",
+    "useTemplateOK": "テンプレートを選択してください（Enter）",
+    "selectTemplate": "テンプレートを選択するかESCキーを押してください",
+    "saveTemplatePrompt": "テンプレートのタイトルを入力してください",
+    "newButtonTitle": "新しいパッドを作成",
+    "newButton": "新規",
+    "userAccountButton": "アカウント",
+    "userListButton": "ユーザーリスト",
+    "movedToTrash": "パッドをゴミ箱に移動しました。<br><a>ドライブにアクセス</a>",
+    "forgetPrompt": "OKをクリックするとパッドをゴミ箱へと移動します。よろしいですか？",
+    "forgetButton": "削除",
+    "pinLimitReached": "利用できるストレージの最大容量に達しました",
+    "disconnected": "接続が切れました",
+    "saveTitle": "タイトルを保存（Enter）",
+    "exportButtonTitle": "ローカルファイルにパッドをエクスポート",
+    "importButtonTitle": "ローカルファイルからパッドをインポート",
+    "pinLimitDrive": "ストレージの最大容量に達しました。<br>新しいパッドは作成できません。",
+    "pinLimitNotPinned": "ストレージの最大容量に達しました。<br>このパッドはCryptDriveに保存されません。",
+    "pinLimitReachedAlertNoAccounts": "ストレージの最大容量に達しました",
+    "pinLimitReachedAlert": "使用できるストレージの最大容量に達しました。新しいパッドはCryptDriveに保存されません。<br>パッドをCryptDriveから削除するか、<a>プレミアムユーザー</a>になると容量を増やすことができます。",
+    "userlist_offline": "現在オフラインのため、ユーザーリストは利用できません。",
+    "readonly": "読み取り専用",
+    "errorState": "重大なエラー: {0}",
+    "realtime_unrecoverableError": "回復不能なエラーが発生しました。OKをクリックして再読み込みを行ってください。",
+    "disabledApp": "このアプリケーションは無効になっています。詳細については、このCryptPadの管理者にお問い合わせください。",
+    "deletedFromServer": "ドキュメントが破棄されました",
+    "newVersionError": "新しいバージョンのCryptPadがあります。<br><a href='#'>リロードする</a>と新しいバージョンを読み込みます。<em>Esc</em>キーを押すと<b>オフラインモード</b>でコンテンツにアクセスします。",
+    "errorRedirectToHome": "<em>Esc</em>キーを押すとCryptDriveにリダイレクトします。",
+    "errorCopy": " <em>Esc</em>キーを押すと、閲覧モードで引き続きコンテンツにアクセスできます。",
+    "invalidHashError": "要求したドキュメントのURLが無効です。",
+    "chainpadError": "コンテンツを更新する際に重大なエラーが発生しました。コンテンツが失われないよう、閲覧モードで表示されています。<br>このパッドを表示し続けるには<em>Esc</em>キーを押し、再度編集を試みるにはリロードをしてください。",
+    "inactiveError": "このパッドは利用されていなかったため削除されました。Escキーを押すと新しいパッドを作成します。",
+    "deletedError": "このドキュメントは削除されたため、利用できなくなりました。",
+    "expiredError": "このパッドは利用期限を過ぎてしまったため、利用できなくなりました。",
+    "anonymousStoreDisabled": "このCryptPadのインスタンスの管理者は、匿名ユーザーによる保存を無効に設定しています。CryptDriveを使用するにはログインする必要があります。",
+    "padNotPinnedVariable": "このパッドは{4}日間利用しないと有効期限が切れます。{0}ログイン{1}するか{2}登録{3}して保存してください。",
+    "padNotPinned": "このパッドは3か月間利用しないと有効期限が切れます。{0}ログイン{1}するか{2}登録{3}して保存してください。",
+    "onLogout": "ログアウトしました。{0}ここをクリック{1}するか<br><em>Escape</em>キーを押すと、閲覧モードでパッドにアクセスできます。",
+    "typeError": "このパッドは選択したアプリケーションと互換性がありません",
+    "form_type_page": "ページ分割",
+    "form_description_default": "ここにテキストを入力",
+    "team_pcsSelectHelp": "所有するパッドをチームのドライブに作成すると、そのパッドのオーナー権はチームに与えられます。",
+    "sharedFolders_create_owned": "所有するフォルダ",
+    "creation_owned1": "<b>所有している</b>項目は、オーナーの望むときにいつでも破棄できます。破棄すると、他のユーザーのCryptDriveからも削除されます。",
+    "creation_owned": "パッドを所有",
+    "uploadFolder_modal_owner": "所有するファイル",
+    "upload_modal_owner": "所有するファイル",
+    "settings_driveDuplicateHint": "所有するパッドを共有フォルダに移動すると、あなたのCryptDriveにパッドのコピーが保存され、あなたは引き続きそのパッドをコントロールできます。重複したファイルは隠すことができます。削除しない限り、共有したバージョンだけが表示されます。削除した場合は、以前の場所に元のファイルが表示されます。",
+    "settings_driveDuplicateTitle": "重複した所有するパッド",
+    "fm_info_owned": "あなたはここに表示されているパッドの所有者です。所有者は、サーバーからパッドを永久に削除することができます。削除すると、他のユーザーはパッドにアクセスできなくなります。",
+    "settings_deleteModal": "あなたのデータを削除するため、以下の情報をCryptPadの管理者と共有します。",
+    "oo_login": "ログインもしくは登録すると、スプレッドシートの性能が改善します。",
+    "cba_hint": "設定は次の新しいパッドから有効になります。",
+    "support_disabledHint": "このCryptPadのインスタンスはサポートフォームを利用するように設定されていません。",
+    "admin_supportInitTitle": "サポートメールボックスの初期化",
+    "admin_supportAddError": "秘密鍵が無効です",
+    "admin_supportAddKey": "秘密鍵を追加",
+    "todo_markAsIncompleteTitle": "このタスクを未完了にする",
+    "todo_markAsCompleteTitle": "このタスクを完了済にする",
+    "settings_codeFontSize": "コードエディターのフォントの大きさ",
+    "settings_anonymous": "ログインしていません。設定はこのブラウザのみで有効です。",
+    "settings_deleted": "アカウントが削除されました。OKを押すとホームページに移動します。",
+    "settings_deleteHint": "アカウントの削除は取り消せません。あなたのCryptDriveとパッドのリストはサーバーから削除されます。誰もCryptDriveに保存していないパッドは、90日で削除されます。",
+    "settings_resetThumbnailsDone": "サムネイルが消去されました。",
+    "settings_resetThumbnailsDescription": "ブラウザに保存したサムネイルを削除します。",
+    "settings_disableThumbnailsDescription": "新しいパッドを開くと、サムネイルが自動で作成され、ブラウザに保存されます。ここでサムネイルの作成を無効にできます。",
+    "fm_info_root": "フォルダを作成してファイルを整理できます。",
+    "oo_conversionSupport": "お使いのブラウザはMicrosoft Officeのフォーマットの変換に対応していません。FirefoxもしくはChromeの最新バージョンの使用を推奨します。",
+    "register_registrationIsClosed": "登録は締め切りました。",
+    "settings_notifCalendarHint": "今後のカレンダーのイベントの全ての通知を有効もしくは無効にします。",
+    "reminder_inProgressAllDay": "今日: <b>{0}</b>",
+    "reminder_inProgress": "<b>{0}</b>が{1}に開始しました",
+    "reminder_now": "<b>{0}</b>が開始しました",
+    "reminder_missed": "<b>{0}</b>が{1}で開催されました",
+    "calendar_dateRange": "{0} - {1}",
+    "calendar_import": "マイカレンダーに追加",
+    "calendar_errorNoCalendar": "編集可能なカレンダーが選択されていません",
+    "calendar_day": "日",
+    "calendar_new": "新しいカレンダー",
+    "calendar_default": "マイカレンダー",
+    "calendar": "カレンダー",
+    "pad_goToAnchor": "アンカーに移動",
+    "oo_cantMigrate": "この表はアップロードの最大のサイズを超えているため、移行することができません。",
+    "footer_roadmap": "ロードマップ",
+    "settings_deleteSubscription": "定額利用を管理",
+    "broadcast_translations": "翻訳",
+    "admin_broadcastCancel": "メッセージを削除",
+    "admin_broadcastButton": "送信",
+    "broadcast_surveyURL": "アンケートのリンク",
+    "admin_surveyActive": "アンケートを開く",
+    "admin_surveyCancel": "削除",
+    "admin_surveyButton": "アンケートを保存",
+    "broadcast_newSurvey": "新しいアンケートがあります。クリックで開きます。",
+    "admin_surveyTitle": "アンケート",
+    "admin_maintenanceCancel": "メンテナンスをキャンセル",
+    "admin_maintenanceButton": "メンテナンスを予定",
+    "admin_maintenanceTitle": "メンテナンス",
+    "importError": "インポートできませんでした（誤ったフォーマット）",
+    "addOptionalPassword": "パスワードを追加（任意）",
+    "pad_settings_show": "表示",
+    "pad_settings_hide": "隠す",
+    "pad_settings_width_small": "ページモード",
+    "pad_settings_info": "このドキュメントの既定の設定です。新しいユーザーがドキュメントを閲覧したときに適用されます。",
+    "pad_settings_title": "ドキュメントの設定",
+    "admin_getquotaTitle": "アカウントのストレージを確認",
+    "settings_colorthemeTitle": "テーマ色",
+    "admin_getquotaButton": "確認",
+    "fm_cantUploadHere": "ここにはファイルをアップロードできません",
+    "settings_resetTipsDone": "全てのヒントが表示されます。",
+    "settings_resetTipsButton": "利用可能なCryptDriveのヒントをリセット",
+    "settings_resetNewTitle": "CryptDriveのデータを消去",
+    "settings_exportErrorMissing": "このドキュメントはサーバーにありません（期限切れ、もしくはオーナーにより削除されました）",
+    "settings_exportErrorEmpty": "このドキュメントはエクスポートできません（内容が空もしくは無効です）。",
+    "settings_exportErrorDescription": "以下のドキュメントをエクスポートに追加できませんでした:",
+    "settings_exportDescription": "ドキュメントをダウンロードして復号化しています。これには数分程度かかることがあります。タブを閉じると作業が中断されます。",
+    "crowdfunding_popup_text": "<h3>あなたの援助が必要です！</h3>CryptPadの開発が継続できるよう、OpenCollectiveのページからご支援いただきますようお願いします。<b>ロードマップ</b>と<b>資金調達の目標</b>を同ページにて公開しています。",
+    "autostore_notAvailable": "この機能を使うにはCryptDriveにパッドを保存する必要があります。",
+    "autostore_forceSave": "CryptDriveにファイルを保存",
+    "autostore_saved": "パッドをCryptDriveに保存しました！",
+    "autostore_settings": "自動保存は<a>設定</a>ページで有効にできます！",
+    "broadcast_end": "終了",
+    "broadcast_start": "開始",
+    "broadcast_preview": "通知をプレビュー",
+    "team_inviteLinkError": "リンクの作成中にエラーが発生しました。",
+    "team_inviteLinkSetPassword": "リンクをパスワードで保護（推奨）",
+    "team_inviteLinkNote": "プライベート・メッセージを追加",
+    "contacts_muteInfo": "ミュートしたユーザーからは通知を受け取りません。<br>ミュートしたことは相手に通知されません。 ",
+    "contacts_manageMuted": "ミュートを管理",
+    "notifyRenamed": "{0}は{1}になりました",
+    "printBackgroundNoValue": "<em>背景画像が選択されていません</em>",
+    "canvas_saveToDrive": "この画像をファイル形式でCryptDriveに保存",
+    "canvas_opacityLabel": "不透明度: {0}",
+    "canvas_opacity": "不透明度",
+    "poll_comment_disabled": "✓ボタンを押して投票を公開すると、コメントが有効になります。",
+    "kanban_item": "項目 {0}",
+    "fileEmbedScript": "このファイルを埋め込むには、Media Tagのロード用に、このスクリプトをページに一度含めてください。",
+    "editShare": "編集用リンク",
+    "colorButtonTitle": "プレゼンテーションモードの文字色を変更",
+    "presentButtonTitle": "プレゼンテーションモードに変更",
+    "exportPrompt": "ファイル名は何にしますか？",
+    "share_formEdit": "作者",
+    "history_userNext": "次の著者",
+    "history_userPrev": "以前の著者",
+    "comments_deleted": "コメントは著者により削除されました",
+    "cba_title": "著者の色",
+    "cba_hide": "著者の色を隠す",
+    "cba_show": "著者の色を表示",
+    "cba_properties": "著者の色（実験的）",
+    "restrictedError": "このドキュメントにアクセスする権限がありません",
+    "restrictedLoginPrompt": "このドキュメントにアクセスする権限がありません。アクセス権がある場合は<a>ログイン</a> してください。",
+    "history_shareTitle": "このバージョンへのリンクを共有",
+    "admin_listMyInstanceTitle": "インスタンスを公開ディレクトリに表示",
+    "admin_checkupButton": "診断を行う",
+    "settings_driveRedirect": "自動で転送",
+    "mdToolbar_embed": "タイトルを埋め込む",
+    "copyToClipboard": "クリップボードにコピー",
+    "form_anonymousBox": "匿名で回答",
+    "form_anonymous_blocked": "匿名の回答はブロックされています。回答には <a href=\"/login/\">ログイン</a>もしくは<a href=\"/register/\">登録</a>が必要です。",
+    "form_add_item": "項目を追加",
+    "form_type_radio": "選択肢",
+    "form_makePublicWarning": "回答を公開してよろしいですか？これは取り消せません。",
+    "form_notAnswered": "<b>{0}</b>個の未回答",
+    "form_showSummary": "概要を表示",
+    "form_showIndividual": "個々の回答を表示",
+    "form_results_empty": "回答がありません",
+    "form_results": "回答",
+    "form_answered": "このフォームは回答済みです",
+    "form_cantFindAnswers": "このフォームの既存の回答を取得できません。",
+    "form_duplicates": "重複する項目が削除されました",
+    "form_editType": "オプションの種類",
+    "share_formView": "参加者",
+    "admin_supportPrivHint": "他の管理者がサポートチケットを表示するのに必要な秘密鍵を表示します。この秘密鍵を入力するフォームは、管理パネルに表示されます。",
+    "oo_importBin": "OKをクリックするとCryptPadの内部フォーマット（.bin）をインポートします。",
+    "settings_notifCalendarTitle": "カレンダーの通知",
+    "reminder_minutes": "<b>{0}</b>はあと{1}分で開始します",
+    "upload_success": "ファイル（{0}）のアップロードが完了しました。",
+    "uploadFolder_modal_title": "フォルダーアップロードのオプション",
+    "upload_modal_title": "ファイルアップロードのオプション",
+    "settings_cursorShowTitle": "他のユーザーのカーソルの位置を表示",
+    "admin_authError": "このページには管理者のみアクセスできます",
+    "settings_cursorShareLabel": "位置を共有",
+    "settings_changePasswordNewPasswordSameAsOld": "新しいパスワードは現在のパスワードと異なるものでなければなりません。",
+    "login_unhandledError": "予期しないエラーが発生しました :(",
+    "autostore_error": "予期しないエラー: このパッドを保存できませんでした。再度試してください。",
+    "settings_changePasswordError": "予期しないエラーが発生しました。ログインしたりパスワードを変更したりすることができない場合は、CryptPadの管理者に連絡してください。",
+    "convertFolderToSF_confirm": "このフォルダを他の人が閲覧するには、共有フォルダに変更する必要があります。続行してよろしいですか？",
+    "share_linkPresent": "表示モード",
+    "share_linkEmbed": "埋め込みモード（ツールバーとユーザー一覧を隠します）",
+    "properties_passwordSuccess": "パスワードは変更されました。<br>OKを押して再読み込みし、アクセス権限を更新してください。",
+    "properties_passwordWarning": "パスワードは変更されましたが、CryptDriveを更新することができませんでした。古いバージョンのパッドは手動で削除しなければならないかもしれません。<br>OKを押して再読み込みし、アクセス権限を更新してください。",
+    "properties_confirmChange": "続行してよろしいですか？パスワードを変更すると履歴が削除されます。パスワードを知らないユーザーは、このパッドにアクセスできなくなります。",
+    "creation_newPadModalDescription": "作成するドキュメントの種類をクリックしてください。<b>タブ</b>キーで選択し、<b>エンター</b>キーで作成することもできます。",
+    "creation_noOwner": "オーナーがいません",
+    "properties_passwordError": "パスワードの変更中にエラーが発生しました。再度試してください。",
+    "properties_passwordSame": "新しいパスワードは現在のパスワードと異なるものでなければなりません。",
+    "four04_pageNotFound": "お探しのページが見つかりませんでした。",
+    "about": "私たちについて",
+    "whatis_apps_info": "<p>CryptPadは共同作業に必要なツールを備えた本格的なオフィススイートです。リッチテキスト、スプレッドシート、コード/マークダウン、カンバン、スライド、ホワイトボード、投票機能があります。</p><p>それらのアプリケーションには、チャット、連絡先、著者別の色表示（コード/マークダウン）、コメント、メンション（リッチテキスト）などの機能が付属しています。</p>",
+    "mdToolbar_button": "マークダウンのツールバーを表示もしくは隠す",
+    "pad_base64": "このパッドはサイズの大きい画像を含んでいます。パッドのサイズが大きいと、読み込みに時間がかかります。サイズを減らすために、画像のフォーマットを変換して、別の画像ファイルとしてCryptDriveに保存することができます。画像を変換してよろしいですか？",
+    "todo_removeTaskTitle": "このタスクをリストから削除",
+    "upload_tooLargeBrief": "ファイルが{0}MBの制限を超えています",
+    "upload_tooLarge": "ファイルがあなたのアカウントでアップロードできるサイズを超えています。",
+    "upload_notEnoughSpaceBrief": "容量が足りません",
+    "upload_notEnoughSpace": "CryptDriveの空き容量が不足しています。",
+    "upload_uploadPending": "アップロード中です。キャンセルして新しいファイルをアップロードしますか？",
+    "upload_serverError": "サーバーエラー: ファイルをアップロードできませんでした。",
+    "uploadFolder_modal_forceSave": "ファイルをCryptDriveに保存",
+    "settings_export_download": "ドキュメントをダウンロードして復号化しています…",
+    "settings_export_reading": "CryptDriveを読み込んでいます…",
+    "settings_exportCancel": "エクスポートをキャンセルしてよろしいでしょうか？次のエクスポートでは最初からやりなおす必要があります。",
+    "fm_error_cantPin": "内部サーバーエラー。ページを再度読み込んでください。",
+    "fm_info_anonymous": "ログインしていないため、ドキュメントは{0}日後に期限切れになります。また、ブラウザの履歴を消去するとファイルが削除される恐れがあります。<br>ファイルを永続的に保存するには、<a href=\"/register/\">登録</a>するか（個人情報の登録は不要です）<a href=\"/login/\">ログイン</a>してください。<a href=\"#docs\">登録アカウントについては、こちらを参照してください</a>。",
+    "fm_info_recent": "あなたか共同編集者が最近開いた、もしくは編集したパッドの一覧です。",
+    "fm_info_template": "テンプレートとして保存したパッドの一覧です。以下のテンプレートを使って、新しいパッドを作成することができます。",
+    "fm_categoryError": "選択したカテゴリーが開けません。ルートを表示します。",
+    "fm_morePads": "さらに表示",
+    "oo_reconnect": "サーバーの接続が回復しました。OKをクリックして再読み込みを行い、編集を継続してください。",
+    "changeNamePrompt": "名前を変更（匿名で利用する場合は空欄）: ",
+    "form_text_text": "テキスト",
+    "form_poll_time": "時",
+    "form_poll_day": "日",
+    "form_poll_text": "テキスト",
+    "form_invalid": "無効なフォーム",
+    "admin_supportPrivButton": "鍵を表示",
+    "admin_supportInitGenerate": "サポートの鍵を生成",
+    "admin_supportPrivTitle": "サポートのメールボックスの秘密鍵",
+    "admin_emailHint": "あなたのインスタンスの連絡先のメールアドレスを設定してください",
+    "admin_emailTitle": "管理者の連絡先のメールアドレス",
+    "mediatag_defaultImageName": "画像",
+    "calendar_noNotification": "なし",
+    "genericCopySuccess": "クリップボードにコピーしました",
+    "toolbar_storeInDrive": "CryptDriveに保存",
+    "calendar_addNotification": "リマインダーを追加",
+    "calendar_notifications": "リマインダー",
+    "settings_notifCalendarCheckbox": "カレンダーの通知を有効にする",
+    "calendar_days": "日",
+    "calendar_hours": "時間",
+    "calendar_minutes": "分",
+    "calendar_allDay": "全日",
+    "calendar_location": "場所: {0}",
+    "calendar_loc": "場所",
+    "calendar_title": "タイトル",
+    "calendar_update": "更新",
+    "calendar_deleteOwned": "共有した他のユーザーには表示されたままになります。",
+    "calendar_deleteConfirm": "このカレンダーをあなたのアカウントから削除してよろしいですか？",
+    "calendar_today": "今日",
+    "calendar_month": "月",
+    "calendar_week": "週",
+    "calendar_deleteTeamConfirm": "このカレンダーをチームから削除してよろしいですか？",
+    "calendar_newEvent": "新しいイベント",
+    "settings_changePasswordPending": "パスワードを変更しています。完了するまでページを閉じたり、再読み込みしたりしないでください。",
+    "settings_changePasswordConfirm": "パスワードを変更してよろしいですか？全てのデバイスで再ログインする必要があります。",
+    "settings_ownDrivePending": "アカウントをアップグレードしています。完了するまでページを閉じたり、再読み込みしたりしないでください。",
+    "settings_ownDriveConfirm": "アカウントのアップグレードには時間がかかるかもしれません。全てのデバイスで再ログインする必要があります。よろしいですか？",
+    "settings_padOpenLinkLabel": "直接リンクを開く機能を有効にする",
+    "settings_padOpenLinkHint": "このオプションを有効にすると、プレビューの吹き出しを表示せず、埋め込んだリンクを直接クリックして開くことができます",
+    "settings_padOpenLinkTitle": "最初のクリックでリンクを開く",
+    "settings_padSpellcheckLabel": "リッチテキストのパッドでスペルチェックを有効にする",
+    "settings_padWidth": "エディターの最大幅",
+    "settings_codeUseTabs": "タブを使ってインデント（空白スペースの代わりに）",
+    "login_noSuchUser": "無効なユーザー名もしくはパスワードです。再度試すか、サインアップしてください",
+    "fo_unavailableName": "同じ名前のファイルまたはフォルダが既に存在しています。アイテムの名前を変更して、再度試してください。",
+    "fo_moveFolderToChildError": "フォルダをサブフォルダに移動することはできません",
+    "fo_existingNameError": "その名前はディレクトリで既に使用されています。他の名前を選んでください。",
+    "fo_moveUnsortedError": "フォルダをテンプレートのリストに移動することはできません",
+    "fm_moveNestedSF": "共有フォルダを他の共有フォルダの中に移動することはできません。フォルダ {0} は移動されませんでした。",
+    "fm_restoreDrive": "あなたのドライブを以前の状態に戻しています。最良の結果のため、完了するまでドライブに変更を加えるのは控えてください。",
+    "fm_padIsOwnedOther": "このパッドは他のユーザーにより所有されています",
+    "fm_burnThisDrive": "ブラウザに保存されているCryptPadの全ての情報を消去してよろしいですか？<br>あなたのCryptDriveと履歴はブラウザから消去されますが、パッドは（暗号化されたまま）サーバー上に残ります。",
+    "fm_burnThisDriveButton": "ブラウザに保存されているCryptPadの全ての情報を消去",
+    "fm_canBeShared": "このフォルダは共有可能です",
+    "useTemplateCancel": "新しく開始（Esc）",
+    "fm_originalPath": "本来のパス",
+    "contacts_online": "このルームの別のユーザーがオンラインです",
+    "contacts_request": "<em>{0}</em>があなたを連絡先に追加しようとしています。<b>承諾しますか<b>？",
+    "contacts_rejected": "連絡先の招待が拒否されました",
+    "contacts_added": "連絡先の招待が承諾されました。",
+    "profile_uploadTypeError": "エラー: あなたのアバターの種類は許可されていません。許可されている種類: {0}",
+    "canvas_imageEmbed": "コンピューターの画像を埋め込む",
+    "canvas_currentBrush": "現在のブラシ",
+    "poll_total": "合計",
+    "kanban_todo": "未着手",
+    "slide_invalidLess": "ユーザー定義のスタイルは無効です",
+    "printCSS": "ユーザー定義のスタイルルール（CSS）：",
+    "admin_provideAggregateStatisticsHint": "追加の利用状況を開発者に提供することも選択できます。追加の情報には、あなたのインスタンスのおおよその登録ユーザー数や一日あたりのユーザー数などがあります。",
+    "fm_info_sharedFolder": "これは共有フォルダです。ログインしていないため、閲覧モードでしかアクセスできません。<br><a href=\"/register/\">登録</a>もしくは<a href=\"/login/\">ログイン</a>すると、CryptDriveにインポートして編集できます。",
+    "team_invitedToTeam": "{0}があなたをチーム「<b>{1}</b>」に招待しました",
+    "team_inviteFromMsg": "{0}があなたをチーム「<b>{1}</b>」に招待しました",
+    "team_invitePleaseLogin": "招待を承諾するには、ログインもしくは登録してください。",
+    "team_inviteEnterPassword": "招待のパスワードを入力してください。",
+    "team_inviteGetData": "チームのデータを取得中です",
+    "team_inviteInvalidLinkError": "招待リンクが無効です。",
+    "admin_getlimitsHint": "インスタンスに適用されている全てのカスタムストレージの制限を一覧表示します。",
+    "settings_exportWarning": "注意：このツールはベータ版のため、スケーラビリティ上の問題があるかもしれません。よりよいパフォーマンスのために、このタブをフォーカスしたままにすることを推奨します。",
+    "settings_exportFailed": "１分以上ダウンロードにかかるパッドは、エクスポートしたファイルには含まれません。エクスポートされなかったパッドについては、リンクを表示します。",
+    "settings_exportTitle": "CryptDriveをエクスポート",
+    "settings_backup2Confirm": "あなたのCryptDriveの全てのパッドをダウンロードします。続けたい場合は、名前を入力してOKを押してください",
+    "settings_backup2": "CryptDriveをダウンロード",
+    "settings_backupHint2": "ドライブの全てのドキュメントをダウンロードします。ドキュメントは、他のアプリケーションで読み込めるフォーマットがあれば、そのフォーマットでダウンロードされます。そうしたフォーマットがなければ、CryptPadで読み込めるフォーマットでダウンロードされます。",
+    "settings_backupHint": "CryptDriveのコンテンツをバックアップもしくは復元します。バックアップには、パッドの内容ではなく、それにアクセスする鍵だけが含まれます。",
+    "register_emailWarning3": "その点を踏まえてなおユーザー名にメールアドレスを使用する場合は、OKをクリックしてください。",
+    "register_emailWarning1": "それもできますが、サーバーには送信されません。",
+    "register_emailWarning0": "ユーザー名にメールアドレスが入力されています。",
+    "fm_tags_used": "使用数",
+    "fm_deletedPads": "これらのパッドはサーバーにありません。あなたのCryptDriveから削除されています: {0}",
+    "fm_renamedPad": "このパッドにユーザー定義の名前を設定しました。共有のファイル名は「<b>{0}</b>」です",
+    "fm_ownedPadsName": "所有",
+    "burnAfterReading_generateLink": "下のボタンをクリックするとリンクを生成します。",
+    "fm_restricted": "アクセス権がありません",
+    "admin_performancePercentHeading": "割合",
+    "settings_cacheButton": "既存のキャッシュを消去",
+    "settings_cacheCheckbox": "このデバイスでキャッシュを有効にする",
+    "form_submitWarning": "強制的に送信",
+    "form_updateWarning": "強制的にアップデート",
+    "form_answerName": "{0}が{1}に回答",
+    "form_addMultipleHint": "複数の日時を追加",
+    "admin_consentToContactTitle": "連絡に同意",
+    "form_poll_hint": "<i></i>: はい、<i></i>: いいえ、<i></i>: 可",
+    "admin_provideAggregateStatisticsLabel": "集計済みの統計を提供",
+    "admin_provideAggregateStatisticsTitle": "統計による集計",
+    "admin_blockDailyCheckHint": "CryptPadのインスタンスは、1日に1度、開発者のサーバーにメッセージを送信するよう設定されています。開発者はそれをもとに、CryptPadのバージョンごとのサーバー数を追跡しています。以下からこの測定をオプトアプトできます。なお、送信されるメッセージの内容は、確認用として、アプリケーションのサーバーのログに記録されます。",
+    "admin_listMyInstanceHint": "あなたのインスタンスが誰でも利用できる場合、同意によってウェブディレクトリに表示できます。表示には、サーバーのテレメトリーが有効になっている必要があります。",
+    "settings_driveRedirectTitle": "ホームページにリダイレクト",
+    "form_defaultItem": "項目{0}",
+    "form_defaultOption": "オプション{0}",
+    "form_answerAnonymous": "{0}に匿名の回答",
+    "form_maxLength": "文字数制限: {0}/{1}",
+    "form_textType": "テキストの種類",
+    "form_pollYourAnswers": "あなたの回答",
+    "form_pollTotal": "合計",
+    "form_editMaxLength": "最大文字数",
+    "form_add_option": "オプションを追加",
+    "form_newItem": "新しい項目",
+    "form_newOption": "新しいオプション",
+    "form_anonymous": "匿名の回答",
+    "form_removeEnd": "締切日を削除",
+    "form_setEnd": "締切日を設定",
+    "form_isPrivate": "回答は公開されていません",
+    "form_isPublic": "回答は公開されています",
+    "form_makePublic": "回答を公開",
+    "form_invalidQuestion": "質問{0}",
+    "info_privacyFlavour": "<a>プライバシーポリシー</a>に、データの取り扱い方を記載しています。",
+    "toolbar_tools": "ツール",
+    "toolbar_savetodrive": "画像として保存",
+    "comments_error": "ここにはコメントを追加できません",
+    "settings_padNotifHint": "あなたのコメントへの返信の通知を無視する",
+    "mentions_notification": "{0}があなたを<b>{1}</b>でメンションしました",
+    "access_muteRequests": "このパッドへのアクセスリクエストをミュート",
+    "access_noContact": "追加する連絡先がありません",
+    "trimHistory_needMigration": "この機能を有効にするには<a>CryptDriveをアップデート</a>してください。",
+    "trimHistory_error": "履歴を削除している途中でエラーが発生しました",
+    "trimHistory_getSizeError": "ドライブの履歴のサイズを計算している途中でエラーが発生しました",
+    "profile_login": "このユーザーを連絡先に追加するにはログインする必要があります",
+    "dontShowAgain": "再び表示しない",
+    "oo_sheetMigration_anonymousEditor": "登録ユーザーが最新のバージョンに更新するまで、このスプレッドシートを未登録ユーザーが編集することはできません。",
+    "oo_invalidFormat": "このファイルはインポートできません",
+    "burnAfterReading_warningDeleted": "このパッドは削除されました。ウインドウを閉じた後で再びアクセスすることはできません。",
+    "burnAfterReading_proceed": "表示して削除",
+    "team_leaveConfirm": "チームから退出すると、チームのCryptDrive、チャットの履歴などにアクセスできなくなります。よろしいですか？",
+    "team_leaveButton": "チームから退出",
+    "team_rosterKick": "チームからキック",
+    "team_rosterDemote": "降格",
+    "team_rosterPromote": "昇格",
+    "team_createLabel": "新しいチームを作成",
+    "team_kickedFromTeam": "{0}があなたをチーム「<b>{1}</b>」からキックしました",
+    "admin_diskUsageButton": "レポートを生成",
+    "admin_diskUsageTitle": "ディスクの使用状況",
+    "contact_adminHint": "アカウントに関連した問題、ストレージの制限、サービスの運用状況に関して。\n",
+    "contact_devHint": "機能のリクエスト、ユーザビリティの改善、もしくはお礼については、以下よりお願いします。",
+    "contact_dev": "開発者に連絡",
+    "contact_admin": "管理者に連絡",
+    "admin_flushCacheDone": "キャッシュを消去しました",
+    "admin_flushCacheTitle": "HTTPキャッシュを消去",
+    "admin_updateLimitDone": "アップデートが完了しました",
+    "admin_updateLimitButton": "クォータを更新",
+    "admin_registeredHint": "あなたのインスタンスの登録ユーザー数",
+    "admin_updateLimitTitle": "ユーザーのクォータを更新",
+    "mdToolbar_defaultText": "ここにテキストを入力",
+    "upload_modal_filename": "ファイル名（拡張子 <em>{0}</em> を自動で追加）",
+    "settings_padSpellcheckHint": "リッチテキストパッドでスペルチェックを有効にします。間違ったつづりには赤色の下線が表示されます。右クリックをしながらコントロールキーもしくはメタキーを押すと、正しい選択肢が表示されます。",
+    "creation_404": "このパッドは存在しません。以下のフォームより新しいパッドを作成してください。",
+    "help_genericMore": "CryptPadの使い方については<a>ドキュメンテーション</a>をご覧ください。",
+    "whatis_drive": "CryptDriveでまとめて管理",
+    "mdToolbar_toc": "目次",
+    "mdToolbar_check": "タスクリスト",
+    "mdToolbar_nlist": "番号付きリスト",
+    "mdToolbar_heading": "見出し",
+    "settings_cursorShowHint": "共同ドキュメントであなたが他のユーザーのカーソルの位置を見られるかどうかを決められます。",
+    "settings_cursorShareHint": "共同ドキュメントで他のユーザーがあなたのカーソルの位置を見られるかどうかを決められます。",
+    "settings_cursorColorHint": "共同ドキュメントでの他のユーザーのカーソルの色を変更できます。",
+    "settings_padWidthHint": "テキストエディターの幅を制限するページモード（既定）と、スクリーン全体の幅を使用するモードを切り替えられます。",
+    "fm_forbidden": "禁止されたアクション",
+    "team_exportHint": "チームのドライブの全てのドキュメントをダウンロードします。ドキュメントは、他のアプリケーションで読み込めるフォーマットがあれば、そのフォーマットでダウンロードされます。そうしたフォーマットがなければ、CryptPadで読み込めるフォーマットでダウンロードされます。",
+    "admin_limitUser": "ユーザーの公開鍵",
+    "fm_shareFolderPassword": "このフォルダをパスワードで保護（任意）",
+    "team_exportTitle": "チームのドライブをダウンロード",
+    "admin_invalLimit": "無効な制限値です",
+    "admin_limitSetNote": "メモ",
+    "admin_limitMB": "制限（MB）",
+    "broadcast_newCustom": "管理者からのメッセージ",
+    "admin_broadcastActive": "アクティブなメッセージ",
+    "fc_noAction": "利用可能なアクションはありません",
+    "support_closed": "このチケットは終了しました",
+    "support_cat_tickets": "既存のチケット",
+    "support_formHint": "このフォームから、管理者に問題の報告や質問を安全に行うことができます。<br>それらに関しては <a>CryptPadユーザーガイド</a>で回答されているものがあるかもしれません。既にチケットを作成している場合、同じ問題に関して新しいチケットを作成するのはお控えください。その代わりに、既存のチケットに追加の情報を送信してください。",
+    "support_disabledTitle": "サポートは有効になっていません",
+    "admin_supportListHint": "ユーザーからサポートのメールボックスに送信されたチケットの一覧です。管理者はメッセージと回答を閲覧できます。終了したチケットは再開することができます。終了したチケットについては削除する（隠す）ことができますが、他の管理者には引き続き表示されます。",
+    "drive_sfPassword": "共有フォルダ「 {0} 」は利用できません。オーナーにより削除されたか、新しいパスワードで保護されています。CryptDriveから削除するか、新しいパスワードを使ってアクセスを回復できます。",
+    "fm_info_sharedFolderHistory": "これは共有フォルダの履歴です: <b>{0}</b><br/>CryptDriveは閲覧モードを継続します。",
+    "notification_folderShared": "{0}があなたとフォルダを共有しました: <b>{1}</b>",
+    "convertFolderToSF_SFChildren": "このフォルダは共有フォルダを含んでいるため、共有フォルダに変更できません。続けるには、このフォルダを共有フォルダの外に移動してください。",
+    "sharedFolders_share": "このリンクを登録ユーザーと共有すると、共有フォルダへのアクセスが可能になります。相手がリンクを開くと、CryptDriveに共有フォルダが追加されます。",
+    "sharedFolders_duplicate": "移動しようとしているパッドのいくつかは既に移動先のフォルダに存在しています。",
+    "sharedFolders_forget": "このパッドは共有フォルダにのみ保存されているため、ゴミ箱に移動できません。あなたのCryptDriveから削除することは可能です。",
+    "settings_ownDriveHint": "技術上の理由で、旧アカウントは最新の機能にアクセスできません。フリーのアップデートで新しい機能が有効になり、CryptDriveの今後のアップデートにも対応します。",
+    "admin_activePadsHint": "閲覧もしくは編集中のドキュメント数",
+    "admin_activePadsTitle": "アクティブなパッド",
+    "admin_activeSessionsTitle": "アクティブな接続",
+    "fm_expirablePad": "期日: {0}",
+    "survey": "CryptPadのアンケート",
+    "share_embedCategory": "埋め込む",
+    "feedback_optout": "オプトアウトを希望の場合は、<a>設定画面</a>のチェックボックスでフィードバックを無効に設定してください。",
+    "home_host": "これはCryptPadの独立コミュニティーのインスタンスです。",
+    "team_deleteConfirm": "チーム全体のデータを全て削除しようとしています。削除すると、チームの他のメンバーもデータにアクセスできなくなります。これは取り消せません。削除してよろしいですか？",
+    "team_kickConfirm": "{0}はチームから削除された旨通知されます。よろしいですか？",
+    "admin_instancePurposeHint": "インスタンスを運用する目的は何ですか？テレメトリーが有効になっている場合、回答は開発ロードマップに利用されます。",
+    "admin_purpose_experiment": "プラットフォームのテストもしくは新機能の開発",
+    "admin_purpose_noanswer": "回答しない",
+    "admin_instancePurposeTitle": "インスタンスの目的",
+    "requestEdit_request": "{1}がパッド（<b>{0}</b>）の編集を希望しています",
+    "support_from": "<b>送信元:</b> {0}",
+    "admin_supportInitPrivate": "あなたのCryptPadのインスタンスは、サポートメールボックスを使用するよう設定されていますが、アクセスに必要な秘密鍵がアカウントに登録されていません。以下のフォームから、秘密鍵を登録もしくは更新してください。",
+    "resources_imageBlocked": "リモート画像をブロックしました",
+    "team_inviteLinkErrorName": "招待する人の名前を追加してください。名前は後から変更できます。 ",
+    "snapshots_ooPickVersion": "スナップショットの作成には、対象となるバージョンの選択が必要です",
+    "notification_folderSharedTeam": "{0}がチーム（{2}）とフォルダ（<b>{1}</b>）を共有しました",
+    "notification_fileSharedTeam": "{0}がチーム（{2}）とファイル（<b>{1}</b>）を共有しました",
+    "notification_padSharedTeam": "{0}がチーム（{2}）とパッド（<b>{1}</b>）を共有しました",
+    "requestEdit_accepted": "{1}があなたにパッド（<b>{0}</b>）の編集権を付与しました",
+    "admin_registrationHint": "ユーザーの新規登録を許可しない",
+    "oo_deletedVersion": "このバージョンは履歴に存在しません。",
+    "team_pickFriends": "チームに招待する連絡先を選択",
+    "notification_fileShared": "{0}があなたとファイルを共有しました: <b>{1}</b>",
+    "resources_openInNewTab": "新しいタブで開く",
+    "download_zip": "ZIPファイルを作成しています…",
+    "fileTableHeader": "ダウンロードとアップロード",
+    "share_copyProfileLink": "プロフィールのリンクをコピー",
+    "calendar_weekNumber": "{0}週",
+    "admin_support_closed": "終了したチケット:",
+    "admin_support_answered": "回答済のチケット:",
+    "admin_support_normal": "未回答のチケット:",
+    "admin_limitNote": "メモ: {0}",
+    "share_linkFriends": "連絡先と共有",
+    "share_filterFriend": "名前で検索",
+    "notification_padShared": "{0}があなたとパッドを共有しました: <b>{1}</b>",
+    "profile_friendRequestSent": "連絡先のリクエストは保留中です…",
+    "friendRequest_notification": "<b>{0}</b>があなたに連絡先への追加のリクエストを送信しました",
+    "friendRequest_received": "<b>{0}</b>が連絡先への追加を希望しています",
+    "friendRequest_declined": "<b>{0}</b>が連絡先のリクエストを拒否しました",
+    "admin_diskUsageHint": "CryptPadのリソースが消費しているストレージ容量",
+    "timeoutError": "エラーが発生してサーバーへの接続が切断されました。<br><em>Esc</em>キーを押してページを再読み込みしてください。",
+    "footer_team": "貢献者",
+    "admin_updateLimitHint": "ユーザーのストレージ制限の強制アップデートはいつでも可能です。エラーが発生したときは必須となります",
+    "admin_cat_general": "全般",
+    "poll_bookmarked_col": "列をブックマークしました。常に編集可能な仕方で左端に表示されます。",
+    "poll_bookmark_col": "この列をブックマークすると、常に編集可能な仕方で左端に表示されます",
+    "settings_colortheme_custom": "ユーザー定義",
+    "admin_getlimitsTitle": "個別の制限",
+    "admin_setlimitTitle": "個別の制限を適用",
+    "admin_setlimitHint": "公開鍵を使用して、ユーザーに個別の制限を設定します。既存のルールは変更または削除できます。",
+    "form_maxOptions": "{0}個まで回答可",
+    "form_anonymous_off": "ブロック",
+    "admin_checkupHint": "CryptPadには、一般的な構成に関する問題を自動で診断し、必要に応じてそれらを修正する方法を提案するページがあります。",
+    "admin_broadcastTitle": "メッセージを送信",
+    "admin_broadcastHint": "このインスタンスの全ユーザーにメッセージを送信します。ユーザーはメッセージを通知で受け取ります。送信前のメッセージは「通知をプレビュー」から確認できます。プレビューには赤いアイコンが付いており、プレビューはあなたの通知画面にのみ表示されます。",
+    "calendar_before": "前",
+    "share_formAuditor": "監査人",
+    "form_editMax": "選択できるオプションの最大数",
+    "form_invalidWarning": "回答にエラーがあります:",
+    "form_isOpen": "このフォームは公開中です",
+    "form_isClosed": "このフォームは{0}に閉じられました",
+    "form_willClose": "このフォームは{0}に終了します",
+    "settings_driveRedirectHint": "ログイン時にホームページからドライブに自動で転送する機能は、デフォルトで有効ではなくなりました。以前の動作は以下で有効にできます。",
+    "admin_removeDonateButtonLabel": "クラウドファンディングのキャンペーンの宣伝を表示しない",
+    "admin_purpose_public": "誰でも利用できるフリーのサービスを提供するため",
+    "owner_team_add": "{0}があなたをチーム（<b>{1}</b>）のオーナーにしようとしています。承諾しますか？",
+    "friendRequest_accepted": "<b>{0}</b>が連絡先リクエストを承諾しました",
+    "friendRequest_accept": "承諾（Enter）",
+    "admin_flushCacheHint": "サーバーから最新のコンテンツをダウンロードするようユーザーに強制（サーバーがフレッシュモードの場合のみ）",
+    "admin_activeSessionsHint": "アクティブなwebsocketの接続（および接続する一意のIPアドレス）の数",
+    "convertFolderToSF_SFParent": "このフォルダは別の共有フォルダ内にあるため、共有フォルダに変換できません。続行するには、外部に移動してください。",
+    "settings_deleteWarning": "注意：現在、プレミアムプランに加入しています（別のユーザーが支払いまたは提供）。アカウントを削除する前に、プランをキャンセルしてください。アカウントを削除すると、サポートに連絡しないとキャンセルできなくなります。",
+    "owner_request": "{0}はあなたを<b>{1}</b>のオーナーにしようとしています",
+    "owner_addConfirm": "共同オーナーは内容を変更したり、あなたをオーナーから削除したりすることができます。続行してよろしいですか？",
+    "download_zip_file": "ファイル {0}/{1}",
+    "documentID": "ドキュメントの識別子",
+    "admin_setlimitButton": "制限を設定",
+    "historyTrim_contentsSize": "内容: {0}",
+    "team_invitePasswordLoading": "招待状を復号化しています",
+    "team_pcsSelectLabel": "保存場所",
+    "admin_cat_broadcast": "お知らせ",
+    "docs_link": "ドキュメンテーション",
+    "admin_support_collapse": "折りたたむ",
+    "team_inviteFrom": "送信元:",
+    "admin_supportInitHint": "サポートのメールボックスを設定すると、あなたのCryptPadのインスタンスのユーザーが、アカウントから安全に問い合わせを行うことができるようになります。",
+    "isNotContact": "{0}はあなたの連絡先では<b>ありません</b>",
+    "isContact": "{0}はあなたの連絡先です",
+    "profile_info": "他のユーザーは、ドキュメントのユーザーリストであなたのアバターをクリックして、あなたのプロフィールを確認できます。",
+    "owner_removeMeConfirm": "オーナー権を放棄しようとしています。これは取り消せません。よろしいですか？",
+    "requestEdit_confirm": "{1}がパッド「<b>{0}</b>」の編集権を要求しました。編集権を与えますか？",
+    "admin_supportInitHelp": "サーバーはサポートメールボックスを使用するように設定されていません。サポートメールボックスを有効にし、ユーザーからメッセージを受け取るためには、サーバーの管理者に連絡し、「./scripts/generate-admin-keys.js」のスクリプトを実行してもらい、生成された公開鍵を「config.js」に保存して、秘密鍵をあなたに送信してもらうよう依頼する必要があります。",
+    "feedback_privacy": "私たちはプライバシーに配慮すると同時に、CryptPadを使いやすくしたいと望んでいます。このファイルは、実行されたアクションを特定するパラメーターと共に要求され、ユーザーにとって重要なUI機能を特定するために使用されます。",
+    "register_warning_note": "暗号化を行うCryptPadの性質上、サービス管理者は、ユーザー名とパスワードを忘れた場合にデータを回復することができません。ユーザー名とパスワードを安全な場所に保管してください。",
+    "history_restoreDriveTitle": "選択したバージョンのCryptDriveを復元",
+    "errorPopupBlocked": "新しいタブを開く許可が必要です。お使いのブラウザのアドレスバーから、ポップアップウィンドウを許可してください。これらのウィンドウが広告の表示に使用されることはありません。",
+    "settings_colorthemeHint": "このデバイスでのテーマ色を変更できます。",
+    "settings_colortheme_default": "システムのデフォルト ({0})",
+    "settings_codeBrackets": "括弧の自動補完",
+    "creation_helperText": "ドキュメンテーションを開く",
+    "contacts_info1": "連絡先の一覧が表示されます。ここでは以下を行うことができます:",
+    "share_noContactsLoggedIn": "連絡先がありません。プロフィールのリンクを共有して、連絡先のリクエストを送信してください。",
+    "settings_cat_security": "セキュリティー",
+    "whatis_collaboration_info": "<p>CryptPadはコラボレーションを念頭に作られています。ドキュメントに加えられる変更は、リアルタイムで同期されます。全てのデータは暗号化されているため、サービスとその管理者が、編集され保存されているコンテンツを覗き見ることはできません。</p>",
+    "whatis_apps": "フルスイートアプリケーション",
+    "whatis_drive_info": "<p>ドキュメントをCryptDriveに保存して管理できます。フォルダを作ったり共有したりできるほか、ドキュメントをタグ付けして整理することもできます。PDFファイル、写真、動画、音声などのファイルをアップロードして共有できます。チームのドライブを使うと、メンバーとデータを共有したり、ファイルの管理や、きめ細かいアクセス権のコントロールを行うことができます。</p>",
+    "whatis_model_info": "<p>CryptPadは2016年より、寄付金とcryptpad.frの定額利用のほか、BPIフランス、NLNet財団、NGI Trust、Mozillaオープンソースサポートといったフランス、EUの研究助成を受けています。私たちは、公的資金で作られたソフトウェアについては、コードも公的に公開されるべきであると考えているため、サービスは全てオープンソースで提供しています。誰でも自由にこのソフトウェアを使用、運営、改変することができます。</p><p>CryptPadは、ユーザーのデータを使って金銭上の利益を得ることはありません。これはプライバシーを尊重するオンラインサービスの展望の一部をなすものです。個人情報を使って金銭上の利益をあげながら「無料」を装う巨大プラットフォームとは違って、CryptPadは、ユーザーが自発的に支援を行うサービスのモデルを作ることを目指しています。</p><p>私たちは、CryptPadのサービスを無料で提供しています。それは、金銭的に余裕のある人々だけでなく、誰もがプライバシーを得るに値すると確信しているからです。もしあなたがこのプロジェクトを支援できる状況にあるなら、機能の開発や、改良、メンテナンスに参加していただきたく考えます。そうすることで、全てのユーザーに利益をもたらされるはずです。</p><p>このプロジェクトが実行可能であることが明らかになったいま、次のゴールは、ユーザーによる支援を通じて、プロジェクトを持続可能なものにすることにあります。CryptPadが、巨大プラットフォームに代わる持続可能なサービスを開発できるよう支援していただけるなら、一度もしくは継続的な寄付へのご協力をお願いいたします。</p>",
+    "whatis_xwiki_info": "<p>CryptPadはフランス、パリに所在する会社である<a>XWiki</a>にて開発されています。当社はオープンソース・ソフトウェアを15年以上にわたって開発しており、情報管理のための共同作業ソフトウェアの開発に関して豊富な経験をもっています。当社の実績は、私たちがCryptPadの長期的な開発と維持にコミットしていることを示しています。</p>",
+    "whatis_xwiki": "XWikiにて開発",
+    "history_restoreDrivePrompt": "CryptDriveの現在のバージョンを、表示されているバージョンに置き換えてよろしいですか？",
+    "owner_text": "パッドのオーナーは、オーナーの追加や削除、リストによるアクセス制限のほか、パッドの削除を行うことができます。",
+    "share_linkWarning": "このリンクは、ドキュメントを暗号化したり復号化したりする鍵を含んでいます。リンクを受け取った相手は、誰でも（ここにはコンピュータープログラムも含まれます）コンテンツにアクセスすることができます。",
+    "creation_expiresIn": "有効期限",
+    "settings_mediatagSizeHint": "ドキュメントに埋め込まれたメディア要素（画像、ビデオ、PDF）を自動で読み込む最大のサイズをメガバイト（MB）で指定してください。指定したサイズより大きい要素については、手動で読み込む必要があります。「-1」を設定すると、メディア要素は常に自動で読み込みます。",
+    "settings_mediatagSizeTitle": "自動ダウンロードの制限",
+    "settings_cacheHint": "CryptPadは、帯域の使用量を減らし、読み込み時間を短縮することを目的に、ドキュメントの各部分をブラウザ上のメモリに保存しています。もし空き容量が少なければ、キャッシュを無効にしてください。セキュリティー上の懸念から、キャッシュはログアウト時に毎回消去されますが、手動でキャッシュを消去して、デバイスの空き容量を確保することもできます。",
+    "team_infoContent": "それぞれのチームには、チーム所有のCryptDrive、ストレージのクォータ、チャット、メンバーリストが備わっています。チームのオーナーはチームを削除することができます。管理者はメンバーを招待したりキックしたりすることができます。メンバーは、チームを退会することができます。",
+    "home_support": "<p>開発チームは、ユーザーのデータを使って金銭上の利益を得ることはありません。これはプライバシーを尊重するオンラインサービスの展望の一部をなすものです。個人情報を使って金銭上の利益をあげながら「無料」を装う巨大プラットフォームとは違って、CryptPadは、ユーザーが自発的に支援を行うサービスのモデルを作ることを目指しています。</p><p>Open Collectiveから、一度もしくは継続的な寄付を行い、プロジェクトを支援していただくことができます。予算には透明性があり、更新については定期的に報告を行っています。<a>お金によらずに貢献する方法</a>も数多くあります。</p>",
+    "form_default": "ここに質問を入力",
+    "form_poll_switch": "行と列を入れ替える",
+    "settings_kanbanTagsHint": "複数のタグを選択したときにタグフィルターがどのように機能するかについて、「かつ」もしくは「または」から選択できます。「かつ」を選択すると、選択したタグを全て含むカードのみを表示し、「または」を選択すると、選択したタグのいずれかを含むカードを表示します。",
+    "notifications_cat_pads": "共有に関する通知",
+    "form_type_multicheck": "チェックボックス式グリッド",
+    "form_type_multiradio": "選択式グリッド",
+    "form_type_sort": "番号付きリスト",
+    "safeLinks_error": "このリンクはブラウザーのアドレスバーからコピーされており、ドキュメントにアクセスすることはできません。<i></i> <b>共有</b>メニューを使って、連絡先と直接ドキュメントを共有するか、リンクをコピーしてください。<a>セーフリンク機能についてはこちらよりご確認ください</a>。",
+    "team_cat_general": "チームについて",
+    "team_ownerConfirm": "共同オーナーはチームを変更もしくは削除したり、あなたをオーナーから削除したりすることができます。続行してよろしいですか？",
+    "owner_request_accepted": "{0}はあなたのリクエストを承諾し、「<b>{1}</b>」のオーナーになりました",
+    "team_acceptInvitation": "{0}がチーム「<b>{1}</b>」への招待を承諾しました",
+    "team_declineInvitation": "{0}がチーム「<b>{1}</b>」への招待を拒否しました",
+    "team_inviteLinkWarning": "このリンクにアクセスする最初の人は、このチームに参加して、コンテンツを閲覧することができます。リンクは慎重に共有してください。",
+    "team_inviteLinkTitle": "このチームへの招待状を好みに合わせて作成",
+    "team_inviteLinkTempName": "一時的な名前（招待の保留中リストに表示）",
+    "team_inviteLinkNoteMsg": "このメッセージは、チームに参加するかどうかを決める前に表示されます。",
+    "owner_removedPending": "{0}は「<b>{1}</b>」に関するオーナー権の申し出をキャンセルしました",
+    "team_pendingOwnerTitle": "この管理者はオーナー権の申し出を受諾していません。",
+    "team_rosterPromoteOwner": "オーナー権を提供",
+    "owner_removed": "{0}は「<b>{1}</b>」に関するあなたのオーナー権を削除しました",
+    "owner_request_declined": "{0}は「<b>{1}</b>」のオーナーになる依頼を拒否しました",
+    "team_demoteMeConfirm": "オーナー権を放棄しようとしています。これは取り消せません。よろしいですか？",
+    "share_noContactsNotLoggedIn": "ログインもしくは新規登録して、連絡先を確認するか新たに追加してください。",
+    "passwordFaqLink": "パスワードについて確認",
+    "share_embedPasswordAlert": "この項目はパスワードで保護されています。このパッドを埋め込む際、閲覧にはパスワードの入力が必要となります。",
+    "share_contactPasswordAlert": "この項目はパスワードで保護されています。CryptPadの連絡先と共有するため、相手がパスワードを入力する必要はありません。",
+    "share_linkPasswordAlert": "この項目はパスワードで保護されています。リンクを受け取った相手はパスワードを入力する必要があります。",
+    "register_notes_title": "重要な注意事項",
+    "teams_table_specificHint": "以前のバージョンの共有フォルダでは、閲覧者は既存のパッドを変更することができます。 これらのフォルダで作成またはコピーしたパッドには、標準の権限が与えられます。",
+    "broadcast_maintenance": "<b>{0}</b>から<b>{1}</b>の間でメンテナンスを予定しています。その間CryptPadは利用できません。",
+    "admin_archiveHint": "ドキュメントを破棄することなく、利用できないよう設定できます。「アーカイブ」フォルダに移動し、数日後に削除します（期間については設定ファイルより設定できます）。",
+    "admin_unarchiveHint": "アーカイブされたドキュメントを復元できます",
+    "admin_registrationTitle": "登録を締め切る",
+    "admin_defaultlimitHint": "ユーザー定義のルールが適用されていない際の最大のストレージ容量（ユーザーとチームについて）を設定できます",
+    "admin_limit": "現在の制限: {0}",
+    "admin_getquotaHint": "ユーザーもしくはチームの公開鍵を入力して、設定されているクォータに対するストレージの使用量を確認できます。",
+    "admin_openFilesHint": "サーバー上で現在開いているファイル記述子の数",
+    "admin_support_premium": "プレミアムチケット:",
+    "admin_maintenanceHint": "このインスタンスのメンテナンスの日程を設定し、ユーザーに通知を送ることができます。メンテナンスの日程を複数設定することはできません。",
+    "admin_surveyHint": "外部サイトで行うアンケートのリンクを追加、更新、削除できます。ユーザーには通知が送信され、アンケートはユーザーのメニューから開くことができます。",
+    "broadcast_defaultLanguage": "この言語にフォールバック",
+    "admin_performanceProfilingHint": "サーバー側でコマンドを実行する際に掛かった合計時間の一覧です",
+    "admin_consentToContactHint": "サーバーのテレメトリーには、ソフトウェアや設定に関する重大な問題が発生した際に開発者が連絡できるよう、管理者の連絡先のメールアドレスが含まれます。メールアドレスが共有、売却、マーケティングの目的で使用されることはありません。サーバーに重大な問題が発生した際に連絡を希望する場合は、「同意する」にチェックを付けてください。",
+    "admin_removeDonateButtonHint": "CryptPadの開発の一部は、公的な助成金と寄付金によってまかなわれています。クラウドファンディングに関する宣伝をあなたのインスタンスで行うことで、開発者が万人のためにプラットフォームを改良することへの支援につながります。ただし、もし宣伝が不適切な場合は、宣伝を無効にすることもできます。",
+    "admin_performanceTimeHeading": "時間（秒）",
+    "team_maxTeams": "それぞれのユーザーアカウントがメンバーになることができるのは、最大{0}チームまでです。",
+    "team_listSlot": "利用可能なチームのスロット",
+    "resources_learnWhy": "ブロックした理由について",
+    "admin_purpose_business": "ビジネス・営利団体での使用",
+    "admin_purpose_education": "教育機関での使用",
+    "admin_purpose_org": "非営利団体・支援団体での使用",
+    "admin_purpose_personal": "個人利用、家族、友人との利用",
+    "burnAfterReading_linkBurnAfterReading": "一度だけ表示した後に自動で削除",
+    "feedback_about": "これを読んでいるのは、特定のアクションの実行時にCryptPadがウェブページのリクエストを送信している理由が気になるからだと思います。",
+    "burnAfterReading_warningLink": "パッドを自動削除に設定しました。リンクを受け取った相手がリンクを開くと、パッドは一度だけ表示され、その後削除されます。",
+    "burnAfterReading_warningAccess": "このドキュメントは自動的に削除されます。下のボタンをクリックするとコンテンツが自動的に表示され、その後で削除されます。ドキュメントを表示した後でウィンドウを閉じると、二度とドキュメントにアクセスすることはできません。準備ができていない場合は、ドキュメントを表示する前にこのウィンドウを閉じて、後ほどアクセスしてください。",
+    "form_sort_hint": "項目を優先順位（1が最も高く{0}が最も低い）に従って並べてください。",
+    "canvas_brush": "ペン",
+    "share_versionHash": "ドキュメントの選択したバージョンを閲覧モードで共有します。それにより、このドキュメントの全てのバージョンへの<b>読み取り専用アクセス</b>も可能になります。",
+    "history_cantRestore": "復元に失敗しました。接続が切れています。",
+    "todo_move": "タスクリストはCryptDriveのカンバン「<b>{0}</b>」に移動しました。",
+    "info_imprintFlavour": "<a>このインスタンスの管理者に関する法的情報</a>。",
+    "settings_safeLinkDefault": "セーフリンクは既定で有効になっています。ブラウザーのアドレスバーではなく、<i></i> <b>共有</b>メニューを使ってリンクをコピーしてください。",
+    "comments_notification": "<b>{1}</b>でのあなたのコメント「{0}」に対する返信",
+    "infobar_versionHash": "このドキュメントの過去のバージョンを閲覧しています（{0}）。",
+    "history_fastNext": "次の編集セッション",
+    "history_fastPrev": "以前の編集セッション",
+    "unableToDisplay": "ドキュメントを表示できません。Escキーを押してページの再読み込みを行ってください。問題が継続する場合は、サポートに連絡してください。",
+    "snapshots_cantMake": "スナップショットを作成できませんでした。接続が切れています。",
+    "snapshots_notFound": "ドキュメントの履歴が削除されたため、スナップショットは存在しません。",
+    "snapshot_error_exists": "このバージョンのスナップショットは既に存在します",
+    "calendar_dateTimeRange": "{0} {1} - {2}",
+    "toolbar_degraded": "現在{0}人以上がこのドキュメントを編集しています。パフォーマンスの改善のため、ユーザーリストとチャットを無効に設定しました。",
+    "oo_lostEdits": "新しいデータと同期したため、保存されていない編集箇所を復元することができませんでした。",
+    "pad_settings_comments": "コメントを既定で表示するか隠すかを選択してください。",
+    "pad_settings_outline": "目次を既定で表示するか隠すかを選択してください。",
+    "pad_settings_width_large": "最大幅",
+    "offlineError": "データを同期できないため、このページは現在表示できません。サービスへの接続が復旧すると読み込みを継続します。",
+    "share_noContactsOffline": "現在オフラインです。連絡先にアクセスすることはできません。",
+    "access_offline": "現在オフラインです。管理画面にアクセスすることはできません。",
+    "admin_support_last": "アップデートした日時: ",
+    "admin_support_first": "作成日時: ",
+    "contacts_confirmCancel": "<b>{0}</b>との連絡先リクエストをキャンセルしてよろしいですか？",
+    "history_trimPrompt": "このドキュメントは{0}の履歴があり、読み込みを遅くしている恐れがあります。必要でない場合は、履歴の削除を検討してください。",
+    "reminder_date": "<b>{0}</b>が{1}にあります",
+    "calendar_more": "あと{0}個",
+    "reminder_time": "<b>{0}</b>が今日の{1}にあります",
+    "form_answerWarning": "本人であることが確認されていません",
+    "team_leaveOwner": "チームから退出する前に、オーナーの役割から降格してください。チームには最低1人以上のオーナーが必要です。あなたが唯一のオーナーの場合は、別のオーナーを追加してください。",
+    "form_exportCSV": "CSVにエクスポート",
+    "fm_link_new": "新しいリンク",
+    "notification_openLink": "{1}からリンク「 <b>{0}</b>」を受け取りました：",
+    "fm_link_type": "リンク",
+    "fm_link_url": "URL",
+    "fm_link_name": "リンク名",
+    "form_anonName": "あなたの名前",
+    "notification_linkShared": "{0}があなたとリンクを共有しました: <b>{1}</b>",
+    "fm_link_name_placeholder": "あなたのリンク",
+    "fm_link_warning": "注意：URLが200字を超えています",
+    "fm_link_invalid": "URLが無効です",
+    "form_answerAs": "名前を記入してください"
 }
diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json
index 5ada6865a..035275177 100644
--- a/www/common/translations/messages.json
+++ b/www/common/translations/messages.json
@@ -13,7 +13,8 @@
         "todo": "Todo",
         "contacts": "Contacts",
         "sheet": "Sheet",
-        "teams": "Teams"
+        "teams": "Teams",
+        "form": "Form"
     },
     "button_newpad": "New Rich Text pad",
     "button_newcode": "New Code pad",
@@ -286,7 +287,7 @@
     "fm_info_template": "Contains all the pads stored as templates and that you can re-use when you create a new pad.",
     "fm_info_recent": "These pads have recently been opened or modified by you or people you collaborate with.",
     "fm_info_trash": "Empty your trash to free space in your CryptDrive.",
-    "fm_info_anonymous": "You are not logged in so your documents will expire after {0} days. Clearing your browser's history may make them disappear.<br><a href=\"/register/\">Sign up</a> (no personal information required) or <a href=\"/login/\">Log in</a> to store them in your drive indefinitely. <a href=\"https://docs.cryptpad.fr/en/user_guide/user_account.html#account-types\" target=\"_blank\">Read more about registered accounts</a>.",
+    "fm_info_anonymous": "You are not logged in so your documents will expire after {0} days. Clearing your browser's history may make them disappear.<br><a href=\"/register/\">Sign up</a> (no personal information required) or <a href=\"/login/\">Log in</a> to store them in your drive indefinitely. <a href=\"#docs\">Read more about registered accounts</a>.",
     "fm_info_sharedFolder": "This is a shared folder. You're not logged in so you can only access it in read-only mode.<br><a href=\"/register/\">Sign up</a> or <a href=\"/login/\">Log in</a> to be able to import it to your CryptDrive and to modify it.",
     "fm_info_owned": "You are the owner of the pads displayed here. This means you can remove them permanently from the server whenever you want. If you do so, other users won't be able to access them anymore.",
     "fm_error_cantPin": "Internal server error. Please reload the page and try again.",
@@ -909,7 +910,7 @@
     "access_main": "Access",
     "access_allow": "List",
     "accessButton": "Access",
-    "restrictedError": "You are not authorised to access this document",
+    "restrictedError": "You are not authorized to access this document",
     "contacts": "Contacts",
     "access_noContact": "No other contact to add",
     "allow_checkbox": "Enable access list",
@@ -917,7 +918,7 @@
     "allow_disabled": "disabled",
     "allow_label": "Access list: {0}",
     "access_muteRequests": "Mute access requests for this pad",
-    "owner_text": "The owner(s) of a pad are the only users authorised to: add/remove owners, restrict access to the pad with an access list, or delete the pad.",
+    "owner_text": "The owner(s) of a pad are the only users authorized to: add/remove owners, restrict access to the pad with an access list, or delete the pad.",
     "logoutEverywhere": "Log out everywhere",
     "allow_text": "Using an access list means that only selected users and owners will be able to access this document.",
     "teams": "Teams",
@@ -1116,7 +1117,7 @@
     "whatis_model": "Business model",
     "whatis_model_info": "<p>CryptPad has been supported since 2016 by French and European research grants such as BPI France, NLNet Foundation, NGI Trust, Mozilla Open Source Support, as well as donations and subscriptions to cryptpad.fr. We believe that public money should fund public code, so the service is fully open source. This means anyone can use, host, and modify the software.</p><p>CryptPad does not profit from user data. This is part of a vision for online services that respect privacy. Unlike the big platforms that pretend to be \"free\" while making profits from personal information, CryptPad aims to build a sustainable model funded willingly by users.</p><p>We offer CryptPad's functionality for free because we believe everyone deserves personal privacy, not just people with disposable income. If you are in a position to support the project, you will contribute new features, improvements and maintenance that benefit all users.</p><p>Now that the feasibility of the project has been established, the next goal is to make it financially sustainable through user funding. If you would like to support CryptPad and help make it a sustainable alternative to the big platforms, please consider making a one-time or recurring donation.</p>",
     "whatis_xwiki": "Made at XWiki",
-    "whatis_xwiki_info": "<p>CryptPad is made at <a>XWiki</a>, a company based in Paris, France that has been making open-source software for over 15 years. We have extensive experience making collaborative software to organise information. Our track record shows we are committed to the long-term development and maintenance of CryptPad.</p>",
+    "whatis_xwiki_info": "<p>CryptPad is made at <a>XWiki</a>, a company based in Paris, France that has been making open-source software for over 15 years. We have extensive experience making collaborative software to organize information. Our track record shows we are committed to the long-term development and maintenance of CryptPad.</p>",
     "creation_expiresIn": "Expires in",
     "creation_helperText": "Open in documentation",
     "docs_link": "Documentation",
@@ -1229,6 +1230,154 @@
     "genericCopySuccess": "Copied to clipboard",
     "mediatag_defaultImageName": "image",
     "register_registrationIsClosed": "Registration is closed.",
-    "oo_conversionSupport": "Your browser cannot handle conversion to and from Microsoft Office formats. We suggest using a recent version of Firefox or Chrome.",
-    "oo_importBin": "Click OK to import CryptPad's internal .bin format."
+    "oo_conversionSupport": "Your browser cannot handle conversion to and from office formats. We suggest using a recent version of Firefox or Chrome.",
+    "oo_importBin": "Click OK to import CryptPad's internal .bin format.",
+    "admin_emailTitle": "Admin contact email",
+    "admin_emailHint": "Set the contact email for your instance here",
+    "admin_supportPrivTitle": "Support mailbox private key",
+    "admin_supportInitGenerate": "Generate support keys",
+    "admin_supportPrivHint": "Display the private key that other admins will need to view support tickets. A form to enter this key will be displayed on their admin panel.",
+    "admin_supportPrivButton": "Show key",
+    "admin_emailButton": "Update",
+    "share_formEdit": "Author",
+    "share_formAuditor": "Auditor",
+    "share_formView": "Participant",
+    "button_newform": "New Form",
+    "form_invalid": "Invalid form",
+    "form_editBlock": "Edit",
+    "form_editMax": "Maximum selectable options",
+    "form_editMaxLength": "Maximum characters",
+    "form_editType": "Option type",
+    "form_poll_text": "Text",
+    "form_poll_day": "Day",
+    "form_poll_time": "Time",
+    "form_poll_switch": "Swap axes",
+    "form_pollTotal": "Total",
+    "form_pollYourAnswers": "Your answers",
+    "form_textType": "Text type",
+    "form_text_text": "Text",
+    "form_text_url": "Link",
+    "form_text_email": "Email",
+    "form_text_number": "Number",
+    "form_default": "Your question here?",
+    "form_type_input": "Text",
+    "form_type_textarea": "Paragraph",
+    "form_type_radio": "Choice",
+    "form_type_multiradio": "Choice Grid",
+    "form_type_checkbox": "Checkbox",
+    "form_type_multicheck": "Checkbox Grid",
+    "form_type_poll": "Poll",
+    "form_type_sort": "Ordered list",
+    "form_sort_hint": "Please drag these items from most (1) to least ({0}) preferred.",
+    "form_type_md": "Description",
+    "form_type_page": "Page break",
+    "form_description_default": "Your text here",
+    "form_duplicates": "Duplicate entries have been removed",
+    "form_maxOptions": "maximum {0} answer(s)",
+    "form_maxLength": "Character limit: {0}/{1}",
+    "form_submit": "Submit",
+    "form_update": "Update",
+    "form_reset": "Reset",
+    "form_sent": "Your response was submitted",
+    "form_delete": "Delete",
+    "form_submitWarning": "Submit anyway",
+    "form_updateWarning": "Update anyway",
+    "form_cantFindAnswers": "Unable to retrieve your existing answers for this form.",
+    "form_answered": "You have already answered this form",
+    "form_results": "Responses",
+    "form_results_empty": "There are no responses",
+    "form_editor": "Editor",
+    "form_form": "Form",
+    "form_showIndividual": "Show individual answers",
+    "form_showSummary": "Show summary",
+    "form_answerAnonymous": "Anonymous answer on {0}",
+    "form_viewButton": "View",
+    "form_backButton": "Back",
+    "form_answerName": "Answer from {0} on {1}",
+    "form_answerWarning": "Unconfirmed identity",
+    "form_notAnswered": "<b>{0}</b> empty answers",
+    "form_input_ph_email": "email@example.com",
+    "form_input_ph_url": "https://example.com",
+    "form_invalidWarning": "There are errors in some answers:",
+    "form_invalidQuestion": "Question {0}",
+    "form_makePublic": "Publish responses",
+    "form_makePublicWarning": "Are you sure you want to make responses to this form public? This cannot be undone.",
+    "form_isPublic": "Responses are public",
+    "form_isPrivate": "Responses are private",
+    "form_open": "Open",
+    "form_setEnd": "Set closing date",
+    "form_removeEnd": "Remove closing date",
+    "form_isOpen": "This form is open",
+    "form_isClosed": "This form was closed on {0}",
+    "form_willClose": "This form will close on {0}",
+    "form_anonymous": "Anonymous answers",
+    "form_anonymous_on": "Allowed",
+    "form_anonymous_off": "Blocked",
+    "form_defaultOption": "Option {0}",
+    "form_defaultItem": "Item {0}",
+    "form_newOption": "New option",
+    "form_newItem": "New item",
+    "form_add_option": "Add option",
+    "form_add_item": "Add item",
+    "form_anonymous_blocked": "Anonymous responses are blocked for this form. You must <a href=\"/login/\">log in</a> or <a href=\"/register/\">register</a> to submit answers.",
+    "form_addMultiple": "Add all",
+    "form_addMultipleHint": "Add multiple dates and times",
+    "form_clear": "Clear",
+    "form_page": "Page {0}/{1}",
+    "form_anonymousBox": "Answer anonymously",
+    "settings_driveRedirectTitle": "Home page redirection",
+    "settings_driveRedirectHint": "Automatic redirection from the home page to the drive when logged in is no longer enabled by default. Legacy behaviour can be enabled below.",
+    "settings_driveRedirect": "Automatically redirect me",
+    "copyToClipboard": "Copy to clipboard",
+    "restrictedLoginPrompt": "You are not authorized to access this document. <a>Log in</a> if you think your account should be able to access it.",
+    "mdToolbar_embed": "Embed file",
+    "admin_cat_network": "Network",
+    "admin_updateAvailableTitle": "New versions",
+    "admin_updateAvailableHint": "A new version of CryptPad is available",
+    "admin_updateAvailableButton": "See release notes",
+    "admin_checkupTitle": "Validate instance configuration",
+    "admin_checkupHint": "CryptPad includes a page which automatically diagnoses common configuration issues and suggests how to correct them if necessary.",
+    "admin_checkupButton": "Run diagnostics",
+    "admin_consentToContactTitle": "Consent to contact",
+    "admin_consentToContactHint": "Server telemetry includes the admin contact email so that the developers can notify you of serious problems with the software or your configuration. It will never be shared, sold, or used for marketing purposes. Consent to contact if you'd like to be informed of critical issues in your server.",
+    "admin_consentToContactLabel": "I consent",
+    "admin_listMyInstanceTitle": "List my instance in public directories",
+    "admin_listMyInstanceHint": "If your instance is suitable for public use you may consent to be listed in web directories. Server telemetry must be enabled for this to have any effect.",
+    "admin_listMyInstanceLabel": "List this instance",
+    "admin_removeDonateButtonTitle": "Crowdfunding participation",
+    "admin_removeDonateButtonHint": "CryptPad's development is partially funded by public grants and donations. Advertizing our crowdfunding efforts on your instance help the developers to continue improving the platform for everybody, but you may disable these notices if you find them inappropriate.",
+    "admin_removeDonateButtonLabel": "Do not advertize crowdfunding campaigns",
+    "admin_blockDailyCheckTitle": "Server telemetry",
+    "admin_blockDailyCheckHint": "CryptPad instances send a message to the developers' server when launched and once per day thereafter. This lets them keep track of how many servers are running which versions of the software. You can opt-out of this measurement below. The contents of this message can be found in the application server's log for your review.",
+    "admin_blockDailyCheckLabel": "Disable server telemetry",
+    "admin_provideAggregateStatisticsTitle": "Statistical aggregation",
+    "admin_provideAggregateStatisticsHint": "You may opt-in to providing additional usage metrics to the developers, such as the approximate number of registered and daily users for your instance.",
+    "admin_provideAggregateStatisticsLabel": "Provide aggregated statistics",
+    "form_poll_hint": "<i></i>: Yes, <i></i>: No, <i></i>: Acceptable",
+    "fc_open_formro": "Open (as participant)",
+    "resources_imageBlocked": "CryptPad blocked a remote image",
+    "resources_openInNewTab": "Open it in a new tab",
+    "resources_learnWhy": "Learn why it was blocked",
+    "admin_instancePurposeTitle": "Instance purpose",
+    "admin_purpose_noanswer": "I prefer not to say",
+    "admin_purpose_experiment": "To test the platform or develop new features",
+    "admin_purpose_personal": "For myself, family, or friends",
+    "admin_purpose_org": "For a non-profit organization or advocacy group",
+    "admin_purpose_education": "For a school, college, or university",
+    "admin_purpose_public": "To provide a free service to the public",
+    "admin_purpose_business": "For a business or commercial organization",
+    "admin_instancePurposeHint": "Why do you run this instance? Your answer will be used to inform the development roadmap if your telemetry is enabled.",
+    "team_leaveOwner": "Please demote yourself from the owner role before leaving the team. Note that teams must have at least one owner, please add one before proceeding if you are currently the only owner.",
+    "form_exportCSV": "Export to CSV",
+    "notification_openLink": "You've received a link <b>{0}</b> from {1}:",
+    "fm_link_new": "New Link",
+    "fm_link_type": "Link",
+    "fm_link_name": "Link name",
+    "fm_link_url": "URL",
+    "fm_link_name_placeholder": "My link",
+    "notification_linkShared": "{0} has shared a link with you: <b>{1}</b>",
+    "form_anonName": "Your name",
+    "form_answerAs": "Answer as",
+    "fm_link_warning": "Warning: the URL exceeds 200 characters",
+    "fm_link_invalid": "Invalid URL"
 }
diff --git a/www/common/translations/messages.lt.json b/www/common/translations/messages.lt.json
new file mode 100644
index 000000000..9d252e196
--- /dev/null
+++ b/www/common/translations/messages.lt.json
@@ -0,0 +1,208 @@
+{
+    "backgroundButtonTitle": "Pakeiskite pristatymo fono spalvą",
+    "presentButtonTitle": "Įeikite į pristatymo režimą",
+    "previewButtonTitle": "Rodyti arba slėpti „Markdown“ peržiūros režimą",
+    "template_empty": "Šablono nėra",
+    "template_import": "Importuoti šabloną",
+    "useTemplateCancel": "Pradėk šviežiai (Esc)",
+    "useTemplateOK": "Pasirinkite šabloną (Enter)",
+    "useTemplate": "Pradėti nuo šablono?",
+    "selectTemplate": "Pasirinkite šabloną arba paspauskite „escape“",
+    "templateSaved": "Šablonas išsaugotas!",
+    "saveTemplatePrompt": "Pasirinkite šablono pavadinimą",
+    "saveTemplateButton": "Išsaugoti kaip šabloną",
+    "uploadButtonTitle": "Įkelkite naują failą į savo „CryptDrive“",
+    "uploadFolderButton": "Įkelti aplanką",
+    "uploadButton": "Įkelti failus",
+    "newButtonTitle": "Sukurti naują padą",
+    "newButton": "Naujas",
+    "userAccountButton": "Tavo paskyra",
+    "chatButton": "Čiatas",
+    "userListButton": "Vartotojų sąrašas",
+    "shareSuccess": "Nukopijuota nuoroda",
+    "shareButton": "Dalintis",
+    "movedToTrash": "Šis apdas buvo perkeltas į šiukšliadėžę. <br> <a> Pasiekite mano diską </a>",
+    "forgetPrompt": "Spustelėjus Gerai, ši trinkelė bus perkelta į šiukšliadėžę. Ar tu tuo tikras?",
+    "forgetButton": "Ištrinti",
+    "saveTitle": "Išsaugoti pavadinimą (enter)",
+    "clickToEdit": "Spauskite redaguoti",
+    "user_accountName": "Paskyros vardas",
+    "user_displayName": "Rodomas pavadinimas",
+    "user_rename": "Keisti rodomą pavadinimą",
+    "changeNamePrompt": "Pakeiskite savo vardą (palikite tuščią, kad būtų anoniminis): ",
+    "exportPrompt": "Kaip norėtumėte pavadinti savo failą?",
+    "exportButtonTitle": "Eksportuokite padą į vietinį failą",
+    "exportButton": "Eksportuoti",
+    "importButton": "Importuoti",
+    "importButtonTitle": "Importuokite padą iš vietinio failo",
+    "pinLimitDrive": "Pasiekėte saugyklos limitą. <br> Negalite sukurti naujų padų.",
+    "pinLimitNotPinned": "Pasiekėte saugyklos limitą. <br> Šis padas nėra saugomas jūsų „CryptDrive“.",
+    "pinLimitReachedAlertNoAccounts": "Pasiekėte saugyklos limitą",
+    "pinLimitReachedAlert": "Pasiekėte saugyklos limitą. Nauji padai nebus saugomi jūsų „CryptDrive“. <br> Norėdami padidinti savo limitą, galite pašalinti padus iš savo „CryptDrive“ arba <a> užsiprenumeruoti  </a>premium sąskaitą.",
+    "pinLimitReached": "Pasiekėte saugyklos limitą",
+    "formattedKB": "{0} KB",
+    "formattedGB": "{0} GB",
+    "formattedMB": "{0} MB",
+    "KB": "KB",
+    "GB": "GB",
+    "MB": "MB",
+    "storageStatus": "Saugykla: <br /> <b> {0} </b> sunaudota iš <b> {1} </b>",
+    "upgrade": "Atnaujinti",
+    "upgradeAccount": "Atnaujinti paskyrą",
+    "language": "Kalba",
+    "userlist_offline": "Šiuo metu esate neprisijungę, vartotojų sąrašas nepasiekiamas.",
+    "editor": "redaktorius",
+    "viewers": "žiūrovai",
+    "viewer": "žiūrovas",
+    "users": "Vartotojai",
+    "anonymous": "Anoniminis",
+    "readonly": "Tik skaityti",
+    "errorState": "Kritinė klaida: {0}",
+    "forgotten": "Perkeltas į šiukšliadėžę",
+    "initializing": "Inicijuojama ...",
+    "typing": "Redaguojama",
+    "reconnecting": "Jungiamasi iš naujo",
+    "synchronizing": "Sinchronizuojama",
+    "disconnected": "Atjungta",
+    "realtime_unrecoverableError": "Įvyko neatkuriama klaida. Norėdami perkrauti, spustelėkite Gerai.",
+    "disabledApp": "Ši programa buvo išjungta. Norėdami gauti daugiau informacijos, susisiekite su „CryptPad“ administratoriumi.",
+    "mustLogin": "Norėdami patekti į šį puslapį, turite būti prisijungę",
+    "deletedFromServer": "Dokumentas ištrintas",
+    "deleted": "Ištrinta",
+    "saved": "Užsaugota",
+    "error": "Klaida",
+    "loading": "Kraunasi...",
+    "newVersionError": "Yra nauja „CryptPad“ versija. <br> <a href='#'> Perkraukite iš naujo </a>, jei norite naudoti naują versiją, arba paspauskite „Escape“, kad pasiektumėte savo turinį <b> offline režimu </b>.",
+    "errorRedirectToHome": "Paspauskite <em> Esc </em>, kad būtumėte nukreipti į „CryptDrive“.",
+    "errorCopy": " Vis dar galite naudoti dabartinę versiją tik skaitymo režimu paspausdami <em> Esc </em>.",
+    "invalidHashError": "Prašytame dokumente yra neteisingas URL.",
+    "chainpadError": "Atnaujinant turinį įvyko kritinė klaida. Šis puslapis veikia tik skaitymo režimu, kad neprarastumėte savo darbo. <br> Jei norite toliau peržiūrėti šį padą, paspauskite <em> Esc </em> arba įkelkite iš naujo, jei norite bandyti redaguoti dar kartą.",
+    "inactiveError": "Šis padas buvo ištrintas dėl neveiklumo. Paspauskite Esc, kad sukurtumėte naują padą.",
+    "deletedError": "Šis dokumentas ištrintas ir jo nebėra.",
+    "expiredError": "Šis Padas nebegalioja ir yra ištrintas.",
+    "anonymousStoreDisabled": "Šios instancijos nepalaiko anoniminio vartojimo. Jūs turite prisiregistruoti, kad galėtumete naudoti CryptDrive.",
+    "padNotPinnedVariable": "Šis padas nustos galioti po {4} neaktyvių dienų, {0}prisijungti{1} arba {2}registruotis{3} kad užsaugoti.",
+    "padNotPinned": "Nenaudojamas padas nustos galioti po 3mėn, {0}prisijungti{1} arba {2} registruotis{3} kad užsaugoti.",
+    "onLogout": "Jūs esate prisijungęs, {0}Spausti čia{1}Prisjungti čia<br>arba spausti <em>Escape</em> pasiekti savo pad tik skaityti.",
+    "typeError": "Šis Pad nesuderinama su pasirinkta programa",
+    "common_connectionLost": "<b> serverio sujungimas prarastas<b><br> Tik skaitymo rėžimas kol sujungimas atsiras.",
+    "button_newsheet": "Naujas Lapas",
+    "button_newkanban": "Naujas kanbanas",
+    "button_newwhiteboard": "Nauja Lenta",
+    "button_newslide": "Nauja prezentacija",
+    "button_newpoll": "Nauja apklausa",
+    "button_newcode": "Naujas Kodas",
+    "button_newpad": "Naujas Tekstas",
+    "type": {
+        "form": "Forma",
+        "teams": "Komandos",
+        "sheet": "Lapas",
+        "contacts": "Kontaktai",
+        "todo": "Todo",
+        "media": "Medija",
+        "file": "Failas",
+        "whiteboard": "Lenta",
+        "drive": "CryptDiskas",
+        "slide": "Prezentacija",
+        "kanban": "Kanbanas",
+        "poll": "Apklausa",
+        "code": "Kodas",
+        "pad": "Tekstas"
+    },
+    "main_title": "CryptPad: lengvai valdomas, bendradarbiavimas realiuoju laiku",
+    "filePicker_close": "Uždaryti",
+    "filePickerButton": "Įterpkite failą, saugomą „CryptDrive“",
+    "printBackgroundRemove": "Pašalinkite šį foną",
+    "printBackgroundNoValue": "<em> Foninis vaizdas nerodomas </em>",
+    "printBackgroundValue": "<b> Dabartinis darbalaukis: </b> <em> {0} </em>",
+    "printBackgroundButton": "Pasirinkti paveiksliuką",
+    "printBackground": "Naudokite fono vaizdą",
+    "printTransition": "Įgalinti perėjimo animacijas",
+    "printCSS": "Stiliaus taisyklės (CSS):",
+    "printTitle": "Parodykite pado pavadinimą",
+    "printDate": "Rodyti datą",
+    "printSlideNumber": "Rodyti skaidrės numerį",
+    "printOptions": "Išdėstymo parinktys",
+    "printButtonTitle2": "Atspausdinkite dokumentą arba eksportuokite jį kaip PDF failą",
+    "printButton": "Atspausdinti (neter)",
+    "printText": "Atspausdinti",
+    "propertiesButtonTitle": "Gaukite pado savybes",
+    "propertiesButton": "Savybės",
+    "colorButtonTitle": "Pakeiskite teksto spalvą prezentacijos režime",
+    "poll_create_user": "Pridėti naują vartotoją",
+    "poll_publish_button": "Publikuoti",
+    "kanban_addBoard": "Pridėkite lentą",
+    "kanban_working": "Atliekama",
+    "kanban_done": "Padaryta",
+    "kanban_todo": "Atlikti",
+    "kanban_item": "Elementas {0}",
+    "kanban_newBoard": "Nauja lenta",
+    "pad_mediatagOptions": "Vaizdo ypatybės",
+    "pad_mediatagImport": "Išsaugokite savo „CryptDrive“",
+    "pad_mediatagPreview": "Peržiūra",
+    "pad_mediatagBorder": "Kraštinės plotis (px)",
+    "pad_mediatagRatio": "Išlaikyti santykį",
+    "pad_mediatagHeight": "Aukštis (px)",
+    "pad_mediatagWidth": "Plotis (px)",
+    "pad_mediatagTitle": "„Media-Tag“ nustatymai",
+    "openLinkInNewTab": "Atidarykite nuorodą naujame skirtuke",
+    "history_restoreDone": "Dokumentas atkurtas",
+    "history_restorePrompt": "Ar tikrai norite pakeisti dabartinę dokumento versiją  į rodoma versiją?",
+    "history_restoreTitle": "Atkurkite pasirinktą dokumento versiją",
+    "history_closeTitle": "Uždarykite istoriją",
+    "history_loadMore": "Įkelti daugiau istorijos",
+    "history_prev": "Ankstesnė versija",
+    "history_next": "Kita versija",
+    "historyButton": "Rodyti dokumentų istoriją",
+    "historyText": "Istorija",
+    "help_button": "Pagalba",
+    "show_help_button": "Rodyti pagalbą",
+    "cancelButton": "Baigti (esc)",
+    "cancel": "Baigti",
+    "okButton": "Taip (enter)",
+    "ok": "Taip",
+    "notifyLeft": "{0} išėjo iš bendradarbiavimo sesijos",
+    "notifyRenamed": "{0} dabar žinomas kaip {1}",
+    "notifyJoined": "{0} prisijungė prie bendradarbiavimo sesijos",
+    "fileEmbedTag": "Tada įdėkite šią medijos žymą visur, kur norite įdėti:",
+    "fileEmbedScript": "Norėdami įterpti šį failą, vieną kartą įtraukite šį scenarijų į savo puslapį, kad įkeltumėte medijos žymą:",
+    "viewEmbedTag": "Norėdami įterpti šį įklotą, įtraukite šį „iframe“ į savo puslapį visur, kur norite. Galite jį stilizuoti naudodami CSS arba HTML atributus.",
+    "viewShare": "Tik skaityti nuoroda",
+    "editShare": "Redaguojama nuoroda",
+    "themeButtonTitle": "Pasirinkite spalvų dizainą, kurią naudosite kodų ir skaidrių redaktoriams",
+    "themeButton": "Dizainas",
+    "languageButtonTitle": "Pasirinkite sintaksės paryškinimui naudojamą kalbą",
+    "languageButton": "Kalba",
+    "slide_invalidLess": "Netinkamas pasirinktinis stilius",
+    "slideOptionsTitle": "Tinkinkite skaidres",
+    "slideOptionsText": "Pasirinkimai",
+    "tags_noentry": "Negalite pažymėti ištrinto pado!",
+    "tags_duplicate": "Pasikartojanti žyma: {0}",
+    "tags_notShared": "Jūsų žymos nebendrinamos su kitais vartotojais",
+    "tags_add": "Atnaujinkite pažymėtų padų žymas",
+    "tags_title": "Žymos (tik jums)",
+    "filePicker_filter": "Filtruokite failus pagal pavadinimą",
+    "filePicker_description": "Pasirinkite failą iš „CryptDrive“, kad jį įdėtumėte arba įkeltumėte naują",
+    "oo_cantUpload": "Įkelti negalima, kol dalyvauja kiti vartotojai.",
+    "oo_reconnect": "Serverio ryšys atkurtas. Spustelėkite Gerai, jei norite iš naujo įkelti ir tęsti leidimą.",
+    "poll_comment_disabled": "Paskelbkite šią apklausą naudodami mygtuką ✓, kad įgalintumėte komentarus.",
+    "poll_comment_placeholder": "Jūsų komentaras",
+    "poll_comment_remove": "Ištrinti šį komentarą",
+    "poll_comment_submit": "Siųsti",
+    "poll_comment_add": "Pridėti komentarą",
+    "poll_comment_list": "Komentarai",
+    "poll_total": "Bendras",
+    "poll_bookmarked_col": "Tai yra jūsų pažymėtas stulpelis. Jums visada bus atrakinta ir rodoma pradžioje.",
+    "poll_bookmark_col": "Pažymėkite šį stulpelį taip, kad jis visada būtų atrakintas ir rodomas pradžioje",
+    "poll_unlocked": "Atrakinta",
+    "poll_locked": "Užrakinta",
+    "poll_edit": "Redaguoti",
+    "poll_remove": "Pašalinti",
+    "poll_descriptionHint": "Apibūdinkite apklausą ir, kai baigsite, naudokite mygtuką ✓ (paskelbti).\nAprašymas gali būti parašytas naudojant žymėjimo sintaksę ir galite įdėti laikmenos elementus iš savo „CryptDrive“.\nVisi, turintys nuorodą, gali pakeisti aprašą, tačiau tai nerekomenduojama.",
+    "poll_removeUser": "Ar tikrai norite pašalinti šį vartotoją?",
+    "poll_removeOption": "Ar tikrai norite pašalinti šią parinktį?",
+    "poll_userPlaceholder": "Vardas",
+    "poll_optionPlaceholder": "Pasirinkimai",
+    "poll_commit": "Pateikti",
+    "poll_create_option": "Pridėti naują parinktį"
+}
diff --git a/www/common/translations/messages.nl.json b/www/common/translations/messages.nl.json
index d9933fef6..393b91a05 100644
--- a/www/common/translations/messages.nl.json
+++ b/www/common/translations/messages.nl.json
@@ -414,7 +414,7 @@
     "fm_viewListButton": "Lijstweergave",
     "fm_info_owned": "U bent de eigenaar van de werkomgevingen die hier zijn weergegeven. Dit betekent dat u ze voorgoed van de server kunt verwijderen. Als u dat doet, zijn ze niet meer toegankelijk voor andere gebruikers.",
     "fm_info_sharedFolder": "Dit is een gedeelde map. U bent niet ingelogd, dus u kunt de inhoud alleen lezen. U kunt zich <br><a href=\"/register/\">registreren</a> of <a href=\"/login/\">inloggen</a> om het in uw CryptDrive te importeren en het te wijzigen.",
-    "fm_info_anonymous": "U bent niet ingelogd, dus uw documenten zullen verlopen na {0} dagen. Ze kunnen ook verdwijnen als uw browsergeschiedenis gewist wordt. <br><a href=\"/register/\">Registreren</a> (geen persoonlijke gegevens vereist) of <a href=\"/login/\">Inloggen</a> om ze voor altijd in uw drive op te slaan. <a href=\"https://docs.cryptpad.fr/en/user_guide/user_account.html#account-types\" target=\"_blank\">Lees meer over geregistreerde accounts</a>.",
+    "fm_info_anonymous": "U bent niet ingelogd, dus uw documenten zullen verlopen na {0} dagen. Ze kunnen ook verdwijnen als uw browsergeschiedenis gewist wordt. <br><a href=\"/register/\">Registreren</a> (geen persoonlijke gegevens vereist) of <a href=\"/login/\">Inloggen</a> om ze voor altijd in uw drive op te slaan. <a href=\"#docs\">Lees meer over geregistreerde accounts</a>.",
     "fm_info_trash": "Leeg uw prullenbak om opslagruimte vrij te maken in uw CryptDrive.",
     "fm_info_recent": "Deze werkomgevingen zijn onlangs geopend of gewijzigd door u of door mensen met wie u samenwerkt.",
     "fm_info_template": "Dit bevat alle werkomgevingen die zijn opgeslagen als sjablonen en die je kunt gebruiken voor een nieuwe werkomgeving.",
diff --git a/www/common/translations/messages.pt-br.json b/www/common/translations/messages.pt-br.json
index 2a2f3dcd8..81237753d 100644
--- a/www/common/translations/messages.pt-br.json
+++ b/www/common/translations/messages.pt-br.json
@@ -9,7 +9,7 @@
         "whiteboard": "Whiteboard",
         "file": "File",
         "media": "Media",
-        "kanban": "Kanban",
+        "kanban": "Placa de Assinatura",
         "todo": "A Fazer",
         "contacts": "Contactos",
         "sheet": "Planilha (Beta)",
@@ -138,7 +138,7 @@
     "fm_categoryError": "Incapaz de abrir a categoria selecionada, Exibindo diretório raiz",
     "fm_info_root": "Crie quantos diretórios aninhados aqui desejar para organizar seus arquivos..",
     "fm_info_trash": "Empty your trash to free space in your CryptDrive.",
-    "fm_info_anonymous": "Você não está logado, então estes documentos vão expirar em {0} dias. Limpar o histórico do seu navegador pode fazê-los desaparecer. <br><a href=\"/register/\">Registre-se</a> (nenhuma informação pessoal será requerida) ou <a href=\"/login/\">Faça login</a> para guarda-lo no seu disco. <a href=\"https://docs.cryptpad.fr/en/user_guide/user_account.html#account-types\" target=\"_blank\">Leia mais sobre contas registradas</a>.",
+    "fm_info_anonymous": "Você não está logado, então estes documentos vão expirar em {0} dias. Limpar o histórico do seu navegador pode fazê-los desaparecer. <br><a href=\"/register/\">Registre-se</a> (nenhuma informação pessoal será requerida) ou <a href=\"/login/\">Faça login</a> para guarda-lo no seu disco. <a href=\"#docs\">Leia mais sobre contas registradas</a>.",
     "fm_error_cantPin": "Erro interno do servidor. Por favor recarregue a página e tente novamente.",
     "fc_newfolder": "Nova pasta",
     "fc_rename": "Renomear",
@@ -221,7 +221,7 @@
     "header_logoTitle": "Go to the main page",
     "edit": "edit",
     "view": "view",
-    "feedback_about": "If you're reading this, you were probably curious why CryptPad is requesting web pages when you perform certain actions",
+    "feedback_about": "Se você está lendo isso, provavelmente está curioso para saber por que o CryptPad está solicitando páginas da web quando você executa certas ações.",
     "feedback_privacy": "We care about your privacy, and at the same time we want CryptPad to be very easy to use.  We use this file to figure out which UI features matter to our users, by requesting it along with a parameter specifying which action was taken.",
     "feedback_optout": "If you would like to opt out, visit <a>your user settings page</a>, where you'll find a checkbox to enable or disable user feedback.",
     "button_newkanban": "Novo Kanban",
@@ -842,7 +842,7 @@
     "admin_flushCacheTitle": "Limpar cache HTTP",
     "settings_padNotifTitle": "Notificações de comentários",
     "comments_comment": "Comentário",
-    "comments_resolve": "Resolve",
+    "comments_resolve": "Resolver",
     "comments_reply": "Responder",
     "comments_submit": "Enviar",
     "comments_edited": "Editado",
@@ -952,5 +952,9 @@
     "contacts_unmute": "Com som",
     "contacts_mute": "Mudo",
     "share_noContactsNotLoggedIn": "Faça login ou registre-se para ver seus contatos existentes e adicionar novos.",
-    "share_copyProfileLink": "Copiar link do perfil"
+    "share_copyProfileLink": "Copiar link do perfil",
+    "settings_padOpenLinkTitle": "Forma",
+    "settings_padOpenLinkHint": "Com esta opção, você pode abrir links incorporados com um clique, sem o pop-up de visualização",
+    "settings_padOpenLinkLabel": "Habilitar abertura de link direto",
+    "settings_padNotifHint": "Ignorar notificações quando alguém responder a um de seus comentários"
 }
diff --git a/www/common/translations/messages.ro.json b/www/common/translations/messages.ro.json
index 0125606ae..0c0fe1f0e 100644
--- a/www/common/translations/messages.ro.json
+++ b/www/common/translations/messages.ro.json
@@ -118,7 +118,7 @@
     "fm_info_root": "Crează câte foldere tip cuib ai nevoie pentru a-ți sorta fișierele.",
     "fm_info_template": "Conține toate pad-urile stocate ca șabloane și pe care le poți refolosi atunci când creezi un nou pad.",
     "fm_info_trash": "Fișierele șterse din gunoi vor fi șterse și din \"Toate fișierele\", făcând imposibilă recuperarea fișierelor din managerul de fișiere.",
-    "fm_info_anonymous": "Nu ești logat cu un cont valid așa că aceste pad-uri vor fi șterse (<a href=\"https://blog.cryptpad.fr/2017/05/17/You-gotta-log-in/\" target=\"_blank\">află de ce</a>). <a href=\"/register/\">Înscrie-te</a> sau <a href=\"/login/\">Loghează-te</a> pentru a le salva.",
+    "fm_info_anonymous": "Nu ești logat cu un cont valid așa că aceste pad-uri vor fi șterse. <a href=\"/register/\">Înscrie-te</a> sau <a href=\"/login/\">Loghează-te</a> pentru a le salva.",
     "fc_newfolder": "Folder nou",
     "fc_rename": "Redenumește",
     "fc_open": "Deschide",
diff --git a/www/common/translations/messages.ru.json b/www/common/translations/messages.ru.json
index 8f08c3f0d..a46232761 100644
--- a/www/common/translations/messages.ru.json
+++ b/www/common/translations/messages.ru.json
@@ -299,7 +299,7 @@
     "printCSS": "Пользовательские настройки вида (CSS):",
     "viewEmbedTag": "Чтобы встроить данный документ, вставьте iframe в нужную страницу.  Вы можете настроить внешний вид используя CSS и HTML атрибуты.",
     "fm_ownedPadsName": "Собственный",
-    "fm_info_anonymous": "Вы не вошли в учетную запись, поэтому срок действия ваших пэдов истечет через 3 месяца (<a href=\"https://blog.cryptpad.fr/2017/05/17/You-gotta-log-in/\" target=\"_blank\">find out more</a>). Они хранятся в вашем браузере, поэтому очистка истории может привести к их исчезновению..<br><a href=\"/register/\">Sign up</a> or <a href=\"/login/\">Log in</a> to keep them alive.<br>",
+    "fm_info_anonymous": "Вы не вошли в учетную запись, поэтому срок действия ваших пэдов истечет через 3 месяца. Они хранятся в вашем браузере, поэтому очистка истории может привести к их исчезновению..<br><a href=\"/register/\">Sign up</a> or <a href=\"/login/\">Log in</a> to keep them alive.",
     "fm_burnThisDriveButton": "Удалить всю информацию, хранящуюся от CryptPad в браузере",
     "fm_tags_used": "Количество использований",
     "fm_restoreDrive": "Восстановление прежнего состояния диска. Для достижения наилучших результатов не вносите изменения в диск, пока этот процесс не будет завершен.",
diff --git a/www/common/translations/messages.th.json b/www/common/translations/messages.th.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/www/common/translations/messages.th.json
@@ -0,0 +1 @@
+{}
diff --git a/www/common/translations/messages.zh.json b/www/common/translations/messages.zh.json
index 814d92cb3..ca0b85c73 100644
--- a/www/common/translations/messages.zh.json
+++ b/www/common/translations/messages.zh.json
@@ -13,7 +13,8 @@
         "todo": "待办事项",
         "teams": "团队",
         "sheet": "工作表",
-        "contacts": "联系我们"
+        "contacts": "联系我们",
+        "form": "从"
     },
     "button_newpad": "富文件檔案",
     "button_newcode": "新代碼檔案",
@@ -139,7 +140,7 @@
     "fm_info_root": "在此建立任何巢狀目錄夾以便於整理分類你的檔案。",
     "fm_info_template": "包含所有工作檔案已存成模版，便於讓你在建立新工作檔案時套用。",
     "fm_info_trash": "清空垃圾筒好讓 CryptDrive 多出一些空間",
-    "fm_info_anonymous": "您没有登录，所以您的文档将在{0}天后过期。清除你的浏览器历史记录可能会使它们消失。<br><a href=\"/register/\">注册</a> (无需个人信息) 或<a href=\"/login/\">登录</a>以无限期地把它们储存在你的硬盘里。 <a href=\"https://docs.cryptpad.fr/en/user_guide/user_account.html#account-types\" target=\"_blank\">阅读更多关于注册帐户</a>。",
+    "fm_info_anonymous": "您没有登录，所以您的文档将在{0}天后过期。清除你的浏览器历史记录可能会使它们消失。<br><a href=\"/register/\">注册</a> (无需个人信息) 或<a href=\"/login/\">登录</a>以无限期地把它们储存在你的硬盘里。 <a href=\"#docs\">阅读更多关于注册帐户</a>。",
     "fm_error_cantPin": "內部伺服器出錯，請重新載入本頁並再試一次。",
     "fc_newfolder": "新資料夾",
     "fc_rename": "重新命名",
diff --git a/www/common/userObject.js b/www/common/userObject.js
index ca716f25f..9e033f5c0 100644
--- a/www/common/userObject.js
+++ b/www/common/userObject.js
@@ -17,6 +17,7 @@ define([
     var SHARED_FOLDERS_TEMP = module.SHARED_FOLDERS_TEMP = "sharedFoldersTemp"; // Maybe deleted or new password
     var FILES_DATA = module.FILES_DATA = Constants.storageKey;
     var OLD_FILES_DATA = module.OLD_FILES_DATA = Constants.oldStorageKey;
+    var STATIC_DATA = module.STATIC_DATA = 'static';
 
     // Create untitled documents when no name is given
     var getLocaleDate = function () {
@@ -138,6 +139,7 @@ define([
         var NEW_FILE_NAME = Messages.fm_newFile || 'New file';
 
         exp.ROOT = ROOT;
+        exp.STATIC_DATA = STATIC_DATA;
         exp.UNSORTED = UNSORTED;
         exp.TRASH = TRASH;
         exp.TEMPLATE = TEMPLATE;
@@ -236,6 +238,10 @@ define([
             return Boolean(data.roHref && !data.href);
         };
 
+        exp.isStaticFile = function (element) {
+            return Boolean(files[STATIC_DATA] && files[STATIC_DATA][element]);
+        };
+
         var isFolder = exp.isFolder = function (element) {
             if (isFolderData(element)) { return false; }
             return typeof(element) === "object" || isSharedFolder(element);
@@ -310,7 +316,24 @@ define([
         // Get data from AllFiles (Cryptpad_RECENTPADS)
         var getFileData = exp.getFileData = function (file, editable) {
             if (!file) { return; }
-            var data = files[FILES_DATA][file] || {};
+            var link;
+            try {
+                link = (files[STATIC_DATA] || {})[file];
+            } catch (err) {
+                console.error(err);
+            }
+            if (link) {
+                var _link = editable ? link : Util.clone(link);
+                if (!editable) { _link.static = true; }
+                return _link;
+            }
+            var data;
+            try {
+                data = files[FILES_DATA][file] || {};
+            } catch (err) {
+                console.error(err);
+                data = {};
+            }
             if (!editable) {
                 data = JSON.parse(JSON.stringify(data));
                 if (data.href && data.href.indexOf('#') === -1) {
@@ -344,7 +367,13 @@ define([
                 return '??';
             }
             var data = getFileData(file);
-            if (!file || !data || !(data.href || data.roHref)) {
+            if (!data) {
+                error("unable to retrieve data about the requested file: ", file, data);
+                return;
+            }
+            // handle links
+            if (data.static) { return data.name; }
+            if (!file || !(data.href || data.roHref)) {
                 error("getTitle called with a non-existing file id: ", file, data);
                 return;
             }
@@ -475,6 +504,11 @@ define([
             });
             return ret;
         };
+        _getFiles[STATIC_DATA] = function () {
+            var ret = [];
+            if (!files[STATIC_DATA]) { return ret; }
+            return Object.keys(files[STATIC_DATA]).map(Number).filter(Boolean);
+        };
         _getFiles[FILES_DATA] = function () {
             var ret = [];
             if (!files[FILES_DATA]) { return ret; }
@@ -854,6 +888,7 @@ define([
 
         // RENAME
         exp.rename = function (path, newName, cb) {
+            cb = cb || function () {};
             if (sframeChan) {
                 return void sframeChan.query("Q_DRIVE_USEROBJECT", {
                     cmd: "rename",
@@ -891,9 +926,15 @@ define([
             if (isSharedFolder(element)) {
                 data = files[SHARED_FOLDERS][element];
             } else {
-                data = files[FILES_DATA][element];
+                data = files[FILES_DATA][element] || files[STATIC_DATA][element];
             }
             if (!data) { return; }
+            if (files[STATIC_DATA][element]) {
+                if (!newName || !newName.trim()) { return void cb(); }
+                data.name = newName;
+                cb();
+                return;
+            }
             if (!newName || newName.trim() === "") {
                 delete data.filename;
                 if (typeof cb === "function") { cb(); }
diff --git a/www/convert/app-convert.less b/www/convert/app-convert.less
new file mode 100644
index 000000000..c5813641a
--- /dev/null
+++ b/www/convert/app-convert.less
@@ -0,0 +1,16 @@
+@import (reference) '../../customize/src/less2/include/framework.less';
+@import (reference) '../../customize/src/less2/include/sidebar-layout.less';
+
+&.cp-app-convert {
+
+    .framework_min_main(
+        @bg-color: @colortheme_apps[default],
+    );
+    .sidebar-layout_main();
+
+    // body
+    display: flex;
+    flex-flow: column;
+    background-color: @cp_app-bg;
+
+}
diff --git a/www/convert/index.html b/www/convert/index.html
new file mode 100644
index 000000000..96a3cce86
--- /dev/null
+++ b/www/convert/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>CryptPad</title>
+    <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="referrer" content="no-referrer" />
+    <script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
+    <link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
+</head>
+<body>
+<iframe-placeholder>
diff --git a/www/convert/inner.html b/www/convert/inner.html
new file mode 100644
index 000000000..206b85722
--- /dev/null
+++ b/www/convert/inner.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html class="cp-app-noscroll">
+<head>
+    <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
+    <script async data-bootload="/convert/inner.js" data-main="/common/sframe-boot.js?ver=1.7" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
+    <style>
+        .loading-hidden { display: none; }
+    </style>
+</head>
+<body class="cp-app-convert">
+    <div id="cp-toolbar" class="cp-toolbar-container"></div>
+    <div id="cp-sidebarlayout-container"></div>
+    <noscript>
+        <p><strong>OOPS</strong> In order to do encryption in your browser, Javascript is really <strong>really</strong> required.</p>
+        <p><strong>OUPS</strong> Afin de pouvoir réaliser le chiffrement dans votre navigateur, Javascript est <strong>vraiment</strong> nécessaire.</p>
+    </noscript>
+</body>
+
diff --git a/www/convert/inner.js b/www/convert/inner.js
new file mode 100644
index 000000000..ba9870ccf
--- /dev/null
+++ b/www/convert/inner.js
@@ -0,0 +1,258 @@
+define([
+    'jquery',
+    '/api/config',
+    '/bower_components/chainpad-crypto/crypto.js',
+    '/common/toolbar.js',
+    '/bower_components/nthen/index.js',
+    '/common/sframe-common.js',
+    '/common/hyperscript.js',
+    '/customize/messages.js',
+    '/common/common-interface.js',
+    '/common/common-util.js',
+
+    '/bower_components/file-saver/FileSaver.min.js',
+    'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
+    'css!/bower_components/components-font-awesome/css/font-awesome.min.css',
+    'less!/convert/app-convert.less',
+], function (
+    $,
+    ApiConfig,
+    Crypto,
+    Toolbar,
+    nThen,
+    SFCommon,
+    h,
+    Messages,
+    UI,
+    Util
+    )
+{
+    var APP = {};
+
+    var common;
+    var sFrameChan;
+
+    var debug = console.debug;
+
+    var x2tReady = Util.mkEvent(true);
+    var x2tInitialized = false;
+    var x2tInit = function(x2t) {
+        debug("x2t mount");
+        // x2t.FS.mount(x2t.MEMFS, {} , '/');
+        x2t.FS.mkdir('/working');
+        x2t.FS.mkdir('/working/media');
+        x2t.FS.mkdir('/working/fonts');
+        x2tInitialized = true;
+        x2tReady.fire();
+        //fetchFonts(x2t);
+        debug("x2t mount done");
+    };
+    var getX2t = function (cb) {
+        require(['/common/onlyoffice/x2t/x2t.js'], function() { // FIXME why does this fail without an access-control-allow-origin header?
+            var x2t = window.Module;
+            x2t.run();
+            if (x2tInitialized) {
+                debug("x2t runtime already initialized");
+                return void x2tReady.reg(function () {
+                    cb(x2t);
+                });
+            }
+
+            x2t.onRuntimeInitialized = function() {
+                debug("x2t in runtime initialized");
+                // Init x2t js module
+                x2tInit(x2t);
+                x2tReady.reg(function () {
+                    cb(x2t);
+                });
+            };
+        });
+    };
+        /*
+            Converting Data
+
+            This function converts a data in a specific format to the outputformat
+            The filename extension needs to represent the input format
+            Example: fileName=cryptpad.bin outputFormat=xlsx
+        */
+        var getFormatId = function (ext) {
+            // Sheets
+            if (ext === 'xlsx') { return 257; }
+            if (ext === 'xls') { return 258; }
+            if (ext === 'ods') { return 259; }
+            if (ext === 'csv') { return 260; }
+            if (ext === 'pdf') { return 513; }
+            // Docs
+            if (ext === 'docx') { return 65; }
+            if (ext === 'doc') { return 66; }
+            if (ext === 'odt') { return 67; }
+            if (ext === 'txt') { return 69; }
+            if (ext === 'html') { return 70; }
+
+            // Slides
+            if (ext === 'pptx') { return 129; }
+            if (ext === 'ppt') { return 130; }
+            if (ext === 'odp') { return 131; }
+
+            return;
+        };
+        var getFromId = function (ext) {
+            var id = getFormatId(ext);
+            if (!id) { return ''; }
+            return '<m_nFormatFrom>'+id+'</m_nFormatFrom>';
+        };
+        var getToId = function (ext) {
+            var id = getFormatId(ext);
+            if (!id) { return ''; }
+            return '<m_nFormatTo>'+id+'</m_nFormatTo>';
+        };
+    var x2tConvertDataInternal = function(x2t, data, fileName, outputFormat) {
+        debug("Converting Data for " + fileName + " to " + outputFormat);
+
+        var inputFormat = fileName.split('.').pop();
+
+        x2t.FS.writeFile('/working/' + fileName, data);
+        var params =  "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
+                    + "<TaskQueueDataConvert xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">"
+                    + "<m_sFileFrom>/working/" + fileName + "</m_sFileFrom>"
+                    + "<m_sFileTo>/working/" + fileName + "." + outputFormat + "</m_sFileTo>"
+                    + getFromId(inputFormat)
+                    + getToId(outputFormat)
+                    + "<m_bIsNoBase64>false</m_bIsNoBase64>"
+                    + "</TaskQueueDataConvert>";
+        // writing params file to mounted working disk (in memory)
+        x2t.FS.writeFile('/working/params.xml', params);
+        // running conversion
+        x2t.ccall("runX2T", ["number"], ["string"], ["/working/params.xml"]);
+        // reading output file from working disk (in memory)
+        var result;
+        try {
+            result = x2t.FS.readFile('/working/' + fileName + "." + outputFormat);
+        } catch (e) {
+            console.error(e, x2t.FS);
+            debug("Failed reading converted file");
+            UI.warn(Messages.error);
+            return "";
+        }
+        return result;
+    };
+    var x2tConverter = function (typeSrc, typeTarget) {
+        return function (data, name, cb) {
+            getX2t(function (x2t) {
+                if (typeSrc === 'ods') {
+                    data = x2tConvertDataInternal(x2t, data, name, 'xlsx');
+                    name += '.xlsx';
+                }
+                if (typeSrc === 'odt') {
+                    data = x2tConvertDataInternal(x2t, data, name, 'docx');
+                    name += '.docx';
+                }
+                if (typeSrc === 'odp') {
+                    data = x2tConvertDataInternal(x2t, data, name, 'pptx');
+                    name += '.pptx';
+                }
+                cb(x2tConvertDataInternal(x2t, data, name, typeTarget));
+            });
+        };
+    };
+
+    var CONVERTERS = {
+        xlsx: {
+            //pdf: x2tConverter('xlsx', 'pdf'),
+            ods: x2tConverter('xlsx', 'ods'),
+            bin: x2tConverter('xlsx', 'bin'),
+        },
+        ods: {
+            //pdf: x2tConverter('ods', 'pdf'),
+            xlsx: x2tConverter('ods', 'xlsx'),
+            bin: x2tConverter('ods', 'bin'),
+        },
+        odt: {
+            docx: x2tConverter('odt', 'docx'),
+            txt: x2tConverter('odt', 'txt'),
+            bin: x2tConverter('odt', 'bin'),
+        },
+        docx: {
+            odt: x2tConverter('docx', 'odt'),
+            txt: x2tConverter('docx', 'txt'),
+            bin: x2tConverter('docx', 'bin'),
+        },
+        txt: {
+            odt: x2tConverter('txt', 'odt'),
+            docx: x2tConverter('txt', 'docx'),
+            bin: x2tConverter('txt', 'bin'),
+        },
+        odp: {
+            pptx: x2tConverter('odp', 'pptx'),
+            bin: x2tConverter('odp', 'bin'),
+        },
+        pptx: {
+            odp: x2tConverter('pptx', 'odp'),
+            bin: x2tConverter('pptx', 'bin'),
+        },
+    };
+
+    Messages.convertPage = "Convert"; // XXX 4.10.0
+    Messages.convert_hint = "Pick the file you want to convert. The list of output format will be visible afterward."; // XXX 4.10.0
+
+    var createToolbar = function () {
+        var displayed = ['useradmin', 'newpad', 'limit', 'pageTitle', 'notifications'];
+        var configTb = {
+            displayed: displayed,
+            sfCommon: common,
+            $container: APP.$toolbar,
+            pageTitle: Messages.convertPage,
+            metadataMgr: common.getMetadataMgr(),
+        };
+        APP.toolbar = Toolbar.create(configTb);
+        APP.toolbar.$rightside.hide();
+    };
+
+    nThen(function (waitFor) {
+        $(waitFor(UI.addLoadingScreen));
+        SFCommon.create(waitFor(function (c) { APP.common = common = c; }));
+    }).nThen(function (waitFor) {
+        APP.$container = $('#cp-sidebarlayout-container');
+        APP.$toolbar = $('#cp-toolbar');
+        APP.$leftside = $('<div>', {id: 'cp-sidebarlayout-leftside'}).appendTo(APP.$container);
+        APP.$rightside = $('<div>', {id: 'cp-sidebarlayout-rightside'}).appendTo(APP.$container);
+        sFrameChan = common.getSframeChannel();
+        sFrameChan.onReady(waitFor());
+    }).nThen(function (/*waitFor*/) {
+        createToolbar();
+
+        var hint = h('p.cp-convert-hint', Messages.convert_hint);
+
+        var picker = h('input', {
+            type: 'file'
+        });
+        APP.$rightside.append([hint, picker]);
+
+        $(picker).on('change', function () {
+            var file = picker.files[0];
+            var name = file && file.name;
+            var reader = new FileReader();
+            var parsed = file && file.name && /.+\.([^.]+)$/.exec(file.name);
+            var ext = parsed && parsed[1];
+            reader.onload = function (e) {
+                if (CONVERTERS[ext]) {
+                    Object.keys(CONVERTERS[ext]).forEach(function (to) {
+                        var button = h('button.btn', to);
+                        $(button).click(function () {
+                            CONVERTERS[ext][to](new Uint8Array(e.target.result), name, function (a) {
+                                var n = name.slice(0, -ext.length) + to;
+                                var blob = new Blob([a], {type: "application/bin;charset=utf-8"});
+                                window.saveAs(blob, n);
+                            });
+
+                        }).appendTo(APP.$rightside);
+                    });
+                }
+            };
+            reader.readAsArrayBuffer(file, 'application/octet-stream');
+        });
+
+        UI.removeLoadingScreen();
+
+    });
+});
diff --git a/www/convert/main.js b/www/convert/main.js
new file mode 100644
index 000000000..236290b13
--- /dev/null
+++ b/www/convert/main.js
@@ -0,0 +1,28 @@
+// Load #1, load as little as possible because we are in a race to get the loading screen up.
+define([
+    '/bower_components/nthen/index.js',
+    '/api/config',
+    '/common/dom-ready.js',
+    '/common/sframe-common-outer.js'
+], function (nThen, ApiConfig, DomReady, SFCommonO) {
+
+    // Loaded in load #2
+    nThen(function (waitFor) {
+        DomReady.onReady(waitFor());
+    }).nThen(function (waitFor) {
+        SFCommonO.initIframe(waitFor, true);
+    }).nThen(function (/*waitFor*/) {
+        var category;
+        if (window.location.hash) {
+            category = window.location.hash.slice(1);
+            window.location.hash = '';
+        }
+        var addData = function (obj) {
+            if (category) { obj.category = category; }
+        };
+        SFCommonO.start({
+            noRealtime: true,
+            addData: addData
+        });
+    });
+});
diff --git a/www/file/main.js b/www/file/main.js
index c4309692f..e0165ff81 100644
--- a/www/file/main.js
+++ b/www/file/main.js
@@ -15,8 +15,8 @@ define([
         href = obj.href;
         hash = obj.hash;
     }).nThen(function (/*waitFor*/) {
-        var addData = function (meta, Cryptpad) {
-            meta.filehash = Cryptpad.currentPad.hash;
+        var addData = function (meta, Cryptpad, user, Utils) {
+            meta.filehash = Utils.currentPad.hash;
         };
         SFCommonO.start({
             cache: true,
diff --git a/www/form/app-form.less b/www/form/app-form.less
new file mode 100644
index 000000000..ad26863bb
--- /dev/null
+++ b/www/form/app-form.less
@@ -0,0 +1,801 @@
+@import (reference) '../../customize/src/less2/include/framework.less';
+@import (reference) '../../customize/src/less2/include/tools.less';
+@import (reference) '../../customize/src/less2/include/avatar.less';
+
+&.cp-app-form {
+    @form_input-width: 400px;
+
+    .framework_main(
+        @bg-color: @colortheme_apps[form]
+    );
+
+    display: flex;
+    flex-flow: column;
+    font: @colortheme_app-font;
+    color: @cryptpad_text_col;
+    background-color: @cp_app-bg;
+
+    #cp-app-form-editor {
+        flex: 1;
+        display: flex;
+        flex-flow: row;
+        height: 100%;
+        overflow: hidden;
+    }
+
+    &.cp-app-form-results {
+        div.cp-form-creator-content, .cp-app-form-button-results {
+            display: none !important;
+        }
+    }
+    &:not(.cp-app-form-results) {
+        div.cp-form-creator-results, .cp-app-form-button-creator {
+            display: none !important;
+        }
+        .cp-form-block {
+            .tools_unselectable();
+        }
+    }
+
+    &.cp-form-readonly {
+        .cp-form-creator-inline-add {
+            display: none;
+        }
+        .cp-form-creator-add-full {
+            display: none !important;
+        }
+        .cp-form-edit-buttons-container button {
+            display: none;
+        }
+        .cp-form-edit-save {
+            display: none;
+        }
+        .cp-form-block {
+            cursor: default !important;
+            .cp-form-block-drag-handle {
+                display: none !important;
+            }
+        }
+    }
+
+    #cp-toolbar .cp-toolbar-title-readonly {
+        display: none;
+    }
+
+    #cp-app-form-container {
+        display: flex;
+        flex: 1;
+        justify-content: center;
+        min-width: 300px;
+
+        .cp-form-input-block {
+            display: flex;
+        }
+
+        div.cp-form-creator-container {
+            display: flex;
+            flex: 1;
+            justify-content: center;
+            min-width: 300px;
+            //flex-wrap: wrap;
+            overflow: auto;
+
+            @media screen and (max-width: 1000px) {
+                flex-wrap: wrap;
+                justify-content: flex-start;
+                .cp-form-creator-control {
+                    width: 100% !important;
+                    .cp-form-creator-settings {
+                        display: flex;
+                        justify-content: space-evenly;
+                        flex-wrap: wrap;
+                    }
+                }
+            }
+
+            .cp-form-creator-settings {
+                padding: 30px;
+                .cp-form-actions {
+                    margin-top: 5px;
+                }
+                & > div:not(:last-child) {
+                    margin-bottom: 20px;
+                }
+            }
+            div.cp-form-filler-container {
+                width: 300px;
+                min-width: 0;
+                flex: 0 300 300px;
+            }
+            div.cp-form-creator-control {
+                padding: 10px;
+                display: flex;
+                flex-flow: column;
+                width: 300px;
+                .cp-form-creator-types {
+                    margin-top: 20px;
+                    display: flex;
+                    flex-flow: column;
+                }
+            }
+            div.cp-form-creator-content, div.cp-form-creator-results {
+                max-width: 1000px;
+                min-width: 300px;
+                margin-top: 10px;
+                padding: 10px;
+                display: flex;
+                flex-flow: column;
+                flex: 1 1 1000px;
+
+                .cp-form-creator-add-inline {
+                    display: flex;
+                    flex-flow: row;
+                    align-items: center;
+                    margin-bottom: 20px;
+                    button {
+                        width: 50px;
+                        i {
+                            margin-right: 0;
+                        }
+                    }
+                    .cp-form-creator-inline-add {
+                        font-size: 25px;
+                        margin-right: 30px;
+                        .add-close { display: none; }
+                        &.displayed {
+                            .add-close { display: inline; }
+                            .add-open { display: none; }
+                        }
+                    }
+                    .cp-form-creator-control-inline {
+                        display: flex;
+                        justify-content: space-around;
+                        button:not(:last-child) {
+                            margin-right: 5px;
+                        }
+                        .cp-form-creator-types {
+                            .btn-secondary {
+                                background: transparent;
+                                &:hover, &:not(:disabled):active, &:focus {
+                                    background-color: @cryptpad_color_brand_fadest;
+                                }
+                            }
+                            button {
+                                border: 0px;
+                                //padding-bottom: 3px;
+                                i {
+                                    font-size: 35px;
+                                    line-height: 35px;
+                                }
+                            }
+                            &:first-child {
+                                margin-right: 50px;
+                            }
+                        }
+                    }
+                }
+                .cp-form-creator-add-full {
+                    display: flex;
+                    flex-flow: column;
+                    margin: 20px 0px 0px 0px;
+                    padding-bottom: 100px;
+                    &> div:first-child {
+                        display: flex;
+                        height: 100%;
+                        align-items: center;
+                        padding-right: 10px;
+                        margin-bottom: 10px;
+                        i {
+                            color: @cryptpad_text_col;
+                            font-size: 30px;
+                            width: 50px;
+                            text-align: center;
+                        }
+                    }
+                    .cp-form-creator-control-inline {
+                        display: flex;
+                        flex-flow: column;
+                        justify-content: space-around;
+                        button:not(:last-child) {
+                            margin-right: 5px;
+                        }
+                        .cp-form-creator-types {
+                            .btn-secondary {
+                                background: transparent;
+                                &:hover, &:not(:disabled):active, &:focus {
+                                    background-color: @cryptpad_color_brand_fadest;
+                                }
+                            }
+                            button {
+                                border: 0px;
+                                padding:5px;
+                                margin-right: 10px;
+                                i {
+                                    font-size: 35px;
+                                    line-height: 35px;
+                                }
+                            }
+                            &:first-child {
+                                margin-bottom: 20px;
+                                margin-right: 50px;
+                            }
+                        }
+                    }
+                }
+
+                .cp-form-send-container {
+                    text-align: center;
+                    margin: 50px auto 0px auto;
+                    padding-bottom: 100px;
+                    button {
+                        &:not(:last-child) {
+                            margin-right: 10px;
+                        }
+                    }
+                    .cp-form-invalid-warning {
+                        color: @cp_form-invalid;
+                        ul {
+                            list-style-type: disclosure-closed;
+                        }
+                        li {
+                            text-align: left;
+                            a {
+                                color: @cryptpad_color_link;
+                            }
+                        }
+                    }
+                    .cp-form-anon-answer {
+                        text-align: center;
+                        margin: 20px 0 30px 0;
+                        .cp-form-anon-answer-input {
+                            margin-top: 20px;
+                            display: flex;
+                            white-space: nowrap;
+                            align-items: center;
+                            input {
+                                margin-left: 10px;
+                            }
+                        }
+                    }
+                }
+
+                .cp-form-page-container {
+                    display: flex;
+                    justify-content: center;
+                    margin: 10px 0;
+                    & > span {
+                        margin: 0 20px;
+                        width: 100px;
+                        display: inline-flex;
+                        align-items: center;
+                        justify-content: center;
+                    }
+                    button {
+                        display: flex;
+                        height: 38px;
+                        align-items: center;
+                        i {
+                            margin-right: 0;
+                            font-size: 25px;
+                        }
+                    }
+                }
+                .cp-form-block {
+                    background: @cp_form-bg1;
+                    padding: 10px;
+                    &:not(:last-child) {
+                        margin-bottom: 20px;
+                    }
+
+                    .cp-form-block-drag-handle {
+                        display: flex;
+                        flex-flow: column;
+                        align-items: center;
+                        color: @cp_sidebar-hint;
+                        i {
+                            cursor: grab;
+                            &:first-child {
+                                height: 3px;
+                                margin-top: -10px;
+                                margin-bottom: 1px;
+                            }
+                        }
+                    }
+
+                    &.sortable-ghost { visibility: hidden; }
+                    &.sortable-drag { opacity: 0.9 !important; }
+
+                    .flatpickr-calendar.inline {
+                        box-shadow: unset;
+                        border: 1px solid @cryptpad_text_col;
+                    }
+
+                    .cp-form-block-question {
+                        margin-bottom: 5px;
+                        .cp-form-block-question-number {
+                            font-weight: bold;
+                            margin-right: 10px;
+                        }
+                    }
+                    .cp-form-block-content {
+                        overflow-x: auto;
+                        p {
+                            a {
+                                color: @cryptpad_color_link;
+                            }
+                        }
+                        .cp-form-page-break-edit {
+                            font-size: 20px;
+                            text-align: center;
+                            padding: 10px;
+                            i {
+                                margin-right: 5px;
+                            }
+                        }
+                        .cp-form-edit-buttons-container {
+                            margin-top: 20px;
+                            display: flex;
+                            justify-content: space-between;
+                        }
+                        input:invalid {
+                            border: 2px solid @cryptpad_color_red;
+                            color: @cp_form-invalid;
+                        }
+                        media-tag {
+                            & > * {
+                                max-width: 100%;
+                            }
+                        }
+                    }
+                    .cp-form-input-block {
+                        //width: @form_input-width;
+                        padding-bottom: 10px;
+                        border-bottom: 2px solid @cp_sidebar-hint;
+                        margin-bottom: 10px;
+                        &:not(.editing) {
+                            input {
+                                background: transparent;
+                                border: none;
+                                padding: 0 !important;
+                                & ~ button:not(:disabled) {
+                                    .cp-form-edit { display: inline; }
+                                    .cp-form-save { display: none; }
+                                }
+                            }
+                        }
+                        input {
+                            flex: 1;
+                            min-width: 100px;
+                            padding: 0 10px !important;
+                            height: auto;
+                            font-size: 20px;
+                        }
+                        button {
+                            .cp-form-edit {
+                                display: none;
+                            }
+                            .cp-form-save { display: inline; }
+                        }
+                        .cp-form-block-drag {
+                            font-size: 22px;
+                            width: 20px;
+                            margin-left: 5px;
+                            text-align: center;
+                            line-height: 31px;
+                        }
+                    }
+                    &.editable {
+                        cursor: grab;
+                        .cp-form-edit-save {
+                            margin-top: 20px;
+                            button {
+                                margin-right: 10px;
+                            }
+                        }
+                        .cp-form-edit-type {
+                            margin-bottom: 10px;
+                            .cp-dropdown-container {
+                                margin-left: 10px;
+                            }
+                        }
+                        .cp-form-multiple-picker {
+                            margin: 10px 0px 0px 0px;
+                            button {
+                                margin: 10px 10px 0px 0px;
+                            }
+                        }
+                    }
+                }
+                .cp-form-edit-max-options {
+                    display: flex;
+                    align-items: center;
+                    margin-bottom: 10px;
+                    input {
+                        width: 100px;
+                        margin-left: 10px;
+                    }
+                }
+                .cp-form-edit-options-block {
+                    display: flex;
+                    flex-wrap: wrap;
+                    align-items: baseline;
+                    .CodeMirror {
+                        cursor: default;
+                        flex: 1;
+                        margin: auto;
+                        min-width: 80%;
+                        width: 80%;
+                        min-height: 200px;
+                        height: 200px;
+                        border: 1px solid @cp_forms-border;
+                        .CodeMirror-placeholder {
+                            color: #777;
+                        }
+                    }
+                }
+                .cp-form-edit-block {
+
+                    button.btn-secondary {
+                        margin-left: 30px;
+                        margin-bottom: 5px;
+                    }
+                    .cp-form-handle {
+                        display: flex;
+                        align-items: center;
+                        justify-content: center;
+                        width: 30px;
+                        color: @cp_sidebar-hint;
+                        i:first-child {
+                            margin-right: 1px;
+                        }
+                    }
+                    .cp-form-edit-block-input {
+                        margin-bottom: 5px;
+                        &.sortable-ghost { visibility: hidden; }
+                        &.sortable-drag { opacity: 0.9 !important; }
+                        display: flex;
+                        width: 400px;
+                        input {
+                            flex: 1;
+                            min-width: 100px;
+                            border-color: @cryptpad_text_col;
+                            border-right: 0px;
+                        }
+                        button {
+                            i { margin: 0 !important; }
+                        }
+
+                    }
+                }
+            }
+        }
+        div.cp-form-creator-results {
+            display: flex;
+            flex-flow: column;
+            position: relative;
+
+            #cp-form-response-msg {
+                background: @cp_form-bg1;
+                margin-bottom: 20px;
+                padding: 10px;
+                p:last-child {
+                    margin-bottom: 0;
+                }
+            }
+
+            .cp-form-creator-results-controls {
+                margin-bottom: 20px;
+                //background: @cp_form-bg1;
+                //padding: 10px;
+
+            }
+            .cp-form-creator-results-export {
+                margin-bottom: 20px;
+            }
+            .cp-form-creator-results-content {
+                padding-bottom: 100px;
+                .cp-form-block {
+                        background: @cp_form-bg1;
+                        padding: 10px;
+                }
+            }
+            .cp-form-block-question {
+                margin-bottom: 5px;
+            }
+            .cp-form-block-type {
+                float: right;
+                padding: 5px;
+                margin-top: -10px;
+                margin-right: -10px;
+                i { margin-right: 5px; }
+                background: fade(@cryptpad_text_col, 15%);
+            }
+            .cp-form-results-type-text {
+                max-height: 300px;
+                overflow: auto;
+                .cp-form-results-type-text-data {
+                    padding: 5px 10px;
+                    background: @cp_form-bg2;
+                    &:not(:last-child) { margin-bottom: 1px; }
+                }
+            }
+            .cp-form-results-type-textarea-data {
+                white-space: pre-wrap;
+                padding: 5px 10px;
+                background: @cp_form-bg2;
+                &:not(:last-child) { margin-bottom: 1px; }
+            }
+            .cp-form-results-type-radio {
+                display: table;
+                .cp-form-results-type-multiradio-data {
+                    display: flex;
+                    flex-flow: column;
+                }
+                .cp-form-results-type-radio-data {
+                    display: table-row;
+                    border: 1px solid @cp_form-border;
+                    & > span {
+                        border: 1px solid @cp_form-border;
+                        display: table-cell;
+                        padding: 5px 10px;
+                        background: @cp_form-bg2;
+                        &.cp-value {
+                            min-width: 200px;
+                        }
+                    }
+                }
+            }
+            .cp-form-individual {
+                background: @cp_form-bg1;
+                padding: 10px;
+                margin-bottom: 20px;
+                & > *:not(:last-child) {
+                    margin-right: 10px;
+                }
+                .cp-form-warning {
+                    color: @cp-limit-bar-warning;
+                }
+                .cp-form-friend {
+                    color: @cp_profile-hint;
+                    .fa {
+                        margin-right: 5px;
+                    }
+                }
+                a, a:visited {
+                    color: @cryptpad_color_link;
+                }
+            }
+        }
+    }
+
+    .cp-form-type-radio, .cp-form-type-checkbox {
+        display: flex;
+        flex-flow: column;
+        align-items: baseline;
+        .cp-radio {
+            display: inline-flex;
+        }
+    }
+    .cp-form-type-multiradio {
+        display: table;
+        & > * {
+            display: table-row;
+            & > * {
+                display: table-cell;
+                padding: 5px 20px;
+                vertical-align: middle;
+                &:first-child {
+                    min-width: 200px;
+                }
+                .cp-radio-mark {
+                    margin: auto;
+                }
+            }
+        }
+    }
+    .cp-form-sort-hint, .cp-poll-hint {
+        margin-bottom: 10px;
+    }
+    .cp-form-type-sort {
+        cursor: grab;
+        padding: 5px;
+        .cp-form-handle {
+            margin-right: 5px;
+        }
+        .cp-form-sort-order {
+            border: 1px solid @cryptpad_text_col;
+            padding: 0 5px;
+            margin-right: 5px;
+        }
+        &:hover {
+            background-color: @cp_app-bg;
+            color: @cryptpad_color_link;
+            .cp-form-sort-order {
+                border-color: @cryptpad_color_link;
+            }
+        }
+    }
+
+    .cp-form-type-poll-container {
+        overflow: auto;
+        .cp-form-poll-hint {
+            margin-bottom: 10px;
+        }
+    }
+    .cp-form-type-poll {
+        display: inline-flex;
+        flex-flow: column;
+        & > div {
+            display: flex;
+        }
+        .cp-poll-total {
+            display: flex;
+        }
+        .cp-form-poll-body {
+            flex-flow: column;
+            max-height: 225px;
+            overflow: auto;
+
+            & > div {
+                display: flex;
+            }
+        }
+        .cp-poll-cell {
+            width: 100px;
+            height: 35px;
+            display: inline-flex;
+            align-items: center;
+            justify-content: center;
+            margin-top:5px;
+            margin-left:5px;
+            &:first-child {
+                width: 200px;
+            }
+            button {
+                width: 100%;
+                border-top: 0px;
+                border-left: 0px;
+                background-color: @cp_form-bg1;
+                .fa{
+                    margin-left:10px;
+                    transform: rotate(-45deg);
+                }
+            }
+            .cp-form-total-yes {
+                margin-right: 5px;
+            }
+            &.cp-poll-best {
+                font-weight: bold;
+            }
+        }
+        .cp-poll-answer-name {
+            padding: 0 5px;
+            display: flex;
+            :last-child {
+                flex: 1;
+                min-width: 0;
+                white-space: nowrap;
+                text-overflow: ellipsis;
+                overflow: hidden;
+            }
+            .cp-avatar {
+                .avatar_main(30px);
+                margin-right: 10px;
+            }
+            &.cp-clickable {
+                cursor: pointer;
+                &:hover {
+                    color: @cryptpad_color_link;
+                    &::after {
+                        font-family: FontAwesome;
+                        content: "\00a0\f06e";
+                    }
+                }
+            }
+        }
+        .cp-poll-time-day {
+            flex-basis: 100px;
+            border-bottom: 1px solid @cryptpad_text_col;
+        }
+        &:not(.cp-form-poll-switch) {
+            & > div {
+                &:last-child {
+                    margin-bottom: 5px;
+                }
+            }
+            .cp-form-poll-body {
+                &::-webkit-scrollbar {
+                  display: none;
+                }
+                -ms-overflow-style: none;  /* IE and Edge */
+                scrollbar-width: none;  /* Firefox */
+            }
+            .cp-form-poll-option, .cp-poll-time-day {
+                flex-flow: column;
+                text-align: center;
+                .cp-form-weekday-separator {
+                    display: none;
+                }
+            }
+            .cp-poll-time-day {
+                height: 50px;
+            }
+        }
+        &.cp-form-poll-switch {
+            display: flex;
+            flex-flow: row;
+            .cp-avatar {
+                .avatar_main(20px);
+            }
+            & > div {
+                flex-flow: column;
+                &.cp-form-poll-body {
+                    flex-flow: row;
+                    max-width: 550px;
+                    max-height: unset;
+                    scroll-snap-type: x mandatory;
+                    & > div {
+                        flex-flow: column;
+                    }
+                }
+            }
+            .cp-poll-total {
+                flex-flow: column;
+            }
+            .cp-poll-cell:not(.cp-poll-switch) {
+                &:first-child {
+                    width: 100px;
+                }
+            }
+            .cp-form-poll-option, .cp-poll-switch {
+                width: 200px;
+                .cp-form-weekday-separator {
+                    margin-right: 5px;
+                    margin-left: 5px;
+                }
+            }
+            .cp-poll-time-day {
+                flex-basis: 40px;
+                border-right: none;
+                border-right: 1px solid @cryptpad_text_col;
+                border-bottom: 0px;
+                flex-flow: column;
+                text-align: center;
+                .cp-form-weekday-separator {
+                    display: none;
+                }
+            }
+        }
+        .cp-form-poll-choice, .cp-form-poll-answer {
+            .fa, .cptools {
+                display: none;
+            }
+            color: @cp_form-poll-color;
+            font-size: 25px;
+            &[data-value="0"] {
+                background: @cp_form-poll-no;
+                .cp-no { display: inline; }
+            }
+            &[data-value="1"] {
+                background: @cp_form-poll-yes;
+                .cp-yes { display: inline; }
+            }
+            &[data-value="2"] {
+                background: @cp_form-poll-maybe;
+                .cp-maybe { display: inline; }
+            }
+        }
+        div.cp-form-poll-choice {
+            cursor: pointer;
+            padding: 5px;
+            //margin: 10px 0px 0px 10px;
+            //border: 1px solid @cryptpad_text_col;
+            color: @cryptpad_text_col;
+        }
+        div.cp-form-poll-answer {
+            color: @cp_form-poll-yes-color;
+        }
+    }
+
+}
+
diff --git a/www/form/export.js b/www/form/export.js
new file mode 100644
index 000000000..4afc4170a
--- /dev/null
+++ b/www/form/export.js
@@ -0,0 +1,72 @@
+define([
+    '/common/common-util.js',
+    '/customize/messages.js'
+], function (Util, Messages) {
+    var Export = {};
+
+    var escapeCSV = function (v) {
+        if (!/("|,|\n|;)/.test(v)) {
+            return v || '';
+        }
+        var value = '';
+        var vv = (v || '').replaceAll('"', '""');
+        value += '"' + vv + '"';
+        return value;
+    };
+    Export.results = function (content, answers, TYPES) {
+        if (!content || !content.form) { return; }
+        var csv = "";
+        var form = content.form;
+
+        var questions = [Messages.form_poll_time, Messages.share_formView];
+
+        content.order.forEach(function (key) {
+            var obj = form[key];
+            if (!obj) { return; }
+            var type = obj.type;
+            if (!TYPES[type]) { return; } // Ignore static types
+            var c;
+            if (TYPES[type] && TYPES[type].exportCSV) { c = TYPES[type].exportCSV(false, obj); }
+            if (!c) { c = [obj.q || Messages.form_default]; }
+            Array.prototype.push.apply(questions, c);
+        });
+
+        questions.forEach(function (v, i) {
+            if (i) { csv += ','; }
+            csv += escapeCSV(v);
+        });
+
+        Object.keys(answers || {}).forEach(function (key) {
+            var obj = answers[key];
+            csv += '\n';
+            var time = new Date(obj.time).toISOString();
+            var msg = obj.msg || {};
+            var user = msg._userdata || {};
+            csv += escapeCSV(time);
+            csv += ',' + escapeCSV(user.name || Messages.anonymous);
+            content.order.forEach(function (key) {
+                var type = form[key].type;
+                if (!TYPES[type]) { return; } // Ignore static types
+                if (TYPES[type].exportCSV) {
+                    var res = TYPES[type].exportCSV(msg[key], form[key]).map(function (str) {
+                        return escapeCSV(str);
+                    }).join(',');
+                    csv += ',' + res;
+                    return;
+                }
+                csv += ',' + escapeCSV(String(msg[key] || ''));
+            });
+        });
+        return csv;
+    };
+
+    Export.main = function (content, cb) {
+        var json = Util.clone(content || {});
+        delete json.answers;
+        cb(new Blob([JSON.stringify(json, 0, 2)], {
+            type: 'application/json;charset=utf-8'
+        }));
+    };
+
+    return Export;
+});
diff --git a/www/form/index.html b/www/form/index.html
new file mode 100644
index 000000000..96a3cce86
--- /dev/null
+++ b/www/form/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>CryptPad</title>
+    <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="referrer" content="no-referrer" />
+    <script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
+    <link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
+</head>
+<body>
+<iframe-placeholder>
diff --git a/www/form/inner.html b/www/form/inner.html
new file mode 100644
index 000000000..de37af4f6
--- /dev/null
+++ b/www/form/inner.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html class="cp-app-noscroll">
+<head>
+    <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
+    <script async data-bootload="/form/inner.js" data-main="/common/sframe-boot.js?ver=1.7" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
+    <style>
+        .loading-hidden { display: none; }
+    </style>
+</head>
+<body class="cp-app-form">
+    <div id="cp-toolbar" class="cp-toolbar-container"></div>
+    <div id="cp-app-form-editor">
+        <div id="cp-app-form-container"></div>
+    </div>
+    <noscript>
+        <p><strong>OOPS</strong> In order to do encryption in your browser, Javascript is really <strong>really</strong> required.</p>
+        <p><strong>OUPS</strong> Afin de pouvoir réaliser le chiffrement dans votre navigateur, Javascript est <strong>vraiment</strong> nécessaire.</p>
+    </noscript>
+</body>
+
diff --git a/www/form/inner.js b/www/form/inner.js
new file mode 100644
index 000000000..410918787
--- /dev/null
+++ b/www/form/inner.js
@@ -0,0 +1,3019 @@
+define([
+    'jquery',
+    'json.sortify',
+    '/bower_components/chainpad-crypto/crypto.js',
+    '/common/sframe-app-framework.js',
+    '/common/toolbar.js',
+    '/form/export.js',
+    '/bower_components/nthen/index.js',
+    '/common/sframe-common.js',
+    '/common/common-util.js',
+    '/common/common-hash.js',
+    '/common/common-interface.js',
+    '/common/common-ui-elements.js',
+    '/common/clipboard.js',
+    '/common/inner/common-mediatag.js',
+    '/common/hyperscript.js',
+    '/customize/messages.js',
+    '/customize/application_config.js',
+    '/common/diffMarked.js',
+    '/common/sframe-common-codemirror.js',
+    'cm/lib/codemirror',
+
+    '/common/inner/share.js',
+    '/common/inner/access.js',
+    '/common/inner/properties.js',
+
+    '/lib/datepicker/flatpickr.js',
+    '/bower_components/sortablejs/Sortable.min.js',
+
+    'cm/addon/display/placeholder',
+    'cm/mode/gfm/gfm',
+    'css!cm/lib/codemirror.css',
+
+    '/bower_components/file-saver/FileSaver.min.js',
+
+    'css!/bower_components/codemirror/lib/codemirror.css',
+    'css!/bower_components/codemirror/addon/dialog/dialog.css',
+    'css!/bower_components/codemirror/addon/fold/foldgutter.css',
+    'css!/lib/datepicker/flatpickr.min.css',
+    'css!/bower_components/components-font-awesome/css/font-awesome.min.css',
+    'less!/form/app-form.less',
+], function (
+    $,
+    Sortify,
+    Crypto,
+    Framework,
+    Toolbar,
+    Exporter,
+    nThen,
+    SFCommon,
+    Util,
+    Hash,
+    UI,
+    UIElements,
+    Clipboard,
+    MT,
+    h,
+    Messages,
+    AppConfig,
+    DiffMd,
+    SFCodeMirror,
+    CMeditor,
+    Share, Access, Properties,
+    Flatpickr,
+    Sortable
+    )
+{
+    var APP = window.APP = {
+    };
+
+    var is24h = UIElements.is24h();
+    var dateFormat = "Y-m-d H:i";
+    var timeFormat = "H:i";
+    if (!is24h) {
+        dateFormat = "Y-m-d h:i K";
+        timeFormat = "h:i K";
+    }
+
+    // multi-line radio, checkboxes, and possibly other things have a max number of items
+    // we'll consider increasing this restriction if people are unhappy with it
+    // but as a general rule we expect users will appreciate having simpler questions
+    var MAX_OPTIONS = 15;
+    var MAX_ITEMS = 10;
+
+    var saveAndCancelOptions = function (getRes, cb) {
+        // Cancel changes
+        var cancelBlock = h('button.btn.btn-secondary', Messages.cancel);
+        $(cancelBlock).click(function () { cb(); });
+
+        // Save changes
+        var saveBlock = h('button.btn.btn-primary', [
+            h('i.fa.fa-floppy-o'),
+            h('span', Messages.settings_save)
+        ]);
+
+        $(saveBlock).click(function () {
+            $(saveBlock).attr('disabled', 'disabled');
+            cb(getRes());
+        });
+
+        return h('div.cp-form-edit-save', [cancelBlock, saveBlock]);
+    };
+    var editTextOptions = function (opts, setCursorGetter, cb, tmp) {
+        if (tmp && tmp.content && Sortify(opts) === Sortify(tmp.old)) {
+            opts = tmp.content;
+        }
+
+        var maxLength, getLengthVal;
+        if (opts.maxLength) {
+            var lengthInput = h('input', {
+                type:"number",
+                value: opts.maxLength,
+                min: 100,
+                max: 5000
+            });
+            maxLength = h('div.cp-form-edit-max-options', [
+                h('span', Messages.form_editMaxLength),
+                lengthInput
+            ]);
+            getLengthVal = function () {
+                var val = Number($(lengthInput).val()) || 1000;
+                if (val < 1) { val = 1; }
+                if (val > 5000) { val = 5000; }
+                return val;
+            };
+
+            var $l = $(lengthInput).on('input', Util.throttle(function () {
+                $l.val(getLengthVal());
+            }, 500));
+
+        }
+
+        var type, typeSelect;
+        if (opts.type) {
+            // Messages.form_text_text.form_text_number.form_text_url.form_text_email
+            var options = ['text', 'number', 'url', 'email'].map(function (t) {
+                return {
+                    tag: 'a',
+                    attributes: {
+                        'class': 'cp-form-type-value',
+                        'data-value': t,
+                        'href': '#',
+                    },
+                    content: Messages['form_text_'+t]
+                };
+            });
+            var dropdownConfig = {
+                text: '', // Button initial text
+                options: options, // Entries displayed in the menu
+                //left: true, // Open to the left of the button
+                //container: $(type),
+                isSelect: true,
+                caretDown: true,
+                buttonCls: 'btn btn-secondary'
+            };
+            typeSelect = UIElements.createDropdown(dropdownConfig);
+            typeSelect.setValue(opts.type);
+
+            type = h('div.cp-form-edit-type', [
+                h('span', Messages.form_textType),
+                typeSelect[0]
+            ]);
+        }
+
+        setCursorGetter(function () {
+            return {
+                old: (tmp && tmp.old) || opts,
+                content: {
+                    maxLength: getLengthVal ? getLengthVal() : undefined,
+                    type: typeSelect ? typeSelect.getValue() : undefined
+                }
+            };
+        });
+
+        var getSaveRes = function () {
+            return {
+                maxLength: getLengthVal ? getLengthVal() : undefined,
+                type: typeSelect ? typeSelect.getValue() : undefined
+            };
+        };
+        var saveAndCancel = saveAndCancelOptions(getSaveRes, cb);
+
+        return [
+            maxLength,
+            type,
+            saveAndCancel
+        ];
+    };
+    var editOptions = function (v, setCursorGetter, cb, tmp) {
+        var add = h('button.btn.btn-secondary', [
+            h('i.fa.fa-plus'),
+            h('span', Messages.form_add_option)
+        ]);
+        var addItem = h('button.btn.btn-secondary', [
+            h('i.fa.fa-plus'),
+            h('span', Messages.form_add_item)
+        ]);
+
+        var cursor;
+        if (tmp && tmp.content && Sortify(v) === Sortify(tmp.old)) {
+            v = tmp.content;
+            cursor = tmp.cursor;
+        }
+
+        var maxOptions, maxInput;
+        if (typeof(v.max) === "number") {
+            maxInput = h('input', {
+                type:"number",
+                value: v.max,
+                min: 1,
+                max: v.values.length
+            });
+            maxOptions = h('div.cp-form-edit-max-options', [
+                h('span', Messages.form_editMax),
+                maxInput
+            ]);
+        }
+
+        var type, typeSelect;
+        if (v.type) {
+            // Messages.form_poll_text.form_poll_day.form_poll_time
+            var options = ['text', 'day', 'time'].map(function (t) {
+                return {
+                    tag: 'a',
+                    attributes: {
+                        'class': 'cp-form-type-value',
+                        'data-value': t,
+                        'href': '#',
+                    },
+                    content: Messages['form_poll_'+t]
+                };
+            });
+            var dropdownConfig = {
+                text: '', // Button initial text
+                options: options, // Entries displayed in the menu
+                //left: true, // Open to the left of the button
+                //container: $(type),
+                isSelect: true,
+                caretDown: true,
+                buttonCls: 'btn btn-secondary'
+            };
+            typeSelect = UIElements.createDropdown(dropdownConfig);
+            typeSelect.setValue(v.type);
+
+            type = h('div.cp-form-edit-type', [
+                h('span', Messages.form_editType),
+                typeSelect[0]
+            ]);
+        }
+
+        // Show existing options
+        var $add, $addItem;
+        var addMultiple;
+        var getOption = function (val, isItem, uid) {
+            var input = h('input', {value:val});
+            if (uid) { $(input).data('uid', uid); }
+
+            // If the input is a date, initialize flatpickr
+            if (v.type && v.type !== 'text') {
+                if (v.type === 'time') {
+                    Flatpickr(input, {
+                        enableTime: true,
+                        time_24hr: is24h,
+                        dateFormat: dateFormat,
+                        defaultDate: val ? new Date(val) : undefined
+                    });
+                } else if (v.type === 'day') {
+                    /*Flatpickr(input, {
+                        defaultDate: val ? new Date(val) : undefined
+                    });*/
+                }
+            }
+
+            // if this element was active before the remote change, restore cursor
+            var setCursor = function () {
+                if (v.type && v.type !== 'text') { return; }
+                input.selectionStart = cursor.start || 0;
+                input.selectionEnd = cursor.end || 0;
+                setTimeout(function () { input.focus(); });
+            };
+            if (isItem) {
+                if (cursor && cursor.uid === uid && cursor.item) { setCursor(); }
+            } else {
+                if (cursor && cursor.el === val && !cursor.item) { setCursor(); }
+            }
+
+            var del = h('button.btn.btn-danger-outline', h('i.fa.fa-times'));
+            var el = h('div.cp-form-edit-block-input', [
+                h('span.cp-form-handle', [
+                    h('i.fa.fa-ellipsis-v'),
+                    h('i.fa.fa-ellipsis-v'),
+                ]),
+                input,
+                del
+            ]);
+            $(del).click(function () {
+                var $block = $(el).closest('.cp-form-edit-block');
+                $(el).remove();
+                // We've just deleted an item/option so we should be under the MAX limit and
+                // we can show the "add" button again
+                if (isItem && $addItem) { $addItem.show(); }
+                if (!isItem && $add) {
+                    $add.show();
+                    if (v.type === "time") { $(addMultiple).show(); }
+                }
+                // decrement the max choices input when there are fewer options than the current maximum
+                if (maxInput) {
+                    var inputs = $block.find('input').length;
+                    var $maxInput = $(maxInput);
+                    var currentMax = Number($maxInput.val());
+                    $maxInput.val(Math.min(inputs, currentMax));
+                }
+            });
+            return el;
+        };
+        var inputs = v.values.map(function (val) { return getOption(val, false); });
+        inputs.push(add);
+
+        var container = h('div.cp-form-edit-block', inputs);
+        var $container = $(container);
+
+        Sortable.create(container, {
+            direction: "vertical",
+            handle: ".cp-form-handle",
+            draggable: ".cp-form-edit-block-input",
+            forceFallback: true,
+        });
+
+        var containerItems;
+        if (v.items) {
+            var inputsItems = v.items.map(function (itemData) {
+                return getOption(itemData.v, true, itemData.uid);
+            });
+            inputsItems.push(addItem);
+            containerItems = h('div.cp-form-edit-block', inputsItems);
+            Sortable.create(containerItems, {
+                direction: "vertical",
+                handle: ".cp-form-handle",
+                draggable: ".cp-form-edit-block-input",
+                forceFallback: true,
+            });
+        }
+
+        // Calendar...
+        var calendarView;
+        if (v.type) {
+            var calendarInput = h('input');
+            calendarView = h('div', calendarInput);
+            var calendarDefault = v.type === "day" ? v.values.map(function (time) {
+                if (!time) { return; }
+                var d = new Date(time);
+                if (!isNaN(d)) { return d; }
+            }).filter(Boolean) : undefined;
+            Flatpickr(calendarInput, {
+                mode: 'multiple',
+                inline: true,
+                defaultDate: calendarDefault,
+                appendTo: calendarView
+            });
+        }
+
+        // Calendar time
+        if (v.type) {
+            var multipleInput = h('input', {placeholder: Messages.form_addMultipleHint});
+            var multipleClearButton = h('button.btn', Messages.form_clear);
+            var addMultipleButton = h('button.btn', [
+                h('i.fa.fa-plus'),
+                h('span', Messages.form_addMultiple)
+            ]);
+            addMultiple = h('div.cp-form-multiple-picker', { style: "display: none;" }, [
+                multipleInput,
+                addMultipleButton,
+                multipleClearButton
+            ]);
+            var multiplePickr = Flatpickr(multipleInput, {
+                mode: 'multiple',
+                enableTime: true,
+                dateFormat: dateFormat,
+            });
+            $(multipleClearButton).click(function () {
+                multiplePickr.clear();
+            });
+            $(addMultipleButton).click(function () {
+                multiplePickr.selectedDates.some(function (date) {
+                    $add.before(getOption(date, false));
+                    var l = $container.find('input').length;
+                    $(maxInput).attr('max', l);
+                    if (l >= MAX_OPTIONS) {
+                        $add.hide();
+                        $(addMultiple).hide();
+                        return true;
+                    }
+                });
+                multiplePickr.clear();
+            });
+        }
+
+        var refreshView = function () {
+            if (!v.type) { return; }
+            var $calendar = $(calendarView);
+            if (v.type !== "day") {
+                $calendar.hide();
+                $container.show();
+                var l = $container.find('input').length;
+                if (v.type === "time" && l < MAX_OPTIONS) {
+                    $(addMultiple).show();
+                } else {
+                    $(addMultiple).hide();
+                }
+            } else {
+                $(addMultiple).hide();
+                $calendar.show();
+                $container.hide();
+            }
+        };
+        refreshView();
+
+        // Doodle type change: empty current values and change input types?
+        if (typeSelect) {
+            typeSelect.onChange.reg(function (prettyVal, val) {
+                v.type = val;
+                refreshView();
+                if (val !== "text") {
+                    $container.find('.cp-form-edit-block-input').remove();
+                    $(add).click();
+                    return;
+                }
+                $container.find('input').each(function (i, input) {
+                    if (input._flatpickr) {
+                        input._flatpickr.destroy();
+                        delete input._flatpickr;
+                    }
+                });
+            });
+        }
+
+        // "Add option" button handler
+        $add = $(add).click(function () {
+            var txt = v.type ? '' : Messages.form_newOption;
+            $add.before(getOption(txt, false));
+            var l = $container.find('input').length;
+            $(maxInput).attr('max', l);
+            if (l >= MAX_OPTIONS) { $add.hide(); }
+        });
+
+        // If multiline block, handle "Add item" button
+        $addItem = $(addItem).click(function () {
+            $addItem.before(getOption(Messages.form_newItem, true, Util.uid()));
+            if ($(containerItems).find('input').length >= MAX_ITEMS) { $addItem.hide(); }
+        });
+        if ($container.find('input').length >= MAX_OPTIONS) { $add.hide(); }
+        if ($(containerItems).find('input').length >= MAX_ITEMS) { $addItem.hide(); }
+
+        // Set cursor getter (to handle remote changes to the form)
+        setCursorGetter(function () {
+            var values = [];
+            var active = document.activeElement;
+            var cursor = {};
+            $container.find('input').each(function (i, el) {
+                if (el === active && !el._flatpickr) {
+                    cursor.el= $(el).val();
+                    cursor.start = el.selectionStart;
+                    cursor.end = el.selectionEnd;
+                }
+                values.push($(el).val());
+            });
+            if (v.type === "day") {
+                var dayPickr = $(calendarView).find('input')[0]._flatpickr;
+                values = dayPickr.selectedDates.map(function (date) {
+                    return +date;
+                });
+            }
+            var _content = {values: values};
+
+            if (maxInput) {
+                _content.max = Number($(maxInput).val()) || 1;
+            }
+
+            if (typeSelect) {
+                _content.type = typeSelect.getValue();
+            }
+
+            if (v.items) {
+                var items = [];
+                $(containerItems).find('input').each(function (i, el) {
+                    if (el === active) {
+                        cursor.item = true;
+                        cursor.uid= $(el).data('uid');
+                        cursor.start = el.selectionStart;
+                        cursor.end = el.selectionEnd;
+                    }
+                    items.push({
+                        uid: $(el).data('uid'),
+                        v: $(el).val()
+                    });
+                });
+                _content.items = items;
+            }
+            return {
+                old: (tmp && tmp.old) || v,
+                content: _content,
+                cursor: cursor
+            };
+        });
+
+        var getSaveRes = function () {
+            // Get values
+            var values = [];
+            var duplicates = false;
+            if (v.type === "day") {
+                var dayPickr = $(calendarView).find('input')[0]._flatpickr;
+                values = dayPickr.selectedDates.map(function (date) {
+                    return +date;
+                });
+            } else {
+                $container.find('input').each(function (i, el) {
+                    var val = $(el).val().trim();
+                    if (v.type === "day" || v.type === "time") {
+                        var f = el._flatpickr;
+                        if (f && f.selectedDates && f.selectedDates.length) {
+                            val = +f.selectedDates[0];
+                        }
+                    }
+                    if (val && values.indexOf(val) === -1) { values.push(val); }
+                    else { duplicates = true; }
+                });
+            }
+            values = values.filter(Boolean); // Block empty or undeinfed options
+            if (!values.length) {
+                return void UI.warn(Messages.error);
+            }
+            var res = { values: values };
+
+            // If multiline block, get items
+            if (v.items) {
+                var items = [];
+                $(containerItems).find('input').each(function (i, el) {
+                    var val = $(el).val().trim();
+                    var uid = $(el).data('uid');
+                    if (!items.some(function (i) { return i.uid === uid; })) {
+                        items.push({
+                            uid: $(el).data('uid'),
+                            v: val
+                        });
+                    }
+                    else { duplicates = true; }
+                });
+                res.items = items;
+            }
+
+            // Show duplicates warning
+            if (duplicates) {
+                UI.warn(Messages.form_duplicates);
+            }
+
+            // If checkboxes, get the maximum number of values the users can select
+            if (maxInput) {
+                var maxVal = Number($(maxInput).val());
+                if (isNaN(maxVal)) { maxVal = values.length; }
+                res.max = maxVal;
+            }
+
+            if (typeSelect) {
+                res.type = typeSelect.getValue();
+            }
+
+            return res;
+        };
+
+        var saveAndCancel = saveAndCancelOptions(getSaveRes, cb);
+
+        return [
+            type,
+            maxOptions,
+            calendarView,
+            h('div.cp-form-edit-options-block', [containerItems, container]),
+            addMultiple,
+            saveAndCancel
+        ];
+    };
+
+    var getWeekDays = function (large) {
+        var baseDate = new Date(2017, 0, 1); // just a Sunday
+        var weekDays = [];
+        for(var i = 0; i < 7; i++) {
+            weekDays.push(baseDate.toLocaleDateString(undefined, { weekday: 'long' }));
+            baseDate.setDate(baseDate.getDate() + 1);
+        }
+        if (!large) {
+            weekDays = weekDays.map(function (day) { return day.slice(0,3); });
+        }
+        return weekDays.map(function (day) { return day.replace(/^./, function (str) { return str.toUpperCase(); }); });
+    };
+
+    // "resultsPageObj" is an object with "content" and "answers"
+    // only available when viewing the Responses page
+    var makePollTable = function (answers, opts, resultsPageObj) {
+        // Sort date values
+        if (opts.type !== "text") {
+            opts.values.sort(function (a, b) {
+                return +new Date(a) - +new Date(b);
+            });
+        }
+        // Create first line with options
+        var allDays = getWeekDays(true);
+        var els = opts.values.map(function (data) {
+            var _date;
+            if (opts.type === "day") {
+                _date = new Date(data);
+                data = _date.toLocaleDateString();
+            }
+            if (opts.type === "time") {
+                _date = new Date(data);
+                data = Flatpickr.formatDate(_date, timeFormat);
+            }
+            var day = _date && allDays[_date.getDay()];
+            return h('div.cp-poll-cell.cp-form-poll-option', {
+                title: Util.fixHTML(data)
+            }, [
+                opts.type === 'day' ? h('span.cp-form-weekday', day) : undefined,
+                opts.type === 'day' ? h('span.cp-form-weekday-separator', ' - ') : undefined,
+                h('span', data)
+            ]);
+        });
+        // Insert axis switch button
+        var switchAxis = h('button.btn.btn-default', [
+            Messages.form_poll_switch,
+            h('i.fa.fa-exchange'),
+        ]);
+        els.unshift(h('div.cp-poll-cell.cp-poll-switch', switchAxis));
+        var lines = [h('div', els)];
+
+        // Add an initial row to "time" values containing the days
+        if (opts.type === "time") {
+            var days = [h('div.cp-poll-cell')];
+            var _days = {};
+            opts.values.forEach(function (d) {
+                var date = new Date(d);
+                var day = date.toLocaleDateString();
+                _days[day] = {
+                    n: (_days[day] && _days[day].n) || 0,
+                    name: allDays[date.getDay()]
+                };
+                _days[day].n++;
+            });
+            Object.keys(_days).forEach(function (day) {
+                days.push(h('div.cp-poll-cell.cp-poll-time-day', {
+                    style: 'flex-grow:'+(_days[day].n - 1)+';'
+                }, [
+                    h('span.cp-form-weekday', _days[day].name),
+                    h('span.cp-form-weekday-separator', ' - '),
+                    h('span', day)
+                ]));
+            });
+            lines.unshift(h('div', days));
+        }
+
+        // Add answers
+        var bodyEls = [];
+        if (Array.isArray(answers)) {
+            answers.forEach(function (answerObj) {
+                var answer = answerObj.results;
+                if (!answer || !answer.values) { return; }
+                var name = Util.find(answerObj, ['user', 'name']) || answer.name || Messages.anonymous;
+                var avatar = h('span.cp-avatar');
+                APP.common.displayAvatar($(avatar), Util.find(answerObj, ['user', 'avatar']), name);
+                var values = answer.values || {};
+                var els = opts.values.map(function (data) {
+                    var res = values[data] || 0;
+                    var v = (Number(res) === 1) ? h('i.fa.fa-check.cp-yes') : undefined;
+                    var cell = h('div.cp-poll-cell.cp-form-poll-answer', {
+                        'data-value': res
+                    }, v);
+                    return cell;
+                });
+                var nameCell;
+                els.unshift(nameCell = h('div.cp-poll-cell.cp-poll-answer-name', {
+                    title: Util.fixHTML(name)
+                }, [
+                    avatar,
+                    h('span', name)
+                ]));
+                bodyEls.push(h('div', els));
+                if (resultsPageObj && (APP.isEditor || APP.isAuditor)) {
+                    $(nameCell).addClass('cp-clickable').click(function () {
+                        APP.renderResults(resultsPageObj.content, resultsPageObj.answers, answerObj.curve);
+                    });
+                }
+            });
+        }
+        var body = h('div.cp-form-poll-body', bodyEls);
+        lines.push(body);
+
+        var $s = $(switchAxis).click(function () {
+            $s.closest('.cp-form-type-poll').toggleClass('cp-form-poll-switch');
+        });
+
+        return lines;
+    };
+    var makePollTotal = function (answers, opts, myLine, evOnChange) {
+        if (!Array.isArray(answers)) { return; }
+        var totals = {};
+        var myTotals = {};
+        var updateMyTotals = function () {
+            if (!myLine) { return; }
+            opts.values.forEach(function (data) {
+                myLine.some(function (el) {
+                    if ($(el).data('option') !== data) { return; }
+                    var res = Number($(el).attr('data-value')) || 0;
+                    if (res === 1) {
+                        myTotals[data] = {
+                            y: 1,
+                            m: 0
+                        };
+                    }
+                    else if (res === 2) {
+                        myTotals[data] = {
+                            y: 0,
+                            m: 1
+                        };
+                    } else {
+                        delete myTotals[data];
+                    }
+                    return true;
+                });
+
+            });
+        };
+        var totalEls = opts.values.map(function (data) {
+            var y = 0; // Yes
+            var m = 0; // Maybe
+            answers.forEach(function (answerObj) {
+                var answer = answerObj.results;
+                if (!answer || !answer.values) { return; }
+                var values = answer.values || {};
+                var res = Number(values[data]) || 0;
+                if (res === 1) { y++; }
+                else if (res === 2) { m++; }
+            });
+            totals[data] = {
+                y: y,
+                m: m
+            };
+
+            return h('div.cp-poll-cell', {
+                'data-id': data
+            }, [
+                h('span.cp-form-total-yes', y),
+                h('span.cp-form-total-maybe', '('+m+')'),
+            ]);
+        });
+
+        totalEls.unshift(h('div.cp-poll-cell', Messages.form_pollTotal));
+        var total = h('div.cp-poll-total', totalEls);
+        var $total = $(total);
+        var refreshBest = function () {
+            var totalMax = {
+                value: 0,
+                data: []
+            };
+            Object.keys(totals).forEach(function (k) {
+                var obj = Util.clone(totals[k]);
+                if (myTotals[k]) {
+                    obj.y += myTotals[k].y || 0;
+                    obj.m += myTotals[k].m || 0;
+                }
+                if (obj.y === totalMax.value) {
+                    totalMax.data.push(k);
+                } else if (obj.y > totalMax.value) {
+                    totalMax.value = obj.y;
+                    totalMax.data = [k];
+                }
+            });
+            if (totalMax.value) {
+                $total.find('[data-id]').removeClass('cp-poll-best');
+                totalMax.data.forEach(function (k) {
+                    $total.find('[data-id="'+k+'"]').addClass('cp-poll-best');
+                });
+            }
+        };
+        refreshBest();
+
+        if (myLine && evOnChange) {
+            var updateValues = function () {
+                totalEls.forEach(function (cell) {
+                    var $c = $(cell);
+                    var data = $c.attr('data-id');
+                    if (!data) { return; }
+                    var y = totals[data].y + ((myTotals[data] || {}).y || 0);
+                    var m = totals[data].m + ((myTotals[data] || {}).m || 0);
+                    $c.find('.cp-form-total-yes').text(y);
+                    $c.find('.cp-form-total-maybe').text('('+m+')');
+                });
+            };
+            evOnChange.reg(function () {
+                updateMyTotals();
+                updateValues();
+                refreshBest();
+            });
+        }
+
+
+        return total;
+    };
+
+    var getEmpty = function (empty) {
+        if (empty) {
+            return UI.setHTML(h('div.cp-form-results-type-text-empty'), Messages._getKey('form_notAnswered', [empty]));
+        }
+    };
+
+    var findItem = function (items, uid) {
+        if (!Array.isArray(items)) { return; }
+        var res;
+        items.some(function (item) {
+            if (item.uid === uid) {
+                res = item.v;
+                return true;
+            }
+        });
+        return res;
+    };
+
+    var getBlockAnswers = function (answers, uid, filterCurve) {
+        if (!answers) { return; }
+        return Object.keys(answers || {}).map(function (user) {
+            if (filterCurve && user === filterCurve) { return; }
+            try {
+                return {
+                    curve: user,
+                    user: answers[user].msg._userdata,
+                    results: answers[user].msg[uid]
+                };
+            } catch (e) { console.error(e); }
+        }).filter(Boolean);
+    };
+
+    var STATIC_TYPES = {
+        md: {
+            defaultOpts: {
+                text: Messages.form_description_default
+            },
+            get: function (opts) {
+                if (!opts) { opts = STATIC_TYPES.md.defaultOpts; }
+                var tag = h('div', {
+                    id: 'form'+Util.uid()
+                }, opts.text);
+                var $tag = $(tag);
+                DiffMd.apply(DiffMd.render(opts.text || ''), $tag, APP.common);
+                var cursorGetter;
+                return {
+                    tag: tag,
+                    edit: function (cb, tmp) {
+                        var t = h('textarea');
+                        var block = h('div.cp-form-edit-options-block', [t]);
+                        var cm = SFCodeMirror.create("gfm", CMeditor, t);
+                        var editor = cm.editor;
+                        editor.setOption('lineNumbers', true);
+                        editor.setOption('lineWrapping', true);
+                        editor.setOption('styleActiveLine', true);
+                        editor.setOption('readOnly', false);
+
+                        var text = opts.text;
+                        var cursor;
+                        if (tmp && tmp.content && tmp.old.text === text) {
+                            text = tmp.content.text;
+                            cursor = tmp.cursor;
+                        }
+
+                        setTimeout(function () {
+                            editor.setValue(text);
+                            if (cursor) {
+                                if (Sortify(cursor.start) === Sortify(cursor.end)) {
+                                    editor.setCursor(cursor.start);
+                                } else {
+                                    editor.setSelection(cursor.start, cursor.end);
+                                }
+                            }
+                            editor.refresh();
+                            editor.save();
+                            editor.focus();
+                        });
+                        if (APP.common) {
+                            var markdownTb = APP.common.createMarkdownToolbar(editor, {
+                                embed: function (mt) {
+                                    editor.focus();
+                                    editor.replaceSelection($(mt)[0].outerHTML);
+                                }
+                            });
+                            $(block).prepend(markdownTb.toolbar);
+                            $(markdownTb.toolbar).show();
+                            cm.configureTheme(APP.common, function () {});
+                        }
+                        // Cancel changes
+                        var cancelBlock = h('button.btn.btn-secondary', Messages.cancel);
+                        $(cancelBlock).click(function () {
+                            cb();
+                        });
+                        // Save changes
+                        var saveBlock = h('button.btn.btn-primary', [
+                            h('i.fa.fa-floppy-o'),
+                            h('span', Messages.settings_save)
+                        ]);
+
+                        var getContent = function () {
+                            return {
+                                text: editor.getValue()
+                            };
+                        };
+                        $(saveBlock).click(function () {
+                            $(saveBlock).attr('disabled', 'disabled');
+                            cb(getContent());
+                        });
+
+                        cursorGetter = function () {
+                            if (document.activeElement && block.contains(document.activeElement)) {
+                                cursor = {
+                                    start: editor.getCursor('from'),
+                                    end: editor.getCursor('to')
+                                };
+                            }
+                            return {
+                                old: opts,
+                                content: getContent(),
+                                cursor: cursor
+                            };
+                        };
+
+                        return [
+                            block,
+                            h('div.cp-form-edit-save', [cancelBlock, saveBlock])
+                        ];
+                    },
+                    getCursor: function () { return cursorGetter(); },
+                };
+            },
+            printResults: function () { return; },
+            icon: h('i.cptools.cptools-form-paragraph')
+        },
+        page: {
+            get: function () {
+                var tag = h('div.cp-form-page-break-edit', [
+                    h('i.cptools.cptools-form-page-break'),
+                    h('span', Messages.form_type_page)
+                ]);
+                return {
+                    tag: tag,
+                    pageBreak: true
+                };
+            },
+            printResults: function () { return; },
+            icon: h('i.cptools.cptools-form-page-break')
+        },
+    };
+
+    var TYPES = {
+        input: {
+            defaultOpts: {
+                type: 'text'
+            },
+            get: function (opts, a, n, evOnChange) {
+                if (!opts) { opts = TYPES.input.defaultOpts; }
+                // Messages.form_input_ph_email.form_input_ph_url
+                var tag = h('input', {
+                    type: opts.type,
+                    placeholder: Messages['form_input_ph_'+opts.type] || ''
+                });
+                var $tag = $(tag);
+                $tag.on('change keypress', Util.throttle(function () {
+                    evOnChange.fire();
+                }, 500));
+                var cursorGetter;
+                var setCursorGetter = function (f) { cursorGetter = f; };
+                return {
+                    tag: tag,
+                    getValue: function () {
+                        //var invalid = $tag.is(':invalid');
+                        //if (invalid) { return; }
+                        return $tag.val();
+                    },
+                    setValue: function (val) { $tag.val(val); },
+                    edit: function (cb, tmp) {
+                        var v = Util.clone(opts);
+                        return editTextOptions(v, setCursorGetter, cb, tmp);
+                    },
+                    getCursor: function () { return cursorGetter(); },
+                    reset: function () { $tag.val(''); }
+                };
+            },
+            printResults: function (answers, uid) {
+                var results = [];
+                var empty = 0;
+                Object.keys(answers).forEach(function (author) { // TODO deduplicate these?
+                    var obj = answers[author];
+                    var answer = obj.msg[uid];
+                    if (!answer || !answer.trim()) { return empty++; }
+                    results.push(h('div.cp-form-results-type-text-data', answer));
+                });
+                results.push(getEmpty(empty));
+
+                return h('div.cp-form-results-type-text', results);
+            },
+            icon: h('i.cptools.cptools-form-text')
+        },
+        textarea: {
+            defaultOpts: {
+                maxLength: 1000
+            },
+            get: function (opts, a, n, evOnChange) {
+                if (!opts) { opts = TYPES.textarea.defaultOpts; }
+                var text = h('textarea', {maxlength: opts.maxLength});
+                var $text = $(text);
+                var charCount = h('div.cp-form-type-textarea-charcount');
+                var updateChar = function () {
+                    var l = $text.val().length;
+                    if (l > opts.maxLength) {
+                        $text.val($text.val().slice(0, opts.maxLength));
+                        l = $text.val().length;
+                    }
+                    $(charCount).text(Messages._getKey('form_maxLength', [
+                        $text.val().length,
+                        opts.maxLength
+                    ]));
+                };
+                updateChar();
+                var tag = h('div.cp-form-type-textarea', [
+                    text,
+                    charCount
+                ]);
+
+                var evChange = Util.throttle(function () {
+                    evOnChange.fire();
+                }, 500);
+
+                $text.on('change keypress keyup keydown', function () {
+                    setTimeout(updateChar);
+                    evChange();
+                });
+                var cursorGetter;
+                var setCursorGetter = function (f) { cursorGetter = f; };
+                return {
+                    tag: tag,
+                    getValue: function () { return $text.val().slice(0, opts.maxLength); },
+                    setValue: function (val) {
+                        $text.val(val);
+                        updateChar();
+                    },
+                    edit: function (cb, tmp) {
+                        var v = Util.clone(opts);
+                        return editTextOptions(v, setCursorGetter, cb, tmp);
+                    },
+                    getCursor: function () { return cursorGetter(); },
+                    reset: function () { $text.val(''); }
+                };
+            },
+            printResults: function (answers, uid) {
+                var results = [];
+                var empty = 0;
+                Object.keys(answers).forEach(function (author) { // TODO deduplicate these
+                    var obj = answers[author];
+                    var answer = obj.msg[uid];
+                    if (!answer || !answer.trim()) { return empty++; }
+                    results.push(h('div.cp-form-results-type-textarea-data', answer));
+                });
+                results.push(getEmpty(empty));
+
+                return h('div.cp-form-results-type-text', results);
+            },
+            icon: h('i.cptools.cptools-form-paragraph')
+        },
+        radio: {
+            defaultOpts: {
+                values: [1,2].map(function (i) {
+                    return Messages._getKey('form_defaultOption', [i]);
+                })
+            },
+            get: function (opts, a, n, evOnChange) {
+                if (!opts) { opts = TYPES.radio.defaultOpts; }
+                if (!Array.isArray(opts.values)) { return; }
+                var name = Util.uid();
+                var els = opts.values.map(function (data, i) {
+                    var radio = UI.createRadio(name, 'cp-form-'+name+'-'+i,
+                               data, false, { mark: { tabindex:1 } });
+                    $(radio).find('input').data('val', data);
+                    return radio;
+                });
+                var tag = h('div.radio-group.cp-form-type-radio', els);
+                var cursorGetter;
+                var setCursorGetter = function (f) { cursorGetter = f; };
+                $(tag).find('input[type="radio"]').on('change', function () {
+                    evOnChange.fire();
+                });
+                return {
+                    tag: tag,
+                    getValue: function () {
+                        var res;
+                        els.some(function (el) {
+                            var $i = $(el).find('input');
+                            if (Util.isChecked($i)) {
+                                res = $i.data('val');
+                                return true;
+                            }
+                        });
+                        return res;
+                    },
+                    reset: function () { $(tag).find('input').removeAttr('checked'); },
+                    edit: function (cb, tmp) {
+                        var v = Util.clone(opts);
+                        return editOptions(v, setCursorGetter, cb, tmp);
+                    },
+                    getCursor: function () { return cursorGetter(); },
+                    setValue: function (val) {
+                        this.reset();
+                        els.some(function (el) {
+                            var $el = $(el).find('input');
+                            if ($el.data('val') === val) {
+                                $el.prop('checked', true);
+                                return true;
+                            }
+                        });
+                    }
+                };
+
+            },
+            printResults: function (answers, uid) {
+                var results = [];
+                var empty = 0;
+                var count = {};
+                Object.keys(answers).forEach(function (author) {
+                    var obj = answers[author];
+                    var answer = obj.msg[uid];
+                    if (!answer || !answer.trim()) { return empty++; }
+                    Util.inc(count, answer);
+                });
+                Object.keys(count).forEach(function (value) {
+                    results.push(h('div.cp-form-results-type-radio-data', [
+                        h('span.cp-value', value),
+                        h('span.cp-count', count[value])
+                    ]));
+                });
+                results.push(getEmpty(empty));
+
+                return h('div.cp-form-results-type-radio', results);
+            },
+            icon: h('i.cptools.cptools-form-list-radio')
+        },
+        multiradio: {
+            defaultOpts: {
+                items: [1,2].map(function (i) {
+                    return {
+                        uid: Util.uid(),
+                        v: Messages._getKey('form_defaultItem', [i])
+                    };
+                }),
+                values: [1,2].map(function (i) {
+                    return Messages._getKey('form_defaultOption', [i]);
+                })
+            },
+            get: function (opts, a, n, evOnChange) {
+                if (!opts) { opts = TYPES.multiradio.defaultOpts; }
+                if (!Array.isArray(opts.items) || !Array.isArray(opts.values)) { return; }
+                var lines = opts.items.map(function (itemData) {
+                    var name = itemData.uid;
+                    var item = itemData.v;
+                    var els = opts.values.map(function (data, i) {
+                        var radio = UI.createRadio(name, 'cp-form-'+name+'-'+i,
+                                   '', false, { mark: { tabindex:1 } });
+                        $(radio).find('input').data('uid', name);
+                        $(radio).find('input').data('val', data);
+                        return radio;
+                    });
+                    els.unshift(h('div.cp-form-multiradio-item', item));
+                    return h('div.radio-group', {'data-uid':name}, els);
+                });
+                var header = opts.values.map(function (v) { return h('span', v); });
+                header.unshift(h('span'));
+                lines.unshift(h('div.cp-form-multiradio-header', header));
+
+                var tag = h('div.radio-group.cp-form-type-multiradio', lines);
+                var cursorGetter;
+                var setCursorGetter = function (f) { cursorGetter = f; };
+                $(tag).find('input[type="radio"]').on('change', function () {
+                    evOnChange.fire();
+                });
+                return {
+                    tag: tag,
+                    getValue: function () {
+                        var res = {};
+                        var l = lines.slice(1);
+                        l.forEach(function (el) {
+                            var $el = $(el);
+                            var uid = $el.attr('data-uid');
+                            $el.find('input').each(function (i, input) {
+                                var $i = $(input);
+                                if (res[uid]) { return; }
+                                if (Util.isChecked($i)) { res[uid] = $i.data('val'); }
+                            });
+                        });
+                        return res;
+                    },
+                    reset: function () { $(tag).find('input').removeAttr('checked'); },
+                    edit: function (cb, tmp) {
+                        var v = Util.clone(opts);
+                        return editOptions(v, setCursorGetter, cb, tmp);
+                    },
+                    getCursor: function () { return cursorGetter(); },
+                    setValue: function (val) {
+                        this.reset();
+                        Object.keys(val || {}).forEach(function (uid) {
+                            $(tag).find('[name="'+uid+'"]').each(function (i, el) {
+                                if ($(el).data('val') !== val[uid]) { return; }
+                                $(el).prop('checked', true);
+                            });
+                        });
+                    }
+                };
+
+            },
+            printResults: function (answers, uid, form) {
+                var structure = form[uid];
+                if (!structure) { return; }
+                var opts = structure.opts || TYPES.multiradio.defaultOpts;
+                var results = [];
+                var empty = 0;
+                var count = {};
+                Object.keys(answers).forEach(function (author) {
+                    var obj = answers[author];
+                    var answer = obj.msg[uid];
+                    if (!answer || !Object.keys(answer).length) { return empty++; }
+                    //count[answer] = count[answer] || {};
+                    Object.keys(answer).forEach(function (q_uid) {
+                        var c = count[q_uid] = count[q_uid] || {};
+                        var res = answer[q_uid];
+                        if (!res || !res.trim()) { return; }
+                        Util.inc(c, res);
+                    });
+                });
+                Object.keys(count).forEach(function (q_uid) {
+                    var q = findItem(opts.items, q_uid);
+                    var c = count[q_uid];
+                    var values = Object.keys(c).map(function (res) {
+                        return h('div.cp-form-results-type-radio-data', [
+                            h('span.cp-value', res),
+                            h('span.cp-count', c[res])
+                        ]);
+                    });
+                    results.push(h('div.cp-form-results-type-multiradio-data', [
+                        h('span.cp-mr-q', q),
+                        h('span.cp-mr-value', values)
+                    ]));
+                });
+                results.push(getEmpty(empty));
+
+                return h('div.cp-form-results-type-radio', results);
+            },
+            exportCSV: function (answer, form) {
+                var opts = form.opts || {};
+                var q = form.q || Messages.form_default;
+                if (answer === false) {
+                    return (opts.items || []).map(function (obj) {
+                        return q + ' | ' + obj.v;
+                    });
+                }
+                if (!answer) { return ['']; }
+                return (opts.items || []).map(function (obj) {
+                    var uid = obj.uid;
+                    return String(answer[uid] || '');
+                });
+            },
+            icon: h('i.cptools.cptools-form-grid-radio')
+        },
+        checkbox: {
+            defaultOpts: {
+                max: 3,
+                values: [1, 2, 3].map(function (i) {
+                    return Messages._getKey('form_defaultOption', [i]);
+                })
+            },
+            get: function (opts, a, n, evOnChange) {
+                if (!opts) { opts = TYPES.checkbox.defaultOpts; }
+                if (!Array.isArray(opts.values)) { return; }
+                var name = Util.uid();
+                var els = opts.values.map(function (data, i) {
+                    var cbox = UI.createCheckbox('cp-form-'+name+'-'+i,
+                               data, false, { mark: { tabindex:1 } });
+                    $(cbox).find('input').data('val', data);
+                    return cbox;
+                });
+                var tag = h('div', [
+                    h('div.cp-form-max-options', Messages._getKey('form_maxOptions', [opts.max])),
+                    h('div.radio-group.cp-form-type-checkbox', els)
+                ]);
+                var $tag = $(tag);
+                $tag.find('input').on('change', function () {
+                    var selected = $tag.find('input:checked').length;
+                    if (selected >= opts.max) {
+                        $tag.find('input:not(:checked)').attr('disabled', 'disabled');
+                    } else {
+                        $tag.find('input').removeAttr('disabled');
+                    }
+                    evOnChange.fire();
+                });
+                var cursorGetter;
+                var setCursorGetter = function (f) { cursorGetter = f; };
+                return {
+                    tag: tag,
+                    getValue: function () {
+                        var res = [];
+                        els.forEach(function (el) {
+                            var $i = $(el).find('input');
+                            if (Util.isChecked($i)) {
+                                res.push($i.data('val'));
+                            }
+                        });
+                        return res;
+                    },
+                    reset: function () { $(tag).find('input').removeAttr('checked'); },
+                    edit: function (cb, tmp) {
+                        var v = Util.clone(opts);
+                        return editOptions(v, setCursorGetter, cb, tmp);
+                    },
+                    getCursor: function () { return cursorGetter(); },
+                    setValue: function (val) {
+                        this.reset();
+                        if (!Array.isArray(val)) { return; }
+                        els.forEach(function (el) {
+                            var $el = $(el).find('input');
+                            if (val.indexOf($el.data('val')) !== -1) {
+                                $el.prop('checked', true);
+                            }
+                        });
+                    }
+                };
+
+            },
+            printResults: function (answers, uid) {
+                var results = [];
+                var empty = 0;
+                var count = {};
+                Object.keys(answers).forEach(function (author) {
+                    var obj = answers[author];
+                    var answer = obj.msg[uid];
+                    if (!Array.isArray(answer) || !answer.length) { return empty++; }
+                    answer.forEach(function (val) {
+                        Util.inc(count, val);
+                    });
+                });
+                Object.keys(count).forEach(function (value) {
+                    results.push(h('div.cp-form-results-type-radio-data', [
+                        h('span.cp-value', value),
+                        h('span.cp-count', count[value])
+                    ]));
+                });
+                results.push(getEmpty(empty));
+
+                return h('div.cp-form-results-type-radio', results);
+            },
+            icon: h('i.cptools.cptools-form-list-check')
+        },
+        multicheck: {
+            defaultOpts: {
+                max: 3,
+                items: [1,2].map(function (i) {
+                    return {
+                        uid: Util.uid(),
+                        v: Messages._getKey('form_defaultItem', [i])
+                    };
+                }),
+                values: [1,2,3].map(function (i) {
+                    return Messages._getKey('form_defaultOption', [i]);
+                })
+            },
+            get: function (opts, a, n, evOnChange) {
+                if (!opts) { opts = TYPES.multicheck.defaultOpts; }
+                if (!Array.isArray(opts.items) || !Array.isArray(opts.values)) { return; }
+                var lines = opts.items.map(function (itemData) {
+                    var name = itemData.uid;
+                    var item = itemData.v;
+                    var els = opts.values.map(function (data, i) {
+                        var cbox = UI.createCheckbox('cp-form-'+name+'-'+i,
+                                   '', false, { mark: { tabindex:1 } });
+                        $(cbox).find('input').data('uid', name);
+                        $(cbox).find('input').data('val', data);
+                        return cbox;
+                    });
+                    els.unshift(h('div.cp-form-multiradio-item', item));
+                    return h('div.radio-group', {'data-uid':name}, els);
+                });
+
+                lines.forEach(function (l) {
+                    $(l).find('input').on('change', function () {
+                        var selected = $(l).find('input:checked').length;
+                        if (selected >= opts.max) {
+                            $(l).find('input:not(:checked)').attr('disabled', 'disabled');
+                        } else {
+                            $(l).find('input').removeAttr('disabled');
+                        }
+                        evOnChange.fire();
+                    });
+                });
+
+                var header = opts.values.map(function (v) { return h('span', v); });
+                header.unshift(h('span'));
+                lines.unshift(h('div.cp-form-multiradio-header', header));
+
+                var tag = h('div.radio-group.cp-form-type-multiradio', lines);
+                var cursorGetter;
+                var setCursorGetter = function (f) { cursorGetter = f; };
+                return {
+                    tag: tag,
+                    getValue: function () {
+                        var res = {};
+                        var l = lines.slice(1);
+                        l.forEach(function (el) {
+                            var $el = $(el);
+                            var uid = $el.attr('data-uid');
+                            res[uid] = [];
+                            $el.find('input').each(function (i, input) {
+                                var $i = $(input);
+                                if (Util.isChecked($i)) { res[uid].push($i.data('val')); }
+                            });
+                        });
+                        return res;
+                    },
+                    reset: function () { $(tag).find('input').removeAttr('checked'); },
+                    edit: function (cb, tmp) {
+                        var v = Util.clone(opts);
+                        return editOptions(v, setCursorGetter, cb, tmp);
+                    },
+                    getCursor: function () { return cursorGetter(); },
+                    setValue: function (val) {
+                        this.reset();
+                        Object.keys(val || {}).forEach(function (uid) {
+                            if (!Array.isArray(val[uid])) { return; }
+                            $(tag).find('[data-uid="'+uid+'"] input').each(function (i, el) {
+                                if (val[uid].indexOf($(el).data('val')) === -1) { return; }
+                                $(el).prop('checked', true);
+                            });
+                        });
+                    }
+                };
+
+            },
+            printResults: function (answers, uid, form) {
+                var structure = form[uid];
+                if (!structure) { return; }
+                var opts = structure.opts || TYPES.multicheck.defaultOpts;
+                var results = [];
+                var empty = 0;
+                var count = {};
+                Object.keys(answers).forEach(function (author) {
+                    var obj = answers[author];
+                    var answer = obj.msg[uid];
+                    if (!answer || !Object.keys(answer).length) { return empty++; }
+                    Object.keys(answer).forEach(function (q_uid) {
+                        var c = count[q_uid] = count[q_uid] || {};
+                        var res = answer[q_uid];
+                        if (!Array.isArray(res) || !res.length) { return; }
+                        res.forEach(function (v) {
+                            Util.inc(c, v);
+                        });
+                    });
+                });
+                Object.keys(count).forEach(function (q_uid) {
+                    var q = findItem(opts.items, q_uid);
+                    var c = count[q_uid];
+                    var values = Object.keys(c).map(function (res) {
+                        return h('div.cp-form-results-type-radio-data', [
+                            h('span.cp-value', res),
+                            h('span.cp-count', c[res])
+                        ]);
+                    });
+                    results.push(h('div.cp-form-results-type-multiradio-data', [
+                        h('span.cp-mr-q', q),
+                        h('span.cp-mr-value', values)
+                    ]));
+                });
+                results.push(getEmpty(empty));
+
+                return h('div.cp-form-results-type-radio', results);
+            },
+            exportCSV: function (answer, form) {
+                var opts = form.opts || {};
+                var q = form.q || Messages.form_default;
+                if (answer === false) {
+                    return (opts.items || []).map(function (obj) {
+                        return q + ' | ' + obj.v;
+                    });
+                }
+                if (!answer) { return ['']; }
+                return (opts.items || []).map(function (obj) {
+                    var uid = obj.uid;
+                    return String(answer[uid] || '');
+                });
+            },
+            icon: h('i.cptools.cptools-form-grid-check')
+        },
+        sort: {
+            defaultOpts: {
+                values: [1,2].map(function (i) {
+                    return Messages._getKey('form_defaultOption', [i]);
+                })
+            },
+            get: function (opts, a, n, evOnChange) {
+                if (!opts) { opts = TYPES.sort.defaultOpts; }
+                if (!Array.isArray(opts.values)) { return; }
+                var map = {};
+                var invMap = {};
+                var sorted = false;
+                Util.shuffleArray(opts.values);
+                var els = opts.values.map(function (data) {
+                    var uid = Util.uid();
+                    map[uid] = data;
+                    invMap[data] = uid;
+                    var div = h('div.cp-form-type-sort', {'data-id': uid}, [
+                        h('span.cp-form-handle', [
+                            h('i.fa.fa-ellipsis-v'),
+                            h('i.fa.fa-ellipsis-v'),
+                        ]),
+                        h('span.cp-form-sort-order', '?'),
+                        h('span', data)
+                    ]);
+                    $(div).data('val', data);
+                    return div;
+                });
+                var tag = h('div.cp-form-type-sort-container', [
+                    h('div.cp-form-sort-hint', Messages._getKey('form_sort_hint', [els.length])),
+                    els
+                ]);
+                var $tag = $(tag);
+                var reorder = function (reset) {
+                    $tag.find('.cp-form-type-sort').each(function (i, el) {
+                        $(el).find('.cp-form-sort-order').text(reset ? '?' : i+1);
+                    });
+                    sorted = !reset;
+                };
+                var cursorGetter;
+                var setCursorGetter = function (f) { cursorGetter = f; };
+
+                var sortable = Sortable.create(tag, {
+                    direction: "vertical",
+                    draggable: ".cp-form-type-sort",
+                    forceFallback: true,
+                    store: {
+                        set: function () {
+                            evOnChange.fire();
+                            reorder();
+                        }
+                    }
+                });
+
+                $(tag).find('input[type="radio"]').on('change', function () {
+                    evOnChange.fire();
+                });
+                return {
+                    tag: tag,
+                    getValue: function () {
+                        if (!sorted) { return; }
+                        return sortable.toArray().map(function (id) {
+                            return map[id];
+                        });
+                    },
+                    reset: function () {
+                        Util.shuffleArray(opts.values);
+                        var toSort = (opts.values).map(function (val) {
+                            return invMap[val];
+                        });
+                        sortable.sort(toSort);
+                        reorder(true);
+                    },
+                    edit: function (cb, tmp) {
+                        var v = Util.clone(opts);
+                        return editOptions(v, setCursorGetter, cb, tmp);
+                    },
+                    getCursor: function () { return cursorGetter(); },
+                    setValue: function (val) {
+                        var toSort = (val || []).map(function (val) {
+                            return invMap[val];
+                        });
+                        sortable.sort(toSort);
+                        reorder();
+                    }
+                };
+
+            },
+            printResults: function (answers, uid, form) {
+                var opts = form[uid].opts || TYPES.sort.defaultOpts;
+                var l = (opts.values || []).length;
+                var results = [];
+                var empty = 0;
+                var count = {};
+                Object.keys(answers).forEach(function (author) {
+                    var obj = answers[author];
+                    var answer = obj.msg[uid];
+                    if (!Array.isArray(answer) || !answer.length) { return empty++; }
+                    answer.forEach(function (el, i) {
+                        var score = l - i;
+                        Util.inc(count, el, score);
+                    });
+                });
+                var sorted = Object.keys(count).sort(function (a, b) {
+                    return count[b] - count[a];
+                });
+                sorted.forEach(function (value) {
+                    results.push(h('div.cp-form-results-type-radio-data', [
+                        h('span.cp-value', value),
+                        h('span.cp-count', count[value])
+                    ]));
+                });
+                results.push(getEmpty(empty));
+
+                return h('div.cp-form-results-type-radio', results);
+            },
+            icon: h('i.cptools.cptools-form-list-ordered')
+        },
+        poll: {
+            defaultOpts: {
+                type: 'text', // Text or Days or Time
+                values: [1, 2, 3].map(function (i) {
+                    return Messages._getKey('form_defaultOption', [i]);
+                })
+            },
+            get: function (opts, answers, username, evOnChange) {
+                if (!opts) { opts = TYPES.poll.defaultOpts; }
+                if (!Array.isArray(opts.values)) { return; }
+
+                var lines = makePollTable(answers, opts, false);
+
+                // Add form
+                var addLine = opts.values.map(function (data) {
+                    var cell = h('div.cp-poll-cell.cp-form-poll-choice', [
+                        h('i.fa.fa-times.cp-no'),
+                        h('i.fa.fa-check.cp-yes'),
+                        h('i.cptools.cptools-form-poll-maybe.cp-maybe'),
+                    ]);
+                    var $c = $(cell);
+                    $c.data('option', data);
+                    var val = 0;
+                    $c.attr('data-value', val);
+                    $c.click(function () {
+                        val = (val+1)%3;
+                        $c.attr('data-value', val);
+                        evOnChange.fire();
+                    });
+                    cell._setValue = function (v) {
+                        val = v;
+                        $c.attr('data-value', val);
+                    };
+                    return cell;
+                });
+                // Name input
+                //var nameInput = h('input', { value: username || Messages.anonymous });
+                var nameInput = h('span.cp-poll-your-answers', Messages.form_pollYourAnswers);
+                addLine.unshift(h('div.cp-poll-cell', nameInput));
+                lines.push(h('div', addLine));
+
+                var total = makePollTotal(answers, opts, addLine, evOnChange);
+                if (total) { lines.push(h('div', total)); }
+
+                var pollHint = UI.setHTML(h('div.cp-form-poll-hint'), Messages.form_poll_hint);
+                var classes = [
+                    'fa fa-check cp-yes',
+                    'fa fa-times cp-no',
+                    'cptools cptools-form-poll-maybe cp-maybe',
+                ];
+                $(pollHint).find('i').each(function (index) {
+                    this.setAttribute('class', classes[index]);
+                });
+
+                var tag = h('div.cp-form-type-poll-container', [
+                    pollHint,
+                    h('div.cp-form-type-poll', lines)
+                ]);
+                var $tag = $(tag);
+
+                var cursorGetter;
+                var setCursorGetter = function (f) { cursorGetter = f; };
+                return {
+                    tag: tag,
+                    getValue: function () {
+                        var res = {};
+                        $tag.find('.cp-form-poll-choice').each(function (i, el) {
+                            var $el = $(el);
+                            res[$el.data('option')] = $el.attr('data-value');
+                        });
+                        return {
+                            values: res
+                        };
+                    },
+                    reset: function () {
+                        $tag.find('.cp-form-poll-choice').attr('data-value', 0);
+                    },
+                    edit: function (cb, tmp) {
+                        var v = Util.clone(opts);
+                        return editOptions(v, setCursorGetter, cb, tmp);
+                    },
+                    getCursor: function () { return cursorGetter(); },
+                    setValue: function (res) {
+                        this.reset();
+                        if (!res || !res.values) { return; }
+                        var val = res.values;
+                        $tag.find('.cp-form-poll-choice').each(function (i, el) {
+                            if (!el._setValue) { return; }
+                            var $el = $(el);
+                            el._setValue(val[$el.data('option')] || 0);
+                        });
+                    }
+                };
+
+            },
+            printResults: function (answers, uid, form, content) {
+                var opts = form[uid].opts || TYPES.poll.defaultOpts;
+                var _answers = getBlockAnswers(answers, uid);
+
+                // If content is defined, we'll be able to click on a row to display
+                // all the answers of this user
+                var lines = makePollTable(_answers, opts, content && {
+                    content: content,
+                    answers: answers
+                });
+
+                var total = makePollTotal(_answers, opts);
+                if (total) { lines.push(h('div', total)); }
+
+                return h('div.cp-form-type-poll', lines);
+            },
+            exportCSV: function (answer, form) {
+                var opts = form.opts || TYPES.poll.defaultOpts;
+                var q = form.q || Messages.form_default;
+                if (answer === false) {
+                    var cols = opts.values.map(function (key) {
+                        return q + ' | ' + key;
+                    });
+                    cols.unshift(q);
+                    return cols;
+                }
+                if (!answer || !answer.values) {
+                    var empty = opts.values.map(function () { return ''; });
+                    empty.unshift('');
+                    return empty;
+                }
+                var str = '';
+                Object.keys(answer.values).sort().forEach(function (k, i) {
+                    if (i !== 0) { str += ';'; }
+                    str += k.replace(';', '').replace(':', '') + ':' + answer.values[k];
+                });
+                var res = opts.values.map(function (key) {
+                    return answer.values[key] || '';
+                });
+                res.unshift(str);
+                return res;
+            },
+            icon: h('i.cptools.cptools-form-poll')
+        },
+    };
+
+    var renderResults = APP.renderResults = function (content, answers, showUser) {
+        var $container = $('div.cp-form-creator-results').empty();
+
+        if (!Object.keys(answers || {}).length) {
+            $container.append(h('div.alert.alert-info', Messages.form_results_empty));
+            return;
+        }
+
+        if (content.answers.msg) {
+            var description = h('div.cp-form-creator-results-description#cp-form-response-msg');
+            var $desc = $(description).appendTo($container);
+            DiffMd.apply(DiffMd.render(content.answers.msg), $desc, APP.common);
+        }
+
+        var controls = h('div.cp-form-creator-results-controls');
+        var $controls = $(controls).appendTo($container);
+        var exportButton = h('button.btn.btn-secondary', Messages.form_exportCSV);
+        var exportCSV = h('div.cp-form-creator-results-export', exportButton);
+        $(exportCSV).appendTo($container);
+        var results = h('div.cp-form-creator-results-content');
+        var $results = $(results).appendTo($container);
+
+        $(exportButton).click(function () {
+            var csv = Exporter.results(content, answers, TYPES);
+            if (!csv) { return void UI.warn(Messages.error); }
+            var suggestion = APP.framework._.title.suggestTitle('cryptpad-document');
+            var title = Util.fixFileName(suggestion) + '.csv';
+            window.saveAs(new Blob([csv], {
+                type: 'text/csv'
+            }), title);
+        });
+
+        var summary = true;
+        var form = content.form;
+
+        var switchMode = h('button.btn.btn-primary', Messages.form_showIndividual);
+        $controls.hide().append(switchMode);
+
+        var show = function (answers, header) {
+            var elements = content.order.map(function (uid) {
+                var block = form[uid];
+                var type = block.type;
+                var model = TYPES[type];
+                if (!model || !model.printResults) { return; }
+
+                // Only use content if we're not viewing individual answers
+                var print = model.printResults(answers, uid, form, !header && content);
+
+                var q = h('div.cp-form-block-question', block.q || Messages.form_default);
+
+//Messages.form_type_checkbox.form_type_input.form_type_md.form_type_multicheck.form_type_multiradio.form_type_poll.form_type_radio.form_type_sort.form_type_textarea
+                return h('div.cp-form-block', [
+                    h('div.cp-form-block-type', [
+                        TYPES[type].icon.cloneNode(),
+                        h('span', Messages['form_type_'+type])
+                    ]),
+                    q,
+                    h('div.cp-form-block-content', print),
+                ]);
+            });
+            $results.empty().append(elements);
+            if (header) { $results.prepend(header); }
+        };
+        show(answers);
+
+        if (APP.isEditor || APP.isAuditor) { $controls.show(); }
+
+        var $s = $(switchMode).click(function () {
+            $results.empty();
+            if (!summary) {
+                $s.text(Messages.form_showIndividual);
+                summary = true;
+                show(answers);
+                return;
+            }
+            summary = false;
+            $s.text(Messages.form_showSummary);
+
+            var origin, priv;
+            if (APP.common) {
+                var metadataMgr = APP.common.getMetadataMgr();
+                priv = metadataMgr.getPrivateData();
+                origin = priv.origin;
+            }
+            var getHref = function (hash) {
+                if (APP.common) {
+                    return origin + Hash.hashToHref(hash, 'profile');
+                }
+                return '#';
+            };
+
+            var els = Object.keys(answers).map(function (curve) {
+                var obj = answers[curve];
+                var answer = obj.msg;
+                var date = new Date(obj.time).toLocaleString();
+                var text, warning, badge;
+                if (!answer._userdata || !answer._userdata.name) {
+                    text = Messages._getKey('form_answerAnonymous', [date]);
+                } else {
+                    var ud = answer._userdata;
+                    var user;
+                    if (ud.profile) {
+                        if (priv && priv.friends[curve]) {
+                            badge = h('span.cp-form-friend', [
+                                h('i.fa.fa-address-book'),
+                                Messages._getKey('isContact', [ud.name || Messages.anonymous])
+                            ]);
+                        }
+                        user = h('a', {
+                            href: getHref(ud.profile) // Only used visually
+                        }, Util.fixHTML(ud.name || Messages.anonymous));
+                        if (curve !== ud.curvePublic) {
+                            warning = h('span.cp-form-warning', Messages.form_answerWarning);
+                        }
+                    } else {
+                        user = h('b', Util.fixHTML(ud.name || Messages.anonymous));
+                    }
+                    text = Messages._getKey('form_answerName', [user.outerHTML, date]);
+                }
+                var span = UI.setHTML(h('span'), text);
+                var viewButton = h('button.btn.btn-secondary.small', Messages.form_viewButton);
+                var div = h('div.cp-form-individual', [span, viewButton, warning, badge]);
+                $(viewButton).click(function () {
+                    var res = {};
+                    res[curve] = obj;
+                    var back = h('button.btn.btn-secondary.small', Messages.form_backButton);
+                    $(back).click(function () {
+                        summary = true;
+                        $s.click();
+                    });
+                    var header = h('div.cp-form-individual', [
+                        span.cloneNode(true),
+                        back
+                    ]);
+                    show(res, header);
+                });
+                $(div).find('a').click(function (e) {
+                    e.preventDefault();
+                    APP.common.openURL(Hash.hashToHref(ud.profile, 'profile'));
+                });
+                if (showUser === curve) {
+                    setTimeout(function () {
+                        showUser = undefined;
+                        $(viewButton).click();
+                    });
+                }
+                return div;
+            });
+            $results.append(els);
+        });
+        if (showUser) {
+            $s.click();
+        }
+    };
+
+    var addResultsButton = function (framework, content) {
+        var $res = $(h('button.cp-toolbar-appmenu.cp-toolbar-form-button', [
+            h('i.fa.fa-bar-chart'),
+            h('span.cp-button-name', Messages.form_results)
+        ]));
+        $res.click(function () {
+            $res.attr('disabled', 'disabled');
+            var sframeChan = framework._.sfCommon.getSframeChannel();
+            sframeChan.query("Q_FORM_FETCH_ANSWERS", content.answers, function (err, obj) {
+                var answers = obj && obj.results;
+                if (answers) { APP.answers = answers; }
+                $res.removeAttr('disabled');
+                $('body').addClass('cp-app-form-results');
+                renderResults(content, answers);
+                $res.remove();
+                var $editor = $(h('button.cp-toolbar-appmenu', [
+                    h('i.fa.fa-pencil'),
+                    h('span.cp-button-name', APP.isEditor ? Messages.form_editor : Messages.form_form)
+                ]));
+                $editor.click(function () {
+                    $('body').removeClass('cp-app-form-results');
+                    $editor.remove();
+                    addResultsButton(framework, content);
+                });
+                framework._.toolbar.$bottomL.append($editor);
+            });
+
+        });
+        framework._.toolbar.$bottomL.append($res);
+    };
+
+    var getFormResults = function () {
+        if (!Array.isArray(APP.formBlocks)) { return; }
+        var results = {};
+        APP.formBlocks.forEach(function (data) {
+            if (!data.getValue) { return; }
+            results[data.uid] = data.getValue();
+        });
+        return results;
+    };
+    var makeFormControls = function (framework, content, update, evOnChange) {
+        var loggedIn = framework._.sfCommon.isLoggedIn();
+        var metadataMgr = framework._.cpNfInner.metadataMgr;
+        var user = metadataMgr.getUserData();
+
+        if (!loggedIn && !content.answers.anonymous) { return; }
+
+        var cbox;
+        var anonName, $anonName;
+        cbox = UI.createCheckbox('cp-form-anonymous',
+                   Messages.form_anonymousBox, true, { mark: { tabindex:1 } });
+        var $anonBox = $(cbox).find('input');
+        if (loggedIn) {
+            if (!content.answers.anonymous || APP.cantAnon) {
+                $(cbox).hide().find('input').attr('disabled', 'disabled').prop('checked', false);
+            }
+        } else {
+            anonName = h('div.cp-form-anon-answer-input', [
+                Messages.form_answerAs,
+                h('input', {
+                    value: user.name || '',
+                    placeholder: Messages.form_anonName
+                })
+            ]);
+            $anonName = $(anonName).hide();
+            $anonBox.on('change', function () {
+                if (Util.isChecked($anonBox)) { $anonName.hide(); }
+                else { $anonName.show(); }
+            });
+        }
+
+        var send = h('button.cp-open.btn.btn-primary', update ? Messages.form_update : Messages.form_submit);
+        var reset = h('button.cp-open.cp-reset-button.btn.btn-danger-alt', Messages.form_reset);
+        $(reset).click(function () {
+            if (!Array.isArray(APP.formBlocks)) { return; }
+            APP.formBlocks.forEach(function (data) {
+                if (typeof(data.reset) === "function") { data.reset(); }
+            });
+            $(reset).attr('disabled', 'disabled');
+        });
+        var $send = $(send).click(function () {
+            $send.attr('disabled', 'disabled');
+            var results = getFormResults();
+            if (!results) { return; }
+
+            var user = metadataMgr.getUserData();
+            if (!Util.isChecked($anonBox)) {
+                results._userdata = loggedIn ? {
+                    avatar: user.avatar,
+                    name: user.name,
+                    notifications: user.notifications,
+                    curvePublic: user.curvePublic,
+                    profile: user.profile
+                } : {
+                    name: $anonName ? $anonName.find('input').val() : user.name
+                };
+            }
+
+            var sframeChan = framework._.sfCommon.getSframeChannel();
+            sframeChan.query('Q_FORM_SUBMIT', {
+                mailbox: content.answers,
+                results: results,
+                anonymous: !loggedIn || Util.isChecked($(cbox).find('input'))
+            }, function (err, data) {
+                $send.attr('disabled', 'disabled');
+                if (err || (data && data.error)) {
+                    if (data.error === "EANSWERED") {
+                        return void UI.warn(Messages.form_answered);
+                    }
+                    console.error(err || data.error);
+                    return void UI.warn(Messages.error);
+                }
+                evOnChange.fire(false, true);
+                window.onbeforeunload = undefined;
+                if (!update && content.answers.privateKey) {
+                    // Add results button
+                    addResultsButton(framework, content);
+                }
+                $send.removeAttr('disabled');
+                UI.alert(Messages.form_sent);
+                $send.text(Messages.form_update);
+            });
+        });
+
+        if (APP.isClosed) {
+            send = undefined;
+            reset = undefined;
+        }
+
+        var invalid = h('div.cp-form-invalid-warning');
+        var $invalid = $(invalid);
+        if (evOnChange) {
+            var origin, priv;
+            if (APP.common) {
+                priv = metadataMgr.getPrivateData();
+                origin = priv.origin;
+            }
+            evOnChange.reg(function () {
+                var $container = $('div.cp-form-creator-content');
+                var $inputs = $container.find('input:invalid');
+                if (!$inputs.length) {
+                    $send.text(update ? Messages.form_update : Messages.form_submit);
+                    return void $invalid.empty();
+                }
+                $send.text(update ? Messages.form_updateWarning : Messages.form_submitWarning);
+                var lis = [];
+                $inputs.each(function (i, el) {
+                    var $el = $(el).closest('.cp-form-block');
+                    var number = $el.find('.cp-form-block-question-number').text();
+                    var a = h('a', {
+                        href: origin + '#' + Messages._getKey('form_invalidQuestion', [number])
+                    }, Messages._getKey('form_invalidQuestion', [number]));
+                    $(a).click(function (e) {
+                        e.preventDefault();
+                        if (!$el.is(':visible')) {
+                            var pages = $el.closest('.cp-form-page').index();
+                            if (APP.refreshPage) { APP.refreshPage(pages + 1); }
+                        }
+                        $el[0].scrollIntoView();
+                    });
+                    var li = h('li', a);
+                    lis.push(li);
+                });
+                var list = h('ul', lis);
+                var content = [
+                    h('span', Messages.form_invalidWarning),
+                    list
+                ];
+                $invalid.empty().append(content);
+            });
+            evOnChange.fire(true);
+        }
+
+        return h('div.cp-form-send-container', [
+            invalid,
+            cbox ? h('div.cp-form-anon-answer', [
+                        cbox,
+                        anonName
+                   ]) : undefined,
+            reset, send
+        ]);
+    };
+    var updateForm = function (framework, content, editable, answers, temp) {
+        var $container = $('div.cp-form-creator-content');
+        if (!$container.length) { return; } // Not ready
+
+        var form = content.form;
+
+        APP.formBlocks = [];
+
+        if (APP.isClosed && content.answers.privateKey && !APP.isEditor) {
+            var sframeChan = framework._.sfCommon.getSframeChannel();
+            sframeChan.query("Q_FORM_FETCH_ANSWERS", content.answers, function (err, obj) {
+                var answers = obj && obj.results;
+                if (answers) { APP.answers = answers; }
+                $('body').addClass('cp-app-form-results');
+                $('.cp-toolbar-form-button').remove();
+                renderResults(content, answers);
+            });
+            return;
+        }
+
+        var evOnChange = Util.mkEvent();
+        if (!APP.isEditor) {
+            var _answers = Util.clone(answers || {});
+            delete _answers._proof;
+            delete _answers._userdata;
+            evOnChange.reg(function (noBeforeUnload, isSave) {
+                if (noBeforeUnload) { return; }
+                $container.find('.cp-reset-button').removeAttr('disabled');
+                var results = getFormResults();
+                if (isSave) {
+                    answers = Util.clone(results || {});
+                    _answers = Util.clone(answers);
+                }
+                if (!answers || Sortify(_answers) !== Sortify(results)) {
+                    window.onbeforeunload = function () {
+                        return true;
+                    };
+                } else {
+                    window.onbeforeunload = undefined;
+                }
+            });
+        }
+
+
+        var getFormCreator = function (uid) {
+            if (!APP.isEditor) { return; }
+            var full = !uid;
+            var idx = content.order.indexOf(uid);
+            var addControl = function (type) {
+                var btn = h('button.btn.btn-secondary', {
+                    title: full ? '' : Messages['form_type_'+type]
+                }, [
+                    (TYPES[type] || STATIC_TYPES[type]).icon.cloneNode(),
+                    full ? h('span', Messages['form_type_'+type]) : undefined
+                ]);
+                $(btn).click(function () {
+                    var uid = Util.uid();
+                    content.form[uid] = {
+                        //q: Messages.form_default,
+                        //opts: opts
+                        type: type,
+                    };
+                    if (full) {
+                        content.order.push(uid);
+                    } else {
+                        content.order.splice(idx, 0, uid);
+                    }
+                    framework.localChange();
+                    updateForm(framework, content, true);
+                });
+                return btn;
+            };
+
+            var controls = Object.keys(TYPES).map(addControl);
+            var staticControls = Object.keys(STATIC_TYPES).map(addControl);
+
+            var buttons = h('div.cp-form-creator-control-inline', [
+                h('div.cp-form-creator-types', controls),
+                h('div.cp-form-creator-types', staticControls)
+            ]);
+            var add = h('div', [h('i.fa.fa-plus')]);
+            if (!full) {
+                add = h('button.btn.cp-form-creator-inline-add', {
+                    title: Messages.tag_add
+                }, [
+                    h('i.fa.fa-plus.add-open'),
+                    h('i.fa.fa-times.add-close')
+                ]);
+                var $b = $(buttons).hide();
+                $(add).click(function () {
+                    $b.toggle();
+                    $(add).toggleClass('displayed');
+                });
+            }
+            else {
+                $(add).append(h('span', Messages.tag_add));
+            }
+
+            var inlineCls = full ? '-full' : '-inline';
+            return h('div.cp-form-creator-add'+inlineCls, [
+                add,
+                buttons
+            ]);
+
+        };
+
+        var updateAddInline = function () {
+            $container.find('.cp-form-creator-add-inline').remove();
+            $container.find('.cp-form-block').each(function (i, el) {
+                var $el = $(el);
+                var uid = $el.attr('data-id');
+                $el.before(getFormCreator(uid));
+            });
+        };
+
+
+        var elements = [];
+        var n = 1; // Question number
+        content.order.forEach(function (uid) {
+            var block = form[uid];
+            var type = block.type;
+            var model = TYPES[type] || STATIC_TYPES[type];
+            var isStatic = Boolean(STATIC_TYPES[type]);
+            if (!model) { return; }
+
+            var _answers, name;
+            if (type === 'poll') {
+                var metadataMgr = framework._.cpNfInner.metadataMgr;
+                var user = metadataMgr.getUserData();
+                // If we are a participant, our results shouldn't be in the table but in the
+                // editable part: remove them from _answers
+                _answers = getBlockAnswers(APP.answers, uid, !editable && user.curvePublic);
+                name = user.name;
+            }
+
+            var data = model.get(block.opts, _answers, name, evOnChange);
+            if (!data) { return; }
+            data.uid = uid;
+            if (answers && answers[uid] && data.setValue) { data.setValue(answers[uid]); }
+
+            if (data.pageBreak && !editable) {
+                elements.push(data);
+                return;
+            }
+
+
+            var dragHandle;
+            var q = h('div.cp-form-block-question', [
+                h('span.cp-form-block-question-number', (n++)+'.'),
+                h('span', block.q || Messages.form_default)
+            ]);
+            // Static blocks don't have questions ("q" is not used) so we can decrement n
+            if (isStatic) { n--; }
+
+            var editButtons, editContainer;
+
+            APP.formBlocks.push(data);
+
+            if (editable) {
+                // Drag handle
+                dragHandle = h('span.cp-form-block-drag-handle', [
+                    h('i.fa.fa-ellipsis-h'),
+                    h('i.fa.fa-ellipsis-h'),
+                ]);
+
+                // Question
+                var inputQ = h('input', {
+                    value: block.q || Messages.form_default
+                });
+                var $inputQ = $(inputQ);
+
+                var saving = false;
+                var cancel = false;
+                var onSaveQ = function (e) {
+                    if (cancel) {
+                        cancel = false;
+                        return;
+                    }
+                    var v = $inputQ.val();
+                    if (!v || !v.trim()) { return void UI.warn(Messages.error); }
+                    // Don't save if no change
+                    if (v.trim() === block.q) {
+                        $(q).removeClass('editing');
+                        if (!e) { $inputQ.blur(); }
+                        return;
+                    }
+                    if (saving && !e) { return; } // Prevent spam Enter
+                    block.q = v.trim();
+                    framework.localChange();
+                    saving = true;
+                    framework._.cpNfInner.chainpad.onSettle(function () {
+                        saving = false;
+                        $(q).removeClass('editing');
+                        if (!e) { $inputQ.blur(); }
+                        UI.log(Messages.saved);
+                    });
+                };
+                var onCancelQ = function () {
+                    $inputQ.val(block.q || Messages.form_default);
+                    cancel = true;
+                    $inputQ.blur();
+                    $(q).removeClass('editing');
+                };
+                $inputQ.keydown(function (e) {
+                    if (e.which === 13) { return void onSaveQ(); }
+                    if (e.which === 27) { return void onCancelQ(); }
+                });
+                $inputQ.focus(function () {
+                    $(q).addClass('editing');
+                });
+                $inputQ.blur(onSaveQ);
+                q = h('div.cp-form-input-block', [inputQ]);
+
+                // Delete question
+                var edit = h('span');
+                var del = h('button.btn.btn-danger-alt', [
+                    h('i.fa.fa-trash-o'),
+                    h('span', Messages.form_delete)
+                ]);
+                UI.confirmButton(del, {
+                    classes: 'btn-danger',
+                    new: true
+                }, function () {
+                    delete content.form[uid];
+                    var idx = content.order.indexOf(uid);
+                    content.order.splice(idx, 1);
+                    $('.cp-form-block[data-id="'+uid+'"]').remove();
+                    framework.localChange();
+                    updateAddInline();
+                });
+
+                // Values
+                if (data.edit) {
+                    edit = h('button.btn.btn-default.cp-form-edit-button', [
+                        h('i.fa.fa-pencil'),
+                        h('span', Messages.form_editBlock)
+                    ]);
+                    editContainer = h('div');
+                    var onSave = function (newOpts) {
+                        data.editing = false;
+                        if (!newOpts) { // Cancel edit
+                            $(editContainer).empty();
+                            $(editButtons).show();
+                            $(data.tag).show();
+                            return;
+                        }
+                        $(editContainer).empty();
+                        block.opts = newOpts;
+                        framework.localChange();
+                        var $oldTag = $(data.tag);
+                        framework._.cpNfInner.chainpad.onSettle(function () {
+                            $(editButtons).show();
+                            UI.log(Messages.saved);
+                            _answers = getBlockAnswers(APP.answers, uid);
+                            data = model.get(newOpts, _answers, null, evOnChange);
+                            if (!data) { data = {}; }
+                            $oldTag.before(data.tag).remove();
+                        });
+                    };
+                    var onEdit = function (tmp) {
+                        data.editing = true;
+                        $(data.tag).hide();
+                        $(editContainer).append(data.edit(onSave, tmp, framework));
+                        $(editButtons).hide();
+                    };
+                    $(edit).click(function () {
+                        onEdit();
+                    });
+
+                    // If we were editing this field, recover our unsaved changes
+                    if (temp && temp[uid]) {
+                        setTimeout(function () {
+                            onEdit(temp[uid]);
+                        });
+                    }
+                }
+
+                editButtons = h('div.cp-form-edit-buttons-container', [
+                    edit, del
+                ]);
+            }
+            var editableCls = editable ? ".editable" : "";
+            elements.push(h('div.cp-form-block'+editableCls, {
+                'data-id':uid
+            }, [
+                APP.isEditor ? dragHandle : undefined,
+                isStatic ? undefined : q,
+                h('div.cp-form-block-content', [
+                    data.tag,
+                    editButtons
+                ]),
+                editContainer
+            ]));
+        });
+
+        if (APP.isEditor) {
+            elements.push(getFormCreator());
+        }
+
+        var _content = elements;
+        if (!editable) {
+            _content = [];
+            var div = h('div.cp-form-page');
+            var pages = 1;
+            var wasPage = false;
+            elements.forEach(function (obj, i) {
+                if (obj && obj.pageBreak) {
+                    if (i === 0) { return; } // Can't start with a page break
+                    if (i === (elements.length - 1)) { return; } // Can't end with a page break
+                    if (wasPage) { return; } // Prevent double page break
+                    _content.push(div);
+                    pages++;
+                    div = h('div.cp-form-page');
+                    wasPage = true;
+                    return;
+                }
+                wasPage = false;
+                $(div).append(obj);
+            });
+            _content.push(div);
+
+            if (pages > 1) {
+                var pageContainer = h('div.cp-form-page-container');
+                var $page = $(pageContainer);
+                _content.push(pageContainer);
+                var refreshPage = APP.refreshPage = function (current) {
+                    $page.empty();
+                    if (!current || current < 1) { current = 1; }
+                    if (current > pages) { current = pages; }
+                    var left = h('button.btn.btn-secondary.cp-prev', [
+                        h('i.fa.fa-arrow-left'),
+                    ]);
+                    var state = h('span', Messages._getKey('form_page', [current, pages]));
+                    var right = h('button.btn.btn-secondary.cp-next', [
+                        h('i.fa.fa-arrow-right'),
+                    ]);
+                    if (current === pages) { $(right).css('visibility', 'hidden'); }
+                    if (current === 1) { $(left).css('visibility', 'hidden'); }
+                    $(left).click(function () { refreshPage(current - 1); });
+                    $(right).click(function () { refreshPage(current + 1); });
+                    $page.append([left, state, right]);
+                    $container.find('.cp-form-page').hide();
+                    $($container.find('.cp-form-page').get(current-1)).show();
+                    if (current !== pages) {
+                        $container.find('.cp-form-send-container').hide();
+                    } else {
+                        $container.find('.cp-form-send-container').show();
+                    }
+                };
+                setTimeout(refreshPage);
+            }
+        }
+
+        $container.empty().append(_content);
+        updateAddInline();
+
+        if (editable) {
+            APP.mainSortable = Sortable.create($container[0], {
+                direction: "vertical",
+                filter: "input, button, .CodeMirror, .cp-form-type-sort",
+                preventOnFilter: false,
+                draggable: ".cp-form-block",
+                //forceFallback: true,
+                fallbackTolerance: 5,
+                onStart: function () {
+                    $container.find('.cp-form-creator-add-inline').remove();
+                },
+                store: {
+                    set: function (s) {
+                        content.order = s.toArray();
+                        framework.localChange();
+                        updateAddInline();
+                    }
+                }
+            });
+            return;
+        }
+
+        // In view mode, add "Submit" and "reset" buttons
+        $container.append(makeFormControls(framework, content, Boolean(answers), evOnChange));
+        if (!answers) {
+            $container.find('.cp-reset-button').attr('disabled', 'disabled');
+        }
+    };
+
+    var getTempFields = function () {
+        if (!Array.isArray(APP.formBlocks)) { return; }
+        var temp = {};
+        APP.formBlocks.forEach(function (data) {
+            if (data.editing) {
+                var cursor = data.getCursor && data.getCursor();
+                temp[data.uid] = cursor;
+            }
+        });
+        return temp;
+    };
+
+    var andThen = function (framework) {
+        framework.start();
+        APP.framework = framework;
+        var evOnChange = Util.mkEvent();
+        var content = {};
+
+        APP.common = framework._.sfCommon;
+        var sframeChan = framework._.sfCommon.getSframeChannel();
+        var metadataMgr = framework._.cpNfInner.metadataMgr;
+        var user = metadataMgr.getUserData();
+
+        var priv = metadataMgr.getPrivateData();
+        APP.isEditor = Boolean(priv.form_public);
+        var $body = $('body');
+
+        var $toolbarContainer = $('#cp-toolbar');
+        var helpMenu = framework._.sfCommon.createHelpMenu(['text', 'pad']);
+        $toolbarContainer.after(helpMenu.menu);
+        framework._.toolbar.$drawer.append(helpMenu.button);
+
+        var offlineEl = h('div.alert.alert-danger.cp-burn-after-reading', Messages.disconnected);
+        framework.onEditableChange(function (editable) {
+            if (editable) {
+                if (APP.mainSortable) {
+                    APP.mainSortable.options.disabled = false;
+                }
+                if (!APP.isEditor) { $(offlineEl).remove(); }
+                $body.removeClass('cp-form-readonly');
+                $('.cp-form-creator-settings').find('input, button').removeAttr('disabled');
+            } else {
+                if (APP.mainSortable) {
+                    APP.mainSortable.options.disabled = true;
+                }
+                if (!APP.isEditor) { $('.cp-help-container').before(offlineEl); }
+                $body.addClass('cp-form-readonly');
+                $('.cp-form-creator-settings').find('input, button').attr('disabled', 'disabled');
+            }
+        });
+
+        if (!APP.isEditor) {
+            framework._.toolbar.alone();
+            $('.cp-toolbar-icon-history').hide();
+            $('.cp-toolbar-icon-snapshots').hide();
+        }
+
+        var makeFormSettings = function () {
+            // Private / public status
+            var resultsType = h('div.cp-form-results-type-container');
+            var $results = $(resultsType);
+            var refreshPublic = function () {
+                $results.empty();
+                var makePublic = h('button.btn.btn-secondary', Messages.form_makePublic);
+                var makePublicDiv = h('div.cp-form-actions', makePublic);
+                if (content.answers.privateKey) { makePublicDiv = undefined; }
+                var publicText = content.answers.privateKey ? Messages.form_isPublic : Messages.form_isPrivate;
+                $results.append(h('span.cp-form-results-type', publicText));
+                $results.append(makePublicDiv);
+                var $makePublic = $(makePublic).click(function () {
+                    UI.confirm(Messages.form_makePublicWarning, function (yes) {
+                        if (!yes) { return; }
+                        $makePublic.attr('disabled', 'disabled');
+                        var priv = metadataMgr.getPrivateData();
+                        content.answers.privateKey = priv.form_private;
+                        framework.localChange();
+                        framework._.cpNfInner.chainpad.onSettle(function () {
+                            UI.log(Messages.saved);
+                            refreshPublic();
+                        });
+                    });
+                });
+            };
+            refreshPublic();
+
+            var responseMsg = h('div.cp-form-response-msg-container');
+            var $responseMsg = $(responseMsg);
+            var refreshResponse = function () {
+                if (true) { return; } // XXX 4.10.0
+                $responseMsg.empty();
+                Messages.form_updateMsg = "Update response message"; // XXX 4.10.0
+                Messages.form_addMsg = "Add response message"; // XXX 4.10.0
+                Messages.form_responseMsg = "Add a message that will be displayed in the response page."; // XXX 4.10.0
+                var text = content.answers.msg ? Messages.form_updateMsg : Messages.form_addMsg;
+                var btn = h('button.btn.btn-secondary', text);
+                $(btn).click(function () {
+                    var editor;
+                    if (!APP.responseModal) {
+                        var t = h('textarea');
+                        var div = h('div', [
+                            h('p', Messages.form_responseMsg),
+                            t
+                        ]);
+                        var cm = SFCodeMirror.create("gfm", CMeditor, t);
+                        editor = APP.responseEditor = cm.editor;
+                        editor.setOption('lineNumbers', true);
+                        editor.setOption('lineWrapping', true);
+                        editor.setOption('styleActiveLine', true);
+                        editor.setOption('readOnly', false);
+                        setTimeout(function () {
+                            editor.setValue(content.answers.msg || '');
+                            editor.refresh();
+                            editor.save();
+                            editor.focus();
+                        });
+
+                        var buttons = [{
+                            className: 'primary',
+                            name: Messages.settings_save,
+                            onClick: function () {
+                                var v = editor.getValue();
+                                content.answers.msg = v.trim(0, 2000); // XXX 4.10.0 max length?
+                                framework.localChange();
+                                framework._.cpNfInner.chainpad.onSettle(function () {
+                                    UI.log(Messages.saved);
+                                    refreshResponse();
+                                });
+                            },
+                            //keys: []
+                        }, {
+                            className: 'cancel',
+                            name: Messages.cancel,
+                            onClick: function () {},
+                            keys: [27]
+                        }];
+                        APP.responseModal = UI.dialog.customModal(div, { buttons: buttons });
+                    } else {
+                        editor = APP.responseEditor;
+                        setTimeout(function () {
+                            editor.setValue(content.answers.msg || '');
+                            editor.refresh();
+                            editor.save();
+                            editor.focus();
+                        });
+                    }
+                    UI.openCustomModal(APP.responseModal);
+                });
+                // $responseMsg.append(btn); // XXX 4.10.0
+            };
+            //refreshResponse();
+
+            // Allow anonymous answers
+            var privacyContainer = h('div.cp-form-privacy-container');
+            var $privacy = $(privacyContainer);
+            var refreshPrivacy = function () {
+                $privacy.empty();
+                var anonymous = content.answers.anonymous;
+                var radioOn = UI.createRadio('cp-form-privacy', 'cp-form-privacy-on',
+                        Messages.form_anonymous_on, Boolean(anonymous), {
+                            input: { value: 1 },
+                            mark: { tabindex:1 }
+                        });
+                var radioOff = UI.createRadio('cp-form-privacy', 'cp-form-privacy-off',
+                        Messages.form_anonymous_off, !anonymous, {
+                            input: { value: 0 },
+                            mark: { tabindex:1 }
+                        });
+                var radioContainer = h('div.cp-form-privacy-radio', [radioOn, radioOff]);
+                $(radioContainer).find('input[type="radio"]').on('change', function() {
+                    var val = $('input:radio[name="cp-form-privacy"]:checked').val();
+                    val = Number(val) || 0;
+                    content.answers.anonymous = Boolean(val);
+                    framework.localChange();
+                    framework._.cpNfInner.chainpad.onSettle(function () {
+                        UI.log(Messages.saved);
+                    });
+                });
+                $privacy.append(h('div.cp-form-status', Messages.form_anonymous));
+                $privacy.append(h('div.cp-form-actions', radioContainer));
+            };
+            refreshPrivacy();
+
+            // End date / Closed state
+            var endDateContainer = h('div.cp-form-status-container');
+            var $endDate = $(endDateContainer);
+            var refreshEndDate = function () {
+                $endDate.empty();
+
+                var endDate = content.answers.endDate;
+                var date = new Date(endDate).toLocaleString();
+                var now = +new Date();
+                var text = Messages.form_isOpen;
+                var buttonTxt = Messages.form_setEnd;
+                if (endDate <= now) {
+                    text = Messages._getKey('form_isClosed', [date]);
+                    buttonTxt = Messages.form_open;
+                } else if (endDate > now) {
+                    text = Messages._getKey('form_willClose', [date]);
+                    buttonTxt = Messages.form_removeEnd;
+                }
+
+                var button = h('button.btn.btn-secondary', buttonTxt);
+
+                var $button = $(button).click(function () {
+                    $button.attr('disabled', 'disabled');
+                    // If there is an end date, remove it
+                    if (endDate) {
+                        delete content.answers.endDate;
+                        framework.localChange();
+                        refreshEndDate();
+                        return;
+                    }
+                    // Otherwise add it
+                    var datePicker = h('input');
+                    var picker = Flatpickr(datePicker, {
+                        enableTime: true,
+                        time_24hr: is24h,
+                        dateFormat: dateFormat,
+                        minDate: new Date()
+                    });
+                    var save = h('button.btn.btn-primary', Messages.settings_save);
+                    $(save).click(function () {
+                        var d = picker.parseDate(datePicker.value);
+                        content.answers.endDate = +d;
+                        framework.localChange();
+                        refreshEndDate();
+                    });
+                    var confirmContent = h('div', [
+                        h('div', Messages.form_setEnd),
+                        h('div.cp-form-input-block', [datePicker, save]),
+                    ]);
+                    $button.after(confirmContent);
+                    $button.remove();
+                    picker.open();
+                });
+
+                $endDate.append(h('div.cp-form-status', text));
+                $endDate.append(h('div.cp-form-actions', button));
+
+            };
+            refreshEndDate();
+
+
+            evOnChange.reg(refreshPublic);
+            evOnChange.reg(refreshPrivacy);
+            evOnChange.reg(refreshEndDate);
+            //evOnChange.reg(refreshResponse);
+
+            return [
+                endDateContainer,
+                privacyContainer,
+                resultsType,
+                responseMsg
+            ];
+        };
+
+        var checkIntegrity = function (getter) {
+            if (!content.order || !content.form) { return; }
+            var changed = false;
+            content.order.forEach(function (uid) {
+                if (!content.form[uid]) {
+                    var idx = content.order.indexOf(uid);
+                    content.order.splice(idx, 1);
+                    changed = true;
+                }
+            });
+            Object.keys(content.form).forEach(function (uid) {
+                var idx = content.order.indexOf(uid);
+                if (idx === -1) {
+                    changed = true;
+                    content.order.push(uid);
+                }
+            });
+
+            if (!getter && changed) { framework.localChange(); }
+        };
+
+        var makeFormCreator = function () {
+
+            var controlContainer;
+            var fillerContainer;
+            if (APP.isEditor) {
+                var settings = makeFormSettings();
+
+                controlContainer = h('div.cp-form-creator-control', [
+                    h('div.cp-form-creator-settings', settings),
+                ]);
+                fillerContainer = h('div.cp-form-filler-container');
+            }
+
+            var contentContainer = h('div.cp-form-creator-content');
+            var resultsContainer = h('div.cp-form-creator-results');
+            var div = h('div.cp-form-creator-container', [
+                controlContainer,
+                contentContainer,
+                resultsContainer,
+                fillerContainer
+            ]);
+            return div;
+        };
+
+        var endDateEl = h('div.alert.alert-warning.cp-burn-after-reading');
+        var endDate;
+        var endDateTo;
+
+        // numbers greater than this overflow the maximum delay for a setTimeout
+        // which results in it being executed immediately (oops)
+        // https://developer.mozilla.org/en-US/docs/Web/API/WindowOrWorkerGlobalScope/setTimeout#maximum_delay_value
+        var MAX_TIMEOUT_DELAY = 2147483647;
+        var refreshEndDateBanner = function (force) {
+            if (APP.isEditor) { return; }
+            var _endDate = content.answers.endDate;
+            if (_endDate === endDate && !force) { return; }
+            endDate = _endDate;
+            var date = new Date(endDate).toLocaleString();
+            var text = Messages._getKey('form_isClosed', [date]);
+            if (endDate > +new Date()) {
+                text = Messages._getKey('form_willClose', [date]);
+            }
+            if ($('.cp-help-container').length && endDate) {
+                $(endDateEl).text(text);
+                $('.cp-help-container').before(endDateEl);
+            } else {
+                $(endDateEl).remove();
+            }
+
+            APP.isClosed = endDate && endDate < (+new Date());
+            clearTimeout(endDateTo);
+            if (!APP.isClosed && endDate) {
+                // calculate how many ms in the future the poll will be closed
+                var diff = (endDate - +new Date() + 100);
+                // if that value would overflow, then check again in a day
+                // (if the tab is still open)
+                if (diff > MAX_TIMEOUT_DELAY) {
+                    endDateTo = setTimeout(function () {
+                        refreshEndDateBanner(true);
+                    }, 1000 * 3600 * 24);
+                    return;
+                }
+
+                endDateTo = setTimeout(function () {
+                    refreshEndDateBanner(true);
+                    $('.cp-form-send-container').find('.cp-open').hide();
+                }, diff);
+            }
+        };
+
+        var showAnonBlockedAlert = function () {
+            var content = UI.setHTML(h('span.cp-anon-blocked-msg'), Messages.form_anonymous_blocked);
+            $(content).find('a').click(function (ev) {
+                ev.preventDefault();
+                var href = ($(this).attr('href') || '').replace(/\//g, '');
+                APP.common.setLoginRedirect(href || 'login');
+            });
+            UI.alert(content);
+        };
+
+        framework.onReady(function () {
+            var priv = metadataMgr.getPrivateData();
+
+            if (APP.isEditor) {
+                if (!content.form) {
+                    content.form = {
+                        "1": { type: 'md' },
+                        "2": { type: 'radio' }
+                    };
+                    framework.localChange();
+                }
+                if (!content.order) {
+                    content.order = ["1", "2"];
+                    framework.localChange();
+                }
+                if (!content.answers || !content.answers.channel || !content.answers.publicKey || !content.answers.validateKey) {
+                    content.answers = {
+                        channel: Hash.createChannelId(),
+                        publicKey: priv.form_public,
+                        validateKey: priv.form_answerValidateKey
+                    };
+                    framework.localChange();
+                }
+                checkIntegrity();
+            }
+
+            sframeChan.event('EV_FORM_PIN', {channel: content.answers.channel});
+
+            var $container = $('#cp-app-form-container');
+            $container.append(makeFormCreator());
+
+            if (!content.answers || !content.answers.channel || !content.answers.publicKey || !content.answers.validateKey) {
+                return void UI.errorLoadingScreen(Messages.form_invalid);
+            }
+
+            var getResults = function (key) {
+                sframeChan.query("Q_FORM_FETCH_ANSWERS", {
+                    channel: content.answers.channel,
+                    validateKey: content.answers.validateKey,
+                    publicKey: content.answers.publicKey,
+                    privateKey: key
+                }, function (err, obj) {
+                    var answers = obj && obj.results;
+                    if (answers) { APP.answers = answers; }
+                    $body.addClass('cp-app-form-results');
+                    renderResults(content, answers);
+                });
+            };
+            if (priv.form_auditorKey) {
+                APP.isAuditor = true;
+                getResults(priv.form_auditorKey);
+                return;
+            }
+
+            if (APP.isEditor) {
+                addResultsButton(framework, content);
+                sframeChan.query("Q_FORM_FETCH_ANSWERS", {
+                    channel: content.answers.channel,
+                    validateKey: content.answers.validateKey,
+                    publicKey: content.answers.publicKey
+                }, function (err, obj) {
+                    var answers = obj && obj.results;
+                    if (answers) { APP.answers = answers; }
+                    checkIntegrity(false);
+                    updateForm(framework, content, true);
+                });
+                return;
+            }
+
+            refreshEndDateBanner();
+
+            var loggedIn = framework._.sfCommon.isLoggedIn();
+            if (!loggedIn && !content.answers.anonymous) {
+                showAnonBlockedAlert();
+            }
+
+            // If the results are public and there is at least one doodle, fetch the results now
+            if (content.answers.privateKey && Object.keys(content.form).some(function (uid) {
+                    return content.form[uid].type === "poll";
+                })) {
+                sframeChan.query("Q_FORM_FETCH_ANSWERS", {
+                    channel: content.answers.channel,
+                    validateKey: content.answers.validateKey,
+                    publicKey: content.answers.publicKey,
+                    privateKey: content.answers.privateKey,
+                }, function (err, obj) {
+                    var answers = obj && obj.results;
+                    if (answers) { APP.answers = answers; }
+
+                    if (obj && obj.noDriveAnswered) {
+                        // No drive mode already answered: can't answer again
+                        if (answers) {
+                            $body.addClass('cp-app-form-results');
+                            renderResults(content, answers);
+                        } else {
+                            return void UI.errorLoadingScreen(Messages.form_answered);
+                        }
+                        return;
+                    }
+                    checkIntegrity(false);
+                    var myAnswers;
+                    var curve1 = user.curvePublic;
+                    var curve2 = obj && obj.myKey; // Anonymous answer key
+                    if (answers) {
+                        var myAnswersObj = answers[curve1] || answers[curve2] || undefined;
+                        if (myAnswersObj) {
+                            myAnswers = myAnswersObj.msg;
+                        }
+                    }
+                    // If we have a non-anon answer, we can't answer anonymously later
+                    if (answers[curve1]) { APP.cantAnon = true; }
+
+                    // Add results button
+                    if (myAnswers) { addResultsButton(framework, content); }
+
+                    updateForm(framework, content, false, myAnswers);
+                });
+                return;
+            }
+
+            sframeChan.query("Q_FETCH_MY_ANSWERS", {
+                channel: content.answers.channel,
+                validateKey: content.answers.validateKey,
+                publicKey: content.answers.publicKey
+            }, function (err, obj) {
+                if (obj && obj.error) {
+                    if (obj.error === "EANSWERED") {
+                        // No drive mode already answered: can't answer again
+                        if (content.answers.privateKey) {
+                            return void getResults(content.answers.privateKey);
+                        }
+                        // Here, we know results are private so we can use an error screen
+                        return void UI.errorLoadingScreen(Messages.form_answered);
+                    }
+                    UI.warn(Messages.form_cantFindAnswers);
+                }
+                var answers;
+                if (obj && !obj.error) {
+                    answers = obj;
+                    // If we have a non-anon answer, we can't answer anonymously later
+                    if (!obj._isAnon) { APP.cantAnon = true; }
+
+                    // Add results button
+                    if (content.answers.privateKey) { addResultsButton(framework, content); }
+                }
+                checkIntegrity(false);
+                updateForm(framework, content, false, answers);
+            });
+
+        });
+
+        framework.onContentUpdate(function (newContent) {
+            content = newContent;
+            evOnChange.fire();
+            refreshEndDateBanner();
+            var answers, temp;
+            if (!APP.isEditor) { answers = getFormResults(); }
+            else { temp = getTempFields(); }
+            updateForm(framework, content, APP.isEditor, answers, temp);
+        });
+
+        framework.setContentGetter(function () {
+            checkIntegrity(true);
+            return content;
+        });
+
+        framework.setFileImporter({ accept: ['.json'] }, function (newContent) {
+            var parsed = JSON.parse(newContent || {});
+            parsed.answers = content.answers;
+            return parsed;
+        });
+
+        framework.setFileExporter(['.json'], function(cb, ext) {
+            Exporter.main(content, cb, ext);
+        }, true);
+
+
+    };
+
+    Framework.create({
+        toolbarContainer: '#cp-toolbar',
+        contentContainer: '#cp-app-form-editor',
+    }, andThen);
+});
diff --git a/www/form/main.js b/www/form/main.js
new file mode 100644
index 000000000..de2c311ef
--- /dev/null
+++ b/www/form/main.js
@@ -0,0 +1,353 @@
+// Load #1, load as little as possible because we are in a race to get the loading screen up.
+define([
+    '/bower_components/nthen/index.js',
+    '/api/config',
+    '/common/dom-ready.js',
+    '/common/sframe-common-outer.js',
+    '/bower_components/tweetnacl/nacl-fast.min.js',
+], function (nThen, ApiConfig, DomReady, SFCommonO) {
+    var Nacl = window.nacl;
+
+    var href, hash;
+    // Loaded in load #2
+    nThen(function (waitFor) {
+        DomReady.onReady(waitFor());
+    }).nThen(function (waitFor) {
+        var obj = SFCommonO.initIframe(waitFor, true);
+        href = obj.href;
+        hash = obj.hash;
+    }).nThen(function (/*waitFor*/) {
+        var privateKey, publicKey;
+        var channels = {};
+        var getPropChannels = function () {
+            return channels;
+        };
+        var addData = function (meta, CryptPad, user, Utils) {
+            var keys = Utils.secret && Utils.secret.keys;
+
+            var parsed = Utils.Hash.parseTypeHash('pad', hash.slice(1));
+            if (parsed && parsed.auditorKey) {
+                meta.form_auditorKey = parsed.auditorKey;
+                meta.form_auditorHash = hash;
+            }
+
+            var formData = Utils.Hash.getFormData(Utils.secret);
+            if (!formData) { return; }
+
+            var validateKey = keys.secondaryValidateKey;
+            meta.form_answerValidateKey = validateKey;
+
+            publicKey = meta.form_public = formData.form_public;
+            privateKey = meta.form_private = formData.form_private;
+            meta.form_auditorHash = formData.form_auditorHash;
+        };
+        var addRpc = function (sframeChan, Cryptpad, Utils) {
+            sframeChan.on('EV_FORM_PIN', function (data) {
+                channels.answersChannel = data.channel;
+                Cryptpad.getPadAttribute('answersChannel', function (err, res) {
+                    // If already stored, don't pin it again
+                    if (res && res === data.channel) { return; }
+                    Cryptpad.pinPads([data.channel], function () {
+                        Cryptpad.setPadAttribute('answersChannel', data.channel, function () {});
+                    });
+                });
+
+            });
+            var getAnonymousKeys = function (formSeed, channel) {
+                var array = Nacl.util.decodeBase64(formSeed + channel);
+                var hash = Nacl.hash(array);
+                var secretKey = Nacl.util.encodeBase64(hash.subarray(32));
+                var publicKey = Utils.Hash.getCurvePublicFromPrivate(secretKey);
+                return {
+                    curvePrivate: secretKey,
+                    curvePublic: publicKey,
+                };
+            };
+            var u8_slice = function (A, start, end) {
+                return new Uint8Array(Array.prototype.slice.call(A, start, end));
+            };
+            var u8_concat = function (A) {
+                var length = 0;
+                A.forEach(function (a) { length += a.length; });
+                var total = new Uint8Array(length);
+
+                var offset = 0;
+                A.forEach(function (a) {
+                    total.set(a, offset);
+                    offset += a.length;
+                });
+                return total;
+            };
+            var anonProof = function (channel, theirPub, anonKeys) {
+                var u8_plain = Nacl.util.decodeUTF8(channel);
+                var u8_nonce = Nacl.randomBytes(Nacl.box.nonceLength);
+                var u8_cipher = Nacl.box(
+                    u8_plain,
+                    u8_nonce,
+                    Nacl.util.decodeBase64(theirPub),
+                    Nacl.util.decodeBase64(anonKeys.curvePrivate)
+                );
+                var u8_bundle = u8_concat([
+                    u8_nonce, // 24 uint8s
+                    u8_cipher, // arbitrary length
+                ]);
+                return {
+                    key: anonKeys.curvePublic,
+                    proof: Nacl.util.encodeBase64(u8_bundle)
+                };
+            };
+            var checkAnonProof = function (proofObj, channel, curvePrivate) {
+                var pub = proofObj.key;
+                var proofTxt = proofObj.proof;
+                try {
+                    var u8_bundle = Nacl.util.decodeBase64(proofTxt);
+                    var u8_nonce = u8_slice(u8_bundle, 0, Nacl.box.nonceLength);
+                    var u8_cipher = u8_slice(u8_bundle, Nacl.box.nonceLength);
+                    var u8_plain = Nacl.box.open(
+                        u8_cipher,
+                        u8_nonce,
+                        Nacl.util.decodeBase64(pub),
+                        Nacl.util.decodeBase64(curvePrivate)
+                    );
+                    return channel === Nacl.util.encodeUTF8(u8_plain);
+                } catch (e) {
+                    console.error(e);
+                    return false;
+                }
+            };
+            sframeChan.on('Q_FORM_FETCH_ANSWERS', function (data, _cb) {
+                var cb = Utils.Util.once(_cb);
+                var myKeys = {};
+                var myFormKeys;
+                var accessKeys;
+                var CPNetflux, Pinpad;
+                var network;
+                var noDriveAnswered = false;
+                nThen(function (w) {
+                    require([
+                        '/bower_components/chainpad-netflux/chainpad-netflux.js',
+                        '/common/pinpad.js',
+                    ], w(function (_CPNetflux, _Pinpad) {
+                        CPNetflux = _CPNetflux;
+                        Pinpad = _Pinpad;
+                    }));
+                    Cryptpad.getAccessKeys(w(function (_keys) {
+                        if (!Array.isArray(_keys)) { return; }
+                        accessKeys = _keys;
+
+                        _keys.some(function (_k) {
+                            if ((!Cryptpad.initialTeam && !_k.id) || Cryptpad.initialTeam === _k.id) {
+                                myKeys = _k;
+                                return true;
+                            }
+                        });
+                    }));
+                    Cryptpad.getFormKeys(w(function (keys) {
+                        if (!keys.curvePublic && !keys.formSeed) {
+                            // No drive mode
+                            var answered = JSON.parse(localStorage.CP_formAnswered || "[]");
+                            noDriveAnswered = answered.indexOf(data.channel) !== -1;
+                        }
+                        myFormKeys = keys;
+                    }));
+                    Cryptpad.makeNetwork(w(function (err, nw) {
+                        network = nw;
+                    }));
+                }).nThen(function () {
+                    if (!network) { return void cb({error: "E_CONNECT"}); }
+
+                    if (myFormKeys.formSeed) {
+                        myFormKeys = getAnonymousKeys(myFormKeys.formSeed, data.channel);
+                    }
+
+                    var keys = Utils.secret && Utils.secret.keys;
+
+                    var curvePrivate = privateKey || data.privateKey;
+                    if (!curvePrivate) { return void cb({error: 'EFORBIDDEN'}); }
+                    var crypto = Utils.Crypto.Mailbox.createEncryptor({
+                        curvePrivate: curvePrivate,
+                        curvePublic: publicKey || data.publicKey,
+                        validateKey: data.validateKey
+                    });
+                    var config = {
+                        network: network,
+                        channel: data.channel,
+                        noChainPad: true,
+                        validateKey: keys.secondaryValidateKey,
+                        owners: [myKeys.edPublic],
+                        crypto: crypto,
+                        //Cache: Utils.Cache // XXX 4.10.0
+                    };
+                    var results = {};
+                    config.onError = function (info) {
+                        cb({ error: info.type });
+                    };
+                    config.onRejected = function (data, cb) {
+                        if (!Array.isArray(data) || !data.length || data[0].length !== 16) {
+                            return void cb(true);
+                        }
+                        if (!Array.isArray(accessKeys)) { return void cb(true); }
+                        network.historyKeeper = data[0];
+                        nThen(function (waitFor) {
+                            accessKeys.forEach(function (obj) {
+                                Pinpad.create(network, obj, waitFor(function (e) {
+                                    console.log('done', obj);
+                                    if (e) { console.error(e); }
+                                }));
+                            });
+                        }).nThen(function () {
+                            cb();
+                        });
+                    };
+                    config.onReady = function () {
+                        var myKey;
+                        // If we have submitted an anonymous answer, retrieve it
+                        if (myFormKeys.curvePublic && results[myFormKeys.curvePublic]) {
+                            myKey = myFormKeys.curvePublic;
+                        }
+                        cb({
+                            noDriveAnswered: noDriveAnswered,
+                            myKey: myKey,
+                            results: results
+                        });
+                        network.disconnect();
+                    };
+                    config.onMessage = function (msg, peer, vKey, isCp, hash, senderCurve, cfg) {
+                        var parsed = Utils.Util.tryParse(msg);
+                        if (!parsed) { return; }
+                        if (parsed._proof) {
+                            var check = checkAnonProof(parsed._proof, data.channel, curvePrivate);
+                            if (check) {
+                                delete results[parsed._proof.key];
+                            }
+                        }
+                        results[senderCurve] = {
+                            msg: parsed,
+                            hash: hash,
+                            time: cfg && cfg.time
+                        };
+                    };
+                    CPNetflux.start(config);
+                });
+            });
+            sframeChan.on("Q_FETCH_MY_ANSWERS", function (data, cb) {
+                var answer;
+                var myKeys;
+                nThen(function (w) {
+                    Cryptpad.getFormKeys(w(function (keys) {
+                        myKeys = keys;
+                    }));
+                    Cryptpad.getFormAnswer({channel: data.channel}, w(function (obj) {
+                        if (!obj || obj.error) {
+                            if (obj && obj.error === "ENODRIVE") {
+                                var answered = JSON.parse(localStorage.CP_formAnswered || "[]");
+                                if (answered.indexOf(data.channel) !== -1) {
+                                    cb({error:'EANSWERED'});
+                                } else {
+                                    cb();
+                                }
+                                return void w.abort();
+                            }
+                            w.abort();
+                            return void cb(obj);
+                        }
+                        answer = obj;
+                    }));
+                }).nThen(function () {
+                    if (answer.anonymous) {
+                        if (!myKeys.formSeed) { return void cb({ error: "ANONYMOUS_ERROR" }); }
+                        myKeys = getAnonymousKeys(myKeys.formSeed, data.channel);
+                    }
+                    Cryptpad.getHistoryRange({
+                        channel: data.channel,
+                        lastKnownHash: answer.hash,
+                        toHash: answer.hash,
+                    }, function (obj) {
+                        if (obj && obj.error) { return void cb(obj); }
+                        var messages = obj.messages;
+                        if (!messages.length) { return void cb(); }
+                        var res = Utils.Crypto.Mailbox.openOwnSecretLetter(messages[0].msg, {
+                            validateKey: data.validateKey,
+                            ephemeral_private: Nacl.util.decodeBase64(answer.curvePrivate),
+                            my_private: Nacl.util.decodeBase64(myKeys.curvePrivate),
+                            their_public: Nacl.util.decodeBase64(data.publicKey)
+                        });
+                        res.content._isAnon = answer.anonymous;
+                        cb(JSON.parse(res.content));
+                    });
+
+                });
+
+            });
+            var noDriveSeed = Utils.Hash.createChannelId();
+            sframeChan.on("Q_FORM_SUBMIT", function (data, cb) {
+                var box = data.mailbox;
+                var myKeys;
+                nThen(function (w) {
+                    Cryptpad.getFormKeys(w(function (keys) {
+                        // If formSeed doesn't exists, it means we're probably in noDrive mode.
+                        // We can create a seed in localStorage.
+                        if (!keys.formSeed) {
+                            // No drive mode
+                            var answered = JSON.parse(localStorage.CP_formAnswered || "[]");
+                            if(answered.indexOf(data.channel) !== -1) {
+                                // Already answered: abort
+                                return void cb({ error: "EANSWERED" });
+                            }
+                            keys = { formSeed: noDriveSeed };
+                        }
+                        myKeys = keys;
+                    }));
+                }).nThen(function () {
+                    var myAnonymousKeys;
+                    if (data.anonymous) {
+                        if (!myKeys.formSeed) { return void cb({ error: "ANONYMOUS_ERROR" }); }
+                        myKeys = getAnonymousKeys(myKeys.formSeed, box.channel);
+                    } else {
+                        myAnonymousKeys = getAnonymousKeys(myKeys.formSeed, box.channel);
+                    }
+                    var keys = Utils.secret && Utils.secret.keys;
+                    myKeys.signingKey = keys.secondarySignKey;
+
+                    var ephemeral_keypair = Nacl.box.keyPair();
+                    var ephemeral_private = Nacl.util.encodeBase64(ephemeral_keypair.secretKey);
+                    myKeys.ephemeral_keypair = ephemeral_keypair;
+
+                    if (myAnonymousKeys) {
+                        var proof = anonProof(box.channel, box.publicKey, myAnonymousKeys);
+                        data.results._proof = proof;
+                    }
+
+                    var crypto = Utils.Crypto.Mailbox.createEncryptor(myKeys);
+                    var text = JSON.stringify(data.results);
+                    var ciphertext = crypto.encrypt(text, box.publicKey);
+
+                    var hash = ciphertext.slice(0,64);
+                    Cryptpad.anonRpcMsg("WRITE_PRIVATE_MESSAGE", [
+                        box.channel,
+                        ciphertext
+                    ], function (err, response) {
+                        Cryptpad.storeFormAnswer({
+                            channel: box.channel,
+                            hash: hash,
+                            curvePrivate: ephemeral_private,
+                            anonymous: Boolean(data.anonymous)
+                        });
+                        cb({error: err, response: response, hash: hash});
+                    });
+                });
+            });
+        };
+        SFCommonO.start({
+            addData: addData,
+            addRpc: addRpc,
+            //cache: true,
+            noDrive: true,
+            hash: hash,
+            href: href,
+            useCreationScreen: true,
+            messaging: true,
+            getPropChannels: getPropChannels
+        });
+    });
+});
diff --git a/www/form/templates.js b/www/form/templates.js
new file mode 100644
index 000000000..6ff3249b8
--- /dev/null
+++ b/www/form/templates.js
@@ -0,0 +1,20 @@
+define([
+    '/customize/messages.js'
+], function (Messages) {
+    return [{
+        id: 'a',
+        used: 1,
+        name: Messages.form_type_poll,
+        content: {
+            form: {
+                "1": {
+                    type: 'md'
+                },
+                "2": {
+                    type: 'poll'
+                }
+            },
+            order: ["1", "2"]
+        }
+    }];
+});
diff --git a/www/kanban/export.js b/www/kanban/export.js
index 9ee770ac7..694724cf4 100644
--- a/www/kanban/export.js
+++ b/www/kanban/export.js
@@ -13,6 +13,73 @@ define([
         }));
     };
 
+    module.import = function (content) {
+        // Import from Trello
+
+        var c = {
+            data: {},
+            items: {},
+            list: []
+        };
+
+        var colorMap = {
+            red: 'color1',
+            orange: 'color2',
+            yellow: 'color3',
+            lime: 'color4',
+            green: 'color5',
+            sky: 'color6',
+            blue: 'color7',
+            purple: 'color8',
+            pink: 'color9',
+            black: 'nocolor'
+        };
+        content.cards.forEach(function (obj, i) {
+            var tags;
+            var color;
+            if (Array.isArray(obj.labels)) {
+                obj.labels.forEach(function (l) {
+                    if (!color) {
+                        color = colorMap[l.color] || '';
+                    }
+                    if (l.name) {
+                        tags = tags || [];
+                        var n = l.name.toLowerCase().trim();
+                        if (tags.indexOf(n) === -1) { tags.push(n); }
+                    }
+                });
+            }
+            c.items[(i+1)] = {
+                id: (i+1),
+                title: obj.name,
+                body: obj.desc,
+                color: color,
+                tags: tags
+            };
+        });
+
+        var id = 1;
+        content.lists.forEach(function (obj) {
+            var _id = obj.id;
+            var cards = [];
+            content.cards.forEach(function (card, i) {
+                if (card.idList === _id) {
+                    cards.push(i+1);
+                }
+            });
+            c.data[id] = {
+                id: id,
+                title: obj.name,
+                item: cards
+            };
+            c.list.push(id);
+
+            id++;
+        });
+
+        return c;
+    };
+
     return module;
 });
 
diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index 199dbf5de..7d3c5dfe5 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -18,6 +18,7 @@ define([
     '/bower_components/marked/marked.min.js',
     'cm/lib/codemirror',
     '/kanban/jkanban_cp.js',
+    '/kanban/export.js',
 
     'cm/mode/gfm/gfm',
     'cm/addon/edit/closebrackets',
@@ -50,7 +51,8 @@ define([
     ChainPad,
     Marked,
     CodeMirror,
-    jKanban)
+    jKanban,
+    Export)
 {
 
     var verbose = function (x) { console.log(x); };
@@ -241,7 +243,12 @@ define([
             e.stopPropagation();
         });
         var common = framework._.sfCommon;
-        var markdownTb = common.createMarkdownToolbar(editor);
+        var markdownTb = common.createMarkdownToolbar(editor, {
+            embed: function (mt) {
+                editor.focus();
+                editor.replaceSelection($(mt)[0].outerHTML);
+            }
+        });
         $(text).before(markdownTb.toolbar);
         $(markdownTb.toolbar).show();
         editor.refresh();
@@ -282,7 +289,7 @@ define([
                     var fileHost = privateData.fileHost || privateData.origin;
                     var src = fileHost + Hash.getBlobPathFromHex(secret.channel);
                     var key = Hash.encodeBase64(secret.keys.cryptKey);
-                    var mt = '<media-tag src="' + src + '" data-crypto-key="cryptpad:' + key + '"></media-tag>';
+                    var mt = UI.mediaTag(src, key).outerHTML;
                     editor.replaceSelection(mt);
                 }
             };
@@ -1063,6 +1070,11 @@ define([
             var parsed;
             try { parsed = JSON.parse(content); }
             catch (e) { return void console.error(e); }
+
+            if (parsed && parsed.id && parsed.lists && parsed.cards) {
+                return { content: Export.import(parsed) };
+            }
+
             return { content: parsed };
         });
 
diff --git a/www/lib/calendar/date-picker.js b/www/lib/calendar/date-picker.js
index bc42dbbeb..d66e98c3d 100644
--- a/www/lib/calendar/date-picker.js
+++ b/www/lib/calendar/date-picker.js
@@ -9,14 +9,17 @@ define([
         var end = cfg.endpicker;
 
         var is24h = false
+        var dateFormat = "Y-m-d H:i";
         try {
             is24h = !new Intl.DateTimeFormat(navigator.language, { hour: 'numeric' }).format(0).match(/AM/);
         } catch (e) {}
+        if (!is24h) { dateFormat = "Y-m-d h:i K"; }
 
         var e = $(end.input)[0];
         var endPickr = Flatpickr(e, {
             enableTime: true,
             time_24hr: is24h,
+            dateFormat: dateFormat,
             minDate: start.date
         });
         endPickr.setDate(end.date);
@@ -25,6 +28,7 @@ define([
         var startPickr = Flatpickr(s, {
             enableTime: true,
             time_24hr: is24h,
+            dateFormat: dateFormat,
             onChange: function () {
                 endPickr.set('minDate', startPickr.parseDate(s.value));
             }
diff --git a/www/lib/changelog.md b/www/lib/changelog.md
new file mode 100644
index 000000000..86ef6ec22
--- /dev/null
+++ b/www/lib/changelog.md
@@ -0,0 +1,4 @@
+This file is intended to be used as a log of what third-party source we have vendored, where we got it, and what modifications we have made to it (if any).
+
+* [turndown v7.1.1](https://github.com/mixmark-io/turndown/releases/tag/v7.1.1) built from unmodified source as per its build scripts.
+
diff --git a/www/lib/turndown.browser.umd.js b/www/lib/turndown.browser.umd.js
new file mode 100644
index 000000000..a812101ae
--- /dev/null
+++ b/www/lib/turndown.browser.umd.js
@@ -0,0 +1,976 @@
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+  typeof define === 'function' && define.amd ? define(factory) :
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.TurndownService = factory());
+}(this, (function () { 'use strict';
+
+  function extend (destination) {
+    for (var i = 1; i < arguments.length; i++) {
+      var source = arguments[i];
+      for (var key in source) {
+        if (source.hasOwnProperty(key)) destination[key] = source[key];
+      }
+    }
+    return destination
+  }
+
+  function repeat (character, count) {
+    return Array(count + 1).join(character)
+  }
+
+  function trimLeadingNewlines (string) {
+    return string.replace(/^\n*/, '')
+  }
+
+  function trimTrailingNewlines (string) {
+    // avoid match-at-end regexp bottleneck, see #370
+    var indexEnd = string.length;
+    while (indexEnd > 0 && string[indexEnd - 1] === '\n') indexEnd--;
+    return string.substring(0, indexEnd)
+  }
+
+  var blockElements = [
+    'ADDRESS', 'ARTICLE', 'ASIDE', 'AUDIO', 'BLOCKQUOTE', 'BODY', 'CANVAS',
+    'CENTER', 'DD', 'DIR', 'DIV', 'DL', 'DT', 'FIELDSET', 'FIGCAPTION', 'FIGURE',
+    'FOOTER', 'FORM', 'FRAMESET', 'H1', 'H2', 'H3', 'H4', 'H5', 'H6', 'HEADER',
+    'HGROUP', 'HR', 'HTML', 'ISINDEX', 'LI', 'MAIN', 'MENU', 'NAV', 'NOFRAMES',
+    'NOSCRIPT', 'OL', 'OUTPUT', 'P', 'PRE', 'SECTION', 'TABLE', 'TBODY', 'TD',
+    'TFOOT', 'TH', 'THEAD', 'TR', 'UL'
+  ];
+
+  function isBlock (node) {
+    return is(node, blockElements)
+  }
+
+  var voidElements = [
+    'AREA', 'BASE', 'BR', 'COL', 'COMMAND', 'EMBED', 'HR', 'IMG', 'INPUT',
+    'KEYGEN', 'LINK', 'META', 'PARAM', 'SOURCE', 'TRACK', 'WBR'
+  ];
+
+  function isVoid (node) {
+    return is(node, voidElements)
+  }
+
+  function hasVoid (node) {
+    return has(node, voidElements)
+  }
+
+  var meaningfulWhenBlankElements = [
+    'A', 'TABLE', 'THEAD', 'TBODY', 'TFOOT', 'TH', 'TD', 'IFRAME', 'SCRIPT',
+    'AUDIO', 'VIDEO'
+  ];
+
+  function isMeaningfulWhenBlank (node) {
+    return is(node, meaningfulWhenBlankElements)
+  }
+
+  function hasMeaningfulWhenBlank (node) {
+    return has(node, meaningfulWhenBlankElements)
+  }
+
+  function is (node, tagNames) {
+    return tagNames.indexOf(node.nodeName) >= 0
+  }
+
+  function has (node, tagNames) {
+    return (
+      node.getElementsByTagName &&
+      tagNames.some(function (tagName) {
+        return node.getElementsByTagName(tagName).length
+      })
+    )
+  }
+
+  var rules = {};
+
+  rules.paragraph = {
+    filter: 'p',
+
+    replacement: function (content) {
+      return '\n\n' + content + '\n\n'
+    }
+  };
+
+  rules.lineBreak = {
+    filter: 'br',
+
+    replacement: function (content, node, options) {
+      return options.br + '\n'
+    }
+  };
+
+  rules.heading = {
+    filter: ['h1', 'h2', 'h3', 'h4', 'h5', 'h6'],
+
+    replacement: function (content, node, options) {
+      var hLevel = Number(node.nodeName.charAt(1));
+
+      if (options.headingStyle === 'setext' && hLevel < 3) {
+        var underline = repeat((hLevel === 1 ? '=' : '-'), content.length);
+        return (
+          '\n\n' + content + '\n' + underline + '\n\n'
+        )
+      } else {
+        return '\n\n' + repeat('#', hLevel) + ' ' + content + '\n\n'
+      }
+    }
+  };
+
+  rules.blockquote = {
+    filter: 'blockquote',
+
+    replacement: function (content) {
+      content = content.replace(/^\n+|\n+$/g, '');
+      content = content.replace(/^/gm, '> ');
+      return '\n\n' + content + '\n\n'
+    }
+  };
+
+  rules.list = {
+    filter: ['ul', 'ol'],
+
+    replacement: function (content, node) {
+      var parent = node.parentNode;
+      if (parent.nodeName === 'LI' && parent.lastElementChild === node) {
+        return '\n' + content
+      } else {
+        return '\n\n' + content + '\n\n'
+      }
+    }
+  };
+
+  rules.listItem = {
+    filter: 'li',
+
+    replacement: function (content, node, options) {
+      content = content
+        .replace(/^\n+/, '') // remove leading newlines
+        .replace(/\n+$/, '\n') // replace trailing newlines with just a single one
+        .replace(/\n/gm, '\n    '); // indent
+      var prefix = options.bulletListMarker + '   ';
+      var parent = node.parentNode;
+      if (parent.nodeName === 'OL') {
+        var start = parent.getAttribute('start');
+        var index = Array.prototype.indexOf.call(parent.children, node);
+        prefix = (start ? Number(start) + index : index + 1) + '.  ';
+      }
+      return (
+        prefix + content + (node.nextSibling && !/\n$/.test(content) ? '\n' : '')
+      )
+    }
+  };
+
+  rules.indentedCodeBlock = {
+    filter: function (node, options) {
+      return (
+        options.codeBlockStyle === 'indented' &&
+        node.nodeName === 'PRE' &&
+        node.firstChild &&
+        node.firstChild.nodeName === 'CODE'
+      )
+    },
+
+    replacement: function (content, node, options) {
+      return (
+        '\n\n    ' +
+        node.firstChild.textContent.replace(/\n/g, '\n    ') +
+        '\n\n'
+      )
+    }
+  };
+
+  rules.fencedCodeBlock = {
+    filter: function (node, options) {
+      return (
+        options.codeBlockStyle === 'fenced' &&
+        node.nodeName === 'PRE' &&
+        node.firstChild &&
+        node.firstChild.nodeName === 'CODE'
+      )
+    },
+
+    replacement: function (content, node, options) {
+      var className = node.firstChild.getAttribute('class') || '';
+      var language = (className.match(/language-(\S+)/) || [null, ''])[1];
+      var code = node.firstChild.textContent;
+
+      var fenceChar = options.fence.charAt(0);
+      var fenceSize = 3;
+      var fenceInCodeRegex = new RegExp('^' + fenceChar + '{3,}', 'gm');
+
+      var match;
+      while ((match = fenceInCodeRegex.exec(code))) {
+        if (match[0].length >= fenceSize) {
+          fenceSize = match[0].length + 1;
+        }
+      }
+
+      var fence = repeat(fenceChar, fenceSize);
+
+      return (
+        '\n\n' + fence + language + '\n' +
+        code.replace(/\n$/, '') +
+        '\n' + fence + '\n\n'
+      )
+    }
+  };
+
+  rules.horizontalRule = {
+    filter: 'hr',
+
+    replacement: function (content, node, options) {
+      return '\n\n' + options.hr + '\n\n'
+    }
+  };
+
+  rules.inlineLink = {
+    filter: function (node, options) {
+      return (
+        options.linkStyle === 'inlined' &&
+        node.nodeName === 'A' &&
+        node.getAttribute('href')
+      )
+    },
+
+    replacement: function (content, node) {
+      var href = node.getAttribute('href');
+      var title = cleanAttribute(node.getAttribute('title'));
+      if (title) title = ' "' + title + '"';
+      return '[' + content + '](' + href + title + ')'
+    }
+  };
+
+  rules.referenceLink = {
+    filter: function (node, options) {
+      return (
+        options.linkStyle === 'referenced' &&
+        node.nodeName === 'A' &&
+        node.getAttribute('href')
+      )
+    },
+
+    replacement: function (content, node, options) {
+      var href = node.getAttribute('href');
+      var title = cleanAttribute(node.getAttribute('title'));
+      if (title) title = ' "' + title + '"';
+      var replacement;
+      var reference;
+
+      switch (options.linkReferenceStyle) {
+        case 'collapsed':
+          replacement = '[' + content + '][]';
+          reference = '[' + content + ']: ' + href + title;
+          break
+        case 'shortcut':
+          replacement = '[' + content + ']';
+          reference = '[' + content + ']: ' + href + title;
+          break
+        default:
+          var id = this.references.length + 1;
+          replacement = '[' + content + '][' + id + ']';
+          reference = '[' + id + ']: ' + href + title;
+      }
+
+      this.references.push(reference);
+      return replacement
+    },
+
+    references: [],
+
+    append: function (options) {
+      var references = '';
+      if (this.references.length) {
+        references = '\n\n' + this.references.join('\n') + '\n\n';
+        this.references = []; // Reset references
+      }
+      return references
+    }
+  };
+
+  rules.emphasis = {
+    filter: ['em', 'i'],
+
+    replacement: function (content, node, options) {
+      if (!content.trim()) return ''
+      return options.emDelimiter + content + options.emDelimiter
+    }
+  };
+
+  rules.strong = {
+    filter: ['strong', 'b'],
+
+    replacement: function (content, node, options) {
+      if (!content.trim()) return ''
+      return options.strongDelimiter + content + options.strongDelimiter
+    }
+  };
+
+  rules.code = {
+    filter: function (node) {
+      var hasSiblings = node.previousSibling || node.nextSibling;
+      var isCodeBlock = node.parentNode.nodeName === 'PRE' && !hasSiblings;
+
+      return node.nodeName === 'CODE' && !isCodeBlock
+    },
+
+    replacement: function (content) {
+      if (!content) return ''
+      content = content.replace(/\r?\n|\r/g, ' ');
+
+      var extraSpace = /^`|^ .*?[^ ].* $|`$/.test(content) ? ' ' : '';
+      var delimiter = '`';
+      var matches = content.match(/`+/gm) || [];
+      while (matches.indexOf(delimiter) !== -1) delimiter = delimiter + '`';
+
+      return delimiter + extraSpace + content + extraSpace + delimiter
+    }
+  };
+
+  rules.image = {
+    filter: 'img',
+
+    replacement: function (content, node) {
+      var alt = cleanAttribute(node.getAttribute('alt'));
+      var src = node.getAttribute('src') || '';
+      var title = cleanAttribute(node.getAttribute('title'));
+      var titlePart = title ? ' "' + title + '"' : '';
+      return src ? '![' + alt + ']' + '(' + src + titlePart + ')' : ''
+    }
+  };
+
+  function cleanAttribute (attribute) {
+    return attribute ? attribute.replace(/(\n+\s*)+/g, '\n') : ''
+  }
+
+  /**
+   * Manages a collection of rules used to convert HTML to Markdown
+   */
+
+  function Rules (options) {
+    this.options = options;
+    this._keep = [];
+    this._remove = [];
+
+    this.blankRule = {
+      replacement: options.blankReplacement
+    };
+
+    this.keepReplacement = options.keepReplacement;
+
+    this.defaultRule = {
+      replacement: options.defaultReplacement
+    };
+
+    this.array = [];
+    for (var key in options.rules) this.array.push(options.rules[key]);
+  }
+
+  Rules.prototype = {
+    add: function (key, rule) {
+      this.array.unshift(rule);
+    },
+
+    keep: function (filter) {
+      this._keep.unshift({
+        filter: filter,
+        replacement: this.keepReplacement
+      });
+    },
+
+    remove: function (filter) {
+      this._remove.unshift({
+        filter: filter,
+        replacement: function () {
+          return ''
+        }
+      });
+    },
+
+    forNode: function (node) {
+      if (node.isBlank) return this.blankRule
+      var rule;
+
+      if ((rule = findRule(this.array, node, this.options))) return rule
+      if ((rule = findRule(this._keep, node, this.options))) return rule
+      if ((rule = findRule(this._remove, node, this.options))) return rule
+
+      return this.defaultRule
+    },
+
+    forEach: function (fn) {
+      for (var i = 0; i < this.array.length; i++) fn(this.array[i], i);
+    }
+  };
+
+  function findRule (rules, node, options) {
+    for (var i = 0; i < rules.length; i++) {
+      var rule = rules[i];
+      if (filterValue(rule, node, options)) return rule
+    }
+    return void 0
+  }
+
+  function filterValue (rule, node, options) {
+    var filter = rule.filter;
+    if (typeof filter === 'string') {
+      if (filter === node.nodeName.toLowerCase()) return true
+    } else if (Array.isArray(filter)) {
+      if (filter.indexOf(node.nodeName.toLowerCase()) > -1) return true
+    } else if (typeof filter === 'function') {
+      if (filter.call(rule, node, options)) return true
+    } else {
+      throw new TypeError('`filter` needs to be a string, array, or function')
+    }
+  }
+
+  /**
+   * The collapseWhitespace function is adapted from collapse-whitespace
+   * by Luc Thevenard.
+   *
+   * The MIT License (MIT)
+   *
+   * Copyright (c) 2014 Luc Thevenard <lucthevenard@gmail.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.
+   */
+
+  /**
+   * collapseWhitespace(options) removes extraneous whitespace from an the given element.
+   *
+   * @param {Object} options
+   */
+  function collapseWhitespace (options) {
+    var element = options.element;
+    var isBlock = options.isBlock;
+    var isVoid = options.isVoid;
+    var isPre = options.isPre || function (node) {
+      return node.nodeName === 'PRE'
+    };
+
+    if (!element.firstChild || isPre(element)) return
+
+    var prevText = null;
+    var keepLeadingWs = false;
+
+    var prev = null;
+    var node = next(prev, element, isPre);
+
+    while (node !== element) {
+      if (node.nodeType === 3 || node.nodeType === 4) { // Node.TEXT_NODE or Node.CDATA_SECTION_NODE
+        var text = node.data.replace(/[ \r\n\t]+/g, ' ');
+
+        if ((!prevText || / $/.test(prevText.data)) &&
+            !keepLeadingWs && text[0] === ' ') {
+          text = text.substr(1);
+        }
+
+        // `text` might be empty at this point.
+        if (!text) {
+          node = remove(node);
+          continue
+        }
+
+        node.data = text;
+
+        prevText = node;
+      } else if (node.nodeType === 1) { // Node.ELEMENT_NODE
+        if (isBlock(node) || node.nodeName === 'BR') {
+          if (prevText) {
+            prevText.data = prevText.data.replace(/ $/, '');
+          }
+
+          prevText = null;
+          keepLeadingWs = false;
+        } else if (isVoid(node) || isPre(node)) {
+          // Avoid trimming space around non-block, non-BR void elements and inline PRE.
+          prevText = null;
+          keepLeadingWs = true;
+        } else if (prevText) {
+          // Drop protection if set previously.
+          keepLeadingWs = false;
+        }
+      } else {
+        node = remove(node);
+        continue
+      }
+
+      var nextNode = next(prev, node, isPre);
+      prev = node;
+      node = nextNode;
+    }
+
+    if (prevText) {
+      prevText.data = prevText.data.replace(/ $/, '');
+      if (!prevText.data) {
+        remove(prevText);
+      }
+    }
+  }
+
+  /**
+   * remove(node) removes the given node from the DOM and returns the
+   * next node in the sequence.
+   *
+   * @param {Node} node
+   * @return {Node} node
+   */
+  function remove (node) {
+    var next = node.nextSibling || node.parentNode;
+
+    node.parentNode.removeChild(node);
+
+    return next
+  }
+
+  /**
+   * next(prev, current, isPre) returns the next node in the sequence, given the
+   * current and previous nodes.
+   *
+   * @param {Node} prev
+   * @param {Node} current
+   * @param {Function} isPre
+   * @return {Node}
+   */
+  function next (prev, current, isPre) {
+    if ((prev && prev.parentNode === current) || isPre(current)) {
+      return current.nextSibling || current.parentNode
+    }
+
+    return current.firstChild || current.nextSibling || current.parentNode
+  }
+
+  /*
+   * Set up window for Node.js
+   */
+
+  var root = (typeof window !== 'undefined' ? window : {});
+
+  /*
+   * Parsing HTML strings
+   */
+
+  function canParseHTMLNatively () {
+    var Parser = root.DOMParser;
+    var canParse = false;
+
+    // Adapted from https://gist.github.com/1129031
+    // Firefox/Opera/IE throw errors on unsupported types
+    try {
+      // WebKit returns null on unsupported types
+      if (new Parser().parseFromString('', 'text/html')) {
+        canParse = true;
+      }
+    } catch (e) {}
+
+    return canParse
+  }
+
+  function createHTMLParser () {
+    var Parser = function () {};
+
+    {
+      if (shouldUseActiveX()) {
+        Parser.prototype.parseFromString = function (string) {
+          var doc = new window.ActiveXObject('htmlfile');
+          doc.designMode = 'on'; // disable on-page scripts
+          doc.open();
+          doc.write(string);
+          doc.close();
+          return doc
+        };
+      } else {
+        Parser.prototype.parseFromString = function (string) {
+          var doc = document.implementation.createHTMLDocument('');
+          doc.open();
+          doc.write(string);
+          doc.close();
+          return doc
+        };
+      }
+    }
+    return Parser
+  }
+
+  function shouldUseActiveX () {
+    var useActiveX = false;
+    try {
+      document.implementation.createHTMLDocument('').open();
+    } catch (e) {
+      if (window.ActiveXObject) useActiveX = true;
+    }
+    return useActiveX
+  }
+
+  var HTMLParser = canParseHTMLNatively() ? root.DOMParser : createHTMLParser();
+
+  function RootNode (input, options) {
+    var root;
+    if (typeof input === 'string') {
+      var doc = htmlParser().parseFromString(
+        // DOM parsers arrange elements in the <head> and <body>.
+        // Wrapping in a custom element ensures elements are reliably arranged in
+        // a single element.
+        '<x-turndown id="turndown-root">' + input + '</x-turndown>',
+        'text/html'
+      );
+      root = doc.getElementById('turndown-root');
+    } else {
+      root = input.cloneNode(true);
+    }
+    collapseWhitespace({
+      element: root,
+      isBlock: isBlock,
+      isVoid: isVoid,
+      isPre: options.preformattedCode ? isPreOrCode : null
+    });
+
+    return root
+  }
+
+  var _htmlParser;
+  function htmlParser () {
+    _htmlParser = _htmlParser || new HTMLParser();
+    return _htmlParser
+  }
+
+  function isPreOrCode (node) {
+    return node.nodeName === 'PRE' || node.nodeName === 'CODE'
+  }
+
+  function Node (node, options) {
+    node.isBlock = isBlock(node);
+    node.isCode = node.nodeName === 'CODE' || node.parentNode.isCode;
+    node.isBlank = isBlank(node);
+    node.flankingWhitespace = flankingWhitespace(node, options);
+    return node
+  }
+
+  function isBlank (node) {
+    return (
+      !isVoid(node) &&
+      !isMeaningfulWhenBlank(node) &&
+      /^\s*$/i.test(node.textContent) &&
+      !hasVoid(node) &&
+      !hasMeaningfulWhenBlank(node)
+    )
+  }
+
+  function flankingWhitespace (node, options) {
+    if (node.isBlock || (options.preformattedCode && node.isCode)) {
+      return { leading: '', trailing: '' }
+    }
+
+    var edges = edgeWhitespace(node.textContent);
+
+    // abandon leading ASCII WS if left-flanked by ASCII WS
+    if (edges.leadingAscii && isFlankedByWhitespace('left', node, options)) {
+      edges.leading = edges.leadingNonAscii;
+    }
+
+    // abandon trailing ASCII WS if right-flanked by ASCII WS
+    if (edges.trailingAscii && isFlankedByWhitespace('right', node, options)) {
+      edges.trailing = edges.trailingNonAscii;
+    }
+
+    return { leading: edges.leading, trailing: edges.trailing }
+  }
+
+  function edgeWhitespace (string) {
+    var m = string.match(/^(([ \t\r\n]*)(\s*))[\s\S]*?((\s*?)([ \t\r\n]*))$/);
+    return {
+      leading: m[1], // whole string for whitespace-only strings
+      leadingAscii: m[2],
+      leadingNonAscii: m[3],
+      trailing: m[4], // empty for whitespace-only strings
+      trailingNonAscii: m[5],
+      trailingAscii: m[6]
+    }
+  }
+
+  function isFlankedByWhitespace (side, node, options) {
+    var sibling;
+    var regExp;
+    var isFlanked;
+
+    if (side === 'left') {
+      sibling = node.previousSibling;
+      regExp = / $/;
+    } else {
+      sibling = node.nextSibling;
+      regExp = /^ /;
+    }
+
+    if (sibling) {
+      if (sibling.nodeType === 3) {
+        isFlanked = regExp.test(sibling.nodeValue);
+      } else if (options.preformattedCode && sibling.nodeName === 'CODE') {
+        isFlanked = false;
+      } else if (sibling.nodeType === 1 && !isBlock(sibling)) {
+        isFlanked = regExp.test(sibling.textContent);
+      }
+    }
+    return isFlanked
+  }
+
+  var reduce = Array.prototype.reduce;
+  var escapes = [
+    [/\\/g, '\\\\'],
+    [/\*/g, '\\*'],
+    [/^-/g, '\\-'],
+    [/^\+ /g, '\\+ '],
+    [/^(=+)/g, '\\$1'],
+    [/^(#{1,6}) /g, '\\$1 '],
+    [/`/g, '\\`'],
+    [/^~~~/g, '\\~~~'],
+    [/\[/g, '\\['],
+    [/\]/g, '\\]'],
+    [/^>/g, '\\>'],
+    [/_/g, '\\_'],
+    [/^(\d+)\. /g, '$1\\. ']
+  ];
+
+  function TurndownService (options) {
+    if (!(this instanceof TurndownService)) return new TurndownService(options)
+
+    var defaults = {
+      rules: rules,
+      headingStyle: 'setext',
+      hr: '* * *',
+      bulletListMarker: '*',
+      codeBlockStyle: 'indented',
+      fence: '```',
+      emDelimiter: '_',
+      strongDelimiter: '**',
+      linkStyle: 'inlined',
+      linkReferenceStyle: 'full',
+      br: '  ',
+      preformattedCode: false,
+      blankReplacement: function (content, node) {
+        return node.isBlock ? '\n\n' : ''
+      },
+      keepReplacement: function (content, node) {
+        return node.isBlock ? '\n\n' + node.outerHTML + '\n\n' : node.outerHTML
+      },
+      defaultReplacement: function (content, node) {
+        return node.isBlock ? '\n\n' + content + '\n\n' : content
+      }
+    };
+    this.options = extend({}, defaults, options);
+    this.rules = new Rules(this.options);
+  }
+
+  TurndownService.prototype = {
+    /**
+     * The entry point for converting a string or DOM node to Markdown
+     * @public
+     * @param {String|HTMLElement} input The string or DOM node to convert
+     * @returns A Markdown representation of the input
+     * @type String
+     */
+
+    turndown: function (input) {
+      if (!canConvert(input)) {
+        throw new TypeError(
+          input + ' is not a string, or an element/document/fragment node.'
+        )
+      }
+
+      if (input === '') return ''
+
+      var output = process.call(this, new RootNode(input, this.options));
+      return postProcess.call(this, output)
+    },
+
+    /**
+     * Add one or more plugins
+     * @public
+     * @param {Function|Array} plugin The plugin or array of plugins to add
+     * @returns The Turndown instance for chaining
+     * @type Object
+     */
+
+    use: function (plugin) {
+      if (Array.isArray(plugin)) {
+        for (var i = 0; i < plugin.length; i++) this.use(plugin[i]);
+      } else if (typeof plugin === 'function') {
+        plugin(this);
+      } else {
+        throw new TypeError('plugin must be a Function or an Array of Functions')
+      }
+      return this
+    },
+
+    /**
+     * Adds a rule
+     * @public
+     * @param {String} key The unique key of the rule
+     * @param {Object} rule The rule
+     * @returns The Turndown instance for chaining
+     * @type Object
+     */
+
+    addRule: function (key, rule) {
+      this.rules.add(key, rule);
+      return this
+    },
+
+    /**
+     * Keep a node (as HTML) that matches the filter
+     * @public
+     * @param {String|Array|Function} filter The unique key of the rule
+     * @returns The Turndown instance for chaining
+     * @type Object
+     */
+
+    keep: function (filter) {
+      this.rules.keep(filter);
+      return this
+    },
+
+    /**
+     * Remove a node that matches the filter
+     * @public
+     * @param {String|Array|Function} filter The unique key of the rule
+     * @returns The Turndown instance for chaining
+     * @type Object
+     */
+
+    remove: function (filter) {
+      this.rules.remove(filter);
+      return this
+    },
+
+    /**
+     * Escapes Markdown syntax
+     * @public
+     * @param {String} string The string to escape
+     * @returns A string with Markdown syntax escaped
+     * @type String
+     */
+
+    escape: function (string) {
+      return escapes.reduce(function (accumulator, escape) {
+        return accumulator.replace(escape[0], escape[1])
+      }, string)
+    }
+  };
+
+  /**
+   * Reduces a DOM node down to its Markdown string equivalent
+   * @private
+   * @param {HTMLElement} parentNode The node to convert
+   * @returns A Markdown representation of the node
+   * @type String
+   */
+
+  function process (parentNode) {
+    var self = this;
+    return reduce.call(parentNode.childNodes, function (output, node) {
+      node = new Node(node, self.options);
+
+      var replacement = '';
+      if (node.nodeType === 3) {
+        replacement = node.isCode ? node.nodeValue : self.escape(node.nodeValue);
+      } else if (node.nodeType === 1) {
+        replacement = replacementForNode.call(self, node);
+      }
+
+      return join(output, replacement)
+    }, '')
+  }
+
+  /**
+   * Appends strings as each rule requires and trims the output
+   * @private
+   * @param {String} output The conversion output
+   * @returns A trimmed version of the ouput
+   * @type String
+   */
+
+  function postProcess (output) {
+    var self = this;
+    this.rules.forEach(function (rule) {
+      if (typeof rule.append === 'function') {
+        output = join(output, rule.append(self.options));
+      }
+    });
+
+    return output.replace(/^[\t\r\n]+/, '').replace(/[\t\r\n\s]+$/, '')
+  }
+
+  /**
+   * Converts an element node to its Markdown equivalent
+   * @private
+   * @param {HTMLElement} node The node to convert
+   * @returns A Markdown representation of the node
+   * @type String
+   */
+
+  function replacementForNode (node) {
+    var rule = this.rules.forNode(node);
+    var content = process.call(this, node);
+    var whitespace = node.flankingWhitespace;
+    if (whitespace.leading || whitespace.trailing) content = content.trim();
+    return (
+      whitespace.leading +
+      rule.replacement(content, node, this.options) +
+      whitespace.trailing
+    )
+  }
+
+  /**
+   * Joins replacement to the current output with appropriate number of new lines
+   * @private
+   * @param {String} output The current conversion output
+   * @param {String} replacement The string to append to the output
+   * @returns Joined output
+   * @type String
+   */
+
+  function join (output, replacement) {
+    var s1 = trimTrailingNewlines(output);
+    var s2 = trimLeadingNewlines(replacement);
+    var nls = Math.max(output.length - s1.length, replacement.length - s2.length);
+    var separator = '\n\n'.substring(0, nls);
+
+    return s1 + separator + s2
+  }
+
+  /**
+   * Determines whether an input can be converted
+   * @private
+   * @param {String|HTMLElement} input Describe this parameter
+   * @returns Describe what it returns
+   * @type String|Object|Array|Boolean|Number
+   */
+
+  function canConvert (input) {
+    return (
+      input != null && (
+        typeof input === 'string' ||
+        (input.nodeType && (
+          input.nodeType === 1 || input.nodeType === 9 || input.nodeType === 11
+        ))
+      )
+    )
+  }
+
+  return TurndownService;
+
+})));
diff --git a/www/pad/export.js b/www/pad/export.js
index f1e3497c9..01ac27d7e 100644
--- a/www/pad/export.js
+++ b/www/pad/export.js
@@ -1,12 +1,24 @@
 define([
     'jquery',
     '/common/common-util.js',
+    '/common/diffMarked.js',
+    '/common/hyperscript.js',
     '/bower_components/hyperjson/hyperjson.js',
     '/bower_components/nthen/index.js',
-], function ($, Util, Hyperjson, nThen) {
+    '/lib/turndown.browser.umd.js'
+], function ($, Util, DiffMd, h, Hyperjson, nThen, Turndown) {
     var module = {
         ext: '.html', // default
-        exts: ['.html', '.doc']
+        exts: ['.html', '.md', '.doc']
+    };
+
+    module.importMd = function (md, common) {
+        var html = DiffMd.render(md, true, false, true);
+        var div = h('div#cp-temp');
+        DiffMd.apply(html, $(div), common);
+        var body = h('body');
+        body.innerHTML = div.innerHTML;
+        return body;
     };
 
     var exportMediaTags = function (inner, cb) {
@@ -77,6 +89,15 @@ define([
                 });
                 return void cb(blob);
             }
+            if (ext === ".md") {
+                var md = Turndown({
+                    headingStyle: 'atx'
+                }).turndown(toExport);
+                var mdBlob = new Blob([md], {
+                    type: 'text/markdown;charset=utf-8'
+                });
+                return void cb(mdBlob);
+            }
             var html = module.getHTML(toExport);
             cb(new Blob([ html ], { type: "text/html;charset=utf-8" }));
         });
diff --git a/www/pad/inner.js b/www/pad/inner.js
index 47ab5dbe3..95e7c1bff 100644
--- a/www/pad/inner.js
+++ b/www/pad/inner.js
@@ -1115,7 +1115,7 @@ define([
 
             framework._.sfCommon.isPadStored(function(err, val) {
                 if (!val) { return; }
-                var b64images = $inner.find('img[src^="data:image"]:not(.cke_reset)');
+                var b64images = $inner.find('img[src^="data:image"]:not(.cke_reset), img[src^="data:application/octet-stream"]:not(.cke_reset)');
                 if (b64images.length && framework._.sfCommon.isLoggedIn()) {
                     var no = h('button.cp-corner-cancel', Messages.cancel);
                     var yes = h('button.cp-corner-primary', Messages.ok);
@@ -1169,7 +1169,14 @@ define([
             });
             cb($dom[0]);
         };
-        framework.setFileImporter({ accept: 'text/html' }, function(content, f, cb) {
+        framework.setFileImporter({ accept: ['.md', 'text/html'] }, function(content, f, cb) {
+            if (!f) { return; }
+            if (/\.md$/.test(f.name)) {
+                var mdDom = Exporter.importMd(content, framework._.sfCommon);
+                return importMediaTags(mdDom, function(dom) {
+                    cb(Hyperjson.fromDOM(dom));
+                });
+            }
             importMediaTags(domFromHTML(content).body, function(dom) {
                 cb(Hyperjson.fromDOM(dom));
             });
@@ -1319,7 +1326,13 @@ define([
                 }));
                 $(waitFor());
             }).nThen(function(waitFor) {
+                // TODO this breaks users' ability to tab out of the editor
+                // but that's a problem in other editors and nobody has complained so far
+                // so we'll include this as-is for now while we search for a good pattern
+                // addresses this issue more generally
+                Ckeditor.config.tabSpaces = 4;
                 Ckeditor.config.toolbarCanCollapse = true;
+                Ckeditor.config.language = Messages._getLanguage();
                 if (screen.height < 800) {
                     Ckeditor.config.toolbarStartupExpanded = false;
                     $('meta[name=viewport]').attr('content',
diff --git a/www/poll/inner.js b/www/poll/inner.js
index 6d4e0590e..53faea7e9 100644
--- a/www/poll/inner.js
+++ b/www/poll/inner.js
@@ -955,7 +955,7 @@ define([
                 var fileHost = privateData.fileHost || privateData.origin;
                 var src = fileHost + Hash.getBlobPathFromHex(secret.channel);
                 var key = Hash.encodeBase64(secret.keys.cryptKey);
-                var mt = '<media-tag src="' + src + '" data-crypto-key="cryptpad:' + key + '"></media-tag>';
+                var mt = UI.mediaTag(src, key).outerHTML;
                 APP.editor.replaceSelection(mt);
             }
         };
@@ -1235,7 +1235,7 @@ define([
                 common.openFilePicker(pickerCfg, function (data) {
                     if (data.type === 'file' && APP.editor) {
                         common.setPadAttribute('atime', +new Date(), null, data.href);
-                        var mt = '<media-tag src="' + data.src + '" data-crypto-key="cryptpad:' + data.key + '"></media-tag>';
+                        var mt = UI.mediaTag(data.src, data.key).outerHTML;
                         APP.editor.replaceSelection(mt);
                         return;
                     }
diff --git a/www/poll/main.js b/www/poll/main.js
index 644761f32..f238a74a3 100644
--- a/www/poll/main.js
+++ b/www/poll/main.js
@@ -14,6 +14,10 @@ define([
         var obj = SFCommonO.initIframe(waitFor, true);
         href = obj.href;
         hash = obj.hash;
+        if (!hash) {
+            window.location.href = '/form/';
+            waitFor.abort();
+        }
     }).nThen(function (/*waitFor*/) {
         SFCommonO.start({
             hash: hash,
diff --git a/www/register/main.js b/www/register/main.js
index 4c63e4482..4d9274253 100644
--- a/www/register/main.js
+++ b/www/register/main.js
@@ -47,7 +47,11 @@ define([
         var I_REALLY_WANT_TO_USE_MY_EMAIL_FOR_MY_USERNAME = false;
 
         var registerClick = function () {
-            var uname = $uname.val();
+            var uname = $uname.val().trim();
+    // trim whitespace surrounding the username since it is otherwise included in key derivation
+    // most people won't realize that its presence is significant
+            $uname.val(uname);
+
             var passwd = $passwd.val();
             var confirmPassword = $confirm.val();
 
diff --git a/www/report/main.js b/www/report/main.js
index 5717f7120..f4dd33429 100644
--- a/www/report/main.js
+++ b/www/report/main.js
@@ -13,6 +13,7 @@ define([
     '/bower_components/chainpad-netflux/chainpad-netflux.js',
     '/bower_components/chainpad-crypto/crypto.js',
     '/common/userObject.js',
+    '/common/clipboard.js',
 
 
     '/bower_components/tweetnacl/nacl-fast.min.js',
@@ -20,16 +21,40 @@ define([
     'less!/customize/src/less2/pages/page-report.less',
 ], function ($, ApiConfig, h, Messages,
             nThen, Hash, Util, Crypt, Cryptpad, Cache, UI, CPNetflux,
-            Crypto, UserObject) {
+            Crypto, UserObject, Clipboard) {
     var $report = $('#cp-report');
     var hash = localStorage.User_hash;
     if (!hash) {
-        return void UI.errorLoadingScreen(Messages.mustLogin);
+        return void UI.alert(Messages.mustLogin, function () {
+            var href = Hash.hashToHref('', 'login');
+            var url = Hash.getNewPadURL(href, {
+                href: '/report/',
+            });
+            console.log(url);
+            window.location.href = url;
+        });
     }
 
     var addReport = function (str) {
         $report.append(h('div', str));
     };
+
+    var getReportContent = window.getReportContent = function () {
+        try {
+            return $report[0].innerText;
+        } catch (err) {
+            return '';
+        }
+    };
+
+    var copyToClipboard = function () {
+        if (Clipboard.copy.multiline(getReportContent())) {
+            UI.log(Messages.genericCopySuccess);
+        } else {
+            UI.warn(Messages.error);
+        }
+    };
+
     var checkCache = function (chan, cb) {
         Cache.getChannelCache(chan, function (err, val) {
             if (err) {
@@ -261,6 +286,14 @@ define([
         n(function () {
             addReport('===================');
             addReport('DONE');
+
+            var copyButton = h('button.btn.btn-primary', Messages.copyToClipboard);
+            copyButton.onclick = copyToClipboard;
+            var buttonContainer = h('div#cp-report-ui', [
+                copyButton,
+            ]);
+
+            document.body.appendChild(buttonContainer);
         });
     });
 
diff --git a/www/secureiframe/inner.js b/www/secureiframe/inner.js
index 1c5af4a57..18970c47b 100644
--- a/www/secureiframe/inner.js
+++ b/www/secureiframe/inner.js
@@ -58,6 +58,7 @@ define([
                     hashes: data.hashes || priv.hashes,
                     common: common,
                     title: data.title,
+                    auditorHash: data.auditorHash,
                     versionHash: data.versionHash,
                     friends: friends,
                     onClose: function () {
@@ -126,6 +127,7 @@ define([
             sframeChan.event("EV_SECURE_ACTION", {
                 type: parsed.type,
                 password: data.password,
+                static: data.static,
                 href: data.url,
                 name: data.name
             });
@@ -213,20 +215,21 @@ define([
                     $container.html('');
                     Object.keys(list).forEach(function (id) {
                         var data = list[id];
-                        var name = data.filename || data.title || '?';
+                        var name = data.filename || data.title || data.name || '?';
                         if (filter && name.toLowerCase().indexOf(filter.toLowerCase()) === -1) {
                             return;
                         }
                         var $span = $('<span>', {
                             'class': 'cp-filepicker-content-element',
-                            'title': name,
+                            'title': Util.fixHTML(name),
                         }).appendTo($container);
                         $span.append(UI.getFileIcon(data));
                         $('<span>', {'class': 'cp-filepicker-content-element-name'}).text(name)
                             .appendTo($span);
+                        if (data.static) { $span.attr('title', Util.fixHTML(data.href)); }
                         $span.click(function () {
                             if (typeof onFilePicked === "function") {
-                                onFilePicked({url: data.href, name: name, password: data.password});
+                                onFilePicked({url: data.href, name: name, static: data.static, password: data.password});
                             }
                         });
 
diff --git a/www/settings/inner.js b/www/settings/inner.js
index 24e03a4cf..2d29f0f05 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -14,6 +14,7 @@ define([
     '/api/config',
     '/common/make-backup.js',
     '/common/common-feedback.js',
+    '/common/common-constants.js',
 
     '/common/jscolor.js',
     '/bower_components/file-saver/FileSaver.min.js',
@@ -35,7 +36,8 @@ define([
     AppConfig,
     ApiConfig,
     Backup,
-    Feedback
+    Feedback,
+    Constants
 ) {
     var saveAs = window.saveAs;
     var APP = window.APP = {};
@@ -67,12 +69,13 @@ define([
             'cp-settings-custom-theme',
         ],
         'drive': [
+            'cp-settings-redirect',
             'cp-settings-resettips',
             'cp-settings-drive-duplicate',
             'cp-settings-thumbnails',
             'cp-settings-drive-backup',
             'cp-settings-drive-import-local',
-            'cp-settings-trim-history'
+            'cp-settings-trim-history',
             //'cp-settings-drive-reset'
         ],
         'cursor': [ // Msg.settings_cat_cursor
@@ -841,6 +844,45 @@ define([
         return $div;
     };
 
+    create['redirect'] = function () {
+        if (!common.isLoggedIn()) { return; }
+        var $div = $('<div>', { 'class': 'cp-settings-redirect cp-sidebarlayout-element' });
+
+        $('<span>', { 'class': 'label' }).text(Messages.settings_driveRedirectTitle).appendTo($div);
+
+        $('<span>', { 'class': 'cp-sidebarlayout-description' })
+            .append(Messages.settings_driveRedirectHint)
+            .appendTo($div);
+
+        var $ok = $('<span>', { 'class': 'fa fa-check', title: Messages.saved });
+        var $spinner = $('<span>', { 'class': 'fa fa-spinner fa-pulse' });
+
+        var $cbox = $(UI.createCheckbox('cp-settings-redirect',
+            Messages.settings_driveRedirect,
+            false, { label: { class: 'noTitle' } }));
+        var $checkbox = $cbox.find('input').on('change', function() {
+            $spinner.show();
+            $ok.hide();
+            var val = $checkbox.is(':checked') || false;
+            common.setAttribute(['general', Constants.prefersDriveRedirectKey], val, function() {
+                $spinner.hide();
+                $ok.show();
+                sframeChan.query("Q_SET_DRIVE_REDIRECT_PREFERENCE", {
+                    value: val,
+                }, console.log);
+            });
+        });
+
+        $cbox.appendTo($div);
+
+        $ok.hide().appendTo($cbox);
+        $spinner.hide().appendTo($cbox);
+
+        if (privateData.prefersDriveRedirect === true) {
+            $checkbox[0].checked = true;
+        }
+        return $div;
+    };
 
     create['resettips'] = function() {
         var $div = $('<div>', { 'class': 'cp-settings-resettips cp-sidebarlayout-element' });
diff --git a/www/settings/main.js b/www/settings/main.js
index 3cfd22fcc..8101203b1 100644
--- a/www/settings/main.js
+++ b/www/settings/main.js
@@ -78,6 +78,9 @@ define([
                 }
                 cb();
             });
+            sframeChan.on('Q_SET_DRIVE_REDIRECT_PREFERENCE', function (data, cb) {
+                Cryptpad.setDriveRedirectPreference(data, cb);
+            });
         };
         var category;
         if (window.location.hash) {
diff --git a/www/slide/app-slide.less b/www/slide/app-slide.less
index 7e518a1c7..ce12b1de3 100644
--- a/www/slide/app-slide.less
+++ b/www/slide/app-slide.less
@@ -356,6 +356,7 @@
             }
 
             .markdown_main();
+            .markdown_cryptpad();
             .markdown_preformatted-code;
             .markdown_gfm-table();
 
diff --git a/www/slide/inner.js b/www/slide/inner.js
index 3eb1435ed..e40bd6d79 100644
--- a/www/slide/inner.js
+++ b/www/slide/inner.js
@@ -556,7 +556,7 @@ define([
                     var fileHost = privateData.fileHost || privateData.origin;
                     var src = fileHost + Hash.getBlobPathFromHex(secret.channel);
                     var key = Hash.encodeBase64(secret.keys.cryptKey);
-                    var mt = '<media-tag src="' + src + '" data-crypto-key="cryptpad:' + key + '"></media-tag>';
+                    var mt = UI.mediaTag(src, key).outerHTML;
                     editor.replaceSelection(mt);
                 }
             };
diff --git a/www/support/inner.js b/www/support/inner.js
index f466e7693..6d9e5eae8 100644
--- a/www/support/inner.js
+++ b/www/support/inner.js
@@ -272,19 +272,27 @@ define([
         APP.$rightside = $('<div>', {id: 'cp-sidebarlayout-rightside'}).appendTo(APP.$container);
         var sFrameChan = common.getSframeChannel();
         sFrameChan.onReady(waitFor());
+    }).nThen(function (waitFor) {
+        metadataMgr = common.getMetadataMgr();
+        privateData = metadataMgr.getPrivateData();
         common.getPinUsage(null, waitFor(function (err, data) {
             if (err) { return void console.error(err); }
             APP.pinUsage = data;
         }));
+        APP.teamsUsage = {};
+        Object.keys(privateData.teams).forEach(function (teamId) {
+            common.getPinUsage(teamId, waitFor(function (err, data) {
+                if (err) { return void console.error(err); }
+                APP.teamsUsage[teamId] = data;
+            }));
+        });
     }).nThen(function (/*waitFor*/) {
         createToolbar();
-        metadataMgr = common.getMetadataMgr();
-        privateData = metadataMgr.getPrivateData();
         common.setTabTitle(Messages.supportPage);
 
         APP.origin = privateData.origin;
         APP.readOnly = privateData.readOnly;
-        APP.support = Support.create(common, false, APP.pinUsage);
+        APP.support = Support.create(common, false, APP.pinUsage, APP.teamsUsage);
 
         // Content
         var $rightside = APP.$rightside;
diff --git a/www/support/ui.js b/www/support/ui.js
index 947a43d93..f61ddac4b 100644
--- a/www/support/ui.js
+++ b/www/support/ui.js
@@ -31,9 +31,7 @@ define([
 
         if (typeof(ctx.pinUsage) === 'object') {
             // pass pin.usage, pin.limit, and pin.plan if supplied
-            Object.keys(ctx.pinUsage).forEach(function (k) {
-                data.sender[k] = ctx.pinUsage[k];
-            });
+            data.sender.quota = ctx.pinUsage;
         }
 
         data.id = id;
@@ -45,11 +43,14 @@ define([
             data.sender.blockLocation = privateData.blockLocation || '';
             data.sender.teams = Object.keys(teams).map(function (key) {
                 var team = teams[key];
-                if (!teams) { return; }
+                if (!team) { return; }
                 var ret = {};
-                ['edPublic', 'owner', 'viewer', 'hasSecondaryKey', 'validKeys'].forEach(function (k) {
+                ['channel', 'roster', 'numberPads', 'numberSf', 'edPublic', 'curvePublic', 'owner', 'viewer', 'hasSecondaryKey', 'validKeys'].forEach(function (k) {
                     ret[k] = team[k];
                 });
+                if (ctx.teamsUsage && ctx.teamsUsage[key]) {
+                    ret.quota = ctx.teamsUsage[key];
+                }
                 return ret;
             }).filter(Boolean);
 
@@ -133,9 +134,13 @@ define([
             'account', // Msg.support_cat_account
             'data', // Msg.support_cat_data
             'bug', // Msg.support_cat_bug
+            // TODO report
             'other' // Msg.support_cat_other
         ];
         if (all) { categories.push('all'); } // Msg.support_cat_all
+
+
+
         categories = categories.map(function (key) {
             return {
                 tag: 'a',
@@ -174,6 +179,7 @@ define([
         var catContainer = h('div.cp-dropdown-container' + (title ? '.cp-hidden': ''));
         makeCategoryDropdown(ctx, catContainer, function (key) {
             $(category).val(key);
+            // TODO add a hint suggesting relevant information to include for the chosen category
         });
 
         var attachments, addAttachment;
@@ -339,7 +345,7 @@ define([
         var senderKey = content.sender && content.sender.edPublic;
         var fromMe = senderKey === privateData.edPublic;
         var fromAdmin = ctx.adminKeys.indexOf(senderKey) !== -1;
-        var fromPremium = Boolean(content.sender.plan);
+        var fromPremium = Boolean(content.sender.plan || Util.find(content, ['sender', 'quota', 'plan']));
 
         var userData = h('div.cp-support-showdata', [
             Messages.support_showData,
@@ -425,12 +431,13 @@ define([
         ]);
     };
 
-    var create = function (common, isAdmin, pinUsage) {
+    var create = function (common, isAdmin, pinUsage, teamsUsage) {
         var ui = {};
         var ctx = {
             common: common,
             isAdmin: isAdmin,
             pinUsage: pinUsage || false,
+            teamsUsage: teamsUsage || false,
             adminKeys: Array.isArray(ApiConfig.adminKeys)?  ApiConfig.adminKeys.slice(): [],
         };
 
diff --git a/www/teams/inner.js b/www/teams/inner.js
index 4b0532628..373a27998 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -768,7 +768,7 @@ define([
                     $(demote).hide();
                     describeUser(common, data.curvePublic, {
                         role: role
-                    }, promote);
+                    }, demote);
                 };
                 if (isMe) {
                     return void UI.confirm(Messages.team_demoteMeConfirm, function (yes) {
@@ -901,22 +901,23 @@ define([
             $header.append(invite);
         }
 
-        if (me && (me.role !== 'OWNER')) {
-            var leave = h('button.cp-online.btn.btn-danger', Messages.team_leaveButton);
-            $(leave).click(function () {
-                UI.confirm(Messages.team_leaveConfirm, function (yes) {
-                    if (!yes) { return; }
-                    APP.module.execCommand('LEAVE_TEAM', {
-                        teamId: APP.team
-                    }, function (obj) {
-                        if (obj && obj.error) {
-                            return void UI.warn(Messages.error);
-                        }
-                    });
+        var leave = h('button.cp-online.btn.btn-danger', Messages.team_leaveButton);
+        $(leave).click(function () {
+            if (me && me.role === 'OWNER') {
+                return void UI.alert(Messages.team_leaveOwner);
+            }
+            UI.confirm(Messages.team_leaveConfirm, function (yes) {
+                if (!yes) { return; }
+                APP.module.execCommand('LEAVE_TEAM', {
+                    teamId: APP.team
+                }, function (obj) {
+                    if (obj && obj.error) {
+                        return void UI.warn(Messages.error);
+                    }
                 });
             });
-            $header.append(leave);
-        }
+        });
+        $header.append(leave);
 
         var table = h('button.btn.btn-primary', Messages.teams_table);
         $(table).click(function (e) {
diff --git a/www/teams/main.js b/www/teams/main.js
index ea48f72a1..7d12126eb 100644
--- a/www/teams/main.js
+++ b/www/teams/main.js
@@ -24,7 +24,10 @@ define([
 
             sframeChan.on('Q_DRIVE_USEROBJECT', function (data, cb) {
                 if (!teamId) { return void cb({error: 'EINVAL'}); }
-                data.teamId = teamId;
+                // a teamId of -1 bypasses guards against modifying your drive
+                // from the team app
+                if (data.teamId !== -1) { data.teamId = teamId; }
+                else { delete data.teamId; }
                 Cryptpad.userObjectCommand(data, cb);
             });
             sframeChan.on('Q_DRIVE_GETOBJECT', function (data, cb) {