Merge pull request #131 from ajbura/dev

v1.3.2
2021-10-06 13:22:18 +05:30
246 changed files with 12140 additions and 31947 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,2 +0,0 @@
-node_modules/
-.git/
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -20,9 +20,5 @@ module.exports = {
  rules: {
    'linebreak-style': 0,
    'no-underscore-dangle': 0,
-    'react/no-unstable-nested-components': [
-      'error',
-      { allowAsProps: true },
-    ],
  },
 };
--- 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/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,28 +0,0 @@
-# Docs: <https://docs.github.com/en/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/customizing-dependency-updates>
-
-version: 2
-
-updates:
-  - package-ecosystem: github-actions
-    directory: /
-    schedule: 
-      interval: weekly
-      day: "tuesday"
-      time: "01:00"
-      timezone: "Asia/Kolkata"
-
-  - package-ecosystem: docker
-    directory: /
-    schedule: 
-      interval: weekly
-      day: "tuesday"
-      time: "01:00"
-      timezone: "Asia/Kolkata"
-
-  - package-ecosystem: npm
-    directory: /
-    schedule: 
-      interval: weekly
-      day: "tuesday"
-      time: "01:00"
-      timezone: "Asia/Kolkata"
--- a/.github/workflows/build-pull-request.yml
+++ b/.github/workflows/build-pull-request.yml
@@ -1,39 +0,0 @@
-name: 'Build pull request'
-
-on:
-  pull_request:
-    types: ['opened', 'synchronize']
-
-jobs:
-  build-pull-request:
-    runs-on: ubuntu-latest
-    env:
-      PR_NUMBER: ${{github.event.number}}
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v3.0.0
-      - name: Build app
-        run: npm ci && npm run build
-      - name: Upload artifact
-        uses: actions/upload-artifact@v3.0.0
-        with:
-          name: previewbuild
-          path: dist
-          retention-days: 1
-      - name: Get PR info
-        uses: actions/github-script@v6.0.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@v3.0.0
-        with:
-          name: pr.json
-          path: pr.json
-          retention-days: 1
-      - name: Build Docker image
-        uses: docker/build-push-action@v2.10.0
-        with:
-          context: .
-          push: false
--- 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 pull request"]
-      types:
-        - completed
-jobs:
-  get-build-and-deploy:
-    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@v6.0.0
-        with:
-          script: |
-            var artifacts = await github.rest.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.rest.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.rest.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@v6.0.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.3
-        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 }}
-              ⚠️ Exercise caution. Use test accounts. ⚠️
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -0,0 +1,34 @@
+name: Publish Docker image
+
+on:
+  release:
+    types: [published]
+
+jobs:
+   push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v2
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: ajbura/cinny
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
--- a/.github/workflows/netlify-dev.yaml
+++ b/.github/workflows/netlify-dev.yaml
@@ -11,12 +11,11 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-      - uses: actions/checkout@v3.0.0
-      - uses: jsmrcaga/action-netlify-deploy@v1.7.2
+      - uses: actions/checkout@v1
+      - uses: jsmrcaga/action-netlify-deploy@master
        with:
-          install_command: "npm ci"
          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
          NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE2_ID }}
          BUILD_DIRECTORY: "dist"
          NETLIFY_DEPLOY_MESSAGE: "Dev deploy v${{ github.ref }}"
-          NETLIFY_DEPLOY_TO_PROD: true
+          NETLIFY_DEPLOY_TO_PROD: true
--- a/.github/workflows/netlify-prod.yaml
+++ b/.github/workflows/netlify-prod.yaml
@@ -0,0 +1,20 @@
+name: 'Deploy to Netlify (prod)'
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  deploy:
+    name: 'Deploy'
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v1
+      - uses: jsmrcaga/action-netlify-deploy@master
+        with:
+          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+          NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
+          BUILD_DIRECTORY: "dist"
+          NETLIFY_DEPLOY_MESSAGE: "Prod deploy v${{ github.ref }}"
+          NETLIFY_DEPLOY_TO_PROD: true
--- a/.github/workflows/prod-deploy.yaml
+++ b/.github/workflows/prod-deploy.yaml
@@ -1,56 +0,0 @@
-name: 'Production deploy'
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  deploy-to-netlify:
-    name: 'Deploy to Netlify'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v3.0.0
-      - name: Build and deploy to Netlify
-        uses: jsmrcaga/action-netlify-deploy@v1.7.2
-        with:
-          install_command: "npm ci"
-          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
-          NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
-          BUILD_DIRECTORY: "dist"
-          NETLIFY_DEPLOY_MESSAGE: "Prod deploy v${{ github.ref }}"
-          NETLIFY_DEPLOY_TO_PROD: true
-      - name: Get version from tag
-        id: vars
-        run: echo ::set-output name=tag::${GITHUB_REF#refs/*/}
-      - name: Create tar.gz
-        run: tar -czvf cinny-${{ steps.vars.outputs.tag }}.tar.gz dist
-      - name: Upload tagged release
-        uses: softprops/action-gh-release@v1
-        with:
-          files: |
-            cinny-${{ steps.vars.outputs.tag }}.tar.gz
-
-  push_to_dockerhub:
-    name: Push Docker image to Docker Hub
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v3.0.0
-      - name: Login to Docker Hub
-        uses: docker/login-action@v1.14.1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v3.6.2
-        with:
-          images: ajbura/cinny
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v2.10.0
-        with:
-          context: .
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
--- 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/14
+++ b/14
@@ -1,18 +1,20 @@
 ## Builder
-FROM node:17.7.1-alpine3.15 as builder
+FROM node:14-alpine as builder

 WORKDIR /src

-COPY package.json package-lock.json /src/
-RUN npm ci
-COPY . /src/
-RUN npm run build
+COPY . /src
+RUN npm install \
+  && npm run build


 ## App
-FROM nginx:1.21.6-alpine
+FROM nginx:alpine

 COPY --from=builder /src/dist /app

+# Insert wasm type into Nginx mime.types file so they load correctly.
+RUN sed -i '3i\ \ \ \ application/wasm wasm\;' /etc/nginx/mime.types
+
 RUN rm -rf /usr/share/nginx/html \
  && ln -s /app /usr/share/nginx/html
--- a/README.md
+++ b/README.md
@@ -5,7 +5,6 @@
 - [About](#about)
 - [Getting Started](https://cinny.in)
 - [Contributing](./CONTRIBUTING.md)
- [Roadmap](https://github.com/ajbura/cinny/projects/11)

 ## About <a name = "about"></a>

@@ -25,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
@@ -53,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,11 +0,0 @@
-{
-  "defaultHomeserver": 4,
-  "homeserverList": [
-    "converser.eu",
-    "envs.net",
-    "halogen.city",
-    "kde.org",
-    "matrix.org",
-    "chat.mozilla.org"
-  ]
-}
--- 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.8.1",
+  "version": "1.3.2",
  "description": "Yet another matrix client",
  "main": "index.js",
  "engines": {
@@ -15,71 +15,65 @@
  "author": "Ajay Bura",
  "license": "MIT",
  "dependencies": {
-    "@fontsource/inter": "^4.5.5",
-    "@fontsource/roboto": "^4.5.3",
-    "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.8.tgz",
-    "@tippyjs/react": "^4.2.6",
+    "@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": "^5.0.3",
-    "emojibase-data": "^7.0.1",
-    "file-saver": "^2.0.5",
-    "flux": "^4.0.3",
-    "formik": "^2.2.9",
-    "html-react-parser": "^1.4.8",
-    "linkifyjs": "^2.1.9",
-    "matrix-js-sdk": "^15.6.0",
-    "micromark": "^3.0.10",
-    "micromark-extension-gfm": "^2.0.1",
-    "micromark-util-chunked": "^1.0.0",
-    "micromark-util-resolve-all": "^1.0.0",
-    "micromark-util-symbol": "^1.0.1",
-    "prop-types": "^15.8.1",
+    "dateformat": "^4.5.1",
+    "emojibase-data": "^6.2.0",
+    "flux": "^4.0.1",
+    "html-react-parser": "^1.2.7",
+    "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",
    "react": "^17.0.2",
    "react-autosize-textarea": "^7.1.0",
-    "react-dnd": "^15.1.1",
-    "react-dnd-html5-backend": "^15.1.2",
    "react-dom": "^17.0.2",
    "react-google-recaptcha": "^2.1.0",
-    "react-modal": "^3.14.4",
-    "sanitize-html": "^2.7.0",
-    "tippy.js": "^6.3.7",
-    "twemoji": "^14.0.1"
+    "react-markdown": "^6.0.1",
+    "react-modal": "^3.13.1",
+    "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"
  },
  "devDependencies": {
-    "@babel/core": "^7.17.7",
-    "@babel/preset-env": "^7.16.11",
-    "@babel/preset-react": "^7.16.7",
+    "@babel/core": "^7.15.5",
+    "@babel/preset-env": "^7.13.12",
+    "@babel/preset-react": "^7.13.13",
    "assert": "^2.0.0",
    "babel-loader": "^8.2.2",
    "browserify-fs": "^1.0.0",
    "buffer": "^6.0.3",
-    "clean-webpack-plugin": "^4.0.0",
-    "copy-webpack-plugin": "^10.2.4",
+    "clean-webpack-plugin": "^3.0.0",
+    "copy-webpack-plugin": "^9.0.1",
    "crypto-browserify": "^3.12.0",
-    "css-loader": "^6.7.1",
-    "css-minimizer-webpack-plugin": "^3.4.1",
-    "eslint": "^8.11.0",
-    "eslint-config-airbnb": "^19.0.4",
+    "css-loader": "^5.2.0",
+    "css-minimizer-webpack-plugin": "^1.3.0",
+    "eslint": "^7.23.0",
+    "eslint-config-airbnb": "^18.2.1",
    "eslint-plugin-import": "^2.22.1",
    "eslint-plugin-jsx-a11y": "^6.4.1",
-    "eslint-plugin-react": "^7.29.4",
+    "eslint-plugin-react": "^7.23.1",
    "eslint-plugin-react-hooks": "^4.2.0",
-    "favicons": "^6.2.2",
+    "favicons": "^6.2.1",
    "favicons-webpack-plugin": "^5.0.2",
-    "html-loader": "^3.1.0",
+    "file-loader": "^6.2.0",
+    "html-loader": "^2.1.2",
    "html-webpack-plugin": "^5.3.1",
-    "mini-css-extract-plugin": "^2.6.0",
+    "mini-css-extract-plugin": "^1.4.0",
    "path-browserify": "^1.0.1",
-    "sass": "^1.49.9",
-    "sass-loader": "^12.6.0",
+    "sass": "^1.32.8",
+    "sass-loader": "^11.0.1",
    "stream-browserify": "^3.0.0",
-    "style-loader": "^3.3.1",
-    "url": "^0.11.0",
+    "style-loader": "^2.0.0",
    "util": "^0.12.4",
-    "webpack": "^5.70.0",
-    "webpack-cli": "^4.9.2",
-    "webpack-dev-server": "^4.7.4",
+    "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
@@ -4,6 +4,7 @@
    <meta charset="UTF-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <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/LICENSE
+++ b/public/res/LICENSE
@@ -1,395 +0,0 @@
-Attribution 4.0 International
-
-=======================================================================
-
-Creative Commons Corporation ("Creative Commons") is not a law firm and
-does not provide legal services or legal advice. Distribution of
-Creative Commons public licenses does not create a lawyer-client or
-other relationship. Creative Commons makes its licenses and related
-information available on an "as-is" basis. Creative Commons gives no
-warranties regarding its licenses, any material licensed under their
-terms and conditions, or any related information. Creative Commons
-disclaims all liability for damages resulting from their use to the
-fullest extent possible.
-
-Using Creative Commons Public Licenses
-
-Creative Commons public licenses provide a standard set of terms and
-conditions that creators and other rights holders may use to share
-original works of authorship and other material subject to copyright
-and certain other rights specified in the public license below. The
-following considerations are for informational purposes only, are not
-exhaustive, and do not form part of our licenses.
-
-     Considerations for licensors: Our public licenses are
-     intended for use by those authorized to give the public
-     permission to use material in ways otherwise restricted by
-     copyright and certain other rights. Our licenses are
-     irrevocable. Licensors should read and understand the terms
-     and conditions of the license they choose before applying it.
-     Licensors should also secure all rights necessary before
-     applying our licenses so that the public can reuse the
-     material as expected. Licensors should clearly mark any
-     material not subject to the license. This includes other CC-
-     licensed material, or material used under an exception or
-     limitation to copyright. More considerations for licensors:
-    wiki.creativecommons.org/Considerations_for_licensors
-
-     Considerations for the public: By using one of our public
-     licenses, a licensor grants the public permission to use the
-     licensed material under specified terms and conditions. If
-     the licensor's permission is not necessary for any reason--for
-     example, because of any applicable exception or limitation to
-     copyright--then that use is not regulated by the license. Our
-     licenses grant only permissions under copyright and certain
-     other rights that a licensor has authority to grant. Use of
-     the licensed material may still be restricted for other
-     reasons, including because others have copyright or other
-     rights in the material. A licensor may make special requests,
-     such as asking that all changes be marked or described.
-     Although not required by our licenses, you are encouraged to
-     respect those requests where reasonable. More considerations
-     for the public:
-    wiki.creativecommons.org/Considerations_for_licensees
-
-=======================================================================
-
-Creative Commons Attribution 4.0 International Public License
-
-By exercising the Licensed Rights (defined below), You accept and agree
-to be bound by the terms and conditions of this Creative Commons
-Attribution 4.0 International Public License ("Public License"). To the
-extent this Public License may be interpreted as a contract, You are
-granted the Licensed Rights in consideration of Your acceptance of
-these terms and conditions, and the Licensor grants You such rights in
-consideration of benefits the Licensor receives from making the
-Licensed Material available under these terms and conditions.
-
-
-Section 1 -- Definitions.
-
-  a. Adapted Material means material subject to Copyright and Similar
-     Rights that is derived from or based upon the Licensed Material
-     and in which the Licensed Material is translated, altered,
-     arranged, transformed, or otherwise modified in a manner requiring
-     permission under the Copyright and Similar Rights held by the
-     Licensor. For purposes of this Public License, where the Licensed
-     Material is a musical work, performance, or sound recording,
-     Adapted Material is always produced where the Licensed Material is
-     synched in timed relation with a moving image.
-
-  b. Adapter's License means the license You apply to Your Copyright
-     and Similar Rights in Your contributions to Adapted Material in
-     accordance with the terms and conditions of this Public License.
-
-  c. Copyright and Similar Rights means copyright and/or similar rights
-     closely related to copyright including, without limitation,
-     performance, broadcast, sound recording, and Sui Generis Database
-     Rights, without regard to how the rights are labeled or
-     categorized. For purposes of this Public License, the rights
-     specified in Section 2(b)(1)-(2) are not Copyright and Similar
-     Rights.
-
-  d. Effective Technological Measures means those measures that, in the
-     absence of proper authority, may not be circumvented under laws
-     fulfilling obligations under Article 11 of the WIPO Copyright
-     Treaty adopted on December 20, 1996, and/or similar international
-     agreements.
-
-  e. Exceptions and Limitations means fair use, fair dealing, and/or
-     any other exception or limitation to Copyright and Similar Rights
-     that applies to Your use of the Licensed Material.
-
-  f. Licensed Material means the artistic or literary work, database,
-     or other material to which the Licensor applied this Public
-     License.
-
-  g. Licensed Rights means the rights granted to You subject to the
-     terms and conditions of this Public License, which are limited to
-     all Copyright and Similar Rights that apply to Your use of the
-     Licensed Material and that the Licensor has authority to license.
-
-  h. Licensor means the individual(s) or entity(ies) granting rights
-     under this Public License.
-
-  i. Share means to provide material to the public by any means or
-     process that requires permission under the Licensed Rights, such
-     as reproduction, public display, public performance, distribution,
-     dissemination, communication, or importation, and to make material
-     available to the public including in ways that members of the
-     public may access the material from a place and at a time
-     individually chosen by them.
-
-  j. Sui Generis Database Rights means rights other than copyright
-     resulting from Directive 96/9/EC of the European Parliament and of
-     the Council of 11 March 1996 on the legal protection of databases,
-     as amended and/or succeeded, as well as other essentially
-     equivalent rights anywhere in the world.
-
-  k. You means the individual or entity exercising the Licensed Rights
-     under this Public License. Your has a corresponding meaning.
-
-
-Section 2 -- Scope.
-
-  a. License grant.
-
-       1. Subject to the terms and conditions of this Public License,
-          the Licensor hereby grants You a worldwide, royalty-free,
-          non-sublicensable, non-exclusive, irrevocable license to
-          exercise the Licensed Rights in the Licensed Material to:
-
-            a. reproduce and Share the Licensed Material, in whole or
-               in part; and
-
-            b. produce, reproduce, and Share Adapted Material.
-
-       2. Exceptions and Limitations. For the avoidance of doubt, where
-          Exceptions and Limitations apply to Your use, this Public
-          License does not apply, and You do not need to comply with
-          its terms and conditions.
-
-       3. Term. The term of this Public License is specified in Section
-          6(a).
-
-       4. Media and formats; technical modifications allowed. The
-          Licensor authorizes You to exercise the Licensed Rights in
-          all media and formats whether now known or hereafter created,
-          and to make technical modifications necessary to do so. The
-          Licensor waives and/or agrees not to assert any right or
-          authority to forbid You from making technical modifications
-          necessary to exercise the Licensed Rights, including
-          technical modifications necessary to circumvent Effective
-          Technological Measures. For purposes of this Public License,
-          simply making modifications authorized by this Section 2(a)
-          (4) never produces Adapted Material.
-
-       5. Downstream recipients.
-
-            a. Offer from the Licensor -- Licensed Material. Every
-               recipient of the Licensed Material automatically
-               receives an offer from the Licensor to exercise the
-               Licensed Rights under the terms and conditions of this
-               Public License.
-
-            b. No downstream restrictions. You may not offer or impose
-               any additional or different terms or conditions on, or
-               apply any Effective Technological Measures to, the
-               Licensed Material if doing so restricts exercise of the
-               Licensed Rights by any recipient of the Licensed
-               Material.
-
-       6. No endorsement. Nothing in this Public License constitutes or
-          may be construed as permission to assert or imply that You
-          are, or that Your use of the Licensed Material is, connected
-          with, or sponsored, endorsed, or granted official status by,
-          the Licensor or others designated to receive attribution as
-          provided in Section 3(a)(1)(A)(i).
-
-  b. Other rights.
-
-       1. Moral rights, such as the right of integrity, are not
-          licensed under this Public License, nor are publicity,
-          privacy, and/or other similar personality rights; however, to
-          the extent possible, the Licensor waives and/or agrees not to
-          assert any such rights held by the Licensor to the limited
-          extent necessary to allow You to exercise the Licensed
-          Rights, but not otherwise.
-
-       2. Patent and trademark rights are not licensed under this
-          Public License.
-
-       3. To the extent possible, the Licensor waives any right to
-          collect royalties from You for the exercise of the Licensed
-          Rights, whether directly or through a collecting society
-          under any voluntary or waivable statutory or compulsory
-          licensing scheme. In all other cases the Licensor expressly
-          reserves any right to collect such royalties.
-
-
-Section 3 -- License Conditions.
-
-Your exercise of the Licensed Rights is expressly made subject to the
-following conditions.
-
-  a. Attribution.
-
-       1. If You Share the Licensed Material (including in modified
-          form), You must:
-
-            a. retain the following if it is supplied by the Licensor
-               with the Licensed Material:
-
-                 i. identification of the creator(s) of the Licensed
-                    Material and any others designated to receive
-                    attribution, in any reasonable manner requested by
-                    the Licensor (including by pseudonym if
-                    designated);
-
-                ii. a copyright notice;
-
-               iii. a notice that refers to this Public License;
-
-                iv. a notice that refers to the disclaimer of
-                    warranties;
-
-                 v. a URI or hyperlink to the Licensed Material to the
-                    extent reasonably practicable;
-
-            b. indicate if You modified the Licensed Material and
-               retain an indication of any previous modifications; and
-
-            c. indicate the Licensed Material is licensed under this
-               Public License, and include the text of, or the URI or
-               hyperlink to, this Public License.
-
-       2. You may satisfy the conditions in Section 3(a)(1) in any
-          reasonable manner based on the medium, means, and context in
-          which You Share the Licensed Material. For example, it may be
-          reasonable to satisfy the conditions by providing a URI or
-          hyperlink to a resource that includes the required
-          information.
-
-       3. If requested by the Licensor, You must remove any of the
-          information required by Section 3(a)(1)(A) to the extent
-          reasonably practicable.
-
-       4. If You Share Adapted Material You produce, the Adapter's
-          License You apply must not prevent recipients of the Adapted
-          Material from complying with this Public License.
-
-
-Section 4 -- Sui Generis Database Rights.
-
-Where the Licensed Rights include Sui Generis Database Rights that
-apply to Your use of the Licensed Material:
-
-  a. for the avoidance of doubt, Section 2(a)(1) grants You the right
-     to extract, reuse, reproduce, and Share all or a substantial
-     portion of the contents of the database;
-
-  b. if You include all or a substantial portion of the database
-     contents in a database in which You have Sui Generis Database
-     Rights, then the database in which You have Sui Generis Database
-     Rights (but not its individual contents) is Adapted Material; and
-
-  c. You must comply with the conditions in Section 3(a) if You Share
-     all or a substantial portion of the contents of the database.
-
-For the avoidance of doubt, this Section 4 supplements and does not
-replace Your obligations under this Public License where the Licensed
-Rights include other Copyright and Similar Rights.
-
-
-Section 5 -- Disclaimer of Warranties and Limitation of Liability.
-
-  a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
-     EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
-     AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
-     ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
-     IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
-     WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
-     PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
-     ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
-     KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
-     ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
-
-  b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
-     TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
-     NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
-     INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
-     COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
-     USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
-     ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
-     DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
-     IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
-
-  c. The disclaimer of warranties and limitation of liability provided
-     above shall be interpreted in a manner that, to the extent
-     possible, most closely approximates an absolute disclaimer and
-     waiver of all liability.
-
-
-Section 6 -- Term and Termination.
-
-  a. This Public License applies for the term of the Copyright and
-     Similar Rights licensed here. However, if You fail to comply with
-     this Public License, then Your rights under this Public License
-     terminate automatically.
-
-  b. Where Your right to use the Licensed Material has terminated under
-     Section 6(a), it reinstates:
-
-       1. automatically as of the date the violation is cured, provided
-          it is cured within 30 days of Your discovery of the
-          violation; or
-
-       2. upon express reinstatement by the Licensor.
-
-     For the avoidance of doubt, this Section 6(b) does not affect any
-     right the Licensor may have to seek remedies for Your violations
-     of this Public License.
-
-  c. For the avoidance of doubt, the Licensor may also offer the
-     Licensed Material under separate terms or conditions or stop
-     distributing the Licensed Material at any time; however, doing so
-     will not terminate this Public License.
-
-  d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
-     License.
-
-
-Section 7 -- Other Terms and Conditions.
-
-  a. The Licensor shall not be bound by any additional or different
-     terms or conditions communicated by You unless expressly agreed.
-
-  b. Any arrangements, understandings, or agreements regarding the
-     Licensed Material not stated herein are separate from and
-     independent of the terms and conditions of this Public License.
-
-
-Section 8 -- Interpretation.
-
-  a. For the avoidance of doubt, this Public License does not, and
-     shall not be interpreted to, reduce, limit, restrict, or impose
-     conditions on any use of the Licensed Material that could lawfully
-     be made without permission under this Public License.
-
-  b. To the extent possible, if any provision of this Public License is
-     deemed unenforceable, it shall be automatically reformed to the
-     minimum extent necessary to make it enforceable. If the provision
-     cannot be reformed, it shall be severed from this Public License
-     without affecting the enforceability of the remaining terms and
-     conditions.
-
-  c. No term or condition of this Public License will be waived and no
-     failure to comply consented to unless expressly agreed to by the
-     Licensor.
-
-  d. Nothing in this Public License constitutes or may be interpreted
-     as a limitation upon, or waiver of, any privileges and immunities
-     that apply to the Licensor or You, including from the legal
-     processes of any jurisdiction or authority.
-
-
-=======================================================================
-
-Creative Commons is not a party to its public
-licenses. Notwithstanding, Creative Commons may elect to apply one of
-its public licenses to material it publishes and in those instances
-will be considered the “Licensor.” The text of the Creative Commons
-public licenses is dedicated to the public domain under the CC0 Public
-Domain Dedication. Except for the limited purpose of indicating that
-material is shared under a Creative Commons public license or as
-otherwise permitted by the Creative Commons policies published at
-creativecommons.org/policies, Creative Commons does not authorize the
-use of the trademark "Creative Commons" or any other trademark or logo
-of Creative Commons without its prior written consent including,
-without limitation, in connection with any unauthorized modifications
-to any of its public licenses or any other arrangements,
-understandings, or agreements concerning use of licensed material. For
-the avoidance of doubt, this paragraph does not form part of the
-public licenses.
-
-Creative Commons may be contacted at creativecommons.org.
--- a/public/res/README.md
+++ b/public/res/README.md
@@ -1,7 +0,0 @@
-Graphics (c) by Ajay Bura (ajbura)
-
-Graphic content is licensed under a
-Creative Commons Attribution 4.0 International License.
-
-You should have received a copy of the license along with this
-work. If not, see <http://creativecommons.org/licenses/by/4.0/>;.
--- a/public/res/ic/filled/category.svg
+++ b/public/res/ic/filled/category.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>
-	<path fill="#231F20" d="M9,11H5c-1.1,0-2-0.9-2-2V5c0-1.1,0.9-2,2-2h4c1.1,0,2,0.9,2,2v4C11,10.1,10.1,11,9,11z"/>
-</g>
-<g>
-	<path fill="#231F20" d="M19,11h-4c-1.1,0-2-0.9-2-2V5c0-1.1,0.9-2,2-2h4c1.1,0,2,0.9,2,2v4C21,10.1,20.1,11,19,11z"/>
-</g>
-<g>
-	<path fill="#231F20" d="M9,21H5c-1.1,0-2-0.9-2-2v-4c0-1.1,0.9-2,2-2h4c1.1,0,2,0.9,2,2v4C11,20.1,10.1,21,9,21z"/>
-</g>
-<g>
-	<path fill="#231F20" d="M19,21h-4c-1.1,0-2-0.9-2-2v-4c0-1.1,0.9-2,2-2h4c1.1,0,2,0.9,2,2v4C21,20.1,20.1,21,19,21z"/>
-</g>
-</svg>
--- a/public/res/ic/outlined/add-pin.svg
+++ b/public/res/ic/outlined/add-pin.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="M13.8,4.7l0.7,0.7l-3.4,3.4L7.7,10l-1-1l-1.4,1.4l3.5,3.5l-5.7,5.7L4.6,21l5.7-5.7l3.5,3.5l1.4-1.4l-1-1l1.1-3.4l3.4-3.4
-		l0.7,0.7L20.9,9l-5.7-5.7L13.8,4.7z M13.7,12l-1,2.9l-3.4-3.4l2.9-1l3.7-3.7l1.4,1.4L13.7,12z"/>
-	<polygon points="10,3.3 7.8,3.3 7.8,1 6.3,1 6.3,3.3 4,3.3 4,4.8 6.3,4.8 6.3,7 7.8,7 7.8,4.8 10,4.8 	"/>
-</g>
-</svg>
--- a/public/res/ic/outlined/category.svg
+++ b/public/res/ic/outlined/category.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 fill="#221F1F" d="M9,5v4H5V5H9 M9,3H5C3.9,3,3,3.9,3,5v4c0,1.1,0.9,2,2,2h4c1.1,0,2-0.9,2-2V5C11,3.9,10.1,3,9,3L9,3z"/>
-	<path fill="#221F1F" d="M19,5v4h-4V5H19 M19,3h-4c-1.1,0-2,0.9-2,2v4c0,1.1,0.9,2,2,2h4c1.1,0,2-0.9,2-2V5C21,3.9,20.1,3,19,3L19,3
-		z"/>
-	<path fill="#221F1F" d="M9,15v4H5v-4H9 M9,13H5c-1.1,0-2,0.9-2,2v4c0,1.1,0.9,2,2,2h4c1.1,0,2-0.9,2-2v-4C11,13.9,10.1,13,9,13
-		L9,13z"/>
-	<path fill="#221F1F" d="M19,15v4h-4v-4H19 M19,13h-4c-1.1,0-2,0.9-2,2v4c0,1.1,0.9,2,2,2h4c1.1,0,2-0.9,2-2v-4
-		C21,13.9,20.1,13,19,13L19,13z"/>
-</g>
-</svg>
--- 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/horizontal-menu.svg
+++ b/public/res/ic/outlined/horizontal-menu.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>
-	<circle cx="5" cy="12" r="2"/>
-	<circle cx="12" cy="12" r="2"/>
-	<circle cx="19" cy="12" r="2"/>
-</g>
-</svg>
--- a/public/res/ic/outlined/recent-clock.svg
+++ b/public/res/ic/outlined/recent-clock.svg
@@ -1,16 +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 fill="#010101" points="11,6 11,12 15.2,16.2 16.7,14.8 13,11.2 13,6 	"/>
-	<path fill="#010101" d="M12,2C6.5,2,2,6.5,2,12H0.2L3,14.8L5.8,12H4c0-4.4,3.6-8,8-8s8,3.6,8,8s-3.6,8-8,8c-1.9,0-3.7-0.7-5-1.8
-		l-1.2,1.6C7.4,21.2,9.6,22,12,22c5.5,0,10-4.5,10-10S17.5,2,12,2z"/>
-</g>
-<g>
-	<polygon fill="#010101" points="49,44 49,50 53.2,54.2 54.7,52.8 51,49.2 51,44 	"/>
-	<path fill="#010101" d="M50,40c-5.5,0-10,4.5-10,10h-1.8l2.8,2.8l2.8-2.8H42c0-4.4,3.6-8,8-8s8,3.6,8,8s-3.6,8-8,8
-		c-1.9,0-3.7-0.7-5-1.8l-1.2,1.6c1.7,1.4,3.9,2.2,6.3,2.2c5.5,0,10-4.5,10-10S55.5,40,50,40z"/>
-</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/ic/outlined/space-plus.svg
+++ b/public/res/ic/outlined/space-plus.svg
@@ -1,12 +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="M19,0c-2.8,0-5,2.2-5,5s2.2,5,5,5s5-2.2,5-5S21.8,0,19,0z M22,5.8h-2.3V8h-1.5V5.8H16V4.3h2.3V2h1.5v2.3H22V5.8z"/>
-</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/public/res/svg/matrix-logo.svg
+++ b/public/res/svg/matrix-logo.svg
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="789.322px" height="336.807px" viewBox="0 0 789.322 336.807" enable-background="new 0 0 789.322 336.807"
+	 xml:space="preserve">
+<path d="M8.876,7.71v321.386h23.13v7.711H0V0h32.006v7.71H8.876z"/>
+<path d="M97.989,109.594v16.264h0.463c4.338-6.191,9.563-10.998,15.684-14.406c6.117-3.402,13.129-5.11,21.027-5.11
+	c7.588,0,14.521,1.475,20.793,4.415c6.274,2.945,11.038,8.131,14.291,15.567c3.56-5.265,8.4-9.913,14.521-13.94
+	c6.117-4.025,13.358-6.042,21.724-6.042c6.351,0,12.234,0.776,17.66,2.325c5.418,1.549,10.065,4.027,13.938,7.434
+	c3.869,3.41,6.889,7.863,9.062,13.357c2.167,5.504,3.253,12.122,3.253,19.869v80.385h-32.993v-68.074
+	c0-4.025-0.154-7.82-0.465-11.385c-0.313-3.56-1.161-6.656-2.555-9.293c-1.395-2.631-3.45-4.724-6.157-6.274
+	c-2.711-1.543-6.391-2.322-11.037-2.322s-8.403,0.896-11.269,2.671c-2.868,1.784-5.112,4.109-6.737,6.971
+	c-1.626,2.869-2.711,6.12-3.252,9.762c-0.545,3.638-0.814,7.318-0.814,11.035v66.91h-32.991v-67.375c0-3.562-0.081-7.087-0.23-10.57
+	c-0.158-3.487-0.814-6.7-1.978-9.645c-1.162-2.94-3.099-5.304-5.809-7.088c-2.711-1.775-6.699-2.671-11.965-2.671
+	c-1.551,0-3.603,0.349-6.156,1.048c-2.556,0.697-5.036,2.016-7.435,3.949c-2.404,1.938-4.454,4.726-6.158,8.363
+	c-1.705,3.642-2.556,8.402-2.556,14.287v69.701h-32.99V109.594H97.989z"/>
+<path d="M271.545,127.254c3.405-5.113,7.744-9.215,13.012-12.316c5.264-3.097,11.186-5.303,17.771-6.621
+	c6.582-1.315,13.205-1.976,19.865-1.976c6.042,0,12.158,0.428,18.354,1.277c6.195,0.855,11.85,2.522,16.962,4.997
+	c5.111,2.477,9.292,5.926,12.546,10.338c3.253,4.414,4.879,10.262,4.879,17.543v62.494c0,5.428,0.31,10.611,0.931,15.567
+	c0.615,4.959,1.701,8.676,3.251,11.153h-33.455c-0.621-1.86-1.126-3.755-1.511-5.693c-0.39-1.933-0.661-3.908-0.813-5.923
+	c-5.267,5.422-11.465,9.217-18.585,11.386c-7.127,2.163-14.407,3.251-21.842,3.251c-5.733,0-11.077-0.698-16.033-2.09
+	c-4.958-1.395-9.293-3.562-13.01-6.51c-3.718-2.938-6.622-6.656-8.713-11.147s-3.138-9.84-3.138-16.033
+	c0-6.813,1.199-12.43,3.604-16.84c2.399-4.417,5.495-7.939,9.295-10.575c3.793-2.632,8.129-4.607,13.01-5.923
+	c4.878-1.315,9.795-2.358,14.752-3.137c4.957-0.772,9.835-1.393,14.638-1.857c4.801-0.466,9.062-1.164,12.779-2.093
+	c3.718-0.929,6.658-2.282,8.829-4.065c2.165-1.781,3.172-4.375,3.02-7.785c0-3.56-0.58-6.389-1.742-8.479
+	c-1.161-2.09-2.711-3.719-4.646-4.88c-1.937-1.161-4.183-1.936-6.737-2.325c-2.557-0.382-5.309-0.58-8.248-0.58
+	c-6.506,0-11.617,1.395-15.335,4.183c-3.716,2.788-5.889,7.437-6.506,13.94h-32.991C266.2,138.793,268.133,132.362,271.545,127.254z
+	 M336.714,173.837c-2.09,0.696-4.337,1.275-6.736,1.741c-2.402,0.465-4.918,0.853-7.551,1.161c-2.635,0.313-5.268,0.698-7.899,1.163
+	c-2.48,0.461-4.919,1.086-7.317,1.857c-2.404,0.779-4.495,1.822-6.274,3.138c-1.784,1.317-3.216,2.985-4.3,4.994
+	c-1.085,2.014-1.626,4.571-1.626,7.668c0,2.94,0.541,5.422,1.626,7.431c1.084,2.017,2.558,3.604,4.416,4.765
+	s4.025,1.976,6.507,2.438c2.475,0.466,5.031,0.698,7.665,0.698c6.505,0,11.537-1.082,15.103-3.253
+	c3.561-2.166,6.192-4.762,7.899-7.785c1.702-3.019,2.749-6.072,3.137-9.174c0.384-3.097,0.58-5.576,0.58-7.434V170.93
+	C340.548,172.172,338.806,173.139,336.714,173.837z"/>
+<path d="M461.826,109.594v22.072h-24.161v59.479c0,5.573,0.928,9.292,2.788,11.149c1.856,1.859,5.576,2.788,11.152,2.788
+	c1.859,0,3.638-0.076,5.343-0.232c1.703-0.152,3.33-0.388,4.878-0.696v25.557c-2.788,0.465-5.887,0.773-9.293,0.931
+	c-3.407,0.149-6.737,0.23-9.99,0.23c-5.111,0-9.953-0.35-14.521-1.048c-4.571-0.695-8.597-2.047-12.081-4.063
+	c-3.486-2.011-6.236-4.88-8.248-8.597c-2.016-3.714-3.021-8.595-3.021-14.639v-70.859h-19.98v-22.072h19.98V73.582h32.992v36.012
+	H461.826z"/>
+<path d="M508.989,109.594v22.306h0.465c1.546-3.72,3.636-7.163,6.272-10.341c2.634-3.172,5.652-5.885,9.06-8.131
+	c3.405-2.242,7.047-3.985,10.923-5.228c3.868-1.237,7.898-1.859,12.081-1.859c2.168,0,4.566,0.39,7.202,1.163v30.67
+	c-1.551-0.312-3.41-0.584-5.576-0.814c-2.17-0.233-4.26-0.35-6.274-0.35c-6.041,0-11.152,1.01-15.332,3.021
+	c-4.182,2.014-7.55,4.761-10.107,8.247c-2.555,3.487-4.379,7.55-5.462,12.198c-1.083,4.645-1.625,9.682-1.625,15.102v54.133h-32.991
+	V109.594H508.989z"/>
+<path d="M568.931,91.006V63.823h32.994v27.183H568.931z M601.925,109.594v120.117h-32.994V109.594H601.925z"/>
+<path d="M619.116,109.594h37.637l21.144,31.365l20.911-31.365h36.476l-39.496,56.226l44.377,63.892h-37.64l-25.093-37.87
+	l-25.094,37.87H615.4l43.213-63.193L619.116,109.594z"/>
+<path d="M780.444,329.096V7.71h-23.13V0h32.008v336.807h-32.008v-7.711H780.444z"/>
+</svg>
--- a/src/app/atoms/avatar/Avatar.jsx
+++ b/src/app/atoms/avatar/Avatar.jsx
@@ -1,62 +1,47 @@
-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';
-import { avatarInitials } from '../../../util/common';
-
-const Avatar = React.forwardRef(({
-  text, bgColor, iconSrc, iconColor, imageSrc, size,
-}, ref) => {
+function Avatar({
+  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 ref={ref} className={`avatar-container avatar-container__${size} noselect`}>
+    <div className={`avatar-container avatar-container__${size} noselect`}>
      {
-        imageSrc !== null
-          ? (
-            <img
-              draggable="false"
-              src={imageSrc}
-              onLoad={(e) => { e.target.style.backgroundColor = 'transparent'; }}
-              onError={(e) => { e.target.src = ImageBrokenSVG; }}
-              alt=""
-            />
-          )
+        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(avatarInitials(text))}
-                    </Text>
-                  )
+                  ? <RawIcon size={size} src={iconSrc} />
+                  : text !== null && <Text variant={textSize}>{text}</Text>
              }
            </span>
          )
      }
    </div>
  );
-});
+}

 Avatar.defaultProps = {
  text: null,
  bgColor: 'transparent',
  iconSrc: null,
-  iconColor: null,
  imageSrc: null,
  size: 'normal',
 };
@@ -65,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,17 +24,19 @@
    height: var(--av-extra-small);
  }

-  > img {
+
+  img {
    width: 100%;
    height: 100%;
    object-fit: cover;
    border-radius: inherit;
-    background-color: var(--bg-surface-hover);
+  }
+
+  .avatar__bordered {
+    box-shadow: var(--bs-surface-border);
  }

  .avatar__border {
-    @extend .cp-fx__row--c-c;
-    
    position: absolute;
    top: 0;
    left: 0;
@@ -46,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/avatar/render.js
+++ b/src/app/atoms/avatar/render.js
@@ -1,61 +0,0 @@
-import { avatarInitials } from '../../../util/common';
-
-function cssVar(name) {
-  return getComputedStyle(document.body).getPropertyValue(name);
-}
-
-// renders the avatar and returns it as an URL
-export default async function renderAvatar({
-  text, bgColor, imageSrc, size, borderRadius, scale,
-}) {
-  try {
-    const canvas = document.createElement('canvas');
-    canvas.width = size * scale;
-    canvas.height = size * scale;
-
-    const ctx = canvas.getContext('2d');
-
-    ctx.scale(scale, scale);
-
-    // rounded corners
-    ctx.beginPath();
-    ctx.moveTo(size, size);
-    ctx.arcTo(0, size, 0, 0, borderRadius);
-    ctx.arcTo(0, 0, size, 0, borderRadius);
-    ctx.arcTo(size, 0, size, size, borderRadius);
-    ctx.arcTo(size, size, 0, size, borderRadius);
-
-    if (imageSrc) {
-      // clip corners of image
-      ctx.closePath();
-      ctx.clip();
-
-      const img = new Image();
-      img.crossOrigin = 'anonymous';
-      const promise = new Promise((resolve, reject) => {
-        img.onerror = reject;
-        img.onload = resolve;
-      });
-      img.src = imageSrc;
-      await promise;
-
-      ctx.drawImage(img, 0, 0, size, size);
-    } else {
-      // colored background
-      ctx.fillStyle = cssVar(bgColor);
-      ctx.fill();
-
-      // centered letter
-      ctx.fillStyle = '#fff';
-      ctx.font = `${cssVar('--fs-s1')} ${cssVar('--font-primary')}`;
-      ctx.textBaseline = 'middle';
-      ctx.textAlign = 'center';
-      ctx.fillText(avatarInitials(text), size / 2, size / 2);
-    }
-
-    return canvas.toDataURL();
-  } catch (e) {
-    console.error(e);
-    return imageSrc;
-  }
-}
--- 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,6 +1,4 @@
@use 'state';
-@use '../../partials/dir';
-@use '../../partials/text';

 .btn-surface,
 .btn-primary,
@@ -19,16 +17,28 @@
  cursor: pointer;
  @include state.disabled;

-  & .text {
-    @extend .cp-txt__ellipsis;
-  }
-  
  &--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));
-      flex-shrink: 0;
+      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,39 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import './Checkbox.scss';
-
-function Checkbox({
-  variant, isActive, onToggle,
-  disabled, tabIndex,
-}) {
-  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}
-      tabIndex={tabIndex}
-    />
-  );
-}
-
-Checkbox.defaultProps = {
-  variant: 'primary',
-  isActive: false,
-  onToggle: null,
-  disabled: false,
-  tabIndex: 0,
-};
-
-Checkbox.propTypes = {
-  variant: PropTypes.oneOf(['primary', 'positive', 'caution', 'danger']),
-  isActive: PropTypes.bool,
-  onToggle: PropTypes.func,
-  disabled: PropTypes.bool,
-  tabIndex: PropTypes.number,
-};
-
-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, autoFocus,
+  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,14 +28,11 @@ function Input({
            onChange={onChange}
            onResize={onResize}
            onKeyDown={onKeyDown}
-            disabled={disabled}
-            autoFocus={autoFocus}
          />
        ) : (
          <input
            ref={forwardRef}
            id={id}
-            name={name}
            className={`input ${state !== 'normal' ? ` input--${state}` : ''}`}
            type={type}
            placeholder={placeholder}
@@ -45,9 +41,6 @@ function Input({
            autoComplete="off"
            onChange={onChange}
            onKeyDown={onKeyDown}
-            disabled={disabled}
-            // eslint-disable-next-line jsx-a11y/no-autofocus
-            autoFocus={autoFocus}
          />
        )}
    </div>
@@ -56,7 +49,6 @@ function Input({

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

 Input.propTypes = {
  id: PropTypes.string,
-  name: PropTypes.string,
  label: PropTypes.string,
  value: PropTypes.string,
  placeholder: PropTypes.string,
@@ -88,8 +77,6 @@ Input.propTypes = {
  onResize: PropTypes.func,
  state: PropTypes.oneOf(['normal', 'success', 'error']),
  onKeyDown: PropTypes.func,
-  disabled: PropTypes.bool,
-  autoFocus: 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
@@ -1,11 +1,9 @@
-import React, { useEffect } from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
 import './RawModal.scss';

 import Modal from 'react-modal';

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

 function RawModal({
@@ -25,11 +23,6 @@ function RawModal({
    default:
      modalClass += 'raw-modal__small ';
  }
-
-  useEffect(() => {
-    navigation.setIsRawModalVisible(isOpen);
-  }, [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/useCategorizedSpaces.js
+++ b/src/app/hooks/useCategorizedSpaces.js
@@ -1,25 +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 useCategorizedSpaces() {
-  const { accountData } = initMatrix;
-  const [categorizedSpaces, setCategorizedSpaces] = useState([...accountData.categorizedSpaces]);
-
-  useEffect(() => {
-    const handleCategorizedSpaces = () => {
-      setCategorizedSpaces([...accountData.categorizedSpaces]);
-    };
-    accountData.on(cons.events.accountData.CATEGORIZE_SPACE_UPDATED, handleCategorizedSpaces);
-    return () => {
-      accountData.removeListener(
-        cons.events.accountData.CATEGORIZE_SPACE_UPDATED,
-        handleCategorizedSpaces,
-      );
-    };
-  }, []);
-
-  return [categorizedSpaces];
-}
--- 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/usePermission.js
+++ b/src/app/hooks/usePermission.js
@@ -1,28 +0,0 @@
-/* eslint-disable import/prefer-default-export */
-
-import { useEffect, useState } from 'react';
-
-export function usePermission(name, initial) {
-  const [state, setState] = useState(initial);
-
-  useEffect(() => {
-    let descriptor;
-
-    const update = () => setState(descriptor.state);
-
-    if (navigator.permissions?.query) {
-      navigator.permissions.query({ name }).then((_descriptor) => {
-        descriptor = _descriptor;
-
-        update();
-        descriptor.addEventListener('change', update);
-      });
-    }
-
-    return () => {
-      if (descriptor) descriptor.removeEventListener('change', update);
-    };
-  }, []);
-
-  return [state, setState];
-}
--- 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,25 +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 { accountData } = initMatrix;
-  const [spaceShortcut, setSpaceShortcut] = useState([...accountData.spaceShortcut]);
-
-  useEffect(() => {
-    const onSpaceShortcutUpdated = () => {
-      setSpaceShortcut([...accountData.spaceShortcut]);
-    };
-    accountData.on(cons.events.accountData.SPACE_SHORTCUT_UPDATED, onSpaceShortcutUpdated);
-    return () => {
-      accountData.removeListener(
-        cons.events.accountData.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,36 +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>
-              {
-                typeof title === 'string'
-                  ? <Text variant="h2" weight="medium" primary>{twemojify(title)}</Text>
-                  : title
-              }
+              <Text variant="h2">{title}</Text>
            </TitleWrapper>
            {contentOptions}
          </Header>
@@ -51,21 +42,15 @@ function Dialog({
 Dialog.defaultProps = {
  className: null,
  contentOptions: null,
-  onAfterOpen: null,
-  onAfterClose: null,
  onRequestClose: null,
-  closeFromOutside: true,
 };

 Dialog.propTypes = {
  className: PropTypes.string,
  isOpen: PropTypes.bool.isRequired,
-  title: PropTypes.node.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/dialog/Dialog.scss
+++ b/src/app/molecules/dialog/Dialog.scss
@@ -1,28 +1,28 @@
 .dialog-model {
  --modal-height: 656px;
-  max-height: min(100%, var(--modal-height));
-  display: flex;
-}
-
-.dialog,
-.dialog__content,
-.dialog__content__wrapper {
-  flex: 1;
-  min-height: 0;
-  min-width: 0;
-
-  display: flex;
+  max-height: var(--modal-height) !important;
 }

 .dialog {
+  width: 100%;
+  max-height: inherit;
  background-color: var(--bg-surface);
+  display: flex;

  &__content {
+    flex: 1;
+    min-width: 0;
+    display: flex;
    flex-direction: column;
  }
 }

+
 .dialog__content-container {
  padding-top: var(--sp-extra-tight);
  padding-bottom: var(--sp-extra-loose);
+}
+.dialog__content__wrapper {
+  flex: 1;
+  min-height: 0;
 }
--- 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,40 +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, openViewSource, 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 CmdIC from '../../../../public/res/ic/outlined/cmd.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 (
@@ -44,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 />
@@ -55,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>
  );
@@ -106,174 +103,48 @@ 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 () => {
-      try {
-        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 ***';
-        setReply({
-          to: username,
-          color: colorMXID(mEvent.getSender()),
-          body: parseReply(rawBody)?.body ?? rawBody ?? fallbackBody,
-          event: mEvent,
-        });
-      } catch {
-        setReply({
-          to: '** Unknown user **',
-          color: 'var(--tc-danger-normal)',
-          body: '*** Unable to load reply ***',
-          event: null,
-        });
-      }
-    };
-    loadReply();
-
-    return () => {
-      isMountedRef.current = false;
-    };
-  }, []);
-
-  const focusReply = (ev) => {
-    if (!ev.keyCode || ev.keyCode === 32 || ev.keyCode === 13) {
-      if (ev.keyCode) ev.preventDefault();
-      if (reply?.event === null) return;
-      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 and variation selector U+FE0F
-    if (nEmojis <= 10 && content.every((element) => (
-      (typeof element === 'object' && element.type === 'img')
-      || (typeof element === 'string' && /^[\s\ufe0f]*$/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);

-  useEffect(() => {
-    // makes the cursor end up at the end of the line instead of the beginning
-    editInputRef.current.value = '';
-    editInputRef.current.value = body;
-  }, []);
-
-  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
-        autoFocus
      />
      <div className="message__edit-btns">
        <Button type="submit" variant="primary">Save</Button>
@@ -283,489 +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))}
-          {index < userIds.length - 1 && (
-            <span style={{ opacity: '.6' }}>
-              {index === userIds.length - 2 ? ' 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 mx = initMatrix.matrixClient;
-  const reactions = {};
-  const shortcodeToEmoji = getShortcodeToCustomEmoji(room);
-  const canSendReaction = room.currentState.maySendEvent('m.reaction', mx.getUserId());
-
-  const eventReactions = reactionTimeline.get(mEvent.getId());
-  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, mEvent.getId(), key, roomTimeline);
-            }}
-          />
-        ))
-      }
-      {canSendReaction && (
-        <IconButton
-          onClick={(e) => {
-            pickEmoji(e, roomId, mEvent.getId(), 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'
-  );
-}
-
-// if editedTimeline has mEventId then pass editedMEvent else pass mEvent to openViewSource
-function handleOpenViewSource(mEvent, roomTimeline) {
-  const eventId = mEvent.getId();
-  const { editedTimeline } = roomTimeline ?? {};
-  let editedMEvent;
-  if (editedTimeline?.has(eventId)) {
-    const editedList = editedTimeline.get(eventId);
-    editedMEvent = editedList[editedList.length - 1];
-  }
-  openViewSource(editedMEvent !== undefined ? editedMEvent : mEvent);
-}
-
-const MessageOptions = React.memo(({
-  roomTimeline, mEvent, edit, reply,
-}) => {
-  const { roomId, room } = roomTimeline;
-  const mx = initMatrix.matrixClient;
-  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, mEvent.getId(), 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>
-            <MenuItem
-              iconSrc={CmdIC}
-              onClick={() => handleOpenViewSource(mEvent, roomTimeline)}
-            >
-              View source
-            </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, mEvent.getId());
-                    }
-                  }}
-                >
-                  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, mEvent.getId(), 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;
-  transform: translateY(-100%);
+  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,16 +1,17 @@
-@use '../../partials/text';
-
 .people-selector {
  width: 100%;
-  padding: var(--sp-extra-tight) var(--sp-normal);
+  padding: var(--sp-extra-tight);
+  padding-left: var(--sp-normal);
  display: flex;
  align-items: center;
  cursor: pointer;
-
-  &__container {
-    display: flex;
+  
+  [dir=rtl] & {
+    padding: {
+      left: var(--sp-extra-tight);
+      right: var(--sp-normal);
+    }
  }
-
  @media (hover: hover) {
    &:hover {
      background-color: var(--bg-surface-hover);
@@ -25,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';
@@ -51,16 +49,14 @@ PWContentSelector.propTypes = {
 function PopupWindow({
  className, isOpen, title, contentTitle,
  drawer, drawerOptions, contentOptions,
-  onAfterClose, onRequestClose, children,
+  onRequestClose, children,
 }) {
  const haveDrawer = drawer !== null;
-  const cTitle = contentTitle !== null ? contentTitle : title;

  return (
    <RawModal
      className={`${className === null ? '' : `${className} `}pw-model`}
      isOpen={isOpen}
-      onAfterClose={onAfterClose}
      onRequestClose={onRequestClose}
      size={haveDrawer ? 'large' : 'medium'}
    >
@@ -70,11 +66,7 @@ function PopupWindow({
            <Header>
              <IconButton size="small" src={ChevronLeftIC} onClick={onRequestClose} tooltip="Back" />
              <TitleWrapper>
-                {
-                  typeof title === 'string'
-                    ? <Text variant="s1" weight="medium" primary>{twemojify(title)}</Text>
-                    : title
-                }
+                <Text variant="s1">{title}</Text>
              </TitleWrapper>
              {drawerOptions}
            </Header>
@@ -90,11 +82,7 @@ function PopupWindow({
        <div className="pw__content">
          <Header>
            <TitleWrapper>
-              {
-                typeof cTitle === 'string'
-                  ? <Text variant="h2" weight="medium" primary>{twemojify(cTitle)}</Text>
-                  : cTitle
-              }
+              <Text variant="h2">{contentTitle !== null ? contentTitle : title}</Text>
            </TitleWrapper>
            {contentOptions}
          </Header>
@@ -117,19 +105,17 @@ PopupWindow.defaultProps = {
  contentTitle: null,
  drawerOptions: null,
  contentOptions: null,
-  onAfterClose: null,
  onRequestClose: null,
 };

 PopupWindow.propTypes = {
  className: PropTypes.string,
  isOpen: PropTypes.bool.isRequired,
-  title: PropTypes.node.isRequired,
-  contentTitle: PropTypes.node,
+  title: PropTypes.string.isRequired,
+  contentTitle: PropTypes.string,
  drawer: PropTypes.node,
  drawerOptions: PropTypes.node,
  contentOptions: PropTypes.node,
-  onAfterClose: PropTypes.func,
  onRequestClose: PropTypes.func,
  children: PropTypes.node.isRequired,
 };
--- 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/Show More
+++ b/Show More