Merge pull request #131 from ajbura/dev

v1.3.2
2021-10-06 13:22:18 +05:30
205 changed files with 9692 additions and 29225 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -27,7 +27,6 @@ If applicable, add screenshots to help explain your problem.
 - OS: [e.g. Windows, MacOS]
 - Browser: [e.g. chrome, firefox]
 - Version: [e.g. 3.22]
- - Matrix homeserver: [e.g. matrix.org]

 #### Additional context
 Add any other context about the problem here.
--- a/.github/workflows/build-pull-request.yml
+++ b/.github/workflows/build-pull-request.yml
@@ -1,32 +0,0 @@
-name: 'Build PR'
-
-on:
-  pull_request:
-    types: ['opened', 'synchronize']
-
-jobs:
-    build:
-        runs-on: ubuntu-latest
-        env:
-          PR_NUMBER: ${{github.event.number}}
-        steps:
-            - uses: actions/checkout@v2
-            - name: Build
-              run: npm install && npm run build
-            - name: Upload Artifact
-              uses: actions/upload-artifact@v2
-              with:
-                  name: previewbuild
-                  path: dist
-                  retention-days: 1
-            - uses: actions/github-script@v3.1.0
-              with:
-                script: |
-                    var fs = require('fs');
-                    fs.writeFileSync('${{github.workspace}}/pr.json', JSON.stringify(context.payload.pull_request));
-            - name: Upload PR Info
-              uses: actions/upload-artifact@v2
-              with:
-                  name: pr.json
-                  path: pr.json
-                  retention-days: 1
--- a/.github/workflows/deploy-pull-request.yml
+++ b/.github/workflows/deploy-pull-request.yml
@@ -1,78 +0,0 @@
-name: Upload Preview Build to Netlify
-on:
-    workflow_run:
-        workflows: ["Build PR"]
-        types:
-            - completed
-jobs:
-    build:
-        runs-on: ubuntu-latest
-        if: >
-            ${{ github.event.workflow_run.conclusion == 'success' }}
-        steps:
-            # There's a 'download artifact' action but it hasn't been updated for the
-            # workflow_run action (https://github.com/actions/download-artifact/issues/60)
-            # so instead we get this mess:
-            - name: 'Download artifact'
-              uses: actions/github-script@v3.1.0
-              with:
-                script: |
-                  var artifacts = await github.actions.listWorkflowRunArtifacts({
-                     owner: context.repo.owner,
-                     repo: context.repo.repo,
-                     run_id: ${{github.event.workflow_run.id }},
-                  });
-                  var matchArtifact = artifacts.data.artifacts.filter((artifact) => {
-                    return artifact.name == "previewbuild"
-                  })[0];
-                  var download = await github.actions.downloadArtifact({
-                     owner: context.repo.owner,
-                     repo: context.repo.repo,
-                     artifact_id: matchArtifact.id,
-                     archive_format: 'zip',
-                  });
-                  var fs = require('fs');
-                  fs.writeFileSync('${{github.workspace}}/previewbuild.zip', Buffer.from(download.data));
-                  var prInfoArtifact = artifacts.data.artifacts.filter((artifact) => {
-                    return artifact.name == "pr.json"
-                  })[0];
-                  var download = await github.actions.downloadArtifact({
-                     owner: context.repo.owner,
-                     repo: context.repo.repo,
-                     artifact_id: prInfoArtifact.id,
-                     archive_format: 'zip',
-                  });
-                  var fs = require('fs');
-                  fs.writeFileSync('${{github.workspace}}/pr.json.zip', Buffer.from(download.data));
-            - name: Extract Artifacts
-              run: unzip -d dist previewbuild.zip && rm previewbuild.zip && unzip pr.json.zip && rm pr.json.zip
-            - name: 'Read PR Info'
-              id: readctx
-              uses: actions/github-script@v3.1.0
-              with:
-                script: |
-                    var fs = require('fs');
-                    var pr = JSON.parse(fs.readFileSync('${{github.workspace}}/pr.json'));
-                    console.log(`::set-output name=prnumber::${pr.number}`);
-            - name: Deploy to Netlify
-              id: netlify
-              uses: nwtgck/actions-netlify@v1.2
-              with:
-                  publish-dir: dist
-                  deploy-message: "Deploy from GitHub Actions"
-                  # These don't work because we're in workflow_run
-                  enable-pull-request-comment: false
-                  enable-commit-comment: false
-              env:
-                  NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
-                  NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE3_ID }}
-              timeout-minutes: 1
-            - name: Edit PR Description
-              uses: velas/pr-description@v1.0.1
-              env:
-                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-              with:
-                  pull-request-number: ${{ steps.readctx.outputs.prnumber }}
-                  description-message: |
-                      Preview: ${{ steps.netlify.outputs.deploy-url }}
-                      ⚠️ Do you trust the author of this PR? Maybe this build will steal your keys or give you malware. Exercise caution. Use test accounts.
--- a/.github/workflows/netlify-dev.yaml
+++ b/.github/workflows/netlify-dev.yaml
@@ -12,7 +12,7 @@ jobs:

    steps:
      - uses: actions/checkout@v1
-      - uses: jsmrcaga/action-netlify-deploy@9cc40dcd499dd1511b3cc99912444f8970411cc6
+      - uses: jsmrcaga/action-netlify-deploy@master
        with:
          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
          NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE2_ID }}
--- a/.github/workflows/netlify-prod.yaml
+++ b/.github/workflows/netlify-prod.yaml
@@ -11,7 +11,7 @@ jobs:

    steps:
      - uses: actions/checkout@v1
-      - uses: jsmrcaga/action-netlify-deploy@9cc40dcd499dd1511b3cc99912444f8970411cc6
+      - uses: jsmrcaga/action-netlify-deploy@master
        with:
          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
          NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,4 @@
 experiment
 dist
 node_modules
-devAssets
-
-.DS_Store
+devAssets
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,39 +1,139 @@
+<!-- omit in toc -->
 # Contributing to Cinny

 First off, thanks for taking the time to contribute! ❤️

-All types of contributions are encouraged and valued. Please make sure to read the relevant section before making your contribution. It will make it a lot easier for us maintainers and smooth out the experience for all involved. The community looks forward to your contributions. 🎉
+All types of contributions are encouraged and valued. See the [Table of Contents](#table-of-contents) for different ways to help and details about how this project handles them. Please make sure to read the relevant section before making your contribution. It will make it a lot easier for us maintainers and smooth out the experience for all involved. The community looks forward to your contributions. 🎉

 > And if you like the project, but just don't have time to contribute, that's fine. There are other easy ways to support the project and show your appreciation, which we would also be very happy about:
 > - Star the project
 > - Tweet about it (tag @cinnyapp)
 > - Refer this project in your project's readme
 > - Mention the project at local meetups and tell your friends/colleagues
-> - [Donate to us](https://cinny.in/#sponsor)
+> - [Donate to us](https://liberapay.com/ajbura/donate)

-## Bug reports
+<!-- omit in toc -->
+## Table of Contents

-Bug reports and feature suggestions must use descriptive and concise titles and be submitted to [GitHub Issues](https://github.com/ajbura/cinny/issues). Please use the search function to make sure that you are not submitting duplicates, and that a similar report or request has not already been resolved or rejected.
+- [I Have a Question](#i-have-a-question)
+- [I Want To Contribute](#i-want-to-contribute)
+  - [Reporting Bugs](#reporting-bugs)
+  - [Suggesting Enhancements](#suggesting-enhancements)
+  - [Your First Code Contribution](#your-first-code-contribution)
+- [Styleguides](#styleguides)
+  - [Commit Messages](#commit-messages)
+  - [Coding conventions](#coding-conventions)

-## Pull requests
+## I Have a Question

-> ### Legal Notice
+Before you ask a question, it is best to search for existing [Issues](https://github.com/ajbura/cinny/issues) that might help you. In case you have found a suitable issue and still need clarification, you can write your question in this issue.
+
+If you then still feel the need to ask a question and need clarification, we recommend the following:
+
+- Ask in our [Matrix room](https://matrix.to/#/#cinny:matrix.org) or [IRC channel](https://web.libera.chat/?channel=#cinny).
+- If no one respond in our channel, please open an [Issue](https://github.com/ajbura/cinny/issues/new).
+- Provide as much context as you can about what you're running into.
+- Provide project and platform versions (nodejs, npm, etc), depending on what seems relevant.
+
+We will then take care of the issue as soon as possible.
+
+
+## I Want To Contribute
+
+> ### Legal Notice <!-- omit in toc -->
 > When contributing to this project, you must agree that you have authored 100% of the content, that you have the necessary rights to the content and that the content you contribute may be provided under the project license.

-**NOTE: If you want to add new features, please discuss with maintainers before coding or opening a pull request.** This is to ensure that we are on same track and following our roadmap.
+### Reporting Bugs

-**Please use clean, concise titles for your pull requests.** We use commit squashing, so the final commit in the dev branch will carry the title of the pull request. For easier sorting in changelog, start your pull request titles using one of the verbs "Add", "Change", "Remove", or "Fix" (present tense).
+<!-- omit in toc -->
+#### Before Submitting a Bug Report

-Example:
+A good bug report shouldn't leave others needing to chase you up for more information. Therefore, we ask you to investigate carefully, collect information and describe the issue in detail in your report. Please complete the following steps in advance to help us fix any potential bug as fast as possible.

-|Not ideal|Better|
-|---|----|
-|Fixed markAllAsRead in RoomTimeline|Fix read marker when paginating room timeline|
+- Make sure that you are using the latest version.
+- Determine if your bug is really a bug and not an error on your side. If you are looking for support, you might want to check [this section](#i-have-a-question)).
+- To see if other users have experienced (and potentially already solved) the same issue you are having, check if there is not already a bug report existing for your bug or error in the [bug tracker](https://github.com/ajbura/cinny/issues?q=label%3Abug).
+- Collect information about the bug:
+  - OS, Platform and Version (Windows, Linux, macOS, x86, ARM)
+  - Possibly your input and the output
+  - Can you reliably reproduce the issue?

-It is not always possible to phrase every change in such a manner, but it is desired.
+<!-- omit in toc -->
+#### How Do I Submit a Good Bug Report?

-**The smaller the set of changes in the pull request is, the quicker it can be reviewed and merged.** Splitting tasks into multiple smaller pull requests is often preferable.
+> You must never report security related issues, vulnerabilities or bugs to the issue tracker, or elsewhere in public. Instead sensitive bugs must be sent by email to <cinnyapp@gmail.com>.

-Also, we use [ESLint](https://eslint.org/) for clean and stylistically consistent code syntax, so make sure your pull request follow it.
+We use GitHub issues to track bugs and errors. If you run into an issue with the project:

-**For any query or design discussion, join our [Matrix room](https://matrix.to/#/#cinny:matrix.org).**
+- Open an [Issue](https://github.com/ajbura/cinny/issues/new). (Since we can't be sure at this point whether it is a bug or not, we ask you not to talk about a bug yet and not to label the issue.)
+- Explain the behavior you would expect and the actual behavior.
+- Please provide as much context as possible and describe the *reproduction steps* that someone else can follow to recreate the issue on their own. For good bug reports you should isolate the problem and create a reduced test case.
+- Provide the information you collected in the previous section.
+
+Once it's filed:
+
+- The project team will label the issue accordingly.
+- A team member will try to reproduce the issue with your provided steps. If there are no reproduction steps or no obvious way to reproduce the issue, the team will ask you for those steps and mark the issue as `needs-repro`. Bugs with the `needs-repro` tag will not be addressed until they are reproduced.
+- If the team is able to reproduce the issue, it will be marked `needs-fix`, as well as possibly other tags (such as `critical`), and the issue will be left to be [implemented by someone](#your-first-code-contribution).
+
+
+### Suggesting Enhancements
+
+This section guides you through submitting an enhancement suggestion for Cinny, **including completely new features and minor improvements to existing functionality**. Following these guidelines will help maintainers and the community to understand your suggestion and find related suggestions.
+
+<!-- omit in toc -->
+#### Before Submitting an Enhancement
+
+- Make sure that you are using the latest version.
+- Perform a [search](https://github.com/ajbura/cinny/issues) to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one.
+- Find out whether your idea fits with the scope and aims of the project. It's up to you to make a strong case to convince the project's developers of the merits of this feature. Keep in mind that we want features that will be useful to the majority of our users and not just a small subset.
+
+<!-- omit in toc -->
+#### How Do I Submit a Good Enhancement Suggestion?
+
+Enhancement suggestions are tracked as [GitHub issues](https://github.com/ajbura/cinny/issues).
+
+- Use a **clear and descriptive title** for the issue to identify the suggestion.
+- Provide a **step-by-step description of the suggested enhancement** in as many details as possible.
+- **Describe the current behavior** and **explain which behavior you expected to see instead** and why. At this point you can also tell which alternatives do not work for you.
+- You may want to **include screenshots and animated GIFs** which help you demonstrate the steps or point out the part which the suggestion is related to. You can use [this tool](https://www.cockos.com/licecap/) to record GIFs on macOS and Windows, and [this tool](https://github.com/colinkeenan/silentcast) on Linux.
+- **Explain why this enhancement would be useful** to most Cinny users. You may also want to point out the other projects that solved it better and which could serve as inspiration.
+
+### Your First Code Contribution
+Please send a [GitHub Pull Request to cinny](https://github.com/ajbura/cinny/pull/new/master) with a clear list of what you've done (read more about [pull requests](http://help.github.com/pull-requests/)).
+
+When proposing a PR:
+
+- Describe what problem it solves, what side effects come with it.
+- Adding some screenshots will help.
+- Add some documentation if relevant.
+- Add some comments around blocks/functions if relevant.
+
+Some reasons why a PR could be refused:
+
+- PR is not meeting one of the previous points.
+- PR is not meeting project goals.
+- PR is conflicting with another PR, and the latter is being preferred.
+- PR slows down Cinny, or it obviously does too many
+  computations for the task being accomplished. It needs to be optimized.
+- PR is using copy-n-paste-programming. It needs to be factorized.
+- PR contains commented code: remove it.
+- PR adds new features or changes the behavior of Cinny without
+  having be approved by the current project owners first.
+- PR is too big and needs to be splitted in many smaller ones.
+- PR contains unnecessary "space/indentations fixes".
+
+If a PR stays in a stale/WIP/POC state for too long, it may be closed
+at any time.
+
+
+## Styleguides
+### Commit Messages
+Always write a clear log message for your commits. One-line messages are fine for small changes, but bigger changes should look like this:
+
+    $ git commit -m "A brief summary of the commit
+    > 
+    > A paragraph describing what changed and its impact."
+
+### Coding conventions
+We use [ESLint](https://eslint.org/) for clean and stylistically consistent code syntax.
--- a/README.md
+++ b/README.md
@@ -24,12 +24,11 @@ You can serve the application with a webserver of your choosing by simply copyin
 Execute the following commands to compile the app from its source code:

 ```sh
-npm ci # Installs all dependencies
+npm install # Installs all dependencies
 npm run build # Compiles the app into the dist/ directory
 ```

-You can then copy the files to a webserver's webroot of your choice.
-
+You can then copy the files to a webserver's webroot of your choice. 
 To serve a development version of the app locally for testing, you may also use the command `npm start`.

 ### Running with Docker
@@ -52,13 +51,9 @@ navigating to `http://localhost:8080`.

 Alternatively you can just pull the [DockerHub image](https://hub.docker.com/r/ajbura/cinny) by `docker pull ajbura/cinny`.

-### Configuring default Homeserver
-
-To set default Homeserver on login and register page, place a customized [`config.json`](config.json) in webroot of your choice.
-
 ## License

-Copyright (c) 2021 Ajay Bura (ajbura) and contributors
+Copyright (c) 2021 Ajay Bura (ajbura) and other contributors

 Code licensed under the MIT License: <http://opensource.org/licenses/MIT>

--- a/config.json
+++ b/config.json
@@ -1,12 +0,0 @@
-{
-  "defaultHomeserver": 5,
-  "homeserverList": [
-    "boba.best",
-    "converser.eu",
-    "envs.net",
-    "halogen.city",
-    "kde.org",
-    "matrix.org",
-    "mozilla.modular.im"
-  ]
-}
--- a/olm.wasm
+++ b/olm.wasm
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "cinny",
-  "version": "1.7.0",
+  "version": "1.3.2",
  "description": "Yet another matrix client",
  "main": "index.js",
  "engines": {
@@ -15,18 +15,16 @@
  "author": "Ajay Bura",
  "license": "MIT",
  "dependencies": {
-    "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.8.tgz",
+    "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.4.tgz",
    "@tippyjs/react": "^4.2.5",
    "babel-polyfill": "^6.26.0",
    "browser-encrypt-attachment": "^0.3.0",
    "dateformat": "^4.5.1",
    "emojibase-data": "^6.2.0",
-    "file-saver": "^2.0.5",
    "flux": "^4.0.1",
-    "formik": "^2.2.9",
    "html-react-parser": "^1.2.7",
-    "linkifyjs": "^2.1.9",
-    "matrix-js-sdk": "^15.2.1",
+    "linkifyjs": "^3.0.0-beta.3",
+    "matrix-js-sdk": "^12.4.1",
    "micromark": "^3.0.3",
    "micromark-extension-gfm": "^1.0.0",
    "prop-types": "^15.7.2",
@@ -34,8 +32,11 @@
    "react-autosize-textarea": "^7.1.0",
    "react-dom": "^17.0.2",
    "react-google-recaptcha": "^2.1.0",
+    "react-markdown": "^6.0.1",
    "react-modal": "^3.13.1",
-    "sanitize-html": "^2.5.3",
+    "react-router-dom": "^5.2.0",
+    "react-syntax-highlighter": "^15.4.3",
+    "remark-gfm": "^1.0.0",
    "tippy.js": "^6.3.1",
    "twemoji": "^13.1.0"
  },
@@ -70,9 +71,9 @@
    "stream-browserify": "^3.0.0",
    "style-loader": "^2.0.0",
    "util": "^0.12.4",
-    "webpack": "^5.62.1",
-    "webpack-cli": "^4.9.1",
-    "webpack-dev-server": "^4.4.0",
+    "webpack": "^5.28.0",
+    "webpack-cli": "^4.5.0",
+    "webpack-dev-server": "^3.11.2",
    "webpack-merge": "^5.7.3"
  }
 }
--- a/public/index.html
+++ b/public/index.html
@@ -3,7 +3,8 @@
 <head>
    <meta charset="UTF-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0 maximum-scale=1.0 user-scalable=no">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link href="https://api.fontshare.com/css?f[]=supreme@300,301,400,401,500,501,700,701&display=swap" rel="stylesheet">
    <title>Cinny</title>
    <meta name="name"        content="Cinny">
    <meta name="author"      content="Ajay Bura">
--- a/public/res/fonts/inter/Inter_vf_slant_weight.ttf
+++ b/public/res/fonts/inter/Inter_vf_slant_weight.ttf
--- a/public/res/fonts/roboto/LICENSE.txt
+++ b/public/res/fonts/roboto/LICENSE.txt
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--- a/public/res/fonts/roboto/Roboto-Bold.ttf
+++ b/public/res/fonts/roboto/Roboto-Bold.ttf
--- a/public/res/fonts/roboto/Roboto-BoldItalic.ttf
+++ b/public/res/fonts/roboto/Roboto-BoldItalic.ttf
--- a/public/res/fonts/roboto/Roboto-Italic.ttf
+++ b/public/res/fonts/roboto/Roboto-Italic.ttf
--- a/public/res/fonts/roboto/Roboto-Light.ttf
+++ b/public/res/fonts/roboto/Roboto-Light.ttf
--- a/public/res/fonts/roboto/Roboto-LightItalic.ttf
+++ b/public/res/fonts/roboto/Roboto-LightItalic.ttf
--- a/public/res/fonts/roboto/Roboto-Medium.ttf
+++ b/public/res/fonts/roboto/Roboto-Medium.ttf
--- a/public/res/fonts/roboto/Roboto-MediumItalic.ttf
+++ b/public/res/fonts/roboto/Roboto-MediumItalic.ttf
--- a/public/res/fonts/roboto/Roboto-Regular.ttf
+++ b/public/res/fonts/roboto/Roboto-Regular.ttf
--- a/public/res/ic/outlined/check.svg
+++ b/public/res/ic/outlined/check.svg
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<polygon points="9.5,14.1 6,10.6 4.6,12 8.1,15.5 9.5,16.9 19.4,7 18,5.6 "/>
-</svg>
--- a/public/res/ic/outlined/hash-globe.svg
+++ b/public/res/ic/outlined/hash-globe.svg
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<g>
-	<polygon points="16,12 14,12 14,14 10,14 10,10 12,10 12,8 10,8 10,3 8,3 8,8 3,8 3,10 8,10 8,14 3,14 3,16 8,16 8,21 10,21 10,16 
-		14,16 14,21 16,21 16,16 21,16 21,14 16,14 	"/>
-	<path d="M18.5,1C16,1,14,3,14,5.5s2,4.5,4.5,4.5S23,8,23,5.5S21,1,18.5,1z M17.5,7C17.5,7,17.5,7,17.5,7c-0.2-0.1-0.3-0.1-0.3-0.2
-		c-0.6-0.5-1.7-1.1-1.8-2c-0.1-0.7,0.8-1.6,1.3-2c0.8-0.6,2.3-1.1,3.2-0.5c0.6,0.4-1.2,1-1.4,1.3c-0.3,0.4-0.3,0.9-0.3,1.4
-		c0,0.5,0.1,1.2-0.2,1.6C17.9,6.9,17.7,7,17.5,7z M20.8,7.9c-0.4,0.3-0.9,0.2-1.3,0.5c-0.1,0.1-0.2,0.2-0.3,0.2
-		c-0.2,0.1-0.5-0.1-0.5-0.3c-0.3-0.8,0.3-1.2,0.9-1.3c0.3,0,0.7,0,1,0c0.2,0,0.4,0.1,0.4,0.3C21.1,7.5,20.9,7.7,20.8,7.9z"/>
-</g>
-</svg>
--- a/public/res/ic/outlined/shield-empty.svg
+++ b/public/res/ic/outlined/shield-empty.svg
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<path d="M12,2L3,6v7c0,5,4,9,9,9c5,0,9-4,9-9V6L12,2z M19,13c0,3.9-3.1,7-7,7s-7-3.1-7-7V7.3l7-3.1l7,3.1V13z"/>
-</svg>
--- a/public/res/ic/outlined/shield-user.svg
+++ b/public/res/ic/outlined/shield-user.svg
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<g>
-	<path d="M12,2L3,6v7c0,5,4,9,9,9c5,0,9-4,9-9V6L12,2z M19,13c0,3.9-3.1,7-7,7s-7-3.1-7-7V7.3l7-3.1l7,3.1V13z"/>
-	<circle cx="12" cy="9" r="2"/>
-	<path d="M15,16H9v-1c0-1.7,1.3-3,3-3h0c1.7,0,3,1.3,3,3V16z"/>
-</g>
-</svg>
--- a/public/res/ic/outlined/space-globe.svg
+++ b/public/res/ic/outlined/space-globe.svg
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<g>
-	<path d="M15.4,13.7L14,14l-0.2,1.4c-0.4,2.8-1.3,4.2-1.7,4.6c-0.4-0.3-1.3-1.8-1.7-4.6L10,14l-1.4-0.2c-2.8-0.4-4.2-1.3-4.6-1.7
-		c0.3-0.4,1.8-1.3,4.6-1.7L10,10l0.2-1.4c0.4-2.8,1.3-4.2,1.7-4.6V2c-1.7,0-3.1,2.6-3.7,6.3C4.6,8.9,2,10.3,2,12s2.6,3.1,6.3,3.7
-		c0.6,3.7,2,6.3,3.7,6.3s3.1-2.6,3.7-6.3c3.7-0.6,6.3-2,6.3-3.7h-2.1C19.6,12.4,18.2,13.3,15.4,13.7z"/>
-	<path d="M18.5,1C16,1,14,3,14,5.5s2,4.5,4.5,4.5S23,8,23,5.5S21,1,18.5,1z M17.5,7C17.5,7,17.5,7,17.5,7c-0.2-0.1-0.3-0.1-0.3-0.2
-		c-0.6-0.5-1.7-1.1-1.8-2c-0.1-0.7,0.8-1.6,1.3-2c0.8-0.6,2.3-1.1,3.2-0.5c0.6,0.4-1.2,1-1.4,1.3c-0.3,0.4-0.3,0.9-0.3,1.4
-		c0,0.5,0.1,1.2-0.2,1.6C17.9,6.9,17.7,7,17.5,7z M20.8,7.9c-0.4,0.3-0.9,0.2-1.3,0.5c-0.1,0.1-0.2,0.2-0.3,0.2
-		c-0.2,0.1-0.5-0.1-0.5-0.3c-0.3-0.8,0.3-1.2,0.9-1.3c0.3,0,0.7,0,1,0c0.2,0,0.4,0.1,0.4,0.3C21.1,7.5,20.9,7.7,20.8,7.9z"/>
-</g>
-</svg>
--- a/public/res/svg/image-broken.svg
+++ b/public/res/svg/image-broken.svg
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<g>
-	<g>
-		<polygon fill="#7F7F7F" points="20,7 20,5 18,5 18,7 16,7 16,5 18,5 18,3 16,3 16,2 3,2 3,22 11,22 11,20 19,12 21,12 21,7 		"/>
-		<polygon fill="#7F7F7F" points="19,16 21,16 21,22 15,22 15,20 19,20 		"/>
-	</g>
-	<polygon fill="#6FBEFF" points="19,9 14,9 14,4 5,4 5,20 11,20 13,20 13,18 15,18 15,16 17,16 17,14 19,14 	"/>
-	<polygon fill="#FFFFFF" points="7,10 12,10 12,8 10,8 10,7 8,7 8,8 7,8 	"/>
-	<g>
-		<rect x="17" y="18" fill="#00C72C" width="2" height="2"/>
-		<polygon fill="#00C72C" points="5,20 5,18 7,18 7,16 9,16 9,14 11,14 11,12 13,12 13,14 15,14 15,18 13,18 13,20 		"/>
-	</g>
-</g>
-</svg>
--- a/src/app/atoms/avatar/Avatar.jsx
+++ b/src/app/atoms/avatar/Avatar.jsx
@@ -1,40 +1,35 @@
-import React from 'react';
+import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import './Avatar.scss';

-import { twemojify } from '../../../util/twemojify';
-
 import Text from '../text/Text';
 import RawIcon from '../system-icons/RawIcon';

-import ImageBrokenSVG from '../../../../public/res/svg/image-broken.svg';
-
 function Avatar({
-  text, bgColor, iconSrc, iconColor, imageSrc, size,
+  text, bgColor, iconSrc, imageSrc, size,
 }) {
+  const [image, updateImage] = useState(imageSrc);
  let textSize = 's1';
  if (size === 'large') textSize = 'h1';
  if (size === 'small') textSize = 'b1';
  if (size === 'extra-small') textSize = 'b3';

+  useEffect(() => updateImage(imageSrc), [imageSrc]);
+
  return (
    <div className={`avatar-container avatar-container__${size} noselect`}>
      {
-        imageSrc !== null
-          ? <img draggable="false" src={imageSrc} onError={(e) => { e.target.src = ImageBrokenSVG; }} alt="avatar" />
+        image !== null
+          ? <img src={image} onError={() => updateImage(null)} alt="avatar" />
          : (
            <span
              style={{ backgroundColor: iconSrc === null ? bgColor : 'transparent' }}
-              className={`avatar__border${iconSrc !== null ? '--active' : ''}`}
+              className={`avatar__border${iconSrc !== null ? ' avatar__bordered' : ''} inline-flex--center`}
            >
              {
                iconSrc !== null
-                  ? <RawIcon size={size} src={iconSrc} color={iconColor} />
-                  : text !== null && (
-                    <Text variant={textSize} primary>
-                      {twemojify([...text][0])}
-                    </Text>
-                  )
+                  ? <RawIcon size={size} src={iconSrc} />
+                  : text !== null && <Text variant={textSize}>{text}</Text>
              }
            </span>
          )
@@ -47,7 +42,6 @@ Avatar.defaultProps = {
  text: null,
  bgColor: 'transparent',
  iconSrc: null,
-  iconColor: null,
  imageSrc: null,
  size: 'normal',
 };
@@ -56,7 +50,6 @@ Avatar.propTypes = {
  text: PropTypes.string,
  bgColor: PropTypes.string,
  iconSrc: PropTypes.string,
-  iconColor: PropTypes.string,
  imageSrc: PropTypes.string,
  size: PropTypes.oneOf(['large', 'normal', 'small', 'extra-small']),
 };
--- a/src/app/atoms/avatar/Avatar.scss
+++ b/src/app/atoms/avatar/Avatar.scss
@@ -1,5 +1,3 @@
-@use '../../partials/flex';
-
 .avatar-container {
  display: inline-flex;
  width: 42px;
@@ -26,16 +24,19 @@
    height: var(--av-extra-small);
  }

-  > img {
+
+  img {
    width: 100%;
    height: 100%;
    object-fit: cover;
    border-radius: inherit;
  }

+  .avatar__bordered {
+    box-shadow: var(--bs-surface-border);
+  }
+
  .avatar__border {
-    @extend .cp-fx__row--c-c;
-    
    position: absolute;
    top: 0;
    left: 0;
@@ -45,11 +46,7 @@
    border-radius: inherit;

    .text {
-      color: white;
-    }
-    &--active {
-      @extend .avatar__border;
-      box-shadow: var(--bs-surface-border);
+      color: var(--tc-primary-high);
    }
  }
 }
--- a/src/app/atoms/badge/NotificationBadge.jsx
+++ b/src/app/atoms/badge/NotificationBadge.jsx
@@ -8,7 +8,7 @@ function NotificationBadge({ alert, content }) {
  const notificationClass = alert ? ' notification-badge--alert' : '';
  return (
    <div className={`notification-badge${notificationClass}`}>
-      {content !== null && <Text variant="b3" weight="bold">{content}</Text>}
+      {content !== null && <Text variant="b3">{content}</Text>}
    </div>
  );
 }
--- a/src/app/atoms/badge/NotificationBadge.scss
+++ b/src/app/atoms/badge/NotificationBadge.scss
@@ -8,6 +8,7 @@
  .text {
    color: var(--tc-badge);
    text-align: center;
+    font-weight: 700;
  }

  &--alert {
--- a/src/app/atoms/button/Button.jsx
+++ b/src/app/atoms/button/Button.jsx
@@ -6,20 +6,18 @@ import Text from '../text/Text';
 import RawIcon from '../system-icons/RawIcon';
 import { blurOnBubbling } from './script';

-const Button = React.forwardRef(({
+function Button({
  id, className, variant, iconSrc,
  type, onClick, children, disabled,
-}, ref) => {
+}) {
  const iconClass = (iconSrc === null) ? '' : `btn-${variant}--icon`;
  return (
    <button
-      ref={ref}
      id={id === '' ? undefined : id}
      className={`${className ? `${className} ` : ''}btn-${variant} ${iconClass} noselect`}
      onMouseUp={(e) => blurOnBubbling(e, `.btn-${variant}`)}
      onClick={onClick}
-      // eslint-disable-next-line react/button-has-type
-      type={type}
+      type={type === 'button' ? 'button' : 'submit'}
      disabled={disabled}
    >
      {iconSrc !== null && <RawIcon size="small" src={iconSrc} />}
@@ -27,7 +25,7 @@ const Button = React.forwardRef(({
      {typeof children !== 'string' && children }
    </button>
  );
-});
+}

 Button.defaultProps = {
  id: '',
@@ -44,7 +42,7 @@ Button.propTypes = {
  className: PropTypes.string,
  variant: PropTypes.oneOf(['surface', 'primary', 'positive', 'caution', 'danger']),
  iconSrc: PropTypes.string,
-  type: PropTypes.oneOf(['button', 'submit', 'reset']),
+  type: PropTypes.oneOf(['button', 'submit']),
  onClick: PropTypes.func,
  children: PropTypes.node.isRequired,
  disabled: PropTypes.bool,
--- a/src/app/atoms/button/Button.scss
+++ b/src/app/atoms/button/Button.scss
@@ -1,5 +1,4 @@
@use 'state';
-@use '../../partials/dir';

 .btn-surface,
 .btn-primary,
@@ -19,10 +18,27 @@
  @include state.disabled;

  &--icon {
-    @include dir.side(padding, var(--sp-tight), var(--sp-loose));
+    padding: {
+      left: var(--sp-tight);
+      right: var(--sp-loose);
+    }
+
+    [dir=rtl] & {
+      padding: {
+        left: var(--sp-loose);
+        right: var(--sp-tight);
+      }
+    }

    .ic-raw {
-      @include dir.side(margin, 0, var(--sp-extra-tight));
+      margin-right: var(--sp-extra-tight);
+
+      [dir=rtl] & {
+        margin: {
+          right: 0;
+          left: var(--sp-extra-tight);
+        }
+      }
    }
  }
 }
--- a/src/app/atoms/button/Checkbox.jsx
+++ b/src/app/atoms/button/Checkbox.jsx
@@ -1,35 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import './Checkbox.scss';
-
-function Checkbox({
-  variant, isActive, onToggle, disabled,
-}) {
-  const className = `checkbox checkbox-${variant}${isActive ? ' checkbox--active' : ''}`;
-  if (onToggle === null) return <span className={className} />;
-  return (
-    // eslint-disable-next-line jsx-a11y/control-has-associated-label
-    <button
-      onClick={() => onToggle(!isActive)}
-      className={className}
-      type="button"
-      disabled={disabled}
-    />
-  );
-}
-
-Checkbox.defaultProps = {
-  variant: 'primary',
-  isActive: false,
-  onToggle: null,
-  disabled: false,
-};
-
-Checkbox.propTypes = {
-  variant: PropTypes.oneOf(['primary', 'positive', 'caution', 'danger']),
-  isActive: PropTypes.bool,
-  onToggle: PropTypes.func,
-  disabled: PropTypes.bool,
-};
-
-export default Checkbox;
--- a/src/app/atoms/button/Checkbox.scss
+++ b/src/app/atoms/button/Checkbox.scss
@@ -1,39 +0,0 @@
-@use '../../partials/flex';
-@use './state';
-
-.checkbox {
-  width: 20px;
-  height: 20px;
-
-  border-radius: calc(var(--bo-radius) / 2);
-  background-color: var(--bg-surface-border);
-  box-shadow: var(--bs-surface-border);
-  cursor: pointer;
-  @include state.disabled;
-  @extend .cp-fx__row--c-c;
-
-  &--active {
-    background-color: black;
-    &::before {
-      content: "";
-      display: inline-block;
-      width: 12px;
-      height: 6px;
-      border: 6px solid white;
-      border-width: 0 0 3px 3px;
-      transform: rotateZ(-45deg) translate(1px, -1px);
-    }
-  }
-}
-.checkbox-primary.checkbox--active {
-  background-color: var(--bg-primary);
-}
-.checkbox-positive.checkbox--active {
-  background-color: var(--bg-positive);
-}
-.checkbox-caution.checkbox--active {
-  background-color: var(--bg-caution);
-}
-.checkbox-danger.checkbox--active {
-  background-color: var(--bg-danger);
-}
--- a/src/app/atoms/button/IconButton.jsx
+++ b/src/app/atoms/button/IconButton.jsx
@@ -9,8 +9,7 @@ import Text from '../text/Text';

 const IconButton = React.forwardRef(({
  variant, size, type,
-  tooltip, tooltipPlacement, src,
-  onClick, tabIndex, disabled, isImage,
+  tooltip, tooltipPlacement, src, onClick,
 }, ref) => {
  const btn = (
    <button
@@ -18,12 +17,9 @@ const IconButton = React.forwardRef(({
      className={`ic-btn ic-btn-${variant}`}
      onMouseUp={(e) => blurOnBubbling(e, `.ic-btn-${variant}`)}
      onClick={onClick}
-      // eslint-disable-next-line react/button-has-type
-      type={type}
-      tabIndex={tabIndex}
-      disabled={disabled}
+      type={type === 'button' ? 'button' : 'submit'}
    >
-      <RawIcon size={size} src={src} isImage={isImage} />
+      <RawIcon size={size} src={src} />
    </button>
  );
  if (tooltip === null) return btn;
@@ -44,22 +40,16 @@ IconButton.defaultProps = {
  tooltip: null,
  tooltipPlacement: 'top',
  onClick: null,
-  tabIndex: 0,
-  disabled: false,
-  isImage: false,
 };

 IconButton.propTypes = {
-  variant: PropTypes.oneOf(['surface', 'primary', 'positive', 'caution', 'danger']),
+  variant: PropTypes.oneOf(['surface', 'positive', 'caution', 'danger']),
  size: PropTypes.oneOf(['normal', 'small', 'extra-small']),
-  type: PropTypes.oneOf(['button', 'submit', 'reset']),
+  type: PropTypes.oneOf(['button', 'submit']),
  tooltip: PropTypes.string,
  tooltipPlacement: PropTypes.oneOf(['top', 'right', 'bottom', 'left']),
  src: PropTypes.string.isRequired,
  onClick: PropTypes.func,
-  tabIndex: PropTypes.number,
-  disabled: PropTypes.bool,
-  isImage: PropTypes.bool,
 };

 export default IconButton;
--- a/src/app/atoms/button/IconButton.scss
+++ b/src/app/atoms/button/IconButton.scss
@@ -29,13 +29,6 @@
  @include focus(var(--bg-surface-hover));
  @include state.active(var(--bg-surface-active));
 }
-.ic-btn-primary {
-  @include color(var(--ic-primary-normal));
-  @include state.hover(var(--bg-primary-hover));
-  @include focus(var(--bg-primary-hover));
-  @include state.active(var(--bg-primary-active));
-  background-color: var(--bg-primary);
-}
 .ic-btn-positive {
  @include color(var(--ic-positive-normal));
  @include state.hover(var(--bg-positive-hover));
--- a/src/app/atoms/button/RadioButton.jsx
+++ b/src/app/atoms/button/RadioButton.jsx
@@ -1,30 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import './RadioButton.scss';
-
-function RadioButton({ isActive, onToggle, disabled }) {
-  if (onToggle === null) return <span className={`radio-btn${isActive ? ' radio-btn--active' : ''}`} />;
-  return (
-    // eslint-disable-next-line jsx-a11y/control-has-associated-label
-    <button
-      onClick={() => onToggle(!isActive)}
-      className={`radio-btn${isActive ? ' radio-btn--active' : ''}`}
-      type="button"
-      disabled={disabled}
-    />
-  );
-}
-
-RadioButton.defaultProps = {
-  isActive: false,
-  onToggle: null,
-  disabled: false,
-};
-
-RadioButton.propTypes = {
-  isActive: PropTypes.bool,
-  onToggle: PropTypes.func,
-  disabled: PropTypes.bool,
-};
-
-export default RadioButton;
--- a/src/app/atoms/button/RadioButton.scss
+++ b/src/app/atoms/button/RadioButton.scss
@@ -1,28 +0,0 @@
-@use '../../partials/flex';
-@use './state';
-
-.radio-btn {
-  @extend .cp-fx__row--c-c;
-  width: 20px;
-  height: 20px;
-  border-radius: 50%;
-  background-color: var(--bg-surface-border);
-  border: 2px solid var(--bg-surface-border);
-  cursor: pointer;
-  @include state.disabled;
-
-  &::before {
-    content: '';
-    display: inline-block;
-    width: 12px;
-    height: 12px;
-    background-color: var(--bg-surface-border);
-    border-radius: 50%;
-  }
-  &--active {
-    border: 2px solid var(--bg-positive);
-    &::before {
-      background-color: var(--bg-positive);
-    }
-  }
-}
--- a/src/app/atoms/button/Toggle.jsx
+++ b/src/app/atoms/button/Toggle.jsx
@@ -2,30 +2,24 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import './Toggle.scss';

-function Toggle({ isActive, onToggle, disabled }) {
-  const className = `toggle${isActive ? ' toggle--active' : ''}`;
-  if (onToggle === null) return <span className={className} />;
+function Toggle({ isActive, onToggle }) {
  return (
    // eslint-disable-next-line jsx-a11y/control-has-associated-label
    <button
      onClick={() => onToggle(!isActive)}
-      className={className}
+      className={`toggle${isActive ? ' toggle--active' : ''}`}
      type="button"
-      disabled={disabled}
    />
  );
 }

 Toggle.defaultProps = {
  isActive: false,
-  disabled: false,
-  onToggle: null,
 };

 Toggle.propTypes = {
  isActive: PropTypes.bool,
-  onToggle: PropTypes.func,
-  disabled: PropTypes.bool,
+  onToggle: PropTypes.func.isRequired,
 };

 export default Toggle;
--- a/src/app/atoms/button/Toggle.scss
+++ b/src/app/atoms/button/Toggle.scss
@@ -1,6 +1,3 @@
-@use '../../partials/dir';
-@use './state';
-
 .toggle {
  width: 44px;
  height: 24px;
@@ -11,7 +8,6 @@
  box-shadow: var(--bs-surface-border);
  cursor: pointer;
  background-color: var(--bg-surface-low);
-  @include state.disabled;

  transition: background 200ms ease-in-out;

@@ -31,13 +27,13 @@
    background-color: var(--bg-positive);

    &::before {
-      --ltr: translateX(calc(125%));
-      --rtl: translateX(calc(-125%));
-      @include dir.prop(transform, var(--ltr), var(--rtl));
-
-      transform: translateX(calc(125%));
      background-color: white;
+      transform: translateX(calc(125%));
      opacity: 1;
+
+      [dir=rtl] & {
+        transform: translateX(calc(-125%));
+      }
    }
  }
 }
--- a/src/app/atoms/chip/Chip.jsx
+++ b/src/app/atoms/chip/Chip.jsx
@@ -7,14 +7,13 @@ import RawIcon from '../system-icons/RawIcon';

 function Chip({
  iconSrc, iconColor, text, children,
-  onClick,
 }) {
  return (
-    <button className="chip" type="button" onClick={onClick}>
-      {iconSrc != null && <RawIcon src={iconSrc} color={iconColor} size="extra-small" />}
-      {(text != null && text !== '') && <Text variant="b3">{text}</Text>}
+    <div className="chip">
+      {iconSrc != null && <RawIcon src={iconSrc} color={iconColor} size="small" />}
+      {(text != null && text !== '') && <Text variant="b2">{text}</Text>}
      {children}
-    </button>
+    </div>
  );
 }

@@ -23,7 +22,6 @@ Chip.propTypes = {
  iconColor: PropTypes.string,
  text: PropTypes.string,
  children: PropTypes.element,
-  onClick: PropTypes.func,
 };

 Chip.defaultProps = {
@@ -31,7 +29,6 @@ Chip.defaultProps = {
  iconColor: null,
  text: null,
  children: null,
-  onClick: null,
 };

 export default Chip;
--- a/src/app/atoms/chip/Chip.scss
+++ b/src/app/atoms/chip/Chip.scss
@@ -1,5 +1,3 @@
-@use '../../partials/dir';
-
 .chip {
  padding: var(--sp-ultra-tight) var(--sp-extra-tight);
  
@@ -9,23 +7,13 @@
  
  background: var(--bg-surface-low);
  border-radius: var(--bo-radius);
-  box-shadow: var(--bs-surface-border);
-  cursor: pointer;
-
-  @media (hover: hover) {
-    &:hover {
-      background-color: var(--bg-surface-hover);
-    }
-  }
-
-  & > .text {
-    flex: 1;
-    color: var(--tc-surface-high);
-  }
+  border: 1px solid var(--bg-surface-border);

  & > .ic-raw {
-    width: 16px;
-    height: 16px;
-    @include dir.side(margin, 0, var(--sp-ultra-tight));
+    margin-right: var(--sp-extra-tight);
+    [dir=rtl] & {
+      margin-right: 0;
+      margin-left: var(--sp-extra-tight);
+    }
  }
 }
--- a/src/app/atoms/context-menu/ContextMenu.jsx
+++ b/src/app/atoms/context-menu/ContextMenu.jsx
@@ -67,12 +67,11 @@ function MenuHeader({ children }) {
 }

 MenuHeader.propTypes = {
-  children: PropTypes.node.isRequired,
+  children: PropTypes.string.isRequired,
 };

 function MenuItem({
-  variant, iconSrc, type,
-  onClick, children, disabled,
+  variant, iconSrc, type, onClick, children,
 }) {
  return (
    <div className="context-menu__item">
@@ -81,7 +80,6 @@ function MenuItem({
        iconSrc={iconSrc}
        type={type}
        onClick={onClick}
-        disabled={disabled}
      >
        { children }
      </Button>
@@ -91,19 +89,16 @@ function MenuItem({

 MenuItem.defaultProps = {
  variant: 'surface',
-  iconSrc: null,
+  iconSrc: 'none',
  type: 'button',
-  disabled: false,
-  onClick: null,
 };

 MenuItem.propTypes = {
  variant: PropTypes.oneOf(['surface', 'positive', 'caution', 'danger']),
  iconSrc: PropTypes.string,
  type: PropTypes.oneOf(['button', 'submit']),
-  onClick: PropTypes.func,
-  children: PropTypes.node.isRequired,
-  disabled: PropTypes.bool,
+  onClick: PropTypes.func.isRequired,
+  children: PropTypes.string.isRequired,
 };

 function MenuBorder() {
--- a/src/app/atoms/context-menu/ContextMenu.scss
+++ b/src/app/atoms/context-menu/ContextMenu.scss
@@ -1,7 +1,3 @@
-@use '../../partials/flex';
-@use '../../partials/text';
-@use '../../partials/dir';
-
 .context-menu {
  background-color: var(--bg-surface);
  box-shadow: var(--bs-popup);
@@ -26,52 +22,50 @@

 .context-menu__header {
  height: 34px;
-  padding: 0 var(--sp-normal);
+  padding: 0 var(--sp-tight);
  margin-bottom: var(--sp-ultra-tight);
  display: flex;
  align-items: center;
  border-bottom: 1px solid var(--bg-surface-border);

  .text {
-    @extend .cp-txt__ellipsis;
    color: var(--tc-surface-low);
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
  }

  &:not(:first-child) {
-    margin-top: var(--sp-extra-tight);
+    margin-top: var(--sp-normal);
    border-top: 1px solid var(--bg-surface-border);
  }
 }

 .context-menu__item {
-  display: flex;
  button[class^="btn"] {
-    @extend .cp-fx__item-one;
-    justify-content: flex-start;
+    width: 100%;
+    justify-content: start;
    border-radius: 0;
    box-shadow: none;
    white-space: nowrap;
-    padding: var(--sp-extra-tight) var(--sp-normal);

-    & > .ic-raw {
-      @include dir.side(margin, 0, var(--sp-tight));
-    }
-
-    // if item doesn't have icon
    .text:first-child {
-      @include dir.side(
-        margin,
-        calc(var(--ic-small) + var(--sp-tight)),
-        0
-      );
+      margin: {
+        left: calc(var(--ic-small) + var(--sp-ultra-tight));
+        right: var(--sp-extra-tight);
+      }
+
+      [dir=rtl] & {
+        margin: {
+          left: var(--sp-extra-tight);
+          right: calc(var(--ic-small) + var(--sp-ultra-tight));
+        }
+      }
    }
  }
  .btn-surface:focus {
    background-color: var(--bg-surface-hover);
  }
-  .btn-positive:focus {
-    background-color: var(--bg-positive-hover);
-  }
  .btn-caution:focus {
    background-color: var(--bg-caution-hover);
  }
--- a/src/app/atoms/context-menu/ReusableContextMenu.jsx
+++ b/src/app/atoms/context-menu/ReusableContextMenu.jsx
@@ -1,87 +0,0 @@
-import React, { useState, useEffect, useRef } from 'react';
-
-import cons from '../../../client/state/cons';
-import navigation from '../../../client/state/navigation';
-
-import ContextMenu from './ContextMenu';
-
-let key = null;
-function ReusableContextMenu() {
-  const [data, setData] = useState(null);
-  const openerRef = useRef(null);
-
-  const closeMenu = () => {
-    key = null;
-    if (data) openerRef.current.click();
-  };
-
-  useEffect(() => {
-    if (data) {
-      const { cords } = data;
-      openerRef.current.style.transform = `translate(${cords.x}px, ${cords.y}px)`;
-      openerRef.current.style.width = `${cords.width}px`;
-      openerRef.current.style.height = `${cords.height}px`;
-      openerRef.current.click();
-    }
-    const handleContextMenuOpen = (placement, cords, render, afterClose) => {
-      if (key) {
-        closeMenu();
-        return;
-      }
-      setData({
-        placement, cords, render, afterClose,
-      });
-    };
-    navigation.on(cons.events.navigation.REUSABLE_CONTEXT_MENU_OPENED, handleContextMenuOpen);
-    return () => {
-      navigation.removeListener(
-        cons.events.navigation.REUSABLE_CONTEXT_MENU_OPENED,
-        handleContextMenuOpen,
-      );
-    };
-  }, [data]);
-
-  const handleAfterToggle = (isVisible) => {
-    if (isVisible) {
-      key = Math.random();
-      return;
-    }
-    data?.afterClose?.();
-    if (setData) setData(null);
-
-    if (key === null) return;
-    const copyKey = key;
-    setTimeout(() => {
-      if (key === copyKey) key = null;
-    }, 200);
-  };
-
-  return (
-    <ContextMenu
-      afterToggle={handleAfterToggle}
-      placement={data?.placement || 'right'}
-      content={data?.render(closeMenu) ?? ''}
-      render={(toggleMenu) => (
-        <input
-          ref={openerRef}
-          onClick={toggleMenu}
-          type="button"
-          style={{
-            width: '32px',
-            height: '32px',
-            backgroundColor: 'transparent',
-            position: 'fixed',
-            top: 0,
-            left: 0,
-            padding: 0,
-            border: 'none',
-            visibility: 'hidden',
-            appearance: 'none',
-          }}
-        />
-      )}
-    />
-  );
-}
-
-export default ReusableContextMenu;
--- a/src/app/atoms/divider/Divider.jsx
+++ b/src/app/atoms/divider/Divider.jsx
@@ -4,25 +4,26 @@ import './Divider.scss';

 import Text from '../text/Text';

-function Divider({ text, variant, align }) {
-  const dividerClass = ` divider--${variant} divider--${align}`;
+function Divider({ text, variant }) {
+  const dividerClass = ` divider--${variant}`;
  return (
    <div className={`divider${dividerClass}`}>
-      {text !== null && <Text className="divider__text" variant="b3" weight="bold">{text}</Text>}
+      {text !== false && <Text className="divider__text" variant="b3">{text}</Text>}
    </div>
  );
 }

 Divider.defaultProps = {
-  text: null,
+  text: false,
  variant: 'surface',
-  align: 'center',
 };

 Divider.propTypes = {
-  text: PropTypes.string,
-  variant: PropTypes.oneOf(['surface', 'primary', 'positive', 'caution', 'danger']),
-  align: PropTypes.oneOf(['left', 'center', 'right']),
+  text: PropTypes.oneOfType([
+    PropTypes.string,
+    PropTypes.bool,
+  ]),
+  variant: PropTypes.oneOf(['surface', 'primary', 'caution', 'danger']),
 };

 export default Divider;
--- a/src/app/atoms/divider/Divider.scss
+++ b/src/app/atoms/divider/Divider.scss
@@ -1,68 +1,68 @@
-.divider-line {
-  content: '';
-  display: inline-block;
-  flex: 1;
-  border-bottom: 1px solid var(--local-divider-color);
-  opacity: var(--local-divider-opacity);
-}
-
 .divider {
+  --local-divider-color: var(--bg-surface-border);
+
+  margin: var(--sp-extra-tight) var(--sp-normal);
+  margin-right: var(--sp-extra-tight);
  display: flex;
  align-items: center;
+  position: relative;

-  &--center::before,
-  &--right::before {
-    @extend .divider-line;
-  }
-  &--center::after,
-  &--left::after {
-    @extend .divider-line;
+  &::before {
+    content: "";
+    display: inline-block;
+    flex: 1;
+    margin-left: calc(var(--av-small) + var(--sp-tight));
+    border-bottom: 1px solid var(--local-divider-color);
+    opacity: 0.18;
+
+    [dir=rtl] & {
+      margin: {
+        left: 0;
+        right: calc(var(--av-small) + var(--sp-tight));
+      }
+    }
  }

  &__text {
-    padding: 2px var(--sp-extra-tight);
-    border-radius: calc(var(--bo-radius) / 2);
+    margin-left: var(--sp-normal);
+  }
+
+  [dir=rtl] & {
+    margin: {
+      left: var(--sp-extra-tight);
+      right: var(--sp-normal);
+    }
+
+    &__text {
+      margin: {
+        left: 0;
+        right: var(--sp-normal);
+      }
+    }
  }
 }

 .divider--surface {
-  --local-divider-color: var(--bg-divider);
-  --local-divider-opacity: 1;
-
+  --local-divider-color: var(--tc-surface-low);
  .divider__text {
    color: var(--tc-surface-low);
-    border: 1px solid var(--bg-divider);
  }
 }
 .divider--primary {
  --local-divider-color: var(--bg-primary);
-  --local-divider-opacity: .8;
  .divider__text {
-    color: var(--tc-primary-high);
-    background-color: var(--bg-primary);
-  }
-}
-.divider--positive {
-  --local-divider-color: var(--bg-positive);
-  --local-divider-opacity: .8;
-  .divider__text {
-    color: var(--bg-surface);
-    background-color: var(--bg-positive);
+    color: var(--bg-primary);
  }
 }
 .divider--danger {
  --local-divider-color: var(--bg-danger);
-  --local-divider-opacity: .8;
  .divider__text {
-    color: var(--bg-surface);
-    background-color: var(--bg-danger);
+    color: var(--bg-danger);
  }
 }
 .divider--caution {
  --local-divider-color: var(--bg-caution);
-  --local-divider-opacity: .8;
  .divider__text {
-    color: var(--bg-surface);
-    background-color: var(--bg-caution);
+    color: var(--bg-caution);
  }
-}
+}
--- a/src/app/atoms/header/Header.scss
+++ b/src/app/atoms/header/Header.scss
@@ -1,43 +1,63 @@
-@use '../../partials/text';
-@use '../../partials/dir';
-
 .header {
-  @include dir.side(padding, var(--sp-normal), var(--sp-extra-tight));
+  padding: {
+    left: var(--sp-normal);
+    right: var(--sp-extra-tight);
+  }
  width: 100%;
  height: var(--header-height);
  border-bottom: 1px solid var(--bg-surface-border);
  display: flex;
  align-items: center;

+  [dir=rtl] & {
+    padding: {
+      left: var(--sp-extra-tight);
+      right: var(--sp-normal);
+    }
+  }
+
  &__title-wrapper {
    flex: 1;
    min-width: 0;
    display: flex;
    align-items: center;
    margin: 0 var(--sp-tight);
-    
+
    &:first-child {
-      @include dir.side(margin, 0, var(--sp-tight));
+      margin-left: 0;
+      [dir=rtl] & {
+        margin-right: 0;
+      }
    }

    & > .text:first-child {
-      @extend .cp-txt__ellipsis;
      min-width: 0;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
    }
    & > .text-b3{
      flex: 1;
      min-width: 0;

      margin-top: var(--sp-ultra-tight);
-      @include dir.side(margin, var(--sp-tight), 0);
-      @include dir.side(padding, var(--sp-tight), 0);
-      @include dir.side(border, 1px solid var(--bg-surface-border), none);
-
+      margin-left: var(--sp-tight);
+      padding-left: var(--sp-tight);
+      border-left: 1px solid var(--bg-surface-border);
      max-height: calc(2 * var(--lh-b3));
      overflow: hidden;
      -webkit-box-orient: vertical;
      -webkit-line-clamp: 2;
      display: -webkit-box;
+
+      [dir=rtl] & {
+        margin-left: 0;
+        padding-left: 0;
+        border-left: none;
+        margin-right: var(--sp-tight);
+        padding-right: var(--sp-tight);
+        border-right: 1px solid var(--bg-surface-border);
+      }
    }
  }
 }
--- a/src/app/atoms/input/Input.jsx
+++ b/src/app/atoms/input/Input.jsx
@@ -5,10 +5,10 @@ import './Input.scss';
 import TextareaAutosize from 'react-autosize-textarea';

 function Input({
-  id, label, name, value, placeholder,
+  id, label, value, placeholder,
  required, type, onChange, forwardRef,
  resizable, minHeight, onResize, state,
-  onKeyDown, disabled,
+  onKeyDown,
 }) {
  return (
    <div className="input-container">
@@ -17,7 +17,6 @@ function Input({
        ? (
          <TextareaAutosize
            style={{ minHeight: `${minHeight}px` }}
-            name={name}
            id={id}
            className={`input input--resizable${state !== 'normal' ? ` input--${state}` : ''}`}
            ref={forwardRef}
@@ -29,13 +28,11 @@ function Input({
            onChange={onChange}
            onResize={onResize}
            onKeyDown={onKeyDown}
-            disabled={disabled}
          />
        ) : (
          <input
            ref={forwardRef}
            id={id}
-            name={name}
            className={`input ${state !== 'normal' ? ` input--${state}` : ''}`}
            type={type}
            placeholder={placeholder}
@@ -44,7 +41,6 @@ function Input({
            autoComplete="off"
            onChange={onChange}
            onKeyDown={onKeyDown}
-            disabled={disabled}
          />
        )}
    </div>
@@ -53,7 +49,6 @@ function Input({

 Input.defaultProps = {
  id: null,
-  name: '',
  label: '',
  value: '',
  placeholder: '',
@@ -66,12 +61,10 @@ Input.defaultProps = {
  onResize: null,
  state: 'normal',
  onKeyDown: null,
-  disabled: false,
 };

 Input.propTypes = {
  id: PropTypes.string,
-  name: PropTypes.string,
  label: PropTypes.string,
  value: PropTypes.string,
  placeholder: PropTypes.string,
@@ -84,7 +77,6 @@ Input.propTypes = {
  onResize: PropTypes.func,
  state: PropTypes.oneOf(['normal', 'success', 'error']),
  onKeyDown: PropTypes.func,
-  disabled: PropTypes.bool,
 };

 export default Input;
--- a/src/app/atoms/input/Input.scss
+++ b/src/app/atoms/input/Input.scss
@@ -1,10 +1,7 @@
-@use '../../atoms/scroll/scrollbar';
-
 .input {
  display: block;
  width: 100%;
  min-width: 0px;
-  margin: 0;
  padding: var(--sp-tight) var(--sp-normal);
  background-color: var(--bg-surface-low);
  color: var(--tc-surface-normal);
@@ -15,11 +12,6 @@
  letter-spacing: var(--ls-b2);
  line-height: var(--lh-b2);

-  :disabled {
-    opacity: 0.4;
-    cursor: no-drop;
-  }
-
  &__label {
    display: inline-block;
    margin-bottom: var(--sp-ultra-tight);
@@ -28,10 +20,6 @@

  &--resizable {
    resize: vertical !important;
-    overflow-y: auto !important;
-    @include scrollbar.scroll;
-    @include scrollbar.scroll__v;
-    @include scrollbar.scroll--auto-hide;
  }
  &--success {
    border: 1px solid var(--bg-positive);
--- a/src/app/atoms/modal/RawModal.jsx
+++ b/src/app/atoms/modal/RawModal.jsx
@@ -4,8 +4,6 @@ import './RawModal.scss';

 import Modal from 'react-modal';

-import navigation from '../../../client/state/navigation';
-
 Modal.setAppElement('#root');

 function RawModal({
@@ -25,9 +23,6 @@ function RawModal({
    default:
      modalClass += 'raw-modal__small ';
  }
-
-  navigation.setIsRawModalVisible(isOpen);
-
  const modalOverlayClass = (overlayClassName !== null) ? `${overlayClassName} ` : '';
  return (
    <Modal
--- a/src/app/atoms/modal/RawModal.scss
+++ b/src/app/atoms/modal/RawModal.scss
@@ -1,6 +1,6 @@
 .ReactModal__Overlay {
  opacity: 0;
-  transition: opacity 200ms var(--fluid-slide-up);
+  transition: opacity 200ms cubic-bezier(0.13, 0.56, 0.25, 0.99);
 }
 .ReactModal__Overlay--after-open{
  opacity: 1;
@@ -11,7 +11,7 @@

 .ReactModal__Content {
  transform: translateY(100%);
-  transition: transform 200ms var(--fluid-slide-up);
+  transition: transform 200ms cubic-bezier(0.13, 0.56, 0.25, 0.99);
 }

 .ReactModal__Content--after-open{
--- a/src/app/atoms/scroll/ScrollView.scss
+++ b/src/app/atoms/scroll/ScrollView.scss
@@ -1,17 +1,9 @@
-@use '../../partials/dir';
@use '_scrollbar';

-@mixin paddingForSafari($padding) {
-	@media not all and (min-resolution:.001dpcm) {
-    @include dir.side(padding, 0, $padding);
-  }
-}
-
 .scrollbar {
  width: 100%;
  height: 100%;
  @include scrollbar.scroll;
-  @include paddingForSafari(var(--sp-extra-tight));

  &__h {
    @include scrollbar.scroll__h;
@@ -26,6 +18,5 @@
  }
  &--invisible {
    @include scrollbar.scroll--invisible;
-    @include paddingForSafari(0);
  }
 }
--- a/src/app/atoms/scroll/_scrollbar.scss
+++ b/src/app/atoms/scroll/_scrollbar.scss
@@ -32,8 +32,6 @@

@mixin scroll {
  overflow: hidden;
-  // Below code stop scroll when x-scrollable content come in timeline
-  // overscroll-behavior: none;
  @extend .firefox-scrollbar;
  @extend .webkit-scrollbar;
  @extend .webkit-scrollbar-track;
@@ -58,7 +56,6 @@
@mixin scroll--invisible {
  -ms-overflow-style: none;
  scrollbar-width: none;
-
  &::-webkit-scrollbar {
    display: none;
  }
--- a/src/app/atoms/segmented-controls/SegmentedControls.jsx
+++ b/src/app/atoms/segmented-controls/SegmentedControls.jsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import './SegmentedControls.scss';

@@ -17,10 +17,6 @@ function SegmentedControls({
    onSelect(segmentIndex);
  }

-  useEffect(() => {
-    setSelect(selected);
-  }, [selected]);
-
  return (
    <div className="segmented-controls">
      {
--- a/src/app/atoms/segmented-controls/SegmentedControls.scss
+++ b/src/app/atoms/segmented-controls/SegmentedControls.scss
@@ -1,5 +1,4 @@
@use '../button/state';
-@use '../../partials/dir';

 .segmented-controls {
  background-color: var(--bg-surface-low);
@@ -21,7 +20,12 @@
    display: flex;
    align-items: center;
    justify-content: center;
-    @include dir.side(border, 1px solid var(--bg-surface-border), none);
+    border-left: 1px solid var(--bg-surface-border);
+    
+    [dir=rtl] & {
+      border-left: none;
+      border-right: 1px solid var(--bg-surface-border);
+    }

    & .text:nth-child(2) {
      margin: 0 var(--sp-extra-tight);
--- a/src/app/atoms/system-icons/RawIcon.jsx
+++ b/src/app/atoms/system-icons/RawIcon.jsx
@@ -2,33 +2,24 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import './RawIcon.scss';

-function RawIcon({
-  color, size, src, isImage,
-}) {
-  const style = {};
+function RawIcon({ color, size, src }) {
+  const style = {
+    WebkitMaskImage: `url(${src})`,
+    maskImage: `url(${src})`,
+  };
  if (color !== null) style.backgroundColor = color;
-  if (isImage) {
-    style.backgroundColor = 'transparent';
-    style.backgroundImage = `url(${src})`;
-  } else {
-    style.WebkitMaskImage = `url(${src})`;
-    style.maskImage = `url(${src})`;
-  }
-
  return <span className={`ic-raw ic-raw-${size}`} style={style}> </span>;
 }

 RawIcon.defaultProps = {
  color: null,
  size: 'normal',
-  isImage: false,
 };

 RawIcon.propTypes = {
  color: PropTypes.string,
  size: PropTypes.oneOf(['large', 'normal', 'small', 'extra-small']),
  src: PropTypes.string.isRequired,
-  isImage: PropTypes.bool,
 };

 export default RawIcon;
--- a/src/app/atoms/system-icons/RawIcon.scss
+++ b/src/app/atoms/system-icons/RawIcon.scss
@@ -10,9 +10,6 @@
  -webkit-mask-size: cover;
  mask-size: cover;
  background-color: var(--ic-surface-normal);
-
-  background-size: cover;
-  background-repeat: no-repeat;
 }
 .ic-raw-large {
  @include icSize(var(--ic-large));
--- a/src/app/atoms/tabs/Tabs.jsx
+++ b/src/app/atoms/tabs/Tabs.jsx
@@ -1,87 +0,0 @@
-import React, { useState } from 'react';
-import PropTypes from 'prop-types';
-import './Tabs.scss';
-
-import Button from '../button/Button';
-import ScrollView from '../scroll/ScrollView';
-
-function TabItem({
-  selected, iconSrc,
-  onClick, children, disabled,
-}) {
-  const isSelected = selected ? 'tab-item--selected' : '';
-
-  return (
-    <Button
-      className={`tab-item ${isSelected}`}
-      iconSrc={iconSrc}
-      onClick={onClick}
-      disabled={disabled}
-    >
-      {children}
-    </Button>
-  );
-}
-
-TabItem.defaultProps = {
-  selected: false,
-  iconSrc: null,
-  onClick: null,
-  disabled: false,
-};
-
-TabItem.propTypes = {
-  selected: PropTypes.bool,
-  iconSrc: PropTypes.string,
-  onClick: PropTypes.func,
-  children: PropTypes.node.isRequired,
-  disabled: PropTypes.bool,
-};
-
-function Tabs({ items, defaultSelected, onSelect }) {
-  const [selectedItem, setSelectedItem] = useState(items[defaultSelected]);
-
-  const handleTabSelection = (item, index) => {
-    if (selectedItem === item) return;
-    setSelectedItem(item);
-    onSelect(item, index);
-  };
-
-  return (
-    <div className="tabs">
-      <ScrollView horizontal vertical={false} invisible>
-        <div className="tabs__content">
-          {items.map((item, index) => (
-            <TabItem
-              key={item.text}
-              selected={selectedItem.text === item.text}
-              iconSrc={item.iconSrc}
-              disabled={item.disabled}
-              onClick={() => handleTabSelection(item, index)}
-            >
-              {item.text}
-            </TabItem>
-          ))}
-        </div>
-      </ScrollView>
-    </div>
-  );
-}
-
-Tabs.defaultProps = {
-  defaultSelected: 0,
-};
-
-Tabs.propTypes = {
-  items: PropTypes.arrayOf(
-    PropTypes.exact({
-      iconSrc: PropTypes.string,
-      text: PropTypes.string,
-      disabled: PropTypes.bool,
-    }),
-  ).isRequired,
-  defaultSelected: PropTypes.number,
-  onSelect: PropTypes.func.isRequired,
-};
-
-export { Tabs as default };
--- a/src/app/atoms/tabs/Tabs.scss
+++ b/src/app/atoms/tabs/Tabs.scss
@@ -1,45 +0,0 @@
-@use '../../partials/dir';
-
-.tabs {
-  height: var(--header-height);
-  box-shadow: inset 0 -1px 0 var(--bg-surface-border);
-
-  &__content {
-    min-width: 100%;
-    height: 100%;
-    display: flex;
-  }
-}
-
-.tab-item {
-  flex-shrink: 0;
-  
-  @include dir.side(padding, var(--sp-normal), 24px);
-  border-radius: 0;
-  height: 100%;
-  box-shadow: none;
-  border-radius: var(--bo-radius) var(--bo-radius)   0 0;
-
-  &:focus,
-  &:active {
-    background-color: var(--bg-surface-active);
-    box-shadow: none;
-  }
-
-  &--selected {
-    --bs-tab-selected: inset 0 -2px 0 var(--tc-surface-high);
-    box-shadow: var(--bs-tab-selected);
-
-    & .ic-raw {
-      background-color: var(--ic-surface-high);
-    }
-    & .text {
-      font-weight: var(--fw-medium);
-    }
-    &:focus,
-    &:active {
-      background-color: var(--bg-surface-active);
-      box-shadow: var(--bs-tab-selected);
-    }
-  }
-}
--- a/src/app/atoms/text/Text.jsx
+++ b/src/app/atoms/text/Text.jsx
@@ -3,39 +3,25 @@ import PropTypes from 'prop-types';
 import './Text.scss';

 function Text({
-  className, style, variant, weight,
-  primary, span, children,
+  id, className, variant, children,
 }) {
-  const classes = [];
-  if (className) classes.push(className);
-
-  classes.push(`text text-${variant} text-${weight}`);
-  if (primary) classes.push('font-primary');
-
-  const textClass = classes.join(' ');
-  if (span) return <span className={textClass} style={style}>{ children }</span>;
-  if (variant === 'h1') return <h1 className={textClass} style={style}>{ children }</h1>;
-  if (variant === 'h2') return <h2 className={textClass} style={style}>{ children }</h2>;
-  if (variant === 's1') return <h4 className={textClass} style={style}>{ children }</h4>;
-  return <p className={textClass} style={style}>{ children }</p>;
+  const cName = className !== '' ? `${className} ` : '';
+  if (variant === 'h1') return <h1 id={id === '' ? undefined : id} className={`${cName}text text-h1`}>{ children }</h1>;
+  if (variant === 'h2') return <h2 id={id === '' ? undefined : id} className={`${cName}text text-h2`}>{ children }</h2>;
+  if (variant === 's1') return <h4 id={id === '' ? undefined : id} className={`${cName}text text-s1`}>{ children }</h4>;
+  return <p id={id === '' ? undefined : id} className={`${cName}text text-${variant}`}>{ children }</p>;
 }

 Text.defaultProps = {
-  className: null,
-  style: null,
+  id: '',
+  className: '',
  variant: 'b1',
-  weight: 'normal',
-  primary: false,
-  span: false,
 };

 Text.propTypes = {
+  id: PropTypes.string,
  className: PropTypes.string,
-  style: PropTypes.shape({}),
  variant: PropTypes.oneOf(['h1', 'h2', 's1', 'b1', 'b2', 'b3']),
-  weight: PropTypes.oneOf(['light', 'normal', 'medium', 'bold']),
-  primary: PropTypes.bool,
-  span: PropTypes.bool,
  children: PropTypes.node.isRequired,
 };

--- a/src/app/atoms/text/Text.scss
+++ b/src/app/atoms/text/Text.scss
@@ -1,61 +1,41 @@
-@mixin font($type) {
+@mixin font($type, $weight) {
+  
  font-size: var(--fs-#{$type});
+  font-weight: $weight;
  letter-spacing: var(--ls-#{$type});
  line-height: var(--lh-#{$type});
-
-  & img.emoji,
-  & img[data-mx-emoticon] {
-    height: calc(var(--lh-#{$type}) - .25rem);
-  }
 }

-.text {
+%text {
  margin: 0;
  padding: 0;
  color: var(--tc-surface-high);
-
-  & img.emoji,
-  & img[data-mx-emoticon] {
-    margin: 0 !important;
-    margin-right: 2px !important;
-    padding: 0 !important;
-    position: relative;
-    top: -.1rem;
-    vertical-align: middle;
-  }
-}
-
-.text-light {
-  font-weight: var(--fw-light);
-}
-.text-normal {
-  font-weight: var(--fw-normal);
-}
-.text-medium {
-  font-weight: var(--fw-medium);
-}
-.text-bold {
-  font-weight: var(--fw-bold);
 }

 .text-h1 {
-  @include font(h1);
+  @extend %text;
+  @include font(h1, 500);
 }
 .text-h2 {
-  @include font(h2);
+  @extend %text;
+  @include font(h2, 500);
 }
 .text-s1 {
-  @include font(s1);
+  @extend %text;
+  @include font(s1, 400);
 }
 .text-b1 {
-  @include font(b1);
+  @extend %text;
+  @include font(b1, 400);
  color: var(--tc-surface-normal);
 }
 .text-b2 {
-  @include font(b2);
+  @extend %text;
+  @include font(b2, 400);
  color: var(--tc-surface-normal);
 }
 .text-b3 {
-  @include font(b3);
+  @extend %text;
+  @include font(b3, 400);
  color: var(--tc-surface-low);
 }
--- a/src/app/atoms/tooltip/Tooltip.jsx
+++ b/src/app/atoms/tooltip/Tooltip.jsx
@@ -4,7 +4,7 @@ import './Tooltip.scss';
 import Tippy from '@tippyjs/react';

 function Tooltip({
-  className, placement, content, delay, children,
+  className, placement, content, children,
 }) {
  return (
    <Tippy
@@ -14,7 +14,7 @@ function Tooltip({
      arrow={false}
      maxWidth={250}
      placement={placement}
-      delay={delay}
+      delay={[0, 0]}
      duration={[100, 0]}
    >
      {children}
@@ -25,14 +25,12 @@ function Tooltip({
 Tooltip.defaultProps = {
  placement: 'top',
  className: '',
-  delay: [200, 0],
 };

 Tooltip.propTypes = {
  className: PropTypes.string,
  placement: PropTypes.string,
  content: PropTypes.node.isRequired,
-  delay: PropTypes.arrayOf(PropTypes.number),
  children: PropTypes.node.isRequired,
 };

--- a/src/app/hooks/useForceUpdate.js
+++ b/src/app/hooks/useForceUpdate.js
@@ -1,10 +0,0 @@
-/* eslint-disable import/prefer-default-export */
-import { useState } from 'react';
-
-export function useForceUpdate() {
-  const [data, setData] = useState(null);
-
-  return [data, function forceUpdateHook() {
-    setData({});
-  }];
-}
--- a/src/app/hooks/useSelectedSpace.js
+++ b/src/app/hooks/useSelectedSpace.js
@@ -1,21 +0,0 @@
-/* eslint-disable import/prefer-default-export */
-import { useState, useEffect } from 'react';
-
-import cons from '../../client/state/cons';
-import navigation from '../../client/state/navigation';
-
-export function useSelectedSpace() {
-  const [spaceId, setSpaceId] = useState(navigation.selectedSpaceId);
-
-  useEffect(() => {
-    const onSpaceSelected = (roomId) => {
-      setSpaceId(roomId);
-    };
-    navigation.on(cons.events.navigation.SPACE_SELECTED, onSpaceSelected);
-    return () => {
-      navigation.removeListener(cons.events.navigation.SPACE_SELECTED, onSpaceSelected);
-    };
-  }, []);
-
-  return [spaceId];
-}
--- a/src/app/hooks/useSelectedTab.js
+++ b/src/app/hooks/useSelectedTab.js
@@ -1,21 +0,0 @@
-/* eslint-disable import/prefer-default-export */
-import { useState, useEffect } from 'react';
-
-import cons from '../../client/state/cons';
-import navigation from '../../client/state/navigation';
-
-export function useSelectedTab() {
-  const [selectedTab, setSelectedTab] = useState(navigation.selectedTab);
-
-  useEffect(() => {
-    const onTabSelected = (tabId) => {
-      setSelectedTab(tabId);
-    };
-    navigation.on(cons.events.navigation.TAB_SELECTED, onTabSelected);
-    return () => {
-      navigation.removeListener(cons.events.navigation.TAB_SELECTED, onTabSelected);
-    };
-  }, []);
-
-  return [selectedTab];
-}
--- a/src/app/hooks/useSpaceShortcut.js
+++ b/src/app/hooks/useSpaceShortcut.js
@@ -1,22 +0,0 @@
-/* eslint-disable import/prefer-default-export */
-import { useState, useEffect } from 'react';
-
-import initMatrix from '../../client/initMatrix';
-import cons from '../../client/state/cons';
-
-export function useSpaceShortcut() {
-  const { roomList } = initMatrix;
-  const [spaceShortcut, setSpaceShortcut] = useState([...roomList.spaceShortcut]);
-
-  useEffect(() => {
-    const onSpaceShortcutUpdated = () => {
-      setSpaceShortcut([...roomList.spaceShortcut]);
-    };
-    roomList.on(cons.events.roomList.SPACE_SHORTCUT_UPDATED, onSpaceShortcutUpdated);
-    return () => {
-      roomList.removeListener(cons.events.roomList.SPACE_SHORTCUT_UPDATED, onSpaceShortcutUpdated);
-    };
-  }, []);
-
-  return [spaceShortcut];
-}
--- a/src/app/hooks/useStore.js
+++ b/src/app/hooks/useStore.js
@@ -1,22 +0,0 @@
-/* eslint-disable import/prefer-default-export */
-import { useEffect, useRef } from 'react';
-
-export function useStore(...args) {
-  const itemRef = useRef(null);
-
-  const getItem = () => itemRef.current;
-
-  const setItem = (event) => {
-    itemRef.current = event;
-    return itemRef.current;
-  };
-
-  useEffect(() => {
-    itemRef.current = null;
-    return () => {
-      itemRef.current = null;
-    };
-  }, args);
-
-  return { getItem, setItem };
-}
--- a/src/app/molecules/dialog/Dialog.jsx
+++ b/src/app/molecules/dialog/Dialog.jsx
@@ -2,32 +2,27 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import './Dialog.scss';

-import { twemojify } from '../../../util/twemojify';
-
 import Text from '../../atoms/text/Text';
 import Header, { TitleWrapper } from '../../atoms/header/Header';
 import ScrollView from '../../atoms/scroll/ScrollView';
 import RawModal from '../../atoms/modal/RawModal';

 function Dialog({
-  className, isOpen, title, onAfterOpen, onAfterClose,
-  contentOptions, onRequestClose, closeFromOutside, children,
+  className, isOpen, title,
+  contentOptions, onRequestClose, children,
 }) {
  return (
    <RawModal
      className={`${className === null ? '' : `${className} `}dialog-model`}
      isOpen={isOpen}
-      onAfterOpen={onAfterOpen}
-      onAfterClose={onAfterClose}
      onRequestClose={onRequestClose}
-      closeFromOutside={closeFromOutside}
      size="small"
    >
      <div className="dialog">
        <div className="dialog__content">
          <Header>
            <TitleWrapper>
-              <Text variant="h2" weight="medium" primary>{twemojify(title)}</Text>
+              <Text variant="h2">{title}</Text>
            </TitleWrapper>
            {contentOptions}
          </Header>
@@ -47,10 +42,7 @@ function Dialog({
 Dialog.defaultProps = {
  className: null,
  contentOptions: null,
-  onAfterOpen: null,
-  onAfterClose: null,
  onRequestClose: null,
-  closeFromOutside: true,
 };

 Dialog.propTypes = {
@@ -58,10 +50,7 @@ Dialog.propTypes = {
  isOpen: PropTypes.bool.isRequired,
  title: PropTypes.string.isRequired,
  contentOptions: PropTypes.node,
-  onAfterOpen: PropTypes.func,
-  onAfterClose: PropTypes.func,
  onRequestClose: PropTypes.func,
-  closeFromOutside: PropTypes.bool,
  children: PropTypes.node.isRequired,
 };

--- a/src/app/molecules/following-members/FollowingMembers.jsx
+++ b/src/app/molecules/following-members/FollowingMembers.jsx
@@ -1,59 +0,0 @@
-/* eslint-disable react/prop-types */
-import React, { useState, useEffect } from 'react';
-import PropTypes from 'prop-types';
-import './FollowingMembers.scss';
-
-import initMatrix from '../../../client/initMatrix';
-import cons from '../../../client/state/cons';
-import { openReadReceipts } from '../../../client/action/navigation';
-
-import Text from '../../atoms/text/Text';
-import RawIcon from '../../atoms/system-icons/RawIcon';
-import TickMarkIC from '../../../../public/res/ic/outlined/tick-mark.svg';
-
-import { getUsersActionJsx } from '../../organisms/room/common';
-
-function FollowingMembers({ roomTimeline }) {
-  const [followingMembers, setFollowingMembers] = useState([]);
-  const { roomId } = roomTimeline;
-  const mx = initMatrix.matrixClient;
-  const { roomsInput } = initMatrix;
-  const myUserId = mx.getUserId();
-
-  const handleOnMessageSent = () => setFollowingMembers([]);
-
-  useEffect(() => {
-    const updateFollowingMembers = () => {
-      setFollowingMembers(roomTimeline.getLiveReaders());
-    };
-    updateFollowingMembers();
-    roomTimeline.on(cons.events.roomTimeline.LIVE_RECEIPT, updateFollowingMembers);
-    roomsInput.on(cons.events.roomsInput.MESSAGE_SENT, handleOnMessageSent);
-    return () => {
-      roomTimeline.removeListener(cons.events.roomTimeline.LIVE_RECEIPT, updateFollowingMembers);
-      roomsInput.removeListener(cons.events.roomsInput.MESSAGE_SENT, handleOnMessageSent);
-    };
-  }, [roomTimeline]);
-
-  const filteredM = followingMembers.filter((userId) => userId !== myUserId);
-
-  return filteredM.length !== 0 && (
-    <button
-      className="following-members"
-      onClick={() => openReadReceipts(roomId, followingMembers)}
-      type="button"
-    >
-      <RawIcon
-        size="extra-small"
-        src={TickMarkIC}
-      />
-      <Text variant="b2">{getUsersActionJsx(roomId, filteredM, 'following the conversation.')}</Text>
-    </button>
-  );
-}
-
-FollowingMembers.propTypes = {
-  roomTimeline: PropTypes.shape({}).isRequired,
-};
-
-export default FollowingMembers;
--- a/src/app/molecules/following-members/FollowingMembers.scss
+++ b/src/app/molecules/following-members/FollowingMembers.scss
@@ -1,31 +0,0 @@
-@use '../../partials/text';
-
-.following-members {
-  width: 100%;
-  padding: 0 var(--sp-normal);
-  display: flex;
-  justify-content: flex-end;
-  align-items: center;
-  cursor: pointer;
-  
-  & .ic-raw {
-    min-width: var(--ic-extra-small);
-    opacity: 0.4;
-    margin: 0 var(--sp-extra-tight);
-  }
-  & .text {
-    @extend .cp-txt__ellipsis;
-    color: var(--tc-surface-low);
-    b {
-      color: var(--tc-surface-normal);
-    }
-  }
-
-  &:hover,
-  &:focus {
-    background-color: var(--bg-surface-hover);
-  }
-  &:active {
-    background-color: var(--bg-surface-active);
-  }
-}
--- a/src/app/molecules/image-upload/ImageUpload.jsx
+++ b/src/app/molecules/image-upload/ImageUpload.jsx
@@ -48,12 +48,12 @@ function ImageUpload({
      >
        <Avatar
          imageSrc={imageSrc}
-          text={text}
+          text={text.slice(0, 1)}
          bgColor={bgColor}
          size="large"
        />
        <div className={`img-upload__process ${uploadPromise === null ? ' img-upload__process--stopped' : ''}`}>
-          {uploadPromise === null && <Text variant="b3" weight="bold">Upload</Text>}
+          {uploadPromise === null && <Text variant="b3">Upload</Text>}
          {uploadPromise !== null && <Spinner size="small" />}
        </div>
      </button>
--- a/src/app/molecules/image-upload/ImageUpload.scss
+++ b/src/app/molecules/image-upload/ImageUpload.scss
@@ -24,6 +24,7 @@
 		z-index: 1;
 		& .text {
 			text-transform: uppercase;
+			font-weight: 600;
 			color: white;
 		}
 		&--stopped {
--- a/src/app/molecules/import-e2e-room-keys/ImportE2ERoomKeys.jsx
+++ b/src/app/molecules/import-e2e-room-keys/ImportE2ERoomKeys.jsx
@@ -0,0 +1,108 @@
+import React, { useState, useEffect, useRef } from 'react';
+import './ImportE2ERoomKeys.scss';
+import EventEmitter from 'events';
+
+import initMatrix from '../../../client/initMatrix';
+import decryptMegolmKeyFile from '../../../util/decryptE2ERoomKeys';
+
+import Text from '../../atoms/text/Text';
+import IconButton from '../../atoms/button/IconButton';
+import Button from '../../atoms/button/Button';
+import Input from '../../atoms/input/Input';
+import Spinner from '../../atoms/spinner/Spinner';
+
+import CirclePlusIC from '../../../../public/res/ic/outlined/circle-plus.svg';
+
+const viewEvent = new EventEmitter();
+
+async function tryDecrypt(file, password) {
+  try {
+    const arrayBuffer = await file.arrayBuffer();
+    viewEvent.emit('importing', true);
+    viewEvent.emit('status', 'Decrypting file...');
+    const keys = await decryptMegolmKeyFile(arrayBuffer, password);
+
+    viewEvent.emit('status', 'Decrypting messages...');
+    await initMatrix.matrixClient.importRoomKeys(JSON.parse(keys));
+
+    viewEvent.emit('status', null);
+    viewEvent.emit('importing', false);
+  } catch (e) {
+    viewEvent.emit('status', e.friendlyText || 'Something went wrong!');
+    viewEvent.emit('importing', false);
+  }
+}
+
+function ImportE2ERoomKeys() {
+  const [keyFile, setKeyFile] = useState(null);
+  const [status, setStatus] = useState(null);
+  const [isImporting, setIsImporting] = useState(false);
+  const inputRef = useRef(null);
+  const passwordRef = useRef(null);
+
+  useEffect(() => {
+    const handleIsImporting = (isImp) => setIsImporting(isImp);
+    const handleStatus = (msg) => setStatus(msg);
+    viewEvent.on('importing', handleIsImporting);
+    viewEvent.on('status', handleStatus);
+
+    return () => {
+      viewEvent.removeListener('importing', handleIsImporting);
+      viewEvent.removeListener('status', handleStatus);
+    };
+  }, []);
+
+  function importE2ERoomKeys() {
+    const password = passwordRef.current.value;
+    if (password === '' || keyFile === null) return;
+    if (isImporting) return;
+
+    tryDecrypt(keyFile, password);
+  }
+
+  function handleFileChange(e) {
+    const file = e.target.files.item(0);
+    passwordRef.current.value = '';
+    setKeyFile(file);
+    setStatus(null);
+  }
+  function removeImportKeysFile() {
+    inputRef.current.value = null;
+    passwordRef.current.value = null;
+    setKeyFile(null);
+    setStatus(null);
+  }
+
+  useEffect(() => {
+    if (!isImporting && status === null) {
+      removeImportKeysFile();
+    }
+  }, [isImporting, status]);
+
+  return (
+    <div className="import-e2e-room-keys">
+      <input ref={inputRef} onChange={handleFileChange} style={{ display: 'none' }} type="file" />
+
+      <form className="import-e2e-room-keys__form" onSubmit={(e) => { e.preventDefault(); importE2ERoomKeys(); }}>
+        { keyFile !== null && (
+          <div className="import-e2e-room-keys__file">
+            <IconButton onClick={removeImportKeysFile} src={CirclePlusIC} tooltip="Remove file" />
+            <Text>{keyFile.name}</Text>
+          </div>
+        )}
+        {keyFile === null && <Button onClick={() => inputRef.current.click()}>Import keys</Button>}
+        <Input forwardRef={passwordRef} type="password" placeholder="Password" required />
+        <Button disabled={isImporting} variant="primary" type="submit">Decrypt</Button>
+      </form>
+      { isImporting && status !== null && (
+        <div className="import-e2e-room-keys__process">
+          <Spinner size="small" />
+          <Text variant="b2">{status}</Text>
+        </div>
+      )}
+      {!isImporting && status !== null && <Text className="import-e2e-room-keys__error" variant="b2">{status}</Text>}
+    </div>
+  );
+}
+
+export default ImportE2ERoomKeys;
--- a/src/app/molecules/import-export-e2e-room-keys/ImportE2ERoomKeys.scss
+++ b/src/app/molecules/import-export-e2e-room-keys/ImportE2ERoomKeys.scss
@@ -1,5 +1,3 @@
-@use '../../partials/text';
-@use '../../partials/dir';

 .import-e2e-room-keys {
  &__file {
@@ -24,9 +22,17 @@
    }
    
    & .text {
-      @extend .cp-txt__ellipsis;
-      @include dir.side(margin, var(--sp-tight), var(--sp-loose));
+      margin-left: var(--sp-tight);
+      margin-right: var(--sp-loose);
      max-width: 86px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+
+      [dir=rtl] {
+        margin-right: var(--sp-tight);
+        margin-left: var(--sp-loose);
+      }
    }
  }

@@ -52,10 +58,6 @@
  }
  &__error {
    margin-top: var(--sp-tight);
-    color: var(--tc-danger-high);
-  }
-  &__success {
-    margin-top: var(--sp-tight);
-    color: var(--tc-positive-high);
+    color: var(--bg-danger);
  }
 }
--- a/src/app/molecules/import-export-e2e-room-keys/ExportE2ERoomKeys.jsx
+++ b/src/app/molecules/import-export-e2e-room-keys/ExportE2ERoomKeys.jsx
@@ -1,100 +0,0 @@
-import React, { useState, useEffect, useRef } from 'react';
-import './ExportE2ERoomKeys.scss';
-
-import FileSaver from 'file-saver';
-
-import initMatrix from '../../../client/initMatrix';
-import cons from '../../../client/state/cons';
-import { encryptMegolmKeyFile } from '../../../util/cryptE2ERoomKeys';
-
-import Text from '../../atoms/text/Text';
-import Button from '../../atoms/button/Button';
-import Input from '../../atoms/input/Input';
-import Spinner from '../../atoms/spinner/Spinner';
-
-import { useStore } from '../../hooks/useStore';
-
-function ExportE2ERoomKeys() {
-  const isMountStore = useStore();
-  const [status, setStatus] = useState({
-    isOngoing: false,
-    msg: null,
-    type: cons.status.PRE_FLIGHT,
-  });
-  const passwordRef = useRef(null);
-  const confirmPasswordRef = useRef(null);
-
-  const exportE2ERoomKeys = async () => {
-    const password = passwordRef.current.value;
-    if (password !== confirmPasswordRef.current.value) {
-      setStatus({
-        isOngoing: false,
-        msg: 'Password does not match.',
-        type: cons.status.ERROR,
-      });
-      return;
-    }
-    setStatus({
-      isOngoing: true,
-      msg: 'Getting keys...',
-      type: cons.status.IN_FLIGHT,
-    });
-    try {
-      const keys = await initMatrix.matrixClient.exportRoomKeys();
-      if (isMountStore.getItem()) {
-        setStatus({
-          isOngoing: true,
-          msg: 'Encrypting keys...',
-          type: cons.status.IN_FLIGHT,
-        });
-      }
-      const encKeys = await encryptMegolmKeyFile(JSON.stringify(keys), password);
-      const blob = new Blob([encKeys], {
-        type: 'text/plain;charset=us-ascii',
-      });
-      FileSaver.saveAs(blob, 'cinny-keys.txt');
-      if (isMountStore.getItem()) {
-        setStatus({
-          isOngoing: false,
-          msg: 'Successfully exported all keys.',
-          type: cons.status.SUCCESS,
-        });
-      }
-    } catch (e) {
-      if (isMountStore.getItem()) {
-        setStatus({
-          isOngoing: false,
-          msg: e.friendlyText || 'Failed to export keys. Please try again.',
-          type: cons.status.ERROR,
-        });
-      }
-    }
-  };
-
-  useEffect(() => {
-    isMountStore.setItem(true);
-    return () => {
-      isMountStore.setItem(false);
-    };
-  }, []);
-
-  return (
-    <div className="export-e2e-room-keys">
-      <form className="export-e2e-room-keys__form" onSubmit={(e) => { e.preventDefault(); exportE2ERoomKeys(); }}>
-        <Input forwardRef={passwordRef} type="password" placeholder="Password" required />
-        <Input forwardRef={confirmPasswordRef} type="password" placeholder="Confirm password" required />
-        <Button disabled={status.isOngoing} variant="primary" type="submit">Export</Button>
-      </form>
-      { status.type === cons.status.IN_FLIGHT && (
-        <div className="import-e2e-room-keys__process">
-          <Spinner size="small" />
-          <Text variant="b2">{status.msg}</Text>
-        </div>
-      )}
-      {status.type === cons.status.SUCCESS && <Text className="import-e2e-room-keys__success" variant="b2">{status.msg}</Text>}
-      {status.type === cons.status.ERROR && <Text className="import-e2e-room-keys__error" variant="b2">{status.msg}</Text>}
-    </div>
-  );
-}
-
-export default ExportE2ERoomKeys;
--- a/src/app/molecules/import-export-e2e-room-keys/ExportE2ERoomKeys.scss
+++ b/src/app/molecules/import-export-e2e-room-keys/ExportE2ERoomKeys.scss
@@ -1,28 +0,0 @@
-.export-e2e-room-keys {
-  margin-top: var(--sp-extra-tight);
-  &__form {
-    display: flex;
-    & > .input-container {
-      flex: 1;
-      min-width: 0;
-    }
-    & > *:nth-child(2) {
-      margin: 0 var(--sp-tight);
-    }
-  }
-
-  &__process {
-    margin-top: var(--sp-tight);
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    & .text {
-      margin: 0 var(--sp-tight);
-    }
-  }
-  &__error {
-    margin-top: var(--sp-tight);
-    color: var(--tc-danger-high);
-  }
-
-}
--- a/src/app/molecules/import-export-e2e-room-keys/ImportE2ERoomKeys.jsx
+++ b/src/app/molecules/import-export-e2e-room-keys/ImportE2ERoomKeys.jsx
@@ -1,133 +0,0 @@
-import React, { useState, useEffect, useRef } from 'react';
-import './ImportE2ERoomKeys.scss';
-
-import initMatrix from '../../../client/initMatrix';
-import cons from '../../../client/state/cons';
-import { decryptMegolmKeyFile } from '../../../util/cryptE2ERoomKeys';
-
-import Text from '../../atoms/text/Text';
-import IconButton from '../../atoms/button/IconButton';
-import Button from '../../atoms/button/Button';
-import Input from '../../atoms/input/Input';
-import Spinner from '../../atoms/spinner/Spinner';
-
-import CirclePlusIC from '../../../../public/res/ic/outlined/circle-plus.svg';
-
-import { useStore } from '../../hooks/useStore';
-
-function ImportE2ERoomKeys() {
-  const isMountStore = useStore();
-  const [keyFile, setKeyFile] = useState(null);
-  const [status, setStatus] = useState({
-    isOngoing: false,
-    msg: null,
-    type: cons.status.PRE_FLIGHT,
-  });
-  const inputRef = useRef(null);
-  const passwordRef = useRef(null);
-
-  async function tryDecrypt(file, password) {
-    try {
-      const arrayBuffer = await file.arrayBuffer();
-      if (isMountStore.getItem()) {
-        setStatus({
-          isOngoing: true,
-          msg: 'Decrypting file...',
-          type: cons.status.IN_FLIGHT,
-        });
-      }
-
-      const keys = await decryptMegolmKeyFile(arrayBuffer, password);
-      if (isMountStore.getItem()) {
-        setStatus({
-          isOngoing: true,
-          msg: 'Decrypting messages...',
-          type: cons.status.IN_FLIGHT,
-        });
-      }
-      await initMatrix.matrixClient.importRoomKeys(JSON.parse(keys));
-      if (isMountStore.getItem()) {
-        setStatus({
-          isOngoing: false,
-          msg: 'Successfully imported all keys.',
-          type: cons.status.SUCCESS,
-        });
-        inputRef.current.value = null;
-        passwordRef.current.value = null;
-      }
-    } catch (e) {
-      if (isMountStore.getItem()) {
-        setStatus({
-          isOngoing: false,
-          msg: e.friendlyText || 'Failed to decrypt keys. Please try again.',
-          type: cons.status.ERROR,
-        });
-      }
-    }
-  }
-
-  const importE2ERoomKeys = () => {
-    const password = passwordRef.current.value;
-    if (password === '' || keyFile === null) return;
-    if (status.isOngoing) return;
-
-    tryDecrypt(keyFile, password);
-  };
-
-  const handleFileChange = (e) => {
-    const file = e.target.files.item(0);
-    passwordRef.current.value = '';
-    setKeyFile(file);
-    setStatus({
-      isOngoing: false,
-      msg: null,
-      type: cons.status.PRE_FLIGHT,
-    });
-  };
-  const removeImportKeysFile = () => {
-    if (status.isOngoing) return;
-    inputRef.current.value = null;
-    passwordRef.current.value = null;
-    setKeyFile(null);
-    setStatus({
-      isOngoing: false,
-      msg: null,
-      type: cons.status.PRE_FLIGHT,
-    });
-  };
-
-  useEffect(() => {
-    isMountStore.setItem(true);
-    return () => {
-      isMountStore.setItem(false);
-    };
-  }, []);
-
-  return (
-    <div className="import-e2e-room-keys">
-      <input ref={inputRef} onChange={handleFileChange} style={{ display: 'none' }} type="file" />
-
-      <form className="import-e2e-room-keys__form" onSubmit={(e) => { e.preventDefault(); importE2ERoomKeys(); }}>
-        { keyFile !== null && (
-          <div className="import-e2e-room-keys__file">
-            <IconButton onClick={removeImportKeysFile} src={CirclePlusIC} tooltip="Remove file" />
-            <Text>{keyFile.name}</Text>
-          </div>
-        )}
-        {keyFile === null && <Button onClick={() => inputRef.current.click()}>Import keys</Button>}
-        <Input forwardRef={passwordRef} type="password" placeholder="Password" required />
-        <Button disabled={status.isOngoing} variant="primary" type="submit">Decrypt</Button>
-      </form>
-      { status.type === cons.status.IN_FLIGHT && (
-        <div className="import-e2e-room-keys__process">
-          <Spinner size="small" />
-          <Text variant="b2">{status.msg}</Text>
-        </div>
-      )}
-      {status.type === cons.status.SUCCESS && <Text className="import-e2e-room-keys__success" variant="b2">{status.msg}</Text>}
-      {status.type === cons.status.ERROR && <Text className="import-e2e-room-keys__error" variant="b2">{status.msg}</Text>}
-    </div>
-  );
-}
-
-export default ImportE2ERoomKeys;
--- a/src/app/molecules/media/Media.scss
+++ b/src/app/molecules/media/Media.scss
@@ -1,5 +1,3 @@
-@use '../../partials/text';
-
 .file-header {
  display: flex;
  align-items: center;
@@ -7,13 +5,11 @@
  min-height: 42px;

  & .file-name {
-    @extend .cp-txt__ellipsis;
    flex: 1;
    color: var(--tc-surface-low);
-  }
-
-  & a {
-    line-height: 0;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
  }
 }

--- a/src/app/molecules/message/Message.jsx
+++ b/src/app/molecules/message/Message.jsx
@@ -1,37 +1,51 @@
-/* eslint-disable react/prop-types */
-import React, { useState, useEffect, useCallback, useRef } from 'react';
+import React, { useRef } from 'react';
 import PropTypes from 'prop-types';
 import './Message.scss';

-import { getShortcodeToCustomEmoji } from '../../organisms/emoji-board/custom-emoji';
-import { twemojify } from '../../../util/twemojify';
-
-import initMatrix from '../../../client/initMatrix';
-import { getUsername, getUsernameOfRoomMember, parseReply } from '../../../util/matrixUtil';
-import colorMXID from '../../../util/colorMXID';
-import { getEventCords } from '../../../util/common';
-import { redactEvent, sendReaction } from '../../../client/action/roomTimeline';
-import {
-  openEmojiBoard, openProfileViewer, openReadReceipts, replyTo,
-} from '../../../client/action/navigation';
-import { sanitizeCustomHtml } from '../../../util/sanitize';
+import Linkify from 'linkifyjs/react';
+import ReactMarkdown from 'react-markdown';
+import gfm from 'remark-gfm';
+import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter';
+import { coy } from 'react-syntax-highlighter/dist/esm/styles/prism';
+import parse from 'html-react-parser';
+import twemoji from 'twemoji';
+import { getUsername } from '../../../util/matrixUtil';

 import Text from '../../atoms/text/Text';
 import RawIcon from '../../atoms/system-icons/RawIcon';
 import Button from '../../atoms/button/Button';
 import Tooltip from '../../atoms/tooltip/Tooltip';
 import Input from '../../atoms/input/Input';
-import Avatar from '../../atoms/avatar/Avatar';
-import IconButton from '../../atoms/button/IconButton';
-import ContextMenu, { MenuHeader, MenuItem, MenuBorder } from '../../atoms/context-menu/ContextMenu';
-import * as Media from '../media/Media';

 import ReplyArrowIC from '../../../../public/res/ic/outlined/reply-arrow.svg';
-import EmojiAddIC from '../../../../public/res/ic/outlined/emoji-add.svg';
-import VerticalMenuIC from '../../../../public/res/ic/outlined/vertical-menu.svg';
-import PencilIC from '../../../../public/res/ic/outlined/pencil.svg';
-import TickMarkIC from '../../../../public/res/ic/outlined/tick-mark.svg';
-import BinIC from '../../../../public/res/ic/outlined/bin.svg';
+
+const components = {
+  code({
+    // eslint-disable-next-line react/prop-types
+    inline, className, children,
+  }) {
+    const match = /language-(\w+)/.exec(className || '');
+    return !inline && match ? (
+      <SyntaxHighlighter
+        style={coy}
+        language={match[1]}
+        PreTag="div"
+        showLineNumbers
+      >
+        {String(children).replace(/\n$/, '')}
+      </SyntaxHighlighter>
+    ) : (
+      <code className={className}>{String(children)}</code>
+    );
+  },
+};
+
+function linkifyContent(content) {
+  return <Linkify options={{ target: { url: '_blank' } }}>{content}</Linkify>;
+}
+function genMarkdown(content) {
+  return <ReactMarkdown remarkPlugins={[gfm]} components={components} linkTarget="_blank">{content}</ReactMarkdown>;
+}

 function PlaceholderMessage() {
  return (
@@ -41,7 +55,7 @@ function PlaceholderMessage() {
      </div>
      <div className="ph-msg__main-container">
        <div className="ph-msg__header" />
-        <div className="ph-msg__body">
+        <div className="ph-msg__content">
          <div />
          <div />
          <div />
@@ -52,49 +66,35 @@ function PlaceholderMessage() {
  );
 }

-const MessageAvatar = React.memo(({
-  roomId, avatarSrc, userId, username,
-}) => (
-  <div className="message__avatar-container">
-    <button type="button" onClick={() => openProfileViewer(userId, roomId)}>
-      <Avatar imageSrc={avatarSrc} text={username} bgColor={colorMXID(userId)} size="small" />
-    </button>
-  </div>
-));
-
-const MessageHeader = React.memo(({
-  userId, username, time,
-}) => (
-  <div className="message__header">
-    <Text
-      style={{ color: colorMXID(userId) }}
-      className="message__profile"
-      variant="b1"
-      weight="medium"
-      span
-    >
-      <span>{twemojify(username)}</span>
-      <span>{twemojify(userId)}</span>
-    </Text>
-    <div className="message__time">
-      <Text variant="b3">{time}</Text>
+function MessageHeader({
+  userId, name, color, time,
+}) {
+  return (
+    <div className="message__header">
+      <div style={{ color }} className="message__profile">
+        <Text variant="b1">{name}</Text>
+        <Text variant="b1">{userId}</Text>
+      </div>
+      <div className="message__time">
+        <Text variant="b3">{time}</Text>
+      </div>
    </div>
-  </div>
-));
+  );
+}
 MessageHeader.propTypes = {
  userId: PropTypes.string.isRequired,
-  username: PropTypes.string.isRequired,
+  name: PropTypes.string.isRequired,
+  color: PropTypes.string.isRequired,
  time: PropTypes.string.isRequired,
 };

-function MessageReply({ name, color, body }) {
+function MessageReply({ name, color, content }) {
  return (
    <div className="message__reply">
      <Text variant="b2">
        <RawIcon color={color} size="extra-small" src={ReplyArrowIC} />
-        <span style={{ color }}>{twemojify(name)}</span>
-        {' '}
-        {twemojify(body)}
+        <span style={{ color }}>{name}</span>
+        <>{` ${content}`}</>
      </Text>
    </div>
  );
@@ -103,151 +103,45 @@ function MessageReply({ name, color, body }) {
 MessageReply.propTypes = {
  name: PropTypes.string.isRequired,
  color: PropTypes.string.isRequired,
-  body: PropTypes.string.isRequired,
+  content: PropTypes.string.isRequired,
 };

-const MessageReplyWrapper = React.memo(({ roomTimeline, eventId }) => {
-  const [reply, setReply] = useState(null);
-  const isMountedRef = useRef(true);
-
-  useEffect(() => {
-    const mx = initMatrix.matrixClient;
-    const timelineSet = roomTimeline.getUnfilteredTimelineSet();
-    const loadReply = async () => {
-      const eTimeline = await mx.getEventTimeline(timelineSet, eventId);
-      await roomTimeline.decryptAllEventsOfTimeline(eTimeline);
-
-      const mEvent = eTimeline.getTimelineSet().findEventById(eventId);
-
-      const rawBody = mEvent.getContent().body;
-      const username = getUsernameOfRoomMember(mEvent.sender);
-
-      if (isMountedRef.current === false) return;
-      const fallbackBody = mEvent.isRedacted() ? '*** This message has been deleted ***' : '*** Unable to load reply content ***';
-      setReply({
-        to: username,
-        color: colorMXID(mEvent.getSender()),
-        body: parseReply(rawBody)?.body ?? rawBody ?? fallbackBody,
-        event: mEvent,
-      });
-    };
-    loadReply();
-
-    return () => {
-      isMountedRef.current = false;
-    };
-  }, []);
-
-  const focusReply = () => {
-    if (reply?.event.isRedacted()) return;
-    roomTimeline.loadEventTimeline(eventId);
-  };
-
+function MessageContent({ content, isMarkdown, isEdited }) {
  return (
-    <div
-      className="message__reply-wrapper"
-      onClick={focusReply}
-      onKeyDown={focusReply}
-      role="button"
-      tabIndex="0"
-    >
-      {reply !== null && <MessageReply name={reply.to} color={reply.color} body={reply.body} />}
-    </div>
-  );
-});
-MessageReplyWrapper.propTypes = {
-  roomTimeline: PropTypes.shape({}).isRequired,
-  eventId: PropTypes.string.isRequired,
-};
-
-const MessageBody = React.memo(({
-  senderName,
-  body,
-  isCustomHTML,
-  isEdited,
-  msgType,
-}) => {
-  // if body is not string it is a React element.
-  if (typeof body !== 'string') return <div className="message__body">{body}</div>;
-
-  let content = isCustomHTML
-    ? twemojify(sanitizeCustomHtml(body), undefined, true, false)
-    : twemojify(body, undefined, true);
-
-  // Determine if this message should render with large emojis
-  // Criteria:
-  // - Contains only emoji
-  // - Contains no more than 10 emoji
-  let emojiOnly = false;
-  if (content.type === 'img') {
-    // If this messages contains only a single (inline) image
-    emojiOnly = true;
-  } else if (content.constructor.name === 'Array') {
-    // Otherwise, it might be an array of images / texb
-
-    // Count the number of emojis
-    const nEmojis = content.filter((e) => e.type === 'img').length;
-
-    // Make sure there's no text besides whitespace
-    if (nEmojis <= 10 && content.every((element) => (
-      (typeof element === 'object' && element.type === 'img')
-      || (typeof element === 'string' && /^\s*$/g.test(element))
-    ))) {
-      emojiOnly = true;
-    }
-  }
-
-  if (!isCustomHTML) {
-    // If this is a plaintext message, wrap it in a <p> element (automatically applying
-    // white-space: pre-wrap) in order to preserve newlines
-    content = (<p>{content}</p>);
-  }
-
-  return (
-    <div className="message__body">
-      <div className={`text ${emojiOnly ? 'text-h1' : 'text-b1'}`}>
-        { msgType === 'm.emote' && (
-          <>
-            {'* '}
-            {twemojify(senderName)}
-            {' '}
-          </>
-        )}
-        { content }
+    <div className="message__content">
+      <div className="text text-b1">
+        { isMarkdown ? genMarkdown(content) : linkifyContent(content) }
      </div>
-      { isEdited && <Text className="message__body-edited" variant="b3">(edited)</Text>}
+      { isEdited && <Text className="message__content-edited" variant="b3">(edited)</Text>}
    </div>
  );
-});
-MessageBody.defaultProps = {
-  isCustomHTML: false,
+}
+MessageContent.defaultProps = {
+  isMarkdown: false,
  isEdited: false,
-  msgType: null,
 };
-MessageBody.propTypes = {
-  senderName: PropTypes.string.isRequired,
-  body: PropTypes.node.isRequired,
-  isCustomHTML: PropTypes.bool,
+MessageContent.propTypes = {
+  content: PropTypes.node.isRequired,
+  isMarkdown: PropTypes.bool,
  isEdited: PropTypes.bool,
-  msgType: PropTypes.string,
 };

-function MessageEdit({ body, onSave, onCancel }) {
+function MessageEdit({ content, onSave, onCancel }) {
  const editInputRef = useRef(null);

-  const handleKeyDown = (e) => {
+  function handleKeyDown(e) {
    if (e.keyCode === 13 && e.shiftKey === false) {
      e.preventDefault();
      onSave(editInputRef.current.value);
    }
-  };
+  }

  return (
    <form className="message__edit" onSubmit={(e) => { e.preventDefault(); onSave(editInputRef.current.value); }}>
      <Input
        forwardRef={editInputRef}
        onKeyDown={handleKeyDown}
-        value={body}
+        value={content}
        placeholder="Edit message"
        required
        resizable
@@ -260,471 +154,125 @@ function MessageEdit({ body, onSave, onCancel }) {
  );
 }
 MessageEdit.propTypes = {
-  body: PropTypes.string.isRequired,
+  content: PropTypes.string.isRequired,
  onSave: PropTypes.func.isRequired,
  onCancel: PropTypes.func.isRequired,
 };

-function getMyEmojiEvent(emojiKey, eventId, roomTimeline) {
-  const mx = initMatrix.matrixClient;
-  const rEvents = roomTimeline.reactionTimeline.get(eventId);
-  let rEvent = null;
-  rEvents?.find((rE) => {
-    if (rE.getRelation() === null) return false;
-    if (rE.getRelation().key === emojiKey && rE.getSender() === mx.getUserId()) {
-      rEvent = rE;
-      return true;
-    }
-    return false;
-  });
-  return rEvent;
-}
-
-function toggleEmoji(roomId, eventId, emojiKey, roomTimeline) {
-  const myAlreadyReactEvent = getMyEmojiEvent(emojiKey, eventId, roomTimeline);
-  if (myAlreadyReactEvent) {
-    const rId = myAlreadyReactEvent.getId();
-    if (rId.startsWith('~')) return;
-    redactEvent(roomId, rId);
-    return;
-  }
-  sendReaction(roomId, eventId, emojiKey);
-}
-
-function pickEmoji(e, roomId, eventId, roomTimeline) {
-  openEmojiBoard(getEventCords(e), (emoji) => {
-    toggleEmoji(roomId, eventId, emoji.unicode, roomTimeline);
-    e.target.click();
-  });
+function MessageReactionGroup({ children }) {
+  return (
+    <div className="message__reactions text text-b3 noselect">
+      { children }
+    </div>
+  );
 }
+MessageReactionGroup.propTypes = {
+  children: PropTypes.node.isRequired,
+};

 function genReactionMsg(userIds, reaction) {
+  const genLessContText = (text) => <span style={{ opacity: '.6' }}>{text}</span>;
+  let msg = <></>;
+  userIds.forEach((userId, index) => {
+    if (index === 0) msg = <>{getUsername(userId)}</>;
+    // eslint-disable-next-line react/jsx-one-expression-per-line
+    else if (index === userIds.length - 1) msg = <>{msg}{genLessContText(' and ')}{getUsername(userId)}</>;
+    // eslint-disable-next-line react/jsx-one-expression-per-line
+    else msg = <>{msg}{genLessContText(', ')}{getUsername(userId)}</>;
+  });
  return (
    <>
-      {userIds.map((userId, index) => (
-        <React.Fragment key={userId}>
-          {twemojify(getUsername(userId))}
-          <span style={{ opacity: '.6' }}>
-            {index === userIds.length - 1 ? ' and ' : ', '}
-          </span>
-        </React.Fragment>
-      ))}
-      <span style={{ opacity: '.6' }}>{' reacted with '}</span>
-      {twemojify(reaction, { className: 'react-emoji' })}
+      {msg}
+      {genLessContText(' reacted with')}
+      {parse(twemoji.parse(reaction))}
    </>
  );
 }

 function MessageReaction({
-  shortcodeToEmoji, reaction, count, users, isActive, onClick,
+  reaction, users, isActive, onClick,
 }) {
-  const customEmojiMatch = reaction.match(/^:(\S+):$/);
-  let customEmojiUrl = null;
-  if (customEmojiMatch) {
-    const customEmoji = shortcodeToEmoji.get(customEmojiMatch[1]);
-    customEmojiUrl = initMatrix.matrixClient.mxcUrlToHttp(customEmoji?.mxc);
-  }
  return (
    <Tooltip
      className="msg__reaction-tooltip"
-      content={<Text variant="b2">{users.length > 0 ? genReactionMsg(users, reaction) : 'Unable to load who has reacted'}</Text>}
+      content={<Text variant="b2">{genReactionMsg(users, reaction)}</Text>}
    >
      <button
        onClick={onClick}
        type="button"
        className={`msg__reaction${isActive ? ' msg__reaction--active' : ''}`}
      >
-        {
-          customEmojiUrl
-            ? <img className="react-emoji" draggable="false" alt={reaction} src={customEmojiUrl} />
-            : twemojify(reaction, { className: 'react-emoji' })
-        }
-        <Text variant="b3" className="msg__reaction-count">{count}</Text>
+        { parse(twemoji.parse(reaction)) }
+        <Text variant="b3" className="msg__reaction-count">{users.length}</Text>
      </button>
    </Tooltip>
  );
 }
 MessageReaction.propTypes = {
-  shortcodeToEmoji: PropTypes.shape({}).isRequired,
  reaction: PropTypes.node.isRequired,
-  count: PropTypes.number.isRequired,
  users: PropTypes.arrayOf(PropTypes.string).isRequired,
  isActive: PropTypes.bool.isRequired,
  onClick: PropTypes.func.isRequired,
 };

-function MessageReactionGroup({ roomTimeline, mEvent }) {
-  const { roomId, room, reactionTimeline } = roomTimeline;
-  const eventId = mEvent.getId();
-  const mx = initMatrix.matrixClient;
-  const reactions = {};
-  const shortcodeToEmoji = getShortcodeToCustomEmoji(room);
-  const canSendReaction = room.currentState.maySendEvent('m.reaction', mx.getUserId());
-
-  const eventReactions = reactionTimeline.get(eventId);
-  const addReaction = (key, count, senderId, isActive) => {
-    let reaction = reactions[key];
-    if (reaction === undefined) {
-      reaction = {
-        count: 0,
-        users: [],
-        isActive: false,
-      };
-    }
-    if (count) {
-      reaction.count = count;
-    } else {
-      reaction.users.push(senderId);
-      reaction.count = reaction.users.length;
-      if (isActive) reaction.isActive = isActive;
-    }
-
-    reactions[key] = reaction;
-  };
-  if (eventReactions) {
-    eventReactions.forEach((rEvent) => {
-      if (rEvent.getRelation() === null) return;
-      const reaction = rEvent.getRelation();
-      const senderId = rEvent.getSender();
-      const isActive = senderId === mx.getUserId();
-
-      addReaction(reaction.key, undefined, senderId, isActive);
-    });
-  } else {
-    // Use aggregated reactions
-    const aggregatedReaction = mEvent.getServerAggregatedRelation('m.annotation')?.chunk;
-    if (!aggregatedReaction) return null;
-    aggregatedReaction.forEach((reaction) => {
-      if (reaction.type !== 'm.reaction') return;
-      addReaction(reaction.key, reaction.count, undefined, false);
-    });
-  }
-
-  return (
-    <div className="message__reactions text text-b3 noselect">
-      {
-        Object.keys(reactions).map((key) => (
-          <MessageReaction
-            key={key}
-            shortcodeToEmoji={shortcodeToEmoji}
-            reaction={key}
-            count={reactions[key].count}
-            users={reactions[key].users}
-            isActive={reactions[key].isActive}
-            onClick={() => {
-              toggleEmoji(roomId, eventId, key, roomTimeline);
-            }}
-          />
-        ))
-      }
-      {canSendReaction && (
-        <IconButton
-          onClick={(e) => {
-            pickEmoji(e, roomId, eventId, roomTimeline);
-          }}
-          src={EmojiAddIC}
-          size="extra-small"
-          tooltip="Add reaction"
-        />
-      )}
-    </div>
-  );
-}
-MessageReactionGroup.propTypes = {
-  roomTimeline: PropTypes.shape({}).isRequired,
-  mEvent: PropTypes.shape({}).isRequired,
-};
-
-function isMedia(mE) {
-  return (
-    mE.getContent()?.msgtype === 'm.file'
-    || mE.getContent()?.msgtype === 'm.image'
-    || mE.getContent()?.msgtype === 'm.audio'
-    || mE.getContent()?.msgtype === 'm.video'
-    || mE.getType() === 'm.sticker'
-  );
-}
-
-const MessageOptions = React.memo(({
-  roomTimeline, mEvent, edit, reply,
-}) => {
-  const { roomId, room } = roomTimeline;
-  const mx = initMatrix.matrixClient;
-  const eventId = mEvent.getId();
-  const senderId = mEvent.getSender();
-
-  const myPowerlevel = room.getMember(mx.getUserId())?.powerLevel;
-  const canIRedact = room.currentState.hasSufficientPowerLevelFor('redact', myPowerlevel);
-  const canSendReaction = room.currentState.maySendEvent('m.reaction', mx.getUserId());
-
+function MessageOptions({ children }) {
  return (
    <div className="message__options">
-      {canSendReaction && (
-        <IconButton
-          onClick={(e) => pickEmoji(e, roomId, eventId, roomTimeline)}
-          src={EmojiAddIC}
-          size="extra-small"
-          tooltip="Add reaction"
-        />
-      )}
-      <IconButton
-        onClick={() => reply()}
-        src={ReplyArrowIC}
-        size="extra-small"
-        tooltip="Reply"
-      />
-      {(senderId === mx.getUserId() && !isMedia(mEvent)) && (
-        <IconButton
-          onClick={() => edit(true)}
-          src={PencilIC}
-          size="extra-small"
-          tooltip="Edit"
-        />
-      )}
-      <ContextMenu
-        content={() => (
-          <>
-            <MenuHeader>Options</MenuHeader>
-            <MenuItem
-              iconSrc={TickMarkIC}
-              onClick={() => openReadReceipts(roomId, roomTimeline.getEventReaders(mEvent))}
-            >
-              Read receipts
-            </MenuItem>
-            {(canIRedact || senderId === mx.getUserId()) && (
-              <>
-                <MenuBorder />
-                <MenuItem
-                  variant="danger"
-                  iconSrc={BinIC}
-                  onClick={() => {
-                    if (window.confirm('Are you sure you want to delete this event')) {
-                      redactEvent(roomId, eventId);
-                    }
-                  }}
-                >
-                  Delete
-                </MenuItem>
-              </>
-            )}
-          </>
-        )}
-        render={(toggleMenu) => (
-          <IconButton
-            onClick={toggleMenu}
-            src={VerticalMenuIC}
-            size="extra-small"
-            tooltip="Options"
-          />
-        )}
-      />
+      {children}
    </div>
  );
-});
+}
 MessageOptions.propTypes = {
-  roomTimeline: PropTypes.shape({}).isRequired,
-  mEvent: PropTypes.shape({}).isRequired,
-  edit: PropTypes.func.isRequired,
-  reply: PropTypes.func.isRequired,
+  children: PropTypes.node.isRequired,
 };

-function genMediaContent(mE) {
-  const mx = initMatrix.matrixClient;
-  const mContent = mE.getContent();
-  if (!mContent || !mContent.body) return <span style={{ color: 'var(--bg-danger)' }}>Malformed event</span>;
-
-  let mediaMXC = mContent?.url;
-  const isEncryptedFile = typeof mediaMXC === 'undefined';
-  if (isEncryptedFile) mediaMXC = mContent?.file?.url;
-
-  let thumbnailMXC = mContent?.info?.thumbnail_url;
-
-  if (typeof mediaMXC === 'undefined' || mediaMXC === '') return <span style={{ color: 'var(--bg-danger)' }}>Malformed event</span>;
-
-  let msgType = mE.getContent()?.msgtype;
-  if (mE.getType() === 'm.sticker') msgType = 'm.image';
-
-  switch (msgType) {
-    case 'm.file':
-      return (
-        <Media.File
-          name={mContent.body}
-          link={mx.mxcUrlToHttp(mediaMXC)}
-          type={mContent.info?.mimetype}
-          file={mContent.file || null}
-        />
-      );
-    case 'm.image':
-      return (
-        <Media.Image
-          name={mContent.body}
-          width={typeof mContent.info?.w === 'number' ? mContent.info?.w : null}
-          height={typeof mContent.info?.h === 'number' ? mContent.info?.h : null}
-          link={mx.mxcUrlToHttp(mediaMXC)}
-          file={isEncryptedFile ? mContent.file : null}
-          type={mContent.info?.mimetype}
-        />
-      );
-    case 'm.audio':
-      return (
-        <Media.Audio
-          name={mContent.body}
-          link={mx.mxcUrlToHttp(mediaMXC)}
-          type={mContent.info?.mimetype}
-          file={mContent.file || null}
-        />
-      );
-    case 'm.video':
-      if (typeof thumbnailMXC === 'undefined') {
-        thumbnailMXC = mContent.info?.thumbnail_file?.url || null;
-      }
-      return (
-        <Media.Video
-          name={mContent.body}
-          link={mx.mxcUrlToHttp(mediaMXC)}
-          thumbnail={thumbnailMXC === null ? null : mx.mxcUrlToHttp(thumbnailMXC)}
-          thumbnailFile={isEncryptedFile ? mContent.info?.thumbnail_file : null}
-          thumbnailType={mContent.info?.thumbnail_info?.mimetype || null}
-          width={typeof mContent.info?.w === 'number' ? mContent.info?.w : null}
-          height={typeof mContent.info?.h === 'number' ? mContent.info?.h : null}
-          file={isEncryptedFile ? mContent.file : null}
-          type={mContent.info?.mimetype}
-        />
-      );
-    default:
-      return <span style={{ color: 'var(--bg-danger)' }}>Malformed event</span>;
-  }
-}
-
-function getEditedBody(editedMEvent) {
-  const newContent = editedMEvent.getContent()['m.new_content'];
-  if (typeof newContent === 'undefined') return [null, false, null];
-
-  const isCustomHTML = newContent.format === 'org.matrix.custom.html';
-  const parsedContent = parseReply(newContent.body);
-  if (parsedContent === null) {
-    return [newContent.body, isCustomHTML, newContent.formatted_body ?? null];
-  }
-  return [parsedContent.body, isCustomHTML, newContent.formatted_body ?? null];
-}
-
 function Message({
-  mEvent, isBodyOnly, roomTimeline, focus, time,
+  avatar, header, reply, content, editContent, reactions, options,
 }) {
-  const [isEditing, setIsEditing] = useState(false);
-  const roomId = mEvent.getRoomId();
-  const { editedTimeline, reactionTimeline } = roomTimeline ?? {};
-
-  const className = ['message', (isBodyOnly ? 'message--body-only' : 'message--full')];
-  if (focus) className.push('message--focus');
-  const content = mEvent.getContent();
-  const eventId = mEvent.getId();
-  const msgType = content?.msgtype;
-  const senderId = mEvent.getSender();
-  let { body } = content;
-  const username = mEvent.sender ? getUsernameOfRoomMember(mEvent.sender) : getUsername(senderId);
-  const avatarSrc = mEvent.sender?.getAvatarUrl(initMatrix.matrixClient.baseUrl, 36, 36, 'crop') ?? null;
-
-  const edit = useCallback(() => {
-    setIsEditing(true);
-  }, []);
-  const reply = useCallback(() => {
-    replyTo(senderId, eventId, body);
-  }, [body]);
-
-  if (body === undefined) return null;
-  if (msgType === 'm.emote') className.push('message--type-emote');
-
-  let isCustomHTML = content.format === 'org.matrix.custom.html';
-  const isEdited = roomTimeline ? editedTimeline.has(eventId) : false;
-  const haveReactions = roomTimeline
-    ? reactionTimeline.has(eventId) || !!mEvent.getServerAggregatedRelation('m.annotation')
-    : false;
-  const isReply = !!mEvent.replyEventId;
-  let customHTML = isCustomHTML ? content.formatted_body : null;
-
-  if (isEdited) {
-    const editedList = editedTimeline.get(eventId);
-    const editedMEvent = editedList[editedList.length - 1];
-    [body, isCustomHTML, customHTML] = getEditedBody(editedMEvent);
-    if (typeof body !== 'string') return null;
-  }
-
-  if (isReply) {
-    body = parseReply(body)?.body ?? body;
-  }
-
+  const msgClass = header === null ? ' message--content-only' : ' message--full';
  return (
-    <div className={className.join(' ')}>
-      {
-        isBodyOnly
-          ? <div className="message__avatar-container" />
-          : (
-            <MessageAvatar
-              roomId={roomId}
-              avatarSrc={avatarSrc}
-              userId={senderId}
-              username={username}
-            />
-          )
-      }
+    <div className={`message${msgClass}`}>
+      <div className="message__avatar-container">
+        {avatar !== null && avatar}
+      </div>
      <div className="message__main-container">
-        {!isBodyOnly && (
-          <MessageHeader userId={senderId} username={username} time={time} />
-        )}
-        {roomTimeline && isReply && (
-          <MessageReplyWrapper
-            roomTimeline={roomTimeline}
-            eventId={mEvent.replyEventId}
-          />
-        )}
-        {!isEditing && (
-          <MessageBody
-            senderName={username}
-            isCustomHTML={isCustomHTML}
-            body={isMedia(mEvent) ? genMediaContent(mEvent) : customHTML ?? body}
-            msgType={msgType}
-            isEdited={isEdited}
-          />
-        )}
-        {isEditing && (
-          <MessageEdit
-            body={body}
-            onSave={(newBody) => {
-              if (newBody !== body) {
-                initMatrix.roomsInput.sendEditedMessage(roomId, mEvent, newBody);
-              }
-              setIsEditing(false);
-            }}
-            onCancel={() => setIsEditing(false)}
-          />
-        )}
-        {haveReactions && (
-          <MessageReactionGroup roomTimeline={roomTimeline} mEvent={mEvent} />
-        )}
-        {roomTimeline && !isEditing && (
-          <MessageOptions
-            roomTimeline={roomTimeline}
-            mEvent={mEvent}
-            edit={edit}
-            reply={reply}
-          />
-        )}
+        {header !== null && header}
+        {reply !== null && reply}
+        {content !== null && content}
+        {editContent !== null && editContent}
+        {reactions !== null && reactions}
+        {options !== null && options}
      </div>
    </div>
  );
 }
 Message.defaultProps = {
-  isBodyOnly: false,
-  focus: false,
-  roomTimeline: null,
+  avatar: null,
+  header: null,
+  reply: null,
+  content: null,
+  editContent: null,
+  reactions: null,
+  options: null,
 };
 Message.propTypes = {
-  mEvent: PropTypes.shape({}).isRequired,
-  isBodyOnly: PropTypes.bool,
-  roomTimeline: PropTypes.shape({}),
-  focus: PropTypes.bool,
-  time: PropTypes.string.isRequired,
+  avatar: PropTypes.node,
+  header: PropTypes.node,
+  reply: PropTypes.node,
+  content: PropTypes.node,
+  editContent: PropTypes.node,
+  reactions: PropTypes.node,
+  options: PropTypes.node,
 };

-export { Message, MessageReply, PlaceholderMessage };
+export {
+  Message,
+  MessageHeader,
+  MessageReply,
+  MessageContent,
+  MessageEdit,
+  MessageReactionGroup,
+  MessageReaction,
+  MessageOptions,
+  PlaceholderMessage,
+};
--- a/src/app/molecules/message/Message.scss
+++ b/src/app/molecules/message/Message.scss
@@ -1,11 +1,9 @@
@use '../../atoms/scroll/scrollbar';
-@use '../../partials/text';
-@use '../../partials/dir';

 .message,
 .ph-msg {
-  padding: var(--sp-ultra-tight);
-  @include dir.side(padding, var(--sp-normal), var(--sp-extra-tight));
+  padding: var(--sp-ultra-tight) var(--sp-normal);
+  padding-right: var(--sp-extra-tight);
  display: flex;

  &:hover {
@@ -14,22 +12,27 @@
      display: flex;
    }
  }
+
+  [dir=rtl] & {
+    padding: {
+      left: var(--sp-extra-tight);
+      right: var(--sp-normal);
+    }
+  }
  
  &__avatar-container {
    padding-top: 6px;
-    @include dir.side(margin, 0, var(--sp-tight));
+  }
+  
+  &__avatar-container{
+    margin-right: var(--sp-tight);

-    & .avatar-container {
-      transition: transform 200ms var(--fluid-push);
-      &:hover {
-        transform: translateY(-4px);
+    [dir=rtl] & {
+      margin: {
+        left: var(--sp-tight);
+        right: 0;
      }
    }
-
-    & button {
-      cursor: pointer;
-      display: flex;
-    }
  }

  &__main-container {
@@ -42,7 +45,7 @@

 .message {
  &--full + &--full,
-  &--body-only + &--full,
+  &--content-only + &--full,
  & + .timeline-change,
  .timeline-change + & {
    margin-top: var(--sp-normal);
@@ -50,12 +53,6 @@
  &__avatar-container {
    width: var(--av-small);
  }
-  &--focus {
-    --ltr: inset 2px 0 0 var(--bg-caution);
-    --rtl: inset -2px 0 0 var(--bg-caution);
-    @include dir.prop(box-shadow, var(--ltr), var(--rtl));
-    background-color: var(--bg-caution-hover);
-  }
 }

 .ph-msg {
@@ -67,37 +64,40 @@
  }

  &__header,
-  &__body > div {
-    margin: var(--sp-ultra-tight);
-    @include dir.side(margin, 0, var(--sp-extra-tight));
+  &__content > div {
+    margin: var(--sp-ultra-tight) 0;
+    margin-right: var(--sp-extra-tight);
    height: var(--fs-b1);
    width: 100%;
    max-width: 100px;
    background-color: var(--bg-surface-hover);
    border-radius: calc(var(--bo-radius) / 2);
+
+    [dir=rtl] & {
+      margin: {
+        right: 0;
+        left: var(--sp-extra-tight);
+      }
+    }
  }
-  &__body {
+  &__content {
    display: flex;
    flex-wrap: wrap;
  }
-  &__body > div:nth-child(1n) {
+  &__content > div:nth-child(1n) {
    max-width: 10%;
  }
-  &__body > div:nth-child(2n) {
+  &__content > div:nth-child(2n) {
    max-width: 50%;
  }
 }

 .message__reply,
-.message__body,
-.message__body__wrapper,
+.message__content,
 .message__edit,
 .message__reactions {
-  max-width: calc(100% - 88px);
+  max-width: 640px;
  min-width: 0;
-  @media (max-width: 1124px) {
-    max-width: 100%;
-  }
 }


@@ -108,16 +108,24 @@
  & .message__profile {
    min-width: 0;
    color: var(--tc-surface-high);
-    @include dir.side(margin, 0, var(--sp-tight));
+    margin-right: var(--sp-tight);

-    & > span {
-      @extend .cp-txt__ellipsis;
-      color: inherit;
+    [dir=rtl] & {
+      margin-left: var(--sp-tight);
+      margin-right: 0;
    }
-    & > span:last-child { display: none; }
+
+    & > .text {
+      color: inherit;
+      font-weight: 500;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+    & > .text:last-child { display: none; }
    &:hover {
-      & > span:first-child { display: none; }
-      & > span:last-child { display: block; }
+      & > .text:first-child { display: none; }
+      & > .text:last-child { display: block; }
    }
  }

@@ -132,84 +140,26 @@
  }
 }
 .message__reply {
-  &-wrapper {
-    min-height: 20px;
-    cursor: pointer;
-    &:empty {
-      border-radius: calc(var(--bo-radius) / 2);
-      background-color: var(--bg-surface-hover);
-      max-width: 200px;
-      cursor: auto;
-    }
-    &:hover .text {
-      color: var(--tc-surface-high);
-    }
-  }
  .text {
-    @extend .cp-txt__ellipsis;
    color: var(--tc-surface-low);
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
  }
  .ic-raw {
    width: 16px;
    height: 14px;
  }
 }
-.message__body {
+.message__content {
  word-break: break-word;
-
+  
  & > .text > * {
    white-space: pre-wrap;
  }

  & a {
-    word-break: break-word;
-  }
-  & > .text > a {
-    white-space: initial !important;
-  }
-  
-  & span[data-mx-pill] {
-    background-color: hsla(0, 0%, 64%, 0.15);
-    padding: 0 2px;
-    border-radius: 4px;
-    cursor: pointer;
-    font-weight: var(--fw-medium);
-    &:hover {
-      background-color: hsla(0, 0%, 64%, 0.3);
-      color: var(--tc-surface-high);
-    }
-
-    &[data-mx-ping] {
-      background-color: var(--bg-ping);
-      &:hover {
-        background-color: var(--bg-ping-hover);
-      }
-    }
-  }
-
-  & span[data-mx-spoiler] {
-    border-radius: 4px;
-    background-color: rgba(124, 124, 124, 0.5);
-    color:transparent;
-    cursor: pointer;
-    -webkit-touch-callout: none;
-    -webkit-user-select: none;
-    -khtml-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-    & > * {
-      opacity: 0;
-    }
-  }
-
-  .data-mx-spoiler--visible {
-    background-color: var(--bg-surface-active) !important;
-    color: inherit !important;
-    user-select: initial !important;
-    & > * {
-      opacity: inherit !important;
-    }
+    word-break: break-all;
  }
  &-edited {
    color: var(--tc-surface-low);
@@ -218,8 +168,10 @@
 .message__edit {
  padding: var(--sp-extra-tight) 0;
  &-btns button {
-    margin: var(--sp-tight) 0 0 0;
-    @include dir.side(margin, 0, var(--sp-tight));
+    margin: var(--sp-tight) var(--sp-tight) 0 0;
+    [dir=rtl] & {
+      margin: var(--sp-tight) 0 0 var(--sp-tight);
+    }
  }
 }
 .message__reactions {
@@ -236,8 +188,7 @@
  }
 }
 .msg__reaction {
-  margin: var(--sp-extra-tight) 0 0 0;
-  @include dir.side(margin, 0, var(--sp-extra-tight));
+  margin: var(--sp-extra-tight) var(--sp-extra-tight) 0 0;
  padding: 0 var(--sp-ultra-tight);
  min-height: 26px;
  display: inline-flex;
@@ -248,22 +199,29 @@
  border-radius: 4px;
  cursor: pointer;

-  & .react-emoji {
-    width: 16px;
-    height: 16px;
+  & .emoji {
+    width: 14px;
+    height: 14px;
    margin: 2px;
  }
  &-count {
    margin: 0 var(--sp-ultra-tight);
    color: var(--tc-surface-normal)
  }
-  &-tooltip .react-emoji  {
-    width: 16px;
-    height: 16px;
+  &-tooltip .emoji {
+    width: 14px;
+    height: 14px;
    margin: 0 var(--sp-ultra-tight);
    margin-bottom: -2px;
  }

+  [dir=rtl] & {
+    margin: {
+      right: 0;
+      left: var(--sp-extra-tight);
+    }
+  }
+
  @media (hover: hover) {
    &:hover {
      background-color: var(--bg-surface-hover);
@@ -289,57 +247,43 @@
 .message__options {
  position: absolute;
  top: 0;
-  @include dir.prop(right, 60px, unset);
-  @include dir.prop(left, unset, 60px);
-
-  z-index: 99;
+  right: 60px;
+  z-index: 999;
  transform: translateY(-50%);

  border-radius: var(--bo-radius);
  box-shadow: var(--bs-surface-border);
  background-color: var(--bg-surface-low);
  display: none;
+
+  [dir=rtl] & {
+    left: 60px;
+    right: unset;
+  }
 }

 // markdown formating
-.message__body {
-  & h1, h2, h3, h4, h5, h6 {
-    margin: 0;
-    margin-bottom: var(--sp-ultra-tight);
-    font-weight: var(--fw-medium);
-    &:first-child {
-      margin-top: 0;
-    }
-    &:last-child {
-      margin-bottom: 0;
-    }
-  }
+.message__content {
  & h1,
  & h2 {
    color: var(--tc-surface-high);
-    margin-top: var(--sp-normal);
-    font-size: var(--fs-h2);
-    line-height: var(--lh-h2);
-    letter-spacing: var(--ls-h2);
+    margin: var(--sp-extra-loose) 0 var(--sp-normal);
+    line-height: var(--lh-h1);
  }
  & h3,
  & h4 {
    color: var(--tc-surface-high);
-    margin-top: var(--sp-tight);
-    font-size: var(--fs-s1);
-    line-height: var(--lh-s1);
-    letter-spacing: var(--ls-s1);
+    margin: var(--sp-loose) 0 var(--sp-tight);
+    line-height: var(--lh-h2);
  }
  & h5,
  & h6 {
    color: var(--tc-surface-high);
-    margin-top: var(--sp-extra-tight);
-    font-size: var(--fs-b1);
-    line-height: var(--lh-b1);
-    letter-spacing: var(--ls-b1);
+    margin: var(--sp-normal) 0 var(--sp-extra-tight);
+    line-height: var(--lh-s1);
  }
  & hr {
-    border-color: var(--bg-divider);
+    border-color: var(--bg-surface-border);
  }

  .text img {
@@ -381,54 +325,60 @@
    @include scrollbar.scroll__h;
    @include scrollbar.scroll--auto-hide;
  }
-  & pre {
-    width: fit-content;
-    max-width: 100%;
-    @include scrollbar.scroll;
-    @include scrollbar.scroll__h;
-    @include scrollbar.scroll--auto-hide;
-    & code {
-      color: var(--tc-surface-normal) !important;
-      white-space: pre;
-    }
+  & pre code {
+    color: var(--tc-surface-normal) !important;
  }
  & blockquote {
-    width: fit-content;
-    max-width: 100%;
-    @include dir.side(border, 4px solid var(--bg-surface-active), 0);
+    padding-left: var(--sp-extra-tight);
+    border-left: 4px solid var(--bg-surface-active);
    white-space: initial !important;

    & > * {
      white-space: pre-wrap;
    }
+
+    [dir=rtl] & {
+      padding: {
+        left: 0;
+        right: var(--sp-extra-tight);
+      }
+      border: {
+        left: none;
+        right: 4px solid var(--bg-surface-active);
+      }
+    }
  }
  & ul,
  & ol {
    margin: var(--sp-ultra-tight) 0;
-    @include dir.side(padding, 24px, 0);
+    padding-left: 24px;
    white-space: initial !important;
+    
+    & > * {
+      white-space: pre-wrap;
+    }
+
+    [dir=rtl] & {
+      padding: {
+        left: 0;
+        right: 24px;
+      }
+    }
  }
  & ul.contains-task-list {
    padding: 0;
    list-style: none;
  }
  & table {
-    display: inline-block;
-    max-width: 100%;
-    white-space: normal !important;
    background-color: var(--bg-surface-hover);
    border-radius: calc(var(--bo-radius) / 2);
    border-spacing: 0;
    border: 1px solid var(--bg-surface-border);
-    @include scrollbar.scroll;
-    @include scrollbar.scroll__h;
-    @include scrollbar.scroll--auto-hide;

    & td, & th {
      padding: var(--sp-extra-tight);
      border: 1px solid var(--bg-surface-border);
      border-width: 0 1px 1px 0;
-      white-space: pre;
      &:last-child {
        border-width: 0;
        border-bottom-width: 1px;
@@ -448,15 +398,4 @@
      border-bottom-width: 0px !important;
    }
  }
-}
-
-.message.message--type-emote {
-  .message__body {
-    font-style: italic;
-
-    // Remove blockness of first `<p>` so that markdown emotes stay on one line.
-    p:first-of-type {
-      display: inline;
-    }
-  }
-}
+}
--- a/src/app/molecules/message/TimelineChange.jsx
+++ b/src/app/molecules/message/TimelineChange.jsx
@@ -2,6 +2,8 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import './TimelineChange.scss';

+// import Linkify from 'linkifyjs/react';
+
 import Text from '../../atoms/text/Text';
 import RawIcon from '../../atoms/system-icons/RawIcon';

@@ -10,10 +12,9 @@ import LeaveArraowIC from '../../../../public/res/ic/outlined/leave-arrow.svg';
 import InviteArraowIC from '../../../../public/res/ic/outlined/invite-arrow.svg';
 import InviteCancelArraowIC from '../../../../public/res/ic/outlined/invite-cancel-arrow.svg';
 import UserIC from '../../../../public/res/ic/outlined/user.svg';
+import TickMarkIC from '../../../../public/res/ic/outlined/tick-mark.svg';

-function TimelineChange({
-  variant, content, time, onClick,
-}) {
+function TimelineChange({ variant, content, time, onClick }) {
  let iconSrc;

  switch (variant) {
@@ -32,6 +33,9 @@ function TimelineChange({
    case 'avatar':
      iconSrc = UserIC;
      break;
+    case 'follow':
+      iconSrc = TickMarkIC;
+      break;
    default:
      iconSrc = JoinArraowIC;
      break;
@@ -45,6 +49,7 @@ function TimelineChange({
      <div className="timeline-change__content">
        <Text variant="b2">
          {content}
+          {/* <Linkify options={{ target: { url: '_blank' } }}>{content}</Linkify> */}
        </Text>
      </div>
      <div className="timeline-change__time">
@@ -63,6 +68,7 @@ TimelineChange.propTypes = {
  variant: PropTypes.oneOf([
    'join', 'leave', 'invite',
    'invite-cancel', 'avatar', 'other',
+    'follow',
  ]),
  content: PropTypes.oneOfType([
    PropTypes.string,
--- a/src/app/molecules/message/TimelineChange.scss
+++ b/src/app/molecules/message/TimelineChange.scss
@@ -1,9 +1,6 @@
-@use '../../partials/dir';
-
 .timeline-change {
-  padding: var(--sp-ultra-tight);
-  @include dir.side(padding, var(--sp-normal), var(--sp-extra-tight));
-
+  padding: var(--sp-ultra-tight) var(--sp-normal);
+  padding-right: var(--sp-extra-tight);
  display: flex;
  align-items: center;
  width: 100%;
@@ -12,6 +9,13 @@
    background-color: var(--bg-surface-hover);
  }

+  [dir=rtl] & {
+    padding: {
+      left: var(--sp-extra-tight);
+      right: var(--sp-normal);
+    }
+  }
+
  &__avatar-container {
    width: var(--av-small);
    display: inline-flex;
@@ -32,6 +36,5 @@
    min-width: 0;

    margin: 0 var(--sp-tight);
-    word-break: break-word;
  }
 }
--- a/src/app/molecules/people-selector/PeopleSelector.jsx
+++ b/src/app/molecules/people-selector/PeopleSelector.jsx
@@ -2,8 +2,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import './PeopleSelector.scss';

-import { twemojify } from '../../../util/twemojify';
-
 import { blurOnBubbling } from '../../atoms/button/script';

 import Text from '../../atoms/text/Text';
@@ -20,8 +18,8 @@ function PeopleSelector({
        onClick={onClick}
        type="button"
      >
-        <Avatar imageSrc={avatarSrc} text={name} bgColor={color} size="extra-small" />
-        <Text className="people-selector__name" variant="b1">{twemojify(name)}</Text>
+        <Avatar imageSrc={avatarSrc} text={name.slice(0, 1)} bgColor={color} size="extra-small" />
+        <Text className="people-selector__name" variant="b1">{name}</Text>
        {peopleRole !== null && <Text className="people-selector__role" variant="b3">{peopleRole}</Text>}
      </button>
    </div>
--- a/src/app/molecules/people-selector/PeopleSelector.scss
+++ b/src/app/molecules/people-selector/PeopleSelector.scss
@@ -1,14 +1,17 @@
-@use '../../partials/text';
-@use '../../partials/dir';
-
 .people-selector {
  width: 100%;
  padding: var(--sp-extra-tight);
-  @include dir.side(padding, var(--sp-normal), var(--sp-extra-tight));
+  padding-left: var(--sp-normal);
  display: flex;
  align-items: center;
  cursor: pointer;
-
+  
+  [dir=rtl] & {
+    padding: {
+      left: var(--sp-extra-tight);
+      right: var(--sp-normal);
+    }
+  }
  @media (hover: hover) {
    &:hover {
      background-color: var(--bg-surface-hover);
@@ -23,11 +26,13 @@
  }

  &__name {
-    @extend .cp-txt__ellipsis;
    flex: 1;
    min-width: 0;
    margin: 0 var(--sp-tight);
    color: var(--tc-surface-normal);
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
  }
  &__role {
    color: var(--tc-surface-low);
--- a/src/app/molecules/popup-window/PopupWindow.jsx
+++ b/src/app/molecules/popup-window/PopupWindow.jsx
@@ -2,8 +2,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import './PopupWindow.scss';

-import { twemojify } from '../../../util/twemojify';
-
 import Text from '../../atoms/text/Text';
 import IconButton from '../../atoms/button/IconButton';
 import { MenuItem } from '../../atoms/context-menu/ContextMenu';
@@ -68,7 +66,7 @@ function PopupWindow({
            <Header>
              <IconButton size="small" src={ChevronLeftIC} onClick={onRequestClose} tooltip="Back" />
              <TitleWrapper>
-                <Text variant="s1" weight="medium" primary>{twemojify(title)}</Text>
+                <Text variant="s1">{title}</Text>
              </TitleWrapper>
              {drawerOptions}
            </Header>
@@ -84,7 +82,7 @@ function PopupWindow({
        <div className="pw__content">
          <Header>
            <TitleWrapper>
-              <Text variant="h2" weight="medium" primary>{twemojify(contentTitle !== null ? contentTitle : title)}</Text>
+              <Text variant="h2">{contentTitle !== null ? contentTitle : title}</Text>
            </TitleWrapper>
            {contentOptions}
          </Header>
--- a/src/app/molecules/popup-window/PopupWindow.scss
+++ b/src/app/molecules/popup-window/PopupWindow.scss
@@ -1,5 +1,3 @@
-@use '../../partials/dir';
-
 .pw-model {
  --modal-height: 656px;
  max-height: var(--modal-height) !important;
@@ -7,6 +5,8 @@
 }

 .pw {
+  --popup-window-drawer-width: 280px;
+
  width: 100%;
  height: 100%;
  background-color: var(--bg-surface);
@@ -16,7 +16,14 @@
  &__drawer {
    width: var(--popup-window-drawer-width);
    background-color: var(--bg-surface-low);
-    @include dir.side(border, none, 1px solid var(--bg-surface-border));
+    border-right: 1px solid var(--bg-surface-border);
+
+    [dir=rtl] & {
+      border: {
+        right: none;
+        left: 1px solid var(--bg-surface-border);
+      }
+    }
  }
  &__content {
    flex: 1;
@@ -45,9 +52,11 @@
 .pw__drawer {
  & .header {
    padding-left: var(--sp-tight);
-    @include dir.side(padding, var(--sp-tight), var(--sp-tight));
    & .header__title-wrapper {
-      @include dir.side(margin, var(--sp-ultra-tight), var(--sp-extra-tight));
+      margin: 0 var(--sp-extra-tight);
+    }
+    [dir=rtl] & {
+        padding-right: var(--sp-tight);
    }
  }
 }
@@ -68,8 +77,15 @@

  & .context-menu__item > button {
    border-radius: var(--bo-radius);
+    & .text {
+      color: var(--tc-surface-normal);
+    }
    & .ic-raw {
-      @include dir.side(margin, 0, var(--sp-tight));
+      margin-right: var(--sp-tight);
+      [dir=rtl] & {
+        margin-right: 0;
+        margin-left: var(--sp-tight);
+      }
    }
  }
 }
--- a/src/app/molecules/power-level-selector/PowerLevelSelector.jsx
+++ b/src/app/molecules/power-level-selector/PowerLevelSelector.jsx
@@ -1,49 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import './PowerLevelSelector.scss';
-
-import IconButton from '../../atoms/button/IconButton';
-import { MenuHeader, MenuItem } from '../../atoms/context-menu/ContextMenu';
-
-import CheckIC from '../../../../public/res/ic/outlined/check.svg';
-
-function PowerLevelSelector({
-  value, max, onSelect,
-}) {
-  const handleSubmit = (e) => {
-    const powerLevel = e.target.elements['power-level']?.value;
-    if (!powerLevel) return;
-    onSelect(Number(powerLevel));
-  };
-
-  return (
-    <div className="power-level-selector">
-      <MenuHeader>Power level selector</MenuHeader>
-      <form onSubmit={(e) => { e.preventDefault(); handleSubmit(e); }}>
-        <input
-          className="input"
-          defaultValue={value}
-          type="number"
-          name="power-level"
-          placeholder="Power level"
-          max={max}
-          autoComplete="off"
-          required
-        />
-        <IconButton variant="primary" src={CheckIC} type="submit" />
-      </form>
-      {max >= 0 && <MenuHeader>Presets</MenuHeader>}
-      {max >= 100 && <MenuItem variant={value === 100 ? 'positive' : 'surface'} onClick={() => onSelect(100)}>Admin - 100</MenuItem>}
-      {max >= 50 && <MenuItem variant={value === 50 ? 'positive' : 'surface'} onClick={() => onSelect(50)}>Mod - 50</MenuItem>}
-      {max >= 0 && <MenuItem variant={value === 0 ? 'positive' : 'surface'} onClick={() => onSelect(0)}>Member - 0</MenuItem>}
-    </div>
-  );
-}
-
-PowerLevelSelector.propTypes = {
-  value: PropTypes.number.isRequired,
-  max: PropTypes.number.isRequired,
-  onSelect: PropTypes.func.isRequired,
-};
-
-export default PowerLevelSelector;
--- a/src/app/molecules/power-level-selector/PowerLevelSelector.scss
+++ b/src/app/molecules/power-level-selector/PowerLevelSelector.scss
@@ -1,20 +0,0 @@
-@use '../../partials/flex';
-@use '../../partials/dir';
-
-.power-level-selector {
-  & .context-menu__item .text {
-    margin: 0 !important;
-  }
-
-  & form {
-    margin: var(--sp-normal);
-    display: flex;
-      
-    & input {
-      @extend .cp-fx__item-one;
-      @include dir.side(margin, 0, var(--sp-tight));
-      width: 148px;
-      padding: 9px var(--sp-tight);
-    }
-  }
-}
--- a/src/app/molecules/room-aliases/RoomAliases.jsx
+++ b/src/app/molecules/room-aliases/RoomAliases.jsx
@@ -1,352 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import PropTypes from 'prop-types';
-import './RoomAliases.scss';
-
-import initMatrix from '../../../client/initMatrix';
-import cons from '../../../client/state/cons';
-import { Debounce } from '../../../util/common';
-import { isRoomAliasAvailable } from '../../../util/matrixUtil';
-
-import Text from '../../atoms/text/Text';
-import Button from '../../atoms/button/Button';
-import Input from '../../atoms/input/Input';
-import Checkbox from '../../atoms/button/Checkbox';
-import Toggle from '../../atoms/button/Toggle';
-import { MenuHeader } from '../../atoms/context-menu/ContextMenu';
-import SettingTile from '../setting-tile/SettingTile';
-
-import { useStore } from '../../hooks/useStore';
-
-function useValidate(hsString) {
-  const [debounce] = useState(new Debounce());
-  const [validate, setValidate] = useState({ alias: null, status: cons.status.PRE_FLIGHT });
-
-  const setValidateToDefault = () => {
-    setValidate({
-      alias: null,
-      status: cons.status.PRE_FLIGHT,
-    });
-  };
-
-  const checkValueOK = (value) => {
-    if (value.trim() === '') {
-      setValidateToDefault();
-      return false;
-    }
-    if (!value.match(/^[a-zA-Z0-9_-]+$/)) {
-      setValidate({
-        alias: null,
-        status: cons.status.ERROR,
-        msg: 'Invalid character: only letter, numbers and _- are allowed.',
-      });
-      return false;
-    }
-    return true;
-  };
-
-  const handleAliasChange = (e) => {
-    const input = e.target;
-    if (validate.status !== cons.status.PRE_FLIGHT) {
-      setValidateToDefault();
-    }
-    if (checkValueOK(input.value) === false) return;
-
-    debounce._(async () => {
-      const { value } = input;
-      const alias = `#${value}:${hsString}`;
-      if (checkValueOK(value) === false) return;
-
-      setValidate({
-        alias,
-        status: cons.status.IN_FLIGHT,
-        msg: `validating ${alias}...`,
-      });
-
-      const isValid = await isRoomAliasAvailable(alias);
-      setValidate(() => {
-        if (e.target.value !== value) {
-          return { alias: null, status: cons.status.PRE_FLIGHT };
-        }
-        return {
-          alias,
-          status: isValid ? cons.status.SUCCESS : cons.status.ERROR,
-          msg: isValid ? `${alias} is available.` : `${alias} is already in use.`,
-        };
-      });
-    }, 600)();
-  };
-
-  return [validate, setValidateToDefault, handleAliasChange];
-}
-
-function getAliases(roomId) {
-  const mx = initMatrix.matrixClient;
-  const room = mx.getRoom(roomId);
-
-  const main = room.getCanonicalAlias();
-  const published = room.getAltAliases();
-  if (main && !published.includes(main)) published.splice(0, 0, main);
-
-  return {
-    main,
-    published: [...new Set(published)],
-    local: [],
-  };
-}
-
-function RoomAliases({ roomId }) {
-  const mx = initMatrix.matrixClient;
-  const room = mx.getRoom(roomId);
-  const userId = mx.getUserId();
-  const hsString = userId.slice(userId.indexOf(':') + 1);
-
-  const isMountedStore = useStore();
-  const [isPublic, setIsPublic] = useState(false);
-  const [isLocalVisible, setIsLocalVisible] = useState(false);
-  const [aliases, setAliases] = useState(getAliases(roomId));
-  const [selectedAlias, setSelectedAlias] = useState(null);
-  const [deleteAlias, setDeleteAlias] = useState(null);
-  const [validate, setValidateToDefault, handleAliasChange] = useValidate(hsString);
-
-  const canPublishAlias = room.currentState.maySendStateEvent('m.room.canonical_alias', userId);
-
-  useEffect(() => isMountedStore.setItem(true), []);
-
-  useEffect(() => {
-    let isUnmounted = false;
-
-    const loadLocalAliases = async () => {
-      let local = [];
-      try {
-        const result = await mx.unstableGetLocalAliases(roomId);
-        local = result.aliases.filter((alias) => !aliases.published.includes(alias));
-      } catch {
-        local = [];
-      }
-      aliases.local = [...new Set(local.reverse())];
-
-      if (isUnmounted) return;
-      setAliases({ ...aliases });
-    };
-    const loadVisibility = async () => {
-      const result = await mx.getRoomDirectoryVisibility(roomId);
-      if (isUnmounted) return;
-      setIsPublic(result.visibility === 'public');
-    };
-    loadLocalAliases();
-    loadVisibility();
-    return () => {
-      isUnmounted = true;
-    };
-  }, [roomId]);
-
-  const toggleDirectoryVisibility = () => {
-    mx.setRoomDirectoryVisibility(roomId, isPublic ? 'private' : 'public');
-    setIsPublic(!isPublic);
-  };
-
-  const handleAliasSubmit = async (e) => {
-    e.preventDefault();
-    if (validate.status === cons.status.ERROR) return;
-    if (!validate.alias) return;
-
-    const { alias } = validate;
-    const aliasInput = e.target.elements['alias-input'];
-    aliasInput.value = '';
-    setValidateToDefault();
-
-    try {
-      aliases.local.push(alias);
-      setAliases({ ...aliases });
-      await mx.createAlias(alias, roomId);
-    } catch {
-      if (isMountedStore.getItem()) {
-        const lIndex = alias.local.indexOf(alias);
-        if (lIndex === -1) return;
-        aliases.local.splice(lIndex, 1);
-        setAliases({ ...aliases });
-      }
-    }
-  };
-
-  const handleAliasSelect = (alias) => {
-    setSelectedAlias(alias === selectedAlias ? null : alias);
-  };
-
-  const handlePublishAlias = (alias) => {
-    const { main, published } = aliases;
-    let { local } = aliases;
-
-    if (!published.includes(aliases)) {
-      published.push(alias);
-      local = local.filter((al) => al !== alias);
-      mx.sendStateEvent(roomId, 'm.room.canonical_alias', {
-        alias: main,
-        alt_aliases: published.filter((al) => al !== main),
-      });
-      setAliases({ main, published, local });
-      setSelectedAlias(null);
-    }
-  };
-
-  const handleUnPublishAlias = (alias) => {
-    let { main, published } = aliases;
-    const { local } = aliases;
-
-    if (published.includes(alias) || main === alias) {
-      if (main === alias) main = null;
-      published = published.filter((al) => al !== alias);
-      local.push(alias);
-      mx.sendStateEvent(roomId, 'm.room.canonical_alias', {
-        alias: main,
-        alt_aliases: published.filter((al) => al !== main),
-      });
-      setAliases({ main, published, local });
-      setSelectedAlias(null);
-    }
-  };
-
-  const handleSetMainAlias = (alias) => {
-    let { main, local } = aliases;
-    const { published } = aliases;
-
-    if (main !== alias) {
-      main = alias;
-      if (!published.includes(alias)) published.splice(0, 0, alias);
-      local = local.filter((al) => al !== alias);
-      mx.sendStateEvent(roomId, 'm.room.canonical_alias', {
-        alias: main,
-        alt_aliases: published.filter((al) => al !== main),
-      });
-      setAliases({ main, published, local });
-      setSelectedAlias(null);
-    }
-  };
-
-  const handleDeleteAlias = async (alias) => {
-    try {
-      setDeleteAlias({ alias, status: cons.status.IN_FLIGHT, msg: 'deleting...' });
-      await mx.deleteAlias(alias);
-      let { main, published, local } = aliases;
-      if (published.includes(alias)) {
-        handleUnPublishAlias(alias);
-        if (main === alias) main = null;
-        published = published.filter((al) => al !== alias);
-      }
-
-      local = local.filter((al) => al !== alias);
-      setAliases({ main, published, local });
-      setDeleteAlias(null);
-      setSelectedAlias(null);
-    } catch (err) {
-      setDeleteAlias({ alias, status: cons.status.ERROR, msg: err.message });
-    }
-  };
-
-  const renderAliasBtns = (alias) => {
-    const isPublished = aliases.published.includes(alias);
-    const isMain = aliases.main === alias;
-    if (deleteAlias?.alias === alias) {
-      const isError = deleteAlias.status === cons.status.ERROR;
-      return (
-        <div className="room-aliases__item-btns">
-          <Text variant="b2">
-            <span style={{ color: isError ? 'var(--tc-danger-high' : 'inherit' }}>{deleteAlias.msg}</span>
-          </Text>
-        </div>
-      );
-    }
-
-    return (
-      <div className="room-aliases__item-btns">
-        {canPublishAlias && !isMain && <Button onClick={() => handleSetMainAlias(alias)} variant="primary">Set as Main</Button>}
-        {!isPublished && canPublishAlias && <Button onClick={() => handlePublishAlias(alias)} variant="positive">Publish</Button>}
-        {isPublished && canPublishAlias && <Button onClick={() => handleUnPublishAlias(alias)} variant="caution">Un-Publish</Button>}
-        <Button onClick={() => handleDeleteAlias(alias)} variant="danger">Delete</Button>
-      </div>
-    );
-  };
-
-  const renderAlias = (alias) => {
-    const isActive = selectedAlias === alias;
-    const disabled = !canPublishAlias && aliases.published.includes(alias);
-    const isMain = aliases.main === alias;
-
-    return (
-      <React.Fragment key={`${alias}-wrapper`}>
-        <div className="room-aliases__alias-item" key={alias}>
-          <Checkbox variant="positive" disabled={disabled} isActive={isActive} onToggle={() => handleAliasSelect(alias)} />
-          <Text>
-            {alias}
-            {isMain && <span>Main</span>}
-          </Text>
-        </div>
-        {isActive && renderAliasBtns(alias)}
-      </React.Fragment>
-    );
-  };
-
-  let inputState = 'normal';
-  if (validate.status === cons.status.ERROR) inputState = 'error';
-  if (validate.status === cons.status.SUCCESS) inputState = 'success';
-  return (
-    <div className="room-aliases">
-      <SettingTile
-        title="Publish to room directory"
-        content={<Text variant="b3">{`Publish this room to the ${hsString}'s public room directory?`}</Text>}
-        options={(
-          <Toggle
-            isActive={isPublic}
-            onToggle={toggleDirectoryVisibility}
-            disabled={!canPublishAlias}
-          />
-        )}
-      />
-
-      <div className="room-aliases__content">
-        <MenuHeader>Published addresses</MenuHeader>
-        {(aliases.published.length === 0) && <Text className="room-aliases__message">No published addresses</Text>}
-        {(aliases.published.length > 0 && !aliases.main) && <Text className="room-aliases__message">No Main address (select one from below)</Text>}
-        {aliases.published.map(renderAlias)}
-        <Text className="room-aliases__message" variant="b3">Published addresses can be used by anyone on any server to join your room. To publish an address, it needs to be set as a local address first.</Text>
-      </div>
-      { isLocalVisible && (
-        <div className="room-aliases__content">
-          <MenuHeader>Local addresses</MenuHeader>
-          {(aliases.local.length === 0) && <Text className="room-aliases__message">No local addresses</Text>}
-          {aliases.local.map(renderAlias)}
-          <Text className="room-aliases__message" variant="b3">Set local addresses for this room so users can find this room through your homeserver.</Text>
-
-          <Text className="room-aliases__form-label" variant="b2">Add local address</Text>
-          <form className="room-aliases__form" onSubmit={handleAliasSubmit}>
-            <div className="room-aliases__input-wrapper">
-              <Input
-                name="alias-input"
-                state={inputState}
-                onChange={handleAliasChange}
-                placeholder="my_room_address"
-                required
-              />
-            </div>
-            <Button variant="primary" type="submit">Add</Button>
-          </form>
-          <div className="room-aliases__input-status">
-            {validate.status === cons.status.SUCCESS && <Text className="room-aliases__valid" variant="b2">{validate.msg}</Text>}
-            {validate.status === cons.status.ERROR && <Text className="room-aliases__invalid" variant="b2">{validate.msg}</Text>}
-          </div>
-        </div>
-      )}
-      <div className="room-aliases__content">
-        <Button onClick={() => setIsLocalVisible(!isLocalVisible)}>
-          {`${isLocalVisible ? 'Hide' : 'Add / View'} local address`}
-        </Button>
-      </div>
-    </div>
-  );
-}
-
-RoomAliases.propTypes = {
-  roomId: PropTypes.string.isRequired,
-};
-
-export default RoomAliases;
--- a/src/app/molecules/room-aliases/RoomAliases.scss
+++ b/src/app/molecules/room-aliases/RoomAliases.scss
@@ -1,84 +0,0 @@
-@use '../../partials/flex';
-@use '../../partials/dir';
-@use '../../partials/text';
-
-.room-aliases {
-  &__message,
-  & .setting-tile {
-    margin: var(--sp-tight) var(--sp-normal);
-  }
-  & .setting-tile {
-    margin-bottom: var(--sp-loose);
-  }
-
-  &__alias-item {
-    padding: var(--sp-extra-tight) var(--sp-normal);
-    @extend .cp-fx__row--s-c;
-    &.checkbox {
-      @include dir.side(margin, 0 , var(--sp-tight));
-    }
-    & .text {
-      @extend .cp-fx__item-one;
-      @extend .cp-txt__ellipsis;
-      color: var(--tc-surface-high);
-      span {
-        margin: 0 var(--sp-extra-tight);
-        padding: 0 var(--sp-ultra-tight);
-        color: var(--bg-surface);
-        background-color: var(--tc-surface-low);
-        border-radius: 4px;
-      }
-    }
-  }
-  &__item-btns {
-    @include dir.side(margin, 48px, 0);
-    & button {
-      padding: var(--sp-ultra-tight) var(--sp-tight);
-      margin-bottom: var(--sp-tight);
-      @include dir.side(margin, 0, var(--sp-tight));
-    }
-  }
-
-  &__content {
-    margin-bottom: var(--sp-normal);
-
-    & .checkbox {
-      @include dir.side(margin, 0, var(--sp-tight));
-      min-width: 20px;
-    }
-    & > button {
-      margin: 0 var(--sp-normal);
-    }
-  }
-  
-  &__form {
-    padding: var(--sp-normal);
-    padding-top: 0;
-    display: flex;
-    &-label {
-      padding: var(--sp-normal) var(--sp-normal) var(--sp-ultra-tight);
-    }
-  }
-  
-  &__input-wrapper {
-    display: flex;
-    @extend .cp-fx__item-one;
-    @include dir.side(margin, 0, var(--sp-tight));
-    
-    & .input-container {
-      @extend .cp-fx__item-one;
-    }
-  }
-
-  &__input-status {
-    padding: 0 var(--sp-normal);
-  }
-  &__valid {
-    color: var(--tc-positive-high);
-    padding-bottom: var(--sp-normal);
-  }
-  &__invalid {
-    color: var(--tc-danger-high);
-    padding-bottom: var(--sp-normal);
-  }
-}
--- a/src/app/molecules/room-encryption/RoomEncryption.jsx
+++ b/src/app/molecules/room-encryption/RoomEncryption.jsx
@@ -1,55 +0,0 @@
-import React, { useState } from 'react';
-import PropTypes from 'prop-types';
-import './RoomEncryption.scss';
-
-import initMatrix from '../../../client/initMatrix';
-
-import Text from '../../atoms/text/Text';
-import Toggle from '../../atoms/button/Toggle';
-import SettingTile from '../setting-tile/SettingTile';
-
-function RoomEncryption({ roomId }) {
-  const mx = initMatrix.matrixClient;
-  const room = mx.getRoom(roomId);
-  const encryptionEvents = room.currentState.getStateEvents('m.room.encryption');
-  const [isEncrypted, setIsEncrypted] = useState(encryptionEvents.length > 0);
-  const canEnableEncryption = room.currentState.maySendStateEvent('m.room.encryption', mx.getUserId());
-
-  const handleEncryptionEnable = () => {
-    const joinRule = room.getJoinRule();
-    const confirmMsg1 = 'It is not recommended to add encryption in public room. Anyone can find and join public rooms, so anyone can read messages in them.';
-    const confirmMsg2 = 'Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly';
-    if (joinRule === 'public' ? confirm(confirmMsg1) : true) {
-      if (confirm(confirmMsg2)) {
-        setIsEncrypted(true);
-        mx.sendStateEvent(roomId, 'm.room.encryption', {
-          algorithm: 'm.megolm.v1.aes-sha2',
-        });
-      }
-    }
-  };
-
-  return (
-    <div className="room-encryption">
-      <SettingTile
-        title="Enable room encryption"
-        content={(
-          <Text variant="b3">Once enabled, encryption cannot be disabled.</Text>
-        )}
-        options={(
-          <Toggle
-            isActive={isEncrypted}
-            onToggle={handleEncryptionEnable}
-            disabled={isEncrypted || !canEnableEncryption}
-          />
-        )}
-      />
-    </div>
-  );
-}
-
-RoomEncryption.propTypes = {
-  roomId: PropTypes.string.isRequired,
-};
-
-export default RoomEncryption;
--- a/src/app/molecules/room-encryption/RoomEncryption.scss
+++ b/src/app/molecules/room-encryption/RoomEncryption.scss
@@ -1,5 +0,0 @@
-.room-encryption {
-  & .setting-tile {
-    margin: var(--sp-normal);
-  }
-}
--- a/src/app/molecules/room-history-visibility/RoomHistoryVisibility.jsx
+++ b/src/app/molecules/room-history-visibility/RoomHistoryVisibility.jsx
@@ -1,99 +0,0 @@
-import React, { useState, useEffect, useCallback } from 'react';
-import PropTypes from 'prop-types';
-import './RoomHistoryVisibility.scss';
-
-import initMatrix from '../../../client/initMatrix';
-
-import Text from '../../atoms/text/Text';
-import RadioButton from '../../atoms/button/RadioButton';
-import { MenuItem } from '../../atoms/context-menu/ContextMenu';
-
-const visibility = {
-  WORLD_READABLE: 'world_readable',
-  SHARED: 'shared',
-  INVITED: 'invited',
-  JOINED: 'joined',
-};
-
-const items = [{
-  iconSrc: null,
-  text: 'World readable (anyone can read)',
-  type: visibility.WORLD_READABLE,
-}, {
-  iconSrc: null,
-  text: 'Member shared (since the point in time of selecting this option)',
-  type: visibility.SHARED,
-}, {
-  iconSrc: null,
-  text: 'Member invited (since they were invited)',
-  type: visibility.INVITED,
-}, {
-  iconSrc: null,
-  text: 'Member joined (since they joined)',
-  type: visibility.JOINED,
-}];
-
-function setHistoryVisibility(roomId, type) {
-  const mx = initMatrix.matrixClient;
-
-  return mx.sendStateEvent(
-    roomId, 'm.room.history_visibility',
-    {
-      history_visibility: type,
-    },
-  );
-}
-
-function useVisibility(roomId) {
-  const mx = initMatrix.matrixClient;
-  const room = mx.getRoom(roomId);
-
-  const [activeType, setActiveType] = useState(room.getHistoryVisibility());
-  useEffect(() => setActiveType(room.getHistoryVisibility()), [roomId]);
-
-  const setVisibility = useCallback((item) => {
-    if (item.type === activeType.type) return;
-    setActiveType(item.type);
-    setHistoryVisibility(roomId, item.type);
-  }, [activeType, roomId]);
-
-  return [activeType, setVisibility];
-}
-
-function RoomHistoryVisibility({ roomId }) {
-  const [activeType, setVisibility] = useVisibility(roomId);
-  const mx = initMatrix.matrixClient;
-  const userId = mx.getUserId();
-  const room = mx.getRoom(roomId);
-  const { currentState } = room;
-
-  const canChange = currentState.maySendStateEvent('m.room.history_visibility', userId);
-
-  return (
-    <div className="room-history-visibility">
-      {
-        items.map((item) => (
-          <MenuItem
-            variant={activeType === item.type ? 'positive' : 'surface'}
-            key={item.type}
-            iconSrc={item.iconSrc}
-            onClick={() => setVisibility(item)}
-            disabled={(!canChange)}
-          >
-            <Text varient="b1">
-              <span>{item.text}</span>
-              <RadioButton isActive={activeType === item.type} />
-            </Text>
-          </MenuItem>
-        ))
-      }
-      <Text variant="b3">Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.</Text>
-    </div>
-  );
-}
-
-RoomHistoryVisibility.propTypes = {
-  roomId: PropTypes.string.isRequired,
-};
-
-export default RoomHistoryVisibility;
--- a/src/app/molecules/room-history-visibility/RoomHistoryVisibility.scss
+++ b/src/app/molecules/room-history-visibility/RoomHistoryVisibility.scss
@@ -1,25 +0,0 @@
-@use '../../partials/flex';
-@use '../../partials/dir';
-@use '../../partials/text';
-
-.room-history-visibility {
-  & .context-menu__item .text {
-    margin: 0 !important;
-    @extend .cp-fx__item-one;
-    @extend .cp-fx__row--s-c;
-    
-    & span:first-child {
-      @extend .cp-fx__item-one;
-      @extend .cp-txt__ellipsis;
-    }
-    
-    & .radio-btn {
-      @include dir.side(margin, var(--sp-tight), 0);
-    }
-  }
-
-  & > .text {
-    margin: var(--sp-normal);
-    margin-top: var(--sp-ultra-tight);
-  }
-}
--- a/src/app/molecules/room-intro/RoomIntro.jsx
+++ b/src/app/molecules/room-intro/RoomIntro.jsx
@@ -2,21 +2,25 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import './RoomIntro.scss';

-import { twemojify } from '../../../util/twemojify';
+import Linkify from 'linkifyjs/react';
 import colorMXID from '../../../util/colorMXID';

 import Text from '../../atoms/text/Text';
 import Avatar from '../../atoms/avatar/Avatar';

+function linkifyContent(content) {
+  return <Linkify options={{ target: { url: '_blank' } }}>{content}</Linkify>;
+}
+
 function RoomIntro({
  roomId, avatarSrc, name, heading, desc, time,
 }) {
  return (
    <div className="room-intro">
-      <Avatar imageSrc={avatarSrc} text={name} bgColor={colorMXID(roomId)} size="large" />
+      <Avatar imageSrc={avatarSrc} text={name.slice(0, 1)} bgColor={colorMXID(roomId)} size="large" />
      <div className="room-intro__content">
-        <Text className="room-intro__name" variant="h1" weight="medium" primary>{twemojify(heading)}</Text>
-        <Text className="room-intro__desc" variant="b1">{twemojify(desc, undefined, true)}</Text>
+        <Text className="room-intro__name" variant="h1">{heading}</Text>
+        <Text className="room-intro__desc" variant="b1">{linkifyContent(desc)}</Text>
        { time !== null && <Text className="room-intro__time" variant="b3">{time}</Text>}
      </div>
    </div>
@@ -24,7 +28,7 @@ function RoomIntro({
 }

 RoomIntro.defaultProps = {
-  avatarSrc: null,
+  avatarSrc: false,
  time: null,
 };

--- a/src/app/molecules/room-intro/RoomIntro.scss
+++ b/src/app/molecules/room-intro/RoomIntro.scss
@@ -1,14 +1,19 @@
-@use '../../partials/dir';
-
 .room-intro {
  margin-top: calc(2 * var(--sp-extra-loose));
  margin-bottom: var(--sp-extra-loose);
-  --left-pad: calc(var(--sp-normal) + var(--av-small) + var(--sp-tight));
-  @include dir.side(padding, var(--left-pad), var(--sp-extra-tight));
+  padding-left: calc(var(--sp-normal) + var(--av-small) + var(--sp-tight));
+  padding-right: var(--sp-extra-tight);
+
+  [dir=rtl] & {
+    padding: {
+      left: var(--sp-extra-tight);
+      right: calc(var(--sp-normal) + var(--av-small) + var(--sp-tight));
+    }
+  }

  .room-intro__content {
    margin-top: var(--sp-extra-loose);
-    width: calc(100% - 88px);
+    max-width: 640px;
  }
  &__name {
    color: var(--tc-surface-high);
--- a/Show More
+++ b/Show More