diff --git a/.eslintrc.json b/.eslintrc.json
index 7a824ff6c..9d747b879 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -4,14 +4,6 @@
     "es2020": true,
     "node": true
   },
-  "parser": "@typescript-eslint/parser",
-  "parserOptions": {
-    "ecmaFeatures": {
-      "jsx": true
-    },
-    "ecmaVersion": 11,
-    "sourceType": "module"
-  },
   "extends": [
     "eslint:recommended",
     "plugin:prettier/recommended",
@@ -19,22 +11,29 @@
     "plugin:@typescript-eslint/recommended",
     "next"
   ],
-
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+    "ecmaFeatures": {
+      "jsx": true
+    },
+    "ecmaVersion": 11,
+    "sourceType": "module"
+  },
   "plugins": ["@typescript-eslint", "prettier"],
   "settings": {
     "import/resolver": {
       "alias": {
         "map": [
-          ["assets", "./assets"],
-          ["components", "./components"],
+          ["assets", "./src/assets"],
+          ["components", "./src/components"],
           ["db", "./db"],
-          ["hooks", "./hooks"],
-          ["lang", "./lang"],
-          ["lib", "./lib"],
+          ["hooks", "./src/components/hooks"],
+          ["lang", "./src/lang"],
+          ["lib", "./src/lib"],
           ["public", "./public"],
-          ["queries", "./queries"],
-          ["store", "./store"],
-          ["styles", "./styles"]
+          ["queries", "./src/queries"],
+          ["store", "./src/store"],
+          ["styles", "./src/styles"]
         ],
         "extensions": [".ts", ".tsx", ".js", ".jsx", ".json"]
       }
@@ -50,7 +49,9 @@
     "@next/next/no-img-element": "off",
     "@typescript-eslint/no-empty-function": "off",
     "@typescript-eslint/no-explicit-any": "off",
-    "@typescript-eslint/no-var-requires": "off"
+    "@typescript-eslint/no-var-requires": "off",
+    "@typescript-eslint/no-empty-interface": "off",
+    "@typescript-eslint/no-unused-vars": ["error", { "ignoreRestSiblings": true }]
   },
   "globals": {
     "React": "writable"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 775f9ecf5..66e16a03e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,10 +16,6 @@ jobs:
     strategy:
       matrix:
         include:
-        - node-version: 16.x
-          db-type: postgresql
-        - node-version: 16.x
-          db-type: mysql
         - node-version: 18.x
           db-type: postgresql
         - node-version: 18.x
diff --git a/.github/workflows/stale-issues.yml b/.github/workflows/stale-issues.yml
index bf2505b14..f16040149 100644
--- a/.github/workflows/stale-issues.yml
+++ b/.github/workflows/stale-issues.yml
@@ -19,4 +19,7 @@ jobs:
           close-issue-message: 'This issue was closed because it has been inactive for 7 days since being marked as stale.'
           days-before-pr-stale: -1
           days-before-pr-close: -1
+          operations-per-run: 200
+          ascending: true
           repo-token: ${{ secrets.GITHUB_TOKEN }}
+          exempt-issue-labels: bug,enhancement
diff --git a/.gitignore b/.gitignore
index 99087ab50..050397c90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,9 +34,7 @@ yarn-error.log*
 
 # local env files
 .env
-.env.development.local
-.env.test.local
-.env.production.local
+.env.*
 
 *.dev.yml
 
diff --git a/Dockerfile b/Dockerfile
index bdc678dac..801b2bc20 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,8 +12,8 @@ RUN yarn install --frozen-lockfile
 FROM node:18-alpine AS builder
 WORKDIR /app
 COPY --from=deps /app/node_modules ./node_modules
-COPY docker/middleware.js .
 COPY . .
+COPY docker/middleware.js ./src
 
 ARG DATABASE_TYPE
 ARG BASE_PATH
@@ -35,7 +35,9 @@ ENV NEXT_TELEMETRY_DISABLED 1
 RUN addgroup --system --gid 1001 nodejs
 RUN adduser --system --uid 1001 nextjs
 
-RUN yarn add npm-run-all dotenv prisma
+RUN set -x \
+    && apk add --no-cache curl \
+    && yarn add npm-run-all dotenv prisma semver
 
 # You only need to copy next.config.js if you are NOT using the default configuration
 COPY --from=builder /app/next.config.js .
@@ -53,6 +55,7 @@ USER nextjs
 
 EXPOSE 3000
 
+ENV HOSTNAME 0.0.0.0
 ENV PORT 3000
 
 CMD ["yarn", "start-docker"]
diff --git a/README.md b/README.md
index 19935ed59..32e78e31c 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ A detailed getting started guide can be found at [https://umami.is/docs/](https:
 
 ### Requirements
 
-- A server with Node.js version 12 or newer
+- A server with Node.js version 16.13 or newer
 - A database. Umami supports [MySQL](https://www.mysql.com/) and [Postgresql](https://www.postgresql.org/) databases.
 
 ### Install Yarn
@@ -72,13 +72,13 @@ docker compose up -d
 Alternatively, to pull just the Umami Docker image with PostgreSQL support:
 
 ```bash
-docker pull docker.umami.dev/umami-software/umami:postgresql-latest
+docker pull ghcr.io/umami-software/umami:postgresql-latest
 ```
 
 Or with MySQL support:
 
 ```bash
-docker pull docker.umami.dev/umami-software/umami:mysql-latest
+docker pull ghcr.io/umami-software/umami:mysql-latest
 ```
 
 ## Getting updates
diff --git a/components/common/FilterButtons.js b/components/common/FilterButtons.js
deleted file mode 100644
index f5a54fb63..000000000
--- a/components/common/FilterButtons.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { ButtonGroup, Button, Flexbox } from 'react-basics';
-
-export function FilterButtons({ items, selectedKey, onSelect }) {
-  return (
-    <Flexbox justifyContent="center">
-      <ButtonGroup items={items} selectedKey={selectedKey} onSelect={onSelect}>
-        {({ key, label }) => <Button key={key}>{label}</Button>}
-      </ButtonGroup>
-    </Flexbox>
-  );
-}
-
-export default FilterButtons;
diff --git a/components/common/HamburgerButton.js b/components/common/HamburgerButton.js
deleted file mode 100644
index 48c807708..000000000
--- a/components/common/HamburgerButton.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import { Button, Icon } from 'react-basics';
-import { useState } from 'react';
-import MobileMenu from './MobileMenu';
-import Icons from 'components/icons';
-import useMessages from 'hooks/useMessages';
-import useConfig from 'hooks/useConfig';
-
-export function HamburgerButton() {
-  const { formatMessage, labels } = useMessages();
-  const [active, setActive] = useState(false);
-  const { cloudMode } = useConfig();
-
-  const menuItems = [
-    {
-      label: formatMessage(labels.dashboard),
-      url: '/dashboard',
-    },
-    !cloudMode && {
-      label: formatMessage(labels.settings),
-      url: '/settings',
-      children: [
-        {
-          label: formatMessage(labels.websites),
-          url: '/settings/websites',
-        },
-        {
-          label: formatMessage(labels.teams),
-          url: '/settings/teams',
-        },
-        {
-          label: formatMessage(labels.users),
-          url: '/settings/users',
-        },
-        {
-          label: formatMessage(labels.profile),
-          url: '/settings/profile',
-        },
-      ],
-    },
-    cloudMode && {
-      label: formatMessage(labels.profile),
-      url: '/settings/profile',
-    },
-    !cloudMode && { label: formatMessage(labels.logout), url: '/logout' },
-  ].filter(n => n);
-
-  const handleClick = () => setActive(state => !state);
-  const handleClose = () => setActive(false);
-
-  return (
-    <>
-      <Button variant="quiet" onClick={handleClick}>
-        <Icon>{active ? <Icons.Close /> : <Icons.Menu />}</Icon>
-      </Button>
-      {active && <MobileMenu items={menuItems} onClose={handleClose} />}
-    </>
-  );
-}
-
-export default HamburgerButton;
diff --git a/components/common/LinkButton.js b/components/common/LinkButton.js
deleted file mode 100644
index 8c0501475..000000000
--- a/components/common/LinkButton.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import Link from 'next/link';
-import { Icon, Icons, Text } from 'react-basics';
-import styles from './LinkButton.module.css';
-
-export default function LinkButton({ href, icon, children }) {
-  return (
-    <Link className={styles.button} href={href}>
-      <Icon>{icon || <Icons.ArrowRight />}</Icon>
-      <Text>{children}</Text>
-    </Link>
-  );
-}
diff --git a/components/common/LinkButton.module.css b/components/common/LinkButton.module.css
deleted file mode 100644
index ae8a3b627..000000000
--- a/components/common/LinkButton.module.css
+++ /dev/null
@@ -1,28 +0,0 @@
-.button {
-  display: flex;
-  align-items: center;
-  align-self: flex-start;
-  white-space: nowrap;
-  gap: var(--size200);
-  font-family: inherit;
-  color: var(--base900);
-  background: var(--base100);
-  border: 1px solid transparent;
-  border-radius: var(--border-radius);
-  min-height: var(--base-height);
-  padding: 0 var(--size600);
-  position: relative;
-  cursor: pointer;
-}
-
-.button:hover {
-  background: var(--base200);
-}
-
-.button:active {
-  background: var(--base300);
-}
-
-.button:visited {
-  color: var(--base900);
-}
diff --git a/components/common/SettingsTable.js b/components/common/SettingsTable.js
deleted file mode 100644
index 8f0398584..000000000
--- a/components/common/SettingsTable.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Table, TableHeader, TableBody, TableRow, TableCell, TableColumn } from 'react-basics';
-import styles from './SettingsTable.module.css';
-
-export function SettingsTable({ columns = [], data = [], children, cellRender }) {
-  return (
-    <Table columns={columns} rows={data}>
-      <TableHeader className={styles.header}>
-        {(column, index) => {
-          return (
-            <TableColumn key={index} className={styles.cell} style={columns[index].style}>
-              {column.label}
-            </TableColumn>
-          );
-        }}
-      </TableHeader>
-      <TableBody className={styles.body}>
-        {(row, keys, rowIndex) => {
-          row.action = children(row, keys, rowIndex);
-
-          return (
-            <TableRow key={rowIndex} data={row} keys={keys} className={styles.row}>
-              {(data, key, colIndex) => {
-                return (
-                  <TableCell key={colIndex} className={styles.cell} style={columns[colIndex].style}>
-                    <label className={styles.label}>{columns[colIndex].label}</label>
-                    {cellRender ? cellRender(row, data, key, colIndex) : data[key]}
-                  </TableCell>
-                );
-              }}
-            </TableRow>
-          );
-        }}
-      </TableBody>
-    </Table>
-  );
-}
-
-export default SettingsTable;
diff --git a/components/common/SettingsTable.module.css b/components/common/SettingsTable.module.css
deleted file mode 100644
index fd6cddfad..000000000
--- a/components/common/SettingsTable.module.css
+++ /dev/null
@@ -1,44 +0,0 @@
-.cell {
-  align-items: center;
-}
-
-.row .cell:last-child {
-  gap: 10px;
-  justify-content: flex-end;
-}
-
-.label {
-  display: none;
-  font-weight: 700;
-}
-
-@media screen and (max-width: 992px) {
-  .header .cell {
-    display: none;
-  }
-
-  .label {
-    display: block;
-    min-width: 100px;
-  }
-
-  .row .cell {
-    padding-left: 0;
-    flex-basis: 100%;
-  }
-}
-
-@media screen and (max-width: 1200px) {
-  .row {
-    flex-wrap: wrap;
-  }
-
-  .header .cell:last-child {
-    display: none;
-  }
-
-  .row .cell:last-child {
-    padding-left: 0;
-    flex-basis: 100%;
-  }
-}
diff --git a/components/input/WebsiteDateFilter.js b/components/input/WebsiteDateFilter.js
deleted file mode 100644
index 47e6f0160..000000000
--- a/components/input/WebsiteDateFilter.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import useDateRange from 'hooks/useDateRange';
-import DateFilter from './DateFilter';
-import styles from './WebsiteDateFilter.module.css';
-
-export default function WebsiteDateFilter({ websiteId }) {
-  const [dateRange, setDateRange] = useDateRange(websiteId);
-  const { value, startDate, endDate } = dateRange;
-
-  const handleChange = async value => {
-    setDateRange(value);
-  };
-
-  return (
-    <DateFilter
-      className={styles.dropdown}
-      value={value}
-      startDate={startDate}
-      endDate={endDate}
-      onChange={handleChange}
-      showAllTime={true}
-    />
-  );
-}
diff --git a/components/input/WebsiteDateFilter.module.css b/components/input/WebsiteDateFilter.module.css
deleted file mode 100644
index 13234c55c..000000000
--- a/components/input/WebsiteDateFilter.module.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.dropdown {
-  min-width: 200px;
-}
diff --git a/components/input/WebsiteSelect.js b/components/input/WebsiteSelect.js
deleted file mode 100644
index b77ae57c8..000000000
--- a/components/input/WebsiteSelect.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Dropdown, Item } from 'react-basics';
-import useApi from 'hooks/useApi';
-import useMessages from 'hooks/useMessages';
-
-export function WebsiteSelect({ websiteId, onSelect }) {
-  const { formatMessage, labels } = useMessages();
-  const { get, useQuery } = useApi();
-  const { data } = useQuery(['websites:me'], () => get('/me/websites'));
-
-  const renderValue = value => {
-    return data?.find(({ id }) => id === value)?.name;
-  };
-
-  return (
-    <Dropdown
-      items={data}
-      value={websiteId}
-      renderValue={renderValue}
-      onChange={onSelect}
-      alignment="end"
-      placeholder={formatMessage(labels.selectWebsite)}
-    >
-      {({ id, name }) => <Item key={id}>{name}</Item>}
-    </Dropdown>
-  );
-}
-
-export default WebsiteSelect;
diff --git a/components/layout/AppLayout.js b/components/layout/AppLayout.js
deleted file mode 100644
index 989128f9e..000000000
--- a/components/layout/AppLayout.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import { Container } from 'react-basics';
-import Head from 'next/head';
-import NavBar from 'components/layout/NavBar';
-import UpdateNotice from 'components/common/UpdateNotice';
-import useRequireLogin from 'hooks/useRequireLogin';
-import useConfig from 'hooks/useConfig';
-import { CURRENT_VERSION } from 'lib/constants';
-import styles from './AppLayout.module.css';
-
-export function AppLayout({ title, children }) {
-  const { user } = useRequireLogin();
-  const config = useConfig();
-
-  if (!user || !config) {
-    return null;
-  }
-
-  return (
-    <div className={styles.layout} data-app-version={CURRENT_VERSION}>
-      <UpdateNotice user={user} config={config} />
-      <Head>
-        <title>{title ? `${title} | umami` : 'umami'}</title>
-      </Head>
-      <nav className={styles.nav}>
-        <NavBar />
-      </nav>
-      <main className={styles.body}>
-        <Container>{children}</Container>
-      </main>
-    </div>
-  );
-}
-
-export default AppLayout;
diff --git a/components/layout/Grid.js b/components/layout/Grid.js
deleted file mode 100644
index 0276063b5..000000000
--- a/components/layout/Grid.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Row, Column } from 'react-basics';
-import classNames from 'classnames';
-import styles from './Grid.module.css';
-
-export function GridRow(props) {
-  const { className, ...otherProps } = props;
-  return <Row {...otherProps} className={classNames(styles.row, className)} />;
-}
-
-export function GridColumn(props) {
-  const { className, ...otherProps } = props;
-  return <Column {...otherProps} className={classNames(styles.col, className)} />;
-}
diff --git a/components/layout/Grid.module.css b/components/layout/Grid.module.css
deleted file mode 100644
index dc2e8ff6c..000000000
--- a/components/layout/Grid.module.css
+++ /dev/null
@@ -1,36 +0,0 @@
-.col {
-  display: flex;
-  flex-direction: column;
-  padding: 20px;
-}
-
-.row {
-  border-top: 1px solid var(--base300);
-  min-height: 430px;
-}
-
-.row > .col {
-  border-inline-start: 1px solid var(--base300);
-}
-
-.row > .col:first-child {
-  border-inline-start: 0;
-  padding-inline-start: 0;
-}
-
-.row > .col:last-child {
-  padding-inline-end: 0;
-}
-
-@media only screen and (max-width: 992px) {
-  .row {
-    border: 0;
-  }
-
-  .row > .col {
-    border-top: 1px solid var(--base300);
-    border-inline-start: 0;
-    border-inline-end: 0;
-    padding: 20px 0;
-  }
-}
diff --git a/components/layout/Header.js b/components/layout/Header.js
deleted file mode 100644
index 21cdd2513..000000000
--- a/components/layout/Header.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import { Column, Icon, Row, Text } from 'react-basics';
-import Link from 'next/link';
-import LanguageButton from 'components/input/LanguageButton';
-import ThemeButton from 'components/input/ThemeButton';
-import SettingsButton from 'components/input/SettingsButton';
-import Icons from 'components/icons';
-import styles from './Header.module.css';
-
-export function Header() {
-  return (
-    <header className={styles.header}>
-      <Row className={styles.row}>
-        <Column>
-          <Link href="https://umami.is" target="_blank" className={styles.title}>
-            <Icon size="lg">
-              <Icons.Logo />
-            </Icon>
-            <Text>umami</Text>
-          </Link>
-        </Column>
-        <Column className={styles.buttons}>
-          <ThemeButton tooltipPosition="bottom" />
-          <LanguageButton tooltipPosition="bottom" menuPosition="bottom" />
-          <SettingsButton />
-        </Column>
-      </Row>
-    </header>
-  );
-}
-
-export default Header;
diff --git a/components/layout/NavBar.js b/components/layout/NavBar.js
deleted file mode 100644
index 97eaa46c3..000000000
--- a/components/layout/NavBar.js
+++ /dev/null
@@ -1,63 +0,0 @@
-import { Icon, Text, Row, Column } from 'react-basics';
-import Link from 'next/link';
-import classNames from 'classnames';
-import Icons from 'components/icons';
-import ThemeButton from 'components/input/ThemeButton';
-import LanguageButton from 'components/input/LanguageButton';
-import ProfileButton from 'components/input/ProfileButton';
-import styles from './NavBar.module.css';
-import useConfig from 'hooks/useConfig';
-import useMessages from 'hooks/useMessages';
-import { useRouter } from 'next/router';
-import HamburgerButton from '../common/HamburgerButton';
-
-export function NavBar() {
-  const { pathname } = useRouter();
-  const { cloudMode } = useConfig();
-  const { formatMessage, labels } = useMessages();
-
-  const links = [
-    { label: formatMessage(labels.dashboard), url: '/dashboard' },
-    !cloudMode && { label: formatMessage(labels.settings), url: '/settings' },
-  ].filter(n => n);
-
-  return (
-    <div className={classNames(styles.navbar)}>
-      <Row>
-        <Column className={styles.left}>
-          <div className={styles.logo}>
-            <Icon size="lg">
-              <Icons.Logo />
-            </Icon>
-            <Text className={styles.text}>umami</Text>
-          </div>
-          <div className={styles.links}>
-            {links.map(({ url, label }) => {
-              return (
-                <Link
-                  key={url}
-                  href={url}
-                  className={classNames({ [styles.selected]: pathname.startsWith(url) })}
-                >
-                  <Text>{label}</Text>
-                </Link>
-              );
-            })}
-          </div>
-        </Column>
-        <Column className={styles.right}>
-          <div className={styles.actions}>
-            <ThemeButton />
-            <LanguageButton />
-            <ProfileButton />
-          </div>
-          <div className={styles.mobile}>
-            <HamburgerButton />
-          </div>
-        </Column>
-      </Row>
-    </div>
-  );
-}
-
-export default NavBar;
diff --git a/components/layout/Page.module.css b/components/layout/Page.module.css
deleted file mode 100644
index c546971b6..000000000
--- a/components/layout/Page.module.css
+++ /dev/null
@@ -1,7 +0,0 @@
-.page {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  background: var(--base50);
-  position: relative;
-}
diff --git a/components/layout/ReportsLayout.js b/components/layout/ReportsLayout.js
deleted file mode 100644
index fd63a67e7..000000000
--- a/components/layout/ReportsLayout.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import { Column, Row } from 'react-basics';
-import styles from './ReportsLayout.module.css';
-
-export function SettingsLayout({ children, filter, header }) {
-  return (
-    <>
-      <Row>{header}</Row>
-      <Row>
-        {filter && (
-          <Column className={styles.filter} defaultSize={12} md={4} lg={3} xl={3}>
-            <h2>Filters</h2>
-            {filter}
-          </Column>
-        )}
-        <Column className={styles.content} defaultSize={12} md={8} lg={9} xl={9}>
-          {children}
-        </Column>
-      </Row>
-    </>
-  );
-}
-
-export default SettingsLayout;
diff --git a/components/layout/ReportsLayout.module.css b/components/layout/ReportsLayout.module.css
deleted file mode 100644
index 6922665fa..000000000
--- a/components/layout/ReportsLayout.module.css
+++ /dev/null
@@ -1,23 +0,0 @@
-.filter {
-  margin-top: 30px;
-  min-width: 200px;
-  max-width: 100vw;
-  padding: 10px;
-  background: var(--base50);
-  border-radius: 5px;
-  border: 1px solid var(--border-color);
-}
-
-.filter h2 {
-  padding-bottom: 20px;
-}
-
-.content {
-  min-height: 50vh;
-}
-
-@media only screen and (max-width: 768px) {
-  .menu {
-    display: none;
-  }
-}
diff --git a/components/layout/SettingsLayout.module.css b/components/layout/SettingsLayout.module.css
deleted file mode 100644
index 569b903ba..000000000
--- a/components/layout/SettingsLayout.module.css
+++ /dev/null
@@ -1,15 +0,0 @@
-.menu {
-  display: flex;
-  flex-direction: column;
-  padding-top: 40px;
-}
-
-.content {
-  min-height: 50vh;
-}
-
-@media only screen and (max-width: 768px) {
-  .menu {
-    display: none;
-  }
-}
diff --git a/components/layout/ShareLayout.js b/components/layout/ShareLayout.js
deleted file mode 100644
index c634e1b6d..000000000
--- a/components/layout/ShareLayout.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Container } from 'react-basics';
-import Header from './Header';
-import Footer from './Footer';
-
-export function ShareLayout({ children }) {
-  return (
-    <Container>
-      <Header />
-      <main>{children}</main>
-      <Footer />
-    </Container>
-  );
-}
-
-export default ShareLayout;
diff --git a/components/layout/SideNav.js b/components/layout/SideNav.js
deleted file mode 100644
index e7e96b7d0..000000000
--- a/components/layout/SideNav.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import classNames from 'classnames';
-import { Menu, Item } from 'react-basics';
-import { useRouter } from 'next/router';
-import Link from 'next/link';
-import styles from './SideNav.module.css';
-
-export function SideNav({ selectedKey, items, shallow, onSelect = () => {} }) {
-  const { asPath } = useRouter();
-  return (
-    <Menu items={items} selectedKey={selectedKey} className={styles.menu} onSelect={onSelect}>
-      {({ key, label, url }) => (
-        <Item
-          key={key}
-          className={classNames(styles.item, { [styles.selected]: asPath.startsWith(url) })}
-        >
-          <Link href={url} shallow={shallow}>
-            {label}
-          </Link>
-        </Item>
-      )}
-    </Menu>
-  );
-}
-
-export default SideNav;
diff --git a/components/metrics/CitiesTable.js b/components/metrics/CitiesTable.js
deleted file mode 100644
index 2e74780d4..000000000
--- a/components/metrics/CitiesTable.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import MetricsTable from './MetricsTable';
-import { emptyFilter } from 'lib/filters';
-import FilterLink from 'components/common/FilterLink';
-import useLocale from 'hooks/useLocale';
-import useMessages from 'hooks/useMessages';
-
-export function CitiesTable({ websiteId, ...props }) {
-  const { locale } = useLocale();
-  const { formatMessage, labels } = useMessages();
-
-  function renderLink({ x }) {
-    return (
-      <div className={locale}>
-        <FilterLink id="city" value={x} />
-      </div>
-    );
-  }
-
-  return (
-    <MetricsTable
-      {...props}
-      title={formatMessage(labels.cities)}
-      type="city"
-      metric={formatMessage(labels.visitors)}
-      websiteId={websiteId}
-      dataFilter={emptyFilter}
-      renderLabel={renderLink}
-    />
-  );
-}
-
-export default CitiesTable;
diff --git a/components/metrics/CountriesTable.js b/components/metrics/CountriesTable.js
deleted file mode 100644
index c72d96ed2..000000000
--- a/components/metrics/CountriesTable.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import { useRouter } from 'next/router';
-import FilterLink from 'components/common/FilterLink';
-import useCountryNames from 'hooks/useCountryNames';
-import useLocale from 'hooks/useLocale';
-import useMessages from 'hooks/useMessages';
-import MetricsTable from './MetricsTable';
-
-export function CountriesTable({ websiteId, ...props }) {
-  const { locale } = useLocale();
-  const countryNames = useCountryNames(locale);
-  const { formatMessage, labels } = useMessages();
-  const { basePath } = useRouter();
-
-  function renderLink({ x: code }) {
-    return (
-      <FilterLink
-        id="country"
-        className={locale}
-        value={countryNames[code] && code}
-        label={countryNames[code]}
-      >
-        <img src={`${basePath}/images/flags/${code?.toLowerCase() || 'xx'}.png`} alt={code} />
-      </FilterLink>
-    );
-  }
-
-  return (
-    <MetricsTable
-      {...props}
-      title={formatMessage(labels.countries)}
-      type="country"
-      metric={formatMessage(labels.visitors)}
-      websiteId={websiteId}
-      renderLabel={renderLink}
-    />
-  );
-}
-
-export default CountriesTable;
diff --git a/components/metrics/MetricsBar.js b/components/metrics/MetricsBar.js
deleted file mode 100644
index 2b74e4256..000000000
--- a/components/metrics/MetricsBar.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import { useState } from 'react';
-import { Loading, cloneChildren } from 'react-basics';
-import ErrorMessage from 'components/common/ErrorMessage';
-import styles from './MetricsBar.module.css';
-import { formatLongNumber, formatNumber } from 'lib/format';
-
-export function MetricsBar({ children, isLoading, isFetched, error }) {
-  const [format, setFormat] = useState(true);
-
-  const formatFunc = format
-    ? n => (n >= 0 ? formatLongNumber(n) : `-${formatLongNumber(Math.abs(n))}`)
-    : formatNumber;
-
-  const handleSetFormat = () => {
-    setFormat(state => !state);
-  };
-
-  return (
-    <div className={styles.bar} onClick={handleSetFormat}>
-      {isLoading && !isFetched && <Loading icon="dots" />}
-      {error && <ErrorMessage />}
-      {cloneChildren(children, child => {
-        return { format: child.props.format || formatFunc };
-      })}
-    </div>
-  );
-}
-
-export default MetricsBar;
diff --git a/components/metrics/MetricsBar.module.css b/components/metrics/MetricsBar.module.css
deleted file mode 100644
index eb33a3241..000000000
--- a/components/metrics/MetricsBar.module.css
+++ /dev/null
@@ -1,18 +0,0 @@
-.bar {
-  display: flex;
-  flex-direction: row;
-  cursor: pointer;
-  min-height: 110px;
-  gap: 20px;
-  flex-wrap: wrap;
-}
-
-.card {
-  justify-self: flex-start;
-}
-
-@media only screen and (max-width: 992px) {
-  .card {
-    flex-basis: calc(50% - 20px);
-  }
-}
diff --git a/components/metrics/MetricsTable.js b/components/metrics/MetricsTable.js
deleted file mode 100644
index 502627984..000000000
--- a/components/metrics/MetricsTable.js
+++ /dev/null
@@ -1,124 +0,0 @@
-import { useMemo } from 'react';
-import { Loading, Icon, Text, Button } from 'react-basics';
-import Link from 'next/link';
-import firstBy from 'thenby';
-import classNames from 'classnames';
-import useApi from 'hooks/useApi';
-import { percentFilter } from 'lib/filters';
-import useDateRange from 'hooks/useDateRange';
-import usePageQuery from 'hooks/usePageQuery';
-import ErrorMessage from 'components/common/ErrorMessage';
-import DataTable from './DataTable';
-import { DEFAULT_ANIMATION_DURATION } from 'lib/constants';
-import Icons from 'components/icons';
-import useMessages from 'hooks/useMessages';
-import styles from './MetricsTable.module.css';
-import useLocale from 'hooks/useLocale';
-
-export function MetricsTable({
-  websiteId,
-  type,
-  className,
-  dataFilter,
-  filterOptions,
-  limit,
-  onDataLoad,
-  delay = null,
-  ...props
-}) {
-  const [{ startDate, endDate, modified }] = useDateRange(websiteId);
-  const {
-    resolveUrl,
-    router,
-    query: { url, referrer, title, os, browser, device, country, region, city },
-  } = usePageQuery();
-  const { formatMessage, labels } = useMessages();
-  const { get, useQuery } = useApi();
-
-  const { data, isLoading, isFetched, error } = useQuery(
-    [
-      'websites:metrics',
-      {
-        websiteId,
-        type,
-        modified,
-        url,
-        referrer,
-        os,
-        title,
-        browser,
-        device,
-        country,
-        region,
-        city,
-      },
-    ],
-    () =>
-      get(`/websites/${websiteId}/metrics`, {
-        type,
-        startAt: +startDate,
-        endAt: +endDate,
-        url,
-        title,
-        referrer,
-        os,
-        browser,
-        device,
-        country,
-        region,
-        city,
-      }),
-    { onSuccess: onDataLoad, retryDelay: delay || DEFAULT_ANIMATION_DURATION },
-  );
-
-  const filteredData = useMemo(() => {
-    if (data) {
-      let items = data;
-
-      if (dataFilter) {
-        if (Array.isArray(dataFilter)) {
-          items = dataFilter.reduce((arr, filter) => {
-            return filter(arr);
-          }, items);
-        } else {
-          items = dataFilter(data);
-        }
-      }
-
-      items = percentFilter(items);
-
-      if (limit) {
-        items = items.filter((e, i) => i < limit);
-      }
-      if (filterOptions?.sort === false) {
-        return items;
-      }
-
-      return items.sort(firstBy('y', -1).thenBy('x'));
-    }
-    return [];
-  }, [data, error, dataFilter, filterOptions]);
-  const { dir } = useLocale();
-
-  return (
-    <div className={classNames(styles.container, className)}>
-      {!data && isLoading && !isFetched && <Loading icon="dots" />}
-      {error && <ErrorMessage />}
-      {data && !error && <DataTable {...props} data={filteredData} className={className} />}
-      <div className={styles.footer}>
-        {data && !error && limit && (
-          <Link href={router.pathname} as={resolveUrl({ view: type })}>
-            <Button variant="quiet">
-              <Text>{formatMessage(labels.more)}</Text>
-              <Icon size="sm" rotate={dir === 'rtl' ? 180 : 0}>
-                <Icons.ArrowRight />
-              </Icon>
-            </Button>
-          </Link>
-        )}
-      </div>
-    </div>
-  );
-}
-
-export default MetricsTable;
diff --git a/components/metrics/PagesTable.js b/components/metrics/PagesTable.js
deleted file mode 100644
index 47e703188..000000000
--- a/components/metrics/PagesTable.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import FilterLink from 'components/common/FilterLink';
-import FilterButtons from 'components/common/FilterButtons';
-import MetricsTable from './MetricsTable';
-import useMessages from 'hooks/useMessages';
-import usePageQuery from 'hooks/usePageQuery';
-import { emptyFilter } from 'lib/filters';
-
-export function PagesTable({ websiteId, showFilters, ...props }) {
-  const {
-    router,
-    resolveUrl,
-    query: { view = 'url' },
-  } = usePageQuery();
-  const { formatMessage, labels } = useMessages();
-
-  const handleSelect = key => {
-    router.push(resolveUrl({ view: key }), null, { shallow: true });
-  };
-
-  const buttons = [
-    {
-      label: 'URL',
-      key: 'url',
-    },
-    {
-      label: formatMessage(labels.title),
-      key: 'title',
-    },
-  ];
-
-  const renderLink = ({ x }) => {
-    return <FilterLink id={view} value={x} label={!x && formatMessage(labels.none)} />;
-  };
-
-  return (
-    <>
-      {showFilters && <FilterButtons items={buttons} selectedKey={view} onSelect={handleSelect} />}
-      <MetricsTable
-        {...props}
-        title={formatMessage(labels.pages)}
-        type={view}
-        metric={formatMessage(labels.views)}
-        websiteId={websiteId}
-        dataFilter={emptyFilter}
-        renderLabel={renderLink}
-      />
-    </>
-  );
-}
-
-export default PagesTable;
diff --git a/components/metrics/QueryParametersTable.js b/components/metrics/QueryParametersTable.js
deleted file mode 100644
index 23193c2e1..000000000
--- a/components/metrics/QueryParametersTable.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import { useState } from 'react';
-import { safeDecodeURI } from 'next-basics';
-import FilterButtons from 'components/common/FilterButtons';
-import { emptyFilter, paramFilter } from 'lib/filters';
-import { FILTER_RAW, FILTER_COMBINED } from 'lib/constants';
-import MetricsTable from './MetricsTable';
-import useMessages from 'hooks/useMessages';
-import styles from './QueryParametersTable.module.css';
-
-const filters = {
-  [FILTER_RAW]: emptyFilter,
-  [FILTER_COMBINED]: [emptyFilter, paramFilter],
-};
-
-export function QueryParametersTable({ websiteId, showFilters, ...props }) {
-  const [filter, setFilter] = useState(FILTER_COMBINED);
-  const { formatMessage, labels } = useMessages();
-
-  const buttons = [
-    {
-      label: formatMessage(labels.filterCombined),
-      key: FILTER_COMBINED,
-    },
-    { label: formatMessage(labels.filterRaw), key: FILTER_RAW },
-  ];
-
-  return (
-    <>
-      {showFilters && <FilterButtons items={buttons} selectedKey={filter} onSelect={setFilter} />}
-      <MetricsTable
-        {...props}
-        title={formatMessage(labels.query)}
-        type="query"
-        metric={formatMessage(labels.views)}
-        websiteId={websiteId}
-        dataFilter={filters[filter]}
-        renderLabel={({ x, p, v }) =>
-          filter === FILTER_RAW ? (
-            x
-          ) : (
-            <div className={styles.item}>
-              <div className={styles.param}>{safeDecodeURI(p)}</div>
-              <div className={styles.value}>{safeDecodeURI(v)}</div>
-            </div>
-          )
-        }
-        delay={0}
-      />
-    </>
-  );
-}
-
-export default QueryParametersTable;
diff --git a/components/pages/dashboard/Dashboard.js b/components/pages/dashboard/Dashboard.js
deleted file mode 100644
index 2d9756dba..000000000
--- a/components/pages/dashboard/Dashboard.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import { useState } from 'react';
-import { Button, Icon, Icons, Text, Flexbox } from 'react-basics';
-import Link from 'next/link';
-import Page from 'components/layout/Page';
-import PageHeader from 'components/layout/PageHeader';
-import WebsiteChartList from 'components/pages/websites/WebsiteChartList';
-import DashboardSettingsButton from 'components/pages/dashboard/DashboardSettingsButton';
-import DashboardEdit from 'components/pages/dashboard/DashboardEdit';
-import EmptyPlaceholder from 'components/common/EmptyPlaceholder';
-import useApi from 'hooks/useApi';
-import useDashboard from 'store/dashboard';
-import useMessages from 'hooks/useMessages';
-import useLocale from 'hooks/useLocale';
-
-export function Dashboard({ userId }) {
-  const { formatMessage, labels, messages } = useMessages();
-  const dashboard = useDashboard();
-  const { showCharts, limit, editing } = dashboard;
-  const [max, setMax] = useState(limit);
-  const { get, useQuery } = useApi();
-  const { data, isLoading, error } = useQuery(['websites'], () =>
-    get('/websites', { userId, includeTeams: 1 }),
-  );
-  const hasData = data && data.length !== 0;
-  const { dir } = useLocale();
-
-  function handleMore() {
-    setMax(max + limit);
-  }
-
-  return (
-    <Page loading={isLoading} error={error}>
-      <PageHeader title={formatMessage(labels.dashboard)}>
-        {!editing && hasData && <DashboardSettingsButton />}
-      </PageHeader>
-      {!hasData && (
-        <EmptyPlaceholder message={formatMessage(messages.noWebsitesConfigured)}>
-          <Link href="/settings/websites">
-            <Button>
-              <Icon rotate={dir === 'rtl' ? 180 : 0}>
-                <Icons.ArrowRight />
-              </Icon>
-              <Text>{formatMessage(messages.goToSettings)}</Text>
-            </Button>
-          </Link>
-        </EmptyPlaceholder>
-      )}
-      {hasData && (
-        <>
-          {editing && <DashboardEdit websites={data} />}
-          {!editing && <WebsiteChartList websites={data} showCharts={showCharts} limit={max} />}
-          {max < data.length && (
-            <Flexbox justifyContent="center">
-              <Button onClick={handleMore}>
-                <Icon rotate={dir === 'rtl' ? 180 : 0}>
-                  <Icons.More />
-                </Icon>
-                <Text>{formatMessage(labels.more)}</Text>
-              </Button>
-            </Flexbox>
-          )}
-        </>
-      )}
-    </Page>
-  );
-}
-
-export default Dashboard;
diff --git a/components/pages/event-data/EventDataMetricsBar.js b/components/pages/event-data/EventDataMetricsBar.js
deleted file mode 100644
index 48843287c..000000000
--- a/components/pages/event-data/EventDataMetricsBar.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import { Column, Row } from 'react-basics';
-import { useApi, useDateRange } from 'hooks';
-import MetricCard from 'components/metrics/MetricCard';
-import useMessages from 'hooks/useMessages';
-import WebsiteDateFilter from 'components/input/WebsiteDateFilter';
-import MetricsBar from 'components/metrics/MetricsBar';
-import styles from './EventDataMetricsBar.module.css';
-
-export function EventDataMetricsBar({ websiteId }) {
-  const { formatMessage, labels } = useMessages();
-  const { get, useQuery } = useApi();
-  const [dateRange] = useDateRange(websiteId);
-  const { startDate, endDate, modified } = dateRange;
-
-  const { data, error, isLoading, isFetched } = useQuery(
-    ['event-data:stats', { websiteId, startDate, endDate, modified }],
-    () =>
-      get(`/event-data/stats`, {
-        websiteId,
-        startAt: +startDate,
-        endAt: +endDate,
-      }),
-  );
-
-  return (
-    <Row className={styles.row}>
-      <Column defaultSize={12} xl={8}>
-        <MetricsBar isLoading={isLoading} isFetched={isFetched} error={error}>
-          {!error && isFetched && (
-            <>
-              <MetricCard
-                className={styles.card}
-                label={formatMessage(labels.fields)}
-                value={data?.fields}
-              />
-              <MetricCard
-                className={styles.card}
-                label={formatMessage(labels.totalRecords)}
-                value={data?.records}
-              />
-            </>
-          )}
-        </MetricsBar>
-      </Column>
-      <Column defaultSize={12} xl={4}>
-        <div className={styles.actions}>
-          <WebsiteDateFilter websiteId={websiteId} />
-        </div>
-      </Column>
-    </Row>
-  );
-}
-
-export default EventDataMetricsBar;
diff --git a/components/pages/event-data/EventDataMetricsBar.module.css b/components/pages/event-data/EventDataMetricsBar.module.css
deleted file mode 100644
index 43b145802..000000000
--- a/components/pages/event-data/EventDataMetricsBar.module.css
+++ /dev/null
@@ -1,46 +0,0 @@
-.container {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 10px 0;
-  min-height: 90px;
-  margin-bottom: 20px;
-  background: var(--base50);
-  z-index: var(--z-index-above);
-}
-
-.metrics {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-}
-
-.actions {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: flex-end;
-  flex: 1;
-}
-
-.bar {
-  display: flex;
-  cursor: pointer;
-  min-height: 110px;
-  gap: 20px;
-  flex-wrap: wrap;
-}
-
-.card {
-  justify-self: flex-start;
-}
-
-@media only screen and (max-width: 992px) {
-  .card {
-    flex-basis: calc(50% - 20px);
-  }
-}
-
-.row {
-  border-bottom: 1px solid var(--border-color);
-}
diff --git a/components/pages/login/LoginLayout.js b/components/pages/login/LoginLayout.js
deleted file mode 100644
index fc8ad4617..000000000
--- a/components/pages/login/LoginLayout.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import Head from 'next/head';
-import useLocale from 'hooks/useLocale';
-import styles from './LoginLayout.module.css';
-
-export function LoginLayout({ children }) {
-  const { dir } = useLocale();
-
-  return (
-    <div className={styles.layout} dir={dir}>
-      <Head>
-        <title>{`Login | umami`}</title>
-      </Head>
-      {children}
-    </div>
-  );
-}
-
-export default LoginLayout;
diff --git a/components/pages/realtime/RealtimePage.js b/components/pages/realtime/RealtimePage.js
deleted file mode 100644
index 507c123c7..000000000
--- a/components/pages/realtime/RealtimePage.js
+++ /dev/null
@@ -1,117 +0,0 @@
-import { useState, useEffect, useMemo } from 'react';
-import { subMinutes, startOfMinute } from 'date-fns';
-import firstBy from 'thenby';
-import { GridRow, GridColumn } from 'components/layout/Grid';
-import Page from 'components/layout/Page';
-import RealtimeChart from 'components/metrics/RealtimeChart';
-import WorldMap from 'components/common/WorldMap';
-import RealtimeLog from 'components/pages/realtime/RealtimeLog';
-import RealtimeHeader from 'components/pages/realtime/RealtimeHeader';
-import RealtimeUrls from 'components/pages/realtime/RealtimeUrls';
-import RealtimeCountries from 'components/pages/realtime/RealtimeCountries';
-import WebsiteHeader from 'components/pages/websites/WebsiteHeader';
-import useApi from 'hooks/useApi';
-import { percentFilter } from 'lib/filters';
-import { REALTIME_RANGE, REALTIME_INTERVAL } from 'lib/constants';
-import styles from './RealtimePage.module.css';
-import { useWebsite } from 'hooks';
-
-function mergeData(state = [], data = [], time) {
-  const ids = state.map(({ __id }) => __id);
-  return state
-    .concat(data.filter(({ __id }) => !ids.includes(__id)))
-    .filter(({ timestamp }) => timestamp >= time);
-}
-
-export function RealtimePage({ websiteId }) {
-  const [currentData, setCurrentData] = useState();
-  const { get, useQuery } = useApi();
-  const { data: website } = useWebsite(websiteId);
-  const { data, isLoading, error } = useQuery(
-    ['realtime', websiteId],
-    () => get(`/realtime/${websiteId}`, { startAt: currentData?.timestamp || 0 }),
-    {
-      enabled: !!(websiteId && website),
-      refetchInterval: REALTIME_INTERVAL,
-      cache: false,
-    },
-  );
-
-  useEffect(() => {
-    if (data) {
-      const date = subMinutes(startOfMinute(new Date()), REALTIME_RANGE);
-      const time = date.getTime();
-
-      setCurrentData(state => ({
-        pageviews: mergeData(state?.pageviews, data.pageviews, time),
-        sessions: mergeData(state?.sessions, data.sessions, time),
-        events: mergeData(state?.events, data.events, time),
-        timestamp: data.timestamp,
-      }));
-    }
-  }, [data]);
-
-  const realtimeData = useMemo(() => {
-    if (!currentData) {
-      return { pageviews: [], sessions: [], events: [], countries: [], visitors: [] };
-    }
-
-    currentData.countries = percentFilter(
-      currentData.sessions
-        .reduce((arr, data) => {
-          if (!arr.find(({ id }) => id === data.id)) {
-            return arr.concat(data);
-          }
-          return arr;
-        }, [])
-        .reduce((arr, { country }) => {
-          if (country) {
-            const row = arr.find(({ x }) => x === country);
-
-            if (!row) {
-              arr.push({ x: country, y: 1 });
-            } else {
-              row.y += 1;
-            }
-          }
-          return arr;
-        }, [])
-        .sort(firstBy('y', -1)),
-    );
-
-    currentData.visitors = currentData.sessions.reduce((arr, val) => {
-      if (!arr.find(({ id }) => id === val.id)) {
-        return arr.concat(val);
-      }
-      return arr;
-    }, []);
-
-    return currentData;
-  }, [currentData]);
-
-  return (
-    <Page loading={isLoading} error={error}>
-      <WebsiteHeader websiteId={websiteId} />
-      <RealtimeHeader websiteId={websiteId} data={currentData} />
-      <RealtimeChart className={styles.chart} data={realtimeData} unit="minute" />
-      <GridRow>
-        <GridColumn xs={12} sm={12} md={12} lg={4} xl={4}>
-          <RealtimeUrls websiteId={websiteId} websiteDomain={website?.domain} data={realtimeData} />
-        </GridColumn>
-        <GridColumn xs={12} sm={12} md={12} lg={8} xl={8}>
-          <RealtimeLog websiteId={websiteId} websiteDomain={website?.domain} data={realtimeData} />
-        </GridColumn>
-      </GridRow>
-      <GridRow>
-        <GridColumn xs={12} lg={4}>
-          <RealtimeCountries data={realtimeData?.countries} />
-        </GridColumn>
-        <GridColumn xs={12} lg={8}>
-          <WorldMap data={realtimeData?.countries} />
-        </GridColumn>
-      </GridRow>
-    </Page>
-  );
-}
-
-export default RealtimePage;
diff --git a/components/pages/reports/BaseParameters.js b/components/pages/reports/BaseParameters.js
deleted file mode 100644
index 394432cfa..000000000
--- a/components/pages/reports/BaseParameters.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import { FormRow } from 'react-basics';
-import DateFilter from 'components/input/DateFilter';
-import WebsiteSelect from 'components/input/WebsiteSelect';
-import { parseDateRange } from 'lib/date';
-import { useContext } from 'react';
-import { ReportContext } from './Report';
-import { useMessages } from 'hooks';
-
-export function BaseParameters() {
-  const { report, updateReport } = useContext(ReportContext);
-  const { formatMessage, labels } = useMessages();
-
-  const { parameters } = report || {};
-  const { websiteId, dateRange } = parameters || {};
-  const { value, startDate, endDate } = dateRange || {};
-
-  const handleWebsiteSelect = websiteId => {
-    updateReport({ websiteId, parameters: { websiteId } });
-  };
-
-  const handleDateChange = value => {
-    updateReport({ parameters: { dateRange: { ...parseDateRange(value) } } });
-  };
-
-  return (
-    <>
-      <FormRow label={formatMessage(labels.website)}>
-        <WebsiteSelect websiteId={websiteId} onSelect={handleWebsiteSelect} />
-      </FormRow>
-      <FormRow label={formatMessage(labels.dateRange)}>
-        <DateFilter
-          value={value}
-          startDate={startDate}
-          endDate={endDate}
-          onChange={handleDateChange}
-        />
-      </FormRow>
-    </>
-  );
-}
-
-export default BaseParameters;
diff --git a/components/pages/reports/FieldFilterForm.js b/components/pages/reports/FieldFilterForm.js
deleted file mode 100644
index 021ea97ef..000000000
--- a/components/pages/reports/FieldFilterForm.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import { useState } from 'react';
-import { Form, FormRow, Menu, Item, Flexbox, Dropdown, TextField, Button } from 'react-basics';
-import { useFilters } from 'hooks';
-import styles from './FieldFilterForm.module.css';
-
-export default function FieldFilterForm({ name, type, onSelect }) {
-  const [filter, setFilter] = useState('');
-  const [value, setValue] = useState('');
-  const { filters, types } = useFilters();
-  const items = types[type];
-
-  const renderValue = value => {
-    return filters[value];
-  };
-
-  if (type === 'boolean') {
-    return (
-      <Form>
-        <FormRow label={name}>
-          <Menu onSelect={value => onSelect({ name, type, value: ['eq', value] })}>
-            {items.map(value => {
-              return <Item key={value}>{filters[value]}</Item>;
-            })}
-          </Menu>
-        </FormRow>
-      </Form>
-    );
-  }
-
-  return (
-    <Form>
-      <FormRow label={name} className={styles.filter}>
-        <Flexbox gap={10}>
-          <Dropdown
-            className={styles.dropdown}
-            items={items}
-            value={filter}
-            renderValue={renderValue}
-            onChange={setFilter}
-          >
-            {value => {
-              return <Item key={value}>{filters[value]}</Item>;
-            }}
-          </Dropdown>
-          <TextField value={value} onChange={e => setValue(e.target.value)} autoFocus={true} />
-        </Flexbox>
-        <Button
-          variant="primary"
-          onClick={() => onSelect({ name, type, value: [filter, value] })}
-          disabled={!filter || !value}
-        >
-          Add
-        </Button>
-      </FormRow>
-    </Form>
-  );
-}
diff --git a/components/pages/reports/PopupForm.js b/components/pages/reports/PopupForm.js
deleted file mode 100644
index 0f0ead369..000000000
--- a/components/pages/reports/PopupForm.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import { createPortal } from 'react-dom';
-import { useDocumentClick, useKeyDown } from 'react-basics';
-import classNames from 'classnames';
-import styles from './PopupForm.module.css';
-
-export function PopupForm({ element, className, children, onClose }) {
-  const { right, top } = element.getBoundingClientRect();
-  const style = { position: 'absolute', left: right, top };
-
-  useKeyDown('Escape', onClose);
-
-  useDocumentClick(e => {
-    if (e.target !== element && !element?.parentElement?.contains(e.target)) {
-      onClose();
-    }
-  });
-
-  const handleClick = e => {
-    e.stopPropagation();
-  };
-
-  return createPortal(
-    <div className={classNames(styles.form, className)} style={style} onClick={handleClick}>
-      {children}
-    </div>,
-    document.body,
-  );
-}
-
-export default PopupForm;
diff --git a/components/pages/reports/Report.js b/components/pages/reports/Report.js
deleted file mode 100644
index 0a98ef756..000000000
--- a/components/pages/reports/Report.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import { createContext } from 'react';
-import Page from 'components/layout/Page';
-import styles from './reports.module.css';
-import { useReport } from 'hooks';
-
-export const ReportContext = createContext(null);
-
-export function Report({ reportId, defaultParameters, children, ...props }) {
-  const report = useReport(reportId, defaultParameters);
-
-  return (
-    <ReportContext.Provider value={{ ...report }}>
-      <Page {...props} className={styles.container}>
-        {children}
-      </Page>
-    </ReportContext.Provider>
-  );
-}
-
-export default Report;
diff --git a/components/pages/reports/ReportBody.js b/components/pages/reports/ReportBody.js
deleted file mode 100644
index 2310c8af8..000000000
--- a/components/pages/reports/ReportBody.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import styles from './reports.module.css';
-
-export function ReportBody({ children }) {
-  return <div className={styles.body}>{children}</div>;
-}
-
-export default ReportBody;
diff --git a/components/pages/reports/ReportDetails.js b/components/pages/reports/ReportDetails.js
deleted file mode 100644
index c41d12f6a..000000000
--- a/components/pages/reports/ReportDetails.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import FunnelReport from './funnel/FunnelReport';
-import EventDataReport from './event-data/EventDataReport';
-
-const reports = {
-  funnel: FunnelReport,
-  'event-data': EventDataReport,
-};
-
-export default function ReportDetails({ reportId, reportType }) {
-  const Report = reports[reportType];
-
-  return <Report reportId={reportId} />;
-}
diff --git a/components/pages/reports/ReportHeader.js b/components/pages/reports/ReportHeader.js
deleted file mode 100644
index 394b1951f..000000000
--- a/components/pages/reports/ReportHeader.js
+++ /dev/null
@@ -1,89 +0,0 @@
-import { useContext } from 'react';
-import { useRouter } from 'next/router';
-import { Icon, LoadingButton, InlineEditField, useToasts } from 'react-basics';
-import PageHeader from 'components/layout/PageHeader';
-import { useMessages, useApi } from 'hooks';
-import { ReportContext } from './Report';
-import styles from './ReportHeader.module.css';
-import reportStyles from './reports.module.css';
-
-export function ReportHeader({ icon }) {
-  const { report, updateReport } = useContext(ReportContext);
-  const { formatMessage, labels, messages } = useMessages();
-  const { showToast } = useToasts();
-  const { post, useMutation } = useApi();
-  const router = useRouter();
-  const { mutate: create, isLoading: isCreating } = useMutation(data => post(`/reports`, data));
-  const { mutate: update, isLoading: isUpdating } = useMutation(data =>
-    post(`/reports/${data.id}`, data),
-  );
-
-  const { name, description, parameters } = report || {};
-  const { websiteId, dateRange } = parameters || {};
-
-  const handleSave = async () => {
-    if (!report.id) {
-      create(report, {
-        onSuccess: async ({ id }) => {
-          showToast({ message: formatMessage(messages.saved), variant: 'success' });
-          router.push(`/reports/${id}`, null, { shallow: true });
-        },
-      });
-    } else {
-      update(report, {
-        onSuccess: async () => {
-          showToast({ message: formatMessage(messages.saved), variant: 'success' });
-        },
-      });
-    }
-  };
-
-  const handleNameChange = name => {
-    updateReport({ name: name || 'Untitled' });
-  };
-
-  const handleDescriptionChange = description => {
-    updateReport({ description });
-  };
-
-  const Title = () => {
-    return (
-      <>
-        <Icon size="lg">{icon}</Icon>
-        <InlineEditField
-          key={name}
-          name="name"
-          value={name}
-          placeholder={formatMessage(labels.untitled)}
-          onCommit={handleNameChange}
-        />
-      </>
-    );
-  };
-
-  return (
-    <div className={reportStyles.header}>
-      <PageHeader title={<Title />}>
-        <LoadingButton
-          variant="primary"
-          loading={isCreating || isUpdating}
-          disabled={!websiteId || !dateRange?.value || !name}
-          onClick={handleSave}
-        >
-          {formatMessage(labels.save)}
-        </LoadingButton>
-      </PageHeader>
-      <div className={styles.description}>
-        <InlineEditField
-          key={description}
-          name="description"
-          value={description}
-          placeholder={`+ ${formatMessage(labels.addDescription)}`}
-          onCommit={handleDescriptionChange}
-        />
-      </div>
-    </div>
-  );
-}
-
-export default ReportHeader;
diff --git a/components/pages/reports/ReportHeader.module.css b/components/pages/reports/ReportHeader.module.css
deleted file mode 100644
index 01e483a0d..000000000
--- a/components/pages/reports/ReportHeader.module.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.description {
-  color: var(--font-color300);
-}
diff --git a/components/pages/reports/ReportMenu.js b/components/pages/reports/ReportMenu.js
deleted file mode 100644
index abfea6fe2..000000000
--- a/components/pages/reports/ReportMenu.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import styles from './reports.module.css';
-
-export function ReportMenu({ children }) {
-  return <div className={styles.menu}>{children}</div>;
-}
-
-export default ReportMenu;
diff --git a/components/pages/reports/ReportsPage.js b/components/pages/reports/ReportsPage.js
deleted file mode 100644
index 470e1b08d..000000000
--- a/components/pages/reports/ReportsPage.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import Page from 'components/layout/Page';
-import PageHeader from 'components/layout/PageHeader';
-import Link from 'next/link';
-import { Button, Icon, Icons, Text } from 'react-basics';
-import { useMessages, useReports } from 'hooks';
-import ReportsTable from './ReportsTable';
-
-export function ReportsPage() {
-  const { formatMessage, labels } = useMessages();
-  const { reports, error, isLoading } = useReports();
-
-  return (
-    <Page loading={isLoading} error={error}>
-      <PageHeader title={formatMessage(labels.reports)}>
-        <Link href="/reports/create">
-          <Button variant="primary">
-            <Icon>
-              <Icons.Plus />
-            </Icon>
-            <Text>{formatMessage(labels.createReport)}</Text>
-          </Button>
-        </Link>
-      </PageHeader>
-      <ReportsTable data={reports} />
-    </Page>
-  );
-}
-
-export default ReportsPage;
diff --git a/components/pages/reports/ReportsTable.js b/components/pages/reports/ReportsTable.js
deleted file mode 100644
index 244740e1c..000000000
--- a/components/pages/reports/ReportsTable.js
+++ /dev/null
@@ -1,55 +0,0 @@
-import { useState } from 'react';
-import { Flexbox, Icon, Icons, Text, Button, Modal } from 'react-basics';
-import LinkButton from 'components/common/LinkButton';
-import SettingsTable from 'components/common/SettingsTable';
-import ConfirmDeleteForm from 'components/common/ConfirmDeleteForm';
-import { useMessages } from 'hooks';
-
-export function ReportsTable({ data = [], onDelete = () => {} }) {
-  const [report, setReport] = useState(null);
-  const { formatMessage, labels } = useMessages();
-
-  const columns = [
-    { name: 'name', label: formatMessage(labels.name) },
-    { name: 'description', label: formatMessage(labels.description) },
-    { name: 'type', label: formatMessage(labels.type) },
-    { name: 'action', label: ' ' },
-  ];
-
-  const handleConfirm = () => {
-    onDelete(report.id);
-  };
-
-  return (
-    <>
-      <SettingsTable columns={columns} data={data}>
-        {row => {
-          const { id } = row;
-
-          return (
-            <Flexbox gap={10}>
-              <LinkButton href={`/reports/${id}`}>{formatMessage(labels.view)}</LinkButton>
-              <Button onClick={() => setReport(row)}>
-                <Icon>
-                  <Icons.Trash />
-                </Icon>
-                <Text>{formatMessage(labels.delete)}</Text>
-              </Button>
-            </Flexbox>
-          );
-        }}
-      </SettingsTable>
-      {report && (
-        <Modal>
-          <ConfirmDeleteForm
-            name={report.name}
-            onConfirm={handleConfirm}
-            onClose={() => setReport(null)}
-          />
-        </Modal>
-      )}
-    </>
-  );
-}
-
-export default ReportsTable;
diff --git a/components/pages/reports/funnel/FunnelChart.js b/components/pages/reports/funnel/FunnelChart.js
deleted file mode 100644
index 7253c3fa5..000000000
--- a/components/pages/reports/funnel/FunnelChart.js
+++ /dev/null
@@ -1,63 +0,0 @@
-import { useCallback, useContext, useMemo } from 'react';
-import { Loading } from 'react-basics';
-import useMessages from 'hooks/useMessages';
-import useTheme from 'hooks/useTheme';
-import BarChart from 'components/metrics/BarChart';
-import { formatLongNumber } from 'lib/format';
-import styles from './FunnelChart.module.css';
-import { ReportContext } from '../Report';
-
-export function FunnelChart({ className, loading }) {
-  const { report } = useContext(ReportContext);
-  const { formatMessage, labels } = useMessages();
-  const { colors } = useTheme();
-
-  const { parameters, data } = report || {};
-
-  const renderXLabel = useCallback(
-    (label, index) => {
-      return parameters.urls[index];
-    },
-    [parameters],
-  );
-
-  const renderTooltipPopup = useCallback((setTooltipPopup, model) => {
-    const { opacity, dataPoints } = model.tooltip;
-
-    if (!dataPoints?.length || !opacity) {
-      setTooltipPopup(null);
-      return;
-    }
-
-    setTooltipPopup(`${formatLongNumber(dataPoints[0].raw.y)} ${formatMessage(labels.visitors)}`);
-  }, []);
-
-  const datasets = useMemo(() => {
-    return [
-      {
-        label: formatMessage(labels.uniqueVisitors),
-        data: data,
-        borderWidth: 1,
-        ...colors.chart.visitors,
-      },
-    ];
-  }, [data]);
-
-  if (loading) {
-    return <Loading icon="dots" className={styles.loading} />;
-  }
-
-  return (
-    <BarChart
-      className={className}
-      datasets={datasets}
-      unit="day"
-      loading={loading}
-      renderXLabel={renderXLabel}
-      renderTooltipPopup={renderTooltipPopup}
-      XAxisType="category"
-    />
-  );
-}
-
-export default FunnelChart;
diff --git a/components/pages/reports/funnel/UrlAddForm.js b/components/pages/reports/funnel/UrlAddForm.js
deleted file mode 100644
index 0fb78b3d2..000000000
--- a/components/pages/reports/funnel/UrlAddForm.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import { useState } from 'react';
-import { useMessages } from 'hooks';
-import { Button, Form, FormRow, TextField, Flexbox } from 'react-basics';
-import styles from './UrlAddForm.module.css';
-import PopupForm from '../PopupForm';
-
-export function UrlAddForm({ defaultValue = '', element, onAdd, onClose }) {
-  const [url, setUrl] = useState(defaultValue);
-  const { formatMessage, labels } = useMessages();
-
-  const handleSave = () => {
-    onAdd(url);
-    setUrl('');
-    onClose();
-  };
-
-  const handleChange = e => {
-    setUrl(e.target.value);
-  };
-
-  const handleKeyDown = e => {
-    if (e.key === 'Enter') {
-      e.stopPropagation();
-      handleSave();
-    }
-  };
-
-  return (
-    <PopupForm element={element}>
-      <Form>
-        <FormRow label={formatMessage(labels.url)}>
-          <Flexbox gap={10}>
-            <TextField
-              className={styles.input}
-              value={url}
-              onChange={handleChange}
-              autoFocus={true}
-              autoComplete="off"
-              onKeyDown={handleKeyDown}
-            />
-            <Button variant="primary" onClick={handleSave}>
-              {formatMessage(labels.add)}
-            </Button>
-          </Flexbox>
-        </FormRow>
-      </Form>
-    </PopupForm>
-  );
-}
-
-export default UrlAddForm;
diff --git a/components/pages/reports/insights/InsightsParameters.js b/components/pages/reports/insights/InsightsParameters.js
deleted file mode 100644
index b87a566da..000000000
--- a/components/pages/reports/insights/InsightsParameters.js
+++ /dev/null
@@ -1,121 +0,0 @@
-import { useContext, useRef } from 'react';
-import { useMessages } from 'hooks';
-import { Form, FormRow, FormButtons, SubmitButton, PopupTrigger, Icon, Popup } from 'react-basics';
-import { ReportContext } from 'components/pages/reports/Report';
-import { REPORT_PARAMETERS, WEBSITE_EVENT_FIELDS } from 'lib/constants';
-import Icons from 'components/icons';
-import BaseParameters from '../BaseParameters';
-import FieldAddForm from '../FieldAddForm';
-import ParameterList from '../ParameterList';
-import styles from './InsightsParameters.module.css';
-
-export function InsightsParameters() {
-  const { report, runReport, updateReport, isRunning } = useContext(ReportContext);
-  const { formatMessage, labels } = useMessages();
-  const ref = useRef(null);
-  const { parameters } = report || {};
-  const { websiteId, dateRange, fields, filters, groups } = parameters || {};
-  const queryEnabled = websiteId && dateRange && fields?.length;
-  const fieldOptions = Object.keys(WEBSITE_EVENT_FIELDS).map(key => WEBSITE_EVENT_FIELDS[key]);
-
-  const parameterGroups = [
-    { label: formatMessage(labels.fields), group: REPORT_PARAMETERS.fields },
-    { label: formatMessage(labels.filters), group: REPORT_PARAMETERS.filters },
-    { label: formatMessage(labels.breakdown), group: REPORT_PARAMETERS.groups },
-  ];
-
-  const parameterData = {
-    fields,
-    filters,
-    groups,
-  };
-
-  const handleSubmit = values => {
-    runReport(values);
-  };
-
-  const handleAdd = (group, value) => {
-    const data = parameterData[group];
-
-    if (!data.find(({ name }) => name === value.name)) {
-      updateReport({ parameters: { [group]: data.concat(value) } });
-    }
-  };
-
-  const handleRemove = (group, index) => {
-    const data = [...parameterData[group]];
-    data.splice(index, 1);
-    updateReport({ parameters: { [group]: data } });
-  };
-
-  const AddButton = ({ group }) => {
-    return (
-      <PopupTrigger>
-        <Icon>
-          <Icons.Plus />
-        </Icon>
-        <Popup position="bottom" alignment="start">
-          {(close, element) => {
-            return (
-              <FieldAddForm
-                fields={fieldOptions}
-                group={group}
-                element={element}
-                onAdd={handleAdd}
-                onClose={close}
-              />
-            );
-          }}
-        </Popup>
-      </PopupTrigger>
-    );
-  };
-
-  return (
-    <Form ref={ref} values={parameters} onSubmit={handleSubmit}>
-      <BaseParameters />
-      {parameterGroups.map(({ label, group }) => {
-        return (
-          <FormRow key={label} label={label} action={<AddButton group={group} onAdd={handleAdd} />}>
-            <ParameterList
-              items={parameterData[group]}
-              onRemove={index => handleRemove(group, index)}
-            >
-              {({ name, value }) => {
-                return (
-                  <div className={styles.parameter}>
-                    {group === REPORT_PARAMETERS.fields && (
-                      <>
-                        <div>{name}</div>
-                        <div className={styles.op}>{value}</div>
-                      </>
-                    )}
-                    {group === REPORT_PARAMETERS.filters && (
-                      <>
-                        <div>{name}</div>
-                        <div className={styles.op}>{value[0]}</div>
-                        <div>{value[1]}</div>
-                      </>
-                    )}
-                    {group === REPORT_PARAMETERS.groups && (
-                      <>
-                        <div>{name}</div>
-                      </>
-                    )}
-                  </div>
-                );
-              }}
-            </ParameterList>
-          </FormRow>
-        );
-      })}
-      <FormButtons>
-        <SubmitButton variant="primary" disabled={!queryEnabled} loading={isRunning}>
-          {formatMessage(labels.runQuery)}
-        </SubmitButton>
-      </FormButtons>
-    </Form>
-  );
-}
-
-export default InsightsParameters;
diff --git a/components/pages/reports/insights/InsightsTable.js b/components/pages/reports/insights/InsightsTable.js
deleted file mode 100644
index a767468e4..000000000
--- a/components/pages/reports/insights/InsightsTable.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import { useContext } from 'react';
-import { GridTable, GridColumn } from 'react-basics';
-import { useMessages } from 'hooks';
-import { ReportContext } from '../Report';
-
-export function InsightsTable() {
-  const { report } = useContext(ReportContext);
-  const { formatMessage, labels } = useMessages();
-
-  return (
-    <GridTable data={report?.data || []}>
-      <GridColumn name="field" label={formatMessage(labels.field)} />
-      <GridColumn name="value" label={formatMessage(labels.value)} />
-      <GridColumn name="total" label={formatMessage(labels.total)} />
-    </GridTable>
-  );
-}
-
-export default InsightsTable;
diff --git a/components/pages/reports/reports.module.css b/components/pages/reports/reports.module.css
deleted file mode 100644
index 6fa542819..000000000
--- a/components/pages/reports/reports.module.css
+++ /dev/null
@@ -1,25 +0,0 @@
-.container {
-  display: grid;
-  grid-template-rows: max-content 1fr;
-  grid-template-columns: max-content 1fr;
-}
-
-.header {
-  grid-row: 1 / 2;
-  grid-column: 1 / 3;
-  margin-bottom: 40px;
-}
-
-.menu {
-  width: 300px;
-  padding-right: 20px;
-  border-right: 1px solid var(--base300);
-  grid-row: 2/3;
-  grid-column: 1 / 2;
-}
-
-.body {
-  padding-left: 20px;
-  grid-row: 2/3;
-  grid-column: 2 / 3;
-}
diff --git a/components/pages/settings/profile/ProfileSettings.js b/components/pages/settings/profile/ProfileSettings.js
deleted file mode 100644
index 6062dfbfa..000000000
--- a/components/pages/settings/profile/ProfileSettings.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import Page from 'components/layout/Page';
-import PageHeader from 'components/layout/PageHeader';
-import ProfileDetails from './ProfileDetails';
-import useMessages from 'hooks/useMessages';
-
-export function ProfileSettings() {
-  const { formatMessage, labels } = useMessages();
-
-  return (
-    <Page>
-      <PageHeader title={formatMessage(labels.profile)} />
-      <ProfileDetails />
-    </Page>
-  );
-}
-
-export default ProfileSettings;
diff --git a/components/pages/settings/teams/TeamAddWebsiteForm.js b/components/pages/settings/teams/TeamAddWebsiteForm.js
deleted file mode 100644
index cc815d934..000000000
--- a/components/pages/settings/teams/TeamAddWebsiteForm.js
+++ /dev/null
@@ -1,63 +0,0 @@
-import useApi from 'hooks/useApi';
-import { useRef, useState } from 'react';
-import { Button, Dropdown, Form, FormButtons, FormRow, Item, SubmitButton } from 'react-basics';
-import WebsiteTags from './WebsiteTags';
-import useMessages from 'hooks/useMessages';
-
-export function TeamAddWebsiteForm({ teamId, onSave, onClose }) {
-  const { formatMessage, labels } = useMessages();
-  const { get, post, useQuery, useMutation } = useApi();
-  const { mutate, error } = useMutation(data => post(`/teams/${teamId}/websites`, data));
-  const { data: websites } = useQuery(['websites'], () => get('/websites'));
-  const [newWebsites, setNewWebsites] = useState([]);
-  const formRef = useRef();
-
-  const handleSubmit = () => {
-    mutate(
-      { websiteIds: newWebsites },
-      {
-        onSuccess: async () => {
-          onSave();
-          onClose();
-        },
-      },
-    );
-  };
-
-  const handleAddWebsite = value => {
-    if (!newWebsites.some(a => a === value)) {
-      const nextValue = [...newWebsites];
-
-      nextValue.push(value);
-
-      setNewWebsites(nextValue);
-    }
-  };
-
-  const handleRemoveWebsite = value => {
-    const newValue = newWebsites.filter(a => a !== value);
-
-    setNewWebsites(newValue);
-  };
-
-  return (
-    <>
-      <Form onSubmit={handleSubmit} error={error} ref={formRef}>
-        <FormRow label={formatMessage(labels.websites)}>
-          <Dropdown items={websites} onChange={handleAddWebsite} style={{ width: 300 }}>
-            {({ id, name }) => <Item key={id}>{name}</Item>}
-          </Dropdown>
-        </FormRow>
-        <WebsiteTags items={websites} websites={newWebsites} onClick={handleRemoveWebsite} />
-        <FormButtons flex>
-          <SubmitButton disabled={newWebsites && newWebsites.length === 0}>
-            {formatMessage(labels.addWebsite)}
-          </SubmitButton>
-          <Button onClick={onClose}>{formatMessage(labels.cancel)}</Button>
-        </FormButtons>
-      </Form>
-    </>
-  );
-}
-
-export default TeamAddWebsiteForm;
diff --git a/components/pages/settings/teams/TeamLeaveForm.js b/components/pages/settings/teams/TeamLeaveForm.js
deleted file mode 100644
index 954006abb..000000000
--- a/components/pages/settings/teams/TeamLeaveForm.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import { Button, Form, FormButtons, SubmitButton } from 'react-basics';
-import useApi from 'hooks/useApi';
-import useMessages from 'hooks/useMessages';
-
-export function TeamLeaveForm({ teamId, userId, teamName, onSave, onClose }) {
-  const { formatMessage, labels, messages, FormattedMessage } = useMessages();
-  const { del, useMutation } = useApi();
-  const { mutate, error, isLoading } = useMutation(() => del(`/teams/${teamId}/users/${userId}`));
-
-  const handleSubmit = async () => {
-    mutate(
-      {},
-      {
-        onSuccess: async () => {
-          onSave();
-          onClose();
-        },
-      },
-    );
-  };
-
-  return (
-    <Form onSubmit={handleSubmit} error={error}>
-      <p>
-        <FormattedMessage {...messages.confirmDelete} values={{ target: <b>{teamName}</b> }} />
-      </p>
-      <FormButtons flex>
-        <SubmitButton variant="danger" disabled={isLoading}>
-          {formatMessage(labels.leave)}
-        </SubmitButton>
-        <Button onClick={onClose}>{formatMessage(labels.cancel)}</Button>
-      </FormButtons>
-    </Form>
-  );
-}
-
-export default TeamLeaveForm;
diff --git a/components/pages/settings/teams/TeamMemberRemoveButton.js b/components/pages/settings/teams/TeamMemberRemoveButton.js
deleted file mode 100644
index 9f3264763..000000000
--- a/components/pages/settings/teams/TeamMemberRemoveButton.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import useApi from 'hooks/useApi';
-import useMessages from 'hooks/useMessages';
-import { Icon, Icons, LoadingButton, Text } from 'react-basics';
-
-export function TeamMemberRemoveButton({ teamId, userId, disabled, onSave }) {
-  const { formatMessage, labels } = useMessages();
-  const { del, useMutation } = useApi();
-  const { mutate, isLoading } = useMutation(() => del(`/teams/${teamId}/users/${userId}`));
-
-  const handleRemoveTeamMember = () => {
-    mutate(
-      {},
-      {
-        onSuccess: () => {
-          onSave();
-        },
-      },
-    );
-  };
-
-  return (
-    <LoadingButton onClick={() => handleRemoveTeamMember()} disabled={disabled} loading={isLoading}>
-      <Icon>
-        <Icons.Close />
-      </Icon>
-      <Text>{formatMessage(labels.remove)}</Text>
-    </LoadingButton>
-  );
-}
-
-export default TeamMemberRemoveButton;
diff --git a/components/pages/settings/teams/TeamMembers.js b/components/pages/settings/teams/TeamMembers.js
deleted file mode 100644
index 3ea8232ce..000000000
--- a/components/pages/settings/teams/TeamMembers.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import { Loading, useToasts } from 'react-basics';
-import TeamMembersTable from 'components/pages/settings/teams/TeamMembersTable';
-import useApi from 'hooks/useApi';
-import useMessages from 'hooks/useMessages';
-
-export function TeamMembers({ teamId, readOnly }) {
-  const { showToast } = useToasts();
-  const { get, useQuery } = useApi();
-  const { formatMessage, messages } = useMessages();
-  const { data, isLoading, refetch } = useQuery(['teams:users', teamId], () =>
-    get(`/teams/${teamId}/users`),
-  );
-
-  if (isLoading) {
-    return <Loading icon="dots" style={{ minHeight: 300 }} />;
-  }
-
-  const handleSave = async () => {
-    await refetch();
-    showToast({ message: formatMessage(messages.saved), variant: 'success' });
-  };
-
-  return (
-    <>
-      <TeamMembersTable onSave={handleSave} data={data} readOnly={readOnly} />
-    </>
-  );
-}
-
-export default TeamMembers;
diff --git a/components/pages/settings/teams/TeamMembersTable.js b/components/pages/settings/teams/TeamMembersTable.js
deleted file mode 100644
index 8e6fad82e..000000000
--- a/components/pages/settings/teams/TeamMembersTable.js
+++ /dev/null
@@ -1,47 +0,0 @@
-import useMessages from 'hooks/useMessages';
-import useUser from 'hooks/useUser';
-import { ROLES } from 'lib/constants';
-import TeamMemberRemoveButton from './TeamMemberRemoveButton';
-import SettingsTable from 'components/common/SettingsTable';
-
-export function TeamMembersTable({ data = [], onSave, readOnly }) {
-  const { formatMessage, labels } = useMessages();
-  const { user } = useUser();
-
-  const columns = [
-    { name: 'username', label: formatMessage(labels.username) },
-    { name: 'role', label: formatMessage(labels.role) },
-    { name: 'action', label: ' ' },
-  ];
-
-  const cellRender = (row, data, key) => {
-    if (key === 'username') {
-      return row?.user?.username;
-    }
-    if (key === 'role') {
-      return formatMessage(
-        labels[Object.keys(ROLES).find(key => ROLES[key] === row.role) || labels.unknown],
-      );
-    }
-    return data[key];
-  };
-
-  return (
-    <SettingsTable data={data} columns={columns} cellRender={cellRender}>
-      {row => {
-        return (
-          !readOnly && (
-            <TeamMemberRemoveButton
-              teamId={row.teamId}
-              userId={row.userId}
-              disabled={user.id === row?.user?.id || row.role === ROLES.teamOwner}
-              onSave={onSave}
-            />
-          )
-        );
-      }}
-    </SettingsTable>
-  );
-}
-
-export default TeamMembersTable;
diff --git a/components/pages/settings/teams/TeamWebsiteRemoveButton.js b/components/pages/settings/teams/TeamWebsiteRemoveButton.js
deleted file mode 100644
index a752313f1..000000000
--- a/components/pages/settings/teams/TeamWebsiteRemoveButton.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import useApi from 'hooks/useApi';
-import useMessages from 'hooks/useMessages';
-import { Icon, Icons, LoadingButton, Text } from 'react-basics';
-
-export function TeamWebsiteRemoveButton({ teamId, websiteId, onSave }) {
-  const { formatMessage, labels } = useMessages();
-  const { del, useMutation } = useApi();
-  const { mutate, isLoading } = useMutation(() => del(`/teams/${teamId}/websites/${websiteId}`));
-
-  const handleRemoveTeamMember = () => {
-    mutate(
-      {},
-      {
-        onSuccess: () => {
-          onSave();
-        },
-      },
-    );
-  };
-
-  return (
-    <LoadingButton onClick={() => handleRemoveTeamMember()} loading={isLoading}>
-      <Icon>
-        <Icons.Close />
-      </Icon>
-      <Text>{formatMessage(labels.remove)}</Text>
-    </LoadingButton>
-  );
-}
-
-export default TeamWebsiteRemoveButton;
diff --git a/components/pages/settings/teams/TeamWebsites.js b/components/pages/settings/teams/TeamWebsites.js
deleted file mode 100644
index 9a5761e56..000000000
--- a/components/pages/settings/teams/TeamWebsites.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import {
-  ActionForm,
-  Button,
-  Icon,
-  Icons,
-  Loading,
-  Modal,
-  ModalTrigger,
-  Text,
-  useToasts,
-} from 'react-basics';
-import TeamWebsitesTable from 'components/pages/settings/teams/TeamWebsitesTable';
-import TeamAddWebsiteForm from 'components/pages/settings/teams/TeamAddWebsiteForm';
-import useApi from 'hooks/useApi';
-import useMessages from 'hooks/useMessages';
-
-export function TeamWebsites({ teamId }) {
-  const { showToast } = useToasts();
-  const { formatMessage, labels, messages } = useMessages();
-  const { get, useQuery } = useApi();
-  const { data, isLoading, refetch } = useQuery(['teams:websites', teamId], () =>
-    get(`/teams/${teamId}/websites`),
-  );
-  const hasData = data && data.length !== 0;
-
-  if (isLoading) {
-    return <Loading icon="dots" style={{ minHeight: 300 }} />;
-  }
-
-  const handleSave = async () => {
-    await refetch();
-    showToast({ message: formatMessage(messages.saved), variant: 'success' });
-  };
-
-  const addButton = (
-    <ModalTrigger>
-      <Button variant="primary">
-        <Icon>
-          <Icons.Plus />
-        </Icon>
-        <Text>{formatMessage(labels.addWebsite)}</Text>
-      </Button>
-      <Modal title={formatMessage(labels.addWebsite)}>
-        {close => <TeamAddWebsiteForm teamId={teamId} onSave={handleSave} onClose={close} />}
-      </Modal>
-    </ModalTrigger>
-  );
-
-  return (
-    <div>
-      <ActionForm description={formatMessage(messages.teamWebsitesInfo)}>{addButton}</ActionForm>
-      {hasData && <TeamWebsitesTable teamId={teamId} data={data} onSave={handleSave} />}
-    </div>
-  );
-}
-
-export default TeamWebsites;
diff --git a/components/pages/settings/teams/TeamWebsitesTable.js b/components/pages/settings/teams/TeamWebsitesTable.js
deleted file mode 100644
index 4873c6c72..000000000
--- a/components/pages/settings/teams/TeamWebsitesTable.js
+++ /dev/null
@@ -1,55 +0,0 @@
-import useMessages from 'hooks/useMessages';
-import useUser from 'hooks/useUser';
-import Link from 'next/link';
-import { Button, Icon, Icons, Text } from 'react-basics';
-import TeamWebsiteRemoveButton from './TeamWebsiteRemoveButton';
-import SettingsTable from 'components/common/SettingsTable';
-import useConfig from 'hooks/useConfig';
-
-export function TeamWebsitesTable({ data = [], onSave }) {
-  const { formatMessage, labels } = useMessages();
-  const { openExternal } = useConfig();
-  const { user } = useUser();
-  const columns = [
-    { name: 'name', label: formatMessage(labels.name) },
-    { name: 'domain', label: formatMessage(labels.domain) },
-    { name: 'action', label: ' ' },
-  ];
-
-  return (
-    <SettingsTable columns={columns} data={data}>
-      {row => {
-        const { teamId } = row;
-        const { id: websiteId, name, domain, userId } = row.website;
-        const { teamUser } = row.team;
-        const owner = teamUser[0];
-        const canRemove = user.id === userId || user.id === owner.userId;
-
-        row.name = name;
-        row.domain = domain;
-
-        return (
-          <>
-            <Link href={`/websites/${websiteId}`} target={openExternal ? '_blank' : null}>
-              <Button>
-                <Icon>
-                  <Icons.External />
-                </Icon>
-                <Text>{formatMessage(labels.view)}</Text>
-              </Button>
-            </Link>
-            {canRemove && (
-              <TeamWebsiteRemoveButton
-                teamId={teamId}
-                websiteId={websiteId}
-                onSave={onSave}
-              ></TeamWebsiteRemoveButton>
-            )}
-          </>
-        );
-      }}
-    </SettingsTable>
-  );
-}
-
-export default TeamWebsitesTable;
diff --git a/components/pages/settings/teams/TeamsList.js b/components/pages/settings/teams/TeamsList.js
deleted file mode 100644
index 0c82639bf..000000000
--- a/components/pages/settings/teams/TeamsList.js
+++ /dev/null
@@ -1,92 +0,0 @@
-import { useState } from 'react';
-import { Button, Icon, Modal, ModalTrigger, useToasts, Text, Flexbox } from 'react-basics';
-import EmptyPlaceholder from 'components/common/EmptyPlaceholder';
-import TeamAddForm from 'components/pages/settings/teams/TeamAddForm';
-import PageHeader from 'components/layout/PageHeader';
-import TeamsTable from 'components/pages/settings/teams/TeamsTable';
-import Page from 'components/layout/Page';
-import Icons from 'components/icons';
-import TeamJoinForm from './TeamJoinForm';
-import useApi from 'hooks/useApi';
-import useMessages from 'hooks/useMessages';
-import { ROLES } from 'lib/constants';
-import useUser from 'hooks/useUser';
-
-export default function TeamsList() {
-  const { user } = useUser();
-  const { formatMessage, labels, messages } = useMessages();
-  const [update, setUpdate] = useState(0);
-  const { get, useQuery } = useApi();
-  const { data, isLoading, error } = useQuery(['teams', update], () => get(`/teams`));
-  const hasData = data && data.length !== 0;
-  const { showToast } = useToasts();
-
-  const handleSave = () => {
-    setUpdate(state => state + 1);
-    showToast({ message: formatMessage(messages.saved), variant: 'success' });
-  };
-
-  const handleJoin = () => {
-    setUpdate(state => state + 1);
-    showToast({ message: formatMessage(messages.saved), variant: 'success' });
-  };
-
-  const handleDelete = () => {
-    setUpdate(state => state + 1);
-    showToast({ message: formatMessage(messages.saved), variant: 'success' });
-  };
-
-  const joinButton = (
-    <ModalTrigger>
-      <Button variant="secondary">
-        <Icon>
-          <Icons.AddUser />
-        </Icon>
-        <Text>{formatMessage(labels.joinTeam)}</Text>
-      </Button>
-      <Modal title={formatMessage(labels.joinTeam)}>
-        {close => <TeamJoinForm onSave={handleJoin} onClose={close} />}
-      </Modal>
-    </ModalTrigger>
-  );
-
-  const createButton = (
-    <>
-      {user.role !== ROLES.viewOnly && (
-        <ModalTrigger>
-          <Button variant="primary">
-            <Icon>
-              <Icons.Plus />
-            </Icon>
-            <Text>{formatMessage(labels.createTeam)}</Text>
-          </Button>
-          <Modal title={formatMessage(labels.createTeam)}>
-            {close => <TeamAddForm onSave={handleSave} onClose={close} />}
-          </Modal>
-        </ModalTrigger>
-      )}
-    </>
-  );
-
-  return (
-    <Page loading={isLoading} error={error}>
-      <PageHeader title={formatMessage(labels.teams)}>
-        {hasData && (
-          <Flexbox gap={10}>
-            {joinButton}
-            {createButton}
-          </Flexbox>
-        )}
-      </PageHeader>
-      {hasData && <TeamsTable data={data} onDelete={handleDelete} />}
-      {!hasData && (
-        <EmptyPlaceholder message={formatMessage(messages.noTeams)}>
-          <Flexbox gap={10}>
-            {joinButton}
-            {createButton}
-          </Flexbox>
-        </EmptyPlaceholder>
-      )}
-    </Page>
-  );
-}
diff --git a/components/pages/settings/teams/TeamsTable.js b/components/pages/settings/teams/TeamsTable.js
deleted file mode 100644
index a344fefce..000000000
--- a/components/pages/settings/teams/TeamsTable.js
+++ /dev/null
@@ -1,94 +0,0 @@
-import Link from 'next/link';
-import { Button, Icon, Icons, Modal, ModalTrigger, Text } from 'react-basics';
-import TeamDeleteForm from './TeamDeleteForm';
-import TeamLeaveForm from './TeamLeaveForm';
-import useMessages from 'hooks/useMessages';
-import useUser from 'hooks/useUser';
-import { ROLES } from 'lib/constants';
-import SettingsTable from 'components/common/SettingsTable';
-import useLocale from 'hooks/useLocale';
-
-export function TeamsTable({ data = [], onDelete }) {
-  const { formatMessage, labels } = useMessages();
-  const { user } = useUser();
-  const { dir } = useLocale();
-
-  const columns = [
-    { name: 'name', label: formatMessage(labels.name) },
-    { name: 'owner', label: formatMessage(labels.owner) },
-    { name: 'action', label: ' ' },
-  ];
-
-  const cellRender = (row, data, key) => {
-    if (key === 'owner') {
-      return row.teamUser.find(({ role }) => role === ROLES.teamOwner)?.user?.username;
-    }
-    return data[key];
-  };
-
-  return (
-    <SettingsTable data={data} columns={columns} cellRender={cellRender}>
-      {row => {
-        const { id, teamUser } = row;
-        const owner = teamUser.find(({ role }) => role === ROLES.teamOwner);
-        const showDelete = user.id === owner?.userId;
-
-        return (
-          <>
-            <Link href={`/settings/teams/${id}`}>
-              <Button>
-                <Icon>
-                  <Icons.Show />
-                </Icon>
-                <Text>{formatMessage(labels.view)}</Text>
-              </Button>
-            </Link>
-            {showDelete && (
-              <ModalTrigger>
-                <Button>
-                  <Icon>
-                    <Icons.Trash />
-                  </Icon>
-                  <Text>{formatMessage(labels.delete)}</Text>
-                </Button>
-                <Modal title={formatMessage(labels.deleteTeam)}>
-                  {close => (
-                    <TeamDeleteForm
-                      teamId={row.id}
-                      teamName={row.name}
-                      onSave={onDelete}
-                      onClose={close}
-                    />
-                  )}
-                </Modal>
-              </ModalTrigger>
-            )}
-            {!showDelete && (
-              <ModalTrigger>
-                <Button>
-                  <Icon rotate={dir === 'rtl' ? 180 : 0}>
-                    <Icons.ArrowRight />
-                  </Icon>
-                  <Text>{formatMessage(labels.leave)}</Text>
-                </Button>
-                <Modal title={formatMessage(labels.leaveTeam)}>
-                  {close => (
-                    <TeamLeaveForm
-                      teamId={id}
-                      userId={user.id}
-                      teamName={row.name}
-                      onSave={onDelete}
-                      onClose={close}
-                    />
-                  )}
-                </Modal>
-              </ModalTrigger>
-            )}
-          </>
-        );
-      }}
-    </SettingsTable>
-  );
-}
-
-export default TeamsTable;
diff --git a/components/pages/settings/users/UserAddButton.js b/components/pages/settings/users/UserAddButton.js
deleted file mode 100644
index a461f39d7..000000000
--- a/components/pages/settings/users/UserAddButton.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Button, Icon, Text, Modal, Icons, ModalTrigger } from 'react-basics';
-import UserAddForm from './UserAddForm';
-import useMessages from 'hooks/useMessages';
-
-export function UserAddButton({ onSave }) {
-  const { formatMessage, labels } = useMessages();
-
-  const handleSave = () => {
-    onSave();
-  };
-
-  return (
-    <ModalTrigger>
-      <Button variant="primary">
-        <Icon>
-          <Icons.Plus />
-        </Icon>
-        <Text>{formatMessage(labels.createUser)}</Text>
-      </Button>
-      <Modal title={formatMessage(labels.createUser)}>
-        {close => <UserAddForm onSave={handleSave} onClose={close} />}
-      </Modal>
-    </ModalTrigger>
-  );
-}
-
-export default UserAddButton;
diff --git a/components/pages/settings/users/UserWebsites.js b/components/pages/settings/users/UserWebsites.js
deleted file mode 100644
index 144fae444..000000000
--- a/components/pages/settings/users/UserWebsites.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import { Loading } from 'react-basics';
-import useApi from 'hooks/useApi';
-import WebsitesTable from 'components/pages/settings/websites/WebsitesTable';
-import useMessages from 'hooks/useMessages';
-
-export function UserWebsites({ userId }) {
-  const { formatMessage, messages } = useMessages();
-  const { get, useQuery } = useApi();
-  const { data, isLoading } = useQuery(['user:websites', userId], () =>
-    get(`/users/${userId}/websites`),
-  );
-  const hasData = data && data.length !== 0;
-
-  if (isLoading) {
-    return <Loading icon="dots" style={{ minHeight: 300 }} />;
-  }
-
-  return (
-    <div>
-      {hasData && <WebsitesTable data={data} />}
-      {!hasData && formatMessage(messages.noDataAvailable)}
-    </div>
-  );
-}
-
-export default UserWebsites;
diff --git a/components/pages/settings/users/UsersList.js b/components/pages/settings/users/UsersList.js
deleted file mode 100644
index 8886203b5..000000000
--- a/components/pages/settings/users/UsersList.js
+++ /dev/null
@@ -1,46 +0,0 @@
-import { useToasts } from 'react-basics';
-import Page from 'components/layout/Page';
-import PageHeader from 'components/layout/PageHeader';
-import EmptyPlaceholder from 'components/common/EmptyPlaceholder';
-import UsersTable from './UsersTable';
-import UserAddButton from './UserAddButton';
-import useApi from 'hooks/useApi';
-import useUser from 'hooks/useUser';
-import useMessages from 'hooks/useMessages';
-
-export function UsersList() {
-  const { formatMessage, labels, messages } = useMessages();
-  const { user } = useUser();
-  const { get, useQuery } = useApi();
-  const { data, isLoading, error, refetch } = useQuery(['user'], () => get(`/users`), {
-    enabled: !!user,
-  });
-  const { showToast } = useToasts();
-  const hasData = data && data.length !== 0;
-
-  const handleSave = () => {
-    refetch().then(() => showToast({ message: formatMessage(messages.saved), variant: 'success' }));
-  };
-
-  const handleDelete = () => {
-    refetch().then(() =>
-      showToast({ message: formatMessage(messages.userDeleted), variant: 'success' }),
-    );
-  };
-
-  return (
-    <Page loading={isLoading} error={error}>
-      <PageHeader title={formatMessage(labels.users)}>
-        <UserAddButton onSave={handleSave} />
-      </PageHeader>
-      {hasData && <UsersTable data={data} onDelete={handleDelete} />}
-      {!hasData && (
-        <EmptyPlaceholder message={formatMessage(messages.noUsers)}>
-          <UserAddButton onSave={handleSave} />
-        </EmptyPlaceholder>
-      )}
-    </Page>
-  );
-}
-
-export default UsersList;
diff --git a/components/pages/settings/users/UsersTable.js b/components/pages/settings/users/UsersTable.js
deleted file mode 100644
index 2023efc5d..000000000
--- a/components/pages/settings/users/UsersTable.js
+++ /dev/null
@@ -1,76 +0,0 @@
-import { Button, Text, Icon, Icons, ModalTrigger, Modal } from 'react-basics';
-import { formatDistance } from 'date-fns';
-import Link from 'next/link';
-import useUser from 'hooks/useUser';
-import UserDeleteForm from './UserDeleteForm';
-import { ROLES } from 'lib/constants';
-import useMessages from 'hooks/useMessages';
-import SettingsTable from 'components/common/SettingsTable';
-import useLocale from 'hooks/useLocale';
-
-export function UsersTable({ data = [], onDelete }) {
-  const { formatMessage, labels } = useMessages();
-  const { user } = useUser();
-  const { dateLocale } = useLocale();
-
-  const columns = [
-    { name: 'username', label: formatMessage(labels.username) },
-    { name: 'role', label: formatMessage(labels.role) },
-    { name: 'created', label: formatMessage(labels.created) },
-    { name: 'action', label: ' ' },
-  ];
-
-  const cellRender = (row, data, key) => {
-    if (key === 'created') {
-      return formatDistance(new Date(row.createdAt), new Date(), {
-        addSuffix: true,
-        locale: dateLocale,
-      });
-    }
-    if (key === 'role') {
-      return formatMessage(
-        labels[Object.keys(ROLES).find(key => ROLES[key] === row.role)] || labels.unknown,
-      );
-    }
-    return data[key];
-  };
-
-  return (
-    <SettingsTable data={data} columns={columns} cellRender={cellRender}>
-      {(row, keys, rowIndex) => {
-        return (
-          <>
-            <Link href={`/settings/users/${row.id}`}>
-              <Button>
-                <Icon>
-                  <Icons.Edit />
-                </Icon>
-                <Text>{formatMessage(labels.edit)}</Text>
-              </Button>
-            </Link>
-            <ModalTrigger disabled={row.id === user.id}>
-              <Button disabled={row.id === user.id}>
-                <Icon>
-                  <Icons.Trash />
-                </Icon>
-                <Text>{formatMessage(labels.delete)}</Text>
-              </Button>
-              <Modal title={formatMessage(labels.deleteUser)}>
-                {close => (
-                  <UserDeleteForm
-                    userId={row.id}
-                    username={row.username}
-                    onSave={onDelete}
-                    onClose={close}
-                  />
-                )}
-              </Modal>
-            </ModalTrigger>
-          </>
-        );
-      }}
-    </SettingsTable>
-  );
-}
-
-export default UsersTable;
diff --git a/components/pages/settings/websites/TrackingCode.js b/components/pages/settings/websites/TrackingCode.js
deleted file mode 100644
index c847ed0d2..000000000
--- a/components/pages/settings/websites/TrackingCode.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import { TextArea } from 'react-basics';
-import useMessages from 'hooks/useMessages';
-import useConfig from 'hooks/useConfig';
-
-export function TrackingCode({ websiteId }) {
-  const { formatMessage, messages } = useMessages();
-  const { basePath, trackerScriptName } = useConfig();
-  const url = trackerScriptName?.startsWith('http')
-    ? trackerScriptName
-    : `${location.origin}${basePath}/${
-        trackerScriptName?.split(',')?.map(n => n.trim())?.[0] || 'script.js'
-      }`;
-
-  const code = `<script async src="${url}" data-website-id="${websiteId}"></script>`;
-
-  return (
-    <>
-      <p>{formatMessage(messages.trackingCode)}</p>
-      <TextArea rows={4} value={code} readOnly allowCopy />
-    </>
-  );
-}
-
-export default TrackingCode;
diff --git a/components/pages/settings/websites/WebsitesList.js b/components/pages/settings/websites/WebsitesList.js
deleted file mode 100644
index de423d0b2..000000000
--- a/components/pages/settings/websites/WebsitesList.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import { Button, Icon, Text, Modal, ModalTrigger, useToasts, Icons } from 'react-basics';
-import Page from 'components/layout/Page';
-import PageHeader from 'components/layout/PageHeader';
-import EmptyPlaceholder from 'components/common/EmptyPlaceholder';
-import WebsiteAddForm from 'components/pages/settings/websites/WebsiteAddForm';
-import WebsitesTable from 'components/pages/settings/websites/WebsitesTable';
-import useApi from 'hooks/useApi';
-import useUser from 'hooks/useUser';
-import useMessages from 'hooks/useMessages';
-import { ROLES } from 'lib/constants';
-
-export function WebsitesList() {
-  const { formatMessage, labels, messages } = useMessages();
-  const { user } = useUser();
-  const { get, useQuery } = useApi();
-  const { data, isLoading, error, refetch } = useQuery(
-    ['websites', user?.id],
-    () => get(`/users/${user?.id}/websites`),
-    { enabled: !!user },
-  );
-  const { showToast } = useToasts();
-  const hasData = data && data.length !== 0;
-
-  const handleSave = async () => {
-    await refetch();
-    showToast({ message: formatMessage(messages.saved), variant: 'success' });
-  };
-
-  const addButton = (
-    <>
-      {user.role !== ROLES.viewOnly && (
-        <ModalTrigger>
-          <Button variant="primary">
-            <Icon>
-              <Icons.Plus />
-            </Icon>
-            <Text>{formatMessage(labels.addWebsite)}</Text>
-          </Button>
-          <Modal title={formatMessage(labels.addWebsite)}>
-            {close => <WebsiteAddForm onSave={handleSave} onClose={close} />}
-          </Modal>
-        </ModalTrigger>
-      )}
-    </>
-  );
-
-  return (
-    <Page loading={isLoading} error={error}>
-      <PageHeader title={formatMessage(labels.websites)}>{addButton}</PageHeader>
-      {hasData && <WebsitesTable data={data} />}
-      {!hasData && (
-        <EmptyPlaceholder message={formatMessage(messages.noWebsitesConfigured)}>
-          {addButton}
-        </EmptyPlaceholder>
-      )}
-    </Page>
-  );
-}
-
-export default WebsitesList;
diff --git a/components/pages/settings/websites/WebsitesTable.js b/components/pages/settings/websites/WebsitesTable.js
deleted file mode 100644
index 902393e6b..000000000
--- a/components/pages/settings/websites/WebsitesTable.js
+++ /dev/null
@@ -1,47 +0,0 @@
-import Link from 'next/link';
-import { Button, Text, Icon, Icons } from 'react-basics';
-import SettingsTable from 'components/common/SettingsTable';
-import useMessages from 'hooks/useMessages';
-import useConfig from 'hooks/useConfig';
-
-export function WebsitesTable({ data = [] }) {
-  const { formatMessage, labels } = useMessages();
-  const { openExternal } = useConfig();
-
-  const columns = [
-    { name: 'name', label: formatMessage(labels.name) },
-    { name: 'domain', label: formatMessage(labels.domain) },
-    { name: 'action', label: ' ' },
-  ];
-
-  return (
-    <SettingsTable columns={columns} data={data}>
-      {row => {
-        const { id } = row;
-
-        return (
-          <>
-            <Link href={`/settings/websites/${id}`}>
-              <Button>
-                <Icon>
-                  <Icons.Edit />
-                </Icon>
-                <Text>{formatMessage(labels.edit)}</Text>
-              </Button>
-            </Link>
-            <Link href={`/websites/${id}`} target={openExternal ? '_blank' : null}>
-              <Button>
-                <Icon>
-                  <Icons.External />
-                </Icon>
-                <Text>{formatMessage(labels.view)}</Text>
-              </Button>
-            </Link>
-          </>
-        );
-      }}
-    </SettingsTable>
-  );
-}
-
-export default WebsitesTable;
diff --git a/components/pages/websites/WebsiteDetailsPage.js b/components/pages/websites/WebsiteDetailsPage.js
deleted file mode 100644
index 9e0519b25..000000000
--- a/components/pages/websites/WebsiteDetailsPage.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import { Loading } from 'react-basics';
-import { useRouter } from 'next/router';
-import Page from 'components/layout/Page';
-import WebsiteChart from 'components/pages/websites/WebsiteChart';
-import FilterTags from 'components/metrics/FilterTags';
-import usePageQuery from 'hooks/usePageQuery';
-import WebsiteTableView from './WebsiteTableView';
-import WebsiteMenuView from './WebsiteMenuView';
-import { useWebsite } from 'hooks';
-import WebsiteHeader from './WebsiteHeader';
-import { WebsiteMetricsBar } from './WebsiteMetricsBar';
-
-export default function WebsiteDetailsPage({ websiteId }) {
-  const { data: website, isLoading, error } = useWebsite(websiteId);
-  const { pathname } = useRouter();
-  const showLinks = !pathname.includes('/share/');
-
-  const {
-    query: { view, url, referrer, os, browser, device, country, region, city, title },
-  } = usePageQuery();
-
-  return (
-    <Page loading={isLoading} error={error}>
-      <WebsiteHeader websiteId={websiteId} showLinks={showLinks} />
-      <WebsiteMetricsBar websiteId={websiteId} sticky={true} />
-      <WebsiteChart websiteId={websiteId} />
-      <FilterTags
-        websiteId={websiteId}
-        params={{ url, referrer, os, browser, device, country, region, city, title }}
-      />
-      {!website && <Loading icon="dots" style={{ minHeight: 300 }} />}
-      {website && (
-        <>
-          {!view && <WebsiteTableView websiteId={websiteId} />}
-          {view && <WebsiteMenuView websiteId={websiteId} />}
-        </>
-      )}
-    </Page>
-  );
-}
diff --git a/components/pages/websites/WebsiteEventData.js b/components/pages/websites/WebsiteEventData.js
deleted file mode 100644
index 7f9a68294..000000000
--- a/components/pages/websites/WebsiteEventData.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import { Flexbox } from 'react-basics';
-import EventDataTable from 'components/pages/event-data/EventDataTable';
-import EventDataValueTable from 'components/pages/event-data/EventDataValueTable';
-import { EventDataMetricsBar } from 'components/pages/event-data/EventDataMetricsBar';
-import { useDateRange, useApi, usePageQuery } from 'hooks';
-import styles from './WebsiteEventData.module.css';
-
-function useData(websiteId, event) {
-  const [dateRange] = useDateRange(websiteId);
-  const { startDate, endDate } = dateRange;
-  const { get, useQuery } = useApi();
-  const { data, error, isLoading } = useQuery(
-    ['event-data:events', { websiteId, startDate, endDate, event }],
-    () =>
-      get('/event-data/events', {
-        websiteId,
-        startAt: +startDate,
-        endAt: +endDate,
-        event,
-      }),
-    { enabled: !!(websiteId && startDate && endDate) },
-  );
-
-  return { data, error, isLoading };
-}
-
-export default function WebsiteEventData({ websiteId }) {
-  const {
-    query: { event },
-  } = usePageQuery();
-  const { data } = useData(websiteId, event);
-
-  return (
-    <Flexbox className={styles.container} direction="column" gap={20}>
-      <EventDataMetricsBar websiteId={websiteId} />
-      {!event && <EventDataTable data={data} />}
-      {event && <EventDataValueTable event={event} data={data} />}
-    </Flexbox>
-  );
-}
diff --git a/components/pages/websites/WebsiteEventDataPage.js b/components/pages/websites/WebsiteEventDataPage.js
deleted file mode 100644
index 08acafb58..000000000
--- a/components/pages/websites/WebsiteEventDataPage.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import Page from 'components/layout/Page';
-import WebsiteHeader from './WebsiteHeader';
-import WebsiteEventData from './WebsiteEventData';
-
-export default function WebsiteEventDataPage({ websiteId }) {
-  return (
-    <Page>
-      <WebsiteHeader websiteId={websiteId} />
-      <WebsiteEventData websiteId={websiteId} />
-    </Page>
-  );
-}
diff --git a/components/pages/websites/WebsiteMenuView.module.css b/components/pages/websites/WebsiteMenuView.module.css
deleted file mode 100644
index 4ba6ab388..000000000
--- a/components/pages/websites/WebsiteMenuView.module.css
+++ /dev/null
@@ -1,7 +0,0 @@
-.menu {
-  position: relative;
-}
-
-.content {
-  min-height: 800px;
-}
diff --git a/components/pages/websites/WebsiteMetricsBar.js b/components/pages/websites/WebsiteMetricsBar.js
deleted file mode 100644
index 3683310c1..000000000
--- a/components/pages/websites/WebsiteMetricsBar.js
+++ /dev/null
@@ -1,121 +0,0 @@
-import classNames from 'classnames';
-import { Row, Column } from 'react-basics';
-import { formatShortTime } from 'lib/format';
-import MetricCard from 'components/metrics/MetricCard';
-import RefreshButton from 'components/input/RefreshButton';
-import WebsiteDateFilter from 'components/input/WebsiteDateFilter';
-import MetricsBar from 'components/metrics/MetricsBar';
-import { useApi, useDateRange, usePageQuery, useMessages, useSticky } from 'hooks';
-import styles from './WebsiteMetricsBar.module.css';
-
-export function WebsiteMetricsBar({ websiteId, sticky }) {
-  const { formatMessage, labels } = useMessages();
-  const { get, useQuery } = useApi();
-  const [dateRange] = useDateRange(websiteId);
-  const { startDate, endDate, modified } = dateRange;
-  const { ref, isSticky } = useSticky({ enabled: sticky });
-  const {
-    query: { url, referrer, title, os, browser, device, country, region, city },
-  } = usePageQuery();
-
-  const { data, error, isLoading, isFetched } = useQuery(
-    [
-      'websites:stats',
-      { websiteId, modified, url, referrer, title, os, browser, device, country, region, city },
-    ],
-    () =>
-      get(`/websites/${websiteId}/stats`, {
-        startAt: +startDate,
-        endAt: +endDate,
-        url,
-        referrer,
-        title,
-        os,
-        browser,
-        device,
-        country,
-        region,
-        city,
-      }),
-  );
-
-  const { pageviews, uniques, bounces, totaltime } = data || {};
-  const num = Math.min(data && uniques.value, data && bounces.value);
-  const diffs = data && {
-    pageviews: pageviews.value - pageviews.change,
-    uniques: uniques.value - uniques.change,
-    bounces: bounces.value - bounces.change,
-    totaltime: totaltime.value - totaltime.change,
-  };
-
-  return (
-    <Row
-      ref={ref}
-      className={classNames(styles.container, {
-        [styles.sticky]: sticky,
-        [styles.isSticky]: isSticky,
-      })}
-    >
-      <Column defaultSize={12} xl={8}>
-        <MetricsBar isLoading={isLoading} isFetched={isFetched} error={error}>
-          {!error && isFetched && (
-            <>
-              <MetricCard
-                className={styles.card}
-                label={formatMessage(labels.views)}
-                value={pageviews.value}
-                change={pageviews.change}
-              />
-              <MetricCard
-                className={styles.card}
-                label={formatMessage(labels.visitors)}
-                value={uniques.value}
-                change={uniques.change}
-              />
-              <MetricCard
-                className={styles.card}
-                label={formatMessage(labels.bounceRate)}
-                value={uniques.value ? (num / uniques.value) * 100 : 0}
-                change={
-                  uniques.value && uniques.change
-                    ? (num / uniques.value) * 100 -
-                        (Math.min(diffs.uniques, diffs.bounces) / diffs.uniques) * 100 || 0
-                    : 0
-                }
-                format={n => Number(n).toFixed(0) + '%'}
-                reverseColors
-              />
-              <MetricCard
-                className={styles.card}
-                label={formatMessage(labels.averageVisitTime)}
-                value={
-                  totaltime.value && pageviews.value
-                    ? totaltime.value / (pageviews.value - bounces.value)
-                    : 0
-                }
-                change={
-                  totaltime.value && pageviews.value
-                    ? (diffs.totaltime / (diffs.pageviews - diffs.bounces) -
-                        totaltime.value / (pageviews.value - bounces.value)) *
-                        -1 || 0
-                    : 0
-                }
-                format={n =>
-                  `${n < 0 ? '-' : ''}${formatShortTime(Math.abs(~~n), ['m', 's'], ' ')}`
-                }
-              />
-            </>
-          )}
-        </MetricsBar>
-      </Column>
-      <Column defaultSize={12} xl={4}>
-        <div className={styles.actions}>
-          <RefreshButton websiteId={websiteId} />
-          <WebsiteDateFilter websiteId={websiteId} />
-        </div>
-      </Column>
-    </Row>
-  );
-}
-
-export default WebsiteMetricsBar;
diff --git a/components/pages/websites/WebsiteReportsPage.js b/components/pages/websites/WebsiteReportsPage.js
deleted file mode 100644
index 569270284..000000000
--- a/components/pages/websites/WebsiteReportsPage.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import Page from 'components/layout/Page';
-import Link from 'next/link';
-import { Button, Icon, Icons, Text, Flexbox } from 'react-basics';
-import { useMessages, useReports } from 'hooks';
-import ReportsTable from 'components/pages/reports/ReportsTable';
-import WebsiteHeader from './WebsiteHeader';
-
-export function WebsiteReportsPage({ websiteId }) {
-  const { formatMessage, labels } = useMessages();
-  const { reports, error, isLoading, deleteReport } = useReports(websiteId);
-
-  const handleDelete = async id => {
-    await deleteReport(id);
-  };
-
-  return (
-    <Page loading={isLoading} error={error}>
-      <WebsiteHeader websiteId={websiteId} />
-      <Flexbox alignItems="center" justifyContent="end">
-        <Link href="/reports/create">
-          <Button variant="primary">
-            <Icon>
-              <Icons.Plus />
-            </Icon>
-            <Text>{formatMessage(labels.createReport)}</Text>
-          </Button>
-        </Link>
-      </Flexbox>
-      <ReportsTable data={reports} onDelete={handleDelete} />
-    </Page>
-  );
-}
-
-export default WebsiteReportsPage;
diff --git a/components/pages/websites/WebsiteTableView.js b/components/pages/websites/WebsiteTableView.js
deleted file mode 100644
index c46c8b737..000000000
--- a/components/pages/websites/WebsiteTableView.js
+++ /dev/null
@@ -1,59 +0,0 @@
-import { useState } from 'react';
-import { GridRow, GridColumn } from 'components/layout/Grid';
-import PagesTable from 'components/metrics/PagesTable';
-import ReferrersTable from 'components/metrics/ReferrersTable';
-import BrowsersTable from 'components/metrics/BrowsersTable';
-import OSTable from 'components/metrics/OSTable';
-import DevicesTable from 'components/metrics/DevicesTable';
-import WorldMap from 'components/common/WorldMap';
-import CountriesTable from 'components/metrics/CountriesTable';
-import EventsTable from 'components/metrics/EventsTable';
-import EventsChart from 'components/metrics/EventsChart';
-
-export default function WebsiteTableView({ websiteId }) {
-  const [countryData, setCountryData] = useState();
-  const tableProps = {
-    websiteId,
-    limit: 10,
-  };
-
-  return (
-    <>
-      <GridRow>
-        <GridColumn variant="two">
-          <PagesTable {...tableProps} />
-        </GridColumn>
-        <GridColumn variant="two">
-          <ReferrersTable {...tableProps} />
-        </GridColumn>
-      </GridRow>
-      <GridRow>
-        <GridColumn variant="three">
-          <BrowsersTable {...tableProps} />
-        </GridColumn>
-        <GridColumn variant="three">
-          <OSTable {...tableProps} />
-        </GridColumn>
-        <GridColumn variant="three">
-          <DevicesTable {...tableProps} />
-        </GridColumn>
-      </GridRow>
-      <GridRow>
-        <GridColumn xs={12} sm={12} md={12} defaultSize={8}>
-          <WorldMap data={countryData} />
-        </GridColumn>
-        <GridColumn xs={12} sm={12} md={12} defaultSize={4}>
-          <CountriesTable {...tableProps} onDataLoad={setCountryData} />
-        </GridColumn>
-      </GridRow>
-      <GridRow>
-        <GridColumn xs={12} sm={12} md={12} lg={4} defaultSize={4}>
-          <EventsTable {...tableProps} />
-        </GridColumn>
-        <GridColumn xs={12} sm={12} md={12} lg={8} defaultSize={8}>
-          <EventsChart websiteId={websiteId} />
-        </GridColumn>
-      </GridRow>
-    </>
-  );
-}
diff --git a/components/pages/websites/WebsiteTableView.module.css b/components/pages/websites/WebsiteTableView.module.css
deleted file mode 100644
index 73c5facbc..000000000
--- a/components/pages/websites/WebsiteTableView.module.css
+++ /dev/null
@@ -1,35 +0,0 @@
-.col {
-  display: flex;
-  flex-direction: column;
-}
-
-.row {
-  border-top: 1px solid var(--base300);
-  min-height: 430px;
-}
-
-.row > .col {
-  border-left: 1px solid var(--base300);
-  padding: 20px;
-}
-
-.row > .col:first-child {
-  border-left: 0;
-  padding-left: 0;
-}
-
-.row > .col:last-child {
-  padding-right: 0;
-}
-
-@media only screen and (max-width: 992px) {
-  .row {
-    border: 0;
-  }
-
-  .row > .col {
-    border-top: 1px solid var(--base300);
-    border-left: 0;
-    padding: 20px 0;
-  }
-}
diff --git a/db/clickhouse/schema.sql b/db/clickhouse/schema.sql
index 94b560c3e..44428e94c 100644
--- a/db/clickhouse/schema.sql
+++ b/db/clickhouse/schema.sql
@@ -66,7 +66,7 @@ CREATE TABLE umami.website_event_queue (
 )
 ENGINE = Kafka
 SETTINGS kafka_broker_list = 'domain:9092,domain:9093,domain:9094', -- input broker list
-       kafka_topic_list = 'events',
+       kafka_topic_list = 'event',
        kafka_group_name = 'event_consumer_group',
        kafka_format = 'JSONEachRow',
        kafka_max_block_size = 1048576,
diff --git a/db/mysql/migrations/02_report_schema_session_data/migration.sql b/db/mysql/migrations/02_report_schema_session_data/migration.sql
index 497088993..1649ace2d 100644
--- a/db/mysql/migrations/02_report_schema_session_data/migration.sql
+++ b/db/mysql/migrations/02_report_schema_session_data/migration.sql
@@ -1,9 +1,9 @@
 -- AlterTable
-ALTER TABLE `event_data` RENAME COLUMN `event_data_type` TO `data_type`;
-ALTER TABLE `event_data` RENAME COLUMN `event_date_value` TO `date_value`;
-ALTER TABLE `event_data` RENAME COLUMN `event_id` TO `event_data_id`;
-ALTER TABLE `event_data` RENAME COLUMN `event_numeric_value` TO `number_value`;
-ALTER TABLE `event_data` RENAME COLUMN `event_string_value` TO `string_value`;
+ALTER TABLE `event_data` CHANGE `event_data_type` `data_type` INTEGER UNSIGNED NOT NULL;
+ALTER TABLE `event_data` CHANGE `event_date_value` `date_value` TIMESTAMP(0) NULL;
+ALTER TABLE `event_data` CHANGE `event_id` `event_data_id` VARCHAR(36) NOT NULL;
+ALTER TABLE `event_data` CHANGE `event_numeric_value` `number_value` DECIMAL(19,4) NULL;
+ALTER TABLE `event_data` CHANGE `event_string_value` `string_value` VARCHAR(500) NULL;
 
 -- CreateTable
 CREATE TABLE `session_data` (
@@ -50,4 +50,4 @@ WHERE data_type = 2;
 
 UPDATE event_data
 SET string_value = CONCAT(REPLACE(DATE_FORMAT(date_value, '%Y-%m-%d %T'), ' ', 'T'), 'Z')
-WHERE data_type = 4;
\ No newline at end of file
+WHERE data_type = 4;
diff --git a/db/mysql/migrations/03_metric_performance_index/migration.sql b/db/mysql/migrations/03_metric_performance_index/migration.sql
new file mode 100644
index 000000000..646813647
--- /dev/null
+++ b/db/mysql/migrations/03_metric_performance_index/migration.sql
@@ -0,0 +1,50 @@
+-- CreateIndex
+CREATE INDEX `event_data_website_id_created_at_idx` ON `event_data`(`website_id`, `created_at`);
+
+-- CreateIndex
+CREATE INDEX `event_data_website_id_created_at_event_key_idx` ON `event_data`(`website_id`, `created_at`, `event_key`);
+
+-- CreateIndex
+CREATE INDEX `session_website_id_created_at_idx` ON `session`(`website_id`, `created_at`);
+
+-- CreateIndex
+CREATE INDEX `session_website_id_created_at_hostname_idx` ON `session`(`website_id`, `created_at`, `hostname`);
+
+-- CreateIndex
+CREATE INDEX `session_website_id_created_at_browser_idx` ON `session`(`website_id`, `created_at`, `browser`);
+
+-- CreateIndex
+CREATE INDEX `session_website_id_created_at_os_idx` ON `session`(`website_id`, `created_at`, `os`);
+
+-- CreateIndex
+CREATE INDEX `session_website_id_created_at_device_idx` ON `session`(`website_id`, `created_at`, `device`);
+
+-- CreateIndex
+CREATE INDEX `session_website_id_created_at_screen_idx` ON `session`(`website_id`, `created_at`, `screen`);
+
+-- CreateIndex
+CREATE INDEX `session_website_id_created_at_language_idx` ON `session`(`website_id`, `created_at`, `language`);
+
+-- CreateIndex
+CREATE INDEX `session_website_id_created_at_country_idx` ON `session`(`website_id`, `created_at`, `country`);
+
+-- CreateIndex
+CREATE INDEX `session_website_id_created_at_subdivision1_idx` ON `session`(`website_id`, `created_at`, `subdivision1`);
+
+-- CreateIndex
+CREATE INDEX `session_website_id_created_at_city_idx` ON `session`(`website_id`, `created_at`, `city`);
+
+-- CreateIndex
+CREATE INDEX `website_event_website_id_created_at_url_path_idx` ON `website_event`(`website_id`, `created_at`, `url_path`);
+
+-- CreateIndex
+CREATE INDEX `website_event_website_id_created_at_url_query_idx` ON `website_event`(`website_id`, `created_at`, `url_query`);
+
+-- CreateIndex
+CREATE INDEX `website_event_website_id_created_at_referrer_domain_idx` ON `website_event`(`website_id`, `created_at`, `referrer_domain`);
+
+-- CreateIndex
+CREATE INDEX `website_event_website_id_created_at_page_title_idx` ON `website_event`(`website_id`, `created_at`, `page_title`);
+
+-- CreateIndex
+CREATE INDEX `website_event_website_id_created_at_event_name_idx` ON `website_event`(`website_id`, `created_at`, `event_name`);
diff --git a/db/mysql/schema.prisma b/db/mysql/schema.prisma
index a25405dff..38bb91f4b 100644
--- a/db/mysql/schema.prisma
+++ b/db/mysql/schema.prisma
@@ -44,6 +44,16 @@ model Session {
 
   @@index([createdAt])
   @@index([websiteId])
+  @@index([websiteId, createdAt])
+  @@index([websiteId, createdAt, hostname])
+  @@index([websiteId, createdAt, browser])
+  @@index([websiteId, createdAt, os])
+  @@index([websiteId, createdAt, device])
+  @@index([websiteId, createdAt, screen])
+  @@index([websiteId, createdAt, language])
+  @@index([websiteId, createdAt, country])
+  @@index([websiteId, createdAt, subdivision1])
+  @@index([websiteId, createdAt, city])
   @@map("session")
 }
 
@@ -91,6 +101,11 @@ model WebsiteEvent {
   @@index([sessionId])
   @@index([websiteId])
   @@index([websiteId, createdAt])
+  @@index([websiteId, createdAt, urlPath])
+  @@index([websiteId, createdAt, urlQuery])
+  @@index([websiteId, createdAt, referrerDomain])
+  @@index([websiteId, createdAt, pageTitle])
+  @@index([websiteId, createdAt, eventName])
   @@index([websiteId, sessionId, createdAt])
   @@map("website_event")
 }
@@ -113,6 +128,8 @@ model EventData {
   @@index([websiteId])
   @@index([websiteEventId])
   @@index([websiteId, websiteEventId, createdAt])
+  @@index([websiteId, createdAt])
+  @@index([websiteId, createdAt, eventKey])
   @@map("event_data")
 }
 
diff --git a/db/postgresql/migrations/03_metric_performance_index/migration.sql b/db/postgresql/migrations/03_metric_performance_index/migration.sql
new file mode 100644
index 000000000..5db7aa50c
--- /dev/null
+++ b/db/postgresql/migrations/03_metric_performance_index/migration.sql
@@ -0,0 +1,50 @@
+-- CreateIndex
+CREATE INDEX "event_data_website_id_created_at_idx" ON "event_data"("website_id", "created_at");
+
+-- CreateIndex
+CREATE INDEX "event_data_website_id_created_at_event_key_idx" ON "event_data"("website_id", "created_at", "event_key");
+
+-- CreateIndex
+CREATE INDEX "session_website_id_created_at_idx" ON "session"("website_id", "created_at");
+
+-- CreateIndex
+CREATE INDEX "session_website_id_created_at_hostname_idx" ON "session"("website_id", "created_at", "hostname");
+
+-- CreateIndex
+CREATE INDEX "session_website_id_created_at_browser_idx" ON "session"("website_id", "created_at", "browser");
+
+-- CreateIndex
+CREATE INDEX "session_website_id_created_at_os_idx" ON "session"("website_id", "created_at", "os");
+
+-- CreateIndex
+CREATE INDEX "session_website_id_created_at_device_idx" ON "session"("website_id", "created_at", "device");
+
+-- CreateIndex
+CREATE INDEX "session_website_id_created_at_screen_idx" ON "session"("website_id", "created_at", "screen");
+
+-- CreateIndex
+CREATE INDEX "session_website_id_created_at_language_idx" ON "session"("website_id", "created_at", "language");
+
+-- CreateIndex
+CREATE INDEX "session_website_id_created_at_country_idx" ON "session"("website_id", "created_at", "country");
+
+-- CreateIndex
+CREATE INDEX "session_website_id_created_at_subdivision1_idx" ON "session"("website_id", "created_at", "subdivision1");
+
+-- CreateIndex
+CREATE INDEX "session_website_id_created_at_city_idx" ON "session"("website_id", "created_at", "city");
+
+-- CreateIndex
+CREATE INDEX "website_event_website_id_created_at_url_path_idx" ON "website_event"("website_id", "created_at", "url_path");
+
+-- CreateIndex
+CREATE INDEX "website_event_website_id_created_at_url_query_idx" ON "website_event"("website_id", "created_at", "url_query");
+
+-- CreateIndex
+CREATE INDEX "website_event_website_id_created_at_referrer_domain_idx" ON "website_event"("website_id", "created_at", "referrer_domain");
+
+-- CreateIndex
+CREATE INDEX "website_event_website_id_created_at_page_title_idx" ON "website_event"("website_id", "created_at", "page_title");
+
+-- CreateIndex
+CREATE INDEX "website_event_website_id_created_at_event_name_idx" ON "website_event"("website_id", "created_at", "event_name");
diff --git a/db/postgresql/schema.prisma b/db/postgresql/schema.prisma
index 5753c6ef7..d7a70ab05 100644
--- a/db/postgresql/schema.prisma
+++ b/db/postgresql/schema.prisma
@@ -44,6 +44,16 @@ model Session {
 
   @@index([createdAt])
   @@index([websiteId])
+  @@index([websiteId, createdAt])
+  @@index([websiteId, createdAt, hostname])
+  @@index([websiteId, createdAt, browser])
+  @@index([websiteId, createdAt, os])
+  @@index([websiteId, createdAt, device])
+  @@index([websiteId, createdAt, screen])
+  @@index([websiteId, createdAt, language])
+  @@index([websiteId, createdAt, country])
+  @@index([websiteId, createdAt, subdivision1])
+  @@index([websiteId, createdAt, city])
   @@map("session")
 }
 
@@ -91,6 +101,11 @@ model WebsiteEvent {
   @@index([sessionId])
   @@index([websiteId])
   @@index([websiteId, createdAt])
+  @@index([websiteId, createdAt, urlPath])
+  @@index([websiteId, createdAt, urlQuery])
+  @@index([websiteId, createdAt, referrerDomain])
+  @@index([websiteId, createdAt, pageTitle])
+  @@index([websiteId, createdAt, eventName])
   @@index([websiteId, sessionId, createdAt])
   @@map("website_event")
 }
@@ -112,6 +127,8 @@ model EventData {
   @@index([createdAt])
   @@index([websiteId])
   @@index([websiteEventId])
+  @@index([websiteId, createdAt])
+  @@index([websiteId, createdAt, eventKey])
   @@map("event_data")
 }
 
diff --git a/docker-compose.yml b/docker-compose.yml
index b8da9373f..08f00b7c3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,6 +13,11 @@ services:
       db:
         condition: service_healthy
     restart: always
+    healthcheck:
+      test: ["CMD-SHELL", "curl http://localhost:3000/api/heartbeat"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
   db:
     image: postgres:15-alpine
     environment:
diff --git a/hooks/useEscapeKey.js b/hooks/useEscapeKey.js
deleted file mode 100644
index 1a17f18f3..000000000
--- a/hooks/useEscapeKey.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import { useEffect, useCallback } from 'react';
-
-export function useEscapeKey(handler) {
-  const escFunction = useCallback(event => {
-    if (event.keyCode === 27) {
-      handler(event);
-    }
-  }, []);
-
-  useEffect(() => {
-    document.addEventListener('keydown', escFunction, false);
-
-    return () => {
-      document.removeEventListener('keydown', escFunction, false);
-    };
-  }, [escFunction]);
-
-  return null;
-}
-
-export default useEscapeKey;
diff --git a/hooks/useFilters.js b/hooks/useFilters.js
deleted file mode 100644
index 512683826..000000000
--- a/hooks/useFilters.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import { useMessages } from 'hooks';
-
-export function useFilters() {
-  const { formatMessage, labels } = useMessages();
-
-  const filters = {
-    eq: formatMessage(labels.equals),
-    neq: formatMessage(labels.doesNotEqual),
-    c: formatMessage(labels.contains),
-    dnc: formatMessage(labels.doesNotContain),
-    t: formatMessage(labels.true),
-    f: formatMessage(labels.false),
-    gt: formatMessage(labels.greaterThan),
-    lt: formatMessage(labels.lessThan),
-    gte: formatMessage(labels.greaterThanEquals),
-    lte: formatMessage(labels.lessThanEquals),
-    be: formatMessage(labels.before),
-    af: formatMessage(labels.after),
-  };
-
-  const types = {
-    string: ['eq', 'neq'],
-    array: ['c', 'dnc'],
-    boolean: ['t', 'f'],
-    number: ['eq', 'neq', 'gt', 'lt', 'gte', 'lte'],
-    date: ['be', 'af'],
-    uuid: ['eq'],
-  };
-
-  return { filters, types };
-}
-
-export default useFilters;
diff --git a/hooks/useMessages.js b/hooks/useMessages.js
deleted file mode 100644
index 0719afd8d..000000000
--- a/hooks/useMessages.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import { useIntl, FormattedMessage } from 'react-intl';
-import { messages, labels } from 'components/messages';
-
-export function useMessages() {
-  const { formatMessage } = useIntl();
-
-  function getMessage(id) {
-    const message = Object.values(messages).find(value => value.id === id);
-
-    return message ? formatMessage(message) : id;
-  }
-
-  return { formatMessage, FormattedMessage, messages, labels, getMessage };
-}
-
-export default useMessages;
diff --git a/hooks/usePageQuery.js b/hooks/usePageQuery.js
deleted file mode 100644
index b275d5807..000000000
--- a/hooks/usePageQuery.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import { useMemo } from 'react';
-import { useRouter } from 'next/router';
-import { buildUrl } from 'next-basics';
-
-export function usePageQuery() {
-  const router = useRouter();
-  const { pathname, search } = location;
-  const { asPath } = router;
-
-  const query = useMemo(() => {
-    if (!search) {
-      return {};
-    }
-
-    const params = search.substring(1).split('&');
-
-    return params.reduce((obj, item) => {
-      const [key, value] = item.split('=');
-
-      obj[key] = decodeURIComponent(value);
-
-      return obj;
-    }, {});
-  }, [search]);
-
-  function resolveUrl(params, reset) {
-    return buildUrl(asPath.split('?')[0], { ...(reset ? {} : query), ...params });
-  }
-
-  return { pathname, query, resolveUrl, router };
-}
-
-export default usePageQuery;
diff --git a/hooks/useReports.js b/hooks/useReports.js
deleted file mode 100644
index f4369eec3..000000000
--- a/hooks/useReports.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import { useState } from 'react';
-import useApi from './useApi';
-
-export function useReports(websiteId) {
-  const [modified, setModified] = useState(Date.now());
-  const { get, useQuery, del, useMutation } = useApi();
-  const { mutate } = useMutation(reportId => del(`/reports/${reportId}`));
-  const { data, error, isLoading } = useQuery(['reports:website', { websiteId, modified }], () =>
-    get(`/reports`, { websiteId }),
-  );
-
-  const deleteReport = id => {
-    mutate(id, {
-      onSuccess: () => {
-        setModified(Date.now());
-      },
-    });
-  };
-
-  return { reports: data, error, isLoading, deleteReport };
-}
-
-export default useReports;
diff --git a/hooks/useRequireLogin.js b/hooks/useRequireLogin.js
deleted file mode 100644
index 3a95c9888..000000000
--- a/hooks/useRequireLogin.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import { useEffect } from 'react';
-import { useRouter } from 'next/router';
-import useApi from 'hooks/useApi';
-import useUser from 'hooks/useUser';
-
-export function useRequireLogin() {
-  const router = useRouter();
-  const { get } = useApi();
-  const { user, setUser } = useUser();
-
-  useEffect(() => {
-    async function loadUser() {
-      try {
-        const { user } = await get('/auth/verify');
-
-        setUser(user);
-      } catch {
-        await router.push('/login');
-      }
-    }
-
-    if (!user) {
-      loadUser();
-    }
-  }, [user]);
-
-  return { user };
-}
-
-export default useRequireLogin;
diff --git a/hooks/useShareToken.js b/hooks/useShareToken.js
deleted file mode 100644
index 3d6b9698b..000000000
--- a/hooks/useShareToken.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import { useEffect } from 'react';
-import useStore, { setShareToken } from 'store/app';
-import useApi from './useApi';
-
-const selector = state => state.shareToken;
-
-export function useShareToken(shareId) {
-  const shareToken = useStore(selector);
-  const { get } = useApi();
-
-  async function loadToken(id) {
-    const data = await get(`/share/${id}`);
-
-    if (data) {
-      setShareToken(data);
-    }
-  }
-
-  useEffect(() => {
-    if (shareId) {
-      loadToken(shareId);
-    }
-  }, [shareId]);
-
-  return shareToken;
-}
-
-export default useShareToken;
diff --git a/hooks/useWebsite.js b/hooks/useWebsite.js
deleted file mode 100644
index 5315f0dc8..000000000
--- a/hooks/useWebsite.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import useApi from './useApi';
-
-export function useWebsite(websiteId) {
-  const { get, useQuery } = useApi();
-  return useQuery(['websites', websiteId], () => get(`/websites/${websiteId}`), {
-    enabled: !!websiteId,
-  });
-}
-
-export default useWebsite;
diff --git a/jsconfig.json b/jsconfig.json
index b639b0f8f..738e8a465 100644
--- a/jsconfig.json
+++ b/jsconfig.json
@@ -1,5 +1,5 @@
 {
   "compilerOptions": {
-    "baseUrl": "."
+    "baseUrl": "./src"
   }
-}
\ No newline at end of file
+}
diff --git a/lang/ja-JP.json b/lang/ja-JP.json
deleted file mode 100644
index 7f618a4e7..000000000
--- a/lang/ja-JP.json
+++ /dev/null
@@ -1,195 +0,0 @@
-{
-  "label.access-code": "Access code",
-  "label.actions": "アクション",
-  "label.activity-log": "Activity log",
-  "label.add": "Add",
-  "label.add-description": "Add description",
-  "label.add-website": "Webサイトの追加",
-  "label.admin": "管理者",
-  "label.all": "すべて表示",
-  "label.all-time": "All time",
-  "label.analytics": "Analytics",
-  "label.average-visit-time": "平均滞在時間",
-  "label.back": "戻る",
-  "label.bounce-rate": "直帰率",
-  "label.browsers": "ブラウザ",
-  "label.cancel": "キャンセル",
-  "label.change-password": "パスワード変更",
-  "label.cities": "Cities",
-  "label.clear-all": "Clear all",
-  "label.confirm": "Confirm",
-  "label.confirm-password": "パスワード（確認）",
-  "label.continue": "Continue",
-  "label.countries": "国",
-  "label.create-team": "Create team",
-  "label.create-user": "Create user",
-  "label.created": "Created",
-  "label.current-password": "現在のパスワード",
-  "label.custom-range": "期間を指定する",
-  "label.dashboard": "ダッシュボード",
-  "label.data": "Data",
-  "label.date-range": "範囲指定",
-  "label.default-date-range": "最初に表示する期間",
-  "label.delete": "削除",
-  "label.delete-team": "Delete team",
-  "label.delete-user": "Delete user",
-  "label.delete-website": "Webサイトの削除",
-  "label.desktop": "デスクトップ",
-  "label.details": "Details",
-  "label.devices": "デバイス",
-  "label.dismiss": "無視する",
-  "label.domain": "ドメイン",
-  "label.dropoff": "Dropoff",
-  "label.edit": "編集",
-  "label.edit-dashboard": "Edit dashboard",
-  "label.enable-share-url": "共有リンクを有効にする",
-  "label.event": "Event",
-  "label.event-data": "Event data",
-  "label.events": "イベント",
-  "label.field": "Field",
-  "label.fields": "Fields",
-  "label.filter-combined": "パスまで",
-  "label.filter-raw": "すべて表示",
-  "label.funnel": "Funnel",
-  "label.insights": "Insights",
-  "label.join": "Join",
-  "label.join-team": "Join team",
-  "label.language": "Language",
-  "label.languages": "Languages",
-  "label.laptop": "ノートPC",
-  "label.last-days": "過去{x}日間",
-  "label.last-hours": "過去{x}時間",
-  "label.leave": "Leave",
-  "label.leave-team": "Leave team",
-  "label.login": "ログイン",
-  "label.logout": "ログアウト",
-  "label.members": "Members",
-  "label.mobile": "携帯電話",
-  "label.more": "さらに表示",
-  "label.name": "名前",
-  "label.new-password": "新しいパスワード",
-  "label.none": "None",
-  "label.operating-systems": "OS",
-  "label.owner": "Owner",
-  "label.page-views": "閲覧数",
-  "label.pages": "ページ",
-  "label.password": "パスワード",
-  "label.powered-by": "このシステムは {name} で実行されています。",
-  "label.profile": "プロファイル",
-  "label.queries": "Queries",
-  "label.query": "Query",
-  "label.query-parameters": "Query parameters",
-  "label.realtime": "リアルタイム",
-  "label.referrers": "リファラー",
-  "label.refresh": "更新",
-  "label.regenerate": "Regenerate",
-  "label.regions": "Regions",
-  "label.remove": "Remove",
-  "label.reports": "Reports",
-  "label.required": "必須",
-  "label.reset": "リセット",
-  "label.reset-website": "Reset statistics",
-  "label.role": "Role",
-  "label.run-query": "Run query",
-  "label.save": "保存",
-  "label.screens": "Screens",
-  "label.select-date": "Select date",
-  "label.select-website": "Select website",
-  "label.sessions": "Sessions",
-  "label.settings": "設定",
-  "label.share-url": "共有リンク",
-  "label.single-day": "一日のみ",
-  "label.tablet": "タブレット",
-  "label.team": "Team",
-  "label.team-guest": "Team guest",
-  "label.team-id": "Team ID",
-  "label.team-member": "Team member",
-  "label.team-owner": "Team owner",
-  "label.teams": "Teams",
-  "label.theme": "Theme",
-  "label.this-month": "今月",
-  "label.this-week": "今週",
-  "label.this-year": "今年",
-  "label.timezone": "タイムゾーン",
-  "label.title": "Title",
-  "label.today": "今日",
-  "label.toggle-charts": "Toggle charts",
-  "label.tracking-code": "トラッキングコード",
-  "label.unique-visitors": "ユニーク訪問者数",
-  "label.unknown": "不明",
-  "label.url": "URL",
-  "label.urls": "URLs",
-  "label.user": "User",
-  "label.username": "ユーザー名",
-  "label.users": "Users",
-  "label.view": "View",
-  "label.view-details": "詳細を見る",
-  "label.view-only": "View only",
-  "label.views": "閲覧数",
-  "label.visitors": "訪問者数",
-  "label.website": "Website",
-  "label.website-id": "Website ID",
-  "label.websites": "Webサイト",
-  "label.window": "Window",
-  "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
-  "message.active-users": "{x}人が閲覧中です。",
-  "message.confirm-delete": "{target}を削除してもよろしいですか？",
-  "message.confirm-leave": "Are you sure you want to leave {target}?",
-  "message.confirm-reset": "Are your sure you want to reset {target}'s statistics?",
-  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
-  "message.delete-website-warning": "関連するすべてのデータも削除されます。",
-  "message.error": "問題が発生しました。",
-  "message.event-log": "{event} on {url}",
-  "message.go-to-settings": "設定する",
-  "message.incorrect-username-password": "ユーザー名/パスワードが正しくありません。",
-  "message.invalid-domain": "無効なドメイン",
-  "message.min-password-length": "Minimum length of {n} characters",
-  "message.no-data-available": "データがありません。",
-  "message.no-event-data": "No event data is available.",
-  "message.no-match-password": "パスワードが一致しません",
-  "message.no-teams": "You have not created any teams.",
-  "message.no-users": "There are no users.",
-  "message.page-not-found": "ページが見つかりません。",
-  "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
-  "message.reset-website-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.",
-  "message.saved": "正常に保存されました。",
-  "message.share-url": "これは{target}の共有リンクです。",
-  "message.team-already-member": "You are already a member of the team.",
-  "message.team-not-found": "Team not found.",
-  "message.tracking-code": "トラッキングコード",
-  "message.user-deleted": "User deleted.",
-  "message.visitor-log": "{os}（{device}）で{browser}を使用している{country}からの訪問者",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "Webサイトが設定されていません。",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
-}
diff --git a/lang/sl-SI.json b/lang/sl-SI.json
deleted file mode 100644
index ab309ab9d..000000000
--- a/lang/sl-SI.json
+++ /dev/null
@@ -1,195 +0,0 @@
-{
-  "label.access-code": "Access code",
-  "label.actions": "Dejanja",
-  "label.activity-log": "Activity log",
-  "label.add": "Add",
-  "label.add-description": "Add description",
-  "label.add-website": "Dodaj spletno mesto",
-  "label.admin": "Administrator",
-  "label.all": "Vse",
-  "label.all-time": "All time",
-  "label.analytics": "Analytics",
-  "label.average-visit-time": "Povprečni čas obiska",
-  "label.back": "Nazaj",
-  "label.bounce-rate": "Zapustna stopnja",
-  "label.browsers": "Brskalniki",
-  "label.cancel": "Prekliči",
-  "label.change-password": "Zamenjaj geslo",
-  "label.cities": "Cities",
-  "label.clear-all": "Clear all",
-  "label.confirm": "Confirm",
-  "label.confirm-password": "Potrditev gesla",
-  "label.continue": "Continue",
-  "label.countries": "Države",
-  "label.create-team": "Create team",
-  "label.create-user": "Create user",
-  "label.created": "Created",
-  "label.current-password": "Trenutno geslo",
-  "label.custom-range": "Razpon po meri",
-  "label.dashboard": "Nadzorna plošča",
-  "label.data": "Data",
-  "label.date-range": "Časovni razpon",
-  "label.default-date-range": "Privzeti časovni razpon",
-  "label.delete": "Izbriši",
-  "label.delete-team": "Delete team",
-  "label.delete-user": "Delete user",
-  "label.delete-website": "Izbriši spletno mesto",
-  "label.desktop": "Namizni računalnik",
-  "label.details": "Details",
-  "label.devices": "Naprave",
-  "label.dismiss": "Opusti",
-  "label.domain": "Domena",
-  "label.dropoff": "Dropoff",
-  "label.edit": "Uredi",
-  "label.edit-dashboard": "Edit dashboard",
-  "label.enable-share-url": "Omogoči URL za skupno rabo",
-  "label.event": "Event",
-  "label.event-data": "Event data",
-  "label.events": "Dogodki",
-  "label.field": "Field",
-  "label.fields": "Fields",
-  "label.filter-combined": "Skupno",
-  "label.filter-raw": "Neobdelane meritve",
-  "label.funnel": "Funnel",
-  "label.insights": "Insights",
-  "label.join": "Join",
-  "label.join-team": "Join team",
-  "label.language": "Language",
-  "label.languages": "Languages",
-  "label.laptop": "Prenosni računalnik",
-  "label.last-days": "Zadnjih {x} dni",
-  "label.last-hours": "Zadnjih {x} ur",
-  "label.leave": "Leave",
-  "label.leave-team": "Leave team",
-  "label.login": "Prijava",
-  "label.logout": "Odjava",
-  "label.members": "Members",
-  "label.mobile": "Mobilni telefon",
-  "label.more": "Več",
-  "label.name": "Ime",
-  "label.new-password": "Novo geslo",
-  "label.none": "None",
-  "label.operating-systems": "Operacijski sistemi",
-  "label.owner": "Owner",
-  "label.page-views": "Ogledi strani",
-  "label.pages": "Strani",
-  "label.password": "Geslo",
-  "label.powered-by": "Zagotavlja {name}",
-  "label.profile": "Profil",
-  "label.queries": "Queries",
-  "label.query": "Query",
-  "label.query-parameters": "Query parameters",
-  "label.realtime": "V realnem času",
-  "label.referrers": "Viri",
-  "label.refresh": "Osveži",
-  "label.regenerate": "Regenerate",
-  "label.regions": "Regions",
-  "label.remove": "Remove",
-  "label.reports": "Reports",
-  "label.required": "Zahtevano",
-  "label.reset": "Ponastavi",
-  "label.reset-website": "Reset statistics",
-  "label.role": "Role",
-  "label.run-query": "Run query",
-  "label.save": "Shrani",
-  "label.screens": "Screens",
-  "label.select-date": "Select date",
-  "label.select-website": "Select website",
-  "label.sessions": "Sessions",
-  "label.settings": "Nastavitve",
-  "label.share-url": "Deli URL",
-  "label.single-day": "En dan",
-  "label.tablet": "Tablični računalnik",
-  "label.team": "Team",
-  "label.team-guest": "Team guest",
-  "label.team-id": "Team ID",
-  "label.team-member": "Team member",
-  "label.team-owner": "Team owner",
-  "label.teams": "Teams",
-  "label.theme": "Theme",
-  "label.this-month": "Ta mesec",
-  "label.this-week": "Ta teden",
-  "label.this-year": "Letos",
-  "label.timezone": "Časovni pas",
-  "label.title": "Title",
-  "label.today": "Danes",
-  "label.toggle-charts": "Toggle charts",
-  "label.tracking-code": "Koda za sledenje",
-  "label.unique-visitors": "Unikatni obiskovalci",
-  "label.unknown": "Neznano",
-  "label.url": "URL",
-  "label.urls": "URLs",
-  "label.user": "User",
-  "label.username": "Uporabniško ime",
-  "label.users": "Users",
-  "label.view": "View",
-  "label.view-details": "Prikaži podrobnosti",
-  "label.view-only": "View only",
-  "label.views": "Ogledi",
-  "label.visitors": "Obiskovalci",
-  "label.website": "Website",
-  "label.website-id": "Website ID",
-  "label.websites": "Spletna mesta",
-  "label.window": "Window",
-  "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
-  "message.active-users": "{x} trenutni {x, plural, one {obiskovalec} other {obiskovalcev}}",
-  "message.confirm-delete": "Ste prepričani, da želite izbrisati {target}?",
-  "message.confirm-leave": "Are you sure you want to leave {target}?",
-  "message.confirm-reset": "Are your sure you want to reset {target}'s statistics?",
-  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
-  "message.delete-website-warning": "Izbrisani bodo tudi vsi povezani podatki.",
-  "message.error": "Prišlo je do napake.",
-  "message.event-log": "{event} on {url}",
-  "message.go-to-settings": "Pojdi v nastavitve",
-  "message.incorrect-username-password": "Nepravilno uporabniško ime/geslo",
-  "message.invalid-domain": "Neveljavna domena",
-  "message.min-password-length": "Minimum length of {n} characters",
-  "message.no-data-available": "Podatki niso na voljo.",
-  "message.no-event-data": "No event data is available.",
-  "message.no-match-password": "Gesli se ne ujemata",
-  "message.no-teams": "You have not created any teams.",
-  "message.no-users": "There are no users.",
-  "message.page-not-found": "Stran ni bila najdena.",
-  "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
-  "message.reset-website-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.",
-  "message.saved": "Uspešno shranjeno.",
-  "message.share-url": "To je javno dostopen naslov URL za {target}.",
-  "message.team-already-member": "You are already a member of the team.",
-  "message.team-not-found": "Team not found.",
-  "message.tracking-code": "Koda za sledenje",
-  "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Obiskovalec iz {country} uporablja {browser} na {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "Ni nastavljenih spletnih mest.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
-}
diff --git a/lang/zh-TW.json b/lang/zh-TW.json
deleted file mode 100644
index a95d50df9..000000000
--- a/lang/zh-TW.json
+++ /dev/null
@@ -1,195 +0,0 @@
-{
-  "label.access-code": "Access code",
-  "label.actions": "用戶行為",
-  "label.activity-log": "Activity log",
-  "label.add": "Add",
-  "label.add-description": "Add description",
-  "label.add-website": "增加網站",
-  "label.admin": "管理員",
-  "label.all": "所有",
-  "label.all-time": "所有時間段",
-  "label.analytics": "Analytics",
-  "label.average-visit-time": "平均訪問時間",
-  "label.back": "返回",
-  "label.bounce-rate": "跳出率",
-  "label.browsers": "瀏覽器",
-  "label.cancel": "取消",
-  "label.change-password": "更新密碼",
-  "label.cities": "Cities",
-  "label.clear-all": "Clear all",
-  "label.confirm": "Confirm",
-  "label.confirm-password": "確認密碼",
-  "label.continue": "Continue",
-  "label.countries": "國家/地區",
-  "label.create-team": "Create team",
-  "label.create-user": "Create user",
-  "label.created": "Created",
-  "label.current-password": "目前密碼",
-  "label.custom-range": "自定義時段",
-  "label.dashboard": "管理面板",
-  "label.data": "Data",
-  "label.date-range": "多日",
-  "label.default-date-range": "默認日期範圍",
-  "label.delete": "刪除",
-  "label.delete-team": "Delete team",
-  "label.delete-user": "Delete user",
-  "label.delete-website": "刪除網站",
-  "label.desktop": "桌機",
-  "label.details": "Details",
-  "label.devices": "裝置",
-  "label.dismiss": "關閉",
-  "label.domain": "域名",
-  "label.dropoff": "Dropoff",
-  "label.edit": "編輯",
-  "label.edit-dashboard": "編輯管理面板",
-  "label.enable-share-url": "啟用分享連結",
-  "label.event": "Event",
-  "label.event-data": "Event data",
-  "label.events": "行為類別",
-  "label.field": "Field",
-  "label.fields": "Fields",
-  "label.filter-combined": "總和",
-  "label.filter-raw": "原始",
-  "label.funnel": "Funnel",
-  "label.insights": "Insights",
-  "label.join": "Join",
-  "label.join-team": "Join team",
-  "label.language": "語言",
-  "label.languages": "語言",
-  "label.laptop": "筆記本",
-  "label.last-days": "最近 {x} 天",
-  "label.last-hours": "最近 {x} 小時",
-  "label.leave": "Leave",
-  "label.leave-team": "Leave team",
-  "label.login": "登入",
-  "label.logout": "退出",
-  "label.members": "Members",
-  "label.mobile": "手機",
-  "label.more": "更多",
-  "label.name": "名字",
-  "label.new-password": "新密碼",
-  "label.none": "無",
-  "label.operating-systems": "操作系統",
-  "label.owner": "擁有者",
-  "label.page-views": "網頁流量",
-  "label.pages": "網頁",
-  "label.password": "密碼",
-  "label.powered-by": "運行 {name}",
-  "label.profile": "個人資料",
-  "label.queries": "Queries",
-  "label.query": "Query",
-  "label.query-parameters": "查詢參數",
-  "label.realtime": "實時",
-  "label.referrers": "指入域名",
-  "label.refresh": "刷新",
-  "label.regenerate": "Regenerate",
-  "label.regions": "Regions",
-  "label.remove": "Remove",
-  "label.reports": "Reports",
-  "label.required": "必填",
-  "label.reset": "重置",
-  "label.reset-website": "重置統計數據",
-  "label.role": "Role",
-  "label.run-query": "Run query",
-  "label.save": "保存",
-  "label.screens": "屏幕尺寸",
-  "label.select-date": "Select date",
-  "label.select-website": "Select website",
-  "label.sessions": "Sessions",
-  "label.settings": "設置",
-  "label.share-url": "分享連結",
-  "label.single-day": "單日",
-  "label.tablet": "平板",
-  "label.team": "Team",
-  "label.team-guest": "Team guest",
-  "label.team-id": "Team ID",
-  "label.team-member": "Team member",
-  "label.team-owner": "Team owner",
-  "label.teams": "Teams",
-  "label.theme": "主題",
-  "label.this-month": "本月",
-  "label.this-week": "本週",
-  "label.this-year": "今年",
-  "label.timezone": "時區",
-  "label.title": "Title",
-  "label.today": "今天",
-  "label.toggle-charts": "切換圖表",
-  "label.tracking-code": "追蹤代碼",
-  "label.unique-visitors": "獨立訪客",
-  "label.unknown": "未知",
-  "label.url": "URL",
-  "label.urls": "URLs",
-  "label.user": "User",
-  "label.username": "用户名",
-  "label.users": "Users",
-  "label.view": "View",
-  "label.view-details": "查看更多",
-  "label.view-only": "View only",
-  "label.views": "頁面流量",
-  "label.visitors": "獨立訪客",
-  "label.website": "Website",
-  "label.website-id": "Website ID",
-  "label.websites": "網站",
-  "label.window": "Window",
-  "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
-  "message.active-users": "當前線上 {x} 人",
-  "message.confirm-delete": "你確定要刪除 {target} 嗎？",
-  "message.confirm-leave": "Are you sure you want to leave {target}?",
-  "message.confirm-reset": "您確定要重置 {target} 的數據嗎?",
-  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
-  "message.delete-website-warning": "所有相關數據將會被刪除。",
-  "message.error": "出現錯誤。",
-  "message.event-log": "{event} on {url}",
-  "message.go-to-settings": "去設定",
-  "message.incorrect-username-password": "用户名或密碼不正確。",
-  "message.invalid-domain": "無效域名",
-  "message.min-password-length": "Minimum length of {n} characters",
-  "message.no-data-available": "無可用數據。",
-  "message.no-event-data": "No event data is available.",
-  "message.no-match-password": "密碼不一致",
-  "message.no-teams": "You have not created any teams.",
-  "message.no-users": "There are no users.",
-  "message.page-not-found": "網頁未找到。",
-  "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
-  "message.reset-website-warning": "本網站的所有統計數據將被刪除，但您的跟蹤代碼將保持不變。",
-  "message.saved": "成功保存。",
-  "message.share-url": "這是 {target} 的分享連結。",
-  "message.team-already-member": "You are already a member of the team.",
-  "message.team-not-found": "Team not found.",
-  "message.tracking-code": "追蹤代碼",
-  "message.user-deleted": "User deleted.",
-  "message.visitor-log": "來自{country}的訪客在搭載 {os} 的{device}上使用 {browser} 進行訪問。",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "目前無任何網站設定。",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
-}
diff --git a/lib/clickhouse.ts b/lib/clickhouse.ts
deleted file mode 100644
index b3dc2c48b..000000000
--- a/lib/clickhouse.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-import { ClickHouse } from 'clickhouse';
-import dateFormat from 'dateformat';
-import debug from 'debug';
-import { CLICKHOUSE } from 'lib/db';
-import { WebsiteMetricFilter } from './types';
-import { FILTER_COLUMNS } from './constants';
-
-export const CLICKHOUSE_DATE_FORMATS = {
-  minute: '%Y-%m-%d %H:%M:00',
-  hour: '%Y-%m-%d %H:00:00',
-  day: '%Y-%m-%d',
-  month: '%Y-%m-01',
-  year: '%Y-01-01',
-};
-
-const log = debug('umami:clickhouse');
-
-let clickhouse: ClickHouse;
-const enabled = Boolean(process.env.CLICKHOUSE_URL);
-
-function getClient() {
-  const {
-    hostname,
-    port,
-    pathname,
-    username = 'default',
-    password,
-  } = new URL(process.env.CLICKHOUSE_URL);
-
-  const client = new ClickHouse({
-    url: hostname,
-    port: Number(port),
-    format: 'json',
-    config: {
-      database: pathname.replace('/', ''),
-    },
-    basicAuth: password ? { username, password } : null,
-  });
-
-  if (process.env.NODE_ENV !== 'production') {
-    global[CLICKHOUSE] = client;
-  }
-
-  log('Clickhouse initialized');
-
-  return client;
-}
-
-function getDateStringQuery(data, unit) {
-  return `formatDateTime(${data}, '${CLICKHOUSE_DATE_FORMATS[unit]}')`;
-}
-
-function getDateQuery(field, unit, timezone?) {
-  if (timezone) {
-    return `date_trunc('${unit}', ${field}, '${timezone}')`;
-  }
-  return `date_trunc('${unit}', ${field})`;
-}
-
-function getDateFormat(date) {
-  return `'${dateFormat(date, 'UTC:yyyy-mm-dd HH:MM:ss')}'`;
-}
-
-function getFilterQuery(filters = {}, params = {}) {
-  const query = Object.keys(filters).reduce((arr, key) => {
-    const filter = filters[key];
-
-    if (filter !== undefined) {
-      const column = FILTER_COLUMNS[key] || key;
-      arr.push(`and ${column} = {${key}:String}`);
-      params[key] = decodeURIComponent(filter);
-    }
-
-    return arr;
-  }, []);
-
-  return query.join('\n');
-}
-
-function parseFilters(filters: WebsiteMetricFilter = {}, params: any = {}) {
-  return {
-    filterQuery: getFilterQuery(filters, params),
-  };
-}
-
-async function rawQuery<T>(query: string, params: object = {}): Promise<T> {
-  if (process.env.LOG_QUERY) {
-    log('QUERY:\n', query);
-    log('PARAMETERS:\n', params);
-  }
-
-  await connect();
-
-  return clickhouse.query(query, { params }).toPromise() as Promise<T>;
-}
-
-async function findUnique(data) {
-  if (data.length > 1) {
-    throw `${data.length} records found when expecting 1.`;
-  }
-
-  return findFirst(data);
-}
-
-async function findFirst(data) {
-  return data[0] ?? null;
-}
-
-async function connect() {
-  if (enabled && !clickhouse) {
-    clickhouse = process.env.CLICKHOUSE_URL && (global[CLICKHOUSE] || getClient());
-  }
-
-  return clickhouse;
-}
-
-export default {
-  enabled,
-  client: clickhouse,
-  log,
-  connect,
-  getDateStringQuery,
-  getDateQuery,
-  getDateFormat,
-  getFilterQuery,
-  parseFilters,
-  findUnique,
-  findFirst,
-  rawQuery,
-};
diff --git a/lib/prisma.ts b/lib/prisma.ts
deleted file mode 100644
index 08309e311..000000000
--- a/lib/prisma.ts
+++ /dev/null
@@ -1,125 +0,0 @@
-import prisma from '@umami/prisma-client';
-import moment from 'moment-timezone';
-import { MYSQL, POSTGRESQL, getDatabaseType } from 'lib/db';
-import { FILTER_COLUMNS } from './constants';
-
-const MYSQL_DATE_FORMATS = {
-  minute: '%Y-%m-%d %H:%i:00',
-  hour: '%Y-%m-%d %H:00:00',
-  day: '%Y-%m-%d',
-  month: '%Y-%m-01',
-  year: '%Y-01-01',
-};
-
-const POSTGRESQL_DATE_FORMATS = {
-  minute: 'YYYY-MM-DD HH24:MI:00',
-  hour: 'YYYY-MM-DD HH24:00:00',
-  day: 'YYYY-MM-DD',
-  month: 'YYYY-MM-01',
-  year: 'YYYY-01-01',
-};
-
-function getAddMinutesQuery(field: string, minutes: number): string {
-  const db = getDatabaseType(process.env.DATABASE_URL);
-
-  if (db === POSTGRESQL) {
-    return `${field} + interval '${minutes} minute'`;
-  }
-
-  if (db === MYSQL) {
-    return `DATE_ADD(${field}, interval ${minutes} minute)`;
-  }
-}
-
-function getDateQuery(field: string, unit: string, timezone?: string): string {
-  const db = getDatabaseType();
-
-  if (db === POSTGRESQL) {
-    if (timezone) {
-      return `to_char(date_trunc('${unit}', ${field} at time zone '${timezone}'), '${POSTGRESQL_DATE_FORMATS[unit]}')`;
-    }
-    return `to_char(date_trunc('${unit}', ${field}), '${POSTGRESQL_DATE_FORMATS[unit]}')`;
-  }
-
-  if (db === MYSQL) {
-    if (timezone) {
-      const tz = moment.tz(timezone).format('Z');
-
-      return `date_format(convert_tz(${field},'+00:00','${tz}'), '${MYSQL_DATE_FORMATS[unit]}')`;
-    }
-
-    return `date_format(${field}, '${MYSQL_DATE_FORMATS[unit]}')`;
-  }
-}
-
-function getTimestampIntervalQuery(field: string): string {
-  const db = getDatabaseType();
-
-  if (db === POSTGRESQL) {
-    return `floor(extract(epoch from max(${field}) - min(${field})))`;
-  }
-
-  if (db === MYSQL) {
-    return `floor(unix_timestamp(max(${field})) - unix_timestamp(min(${field})))`;
-  }
-}
-
-function getFilterQuery(filters = {}, params = []): string {
-  const query = Object.keys(filters).reduce((arr, key) => {
-    const filter = filters[key];
-
-    if (filter !== undefined) {
-      const column = FILTER_COLUMNS[key] || key;
-      arr.push(`and ${column}={{${key}}}`);
-      params.push(decodeURIComponent(filter));
-    }
-
-    return arr;
-  }, []);
-
-  return query.join('\n');
-}
-
-function parseFilters(
-  filters: { [key: string]: any } = {},
-  params = [],
-  sessionKey = 'session_id',
-) {
-  const { os, browser, device, country, region, city } = filters;
-
-  return {
-    joinSession:
-      os || browser || device || country || region || city
-        ? `inner join session on website_event.${sessionKey} = session.${sessionKey}`
-        : '',
-    filterQuery: getFilterQuery(filters, params),
-  };
-}
-
-async function rawQuery(sql: string, data: object): Promise<any> {
-  const db = getDatabaseType();
-  const params = [];
-
-  if (db !== POSTGRESQL && db !== MYSQL) {
-    return Promise.reject(new Error('Unknown database.'));
-  }
-
-  const query = sql?.replaceAll(/\{\{\s*(\w+)(::\w+)?\s*}}/g, (...args) => {
-    const [, name, type] = args;
-    params.push(data[name]);
-
-    return db === MYSQL ? '?' : `$${params.length}${type ?? ''}`;
-  });
-
-  return prisma.rawQuery(query, params);
-}
-
-export default {
-  ...prisma,
-  getAddMinutesQuery,
-  getDateQuery,
-  getTimestampIntervalQuery,
-  getFilterQuery,
-  parseFilters,
-  rawQuery,
-};
diff --git a/next-env.d.ts b/next-env.d.ts
index 4f11a03dc..fd36f9494 100644
--- a/next-env.d.ts
+++ b/next-env.d.ts
@@ -1,5 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
+/// <reference types="next/navigation-types/compat/navigation" />
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/basic-features/typescript for more information.
diff --git a/next.config.js b/next.config.js
index 2165a6e01..a155ece75 100644
--- a/next.config.js
+++ b/next.config.js
@@ -1,28 +1,28 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 require('dotenv').config();
+const path = require('path');
 const pkg = require('./package.json');
 
-const contentSecurityPolicy = `
-  default-src 'self';
-  img-src *;
-  script-src 'self' 'unsafe-eval';
-  style-src 'self' 'unsafe-inline';
-  connect-src 'self' api.umami.is;
-  frame-ancestors 'self' ${process.env.ALLOWED_FRAME_URLS};
-`;
+const contentSecurityPolicy = [
+  `default-src 'self'`,
+  `img-src *`,
+  `script-src 'self' 'unsafe-eval' 'unsafe-inline'`,
+  `style-src 'self' 'unsafe-inline'`,
+  `connect-src 'self' api.umami.is`,
+  `frame-ancestors 'self' ${process.env.ALLOWED_FRAME_URLS || ''}`,
+];
 
 const headers = [
   {
     key: 'X-DNS-Prefetch-Control',
     value: 'on',
   },
-  {
-    key: 'X-Frame-Options',
-    value: 'SAMEORIGIN',
-  },
   {
     key: 'Content-Security-Policy',
-    value: contentSecurityPolicy.replace(/\s{2,}/g, ' ').trim(),
+    value: contentSecurityPolicy
+      .join(';')
+      .replace(/\s{2,}/g, ' ')
+      .trim(),
   },
 ];
 
@@ -58,7 +58,9 @@ if (process.env.TRACKER_SCRIPT_NAME) {
 const redirects = [
   {
     source: '/settings',
-    destination: process.env.CLOUD_MODE ? '/settings/profile' : '/settings/websites',
+    destination: process.env.CLOUD_MODE
+      ? `${process.env.CLOUD_URL}/settings/websites`
+      : '/settings/websites',
     permanent: true,
   },
 ];
@@ -71,13 +73,23 @@ if (process.env.CLOUD_MODE && process.env.CLOUD_URL && process.env.DISABLE_LOGIN
   });
 }
 
+const basePath = process.env.BASE_PATH;
+
+/** @type {import('next').NextConfig} */
 const config = {
+  reactStrictMode: false,
   env: {
+    basePath: basePath || '',
+    cloudMode: process.env.CLOUD_MODE || '',
+    cloudUrl: process.env.CLOUD_URL || '',
+    configUrl: '/config',
     currentVersion: pkg.version,
-    defaultLocale: process.env.DEFAULT_LOCALE,
-    isProduction: process.env.NODE_ENV === 'production',
+    defaultLocale: process.env.DEFAULT_LOCALE || '',
+    disableLogin: process.env.DISABLE_LOGIN || '',
+    disableUI: process.env.DISABLE_UI || '',
+    hostUrl: process.env.HOST_URL || '',
   },
-  basePath: process.env.BASE_PATH,
+  basePath,
   output: 'standalone',
   eslint: {
     ignoreDuringBuilds: true,
@@ -86,11 +98,25 @@ const config = {
     ignoreBuildErrors: true,
   },
   webpack(config) {
-    config.module.rules.push({
-      test: /\.svg$/,
-      issuer: /\.{js|jsx|ts|tsx}$/,
-      use: ['@svgr/webpack'],
-    });
+    const fileLoaderRule = config.module.rules.find(rule => rule.test?.test?.('.svg'));
+
+    config.module.rules.push(
+      {
+        ...fileLoaderRule,
+        test: /\.svg$/i,
+        resourceQuery: /url/,
+      },
+      {
+        test: /\.svg$/i,
+        issuer: fileLoaderRule.issuer,
+        resourceQuery: { not: [...fileLoaderRule.resourceQuery.not, /url/] },
+        use: ['@svgr/webpack'],
+      },
+    );
+
+    fileLoaderRule.exclude = /\.svg$/i;
+
+    config.resolve.alias['public'] = path.resolve('./public');
 
     return config;
   },
diff --git a/package.components.json b/package.components.json
new file mode 100644
index 000000000..41e72579f
--- /dev/null
+++ b/package.components.json
@@ -0,0 +1,23 @@
+{
+  "name": "@umami/components",
+  "version": "0.1.0",
+  "description": "Umami React components.",
+  "author": "Mike Cao <mike@mikecao.com>",
+  "license": "MIT",
+  "type": "module",
+  "main": "./index.js",
+  "types": "./index.d.ts",
+  "peerDependencies": {
+    "@tanstack/react-query": "^4.33.0",
+    "classnames": "^2.3.1",
+    "colord": "^2.9.2",
+    "immer": "^9.0.12",
+    "moment-timezone": "^0.5.35",
+    "next": "^13.4.0",
+    "next-basics": "^0.36.0",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "react-intl": "^5.24.7",
+    "zustand": "^4.3.8"
+  }
+}
diff --git a/package.json b/package.json
index 868b3cdfb..0f437c355 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "umami",
-  "version": "2.4.1",
+  "version": "2.9.0",
   "description": "A simple, fast, privacy-focused alternative to Google Analytics.",
   "author": "Mike Cao <mike@mikecao.com>",
   "license": "MIT",
@@ -18,9 +18,10 @@
     "start-env": "node scripts/start-env.js",
     "start-server": "node server.js",
     "build-app": "next build",
-    "build-tracker": "rollup -c rollup.tracker.config.js",
+    "build-components": "rollup -c rollup.components.config.mjs",
+    "build-tracker": "rollup -c rollup.tracker.config.mjs",
     "build-db": "npm-run-all copy-db-files build-db-client",
-    "build-lang": "npm-run-all format-lang compile-lang download-country-names download-language-names",
+    "build-lang": "npm-run-all format-lang compile-lang clean-lang download-country-names download-language-names",
     "build-geo": "node scripts/build-geo.js",
     "build-db-schema": "prisma db pull",
     "build-db-client": "prisma generate",
@@ -29,11 +30,12 @@
     "check-db": "node scripts/check-db.js",
     "check-env": "node scripts/check-env.js",
     "copy-db-files": "node scripts/copy-db-files.js",
-    "extract-messages": "formatjs extract \"{pages,components}/**/*.js\" --out-file build/messages.json",
+    "extract-messages": "formatjs extract \"src/{pages,components}/**/*.js\" --out-file build/messages.json",
     "merge-messages": "node scripts/merge-messages.js",
     "generate-lang": "npm-run-all extract-messages merge-messages",
     "format-lang": "node scripts/format-lang.js",
     "compile-lang": "formatjs compile-folder --ast build/messages public/intl/messages",
+    "clean-lang": "prettier --write ./public/intl/messages/*.json",
     "check-lang": "node scripts/check-lang.js",
     "download-country-names": "node scripts/download-country-names.js",
     "download-language-names": "node scripts/download-language-names.js",
@@ -59,16 +61,18 @@
     ".next/cache"
   ],
   "dependencies": {
+    "@clickhouse/client": "^0.2.2",
     "@fontsource/inter": "^4.5.15",
-    "@prisma/client": "5.0.0",
-    "@tanstack/react-query": "^4.16.1",
-    "@umami/prisma-client": "^0.2.0",
-    "@umami/redis-client": "^0.5.0",
+    "@prisma/client": "5.6.0",
+    "@prisma/extension-read-replicas": "^0.3.0",
+    "@react-spring/web": "^9.7.3",
+    "@tanstack/react-query": "^5.12.2",
+    "@umami/prisma-client": "^0.8.0",
+    "@umami/redis-client": "^0.18.0",
     "chalk": "^4.1.1",
     "chart.js": "^4.2.1",
     "chartjs-adapter-date-fns": "^3.0.0",
     "classnames": "^2.3.1",
-    "clickhouse": "^2.5.0",
     "colord": "^2.9.2",
     "cors": "^2.8.5",
     "cross-spawn": "^7.0.3",
@@ -89,22 +93,22 @@
     "kafkajs": "^2.1.0",
     "maxmind": "^4.3.6",
     "moment-timezone": "^0.5.35",
-    "next": "13.3.1",
-    "next-basics": "^0.35.0",
+    "next": "14.0.4",
+    "next-basics": "^0.39.0",
     "node-fetch": "^3.2.8",
     "npm-run-all": "^4.1.5",
+    "prisma": "5.6.0",
     "react": "^18.2.0",
-    "react-basics": "^0.91.0",
+    "react-basics": "^0.114.0",
     "react-beautiful-dnd": "^13.1.0",
     "react-dom": "^18.2.0",
     "react-error-boundary": "^4.0.4",
-    "react-intl": "^5.24.7",
+    "react-intl": "^6.5.5",
     "react-simple-maps": "^2.3.0",
-    "react-spring": "^9.4.4",
     "react-use-measure": "^2.0.4",
     "react-window": "^1.8.6",
     "request-ip": "^3.3.0",
-    "semver": "^7.5.2",
+    "semver": "^7.5.4",
     "thenby": "^1.3.4",
     "timezone-support": "^2.0.2",
     "uuid": "^9.0.0",
@@ -115,15 +119,19 @@
     "@formatjs/cli": "^4.2.29",
     "@netlify/plugin-nextjs": "^4.27.3",
     "@rollup/plugin-alias": "^5.0.0",
-    "@rollup/plugin-buble": "^0.21.3",
-    "@rollup/plugin-commonjs": "^24.1.0",
+    "@rollup/plugin-buble": "^1.0.2",
+    "@rollup/plugin-commonjs": "^25.0.4",
     "@rollup/plugin-json": "^6.0.0",
-    "@rollup/plugin-node-resolve": "^15.0.2",
-    "@rollup/plugin-replace": "^4.0.0",
-    "@svgr/rollup": "^7.0.0",
-    "@svgr/webpack": "^6.2.1",
-    "@typescript-eslint/eslint-plugin": "^5.50.0",
-    "@typescript-eslint/parser": "^5.50.0",
+    "@rollup/plugin-node-resolve": "^15.2.0",
+    "@rollup/plugin-replace": "^5.0.2",
+    "@svgr/rollup": "^8.1.0",
+    "@svgr/webpack": "^8.1.0",
+    "@types/node": "^20.9.0",
+    "@types/react": "^18.2.41",
+    "@types/react-dom": "^18.2.17",
+    "@types/react-window": "^1.8.8",
+    "@typescript-eslint/eslint-plugin": "^6.7.3",
+    "@typescript-eslint/parser": "^6.7.3",
     "cross-env": "^7.0.3",
     "esbuild": "^0.17.17",
     "eslint": "^8.33.0",
@@ -133,21 +141,21 @@
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-prettier": "^4.0.0",
     "extract-react-intl-messages": "^4.1.1",
-    "husky": "^7.0.0",
-    "lint-staged": "^11.0.0",
-    "postcss": "^8.4.21",
+    "husky": "^8.0.3",
+    "lint-staged": "^14.0.1",
+    "postcss": "^8.4.31",
     "postcss-flexbugs-fixes": "^5.0.2",
     "postcss-import": "^15.1.0",
     "postcss-preset-env": "7.8.3",
     "postcss-rtlcss": "^4.0.1",
     "prettier": "^2.6.2",
-    "prisma": "5.0.0",
     "prompts": "2.4.2",
-    "rollup": "^2.70.1",
+    "rollup": "^3.28.0",
+    "rollup-plugin-copy": "^3.4.0",
     "rollup-plugin-delete": "^2.0.0",
-    "rollup-plugin-dts": "^5.3.0",
+    "rollup-plugin-dts": "^5.3.1",
     "rollup-plugin-esbuild": "^5.0.0",
-    "rollup-plugin-node-externals": "^5.1.2",
+    "rollup-plugin-node-externals": "^6.1.1",
     "rollup-plugin-postcss": "^4.0.2",
     "rollup-plugin-terser": "^7.0.2",
     "stylelint": "^15.10.1",
@@ -156,6 +164,6 @@
     "stylelint-config-recommended": "^9.0.0",
     "tar": "^6.1.2",
     "ts-node": "^10.9.1",
-    "typescript": "^4.9.5"
+    "typescript": "^5.1.6"
   }
 }
diff --git a/pages/404.js b/pages/404.js
deleted file mode 100644
index 4a5f4bd95..000000000
--- a/pages/404.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Row, Column, Flexbox } from 'react-basics';
-import AppLayout from 'components/layout/AppLayout';
-import useMessages from 'hooks/useMessages';
-
-export default function Custom404() {
-  const { formatMessage, labels } = useMessages();
-
-  return (
-    <AppLayout title={formatMessage(labels.pageNotFound)}>
-      <Row>
-        <Column>
-          <Flexbox alignItems="center" justifyContent="center" flex={1} style={{ minHeight: 600 }}>
-            <h1>{formatMessage(labels.pageNotFound)}</h1>
-          </Flexbox>
-        </Column>
-      </Row>
-    </AppLayout>
-  );
-}
diff --git a/pages/_app.js b/pages/_app.js
deleted file mode 100644
index 8d5497732..000000000
--- a/pages/_app.js
+++ /dev/null
@@ -1,82 +0,0 @@
-import { IntlProvider } from 'react-intl';
-import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { ReactBasicsProvider } from 'react-basics';
-import Head from 'next/head';
-import Script from 'next/script';
-import { useRouter } from 'next/router';
-import ErrorBoundary from 'components/common/ErrorBoundary';
-import useLocale from 'hooks/useLocale';
-import useConfig from 'hooks/useConfig';
-import '@fontsource/inter/400.css';
-import '@fontsource/inter/700.css';
-import 'react-basics/dist/styles.css';
-import 'styles/variables.css';
-import 'styles/locale.css';
-import 'styles/index.css';
-import 'chartjs-adapter-date-fns';
-
-const client = new QueryClient({
-  defaultOptions: {
-    queries: {
-      retry: false,
-      refetchOnWindowFocus: false,
-    },
-  },
-});
-
-export default function App({ Component, pageProps }) {
-  const { locale, messages } = useLocale();
-  const { basePath, pathname } = useRouter();
-  const config = useConfig();
-
-  const Wrapper = ({ children }) => <span className={locale}>{children}</span>;
-
-  if (config?.uiDisabled) {
-    return null;
-  }
-
-  return (
-    <QueryClientProvider client={client}>
-      <IntlProvider
-        locale={locale}
-        messages={messages[locale]}
-        textComponent={Wrapper}
-        onError={() => null}
-      >
-        <ReactBasicsProvider>
-          <ErrorBoundary>
-            <Head>
-              <link rel="icon" href={`${basePath}/favicon.ico`} />
-              <link
-                rel="apple-touch-icon"
-                sizes="180x180"
-                href={`${basePath}/apple-touch-icon.png`}
-              />
-              <link
-                rel="icon"
-                type="image/png"
-                sizes="32x32"
-                href={`${basePath}/favicon-32x32.png`}
-              />
-              <link
-                rel="icon"
-                type="image/png"
-                sizes="16x16"
-                href={`${basePath}/favicon-16x16.png`}
-              />
-              <link rel="manifest" href={`${basePath}/site.webmanifest`} />
-              <link rel="mask-icon" href={`${basePath}/safari-pinned-tab.svg`} color="#5bbad5" />
-              <meta name="msapplication-TileColor" content="#da532c" />
-              <meta name="theme-color" content="#fafafa" media="(prefers-color-scheme: light)" />
-              <meta name="theme-color" content="#2f2f2f" media="(prefers-color-scheme: dark)" />
-              <meta name="viewport" content="width=device-width, initial-scale=1" />
-              <meta name="robots" content="noindex,nofollow" />
-            </Head>
-            <Component {...pageProps} />
-            {!pathname.includes('/share/') && <Script src={`${basePath}/telemetry.js`} />}
-          </ErrorBoundary>
-        </ReactBasicsProvider>
-      </IntlProvider>
-    </QueryClientProvider>
-  );
-}
diff --git a/pages/api/event-data/events.ts b/pages/api/event-data/events.ts
deleted file mode 100644
index 1d74c3d24..000000000
--- a/pages/api/event-data/events.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { canViewWebsite } from 'lib/auth';
-import { useCors, useAuth } from 'lib/middleware';
-import { NextApiRequestQueryBody } from 'lib/types';
-import { NextApiResponse } from 'next';
-import { ok, methodNotAllowed, unauthorized } from 'next-basics';
-import { getEventDataEvents } from 'queries';
-
-export interface EventDataFieldsRequestBody {
-  websiteId: string;
-  dateRange: {
-    startDate: string;
-    endDate: string;
-  };
-}
-
-export default async (
-  req: NextApiRequestQueryBody<any, EventDataFieldsRequestBody>,
-  res: NextApiResponse<any>,
-) => {
-  await useCors(req, res);
-  await useAuth(req, res);
-
-  if (req.method === 'GET') {
-    const { websiteId, startAt, endAt, field, event } = req.query;
-
-    if (!(await canViewWebsite(req.auth, websiteId))) {
-      return unauthorized(res);
-    }
-
-    const data = await getEventDataEvents(websiteId, new Date(+startAt), new Date(+endAt), {
-      field,
-      event,
-    });
-
-    return ok(res, data);
-  }
-
-  return methodNotAllowed(res);
-};
diff --git a/pages/api/event-data/fields.ts b/pages/api/event-data/fields.ts
deleted file mode 100644
index 18b74bc32..000000000
--- a/pages/api/event-data/fields.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { canViewWebsite } from 'lib/auth';
-import { useCors, useAuth } from 'lib/middleware';
-import { NextApiRequestQueryBody } from 'lib/types';
-import { NextApiResponse } from 'next';
-import { ok, methodNotAllowed, unauthorized } from 'next-basics';
-import { getEventDataFields } from 'queries';
-
-export interface EventDataFieldsRequestBody {
-  websiteId: string;
-  dateRange: {
-    startDate: string;
-    endDate: string;
-  };
-}
-
-export default async (
-  req: NextApiRequestQueryBody<any, EventDataFieldsRequestBody>,
-  res: NextApiResponse<any>,
-) => {
-  await useCors(req, res);
-  await useAuth(req, res);
-
-  if (req.method === 'GET') {
-    const { websiteId, startAt, endAt, field } = req.query;
-
-    if (!(await canViewWebsite(req.auth, websiteId))) {
-      return unauthorized(res);
-    }
-
-    const data = await getEventDataFields(websiteId, new Date(+startAt), new Date(+endAt), field);
-
-    return ok(res, data);
-  }
-
-  return methodNotAllowed(res);
-};
diff --git a/pages/api/event-data/stats.ts b/pages/api/event-data/stats.ts
deleted file mode 100644
index 8fdf9438b..000000000
--- a/pages/api/event-data/stats.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { canViewWebsite } from 'lib/auth';
-import { useCors, useAuth } from 'lib/middleware';
-import { NextApiRequestQueryBody } from 'lib/types';
-import { NextApiResponse } from 'next';
-import { ok, methodNotAllowed, unauthorized } from 'next-basics';
-import { getEventDataFields } from 'queries';
-
-export interface EventDataRequestBody {
-  websiteId: string;
-  dateRange: {
-    startDate: string;
-    endDate: string;
-  };
-  field?: string;
-}
-
-export default async (
-  req: NextApiRequestQueryBody<any, EventDataRequestBody>,
-  res: NextApiResponse<any>,
-) => {
-  await useCors(req, res);
-  await useAuth(req, res);
-
-  if (req.method === 'GET') {
-    const { websiteId, startAt, endAt } = req.query;
-
-    if (!(await canViewWebsite(req.auth, websiteId))) {
-      return unauthorized(res);
-    }
-
-    const results = await getEventDataFields(websiteId, new Date(+startAt), new Date(+endAt));
-
-    const data = results.reduce(
-      (obj, row) => {
-        obj.records += Number(row.total);
-        return obj;
-      },
-      { fields: results.length, records: 0 },
-    );
-
-    return ok(res, data);
-  }
-
-  return methodNotAllowed(res);
-};
diff --git a/pages/api/me/teams.ts b/pages/api/me/teams.ts
deleted file mode 100644
index 366990163..000000000
--- a/pages/api/me/teams.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { useCors } from 'lib/middleware';
-import { NextApiRequestQueryBody } from 'lib/types';
-import { NextApiResponse } from 'next';
-import { methodNotAllowed } from 'next-basics';
-import userTeams from 'pages/api/users/[id]/teams';
-
-export default async (req: NextApiRequestQueryBody, res: NextApiResponse) => {
-  await useCors(req, res);
-
-  if (req.method === 'GET') {
-    return userTeams(req, res);
-  }
-
-  return methodNotAllowed(res);
-};
diff --git a/pages/api/me/websites.ts b/pages/api/me/websites.ts
deleted file mode 100644
index 29f1e4311..000000000
--- a/pages/api/me/websites.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { useAuth, useCors } from 'lib/middleware';
-import { NextApiRequestQueryBody } from 'lib/types';
-import { NextApiResponse } from 'next';
-import { methodNotAllowed } from 'next-basics';
-
-import userWebsites from 'pages/api/users/[id]/websites';
-
-export default async (req: NextApiRequestQueryBody, res: NextApiResponse) => {
-  await useCors(req, res);
-  await useAuth(req, res);
-
-  if (req.method === 'GET') {
-    req.query.id = req.auth.user.id;
-
-    return userWebsites(req, res);
-  }
-
-  return methodNotAllowed(res);
-};
diff --git a/pages/api/reports/index.ts b/pages/api/reports/index.ts
deleted file mode 100644
index c856b5659..000000000
--- a/pages/api/reports/index.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { useAuth, useCors } from 'lib/middleware';
-import { NextApiRequestQueryBody } from 'lib/types';
-import { NextApiResponse } from 'next';
-import { methodNotAllowed, ok, unauthorized } from 'next-basics';
-import { createReport, getWebsiteReports } from 'queries';
-import { canViewWebsite } from 'lib/auth';
-import { uuid } from 'lib/crypto';
-
-export interface ReportRequestBody {
-  websiteId: string;
-  name: string;
-  type: string;
-  description: string;
-  parameters: {
-    window: string;
-    urls: string[];
-  };
-}
-
-export default async (
-  req: NextApiRequestQueryBody<any, ReportRequestBody>,
-  res: NextApiResponse,
-) => {
-  await useCors(req, res);
-  await useAuth(req, res);
-
-  const { websiteId } = req.query;
-
-  const {
-    user: { id: userId },
-  } = req.auth;
-
-  if (req.method === 'GET') {
-    if (!(websiteId && (await canViewWebsite(req.auth, websiteId)))) {
-      return unauthorized(res);
-    }
-
-    const data = await getWebsiteReports(websiteId);
-
-    return ok(res, data);
-  }
-
-  if (req.method === 'POST') {
-    const { websiteId, type, name, description, parameters } = req.body;
-
-    const result = await createReport({
-      id: uuid(),
-      userId,
-      websiteId,
-      type,
-      name,
-      description,
-      parameters: JSON.stringify(parameters),
-    } as any);
-
-    return ok(res, result);
-  }
-
-  return methodNotAllowed(res);
-};
diff --git a/pages/api/reports/insights.ts b/pages/api/reports/insights.ts
deleted file mode 100644
index dba11953c..000000000
--- a/pages/api/reports/insights.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { canViewWebsite } from 'lib/auth';
-import { useCors, useAuth } from 'lib/middleware';
-import { NextApiRequestQueryBody } from 'lib/types';
-import { NextApiResponse } from 'next';
-import { ok, methodNotAllowed, unauthorized } from 'next-basics';
-import { getInsights } from 'queries';
-
-export interface InsightsRequestBody {
-  websiteId: string;
-  dateRange: {
-    startDate: string;
-    endDate: string;
-  };
-  fields: string[];
-  filters: string[];
-  groups: string[];
-}
-
-export default async (
-  req: NextApiRequestQueryBody<any, InsightsRequestBody>,
-  res: NextApiResponse,
-) => {
-  await useCors(req, res);
-  await useAuth(req, res);
-
-  if (req.method === 'POST') {
-    const {
-      websiteId,
-      dateRange: { startDate, endDate },
-      fields,
-      filters,
-      groups,
-    } = req.body;
-
-    if (!(await canViewWebsite(req.auth, websiteId))) {
-      return unauthorized(res);
-    }
-
-    const data = await getInsights(websiteId, {
-      startDate: new Date(startDate),
-      endDate: new Date(endDate),
-      fields,
-      filters,
-      groups,
-    });
-
-    return ok(res, data);
-  }
-
-  return methodNotAllowed(res);
-};
diff --git a/pages/api/send.ts b/pages/api/send.ts
deleted file mode 100644
index f90ded772..000000000
--- a/pages/api/send.ts
+++ /dev/null
@@ -1,175 +0,0 @@
-import isbot from 'isbot';
-import ipaddr from 'ipaddr.js';
-import { createToken, ok, send, badRequest, forbidden } from 'next-basics';
-import { saveEvent, saveSessionData } from 'queries';
-import { useCors, useSession } from 'lib/middleware';
-import { getJsonBody, getIpAddress } from 'lib/detect';
-import { secret } from 'lib/crypto';
-import { NextApiRequest, NextApiResponse } from 'next';
-import { Resolver } from 'dns/promises';
-import { CollectionType } from 'lib/types';
-import { COLLECTION_TYPE } from 'lib/constants';
-
-export interface CollectRequestBody {
-  payload: {
-    data: { [key: string]: any };
-    hostname: string;
-    language: string;
-    referrer: string;
-    screen: string;
-    title: string;
-    url: string;
-    website: string;
-    name: string;
-  };
-  type: CollectionType;
-}
-
-export interface NextApiRequestCollect extends NextApiRequest {
-  body: CollectRequestBody;
-  session: {
-    id: string;
-    websiteId: string;
-    ownerId: string;
-    hostname: string;
-    browser: string;
-    os: string;
-    device: string;
-    screen: string;
-    language: string;
-    country: string;
-    subdivision1: string;
-    subdivision2: string;
-    city: string;
-  };
-  headers: { [key: string]: any };
-}
-
-export default async (req: NextApiRequestCollect, res: NextApiResponse) => {
-  await useCors(req, res);
-
-  if (isbot(req.headers['user-agent']) && !process.env.DISABLE_BOT_CHECK) {
-    return ok(res);
-  }
-
-  const { type, payload } = getJsonBody<CollectRequestBody>(req);
-
-  const error = validateBody({ type, payload });
-
-  if (error) {
-    return badRequest(res, error);
-  }
-
-  if (await hasBlockedIp(req)) {
-    return forbidden(res);
-  }
-
-  const { url, referrer, name: eventName, data: eventData, title: pageTitle } = payload;
-
-  await useSession(req, res);
-
-  const session = req.session;
-
-  if (type === COLLECTION_TYPE.event) {
-    // eslint-disable-next-line prefer-const
-    let [urlPath, urlQuery] = url?.split('?') || [];
-    let [referrerPath, referrerQuery] = referrer?.split('?') || [];
-    let referrerDomain;
-
-    if (!urlPath) {
-      urlPath = '/';
-    }
-
-    if (referrerPath?.startsWith('http')) {
-      const refUrl = new URL(referrer);
-      referrerPath = refUrl.pathname;
-      referrerQuery = refUrl.search.substring(1);
-      referrerDomain = refUrl.hostname.replace(/www\./, '');
-    }
-
-    if (process.env.REMOVE_TRAILING_SLASH) {
-      urlPath = urlPath.replace(/.+\/$/, '');
-    }
-
-    await saveEvent({
-      urlPath,
-      urlQuery,
-      referrerPath,
-      referrerQuery,
-      referrerDomain,
-      pageTitle,
-      eventName,
-      eventData,
-      ...session,
-      sessionId: session.id,
-    });
-  }
-
-  if (type === COLLECTION_TYPE.identify) {
-    if (!eventData) {
-      return badRequest(res, 'Data required.');
-    }
-
-    await saveSessionData({ ...session, sessionData: eventData, sessionId: session.id });
-  }
-
-  const token = createToken(session, secret());
-
-  return send(res, token);
-};
-
-function validateBody({ type, payload }: CollectRequestBody) {
-  if (!type || !payload) {
-    return 'Invalid payload.';
-  }
-
-  if (type !== COLLECTION_TYPE.event && type !== COLLECTION_TYPE.identify) {
-    return 'Wrong payload type.';
-  }
-
-  const { data } = payload;
-
-  if (data && !(typeof data === 'object' && !Array.isArray(data))) {
-    return 'Invalid event data.';
-  }
-}
-
-async function hasBlockedIp(req: NextApiRequestCollect) {
-  const ignoreIps = process.env.IGNORE_IP;
-  const ignoreHostnames = process.env.IGNORE_HOSTNAME;
-
-  if (ignoreIps || ignoreHostnames) {
-    const ips = [];
-
-    if (ignoreIps) {
-      ips.push(...ignoreIps.split(',').map(n => n.trim()));
-    }
-
-    if (ignoreHostnames) {
-      const resolver = new Resolver();
-      const promises = ignoreHostnames
-        .split(',')
-        .map(n => resolver.resolve4(n.trim()).catch(() => {}));
-
-      await Promise.all(promises).then(resolvedIps => {
-        ips.push(...resolvedIps.filter(n => n).flatMap(n => n as string[]));
-      });
-    }
-
-    const clientIp = getIpAddress(req);
-
-    return ips.find(ip => {
-      if (ip === clientIp) return true;
-
-      // CIDR notation
-      if (ip.indexOf('/') > 0) {
-        const addr = ipaddr.parse(clientIp);
-        const range = ipaddr.parseCIDR(ip);
-
-        if (addr.kind() === range[0].kind() && addr.match(range)) return true;
-      }
-
-      return false;
-    });
-  }
-}
diff --git a/pages/api/teams/[id]/users/index.ts b/pages/api/teams/[id]/users/index.ts
deleted file mode 100644
index c73da6836..000000000
--- a/pages/api/teams/[id]/users/index.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { canUpdateTeam, canViewTeam } from 'lib/auth';
-import { useAuth } from 'lib/middleware';
-import { NextApiRequestQueryBody } from 'lib/types';
-import { NextApiResponse } from 'next';
-import { badRequest, methodNotAllowed, ok, unauthorized } from 'next-basics';
-import { createTeamUser, getTeamUsers, getUserByUsername } from 'queries';
-
-export interface TeamUserRequestQuery {
-  id: string;
-}
-
-export interface TeamUserRequestBody {
-  email: string;
-  roleId: string;
-}
-
-export default async (
-  req: NextApiRequestQueryBody<TeamUserRequestQuery, TeamUserRequestBody>,
-  res: NextApiResponse,
-) => {
-  await useAuth(req, res);
-
-  const { id: teamId } = req.query;
-
-  if (req.method === 'GET') {
-    if (!(await canViewTeam(req.auth, teamId))) {
-      return unauthorized(res);
-    }
-
-    const users = await getTeamUsers(teamId);
-
-    return ok(res, users);
-  }
-
-  if (req.method === 'POST') {
-    if (!(await canUpdateTeam(req.auth, teamId))) {
-      return unauthorized(res, 'You must be the owner of this team.');
-    }
-
-    const { email, roleId: roleId } = req.body;
-
-    // Check for User
-    const user = await getUserByUsername(email);
-
-    if (!user) {
-      return badRequest(res, 'The User does not exists.');
-    }
-
-    const updated = await createTeamUser(user.id, teamId, roleId);
-
-    return ok(res, updated);
-  }
-
-  return methodNotAllowed(res);
-};
diff --git a/pages/api/users/[id]/teams.ts b/pages/api/users/[id]/teams.ts
deleted file mode 100644
index c31b98ca7..000000000
--- a/pages/api/users/[id]/teams.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { useAuth, useCors } from 'lib/middleware';
-import { NextApiRequestQueryBody } from 'lib/types';
-import { NextApiResponse } from 'next';
-import { methodNotAllowed, ok, unauthorized } from 'next-basics';
-import { getUserTeams } from 'queries';
-
-export interface UserWebsitesRequestBody {
-  name: string;
-  domain: string;
-  shareId: string;
-}
-
-export default async (
-  req: NextApiRequestQueryBody<any, UserWebsitesRequestBody>,
-  res: NextApiResponse,
-) => {
-  await useCors(req, res);
-  await useAuth(req, res);
-
-  const { user } = req.auth;
-  const { id: userId } = req.query;
-
-  if (req.method === 'GET') {
-    if (!user.isAdmin && user.id !== userId) {
-      return unauthorized(res);
-    }
-
-    const teams = await getUserTeams(userId);
-
-    return ok(res, teams);
-  }
-
-  return methodNotAllowed(res);
-};
diff --git a/pages/api/users/[id]/websites.ts b/pages/api/users/[id]/websites.ts
deleted file mode 100644
index e94094a45..000000000
--- a/pages/api/users/[id]/websites.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { useAuth, useCors } from 'lib/middleware';
-import { NextApiRequestQueryBody } from 'lib/types';
-import { NextApiResponse } from 'next';
-import { methodNotAllowed, ok, unauthorized } from 'next-basics';
-import { getUserWebsites } from 'queries';
-
-export interface UserWebsitesRequestBody {
-  name: string;
-  domain: string;
-  shareId: string;
-}
-
-export default async (
-  req: NextApiRequestQueryBody<any, UserWebsitesRequestBody>,
-  res: NextApiResponse,
-) => {
-  await useCors(req, res);
-  await useAuth(req, res);
-  const { user } = req.auth;
-  const { id: userId } = req.query;
-
-  if (req.method === 'GET') {
-    if (!user.isAdmin && user.id !== userId) {
-      return unauthorized(res);
-    }
-
-    const { includeTeams } = req.query;
-
-    const websites = await getUserWebsites(userId, { includeTeams });
-
-    return ok(res, websites);
-  }
-
-  return methodNotAllowed(res);
-};
diff --git a/pages/console/[[...id]].js b/pages/console/[[...id]].js
deleted file mode 100644
index d13d6f687..000000000
--- a/pages/console/[[...id]].js
+++ /dev/null
@@ -1,22 +0,0 @@
-import AppLayout from 'components/layout/AppLayout';
-import TestConsole from 'components/pages/console/TestConsole';
-
-export default function ({ disabled }) {
-  if (disabled) {
-    return null;
-  }
-
-  return (
-    <AppLayout>
-      <TestConsole />
-    </AppLayout>
-  );
-}
-
-export async function getServerSideProps() {
-  return {
-    props: {
-      disabled: !process.env.ENABLE_TEST_CONSOLE,
-    },
-  };
-}
diff --git a/pages/dashboard/index.js b/pages/dashboard/index.js
deleted file mode 100644
index 061697f44..000000000
--- a/pages/dashboard/index.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import AppLayout from 'components/layout/AppLayout';
-import Dashboard from 'components/pages/dashboard/Dashboard';
-import useMessages from 'hooks/useMessages';
-
-export default function DashboardPage() {
-  const { formatMessage, labels } = useMessages();
-
-  return (
-    <AppLayout title={formatMessage(labels.dashboard)}>
-      <Dashboard />
-    </AppLayout>
-  );
-}
diff --git a/pages/index.js b/pages/index.js
deleted file mode 100644
index bd4c74be7..000000000
--- a/pages/index.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { useEffect } from 'react';
-import { useRouter } from 'next/router';
-
-export default function () {
-  const router = useRouter();
-
-  useEffect(() => {
-    router.push('/dashboard');
-  }, []);
-
-  return null;
-}
diff --git a/pages/login.js b/pages/login.js
deleted file mode 100644
index a43f8c1f2..000000000
--- a/pages/login.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import LoginLayout from 'components/pages/login/LoginLayout';
-import LoginForm from 'components/pages/login/LoginForm';
-
-export default function ({ disabled }) {
-  if (disabled) {
-    return null;
-  }
-
-  return (
-    <LoginLayout title="login">
-      <LoginForm />
-    </LoginLayout>
-  );
-}
-
-export async function getServerSideProps() {
-  return {
-    props: {
-      disabled: !!process.env.DISABLE_LOGIN,
-    },
-  };
-}
diff --git a/pages/reports/[id].js b/pages/reports/[id].js
deleted file mode 100644
index 2520e87db..000000000
--- a/pages/reports/[id].js
+++ /dev/null
@@ -1,24 +0,0 @@
-import { useRouter } from 'next/router';
-import AppLayout from 'components/layout/AppLayout';
-import ReportDetails from 'components/pages/reports/ReportDetails';
-import { useApi, useMessages } from 'hooks';
-
-export default function () {
-  const { formatMessage, labels } = useMessages();
-  const router = useRouter();
-  const { id } = router.query;
-  const { get, useQuery } = useApi();
-  const { data: report } = useQuery(['reports', id], () => get(`/reports/${id}`), {
-    enabled: !!id,
-  });
-
-  if (!id || !report) {
-    return null;
-  }
-
-  return (
-    <AppLayout title={formatMessage(labels.websites)}>
-      <ReportDetails reportId={report.id} reportType={report.type} />
-    </AppLayout>
-  );
-}
diff --git a/pages/reports/create.js b/pages/reports/create.js
deleted file mode 100644
index 763e2c63f..000000000
--- a/pages/reports/create.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import AppLayout from 'components/layout/AppLayout';
-import ReportTemplates from 'components/pages/reports/ReportTemplates';
-import { useMessages } from 'hooks';
-
-export default function () {
-  const { formatMessage, labels } = useMessages();
-
-  return (
-    <AppLayout title={formatMessage(labels.reports)}>
-      <ReportTemplates />
-    </AppLayout>
-  );
-}
diff --git a/pages/reports/funnel.js b/pages/reports/funnel.js
deleted file mode 100644
index 4acdef37d..000000000
--- a/pages/reports/funnel.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import AppLayout from 'components/layout/AppLayout';
-import FunnelReport from 'components/pages/reports/funnel/FunnelReport';
-import useMessages from 'hooks/useMessages';
-
-export default function () {
-  const { formatMessage, labels } = useMessages();
-
-  return (
-    <AppLayout title={`${formatMessage(labels.funnel)} - ${formatMessage(labels.reports)}`}>
-      <FunnelReport />
-    </AppLayout>
-  );
-}
diff --git a/pages/reports/insights.js b/pages/reports/insights.js
deleted file mode 100644
index 45236e10e..000000000
--- a/pages/reports/insights.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import AppLayout from 'components/layout/AppLayout';
-import InsightsReport from 'components/pages/reports/insights/InsightsReport';
-import { useMessages } from 'hooks';
-
-export default function () {
-  const { formatMessage, labels } = useMessages();
-
-  return (
-    <AppLayout title={`${formatMessage(labels.insights)} - ${formatMessage(labels.reports)}`}>
-      <InsightsReport />
-    </AppLayout>
-  );
-}
diff --git a/pages/settings/profile/index.js b/pages/settings/profile/index.js
deleted file mode 100644
index 8827f1daa..000000000
--- a/pages/settings/profile/index.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import AppLayout from 'components/layout/AppLayout';
-import SettingsLayout from 'components/layout/SettingsLayout';
-import ProfileSettings from 'components/pages/settings/profile/ProfileSettings';
-import useMessages from 'hooks/useMessages';
-
-export default function () {
-  const { formatMessage, labels } = useMessages();
-  return (
-    <AppLayout title={`${formatMessage(labels.settings)} - ${formatMessage(labels.profile)}`}>
-      <SettingsLayout>
-        <ProfileSettings />
-      </SettingsLayout>
-    </AppLayout>
-  );
-}
diff --git a/pages/settings/teams/[id].js b/pages/settings/teams/[id].js
deleted file mode 100644
index a68ef80c3..000000000
--- a/pages/settings/teams/[id].js
+++ /dev/null
@@ -1,31 +0,0 @@
-import AppLayout from 'components/layout/AppLayout';
-import SettingsLayout from 'components/layout/SettingsLayout';
-import TeamSettings from 'components/pages/settings/teams/TeamSettings';
-import { useRouter } from 'next/router';
-import useMessages from 'hooks/useMessages';
-
-export default function ({ disabled }) {
-  const router = useRouter();
-  const { id } = router.query;
-  const { formatMessage, labels } = useMessages();
-
-  if (!id || disabled) {
-    return null;
-  }
-
-  return (
-    <AppLayout title={`${formatMessage(labels.settings)} - ${formatMessage(labels.teams)}`}>
-      <SettingsLayout>
-        <TeamSettings teamId={id} />
-      </SettingsLayout>
-    </AppLayout>
-  );
-}
-
-export async function getServerSideProps() {
-  return {
-    props: {
-      disabled: !!process.env.CLOUD_MODE,
-    },
-  };
-}
diff --git a/pages/settings/teams/index.js b/pages/settings/teams/index.js
deleted file mode 100644
index 51739c316..000000000
--- a/pages/settings/teams/index.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import AppLayout from 'components/layout/AppLayout';
-import SettingsLayout from 'components/layout/SettingsLayout';
-import TeamsList from 'components/pages/settings/teams/TeamsList';
-import useMessages from 'hooks/useMessages';
-
-export default function ({ disabled }) {
-  const { formatMessage, labels } = useMessages();
-  if (disabled) {
-    return null;
-  }
-
-  return (
-    <AppLayout title={`${formatMessage(labels.settings)} - ${formatMessage(labels.teams)}`}>
-      <SettingsLayout>
-        <TeamsList />
-      </SettingsLayout>
-    </AppLayout>
-  );
-}
-
-export async function getServerSideProps() {
-  return {
-    props: {
-      disabled: !!process.env.CLOUD_MODE,
-    },
-  };
-}
diff --git a/pages/settings/users/[id].js b/pages/settings/users/[id].js
deleted file mode 100644
index d1e53419b..000000000
--- a/pages/settings/users/[id].js
+++ /dev/null
@@ -1,31 +0,0 @@
-import AppLayout from 'components/layout/AppLayout';
-import SettingsLayout from 'components/layout/SettingsLayout';
-import UserSettings from 'components/pages/settings/users/UserSettings';
-import { useRouter } from 'next/router';
-import useMessages from 'hooks/useMessages';
-
-export default function ({ disabled }) {
-  const router = useRouter();
-  const { id } = router.query;
-  const { formatMessage, labels } = useMessages();
-
-  if (!id || disabled) {
-    return null;
-  }
-
-  return (
-    <AppLayout title={`${formatMessage(labels.settings)} - ${formatMessage(labels.users)}`}>
-      <SettingsLayout>
-        <UserSettings userId={id} />
-      </SettingsLayout>
-    </AppLayout>
-  );
-}
-
-export async function getServerSideProps() {
-  return {
-    props: {
-      disabled: !!process.env.CLOUD_MODE,
-    },
-  };
-}
diff --git a/pages/settings/users/index.js b/pages/settings/users/index.js
deleted file mode 100644
index ee325adca..000000000
--- a/pages/settings/users/index.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import AppLayout from 'components/layout/AppLayout';
-import SettingsLayout from 'components/layout/SettingsLayout';
-import UsersList from 'components/pages/settings/users/UsersList';
-import useMessages from 'hooks/useMessages';
-
-export default function ({ disabled }) {
-  const { formatMessage, labels } = useMessages();
-  if (disabled) {
-    return null;
-  }
-
-  return (
-    <AppLayout title={`${formatMessage(labels.settings)} - ${formatMessage(labels.users)}`}>
-      <SettingsLayout>
-        <UsersList />
-      </SettingsLayout>
-    </AppLayout>
-  );
-}
-
-export async function getServerSideProps() {
-  return {
-    props: {
-      disabled: !!process.env.CLOUD_MODE,
-    },
-  };
-}
diff --git a/pages/settings/websites/[id].js b/pages/settings/websites/[id].js
deleted file mode 100644
index f828369e0..000000000
--- a/pages/settings/websites/[id].js
+++ /dev/null
@@ -1,31 +0,0 @@
-import AppLayout from 'components/layout/AppLayout';
-import { useRouter } from 'next/router';
-import WebsiteSettings from 'components/pages/settings/websites/WebsiteSettings';
-import SettingsLayout from 'components/layout/SettingsLayout';
-import useMessages from 'hooks/useMessages';
-
-export default function ({ disabled }) {
-  const router = useRouter();
-  const { id } = router.query;
-  const { formatMessage, labels } = useMessages();
-
-  if (!id || disabled) {
-    return null;
-  }
-
-  return (
-    <AppLayout title={`${formatMessage(labels.settings)} - ${formatMessage(labels.websites)}`}>
-      <SettingsLayout>
-        <WebsiteSettings websiteId={id} />
-      </SettingsLayout>
-    </AppLayout>
-  );
-}
-
-export async function getServerSideProps() {
-  return {
-    props: {
-      disabled: !!process.env.CLOUD_MODE,
-    },
-  };
-}
diff --git a/pages/settings/websites/index.js b/pages/settings/websites/index.js
deleted file mode 100644
index 899ad7c71..000000000
--- a/pages/settings/websites/index.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import AppLayout from 'components/layout/AppLayout';
-import SettingsLayout from 'components/layout/SettingsLayout';
-import WebsitesList from 'components/pages/settings/websites/WebsitesList';
-import useMessages from 'hooks/useMessages';
-
-export default function ({ disabled }) {
-  const { formatMessage, labels } = useMessages();
-  if (disabled) {
-    return null;
-  }
-
-  return (
-    <AppLayout title={`${formatMessage(labels.settings)} - ${formatMessage(labels.websites)}`}>
-      <SettingsLayout>
-        <WebsitesList />
-      </SettingsLayout>
-    </AppLayout>
-  );
-}
-
-export async function getServerSideProps() {
-  return {
-    props: {
-      disabled: !!process.env.CLOUD_MODE,
-    },
-  };
-}
diff --git a/pages/share/[...id].js b/pages/share/[...id].js
deleted file mode 100644
index 1e4243821..000000000
--- a/pages/share/[...id].js
+++ /dev/null
@@ -1,21 +0,0 @@
-import { useRouter } from 'next/router';
-import ShareLayout from 'components/layout/ShareLayout';
-import WebsiteDetailsPage from 'components/pages/websites/WebsiteDetailsPage';
-import useShareToken from 'hooks/useShareToken';
-
-export default function () {
-  const router = useRouter();
-  const { id } = router.query;
-  const shareId = id?.[0];
-  const shareToken = useShareToken(shareId);
-
-  if (!shareToken) {
-    return null;
-  }
-
-  return (
-    <ShareLayout>
-      <WebsiteDetailsPage websiteId={shareToken.websiteId} />
-    </ShareLayout>
-  );
-}
diff --git a/pages/websites/[id]/event-data.js b/pages/websites/[id]/event-data.js
deleted file mode 100644
index 8b44616d9..000000000
--- a/pages/websites/[id]/event-data.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import { useRouter } from 'next/router';
-import AppLayout from 'components/layout/AppLayout';
-import WebsiteEventDataPage from 'components/pages/websites/WebsiteEventDataPage';
-import useMessages from 'hooks/useMessages';
-
-export default function () {
-  const { formatMessage, labels } = useMessages();
-  const router = useRouter();
-  const { id } = router.query;
-
-  if (!id) {
-    return null;
-  }
-
-  return (
-    <AppLayout title={formatMessage(labels.websites)}>
-      <WebsiteEventDataPage websiteId={id} />
-    </AppLayout>
-  );
-}
diff --git a/pages/websites/[id]/index.js b/pages/websites/[id]/index.js
deleted file mode 100644
index bec7a45f6..000000000
--- a/pages/websites/[id]/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import { useRouter } from 'next/router';
-import AppLayout from 'components/layout/AppLayout';
-import WebsiteDetailsPage from 'components/pages/websites/WebsiteDetailsPage';
-import useMessages from 'hooks/useMessages';
-
-export default function () {
-  const { formatMessage, labels } = useMessages();
-  const router = useRouter();
-  const { id } = router.query;
-
-  if (!id) {
-    return null;
-  }
-
-  return (
-    <AppLayout title={formatMessage(labels.websites)}>
-      <WebsiteDetailsPage websiteId={id} />
-    </AppLayout>
-  );
-}
diff --git a/pages/websites/[id]/realtime.js b/pages/websites/[id]/realtime.js
deleted file mode 100644
index efe486a54..000000000
--- a/pages/websites/[id]/realtime.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { useRouter } from 'next/router';
-import AppLayout from 'components/layout/AppLayout';
-import RealtimePage from 'components/pages/realtime/RealtimePage';
-
-export default function () {
-  const router = useRouter();
-  const { id: websiteId } = router.query;
-
-  if (!websiteId) {
-    return null;
-  }
-
-  return (
-    <AppLayout>
-      <RealtimePage websiteId={websiteId} />
-    </AppLayout>
-  );
-}
diff --git a/pages/websites/[id]/reports.js b/pages/websites/[id]/reports.js
deleted file mode 100644
index ccd88081e..000000000
--- a/pages/websites/[id]/reports.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { useRouter } from 'next/router';
-import AppLayout from 'components/layout/AppLayout';
-import WebsiteReportsPage from 'components/pages/websites/WebsiteReportsPage';
-
-export default function () {
-  const router = useRouter();
-  const { id: websiteId } = router.query;
-
-  if (!websiteId) {
-    return null;
-  }
-
-  return (
-    <AppLayout>
-      <WebsiteReportsPage websiteId={websiteId} />
-    </AppLayout>
-  );
-}
diff --git a/public/android-chrome-192x192.png b/public/android-chrome-192x192.png
index 36a3bb8c6..29d134eef 100644
Binary files a/public/android-chrome-192x192.png and b/public/android-chrome-192x192.png differ
diff --git a/public/android-chrome-512x512.png b/public/android-chrome-512x512.png
index aa9bebab8..e9253204b 100644
Binary files a/public/android-chrome-512x512.png and b/public/android-chrome-512x512.png differ
diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
index 16842d3c1..575bba77b 100644
Binary files a/public/apple-touch-icon.png and b/public/apple-touch-icon.png differ
diff --git a/public/favicon-16x16.png b/public/favicon-16x16.png
index 9d08d9963..549642460 100644
Binary files a/public/favicon-16x16.png and b/public/favicon-16x16.png differ
diff --git a/public/favicon-32x32.png b/public/favicon-32x32.png
index 3f2e4c1f7..ec5ecedae 100644
Binary files a/public/favicon-32x32.png and b/public/favicon-32x32.png differ
diff --git a/public/images/browsers/android.png b/public/images/browsers/android.png
index 6e28498d2..393001a01 100644
Binary files a/public/images/browsers/android.png and b/public/images/browsers/android.png differ
diff --git a/public/images/browsers/aol.png b/public/images/browsers/aol.png
index 66dc4288e..3b6f962f7 100644
Binary files a/public/images/browsers/aol.png and b/public/images/browsers/aol.png differ
diff --git a/public/images/browsers/beaker.png b/public/images/browsers/beaker.png
index fbc997cd8..8d4e61d69 100644
Binary files a/public/images/browsers/beaker.png and b/public/images/browsers/beaker.png differ
diff --git a/public/images/browsers/blackberry.png b/public/images/browsers/blackberry.png
index 74f255cb9..11ccd8364 100644
Binary files a/public/images/browsers/blackberry.png and b/public/images/browsers/blackberry.png differ
diff --git a/public/images/browsers/curl.png b/public/images/browsers/curl.png
index dd2219273..cc0a617af 100644
Binary files a/public/images/browsers/curl.png and b/public/images/browsers/curl.png differ
diff --git a/public/images/browsers/edge.png b/public/images/browsers/edge.png
index 3881a7e0a..2da3aaffe 100644
Binary files a/public/images/browsers/edge.png and b/public/images/browsers/edge.png differ
diff --git a/public/images/browsers/instagram.png b/public/images/browsers/instagram.png
index 5961a6b3b..8377710a1 100644
Binary files a/public/images/browsers/instagram.png and b/public/images/browsers/instagram.png differ
diff --git a/public/images/browsers/ios-webview.png b/public/images/browsers/ios-webview.png
index 5f2dd4019..bf7c362e5 100644
Binary files a/public/images/browsers/ios-webview.png and b/public/images/browsers/ios-webview.png differ
diff --git a/public/images/browsers/ios.png b/public/images/browsers/ios.png
index 5f2dd4019..114bf554c 100644
Binary files a/public/images/browsers/ios.png and b/public/images/browsers/ios.png differ
diff --git a/public/images/browsers/miui.png b/public/images/browsers/miui.png
index 5f929510f..1534a0ca1 100644
Binary files a/public/images/browsers/miui.png and b/public/images/browsers/miui.png differ
diff --git a/public/images/browsers/searchbot.png b/public/images/browsers/searchbot.png
index 46a33055c..43b1dff99 100644
Binary files a/public/images/browsers/searchbot.png and b/public/images/browsers/searchbot.png differ
diff --git a/public/images/os/amazon-os.png b/public/images/os/amazon-os.png
index 9b18cf0fd..030e72f6d 100644
Binary files a/public/images/os/amazon-os.png and b/public/images/os/amazon-os.png differ
diff --git a/public/images/os/android-os.png b/public/images/os/android-os.png
index fc6509b36..21ea3445e 100644
Binary files a/public/images/os/android-os.png and b/public/images/os/android-os.png differ
diff --git a/public/images/os/beos.png b/public/images/os/beos.png
index 6bc4a8a5c..8e852b0fc 100644
Binary files a/public/images/os/beos.png and b/public/images/os/beos.png differ
diff --git a/public/images/os/blackberry-os.png b/public/images/os/blackberry-os.png
index c77db5254..093a8a400 100644
Binary files a/public/images/os/blackberry-os.png and b/public/images/os/blackberry-os.png differ
diff --git a/public/images/os/ios.png b/public/images/os/ios.png
index 1c129ae84..7e803a690 100644
Binary files a/public/images/os/ios.png and b/public/images/os/ios.png differ
diff --git a/public/images/os/linux.png b/public/images/os/linux.png
index ce8fba38e..d5c1bd8b7 100644
Binary files a/public/images/os/linux.png and b/public/images/os/linux.png differ
diff --git a/public/images/os/mac-os.png b/public/images/os/mac-os.png
index 1972abe75..e57d01cf2 100644
Binary files a/public/images/os/mac-os.png and b/public/images/os/mac-os.png differ
diff --git a/public/images/os/open-bsd.png b/public/images/os/open-bsd.png
index 806887e83..b3423ccee 100644
Binary files a/public/images/os/open-bsd.png and b/public/images/os/open-bsd.png differ
diff --git a/public/images/os/os-2.png b/public/images/os/os-2.png
index 5f88105da..8f51e6183 100644
Binary files a/public/images/os/os-2.png and b/public/images/os/os-2.png differ
diff --git a/public/images/os/qnx.png b/public/images/os/qnx.png
index 59d9a44c4..1cf10fe57 100644
Binary files a/public/images/os/qnx.png and b/public/images/os/qnx.png differ
diff --git a/public/images/os/sun-os.png b/public/images/os/sun-os.png
index c19f0eb39..648eb2417 100644
Binary files a/public/images/os/sun-os.png and b/public/images/os/sun-os.png differ
diff --git a/public/images/os/windows-2000.png b/public/images/os/windows-2000.png
index 3bccae3fb..8ec7db187 100644
Binary files a/public/images/os/windows-2000.png and b/public/images/os/windows-2000.png differ
diff --git a/public/images/os/windows-3-11.png b/public/images/os/windows-3-11.png
index 3bccae3fb..8ec7db187 100644
Binary files a/public/images/os/windows-3-11.png and b/public/images/os/windows-3-11.png differ
diff --git a/public/images/os/windows-7.png b/public/images/os/windows-7.png
index cd2db79e4..4a899a30f 100644
Binary files a/public/images/os/windows-7.png and b/public/images/os/windows-7.png differ
diff --git a/public/images/os/windows-8-1.png b/public/images/os/windows-8-1.png
index 3ce98aaaf..f6605f4c5 100644
Binary files a/public/images/os/windows-8-1.png and b/public/images/os/windows-8-1.png differ
diff --git a/public/images/os/windows-8.png b/public/images/os/windows-8.png
index 3ce98aaaf..f6605f4c5 100644
Binary files a/public/images/os/windows-8.png and b/public/images/os/windows-8.png differ
diff --git a/public/images/os/windows-95.png b/public/images/os/windows-95.png
index 3bccae3fb..8ec7db187 100644
Binary files a/public/images/os/windows-95.png and b/public/images/os/windows-95.png differ
diff --git a/public/images/os/windows-98.png b/public/images/os/windows-98.png
index 3bccae3fb..8ec7db187 100644
Binary files a/public/images/os/windows-98.png and b/public/images/os/windows-98.png differ
diff --git a/public/images/os/windows-me.png b/public/images/os/windows-me.png
index cd2db79e4..4a899a30f 100644
Binary files a/public/images/os/windows-me.png and b/public/images/os/windows-me.png differ
diff --git a/public/images/os/windows-mobile.png b/public/images/os/windows-mobile.png
new file mode 100644
index 000000000..4a899a30f
Binary files /dev/null and b/public/images/os/windows-mobile.png differ
diff --git a/public/images/os/windows-server-2003.png b/public/images/os/windows-server-2003.png
index cd2db79e4..4a899a30f 100644
Binary files a/public/images/os/windows-server-2003.png and b/public/images/os/windows-server-2003.png differ
diff --git a/public/images/os/windows-vista.png b/public/images/os/windows-vista.png
index cd2db79e4..4a899a30f 100644
Binary files a/public/images/os/windows-vista.png and b/public/images/os/windows-vista.png differ
diff --git a/public/images/os/windows-xp.png b/public/images/os/windows-xp.png
index cd2db79e4..4a899a30f 100644
Binary files a/public/images/os/windows-xp.png and b/public/images/os/windows-xp.png differ
diff --git a/public/intl/country/my-MM.json b/public/intl/country/my-MM.json
new file mode 100644
index 000000000..e233349e2
--- /dev/null
+++ b/public/intl/country/my-MM.json
@@ -0,0 +1,251 @@
+{
+  "CA": "\u1000\u1014\u1031\u1012\u102b",
+  "KG": "\u1000\u102c\u1002\u103b\u1005\u1039\u1005\u1010\u1014\u103a",
+  "KZ": "\u1000\u102c\u1007\u1000\u103a\u1005\u1010\u1014\u103a",
+  "QA": "\u1000\u102c\u1010\u102c",
+  "BQ": "\u1000\u102c\u101b\u1005\u103a\u1018\u102e\u101a\u1036 \u1014\u101a\u103a\u101e\u102c\u101c\u1014\u103a",
+  "KW": "\u1000\u1030\u101d\u102d\u1010\u103a",
+  "KY": "\u1000\u1031\u1019\u1014\u103a \u1000\u103b\u103d\u1014\u103a\u1038\u1005\u102f",
+  "CC": "\u1000\u102d\u102f\u1000\u102d\u102f\u1038\u1000\u103b\u103d\u1014\u103a\u1038",
+  "KM": "\u1000\u102d\u102f\u1019\u102d\u102f\u101b\u102d\u102f\u1005\u103a",
+  "CO": "\u1000\u102d\u102f\u101c\u1036\u1018\u102e\u101a\u102c",
+  "CR": "\u1000\u102d\u102f\u1037\u1005\u103a\u1010\u102c\u101b\u102e\u1000\u102c",
+  "CI": "\u1000\u102d\u102f\u1037\u1010\u103a \u1012\u102e\u1017\u103d\u102c",
+  "KE": "\u1000\u1004\u103a\u100a\u102c",
+  "CM": "\u1000\u1004\u103a\u1019\u101b\u103d\u1014\u103a\u1038",
+  "CV": "\u1000\u102d\u1010\u103a\u1017\u102c\u1012\u102e",
+  "KH": "\u1000\u1019\u1039\u1018\u1031\u102c\u1012\u102e\u1038\u101a\u102c\u1038",
+  "CW": "\u1000\u103b\u1030\u101b\u1031\u1038\u1000\u102d\u102f\u1038\u1005\u103a",
+  "CU": "\u1000\u103b\u1030\u1038\u1018\u102c\u1038",
+  "CK": "\u1000\u103d\u1010\u103a \u1000\u103b\u103d\u1014\u103a\u1038\u1005\u102f",
+  "CD": "\u1000\u103d\u1014\u103a\u1002\u102d\u102f",
+  "CG": "\u1000\u103d\u1014\u103a\u1002\u102d\u102f-\u1018\u101b\u102c\u1007\u102c\u1017\u102e\u1038\u101c\u103a",
+  "HR": "\u1001\u101b\u102d\u102f\u1021\u1031\u1038\u101b\u103e\u102c\u1038",
+  "CX": "\u1001\u101b\u1005\u103a\u1005\u1019\u1010\u103a \u1000\u103b\u103d\u1014\u103a\u1038",
+  "KI": "\u1001\u102e\u101b\u102e\u1018\u102c\u1010\u102e",
+  "CL": "\u1001\u103b\u102e\u101c\u102e",
+  "CZ": "\u1001\u103b\u1000\u103a\u1000\u102e\u101a\u102c\u1038",
+  "TD": "\u1001\u103b\u1012\u103a",
+  "GR": "\u1002\u101b\u102d",
+  "GD": "\u1002\u101b\u102e\u1014\u1031\u1012\u102b",
+  "GL": "\u1002\u101b\u1004\u103a\u1038\u101c\u1014\u103a\u1038",
+  "GH": "\u1002\u102b\u1014\u102c",
+  "GA": "\u1002\u102b\u1018\u103d\u1014\u103a",
+  "GN": "\u1002\u102e\u1014\u102e",
+  "GW": "\u1002\u102e\u1014\u102e-\u1018\u102e\u1005\u1031\u102c",
+  "GU": "\u1002\u1030\u1021\u1019\u103a",
+  "GY": "\u1002\u102d\u102f\u1004\u103a\u101a\u102c\u1014\u102c",
+  "GM": "\u1002\u1019\u103a\u1018\u102e\u101b\u102c",
+  "JP": "\u1002\u103b\u1015\u1014\u103a",
+  "JM": "\u1002\u103b\u1019\u1031\u1000\u102c",
+  "JE": "\u1002\u103b\u102c\u1005\u102e",
+  "DE": "\u1002\u103b\u102c\u1019\u1014\u102e",
+  "GI": "\u1002\u103b\u102e\u1018\u101b\u1031\u102c\u103a\u101c\u103a\u1010\u102c",
+  "DJ": "\u1002\u103b\u102e\u1018\u1030\u1010\u102e",
+  "GE": "\u1002\u103b\u1031\u102c\u103a\u1002\u103b\u102e\u101a\u102c",
+  "JO": "\u1002\u103b\u1031\u102c\u103a\u1012\u1014\u103a",
+  "GT": "\u1002\u103d\u102b\u1010\u102e\u1019\u102c\u101c\u102c",
+  "GP": "\u1002\u103d\u102b\u1012\u102e\u101c\u102f",
+  "GG": "\u1002\u103d\u1014\u103a\u1038\u1007\u102e",
+  "ES": "\u1005\u1015\u102d\u1014\u103a",
+  "SJ": "\u1005\u1017\u102d\u102f\u101c\u103a\u1018\u1010\u103a\u1014\u103e\u1004\u1037\u103a\u1002\u103b\u1014\u103a\u1019\u1031\u101b\u1014\u103a",
+  "KN": "\u1005\u102d\u1014\u1037\u103a\u1000\u1005\u103a\u1014\u103e\u1004\u1037\u103a\u1014\u102e\u1017\u102e\u1005\u103a",
+  "PM": "\u1005\u102d\u1014\u1037\u103a\u1015\u102e\u1021\u1032\u101b\u103a\u1014\u103e\u1004\u1037\u103a \u1019\u102e\u1000\u103d\u102e\u101c\u103d\u1014\u103a",
+  "VC": "\u1005\u102d\u1014\u1037\u103a\u1017\u1004\u103a\u1038\u1006\u1004\u1037\u103a\u1014\u103e\u1004\u1037\u103a \u1002\u101b\u102d\u1014\u1031\u1012\u102d\u102f\u1004\u103a",
+  "BL": "\u1005\u102d\u1014\u1037\u103a\u1018\u102c\u101e\u101a\u103a\u101c\u103a\u1019\u102e",
+  "MF": "\u1005\u102d\u1014\u1037\u103a\u1019\u102c\u1010\u1004\u103a",
+  "LC": "\u1005\u102d\u1014\u1037\u103a\u101c\u1030\u1005\u102e\u101a\u102c",
+  "SH": "\u1005\u102d\u1014\u1037\u103a\u101f\u101a\u103a\u101c\u101a\u103a\u1014\u102c",
+  "SG": "\u1005\u1004\u103a\u1039\u1000\u102c\u1015\u1030",
+  "SX": "\u1005\u1004\u1037\u103a\u1019\u102c\u1010\u1004\u103a",
+  "WS": "\u1006\u1019\u102d\u102f\u1038\u1021\u102c\u1038",
+  "SI": "\u1006\u101c\u102d\u102f\u1017\u1031\u1038\u1014\u102e\u1038\u101a\u102c\u1038",
+  "SK": "\u1006\u101c\u102d\u102f\u1017\u1000\u103a\u1000\u102e\u1038\u101a\u102c\u1038",
+  "RS": "\u1006\u102c\u1038\u1018\u102e\u1038\u101a\u102c\u1038",
+  "SN": "\u1006\u102e\u1014\u102e\u1002\u1031\u102b",
+  "SL": "\u1006\u102e\u101a\u102c\u101b\u102c \u101c\u102e\u101a\u103d\u1014\u103a\u1038",
+  "SY": "\u1006\u102e\u1038\u101b\u102e\u1038\u101a\u102c\u1038",
+  "SD": "\u1006\u1030\u1012\u1014\u103a",
+  "SR": "\u1006\u1030\u101b\u102c\u1014\u1019\u103a",
+  "SC": "\u1006\u1031\u1038\u101b\u103e\u1032",
+  "SA": "\u1006\u1031\u102c\u103a\u1012\u102e\u1021\u102c\u101b\u1031\u1038\u1018\u102e\u1038\u101a\u102c\u1038",
+  "SB": "\u1006\u1031\u102c\u103a\u101c\u1019\u103d\u1014\u103a\u1000\u103b\u103d\u1014\u103a\u1038\u1005\u102f",
+  "SO": "\u1006\u102d\u102f\u1019\u102c\u101c\u102e\u101a\u102c",
+  "CY": "\u1006\u102d\u102f\u1000\u103a\u1015\u101b\u1015\u103a\u1005\u103a",
+  "ST": "\u1006\u1031\u102c\u1004\u103a\u1010\u1030\u1019\u1031\u1038\u1014\u103e\u1004\u1037\u103a \u1015\u101b\u1004\u103a\u1005\u102e\u1015\u102e",
+  "SM": "\u1006\u1014\u103a\u1019\u102c\u101b\u102e\u1014\u102d\u102f",
+  "SZ": "\u1006\u103d\u102c\u1007\u102e\u101c\u1014\u103a",
+  "SE": "\u1006\u103d\u102e\u1012\u1004\u103a",
+  "CH": "\u1006\u103d\u1005\u103a\u1007\u102c\u101c\u1014\u103a",
+  "ZW": "\u1007\u1004\u103a\u1018\u102c\u1018\u103d\u1031",
+  "ZM": "\u1007\u1019\u103a\u1018\u102e\u101a\u102c",
+  "CN": "\u1010\u101b\u102f\u1010\u103a",
+  "TJ": "\u1010\u102c\u1002\u103b\u102e\u1000\u1005\u1039\u1005\u1010\u1014\u103a",
+  "TM": "\u1010\u102c\u1037\u1001\u103a\u1019\u1004\u103a\u1014\u1005\u1039\u1005\u1010\u1014\u103a",
+  "TN": "\u1010\u1030\u1014\u102e\u1038\u101b\u103e\u102c\u1038",
+  "TV": "\u1010\u1030\u1017\u102c\u1038\u101c\u1030",
+  "TR": "\u1010\u1030\u101b\u1000\u102e",
+  "TK": "\u1010\u102d\u102f\u1000\u101c\u1031\u102c\u1004\u103a",
+  "TG": "\u1010\u102d\u102f\u1002\u102d\u102f",
+  "TC": "\u1010\u1001\u103a\u1005\u103a\u1014\u103e\u1004\u1037\u103a\u1000\u102c\u1021\u102e\u1000\u102d\u102f\u1005\u103a\u1000\u103b\u103d\u1014\u103a\u1038\u1005\u102f",
+  "GS": "\u1010\u1031\u102c\u1004\u103a \u1002\u103b\u1031\u102c\u103a\u1002\u103b\u102e\u101a\u102c \u1014\u103e\u1004\u1037\u103a \u1010\u1031\u102c\u1004\u103a \u1006\u1004\u103a\u1038\u1012\u101d\u1005\u103a\u1002\u103b\u103a \u1000\u103b\u103d\u1014\u103a\u1038\u1005\u102f\u1019\u103b\u102c\u1038",
+  "SS": "\u1010\u1031\u102c\u1004\u103a \u1006\u1030\u1012\u1014\u103a",
+  "KR": "\u1010\u1031\u102c\u1004\u103a\u1000\u102d\u102f\u101b\u102e\u1038\u101a\u102c\u1038",
+  "ZA": "\u1010\u1031\u102c\u1004\u103a\u1021\u102c\u1016\u101b\u102d\u1000",
+  "TZ": "\u1010\u1014\u103a\u1007\u1014\u103a\u1038\u1014\u102e\u1038\u101a\u102c\u1038",
+  "TO": "\u1010\u103d\u1014\u103a\u1002\u102b",
+  "TT": "\u1011\u101b\u102e\u1014\u102e\u1012\u1010\u103a\u1014\u103e\u1004\u1037\u103a \u1010\u102d\u102f\u1018\u1000\u103a\u1002\u102d\u102f",
+  "TW": "\u1011\u102d\u102f\u1004\u103a\u101d\u1019\u103a",
+  "TH": "\u1011\u102d\u102f\u1004\u103a\u1038",
+  "DM": "\u1012\u102d\u102f\u1019\u102e\u1014\u102e\u1000\u102c",
+  "DO": "\u1012\u102d\u102f\u1019\u102e\u1014\u102e\u1000\u1014\u103a",
+  "DK": "\u1012\u102d\u1014\u103a\u1038\u1019\u1010\u103a",
+  "NA": "\u1014\u1019\u102e\u1038\u1018\u102e\u1038\u101a\u102c\u1038",
+  "NC": "\u1014\u101a\u1030\u1038 \u1000\u101a\u103a\u101c\u102e\u1012\u102d\u102f\u1014\u102e\u1038\u101a\u102c\u1038",
+  "NZ": "\u1014\u101a\u1030\u1038\u1007\u102e\u101c\u1014\u103a",
+  "NI": "\u1014\u102e\u1000\u102c\u101b\u102c\u1002\u103d\u102b",
+  "NP": "\u1014\u102e\u1015\u1031\u102b",
+  "NU": "\u1014\u102e\u1025\u1030\u1021\u1031",
+  "NF": "\u1014\u1031\u102c\u1016\u102f\u1010\u103a\u1000\u103b\u103d\u1014\u103a\u1038",
+  "NR": "\u1014\u1031\u102c\u103a\u101b\u1030\u1038",
+  "NO": "\u1014\u1031\u102c\u103a\u101d\u1031",
+  "NE": "\u1014\u102d\u102f\u1004\u103a\u1002\u103b\u102c",
+  "NG": "\u1014\u102d\u102f\u1004\u103a\u1002\u103b\u102e\u1038\u101b\u102e\u1038\u101a\u102c\u1038",
+  "NL": "\u1014\u101a\u103a\u101e\u102c\u101c\u1014\u103a",
+  "PA": "\u1015\u1014\u102c\u1038\u1019\u102c\u1038",
+  "PW": "\u1015\u101c\u102c\u1021\u102d\u102f",
+  "PK": "\u1015\u102b\u1000\u1005\u1039\u1005\u1010\u1014\u103a",
+  "PG": "\u1015\u102b\u1015\u1030\u1021\u102c \u1014\u101a\u1030\u1038\u1002\u102e\u1014\u102e",
+  "PY": "\u1015\u102b\u101b\u102c\u1002\u103d\u1031\u1038",
+  "PS": "\u1015\u102b\u101c\u1000\u103a\u1005\u1010\u102d\u102f\u1004\u103a\u1038 \u1015\u102d\u102f\u1004\u103a\u1014\u1000\u103a",
+  "PE": "\u1015\u102e\u101b\u1030\u1038",
+  "PT": "\u1015\u1031\u102b\u103a\u1010\u1030\u1002\u102e",
+  "PR": "\u1015\u1031\u102b\u103a\u1010\u102d\u102f\u101b\u102e\u1000\u102d\u102f",
+  "PL": "\u1015\u102d\u102f\u101c\u1014\u103a",
+  "PN": "\u1015\u1005\u103a\u1010\u103a\u1000\u102d\u1014\u103a\u1038\u1000\u103b\u103d\u1014\u103a\u1038\u1005\u102f",
+  "FR": "\u1015\u103c\u1004\u103a\u101e\u1005\u103a",
+  "GF": "\u1015\u103c\u1004\u103a\u101e\u1005\u103a \u1002\u102e\u101a\u102c\u1014\u102c",
+  "TF": "\u1015\u103c\u1004\u103a\u101e\u1005\u103a \u1010\u1031\u102c\u1004\u103a\u1015\u102d\u102f\u1004\u103a\u1038 \u1015\u102d\u102f\u1004\u103a\u1014\u1000\u103a\u1019\u103b\u102c\u1038",
+  "PF": "\u1015\u103c\u1004\u103a\u101e\u1005\u103a \u1015\u1031\u102b\u103a\u101c\u102e\u1014\u102e\u1038\u101b\u103e\u102c\u1038",
+  "FO": "\u1016\u102c\u101b\u102d\u102f\u1038 \u1000\u103b\u103d\u1014\u103a\u1038\u1005\u102f\u1019\u103b\u102c\u1038",
+  "PH": "\u1016\u102d\u101c\u1005\u103a\u1015\u102d\u102f\u1004\u103a",
+  "FJ": "\u1016\u102e\u1002\u103b\u102e",
+  "FK": "\u1016\u1031\u102c\u1037\u1000\u101c\u1014\u103a \u1000\u103b\u103d\u1014\u103a\u1038\u1005\u102f",
+  "FI": "\u1016\u1004\u103a\u101c\u1014\u103a",
+  "VU": "\u1017\u1014\u103d\u102c\u1038\u1010\u1030",
+  "CF": "\u1017\u101f\u102d\u102f \u1021\u102c\u1016\u101b\u102d\u1000 \u1015\u103c\u100a\u103a\u1011\u1031\u102c\u1004\u103a\u1005\u102f",
+  "VA": "\u1017\u102c\u1010\u102e\u1000\u1014\u103a\u1005\u102e\u1038\u1010\u102e\u1038",
+  "VN": "\u1017\u102e\u101a\u1000\u103a\u1014\u1019\u103a",
+  "VE": "\u1017\u1004\u103a\u1014\u102e\u1007\u103d\u1032\u101c\u102c\u1038",
+  "VG": "\u1017\u103c\u102d\u1010\u102d\u101e\u103b\u103e \u1017\u102c\u1002\u103b\u1004\u103a\u1038 \u1000\u103b\u103d\u1014\u103a\u1038\u1005\u102f",
+  "IO": "\u1017\u103c\u102d\u1010\u102d\u101e\u103b\u103e\u1015\u102d\u102f\u1004\u103a \u1021\u102d\u1014\u1039\u1012\u102d\u101a\u101e\u1019\u102f\u1012\u1039\u1012\u101b\u102c\u1000\u103b\u103d\u1014\u103a\u1038\u1019\u103b\u102c\u1038",
+  "BR": "\u1018\u101b\u102c\u1007\u102e\u1038",
+  "BN": "\u1018\u101b\u1030\u1014\u102d\u102f\u1004\u103a\u1038",
+  "BZ": "\u1018\u101c\u102d\u1007\u103a",
+  "BS": "\u1018\u101f\u102c\u1038\u1019\u102c\u1038",
+  "BF": "\u1018\u102c\u1000\u102e\u1038\u1014\u102c\u1038 \u1016\u102c\u1038\u1006\u102d\u102f",
+  "BB": "\u1018\u102c\u1018\u1031\u1038\u1012\u102d\u102f\u1038\u1005\u103a",
+  "BM": "\u1018\u102c\u1019\u103c\u1030\u1012\u102b",
+  "BH": "\u1018\u102c\u101b\u102d\u1014\u103a\u1038",
+  "BJ": "\u1018\u102e\u1014\u1004\u103a",
+  "BY": "\u1018\u102e\u101c\u102c\u101b\u102f\u1005\u103a",
+  "BT": "\u1018\u1030\u1010\u1014\u103a",
+  "BV": "\u1018\u1030\u1017\u1000\u103a\u1000\u103b\u103d\u1014\u103a\u1038",
+  "BI": "\u1018\u1030\u101b\u103d\u1014\u103a\u1012\u102e",
+  "BG": "\u1018\u1030\u101c\u103a\u1002\u1031\u1038\u101b\u102e\u1038\u101a\u102c\u1038",
+  "BA": "\u1018\u1031\u102c\u1037\u1005\u1014\u102e\u1038\u101a\u102c\u1038\u1014\u103e\u1004\u1037\u103a \u101f\u102c\u1007\u102e\u1002\u102d\u102f\u1017\u102e\u1014\u102c\u1038",
+  "BW": "\u1018\u1031\u102c\u1037\u1006\u103d\u102c\u1014\u102c",
+  "BO": "\u1018\u102d\u102f\u101c\u102e\u1038\u1017\u102e\u1038\u101a\u102c\u1038",
+  "BD": "\u1018\u1004\u103a\u1039\u1002\u101c\u102c\u1038\u1012\u1031\u1037\u101b\u103e\u103a",
+  "BE": "\u1018\u101a\u103a\u101c\u103a\u1002\u103b\u102e\u101a\u1019\u103a",
+  "MO": "\u1019\u1000\u102c\u1021\u102d\u102f (\u1010\u101b\u102f\u1010\u103a\u1015\u103c\u100a\u103a)",
+  "MG": "\u1019\u1012\u102b\u1002\u1010\u103a\u1005\u1000\u102c\u1038",
+  "MY": "\u1019\u101c\u1031\u1038\u101b\u103e\u102c\u1038",
+  "MQ": "\u1019\u102c\u1010\u102e\u1014\u102d\u1001\u103a",
+  "MH": "\u1019\u102c\u101b\u103e\u101a\u103a \u1000\u103b\u103d\u1014\u103a\u1038\u1005\u102f",
+  "MW": "\u1019\u102c\u101c\u102c\u101d\u102e",
+  "ML": "\u1019\u102c\u101c\u102e",
+  "YT": "\u1019\u1031\u101a\u1031\u102c\u1037",
+  "MU": "\u1019\u1031\u102c\u101b\u1005\u103a\u101b\u103e",
+  "MS": "\u1019\u1031\u102c\u1004\u1037\u103a\u1005\u1032\u101b\u1000\u103a",
+  "MR": "\u1019\u1031\u102c\u103a\u101b\u102e\u1010\u1031\u1038\u1014\u102e\u1038\u101a\u102c\u1038",
+  "MA": "\u1019\u1031\u102c\u103a\u101b\u102d\u102f\u1000\u102d\u102f",
+  "MV": "\u1019\u1031\u102c\u103a\u101c\u103a\u1012\u102d\u102f\u1000\u103a",
+  "MZ": "\u1019\u102d\u102f\u1007\u1019\u103a\u1018\u1005\u103a",
+  "MC": "\u1019\u102d\u102f\u1014\u102c\u1000\u102d\u102f",
+  "MX": "\u1019\u1000\u103a\u1000\u1006\u102e\u1000\u102d\u102f",
+  "FM": "\u1019\u102d\u102f\u1004\u103a\u1001\u101b\u102d\u102f\u1014\u102e\u101b\u103e\u102c\u1038",
+  "IM": "\u1019\u1014\u103a\u1000\u103b\u103d\u1014\u103a\u1038",
+  "MT": "\u1019\u1031\u102c\u101c\u103a\u1010\u102c",
+  "MD": "\u1019\u1031\u102c\u101c\u103a\u1012\u102d\u102f\u1017\u102c",
+  "MK": "\u1019\u103c\u1031\u102c\u1000\u103a \u1019\u1000\u103a\u1006\u102e\u1012\u102d\u102f\u1038\u1014\u102e\u1038\u101a\u102c\u1038",
+  "KP": "\u1019\u103c\u1031\u102c\u1000\u103a\u1000\u102d\u102f\u101b\u102e\u1038\u101a\u102c\u1038",
+  "MP": "\u1019\u103c\u1031\u102c\u1000\u103a\u1015\u102d\u102f\u1004\u103a\u1038\u1019\u102c\u101b\u102e\u1021\u102c\u1014\u102c\u1000\u103b\u103d\u1014\u103a\u1038\u1005\u102f",
+  "MM": "\u1019\u103c\u1014\u103a\u1019\u102c",
+  "MN": "\u1019\u103d\u1014\u103a\u1002\u102d\u102f\u1038\u101c\u102e\u1038\u101a\u102c\u1038",
+  "ME": "\u1019\u103d\u1014\u103a\u1010\u102e\u1014\u102d\u1002\u101b\u102d\u102f\u1038",
+  "YE": "\u101a\u102e\u1019\u1004\u103a",
+  "UA": "\u101a\u1030\u1000\u101b\u102d\u1014\u103a\u1038",
+  "UG": "\u101a\u1030\u1002\u1014\u103a\u1038\u1012\u102b\u1038",
+  "GB": "\u101a\u1030\u1014\u102d\u102f\u1000\u103a\u1010\u1000\u103a\u1000\u1004\u103a\u1038\u1012\u1019\u103a\u1038",
+  "UM": "\u101a\u1030\u1014\u102d\u102f\u1000\u103a\u1010\u1000\u103a\u1005\u1010\u102d\u1010\u103a \u1000\u103b\u103d\u1014\u103a\u1038\u1014\u102d\u102f\u1004\u103a\u1004\u1036\u1019\u103b\u102c\u1038",
+  "AE": "\u101a\u1030\u1021\u1031\u1021\u102e\u1038",
+  "VI": "\u101a\u1030\u1021\u1000\u103a\u1005\u103a \u1017\u102c\u1002\u103b\u1004\u103a\u1038 \u1000\u103b\u103d\u1014\u103a\u1038\u1005\u102f",
+  "RW": "\u101b\u101d\u1014\u103a\u1012\u102b",
+  "RE": "\u101b\u102e\u101a\u1030\u1014\u102e\u101a\u1014\u103a",
+  "RU": "\u101b\u102f\u101b\u103e\u102c\u1038",
+  "RO": "\u101b\u102d\u102f\u1019\u1031\u1038\u1014\u102e\u1038\u101a\u102c\u1038",
+  "LA": "\u101c\u102c\u1021\u102d\u102f",
+  "LS": "\u101c\u102e\u1006\u102d\u102f\u101e\u102d\u102f",
+  "LU": "\u101c\u1030\u1007\u1004\u103a\u1018\u1010\u103a",
+  "LB": "\u101c\u1000\u103a\u1018\u1014\u103d\u1014\u103a",
+  "LR": "\u101c\u102d\u102f\u1000\u103a\u1018\u1031\u1038\u101b\u102e\u1038\u101a\u102c\u1038",
+  "LI": "\u101c\u1005\u103a\u1010\u1014\u103a\u1005\u1010\u102d\u1014\u103a\u1038",
+  "LY": "\u101c\u1005\u103a\u1017\u103b\u102c\u1038",
+  "LT": "\u101c\u1005\u103a\u101e\u1030\u101a\u1031\u1038\u1014\u102e\u1038\u101a\u102c\u1038",
+  "LV": "\u101c\u1010\u103a\u1017\u102e\u1038\u101a\u102c\u1038",
+  "WF": "\u101d\u1031\u102b\u101c\u1005\u103a\u1014\u103e\u1004\u1037\u103a \u1016\u1030\u1000\u103b\u1030\u1038\u1014\u102c\u1038",
+  "LK": "\u101e\u102e\u101b\u102d\u101c\u1004\u103a\u1039\u1000\u102c",
+  "HT": "\u101f\u1031\u1010\u102e",
+  "HK": "\u101f\u1031\u102c\u1004\u103a\u1000\u1031\u102c\u1004\u103a (\u1010\u101b\u102f\u1010\u103a\u1015\u103c\u100a\u103a)",
+  "HM": "\u101f\u1010\u103a\u1000\u103b\u103d\u1014\u103a\u1038\u1014\u103e\u1004\u1037\u103a\u1019\u1000\u103a\u1012\u1031\u102b\u1014\u101a\u103a\u1000\u103b\u103d\u1014\u103a\u1038\u1005\u102f",
+  "HU": "\u101f\u1014\u103a\u1002\u1031\u101b\u102e",
+  "HN": "\u101f\u103d\u1014\u103a\u1012\u1030\u1038\u101b\u1015\u103a\u1005\u103a",
+  "AZ": "\u1021\u1007\u102c\u1018\u102d\u102f\u1004\u103a\u1002\u103b\u1014\u103a",
+  "EH": "\u1021\u1014\u1031\u102c\u1000\u103a \u1006\u102c\u101f\u102c\u101b",
+  "AS": "\u1021\u1019\u1031\u101b\u102d\u1000\u1014\u103a \u1006\u1019\u102d\u102f\u1038\u1021\u102c\u1038",
+  "US": "\u1021\u1019\u1031\u101b\u102d\u1000\u1014\u103a \u1015\u103c\u100a\u103a\u1011\u1031\u102c\u1004\u103a\u1005\u102f",
+  "TL": "\u1021\u101b\u103e\u1031\u1037\u1010\u102e\u1019\u1031\u102c",
+  "AR": "\u1021\u102c\u1002\u103b\u1004\u103a\u1010\u102e\u1038\u1014\u102c\u1038",
+  "AF": "\u1021\u102c\u1016\u1002\u1014\u103a\u1014\u1005\u1039\u1005\u1010\u1014\u103a",
+  "AM": "\u1021\u102c\u1019\u1031\u1038\u1014\u102e\u1038\u101a\u102c\u1038",
+  "AW": "\u1021\u102c\u101b\u1030\u1038\u1017\u102c\u1038",
+  "AX": "\u1021\u102c\u101c\u1014\u103a\u1000\u103b\u103d\u1014\u103a\u1038",
+  "GQ": "\u1021\u102e\u1000\u103d\u1031\u1010\u102c \u1002\u102e\u1014\u102e",
+  "EC": "\u1021\u102e\u1000\u103d\u1031\u1012\u1031\u102b",
+  "EG": "\u1021\u102e\u1002\u103b\u1005\u103a",
+  "IT": "\u1021\u102e\u1010\u101c\u102e",
+  "ER": "\u1021\u102e\u101b\u102e\u1011\u101b\u102e\u1038\u101a\u102c\u1038",
+  "IQ": "\u1021\u102e\u101b\u1010\u103a",
+  "IR": "\u1021\u102e\u101b\u1014\u103a",
+  "ET": "\u1021\u102e\u101e\u102e\u101a\u102d\u102f\u1038\u1015\u102e\u1038\u101a\u102c\u1038",
+  "UZ": "\u1025\u1007\u1018\u1000\u103a\u1000\u1005\u1039\u1005\u1010\u1014\u103a",
+  "UY": "\u1025\u101b\u102f\u1002\u103d\u1031\u1038",
+  "AT": "\u1029\u1005\u1010\u103c\u102e\u1038\u101a\u102c\u1038",
+  "AU": "\u1029\u1005\u1010\u103c\u1031\u1038\u101c\u103b",
+  "OM": "\u1021\u102d\u102f\u1019\u1014\u103a",
+  "EE": "\u1021\u1000\u103a\u1005\u1010\u102d\u102f\u1038\u1014\u102e\u1038\u101a\u102c\u1038",
+  "IS": "\u1021\u102d\u102f\u1000\u103a\u1005\u101c\u1014\u103a",
+  "ID": "\u1021\u1004\u103a\u1012\u102d\u102f\u1014\u102e\u1038\u101b\u103e\u102c\u1038",
+  "IE": "\u1021\u102d\u102f\u1004\u103a\u101a\u102c\u101c\u1014\u103a",
+  "IL": "\u1021\u1005\u1039\u1005\u101b\u1031\u1038",
+  "AI": "\u1021\u1014\u103a\u1002\u102e\u101c\u102c",
+  "AO": "\u1021\u1014\u103a\u1002\u102d\u102f\u101c\u102c",
+  "AQ": "\u1021\u1014\u103a\u1010\u102c\u1010\u102d\u1000",
+  "AG": "\u1021\u1014\u103a\u1010\u102e\u1002\u103d\u102b\u1014\u103e\u1004\u1037\u103a \u1018\u102c\u1018\u1030\u1012\u102b",
+  "AD": "\u1021\u1014\u103a\u1012\u102d\u102f\u101b\u102c",
+  "IN": "\u1021\u102d\u1014\u1039\u1012\u102d\u101a",
+  "DZ": "\u1021\u101a\u103a\u101c\u103a\u1002\u103b\u102e\u1038\u101b\u102e\u1038\u101a\u102c\u1038",
+  "SV": "\u1021\u101a\u103a\u101c\u103a\u1006\u102c\u1017\u1031\u1038\u1012\u102d\u102f\u1038",
+  "AL": "\u1021\u101a\u103a\u101c\u103a\u1018\u1031\u1038\u1014\u102e\u1038\u101a\u102c\u1038"
+}
diff --git a/public/intl/language/my-MM.json b/public/intl/language/my-MM.json
new file mode 100644
index 000000000..e853cde4a
--- /dev/null
+++ b/public/intl/language/my-MM.json
@@ -0,0 +1,611 @@
+{
+  "kac": "\u1000\u1001\u103b\u1004\u103a",
+  "fr_CA": "\u1000\u1014\u1031\u1012\u102b \u1015\u103c\u1004\u103a\u101e\u1005\u103a",
+  "en_CA": "\u1000\u1014\u1031\u1012\u102b \u1021\u1004\u103a\u1039\u1002\u101c\u102d\u1015\u103a",
+  "ca": "\u1000\u102c\u1010\u102c\u101c\u1014\u103a",
+  "koi": "\u1000\u102d\u102f\u1019\u102e-\u1015\u102b\u1019\u103c\u1000\u103a",
+  "ko": "\u1000\u102d\u102f\u1038\u101b\u102e\u1038\u101a\u102c\u1038",
+  "ks": "\u1000\u1000\u103a\u101b\u103e\u103a\u1019\u102e\u101b\u102e",
+  "rw": "\u1000\u1004\u103a\u101b\u102c\u101d\u1014\u103a\u1012\u102b",
+  "ku": "\u1000\u1012\u103a",
+  "kn": "\u1000\u1014\u1039\u1014\u102c\u1012\u102b",
+  "kok": "\u1000\u103d\u1014\u103a\u1000\u1014\u102e",
+  "kg": "\u1000\u103d\u1014\u103a\u1002\u102d\u102f",
+  "kea": "\u1001\u1018\u1030\u1017\u102c\u1012\u102e\u1021\u102c\u1014\u1030",
+  "kab": "\u1001\u1018\u102d\u102f\u1004\u103a\u101c\u103a",
+  "km": "\u1001\u1019\u102c",
+  "cr": "\u1001\u101b\u102e\u1038",
+  "ky": "\u1001\u101b\u1030\u1002\u1005\u103a",
+  "hr": "\u1001\u101b\u102d\u102f\u1021\u1031\u101b\u103e\u1014\u103a",
+  "kl": "\u1001\u101c\u102c\u1021\u103a\u101c\u102e\u1006\u1015\u103a",
+  "kha": "\u1001\u102b\u1005\u102e",
+  "kk": "\u1001\u102b\u1007\u102b\u1001\u103a",
+  "kln": "\u1001\u102b\u101c\u102d\u1019\u103a\u1002\u103b\u1004\u103a",
+  "ki": "\u1001\u102e\u1001\u1030\u101a\u1030",
+  "quc": "\u1001\u102e\u1001\u103a\u1021\u102e\u1001\u103b\u102e",
+  "co": "\u1001\u102d\u102f\u1005\u102e\u1000\u1014\u103a",
+  "kw": "\u1001\u102d\u102f\u1014\u102e\u101b\u103e\u103a",
+  "khq": "\u1001\u102d\u102f\u101b\u102c \u1001\u103b\u102e\u1021\u102e\u1014\u102e",
+  "ses": "\u1001\u102d\u102f\u101b\u102c\u1018\u102d\u102f\u101b\u102d\u102f \u1006\u1019\u103a\u1014\u102e",
+  "qu": "\u1001\u1000\u103a\u1001\u103b\u103a\u101d\u102b",
+  "kam": "\u1001\u1019\u103a\u1018\u102c",
+  "sms": "\u1001\u102d\u102f\u101c\u103a \u1006\u102c\u1019\u102d",
+  "chr": "\u1001\u103b\u102c\u101b\u102d\u102f\u1000\u102e",
+  "cgg": "\u1001\u103b\u102e\u1002\u102b",
+  "ce": "\u1001\u103b\u1031\u1001\u103b\u1004\u103a\u1038",
+  "cs": "\u1001\u103b\u1000\u103a",
+  "swc": "\u1001\u103d\u1014\u103a\u1002\u102d\u102f \u1005\u103d\u102c\u101f\u102e\u101c\u102e",
+  "el": "\u1002\u101b\u102d",
+  "gag": "\u1002\u102b\u1002\u102b\u1007\u103a",
+  "gl": "\u1002\u102b\u101c\u102c\u1005\u102e\u101a\u1036",
+  "gu": "\u1002\u1030\u1002\u103b\u102c\u101b\u101e\u102e",
+  "guz": "\u1002\u1030\u1005\u102e\u1038",
+  "gn": "\u1002\u1030\u1021\u102c\u101b\u102c\u1014\u102e",
+  "lg": "\u1002\u1014\u103a\u1012\u102e",
+  "ja": "\u1002\u103b\u1015\u1014\u103a",
+  "jv": "\u1002\u103b\u102c\u1017\u102c\u1038\u1014\u102e\u1038\u1005\u103a",
+  "de": "\u1002\u103b\u102c\u1019\u1014\u103a",
+  "jpr": "\u1002\u103b\u1030\u1012\u102e\u101a\u102d\u102f-\u1015\u102b\u101b\u103e\u1014\u103a",
+  "jrb": "\u1002\u103b\u1030\u1012\u102e\u101a\u102d\u102f-\u1021\u102c\u101b\u1031\u1017\u103b",
+  "ka": "\u1002\u103b\u1031\u102c\u103a\u1002\u103b\u102e\u101a\u1014\u103a",
+  "dyo": "\u1002\u103b\u102d\u102f\u101c\u102c-\u1016\u103d\u1014\u103a\u101b\u102e",
+  "jgo": "\u1002\u103d\u1019\u103a\u1018\u102c",
+  "sco": "\u1005\u1000\u1031\u102c\u1037",
+  "es": "\u1005\u1015\u102d\u1014\u103a",
+  "es_ES": "\u1005\u1015\u102d\u1014\u103a(\u1025\u101b\u1031\u102c\u1015)",
+  "sl": "\u1005\u101c\u102d\u102f\u1017\u1031\u1038\u1014\u102e\u1038\u101a\u1019\u103a\u1038",
+  "sk": "\u1005\u101c\u102d\u102f\u1017\u1000\u103a",
+  "ii": "\u1005\u102e\u1001\u103b\u103d\u1019\u103a \u101b\u102e",
+  "seh": "\u1005\u102e\u1014\u102c",
+  "sd": "\u1005\u1004\u103a\u1012\u102e",
+  "sr": "\u1006\u102c\u1038\u1017\u102e\u1038\u101a\u1014\u103a\u1038",
+  "su": "\u1006\u1030\u1012\u1014\u103a",
+  "xog": "\u1006\u102d\u102f\u1002\u102b",
+  "so": "\u1006\u102d\u102f\u1019\u102c\u101c\u102e",
+  "ckb": "\u1006\u102d\u102f\u101b\u102c\u1014\u102e \u1000\u1030\u1012\u1005\u103a\u101b\u103e\u103a",
+  "si": "\u1006\u1004\u103a\u101f\u102c\u101c",
+  "sbp": "\u1006\u1014\u103a\u1002\u102f",
+  "saq": "\u1006\u1014\u103a\u1018\u1030\u101b\u102f",
+  "sg": "\u1006\u1019\u103a\u1002\u102d\u102f",
+  "sw": "\u1006\u103c\u102c\u101f\u102e\u101c\u102e",
+  "sv": "\u1006\u103d\u102e\u1012\u1004\u103a",
+  "gsw": "\u1006\u103d\u1005\u103a \u1002\u103b\u102c\u1019\u1014\u103a",
+  "fr_CH": "\u1006\u103d\u1005\u103a \u1015\u103c\u1004\u103a\u101e\u1005\u103a",
+  "de_CH": "\u1006\u103d\u1005\u103a \u1021\u1019\u103c\u1004\u1037\u103a \u1002\u103b\u102c\u1019\u1014\u103a",
+  "dje": "\u1007\u102c\u1019\u102c",
+  "zu": "\u1007\u1030\u101c\u1030",
+  "xh": "\u1007\u102d\u102f\u1005\u102c",
+  "tt": "\u1010\u1010\u102c",
+  "ta": "\u1010\u1019\u102e\u1038\u101c\u103a",
+  "zh": "\u1010\u101b\u102f\u1010\u103a",
+  "tr": "\u1010\u102c\u1000\u1005\u103a",
+  "shi": "\u1010\u102c\u1001\u103b\u101a\u103a\u101c\u103a\u101f\u1005\u103a",
+  "tg": "\u1010\u102c\u1002\u103d\u102e\u1001\u103a",
+  "twq": "\u1010\u102c\u1006\u102c\u101d\u102b\u1001\u103a",
+  "bo": "\u1010\u102d\u1018\u1000\u103a",
+  "teo": "\u1010\u102e\u1006\u102d\u102f",
+  "te": "\u1010\u102e\u101c\u102e\u1002\u102f",
+  "ti": "\u1010\u102e\u1002\u103a\u101b\u1004\u103a\u101b\u102c",
+  "tk": "\u1010\u1001\u1039\u1019\u1004\u103a",
+  "se": "\u1010\u1031\u102c\u1004\u103a\u1006\u102c\u1019\u102d",
+  "nd": "\u1010\u1031\u102c\u1004\u103a\u1012\u102e\u1018\u102e\u101c\u102e",
+  "sma": "\u1010\u1031\u102c\u1004\u103a\u1015\u102d\u102f\u1004\u103a\u1038 \u1006\u102c\u1019\u102d",
+  "dav": "\u1010\u102d\u102f\u1004\u103a\u1010\u102c",
+  "to": "\u1010\u103d\u1014\u103a\u1002\u102b",
+  "th": "\u1011\u102d\u102f\u1004\u103a\u1038",
+  "dak": "\u1012\u102b\u1000\u102d\u102f\u1010\u102c",
+  "del": "\u1012\u102e\u101c\u102c\u101d\u1032",
+  "dua": "\u1012\u1030\u1021\u101c\u102c",
+  "nl": "\u1012\u1010\u103a\u1001\u103b\u103a",
+  "da": "\u1012\u102d\u1014\u103a\u1038\u1019\u1010\u103a",
+  "dz": "\u1012\u103d\u1014\u103a\u1000\u102c",
+  "nqo": "\u1014\u1000\u102d\u102f",
+  "naq": "\u1014\u102c\u1019\u102c",
+  "ne": "\u1014\u102e\u1015\u102b\u101c\u102e",
+  "nus": "\u1014\u1030\u1021\u102c",
+  "no": "\u1014\u1031\u102c\u103a\u101d\u1031\u1038",
+  "nn": "\u1014\u1031\u102c\u103a\u101d\u1031\u1038 \u1014\u102e\u1038\u1014\u1031\u102c\u103a\u1005\u103a\u1001\u103a",
+  "fa": "\u1015\u102b\u101b\u103e\u1014\u103a",
+  "peo": "\u1015\u102b\u101b\u103e\u1014\u103a \u1021\u101f\u1031\u102c\u1004\u103a\u1038",
+  "ps": "\u1015\u102b\u101b\u103e\u103a\u1010\u102d\u102f",
+  "pi": "\u1015\u102b\u1020\u102d",
+  "pt": "\u1015\u1031\u102b\u103a\u1010\u1030\u1002\u102e",
+  "pl": "\u1015\u102d\u102f\u101c\u1014\u103a",
+  "pa": "\u1015\u1014\u103a\u1001\u103b\u102c\u1015\u102e",
+  "fr": "\u1015\u103c\u1004\u103a\u101e\u1005\u103a",
+  "fro": "\u1015\u103c\u1004\u103a\u101e\u1005\u103a\u101f\u1031\u102c\u1004\u103a\u1038",
+  "nl_BE": "\u1016\u101c\u102e\u1019\u1005\u103a\u101b\u103e\u103a",
+  "fo": "\u1016\u102c\u101b\u102d\u102f\u1021\u102d\u1005\u103a",
+  "fil": "\u1016\u102d\u101c\u1005\u103a\u1015\u102e\u1014\u102d\u102f",
+  "fj": "\u1016\u102e\u1002\u103b\u102e",
+  "fi": "\u1016\u1004\u103a\u1014\u1005\u103a\u101b\u103e\u103a",
+  "my": "\u1017\u1019\u102c",
+  "vi": "\u1017\u102e\u101a\u1000\u103a\u1014\u1019\u103a",
+  "brx": "\u1017\u102d\u102f\u1012\u102d\u102f",
+  "vai": "\u1017\u102d\u102f\u1004\u103a",
+  "vun": "\u1017\u1014\u103a\u1002\u103b\u102d\u102f",
+  "en_GB": "\u1017\u103c\u102d\u1010\u102d\u101e\u103b\u103e \u1021\u1004\u103a\u1039\u1002\u101c\u102d\u1015\u103a",
+  "pt_BR": "\u1018\u101b\u102c\u1007\u102e\u1038 \u1015\u1031\u102b\u103a\u1010\u1030\u1002\u102e",
+  "br": "\u1018\u101b\u102e\u1010\u103d\u1014\u103a",
+  "bas": "\u1018\u102c\u1006\u102c",
+  "ksf": "\u1018\u102c\u1016\u102e\u1021\u102c",
+  "ban": "\u1018\u102c\u101c\u102e",
+  "zxx": "\u1018\u102c\u101e\u102c\u1005\u1000\u102c\u1038 \u1014\u103e\u1004\u1037\u103a \u1015\u1010\u103a\u101e\u1000\u103a \u101e\u1031\u102c\u1021\u101b\u102c\u1019\u101b\u103e\u102d",
+  "bez": "\u1018\u102e\u1014\u102c",
+  "be": "\u1018\u102e\u101c\u102c\u101b\u102f",
+  "bg": "\u1018\u1030\u1002\u1031\u1038\u101b\u102e\u1038\u101a\u102c\u1038",
+  "bs": "\u1018\u1031\u102c\u1037\u1005\u103a\u1014\u102e\u1038\u101a\u102c\u1038",
+  "ba": "\u1018\u1000\u103a\u101b\u103e\u103a\u1000\u102e\u1021\u102c",
+  "bn": "\u1018\u1004\u103a\u1039\u1002\u102b\u101c\u102e",
+  "eu": "\u1018\u1005\u103a\u1000\u1039\u1000\u102e",
+  "bm": "\u1018\u1014\u103a\u1018\u102c\u101b\u102c",
+  "bem": "\u1018\u102d\u1014\u103a\u1018\u102c",
+  "nb": "\u1018\u103d\u1010\u103a\u1019\u1031\u102c\u103a\u101c\u103a",
+  "jmc": "\u1019\u1001\u103b\u102c\u1019\u102e",
+  "ms": "\u1019\u101c\u1031\u1038",
+  "ml": "\u1019\u101c\u1031\u1038\u101b\u102c\u101c\u1019\u103a",
+  "und": "\u1019\u101e\u102d \u101e\u102d\u102f\u1037\u1019\u101f\u102f\u1010\u103a \u1019\u101b\u103e\u102d \u101e\u1031\u102c \u1018\u102c\u101e\u102c\u1005\u1000\u102c\u1038",
+  "mgh": "\u1019\u102c\u1001\u1030\u101d\u102b-\u1019\u102e\u1021\u102e\u1010\u102d\u102f",
+  "kde": "\u1019\u102c\u1001\u103d\u1014\u103a\u1012\u102e",
+  "mk": "\u1019\u102c\u1005\u102e\u1012\u102d\u102f\u1014\u102e\u101a\u1036",
+  "mas": "\u1019\u102c\u1006\u102d\u102f\u1004\u103a",
+  "arn": "\u1019\u102c\u1015\u102f\u1001\u103b\u102e",
+  "mr": "\u1019\u102c\u101b\u101e\u102e",
+  "mgo": "\u1019\u102e\u1010\u102c",
+  "mer": "\u1019\u102e\u101b\u102f",
+  "root": "\u1019\u1030\u101c\u101b\u1004\u103a\u1038\u1019\u103c\u1005\u103a",
+  "zgh": "\u1019\u102d\u102f\u101b\u102d\u102f\u1000\u1014\u103a \u1010\u103d\u1019\u103a\u1019\u1007\u102d\u102f\u1010\u103a \u1005\u1036",
+  "mfe": "\u1019\u102d\u102f\u101b\u103e\u102e\u1005\u103a\u101a\u1014\u103a\u1038",
+  "moh": "\u1019\u102d\u102f\u101f\u1031\u102c\u1037\u1001\u103a",
+  "mi": "\u1019\u1031\u102c\u1004\u103a\u1038\u101b\u102e (\u1014\u101a\u1030\u1038\u1007\u102e\u101c\u1014\u103a\u1000\u103b\u103d\u1014\u103a\u1038\u101b\u103e\u102d \u1015\u1004\u103a\u101b\u1004\u103a\u1038\u1010\u102d\u102f\u1004\u103a\u1038\u101b\u1004\u103a\u1038\u101e\u102c\u1038\u101c\u1030\u1019\u103b\u102d\u102f\u1038)",
+  "mnc": "\u1019\u1014\u103a\u1001\u103b\u1030\u1038",
+  "mua": "\u1019\u1014\u103a\u1012\u1014\u103a\u1038",
+  "gv": "\u1019\u1014\u103a\u1038\u1007\u103a",
+  "mt": "\u1019\u1031\u102c\u101c\u1039\u1010\u102e\u1005\u103a",
+  "frr": "\u1019\u103c\u1031\u102c\u1000\u103a\u1015\u102d\u102f\u1004\u103a\u1038 \u1016\u101b\u102e\u1005\u102e\u101b\u1014\u103a",
+  "mn": "\u1019\u103d\u1014\u103a\u1002\u102d\u102f\u101c\u102e\u1038\u101a\u1014\u103a\u1038",
+  "uk": "\u101a\u1030\u1000\u101b\u102d\u1014\u103a\u1038",
+  "nyn": "\u101a\u1014\u103a\u1000\u102d\u102f\u101c\u102e",
+  "ru": "\u101b\u102f\u101b\u103e",
+  "rm": "\u101b\u1031\u102c\u1019",
+  "ro": "\u101b\u102d\u102f\u1019\u1031\u1014\u102e\u101a\u102c\u1038",
+  "yo": "\u101b\u102d\u102f\u101b\u102f\u1018\u102c",
+  "zh_Hans": "\u101b\u102d\u102f\u1038\u101b\u103e\u1004\u103a\u1038\u101e\u1031\u102c \u1010\u101b\u102f\u1010\u103a",
+  "rn": "\u101b\u103d\u1014\u103a\u1012\u102e",
+  "rof": "\u101b\u103d\u1019\u103a\u1018\u102d\u102f",
+  "sn": "\u101b\u103e\u102d\u1014\u102c",
+  "zh_Hant": "\u101b\u103e\u1031\u1038\u101b\u102d\u102f\u1038\u1005\u1009\u103a\u101c\u102c \u1010\u101b\u102f\u1010\u103a",
+  "grc": "\u101b\u103e\u1031\u1038\u101f\u1031\u102c\u1004\u103a\u1038 \u1002\u101b\u102d",
+  "egy": "\u101b\u103e\u1031\u1038\u101f\u1031\u102c\u1004\u103a\u1038 \u1021\u102e\u1002\u103b\u1005\u103a",
+  "ksb": "\u101b\u103e\u1014\u103a\u1018\u102c\u101c\u102c",
+  "shn": "\u101b\u103e\u1019\u103a\u1038",
+  "lkt": "\u101c\u102c\u1000\u102d\u102f\u1010\u102c",
+  "lo": "\u101c\u102c\u1021\u102d\u102f",
+  "lb": "\u101c\u1030\u1007\u1004\u103a\u1018\u1010\u103a\u1000\u103a",
+  "lu": "\u101c\u1030\u1018\u102c-\u1001\u102b\u1010\u1014\u103a\u1002\u102b",
+  "luy": "\u101c\u1030\u101b\u102e\u1021\u102c",
+  "smj": "\u101c\u1030\u101c\u102e \u1006\u102c\u1019\u102d",
+  "luo": "\u101c\u1030\u1021\u102d\u102f",
+  "la": "\u101c\u1000\u103a\u1010\u1004\u103a",
+  "es_419": "\u101c\u1000\u103a\u1010\u1004\u103a\u1021\u1019\u1031\u101b\u102d\u1000 \u1005\u1015\u102d\u1014\u103a",
+  "lv": "\u101c\u1000\u1039\u1018\u102e\u1021\u1036",
+  "ln": "\u101c\u1004\u103a\u1002\u102b\u101c\u102c",
+  "lt": "\u101c\u1005\u1039\u101e\u1030\u1021\u102c\u1014\u102e\u101a\u1036",
+  "lag": "\u101c\u1014\u103a\u1002\u102e",
+  "rwk": "\u101d\u102b",
+  "nmg": "\u101d\u102b\u1006\u102e\u1021\u102d\u102f",
+  "ee": "\u101d\u102e",
+  "ug": "\u101d\u102e\u1002\u102b",
+  "wo": "\u101d\u1030\u101c\u102d\u102f\u1016\u103a",
+  "cy": "\u101d\u1031\u101c",
+  "sa": "\u101e\u1004\u103a\u1039\u101e\u1000\u101b\u102d\u102f\u1000\u103a",
+  "haw": "\u101f\u102c\u101d\u1031\u101a\u1036",
+  "ht": "\u101f\u102c\u1021\u102e\u1010\u102e\u1021\u1014\u103a",
+  "ha": "\u101f\u102c\u1025\u1005\u102c",
+  "he": "\u101f\u102e\u1038\u1018\u101b\u1030\u1038",
+  "hu": "\u101f\u1014\u103a\u1002\u1031\u101b\u102e",
+  "hi": "\u101f\u102d\u1014\u1039\u1012\u102e",
+  "mul": "\u1021\u1000\u103c\u102d\u1019\u103a\u1019\u103b\u102c\u1038\u1005\u103d\u102c \u1018\u102c\u101e\u102c\u1005\u1000\u102c\u1038\u1019\u103b\u102c\u1038",
+  "fy": "\u1021\u1014\u1031\u102c\u1000\u103a\u1015\u102d\u102f\u1004\u103a\u1038 \u1016\u101b\u102e\u1005\u102e\u101b\u1014\u103a",
+  "nds": "\u1021\u1014\u102d\u1019\u1037\u103a \u1002\u103b\u102c\u1019\u1014\u103a",
+  "hsb": "\u1021\u1015\u1031\u102b\u103a\u1006\u102d\u102f\u1018\u102e\u1021\u1019\u103a",
+  "en_US": "\u1021\u1019\u1031\u101b\u102d\u1000\u1014\u103a \u1021\u1004\u103a\u1039\u1002\u101c\u102d\u1015\u103a",
+  "ar_001": "\u1021\u101b\u1031\u1017\u102e(\u1015\u102f\u1036\u1019\u103e\u1014\u103a)",
+  "frs": "\u1021\u101b\u103e\u1031\u1037\u1015\u102d\u102f\u1004\u103a\u1038 \u1016\u101b\u102e\u1005\u102e\u101b\u1014\u103a",
+  "dum": "\u1021\u101c\u101a\u103a\u1015\u102d\u102f\u1004\u103a\u1038 \u1012\u1010\u103a\u1001\u103b\u103a",
+  "enm": "\u1021\u101c\u101a\u103a\u1015\u102d\u102f\u1004\u103a\u1038 \u1021\u1004\u103a\u1039\u1002\u101c\u102d\u1015\u103a",
+  "mga": "\u1021\u101c\u101a\u103a\u1015\u102d\u102f\u1004\u103a\u1038 \u1021\u102d\u102f\u1004\u103a\u1038\u101b\u1005\u103a",
+  "frm": "\u1021\u101c\u101a\u103a\u1015\u102d\u102f\u1004\u103a\u1038\u1015\u103c\u1004\u103a\u101e\u1005\u103a",
+  "gmh": "\u1021\u101c\u101a\u103a\u1015\u102d\u102f\u1004\u103a\u1038\u1021\u1019\u103c\u1004\u1037\u103a\u1002\u103b\u102c\u1019\u1014\u103a",
+  "tzm": "\u1021\u101c\u101a\u103a\u1021\u1000\u103a\u1010\u103a\u101c\u1000\u103a\u1005\u103a \u1010\u102c\u1019\u102c\u1007\u102d\u102f\u1000\u103a",
+  "ak": "\u1021\u102c\u1000\u102d\u1014\u103a",
+  "asa": "\u1021\u102c\u1005\u102f",
+  "af": "\u1021\u102c\u1016\u101b\u102d\u1000\u1014\u103a\u1038\u1005\u103a",
+  "hy": "\u1021\u102c\u1019\u1031\u1014\u102e\u1021\u1014\u103a",
+  "ar": "\u1021\u102c\u101b\u1031\u1017\u102e",
+  "mg": "\u1021\u102c\u101c\u102c\u1002\u102b\u1005\u102e",
+  "it": "\u1021\u102e\u1010\u101c\u102e",
+  "smn": "\u1021\u102e\u1014\u102c\u101b\u102e \u1006\u102c\u1019\u102d",
+  "iu": "\u1021\u102e\u1014\u102f\u1001\u103a\u1010\u102e\u1010\u102f",
+  "pt_PT": "\u1025\u101b\u1031\u102c\u1015 \u1015\u1031\u102b\u103a\u1010\u1030\u1002\u102e",
+  "uz": "\u1026\u1038\u1007\u103a\u1018\u1000\u103a",
+  "de_AT": "\u1029\u1005\u1010\u103c\u102e\u1038\u101a \u1002\u103b\u102c\u1019\u1014\u103a",
+  "en_AU": "\u1029\u1005\u1010\u103c\u1031\u1038\u101c\u103b\u103e \u1021\u1004\u103a\u1039\u1002\u101c\u102d\u1015\u103a",
+  "az": "\u1021\u1031\u102c\u103a\u1007\u1031\u102c\u1018\u102d\u102f\u1004\u103a\u1002\u103b\u1031\u102c\u1014\u102e",
+  "ur": "\u1021\u1031\u102c\u103a\u1012\u1030",
+  "or": "\u1021\u102d\u102f\u101b\u102e\u101b\u102c",
+  "om": "\u1021\u102d\u102f\u101b\u102d\u102f\u1019\u102d\u102f",
+  "ab": "\u1021\u1000\u103a\u1001\u102b\u1007\u1030\u1021\u1014\u103b",
+  "eo": "\u1021\u1000\u1039\u1005\u1015\u101b\u1014\u1039\u1010\u102d\u102f",
+  "as": "\u1021\u1000\u1039\u1005\u1019\u102e\u1005\u103a",
+  "et": "\u1021\u1000\u103a\u1005\u103a\u1010\u102d\u102f\u1038\u1014\u102e\u1038\u101b\u1014\u103a\u1038",
+  "dsb": "\u1021\u1031\u102c\u1000\u103a\u1006\u102d\u102f\u1018\u102e\u1021\u1019\u103a",
+  "agq": "\u1021\u102c\u1002\u103a\u101f\u102d\u1014\u103a\u1038",
+  "en": "\u1021\u1004\u103a\u1039\u1002\u101c\u102d\u1015\u103a",
+  "ang": "\u1021\u1004\u103a\u1039\u1002\u101c\u102d\u1015\u103a\u1005\u102c\u101f\u1031\u102c\u1004\u103a\u1038",
+  "id": "\u1021\u1004\u103a\u1012\u102d\u102f\u1014\u102e\u1038\u101b\u103e\u102c\u1038",
+  "is": "\u1021\u102d\u102f\u1004\u103a\u1005\u103a\u101c\u1014\u1039\u1012\u102e",
+  "ga": "\u1021\u102d\u102f\u1004\u103a\u1038\u101b\u1005\u103a",
+  "sga": "\u1021\u102d\u102f\u1004\u103a\u1038\u101b\u1005\u103a \u101f\u1031\u102c\u1004\u103a\u1038",
+  "ig": "\u1021\u1005\u1039\u1002\u1018\u102d\u102f",
+  "am": "\u1021\u1014\u103a\u101f\u102c\u101b\u1005\u103b\u1001\u103b",
+  "ebu": "\u1021\u1019\u103a\u1018\u1030",
+  "sq": "\u1021\u101a\u103a\u101c\u103a\u1018\u1031\u1038\u1014\u102e\u1038\u101a\u1014\u103a\u1038",
+  "ace": "Achinese",
+  "ach": "Acoli",
+  "ada": "Adangme",
+  "ady": "Adyghe",
+  "aa": "Afar",
+  "afh": "Afrihili",
+  "ain": "Ainu",
+  "akk": "Akkadian",
+  "bss": "Akoose",
+  "akz": "Alabama",
+  "ale": "Aleut",
+  "arq": "Algerian Arabic",
+  "ase": "American Sign Language",
+  "anp": "Angika",
+  "njo": "Ao Naga",
+  "an": "Aragonese",
+  "arc": "Aramaic",
+  "aro": "Araona",
+  "arp": "Arapaho",
+  "arw": "Arawak",
+  "rup": "Aromanian",
+  "frp": "Arpitan",
+  "ast": "Asturian",
+  "cch": "Atsam",
+  "av": "Avaric",
+  "ae": "Avestan",
+  "awa": "Awadhi",
+  "ay": "Aymara",
+  "bfq": "Badaga",
+  "bfd": "Bafut",
+  "bqi": "Bakhtiari",
+  "bal": "Baluchi",
+  "bax": "Bamun",
+  "bjn": "Banjar",
+  "bbc": "Batak Toba",
+  "bar": "Bavarian",
+  "bej": "Beja",
+  "bew": "Betawi",
+  "bho": "Bhojpuri",
+  "bik": "Bikol",
+  "bin": "Bini",
+  "bpy": "Bishnupriya",
+  "bi": "Bislama",
+  "byn": "Blin",
+  "zbl": "Blissymbols",
+  "brh": "Brahui",
+  "bra": "Braj",
+  "bug": "Buginese",
+  "bum": "Bulu",
+  "bua": "Buriat",
+  "cad": "Caddo",
+  "frc": "Cajun French",
+  "yue": "Cantonese",
+  "cps": "Capiznon",
+  "car": "Carib",
+  "cay": "Cayuga",
+  "ceb": "Cebuano",
+  "dtp": "Central Dusun",
+  "esu": "Central Yupik",
+  "shu": "Chadian Arabic",
+  "chg": "Chagatai",
+  "ch": "Chamorro",
+  "chy": "Cheyenne",
+  "chb": "Chibcha",
+  "qug": "Chimborazo Highland Quichua",
+  "chn": "Chinook Jargon",
+  "chp": "Chipewyan",
+  "cho": "Choctaw",
+  "cu": "Church Slavic",
+  "chk": "Chuukese",
+  "cv": "Chuvash",
+  "nwc": "Classical Newari",
+  "syc": "Classical Syriac",
+  "ksh": "Colognian",
+  "swb": "Comorian",
+  "cop": "Coptic",
+  "mus": "Creek",
+  "crh": "Crimean Turkish",
+  "dar": "Dargwa",
+  "dzg": "Dazaga",
+  "din": "Dinka",
+  "dv": "Divehi",
+  "doi": "Dogri",
+  "dgr": "Dogrib",
+  "dyu": "Dyula",
+  "efi": "Efik",
+  "arz": "Egyptian Arabic",
+  "eka": "Ekajuk",
+  "elx": "Elamite",
+  "egl": "Emilian",
+  "myv": "Erzya",
+  "ewo": "Ewondo",
+  "ext": "Extremaduran",
+  "fan": "Fang",
+  "fat": "Fanti",
+  "hif": "Fiji Hindi",
+  "fon": "Fon",
+  "gur": "Frafra",
+  "fur": "Friulian",
+  "ff": "Fulah",
+  "gaa": "Ga",
+  "gan": "Gan Chinese",
+  "gay": "Gayo",
+  "gba": "Gbaya",
+  "gez": "Geez",
+  "aln": "Gheg Albanian",
+  "bbj": "Ghomala",
+  "glk": "Gilaki",
+  "gil": "Gilbertese",
+  "gom": "Goan Konkani",
+  "gon": "Gondi",
+  "gor": "Gorontalo",
+  "got": "Gothic",
+  "grb": "Grebo",
+  "gwi": "Gwich\u02bcin",
+  "hai": "Haida",
+  "hak": "Hakka Chinese",
+  "hz": "Herero",
+  "hil": "Hiligaynon",
+  "ho": "Hiri Motu",
+  "hit": "Hittite",
+  "hmn": "Hmong",
+  "hup": "Hupa",
+  "iba": "Iban",
+  "ibb": "Ibibio",
+  "io": "Ido",
+  "ilo": "Iloko",
+  "izh": "Ingrian",
+  "inh": "Ingush",
+  "ia": "Interlingua",
+  "ie": "Interlingue",
+  "ik": "Inupiaq",
+  "jam": "Jamaican Creole English",
+  "kaj": "Jju",
+  "jut": "Jutish",
+  "kbd": "Kabardian",
+  "kgp": "Kaingang",
+  "kkj": "Kako",
+  "xal": "Kalmyk",
+  "kbl": "Kanembu",
+  "kr": "Kanuri",
+  "kaa": "Kara-Kalpak",
+  "krc": "Karachay-Balkar",
+  "krl": "Karelian",
+  "csb": "Kashubian",
+  "kaw": "Kawi",
+  "ken": "Kenyang",
+  "kho": "Khotanese",
+  "khw": "Khowar",
+  "kmb": "Kimbundu",
+  "krj": "Kinaray-a",
+  "kiu": "Kirmanjki",
+  "tlh": "Klingon",
+  "bkm": "Kom",
+  "kv": "Komi",
+  "kfo": "Koro",
+  "kos": "Kosraean",
+  "avk": "Kotava",
+  "kpe": "Kpelle",
+  "kri": "Krio",
+  "kj": "Kuanyama",
+  "kum": "Kumyk",
+  "kru": "Kurukh",
+  "kut": "Kutenai",
+  "lad": "Ladino",
+  "lah": "Lahnda",
+  "lam": "Lamba",
+  "ltg": "Latgalian",
+  "lzz": "Laz",
+  "lez": "Lezghian",
+  "lij": "Ligurian",
+  "li": "Limburgish",
+  "lfn": "Lingua Franca Nova",
+  "lzh": "Literary Chinese",
+  "liv": "Livonian",
+  "jbo": "Lojban",
+  "lmo": "Lombard",
+  "sli": "Lower Silesian",
+  "loz": "Lozi",
+  "lua": "Luba-Lulua",
+  "lui": "Luiseno",
+  "lun": "Lunda",
+  "mde": "Maba",
+  "mad": "Madurese",
+  "maf": "Mafa",
+  "mag": "Magahi",
+  "vmf": "Main-Franconian",
+  "mai": "Maithili",
+  "mak": "Makasar",
+  "mdr": "Mandar",
+  "man": "Mandingo",
+  "mni": "Manipuri",
+  "chm": "Mari",
+  "mh": "Marshallese",
+  "mwr": "Marwari",
+  "mzn": "Mazanderani",
+  "byv": "Medumba",
+  "men": "Mende",
+  "mwv": "Mentawai",
+  "es_MX": "Mexican Spanish",
+  "mic": "Micmac",
+  "nan": "Min Nan Chinese",
+  "min": "Minangkabau",
+  "xmf": "Mingrelian",
+  "mwl": "Mirandese",
+  "lus": "Mizo",
+  "mdf": "Moksha",
+  "ro_MD": "Moldavian",
+  "lol": "Mongo",
+  "ary": "Moroccan Arabic",
+  "mos": "Mossi",
+  "ttt": "Muslim Tat",
+  "mye": "Myene",
+  "na": "Nauru",
+  "nv": "Navajo",
+  "ng": "Ndonga",
+  "nap": "Neapolitan",
+  "new": "Newari",
+  "sba": "Ngambay",
+  "nnh": "Ngiemboon",
+  "yrl": "Nheengatu",
+  "nia": "Nias",
+  "niu": "Niuean",
+  "nog": "Nogai",
+  "nso": "Northern Sotho",
+  "nov": "Novial",
+  "nym": "Nyamwezi",
+  "ny": "Nyanja",
+  "tog": "Nyasa Tonga",
+  "nyo": "Nyoro",
+  "nzi": "Nzima",
+  "oc": "Occitan",
+  "oj": "Ojibwa",
+  "goh": "Old High German",
+  "non": "Old Norse",
+  "pro": "Old Proven\u00e7al",
+  "osa": "Osage",
+  "os": "Ossetic",
+  "ota": "Ottoman Turkish",
+  "pal": "Pahlavi",
+  "pfl": "Palatine German",
+  "pau": "Palauan",
+  "pam": "Pampanga",
+  "pag": "Pangasinan",
+  "pap": "Papiamento",
+  "pdc": "Pennsylvania German",
+  "phn": "Phoenician",
+  "pcd": "Picard",
+  "pms": "Piedmontese",
+  "pdt": "Plautdietsch",
+  "pon": "Pohnpeian",
+  "pnt": "Pontic",
+  "prg": "Prussian",
+  "raj": "Rajasthani",
+  "rap": "Rapanui",
+  "rar": "Rarotongan",
+  "rif": "Riffian",
+  "rgn": "Romagnol",
+  "rom": "Romany",
+  "rtm": "Rotuman",
+  "rug": "Roviana",
+  "rue": "Rusyn",
+  "ssy": "Saho",
+  "sah": "Sakha",
+  "sam": "Samaritan Aramaic",
+  "sm": "Samoan",
+  "sgs": "Samogitian",
+  "sad": "Sandawe",
+  "sat": "Santali",
+  "sc": "Sardinian",
+  "sas": "Sasak",
+  "sdc": "Sassarese Sardinian",
+  "stq": "Saterland Frisian",
+  "saz": "Saurashtra",
+  "gd": "Scottish Gaelic",
+  "sly": "Selayar",
+  "sel": "Selkup",
+  "see": "Seneca",
+  "sh": "Serbo-Croatian",
+  "srr": "Serer",
+  "sei": "Seri",
+  "scn": "Sicilian",
+  "sid": "Sidamo",
+  "bla": "Siksika",
+  "szl": "Silesian",
+  "den": "Slave",
+  "sog": "Sogdien",
+  "snk": "Soninke",
+  "azb": "South Azerbaijani",
+  "nr": "South Ndebele",
+  "alt": "Southern Altai",
+  "st": "Southern Sotho",
+  "srn": "Sranan Tongo",
+  "suk": "Sukuma",
+  "sux": "Sumerian",
+  "sus": "Susu",
+  "ss": "Swati",
+  "syr": "Syriac",
+  "tl": "Tagalog",
+  "ty": "Tahitian",
+  "tly": "Talysh",
+  "tmh": "Tamashek",
+  "trv": "Taroko",
+  "ter": "Tereno",
+  "tet": "Tetum",
+  "tig": "Tigre",
+  "tem": "Timne",
+  "tiv": "Tiv",
+  "tli": "Tlingit",
+  "tpi": "Tok Pisin",
+  "tkl": "Tokelau",
+  "fit": "Tornedalen Finnish",
+  "tkr": "Tsakhur",
+  "tsd": "Tsakonian",
+  "tsi": "Tsimshian",
+  "ts": "Tsonga",
+  "tn": "Tswana",
+  "tcy": "Tulu",
+  "tum": "Tumbuka",
+  "aeb": "Tunisian Arabic",
+  "tru": "Turoyo",
+  "tvl": "Tuvalu",
+  "tyv": "Tuvinian",
+  "tw": "Twi",
+  "kcg": "Tyap",
+  "udm": "Udmurt",
+  "uga": "Ugaritic",
+  "umb": "Umbundu",
+  "ve": "Venda",
+  "vec": "Venetian",
+  "vep": "Veps",
+  "vo": "Volap\u00fck",
+  "vro": "V\u00f5ro",
+  "vot": "Votic",
+  "wa": "Walloon",
+  "wae": "Walser",
+  "war": "Waray",
+  "wbp": "Warlpiri",
+  "was": "Washo",
+  "guc": "Wayuu",
+  "vls": "West Flemish",
+  "mrj": "Western Mari",
+  "wal": "Wolaytta",
+  "wuu": "Wu Chinese",
+  "hsn": "Xiang Chinese",
+  "yav": "Yangben",
+  "yao": "Yao",
+  "yap": "Yapese",
+  "ybb": "Yemba",
+  "yi": "Yiddish",
+  "zap": "Zapotec",
+  "zza": "Zaza",
+  "zea": "Zeelandic",
+  "zen": "Zenaga",
+  "za": "Zhuang",
+  "gbz": "Zoroastrian Dari",
+  "zun": "Zuni"
+}
diff --git a/public/intl/messages/am-ET.json b/public/intl/messages/am-ET.json
index b82cdf365..cb9ff4f99 100644
--- a/public/intl/messages/am-ET.json
+++ b/public/intl/messages/am-ET.json
@@ -41,6 +41,12 @@
       "value": "Administrator"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Back"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Bounce rate"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Confirm password"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "Countries"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Date range"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "Delete website"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "Dismiss"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "Events"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "Raw"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +543,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +567,24 @@
       "value": "Logout"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +597,12 @@
       "value": "More"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +621,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Operating systems"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +639,36 @@
       "value": "Owner"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Page views"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +721,12 @@
       "value": "Realtime"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +745,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +787,18 @@
       "value": "Reset statistics"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -583,6 +823,12 @@
       "value": "Screens"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -619,6 +865,12 @@
       "value": "Single day"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +901,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +973,42 @@
       "value": "Toggle charts"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Tracking code"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +1021,12 @@
       "value": "Unknown"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1057,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1123,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/ar-SA.json b/public/intl/messages/ar-SA.json
index b850db9b7..17a859167 100644
--- a/public/intl/messages/ar-SA.json
+++ b/public/intl/messages/ar-SA.json
@@ -41,6 +41,12 @@
       "value": "مدير"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "تحليلات"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "للخلف"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "معدل الارتداد"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "المدن"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "تأكيد كلمة المرور"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "الدول"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "البيانات"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "فترة مخصصة"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "حذف الموقع"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "تفاصيل"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "اخفاء"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "الأحداث"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "مفصلة"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +543,18 @@
       "value": "مغادرة المجموعة"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +567,24 @@
       "value": "تسجيل الخروج"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "الأعضاء"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +597,12 @@
       "value": "المزيد"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +621,16 @@
       "value": "غير معرف"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "نظام التشغيل"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +639,36 @@
       "value": "المالك"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "مشاهدات الصفحة"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +721,12 @@
       "value": "الوقت الفعلي"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +745,12 @@
       "value": "اعادة انشاء"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +787,18 @@
       "value": "اعادة تعيين الإحصائيات"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -583,6 +823,12 @@
       "value": "الشاشات"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -619,6 +865,12 @@
       "value": "يوم واحد"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +901,24 @@
       "value": "عضو المجموعة"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "مدير المجموعة"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +973,42 @@
       "value": "تغيير الإحصائيات"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "كود التتبع"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +1021,12 @@
       "value": "غير معروف"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1057,12 @@
       "value": "المستخدمين"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1123,6 @@
       "value": "الأمس"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/be-BY.json b/public/intl/messages/be-BY.json
index 9d17b7005..c8081e373 100644
--- a/public/intl/messages/be-BY.json
+++ b/public/intl/messages/be-BY.json
@@ -41,6 +41,12 @@
       "value": "Адміністратар"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Назад"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Паказчык адмоваў"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Падцвердзіць пароль"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "Краіны"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Дыяпазон дат"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "Выдаліць сайт"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "Адмена"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "Падзеі"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "Сырыя"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +543,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +567,24 @@
       "value": "Выйсці"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +597,12 @@
       "value": "Болей"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +621,16 @@
       "value": "Няма"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Аперацыонныя сістэмы"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +639,36 @@
       "value": "Уласнік"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Прагляды старонкі"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +721,12 @@
       "value": "У рэяльным часе"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +745,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +787,18 @@
       "value": "Скінуць статыстыку"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -583,6 +823,12 @@
       "value": "Экраны"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -619,6 +865,12 @@
       "value": "Адзін дзень"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +901,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +973,42 @@
       "value": "Пераключыць графікі"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Код адсочвання"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +1021,12 @@
       "value": "Невядома"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1057,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1123,6 @@
       "value": "Учора"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/bn-BD.json b/public/intl/messages/bn-BD.json
index 6e51b096e..6b8875adf 100644
--- a/public/intl/messages/bn-BD.json
+++ b/public/intl/messages/bn-BD.json
@@ -41,6 +41,12 @@
       "value": "অ্যাডমিন"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "পেছনে"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "বহিষ্কারের হার"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "পাসওয়ার্ড নিশ্চিত করুন"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "দেশ"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "তারিখের পরিসীমা"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "ওয়েবসাইট মুছুন"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "বাতিল"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "ঘটনা"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "অপরিশোধিত"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +543,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +567,24 @@
       "value": "লগ আউট"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +597,12 @@
       "value": "আরও"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +621,16 @@
       "value": "কিছুই না"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "অপারেটিং সিস্টেম গুলো"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +639,36 @@
       "value": "মালিক"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "পৃষ্ঠা পরিদর্শন গুলো"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +721,12 @@
       "value": "সরাসরি"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +745,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +787,18 @@
       "value": "ওয়েবসাইট রিসেট করুন"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -583,6 +823,12 @@
       "value": "স্ক্রিনগুলি"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -619,6 +865,12 @@
       "value": "একদিন"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +901,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +973,42 @@
       "value": "চার্ট পরিবর্তন করুন"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "ট্র্যাকিং কোড"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +1021,12 @@
       "value": "অজানা"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1057,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1123,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/ca-ES.json b/public/intl/messages/ca-ES.json
index 6a3f0542a..f21a739cc 100644
--- a/public/intl/messages/ca-ES.json
+++ b/public/intl/messages/ca-ES.json
@@ -41,6 +41,12 @@
       "value": "Administrador"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Enrere"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Percentatge de rebot"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Confirma la contrasenya"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "Països"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Interval de dates"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "Esborra el lloc web"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "Descarta"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "Esdeveniments"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "En cru"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +543,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +567,24 @@
       "value": "Desconnecta't"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +597,12 @@
       "value": "Més"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +621,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Sistemes operatius"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +639,36 @@
       "value": "Propietari"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Pàgines vistes"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +721,12 @@
       "value": "Temps real"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +745,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +787,18 @@
       "value": "Restableix estadístiques"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -583,6 +823,12 @@
       "value": "Screens"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -619,6 +865,12 @@
       "value": "Un sol dia"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +901,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +973,42 @@
       "value": "Mostra/amaga gràfics"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Codi de seguiment"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +1021,12 @@
       "value": "Desconegut"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1057,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1123,6 @@
       "value": "Ahir"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/cs-CZ.json b/public/intl/messages/cs-CZ.json
index abfc225db..e316e9731 100644
--- a/public/intl/messages/cs-CZ.json
+++ b/public/intl/messages/cs-CZ.json
@@ -41,6 +41,12 @@
       "value": "Administrátor"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Zpět"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Okamžité opuštění"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Potvrdit heslo"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "Země"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Období"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "Smazat web"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "Odejít"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "Události"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "Nezpracované"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +543,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +567,24 @@
       "value": "Odhlásit"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +597,12 @@
       "value": "Více"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +621,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Operační systém"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +639,36 @@
       "value": "Owner"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Zobrazení stránek"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +721,12 @@
       "value": "Aktuálně"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +745,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +787,18 @@
       "value": "Reset statistics"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -583,6 +823,12 @@
       "value": "Screens"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -619,6 +865,12 @@
       "value": "Jeden den"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +901,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +973,42 @@
       "value": "Toggle charts"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Sledovací kód"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +1021,12 @@
       "value": "Neznámý"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1057,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1123,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/da-DK.json b/public/intl/messages/da-DK.json
index e69d70363..05b0c572a 100644
--- a/public/intl/messages/da-DK.json
+++ b/public/intl/messages/da-DK.json
@@ -41,6 +41,12 @@
       "value": "Administrator"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Tilbage"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Afvisningsprocent"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Godkendt adgangskode"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "Lande"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Datointerval"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "Slet hjemmeside"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "Afvis"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "Hændelser"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "Rå"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +543,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +567,24 @@
       "value": "Log ud"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +597,12 @@
       "value": "Mere"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +621,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Operativsystemer"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +639,36 @@
       "value": "Ejer"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Sidevisninger"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +721,12 @@
       "value": "Realtid"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +745,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +787,18 @@
       "value": "Nulstil statistikker"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -583,6 +823,12 @@
       "value": "Screens"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -619,6 +865,12 @@
       "value": "Enkelt dag"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +901,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +973,42 @@
       "value": "Ændre graf"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Sporingskode"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +1021,12 @@
       "value": "Ukendt"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1057,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1123,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/de-CH.json b/public/intl/messages/de-CH.json
index 4a5fd0a22..ecc153361 100644
--- a/public/intl/messages/de-CH.json
+++ b/public/intl/messages/de-CH.json
@@ -41,6 +41,12 @@
       "value": "Administrator"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Zrugg"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Absprungsrate"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Städt"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Passwort widerhole"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "Länder"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Datä"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Datumsbereich"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "Websiite lösche"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "Verwerfe"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "Ereigniss"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "Rohdate"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +543,18 @@
       "value": "Team verlah"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +567,24 @@
       "value": "Abmelde"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Mitglieder"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +597,12 @@
       "value": "Meh"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +621,16 @@
       "value": "Keis"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Betriibssystem"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +639,36 @@
       "value": "Bsitzer"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Siitenufrüef"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +721,12 @@
       "value": "Echtzit"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +745,12 @@
       "value": "Erneuere"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +787,18 @@
       "value": "Statistik zruggsetze"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -583,6 +823,12 @@
       "value": "Bildschirmuflösige"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -619,6 +865,12 @@
       "value": "Ein Tag"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +901,24 @@
       "value": "Team Mitglied"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team Bsitzer"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +973,42 @@
       "value": "Schaubilder umschalte"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Tracking Code"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +1021,12 @@
       "value": "Unbekannt"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1057,12 @@
       "value": "Benutzer"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1123,6 @@
       "value": "Gester"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/de-DE.json b/public/intl/messages/de-DE.json
index ef34acd27..5e74647c1 100644
--- a/public/intl/messages/de-DE.json
+++ b/public/intl/messages/de-DE.json
@@ -20,7 +20,7 @@
   "label.add": [
     {
       "type": 0,
-      "value": "Add"
+      "value": "Hinzufügen"
     }
   ],
   "label.add-description": [
@@ -32,7 +32,7 @@
   "label.add-website": [
     {
       "type": 0,
-      "value": "Webseite hinzufügen"
+      "value": "Website hinzufügen"
     }
   ],
   "label.admin": [
@@ -41,6 +41,12 @@
       "value": "Administrator"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "Nach"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Durchschnitt"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Zurück"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Vor"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Absprungrate"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Städte"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "Stadt"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Passwort wiederholen"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Enthält"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "Länder"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Land"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Bericht erstellen"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Daten"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Datum"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Datumsbereich"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Tag"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -206,7 +278,13 @@
   "label.delete-website": [
     {
       "type": 0,
-      "value": "Webseite löschen"
+      "value": "Website löschen"
+    }
+  ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Beschreibung"
     }
   ],
   "label.desktop": [
@@ -221,6 +299,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Gerät"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "Verwerfen"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Enthält nicht"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -272,7 +362,7 @@
   "label.event-data": [
     {
       "type": 0,
-      "value": "Event daten"
+      "value": "Eventdaten"
     }
   ],
   "label.events": [
@@ -281,16 +371,28 @@
       "value": "Ereignisse"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "Falsch"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
-      "value": "Field"
+      "value": "Feld"
     }
   ],
   "label.fields": [
     {
       "type": 0,
-      "value": "Fields"
+      "value": "Felder"
+    }
+  ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
     }
   ],
   "label.filter-combined": [
@@ -305,18 +407,72 @@
       "value": "Rohdaten"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Größer als"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Größer oder gleich"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Ist"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Ist nicht"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Ist nicht gesetzt"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Ist gesetzt"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +543,18 @@
       "value": "Team verlassen"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Kleiner als"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Kleiner oder gleich"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +567,24 @@
       "value": "Abmelden"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Mitglieder"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +597,12 @@
       "value": "Mehr"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "Meine Websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +621,16 @@
       "value": "Keine"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Betriebssysteme"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Übersicht"
     }
   ],
   "label.owner": [
@@ -447,12 +639,36 @@
       "value": "Besitzer"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Seite "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " von "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Seitenaufrufe"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Seitentitel"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +721,12 @@
       "value": "Echtzeit"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +745,12 @@
       "value": "Erneuern"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -538,7 +766,7 @@
   "label.reports": [
     {
       "type": 0,
-      "value": "Reporte"
+      "value": "Berichte"
     }
   ],
   "label.required": [
@@ -559,6 +787,18 @@
       "value": "Statistik zurücksetzen"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -583,6 +823,12 @@
       "value": "Bildschirmauflösungen"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -598,7 +844,7 @@
   "label.sessions": [
     {
       "type": 0,
-      "value": "Sessions"
+      "value": "Sitzungen"
     }
   ],
   "label.settings": [
@@ -619,6 +865,12 @@
       "value": "Ein Tag"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Summe"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -634,25 +886,37 @@
   "label.team-guest": [
     {
       "type": 0,
-      "value": "Team Gast"
+      "value": "Gast des Teams"
     }
   ],
   "label.team-id": [
     {
       "type": 0,
-      "value": "Team ID"
+      "value": "Team-ID"
     }
   ],
   "label.team-member": [
     {
       "type": 0,
-      "value": "Team Mitglied"
+      "value": "Team-Mitglied"
+    }
+  ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Name des Teams"
     }
   ],
   "label.team-owner": [
     {
       "type": 0,
-      "value": "Team Eigentümer"
+      "value": "Team-Eigentümer"
+    }
+  ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team-Websites"
     }
   ],
   "label.teams": [
@@ -709,12 +973,42 @@
       "value": "Schaubilder umschalten"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Gesamt"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Datensätze insgesamt"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Tracking Code"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "Wahr"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Typ"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Eindeutig"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +1021,12 @@
       "value": "Unbekannt"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Unbenannt"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1057,12 @@
       "value": "Benutzer"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Wert"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -772,7 +1078,7 @@
   "label.view-only": [
     {
       "type": 0,
-      "value": "View only"
+      "value": "Nur ansehen"
     }
   ],
   "label.views": [
@@ -790,25 +1096,25 @@
   "label.website": [
     {
       "type": 0,
-      "value": "Webseite"
+      "value": "Website"
     }
   ],
   "label.website-id": [
     {
       "type": 0,
-      "value": "Webseite ID"
+      "value": "Website ID"
     }
   ],
   "label.websites": [
     {
       "type": 0,
-      "value": "Webseiten"
+      "value": "Websites"
     }
   ],
   "label.window": [
     {
       "type": 0,
-      "value": "Window"
+      "value": "Fenster"
     }
   ],
   "label.yesterday": [
@@ -817,168 +1123,6 @@
       "value": "Gestern"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Durchschnitt"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Report erstellen"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Beschreibung"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Größer als"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Größer oder gleich"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Kleiner als"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Kleiner oder gleich"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Übersicht"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Summe"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
@@ -1058,7 +1202,7 @@
   "message.delete-account": [
     {
       "type": 0,
-      "value": "To delete this account, type "
+      "value": "Um dieses Konto zu löschen, geben Sie zur Bestätigung "
     },
     {
       "type": 1,
@@ -1066,13 +1210,13 @@
     },
     {
       "type": 0,
-      "value": " in the box below to confirm."
+      "value": " in das Feld unten ein."
     }
   ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "To delete this website, type "
+      "value": "Um diese Website zu löschen, geben Sie zur Bestätigung "
     },
     {
       "type": 1,
@@ -1080,7 +1224,7 @@
     },
     {
       "type": 0,
-      "value": " in the box below to confirm."
+      "value": " in das Feld unten ein."
     }
   ],
   "message.delete-website-warning": [
@@ -1130,7 +1274,7 @@
   "message.min-password-length": [
     {
       "type": 0,
-      "value": "Minimale länge von "
+      "value": "Minimale Länge von "
     },
     {
       "type": 1,
@@ -1144,15 +1288,11 @@
   "message.new-version-available": [
     {
       "type": 0,
-      "value": "A new version of Umami "
+      "value": "Eine neue Version von Umami ist verfügbar: "
     },
     {
       "type": 1,
       "value": "version"
-    },
-    {
-      "type": 0,
-      "value": " is available!"
     }
   ],
   "message.no-data-available": [
@@ -1164,7 +1304,7 @@
   "message.no-event-data": [
     {
       "type": 0,
-      "value": "No event data is available."
+      "value": "Es sind keine Ereignisdaten verfügbar."
     }
   ],
   "message.no-match-password": [
@@ -1200,7 +1340,7 @@
   "message.no-websites-configured": [
     {
       "type": 0,
-      "value": "Es ist keine Webseite vorhanden."
+      "value": "Es ist keine Website vorhanden."
     }
   ],
   "message.page-not-found": [
@@ -1212,7 +1352,7 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "To reset this website, type "
+      "value": "Um diese Website zurückzusetzen, geben Sie zur Bestätigung "
     },
     {
       "type": 1,
@@ -1220,13 +1360,13 @@
     },
     {
       "type": 0,
-      "value": " in the box below to confirm."
+      "value": " in das Feld unten ein."
     }
   ],
   "message.reset-website-warning": [
     {
       "type": 0,
-      "value": "Alle Daten für diese Webseite werden gelöscht, jedoch bleibt der Tracking Code bestehen."
+      "value": "Alle Daten für diese Website werden gelöscht, jedoch bleibt der Tracking Code bestehen."
     }
   ],
   "message.saved": [
@@ -1238,7 +1378,7 @@
   "message.share-url": [
     {
       "type": 0,
-      "value": "Ihre Webseitenstatistik ist unter der folgenden URL öffentlich zugänglich:"
+      "value": "Die Statistiken Ihrer Website sind unter folgender URL öffentlich zugänglich:"
     }
   ],
   "message.team-already-member": [
@@ -1256,7 +1396,7 @@
   "message.team-websites-info": [
     {
       "type": 0,
-      "value": "Webseiten können von jedem im Team eingesehen werden."
+      "value": "Websites können von jedem im Team eingesehen werden."
     }
   ],
   "message.tracking-code": [
diff --git a/public/intl/messages/el-GR.json b/public/intl/messages/el-GR.json
index 26fdc5355..eb6b73ce0 100644
--- a/public/intl/messages/el-GR.json
+++ b/public/intl/messages/el-GR.json
@@ -41,6 +41,12 @@
       "value": "Διαχειριστής"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Πίσω"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Ποσοστό αναπήδησης"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Επιβεβαίωση κωδικού"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "Χώρες"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Εύρος ημερομηνιών"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "Διαγραφή ιστότοπου"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "Dismiss"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "Γεγονότα"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "Ακατέργαστο"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +543,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +567,24 @@
       "value": "Αποσύνδεση"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +597,12 @@
       "value": "Περισσότερα"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +621,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Λειτουργικά συστήματα"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +639,36 @@
       "value": "Owner"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Προβολές σελίδας"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +721,12 @@
       "value": "Realtime"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +745,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +787,18 @@
       "value": "Reset statistics"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -583,6 +823,12 @@
       "value": "Screens"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -619,6 +865,12 @@
       "value": "Ημερήσια"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +901,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +973,42 @@
       "value": "Toggle charts"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Κωδικός παρακολούθησης"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +1021,12 @@
       "value": "Άγνωστο"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1057,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1123,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/en-GB.json b/public/intl/messages/en-GB.json
index 4194da83c..68f242481 100644
--- a/public/intl/messages/en-GB.json
+++ b/public/intl/messages/en-GB.json
@@ -41,6 +41,12 @@
       "value": "Administrator"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Back"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Bounce rate"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Confirm password"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "Countries"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Date range"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "Delete website"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "Dismiss"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "Events"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "Raw"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +543,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +567,24 @@
       "value": "Logout"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +597,12 @@
       "value": "More"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +621,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Operating systems"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +639,36 @@
       "value": "Owner"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Page views"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +721,12 @@
       "value": "Realtime"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +745,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +787,18 @@
       "value": "Reset statistics"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -583,6 +823,12 @@
       "value": "Screens"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -619,6 +865,12 @@
       "value": "Single day"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +901,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +973,42 @@
       "value": "Toggle charts"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Tracking code"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +1021,12 @@
       "value": "Unknown"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1057,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1123,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/en-US.json b/public/intl/messages/en-US.json
index 929f61c99..0ee5b1e64 100644
--- a/public/intl/messages/en-US.json
+++ b/public/intl/messages/en-US.json
@@ -41,6 +41,12 @@
       "value": "Administrator"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Back"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Bounce rate"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Confirm password"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "Countries"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Date range"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "Delete website"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "Dismiss"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "Events"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "Raw"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +543,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +567,24 @@
       "value": "Logout"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +597,12 @@
       "value": "More"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +621,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Operating systems"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +639,36 @@
       "value": "Owner"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Page views"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +721,12 @@
       "value": "Realtime"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +745,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +787,18 @@
       "value": "Reset website"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -583,6 +823,12 @@
       "value": "Screens"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -619,6 +865,12 @@
       "value": "Single day"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +901,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +973,42 @@
       "value": "Toggle charts"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Tracking code"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +1021,12 @@
       "value": "Unknown"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1057,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1123,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
@@ -1176,7 +1320,7 @@
   "message.no-results-found": [
     {
       "type": 0,
-      "value": "No results were found."
+      "value": "No results found."
     }
   ],
   "message.no-team-websites": [
diff --git a/public/intl/messages/es-ES.json b/public/intl/messages/es-ES.json
index 6d5289657..5fd90efd8 100644
--- a/public/intl/messages/es-ES.json
+++ b/public/intl/messages/es-ES.json
@@ -41,6 +41,12 @@
       "value": "Administrador"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "Después"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analíticas"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Media"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Atrás"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Antes"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Porcentaje de rebote"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Desglose"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Navegador"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Ciudades"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "Ciudad"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Confirmar contraseña"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contiene"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "Países"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "País"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Crear"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Crear informe"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Datos"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Fecha"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Intervalo de fechas"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Día"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "Eliminar sitio"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Descripción"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Detalles"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Dispositivo"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -230,7 +314,13 @@
   "label.dismiss": [
     {
       "type": 0,
-      "value": "Ignorar"
+      "value": "Cerrar"
+    }
+  ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "No contiene"
     }
   ],
   "label.domain": [
@@ -242,7 +332,7 @@
   "label.dropoff": [
     {
       "type": 0,
-      "value": "Dropoff"
+      "value": "Abandono"
     }
   ],
   "label.edit": [
@@ -281,6 +371,12 @@
       "value": "Eventos"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "Falso"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Campos"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filtro"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "En crudo"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filtros"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Comprender conversión y abandono de usuarios."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Mayor que"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Mayor que o igual a"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Es igual a"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "No es igual a"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Está establecido"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +543,18 @@
       "value": "Abandonar equipo"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Menor que"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Menor que o igual a"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +567,24 @@
       "value": "Cerrar sesión"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Máx"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Miembros"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Mín"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +597,12 @@
       "value": "Más"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "Mis sitios web"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +621,16 @@
       "value": "Ninguno"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Sistemas operativos"
+      "value": "Sistema"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Resumen"
     }
   ],
   "label.owner": [
@@ -447,12 +639,36 @@
       "value": "Propietario"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Página "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " de "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Vistas"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Título de página"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -468,7 +684,7 @@
   "label.powered-by": [
     {
       "type": 0,
-      "value": "Con la ayuda de "
+      "value": "Analíticas de "
     },
     {
       "type": 1,
@@ -490,7 +706,7 @@
   "label.query": [
     {
       "type": 0,
-      "value": "Query"
+      "value": "Consulta"
     }
   ],
   "label.query-parameters": [
@@ -505,6 +721,12 @@
       "value": "Tiempo real"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referido"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +745,12 @@
       "value": "Regenerar"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -538,7 +766,7 @@
   "label.reports": [
     {
       "type": 0,
-      "value": "Reportes"
+      "value": "Informes"
     }
   ],
   "label.required": [
@@ -556,7 +784,19 @@
   "label.reset-website": [
     {
       "type": 0,
-      "value": "Reiniciar estadísticas"
+      "value": "Reiniciar analíticas"
+    }
+  ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retención"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Medir la frecuencia con la que los usuarios vuelven a tu sitio web."
     }
   ],
   "label.role": [
@@ -583,6 +823,12 @@
       "value": "Pantallas"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Buscar"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -604,7 +850,7 @@
   "label.settings": [
     {
       "type": 0,
-      "value": "Configuraciones"
+      "value": "Ajustes"
     }
   ],
   "label.share-url": [
@@ -619,6 +865,12 @@
       "value": "Un solo día"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Suma"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -640,7 +892,7 @@
   "label.team-id": [
     {
       "type": 0,
-      "value": "ID de equipo"
+      "value": "ID del equipo"
     }
   ],
   "label.team-member": [
@@ -649,12 +901,24 @@
       "value": "Miembro del equipo"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Nombre del equipo"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Admin. del equipo"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Sitios web del equipo"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +973,42 @@
       "value": "Alternar gráficas"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total de registros"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Código de rastreo"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "Verdadero"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Tipo"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Único"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +1021,12 @@
       "value": "Desconocida"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Sin título"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1057,12 @@
       "value": "Usuarios"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Valor"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1123,6 @@
       "value": "Ayer"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "Después"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Media"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Antes"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Desglose"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contiene"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Crear reporte"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Descripciones"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "No contiene"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "No es igual a"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Es igual a"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filtros"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Mayor que"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Mayor que o igual a"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Menor que"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Menor que o igual a"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Máx"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Mín"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Resumen"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Suma"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total de registros"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "Verdadero"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Tipo"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Único"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Sin título"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Valor"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
@@ -1144,7 +1288,7 @@
   "message.new-version-available": [
     {
       "type": 0,
-      "value": "A new version of Umami "
+      "value": "Una nueva versión de Umami "
     },
     {
       "type": 1,
@@ -1152,7 +1296,7 @@
     },
     {
       "type": 0,
-      "value": " is available!"
+      "value": " está disponible"
     }
   ],
   "message.no-data-available": [
@@ -1232,7 +1376,7 @@
   "message.saved": [
     {
       "type": 0,
-      "value": "Guardado."
+      "value": "Guardado"
     }
   ],
   "message.share-url": [
diff --git a/public/intl/messages/es-MX.json b/public/intl/messages/es-MX.json
index 6e2cf72b7..c3ef099df 100644
--- a/public/intl/messages/es-MX.json
+++ b/public/intl/messages/es-MX.json
@@ -41,6 +41,12 @@
       "value": "Administrador"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analíticas"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Atrás"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Porcentaje de rebote"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Ciudades"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Confirmar contraseña"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "Países"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Datos"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Intervalo de fechas"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "Eliminar sitio"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Detalles"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "Ignorar"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "Eventos"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "Personalizado"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +543,18 @@
       "value": "Abandonar equipo"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +567,24 @@
       "value": "Cerrar sesión"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Miembros"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +597,12 @@
       "value": "Más"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +621,16 @@
       "value": "Ninguno"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Sistemas operativos"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +639,36 @@
       "value": "Propietario"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Vistas"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +721,12 @@
       "value": "Tiempo real"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +745,12 @@
       "value": "Regenerar"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +787,18 @@
       "value": "Reiniciar estadísticas"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -583,6 +823,12 @@
       "value": "Pantallas"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -619,6 +865,12 @@
       "value": "Día"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +901,24 @@
       "value": "Miembro de equipo"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Admin. del equipo"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +973,42 @@
       "value": "Alternar gráficas"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Código de rastreo"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +1021,12 @@
       "value": "Desconocida"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1057,12 @@
       "value": "Usuarios"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1123,6 @@
       "value": "Ayer"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/fa-IR.json b/public/intl/messages/fa-IR.json
index 8f2d9378e..e09b155b6 100644
--- a/public/intl/messages/fa-IR.json
+++ b/public/intl/messages/fa-IR.json
@@ -41,6 +41,12 @@
       "value": "مدیر"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "برگشت"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "نرخ Bounce"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "تایید رمز"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "کشورها"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "محدوده‌ی تاریخ"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "حذف وب‌سایت"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "رد کردن"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "رویدادها"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "خام"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +543,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +567,24 @@
       "value": "خروج"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +597,12 @@
       "value": "بیشتر"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +621,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "سیستم‌عامل‌ها"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +639,36 @@
       "value": "ایجاد شده توسط"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "بازدید صفحه"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +721,12 @@
       "value": "آمار زنده"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +745,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +787,18 @@
       "value": "بازنشانی آمار"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -583,6 +823,12 @@
       "value": "Screens"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -619,6 +865,12 @@
       "value": "یک روز"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +901,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +973,42 @@
       "value": "Toggle charts"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "کد رهگیری"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +1021,12 @@
       "value": "ناشناخته"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1057,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1123,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/fi-FI.json b/public/intl/messages/fi-FI.json
index b78025f33..2130f82cd 100644
--- a/public/intl/messages/fi-FI.json
+++ b/public/intl/messages/fi-FI.json
@@ -41,6 +41,12 @@
       "value": "Järjestelmänvalvoja"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Takaisin"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Välitön poistuminen"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Vahvista salasana"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "Maat"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Ajanjakso"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "Poista verkkosivu"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "Hylkää"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "Tapahtumat"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "Käsittelemätön"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +543,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +567,24 @@
       "value": "Kirjaudu ulos"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +597,12 @@
       "value": "Lisää"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +621,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Käyttöjärjestelmät"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +639,36 @@
       "value": "Omistaja"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Sivun näyttökerrat"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +721,12 @@
       "value": "Juuri nyt"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +745,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +787,18 @@
       "value": "Nollaa tilastot"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -583,6 +823,12 @@
       "value": "Screens"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -619,6 +865,12 @@
       "value": "Yksi päivä"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +901,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +973,42 @@
       "value": "Kytke kaaviot päälle/pois"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Seurantakoodi"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +1021,12 @@
       "value": "Tuntematon"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1057,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1123,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/fo-FO.json b/public/intl/messages/fo-FO.json
index 8b98376ec..bc11c56e1 100644
--- a/public/intl/messages/fo-FO.json
+++ b/public/intl/messages/fo-FO.json
@@ -41,6 +41,12 @@
       "value": "Fyrisitari"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Aftur"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Bounce prosenttal"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Vátta loyniorð"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "Lond"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Vel dato"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "Sletta heimasíðu"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "Lat fara"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "Hendingar/tiltøk"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "Óviðgjørt"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +543,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +567,24 @@
       "value": "Rita út"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +597,12 @@
       "value": "Meira"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +621,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Stýrikervir"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +639,36 @@
       "value": "Owner"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Opnaðar síðir"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +721,12 @@
       "value": "Beinleiðis"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +745,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +787,18 @@
       "value": "Reset statistics"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -583,6 +823,12 @@
       "value": "Screens"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -619,6 +865,12 @@
       "value": "Einkultur dagur"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +901,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +973,42 @@
       "value": "Toggle charts"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Spori kota"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +1021,12 @@
       "value": "Ókent"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1057,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1123,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/fr-FR.json b/public/intl/messages/fr-FR.json
index 992f4c703..99937de70 100644
--- a/public/intl/messages/fr-FR.json
+++ b/public/intl/messages/fr-FR.json
@@ -41,6 +41,12 @@
       "value": "Administrateur"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "Après"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Moyenne"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Retour"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Avant"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Taux de rebond"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Répartition"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Navigateur"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Villes"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "Ville"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Confirmation du mot de passe"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contient"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "Pays"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Pays"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Créer"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Créer un rapport"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Données"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Période"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Jour"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "Supprimer le site"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Détails"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Appareil"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "Ignorer"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Ne contient pas"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -242,7 +332,7 @@
   "label.dropoff": [
     {
       "type": 0,
-      "value": "Dropoff"
+      "value": "Abandons"
     }
   ],
   "label.edit": [
@@ -266,19 +356,25 @@
   "label.event": [
     {
       "type": 0,
-      "value": "Event"
+      "value": "Évènement"
     }
   ],
   "label.event-data": [
     {
       "type": 0,
-      "value": "Données d'événements"
+      "value": "Données d'évènements"
     }
   ],
   "label.events": [
     {
       "type": 0,
-      "value": "Événements"
+      "value": "Évènements"
+    }
+  ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "Faux"
     }
   ],
   "label.field": [
@@ -293,6 +389,12 @@
       "value": "Champs"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filtrer"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "Brut"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filtres"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Entonnoir"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Suivi des conversions et des taux d'abandons."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Supérieur à"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Supérieur ou égal à"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Analyse précise des données en utilisant des segments et des filtres."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Est"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "N'est pas"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "N'est pas défini"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Est défini"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -379,6 +535,18 @@
       "value": "Quitter l'équipe"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Inférieur à"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Inférieur ou égal à"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -391,12 +559,24 @@
       "value": "Déconnexion"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Membres"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -409,6 +589,12 @@
       "value": "Plus"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "Mes sites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -427,10 +613,16 @@
       "value": "Aucun·e"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Systèmes d'exploitation"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Vue d'ensemble"
     }
   ],
   "label.owner": [
@@ -439,12 +631,36 @@
       "value": "Propriétaire"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " sur "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Pages vues"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Titre de page"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -488,7 +704,7 @@
   "label.query-parameters": [
     {
       "type": 0,
-      "value": "Paramètres d'URL"
+      "value": "Paramètres de requête"
     }
   ],
   "label.realtime": [
@@ -497,6 +713,12 @@
       "value": "Temps réel"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Site référent"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -515,6 +737,12 @@
       "value": "Régénérer"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Région"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -551,6 +779,18 @@
       "value": "Réinitialiser les statistiques"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Rétention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Mesure de l'atractivité du site en visualisant les taux d'utilisateurs qui reviennent."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -575,6 +815,12 @@
       "value": "Résolutions d'écran"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Rechercher"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -611,6 +857,12 @@
       "value": "Journée"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Somme"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -641,12 +893,24 @@
       "value": "Membre de l'équipe"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Nom de l'équipe"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Propriétaire de l'équipe"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Sites d'équipes"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -701,12 +965,42 @@
       "value": "Afficher/Masquer les graphiques"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Nombre d'enregistrements"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Code de suivi"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "Vrai"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -719,6 +1013,12 @@
       "value": "Inconnu"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Sans titre"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -749,6 +1049,12 @@
       "value": "Utilisateurs"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Valeur"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -782,7 +1088,7 @@
   "label.website": [
     {
       "type": 0,
-      "value": "Website"
+      "value": "Site"
     }
   ],
   "label.website-id": [
@@ -809,168 +1115,6 @@
       "value": "Hier"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "Après"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Moyenne"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Avant"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Répartition"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contient"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Créer un rapport"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Ne contient pas"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "N'est pas égal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Est égal"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "Faux"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filtres"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Supérieur à"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Supérieur ou égal à"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Inférieur à"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Inférieur ou égal à"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Vue d'ensemble"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Somme"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Nombre d'enregistrements"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "Vrai"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Sans titre"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Valeur"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
@@ -1140,7 +1284,7 @@
   "message.new-version-available": [
     {
       "type": 0,
-      "value": "A new version of Umami "
+      "value": "Une nouvelle version d'Umami "
     },
     {
       "type": 1,
@@ -1148,7 +1292,7 @@
     },
     {
       "type": 0,
-      "value": " is available!"
+      "value": " est disponible !"
     }
   ],
   "message.no-data-available": [
@@ -1228,7 +1372,7 @@
   "message.saved": [
     {
       "type": 0,
-      "value": "Enregistré avec succès."
+      "value": "Enregistré."
     }
   ],
   "message.share-url": [
diff --git a/public/intl/messages/ga-ES.json b/public/intl/messages/ga-ES.json
index 6101da477..b5fabeffe 100644
--- a/public/intl/messages/ga-ES.json
+++ b/public/intl/messages/ga-ES.json
@@ -41,6 +41,12 @@
       "value": "Administradora"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Atrás"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Proporción de rebote"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Confirmar contrasinal"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "Países"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Rango temporal"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "Eliminar sitio web"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "Desbotar"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "Eventos"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "Raw"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +543,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +567,24 @@
       "value": "Pechar sesión"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +597,12 @@
       "value": "Máis"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +621,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Sistemas operativos"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +639,36 @@
       "value": "Dona"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Vistas de páxinas"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +721,12 @@
       "value": "Agora mesmo"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +745,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -567,6 +795,18 @@
       "value": " in the box below to confirm."
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -591,6 +831,12 @@
       "value": "Screens"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -627,6 +873,12 @@
       "value": "Un só día"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -657,12 +909,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -717,12 +981,42 @@
       "value": "Activación das gráficas"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Código de seguimento"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -735,6 +1029,12 @@
       "value": "Descoñecido"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -765,6 +1065,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -825,168 +1131,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/he-IL.json b/public/intl/messages/he-IL.json
index 7a5c063c7..16f625257 100644
--- a/public/intl/messages/he-IL.json
+++ b/public/intl/messages/he-IL.json
@@ -41,6 +41,12 @@
       "value": "מנהל"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "חזרה"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Bounce rate"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "אישור סיסמה"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "מדינות"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "טווח תאריכים"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "הסרת אתר"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "שיחרור"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "אירועים"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "גולמי"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -379,6 +535,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -391,12 +559,24 @@
       "value": "התנתקות"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -409,6 +589,12 @@
       "value": "עוד"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -427,10 +613,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "מערכות הפעלה"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -439,12 +631,36 @@
       "value": "Owner"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "צפיות בדפים"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -497,6 +713,12 @@
       "value": "זמן אמת"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -515,6 +737,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -551,6 +779,18 @@
       "value": "Reset statistics"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -575,6 +815,12 @@
       "value": "Screens"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -611,6 +857,12 @@
       "value": "יום בודד"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -641,12 +893,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -701,12 +965,42 @@
       "value": "Toggle charts"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "קוד מעקב"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -719,6 +1013,12 @@
       "value": "לא ידוע"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -749,6 +1049,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -809,168 +1115,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/hi-IN.json b/public/intl/messages/hi-IN.json
index 043943854..df3bcb401 100644
--- a/public/intl/messages/hi-IN.json
+++ b/public/intl/messages/hi-IN.json
@@ -41,6 +41,12 @@
       "value": "प्रशासक"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "पीछे"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "उछाल दर"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "पासवर्ड की पुष्टि कीजिये"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "देश"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "तिथि सीमा"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "वेबसाइट हटाएं"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "खारिज कीजिये"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "स्पर्धाएँ"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "रॉ"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +543,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +567,24 @@
       "value": "लॉग आउट"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +597,12 @@
       "value": "और"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +621,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "ऑपरेटिंग सिस्टम"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +639,36 @@
       "value": "Owner"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "पृष्ठ दृश्य"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +721,12 @@
       "value": "वास्तव काल"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +745,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +787,18 @@
       "value": "Reset statistics"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -583,6 +823,12 @@
       "value": "Screens"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -619,6 +865,12 @@
       "value": "एक दिन"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +901,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +973,42 @@
       "value": "Toggle charts"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "ट्रैकिंग कोड"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +1021,12 @@
       "value": "अज्ञात"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1057,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1123,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/hr-HR.json b/public/intl/messages/hr-HR.json
index bfac159a7..8388dd486 100644
--- a/public/intl/messages/hr-HR.json
+++ b/public/intl/messages/hr-HR.json
@@ -41,6 +41,12 @@
       "value": "Administrator"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Natrag "
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Bounce rate"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Potvrdi lozinku"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "Countries"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Raspon datuma"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "Obriši web stranicu"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "Odbaci"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "Events"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "Raw"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +543,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +567,24 @@
       "value": "Odjava"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +597,12 @@
       "value": "Više"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +621,16 @@
       "value": "Ništa"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Operating systems"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +639,36 @@
       "value": "Vlasnik"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Page views"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +721,12 @@
       "value": "Stvarno vrijeme"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +745,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +787,18 @@
       "value": "Resetirati web stranicu"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -583,6 +823,12 @@
       "value": "Screens"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -619,6 +865,12 @@
       "value": "Jedan dan"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +901,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +973,42 @@
       "value": "Toggle charts"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Kod za praćenje"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +1021,12 @@
       "value": "Nepoznato"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1057,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1123,6 @@
       "value": "Jučer"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/hu-HU.json b/public/intl/messages/hu-HU.json
index 2d12b05b3..c3da1af06 100644
--- a/public/intl/messages/hu-HU.json
+++ b/public/intl/messages/hu-HU.json
@@ -41,6 +41,12 @@
       "value": "Adminisztrátor"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Vissza"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Visszafordulási arány"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Jelszó megerősítése"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "Országok"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Időintervallum"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "Weboldal eltávolítása"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "Mellőzés"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "Események"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "Nyers"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +543,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +567,24 @@
       "value": "Kijelentkezés"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +597,12 @@
       "value": "Bővebben"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +621,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Operációs rendszerek"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +639,36 @@
       "value": "Owner"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Oldalmegtekintések"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +721,12 @@
       "value": "Valós idejű"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +745,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +787,18 @@
       "value": "Reset statistics"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -583,6 +823,12 @@
       "value": "Screens"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -619,6 +865,12 @@
       "value": "Egy nap"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +901,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +973,42 @@
       "value": "Toggle charts"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Követési kód"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +1021,12 @@
       "value": "Ismeretlen"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1057,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1123,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/id-ID.json b/public/intl/messages/id-ID.json
index 9a8b5f412..eda5c0b3e 100644
--- a/public/intl/messages/id-ID.json
+++ b/public/intl/messages/id-ID.json
@@ -41,6 +41,12 @@
       "value": "Pengelola"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Kembali"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Rasio pentalan"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Konfirmasi kata sandi"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "Negara"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Rentang tanggal"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "Hapus situs web"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "Tutup"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "Perihal"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "Mentah"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -379,6 +535,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -391,12 +559,24 @@
       "value": "Keluar"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -409,6 +589,12 @@
       "value": "Lebih banyak"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -427,10 +613,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Sistem Operasi"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -439,12 +631,36 @@
       "value": "Pemilik"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Tampilan halaman"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -497,6 +713,12 @@
       "value": "Waktu nyata"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -515,6 +737,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -551,6 +779,18 @@
       "value": "Atur ulang statistik"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -575,6 +815,12 @@
       "value": "Layar"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -611,6 +857,12 @@
       "value": "Sehari"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -641,12 +893,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -701,12 +965,42 @@
       "value": "Buka grafik"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Kode lacak"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -719,6 +1013,12 @@
       "value": "Tidak diketahui"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -749,6 +1049,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -809,168 +1115,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/it-IT.json b/public/intl/messages/it-IT.json
index dcff2f880..bdc015f5a 100644
--- a/public/intl/messages/it-IT.json
+++ b/public/intl/messages/it-IT.json
@@ -41,6 +41,12 @@
       "value": "Amministratore"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Indietro"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Frequenza di rimbalzo"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Conferma password"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "Nazioni"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Periodo"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "Elimina sito"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "Scarta"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "Eventi"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "Raw"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +543,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +567,24 @@
       "value": "Esci"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +597,12 @@
       "value": "Dettagli"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +621,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Sistemi operativi"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +639,36 @@
       "value": "Proprietario"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Visualizzazioni di pagina"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +721,12 @@
       "value": "Tempo reale"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +745,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +787,18 @@
       "value": "Resetta le statistiche"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -583,6 +823,12 @@
       "value": "Screens"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -619,6 +865,12 @@
       "value": "Singolo giorno"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +901,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +973,42 @@
       "value": "Apri/Chiudi i grafici"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Codice di tracking"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +1021,12 @@
       "value": "Sconosciuto"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1057,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1123,6 @@
       "value": "Ieri"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/ja-JP.json b/public/intl/messages/ja-JP.json
index 16b17513e..4e2a8fc47 100644
--- a/public/intl/messages/ja-JP.json
+++ b/public/intl/messages/ja-JP.json
@@ -2,7 +2,7 @@
   "label.access-code": [
     {
       "type": 0,
-      "value": "Access code"
+      "value": "アクセスコード"
     }
   ],
   "label.actions": [
@@ -14,19 +14,19 @@
   "label.activity-log": [
     {
       "type": 0,
-      "value": "Activity log"
+      "value": "アクティビティログ"
     }
   ],
   "label.add": [
     {
       "type": 0,
-      "value": "Add"
+      "value": "追加"
     }
   ],
   "label.add-description": [
     {
       "type": 0,
-      "value": "Add description"
+      "value": "説明を追加"
     }
   ],
   "label.add-website": [
@@ -41,22 +41,34 @@
       "value": "管理者"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "直後"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
-      "value": "すべて表示"
+      "value": "すべて"
     }
   ],
   "label.all-time": [
     {
       "type": 0,
-      "value": "All time"
+      "value": "すべての時間帯"
     }
   ],
   "label.analytics": [
     {
       "type": 0,
-      "value": "Analytics"
+      "value": "アナリティクス"
+    }
+  ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "平均"
     }
   ],
   "label.average-visit-time": [
@@ -71,12 +83,30 @@
       "value": "戻る"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "直前"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "直帰率"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "故障"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "ブラウザ"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -92,61 +122,91 @@
   "label.change-password": [
     {
       "type": 0,
-      "value": "パスワード変更"
+      "value": "パスワードの変更"
     }
   ],
   "label.cities": [
     {
       "type": 0,
-      "value": "Cities"
+      "value": "都市"
+    }
+  ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "都市"
     }
   ],
   "label.clear-all": [
     {
       "type": 0,
-      "value": "Clear all"
+      "value": "すべてクリア"
     }
   ],
   "label.confirm": [
     {
       "type": 0,
-      "value": "Confirm"
+      "value": "確認"
     }
   ],
   "label.confirm-password": [
     {
       "type": 0,
-      "value": "パスワード（確認）"
+      "value": "パスワード(確認)"
+    }
+  ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "コンテンツ"
     }
   ],
   "label.continue": [
     {
       "type": 0,
-      "value": "Continue"
+      "value": "続ける"
     }
   ],
   "label.countries": [
+    {
+      "type": 0,
+      "value": "国名"
+    }
+  ],
+  "label.country": [
     {
       "type": 0,
       "value": "国"
     }
   ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "レポートの作成"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
-      "value": "Create team"
+      "value": "チームの作成"
     }
   ],
   "label.create-user": [
     {
       "type": 0,
-      "value": "Create user"
+      "value": "ユーザーの作成"
     }
   ],
   "label.created": [
     {
       "type": 0,
-      "value": "Created"
+      "value": "作成されました"
     }
   ],
   "label.current-password": [
@@ -158,7 +218,7 @@
   "label.custom-range": [
     {
       "type": 0,
-      "value": "期間を指定する"
+      "value": "範囲指定"
     }
   ],
   "label.dashboard": [
@@ -170,19 +230,31 @@
   "label.data": [
     {
       "type": 0,
-      "value": "Data"
+      "value": "データ"
+    }
+  ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "日付"
     }
   ],
   "label.date-range": [
     {
       "type": 0,
-      "value": "範囲指定"
+      "value": "期間"
+    }
+  ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "日"
     }
   ],
   "label.default-date-range": [
     {
       "type": 0,
-      "value": "最初に表示する期間"
+      "value": "デフォルトの期間"
     }
   ],
   "label.delete": [
@@ -194,13 +266,13 @@
   "label.delete-team": [
     {
       "type": 0,
-      "value": "Delete team"
+      "value": "チームの削除"
     }
   ],
   "label.delete-user": [
     {
       "type": 0,
-      "value": "Delete user"
+      "value": "ユーザーの削除"
     }
   ],
   "label.delete-website": [
@@ -209,6 +281,12 @@
       "value": "Webサイトの削除"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "説明"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -218,7 +296,13 @@
   "label.details": [
     {
       "type": 0,
-      "value": "Details"
+      "value": "詳細情報"
+    }
+  ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "デバイス"
     }
   ],
   "label.devices": [
@@ -230,7 +314,13 @@
   "label.dismiss": [
     {
       "type": 0,
-      "value": "無視する"
+      "value": "却下"
+    }
+  ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "を含まない"
     }
   ],
   "label.domain": [
@@ -242,7 +332,7 @@
   "label.dropoff": [
     {
       "type": 0,
-      "value": "Dropoff"
+      "value": "切り捨て"
     }
   ],
   "label.edit": [
@@ -254,25 +344,25 @@
   "label.edit-dashboard": [
     {
       "type": 0,
-      "value": "Edit dashboard"
+      "value": "ダッシュボードの編集"
     }
   ],
   "label.enable-share-url": [
     {
       "type": 0,
-      "value": "共有リンクを有効にする"
+      "value": "共有URLを有効にする"
     }
   ],
   "label.event": [
     {
       "type": 0,
-      "value": "Event"
+      "value": "イベント"
     }
   ],
   "label.event-data": [
     {
       "type": 0,
-      "value": "Event data"
+      "value": "イベントデータ"
     }
   ],
   "label.events": [
@@ -281,64 +371,130 @@
       "value": "イベント"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "偽"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
-      "value": "Field"
+      "value": "フィールド"
     }
   ],
   "label.fields": [
     {
       "type": 0,
-      "value": "Fields"
+      "value": "フィールド"
+    }
+  ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
     }
   ],
   "label.filter-combined": [
     {
       "type": 0,
-      "value": "パスまで"
+      "value": "統合"
     }
   ],
   "label.filter-raw": [
     {
       "type": 0,
-      "value": "すべて表示"
+      "value": "RAW"
+    }
+  ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "フィルター"
     }
   ],
   "label.funnel": [
     {
       "type": 0,
-      "value": "Funnel"
+      "value": "分析"
+    }
+  ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "超過"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "以上"
     }
   ],
   "label.insights": [
     {
       "type": 0,
-      "value": "Insights"
+      "value": "見通し"
+    }
+  ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "に等しい"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "に等しくない"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "未設定"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "設定済み"
     }
   ],
   "label.join": [
     {
       "type": 0,
-      "value": "Join"
+      "value": "参加"
     }
   ],
   "label.join-team": [
     {
       "type": 0,
-      "value": "Join team"
+      "value": "チームに参加"
     }
   ],
   "label.language": [
     {
       "type": 0,
-      "value": "Language"
+      "value": "言語"
     }
   ],
   "label.languages": [
     {
       "type": 0,
-      "value": "Languages"
+      "value": "言語"
     }
   ],
   "label.laptop": [
@@ -378,13 +534,25 @@
   "label.leave": [
     {
       "type": 0,
-      "value": "Leave"
+      "value": "離脱"
     }
   ],
   "label.leave-team": [
     {
       "type": 0,
-      "value": "Leave team"
+      "value": "チームを離脱"
+    }
+  ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "未満"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "以下"
     }
   ],
   "label.login": [
@@ -399,10 +567,22 @@
       "value": "ログアウト"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "最大"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
-      "value": "Members"
+      "value": "メンバー"
+    }
+  ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "最小"
     }
   ],
   "label.mobile": [
@@ -414,7 +594,13 @@
   "label.more": [
     {
       "type": 0,
-      "value": "さらに表示"
+      "value": "もっと見る"
+    }
+  ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "マイWebサイト"
     }
   ],
   "label.name": [
@@ -432,19 +618,43 @@
   "label.none": [
     {
       "type": 0,
-      "value": "None"
+      "value": "なし"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
       "value": "OS"
     }
   ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "概要"
+    }
+  ],
   "label.owner": [
     {
       "type": 0,
-      "value": "Owner"
+      "value": "所有者"
+    }
+  ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "ページ "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": "/"
+    },
+    {
+      "type": 1,
+      "value": "total"
     }
   ],
   "label.page-views": [
@@ -453,6 +663,12 @@
       "value": "閲覧数"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "ページタイトル"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -468,39 +684,35 @@
   "label.powered-by": [
     {
       "type": 0,
-      "value": "このシステムは "
+      "value": "Powered by "
     },
     {
       "type": 1,
       "value": "name"
-    },
-    {
-      "type": 0,
-      "value": " で実行されています。"
     }
   ],
   "label.profile": [
     {
       "type": 0,
-      "value": "プロファイル"
+      "value": "プロフィール"
     }
   ],
   "label.queries": [
     {
       "type": 0,
-      "value": "Queries"
+      "value": "クエリ"
     }
   ],
   "label.query": [
     {
       "type": 0,
-      "value": "Query"
+      "value": "クエリ"
     }
   ],
   "label.query-parameters": [
     {
       "type": 0,
-      "value": "Query parameters"
+      "value": "クエリパラメーター"
     }
   ],
   "label.realtime": [
@@ -509,6 +721,12 @@
       "value": "リアルタイム"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "リファラー"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -524,25 +742,31 @@
   "label.regenerate": [
     {
       "type": 0,
-      "value": "Regenerate"
+      "value": "再生成"
+    }
+  ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "地域"
     }
   ],
   "label.regions": [
     {
       "type": 0,
-      "value": "Regions"
+      "value": "地域"
     }
   ],
   "label.remove": [
     {
       "type": 0,
-      "value": "Remove"
+      "value": "削除"
     }
   ],
   "label.reports": [
     {
       "type": 0,
-      "value": "Reports"
+      "value": "レポート"
     }
   ],
   "label.required": [
@@ -560,19 +784,31 @@
   "label.reset-website": [
     {
       "type": 0,
-      "value": "Reset statistics"
+      "value": "Webサイトをリセットする"
+    }
+  ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "保持"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
     }
   ],
   "label.role": [
     {
       "type": 0,
-      "value": "Role"
+      "value": "ロール"
     }
   ],
   "label.run-query": [
     {
       "type": 0,
-      "value": "Run query"
+      "value": "クエリ実行"
     }
   ],
   "label.save": [
@@ -584,25 +820,31 @@
   "label.screens": [
     {
       "type": 0,
-      "value": "Screens"
+      "value": "画面サイズ"
+    }
+  ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
     }
   ],
   "label.select-date": [
     {
       "type": 0,
-      "value": "Select date"
+      "value": "日付を選択"
     }
   ],
   "label.select-website": [
     {
       "type": 0,
-      "value": "Select website"
+      "value": "Webサイトを選択"
     }
   ],
   "label.sessions": [
     {
       "type": 0,
-      "value": "Sessions"
+      "value": "セッション"
     }
   ],
   "label.settings": [
@@ -614,13 +856,19 @@
   "label.share-url": [
     {
       "type": 0,
-      "value": "共有リンク"
+      "value": "共有URL"
     }
   ],
   "label.single-day": [
     {
       "type": 0,
-      "value": "一日のみ"
+      "value": "一日"
+    }
+  ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "合計"
     }
   ],
   "label.tablet": [
@@ -632,43 +880,55 @@
   "label.team": [
     {
       "type": 0,
-      "value": "Team"
+      "value": "チーム"
     }
   ],
   "label.team-guest": [
     {
       "type": 0,
-      "value": "Team guest"
+      "value": "チームゲスト"
     }
   ],
   "label.team-id": [
     {
       "type": 0,
-      "value": "Team ID"
+      "value": "チームID"
     }
   ],
   "label.team-member": [
     {
       "type": 0,
-      "value": "Team member"
+      "value": "チームメンバー"
+    }
+  ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "チーム名"
     }
   ],
   "label.team-owner": [
     {
       "type": 0,
-      "value": "Team owner"
+      "value": "チーム所有者"
+    }
+  ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "チームのWebサイト"
     }
   ],
   "label.teams": [
     {
       "type": 0,
-      "value": "Teams"
+      "value": "チーム"
     }
   ],
   "label.theme": [
     {
       "type": 0,
-      "value": "Theme"
+      "value": "テーマ"
     }
   ],
   "label.this-month": [
@@ -698,7 +958,7 @@
   "label.title": [
     {
       "type": 0,
-      "value": "Title"
+      "value": "タイトル"
     }
   ],
   "label.today": [
@@ -710,7 +970,19 @@
   "label.toggle-charts": [
     {
       "type": 0,
-      "value": "Toggle charts"
+      "value": "グラフを切り替える"
+    }
+  ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "累計"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "総記録数"
     }
   ],
   "label.tracking-code": [
@@ -719,6 +991,24 @@
       "value": "トラッキングコード"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "真"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "種別"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "ユニーク"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -731,6 +1021,12 @@
       "value": "不明"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "無題"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -740,13 +1036,13 @@
   "label.urls": [
     {
       "type": 0,
-      "value": "URLs"
+      "value": "URL"
     }
   ],
   "label.user": [
     {
       "type": 0,
-      "value": "User"
+      "value": "ユーザー"
     }
   ],
   "label.username": [
@@ -758,49 +1054,55 @@
   "label.users": [
     {
       "type": 0,
-      "value": "Users"
+      "value": "ユーザー"
+    }
+  ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "値"
     }
   ],
   "label.view": [
     {
       "type": 0,
-      "value": "View"
+      "value": "表示"
     }
   ],
   "label.view-details": [
     {
       "type": 0,
-      "value": "詳細を見る"
+      "value": "詳細を表示"
     }
   ],
   "label.view-only": [
     {
       "type": 0,
-      "value": "View only"
+      "value": "表示のみ"
     }
   ],
   "label.views": [
     {
       "type": 0,
-      "value": "閲覧数"
+      "value": "表示"
     }
   ],
   "label.visitors": [
     {
       "type": 0,
-      "value": "訪問者数"
+      "value": "訪問者"
     }
   ],
   "label.website": [
     {
       "type": 0,
-      "value": "Website"
+      "value": "Webサイト"
     }
   ],
   "label.website-id": [
     {
       "type": 0,
-      "value": "Website ID"
+      "value": "WebサイトID"
     }
   ],
   "label.websites": [
@@ -812,175 +1114,13 @@
   "label.window": [
     {
       "type": 0,
-      "value": "Window"
+      "value": "ウィンドウ"
     }
   ],
   "label.yesterday": [
     {
       "type": 0,
-      "value": "Yesterday"
-    }
-  ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
+      "value": "昨日"
     }
   ],
   "message.active-users": [
@@ -990,7 +1130,31 @@
     },
     {
       "type": 0,
-      "value": "人が閲覧中です。"
+      "value": " "
+    },
+    {
+      "offset": 0,
+      "options": {
+        "one": {
+          "value": [
+            {
+              "type": 0,
+              "value": "アクティブな訪問者"
+            }
+          ]
+        },
+        "other": {
+          "value": [
+            {
+              "type": 0,
+              "value": "アクティブな訪問者"
+            }
+          ]
+        }
+      },
+      "pluralType": "cardinal",
+      "type": 6,
+      "value": "x"
     }
   ],
   "message.confirm-delete": [
@@ -1004,37 +1168,29 @@
     }
   ],
   "message.confirm-leave": [
-    {
-      "type": 0,
-      "value": "Are you sure you want to leave "
-    },
     {
       "type": 1,
       "value": "target"
     },
     {
       "type": 0,
-      "value": "?"
+      "value": "から離脱してもよろしいですか？"
     }
   ],
   "message.confirm-reset": [
-    {
-      "type": 0,
-      "value": "Are your sure you want to reset "
-    },
     {
       "type": 1,
       "value": "target"
     },
     {
       "type": 0,
-      "value": "'s statistics?"
+      "value": "をリセットしてもよろしいですか？"
     }
   ],
   "message.delete-account": [
     {
       "type": 0,
-      "value": "To delete this account, type "
+      "value": "このアカウントを削除するには、下のフォームに「"
     },
     {
       "type": 1,
@@ -1042,13 +1198,13 @@
     },
     {
       "type": 0,
-      "value": " in the box below to confirm."
+      "value": "」と入力してください。"
     }
   ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "To delete this website, type "
+      "value": "このWebサイトを削除するには、下のフォームに「"
     },
     {
       "type": 1,
@@ -1056,57 +1212,57 @@
     },
     {
       "type": 0,
-      "value": " in the box below to confirm."
+      "value": "」と入力してください。"
     }
   ],
   "message.delete-website-warning": [
     {
       "type": 0,
-      "value": "関連するすべてのデータも削除されます。"
+      "value": "Webサイトのデータがすべて削除されます。"
     }
   ],
   "message.error": [
     {
       "type": 0,
-      "value": "問題が発生しました。"
+      "value": "未知のエラーが発生しました。"
     }
   ],
   "message.event-log": [
     {
       "type": 1,
-      "value": "event"
+      "value": "url"
     },
     {
       "type": 0,
-      "value": " on "
+      "value": "の"
     },
     {
       "type": 1,
-      "value": "url"
+      "value": "event"
     }
   ],
   "message.go-to-settings": [
     {
       "type": 0,
-      "value": "設定する"
+      "value": "設定に移動する"
     }
   ],
   "message.incorrect-username-password": [
     {
       "type": 0,
-      "value": "ユーザー名/パスワードが正しくありません。"
+      "value": "ユーザー名またはパスワードが間違っています。"
     }
   ],
   "message.invalid-domain": [
     {
       "type": 0,
-      "value": "無効なドメイン"
+      "value": "無効なドメインです。http/httpsを含めないでください。"
     }
   ],
   "message.min-password-length": [
     {
       "type": 0,
-      "value": "Minimum length of "
+      "value": "最小文字数は"
     },
     {
       "type": 1,
@@ -1114,13 +1270,13 @@
     },
     {
       "type": 0,
-      "value": " characters"
+      "value": "文字です"
     }
   ],
   "message.new-version-available": [
     {
       "type": 0,
-      "value": "A new version of Umami "
+      "value": "Umamiの新しいバージョン"
     },
     {
       "type": 1,
@@ -1128,7 +1284,7 @@
     },
     {
       "type": 0,
-      "value": " is available!"
+      "value": "が利用可能です！"
     }
   ],
   "message.no-data-available": [
@@ -1140,37 +1296,37 @@
   "message.no-event-data": [
     {
       "type": 0,
-      "value": "No event data is available."
+      "value": "イベントデータがありません。"
     }
   ],
   "message.no-match-password": [
     {
       "type": 0,
-      "value": "パスワードが一致しません"
+      "value": "パスワードが一致しません。"
     }
   ],
   "message.no-results-found": [
     {
       "type": 0,
-      "value": "No results were found."
+      "value": "結果が見つかりません。"
     }
   ],
   "message.no-team-websites": [
     {
       "type": 0,
-      "value": "This team does not have any websites."
+      "value": "このチームにはWebサイトがありません。"
     }
   ],
   "message.no-teams": [
     {
       "type": 0,
-      "value": "You have not created any teams."
+      "value": "チームを作成していません。"
     }
   ],
   "message.no-users": [
     {
       "type": 0,
-      "value": "There are no users."
+      "value": "ユーザーが存在しません。"
     }
   ],
   "message.no-websites-configured": [
@@ -1182,13 +1338,13 @@
   "message.page-not-found": [
     {
       "type": 0,
-      "value": "ページが見つかりません。"
+      "value": "ページが見つかりません"
     }
   ],
   "message.reset-website": [
     {
       "type": 0,
-      "value": "To reset this website, type "
+      "value": "このWebサイトをリセットするには、下のフォームに「"
     },
     {
       "type": 1,
@@ -1196,63 +1352,69 @@
     },
     {
       "type": 0,
-      "value": " in the box below to confirm."
+      "value": "」と入力してください。"
     }
   ],
   "message.reset-website-warning": [
     {
       "type": 0,
-      "value": "All statistics for this website will be deleted, but your tracking code will remain intact."
+      "value": "このWebサイトの統計情報はすべて削除されますが、設定はそのまま残ります。"
     }
   ],
   "message.saved": [
     {
       "type": 0,
-      "value": "正常に保存されました。"
+      "value": "保存されました。"
     }
   ],
   "message.share-url": [
     {
       "type": 0,
-      "value": "これは"
-    },
-    {
-      "type": 1,
-      "value": "target"
-    },
-    {
-      "type": 0,
-      "value": "の共有リンクです。"
+      "value": "あなたのWebサイトの統計情報は次のURLで公開されています："
     }
   ],
   "message.team-already-member": [
     {
       "type": 0,
-      "value": "You are already a member of the team."
+      "value": "あなたはすでにチームのメンバーです。"
     }
   ],
   "message.team-not-found": [
     {
       "type": 0,
-      "value": "Team not found."
+      "value": "チームが見つかりません。"
     }
   ],
   "message.team-websites-info": [
     {
       "type": 0,
-      "value": "Websites can be viewed by anyone on the team."
+      "value": "Webサイトはチーム内の誰でも見ることができます。"
     }
   ],
   "message.tracking-code": [
     {
       "type": 0,
-      "value": "トラッキングコード"
+      "value": "このWebサイトの統計情報を追跡するには、HTMLの"
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "..."
+        }
+      ],
+      "type": 8,
+      "value": "head"
+    },
+    {
+      "type": 0,
+      "value": "セクションに以下のコードを記述します。"
     }
   ],
   "message.user-deleted": [
     {
       "type": 0,
-      "value": "User deleted."
+      "value": "ユーザーが削除されました。"
     }
   ],
   "message.visitor-log": [
@@ -1262,7 +1424,7 @@
     },
     {
       "type": 0,
-      "value": "（"
+      "value": "("
     },
     {
       "type": 1,
@@ -1270,7 +1432,7 @@
     },
     {
       "type": 0,
-      "value": "）で"
+      "value": ")で"
     },
     {
       "type": 1,
diff --git a/public/intl/messages/km-KH.json b/public/intl/messages/km-KH.json
index 938c3df8c..68c71ebbd 100644
--- a/public/intl/messages/km-KH.json
+++ b/public/intl/messages/km-KH.json
@@ -41,6 +41,12 @@
       "value": "អ្នកគ្រប់គ្រង"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "ថយក្រោយ"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "ចំនួនវិលត្រឡប់"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "បញ្ជាក់ពាក្យសម្ងាត់"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "ប្រទេស"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "ចន្លោះកាលបរិច្ឆេទ"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "លុបគេហទំព័រ"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "បដិសេធ"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "ព្រឹត្តិការណ៍"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "ដើម"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -379,6 +535,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -391,12 +559,24 @@
       "value": "ចេញ"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -409,6 +589,12 @@
       "value": "បន្ថែម"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -427,10 +613,16 @@
       "value": "មិនមាន"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "ប្រព័ន្ធប្រតិបត្តិការ"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -439,12 +631,36 @@
       "value": "ម្ចាស់"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "អ្នកមើលទំព័រ"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -497,6 +713,12 @@
       "value": "ឥលូវនេះ"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -515,6 +737,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -551,6 +779,18 @@
       "value": "កំណត់ស្ថិតិឡើងវិញ"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -575,6 +815,12 @@
       "value": "ប្រភេទឧបករណ៍"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -611,6 +857,12 @@
       "value": "ថ្ងៃតែមួយ"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -641,12 +893,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -701,12 +965,42 @@
       "value": "បិទ/បើកតារាង"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "លេខកូដតាមដាន"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -719,6 +1013,12 @@
       "value": "មិនស្គាល់"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -749,6 +1049,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -809,168 +1115,6 @@
       "value": "ម្សិលមិញ"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 0,
diff --git a/public/intl/messages/ko-KR.json b/public/intl/messages/ko-KR.json
index 4c7b4f539..5a3c90348 100644
--- a/public/intl/messages/ko-KR.json
+++ b/public/intl/messages/ko-KR.json
@@ -41,6 +41,12 @@
       "value": "관리자"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "뒤로"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "이탈률"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "비밀번호 확인"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "국가"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "날짜 범위"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "웹사이트 삭제"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "무시하기"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "이벤트"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "전체 보기"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +543,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +567,24 @@
       "value": "로그아웃"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +597,12 @@
       "value": "더 보기"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +621,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "운영체제"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +639,36 @@
       "value": "Owner"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "페이지 뷰(PV)"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -509,6 +725,12 @@
       "value": "실시간"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -527,6 +749,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -563,6 +791,18 @@
       "value": "Reset statistics"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -587,6 +827,12 @@
       "value": "Screens"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -623,6 +869,12 @@
       "value": "하루"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -653,12 +905,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -713,12 +977,42 @@
       "value": "Toggle charts"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "추적 코드"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -731,6 +1025,12 @@
       "value": "알 수 없음"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -761,6 +1061,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -821,168 +1127,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/lt-LT.json b/public/intl/messages/lt-LT.json
index 46e336669..6369cd3c1 100644
--- a/public/intl/messages/lt-LT.json
+++ b/public/intl/messages/lt-LT.json
@@ -41,6 +41,12 @@
       "value": "Administratorius"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Atgal"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Atmetimo rodiklis"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Patvirtinti slaptažodį"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "Šalys"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Laikotarpis"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "Ištrinti svetainę"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "Gerai"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "Įvykiai"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "Neapdoroti"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -492,6 +648,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -504,12 +672,24 @@
       "value": "Atsijungti"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -522,6 +702,12 @@
       "value": "Daugiau"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -540,10 +726,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Operacinės sistemos"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -552,12 +744,36 @@
       "value": "Savininkas"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Puslapių peržiūros"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -610,6 +826,12 @@
       "value": "Realiuoju laiku"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -628,6 +850,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -664,6 +892,18 @@
       "value": "Atstatyti statistikos duomenis"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -688,6 +928,12 @@
       "value": "Screens"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -724,6 +970,12 @@
       "value": "Viena diena"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -754,12 +1006,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -814,12 +1078,42 @@
       "value": "Rodyti / slėpti grafikus"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Sekimo kodas"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -832,6 +1126,12 @@
       "value": "Nežinoma"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -862,6 +1162,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -922,168 +1228,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "offset": 0,
diff --git a/public/intl/messages/mn-MN.json b/public/intl/messages/mn-MN.json
index 0c541031a..1a2210453 100644
--- a/public/intl/messages/mn-MN.json
+++ b/public/intl/messages/mn-MN.json
@@ -20,13 +20,13 @@
   "label.add": [
     {
       "type": 0,
-      "value": "Add"
+      "value": "Нэмэх"
     }
   ],
   "label.add-description": [
     {
       "type": 0,
-      "value": "Add description"
+      "value": "Тайлбар нэмэх"
     }
   ],
   "label.add-website": [
@@ -41,6 +41,12 @@
       "value": "Админ"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "Хойно"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Дундаж"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Буцах"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Өмнө"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Нэг хуудас үзээд гарсан"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Задаргаа"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Хөтөч"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Хотууд"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "Хот"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Шинэ нууц үгээ давтах"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Агуулах"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "Улс"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Улс"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Үүсгэх"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Тайлан үүсгэх"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Өгөгдөл"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Огноо"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Хугацааны муж"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Өдөр"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "Веб устгах"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Тайлбар"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Мэдээлэл"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Төхөөрөмж"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "Үл хэргэсэх"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Агуулахгүй"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -242,7 +332,7 @@
   "label.dropoff": [
     {
       "type": 0,
-      "value": "Dropoff"
+      "value": "Уналт"
     }
   ],
   "label.edit": [
@@ -266,13 +356,13 @@
   "label.event": [
     {
       "type": 0,
-      "value": "Event"
+      "value": "Үйлдэл"
     }
   ],
   "label.event-data": [
     {
       "type": 0,
-      "value": "Event data"
+      "value": "Үйлдлийн өгөгдөл"
     }
   ],
   "label.events": [
@@ -281,16 +371,28 @@
       "value": "Үйлдэл"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "Худал"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
-      "value": "Field"
+      "value": "Талбар"
     }
   ],
   "label.fields": [
     {
       "type": 0,
-      "value": "Fields"
+      "value": "Талбар"
+    }
+  ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Шүүлтүүр"
     }
   ],
   "label.filter-combined": [
@@ -305,16 +407,70 @@
       "value": "Түүхий"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Шүүлтүүр"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
-      "value": "Funnel"
+      "value": "Цутгал"
+    }
+  ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Хэрэглэгчдийн шилжилт, уналтын хэмжээг шижнлэх."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Их"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Их буюу тэнцүү"
     }
   ],
   "label.insights": [
     {
       "type": 0,
-      "value": "Insights"
+      "value": "Шинжлэх"
+    }
+  ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Өгөгдлөө хэсэгчлэн хуваах, шүүх байдлаар задлах шинжлэх."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Бол"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Биш"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Утга оноогоогүй"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Утга оноосон"
     }
   ],
   "label.join": [
@@ -387,6 +543,18 @@
       "value": "Багаас гарах"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Бага"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Бага буюу тэнцүү"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +567,24 @@
       "value": "Гарах"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Гишүүд"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +597,12 @@
       "value": "Цааш"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "Миний вебүүд"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +621,16 @@
       "value": "Байхгүй"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Үйлдлийн систем"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Тойм"
     }
   ],
   "label.owner": [
@@ -447,12 +639,36 @@
       "value": "Эзэмшигч"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Хуудас "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    },
+    {
+      "type": 0,
+      "value": "-с "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Хуудас үзсэн"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Хуудасны гарчиг"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +721,12 @@
       "value": "Яг одоо"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Чиглүүлэгч"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +745,12 @@
       "value": "Дахин үүсгэх"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Бүс"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -538,7 +766,7 @@
   "label.reports": [
     {
       "type": 0,
-      "value": "Reports"
+      "value": "Тайлан"
     }
   ],
   "label.required": [
@@ -559,6 +787,18 @@
       "value": "Тоон үзүүлэлтийг дахин эхлүүлэх"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Барилт"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Хэрэглэгчид таны веб рүү дахин хандах буюу хэрэглэгчидээ хэр тогтоож буйг хэмжих."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -568,7 +808,7 @@
   "label.run-query": [
     {
       "type": 0,
-      "value": "Run query"
+      "value": "Query ажиллуулах"
     }
   ],
   "label.save": [
@@ -583,10 +823,16 @@
       "value": "Дэлгэц"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Хайх"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
-      "value": "Select date"
+      "value": "Огноо сонгох"
     }
   ],
   "label.select-website": [
@@ -619,6 +865,12 @@
       "value": "Нэг өдөр"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Нийлбэр"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +901,24 @@
       "value": "Багийн гишүүн"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Багийн нэр"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Багийн эзэмшигч"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Багийн вебүүд"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +973,42 @@
       "value": "Графикийг харуулах/нуух"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Нийт"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Нийт мөриийн тоо"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Мөрдөх код"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "Үнэн"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Төрөл"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +1021,12 @@
       "value": "Тодорхойгүй"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Гарчиггүй"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1057,12 @@
       "value": "Хэрэглэгчид"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Утга"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -772,7 +1078,7 @@
   "label.view-only": [
     {
       "type": 0,
-      "value": "View only"
+      "value": "Зөвхөн үзэх"
     }
   ],
   "label.views": [
@@ -790,7 +1096,7 @@
   "label.website": [
     {
       "type": 0,
-      "value": "Website"
+      "value": "Веб"
     }
   ],
   "label.website-id": [
@@ -808,7 +1114,7 @@
   "label.window": [
     {
       "type": 0,
-      "value": "Window"
+      "value": "Цонх"
     }
   ],
   "label.yesterday": [
@@ -817,168 +1123,6 @@
       "value": "Өчигдөр"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 0,
@@ -1066,7 +1210,7 @@
   "message.delete-account": [
     {
       "type": 0,
-      "value": "To delete this account, type "
+      "value": "Энэ бүртгэлийг устгахын тулд доорх хэсэгт "
     },
     {
       "type": 1,
@@ -1074,13 +1218,13 @@
     },
     {
       "type": 0,
-      "value": " in the box below to confirm."
+      "value": " гэж бичиж баталгаажуулна уу."
     }
   ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "To delete this website, type "
+      "value": "Энэ вебийг устгахын тулд доорх хэсэгт "
     },
     {
       "type": 1,
@@ -1088,7 +1232,7 @@
     },
     {
       "type": 0,
-      "value": " in the box below to confirm."
+      "value": " гэж бичиж баталгаажуулна уу."
     }
   ],
   "message.delete-website-warning": [
@@ -1152,7 +1296,7 @@
   "message.new-version-available": [
     {
       "type": 0,
-      "value": "A new version of Umami "
+      "value": "Umami-н шинэ хувилбар "
     },
     {
       "type": 1,
@@ -1160,7 +1304,7 @@
     },
     {
       "type": 0,
-      "value": " is available!"
+      "value": " гарсан байна!"
     }
   ],
   "message.no-data-available": [
@@ -1172,7 +1316,7 @@
   "message.no-event-data": [
     {
       "type": 0,
-      "value": "No event data is available."
+      "value": "Үйлдлийн өгөгдөл алга."
     }
   ],
   "message.no-match-password": [
@@ -1184,7 +1328,7 @@
   "message.no-results-found": [
     {
       "type": 0,
-      "value": "No results were found."
+      "value": "Ямар ч үр дүн олдсонгүй."
     }
   ],
   "message.no-team-websites": [
diff --git a/public/intl/messages/ms-MY.json b/public/intl/messages/ms-MY.json
index 1bbcf235b..874f3a3dd 100644
--- a/public/intl/messages/ms-MY.json
+++ b/public/intl/messages/ms-MY.json
@@ -41,6 +41,12 @@
       "value": "Pentadbir"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Kembali"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Kadar lantunan"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Sahkan kata laluan"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "Negara"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Julat tarikh"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "Padam laman web"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "Ketepikan"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "Peristiwa"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "Mentah"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -379,6 +535,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -391,12 +559,24 @@
       "value": "Log keluar"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -409,6 +589,12 @@
       "value": "Lebih banyak lagi"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -427,10 +613,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Sistem operasi"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -439,12 +631,36 @@
       "value": "Owner"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Paparan halaman"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -497,6 +713,12 @@
       "value": "Siaran langsung"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -515,6 +737,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -551,6 +779,18 @@
       "value": "Reset statistics"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -575,6 +815,12 @@
       "value": "Screens"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -611,6 +857,12 @@
       "value": "Satu hari"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -641,12 +893,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -701,12 +965,42 @@
       "value": "Toggle charts"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Kod penjejakan"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -719,6 +1013,12 @@
       "value": "Tidak diketahui"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -749,6 +1049,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -809,168 +1115,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/my-MM.json b/public/intl/messages/my-MM.json
new file mode 100644
index 000000000..33b449793
--- /dev/null
+++ b/public/intl/messages/my-MM.json
@@ -0,0 +1,1440 @@
+{
+  "label.access-code": [
+    {
+      "type": 0,
+      "value": "ဝင်ခွင့်ကုဒ်"
+    }
+  ],
+  "label.actions": [
+    {
+      "type": 0,
+      "value": "လုပ်ဆောင်ချက်များ"
+    }
+  ],
+  "label.activity-log": [
+    {
+      "type": 0,
+      "value": "လုပ်ဆောင်ချက်စာရင်း"
+    }
+  ],
+  "label.add": [
+    {
+      "type": 0,
+      "value": "ထပ်ထည့်မည်"
+    }
+  ],
+  "label.add-description": [
+    {
+      "type": 0,
+      "value": "အကြောင်းအရာဖော်ပြချက် ထည့်မည်"
+    }
+  ],
+  "label.add-website": [
+    {
+      "type": 0,
+      "value": "ဝက်ဘ်ဆိုဒ်ထည့်မည်"
+    }
+  ],
+  "label.admin": [
+    {
+      "type": 0,
+      "value": "အက်ဒမင်"
+    }
+  ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "ပြီးနောက်"
+    }
+  ],
+  "label.all": [
+    {
+      "type": 0,
+      "value": "အားလုံး"
+    }
+  ],
+  "label.all-time": [
+    {
+      "type": 0,
+      "value": "အချိန်အစမှအခုထိ"
+    }
+  ],
+  "label.analytics": [
+    {
+      "type": 0,
+      "value": "အန်နလစ်တစ်"
+    }
+  ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "ပျမ်းမျှ"
+    }
+  ],
+  "label.average-visit-time": [
+    {
+      "type": 0,
+      "value": "ဝဘက်ဘ်ဆိုဒ်တွင် ပျမ်းမျှကုန်ဆုံးချိန်"
+    }
+  ],
+  "label.back": [
+    {
+      "type": 0,
+      "value": "နောက်သို့"
+    }
+  ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "မတိုင်မီ"
+    }
+  ],
+  "label.bounce-rate": [
+    {
+      "type": 0,
+      "value": "Bounce နှုန်း"
+    }
+  ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "ခွဲခြမ်းစိတ်ဖြာမှု"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
+  "label.browsers": [
+    {
+      "type": 0,
+      "value": "ဝက်ဘ်ဘရောင်ဇာများ"
+    }
+  ],
+  "label.cancel": [
+    {
+      "type": 0,
+      "value": "မလုပ်တော့ပါ"
+    }
+  ],
+  "label.change-password": [
+    {
+      "type": 0,
+      "value": "စကားဝှက် ပြောင်းမည်"
+    }
+  ],
+  "label.cities": [
+    {
+      "type": 0,
+      "value": "မြို့များ"
+    }
+  ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
+  "label.clear-all": [
+    {
+      "type": 0,
+      "value": "အားလုံးကိုဖျက်မည်"
+    }
+  ],
+  "label.confirm": [
+    {
+      "type": 0,
+      "value": "အတည်ပြုသည်"
+    }
+  ],
+  "label.confirm-password": [
+    {
+      "type": 0,
+      "value": "စကားဝှက်အတည်ပြုသည်"
+    }
+  ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "ပါဝင်သည်"
+    }
+  ],
+  "label.continue": [
+    {
+      "type": 0,
+      "value": "ဆက်သွားမည်"
+    }
+  ],
+  "label.countries": [
+    {
+      "type": 0,
+      "value": "နိုင်ငံများ"
+    }
+  ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "ရီပို့လုပ်မည်"
+    }
+  ],
+  "label.create-team": [
+    {
+      "type": 0,
+      "value": "Team ပြုလုပ်မည်"
+    }
+  ],
+  "label.create-user": [
+    {
+      "type": 0,
+      "value": "အသုံးပြုသူထည့်မည်"
+    }
+  ],
+  "label.created": [
+    {
+      "type": 0,
+      "value": "ပြုလုပ်ပြီးသော"
+    }
+  ],
+  "label.current-password": [
+    {
+      "type": 0,
+      "value": "လက်ရှိစကားဝှက်"
+    }
+  ],
+  "label.custom-range": [
+    {
+      "type": 0,
+      "value": "အချိန်အပိုင်းအခြားရွေးရန်"
+    }
+  ],
+  "label.dashboard": [
+    {
+      "type": 0,
+      "value": "ဒက်ရှ်ဘုတ်"
+    }
+  ],
+  "label.data": [
+    {
+      "type": 0,
+      "value": "ဒေတာ"
+    }
+  ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
+  "label.date-range": [
+    {
+      "type": 0,
+      "value": "ရက်အပိုင်းအခြား"
+    }
+  ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
+  "label.default-date-range": [
+    {
+      "type": 0,
+      "value": "ပုံသေ ရက်အပိုင်းအခြား"
+    }
+  ],
+  "label.delete": [
+    {
+      "type": 0,
+      "value": "ဖျက်မည်"
+    }
+  ],
+  "label.delete-team": [
+    {
+      "type": 0,
+      "value": "Team ကိုဖျက်မည်"
+    }
+  ],
+  "label.delete-user": [
+    {
+      "type": 0,
+      "value": "အသုံးပြုသူကိုဖျက်မည်"
+    }
+  ],
+  "label.delete-website": [
+    {
+      "type": 0,
+      "value": "ဝက်ဘ်ဆိုဒ်ကိုဖျက်မည်"
+    }
+  ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "ရှင်းပြချက်"
+    }
+  ],
+  "label.desktop": [
+    {
+      "type": 0,
+      "value": "စားပွဲတင်ကွန်ပျူတာ"
+    }
+  ],
+  "label.details": [
+    {
+      "type": 0,
+      "value": "အသေးစိတ်"
+    }
+  ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
+  "label.devices": [
+    {
+      "type": 0,
+      "value": "အသုံးပြုသည့် ကိရိယာများ"
+    }
+  ],
+  "label.dismiss": [
+    {
+      "type": 0,
+      "value": "ပိတ်ပါ"
+    }
+  ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "မပါဝင်ပါ"
+    }
+  ],
+  "label.domain": [
+    {
+      "type": 0,
+      "value": "ဒိုမိန်း"
+    }
+  ],
+  "label.dropoff": [
+    {
+      "type": 0,
+      "value": "Dropoff"
+    }
+  ],
+  "label.edit": [
+    {
+      "type": 0,
+      "value": "ပြုပြင်မည်"
+    }
+  ],
+  "label.edit-dashboard": [
+    {
+      "type": 0,
+      "value": "ဒက်ရှ်ဘုတ်ကို ပြုပြင်မည်"
+    }
+  ],
+  "label.enable-share-url": [
+    {
+      "type": 0,
+      "value": "ဝေငှခြင်းကိုလင့်ကို ဖွင့်မည်"
+    }
+  ],
+  "label.event": [
+    {
+      "type": 0,
+      "value": "အဖြစ်အပျက်"
+    }
+  ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "အဖြစ်အပျက် ဒေတာ"
+    }
+  ],
+  "label.events": [
+    {
+      "type": 0,
+      "value": "အဖြစ်အပျက်များ"
+    }
+  ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "မှားသည်"
+    }
+  ],
+  "label.field": [
+    {
+      "type": 0,
+      "value": "Field အမည်"
+    }
+  ],
+  "label.fields": [
+    {
+      "type": 0,
+      "value": "Field အမည်များ"
+    }
+  ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
+  "label.filter-combined": [
+    {
+      "type": 0,
+      "value": "ပေါင်းစပ်ပြီး"
+    }
+  ],
+  "label.filter-raw": [
+    {
+      "type": 0,
+      "value": "အရှိအတိုင်း"
+    }
+  ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filter များ"
+    }
+  ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "ဖန်နယ်"
+    }
+  ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "ထက်ပို၍ကြီးသည်"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "ထက်ပို၍ကြီးသည်သို့မဟုတ်တူသည်"
+    }
+  ],
+  "label.insights": [
+    {
+      "type": 0,
+      "value": "အသေးစိတ်သိမြင်နိုင်ရန်"
+    }
+  ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
+  "label.join": [
+    {
+      "type": 0,
+      "value": "ဝင်မည်"
+    }
+  ],
+  "label.join-team": [
+    {
+      "type": 0,
+      "value": "အသင်းဝင်မည်"
+    }
+  ],
+  "label.language": [
+    {
+      "type": 0,
+      "value": "ဘာသာစကား"
+    }
+  ],
+  "label.languages": [
+    {
+      "type": 0,
+      "value": "ဘာသာစကားများ"
+    }
+  ],
+  "label.laptop": [
+    {
+      "type": 0,
+      "value": "လက်တော့ပ်"
+    }
+  ],
+  "label.last-days": [
+    {
+      "type": 0,
+      "value": "လွန်ခဲ့သော "
+    },
+    {
+      "type": 1,
+      "value": "x"
+    },
+    {
+      "type": 0,
+      "value": " ရက်က"
+    }
+  ],
+  "label.last-hours": [
+    {
+      "type": 0,
+      "value": "လွန်ခဲ့သော "
+    },
+    {
+      "type": 1,
+      "value": "x"
+    },
+    {
+      "type": 0,
+      "value": " နာရီက"
+    }
+  ],
+  "label.leave": [
+    {
+      "type": 0,
+      "value": "ထွက်မည်"
+    }
+  ],
+  "label.leave-team": [
+    {
+      "type": 0,
+      "value": "အသင်းမှထွက်မည်"
+    }
+  ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "ထက်ပို၍ငယ်သည်"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "ထက်ပို၍ငယ်သည်သို့မဟုတ်တူသည်"
+    }
+  ],
+  "label.login": [
+    {
+      "type": 0,
+      "value": "လော့ဂ်အင်"
+    }
+  ],
+  "label.logout": [
+    {
+      "type": 0,
+      "value": "လော့ဂ်အောက်လုပ်မည်"
+    }
+  ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "အများဆုံး"
+    }
+  ],
+  "label.members": [
+    {
+      "type": 0,
+      "value": "အဖွဲ့ဝင်များ"
+    }
+  ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "အနည်းဆုံး"
+    }
+  ],
+  "label.mobile": [
+    {
+      "type": 0,
+      "value": "မိုဘိုင်း"
+    }
+  ],
+  "label.more": [
+    {
+      "type": 0,
+      "value": "နောက်ထပ်"
+    }
+  ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
+  "label.name": [
+    {
+      "type": 0,
+      "value": "အမည်"
+    }
+  ],
+  "label.new-password": [
+    {
+      "type": 0,
+      "value": "စကားဝှက်အသစ်"
+    }
+  ],
+  "label.none": [
+    {
+      "type": 0,
+      "value": "မရှိပါ"
+    }
+  ],
+  "label.os": [
+    {
+      "type": 0,
+      "value": "ကွန်ပျူတာလည်ပတ်မှုစနစ်"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "အပေါ်ယံမြင်ကွင်း"
+    }
+  ],
+  "label.owner": [
+    {
+      "type": 0,
+      "value": "ပိုင်ဆိုင်သူ"
+    }
+  ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
+  "label.page-views": [
+    {
+      "type": 0,
+      "value": "ဝင်ရောက်ကြည့်ရှုသူ"
+    }
+  ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
+  "label.pages": [
+    {
+      "type": 0,
+      "value": "စာမျက်နှာများ"
+    }
+  ],
+  "label.password": [
+    {
+      "type": 0,
+      "value": "စကားဝှက်"
+    }
+  ],
+  "label.powered-by": [
+    {
+      "type": 1,
+      "value": "name"
+    },
+    {
+      "type": 0,
+      "value": " ထောက်ပံ့သည်"
+    }
+  ],
+  "label.profile": [
+    {
+      "type": 0,
+      "value": "ပရိုဖိုင်း"
+    }
+  ],
+  "label.queries": [
+    {
+      "type": 0,
+      "value": "Queries (ကွာရီများ)"
+    }
+  ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query (ကွာရီ)"
+    }
+  ],
+  "label.query-parameters": [
+    {
+      "type": 0,
+      "value": "Query parameters (ကွာရီပါရာမီတာများ)"
+    }
+  ],
+  "label.realtime": [
+    {
+      "type": 0,
+      "value": "အချိန်နှင့်တပြေးညီ"
+    }
+  ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
+  "label.referrers": [
+    {
+      "type": 0,
+      "value": "ရည်ညွှန်းမှုများ"
+    }
+  ],
+  "label.refresh": [
+    {
+      "type": 0,
+      "value": "Refresh လုပ်မည်"
+    }
+  ],
+  "label.regenerate": [
+    {
+      "type": 0,
+      "value": "ပြန်ထုတ်မည်"
+    }
+  ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
+  "label.regions": [
+    {
+      "type": 0,
+      "value": "ဒေသများ"
+    }
+  ],
+  "label.remove": [
+    {
+      "type": 0,
+      "value": "ဖျက်မည်"
+    }
+  ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "တင်ပြမှုများ"
+    }
+  ],
+  "label.required": [
+    {
+      "type": 0,
+      "value": "လိုအပ်သည်"
+    }
+  ],
+  "label.reset": [
+    {
+      "type": 0,
+      "value": "ပြန်စမည်"
+    }
+  ],
+  "label.reset-website": [
+    {
+      "type": 0,
+      "value": "ဝက်ဘ်ဆိုဒ်ဒေတာကိုဖျက်မည်"
+    }
+  ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
+  "label.role": [
+    {
+      "type": 0,
+      "value": "အခန်းကဏ္ဍ"
+    }
+  ],
+  "label.run-query": [
+    {
+      "type": 0,
+      "value": "Query ကိုလုပ်ဆောင်မည်"
+    }
+  ],
+  "label.save": [
+    {
+      "type": 0,
+      "value": "သိမ်းဆည်းမည်"
+    }
+  ],
+  "label.screens": [
+    {
+      "type": 0,
+      "value": "မြင်ကွင်းများ"
+    }
+  ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "ရက်ရွေးပါ"
+    }
+  ],
+  "label.select-website": [
+    {
+      "type": 0,
+      "value": "ဝဘက်ဘ်ဆိုဒ်ရွေးပါ"
+    }
+  ],
+  "label.sessions": [
+    {
+      "type": 0,
+      "value": "ဆက်ရှင်များ"
+    }
+  ],
+  "label.settings": [
+    {
+      "type": 0,
+      "value": "ဆက်တင်များ"
+    }
+  ],
+  "label.share-url": [
+    {
+      "type": 0,
+      "value": "URL ကိုရှဲမည်"
+    }
+  ],
+  "label.single-day": [
+    {
+      "type": 0,
+      "value": "တစ်ရက်အတွင်း"
+    }
+  ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "ပေါင်းလဒ်"
+    }
+  ],
+  "label.tablet": [
+    {
+      "type": 0,
+      "value": "တက်ဘလက်"
+    }
+  ],
+  "label.team": [
+    {
+      "type": 0,
+      "value": "အသင်း"
+    }
+  ],
+  "label.team-guest": [
+    {
+      "type": 0,
+      "value": "အသင်း ဧည့်သည်"
+    }
+  ],
+  "label.team-id": [
+    {
+      "type": 0,
+      "value": "အသင်း အိုင်ဒီ"
+    }
+  ],
+  "label.team-member": [
+    {
+      "type": 0,
+      "value": "အသင်းဝင်"
+    }
+  ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
+  "label.team-owner": [
+    {
+      "type": 0,
+      "value": "အသင်းကိုပိုင်ဆိုင်သူ"
+    }
+  ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
+  "label.teams": [
+    {
+      "type": 0,
+      "value": "အသင်းများ"
+    }
+  ],
+  "label.theme": [
+    {
+      "type": 0,
+      "value": "Theme (အပြင်အဆင်)"
+    }
+  ],
+  "label.this-month": [
+    {
+      "type": 0,
+      "value": "ယခုလ"
+    }
+  ],
+  "label.this-week": [
+    {
+      "type": 0,
+      "value": "ယခုအပတ်"
+    }
+  ],
+  "label.this-year": [
+    {
+      "type": 0,
+      "value": "ယခုနှစ်"
+    }
+  ],
+  "label.timezone": [
+    {
+      "type": 0,
+      "value": "အချိန်ဇုန်"
+    }
+  ],
+  "label.title": [
+    {
+      "type": 0,
+      "value": "ခေါင်းစဥ်"
+    }
+  ],
+  "label.today": [
+    {
+      "type": 0,
+      "value": "ယနေ့"
+    }
+  ],
+  "label.toggle-charts": [
+    {
+      "type": 0,
+      "value": "ဇယားများကို အဖွင့်အပိတ်လုပ်မည်"
+    }
+  ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "စုစုပေါင်း"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "မှတ်တမ်းစုစုပေါင်း"
+    }
+  ],
+  "label.tracking-code": [
+    {
+      "type": 0,
+      "value": "ထရက်လုပ်သည့် ကုဒ်"
+    }
+  ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "မှန်သည်"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "အမျိုးအစား"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
+  "label.unique-visitors": [
+    {
+      "type": 0,
+      "value": "ဝင်ရောက်သူ (ထပ်ခြင်းမရှိ)"
+    }
+  ],
+  "label.unknown": [
+    {
+      "type": 0,
+      "value": "မသိသော"
+    }
+  ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "ခေါင်းစဉ်မရှိ"
+    }
+  ],
+  "label.url": [
+    {
+      "type": 0,
+      "value": "URL"
+    }
+  ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URL များ"
+    }
+  ],
+  "label.user": [
+    {
+      "type": 0,
+      "value": "အသုံးပြုသူ"
+    }
+  ],
+  "label.username": [
+    {
+      "type": 0,
+      "value": "အသုံးပြုသူအမည်"
+    }
+  ],
+  "label.users": [
+    {
+      "type": 0,
+      "value": "အသုံးပြုသူများ"
+    }
+  ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "တန်ဖိုး"
+    }
+  ],
+  "label.view": [
+    {
+      "type": 0,
+      "value": "ဝင်ရောက်ကြည့်ရှုမှု"
+    }
+  ],
+  "label.view-details": [
+    {
+      "type": 0,
+      "value": "အသေးစိတ်ကို ကြည့်ရှုမည်"
+    }
+  ],
+  "label.view-only": [
+    {
+      "type": 0,
+      "value": "ဝင်ရောက်ကြည့်ရှုမှုများသာ"
+    }
+  ],
+  "label.views": [
+    {
+      "type": 0,
+      "value": "ဝင်ရောက်ကြည့်ရှုမှုများ"
+    }
+  ],
+  "label.visitors": [
+    {
+      "type": 0,
+      "value": "ဝင်ရောက်ကြည့်ရှုသူများ"
+    }
+  ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "ဝက်ဘ်ဆိုဒ်"
+    }
+  ],
+  "label.website-id": [
+    {
+      "type": 0,
+      "value": "ဝက်ဘ်ဆိုဒ် အိုင်ဒီ"
+    }
+  ],
+  "label.websites": [
+    {
+      "type": 0,
+      "value": "ဝက်ဘ်ဆိုဒ်များ"
+    }
+  ],
+  "label.window": [
+    {
+      "type": 0,
+      "value": "ဝင်းဒိုး"
+    }
+  ],
+  "label.yesterday": [
+    {
+      "type": 0,
+      "value": "မနေ့က"
+    }
+  ],
+  "message.active-users": [
+    {
+      "type": 1,
+      "value": "x"
+    },
+    {
+      "type": 0,
+      "value": " လက်ရှိအသုံးပြုနေသူ "
+    },
+    {
+      "offset": 0,
+      "options": {
+        "one": {
+          "value": [
+            {
+              "type": 0,
+              "value": "ယောက်"
+            }
+          ]
+        },
+        "other": {
+          "value": [
+            {
+              "type": 0,
+              "value": "ယောက်"
+            }
+          ]
+        }
+      },
+      "pluralType": "cardinal",
+      "type": 6,
+      "value": "x"
+    }
+  ],
+  "message.confirm-delete": [
+    {
+      "type": 1,
+      "value": "target"
+    },
+    {
+      "type": 0,
+      "value": " ကို ဖျက်ရန် သေချာပါသလား?"
+    }
+  ],
+  "message.confirm-leave": [
+    {
+      "type": 1,
+      "value": "target"
+    },
+    {
+      "type": 0,
+      "value": " ကို ထွက်ရန် သေချာပါသလား?"
+    }
+  ],
+  "message.confirm-reset": [
+    {
+      "type": 1,
+      "value": "target"
+    },
+    {
+      "type": 0,
+      "value": " ကို ဖျက်၍ပြန်စလုပ်ရန် သေချာပါသလား?"
+    }
+  ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "ဤအကောင့်ကိုဖျက်ရန် "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " ကို ရိုက်ထည့်ပေးပါ."
+    }
+  ],
+  "message.delete-website": [
+    {
+      "type": 0,
+      "value": "ဤ ဝက်ဘ်ဆိုဒ်ကိုဖျက်ရန် "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " ကို ရိုက်ထည့်ပေးပါ"
+    }
+  ],
+  "message.delete-website-warning": [
+    {
+      "type": 0,
+      "value": "ဝက်ဘ်ဆိုဒ် ဒေတာအကုန် ဖျက်မည်"
+    }
+  ],
+  "message.error": [
+    {
+      "type": 0,
+      "value": "မှားယွင်းမှုတစ်ခု ရှိသွားပါသည်"
+    }
+  ],
+  "message.event-log": [
+    {
+      "type": 1,
+      "value": "url"
+    },
+    {
+      "type": 0,
+      "value": " တွင် "
+    },
+    {
+      "type": 1,
+      "value": "event"
+    }
+  ],
+  "message.go-to-settings": [
+    {
+      "type": 0,
+      "value": "ဆက်တင်သို့ သွားရန်"
+    }
+  ],
+  "message.incorrect-username-password": [
+    {
+      "type": 0,
+      "value": "အသုံးပြုသူအမည် သို့မဟုတ် စကားဝှက် မှားနေသည်"
+    }
+  ],
+  "message.invalid-domain": [
+    {
+      "type": 0,
+      "value": "ဒိုမိန်း မမှန်ပါ http/https. မပါရပါ"
+    }
+  ],
+  "message.min-password-length": [
+    {
+      "type": 0,
+      "value": "အနည်းဆုံး "
+    },
+    {
+      "type": 1,
+      "value": "n"
+    },
+    {
+      "type": 0,
+      "value": " character ရှိရမည်"
+    }
+  ],
+  "message.new-version-available": [
+    {
+      "type": 0,
+      "value": "အူမာမီ "
+    },
+    {
+      "type": 1,
+      "value": "version"
+    },
+    {
+      "type": 0,
+      "value": " အသစ်ထွက်နေပါပြီ"
+    }
+  ],
+  "message.no-data-available": [
+    {
+      "type": 0,
+      "value": "ဒေတာ မရှိပါ"
+    }
+  ],
+  "message.no-event-data": [
+    {
+      "type": 0,
+      "value": "အဖြစ်အပျက်ဒေတာ မရှိပါ"
+    }
+  ],
+  "message.no-match-password": [
+    {
+      "type": 0,
+      "value": "စကားဝှက် မှားနေသည်"
+    }
+  ],
+  "message.no-results-found": [
+    {
+      "type": 0,
+      "value": "ရလဒ်မရှိပါ"
+    }
+  ],
+  "message.no-team-websites": [
+    {
+      "type": 0,
+      "value": "ဤအသင်းတွင် ဝက်ဘ်ဆိုက်မရှိသေးပါ"
+    }
+  ],
+  "message.no-teams": [
+    {
+      "type": 0,
+      "value": "အသင်း မပြုလုပ်ရသေးပါ"
+    }
+  ],
+  "message.no-users": [
+    {
+      "type": 0,
+      "value": "အသုံးပြုသူ မရှိသေးပါ"
+    }
+  ],
+  "message.no-websites-configured": [
+    {
+      "type": 0,
+      "value": "ဝက်ဘ်ဆိုဒ်တစ်ခုမှ မထည့်ရသေးပါ"
+    }
+  ],
+  "message.page-not-found": [
+    {
+      "type": 0,
+      "value": "ဤစာမျက်နှာသည် မရှိပါ"
+    }
+  ],
+  "message.reset-website": [
+    {
+      "type": 0,
+      "value": "ဤ ဝက်ဘ်ဆိုဒ်ဒေတာကိုဖျက်၍ ပြန်စလုပ်ရန် အောက်တွင် "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " ကို ရိုက်ထည့်ပေးပါ"
+    }
+  ],
+  "message.reset-website-warning": [
+    {
+      "type": 0,
+      "value": "ဤဝက်ဘ်ဆိုဒ်က စာရင်းအချက်အလက်များကို ဖျက်မည်၊ ဆက်တင်ဒေတာများ မပါပါ"
+    }
+  ],
+  "message.saved": [
+    {
+      "type": 0,
+      "value": "မှတ်သားပြီး"
+    }
+  ],
+  "message.share-url": [
+    {
+      "type": 0,
+      "value": "သင့်ဝက်ဆိုဒ်ဘ်၏ စာရင်းအချက်အလက်များကို အောက်ပါ URL တွင် ဝင်ရောက်ကြည့်ရှုနိုင်သည်"
+    }
+  ],
+  "message.team-already-member": [
+    {
+      "type": 0,
+      "value": "ဤအသင်းတွင် ဝင်ပြီးသားဖြစ်နေသည်"
+    }
+  ],
+  "message.team-not-found": [
+    {
+      "type": 0,
+      "value": "အသင်း မရှိပါ"
+    }
+  ],
+  "message.team-websites-info": [
+    {
+      "type": 0,
+      "value": "ဤဝက်ဘ်ဆိုဒ်များကို အသင်းထဲမှ လူတိုင်းဝင်ကြည့်နိုင်သည်"
+    }
+  ],
+  "message.tracking-code": [
+    {
+      "type": 0,
+      "value": "ဤဝက်ဘ်ဆိုဒ်၏ ဒေတာကိုကောက်ခံရန် အောက်ပါ code ကို သင်၏ HTML တွင်ထည့်ပါ"
+    }
+  ],
+  "message.user-deleted": [
+    {
+      "type": 0,
+      "value": "အသုံးပြုသူ ဖျက်ပြီးပါပြီ"
+    }
+  ],
+  "message.visitor-log": [
+    {
+      "type": 1,
+      "value": "country"
+    },
+    {
+      "type": 0,
+      "value": " မှ "
+    },
+    {
+      "type": 1,
+      "value": "browser"
+    },
+    {
+      "type": 0,
+      "value": " ဖြင့် "
+    },
+    {
+      "type": 1,
+      "value": "os"
+    },
+    {
+      "type": 0,
+      "value": " "
+    },
+    {
+      "type": 1,
+      "value": "device"
+    },
+    {
+      "type": 0,
+      "value": " တွင် ဝင်ရောက်ကြည့်ရှုသူ"
+    }
+  ]
+}
diff --git a/public/intl/messages/nb-NO.json b/public/intl/messages/nb-NO.json
index 69d9c6dca..010bd2ad4 100644
--- a/public/intl/messages/nb-NO.json
+++ b/public/intl/messages/nb-NO.json
@@ -41,6 +41,12 @@
       "value": "Administrator"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Tilbake"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Avvisningsfrekvens"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Godkjenn passord"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "Land"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Datointervall"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "Slett nettstedet"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "Avbryt"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "Arrangementer"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "Rå"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +543,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +567,24 @@
       "value": "Logg ut"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +597,12 @@
       "value": "Mer"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +621,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Operativsystemer"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +639,36 @@
       "value": "Eier"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Sidevisninger"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +721,12 @@
       "value": "Sanntid"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +745,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +787,18 @@
       "value": "Nullstill statistikk"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -583,6 +823,12 @@
       "value": "Screens"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -619,6 +865,12 @@
       "value": "Enkelt dag"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +901,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +973,42 @@
       "value": "Veksle grafer"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Sporingskode"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +1021,12 @@
       "value": "Ukjent"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1057,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1123,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/nl-NL.json b/public/intl/messages/nl-NL.json
index 878dddfaa..66c5f4faf 100644
--- a/public/intl/messages/nl-NL.json
+++ b/public/intl/messages/nl-NL.json
@@ -41,6 +41,12 @@
       "value": "Beheerder"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Terug"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Bouncepercentage"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Steden"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Wachtwoord bevestigen"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "Landen"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Gegevens"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Datumbereik"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "Website verwijderen"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Informatie"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "Negeren"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "Gebeurtenissen"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "Ruw"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +543,18 @@
       "value": "Verlaat team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +567,24 @@
       "value": "Uitloggen"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Gebruikers"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +597,12 @@
       "value": "Toon meer"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +621,16 @@
       "value": "Geen"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Besturingssystemen"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +639,36 @@
       "value": "Eigenaar"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Paginaweergaven"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +721,12 @@
       "value": "Actueel"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +745,12 @@
       "value": "Opnieuw genereren"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +787,18 @@
       "value": "Statistieken opnieuw instellen"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -583,6 +823,12 @@
       "value": "Schermen"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -619,6 +865,12 @@
       "value": "Enkele dag"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +901,24 @@
       "value": "Teamlid"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Teameigenaar"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +973,42 @@
       "value": "Grafieken tonen/verbergen"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Volgcode"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +1021,12 @@
       "value": "Onbekend"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1057,12 @@
       "value": "Gebruikers"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1123,6 @@
       "value": "Gisteren"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/pl-PL.json b/public/intl/messages/pl-PL.json
index e88b6a83a..4621a918d 100644
--- a/public/intl/messages/pl-PL.json
+++ b/public/intl/messages/pl-PL.json
@@ -41,6 +41,12 @@
       "value": "Administrator"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "Po"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analityka"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Średnia"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Powrót"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Przed"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Współczynnik odrzuceń"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Rozbicie"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Miasta"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Potwierdź hasło"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Zawiera"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "Kraje"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Stwórz raport"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Zakres dat"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "Usuń witrynę"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Opis"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Szczegóły"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "Odrzuć"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Nie zawiera"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "Zdarzenia"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "Fałsz"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Pola"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "Surowe dane"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filtry"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Lejek"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Większe niż"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Większe niż lub równe"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Równe"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Nie jest równe"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +543,18 @@
       "value": "Opuść zespół"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Mniejsze niż"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Mniejsze niż lub równe"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +567,24 @@
       "value": "Wyloguj"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Maks"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Członkowie"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +597,12 @@
       "value": "Więcej"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +621,16 @@
       "value": "Brak"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "System operacyjny"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Przegląd"
     }
   ],
   "label.owner": [
@@ -447,12 +639,36 @@
       "value": "Właściciel"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Wyświetlenia strony"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +721,12 @@
       "value": "Czas rzeczywisty"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +745,12 @@
       "value": "Wygeneruj ponownie"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +787,18 @@
       "value": "Zresetuj statystyki"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -583,6 +823,12 @@
       "value": "Ekrany"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -619,6 +865,12 @@
       "value": "W tym dniu"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Suma"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +901,24 @@
       "value": "Członek zespołu"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Właściciel zespołu"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +973,42 @@
       "value": "Przełącz wykresy"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "W sumie"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Suma rekordów"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Kod śledzenia"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "Prawda"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Typ"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unikalne"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +1021,12 @@
       "value": "Nieznany"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Bez tytułu"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1057,12 @@
       "value": "Użytkownicy"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Wartość"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1123,6 @@
       "value": "Wczoraj"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "Po"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Średnia"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Przed"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Rozbicie"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Zawiera"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Stwórz raport"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Opis"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Nie zawiera"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Nie jest równe"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Równe"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "Fałsz"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filtry"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Większe niż"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Większe niż lub równe"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Mniejsze niż"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Mniejsze niż lub równe"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Maks"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Przegląd"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Suma"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "W sumie"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Suma rekordów"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "Prawda"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Typ"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unikalne"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Bez tytułu"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Wartość"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/pt-BR.json b/public/intl/messages/pt-BR.json
index e3d7e33da..790e13161 100644
--- a/public/intl/messages/pt-BR.json
+++ b/public/intl/messages/pt-BR.json
@@ -41,6 +41,12 @@
       "value": "Administrador"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "Depois"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Estatísticas"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Voltar"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Antes"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Taxa de rejeição"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cidades"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Confirme a nova senha"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "Países"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Criar relatório"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Intervalo de datas"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "Remover site"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Descrição"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Detalhes"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "Dispensar"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "Eventos"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Campos"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "Dados brutos"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funil"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Maior que"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Maior que ou igual"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +543,18 @@
       "value": "Sair do time"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Menor que"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Menor que ou igual"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +567,24 @@
       "value": "Sair"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Membros"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +597,12 @@
       "value": "Mais"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +621,16 @@
       "value": "Nenhum"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Sistemas operacionais"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +639,36 @@
       "value": "Proprietário"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Visualizações de página"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +721,12 @@
       "value": "Tempo real"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +745,12 @@
       "value": "Regerar"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +787,18 @@
       "value": "Redefinir estatísticas"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -583,6 +823,12 @@
       "value": "Telas"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -619,6 +865,12 @@
       "value": "Dia específico"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +901,24 @@
       "value": "Membro"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Proprietário"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +973,42 @@
       "value": "Mostrar/Esconder gráficos"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Código de rastreamento"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Tipo"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Único"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +1021,12 @@
       "value": "Desconhecido"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Sem título"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1057,12 @@
       "value": "Usuários"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Valor"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1123,6 @@
       "value": "Ontem"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "Depois"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Antes"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Criar relatório"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Descrição"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Maior que"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Maior que ou igual"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Menor que"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Menor que ou igual"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Tipo"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Único"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Sem título"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Valor"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/pt-PT.json b/public/intl/messages/pt-PT.json
index 3120b272c..511d74fc6 100644
--- a/public/intl/messages/pt-PT.json
+++ b/public/intl/messages/pt-PT.json
@@ -41,6 +41,12 @@
       "value": "Administrador"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Voltar"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Taxa de rejeição"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Confirmar senha"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "Países"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Intervalo de datas"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "Eliminar website"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "Ignorar"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "Eventos"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "Dados brutos"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +543,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +567,24 @@
       "value": "Sair"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +597,12 @@
       "value": "Mais"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +621,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Sistemas operativos"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +639,36 @@
       "value": "Proprietário"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Visualizações da página"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +721,12 @@
       "value": "Tempo real"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +745,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +787,18 @@
       "value": "Repor estatísticas"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -583,6 +823,12 @@
       "value": "Screens"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -619,6 +865,12 @@
       "value": "Dia único"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +901,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +973,42 @@
       "value": "Alternar gráficos"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Código de rastreamento"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +1021,12 @@
       "value": "Desconhecido"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1057,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1123,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/ro-RO.json b/public/intl/messages/ro-RO.json
index 0694cf520..9181c1035 100644
--- a/public/intl/messages/ro-RO.json
+++ b/public/intl/messages/ro-RO.json
@@ -41,6 +41,12 @@
       "value": "Administrator"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Înapoi"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Rata de respingere"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Confirmare parolă"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "Țări"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Interval de date"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "Ștergere site web"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "Renunță"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "Evenimente"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "Brut"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +543,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +567,24 @@
       "value": "Iesire din cont"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +597,12 @@
       "value": "Mai mult"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +621,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Sisteme de operare"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +639,36 @@
       "value": "Owner"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Vizualizări de pagină"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +721,12 @@
       "value": "Realtime"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +745,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +787,18 @@
       "value": "Resetează statisticile pentru site"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -583,6 +823,12 @@
       "value": "Screens"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -619,6 +865,12 @@
       "value": "O singură zi"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +901,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +973,42 @@
       "value": "Schimbă graficele"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Cod de urmărire"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +1021,12 @@
       "value": "Necunoscut"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1057,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1123,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/ru-RU.json b/public/intl/messages/ru-RU.json
index 317fcbeeb..93b89291d 100644
--- a/public/intl/messages/ru-RU.json
+++ b/public/intl/messages/ru-RU.json
@@ -41,6 +41,12 @@
       "value": "Администратор"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Аналитика"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Назад"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Отказы"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Города"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Подтвердить пароль"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "Страны"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Данные"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Диапазон дат"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "Удалить сайт"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Подробности"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "Отклонить"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "События"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "Сырые данные"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +543,18 @@
       "value": "Покинуть команду"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +567,24 @@
       "value": "Выйти"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Участники"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +597,12 @@
       "value": "Больше"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +621,16 @@
       "value": "Не указано"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Операционные системы"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +639,36 @@
       "value": "Владелец"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Просмотры страниц"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +721,12 @@
       "value": "Реальное время"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +745,12 @@
       "value": "Обновить"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +787,18 @@
       "value": "Сбросить статистику"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -583,6 +823,12 @@
       "value": "Экраны"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -619,6 +865,12 @@
       "value": "Один день"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +901,24 @@
       "value": "Член команды"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Владелец команды"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +973,42 @@
       "value": "Показать/скрыть графики"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Код отслеживания"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +1021,12 @@
       "value": "Неизвестно"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1057,12 @@
       "value": "Пользователи"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1123,6 @@
       "value": "Вчера"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/si-LK.json b/public/intl/messages/si-LK.json
index ccee2f6c7..578a8abed 100644
--- a/public/intl/messages/si-LK.json
+++ b/public/intl/messages/si-LK.json
@@ -41,6 +41,12 @@
       "value": "Administrator"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "ආපසු"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Bounce rate"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "මුරපදය සත්‍යාපනය කරන්න"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "Countries"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "දින පරාසය"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "වෙබ් අඩවිය මකන්න"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "මගහරින්න"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "Events"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "Raw"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +543,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +567,24 @@
       "value": "පිටවීම"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +597,12 @@
       "value": "තවත්"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +621,16 @@
       "value": "කිසිවක් නැත"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Operating systems"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +639,36 @@
       "value": "හිමිකරු"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Page views"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +721,12 @@
       "value": "තත්ය කාල"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +745,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +787,18 @@
       "value": "සංඛ්යා ලේඛන නැවත සකසන්න"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -583,6 +823,12 @@
       "value": "Screens"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -619,6 +865,12 @@
       "value": "තනි දවස"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +901,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +973,42 @@
       "value": "Toggle charts"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "ලුහුබැඳීමේ කේතය"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +1021,12 @@
       "value": "නොදනී"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1057,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1123,6 @@
       "value": "ඊයේ"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/sk-SK.json b/public/intl/messages/sk-SK.json
index 9febb0adf..6b375afed 100644
--- a/public/intl/messages/sk-SK.json
+++ b/public/intl/messages/sk-SK.json
@@ -41,6 +41,12 @@
       "value": "Administrátor"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Späť"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Okamžité opustenie"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Potvrdiť heslo"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "Zem"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Obdobie"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "Zmazať web"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "Odísť"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "Udalosti"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "Nezpracované"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +543,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +567,24 @@
       "value": "Odhlásiť"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +597,12 @@
       "value": "Viac"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +621,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Operačný systém"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +639,36 @@
       "value": "Owner"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Zobrazenie stánok"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +721,12 @@
       "value": "Aktuálne"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +745,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +787,18 @@
       "value": "Reset statistics"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -583,6 +823,12 @@
       "value": "Screens"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -619,6 +865,12 @@
       "value": "Jeden deň"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +901,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +973,42 @@
       "value": "Toggle charts"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Sledovací kód"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +1021,12 @@
       "value": "Neznámý"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1057,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1123,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/sl-SI.json b/public/intl/messages/sl-SI.json
index 813a9c7f2..6d435020c 100644
--- a/public/intl/messages/sl-SI.json
+++ b/public/intl/messages/sl-SI.json
@@ -2,7 +2,7 @@
   "label.access-code": [
     {
       "type": 0,
-      "value": "Access code"
+      "value": "Koda za dostop"
     }
   ],
   "label.actions": [
@@ -14,19 +14,19 @@
   "label.activity-log": [
     {
       "type": 0,
-      "value": "Activity log"
+      "value": "Dnevnik dejavnosti"
     }
   ],
   "label.add": [
     {
       "type": 0,
-      "value": "Add"
+      "value": "Dodaj"
     }
   ],
   "label.add-description": [
     {
       "type": 0,
-      "value": "Add description"
+      "value": "Dodaj opis"
     }
   ],
   "label.add-website": [
@@ -41,22 +41,34 @@
       "value": "Administrator"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "Po"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
-      "value": "Vse"
+      "value": "Vsi"
     }
   ],
   "label.all-time": [
     {
       "type": 0,
-      "value": "All time"
+      "value": "Ves čas"
     }
   ],
   "label.analytics": [
     {
       "type": 0,
-      "value": "Analytics"
+      "value": "Analitika"
+    }
+  ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Povprečno"
     }
   ],
   "label.average-visit-time": [
@@ -71,10 +83,28 @@
       "value": "Nazaj"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Pred"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
-      "value": "Zapustna stopnja"
+      "value": "Odbojna stopnja"
+    }
+  ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Razčlenitev"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Brskalnik"
     }
   ],
   "label.browsers": [
@@ -98,31 +128,43 @@
   "label.cities": [
     {
       "type": 0,
-      "value": "Cities"
+      "value": "Mesta"
+    }
+  ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "Mesto"
     }
   ],
   "label.clear-all": [
     {
       "type": 0,
-      "value": "Clear all"
+      "value": "Počisti vse"
     }
   ],
   "label.confirm": [
     {
       "type": 0,
-      "value": "Confirm"
+      "value": "Potrdi"
     }
   ],
   "label.confirm-password": [
     {
       "type": 0,
-      "value": "Potrditev gesla"
+      "value": "Potrdi geslo"
+    }
+  ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Vsebuje"
     }
   ],
   "label.continue": [
     {
       "type": 0,
-      "value": "Continue"
+      "value": "Nadaljuj"
     }
   ],
   "label.countries": [
@@ -131,22 +173,40 @@
       "value": "Države"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Država"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Ustvari poročilo"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
-      "value": "Create team"
+      "value": "Ustvari ekipo"
     }
   ],
   "label.create-user": [
     {
       "type": 0,
-      "value": "Create user"
+      "value": "Ustvari uporabnika"
     }
   ],
   "label.created": [
     {
       "type": 0,
-      "value": "Created"
+      "value": "Ustvarjeno"
     }
   ],
   "label.current-password": [
@@ -158,7 +218,7 @@
   "label.custom-range": [
     {
       "type": 0,
-      "value": "Razpon po meri"
+      "value": "Obdobje po meri"
     }
   ],
   "label.dashboard": [
@@ -170,19 +230,31 @@
   "label.data": [
     {
       "type": 0,
-      "value": "Data"
+      "value": "Podatki"
+    }
+  ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Datum"
     }
   ],
   "label.date-range": [
     {
       "type": 0,
-      "value": "Časovni razpon"
+      "value": "Časovno obdobje"
+    }
+  ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Dan"
     }
   ],
   "label.default-date-range": [
     {
       "type": 0,
-      "value": "Privzeti časovni razpon"
+      "value": "Privzeto časovno obdobje"
     }
   ],
   "label.delete": [
@@ -194,13 +266,13 @@
   "label.delete-team": [
     {
       "type": 0,
-      "value": "Delete team"
+      "value": "Izbriši ekipo"
     }
   ],
   "label.delete-user": [
     {
       "type": 0,
-      "value": "Delete user"
+      "value": "Izbriši uporabnika"
     }
   ],
   "label.delete-website": [
@@ -209,6 +281,12 @@
       "value": "Izbriši spletno mesto"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Opis"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -218,7 +296,13 @@
   "label.details": [
     {
       "type": 0,
-      "value": "Details"
+      "value": "Podrobnosti"
+    }
+  ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Naprava"
     }
   ],
   "label.devices": [
@@ -230,7 +314,13 @@
   "label.dismiss": [
     {
       "type": 0,
-      "value": "Opusti"
+      "value": "Prezri"
+    }
+  ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Ne vsebuje"
     }
   ],
   "label.domain": [
@@ -242,7 +332,7 @@
   "label.dropoff": [
     {
       "type": 0,
-      "value": "Dropoff"
+      "value": "Zapustitev"
     }
   ],
   "label.edit": [
@@ -254,25 +344,25 @@
   "label.edit-dashboard": [
     {
       "type": 0,
-      "value": "Edit dashboard"
+      "value": "Uredi nadzorno ploščo"
     }
   ],
   "label.enable-share-url": [
     {
       "type": 0,
-      "value": "Omogoči URL za skupno rabo"
+      "value": "Uredi povezavo za deljenje"
     }
   ],
   "label.event": [
     {
       "type": 0,
-      "value": "Event"
+      "value": "Dogodek"
     }
   ],
   "label.event-data": [
     {
       "type": 0,
-      "value": "Event data"
+      "value": "Podatki dogodka"
     }
   ],
   "label.events": [
@@ -281,64 +371,130 @@
       "value": "Dogodki"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "Napačno"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
-      "value": "Field"
+      "value": "Polje"
     }
   ],
   "label.fields": [
     {
       "type": 0,
-      "value": "Fields"
+      "value": "Polja"
+    }
+  ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
     }
   ],
   "label.filter-combined": [
     {
       "type": 0,
-      "value": "Skupno"
+      "value": "Skupaj"
     }
   ],
   "label.filter-raw": [
     {
       "type": 0,
-      "value": "Neobdelane meritve"
+      "value": "Neobdelano"
+    }
+  ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filtri"
     }
   ],
   "label.funnel": [
     {
       "type": 0,
-      "value": "Funnel"
+      "value": "Prodajni lijak"
+    }
+  ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Večje od"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Večje ali enako kot"
     }
   ],
   "label.insights": [
     {
       "type": 0,
-      "value": "Insights"
+      "value": "Vpogled"
+    }
+  ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Je"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Ni"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Ni nastavljeno"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Je nastavljeno"
     }
   ],
   "label.join": [
     {
       "type": 0,
-      "value": "Join"
+      "value": "Pridruži se"
     }
   ],
   "label.join-team": [
     {
       "type": 0,
-      "value": "Join team"
+      "value": "Pridruži se ekipi"
     }
   ],
   "label.language": [
     {
       "type": 0,
-      "value": "Language"
+      "value": "Jezik"
     }
   ],
   "label.languages": [
     {
       "type": 0,
-      "value": "Languages"
+      "value": "Jeziki"
     }
   ],
   "label.laptop": [
@@ -378,13 +534,25 @@
   "label.leave": [
     {
       "type": 0,
-      "value": "Leave"
+      "value": "Zapusti"
     }
   ],
   "label.leave-team": [
     {
       "type": 0,
-      "value": "Leave team"
+      "value": "Zapusti ekipo"
+    }
+  ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Manjše kot"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Manjše ali enako kot"
     }
   ],
   "label.login": [
@@ -399,16 +567,28 @@
       "value": "Odjava"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Največ"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
-      "value": "Members"
+      "value": "Člani"
+    }
+  ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Najmanj"
     }
   ],
   "label.mobile": [
     {
       "type": 0,
-      "value": "Mobilni telefon"
+      "value": "Mobilne naprave"
     }
   ],
   "label.more": [
@@ -417,6 +597,12 @@
       "value": "Več"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "Moja spletna mesta"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -432,25 +618,55 @@
   "label.none": [
     {
       "type": 0,
-      "value": "None"
+      "value": "Brez"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Operacijski sistemi"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Pregled"
     }
   ],
   "label.owner": [
     {
       "type": 0,
-      "value": "Owner"
+      "value": "Lastnik"
+    }
+  ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Stran "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " od "
+    },
+    {
+      "type": 1,
+      "value": "total"
     }
   ],
   "label.page-views": [
     {
       "type": 0,
-      "value": "Ogledi strani"
+      "value": "Obiski strani"
+    }
+  ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Naslov strani"
     }
   ],
   "label.pages": [
@@ -468,7 +684,7 @@
   "label.powered-by": [
     {
       "type": 0,
-      "value": "Zagotavlja "
+      "value": "Poganja "
     },
     {
       "type": 1,
@@ -484,25 +700,31 @@
   "label.queries": [
     {
       "type": 0,
-      "value": "Queries"
+      "value": "Poizvedbe"
     }
   ],
   "label.query": [
     {
       "type": 0,
-      "value": "Query"
+      "value": "Poizvedba"
     }
   ],
   "label.query-parameters": [
     {
       "type": 0,
-      "value": "Query parameters"
+      "value": "Parametri poizvedbe"
     }
   ],
   "label.realtime": [
     {
       "type": 0,
-      "value": "V realnem času"
+      "value": "V živo"
+    }
+  ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Vir"
     }
   ],
   "label.referrers": [
@@ -520,25 +742,31 @@
   "label.regenerate": [
     {
       "type": 0,
-      "value": "Regenerate"
+      "value": "Ponovno generiraj"
+    }
+  ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Regija"
     }
   ],
   "label.regions": [
     {
       "type": 0,
-      "value": "Regions"
+      "value": "Regije"
     }
   ],
   "label.remove": [
     {
       "type": 0,
-      "value": "Remove"
+      "value": "Odstrani"
     }
   ],
   "label.reports": [
     {
       "type": 0,
-      "value": "Reports"
+      "value": "Poročila"
     }
   ],
   "label.required": [
@@ -556,19 +784,31 @@
   "label.reset-website": [
     {
       "type": 0,
-      "value": "Reset statistics"
+      "value": "Ponastavi statistiko"
+    }
+  ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Ohranjanje uporabnikov"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
     }
   ],
   "label.role": [
     {
       "type": 0,
-      "value": "Role"
+      "value": "Vloga"
     }
   ],
   "label.run-query": [
     {
       "type": 0,
-      "value": "Run query"
+      "value": "Izvedi poizvedbo"
     }
   ],
   "label.save": [
@@ -580,25 +820,31 @@
   "label.screens": [
     {
       "type": 0,
-      "value": "Screens"
+      "value": "Zasloni"
+    }
+  ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
     }
   ],
   "label.select-date": [
     {
       "type": 0,
-      "value": "Select date"
+      "value": "Izberi datum"
     }
   ],
   "label.select-website": [
     {
       "type": 0,
-      "value": "Select website"
+      "value": "Izberi spletno mesto"
     }
   ],
   "label.sessions": [
     {
       "type": 0,
-      "value": "Sessions"
+      "value": "Seje"
     }
   ],
   "label.settings": [
@@ -610,7 +856,7 @@
   "label.share-url": [
     {
       "type": 0,
-      "value": "Deli URL"
+      "value": "Deli povezavo"
     }
   ],
   "label.single-day": [
@@ -619,6 +865,12 @@
       "value": "En dan"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Seštevek"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -628,43 +880,55 @@
   "label.team": [
     {
       "type": 0,
-      "value": "Team"
+      "value": "Ekipa"
     }
   ],
   "label.team-guest": [
     {
       "type": 0,
-      "value": "Team guest"
+      "value": "Gost ekipe"
     }
   ],
   "label.team-id": [
     {
       "type": 0,
-      "value": "Team ID"
+      "value": "ID ekipe"
     }
   ],
   "label.team-member": [
     {
       "type": 0,
-      "value": "Team member"
+      "value": "Član ekipe"
+    }
+  ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Ime ekipe"
     }
   ],
   "label.team-owner": [
     {
       "type": 0,
-      "value": "Team owner"
+      "value": "Lastnik ekipe"
+    }
+  ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Spletna mesta ekipe"
     }
   ],
   "label.teams": [
     {
       "type": 0,
-      "value": "Teams"
+      "value": "Ekipe"
     }
   ],
   "label.theme": [
     {
       "type": 0,
-      "value": "Theme"
+      "value": "Tema"
     }
   ],
   "label.this-month": [
@@ -682,7 +946,7 @@
   "label.this-year": [
     {
       "type": 0,
-      "value": "Letos"
+      "value": "To leto"
     }
   ],
   "label.timezone": [
@@ -694,7 +958,7 @@
   "label.title": [
     {
       "type": 0,
-      "value": "Title"
+      "value": "Naslov"
     }
   ],
   "label.today": [
@@ -706,7 +970,19 @@
   "label.toggle-charts": [
     {
       "type": 0,
-      "value": "Toggle charts"
+      "value": "Preklopi grafe"
+    }
+  ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Skupaj"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Skupni zapisi"
     }
   ],
   "label.tracking-code": [
@@ -715,6 +991,24 @@
       "value": "Koda za sledenje"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "Pravilno"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Vrsta"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unikatni"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,22 +1021,28 @@
       "value": "Neznano"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Brez naslova"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
-      "value": "URL"
+      "value": "Povezava"
     }
   ],
   "label.urls": [
     {
       "type": 0,
-      "value": "URLs"
+      "value": "Povezave"
     }
   ],
   "label.user": [
     {
       "type": 0,
-      "value": "User"
+      "value": "Uporabnik"
     }
   ],
   "label.username": [
@@ -754,31 +1054,37 @@
   "label.users": [
     {
       "type": 0,
-      "value": "Users"
+      "value": "Uporabniki"
+    }
+  ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Vrednost"
     }
   ],
   "label.view": [
     {
       "type": 0,
-      "value": "View"
+      "value": "Poglej"
     }
   ],
   "label.view-details": [
     {
       "type": 0,
-      "value": "Prikaži podrobnosti"
+      "value": "Poglej podrobnosti"
     }
   ],
   "label.view-only": [
     {
       "type": 0,
-      "value": "View only"
+      "value": "Samo ogledovanje"
     }
   ],
   "label.views": [
     {
       "type": 0,
-      "value": "Ogledi"
+      "value": "Obiski"
     }
   ],
   "label.visitors": [
@@ -790,193 +1096,31 @@
   "label.website": [
     {
       "type": 0,
-      "value": "Website"
+      "value": "Spletno mesto"
     }
   ],
   "label.website-id": [
     {
       "type": 0,
-      "value": "Website ID"
+      "value": "ID spletnega mesta"
     }
   ],
   "label.websites": [
     {
       "type": 0,
-      "value": "Spletna mesta"
+      "value": "Spletnih mest"
     }
   ],
   "label.window": [
     {
       "type": 0,
-      "value": "Window"
+      "value": "Okno"
     }
   ],
   "label.yesterday": [
     {
       "type": 0,
-      "value": "Yesterday"
-    }
-  ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
+      "value": "Včeraj"
     }
   ],
   "message.active-users": [
@@ -1030,7 +1174,7 @@
   "message.confirm-leave": [
     {
       "type": 0,
-      "value": "Are you sure you want to leave "
+      "value": "Ste prepričani, da želite zapustiti "
     },
     {
       "type": 1,
@@ -1044,7 +1188,7 @@
   "message.confirm-reset": [
     {
       "type": 0,
-      "value": "Are your sure you want to reset "
+      "value": "Ste prepričani, da želite ponastaviti statistiko "
     },
     {
       "type": 1,
@@ -1052,13 +1196,13 @@
     },
     {
       "type": 0,
-      "value": "'s statistics?"
+      "value": "?"
     }
   ],
   "message.delete-account": [
     {
       "type": 0,
-      "value": "To delete this account, type "
+      "value": "Za potrditev izbrisa tega računa vnesite "
     },
     {
       "type": 1,
@@ -1066,13 +1210,13 @@
     },
     {
       "type": 0,
-      "value": " in the box below to confirm."
+      "value": " v spodnje polje."
     }
   ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "To delete this website, type "
+      "value": "Za potrditev izbrisa tega spletnega mesta vnesite "
     },
     {
       "type": 1,
@@ -1080,19 +1224,19 @@
     },
     {
       "type": 0,
-      "value": " in the box below to confirm."
+      "value": " v spodnje polje."
     }
   ],
   "message.delete-website-warning": [
     {
       "type": 0,
-      "value": "Izbrisani bodo tudi vsi povezani podatki."
+      "value": "Izbrisani bodo tudi vsi pripadajoči podatki."
     }
   ],
   "message.error": [
     {
       "type": 0,
-      "value": "Prišlo je do napake."
+      "value": "Nekaj je šlo narobe."
     }
   ],
   "message.event-log": [
@@ -1102,7 +1246,7 @@
     },
     {
       "type": 0,
-      "value": " on "
+      "value": " na "
     },
     {
       "type": 1,
@@ -1118,7 +1262,7 @@
   "message.incorrect-username-password": [
     {
       "type": 0,
-      "value": "Nepravilno uporabniško ime/geslo"
+      "value": "Nepravilno uporabniško ime/geslo."
     }
   ],
   "message.invalid-domain": [
@@ -1130,7 +1274,7 @@
   "message.min-password-length": [
     {
       "type": 0,
-      "value": "Minimum length of "
+      "value": "Najmanjša dolžina je "
     },
     {
       "type": 1,
@@ -1138,13 +1282,13 @@
     },
     {
       "type": 0,
-      "value": " characters"
+      "value": " znakov"
     }
   ],
   "message.new-version-available": [
     {
       "type": 0,
-      "value": "A new version of Umami "
+      "value": "Na voljo je nova verzija programa Umami "
     },
     {
       "type": 1,
@@ -1152,7 +1296,7 @@
     },
     {
       "type": 0,
-      "value": " is available!"
+      "value": "!"
     }
   ],
   "message.no-data-available": [
@@ -1164,7 +1308,7 @@
   "message.no-event-data": [
     {
       "type": 0,
-      "value": "No event data is available."
+      "value": "Podatki o dogodku niso na voljo."
     }
   ],
   "message.no-match-password": [
@@ -1176,31 +1320,31 @@
   "message.no-results-found": [
     {
       "type": 0,
-      "value": "No results were found."
+      "value": "Rezultatov ni bilo mogoče najti."
     }
   ],
   "message.no-team-websites": [
     {
       "type": 0,
-      "value": "This team does not have any websites."
+      "value": "Ta ekipa nima spletnih mest."
     }
   ],
   "message.no-teams": [
     {
       "type": 0,
-      "value": "You have not created any teams."
+      "value": "Niste še ustvarili nobene ekipe."
     }
   ],
   "message.no-users": [
     {
       "type": 0,
-      "value": "There are no users."
+      "value": "Ni uporabnikov."
     }
   ],
   "message.no-websites-configured": [
     {
       "type": 0,
-      "value": "Ni nastavljenih spletnih mest."
+      "value": "Nimate nastavljenih nobenih spletnih mest."
     }
   ],
   "message.page-not-found": [
@@ -1212,7 +1356,7 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "To reset this website, type "
+      "value": "Za ponastavitev izbrisa tega spletnega mesta vnesite "
     },
     {
       "type": 1,
@@ -1220,13 +1364,13 @@
     },
     {
       "type": 0,
-      "value": " in the box below to confirm."
+      "value": " v spodnje polje."
     }
   ],
   "message.reset-website-warning": [
     {
       "type": 0,
-      "value": "All statistics for this website will be deleted, but your tracking code will remain intact."
+      "value": "Vse statistike za to spletno mesto bodo izbrisane, koda za sledenje pa bo ostala nespremenjena."
     }
   ],
   "message.saved": [
@@ -1238,7 +1382,7 @@
   "message.share-url": [
     {
       "type": 0,
-      "value": "To je javno dostopen naslov URL za "
+      "value": "To je javno dostopna povezava za "
     },
     {
       "type": 1,
@@ -1252,19 +1396,19 @@
   "message.team-already-member": [
     {
       "type": 0,
-      "value": "You are already a member of the team."
+      "value": "Ste že član ekipe."
     }
   ],
   "message.team-not-found": [
     {
       "type": 0,
-      "value": "Team not found."
+      "value": "Ekipa ni bila najdena."
     }
   ],
   "message.team-websites-info": [
     {
       "type": 0,
-      "value": "Websites can be viewed by anyone on the team."
+      "value": "Spletne strani si lahko ogleda vsak član ekipe."
     }
   ],
   "message.tracking-code": [
@@ -1276,7 +1420,7 @@
   "message.user-deleted": [
     {
       "type": 0,
-      "value": "User deleted."
+      "value": "Uporabnik je izbrisan."
     }
   ],
   "message.visitor-log": [
diff --git a/public/intl/messages/sv-SE.json b/public/intl/messages/sv-SE.json
index e55ae25a6..9824be155 100644
--- a/public/intl/messages/sv-SE.json
+++ b/public/intl/messages/sv-SE.json
@@ -41,6 +41,12 @@
       "value": "Administratör"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analys"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Tillbaka"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Avvisningfrekvens"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Städer"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Bekräfta lösenord"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "Länder"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Datumomfång"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "Radera webbsajt"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Detailjer"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "Avbryt"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "Händelser"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "Rådata"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +543,18 @@
       "value": "Lämna team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +567,24 @@
       "value": "Logga ut"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Medlemmar"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +597,12 @@
       "value": "Mer"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +621,16 @@
       "value": "Inga"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Operativsystem"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +639,36 @@
       "value": "Ägare"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Sidvisningar"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +721,12 @@
       "value": "Realtid"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +745,12 @@
       "value": "Regenerera"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +787,18 @@
       "value": "Återställ statistik"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -583,6 +823,12 @@
       "value": "Upplösning"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -619,6 +865,12 @@
       "value": "En dag"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +901,24 @@
       "value": "Team-medlem"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team-ägare"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +973,42 @@
       "value": "Visa/göm grafer"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Spårningskod"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +1021,12 @@
       "value": "Okänd"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1057,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1123,6 @@
       "value": "Igår"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/ta-IN.json b/public/intl/messages/ta-IN.json
index 5afccd0ed..9726b46d5 100644
--- a/public/intl/messages/ta-IN.json
+++ b/public/intl/messages/ta-IN.json
@@ -41,6 +41,12 @@
       "value": "நிர்வாகியைச் சேர்க்க"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "பின்னால்"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "துள்ளல் விகிதம்"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "கடவுச்சொல்லை உறுதிப்படுத்தவும்"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "நாடுகள்"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "தேதி வரம்பு"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "வலைத்தளத்தை நீக்கு"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "நீக்கு"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "நிகழ்வுகள்"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "மூல"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +543,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +567,24 @@
       "value": "வெளியேறு"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +597,12 @@
       "value": "மேலும்"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +621,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "இயக்க முறைமைகள்"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +639,36 @@
       "value": "Owner"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "பக்க காட்சிகள்"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +721,12 @@
       "value": "தற்போதைய"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +745,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +787,18 @@
       "value": "Reset statistics"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -583,6 +823,12 @@
       "value": "Screens"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -619,6 +865,12 @@
       "value": "ஒரு நாள்"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +901,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +973,42 @@
       "value": "Toggle charts"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "கண்காணிப்பு குறியீடு"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +1021,12 @@
       "value": "தெரியாத"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1057,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1123,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/th-TH.json b/public/intl/messages/th-TH.json
index 092c3fb84..6988c653b 100644
--- a/public/intl/messages/th-TH.json
+++ b/public/intl/messages/th-TH.json
@@ -41,6 +41,12 @@
       "value": "ผู้ดูแลระบบ"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "ย้อนกลับ"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "อัตราตีกลับ"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "ยืนยันรหัสผ่าน"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "ประเทศ"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "ตั้งแต่วันที่"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "ลบเว็บไซต์"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "ยกเลิก"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "เหตุการณ์"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "ข้อมูลดิบ"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -379,6 +535,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -391,12 +559,24 @@
       "value": "ออกจากระบบ"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -409,6 +589,12 @@
       "value": "เพิ่มเติม"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -427,10 +613,16 @@
       "value": "ไม่ได้กำหนด"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "ระบบปฏิบัติการ"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -439,12 +631,36 @@
       "value": "เจ้าของ"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "การเข้าชม"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -497,6 +713,12 @@
       "value": "เรียลไทม์"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -515,6 +737,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -551,6 +779,18 @@
       "value": "รีเซตข้อมูลสถิติ"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -575,6 +815,12 @@
       "value": "ขนาดหน้าจอ"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -611,6 +857,12 @@
       "value": "วันที่"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -641,12 +893,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -701,12 +965,42 @@
       "value": "เปิด/ปิดแผนภูมิ"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "โค้ดสำหรับใช้ติดตาม"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -719,6 +1013,12 @@
       "value": "ไม่รู้จัก"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -749,6 +1049,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -809,168 +1115,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 0,
diff --git a/public/intl/messages/tr-TR.json b/public/intl/messages/tr-TR.json
index 6f5c6e3e8..f15a3b732 100644
--- a/public/intl/messages/tr-TR.json
+++ b/public/intl/messages/tr-TR.json
@@ -41,6 +41,12 @@
       "value": "Yönetici"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Geri"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Çıkma oranı"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Parolayı onayla"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "Ülkeler"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Tarih aralığı"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "Web sitesini sil"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "Reddet"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "Olaylar"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "Ham"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +543,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +567,24 @@
       "value": "Çıkış Yap"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +597,12 @@
       "value": "Detaylı göster"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +621,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "İşletim sistemi"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +639,36 @@
       "value": "Owner"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Sayfa görünümü"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +721,12 @@
       "value": "Gerçek Zamanlı"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +745,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +787,18 @@
       "value": "Reset statistics"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -583,6 +823,12 @@
       "value": "Ekranlar"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -619,6 +865,12 @@
       "value": "Tekil gün"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +901,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +973,42 @@
       "value": "Toggle charts"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "İzleme kodu"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +1021,12 @@
       "value": "Bilinmeyen"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1057,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1123,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/uk-UA.json b/public/intl/messages/uk-UA.json
index 5f54c972a..2c602c947 100644
--- a/public/intl/messages/uk-UA.json
+++ b/public/intl/messages/uk-UA.json
@@ -41,6 +41,12 @@
       "value": "Адміністратор"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Назад"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Показник відмов"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Підтвердити пароль"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "Країни"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Діапазон дат"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "Видалити сайт"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "Відхилити"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "Події"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "Сирі дані"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +543,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +567,24 @@
       "value": "Вийти"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +597,12 @@
       "value": "Більше"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +621,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Операційні системи"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +639,36 @@
       "value": "Власник"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Перегляди сторінок"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +721,12 @@
       "value": "У реальному часі"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +745,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +787,18 @@
       "value": "Скинути статистику сайту"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -583,6 +823,12 @@
       "value": "Screens"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -619,6 +865,12 @@
       "value": "Один день"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +901,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +973,42 @@
       "value": "Переключити графіки"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Код для відслідковування"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +1021,12 @@
       "value": "Невідомо"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1057,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1123,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/ur-PK.json b/public/intl/messages/ur-PK.json
index adf1eb311..23195ffc0 100644
--- a/public/intl/messages/ur-PK.json
+++ b/public/intl/messages/ur-PK.json
@@ -41,6 +41,12 @@
       "value": "منتظم"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "پیچھے"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "اچھال کی شرح"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "پاس ورڈ کی تصدیق کریں"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "ممالک"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "تاریخ کی حد"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "ویب سائٹ مٹایں"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "مسترد کریں"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "واقعات"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "خام"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +543,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +567,24 @@
       "value": "لاگ آوٹ"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +597,12 @@
       "value": "مزید"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +621,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "آپریٹنگ سسٹمز"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +639,36 @@
       "value": "مالک"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "صفحہ کے نظارے"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +721,12 @@
       "value": "براہ راست"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +745,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +787,18 @@
       "value": "اعدادوشمار کو دوبارہ ترتیب دیں"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -583,6 +823,12 @@
       "value": "Screens"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -619,6 +865,12 @@
       "value": "ایک دن"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +901,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +973,42 @@
       "value": "چارٹ تبدیل کریں"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "ٹریکنگ کوڈ"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +1021,12 @@
       "value": "نامعلوم"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1057,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1123,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/vi-VN.json b/public/intl/messages/vi-VN.json
index d0b3b69b9..4c3ef05cb 100644
--- a/public/intl/messages/vi-VN.json
+++ b/public/intl/messages/vi-VN.json
@@ -41,6 +41,12 @@
       "value": "Quản trị"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Quay về"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Tỷ lệ thoát trang"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Xác nhận mật khẩu"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "Quốc gia"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Phạm vi ngày"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "Xóa website"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "Loại trừ"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +371,12 @@
       "value": "Sự kiện"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -293,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -305,18 +407,72 @@
       "value": "Gốc"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -379,6 +535,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -391,12 +559,24 @@
       "value": "Đăng xuất"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -409,6 +589,12 @@
       "value": "Thêm"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -427,10 +613,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Hệ điều hành"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -439,12 +631,36 @@
       "value": "Chủ sở hữu"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Lượt xem"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -497,6 +713,12 @@
       "value": "Thời gian thực"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -515,6 +737,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -551,6 +779,18 @@
       "value": "Tái thiết lập thống kê"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -575,6 +815,12 @@
       "value": "Screens"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
@@ -611,6 +857,12 @@
       "value": "Trong ngày"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -641,12 +893,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -701,12 +965,42 @@
       "value": "Bật/tắt biểu đồ"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Mã theo dõi"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -719,6 +1013,12 @@
       "value": "Không rõ"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -749,6 +1049,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -809,168 +1115,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/zh-CN.json b/public/intl/messages/zh-CN.json
index 29a4ea1fc..6441e763b 100644
--- a/public/intl/messages/zh-CN.json
+++ b/public/intl/messages/zh-CN.json
@@ -41,6 +41,12 @@
       "value": "管理员"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "之后"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "分析"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "平均"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "返回"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "之前"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "跳出率"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "故障"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "浏览器"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "市/县"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "市/县"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "确认密码"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "包含"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,24 @@
       "value": "国家/地区"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "国家/地区"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "创建"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "创建报告"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +233,24 @@
       "value": "统计数据"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "日期"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "时间段"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "日"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +281,12 @@
       "value": "删除网站"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "描述"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +299,12 @@
       "value": "详细信息"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "设备"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +317,12 @@
       "value": "关闭"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "不包含"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -242,7 +332,7 @@
   "label.dropoff": [
     {
       "type": 0,
-      "value": "Dropoff"
+      "value": "丢弃"
     }
   ],
   "label.edit": [
@@ -266,13 +356,13 @@
   "label.event": [
     {
       "type": 0,
-      "value": "Event"
+      "value": "事件"
     }
   ],
   "label.event-data": [
     {
       "type": 0,
-      "value": "Event data"
+      "value": "事件数据"
     }
   ],
   "label.events": [
@@ -281,16 +371,28 @@
       "value": "行为类别"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "否"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
-      "value": "Field"
+      "value": "字段"
     }
   ],
   "label.fields": [
     {
       "type": 0,
-      "value": "Fields"
+      "value": "字段"
+    }
+  ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "筛选器"
     }
   ],
   "label.filter-combined": [
@@ -305,16 +407,70 @@
       "value": "原始"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "筛选"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
-      "value": "Funnel"
+      "value": "分析"
+    }
+  ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "了解用户的转换率和退出率。"
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "大于"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "大于或等于"
     }
   ],
   "label.insights": [
     {
       "type": 0,
-      "value": "Insights"
+      "value": "见解"
+    }
+  ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "通过使用筛选器和划分时间段来更深入地研究数据。"
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "等于"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "不等于"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "未设置"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "已设置"
     }
   ],
   "label.join": [
@@ -387,6 +543,18 @@
       "value": "离开团队"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "少于"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "少于等于"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +567,24 @@
       "value": "退出"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "最大"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "成员"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "最小"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +597,12 @@
       "value": "更多"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "我的网站"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +621,16 @@
       "value": "无"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "操作系统"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "概览"
     }
   ],
   "label.owner": [
@@ -447,12 +639,40 @@
       "value": "所有者"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "总"
+    },
+    {
+      "type": 1,
+      "value": "total"
+    },
+    {
+      "type": 0,
+      "value": "中的第"
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": "页"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "页面浏览量"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "标题"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -494,7 +714,7 @@
   "label.query": [
     {
       "type": 0,
-      "value": "Query"
+      "value": "查询"
     }
   ],
   "label.query-parameters": [
@@ -509,6 +729,12 @@
       "value": "实时"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "来源"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -527,6 +753,12 @@
       "value": "重新生成"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "州/省"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -542,7 +774,7 @@
   "label.reports": [
     {
       "type": 0,
-      "value": "Reports"
+      "value": "报告"
     }
   ],
   "label.required": [
@@ -563,6 +795,18 @@
       "value": "重置统计数据"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "保留"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "通过跟踪用户返回的频率来衡量网站的用户粘性。"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -572,7 +816,7 @@
   "label.run-query": [
     {
       "type": 0,
-      "value": "Run query"
+      "value": "查询"
     }
   ],
   "label.save": [
@@ -587,10 +831,16 @@
       "value": "屏幕尺寸"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "搜索"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,
-      "value": "Select date"
+      "value": "选择数据"
     }
   ],
   "label.select-website": [
@@ -623,6 +873,12 @@
       "value": "单日"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "总和"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -653,12 +909,24 @@
       "value": "团队成员"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "团队名称"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "团队所有者"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "团队网站"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -713,12 +981,42 @@
       "value": "切换图表"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "总数"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "总记录数"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "跟踪代码"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "是"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "类型"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "独立"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -731,16 +1029,22 @@
       "value": "未知"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "未命名"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
-      "value": "URL"
+      "value": "网址"
     }
   ],
   "label.urls": [
     {
       "type": 0,
-      "value": "URLs"
+      "value": "网址"
     }
   ],
   "label.user": [
@@ -761,6 +1065,12 @@
       "value": "用户"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "值"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -776,7 +1086,7 @@
   "label.view-only": [
     {
       "type": 0,
-      "value": "View only"
+      "value": "仅浏览量"
     }
   ],
   "label.views": [
@@ -794,7 +1104,7 @@
   "label.website": [
     {
       "type": 0,
-      "value": "Website"
+      "value": "网站"
     }
   ],
   "label.website-id": [
@@ -821,168 +1131,6 @@
       "value": "昨天"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "创建报告"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "描述"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "未命名"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 0,
@@ -1082,15 +1230,15 @@
   "message.event-log": [
     {
       "type": 1,
-      "value": "event"
+      "value": "url"
     },
     {
       "type": 0,
-      "value": " on "
+      "value": "上的"
     },
     {
       "type": 1,
-      "value": "url"
+      "value": "event"
     }
   ],
   "message.go-to-settings": [
@@ -1128,7 +1276,7 @@
   "message.new-version-available": [
     {
       "type": 0,
-      "value": "A new version of Umami "
+      "value": "Umami的新版本"
     },
     {
       "type": 1,
@@ -1136,7 +1284,7 @@
     },
     {
       "type": 0,
-      "value": " is available!"
+      "value": "已推出！"
     }
   ],
   "message.no-data-available": [
@@ -1148,7 +1296,7 @@
   "message.no-event-data": [
     {
       "type": 0,
-      "value": "No event data is available."
+      "value": "无可用事件。"
     }
   ],
   "message.no-match-password": [
@@ -1196,7 +1344,7 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "确定重置该网站, 请在下面的输入框中输入 "
+      "value": "如果确定重置该网站, 请在下面的输入框中输入 "
     },
     {
       "type": 1,
@@ -1260,7 +1408,7 @@
   "message.user-deleted": [
     {
       "type": 0,
-      "value": "User deleted."
+      "value": "用户已删除。"
     }
   ],
   "message.visitor-log": [
diff --git a/public/intl/messages/zh-TW.json b/public/intl/messages/zh-TW.json
index c51bd538e..82f54a667 100644
--- a/public/intl/messages/zh-TW.json
+++ b/public/intl/messages/zh-TW.json
@@ -2,37 +2,37 @@
   "label.access-code": [
     {
       "type": 0,
-      "value": "Access code"
+      "value": "存取碼"
     }
   ],
   "label.actions": [
     {
       "type": 0,
-      "value": "用戶行為"
+      "value": "行動"
     }
   ],
   "label.activity-log": [
     {
       "type": 0,
-      "value": "Activity log"
+      "value": "活動日誌"
     }
   ],
   "label.add": [
     {
       "type": 0,
-      "value": "Add"
+      "value": "新增"
     }
   ],
   "label.add-description": [
     {
       "type": 0,
-      "value": "Add description"
+      "value": "新增描述"
     }
   ],
   "label.add-website": [
     {
       "type": 0,
-      "value": "增加網站"
+      "value": "新增網站"
     }
   ],
   "label.admin": [
@@ -41,28 +41,40 @@
       "value": "管理員"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "之後"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
-      "value": "所有"
+      "value": "全部"
     }
   ],
   "label.all-time": [
     {
       "type": 0,
-      "value": "所有時間段"
+      "value": "所有時間"
     }
   ],
   "label.analytics": [
     {
       "type": 0,
-      "value": "Analytics"
+      "value": "分析"
+    }
+  ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "平均"
     }
   ],
   "label.average-visit-time": [
     {
       "type": 0,
-      "value": "平均訪問時間"
+      "value": "平均造訪時間"
     }
   ],
   "label.back": [
@@ -71,12 +83,30 @@
       "value": "返回"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "之前"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "跳出率"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "分解"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "瀏覽器"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -92,25 +122,31 @@
   "label.change-password": [
     {
       "type": 0,
-      "value": "更新密碼"
+      "value": "更改密碼"
     }
   ],
   "label.cities": [
     {
       "type": 0,
-      "value": "Cities"
+      "value": "城市"
+    }
+  ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "城市"
     }
   ],
   "label.clear-all": [
     {
       "type": 0,
-      "value": "Clear all"
+      "value": "全部清除"
     }
   ],
   "label.confirm": [
     {
       "type": 0,
-      "value": "Confirm"
+      "value": "確認"
     }
   ],
   "label.confirm-password": [
@@ -119,34 +155,58 @@
       "value": "確認密碼"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "包含"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
-      "value": "Continue"
+      "value": "繼續"
     }
   ],
   "label.countries": [
     {
       "type": 0,
-      "value": "國家/地區"
+      "value": "國家"
+    }
+  ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "國家"
+    }
+  ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "建立"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "建立報告"
     }
   ],
   "label.create-team": [
     {
       "type": 0,
-      "value": "Create team"
+      "value": "建立團隊"
     }
   ],
   "label.create-user": [
     {
       "type": 0,
-      "value": "Create user"
+      "value": "建立使用者"
     }
   ],
   "label.created": [
     {
       "type": 0,
-      "value": "Created"
+      "value": "已建立"
     }
   ],
   "label.current-password": [
@@ -158,31 +218,43 @@
   "label.custom-range": [
     {
       "type": 0,
-      "value": "自定義時段"
+      "value": "自訂範圍"
     }
   ],
   "label.dashboard": [
     {
       "type": 0,
-      "value": "管理面板"
+      "value": "儀表板"
     }
   ],
   "label.data": [
     {
       "type": 0,
-      "value": "Data"
+      "value": "資料"
+    }
+  ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "日期"
     }
   ],
   "label.date-range": [
     {
       "type": 0,
-      "value": "多日"
+      "value": "日期範圍"
+    }
+  ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "日"
     }
   ],
   "label.default-date-range": [
     {
       "type": 0,
-      "value": "默認日期範圍"
+      "value": "預設日期範圍"
     }
   ],
   "label.delete": [
@@ -194,13 +266,13 @@
   "label.delete-team": [
     {
       "type": 0,
-      "value": "Delete team"
+      "value": "刪除團隊"
     }
   ],
   "label.delete-user": [
     {
       "type": 0,
-      "value": "Delete user"
+      "value": "刪除使用者"
     }
   ],
   "label.delete-website": [
@@ -209,16 +281,28 @@
       "value": "刪除網站"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "描述"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
-      "value": "桌機"
+      "value": "桌上型電腦"
     }
   ],
   "label.details": [
     {
       "type": 0,
-      "value": "Details"
+      "value": "詳細資訊"
+    }
+  ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "裝置"
     }
   ],
   "label.devices": [
@@ -233,16 +317,22 @@
       "value": "關閉"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "不包含"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
-      "value": "域名"
+      "value": "網域"
     }
   ],
   "label.dropoff": [
     {
       "type": 0,
-      "value": "Dropoff"
+      "value": "退出"
     }
   ],
   "label.edit": [
@@ -254,49 +344,61 @@
   "label.edit-dashboard": [
     {
       "type": 0,
-      "value": "編輯管理面板"
+      "value": "編輯儀表板"
     }
   ],
   "label.enable-share-url": [
     {
       "type": 0,
-      "value": "啟用分享連結"
+      "value": "啟用分享網址"
     }
   ],
   "label.event": [
     {
       "type": 0,
-      "value": "Event"
+      "value": "事件"
     }
   ],
   "label.event-data": [
     {
       "type": 0,
-      "value": "Event data"
+      "value": "事件資料"
     }
   ],
   "label.events": [
     {
       "type": 0,
-      "value": "行為類別"
+      "value": "事件"
+    }
+  ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "否"
     }
   ],
   "label.field": [
     {
       "type": 0,
-      "value": "Field"
+      "value": "欄位"
     }
   ],
   "label.fields": [
     {
       "type": 0,
-      "value": "Fields"
+      "value": "欄位"
+    }
+  ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "篩選器"
     }
   ],
   "label.filter-combined": [
     {
       "type": 0,
-      "value": "總和"
+      "value": "組合"
     }
   ],
   "label.filter-raw": [
@@ -305,28 +407,82 @@
       "value": "原始"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "篩選器"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
-      "value": "Funnel"
+      "value": "漏斗"
+    }
+  ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "瞭解使用者的轉換率和退出率"
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "大於"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "大於或等於"
     }
   ],
   "label.insights": [
     {
       "type": 0,
-      "value": "Insights"
+      "value": "洞察"
+    }
+  ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "透過使用區段和篩選器來深入探索你的數據"
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "是"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "不是"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "未設定"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "已設定"
     }
   ],
   "label.join": [
     {
       "type": 0,
-      "value": "Join"
+      "value": "加入"
     }
   ],
   "label.join-team": [
     {
       "type": 0,
-      "value": "Join team"
+      "value": "加入團隊"
     }
   ],
   "label.language": [
@@ -344,7 +500,7 @@
   "label.laptop": [
     {
       "type": 0,
-      "value": "筆記本"
+      "value": "筆記型電腦"
     }
   ],
   "label.last-days": [
@@ -378,13 +534,25 @@
   "label.leave": [
     {
       "type": 0,
-      "value": "Leave"
+      "value": "離開"
     }
   ],
   "label.leave-team": [
     {
       "type": 0,
-      "value": "Leave team"
+      "value": "離開團隊"
+    }
+  ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "小於"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "小於或等於"
     }
   ],
   "label.login": [
@@ -396,19 +564,31 @@
   "label.logout": [
     {
       "type": 0,
-      "value": "退出"
+      "value": "登出"
+    }
+  ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "最大"
     }
   ],
   "label.members": [
     {
       "type": 0,
-      "value": "Members"
+      "value": "成員"
+    }
+  ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "最小"
     }
   ],
   "label.mobile": [
     {
       "type": 0,
-      "value": "手機"
+      "value": "行動裝置"
     }
   ],
   "label.more": [
@@ -417,10 +597,16 @@
       "value": "更多"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "我的網站"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
-      "value": "名字"
+      "value": "名稱"
     }
   ],
   "label.new-password": [
@@ -435,10 +621,16 @@
       "value": "無"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "操作系統"
+      "value": "作業系統"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "概覽"
     }
   ],
   "label.owner": [
@@ -447,16 +639,40 @@
       "value": "擁有者"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "頁面 "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " / "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
-      "value": "網頁流量"
+      "value": "頁面瀏覽"
+    }
+  ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "頁面標題"
     }
   ],
   "label.pages": [
     {
       "type": 0,
-      "value": "網頁"
+      "value": "頁面"
     }
   ],
   "label.password": [
@@ -468,11 +684,15 @@
   "label.powered-by": [
     {
       "type": 0,
-      "value": "運行 "
+      "value": "由 "
     },
     {
       "type": 1,
       "value": "name"
+    },
+    {
+      "type": 0,
+      "value": " 提供"
     }
   ],
   "label.profile": [
@@ -484,13 +704,13 @@
   "label.queries": [
     {
       "type": 0,
-      "value": "Queries"
+      "value": "查詢"
     }
   ],
   "label.query": [
     {
       "type": 0,
-      "value": "Query"
+      "value": "查詢"
     }
   ],
   "label.query-parameters": [
@@ -502,43 +722,55 @@
   "label.realtime": [
     {
       "type": 0,
-      "value": "實時"
+      "value": "即時"
+    }
+  ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "參照來源"
     }
   ],
   "label.referrers": [
     {
       "type": 0,
-      "value": "指入域名"
+      "value": "參照來源"
     }
   ],
   "label.refresh": [
     {
       "type": 0,
-      "value": "刷新"
+      "value": "重新整理"
     }
   ],
   "label.regenerate": [
     {
       "type": 0,
-      "value": "Regenerate"
+      "value": "重新產生"
+    }
+  ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "區域"
     }
   ],
   "label.regions": [
     {
       "type": 0,
-      "value": "Regions"
+      "value": "區域"
     }
   ],
   "label.remove": [
     {
       "type": 0,
-      "value": "Remove"
+      "value": "移除"
     }
   ],
   "label.reports": [
     {
       "type": 0,
-      "value": "Reports"
+      "value": "報告"
     }
   ],
   "label.required": [
@@ -550,67 +782,85 @@
   "label.reset": [
     {
       "type": 0,
-      "value": "重置"
+      "value": "重設"
     }
   ],
   "label.reset-website": [
     {
       "type": 0,
-      "value": "重置統計數據"
+      "value": "重設網站"
+    }
+  ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "保留"
+    }
+  ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "透過追蹤使用者回訪的頻率來衡量您的網站黏著度。"
     }
   ],
   "label.role": [
     {
       "type": 0,
-      "value": "Role"
+      "value": "角色"
     }
   ],
   "label.run-query": [
     {
       "type": 0,
-      "value": "Run query"
+      "value": "執行查詢"
     }
   ],
   "label.save": [
     {
       "type": 0,
-      "value": "保存"
+      "value": "儲存"
     }
   ],
   "label.screens": [
     {
       "type": 0,
-      "value": "屏幕尺寸"
+      "value": "螢幕"
+    }
+  ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
     }
   ],
   "label.select-date": [
     {
       "type": 0,
-      "value": "Select date"
+      "value": "選擇日期"
     }
   ],
   "label.select-website": [
     {
       "type": 0,
-      "value": "Select website"
+      "value": "選擇網站"
     }
   ],
   "label.sessions": [
     {
       "type": 0,
-      "value": "Sessions"
+      "value": "工作階段"
     }
   ],
   "label.settings": [
     {
       "type": 0,
-      "value": "設置"
+      "value": "設定"
     }
   ],
   "label.share-url": [
     {
       "type": 0,
-      "value": "分享連結"
+      "value": "分享網址"
     }
   ],
   "label.single-day": [
@@ -619,6 +869,12 @@
       "value": "單日"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "總和"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -628,37 +884,49 @@
   "label.team": [
     {
       "type": 0,
-      "value": "Team"
+      "value": "團隊"
     }
   ],
   "label.team-guest": [
     {
       "type": 0,
-      "value": "Team guest"
+      "value": "團隊訪客"
     }
   ],
   "label.team-id": [
     {
       "type": 0,
-      "value": "Team ID"
+      "value": "團隊 ID"
     }
   ],
   "label.team-member": [
     {
       "type": 0,
-      "value": "Team member"
+      "value": "團隊成員"
+    }
+  ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "團隊名稱"
     }
   ],
   "label.team-owner": [
     {
       "type": 0,
-      "value": "Team owner"
+      "value": "團隊擁有者"
+    }
+  ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "團隊網站"
     }
   ],
   "label.teams": [
     {
       "type": 0,
-      "value": "Teams"
+      "value": "團隊"
     }
   ],
   "label.theme": [
@@ -694,7 +962,7 @@
   "label.title": [
     {
       "type": 0,
-      "value": "Title"
+      "value": "標題"
     }
   ],
   "label.today": [
@@ -709,12 +977,42 @@
       "value": "切換圖表"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "總計"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "總記錄"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "追蹤代碼"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "是"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "類型"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "獨立"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,76 +1025,88 @@
       "value": "未知"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "無標題"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
-      "value": "URL"
+      "value": "網址"
     }
   ],
   "label.urls": [
     {
       "type": 0,
-      "value": "URLs"
+      "value": "網址"
     }
   ],
   "label.user": [
     {
       "type": 0,
-      "value": "User"
+      "value": "使用者"
     }
   ],
   "label.username": [
     {
       "type": 0,
-      "value": "用户名"
+      "value": "使用者名稱"
     }
   ],
   "label.users": [
     {
       "type": 0,
-      "value": "Users"
+      "value": "使用者"
+    }
+  ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "值"
     }
   ],
   "label.view": [
     {
       "type": 0,
-      "value": "View"
+      "value": "檢視"
     }
   ],
   "label.view-details": [
     {
       "type": 0,
-      "value": "查看更多"
+      "value": "檢視詳細資訊"
     }
   ],
   "label.view-only": [
     {
       "type": 0,
-      "value": "View only"
+      "value": "僅供檢視"
     }
   ],
   "label.views": [
     {
       "type": 0,
-      "value": "頁面流量"
+      "value": "檢視"
     }
   ],
   "label.visitors": [
     {
       "type": 0,
-      "value": "獨立訪客"
+      "value": "訪客"
     }
   ],
   "label.website": [
     {
       "type": 0,
-      "value": "Website"
+      "value": "網站"
     }
   ],
   "label.website-id": [
     {
       "type": 0,
-      "value": "Website ID"
+      "value": "網站 ID"
     }
   ],
   "label.websites": [
@@ -808,181 +1118,19 @@
   "label.window": [
     {
       "type": 0,
-      "value": "Window"
+      "value": "視窗"
     }
   ],
   "label.yesterday": [
     {
       "type": 0,
-      "value": "Yesterday"
-    }
-  ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
+      "value": "昨天"
     }
   ],
   "message.active-users": [
     {
       "type": 0,
-      "value": "當前線上 "
+      "value": "目前有 "
     },
     {
       "type": 1,
@@ -990,13 +1138,13 @@
     },
     {
       "type": 0,
-      "value": " 人"
+      "value": " 個活躍的訪客"
     }
   ],
   "message.confirm-delete": [
     {
       "type": 0,
-      "value": "你確定要刪除 "
+      "value": "您確定要刪除 "
     },
     {
       "type": 1,
@@ -1010,7 +1158,7 @@
   "message.confirm-leave": [
     {
       "type": 0,
-      "value": "Are you sure you want to leave "
+      "value": "您確定要離開 "
     },
     {
       "type": 1,
@@ -1018,13 +1166,13 @@
     },
     {
       "type": 0,
-      "value": "?"
+      "value": " 嗎？"
     }
   ],
   "message.confirm-reset": [
     {
       "type": 0,
-      "value": "您確定要重置 "
+      "value": "您確定要重設 "
     },
     {
       "type": 1,
@@ -1032,13 +1180,13 @@
     },
     {
       "type": 0,
-      "value": " 的數據嗎?"
+      "value": " 嗎？"
     }
   ],
   "message.delete-account": [
     {
       "type": 0,
-      "value": "To delete this account, type "
+      "value": "要刪除此帳戶，請在下方的方框中輸入 "
     },
     {
       "type": 1,
@@ -1046,13 +1194,13 @@
     },
     {
       "type": 0,
-      "value": " in the box below to confirm."
+      "value": " 以確認。"
     }
   ],
   "message.delete-website": [
     {
       "type": 0,
-      "value": "To delete this website, type "
+      "value": "要刪除此網站，請在下方的方框中輸入 "
     },
     {
       "type": 1,
@@ -1060,19 +1208,19 @@
     },
     {
       "type": 0,
-      "value": " in the box below to confirm."
+      "value": " 以確認。"
     }
   ],
   "message.delete-website-warning": [
     {
       "type": 0,
-      "value": "所有相關數據將會被刪除。"
+      "value": "所有網站資料將被刪除。"
     }
   ],
   "message.error": [
     {
       "type": 0,
-      "value": "出現錯誤。"
+      "value": "發生錯誤。"
     }
   ],
   "message.event-log": [
@@ -1082,7 +1230,7 @@
     },
     {
       "type": 0,
-      "value": " on "
+      "value": " 在 "
     },
     {
       "type": 1,
@@ -1092,25 +1240,25 @@
   "message.go-to-settings": [
     {
       "type": 0,
-      "value": "去設定"
+      "value": "前往設定"
     }
   ],
   "message.incorrect-username-password": [
     {
       "type": 0,
-      "value": "用户名或密碼不正確。"
+      "value": "使用者名稱和/或密碼不正確。"
     }
   ],
   "message.invalid-domain": [
     {
       "type": 0,
-      "value": "無效域名"
+      "value": "無效的網域。請不要包含 http/https。"
     }
   ],
   "message.min-password-length": [
     {
       "type": 0,
-      "value": "Minimum length of "
+      "value": "最少需要 "
     },
     {
       "type": 1,
@@ -1118,13 +1266,13 @@
     },
     {
       "type": 0,
-      "value": " characters"
+      "value": " 個字元"
     }
   ],
   "message.new-version-available": [
     {
       "type": 0,
-      "value": "A new version of Umami "
+      "value": "Umami "
     },
     {
       "type": 1,
@@ -1132,67 +1280,67 @@
     },
     {
       "type": 0,
-      "value": " is available!"
+      "value": " 的新版本已經可以使用！"
     }
   ],
   "message.no-data-available": [
     {
       "type": 0,
-      "value": "無可用數據。"
+      "value": "沒有可用的資料。"
     }
   ],
   "message.no-event-data": [
     {
       "type": 0,
-      "value": "No event data is available."
+      "value": "沒有可用的事件資料。"
     }
   ],
   "message.no-match-password": [
     {
       "type": 0,
-      "value": "密碼不一致"
+      "value": "密碼不一致。"
     }
   ],
   "message.no-results-found": [
     {
       "type": 0,
-      "value": "No results were found."
+      "value": "找不到結果。"
     }
   ],
   "message.no-team-websites": [
     {
       "type": 0,
-      "value": "This team does not have any websites."
+      "value": "此團隊沒有任何網站。"
     }
   ],
   "message.no-teams": [
     {
       "type": 0,
-      "value": "You have not created any teams."
+      "value": "您尚未建立任何團隊。"
     }
   ],
   "message.no-users": [
     {
       "type": 0,
-      "value": "There are no users."
+      "value": "沒有使用者。"
     }
   ],
   "message.no-websites-configured": [
     {
       "type": 0,
-      "value": "目前無任何網站設定。"
+      "value": "您尚未設定任何網站。"
     }
   ],
   "message.page-not-found": [
     {
       "type": 0,
-      "value": "網頁未找到。"
+      "value": "找不到頁面"
     }
   ],
   "message.reset-website": [
     {
       "type": 0,
-      "value": "To reset this website, type "
+      "value": "要重設此網站，請在下方的方框中輸入 "
     },
     {
       "type": 1,
@@ -1200,69 +1348,75 @@
     },
     {
       "type": 0,
-      "value": " in the box below to confirm."
+      "value": " 以確認。"
     }
   ],
   "message.reset-website-warning": [
     {
       "type": 0,
-      "value": "本網站的所有統計數據將被刪除，但您的跟蹤代碼將保持不變。"
+      "value": "此網站的所有統計將被刪除，但您的設定將保持不變。"
     }
   ],
   "message.saved": [
     {
       "type": 0,
-      "value": "成功保存。"
+      "value": "已儲存。"
     }
   ],
   "message.share-url": [
     {
       "type": 0,
-      "value": "這是 "
-    },
-    {
-      "type": 1,
-      "value": "target"
-    },
-    {
-      "type": 0,
-      "value": " 的分享連結。"
+      "value": "您的網站統計資料可以在以下網址公開檢視："
     }
   ],
   "message.team-already-member": [
     {
       "type": 0,
-      "value": "You are already a member of the team."
+      "value": "您已經是團隊的成員。"
     }
   ],
   "message.team-not-found": [
     {
       "type": 0,
-      "value": "Team not found."
+      "value": "找不到團隊。"
     }
   ],
   "message.team-websites-info": [
     {
       "type": 0,
-      "value": "Websites can be viewed by anyone on the team."
+      "value": "團隊的任何成員都可以檢視網站。"
     }
   ],
   "message.tracking-code": [
     {
       "type": 0,
-      "value": "追蹤代碼"
+      "value": "要追蹤此網站的統計，請將以下代碼放在您的 HTML 的 "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "..."
+        }
+      ],
+      "type": 8,
+      "value": "head"
+    },
+    {
+      "type": 0,
+      "value": " 區段中。"
     }
   ],
   "message.user-deleted": [
     {
       "type": 0,
-      "value": "User deleted."
+      "value": "使用者已刪除。"
     }
   ],
   "message.visitor-log": [
     {
       "type": 0,
-      "value": "來自"
+      "value": "來自 "
     },
     {
       "type": 1,
@@ -1270,15 +1424,7 @@
     },
     {
       "type": 0,
-      "value": "的訪客在搭載 "
-    },
-    {
-      "type": 1,
-      "value": "os"
-    },
-    {
-      "type": 0,
-      "value": " 的"
+      "value": " 的訪客在 "
     },
     {
       "type": 1,
@@ -1286,7 +1432,15 @@
     },
     {
       "type": 0,
-      "value": "上使用 "
+      "value": " 上的 "
+    },
+    {
+      "type": 1,
+      "value": "os"
+    },
+    {
+      "type": 0,
+      "value": " 使用 "
     },
     {
       "type": 1,
@@ -1294,7 +1448,7 @@
     },
     {
       "type": 0,
-      "value": " 進行訪問。"
+      "value": " 瀏覽。"
     }
   ]
 }
diff --git a/public/mstile-150x150.png b/public/mstile-150x150.png
index 7f73bcd84..ae4fd79c1 100644
Binary files a/public/mstile-150x150.png and b/public/mstile-150x150.png differ
diff --git a/public/safari-pinned-tab.svg b/public/safari-pinned-tab.svg
index 179f3e69b..2d116eb84 100644
--- a/public/safari-pinned-tab.svg
+++ b/public/safari-pinned-tab.svg
@@ -1,75 +1 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
- "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
- width="856.000000pt" height="856.000000pt" viewBox="0 0 856.000000 856.000000"
- preserveAspectRatio="xMidYMid meet">
-<metadata>
-Created by potrace 1.11, written by Peter Selinger 2001-2013
-</metadata>
-<g transform="translate(0.000000,856.000000) scale(0.100000,-0.100000)"
-fill="#000000" stroke="none">
-<path d="M4027 8163 c-2 -2 -28 -5 -58 -7 -50 -4 -94 -9 -179 -22 -19 -2 -48
--6 -65 -9 -47 -6 -236 -44 -280 -55 -22 -6 -49 -12 -60 -15 -34 -6 -58 -13
--130 -36 -38 -13 -72 -23 -75 -24 -29 -6 -194 -66 -264 -96 -49 -22 -95 -39
--102 -39 -7 0 -19 -7 -28 -15 -8 -9 -18 -15 -21 -14 -7 1 -197 -92 -205 -101
--3 -3 -21 -13 -40 -24 -79 -42 -123 -69 -226 -137 -94 -62 -246 -173 -280
--204 -6 -5 -29 -25 -52 -43 -136 -111 -329 -305 -457 -462 -21 -25 -41 -47
--44 -50 -4 -3 -22 -26 -39 -52 -18 -25 -38 -52 -45 -60 -34 -35 -207 -308
--259 -408 -13 -25 -25 -47 -28 -50 -11 -11 -121 -250 -159 -346 -42 -105 -114
--321 -126 -374 l-7 -30 -263 0 c-245 0 -268 -2 -321 -21 -94 -35 -171 -122
--191 -216 -9 -39 -8 -852 0 -938 9 -87 16 -150 23 -195 3 -19 6 -48 8 -65 3
--29 14 -97 22 -140 3 -11 7 -36 10 -55 3 -19 9 -51 14 -70 5 -19 11 -46 14
--60 29 -138 104 -401 145 -505 5 -11 23 -58 42 -105 18 -47 42 -105 52 -130
-11 -25 21 -49 22 -55 3 -10 109 -224 164 -330 18 -33 50 -89 71 -124 22 -34
-40 -64 40 -66 0 -8 104 -161 114 -167 6 -4 7 -8 3 -8 -4 0 4 -12 18 -27 14
--15 25 -32 25 -36 0 -5 6 -14 13 -21 6 -7 21 -25 32 -41 11 -15 34 -44 50 -64
-17 -21 41 -52 55 -70 13 -18 33 -43 45 -56 11 -13 42 -49 70 -81 100 -118 359
--369 483 -469 34 -27 62 -53 62 -57 0 -5 6 -8 13 -8 7 0 19 -9 27 -20 8 -11
-19 -20 26 -20 6 0 19 -9 29 -20 10 -11 22 -20 27 -20 5 0 23 -13 41 -30 18
--16 37 -30 44 -30 6 0 13 -4 15 -8 3 -8 186 -132 194 -132 2 0 27 -15 56 -34
-132 -83 377 -207 558 -280 36 -15 74 -31 85 -36 62 -26 220 -81 320 -109 79
--23 191 -53 214 -57 14 -3 28 -7 31 -9 4 -2 20 -7 36 -9 16 -3 40 -8 54 -11
-14 -3 36 -8 50 -11 14 -2 36 -7 50 -10 13 -3 40 -8 60 -10 19 -2 46 -7 60 -10
-54 -10 171 -25 320 -40 90 -9 613 -12 636 -4 11 5 28 4 37 -1 9 -6 17 -6 17
--1 0 4 10 8 23 9 29 0 154 12 192 18 17 3 46 7 65 9 70 10 131 20 183 32 16 3
-38 7 50 9 45 7 165 36 252 60 50 14 100 28 112 30 12 3 34 10 48 15 14 5 25 7
-25 4 0 -4 6 -2 13 3 6 6 30 16 52 22 22 7 47 15 55 18 8 4 17 7 20 7 10 2 179
-68 240 94 96 40 342 159 395 191 17 10 53 30 80 46 28 15 81 47 118 71 37 24
-72 44 76 44 5 0 11 3 13 8 2 4 30 25 63 47 33 22 62 42 65 45 3 3 50 38 105
-79 55 40 105 79 110 85 6 6 24 22 40 34 85 65 465 430 465 447 0 3 8 13 18 23
-9 10 35 40 57 66 22 27 47 56 55 65 8 9 42 52 74 96 32 44 71 96 85 115 140
-183 358 576 461 830 12 30 28 69 36 85 24 56 123 355 117 355 -3 0 -1 6 5 13
-6 6 14 30 18 52 10 48 9 46 17 65 5 13 37 155 52 230 9 42 35 195 40 231 34
-235 40 357 40 804 l0 420 -24 44 c-46 87 -143 157 -231 166 -19 2 -144 4 -276
-4 l-242 1 -36 118 c-21 64 -46 139 -56 166 -11 27 -20 52 -20 57 0 5 -11 33
--25 63 -14 30 -25 58 -25 61 0 18 -152 329 -162 333 -5 2 -8 10 -8 18 0 8 -4
-14 -10 14 -5 0 -9 3 -8 8 3 9 -40 82 -128 217 -63 97 -98 145 -187 259 -133
-171 -380 420 -559 564 -71 56 -132 102 -138 102 -5 0 -10 3 -10 8 0 4 -25 23
--55 42 -30 19 -55 38 -55 43 0 4 -6 7 -13 7 -7 0 -22 8 -33 18 -11 9 -37 26
--59 37 -21 11 -44 25 -50 30 -41 37 -413 220 -540 266 -27 9 -61 22 -75 27
--14 5 -28 10 -32 11 -4 1 -28 10 -53 21 -25 11 -46 19 -48 18 -2 -1 -109 29
--137 40 -13 4 -32 9 -65 16 -5 1 -16 5 -22 9 -7 5 -13 6 -13 3 0 -2 -15 0 -32
-5 -18 5 -44 11 -58 14 -14 3 -36 7 -50 10 -14 3 -50 9 -80 15 -30 6 -64 12
--75 14 -11 2 -45 6 -75 10 -30 4 -71 9 -90 12 -19 3 -53 6 -75 7 -22 1 -44 5
--50 8 -11 7 -542 9 -548 2z m57 -404 c7 10 436 8 511 -3 22 -3 60 -8 85 -11
-25 -2 56 -6 70 -9 14 -2 43 -7 65 -10 38 -5 58 -9 115 -21 14 -3 34 -7 45 -9
-11 -2 58 -14 105 -26 47 -12 92 -23 100 -25 35 -7 279 -94 308 -109 17 -9 34
--16 37 -16 3 1 20 -6 38 -14 17 -8 68 -31 112 -51 44 -20 82 -35 84 -35 2 1 7
--3 10 -8 3 -5 43 -28 88 -51 45 -23 87 -48 93 -56 7 -8 17 -15 22 -15 12 0
-192 -121 196 -132 2 -4 8 -8 13 -8 10 0 119 -86 220 -172 102 -87 256 -244
-349 -357 25 -30 53 -63 63 -73 9 -10 17 -22 17 -28 0 -5 3 -10 8 -10 4 0 25
--27 46 -60 22 -33 43 -60 48 -60 4 0 8 -5 8 -11 0 -6 11 -25 25 -43 14 -18 25
--38 25 -44 0 -7 4 -12 8 -12 5 0 16 -15 25 -32 9 -18 30 -55 47 -83 46 -77
-161 -305 154 -305 -4 0 -2 -6 4 -12 6 -7 23 -47 40 -88 16 -41 33 -84 37 -95
-5 -11 9 -22 10 -25 0 -3 11 -36 24 -73 13 -38 21 -70 19 -73 -3 -2 -1386 -3
--3075 -2 l-3071 3 38 110 c47 137 117 301 182 425 62 118 167 295 191 320 9
-11 17 22 17 25 0 7 39 63 58 83 6 7 26 35 44 60 18 26 37 52 43 57 6 6 34 37
-61 70 48 59 271 286 329 335 17 14 53 43 80 65 28 22 52 42 55 45 3 3 21 17
-40 30 19 14 40 28 45 32 40 32 105 78 109 78 3 0 28 16 55 35 26 19 53 35 58
-35 5 0 18 8 29 18 17 15 53 35 216 119 118 60 412 176 422 166 3 -4 6 -2 6 4
-0 6 12 13 28 16 15 3 52 12 82 21 30 9 63 19 73 21 10 2 27 7 37 10 10 3 29 8
-42 10 13 3 48 10 78 16 30 7 61 12 68 12 6 0 12 4 12 9 0 5 5 6 10 3 6 -4 34
--2 63 4 51 11 71 13 197 26 36 4 67 9 69 11 2 2 10 -1 17 -7 8 -6 14 -7 18 0z"/>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="1141.333" height="1141.333" preserveAspectRatio="xMidYMid meet" version="1.0" viewBox="0 0 856 856"><metadata>Created by potrace 1.11, written by Peter Selinger 2001-2013</metadata><g fill="#000" stroke="none"><path d="M4027 8163 c-2 -2 -28 -5 -58 -7 -50 -4 -94 -9 -179 -22 -19 -2 -48 -6 -65 -9 -47 -6 -236 -44 -280 -55 -22 -6 -49 -12 -60 -15 -34 -6 -58 -13 -130 -36 -38 -13 -72 -23 -75 -24 -29 -6 -194 -66 -264 -96 -49 -22 -95 -39 -102 -39 -7 0 -19 -7 -28 -15 -8 -9 -18 -15 -21 -14 -7 1 -197 -92 -205 -101 -3 -3 -21 -13 -40 -24 -79 -42 -123 -69 -226 -137 -94 -62 -246 -173 -280 -204 -6 -5 -29 -25 -52 -43 -136 -111 -329 -305 -457 -462 -21 -25 -41 -47 -44 -50 -4 -3 -22 -26 -39 -52 -18 -25 -38 -52 -45 -60 -34 -35 -207 -308 -259 -408 -13 -25 -25 -47 -28 -50 -11 -11 -121 -250 -159 -346 -42 -105 -114 -321 -126 -374 l-7 -30 -263 0 c-245 0 -268 -2 -321 -21 -94 -35 -171 -122 -191 -216 -9 -39 -8 -852 0 -938 9 -87 16 -150 23 -195 3 -19 6 -48 8 -65 3 -29 14 -97 22 -140 3 -11 7 -36 10 -55 3 -19 9 -51 14 -70 5 -19 11 -46 14 -60 29 -138 104 -401 145 -505 5 -11 23 -58 42 -105 18 -47 42 -105 52 -130 11 -25 21 -49 22 -55 3 -10 109 -224 164 -330 18 -33 50 -89 71 -124 22 -34 40 -64 40 -66 0 -8 104 -161 114 -167 6 -4 7 -8 3 -8 -4 0 4 -12 18 -27 14 -15 25 -32 25 -36 0 -5 6 -14 13 -21 6 -7 21 -25 32 -41 11 -15 34 -44 50 -64 17 -21 41 -52 55 -70 13 -18 33 -43 45 -56 11 -13 42 -49 70 -81 100 -118 359 -369 483 -469 34 -27 62 -53 62 -57 0 -5 6 -8 13 -8 7 0 19 -9 27 -20 8 -11 19 -20 26 -20 6 0 19 -9 29 -20 10 -11 22 -20 27 -20 5 0 23 -13 41 -30 18 -16 37 -30 44 -30 6 0 13 -4 15 -8 3 -8 186 -132 194 -132 2 0 27 -15 56 -34 132 -83 377 -207 558 -280 36 -15 74 -31 85 -36 62 -26 220 -81 320 -109 79 -23 191 -53 214 -57 14 -3 28 -7 31 -9 4 -2 20 -7 36 -9 16 -3 40 -8 54 -11 14 -3 36 -8 50 -11 14 -2 36 -7 50 -10 13 -3 40 -8 60 -10 19 -2 46 -7 60 -10 54 -10 171 -25 320 -40 90 -9 613 -12 636 -4 11 5 28 4 37 -1 9 -6 17 -6 17 -1 0 4 10 8 23 9 29 0 154 12 192 18 17 3 46 7 65 9 70 10 131 20 183 32 16 3 38 7 50 9 45 7 165 36 252 60 50 14 100 28 112 30 12 3 34 10 48 15 14 5 25 7 25 4 0 -4 6 -2 13 3 6 6 30 16 52 22 22 7 47 15 55 18 8 4 17 7 20 7 10 2 179 68 240 94 96 40 342 159 395 191 17 10 53 30 80 46 28 15 81 47 118 71 37 24 72 44 76 44 5 0 11 3 13 8 2 4 30 25 63 47 33 22 62 42 65 45 3 3 50 38 105 79 55 40 105 79 110 85 6 6 24 22 40 34 85 65 465 430 465 447 0 3 8 13 18 23 9 10 35 40 57 66 22 27 47 56 55 65 8 9 42 52 74 96 32 44 71 96 85 115 140 183 358 576 461 830 12 30 28 69 36 85 24 56 123 355 117 355 -3 0 -1 6 5 13 6 6 14 30 18 52 10 48 9 46 17 65 5 13 37 155 52 230 9 42 35 195 40 231 34 235 40 357 40 804 l0 420 -24 44 c-46 87 -143 157 -231 166 -19 2 -144 4 -276 4 l-242 1 -36 118 c-21 64 -46 139 -56 166 -11 27 -20 52 -20 57 0 5 -11 33 -25 63 -14 30 -25 58 -25 61 0 18 -152 329 -162 333 -5 2 -8 10 -8 18 0 8 -4 14 -10 14 -5 0 -9 3 -8 8 3 9 -40 82 -128 217 -63 97 -98 145 -187 259 -133 171 -380 420 -559 564 -71 56 -132 102 -138 102 -5 0 -10 3 -10 8 0 4 -25 23 -55 42 -30 19 -55 38 -55 43 0 4 -6 7 -13 7 -7 0 -22 8 -33 18 -11 9 -37 26 -59 37 -21 11 -44 25 -50 30 -41 37 -413 220 -540 266 -27 9 -61 22 -75 27 -14 5 -28 10 -32 11 -4 1 -28 10 -53 21 -25 11 -46 19 -48 18 -2 -1 -109 29 -137 40 -13 4 -32 9 -65 16 -5 1 -16 5 -22 9 -7 5 -13 6 -13 3 0 -2 -15 0 -32 5 -18 5 -44 11 -58 14 -14 3 -36 7 -50 10 -14 3 -50 9 -80 15 -30 6 -64 12 -75 14 -11 2 -45 6 -75 10 -30 4 -71 9 -90 12 -19 3 -53 6 -75 7 -22 1 -44 5 -50 8 -11 7 -542 9 -548 2z m57 -404 c7 10 436 8 511 -3 22 -3 60 -8 85 -11 25 -2 56 -6 70 -9 14 -2 43 -7 65 -10 38 -5 58 -9 115 -21 14 -3 34 -7 45 -9 11 -2 58 -14 105 -26 47 -12 92 -23 100 -25 35 -7 279 -94 308 -109 17 -9 34 -16 37 -16 3 1 20 -6 38 -14 17 -8 68 -31 112 -51 44 -20 82 -35 84 -35 2 1 7 -3 10 -8 3 -5 43 -28 88 -51 45 -23 87 -48 93 -56 7 -8 17 -15 22 -15 12 0 192 -121 196 -132 2 -4 8 -8 13 -8 10 0 119 -86 220 -172 102 -87 256 -244 349 -357 25 -30 53 -63 63 -73 9 -10 17 -22 17 -28 0 -5 3 -10 8 -10 4 0 25 -27 46 -60 22 -33 43 -60 48 -60 4 0 8 -5 8 -11 0 -6 11 -25 25 -43 14 -18 25 -38 25 -44 0 -7 4 -12 8 -12 5 0 16 -15 25 -32 9 -18 30 -55 47 -83 46 -77 161 -305 154 -305 -4 0 -2 -6 4 -12 6 -7 23 -47 40 -88 16 -41 33 -84 37 -95 5 -11 9 -22 10 -25 0 -3 11 -36 24 -73 13 -38 21 -70 19 -73 -3 -2 -1386 -3 -3075 -2 l-3071 3 38 110 c47 137 117 301 182 425 62 118 167 295 191 320 9 11 17 22 17 25 0 7 39 63 58 83 6 7 26 35 44 60 18 26 37 52 43 57 6 6 34 37 61 70 48 59 271 286 329 335 17 14 53 43 80 65 28 22 52 42 55 45 3 3 21 17 40 30 19 14 40 28 45 32 40 32 105 78 109 78 3 0 28 16 55 35 26 19 53 35 58 35 5 0 18 8 29 18 17 15 53 35 216 119 118 60 412 176 422 166 3 -4 6 -2 6 4 0 6 12 13 28 16 15 3 52 12 82 21 30 9 63 19 73 21 10 2 27 7 37 10 10 3 29 8 42 10 13 3 48 10 78 16 30 7 61 12 68 12 6 0 12 4 12 9 0 5 5 6 10 3 6 -4 34 -2 63 4 51 11 71 13 197 26 36 4 67 9 69 11 2 2 10 -1 17 -7 8 -6 14 -7 18 0z" transform="translate(0.000000,856.000000) scale(0.100000,-0.100000)"/></g></svg>
\ No newline at end of file
diff --git a/queries/admin/report.ts b/queries/admin/report.ts
deleted file mode 100644
index ee7a05920..000000000
--- a/queries/admin/report.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { Prisma, Report } from '@prisma/client';
-import prisma from 'lib/prisma';
-
-export async function createReport(data: Prisma.ReportUncheckedCreateInput): Promise<Report> {
-  return prisma.client.report.create({ data });
-}
-
-export async function getReportById(reportId: string): Promise<Report> {
-  return prisma.client.report.findUnique({
-    where: {
-      id: reportId,
-    },
-  });
-}
-
-export async function getUserReports(userId: string): Promise<Report[]> {
-  return prisma.client.report.findMany({
-    where: {
-      userId,
-    },
-  });
-}
-
-export async function getWebsiteReports(websiteId: string): Promise<Report[]> {
-  return prisma.client.report.findMany({
-    where: {
-      websiteId,
-    },
-  });
-}
-
-export async function updateReport(
-  reportId: string,
-  data: Prisma.ReportUpdateInput,
-): Promise<Report> {
-  return prisma.client.report.update({ where: { id: reportId }, data });
-}
-
-export async function deleteReport(reportId: string): Promise<Report> {
-  return prisma.client.report.delete({ where: { id: reportId } });
-}
diff --git a/queries/admin/website.ts b/queries/admin/website.ts
deleted file mode 100644
index 35f32bac2..000000000
--- a/queries/admin/website.ts
+++ /dev/null
@@ -1,128 +0,0 @@
-import { Prisma, Website } from '@prisma/client';
-import cache from 'lib/cache';
-import prisma from 'lib/prisma';
-
-async function getWebsite(where: Prisma.WebsiteWhereUniqueInput): Promise<Website> {
-  return prisma.client.website.findUnique({
-    where,
-  });
-}
-
-export async function getWebsiteById(id: string) {
-  return getWebsite({ id });
-}
-
-export async function getWebsiteByShareId(shareId: string) {
-  return getWebsite({ shareId });
-}
-
-export async function getWebsites(): Promise<Website[]> {
-  return prisma.client.website.findMany({
-    orderBy: {
-      name: 'asc',
-    },
-  });
-}
-
-export async function createWebsite(
-  data: Prisma.WebsiteCreateInput | Prisma.WebsiteUncheckedCreateInput,
-): Promise<Website> {
-  return prisma.client.website
-    .create({
-      data,
-    })
-    .then(async data => {
-      if (cache.enabled) {
-        await cache.storeWebsite(data);
-      }
-
-      return data;
-    });
-}
-
-export async function updateWebsite(
-  websiteId,
-  data: Prisma.WebsiteUpdateInput | Prisma.WebsiteUncheckedUpdateInput,
-): Promise<Website> {
-  return prisma.client.website.update({
-    where: {
-      id: websiteId,
-    },
-    data,
-  });
-}
-
-export async function resetWebsite(
-  websiteId,
-): Promise<[Prisma.BatchPayload, Prisma.BatchPayload, Website]> {
-  const { client, transaction } = prisma;
-
-  return transaction([
-    client.eventData.deleteMany({
-      where: { websiteId },
-    }),
-    client.websiteEvent.deleteMany({
-      where: { websiteId },
-    }),
-    client.session.deleteMany({
-      where: { websiteId },
-    }),
-    client.website.update({
-      where: { id: websiteId },
-      data: {
-        resetAt: new Date(),
-      },
-    }),
-  ]).then(async data => {
-    if (cache.enabled) {
-      await cache.storeWebsite(data[2]);
-    }
-
-    return data;
-  });
-}
-
-export async function deleteWebsite(
-  websiteId,
-): Promise<[Prisma.BatchPayload, Prisma.BatchPayload, Website]> {
-  const { client, transaction } = prisma;
-  const cloudMode = process.env.CLOUD_MODE;
-
-  return transaction([
-    client.eventData.deleteMany({
-      where: { websiteId },
-    }),
-    client.websiteEvent.deleteMany({
-      where: { websiteId },
-    }),
-    client.session.deleteMany({
-      where: { websiteId },
-    }),
-    client.teamWebsite.deleteMany({
-      where: {
-        websiteId,
-      },
-    }),
-    client.report.deleteMany({
-      where: {
-        websiteId,
-      },
-    }),
-    cloudMode
-      ? prisma.client.website.update({
-          data: {
-            deletedAt: new Date(),
-          },
-          where: { id: websiteId },
-        })
-      : client.website.delete({
-          where: { id: websiteId },
-        }),
-  ]).then(async data => {
-    if (cache.enabled) {
-      await cache.deleteWebsite(websiteId);
-    }
-
-    return data;
-  });
-}
diff --git a/queries/analytics/eventData/getEventDataEvents.ts b/queries/analytics/eventData/getEventDataEvents.ts
deleted file mode 100644
index 634a28a26..000000000
--- a/queries/analytics/eventData/getEventDataEvents.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-import prisma from 'lib/prisma';
-import clickhouse from 'lib/clickhouse';
-import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
-import { WebsiteEventDataFields } from 'lib/types';
-import { loadWebsite } from 'lib/load';
-import { maxDate } from 'lib/date';
-
-export async function getEventDataEvents(
-  ...args: [
-    websiteId: string,
-    startDate: Date,
-    endDate: Date,
-    filters: { field?: string; event?: string },
-  ]
-): Promise<WebsiteEventDataFields[]> {
-  return runQuery({
-    [PRISMA]: () => relationalQuery(...args),
-    [CLICKHOUSE]: () => clickhouseQuery(...args),
-  });
-}
-
-async function relationalQuery(
-  websiteId: string,
-  startDate: Date,
-  endDate: Date,
-  filters: { field?: string; event?: string },
-) {
-  const { rawQuery } = prisma;
-  const website = await loadWebsite(websiteId);
-  const { event } = filters;
-
-  if (event) {
-    return rawQuery(
-      `
-      select
-        we.event_name as event,
-        ed.event_key as field,
-        ed.data_type as type,
-        ed.string_value as value,
-        count(*) as total
-      from event_data as ed
-      inner join website_event as we
-        on we.event_id = ed.website_event_id
-      where ed.website_id = {{websiteId::uuid}}
-        and ed.created_at between {{startDate}} and {{endDate}}
-        and we.event_name = {{event}}
-      group by we.event_name, ed.event_key, ed.data_type, ed.string_value
-      order by 1 asc, 2 asc, 3 asc, 4 desc
-      `,
-      { websiteId, startDate: maxDate(startDate, website.resetAt), endDate, ...filters },
-    );
-  }
-  return rawQuery(
-    `
-    select
-      we.event_name as event,
-      ed.event_key as field,
-      ed.data_type as type,
-      count(*) as total
-    from event_data as ed
-    inner join website_event as we
-      on we.event_id = ed.website_event_id
-    where ed.website_id = {{websiteId::uuid}}
-      and ed.created_at between {{startDate}} and {{endDate}}
-    group by we.event_name, ed.event_key, ed.data_type
-    order by 1 asc, 2 asc
-    limit 100
-    `,
-    { websiteId, startDate: maxDate(startDate, website.resetAt), endDate },
-  );
-}
-
-async function clickhouseQuery(
-  websiteId: string,
-  startDate: Date,
-  endDate: Date,
-  filters: { field?: string; event?: string },
-) {
-  const { rawQuery } = clickhouse;
-  const website = await loadWebsite(websiteId);
-  const { event } = filters;
-
-  if (event) {
-    return rawQuery(
-      `
-      select
-        event_name as event,
-        event_key as field,
-        data_type as type,
-        string_value as value,
-        count(*) as total
-      from event_data
-      where website_id = {websiteId:UUID}
-        and created_at between {startDate:DateTime} and {endDate:DateTime}
-        and event_name = {event:String}
-      group by event_key, data_type, string_value, event_name
-      order by 1 asc, 2 asc, 3 asc, 4 desc
-      limit 100
-      `,
-      { ...filters, websiteId, startDate: maxDate(startDate, website.resetAt), endDate },
-    );
-  }
-
-  return rawQuery(
-    `
-    select
-      event_name as event,
-      event_key as field,
-      data_type as type,
-      count(*) as total
-    from event_data
-    where website_id = {websiteId:UUID}
-      and created_at between {startDate:DateTime} and {endDate:DateTime}
-    group by event_key, data_type, event_name
-    order by 1 asc, 2 asc
-    limit 100
-    `,
-    { websiteId, startDate: maxDate(startDate, website.resetAt), endDate },
-  );
-}
diff --git a/queries/analytics/eventData/getEventDataFields.ts b/queries/analytics/eventData/getEventDataFields.ts
deleted file mode 100644
index 516c58d0c..000000000
--- a/queries/analytics/eventData/getEventDataFields.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import prisma from 'lib/prisma';
-import clickhouse from 'lib/clickhouse';
-import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
-import { WebsiteEventDataFields } from 'lib/types';
-import { loadWebsite } from 'lib/load';
-import { maxDate } from 'lib/date';
-
-export async function getEventDataFields(
-  ...args: [websiteId: string, startDate: Date, endDate: Date, field?: string]
-): Promise<WebsiteEventDataFields[]> {
-  return runQuery({
-    [PRISMA]: () => relationalQuery(...args),
-    [CLICKHOUSE]: () => clickhouseQuery(...args),
-  });
-}
-
-async function relationalQuery(websiteId: string, startDate: Date, endDate: Date, field: string) {
-  const { rawQuery } = prisma;
-  const website = await loadWebsite(websiteId);
-
-  if (field) {
-    return rawQuery(
-      `
-      select
-        event_key as field,
-        string_value as value,
-        count(*) as total
-      from event_data
-      where website_id = {{websiteId::uuid}}
-        and event_key = {{field}}
-        and created_at between {{startDate}} and {{endDate}}
-      group by event_key, string_value
-      order by 3 desc, 2 desc, 1 asc
-      limit 100
-      `,
-      { websiteId, field, startDate: maxDate(startDate, website.resetAt), endDate },
-    );
-  }
-
-  return rawQuery(
-    `
-    select
-      event_key as field,
-      data_type as type,
-      count(*) as total
-    from event_data
-    where website_id = {{websiteId::uuid}}
-      and created_at between {{startDate}} and {{endDate}}
-    group by event_key, data_type
-    order by 3 desc, 2 asc, 1 asc
-    limit 100
-    `,
-    { websiteId, startDate: maxDate(startDate, website.resetAt), endDate },
-  );
-}
-
-async function clickhouseQuery(websiteId: string, startDate: Date, endDate: Date, field: string) {
-  const { rawQuery } = clickhouse;
-  const website = await loadWebsite(websiteId);
-
-  if (field) {
-    return rawQuery(
-      `
-      select
-        event_key as field,
-        string_value as value,
-        count(*) as total
-      from event_data
-      where website_id = {websiteId:UUID}
-        and event_key = {field:String}
-        and created_at between {startDate:DateTime} and {endDate:DateTime}
-      group by event_key, string_value
-      order by 3 desc, 2 desc, 1 asc
-      limit 100
-      `,
-      { websiteId, field, startDate: maxDate(startDate, website.resetAt), endDate },
-    );
-  }
-
-  return rawQuery(
-    `
-    select
-      event_key as field,
-      data_type as type,
-      count(*) as total
-    from event_data
-    where website_id = {websiteId:UUID}
-      and created_at between {startDate:DateTime} and {endDate:DateTime}
-    group by event_key, data_type
-    order by 3 desc, 2 asc, 1 asc
-    limit 100
-    `,
-    { websiteId, startDate: maxDate(startDate, website.resetAt), endDate },
-  );
-}
diff --git a/queries/analytics/events/getEventMetrics.ts b/queries/analytics/events/getEventMetrics.ts
deleted file mode 100644
index e97540366..000000000
--- a/queries/analytics/events/getEventMetrics.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-import prisma from 'lib/prisma';
-import clickhouse from 'lib/clickhouse';
-import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
-import { WebsiteEventMetric } from 'lib/types';
-import { EVENT_TYPE } from 'lib/constants';
-import { loadWebsite } from 'lib/load';
-import { maxDate } from 'lib/date';
-
-export interface GetEventMetricsCriteria {
-  startDate: Date;
-  endDate: Date;
-  timezone: string;
-  unit: string;
-  filters: {
-    url: string;
-    eventName: string;
-  };
-}
-
-export async function getEventMetrics(
-  ...args: [websiteId: string, criteria: GetEventMetricsCriteria]
-): Promise<WebsiteEventMetric[]> {
-  return runQuery({
-    [PRISMA]: () => relationalQuery(...args),
-    [CLICKHOUSE]: () => clickhouseQuery(...args),
-  });
-}
-
-async function relationalQuery(websiteId: string, criteria: GetEventMetricsCriteria) {
-  const { startDate, endDate, timezone = 'utc', unit = 'day', filters } = criteria;
-  const { rawQuery, getDateQuery, getFilterQuery } = prisma;
-  const website = await loadWebsite(websiteId);
-  const filterQuery = getFilterQuery(filters);
-
-  return rawQuery(
-    `
-    select
-      event_name x,
-      ${getDateQuery('created_at', unit, timezone)} t,
-      count(*) y
-    from website_event
-    where website_id = {{websiteId::uuid}}
-      and created_at between {{startDate}} and {{endDate}}
-      and event_type = {{eventType}}
-      ${filterQuery}
-    group by 1, 2
-    order by 2
-    `,
-    {
-      websiteId,
-      startDate: maxDate(startDate, website.resetAt),
-      endDate,
-      eventType: EVENT_TYPE.customEvent,
-      ...filters,
-    },
-  );
-}
-
-async function clickhouseQuery(websiteId: string, criteria: GetEventMetricsCriteria) {
-  const { startDate, endDate, timezone = 'utc', unit = 'day', filters } = criteria;
-  const { rawQuery, getDateQuery, getFilterQuery } = clickhouse;
-  const website = await loadWebsite(websiteId);
-  const filterQuery = getFilterQuery(filters);
-
-  return rawQuery(
-    `
-    select
-      event_name x,
-      ${getDateQuery('created_at', unit, timezone)} t,
-      count(*) y
-    from website_event
-    where website_id = {websiteId:UUID}
-      and created_at between {startDate:DateTime} and {endDate:DateTime}
-      and event_type = {eventType:UInt32}
-      ${filterQuery}
-    group by x, t
-    order by t
-    `,
-    {
-      ...filters,
-      websiteId,
-      startDate: maxDate(startDate, website.resetAt),
-      endDate,
-      eventType: EVENT_TYPE.customEvent,
-    },
-  );
-}
diff --git a/queries/analytics/pageviews/getPageviewMetrics.ts b/queries/analytics/pageviews/getPageviewMetrics.ts
deleted file mode 100644
index 1032540b8..000000000
--- a/queries/analytics/pageviews/getPageviewMetrics.ts
+++ /dev/null
@@ -1,118 +0,0 @@
-import prisma from 'lib/prisma';
-import clickhouse from 'lib/clickhouse';
-import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
-import { EVENT_TYPE } from 'lib/constants';
-import { loadWebsite } from 'lib/load';
-import { maxDate } from 'lib/date';
-
-export async function getPageviewMetrics(
-  ...args: [
-    websiteId: string,
-    criteria: {
-      startDate: Date;
-      endDate: Date;
-      column: string;
-      filters: object;
-    },
-  ]
-) {
-  return runQuery({
-    [PRISMA]: () => relationalQuery(...args),
-    [CLICKHOUSE]: () => clickhouseQuery(...args),
-  });
-}
-
-async function relationalQuery(
-  websiteId: string,
-  criteria: {
-    startDate: Date;
-    endDate: Date;
-    column: string;
-    filters: object;
-  },
-) {
-  const { startDate, endDate, filters = {}, column } = criteria;
-  const { rawQuery, parseFilters } = prisma;
-  const website = await loadWebsite(websiteId);
-  const params: any = {
-    websiteId,
-    startDate: maxDate(startDate, website.resetAt),
-    endDate,
-    eventType: column === 'event_name' ? EVENT_TYPE.customEvent : EVENT_TYPE.pageView,
-    ...filters,
-  };
-
-  let excludeDomain = '';
-
-  if (column === 'referrer_domain') {
-    excludeDomain =
-      'and (website_event.referrer_domain != {{domain}} or website_event.referrer_domain is null)';
-
-    params.domain = website.domain;
-  }
-
-  const { filterQuery, joinSession } = parseFilters(filters);
-
-  return rawQuery(
-    `
-    select ${column} x, count(*) y
-    from website_event
-      ${joinSession}
-    where website_event.website_id = {{websiteId::uuid}}
-      and website_event.created_at between {{startDate}} and {{endDate}}
-      and event_type = {{eventType}}
-      ${excludeDomain}
-      ${filterQuery}
-    group by 1
-    order by 2 desc
-    limit 100
-    `,
-    params,
-  );
-}
-
-async function clickhouseQuery(
-  websiteId: string,
-  criteria: {
-    startDate: Date;
-    endDate: Date;
-    column: string;
-    filters: object;
-  },
-) {
-  const { startDate, endDate, filters = {}, column } = criteria;
-  const { rawQuery, parseFilters } = clickhouse;
-  const website = await loadWebsite(websiteId);
-  const params = {
-    websiteId,
-    startDate: maxDate(startDate, website.resetAt),
-    endDate,
-    eventType: column === 'event_name' ? EVENT_TYPE.customEvent : EVENT_TYPE.pageView,
-    domain: undefined,
-  };
-
-  let excludeDomain = '';
-
-  if (column === 'referrer_domain') {
-    excludeDomain = 'and referrer_domain != {domain:String}';
-    params.domain = website.domain;
-  }
-
-  const { filterQuery } = parseFilters(filters, params);
-
-  return rawQuery(
-    `
-    select ${column} x, count(*) y
-    from website_event
-    where website_id = {websiteId:UUID}
-      and created_at between {startDate:DateTime} and {endDate:DateTime}
-      and event_type = {eventType:UInt32}
-      ${excludeDomain}
-      ${filterQuery}
-    group by x
-    order by y desc
-    limit 100
-    `,
-    params,
-  );
-}
diff --git a/queries/analytics/pageviews/getPageviewStats.ts b/queries/analytics/pageviews/getPageviewStats.ts
deleted file mode 100644
index f6d4158c9..000000000
--- a/queries/analytics/pageviews/getPageviewStats.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import clickhouse from 'lib/clickhouse';
-import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
-import prisma from 'lib/prisma';
-import { EVENT_TYPE } from 'lib/constants';
-import { loadWebsite } from 'lib/load';
-import { maxDate } from 'lib/date';
-
-export interface PageviewStatsCriteria {
-  startDate: Date;
-  endDate: Date;
-  timezone?: string;
-  unit?: string;
-  count?: string;
-  filters: object;
-  sessionKey?: string;
-}
-
-export async function getPageviewStats(
-  ...args: [websiteId: string, criteria: PageviewStatsCriteria]
-) {
-  return runQuery({
-    [PRISMA]: () => relationalQuery(...args),
-    [CLICKHOUSE]: () => clickhouseQuery(...args),
-  });
-}
-
-async function relationalQuery(websiteId: string, criteria: PageviewStatsCriteria) {
-  const {
-    startDate,
-    endDate,
-    timezone = 'utc',
-    unit = 'day',
-    count = '*',
-    filters = {},
-    sessionKey = 'session_id',
-  } = criteria;
-  const { getDateQuery, parseFilters, rawQuery } = prisma;
-  const website = await loadWebsite(websiteId);
-  const { filterQuery, joinSession } = parseFilters(filters);
-
-  return rawQuery(
-    `
-    select
-      ${getDateQuery('website_event.created_at', unit, timezone)} x,
-      count(${count !== '*' ? `${count}${sessionKey}` : count}) y
-    from website_event
-      ${joinSession}
-    where website_event.website_id = {{websiteId::uuid}}
-      and website_event.created_at between {{startDate}} and {{endDate}}
-      and event_type = {{eventType}}
-      ${filterQuery}
-    group by 1
-    `,
-    {
-      websiteId,
-      startDate: maxDate(startDate, website.resetAt),
-      endDate,
-      eventType: EVENT_TYPE.pageView,
-      ...filters,
-    },
-  );
-}
-
-async function clickhouseQuery(websiteId: string, criteria: PageviewStatsCriteria) {
-  const {
-    startDate,
-    endDate,
-    timezone = 'UTC',
-    unit = 'day',
-    count = '*',
-    filters = {},
-  } = criteria;
-  const { parseFilters, rawQuery, getDateStringQuery, getDateQuery } = clickhouse;
-  const website = await loadWebsite(websiteId);
-  const { filterQuery } = parseFilters(filters);
-
-  return rawQuery(
-    `
-    select
-      ${getDateStringQuery('g.t', unit)} as x, 
-      g.y as y
-    from (
-      select 
-        ${getDateQuery('created_at', unit, timezone)} as t,
-        count(${count !== '*' ? 'distinct session_id' : count}) as y
-      from website_event
-      where website_id = {websiteId:UUID}
-        and created_at between {startDate:DateTime} and {endDate:DateTime}
-        and event_type = {eventType:UInt32}
-        ${filterQuery}
-      group by t
-    ) as g
-    order by t
-    `,
-    {
-      ...filters,
-      websiteId,
-      startDate: maxDate(startDate, website.resetAt),
-      endDate,
-      eventType: EVENT_TYPE.pageView,
-    },
-  );
-}
diff --git a/queries/analytics/reports/getInsights.ts b/queries/analytics/reports/getInsights.ts
deleted file mode 100644
index 1d8970ed0..000000000
--- a/queries/analytics/reports/getInsights.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
-import prisma from 'lib/prisma';
-import clickhouse from 'lib/clickhouse';
-
-export interface GetInsightsCriteria {
-  startDate: Date;
-  endDate: Date;
-  fields: string[];
-  filters: string[];
-  groups: string[];
-}
-
-export async function getInsights(...args: [websiteId: string, criteria: GetInsightsCriteria]) {
-  return runQuery({
-    [PRISMA]: () => relationalQuery(...args),
-    [CLICKHOUSE]: () => clickhouseQuery(...args),
-  });
-}
-
-async function relationalQuery(
-  websiteId: string,
-  criteria: GetInsightsCriteria,
-): Promise<
-  {
-    x: string;
-    y: number;
-  }[]
-> {
-  return null;
-}
-
-async function clickhouseQuery(
-  websiteId: string,
-  criteria: GetInsightsCriteria,
-): Promise<
-  {
-    x: string;
-    y: number;
-  }[]
-> {
-  return null;
-}
diff --git a/queries/analytics/sessions/getSessionMetrics.ts b/queries/analytics/sessions/getSessionMetrics.ts
deleted file mode 100644
index aec2d8f13..000000000
--- a/queries/analytics/sessions/getSessionMetrics.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import prisma from 'lib/prisma';
-import clickhouse from 'lib/clickhouse';
-import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
-import { DEFAULT_RESET_DATE, EVENT_TYPE } from 'lib/constants';
-import { loadWebsite } from 'lib/load';
-import { maxDate } from 'lib/date';
-
-export async function getSessionMetrics(
-  ...args: [
-    websiteId: string,
-    criteria: { startDate: Date; endDate: Date; column: string; filters: object },
-  ]
-) {
-  return runQuery({
-    [PRISMA]: () => relationalQuery(...args),
-    [CLICKHOUSE]: () => clickhouseQuery(...args),
-  });
-}
-
-async function relationalQuery(
-  websiteId: string,
-  criteria: { startDate: Date; endDate: Date; column: string; filters: object },
-) {
-  const website = await loadWebsite(websiteId);
-  const { startDate, endDate, column, filters = {} } = criteria;
-  const { parseFilters, rawQuery } = prisma;
-  const { filterQuery, joinSession } = parseFilters(filters);
-
-  return rawQuery(
-    `select ${column} x, count(*) y
-    from session as x
-    where x.session_id in (
-      select website_event.session_id
-      from website_event
-        join website 
-          on website_event.website_id = website.website_id
-        ${joinSession}
-      where website.website_id = {{websiteId::uuid}}
-        and website_event.created_at between {{startDate}} and {{endDate}}
-      ${filterQuery}
-    )
-    group by 1
-    order by 2 desc
-    limit 100`,
-    {
-      websiteId,
-      startDate: maxDate(startDate, website.resetAt),
-      endDate,
-      ...filters,
-    },
-  );
-}
-
-async function clickhouseQuery(
-  websiteId: string,
-  data: { startDate: Date; endDate: Date; column: string; filters: object },
-) {
-  const { startDate, endDate, column, filters = {} } = data;
-  const { parseFilters, rawQuery } = clickhouse;
-  const website = await loadWebsite(websiteId);
-  const { filterQuery } = parseFilters(filters);
-
-  return rawQuery(
-    `
-    select
-      ${column} x, count(distinct session_id) y
-    from website_event as x
-    where website_id = {websiteId:UUID}
-      and created_at between {startDate:DateTime} and {endDate:DateTime}
-      and event_type = {eventType:UInt32}
-      ${filterQuery}
-    group by x
-    order by y desc
-    limit 100
-    `,
-    {
-      ...filters,
-      websiteId,
-      startDate: maxDate(startDate, website.resetAt),
-      endDate,
-      eventType: EVENT_TYPE.pageView,
-    },
-  );
-}
diff --git a/queries/analytics/stats/getRealtimeData.ts b/queries/analytics/stats/getRealtimeData.ts
deleted file mode 100644
index 98a5595b9..000000000
--- a/queries/analytics/stats/getRealtimeData.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { md5 } from 'next-basics';
-import { getSessions, getEvents } from 'queries';
-import { EVENT_TYPE } from 'lib/constants';
-
-export async function getRealtimeData(websiteId, time) {
-  const [pageviews, sessions, events] = await Promise.all([
-    getEvents(websiteId, time, EVENT_TYPE.pageView),
-    getSessions(websiteId, time),
-    getEvents(websiteId, time, EVENT_TYPE.customEvent),
-  ]);
-
-  const decorate = (id, data) => {
-    return data.map(props => ({
-      ...props,
-      __id: md5(id, ...Object.values(props)),
-      __type: id,
-      timestamp: props.timestamp ? props.timestamp * 1000 : new Date(props.createdAt).getTime(),
-    }));
-  };
-
-  return {
-    pageviews: decorate('pageview', pageviews),
-    sessions: decorate('session', sessions),
-    events: decorate('event', events),
-    timestamp: Date.now(),
-  };
-}
diff --git a/rollup.components.config.mjs b/rollup.components.config.mjs
new file mode 100644
index 000000000..9be073908
--- /dev/null
+++ b/rollup.components.config.mjs
@@ -0,0 +1,85 @@
+import path from 'path';
+import crypto from 'crypto';
+import resolve from '@rollup/plugin-node-resolve';
+import alias from '@rollup/plugin-alias';
+import json from '@rollup/plugin-json';
+import postcss from 'rollup-plugin-postcss';
+import copy from 'rollup-plugin-copy';
+import del from 'rollup-plugin-delete';
+import nodeExternals from 'rollup-plugin-node-externals';
+import esbuild from 'rollup-plugin-esbuild';
+import dts from 'rollup-plugin-dts';
+import svgr from '@svgr/rollup';
+
+const md5 = str => crypto.createHash('md5').update(str).digest('hex');
+
+const customResolver = resolve({
+  extensions: ['.js', '.jsx', '.ts', '.tsx'],
+});
+
+const aliasConfig = {
+  entries: [
+    { find: /^app/, replacement: path.resolve('./src/app') },
+    { find: /^components/, replacement: path.resolve('./src/components') },
+    { find: /^hooks/, replacement: path.resolve('./src/hooks') },
+    { find: /^lib/, replacement: path.resolve('./src/lib') },
+    { find: /^store/, replacement: path.resolve('./src/store') },
+    { find: /^public/, replacement: path.resolve('./public') },
+    { find: /^assets/, replacement: path.resolve('./src/assets') },
+  ],
+  customResolver,
+};
+
+const jsBundle = {
+  input: 'src/index.ts',
+  output: [
+    {
+      file: 'dist/index.js',
+      format: 'es',
+      sourcemap: true,
+    },
+  ],
+  plugins: [
+    del({ targets: 'dist/*', runOnce: true }),
+    copy({ targets: [{ src: './package.components.json', dest: 'dist', rename: 'package.json' }] }),
+    postcss({
+      config: false,
+      extract: 'styles.css',
+      sourceMap: true,
+      minimize: true,
+      modules: {
+        generateScopedName: function (name, filename, css) {
+          const file = path.basename(filename, '.css').replace('.module', '');
+          const hash = Buffer.from(md5(`${name}:${filename}:${css}`))
+            .toString('base64')
+            .substring(0, 5);
+
+          return `${file}-${name}--${hash}`;
+        },
+      },
+    }),
+    svgr({ icon: true }),
+    nodeExternals(),
+    json(),
+    alias(aliasConfig),
+    esbuild({
+      target: 'es6',
+      jsx: 'automatic',
+      loaders: {
+        '.js': 'jsx',
+      },
+    }),
+  ],
+};
+
+const dtsBundle = {
+  input: 'src/index.ts',
+  output: {
+    file: 'dist/index.d.ts',
+    format: 'es',
+  },
+  plugins: [alias(aliasConfig), nodeExternals(), json(), dts()],
+  external: [/\.css/],
+};
+
+export default [jsBundle, dtsBundle];
diff --git a/rollup.tracker.config.js b/rollup.tracker.config.mjs
similarity index 93%
rename from rollup.tracker.config.js
rename to rollup.tracker.config.mjs
index f4e7223c6..465e1af36 100644
--- a/rollup.tracker.config.js
+++ b/rollup.tracker.config.mjs
@@ -4,7 +4,7 @@ import replace from '@rollup/plugin-replace';
 import { terser } from 'rollup-plugin-terser';
 
 export default {
-  input: 'tracker/index.js',
+  input: 'src/tracker/index.js',
   output: {
     file: 'public/script.js',
     format: 'iife',
diff --git a/scripts/check-db.js b/scripts/check-db.js
index a84a775ce..757843ac3 100644
--- a/scripts/check-db.js
+++ b/scripts/check-db.js
@@ -66,12 +66,16 @@ async function checkDatabaseVersion() {
 
 async function checkV1Tables() {
   try {
-    await prisma.$queryRaw`select * from account limit 1`;
+    // check for v1 migrations before v2 release date
+    const record =
+      await prisma.$queryRaw`select * from _prisma_migrations where started_at < '2023-04-17'`;
 
-    error(
-      'Umami v1 tables detected. For how to upgrade from v1 to v2 go to https://umami.is/docs/migrate-v1-v2.',
-    );
-    process.exit(1);
+    if (record.length > 0) {
+      error(
+        'Umami v1 tables detected. For how to upgrade from v1 to v2 go to https://umami.is/docs/migrate-v1-v2.',
+      );
+      process.exit(1);
+    }
   } catch (e) {
     // Ignore
   }
diff --git a/scripts/check-lang.js b/scripts/check-lang.js
index e5a0bf095..a1b604310 100644
--- a/scripts/check-lang.js
+++ b/scripts/check-lang.js
@@ -2,7 +2,7 @@
 const fs = require('fs');
 const path = require('path');
 const chalk = require('chalk');
-const messages = require('../lang/en-US.json');
+const messages = require('../src/lang/en-US.json');
 const ignore = require('../lang-ignore.json');
 
 const dir = path.resolve(__dirname, '../lang');
diff --git a/scripts/download-country-names.js b/scripts/download-country-names.js
index f56d91f9c..6dbbbbdcc 100644
--- a/scripts/download-country-names.js
+++ b/scripts/download-country-names.js
@@ -4,7 +4,7 @@ const path = require('path');
 const https = require('https');
 const chalk = require('chalk');
 
-const src = path.resolve(__dirname, '../lang');
+const src = path.resolve(__dirname, '../src/lang');
 const dest = path.resolve(__dirname, '../public/intl/country');
 const files = fs.readdirSync(src);
 
diff --git a/scripts/download-language-names.js b/scripts/download-language-names.js
index 5cea88cf8..5478fb8d0 100644
--- a/scripts/download-language-names.js
+++ b/scripts/download-language-names.js
@@ -4,7 +4,7 @@ const path = require('path');
 const https = require('https');
 const chalk = require('chalk');
 
-const src = path.resolve(__dirname, '../lang');
+const src = path.resolve(__dirname, '../src/lang');
 const dest = path.resolve(__dirname, '../public/intl/language');
 const files = fs.readdirSync(src);
 
diff --git a/scripts/format-lang.js b/scripts/format-lang.js
index 941fd6722..593e296d2 100644
--- a/scripts/format-lang.js
+++ b/scripts/format-lang.js
@@ -3,7 +3,7 @@ const path = require('path');
 const del = require('del');
 const prettier = require('prettier');
 
-const src = path.resolve(__dirname, '../lang');
+const src = path.resolve(__dirname, '../src/lang');
 const dest = path.resolve(__dirname, '../build/messages');
 const files = fs.readdirSync(src);
 
@@ -17,7 +17,7 @@ async function run() {
   await fs.ensureDir(dest);
 
   files.forEach(file => {
-    const lang = require(`../lang/${file}`);
+    const lang = require(`../src/lang/${file}`);
     const keys = Object.keys(lang).sort();
 
     const formatted = keys.reduce((obj, key) => {
diff --git a/scripts/merge-messages.js b/scripts/merge-messages.js
index a74153146..572e9a7ed 100644
--- a/scripts/merge-messages.js
+++ b/scripts/merge-messages.js
@@ -4,7 +4,7 @@ const path = require('path');
 const prettier = require('prettier');
 const messages = require('../build/messages.json');
 
-const dest = path.resolve(__dirname, '../lang');
+const dest = path.resolve(__dirname, '../src/lang');
 const files = fs.readdirSync(dest);
 const keys = Object.keys(messages).sort();
 
@@ -14,7 +14,7 @@ with the existing files under `lang`. Any newly added
 keys will be printed to the console.
  */
 files.forEach(file => {
-  const lang = require(`../lang/${file}`);
+  const lang = require(`../src/lang/${file}`);
 
   console.log(`Merging ${file}`);
 
diff --git a/scripts/start-env.js b/scripts/start-env.js
index bfaf1330f..e9fe2a4b4 100644
--- a/scripts/start-env.js
+++ b/scripts/start-env.js
@@ -1,4 +1,8 @@
 require('dotenv').config();
 const cli = require('next/dist/cli/next-start');
 
-cli.nextStart(['-p', process.env.PORT || 3000, '-H', process.env.HOSTNAME || '0.0.0.0']);
+cli.nextStart({
+  '--port': process.env.PORT || 3000,
+  '--hostname': process.env.HOSTNAME || '0.0.0.0',
+  _: [],
+});
diff --git a/src/app/(main)/App.tsx b/src/app/(main)/App.tsx
new file mode 100644
index 000000000..4b0931652
--- /dev/null
+++ b/src/app/(main)/App.tsx
@@ -0,0 +1,36 @@
+'use client';
+import { Loading } from 'react-basics';
+import Script from 'next/script';
+import { usePathname } from 'next/navigation';
+import { useLogin, useConfig } from 'components/hooks';
+import UpdateNotice from './UpdateNotice';
+
+export function App({ children }) {
+  const { user, isLoading, error } = useLogin();
+  const config = useConfig();
+  const pathname = usePathname();
+
+  if (isLoading) {
+    return <Loading />;
+  }
+
+  if (error) {
+    window.location.href = `${process.env.basePath || ''}/login`;
+  }
+
+  if (!user || !config) {
+    return null;
+  }
+
+  return (
+    <>
+      {children}
+      <UpdateNotice user={user} config={config} />
+      {process.env.NODE_ENV === 'production' && !pathname.includes('/share/') && (
+        <Script src={`telemetry.js`} />
+      )}
+    </>
+  );
+}
+
+export default App;
diff --git a/components/layout/NavBar.module.css b/src/app/(main)/NavBar.module.css
similarity index 75%
rename from components/layout/NavBar.module.css
rename to src/app/(main)/NavBar.module.css
index dd5085a03..fd022ecab 100644
--- a/components/layout/NavBar.module.css
+++ b/src/app/(main)/NavBar.module.css
@@ -1,7 +1,7 @@
 .navbar {
+  display: grid;
+  grid-template-columns: max-content 1fr 1fr;
   position: relative;
-  display: flex;
-  flex-direction: row;
   align-items: center;
   height: 60px;
   background: var(--base75);
@@ -9,17 +9,6 @@
   padding: 0 20px;
 }
 
-.left,
-.right {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-}
-
-.right {
-  justify-content: flex-end;
-}
-
 .logo {
   display: flex;
   flex-direction: row;
@@ -35,29 +24,24 @@
   flex-direction: row;
   gap: 30px;
   padding: 0 40px;
-  flex: 1;
   font-weight: 700;
+  max-height: 60px;
 }
 
-.links a {
-  display: flex;
-  align-items: center;
-  gap: 10px;
-  line-height: 60px;
+.links a,
+.links a:active,
+.links a:visited {
   color: var(--font-color200);
+  line-height: 60px;
   border-bottom: 2px solid transparent;
 }
 
-.links span {
-  white-space: nowrap;
-}
-
 .links a:hover {
   color: var(--font-color100);
   border-bottom: 2px solid var(--primary400);
 }
 
-.links .selected {
+.links a.selected {
   color: var(--font-color100);
   border-bottom: 2px solid var(--primary400);
 }
@@ -68,7 +52,6 @@
   flex-direction: row;
   align-items: center;
   justify-content: flex-end;
-  min-width: 0;
 }
 
 .mobile {
@@ -76,6 +59,10 @@
 }
 
 @media only screen and (max-width: 768px) {
+  .navbar {
+    grid-template-columns: repeat(2, 1fr);
+  }
+
   .links,
   .actions {
     display: none;
diff --git a/src/app/(main)/NavBar.tsx b/src/app/(main)/NavBar.tsx
new file mode 100644
index 000000000..e241a0590
--- /dev/null
+++ b/src/app/(main)/NavBar.tsx
@@ -0,0 +1,93 @@
+'use client';
+import { Icon, Text } from 'react-basics';
+import Link from 'next/link';
+import classNames from 'classnames';
+import Icons from 'components/icons';
+import ThemeButton from 'components/input/ThemeButton';
+import LanguageButton from 'components/input/LanguageButton';
+import ProfileButton from 'components/input/ProfileButton';
+import useMessages from 'components/hooks/useMessages';
+import HamburgerButton from 'components/common/HamburgerButton';
+import { usePathname } from 'next/navigation';
+import styles from './NavBar.module.css';
+
+export function NavBar() {
+  const pathname = usePathname();
+  const { formatMessage, labels } = useMessages();
+  const cloudMode = Boolean(process.env.cloudMode);
+
+  const links = [
+    { label: formatMessage(labels.dashboard), url: '/dashboard' },
+    { label: formatMessage(labels.websites), url: '/websites' },
+    { label: formatMessage(labels.reports), url: '/reports' },
+    { label: formatMessage(labels.settings), url: '/settings' },
+  ].filter(n => n);
+
+  const menuItems = [
+    {
+      label: formatMessage(labels.dashboard),
+      url: '/dashboard',
+    },
+    !cloudMode && {
+      label: formatMessage(labels.settings),
+      url: '/settings',
+      children: [
+        {
+          label: formatMessage(labels.websites),
+          url: '/settings/websites',
+        },
+        {
+          label: formatMessage(labels.teams),
+          url: '/settings/teams',
+        },
+        {
+          label: formatMessage(labels.users),
+          url: '/settings/users',
+        },
+        {
+          label: formatMessage(labels.profile),
+          url: '/settings/profile',
+        },
+      ],
+    },
+    cloudMode && {
+      label: formatMessage(labels.profile),
+      url: '/settings/profile',
+    },
+    !cloudMode && { label: formatMessage(labels.logout), url: '/logout' },
+  ].filter(n => n);
+
+  return (
+    <div className={styles.navbar}>
+      <div className={styles.logo}>
+        <Icon size="lg">
+          <Icons.Logo />
+        </Icon>
+        <Text>umami</Text>
+      </div>
+      <div className={styles.links}>
+        {links.map(({ url, label }) => {
+          return (
+            <Link
+              key={url}
+              href={url}
+              className={classNames({ [styles.selected]: pathname.startsWith(url) })}
+            >
+              <Text>{label}</Text>
+            </Link>
+          );
+        })}
+      </div>
+      <div className={styles.actions}>
+        <ThemeButton />
+        <LanguageButton />
+        <ProfileButton />
+      </div>
+      <div className={styles.mobile}>
+        <HamburgerButton menuItems={menuItems} />
+      </div>
+    </div>
+  );
+}
+
+export default NavBar;
diff --git a/components/common/UpdateNotice.module.css b/src/app/(main)/UpdateNotice.module.css
similarity index 85%
rename from components/common/UpdateNotice.module.css
rename to src/app/(main)/UpdateNotice.module.css
index db7a0abdc..261a31698 100644
--- a/components/common/UpdateNotice.module.css
+++ b/src/app/(main)/UpdateNotice.module.css
@@ -2,13 +2,14 @@
   position: absolute;
   max-width: 800px;
   gap: 20px;
-  margin: 20px auto;
-  justify-self: center;
+  margin: 80px auto;
+  align-self: center;
   background: var(--base50);
   padding: 20px;
   border: 1px solid var(--base300);
   border-radius: var(--border-radius);
   z-index: var(--z-index-popup);
+  box-shadow: 4px 4px 8px rgba(0, 0, 0, 0.1);
 }
 
 .message {
diff --git a/components/common/UpdateNotice.js b/src/app/(main)/UpdateNotice.tsx
similarity index 77%
rename from components/common/UpdateNotice.js
rename to src/app/(main)/UpdateNotice.tsx
index bef6be982..509df95ce 100644
--- a/components/common/UpdateNotice.js
+++ b/src/app/(main)/UpdateNotice.tsx
@@ -1,16 +1,18 @@
+'use client';
 import { useEffect, useCallback, useState } from 'react';
-import { Button, Row, Column } from 'react-basics';
+import { createPortal } from 'react-dom';
+import { Button } from 'react-basics';
 import { setItem } from 'next-basics';
 import useStore, { checkVersion } from 'store/version';
 import { REPO_URL, VERSION_CHECK } from 'lib/constants';
 import styles from './UpdateNotice.module.css';
-import useMessages from 'hooks/useMessages';
-import { useRouter } from 'next/router';
+import useMessages from 'components/hooks/useMessages';
+import { usePathname } from 'next/navigation';
 
 export function UpdateNotice({ user, config }) {
   const { formatMessage, labels, messages } = useMessages();
   const { latest, checked, hasUpdate, releaseUrl } = useStore();
-  const { pathname } = useRouter();
+  const pathname = usePathname();
   const [dismissed, setDismissed] = useState(checked);
   const allowUpdate =
     user?.isAdmin &&
@@ -44,18 +46,19 @@ export function UpdateNotice({ user, config }) {
     return null;
   }
 
-  return (
-    <Row className={styles.notice}>
-      <Column variant="two" className={styles.message}>
+  return createPortal(
+    <div className={styles.notice}>
+      <div className={styles.message}>
         {formatMessage(messages.newVersionAvailable, { version: `v${latest}` })}
-      </Column>
-      <Column className={styles.buttons}>
+      </div>
+      <div className={styles.buttons}>
         <Button variant="primary" onClick={handleViewClick}>
           {formatMessage(labels.viewDetails)}
         </Button>
         <Button onClick={handleDismissClick}>{formatMessage(labels.dismiss)}</Button>
-      </Column>
-    </Row>
+      </div>
+    </div>,
+    document.body,
   );
 }
 
diff --git a/components/pages/console/TestConsole.module.css b/src/app/(main)/console/TestConsole.module.css
similarity index 100%
rename from components/pages/console/TestConsole.module.css
rename to src/app/(main)/console/TestConsole.module.css
diff --git a/components/pages/console/TestConsole.js b/src/app/(main)/console/TestConsole.tsx
similarity index 68%
rename from components/pages/console/TestConsole.js
rename to src/app/(main)/console/TestConsole.tsx
index 4f167b9a7..0bb807ff5 100644
--- a/components/pages/console/TestConsole.js
+++ b/src/app/(main)/console/TestConsole.tsx
@@ -1,33 +1,33 @@
+'use client';
+import { Button } from 'react-basics';
+import Head from 'next/head';
+import Link from 'next/link';
+import Script from 'next/script';
 import WebsiteSelect from 'components/input/WebsiteSelect';
 import Page from 'components/layout/Page';
 import PageHeader from 'components/layout/PageHeader';
 import EventsChart from 'components/metrics/EventsChart';
-import WebsiteChart from 'components/pages/websites/WebsiteChart';
-import useApi from 'hooks/useApi';
-import Head from 'next/head';
-import Link from 'next/link';
-import { useRouter } from 'next/router';
-import Script from 'next/script';
-import { Button, Column, Row } from 'react-basics';
+import WebsiteChart from 'app/(main)/websites/[id]/WebsiteChart';
+import useApi from 'components/hooks/useApi';
+import useNavigation from 'components/hooks/useNavigation';
 import styles from './TestConsole.module.css';
 
-export function TestConsole() {
+export function TestConsole({ websiteId }: { websiteId: string }) {
   const { get, useQuery } = useApi();
-  const { data, isLoading, error } = useQuery(['websites:me'], () => get('/me/websites'));
-  const router = useRouter();
-  const {
-    basePath,
-    query: { id },
-  } = router;
+  const { data, isLoading, error } = useQuery({
+    queryKey: ['websites:me'],
+    queryFn: () => get('/me/websites'),
+  });
+  const { router } = useNavigation();
 
-  function handleChange(value) {
+  function handleChange(value: string) {
     router.push(`/console/${value}`);
   }
 
   function handleClick() {
-    window.umami.track({ url: '/page-view', referrer: 'https://www.google.com' });
-    window.umami.track('track-event-no-data');
-    window.umami.track('track-event-with-data', {
+    window['umami'].track({ url: '/page-view', referrer: 'https://www.google.com' });
+    window['umami'].track('track-event-no-data');
+    window['umami'].track('track-event-with-data', {
       test: 'test-data',
       boolean: true,
       booleanError: 'true',
@@ -47,7 +47,7 @@ export function TestConsole() {
   }
 
   function handleIdentifyClick() {
-    window.umami.identify({
+    window['umami'].identify({
       userId: 123,
       name: 'brian',
       number: Math.random() * 100,
@@ -71,11 +71,10 @@ export function TestConsole() {
     return null;
   }
 
-  const [websiteId] = id || [];
-  const website = data.find(({ id }) => websiteId === id);
+  const website = data?.data.find(({ id }) => websiteId === id);
 
   return (
-    <Page loading={isLoading} error={error}>
+    <Page isLoading={isLoading} error={error}>
       <Head>
         <title>{website ? `${website.name} | Umami Console` : 'Umami Console'}</title>
       </Head>
@@ -86,12 +85,12 @@ export function TestConsole() {
         <>
           <Script
             async
-            data-website-id={website.id}
-            src={`${basePath}/script.js`}
+            data-website-id={websiteId}
+            src={`${process.env.basePath}/script.js`}
             data-cache="true"
           />
-          <Row className={styles.test}>
-            <Column xs="4">
+          <div className={styles.test}>
+            <div>
               <div className={styles.header}>Page links</div>
               <div>
                 <Link href={`/console/${websiteId}/page/1/?q=abc`}>page one</Link>
@@ -114,10 +113,10 @@ export function TestConsole() {
                   external link (tab)
                 </a>
               </div>
-            </Column>
-            <Column xs="4">
+            </div>
+            <div>
               <div className={styles.header}>Click events</div>
-              <Button id="send-event-button" data-umami-event="button-click" variant="action">
+              <Button id="send-event-button" data-umami-event="button-click" variant="primary">
                 Send event
               </Button>
               <p />
@@ -126,28 +125,26 @@ export function TestConsole() {
                 data-umami-event="button-click"
                 data-umami-event-name="bob"
                 data-umami-event-id="123"
-                variant="action"
+                variant="primary"
               >
                 Send event with data
               </Button>
-            </Column>
-            <Column xs="4">
+            </div>
+            <div>
               <div className={styles.header}>Javascript events</div>
-              <Button id="manual-button" variant="action" onClick={handleClick}>
+              <Button id="manual-button" variant="primary" onClick={handleClick}>
                 Run script
               </Button>
               <p />
-              <Button id="manual-button" variant="action" onClick={handleIdentifyClick}>
+              <Button id="manual-button" variant="primary" onClick={handleIdentifyClick}>
                 Run identify
               </Button>
-            </Column>
-          </Row>
-          <Row>
-            <Column>
-              <WebsiteChart websiteId={website.id} />
-              <EventsChart websiteId={website.id} />
-            </Column>
-          </Row>
+            </div>
+          </div>
+          <div>
+            <WebsiteChart websiteId={website.id} />
+            <EventsChart websiteId={website.id} />
+          </div>
         </>
       )}
     </Page>
diff --git a/src/app/(main)/console/[[...id]]/page.tsx b/src/app/(main)/console/[[...id]]/page.tsx
new file mode 100644
index 000000000..f3d865f62
--- /dev/null
+++ b/src/app/(main)/console/[[...id]]/page.tsx
@@ -0,0 +1,20 @@
+import TestConsole from '../TestConsole';
+import { Metadata } from 'next';
+
+async function getEnabled() {
+  return !!process.env.ENABLE_TEST_CONSOLE;
+}
+
+export default async function ({ params: { id } }) {
+  const enabled = await getEnabled();
+
+  if (!enabled) {
+    return null;
+  }
+
+  return <TestConsole websiteId={id?.[0]} />;
+}
+
+export const metadata: Metadata = {
+  title: 'Test Console | umami',
+};
diff --git a/src/app/(main)/dashboard/Dashboard.tsx b/src/app/(main)/dashboard/Dashboard.tsx
new file mode 100644
index 000000000..ec1d793c2
--- /dev/null
+++ b/src/app/(main)/dashboard/Dashboard.tsx
@@ -0,0 +1,81 @@
+'use client';
+import { Button, Icon, Icons, Loading, Text } from 'react-basics';
+import Link from 'next/link';
+import PageHeader from 'components/layout/PageHeader';
+import Pager from 'components/common/Pager';
+import WebsiteChartList from '../../(main)/websites/[id]/WebsiteChartList';
+import DashboardSettingsButton from 'app/(main)/dashboard/DashboardSettingsButton';
+import DashboardEdit from 'app/(main)/dashboard/DashboardEdit';
+import EmptyPlaceholder from 'components/common/EmptyPlaceholder';
+import useApi from 'components/hooks/useApi';
+import useDashboard from 'store/dashboard';
+import useMessages from 'components/hooks/useMessages';
+import useLocale from 'components/hooks/useLocale';
+import useFilterQuery from 'components/hooks/useFilterQuery';
+import { useUser } from 'components/hooks';
+
+export function Dashboard() {
+  const { formatMessage, labels, messages } = useMessages();
+  const { user } = useUser();
+  const { showCharts, editing } = useDashboard();
+  const { dir } = useLocale();
+  const { get } = useApi();
+  const pageSize = 10;
+
+  const { query, params, setParams, result } = useFilterQuery({
+    queryKey: ['dashboard:websites'],
+    queryFn: (params: any) => {
+      return get(`/users/${user.id}/websites`, { ...params, includeTeams: true, pageSize });
+    },
+  });
+
+  const handlePageChange = (page: number) => {
+    setParams({ ...params, page });
+  };
+
+  const { data, count } = result || {};
+  const hasData = !!(data as any)?.length;
+  const { page } = params;
+
+  if (query.isLoading) {
+    return <Loading />;
+  }
+
+  return (
+    <>
+      <PageHeader title={formatMessage(labels.dashboard)}>
+        {!editing && hasData && <DashboardSettingsButton />}
+      </PageHeader>
+      {!hasData && (
+        <EmptyPlaceholder message={formatMessage(messages.noWebsitesConfigured)}>
+          <Link href="/settings/websites">
+            <Button>
+              <Icon rotate={dir === 'rtl' ? 180 : 0}>
+                <Icons.ArrowRight />
+              </Icon>
+              <Text>{formatMessage(messages.goToSettings)}</Text>
+            </Button>
+          </Link>
+        </EmptyPlaceholder>
+      )}
+      {hasData && (
+        <>
+          {editing && <DashboardEdit />}
+          {!editing && (
+            <>
+              <WebsiteChartList websites={data} showCharts={showCharts} limit={pageSize} />
+              <Pager
+                page={page}
+                pageSize={pageSize}
+                count={count}
+                onPageChange={handlePageChange}
+              />
+            </>
+          )}
+        </>
+      )}
+    </>
+  );
+}
+
+export default Dashboard;
diff --git a/components/pages/dashboard/DashboardEdit.module.css b/src/app/(main)/dashboard/DashboardEdit.module.css
similarity index 100%
rename from components/pages/dashboard/DashboardEdit.module.css
rename to src/app/(main)/dashboard/DashboardEdit.module.css
diff --git a/components/pages/dashboard/DashboardEdit.js b/src/app/(main)/dashboard/DashboardEdit.tsx
similarity index 80%
rename from components/pages/dashboard/DashboardEdit.js
rename to src/app/(main)/dashboard/DashboardEdit.tsx
index 1810ee9bf..356380388 100644
--- a/components/pages/dashboard/DashboardEdit.js
+++ b/src/app/(main)/dashboard/DashboardEdit.tsx
@@ -1,27 +1,36 @@
+'use client';
 import { useState, useMemo } from 'react';
 import { DragDropContext, Draggable, Droppable } from 'react-beautiful-dnd';
 import classNames from 'classnames';
 import { Button } from 'react-basics';
 import { firstBy } from 'thenby';
 import useDashboard, { saveDashboard } from 'store/dashboard';
-import useMessages from 'hooks/useMessages';
+import useMessages from 'components/hooks/useMessages';
+import useApi from 'components/hooks/useApi';
 import styles from './DashboardEdit.module.css';
 
 const dragId = 'dashboard-website-ordering';
 
-export function DashboardEdit({ websites }) {
+export function DashboardEdit() {
   const settings = useDashboard();
   const { websiteOrder } = settings;
   const { formatMessage, labels } = useMessages();
   const [order, setOrder] = useState(websiteOrder || []);
+  const { get, useQuery } = useApi();
+  const { data: result } = useQuery({
+    queryKey: ['websites'],
+    queryFn: () => get('/websites', { includeTeams: 1 }),
+  });
+  const { data: websites } = result || {};
 
-  const ordered = useMemo(
-    () =>
-      websites
+  const ordered = useMemo(() => {
+    if (websites) {
+      return websites
         .map(website => ({ ...website, order: order.indexOf(website.id) }))
-        .sort(firstBy('order')),
-    [websites, order],
-  );
+        .sort(firstBy('order'));
+    }
+    return [];
+  }, [websites, order]);
 
   function handleWebsiteDrag({ destination, source }) {
     if (!destination || destination.index === source.index) return;
@@ -51,13 +60,13 @@ export function DashboardEdit({ websites }) {
   return (
     <>
       <div className={styles.buttons}>
-        <Button onClick={handleSave} variant="action" size="small">
+        <Button onClick={handleSave} variant="primary" size="sm">
           {formatMessage(labels.save)}
         </Button>
-        <Button onClick={handleCancel} size="small">
+        <Button onClick={handleCancel} size="sm">
           {formatMessage(labels.cancel)}
         </Button>
-        <Button onClick={handleReset} size="small">
+        <Button onClick={handleReset} size="sm">
           {formatMessage(labels.reset)}
         </Button>
       </div>
diff --git a/components/pages/dashboard/DashboardSettingsButton.module.css b/src/app/(main)/dashboard/DashboardSettingsButton.module.css
similarity index 100%
rename from components/pages/dashboard/DashboardSettingsButton.module.css
rename to src/app/(main)/dashboard/DashboardSettingsButton.module.css
diff --git a/components/pages/dashboard/DashboardSettingsButton.js b/src/app/(main)/dashboard/DashboardSettingsButton.tsx
similarity index 86%
rename from components/pages/dashboard/DashboardSettingsButton.js
rename to src/app/(main)/dashboard/DashboardSettingsButton.tsx
index 99dab14f7..eeb1f9471 100644
--- a/components/pages/dashboard/DashboardSettingsButton.js
+++ b/src/app/(main)/dashboard/DashboardSettingsButton.tsx
@@ -1,7 +1,7 @@
-import { TooltipPopup, Icon, Text, Flexbox, Popup, Item, Button } from 'react-basics';
+import { TooltipPopup, Icon, Text, Flexbox, Button } from 'react-basics';
 import Icons from 'components/icons';
 import { saveDashboard } from 'store/dashboard';
-import useMessages from 'hooks/useMessages';
+import useMessages from 'components/hooks/useMessages';
 
 export function DashboardSettingsButton() {
   const { formatMessage, labels } = useMessages();
diff --git a/src/app/(main)/dashboard/page.tsx b/src/app/(main)/dashboard/page.tsx
new file mode 100644
index 000000000..1853a9f5e
--- /dev/null
+++ b/src/app/(main)/dashboard/page.tsx
@@ -0,0 +1,10 @@
+import Dashboard from 'app/(main)/dashboard/Dashboard';
+import { Metadata } from 'next';
+
+export default function () {
+  return <Dashboard />;
+}
+
+export const metadata: Metadata = {
+  title: 'Dashboard | umami',
+};
diff --git a/components/layout/AppLayout.module.css b/src/app/(main)/layout.module.css
similarity index 100%
rename from components/layout/AppLayout.module.css
rename to src/app/(main)/layout.module.css
diff --git a/src/app/(main)/layout.tsx b/src/app/(main)/layout.tsx
new file mode 100644
index 000000000..f5aeab67d
--- /dev/null
+++ b/src/app/(main)/layout.tsx
@@ -0,0 +1,19 @@
+import App from './App';
+import NavBar from './NavBar';
+import Page from 'components/layout/Page';
+import styles from './layout.module.css';
+
+export default function ({ children }) {
+  return (
+    <App>
+      <main className={styles.layout}>
+        <nav className={styles.nav}>
+          <NavBar />
+        </nav>
+        <section className={styles.body}>
+          <Page>{children}</Page>
+        </section>
+      </main>
+    </App>
+  );
+}
diff --git a/src/app/(main)/reports/ReportDeleteButton.tsx b/src/app/(main)/reports/ReportDeleteButton.tsx
new file mode 100644
index 000000000..32ec819e4
--- /dev/null
+++ b/src/app/(main)/reports/ReportDeleteButton.tsx
@@ -0,0 +1,50 @@
+import { Button, Icon, Icons, Modal, ModalTrigger, Text } from 'react-basics';
+import ConfirmDeleteForm from 'components/common/ConfirmDeleteForm';
+import { useApi, useMessages } from 'components/hooks';
+import { setValue } from 'store/cache';
+
+export function ReportDeleteButton({
+  reportId,
+  reportName,
+  onDelete,
+}: {
+  reportId: string;
+  reportName: string;
+  onDelete?: () => void;
+}) {
+  const { formatMessage, labels } = useMessages();
+  const { del, useMutation } = useApi();
+  const { mutate } = useMutation({ mutationFn: reportId => del(`/reports/${reportId}`) });
+
+  const handleConfirm = (close: () => void) => {
+    mutate(reportId as any, {
+      onSuccess: () => {
+        setValue('reports', Date.now());
+        onDelete?.();
+        close();
+      },
+    });
+  };
+
+  return (
+    <ModalTrigger>
+      <Button>
+        <Icon>
+          <Icons.Trash />
+        </Icon>
+        <Text>{formatMessage(labels.delete)}</Text>
+      </Button>
+      <Modal>
+        {close => (
+          <ConfirmDeleteForm
+            name={reportName}
+            onConfirm={handleConfirm.bind(null, close)}
+            onClose={close}
+          />
+        )}
+      </Modal>
+    </ModalTrigger>
+  );
+}
+
+export default ReportDeleteButton;
diff --git a/src/app/(main)/reports/ReportsDataTable.tsx b/src/app/(main)/reports/ReportsDataTable.tsx
new file mode 100644
index 000000000..3ede47839
--- /dev/null
+++ b/src/app/(main)/reports/ReportsDataTable.tsx
@@ -0,0 +1,14 @@
+'use client';
+import { useReports } from 'components/hooks';
+import ReportsTable from './ReportsTable';
+import DataTable from 'components/common/DataTable';
+
+export default function ReportsDataTable({ websiteId }: { websiteId?: string }) {
+  const queryResult = useReports(websiteId);
+
+  return (
+    <DataTable queryResult={queryResult}>
+      {({ data }) => <ReportsTable data={data} showDomain={!websiteId} />}
+    </DataTable>
+  );
+}
diff --git a/src/app/(main)/reports/ReportsHeader.tsx b/src/app/(main)/reports/ReportsHeader.tsx
new file mode 100644
index 000000000..43cce2172
--- /dev/null
+++ b/src/app/(main)/reports/ReportsHeader.tsx
@@ -0,0 +1,25 @@
+'use client';
+import PageHeader from 'components/layout/PageHeader';
+import { Button, Icon, Icons, Text } from 'react-basics';
+import { useMessages } from 'components/hooks';
+import { useRouter } from 'next/navigation';
+
+export function ReportsHeader() {
+  const { formatMessage, labels } = useMessages();
+  const router = useRouter();
+
+  const handleClick = () => router.push('/reports/create');
+
+  return (
+    <PageHeader title={formatMessage(labels.reports)}>
+      <Button variant="primary" onClick={handleClick}>
+        <Icon>
+          <Icons.Plus />
+        </Icon>
+        <Text>{formatMessage(labels.createReport)}</Text>
+      </Button>
+    </PageHeader>
+  );
+}
+
+export default ReportsHeader;
diff --git a/src/app/(main)/reports/ReportsTable.tsx b/src/app/(main)/reports/ReportsTable.tsx
new file mode 100644
index 000000000..882110eec
--- /dev/null
+++ b/src/app/(main)/reports/ReportsTable.tsx
@@ -0,0 +1,51 @@
+import { GridColumn, GridTable, Icon, Icons, Text, useBreakpoint } from 'react-basics';
+import LinkButton from 'components/common/LinkButton';
+import { useMessages } from 'components/hooks';
+import useUser from 'components/hooks/useUser';
+import { REPORT_TYPES } from 'lib/constants';
+import ReportDeleteButton from './ReportDeleteButton';
+
+export function ReportsTable({ data = [], showDomain }: { data: any[]; showDomain?: boolean }) {
+  const { formatMessage, labels } = useMessages();
+  const { user } = useUser();
+  const breakpoint = useBreakpoint();
+
+  return (
+    <GridTable data={data} cardMode={['xs', 'sm', 'md'].includes(breakpoint)}>
+      <GridColumn name="name" label={formatMessage(labels.name)} />
+      <GridColumn name="description" label={formatMessage(labels.description)} />
+      <GridColumn name="type" label={formatMessage(labels.type)}>
+        {row => {
+          return formatMessage(
+            labels[Object.keys(REPORT_TYPES).find(key => REPORT_TYPES[key] === row.type)],
+          );
+        }}
+      </GridColumn>
+      {showDomain && (
+        <GridColumn name="domain" label={formatMessage(labels.domain)}>
+          {row => row?.website?.domain}
+        </GridColumn>
+      )}
+      <GridColumn name="action" label="" alignment="end">
+        {row => {
+          const { id, name, userId, website } = row;
+          return (
+            <>
+              {(user.id === userId || user.id === website?.userId) && (
+                <ReportDeleteButton reportId={id} reportName={name} />
+              )}
+              <LinkButton href={`/reports/${id}`}>
+                <Icon>
+                  <Icons.ArrowRight />
+                </Icon>
+                <Text>{formatMessage(labels.view)}</Text>
+              </LinkButton>
+            </>
+          );
+        }}
+      </GridColumn>
+    </GridTable>
+  );
+}
+
+export default ReportsTable;
diff --git a/src/app/(main)/reports/[id]/BaseParameters.tsx b/src/app/(main)/reports/[id]/BaseParameters.tsx
new file mode 100644
index 000000000..9b6be5d8c
--- /dev/null
+++ b/src/app/(main)/reports/[id]/BaseParameters.tsx
@@ -0,0 +1,62 @@
+import { useContext } from 'react';
+import { FormRow } from 'react-basics';
+import { parseDateRange } from 'lib/date';
+import DateFilter from 'components/input/DateFilter';
+import WebsiteSelect from 'components/input/WebsiteSelect';
+import { useMessages } from 'components/hooks';
+import { ReportContext } from './Report';
+
+export interface BaseParametersProps {
+  showWebsiteSelect?: boolean;
+  allowWebsiteSelect?: boolean;
+  showDateSelect?: boolean;
+  allowDateSelect?: boolean;
+}
+
+export function BaseParameters({
+  showWebsiteSelect = true,
+  allowWebsiteSelect = true,
+  showDateSelect = true,
+  allowDateSelect = true,
+}: BaseParametersProps) {
+  const { report, updateReport } = useContext(ReportContext);
+  const { formatMessage, labels } = useMessages();
+
+  const { parameters } = report || {};
+  const { websiteId, dateRange } = parameters || {};
+  const { value, startDate, endDate } = dateRange || {};
+
+  const handleWebsiteSelect = (websiteId: string) => {
+    updateReport({ websiteId, parameters: { websiteId } });
+  };
+
+  const handleDateChange = (value: string) => {
+    updateReport({ parameters: { dateRange: { ...parseDateRange(value) } } });
+  };
+
+  return (
+    <>
+      {showWebsiteSelect && (
+        <FormRow label={formatMessage(labels.website)}>
+          {allowWebsiteSelect && (
+            <WebsiteSelect websiteId={websiteId} onSelect={handleWebsiteSelect} />
+          )}
+        </FormRow>
+      )}
+      {showDateSelect && (
+        <FormRow label={formatMessage(labels.dateRange)}>
+          {allowDateSelect && (
+            <DateFilter
+              value={value}
+              startDate={startDate}
+              endDate={endDate}
+              onChange={handleDateChange}
+            />
+          )}
+        </FormRow>
+      )}
+    </>
+  );
+}
+
+export default BaseParameters;
diff --git a/components/pages/reports/FieldAddForm.module.css b/src/app/(main)/reports/[id]/FieldAddForm.module.css
similarity index 100%
rename from components/pages/reports/FieldAddForm.module.css
rename to src/app/(main)/reports/[id]/FieldAddForm.module.css
diff --git a/components/pages/reports/FieldAddForm.js b/src/app/(main)/reports/[id]/FieldAddForm.tsx
similarity index 73%
rename from components/pages/reports/FieldAddForm.js
rename to src/app/(main)/reports/[id]/FieldAddForm.tsx
index e88312478..9db472d8d 100644
--- a/components/pages/reports/FieldAddForm.js
+++ b/src/app/(main)/reports/[id]/FieldAddForm.tsx
@@ -7,10 +7,20 @@ import FieldAggregateForm from './FieldAggregateForm';
 import FieldFilterForm from './FieldFilterForm';
 import styles from './FieldAddForm.module.css';
 
-export function FieldAddForm({ fields = [], group, element, onAdd, onClose }) {
-  const [selected, setSelected] = useState();
+export function FieldAddForm({
+  fields = [],
+  group,
+  onAdd,
+  onClose,
+}: {
+  fields?: any[];
+  group: string;
+  onAdd: (group: string, value: string) => void;
+  onClose: () => void;
+}) {
+  const [selected, setSelected] = useState<{ name: string; type: string; value: string }>();
 
-  const handleSelect = value => {
+  const handleSelect = (value: any) => {
     const { type } = value;
 
     if (group === REPORT_PARAMETERS.groups || type === 'array' || type === 'boolean') {
@@ -22,13 +32,13 @@ export function FieldAddForm({ fields = [], group, element, onAdd, onClose }) {
     setSelected(value);
   };
 
-  const handleSave = value => {
+  const handleSave = (value: any) => {
     onAdd(group, value);
     onClose();
   };
 
   return createPortal(
-    <PopupForm className={styles.popup} element={element} onClose={onClose}>
+    <PopupForm className={styles.popup}>
       {!selected && <FieldSelectForm fields={fields} onSelect={handleSelect} />}
       {selected && group === REPORT_PARAMETERS.fields && (
         <FieldAggregateForm {...selected} onSelect={handleSave} />
diff --git a/components/pages/reports/FieldAggregateForm.js b/src/app/(main)/reports/[id]/FieldAggregateForm.tsx
similarity index 83%
rename from components/pages/reports/FieldAggregateForm.js
rename to src/app/(main)/reports/[id]/FieldAggregateForm.tsx
index abd1dbd94..6b5bf6360 100644
--- a/components/pages/reports/FieldAggregateForm.js
+++ b/src/app/(main)/reports/[id]/FieldAggregateForm.tsx
@@ -1,7 +1,15 @@
 import { Form, FormRow, Menu, Item } from 'react-basics';
-import { useMessages } from 'hooks';
+import { useMessages } from 'components/hooks';
 
-export default function FieldAggregateForm({ name, type, onSelect }) {
+export default function FieldAggregateForm({
+  name,
+  type,
+  onSelect,
+}: {
+  name: string;
+  type: string;
+  onSelect: (key: any) => void;
+}) {
   const { formatMessage, labels } = useMessages();
 
   const options = {
@@ -27,7 +35,7 @@ export default function FieldAggregateForm({ name, type, onSelect }) {
 
   const items = options[type];
 
-  const handleSelect = value => {
+  const handleSelect = (value: any) => {
     onSelect({ name, type, value });
   };
 
diff --git a/components/pages/reports/FieldFilterForm.module.css b/src/app/(main)/reports/[id]/FieldFilterForm.module.css
similarity index 76%
rename from components/pages/reports/FieldFilterForm.module.css
rename to src/app/(main)/reports/[id]/FieldFilterForm.module.css
index 15baa582c..bbb338afc 100644
--- a/components/pages/reports/FieldFilterForm.module.css
+++ b/src/app/(main)/reports/[id]/FieldFilterForm.module.css
@@ -15,3 +15,8 @@
 .dropdown {
   min-width: 180px;
 }
+
+.menu {
+  min-width: 360px;
+  max-height: 300px;
+}
diff --git a/src/app/(main)/reports/[id]/FieldFilterForm.tsx b/src/app/(main)/reports/[id]/FieldFilterForm.tsx
new file mode 100644
index 000000000..4af7febfb
--- /dev/null
+++ b/src/app/(main)/reports/[id]/FieldFilterForm.tsx
@@ -0,0 +1,97 @@
+import { useState, useMemo } from 'react';
+import { Form, FormRow, Item, Flexbox, Dropdown, Button } from 'react-basics';
+import { useMessages, useFilters, useFormat, useLocale } from 'components/hooks';
+import styles from './FieldFilterForm.module.css';
+
+export interface FieldFilterFormProps {
+  name: string;
+  label?: string;
+  type: string;
+  values?: any[];
+  onSelect?: (key: any) => void;
+  allowFilterSelect?: boolean;
+}
+
+export default function FieldFilterForm({
+  name,
+  label,
+  type,
+  values,
+  onSelect,
+  allowFilterSelect = true,
+}: FieldFilterFormProps) {
+  const { formatMessage, labels } = useMessages();
+  const [filter, setFilter] = useState('eq');
+  const [value, setValue] = useState();
+  const { getFilters } = useFilters();
+  const { formatValue } = useFormat();
+  const { locale } = useLocale();
+  const filters = getFilters(type);
+
+  const formattedValues = useMemo(() => {
+    const formatted = {};
+    const format = (val: string) => {
+      formatted[val] = formatValue(val, name);
+      return formatted[val];
+    };
+    if (values.length !== 1) {
+      const { compare } = new Intl.Collator(locale, { numeric: true });
+      values.sort((a, b) => compare(formatted[a] ?? format(a), formatted[b] ?? format(b)));
+    } else {
+      format(values[0]);
+    }
+    return formatted;
+  }, [values]);
+
+  const renderFilterValue = value => {
+    return filters.find(f => f.value === value)?.label;
+  };
+
+  const renderValue = value => {
+    return formattedValues[value];
+  };
+
+  const handleAdd = () => {
+    onSelect({ name, type, filter, value });
+  };
+
+  return (
+    <Form>
+      <FormRow label={label} className={styles.filter}>
+        <Flexbox gap={10}>
+          {allowFilterSelect && (
+            <Dropdown
+              className={styles.dropdown}
+              items={filters}
+              value={filter}
+              renderValue={renderFilterValue}
+              onChange={(key: any) => setFilter(key)}
+            >
+              {({ value, label }) => {
+                return <Item key={value}>{label}</Item>;
+              }}
+            </Dropdown>
+          )}
+          <Dropdown
+            className={styles.dropdown}
+            menuProps={{ className: styles.menu }}
+            items={values}
+            value={value}
+            renderValue={renderValue}
+            onChange={(key: any) => setValue(key)}
+            style={{
+              minWidth: '250px',
+            }}
+          >
+            {(value: string) => {
+              return <Item key={value}>{formattedValues[value]}</Item>;
+            }}
+          </Dropdown>
+        </Flexbox>
+        <Button variant="primary" onClick={handleAdd} disabled={!filter || !value}>
+          {formatMessage(labels.add)}
+        </Button>
+      </FormRow>
+    </Form>
+  );
+}
diff --git a/components/pages/reports/FieldSelectForm.module.css b/src/app/(main)/reports/[id]/FieldSelectForm.module.css
similarity index 100%
rename from components/pages/reports/FieldSelectForm.module.css
rename to src/app/(main)/reports/[id]/FieldSelectForm.module.css
diff --git a/components/pages/reports/FieldSelectForm.js b/src/app/(main)/reports/[id]/FieldSelectForm.tsx
similarity index 52%
rename from components/pages/reports/FieldSelectForm.js
rename to src/app/(main)/reports/[id]/FieldSelectForm.tsx
index 0e41ea1fb..dfd402cf0 100644
--- a/components/pages/reports/FieldSelectForm.js
+++ b/src/app/(main)/reports/[id]/FieldSelectForm.tsx
@@ -1,19 +1,30 @@
 import { Menu, Item, Form, FormRow } from 'react-basics';
-import { useMessages } from 'hooks';
+import { useMessages } from 'components/hooks';
 import styles from './FieldSelectForm.module.css';
+import { Key } from 'react';
 
-export default function FieldSelectForm({ fields, onSelect }) {
+export interface FieldSelectFormProps {
+  fields?: any[];
+  onSelect?: (key: any) => void;
+  showType?: boolean;
+}
+
+export default function FieldSelectForm({
+  fields = [],
+  onSelect,
+  showType = true,
+}: FieldSelectFormProps) {
   const { formatMessage, labels } = useMessages();
 
   return (
     <Form>
       <FormRow label={formatMessage(labels.fields)}>
-        <Menu className={styles.menu} onSelect={key => onSelect(fields[key])}>
-          {fields.map(({ label, name, type }, index) => {
+        <Menu className={styles.menu} onSelect={key => onSelect(fields[key as any])}>
+          {fields.map(({ name, label, type }: any, index: Key) => {
             return (
               <Item key={index} className={styles.item}>
                 <div>{label || name}</div>
-                <div className={styles.type}>{type}</div>
+                {showType && type && <div className={styles.type}>{type}</div>}
               </Item>
             );
           })}
diff --git a/src/app/(main)/reports/[id]/FilterSelectForm.tsx b/src/app/(main)/reports/[id]/FilterSelectForm.tsx
new file mode 100644
index 000000000..4f9b92642
--- /dev/null
+++ b/src/app/(main)/reports/[id]/FilterSelectForm.tsx
@@ -0,0 +1,59 @@
+import { useState } from 'react';
+import { Loading } from 'react-basics';
+import { subDays } from 'date-fns';
+import FieldSelectForm from './FieldSelectForm';
+import FieldFilterForm from './FieldFilterForm';
+import { useApi } from 'components/hooks';
+
+function useValues(websiteId: string, type: string) {
+  const now = Date.now();
+  const { get, useQuery } = useApi();
+  const { data, error, isLoading } = useQuery({
+    queryKey: ['websites:values', websiteId, type],
+    queryFn: () =>
+      get(`/websites/${websiteId}/values`, {
+        type,
+        startAt: +subDays(now, 90),
+        endAt: now,
+      }),
+    enabled: !!(websiteId && type),
+  });
+
+  return { data, error, isLoading };
+}
+
+export interface FilterSelectFormProps {
+  websiteId: string;
+  items: any[];
+  onSelect?: (key: any) => void;
+  allowFilterSelect?: boolean;
+}
+
+export default function FilterSelectForm({
+  websiteId,
+  items,
+  onSelect,
+  allowFilterSelect,
+}: FilterSelectFormProps) {
+  const [field, setField] = useState<{ name: string; label: string; type: string }>();
+  const { data, isLoading } = useValues(websiteId, field?.name);
+
+  if (!field) {
+    return <FieldSelectForm fields={items} onSelect={setField} showType={false} />;
+  }
+
+  if (isLoading) {
+    return <Loading position="center" icon="dots" />;
+  }
+
+  return (
+    <FieldFilterForm
+      name={field?.name}
+      label={field?.label}
+      type={field?.type}
+      values={data}
+      onSelect={onSelect}
+      allowFilterSelect={allowFilterSelect}
+    />
+  );
+}
diff --git a/components/pages/reports/ParameterList.module.css b/src/app/(main)/reports/[id]/ParameterList.module.css
similarity index 100%
rename from components/pages/reports/ParameterList.module.css
rename to src/app/(main)/reports/[id]/ParameterList.module.css
diff --git a/components/pages/reports/ParameterList.js b/src/app/(main)/reports/[id]/ParameterList.tsx
similarity index 78%
rename from components/pages/reports/ParameterList.js
rename to src/app/(main)/reports/[id]/ParameterList.tsx
index a097cbdc3..eb1a646a4 100644
--- a/components/pages/reports/ParameterList.js
+++ b/src/app/(main)/reports/[id]/ParameterList.tsx
@@ -1,10 +1,17 @@
+import { ReactNode } from 'react';
 import { Icon, TooltipPopup } from 'react-basics';
 import Icons from 'components/icons';
 import Empty from 'components/common/Empty';
-import { useMessages } from 'hooks';
+import { useMessages } from 'components/hooks';
 import styles from './ParameterList.module.css';
 
-export function ParameterList({ items = [], children, onRemove }) {
+export interface ParameterListProps {
+  items: any[];
+  children?: ReactNode | ((item: any) => ReactNode);
+  onRemove: (index: number, e: any) => void;
+}
+
+export function ParameterList({ items = [], children, onRemove }: ParameterListProps) {
   const { formatMessage, labels } = useMessages();
 
   return (
diff --git a/components/pages/reports/PopupForm.module.css b/src/app/(main)/reports/[id]/PopupForm.module.css
similarity index 91%
rename from components/pages/reports/PopupForm.module.css
rename to src/app/(main)/reports/[id]/PopupForm.module.css
index 4daf199ac..94d98b38c 100644
--- a/components/pages/reports/PopupForm.module.css
+++ b/src/app/(main)/reports/[id]/PopupForm.module.css
@@ -3,8 +3,8 @@
   background: var(--base50);
   min-width: 300px;
   padding: 20px;
-  margin-left: 30px;
   border: 1px solid var(--base400);
   border-radius: var(--border-radius);
   box-shadow: 0 0 0 5px rgba(0, 0, 0, 0.1);
+  z-index: 1000;
 }
diff --git a/src/app/(main)/reports/[id]/PopupForm.tsx b/src/app/(main)/reports/[id]/PopupForm.tsx
new file mode 100644
index 000000000..f26661991
--- /dev/null
+++ b/src/app/(main)/reports/[id]/PopupForm.tsx
@@ -0,0 +1,25 @@
+import { CSSProperties, ReactNode } from 'react';
+import classNames from 'classnames';
+import styles from './PopupForm.module.css';
+
+export function PopupForm({
+  className,
+  style,
+  children,
+}: {
+  className?: string;
+  style?: CSSProperties;
+  children: ReactNode;
+}) {
+  return (
+    <div
+      className={classNames(styles.form, className)}
+      style={style}
+      onClick={e => e.stopPropagation()}
+    >
+      {children}
+    </div>
+  );
+}
+
+export default PopupForm;
diff --git a/src/app/(main)/reports/[id]/Report.module.css b/src/app/(main)/reports/[id]/Report.module.css
new file mode 100644
index 000000000..181536550
--- /dev/null
+++ b/src/app/(main)/reports/[id]/Report.module.css
@@ -0,0 +1,5 @@
+.container {
+  display: grid;
+  grid-template-rows: max-content 1fr;
+  grid-template-columns: max-content 1fr;
+}
diff --git a/src/app/(main)/reports/[id]/Report.tsx b/src/app/(main)/reports/[id]/Report.tsx
new file mode 100644
index 000000000..c1cc502f9
--- /dev/null
+++ b/src/app/(main)/reports/[id]/Report.tsx
@@ -0,0 +1,31 @@
+'use client';
+import { createContext, ReactNode } from 'react';
+import { Loading } from 'react-basics';
+import { useReport } from 'components/hooks';
+import styles from './Report.module.css';
+import classNames from 'classnames';
+
+export const ReportContext = createContext(null);
+
+export interface ReportProps {
+  reportId: string;
+  defaultParameters: { [key: string]: any };
+  children: ReactNode;
+  className?: string;
+}
+
+export function Report({ reportId, defaultParameters, children, className }: ReportProps) {
+  const report = useReport(reportId, defaultParameters);
+
+  if (!report) {
+    return reportId ? <Loading position="page" /> : null;
+  }
+
+  return (
+    <ReportContext.Provider value={report}>
+      <div className={classNames(styles.container, className)}>{children}</div>
+    </ReportContext.Provider>
+  );
+}
+
+export default Report;
diff --git a/src/app/(main)/reports/[id]/ReportBody.module.css b/src/app/(main)/reports/[id]/ReportBody.module.css
new file mode 100644
index 000000000..79e3caa0f
--- /dev/null
+++ b/src/app/(main)/reports/[id]/ReportBody.module.css
@@ -0,0 +1,5 @@
+.body {
+  padding-left: 20px;
+  grid-row: 2/3;
+  grid-column: 2 / 3;
+}
diff --git a/src/app/(main)/reports/[id]/ReportBody.tsx b/src/app/(main)/reports/[id]/ReportBody.tsx
new file mode 100644
index 000000000..6f4627f68
--- /dev/null
+++ b/src/app/(main)/reports/[id]/ReportBody.tsx
@@ -0,0 +1,15 @@
+import styles from './ReportBody.module.css';
+import { useContext } from 'react';
+import { ReportContext } from './Report';
+
+export function ReportBody({ children }) {
+  const { report } = useContext(ReportContext);
+
+  if (!report) {
+    return null;
+  }
+
+  return <div className={styles.body}>{children}</div>;
+}
+
+export default ReportBody;
diff --git a/src/app/(main)/reports/[id]/ReportDetails.tsx b/src/app/(main)/reports/[id]/ReportDetails.tsx
new file mode 100644
index 000000000..e4d4688a0
--- /dev/null
+++ b/src/app/(main)/reports/[id]/ReportDetails.tsx
@@ -0,0 +1,29 @@
+'use client';
+import FunnelReport from '../funnel/FunnelReport';
+import EventDataReport from '../event-data/EventDataReport';
+import InsightsReport from '../insights/InsightsReport';
+import RetentionReport from '../retention/RetentionReport';
+import { useApi } from 'components/hooks';
+
+const reports = {
+  funnel: FunnelReport,
+  'event-data': EventDataReport,
+  insights: InsightsReport,
+  retention: RetentionReport,
+};
+
+export default function ReportDetails({ reportId }: { reportId: string }) {
+  const { get, useQuery } = useApi();
+  const { data: report } = useQuery({
+    queryKey: ['reports', reportId],
+    queryFn: () => get(`/reports/${reportId}`),
+  });
+
+  if (!report) {
+    return null;
+  }
+
+  const ReportComponent = reports[report.type];
+
+  return <ReportComponent reportId={reportId} />;
+}
diff --git a/src/app/(main)/reports/[id]/ReportHeader.module.css b/src/app/(main)/reports/[id]/ReportHeader.module.css
new file mode 100644
index 000000000..5ff261040
--- /dev/null
+++ b/src/app/(main)/reports/[id]/ReportHeader.module.css
@@ -0,0 +1,36 @@
+.header {
+  display: grid;
+  grid-template-columns: 1fr min-content;
+  align-items: center;
+  grid-row: 1 / 2;
+  grid-column: 1 / 3;
+  margin: 20px 0 40px 0;
+}
+
+.title {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  font-size: 24px;
+  font-weight: 700;
+  gap: 20px;
+  height: 60px;
+}
+
+.type {
+  font-size: 11px;
+  font-weight: 700;
+  text-transform: uppercase;
+  color: var(--base600);
+}
+
+.description {
+  color: var(--font-color300);
+  max-width: 500px;
+  height: 30px;
+}
+
+.actions {
+  display: flex;
+  align-items: center;
+}
diff --git a/src/app/(main)/reports/[id]/ReportHeader.tsx b/src/app/(main)/reports/[id]/ReportHeader.tsx
new file mode 100644
index 000000000..d69cd0cd2
--- /dev/null
+++ b/src/app/(main)/reports/[id]/ReportHeader.tsx
@@ -0,0 +1,97 @@
+import { useContext } from 'react';
+import { useRouter } from 'next/navigation';
+import { Icon, LoadingButton, InlineEditField, useToasts } from 'react-basics';
+import { useMessages, useApi } from 'components/hooks';
+import { ReportContext } from './Report';
+import styles from './ReportHeader.module.css';
+import { REPORT_TYPES } from 'lib/constants';
+
+export function ReportHeader({ icon }) {
+  const { report, updateReport } = useContext(ReportContext);
+  const { formatMessage, labels, messages } = useMessages();
+  const { showToast } = useToasts();
+  const { post, useMutation } = useApi();
+  const router = useRouter();
+  const { mutate: create, isPending: isCreating } = useMutation({
+    mutationFn: (data: any) => post(`/reports`, data),
+  });
+  const { mutate: update, isPending: isUpdating } = useMutation({
+    mutationFn: (data: any) => post(`/reports/${data.id}`, data),
+  });
+
+  const { name, description, parameters } = report || {};
+  const { websiteId, dateRange } = parameters || {};
+  const defaultName = formatMessage(labels.untitled);
+
+  const handleSave = async () => {
+    if (!report.id) {
+      create(report, {
+        onSuccess: async ({ id }) => {
+          showToast({ message: formatMessage(messages.saved), variant: 'success' });
+          router.push(`/reports/${id}`);
+        },
+      });
+    } else {
+      update(report, {
+        onSuccess: async () => {
+          showToast({ message: formatMessage(messages.saved), variant: 'success' });
+        },
+      });
+    }
+  };
+
+  const handleNameChange = (name: string) => {
+    updateReport({ name: name || defaultName });
+  };
+
+  const handleDescriptionChange = (description: string) => {
+    updateReport({ description });
+  };
+
+  if (!report) {
+    return null;
+  }
+
+  return (
+    <div className={styles.header}>
+      <div>
+        <div className={styles.type}>
+          {formatMessage(
+            labels[Object.keys(REPORT_TYPES).find(key => REPORT_TYPES[key] === report?.type)],
+          )}
+        </div>
+        <div className={styles.title}>
+          <Icon size="lg">{icon}</Icon>
+          <InlineEditField
+            key={name}
+            name="name"
+            value={name}
+            placeholder={defaultName}
+            onCommit={handleNameChange}
+          />
+        </div>
+        <div className={styles.description}>
+          <InlineEditField
+            key={description}
+            name="description"
+            value={description}
+            placeholder={`+ ${formatMessage(labels.addDescription)}`}
+            onCommit={handleDescriptionChange}
+          />
+        </div>
+      </div>
+      <div className={styles.actions}>
+        <LoadingButton
+          variant="primary"
+          isLoading={isCreating || isUpdating}
+          disabled={!websiteId || !dateRange?.value || !name}
+          onClick={handleSave}
+        >
+          {formatMessage(labels.save)}
+        </LoadingButton>
+      </div>
+    </div>
+  );
+}
+
+export default ReportHeader;
diff --git a/src/app/(main)/reports/[id]/ReportMenu.module.css b/src/app/(main)/reports/[id]/ReportMenu.module.css
new file mode 100644
index 000000000..1fc8db299
--- /dev/null
+++ b/src/app/(main)/reports/[id]/ReportMenu.module.css
@@ -0,0 +1,7 @@
+.menu {
+  width: 300px;
+  padding-right: 20px;
+  border-right: 1px solid var(--base300);
+  grid-row: 2 / 3;
+  grid-column: 1 / 2;
+}
diff --git a/src/app/(main)/reports/[id]/ReportMenu.tsx b/src/app/(main)/reports/[id]/ReportMenu.tsx
new file mode 100644
index 000000000..9478a9039
--- /dev/null
+++ b/src/app/(main)/reports/[id]/ReportMenu.tsx
@@ -0,0 +1,15 @@
+import styles from './ReportMenu.module.css';
+import { useContext } from 'react';
+import { ReportContext } from './Report';
+
+export function ReportMenu({ children }) {
+  const { report } = useContext(ReportContext);
+
+  if (!report) {
+    return null;
+  }
+
+  return <div className={styles.menu}>{children}</div>;
+}
+
+export default ReportMenu;
diff --git a/src/app/(main)/reports/[id]/page.tsx b/src/app/(main)/reports/[id]/page.tsx
new file mode 100644
index 000000000..9ba87f41f
--- /dev/null
+++ b/src/app/(main)/reports/[id]/page.tsx
@@ -0,0 +1,14 @@
+import ReportDetails from './ReportDetails';
+import { Metadata } from 'next';
+
+export default function ReportDetailsPage({ params: { id } }) {
+  if (!id) {
+    return null;
+  }
+
+  return <ReportDetails reportId={id} />;
+}
+
+export const metadata: Metadata = {
+  title: 'Reports | umami',
+};
diff --git a/components/pages/reports/ReportTemplates.module.css b/src/app/(main)/reports/create/ReportTemplates.module.css
similarity index 96%
rename from components/pages/reports/ReportTemplates.module.css
rename to src/app/(main)/reports/create/ReportTemplates.module.css
index 331835051..0cdcb8351 100644
--- a/components/pages/reports/ReportTemplates.module.css
+++ b/src/app/(main)/reports/create/ReportTemplates.module.css
@@ -2,7 +2,6 @@
   display: grid;
   grid-template-columns: repeat(auto-fit, minmax(360px, 1fr));
   gap: 20px;
-  width: 360px;
 }
 
 .report {
diff --git a/components/pages/reports/ReportTemplates.js b/src/app/(main)/reports/create/ReportTemplates.tsx
similarity index 68%
rename from components/pages/reports/ReportTemplates.js
rename to src/app/(main)/reports/create/ReportTemplates.tsx
index 60ae11e79..003cb3fc4 100644
--- a/components/pages/reports/ReportTemplates.js
+++ b/src/app/(main)/reports/create/ReportTemplates.tsx
@@ -1,13 +1,16 @@
+'use client';
 import Link from 'next/link';
 import { Button, Icons, Text, Icon } from 'react-basics';
-import Page from 'components/layout/Page';
 import PageHeader from 'components/layout/PageHeader';
 import Funnel from 'assets/funnel.svg';
 import Lightbulb from 'assets/lightbulb.svg';
+import Magnet from 'assets/magnet.svg';
 import styles from './ReportTemplates.module.css';
-import { useMessages } from 'hooks';
+import { useMessages } from 'components/hooks';
 
 function ReportItem({ title, description, url, icon }) {
+  const { formatMessage, labels } = useMessages();
+
   return (
     <div className={styles.report}>
       <div className={styles.title}>
@@ -21,7 +24,7 @@ function ReportItem({ title, description, url, icon }) {
             <Icon>
               <Icons.Plus />
             </Icon>
-            <Text>Create</Text>
+            <Text>{formatMessage(labels.create)}</Text>
           </Button>
         </Link>
       </div>
@@ -29,29 +32,33 @@ function ReportItem({ title, description, url, icon }) {
   );
 }
 
-export function ReportTemplates() {
+export function ReportTemplates({ showHeader = true }) {
   const { formatMessage, labels } = useMessages();
 
   const reports = [
-    /*
     {
       title: formatMessage(labels.insights),
-      description: 'Dive deeper into your data by using segments and filters.',
+      description: formatMessage(labels.insightsDescription),
       url: '/reports/insights',
       icon: <Lightbulb />,
     },
-     */
     {
       title: formatMessage(labels.funnel),
-      description: 'Understand the conversion and drop-off rate of users.',
+      description: formatMessage(labels.funnelDescription),
       url: '/reports/funnel',
       icon: <Funnel />,
     },
+    {
+      title: formatMessage(labels.retention),
+      description: formatMessage(labels.retentionDescription),
+      url: '/reports/retention',
+      icon: <Magnet />,
+    },
   ];
 
   return (
-    <Page>
-      <PageHeader title={formatMessage(labels.reports)} />
+    <>
+      {showHeader && <PageHeader title={formatMessage(labels.reports)} />}
       <div className={styles.reports}>
         {reports.map(({ title, description, url, icon }) => {
           return (
@@ -59,7 +66,7 @@ export function ReportTemplates() {
           );
         })}
       </div>
-    </Page>
+    </>
   );
 }
 
diff --git a/src/app/(main)/reports/create/page.tsx b/src/app/(main)/reports/create/page.tsx
new file mode 100644
index 000000000..a1a761bcd
--- /dev/null
+++ b/src/app/(main)/reports/create/page.tsx
@@ -0,0 +1,10 @@
+import ReportTemplates from './ReportTemplates';
+import { Metadata } from 'next';
+
+export default function ReportsCreatePage() {
+  return <ReportTemplates />;
+}
+
+export const metadata: Metadata = {
+  title: 'Create Report | umami',
+};
diff --git a/components/pages/reports/event-data/EventDataParameters.module.css b/src/app/(main)/reports/event-data/EventDataParameters.module.css
similarity index 100%
rename from components/pages/reports/event-data/EventDataParameters.module.css
rename to src/app/(main)/reports/event-data/EventDataParameters.module.css
diff --git a/components/pages/reports/event-data/EventDataParameters.js b/src/app/(main)/reports/event-data/EventDataParameters.tsx
similarity index 81%
rename from components/pages/reports/event-data/EventDataParameters.js
rename to src/app/(main)/reports/event-data/EventDataParameters.tsx
index 8d4dbb623..7a39131ba 100644
--- a/components/pages/reports/event-data/EventDataParameters.js
+++ b/src/app/(main)/reports/event-data/EventDataParameters.tsx
@@ -1,27 +1,27 @@
-import { useContext, useRef } from 'react';
-import { useApi, useMessages } from 'hooks';
+import { useContext } from 'react';
 import { Form, FormRow, FormButtons, SubmitButton, PopupTrigger, Icon, Popup } from 'react-basics';
-import { ReportContext } from 'components/pages/reports/Report';
 import Empty from 'components/common/Empty';
-import { DATA_TYPES, REPORT_PARAMETERS } from 'lib/constants';
 import Icons from 'components/icons';
-import FieldAddForm from '../FieldAddForm';
-import BaseParameters from '../BaseParameters';
-import ParameterList from '../ParameterList';
+import { useApi, useMessages } from 'components/hooks';
+import { DATA_TYPES, REPORT_PARAMETERS } from 'lib/constants';
+import { ReportContext } from '../[id]/Report';
+import FieldAddForm from '../[id]/FieldAddForm';
+import ParameterList from '../[id]/ParameterList';
+import BaseParameters from '../[id]/BaseParameters';
 import styles from './EventDataParameters.module.css';
 
 function useFields(websiteId, startDate, endDate) {
   const { get, useQuery } = useApi();
-  const { data, error, isLoading } = useQuery(
-    ['fields', websiteId, startDate, endDate],
-    () =>
+  const { data, error, isLoading } = useQuery({
+    queryKey: ['fields', websiteId, startDate, endDate],
+    queryFn: () =>
       get('/reports/event-data', {
         websiteId,
         startAt: +startDate,
         endAt: +endDate,
       }),
-    { enabled: !!(websiteId && startDate && endDate) },
-  );
+    enabled: !!(websiteId && startDate && endDate),
+  });
 
   return { data, error, isLoading };
 }
@@ -29,7 +29,6 @@ function useFields(websiteId, startDate, endDate) {
 export function EventDataParameters() {
   const { report, runReport, updateReport, isRunning } = useContext(ReportContext);
   const { formatMessage, labels, messages } = useMessages();
-  const ref = useRef(null);
   const { parameters } = report || {};
   const { websiteId, dateRange, fields, filters, groups } = parameters || {};
   const { startDate, endDate } = dateRange || {};
@@ -53,28 +52,28 @@ export function EventDataParameters() {
     runReport(values);
   };
 
-  const handleAdd = (group, value) => {
+  const handleAdd = (group: string, value: any) => {
     const data = parameterData[group];
 
-    if (!data.find(({ name }) => name === value.name)) {
+    if (!data.find(({ name }) => name === value?.name)) {
       updateReport({ parameters: { [group]: data.concat(value) } });
     }
   };
 
-  const handleRemove = (group, index) => {
+  const handleRemove = (group: string, index: number) => {
     const data = [...parameterData[group]];
     data.splice(index, 1);
     updateReport({ parameters: { [group]: data } });
   };
 
-  const AddButton = ({ group }) => {
+  const AddButton = ({ group, onAdd }) => {
     return (
       <PopupTrigger>
         <Icon>
           <Icons.Plus />
         </Icon>
         <Popup position="bottom" alignment="start">
-          {(close, element) => {
+          {(close: () => void) => {
             return (
               <FieldAddForm
                 fields={data.map(({ eventKey, eventDataType }) => ({
@@ -82,8 +81,7 @@ export function EventDataParameters() {
                   type: DATA_TYPES[eventDataType],
                 }))}
                 group={group}
-                element={element}
-                onAdd={handleAdd}
+                onAdd={onAdd}
                 onClose={close}
               />
             );
@@ -94,7 +92,7 @@ export function EventDataParameters() {
   };
 
   return (
-    <Form ref={ref} values={parameters} error={error} onSubmit={handleSubmit}>
+    <Form values={parameters} error={error} onSubmit={handleSubmit}>
       <BaseParameters />
       {!hasData && <Empty message={formatMessage(messages.noEventData)} />}
       {parametersSelected &&
@@ -134,7 +132,7 @@ export function EventDataParameters() {
           );
         })}
       <FormButtons>
-        <SubmitButton variant="primary" disabled={!queryEnabled} loading={isRunning}>
+        <SubmitButton variant="primary" disabled={!queryEnabled} isLoading={isRunning}>
           {formatMessage(labels.runQuery)}
         </SubmitButton>
       </FormButtons>
diff --git a/components/pages/reports/event-data/EventDataReport.js b/src/app/(main)/reports/event-data/EventDataReport.tsx
similarity index 67%
rename from components/pages/reports/event-data/EventDataReport.js
rename to src/app/(main)/reports/event-data/EventDataReport.tsx
index eb49a29df..8b4dc99cd 100644
--- a/components/pages/reports/event-data/EventDataReport.js
+++ b/src/app/(main)/reports/event-data/EventDataReport.tsx
@@ -1,7 +1,7 @@
-import Report from '../Report';
-import ReportHeader from '../ReportHeader';
-import ReportMenu from '../ReportMenu';
-import ReportBody from '../ReportBody';
+import Report from '../[id]/Report';
+import ReportHeader from '../[id]/ReportHeader';
+import ReportMenu from '../[id]/ReportMenu';
+import ReportBody from '../[id]/ReportBody';
 import EventDataParameters from './EventDataParameters';
 import EventDataTable from './EventDataTable';
 import Nodes from 'assets/nodes.svg';
@@ -11,7 +11,7 @@ const defaultParameters = {
   parameters: { fields: [], filters: [] },
 };
 
-export default function EventDataReport({ reportId }) {
+export default function EventDataReport({ reportId }: { reportId: string }) {
   return (
     <Report reportId={reportId} defaultParameters={defaultParameters}>
       <ReportHeader icon={<Nodes />} />
diff --git a/components/pages/reports/event-data/EventDataTable.js b/src/app/(main)/reports/event-data/EventDataTable.tsx
similarity index 85%
rename from components/pages/reports/event-data/EventDataTable.js
rename to src/app/(main)/reports/event-data/EventDataTable.tsx
index 81b9cad14..b709aee75 100644
--- a/components/pages/reports/event-data/EventDataTable.js
+++ b/src/app/(main)/reports/event-data/EventDataTable.tsx
@@ -1,7 +1,7 @@
 import { useContext } from 'react';
 import { GridTable, GridColumn } from 'react-basics';
-import { useMessages } from 'hooks';
-import { ReportContext } from '../Report';
+import { useMessages } from 'components/hooks';
+import { ReportContext } from '../[id]/Report';
 
 export function EventDataTable() {
   const { report } = useContext(ReportContext);
diff --git a/components/pages/reports/funnel/FunnelChart.module.css b/src/app/(main)/reports/funnel/FunnelChart.module.css
similarity index 100%
rename from components/pages/reports/funnel/FunnelChart.module.css
rename to src/app/(main)/reports/funnel/FunnelChart.module.css
diff --git a/src/app/(main)/reports/funnel/FunnelChart.tsx b/src/app/(main)/reports/funnel/FunnelChart.tsx
new file mode 100644
index 000000000..923e8d56b
--- /dev/null
+++ b/src/app/(main)/reports/funnel/FunnelChart.tsx
@@ -0,0 +1,85 @@
+import { JSX, useCallback, useContext, useMemo } from 'react';
+import { Loading, StatusLight } from 'react-basics';
+import useMessages from 'components/hooks/useMessages';
+import useTheme from 'components/hooks/useTheme';
+import BarChart from 'components/metrics/BarChart';
+import { formatLongNumber } from 'lib/format';
+import { ReportContext } from '../[id]/Report';
+import styles from './FunnelChart.module.css';
+
+export interface FunnelChartProps {
+  className?: string;
+  isLoading?: boolean;
+}
+
+export function FunnelChart({ className, isLoading }: FunnelChartProps) {
+  const { report } = useContext(ReportContext);
+  const { formatMessage, labels } = useMessages();
+  const { colors } = useTheme();
+
+  const { parameters, data } = report || {};
+
+  const renderXLabel = useCallback(
+    (label: string, index: number) => {
+      return parameters.urls[index];
+    },
+    [parameters],
+  );
+
+  const renderTooltipPopup = useCallback(
+    (
+      setTooltipPopup: (arg0: JSX.Element) => void,
+      model: { tooltip: { opacity: any; labelColors: any; dataPoints: any } },
+    ) => {
+      const { opacity, labelColors, dataPoints } = model.tooltip;
+
+      if (!dataPoints?.length || !opacity) {
+        setTooltipPopup(null);
+        return;
+      }
+
+      setTooltipPopup(
+        <>
+          <div>
+            {formatLongNumber(dataPoints[0].raw.y)} {formatMessage(labels.visitors)}
+          </div>
+          <div>
+            <StatusLight color={labelColors?.[0]?.backgroundColor}>
+              {formatLongNumber(dataPoints[0].raw.z)}% {formatMessage(labels.dropoff)}
+            </StatusLight>
+          </div>
+        </>,
+      );
+    },
+    [],
+  );
+
+  const datasets = useMemo(() => {
+    return [
+      {
+        label: formatMessage(labels.uniqueVisitors),
+        data: data,
+        borderWidth: 1,
+        ...colors.chart.visitors,
+      },
+    ];
+  }, [data, colors, formatMessage, labels]);
+
+  if (isLoading) {
+    return <Loading icon="dots" className={styles.loading} />;
+  }
+
+  return (
+    <BarChart
+      className={className}
+      datasets={datasets}
+      unit="day"
+      isLoading={isLoading}
+      renderXLabel={renderXLabel}
+      renderTooltipPopup={renderTooltipPopup}
+      XAxisType="category"
+    />
+  );
+}
+
+export default FunnelChart;
diff --git a/components/pages/reports/funnel/FunnelParameters.js b/src/app/(main)/reports/funnel/FunnelParameters.tsx
similarity index 67%
rename from components/pages/reports/funnel/FunnelParameters.js
rename to src/app/(main)/reports/funnel/FunnelParameters.tsx
index ae4981761..0bb454156 100644
--- a/components/pages/reports/funnel/FunnelParameters.js
+++ b/src/app/(main)/reports/funnel/FunnelParameters.tsx
@@ -1,5 +1,5 @@
-import { useContext, useRef } from 'react';
-import { useMessages } from 'hooks';
+import { useContext } from 'react';
+import { useMessages } from 'components/hooks';
 import {
   Icon,
   Form,
@@ -13,20 +13,20 @@ import {
 } from 'react-basics';
 import Icons from 'components/icons';
 import UrlAddForm from './UrlAddForm';
-import { ReportContext } from 'components/pages/reports/Report';
-import BaseParameters from '../BaseParameters';
-import ParameterList from '../ParameterList';
+import { ReportContext } from '../[id]/Report';
+import BaseParameters from '../[id]/BaseParameters';
+import ParameterList from '../[id]/ParameterList';
+import PopupForm from '../[id]/PopupForm';
 
 export function FunnelParameters() {
   const { report, runReport, updateReport, isRunning } = useContext(ReportContext);
   const { formatMessage, labels } = useMessages();
-  const ref = useRef(null);
 
   const { parameters } = report || {};
   const { websiteId, dateRange, urls } = parameters || {};
   const queryDisabled = !websiteId || !dateRange || urls?.length < 2;
 
-  const handleSubmit = (data, e) => {
+  const handleSubmit = (data: any, e: any) => {
     e.stopPropagation();
     e.preventDefault();
     if (!queryDisabled) {
@@ -34,11 +34,11 @@ export function FunnelParameters() {
     }
   };
 
-  const handleAddUrl = url => {
+  const handleAddUrl = (url: string) => {
     updateReport({ parameters: { urls: parameters.urls.concat(url) } });
   };
 
-  const handleRemoveUrl = (index, e) => {
+  const handleRemoveUrl = (index: number, e: any) => {
     e.stopPropagation();
     const urls = [...parameters.urls];
     urls.splice(index, 1);
@@ -51,17 +51,17 @@ export function FunnelParameters() {
         <Icon>
           <Icons.Plus />
         </Icon>
-        <Popup position="bottom" alignment="start">
-          {(close, element) => {
-            return <UrlAddForm element={element} onAdd={handleAddUrl} onClose={close} />;
-          }}
+        <Popup position="right" alignment="start">
+          <PopupForm>
+            <UrlAddForm onAdd={handleAddUrl} />
+          </PopupForm>
         </Popup>
       </PopupTrigger>
     );
   };
 
   return (
-    <Form ref={ref} values={parameters} onSubmit={handleSubmit} preventSubmit={true}>
+    <Form values={parameters} onSubmit={handleSubmit} preventSubmit={true}>
       <BaseParameters />
       <FormRow label={formatMessage(labels.window)}>
         <FormInput
@@ -72,10 +72,13 @@ export function FunnelParameters() {
         </FormInput>
       </FormRow>
       <FormRow label={formatMessage(labels.urls)} action={<AddUrlButton />}>
-        <ParameterList items={urls} onRemove={handleRemoveUrl} />
+        <ParameterList
+          items={urls}
+          onRemove={(index: number, e: any) => handleRemoveUrl(index, e)}
+        />
       </FormRow>
       <FormButtons>
-        <SubmitButton variant="primary" disabled={queryDisabled} loading={isRunning}>
+        <SubmitButton variant="primary" disabled={queryDisabled} isLoading={isRunning}>
           {formatMessage(labels.runQuery)}
         </SubmitButton>
       </FormButtons>
diff --git a/components/pages/reports/funnel/FunnelReport.module.css b/src/app/(main)/reports/funnel/FunnelReport.module.css
similarity index 100%
rename from components/pages/reports/funnel/FunnelReport.module.css
rename to src/app/(main)/reports/funnel/FunnelReport.module.css
diff --git a/components/pages/reports/funnel/FunnelReport.js b/src/app/(main)/reports/funnel/FunnelReport.tsx
similarity index 69%
rename from components/pages/reports/funnel/FunnelReport.js
rename to src/app/(main)/reports/funnel/FunnelReport.tsx
index 7b4d8eced..69f460918 100644
--- a/components/pages/reports/funnel/FunnelReport.js
+++ b/src/app/(main)/reports/funnel/FunnelReport.tsx
@@ -1,14 +1,16 @@
+'use client';
 import FunnelChart from './FunnelChart';
 import FunnelTable from './FunnelTable';
 import FunnelParameters from './FunnelParameters';
-import Report from '../Report';
-import ReportHeader from '../ReportHeader';
-import ReportMenu from '../ReportMenu';
-import ReportBody from '../ReportBody';
+import Report from '../[id]/Report';
+import ReportHeader from '../[id]/ReportHeader';
+import ReportMenu from '../[id]/ReportMenu';
+import ReportBody from '../[id]/ReportBody';
 import Funnel from 'assets/funnel.svg';
+import { REPORT_TYPES } from 'lib/constants';
 
 const defaultParameters = {
-  type: 'funnel',
+  type: REPORT_TYPES.funnel,
   parameters: { window: 60, urls: [] },
 };
 
diff --git a/components/pages/reports/funnel/FunnelTable.js b/src/app/(main)/reports/funnel/FunnelTable.tsx
similarity index 68%
rename from components/pages/reports/funnel/FunnelTable.js
rename to src/app/(main)/reports/funnel/FunnelTable.tsx
index 9ae8ab583..4cf797f26 100644
--- a/components/pages/reports/funnel/FunnelTable.js
+++ b/src/app/(main)/reports/funnel/FunnelTable.tsx
@@ -1,13 +1,13 @@
 import { useContext } from 'react';
-import DataTable from 'components/metrics/DataTable';
-import { useMessages } from 'hooks';
-import { ReportContext } from '../Report';
+import ListTable from 'components/metrics/ListTable';
+import { useMessages } from 'components/hooks';
+import { ReportContext } from '../[id]/Report';
 
 export function FunnelTable() {
   const { report } = useContext(ReportContext);
   const { formatMessage, labels } = useMessages();
   return (
-    <DataTable
+    <ListTable
       data={report?.data}
       title={formatMessage(labels.url)}
       metric={formatMessage(labels.visitors)}
diff --git a/components/pages/reports/funnel/UrlAddForm.module.css b/src/app/(main)/reports/funnel/UrlAddForm.module.css
similarity index 100%
rename from components/pages/reports/funnel/UrlAddForm.module.css
rename to src/app/(main)/reports/funnel/UrlAddForm.module.css
diff --git a/src/app/(main)/reports/funnel/UrlAddForm.tsx b/src/app/(main)/reports/funnel/UrlAddForm.tsx
new file mode 100644
index 000000000..88c27ae91
--- /dev/null
+++ b/src/app/(main)/reports/funnel/UrlAddForm.tsx
@@ -0,0 +1,52 @@
+import { useState } from 'react';
+import { useMessages } from 'components/hooks';
+import { Button, Form, FormRow, TextField, Flexbox } from 'react-basics';
+import styles from './UrlAddForm.module.css';
+
+export interface UrlAddFormProps {
+  defaultValue?: string;
+  onAdd?: (url: string) => void;
+}
+
+export function UrlAddForm({ defaultValue = '', onAdd }: UrlAddFormProps) {
+  const [url, setUrl] = useState(defaultValue);
+  const { formatMessage, labels } = useMessages();
+
+  const handleSave = () => {
+    onAdd(url);
+    setUrl('');
+  };
+
+  const handleChange = e => {
+    setUrl(e.target.value);
+  };
+
+  const handleKeyDown = e => {
+    if (e.key === 'Enter') {
+      e.stopPropagation();
+      handleSave();
+    }
+  };
+
+  return (
+    <Form>
+      <FormRow label={formatMessage(labels.url)}>
+        <Flexbox gap={10}>
+          <TextField
+            className={styles.input}
+            value={url}
+            onChange={handleChange}
+            autoFocus={true}
+            autoComplete="off"
+            onKeyDown={handleKeyDown}
+          />
+          <Button variant="primary" onClick={handleSave}>
+            {formatMessage(labels.add)}
+          </Button>
+        </Flexbox>
+      </FormRow>
+    </Form>
+  );
+}
+
+export default UrlAddForm;
diff --git a/src/app/(main)/reports/funnel/page.tsx b/src/app/(main)/reports/funnel/page.tsx
new file mode 100644
index 000000000..1ce70c754
--- /dev/null
+++ b/src/app/(main)/reports/funnel/page.tsx
@@ -0,0 +1,10 @@
+import FunnelReport from './FunnelReport';
+import { Metadata } from 'next';
+
+export default function FunnelReportPage() {
+  return <FunnelReport reportId={null} />;
+}
+
+export const metadata: Metadata = {
+  title: 'Funnel Report | umami',
+};
diff --git a/components/pages/reports/insights/InsightsParameters.module.css b/src/app/(main)/reports/insights/InsightsParameters.module.css
similarity index 74%
rename from components/pages/reports/insights/InsightsParameters.module.css
rename to src/app/(main)/reports/insights/InsightsParameters.module.css
index 06b624149..c84f8a9e9 100644
--- a/components/pages/reports/insights/InsightsParameters.module.css
+++ b/src/app/(main)/reports/insights/InsightsParameters.module.css
@@ -10,3 +10,8 @@
 .op {
   font-weight: bold;
 }
+
+.popup {
+  margin-top: -10px;
+  margin-left: 30px;
+}
diff --git a/src/app/(main)/reports/insights/InsightsParameters.tsx b/src/app/(main)/reports/insights/InsightsParameters.tsx
new file mode 100644
index 000000000..cd643eedf
--- /dev/null
+++ b/src/app/(main)/reports/insights/InsightsParameters.tsx
@@ -0,0 +1,143 @@
+import { useContext } from 'react';
+import { useFormat, useMessages, useFilters } from 'components/hooks';
+import {
+  Form,
+  FormRow,
+  FormButtons,
+  SubmitButton,
+  PopupTrigger,
+  Icon,
+  Popup,
+  TooltipPopup,
+} from 'react-basics';
+import Icons from 'components/icons';
+import BaseParameters from '../[id]/BaseParameters';
+import { ReportContext } from '../[id]/Report';
+import ParameterList from '../[id]/ParameterList';
+import FilterSelectForm from '../[id]/FilterSelectForm';
+import FieldSelectForm from '../[id]/FieldSelectForm';
+import PopupForm from '../[id]/PopupForm';
+import styles from './InsightsParameters.module.css';
+
+export function InsightsParameters() {
+  const { report, runReport, updateReport, isRunning } = useContext(ReportContext);
+  const { formatMessage, labels } = useMessages();
+  const { formatValue } = useFormat();
+  const { filterLabels } = useFilters();
+  const { parameters } = report || {};
+  const { websiteId, dateRange, fields, filters } = parameters || {};
+  const { startDate, endDate } = dateRange || {};
+  const parametersSelected = websiteId && startDate && endDate;
+  const queryEnabled = websiteId && dateRange && (fields?.length || filters?.length);
+
+  const fieldOptions = [
+    { name: 'url', type: 'string', label: formatMessage(labels.url) },
+    { name: 'title', type: 'string', label: formatMessage(labels.pageTitle) },
+    { name: 'referrer', type: 'string', label: formatMessage(labels.referrer) },
+    { name: 'query', type: 'string', label: formatMessage(labels.query) },
+    { name: 'browser', type: 'string', label: formatMessage(labels.browser) },
+    { name: 'os', type: 'string', label: formatMessage(labels.os) },
+    { name: 'device', type: 'string', label: formatMessage(labels.device) },
+    { name: 'country', type: 'string', label: formatMessage(labels.country) },
+    { name: 'region', type: 'string', label: formatMessage(labels.region) },
+    { name: 'city', type: 'string', label: formatMessage(labels.city) },
+  ];
+
+  const parameterGroups = [
+    { id: 'fields', label: formatMessage(labels.fields) },
+    { id: 'filters', label: formatMessage(labels.filters) },
+  ];
+
+  const parameterData = {
+    fields,
+    filters,
+  };
+
+  const handleSubmit = values => {
+    runReport(values);
+  };
+
+  const handleAdd = (id, value) => {
+    const data = parameterData[id];
+
+    if (!data.find(({ name }) => name === value.name)) {
+      updateReport({ parameters: { [id]: data.concat(value) } });
+    }
+  };
+
+  const handleRemove = (id, index) => {
+    const data = [...parameterData[id]];
+    data.splice(index, 1);
+    updateReport({ parameters: { [id]: data } });
+  };
+
+  const AddButton = ({ id, onAdd }) => {
+    return (
+      <PopupTrigger>
+        <TooltipPopup label={formatMessage(labels.add)} position="top">
+          <Icon>
+            <Icons.Plus />
+          </Icon>
+        </TooltipPopup>
+        <Popup position="bottom" alignment="start" className={styles.popup}>
+          <PopupForm>
+            {id === 'fields' && (
+              <FieldSelectForm
+                fields={fieldOptions}
+                onSelect={onAdd.bind(null, id)}
+                showType={false}
+              />
+            )}
+            {id === 'filters' && (
+              <FilterSelectForm
+                websiteId={websiteId}
+                items={fieldOptions}
+                onSelect={onAdd.bind(null, id)}
+              />
+            )}
+          </PopupForm>
+        </Popup>
+      </PopupTrigger>
+    );
+  };
+
+  return (
+    <Form values={parameters} onSubmit={handleSubmit}>
+      <BaseParameters />
+      {parametersSelected &&
+        parameterGroups.map(({ id, label }) => {
+          return (
+            <FormRow key={label} label={label} action={<AddButton id={id} onAdd={handleAdd} />}>
+              <ParameterList items={parameterData[id]} onRemove={index => handleRemove(id, index)}>
+                {({ name, filter, value }) => {
+                  return (
+                    <div className={styles.parameter}>
+                      {id === 'fields' && (
+                        <>
+                          <div>{fieldOptions.find(f => f.name === name)?.label}</div>
+                        </>
+                      )}
+                      {id === 'filters' && (
+                        <>
+                          <div>{fieldOptions.find(f => f.name === name)?.label}</div>
+                          <div className={styles.op}>{filterLabels[filter]}</div>
+                          <div>{formatValue(value, name)}</div>
+                        </>
+                      )}
+                    </div>
+                  );
+                }}
+              </ParameterList>
+            </FormRow>
+          );
+        })}
+      <FormButtons>
+        <SubmitButton variant="primary" disabled={!queryEnabled} isLoading={isRunning}>
+          {formatMessage(labels.runQuery)}
+        </SubmitButton>
+      </FormButtons>
+    </Form>
+  );
+}
+
+export default InsightsParameters;
diff --git a/components/pages/reports/insights/InsightsReport.js b/src/app/(main)/reports/insights/InsightsReport.tsx
similarity index 54%
rename from components/pages/reports/insights/InsightsReport.js
rename to src/app/(main)/reports/insights/InsightsReport.tsx
index 88f12304c..b90ff396d 100644
--- a/components/pages/reports/insights/InsightsReport.js
+++ b/src/app/(main)/reports/insights/InsightsReport.tsx
@@ -1,17 +1,19 @@
-import Report from '../Report';
-import ReportHeader from '../ReportHeader';
-import ReportMenu from '../ReportMenu';
-import ReportBody from '../ReportBody';
+'use client';
+import Report from '../[id]/Report';
+import ReportHeader from '../[id]/ReportHeader';
+import ReportMenu from '../[id]/ReportMenu';
+import ReportBody from '../[id]/ReportBody';
 import InsightsParameters from './InsightsParameters';
 import InsightsTable from './InsightsTable';
 import Lightbulb from 'assets/lightbulb.svg';
+import { REPORT_TYPES } from 'lib/constants';
 
 const defaultParameters = {
-  type: 'insights',
-  parameters: { fields: [], filters: [], groups: [] },
+  type: REPORT_TYPES.insights,
+  parameters: { fields: [], filters: [] },
 };
 
-export default function InsightsReport({ reportId }) {
+export default function InsightsReport({ reportId }: { reportId: string }) {
   return (
     <Report reportId={reportId} defaultParameters={defaultParameters}>
       <ReportHeader icon={<Lightbulb />} />
diff --git a/src/app/(main)/reports/insights/InsightsTable.tsx b/src/app/(main)/reports/insights/InsightsTable.tsx
new file mode 100644
index 000000000..a45176983
--- /dev/null
+++ b/src/app/(main)/reports/insights/InsightsTable.tsx
@@ -0,0 +1,49 @@
+import { useContext, useEffect, useState } from 'react';
+import { GridTable, GridColumn } from 'react-basics';
+import { useFormat, useMessages } from 'components/hooks';
+import { ReportContext } from '../[id]/Report';
+import EmptyPlaceholder from 'components/common/EmptyPlaceholder';
+
+export function InsightsTable() {
+  const [fields, setFields] = useState([]);
+  const { report } = useContext(ReportContext);
+  const { formatMessage, labels } = useMessages();
+  const { formatValue } = useFormat();
+
+  useEffect(
+    () => {
+      setFields(report?.parameters?.fields);
+    },
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [report?.data],
+  );
+
+  if (!fields || !report?.parameters) {
+    return <EmptyPlaceholder />;
+  }
+
+  return (
+    <GridTable data={report?.data || []}>
+      {fields.map(({ name, label }) => {
+        return (
+          <GridColumn key={name} name={name} label={label}>
+            {row => formatValue(row[name], name)}
+          </GridColumn>
+        );
+      })}
+      <GridColumn
+        name="visitors"
+        label={formatMessage(labels.visitors)}
+        width="100px"
+        alignment="end"
+      >
+        {row => row?.visitors?.toLocaleString()}
+      </GridColumn>
+      <GridColumn name="views" label={formatMessage(labels.views)} width="100px" alignment="end">
+        {row => row?.views?.toLocaleString()}
+      </GridColumn>
+    </GridTable>
+  );
+}
+
+export default InsightsTable;
diff --git a/src/app/(main)/reports/insights/page.tsx b/src/app/(main)/reports/insights/page.tsx
new file mode 100644
index 000000000..1f4db5c66
--- /dev/null
+++ b/src/app/(main)/reports/insights/page.tsx
@@ -0,0 +1,10 @@
+import InsightsReport from './InsightsReport';
+import { Metadata } from 'next';
+
+export default function InsightsReportPage() {
+  return <InsightsReport reportId={null} />;
+}
+
+export const metadata: Metadata = {
+  title: 'Insights Report | umami',
+};
diff --git a/src/app/(main)/reports/page.tsx b/src/app/(main)/reports/page.tsx
new file mode 100644
index 000000000..22e6e2a7c
--- /dev/null
+++ b/src/app/(main)/reports/page.tsx
@@ -0,0 +1,14 @@
+import ReportsHeader from './ReportsHeader';
+import ReportsDataTable from './ReportsDataTable';
+
+export default function () {
+  return (
+    <>
+      <ReportsHeader />
+      <ReportsDataTable />
+    </>
+  );
+}
+export const metadata = {
+  title: 'Reports | umami',
+};
diff --git a/src/app/(main)/reports/retention/RetentionParameters.tsx b/src/app/(main)/reports/retention/RetentionParameters.tsx
new file mode 100644
index 000000000..fc168695f
--- /dev/null
+++ b/src/app/(main)/reports/retention/RetentionParameters.tsx
@@ -0,0 +1,46 @@
+import { useContext } from 'react';
+import { useMessages } from 'components/hooks';
+import { Form, FormButtons, FormRow, SubmitButton } from 'react-basics';
+import { ReportContext } from '../[id]/Report';
+import { MonthSelect } from 'components/input/MonthSelect';
+import BaseParameters from '../[id]/BaseParameters';
+import { parseDateRange } from 'lib/date';
+
+export function RetentionParameters() {
+  const { report, runReport, isRunning, updateReport } = useContext(ReportContext);
+  const { formatMessage, labels } = useMessages();
+
+  const { parameters } = report || {};
+  const { websiteId, dateRange } = parameters || {};
+  const { startDate } = dateRange || {};
+  const queryDisabled = !websiteId || !dateRange;
+
+  const handleSubmit = (data: any, e: any) => {
+    e.stopPropagation();
+    e.preventDefault();
+
+    if (!queryDisabled) {
+      runReport(data);
+    }
+  };
+
+  const handleDateChange = value => {
+    updateReport({ parameters: { dateRange: { ...parseDateRange(value) } } });
+  };
+
+  return (
+    <Form values={parameters} onSubmit={handleSubmit} preventSubmit={true}>
+      <BaseParameters showDateSelect={false} />
+      <FormRow label={formatMessage(labels.date)}>
+        <MonthSelect date={startDate} onChange={handleDateChange} />
+      </FormRow>
+      <FormButtons>
+        <SubmitButton variant="primary" disabled={queryDisabled} isLoading={isRunning}>
+          {formatMessage(labels.runQuery)}
+        </SubmitButton>
+      </FormButtons>
+    </Form>
+  );
+}
+
+export default RetentionParameters;
diff --git a/src/app/(main)/reports/retention/RetentionReport.module.css b/src/app/(main)/reports/retention/RetentionReport.module.css
new file mode 100644
index 000000000..aed66b74e
--- /dev/null
+++ b/src/app/(main)/reports/retention/RetentionReport.module.css
@@ -0,0 +1,10 @@
+.filters {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  border: 1px solid var(--base400);
+  border-radius: var(--border-radius);
+  line-height: 32px;
+  padding: 10px;
+  overflow: hidden;
+}
diff --git a/src/app/(main)/reports/retention/RetentionReport.tsx b/src/app/(main)/reports/retention/RetentionReport.tsx
new file mode 100644
index 000000000..35f0fcb1e
--- /dev/null
+++ b/src/app/(main)/reports/retention/RetentionReport.tsx
@@ -0,0 +1,34 @@
+'use client';
+import RetentionTable from './RetentionTable';
+import RetentionParameters from './RetentionParameters';
+import Report from '../[id]/Report';
+import ReportHeader from '../[id]/ReportHeader';
+import ReportMenu from '../[id]/ReportMenu';
+import ReportBody from '../[id]/ReportBody';
+import Magnet from 'assets/magnet.svg';
+import { REPORT_TYPES } from 'lib/constants';
+import { parseDateRange } from 'lib/date';
+import { endOfMonth, startOfMonth } from 'date-fns';
+
+const defaultParameters = {
+  type: REPORT_TYPES.retention,
+  parameters: {
+    dateRange: parseDateRange(
+      `range:${startOfMonth(new Date()).getTime()}:${endOfMonth(new Date()).getTime()}`,
+    ),
+  },
+};
+
+export default function RetentionReport({ reportId }: { reportId: string }) {
+  return (
+    <Report reportId={reportId} defaultParameters={defaultParameters}>
+      <ReportHeader icon={<Magnet />} />
+      <ReportMenu>
+        <RetentionParameters />
+      </ReportMenu>
+      <ReportBody>
+        <RetentionTable />
+      </ReportBody>
+    </Report>
+  );
+}
diff --git a/src/app/(main)/reports/retention/RetentionTable.module.css b/src/app/(main)/reports/retention/RetentionTable.module.css
new file mode 100644
index 000000000..bfe3ac1c4
--- /dev/null
+++ b/src/app/(main)/reports/retention/RetentionTable.module.css
@@ -0,0 +1,52 @@
+.table {
+  display: flex;
+  flex-direction: column;
+}
+
+.header {
+  font-weight: 700;
+}
+
+.row {
+  display: flex;
+  flex-direction: row;
+  gap: 1px;
+  margin-bottom: 1px;
+}
+
+.cell {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 60px;
+  height: 60px;
+  background: var(--blue200);
+  border-radius: var(--border-radius);
+}
+
+.date {
+  display: flex;
+  align-items: center;
+  min-width: 160px;
+}
+
+.visitors {
+  display: flex;
+  align-items: center;
+  min-width: 80px;
+}
+
+.day {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 60px;
+  height: 60px;
+  text-align: center;
+  font-size: var(--font-size-sm);
+  font-weight: 400;
+}
+
+.empty {
+  background: var(--blue100);
+}
diff --git a/src/app/(main)/reports/retention/RetentionTable.tsx b/src/app/(main)/reports/retention/RetentionTable.tsx
new file mode 100644
index 000000000..d2e7f129e
--- /dev/null
+++ b/src/app/(main)/reports/retention/RetentionTable.tsx
@@ -0,0 +1,79 @@
+import { useContext } from 'react';
+import classNames from 'classnames';
+import { ReportContext } from '../[id]/Report';
+import EmptyPlaceholder from 'components/common/EmptyPlaceholder';
+import { useMessages, useLocale } from 'components/hooks';
+import { formatDate } from 'lib/date';
+import styles from './RetentionTable.module.css';
+
+const DAYS = [1, 2, 3, 4, 5, 6, 7, 14, 21, 28];
+
+export function RetentionTable({ days = DAYS }) {
+  const { formatMessage, labels } = useMessages();
+  const { locale } = useLocale();
+  const { report } = useContext(ReportContext);
+  const { data } = report || {};
+
+  if (!data) {
+    return <EmptyPlaceholder />;
+  }
+
+  const rows = data.reduce((arr: any[], row: { date: any; visitors: any; day: any }) => {
+    const { date, visitors, day } = row;
+    if (day === 0) {
+      return arr.concat({
+        date,
+        visitors,
+        records: days
+          .reduce((arr, day) => {
+            arr[day] = data.find(x => x.date === date && x.day === day);
+            return arr;
+          }, [])
+          .filter(n => n),
+      });
+    }
+    return arr;
+  }, []);
+
+  const totalDays = rows.length;
+
+  return (
+    <>
+      <div className={styles.table}>
+        <div className={classNames(styles.row, styles.header)}>
+          <div className={styles.date}>{formatMessage(labels.date)}</div>
+          <div className={styles.visitors}>{formatMessage(labels.visitors)}</div>
+          {days.map(n => (
+            <div key={n} className={styles.day}>
+              {formatMessage(labels.day)} {n}
+            </div>
+          ))}
+        </div>
+        {rows.map(({ date, visitors, records }, rowIndex) => {
+          return (
+            <div key={rowIndex} className={styles.row}>
+              <div className={styles.date}>{formatDate(`${date} 00:00:00`, 'PP', locale)}</div>
+              <div className={styles.visitors}>{visitors}</div>
+              {days.map(day => {
+                if (totalDays - rowIndex < day) {
+                  return null;
+                }
+                const percentage = records[day]?.percentage;
+                return (
+                  <div
+                    key={day}
+                    className={classNames(styles.cell, { [styles.empty]: !percentage })}
+                  >
+                    {percentage ? `${percentage.toFixed(2)}%` : ''}
+                  </div>
+                );
+              })}
+            </div>
+          );
+        })}
+      </div>
+    </>
+  );
+}
+
+export default RetentionTable;
diff --git a/src/app/(main)/reports/retention/page.js b/src/app/(main)/reports/retention/page.js
new file mode 100644
index 000000000..7c60cee8e
--- /dev/null
+++ b/src/app/(main)/reports/retention/page.js
@@ -0,0 +1,9 @@
+import RetentionReport from './RetentionReport';
+
+export default function RetentionReportPage() {
+  return <RetentionReport reportId={null} />;
+}
+
+export const metadata = {
+  title: 'Create Report | umami',
+};
diff --git a/src/app/(main)/settings/SettingsContext.tsx b/src/app/(main)/settings/SettingsContext.tsx
new file mode 100644
index 000000000..898a40cc0
--- /dev/null
+++ b/src/app/(main)/settings/SettingsContext.tsx
@@ -0,0 +1,5 @@
+import { createContext } from 'react';
+
+export const SettingsContext = createContext(null);
+
+export default SettingsContext;
diff --git a/src/app/(main)/settings/layout.module.css b/src/app/(main)/settings/layout.module.css
new file mode 100644
index 000000000..19162ef5b
--- /dev/null
+++ b/src/app/(main)/settings/layout.module.css
@@ -0,0 +1,31 @@
+.layout {
+  display: grid;
+  grid-template-columns: max-content 1fr;
+  gap: 20px;
+}
+
+.menu {
+  width: 240px;
+  padding-top: 34px;
+  padding-right: 20px;
+}
+
+.content {
+  display: flex;
+  flex-direction: column;
+  min-height: 50vh;
+}
+
+@media only screen and (max-width: 992px) {
+  .layout {
+    grid-template-columns: 1fr;
+  }
+
+  .menu {
+    display: none;
+  }
+
+  .content {
+    margin-top: 20px;
+  }
+}
diff --git a/components/layout/SettingsLayout.js b/src/app/(main)/settings/layout.tsx
similarity index 50%
rename from components/layout/SettingsLayout.js
rename to src/app/(main)/settings/layout.tsx
index c79f09092..e36b5b53d 100644
--- a/components/layout/SettingsLayout.js
+++ b/src/app/(main)/settings/layout.tsx
@@ -1,16 +1,15 @@
-import { Row, Column } from 'react-basics';
-import { useRouter } from 'next/router';
-import SideNav from './SideNav';
-import useUser from 'hooks/useUser';
-import useMessages from 'hooks/useMessages';
-import useConfig from 'hooks/useConfig';
-import styles from './SettingsLayout.module.css';
+'use client';
+import { usePathname } from 'next/navigation';
+import useUser from 'components/hooks/useUser';
+import useMessages from 'components/hooks/useMessages';
+import SideNav from 'components/layout/SideNav';
+import styles from './layout.module.css';
 
-export function SettingsLayout({ children }) {
+export default function SettingsLayout({ children }) {
   const { user } = useUser();
-  const { pathname } = useRouter();
+  const pathname = usePathname();
   const { formatMessage, labels } = useMessages();
-  const { cloudMode } = useConfig();
+  const cloudMode = !!process.env.cloudMode;
 
   const items = [
     { key: 'websites', label: formatMessage(labels.websites), url: '/settings/websites' },
@@ -21,18 +20,18 @@ export function SettingsLayout({ children }) {
 
   const getKey = () => items.find(({ url }) => pathname === url)?.key;
 
+  if (cloudMode && pathname !== '/settings/profile') {
+    return null;
+  }
+
   return (
-    <Row>
+    <div className={styles.layout}>
       {!cloudMode && (
-        <Column className={styles.menu} defaultSize={12} md={4} lg={3} xl={2}>
+        <div className={styles.menu}>
           <SideNav items={items} shallow={true} selectedKey={getKey()} />
-        </Column>
+        </div>
       )}
-      <Column className={styles.content} defaultSize={12} md={8} lg={9} xl={10}>
-        {children}
-      </Column>
-    </Row>
+      <div className={styles.content}>{children}</div>
+    </div>
   );
 }
-
-export default SettingsLayout;
diff --git a/components/pages/settings/profile/DateRangeSetting.js b/src/app/(main)/settings/profile/DateRangeSetting.tsx
similarity index 87%
rename from components/pages/settings/profile/DateRangeSetting.js
rename to src/app/(main)/settings/profile/DateRangeSetting.tsx
index 16db3c07a..85ad6d795 100644
--- a/components/pages/settings/profile/DateRangeSetting.js
+++ b/src/app/(main)/settings/profile/DateRangeSetting.tsx
@@ -1,8 +1,8 @@
 import DateFilter from 'components/input/DateFilter';
 import { Button, Flexbox } from 'react-basics';
-import useDateRange from 'hooks/useDateRange';
+import useDateRange from 'components/hooks/useDateRange';
 import { DEFAULT_DATE_RANGE } from 'lib/constants';
-import useMessages from 'hooks/useMessages';
+import useMessages from 'components/hooks/useMessages';
 
 export function DateRangeSetting() {
   const { formatMessage, labels } = useMessages();
diff --git a/components/pages/settings/profile/LanguageSetting.js b/src/app/(main)/settings/profile/LanguageSetting.tsx
similarity index 89%
rename from components/pages/settings/profile/LanguageSetting.js
rename to src/app/(main)/settings/profile/LanguageSetting.tsx
index a85e12a23..f1b196260 100644
--- a/components/pages/settings/profile/LanguageSetting.js
+++ b/src/app/(main)/settings/profile/LanguageSetting.tsx
@@ -1,8 +1,8 @@
 import { Button, Dropdown, Item, Flexbox } from 'react-basics';
-import useLocale from 'hooks/useLocale';
+import useLocale from 'components/hooks/useLocale';
 import { DEFAULT_LOCALE } from 'lib/constants';
 import { languages } from 'lib/lang';
-import useMessages from 'hooks/useMessages';
+import useMessages from 'components/hooks/useMessages';
 
 export function LanguageSetting() {
   const { formatMessage, labels } = useMessages();
diff --git a/components/pages/settings/profile/PasswordChangeButton.js b/src/app/(main)/settings/profile/PasswordChangeButton.tsx
similarity index 85%
rename from components/pages/settings/profile/PasswordChangeButton.js
rename to src/app/(main)/settings/profile/PasswordChangeButton.tsx
index 03bf74bc6..29ec844a3 100644
--- a/components/pages/settings/profile/PasswordChangeButton.js
+++ b/src/app/(main)/settings/profile/PasswordChangeButton.tsx
@@ -1,7 +1,7 @@
 import { Button, Icon, Text, useToasts, ModalTrigger, Modal } from 'react-basics';
-import PasswordEditForm from 'components/pages/settings/profile/PasswordEditForm';
+import PasswordEditForm from 'app/(main)/settings/profile/PasswordEditForm';
 import Icons from 'components/icons';
-import useMessages from 'hooks/useMessages';
+import useMessages from 'components/hooks/useMessages';
 
 export function PasswordChangeButton() {
   const { formatMessage, labels, messages } = useMessages();
diff --git a/components/pages/settings/profile/PasswordEditForm.js b/src/app/(main)/settings/profile/PasswordEditForm.tsx
similarity index 83%
rename from components/pages/settings/profile/PasswordEditForm.js
rename to src/app/(main)/settings/profile/PasswordEditForm.tsx
index 8e920471e..1384a9196 100644
--- a/components/pages/settings/profile/PasswordEditForm.js
+++ b/src/app/(main)/settings/profile/PasswordEditForm.tsx
@@ -1,15 +1,17 @@
 import { useRef } from 'react';
 import { Form, FormRow, FormInput, FormButtons, PasswordField, Button } from 'react-basics';
-import useApi from 'hooks/useApi';
-import useMessages from 'hooks/useMessages';
+import useApi from 'components/hooks/useApi';
+import useMessages from 'components/hooks/useMessages';
 
 export function PasswordEditForm({ onSave, onClose }) {
   const { formatMessage, labels, messages } = useMessages();
   const { post, useMutation } = useApi();
-  const { mutate, error, isLoading } = useMutation(data => post('/me/password', data));
+  const { mutate, error, isPending } = useMutation({
+    mutationFn: (data: any) => post('/me/password', data),
+  });
   const ref = useRef(null);
 
-  const handleSubmit = async data => {
+  const handleSubmit = async (data: any) => {
     mutate(data, {
       onSuccess: async () => {
         onSave();
@@ -18,7 +20,7 @@ export function PasswordEditForm({ onSave, onClose }) {
     });
   };
 
-  const samePassword = value => {
+  const samePassword = (value: string) => {
     if (value !== ref?.current?.getValues('newPassword')) {
       return formatMessage(messages.noMatchPassword);
     }
@@ -56,7 +58,7 @@ export function PasswordEditForm({ onSave, onClose }) {
         </FormInput>
       </FormRow>
       <FormButtons flex>
-        <Button type="submit" variant="primary" disabled={isLoading}>
+        <Button type="submit" variant="primary" disabled={isPending}>
           {formatMessage(labels.save)}
         </Button>
         <Button onClick={onClose}>{formatMessage(labels.cancel)}</Button>
diff --git a/src/app/(main)/settings/profile/ProfileHeader.tsx b/src/app/(main)/settings/profile/ProfileHeader.tsx
new file mode 100644
index 000000000..35aeb0e65
--- /dev/null
+++ b/src/app/(main)/settings/profile/ProfileHeader.tsx
@@ -0,0 +1,11 @@
+'use client';
+import PageHeader from 'components/layout/PageHeader';
+import { useMessages } from 'components/hooks';
+
+export function ProfileHeader() {
+  const { formatMessage, labels } = useMessages();
+
+  return <PageHeader title={formatMessage(labels.profile)}></PageHeader>;
+}
+
+export default ProfileHeader;
diff --git a/components/pages/settings/profile/ProfileDetails.js b/src/app/(main)/settings/profile/ProfileSettings.tsx
similarity index 72%
rename from components/pages/settings/profile/ProfileDetails.js
rename to src/app/(main)/settings/profile/ProfileSettings.tsx
index d1690220c..89c6354c7 100644
--- a/components/pages/settings/profile/ProfileDetails.js
+++ b/src/app/(main)/settings/profile/ProfileSettings.tsx
@@ -1,18 +1,18 @@
+'use client';
 import { Form, FormRow } from 'react-basics';
-import TimezoneSetting from 'components/pages/settings/profile/TimezoneSetting';
-import DateRangeSetting from 'components/pages/settings/profile/DateRangeSetting';
-import LanguageSetting from 'components/pages/settings/profile/LanguageSetting';
-import ThemeSetting from 'components/pages/settings/profile/ThemeSetting';
+import TimezoneSetting from 'app/(main)/settings/profile/TimezoneSetting';
+import DateRangeSetting from 'app/(main)/settings/profile/DateRangeSetting';
+import LanguageSetting from 'app/(main)/settings/profile/LanguageSetting';
+import ThemeSetting from 'app/(main)/settings/profile/ThemeSetting';
 import PasswordChangeButton from './PasswordChangeButton';
-import useUser from 'hooks/useUser';
-import useMessages from 'hooks/useMessages';
-import useConfig from 'hooks/useConfig';
+import useUser from 'components/hooks/useUser';
+import useMessages from 'components/hooks/useMessages';
 import { ROLES } from 'lib/constants';
 
-export function ProfileDetails() {
+export function ProfileSettings() {
   const { user } = useUser();
   const { formatMessage, labels } = useMessages();
-  const { cloudMode } = useConfig();
+  const cloudMode = Boolean(process.env.cloudMode);
 
   if (!user) {
     return null;
@@ -59,4 +59,4 @@ export function ProfileDetails() {
   );
 }
 
-export default ProfileDetails;
+export default ProfileSettings;
diff --git a/components/pages/settings/profile/ThemeSetting.module.css b/src/app/(main)/settings/profile/ThemeSetting.module.css
similarity index 100%
rename from components/pages/settings/profile/ThemeSetting.module.css
rename to src/app/(main)/settings/profile/ThemeSetting.module.css
diff --git a/components/pages/settings/profile/ThemeSetting.js b/src/app/(main)/settings/profile/ThemeSetting.tsx
similarity index 93%
rename from components/pages/settings/profile/ThemeSetting.js
rename to src/app/(main)/settings/profile/ThemeSetting.tsx
index 54a8dac8b..aa3a67a21 100644
--- a/components/pages/settings/profile/ThemeSetting.js
+++ b/src/app/(main)/settings/profile/ThemeSetting.tsx
@@ -1,6 +1,6 @@
 import classNames from 'classnames';
 import { Button, Icon } from 'react-basics';
-import useTheme from 'hooks/useTheme';
+import useTheme from 'components/hooks/useTheme';
 import Sun from 'assets/sun.svg';
 import Moon from 'assets/moon.svg';
 import styles from './ThemeSetting.module.css';
diff --git a/components/pages/settings/profile/TimezoneSetting.js b/src/app/(main)/settings/profile/TimezoneSetting.tsx
similarity index 87%
rename from components/pages/settings/profile/TimezoneSetting.js
rename to src/app/(main)/settings/profile/TimezoneSetting.tsx
index 5976f3932..fc3180819 100644
--- a/components/pages/settings/profile/TimezoneSetting.js
+++ b/src/app/(main)/settings/profile/TimezoneSetting.tsx
@@ -1,7 +1,7 @@
 import { Dropdown, Item, Button, Flexbox } from 'react-basics';
 import { listTimeZones } from 'timezone-support';
-import useTimezone from 'hooks/useTimezone';
-import useMessages from 'hooks/useMessages';
+import useTimezone from 'components/hooks/useTimezone';
+import useMessages from 'components/hooks/useMessages';
 import { getTimezone } from 'lib/date';
 
 export function TimezoneSetting() {
diff --git a/src/app/(main)/settings/profile/page.tsx b/src/app/(main)/settings/profile/page.tsx
new file mode 100644
index 000000000..d7a3ad92d
--- /dev/null
+++ b/src/app/(main)/settings/profile/page.tsx
@@ -0,0 +1,16 @@
+import ProfileHeader from './ProfileHeader';
+import ProfileSettings from './ProfileSettings';
+import { Metadata } from 'next';
+
+export default function () {
+  return (
+    <>
+      <ProfileHeader />
+      <ProfileSettings />
+    </>
+  );
+}
+
+export const metadata: Metadata = {
+  title: 'Profile Settings | umami',
+};
diff --git a/components/pages/settings/teams/TeamAddForm.js b/src/app/(main)/settings/teams/TeamAddForm.tsx
similarity index 56%
rename from components/pages/settings/teams/TeamAddForm.js
rename to src/app/(main)/settings/teams/TeamAddForm.tsx
index 8ac361172..5a242cb90 100644
--- a/components/pages/settings/teams/TeamAddForm.js
+++ b/src/app/(main)/settings/teams/TeamAddForm.tsx
@@ -1,4 +1,3 @@
-import { useRef } from 'react';
 import {
   Form,
   FormRow,
@@ -8,36 +7,39 @@ import {
   Button,
   SubmitButton,
 } from 'react-basics';
-import useApi from 'hooks/useApi';
-import useMessages from 'hooks/useMessages';
+import { setValue } from 'store/cache';
+import useApi from 'components/hooks/useApi';
+import useMessages from 'components/hooks/useMessages';
 
-export function TeamAddForm({ onSave, onClose }) {
+export function TeamAddForm({ onSave, onClose }: { onSave: () => void; onClose: () => void }) {
   const { formatMessage, labels } = useMessages();
   const { post, useMutation } = useApi();
-  const { mutate, error, isLoading } = useMutation(data => post('/teams', data));
-  const ref = useRef(null);
+  const { mutate, error, isPending } = useMutation({
+    mutationFn: (data: any) => post('/teams', data),
+  });
 
   const handleSubmit = async data => {
     mutate(data, {
       onSuccess: async () => {
-        onSave();
-        onClose();
+        setValue('teams', Date.now());
+        onSave?.();
+        onClose?.();
       },
     });
   };
 
   return (
-    <Form ref={ref} onSubmit={handleSubmit} error={error}>
+    <Form onSubmit={handleSubmit} error={error}>
       <FormRow label={formatMessage(labels.name)}>
         <FormInput name="name" rules={{ required: formatMessage(labels.required) }}>
           <TextField autoComplete="off" />
         </FormInput>
       </FormRow>
       <FormButtons flex>
-        <SubmitButton variant="primary" disabled={isLoading}>
+        <SubmitButton variant="primary" disabled={isPending}>
           {formatMessage(labels.save)}
         </SubmitButton>
-        <Button disabled={isLoading} onClick={onClose}>
+        <Button disabled={isPending} onClick={onClose}>
           {formatMessage(labels.cancel)}
         </Button>
       </FormButtons>
diff --git a/src/app/(main)/settings/teams/TeamDeleteButton.tsx b/src/app/(main)/settings/teams/TeamDeleteButton.tsx
new file mode 100644
index 000000000..36a1a1f83
--- /dev/null
+++ b/src/app/(main)/settings/teams/TeamDeleteButton.tsx
@@ -0,0 +1,33 @@
+import { Button, Icon, Icons, Modal, ModalTrigger, Text } from 'react-basics';
+import useMessages from 'components/hooks/useMessages';
+import TeamDeleteForm from './TeamDeleteForm';
+
+export function TeamDeleteButton({
+  teamId,
+  teamName,
+  onDelete,
+}: {
+  teamId: string;
+  teamName: string;
+  onDelete?: () => void;
+}) {
+  const { formatMessage, labels } = useMessages();
+
+  return (
+    <ModalTrigger>
+      <Button>
+        <Icon>
+          <Icons.Trash />
+        </Icon>
+        <Text>{formatMessage(labels.delete)}</Text>
+      </Button>
+      <Modal title={formatMessage(labels.deleteTeam)}>
+        {(close: any) => (
+          <TeamDeleteForm teamId={teamId} teamName={teamName} onSave={onDelete} onClose={close} />
+        )}
+      </Modal>
+    </ModalTrigger>
+  );
+}
+
+export default TeamDeleteButton;
diff --git a/components/pages/settings/teams/TeamDeleteForm.js b/src/app/(main)/settings/teams/TeamDeleteForm.tsx
similarity index 55%
rename from components/pages/settings/teams/TeamDeleteForm.js
rename to src/app/(main)/settings/teams/TeamDeleteForm.tsx
index 4261aff17..00eedb178 100644
--- a/components/pages/settings/teams/TeamDeleteForm.js
+++ b/src/app/(main)/settings/teams/TeamDeleteForm.tsx
@@ -1,17 +1,31 @@
 import { Button, Form, FormButtons, SubmitButton } from 'react-basics';
-import useApi from 'hooks/useApi';
-import useMessages from 'hooks/useMessages';
+import useApi from 'components/hooks/useApi';
+import useMessages from 'components/hooks/useMessages';
+import { setValue } from 'store/cache';
 
-export function TeamDeleteForm({ teamId, teamName, onSave, onClose }) {
+export function TeamDeleteForm({
+  teamId,
+  teamName,
+  onSave,
+  onClose,
+}: {
+  teamId: string;
+  teamName: string;
+  onSave: () => void;
+  onClose: () => void;
+}) {
   const { formatMessage, labels, messages, FormattedMessage } = useMessages();
   const { del, useMutation } = useApi();
-  const { mutate, error, isLoading } = useMutation(data => del(`/teams/${teamId}`, data));
+  const { mutate, error, isPending } = useMutation({
+    mutationFn: (data: any) => del(`/teams/${teamId}`, data),
+  });
 
   const handleSubmit = async data => {
     mutate(data, {
       onSuccess: async () => {
-        onSave();
-        onClose();
+        setValue('teams', Date.now());
+        onSave?.();
+        onClose?.();
       },
     });
   };
@@ -22,7 +36,7 @@ export function TeamDeleteForm({ teamId, teamName, onSave, onClose }) {
         <FormattedMessage {...messages.confirmDelete} values={{ target: <b>{teamName}</b> }} />
       </p>
       <FormButtons flex>
-        <SubmitButton variant="danger" disabled={isLoading}>
+        <SubmitButton variant="danger" disabled={isPending}>
           {formatMessage(labels.delete)}
         </SubmitButton>
         <Button onClick={onClose}>{formatMessage(labels.cancel)}</Button>
diff --git a/components/pages/settings/teams/TeamJoinForm.js b/src/app/(main)/settings/teams/TeamJoinForm.tsx
similarity index 69%
rename from components/pages/settings/teams/TeamJoinForm.js
rename to src/app/(main)/settings/teams/TeamJoinForm.tsx
index 34153aa1a..5cd382256 100644
--- a/components/pages/settings/teams/TeamJoinForm.js
+++ b/src/app/(main)/settings/teams/TeamJoinForm.tsx
@@ -8,20 +8,22 @@ import {
   Button,
   SubmitButton,
 } from 'react-basics';
-import useApi from 'hooks/useApi';
-import useMessages from 'hooks/useMessages';
+import useApi from 'components/hooks/useApi';
+import useMessages from 'components/hooks/useMessages';
+import { setValue } from 'store/cache';
 
-export function TeamJoinForm({ onSave, onClose }) {
+export function TeamJoinForm({ onSave, onClose }: { onSave: () => void; onClose: () => void }) {
   const { formatMessage, labels, getMessage } = useMessages();
   const { post, useMutation } = useApi();
-  const { mutate, error } = useMutation(data => post('/teams/join', data));
+  const { mutate, error } = useMutation({ mutationFn: (data: any) => post('/teams/join', data) });
   const ref = useRef(null);
 
   const handleSubmit = async data => {
     mutate(data, {
       onSuccess: async () => {
-        onSave();
-        onClose();
+        setValue('teams:members', Date.now());
+        onSave?.();
+        onClose?.();
       },
     });
   };
diff --git a/src/app/(main)/settings/teams/TeamLeaveButton.tsx b/src/app/(main)/settings/teams/TeamLeaveButton.tsx
new file mode 100644
index 000000000..97676e176
--- /dev/null
+++ b/src/app/(main)/settings/teams/TeamLeaveButton.tsx
@@ -0,0 +1,43 @@
+import { Button, Icon, Icons, Modal, ModalTrigger, Text } from 'react-basics';
+import useMessages from 'components/hooks/useMessages';
+import useLocale from 'components/hooks/useLocale';
+import useUser from 'components/hooks/useUser';
+import TeamDeleteForm from './TeamLeaveForm';
+
+export function TeamLeaveButton({
+  teamId,
+  teamName,
+  onLeave,
+}: {
+  teamId: string;
+  teamName: string;
+  onLeave?: () => void;
+}) {
+  const { formatMessage, labels } = useMessages();
+  const { dir } = useLocale();
+  const { user } = useUser();
+
+  return (
+    <ModalTrigger>
+      <Button>
+        <Icon rotate={dir === 'rtl' ? 180 : 0}>
+          <Icons.Logout />
+        </Icon>
+        <Text>{formatMessage(labels.leave)}</Text>
+      </Button>
+      <Modal title={formatMessage(labels.leaveTeam)}>
+        {close => (
+          <TeamDeleteForm
+            teamId={teamId}
+            userId={user.id}
+            teamName={teamName}
+            onSave={onLeave}
+            onClose={close}
+          />
+        )}
+      </Modal>
+    </ModalTrigger>
+  );
+}
+
+export default TeamLeaveButton;
diff --git a/src/app/(main)/settings/teams/TeamLeaveForm.tsx b/src/app/(main)/settings/teams/TeamLeaveForm.tsx
new file mode 100644
index 000000000..3b4d4703c
--- /dev/null
+++ b/src/app/(main)/settings/teams/TeamLeaveForm.tsx
@@ -0,0 +1,50 @@
+import { Button, Form, FormButtons, SubmitButton } from 'react-basics';
+import useApi from 'components/hooks/useApi';
+import useMessages from 'components/hooks/useMessages';
+import { setValue } from 'store/cache';
+
+export function TeamLeaveForm({
+  teamId,
+  userId,
+  teamName,
+  onSave,
+  onClose,
+}: {
+  teamId: string;
+  userId: string;
+  teamName: string;
+  onSave: () => void;
+  onClose: () => void;
+}) {
+  const { formatMessage, labels, messages, FormattedMessage } = useMessages();
+  const { del, useMutation } = useApi();
+  const { mutate, error, isPending } = useMutation({
+    mutationFn: () => del(`/teams/${teamId}/users/${userId}`),
+  });
+
+  const handleSubmit = async () => {
+    mutate(null, {
+      onSuccess: async () => {
+        setValue('team:members', Date.now());
+        onSave();
+        onClose();
+      },
+    });
+  };
+
+  return (
+    <Form onSubmit={handleSubmit} error={error}>
+      <p>
+        <FormattedMessage {...messages.confirmDelete} values={{ target: <b>{teamName}</b> }} />
+      </p>
+      <FormButtons flex>
+        <SubmitButton variant="danger" disabled={isPending}>
+          {formatMessage(labels.leave)}
+        </SubmitButton>
+        <Button onClick={onClose}>{formatMessage(labels.cancel)}</Button>
+      </FormButtons>
+    </Form>
+  );
+}
+
+export default TeamLeaveForm;
diff --git a/src/app/(main)/settings/teams/TeamsAddButton.tsx b/src/app/(main)/settings/teams/TeamsAddButton.tsx
new file mode 100644
index 000000000..09f9ecbbf
--- /dev/null
+++ b/src/app/(main)/settings/teams/TeamsAddButton.tsx
@@ -0,0 +1,24 @@
+import { Button, Icon, Modal, ModalTrigger, Text } from 'react-basics';
+import Icons from 'components/icons';
+import useMessages from 'components/hooks/useMessages';
+import TeamAddForm from './TeamAddForm';
+
+export function TeamsAddButton({ onAdd }: { onAdd?: () => void }) {
+  const { formatMessage, labels } = useMessages();
+
+  return (
+    <ModalTrigger>
+      <Button variant="primary">
+        <Icon>
+          <Icons.Plus />
+        </Icon>
+        <Text>{formatMessage(labels.createTeam)}</Text>
+      </Button>
+      <Modal title={formatMessage(labels.createTeam)}>
+        {(close: () => void) => <TeamAddForm onSave={onAdd} onClose={close} />}
+      </Modal>
+    </ModalTrigger>
+  );
+}
+
+export default TeamsAddButton;
diff --git a/src/app/(main)/settings/teams/TeamsDataTable.tsx b/src/app/(main)/settings/teams/TeamsDataTable.tsx
new file mode 100644
index 000000000..2424e464e
--- /dev/null
+++ b/src/app/(main)/settings/teams/TeamsDataTable.tsx
@@ -0,0 +1,29 @@
+'use client';
+import DataTable from 'components/common/DataTable';
+import TeamsTable from 'app/(main)/settings/teams/TeamsTable';
+import useApi from 'components/hooks/useApi';
+import useFilterQuery from 'components/hooks/useFilterQuery';
+import useCache from 'store/cache';
+
+export function TeamsDataTable() {
+  const { get } = useApi();
+  const modified = useCache((state: any) => state?.teams);
+  const queryResult = useFilterQuery({
+    queryKey: ['teams', { modified }],
+    queryFn: (params: any) => {
+      return get(`/teams`, {
+        ...params,
+      });
+    },
+  });
+
+  return (
+    <DataTable queryResult={queryResult}>
+      {({ data }) => {
+        return <TeamsTable data={data} />;
+      }}
+    </DataTable>
+  );
+}
+
+export default TeamsDataTable;
diff --git a/src/app/(main)/settings/teams/TeamsHeader.tsx b/src/app/(main)/settings/teams/TeamsHeader.tsx
new file mode 100644
index 000000000..444f87030
--- /dev/null
+++ b/src/app/(main)/settings/teams/TeamsHeader.tsx
@@ -0,0 +1,24 @@
+'use client';
+import { Flexbox } from 'react-basics';
+import PageHeader from 'components/layout/PageHeader';
+import { ROLES } from 'lib/constants';
+import useUser from 'components/hooks/useUser';
+import useMessages from 'components/hooks/useMessages';
+import TeamsJoinButton from './TeamsJoinButton';
+import TeamsAddButton from './TeamsAddButton';
+
+export function TeamsHeader() {
+  const { formatMessage, labels } = useMessages();
+  const { user } = useUser();
+
+  return (
+    <PageHeader title={formatMessage(labels.teams)}>
+      <Flexbox gap={10}>
+        <TeamsJoinButton />
+        {user.role !== ROLES.viewOnly && <TeamsAddButton />}
+      </Flexbox>
+    </PageHeader>
+  );
+}
+
+export default TeamsHeader;
diff --git a/src/app/(main)/settings/teams/TeamsJoinButton.tsx b/src/app/(main)/settings/teams/TeamsJoinButton.tsx
new file mode 100644
index 000000000..f8d2fa238
--- /dev/null
+++ b/src/app/(main)/settings/teams/TeamsJoinButton.tsx
@@ -0,0 +1,29 @@
+import { Button, Icon, Modal, ModalTrigger, Text, useToasts } from 'react-basics';
+import Icons from 'components/icons';
+import useMessages from 'components/hooks/useMessages';
+import TeamJoinForm from './TeamJoinForm';
+
+export function TeamsJoinButton() {
+  const { formatMessage, labels, messages } = useMessages();
+  const { showToast } = useToasts();
+
+  const handleJoin = () => {
+    showToast({ message: formatMessage(messages.saved), variant: 'success' });
+  };
+
+  return (
+    <ModalTrigger>
+      <Button variant="secondary">
+        <Icon>
+          <Icons.AddUser />
+        </Icon>
+        <Text>{formatMessage(labels.joinTeam)}</Text>
+      </Button>
+      <Modal title={formatMessage(labels.joinTeam)}>
+        {close => <TeamJoinForm onSave={handleJoin} onClose={close} />}
+      </Modal>
+    </ModalTrigger>
+  );
+}
+
+export default TeamsJoinButton;
diff --git a/src/app/(main)/settings/teams/TeamsTable.tsx b/src/app/(main)/settings/teams/TeamsTable.tsx
new file mode 100644
index 000000000..70a7bebbd
--- /dev/null
+++ b/src/app/(main)/settings/teams/TeamsTable.tsx
@@ -0,0 +1,47 @@
+'use client';
+import useMessages from 'components/hooks/useMessages';
+import useUser from 'components/hooks/useUser';
+import { ROLES } from 'lib/constants';
+import Link from 'next/link';
+import { Button, GridColumn, GridTable, Icon, Icons, Text, useBreakpoint } from 'react-basics';
+import TeamDeleteButton from './TeamDeleteButton';
+import TeamLeaveButton from './TeamLeaveButton';
+
+export function TeamsTable({ data = [] }: { data: any[] }) {
+  const { formatMessage, labels } = useMessages();
+  const { user } = useUser();
+  const breakpoint = useBreakpoint();
+
+  return (
+    <GridTable data={data} cardMode={['xs', 'sm', 'md'].includes(breakpoint)}>
+      <GridColumn name="name" label={formatMessage(labels.name)} />
+      <GridColumn name="owner" label={formatMessage(labels.owner)}>
+        {row => row.teamUser.find(({ role }) => role === ROLES.teamOwner)?.user?.username}
+      </GridColumn>
+      <GridColumn name="action" label=" " alignment="end">
+        {row => {
+          const { id, name, teamUser } = row;
+          const owner = teamUser.find(({ role }) => role === ROLES.teamOwner);
+          const isOwner = user.id === owner?.userId;
+
+          return (
+            <>
+              {isOwner && <TeamDeleteButton teamId={id} teamName={name} />}
+              {!isOwner && <TeamLeaveButton teamId={id} teamName={name} />}
+              <Link href={`/settings/teams/${id}`}>
+                <Button>
+                  <Icon>
+                    <Icons.Edit />
+                  </Icon>
+                  <Text>{formatMessage(isOwner ? labels.edit : labels.view)}</Text>
+                </Button>
+              </Link>
+            </>
+          );
+        }}
+      </GridColumn>
+    </GridTable>
+  );
+}
+
+export default TeamsTable;
diff --git a/components/pages/settings/teams/WebsiteTags.module.css b/src/app/(main)/settings/teams/WebsiteTags.module.css
similarity index 100%
rename from components/pages/settings/teams/WebsiteTags.module.css
rename to src/app/(main)/settings/teams/WebsiteTags.module.css
diff --git a/components/pages/settings/teams/WebsiteTags.js b/src/app/(main)/settings/teams/WebsiteTags.tsx
similarity index 83%
rename from components/pages/settings/teams/WebsiteTags.js
rename to src/app/(main)/settings/teams/WebsiteTags.tsx
index c17d5763d..4a0f109d8 100644
--- a/components/pages/settings/teams/WebsiteTags.js
+++ b/src/app/(main)/settings/teams/WebsiteTags.tsx
@@ -1,7 +1,15 @@
 import { Button, Icon, Icons, Text } from 'react-basics';
 import styles from './WebsiteTags.module.css';
 
-export function WebsiteTags({ items = [], websites = [], onClick }) {
+export function WebsiteTags({
+  items = [],
+  websites = [],
+  onClick,
+}: {
+  items: any[];
+  websites: any[];
+  onClick: (e: Event) => void;
+}) {
   if (websites.length === 0) {
     return null;
   }
diff --git a/components/pages/settings/teams/TeamEditForm.js b/src/app/(main)/settings/teams/[id]/TeamEditForm.tsx
similarity index 86%
rename from components/pages/settings/teams/TeamEditForm.js
rename to src/app/(main)/settings/teams/[id]/TeamEditForm.tsx
index faeb4e7c5..420afe9bb 100644
--- a/components/pages/settings/teams/TeamEditForm.js
+++ b/src/app/(main)/settings/teams/[id]/TeamEditForm.tsx
@@ -10,23 +10,25 @@ import {
 } from 'react-basics';
 import { getRandomChars } from 'next-basics';
 import { useRef, useState } from 'react';
-import useApi from 'hooks/useApi';
-import useMessages from 'hooks/useMessages';
+import useApi from 'components/hooks/useApi';
+import useMessages from 'components/hooks/useMessages';
 
 const generateId = () => getRandomChars(16);
 
 export function TeamEditForm({ teamId, data, onSave, readOnly }) {
   const { formatMessage, labels } = useMessages();
   const { post, useMutation } = useApi();
-  const { mutate, error } = useMutation(data => post(`/teams/${teamId}`, data));
+  const { mutate, error } = useMutation({
+    mutationFn: (data: any) => post(`/teams/${teamId}`, data),
+  });
   const ref = useRef(null);
   const [accessCode, setAccessCode] = useState(data.accessCode);
 
-  const handleSubmit = async data => {
+  const handleSubmit = async (data: any) => {
     mutate(data, {
       onSuccess: async () => {
         ref.current.reset(data);
-        onSave(data);
+        onSave?.(data);
       },
     });
   };
diff --git a/src/app/(main)/settings/teams/[id]/TeamMemberRemoveButton.tsx b/src/app/(main)/settings/teams/[id]/TeamMemberRemoveButton.tsx
new file mode 100644
index 000000000..cef2977ef
--- /dev/null
+++ b/src/app/(main)/settings/teams/[id]/TeamMemberRemoveButton.tsx
@@ -0,0 +1,46 @@
+import useApi from 'components/hooks/useApi';
+import useMessages from 'components/hooks/useMessages';
+import { Icon, Icons, LoadingButton, Text } from 'react-basics';
+import { setValue } from 'store/cache';
+
+export function TeamMemberRemoveButton({
+  teamId,
+  userId,
+  disabled,
+  onSave,
+}: {
+  teamId: string;
+  userId: string;
+  disabled?: boolean;
+  onSave?: () => void;
+}) {
+  const { formatMessage, labels } = useMessages();
+  const { del, useMutation } = useApi();
+  const { mutate, isPending } = useMutation({
+    mutationFn: () => del(`/teams/${teamId}/users/${userId}`),
+  });
+
+  const handleRemoveTeamMember = () => {
+    mutate(null, {
+      onSuccess: () => {
+        setValue('team:members', Date.now());
+        onSave?.();
+      },
+    });
+  };
+
+  return (
+    <LoadingButton
+      onClick={() => handleRemoveTeamMember()}
+      disabled={disabled}
+      isLoading={isPending}
+    >
+      <Icon>
+        <Icons.Close />
+      </Icon>
+      <Text>{formatMessage(labels.remove)}</Text>
+    </LoadingButton>
+  );
+}
+
+export default TeamMemberRemoveButton;
diff --git a/src/app/(main)/settings/teams/[id]/TeamMembers.tsx b/src/app/(main)/settings/teams/[id]/TeamMembers.tsx
new file mode 100644
index 000000000..588a5a52b
--- /dev/null
+++ b/src/app/(main)/settings/teams/[id]/TeamMembers.tsx
@@ -0,0 +1,29 @@
+import useApi from 'components/hooks/useApi';
+import TeamMembersTable from './TeamMembersTable';
+import useFilterQuery from 'components/hooks/useFilterQuery';
+import DataTable from 'components/common/DataTable';
+import useCache from 'store/cache';
+
+export function TeamMembers({ teamId, readOnly }: { teamId: string; readOnly: boolean }) {
+  const { get } = useApi();
+  const modified = useCache(state => state?.['team:members']);
+  const queryResult = useFilterQuery({
+    queryKey: ['team:members', { teamId, modified }],
+    queryFn: params => {
+      return get(`/teams/${teamId}/users`, {
+        ...params,
+      });
+    },
+    enabled: !!teamId,
+  });
+
+  return (
+    <>
+      <DataTable queryResult={queryResult}>
+        {({ data }) => <TeamMembersTable data={data} teamId={teamId} readOnly={readOnly} />}
+      </DataTable>
+    </>
+  );
+}
+
+export default TeamMembers;
diff --git a/src/app/(main)/settings/teams/[id]/TeamMembersTable.tsx b/src/app/(main)/settings/teams/[id]/TeamMembersTable.tsx
new file mode 100644
index 000000000..a08c746bb
--- /dev/null
+++ b/src/app/(main)/settings/teams/[id]/TeamMembersTable.tsx
@@ -0,0 +1,44 @@
+import { GridColumn, GridTable, useBreakpoint } from 'react-basics';
+import useMessages from 'components/hooks/useMessages';
+import useUser from 'components/hooks/useUser';
+import { ROLES } from 'lib/constants';
+import TeamMemberRemoveButton from './TeamMemberRemoveButton';
+
+export function TeamMembersTable({
+  data = [],
+  teamId,
+  readOnly,
+}: {
+  data: any[];
+  teamId: string;
+  readOnly: boolean;
+}) {
+  const { formatMessage, labels } = useMessages();
+  const { user } = useUser();
+  const breakpoint = useBreakpoint();
+
+  const roles = {
+    [ROLES.teamOwner]: formatMessage(labels.teamOwner),
+    [ROLES.teamMember]: formatMessage(labels.teamMember),
+  };
+
+  return (
+    <GridTable data={data} cardMode={['xs', 'sm', 'md'].includes(breakpoint)}>
+      <GridColumn name="username" label={formatMessage(labels.username)} />
+      <GridColumn name="role" label={formatMessage(labels.role)}>
+        {row => roles[row?.teamUser?.[0]?.role]}
+      </GridColumn>
+      <GridColumn name="action" label=" " alignment="end">
+        {row => {
+          return (
+            !readOnly &&
+            row?.teamUser?.[0]?.role !== ROLES.teamOwner &&
+            user?.id !== row?.id && <TeamMemberRemoveButton teamId={teamId} userId={row.id} />
+          );
+        }}
+      </GridColumn>
+    </GridTable>
+  );
+}
+
+export default TeamMembersTable;
diff --git a/components/pages/settings/teams/TeamSettings.js b/src/app/(main)/settings/teams/[id]/TeamSettings.tsx
similarity index 65%
rename from components/pages/settings/teams/TeamSettings.js
rename to src/app/(main)/settings/teams/[id]/TeamSettings.tsx
index 64160578d..cf5ae35cb 100644
--- a/components/pages/settings/teams/TeamSettings.js
+++ b/src/app/(main)/settings/teams/[id]/TeamSettings.tsx
@@ -1,32 +1,31 @@
+'use client';
 import { useEffect, useState } from 'react';
-import { Breadcrumbs, Item, Tabs, useToasts } from 'react-basics';
-import Link from 'next/link';
-import Page from 'components/layout/Page';
+import { Item, Loading, Tabs, useToasts, Flexbox } from 'react-basics';
 import PageHeader from 'components/layout/PageHeader';
 import { ROLES } from 'lib/constants';
-import useUser from 'hooks/useUser';
-import useApi from 'hooks/useApi';
-import useMessages from 'hooks/useMessages';
+import useUser from 'components/hooks/useUser';
+import useApi from 'components/hooks/useApi';
+import useMessages from 'components/hooks/useMessages';
 import TeamEditForm from './TeamEditForm';
 import TeamMembers from './TeamMembers';
 import TeamWebsites from './TeamWebsites';
 
-export function TeamSettings({ teamId }) {
+export function TeamSettings({ teamId }: { teamId: string }) {
   const { formatMessage, labels, messages } = useMessages();
   const { user } = useUser();
   const [values, setValues] = useState(null);
   const [tab, setTab] = useState('details');
   const { get, useQuery } = useApi();
   const { showToast } = useToasts();
-  const { data, isLoading } = useQuery(
-    ['team', teamId],
-    () => {
+  const { data, isLoading } = useQuery({
+    queryKey: ['team', teamId],
+    queryFn: () => {
       if (teamId) {
         return get(`/teams/${teamId}`);
       }
     },
-    { cacheTime: 0 },
-  );
+    gcTime: 0,
+  });
   const canEdit = data?.teamUser?.find(
     ({ userId, role }) => role === ROLES.teamOwner && userId === user.id,
   );
@@ -42,19 +41,14 @@ export function TeamSettings({ teamId }) {
     }
   }, [data]);
 
+  if (isLoading || !values) {
+    return <Loading />;
+  }
+
   return (
-    <Page loading={isLoading || !values}>
-      <PageHeader
-        title={
-          <Breadcrumbs>
-            <Item>
-              <Link href="/settings/teams">{formatMessage(labels.teams)}</Link>
-            </Item>
-            <Item>{values?.name}</Item>
-          </Breadcrumbs>
-        }
-      />
-      <Tabs selectedKey={tab} onSelect={setTab} style={{ marginBottom: 30 }}>
+    <Flexbox direction="column">
+      <PageHeader title={values?.name} />
+      <Tabs selectedKey={tab} onSelect={(value: any) => setTab(value)} style={{ marginBottom: 30 }}>
         <Item key="details">{formatMessage(labels.details)}</Item>
         <Item key="members">{formatMessage(labels.members)}</Item>
         <Item key="websites">{formatMessage(labels.websites)}</Item>
@@ -64,7 +58,7 @@ export function TeamSettings({ teamId }) {
       )}
       {tab === 'members' && <TeamMembers teamId={teamId} readOnly={!canEdit} />}
       {tab === 'websites' && <TeamWebsites teamId={teamId} readOnly={!canEdit} />}
-    </Page>
+    </Flexbox>
   );
 }
 
diff --git a/src/app/(main)/settings/teams/[id]/TeamWebsiteAddForm.tsx b/src/app/(main)/settings/teams/[id]/TeamWebsiteAddForm.tsx
new file mode 100644
index 000000000..64a0c58e4
--- /dev/null
+++ b/src/app/(main)/settings/teams/[id]/TeamWebsiteAddForm.tsx
@@ -0,0 +1,79 @@
+import useApi from 'components/hooks/useApi';
+import { useState } from 'react';
+import { Button, Form, FormButtons, GridColumn, Loading, SubmitButton, Toggle } from 'react-basics';
+import useMessages from 'components/hooks/useMessages';
+import WebsitesDataTable from 'app/(main)/settings/websites/WebsitesDataTable';
+import Empty from 'components/common/Empty';
+import { setValue } from 'store/cache';
+import { useUser } from 'components/hooks';
+
+export function TeamWebsiteAddForm({
+  teamId,
+  onSave,
+  onClose,
+}: {
+  teamId: string;
+  onSave: () => void;
+  onClose: () => void;
+}) {
+  const { user } = useUser();
+  const { formatMessage, labels } = useMessages();
+  const { get, post, useQuery, useMutation } = useApi();
+  const { mutate, error } = useMutation({
+    mutationFn: (data: any) => post(`/teams/${teamId}/websites`, data),
+  });
+  const { data: websites, isLoading } = useQuery({
+    queryKey: ['websites'],
+    queryFn: () => get('/websites'),
+  });
+  const [selected, setSelected] = useState([]);
+  const hasData = websites && websites.data.length > 0;
+
+  const handleSubmit = () => {
+    mutate(
+      { websiteIds: selected },
+      {
+        onSuccess: async () => {
+          setValue('team:websites', Date.now());
+          onSave?.();
+          onClose?.();
+        },
+      },
+    );
+  };
+
+  const handleSelect = id => {
+    setSelected(state => (state.includes(id) ? state.filter(n => n !== id) : state.concat(id)));
+  };
+
+  return (
+    <>
+      {isLoading && !hasData && <Loading icon="dots" position="center" />}
+      {!isLoading && !hasData && <Empty />}
+      {hasData && (
+        <Form onSubmit={handleSubmit} error={error}>
+          <WebsitesDataTable userId={user.id} showActions={false}>
+            <GridColumn name="select" label={formatMessage(labels.selectWebsite)} alignment="end">
+              {row => (
+                <Toggle
+                  key={row.id}
+                  value={row.id}
+                  checked={selected?.includes(row.id)}
+                  onChange={handleSelect.bind(null, row.id)}
+                />
+              )}
+            </GridColumn>
+          </WebsitesDataTable>
+          <FormButtons flex>
+            <SubmitButton disabled={selected?.length === 0}>
+              {formatMessage(labels.addWebsite)}
+            </SubmitButton>
+            <Button onClick={onClose}>{formatMessage(labels.cancel)}</Button>
+          </FormButtons>
+        </Form>
+      )}
+    </>
+  );
+}
+
+export default TeamWebsiteAddForm;
diff --git a/src/app/(main)/settings/teams/[id]/TeamWebsiteRemoveButton.tsx b/src/app/(main)/settings/teams/[id]/TeamWebsiteRemoveButton.tsx
new file mode 100644
index 000000000..0c039d4e9
--- /dev/null
+++ b/src/app/(main)/settings/teams/[id]/TeamWebsiteRemoveButton.tsx
@@ -0,0 +1,30 @@
+import useApi from 'components/hooks/useApi';
+import useMessages from 'components/hooks/useMessages';
+import { Icon, Icons, LoadingButton, Text } from 'react-basics';
+
+export function TeamWebsiteRemoveButton({ teamId, websiteId, onSave }) {
+  const { formatMessage, labels } = useMessages();
+  const { del, useMutation } = useApi();
+  const { mutate, isPending } = useMutation({
+    mutationFn: () => del(`/teams/${teamId}/websites/${websiteId}`),
+  });
+
+  const handleRemoveTeamMember = async () => {
+    mutate(null, {
+      onSuccess: () => {
+        onSave();
+      },
+    });
+  };
+
+  return (
+    <LoadingButton variant="quiet" onClick={() => handleRemoveTeamMember()} isLoading={isPending}>
+      <Icon>
+        <Icons.Close />
+      </Icon>
+      <Text>{formatMessage(labels.remove)}</Text>
+    </LoadingButton>
+  );
+}
+
+export default TeamWebsiteRemoveButton;
diff --git a/src/app/(main)/settings/teams/[id]/TeamWebsites.tsx b/src/app/(main)/settings/teams/[id]/TeamWebsites.tsx
new file mode 100644
index 000000000..93bb3a106
--- /dev/null
+++ b/src/app/(main)/settings/teams/[id]/TeamWebsites.tsx
@@ -0,0 +1,54 @@
+import { ActionForm, Button, Icon, Icons, Modal, ModalTrigger, Text } from 'react-basics';
+import TeamWebsitesTable from './TeamWebsitesTable';
+import TeamWebsiteAddForm from './TeamWebsiteAddForm';
+import useApi from 'components/hooks/useApi';
+import useMessages from 'components/hooks/useMessages';
+import useUser from 'components/hooks/useUser';
+import useFilterQuery from 'components/hooks/useFilterQuery';
+import DataTable from 'components/common/DataTable';
+import useCache from 'store/cache';
+
+export function TeamWebsites({ teamId, readOnly }: { teamId: string; readOnly: boolean }) {
+  const { formatMessage, labels, messages } = useMessages();
+  const { user } = useUser();
+  const { get } = useApi();
+  const modified = useCache(state => state?.['team:websites']);
+  const queryResult = useFilterQuery({
+    queryKey: ['team:websites', { teamId, modified }],
+    queryFn: params => {
+      return get(`/teams/${teamId}/websites`, {
+        ...params,
+      });
+    },
+    enabled: !!user,
+  });
+
+  const handleChange = () => {
+    queryResult.query.refetch();
+  };
+
+  return (
+    <>
+      <ActionForm description={formatMessage(messages.teamWebsitesInfo)}>
+        <ModalTrigger>
+          <Button variant="primary">
+            <Icon>
+              <Icons.Plus />
+            </Icon>
+            <Text>{formatMessage(labels.addWebsite)}</Text>
+          </Button>
+          <Modal title={formatMessage(labels.addWebsite)}>
+            {close => <TeamWebsiteAddForm teamId={teamId} onSave={handleChange} onClose={close} />}
+          </Modal>
+        </ModalTrigger>
+      </ActionForm>
+      <DataTable queryResult={queryResult}>
+        {({ data }) => (
+          <TeamWebsitesTable data={data} onRemove={handleChange} readOnly={readOnly} />
+        )}
+      </DataTable>
+    </>
+  );
+}
+
+export default TeamWebsites;
diff --git a/src/app/(main)/settings/teams/[id]/TeamWebsitesTable.tsx b/src/app/(main)/settings/teams/[id]/TeamWebsitesTable.tsx
new file mode 100644
index 000000000..29b958160
--- /dev/null
+++ b/src/app/(main)/settings/teams/[id]/TeamWebsitesTable.tsx
@@ -0,0 +1,50 @@
+import Link from 'next/link';
+import { Button, GridColumn, GridTable, Icon, Icons, Text } from 'react-basics';
+import useMessages from 'components/hooks/useMessages';
+import useUser from 'components/hooks/useUser';
+import TeamWebsiteRemoveButton from './TeamWebsiteRemoveButton';
+
+export function TeamWebsitesTable({
+  data = [],
+  readOnly,
+  onRemove,
+}: {
+  data: any[];
+  readOnly: boolean;
+  onRemove: () => void;
+}) {
+  const { formatMessage, labels } = useMessages();
+  const { user } = useUser();
+
+  return (
+    <GridTable data={data}>
+      <GridColumn name="name" label={formatMessage(labels.name)} />
+      <GridColumn name="domain" label={formatMessage(labels.domain)} />
+      <GridColumn name="action" label=" " alignment="end">
+        {row => {
+          const { id: teamId, teamUser } = row.teamWebsite[0].team;
+          const { id: websiteId, userId } = row;
+          const owner = teamUser[0];
+          const canRemove = !readOnly && (user.id === userId || user.id === owner.userId);
+          return (
+            <>
+              {canRemove && (
+                <TeamWebsiteRemoveButton teamId={teamId} websiteId={websiteId} onSave={onRemove} />
+              )}
+              <Link href={`/websites/${websiteId}`}>
+                <Button>
+                  <Icon>
+                    <Icons.External />
+                  </Icon>
+                  <Text>{formatMessage(labels.view)}</Text>
+                </Button>
+              </Link>
+            </>
+          );
+        }}
+      </GridColumn>
+    </GridTable>
+  );
+}
+
+export default TeamWebsitesTable;
diff --git a/src/app/(main)/settings/teams/[id]/page.tsx b/src/app/(main)/settings/teams/[id]/page.tsx
new file mode 100644
index 000000000..652e65c14
--- /dev/null
+++ b/src/app/(main)/settings/teams/[id]/page.tsx
@@ -0,0 +1,9 @@
+import TeamSettings from './TeamSettings';
+
+export default function ({ params }) {
+  if (process.env.cloudMode) {
+    return null;
+  }
+
+  return <TeamSettings teamId={params.id} />;
+}
diff --git a/src/app/(main)/settings/teams/page.tsx b/src/app/(main)/settings/teams/page.tsx
new file mode 100644
index 000000000..0cdb6f7d7
--- /dev/null
+++ b/src/app/(main)/settings/teams/page.tsx
@@ -0,0 +1,20 @@
+import TeamsDataTable from './TeamsDataTable';
+import TeamsHeader from './TeamsHeader';
+import { Metadata } from 'next';
+
+export default function () {
+  if (process.env.cloudMode) {
+    return null;
+  }
+
+  return (
+    <>
+      <TeamsHeader />
+      <TeamsDataTable />
+    </>
+  );
+}
+
+export const metadata: Metadata = {
+  title: 'Teams Settings | umami',
+};
diff --git a/src/app/(main)/settings/users/UserAddButton.tsx b/src/app/(main)/settings/users/UserAddButton.tsx
new file mode 100644
index 000000000..1158ecec6
--- /dev/null
+++ b/src/app/(main)/settings/users/UserAddButton.tsx
@@ -0,0 +1,31 @@
+import { Button, Icon, Text, Modal, Icons, ModalTrigger, useToasts } from 'react-basics';
+import UserAddForm from './UserAddForm';
+import useMessages from 'components/hooks/useMessages';
+import { setValue } from 'store/cache';
+
+export function UserAddButton({ onSave }: { onSave?: () => void }) {
+  const { formatMessage, labels, messages } = useMessages();
+  const { showToast } = useToasts();
+
+  const handleSave = () => {
+    showToast({ message: formatMessage(messages.saved), variant: 'success' });
+    setValue('users', Date.now());
+    onSave?.();
+  };
+
+  return (
+    <ModalTrigger>
+      <Button variant="primary">
+        <Icon>
+          <Icons.Plus />
+        </Icon>
+        <Text>{formatMessage(labels.createUser)}</Text>
+      </Button>
+      <Modal title={formatMessage(labels.createUser)}>
+        {(close: () => void) => <UserAddForm onSave={handleSave} onClose={close} />}
+      </Modal>
+    </ModalTrigger>
+  );
+}
+
+export default UserAddButton;
diff --git a/components/pages/settings/users/UserAddForm.js b/src/app/(main)/settings/users/UserAddForm.tsx
similarity index 86%
rename from components/pages/settings/users/UserAddForm.js
rename to src/app/(main)/settings/users/UserAddForm.tsx
index bb4087495..8c1537757 100644
--- a/components/pages/settings/users/UserAddForm.js
+++ b/src/app/(main)/settings/users/UserAddForm.tsx
@@ -10,16 +10,18 @@ import {
   SubmitButton,
   Button,
 } from 'react-basics';
-import useApi from 'hooks/useApi';
+import useApi from 'components/hooks/useApi';
 import { ROLES } from 'lib/constants';
-import useMessages from 'hooks/useMessages';
+import useMessages from 'components/hooks/useMessages';
 
 export function UserAddForm({ onSave, onClose }) {
   const { post, useMutation } = useApi();
-  const { mutate, error, isLoading } = useMutation(data => post(`/users`, data));
+  const { mutate, error, isPending } = useMutation({
+    mutationFn: (data: any) => post(`/users`, data),
+  });
   const { formatMessage, labels } = useMessages();
 
-  const handleSubmit = async data => {
+  const handleSubmit = async (data: any) => {
     mutate(data, {
       onSuccess: async () => {
         onSave(data);
@@ -65,7 +67,7 @@ export function UserAddForm({ onSave, onClose }) {
         <SubmitButton variant="primary" disabled={false}>
           {formatMessage(labels.save)}
         </SubmitButton>
-        <Button disabled={isLoading} onClick={onClose}>
+        <Button disabled={isPending} onClick={onClose}>
           {formatMessage(labels.cancel)}
         </Button>
       </FormButtons>
diff --git a/src/app/(main)/settings/users/UserDeleteButton.tsx b/src/app/(main)/settings/users/UserDeleteButton.tsx
new file mode 100644
index 000000000..775004a84
--- /dev/null
+++ b/src/app/(main)/settings/users/UserDeleteButton.tsx
@@ -0,0 +1,35 @@
+import { Button, Icon, Icons, Modal, ModalTrigger, Text } from 'react-basics';
+import useMessages from 'components/hooks/useMessages';
+import useUser from 'components/hooks/useUser';
+import UserDeleteForm from './UserDeleteForm';
+
+export function UserDeleteButton({
+  userId,
+  username,
+  onDelete,
+}: {
+  userId: string;
+  username: string;
+  onDelete?: () => void;
+}) {
+  const { formatMessage, labels } = useMessages();
+  const { user } = useUser();
+
+  return (
+    <ModalTrigger disabled={userId === user?.id}>
+      <Button disabled={userId === user?.id}>
+        <Icon>
+          <Icons.Trash />
+        </Icon>
+        <Text>{formatMessage(labels.delete)}</Text>
+      </Button>
+      <Modal title={formatMessage(labels.deleteUser)}>
+        {(close: () => void) => (
+          <UserDeleteForm userId={userId} username={username} onSave={onDelete} onClose={close} />
+        )}
+      </Modal>
+    </ModalTrigger>
+  );
+}
+
+export default UserDeleteButton;
diff --git a/components/pages/settings/users/UserDeleteForm.js b/src/app/(main)/settings/users/UserDeleteForm.tsx
similarity index 64%
rename from components/pages/settings/users/UserDeleteForm.js
rename to src/app/(main)/settings/users/UserDeleteForm.tsx
index bd412e440..eaa8e4818 100644
--- a/components/pages/settings/users/UserDeleteForm.js
+++ b/src/app/(main)/settings/users/UserDeleteForm.tsx
@@ -1,14 +1,13 @@
-import { useMutation } from '@tanstack/react-query';
 import { Button, Form, FormButtons, SubmitButton } from 'react-basics';
-import useApi from 'hooks/useApi';
-import useMessages from 'hooks/useMessages';
+import useApi from 'components/hooks/useApi';
+import useMessages from 'components/hooks/useMessages';
 
 export function UserDeleteForm({ userId, username, onSave, onClose }) {
   const { formatMessage, FormattedMessage, labels, messages } = useMessages();
-  const { del } = useApi();
-  const { mutate, error, isLoading } = useMutation(() => del(`/users/${userId}`));
+  const { del, useMutation } = useApi();
+  const { mutate, error, isPending } = useMutation({ mutationFn: () => del(`/users/${userId}`) });
 
-  const handleSubmit = async data => {
+  const handleSubmit = async (data: any) => {
     mutate(data, {
       onSuccess: async () => {
         onSave();
@@ -23,10 +22,10 @@ export function UserDeleteForm({ userId, username, onSave, onClose }) {
         <FormattedMessage {...messages.confirmDelete} values={{ target: <b>{username}</b> }} />
       </p>
       <FormButtons flex>
-        <SubmitButton variant="danger" disabled={isLoading}>
+        <SubmitButton variant="danger" disabled={isPending}>
           {formatMessage(labels.delete)}
         </SubmitButton>
-        <Button disabled={isLoading} onClick={onClose}>
+        <Button disabled={isPending} onClick={onClose}>
           {formatMessage(labels.cancel)}
         </Button>
       </FormButtons>
diff --git a/components/pages/settings/users/UserEditForm.js b/src/app/(main)/settings/users/UserEditForm.tsx
similarity index 77%
rename from components/pages/settings/users/UserEditForm.js
rename to src/app/(main)/settings/users/UserEditForm.tsx
index 887531e87..0b823a94e 100644
--- a/components/pages/settings/users/UserEditForm.js
+++ b/src/app/(main)/settings/users/UserEditForm.tsx
@@ -9,18 +9,34 @@ import {
   SubmitButton,
   PasswordField,
 } from 'react-basics';
-import useApi from 'hooks/useApi';
+import useApi from 'components/hooks/useApi';
 import { ROLES } from 'lib/constants';
-import useMessages from 'hooks/useMessages';
+import useMessages from 'components/hooks/useMessages';
 
-export function UserEditForm({ userId, data, onSave }) {
+export function UserEditForm({
+  userId,
+  data,
+  onSave,
+}: {
+  userId: string;
+  data: any[];
+  onSave: (data: any) => void;
+}) {
   const { formatMessage, labels, messages } = useMessages();
   const { post, useMutation } = useApi();
-  const { mutate, error } = useMutation(({ username, password, role }) =>
-    post(`/users/${userId}`, { username, password, role }),
-  );
+  const { mutate, error } = useMutation({
+    mutationFn: ({
+      username,
+      password,
+      role,
+    }: {
+      username: string;
+      password: string;
+      role: string;
+    }) => post(`/users/${userId}`, { username, password, role }),
+  });
 
-  const handleSubmit = async data => {
+  const handleSubmit = async (data: any) => {
     mutate(data, {
       onSuccess: async () => {
         onSave(data);
diff --git a/src/app/(main)/settings/users/UserWebsites.tsx b/src/app/(main)/settings/users/UserWebsites.tsx
new file mode 100644
index 000000000..2d06e82a9
--- /dev/null
+++ b/src/app/(main)/settings/users/UserWebsites.tsx
@@ -0,0 +1,26 @@
+import Page from 'components/layout/Page';
+import useApi from 'components/hooks/useApi';
+import WebsitesTable from 'app/(main)/settings/websites/WebsitesTable';
+import useFilterQuery from 'components/hooks/useFilterQuery';
+import DataTable from 'components/common/DataTable';
+
+export function UserWebsites({ userId }) {
+  const { get } = useApi();
+  const queryResult = useFilterQuery({
+    queryKey: ['user:websites', userId],
+    queryFn: (params: any) => get(`/users/${userId}/websites`, params),
+  });
+  const hasData = queryResult.result && queryResult.result.data.length !== 0;
+
+  return (
+    <Page isLoading={queryResult.query.isLoading} error={queryResult.query.error}>
+      {hasData && (
+        <DataTable queryResult={queryResult}>
+          {({ data }) => <WebsitesTable data={data} />}
+        </DataTable>
+      )}
+    </Page>
+  );
+}
+
+export default UserWebsites;
diff --git a/src/app/(main)/settings/users/UsersDataTable.tsx b/src/app/(main)/settings/users/UsersDataTable.tsx
new file mode 100644
index 000000000..2495d0232
--- /dev/null
+++ b/src/app/(main)/settings/users/UsersDataTable.tsx
@@ -0,0 +1,25 @@
+'use client';
+import useApi from 'components/hooks/useApi';
+import useFilterQuery from 'components/hooks/useFilterQuery';
+import DataTable from 'components/common/DataTable';
+import UsersTable from './UsersTable';
+import UsersHeader from './UsersHeader';
+import useCache from 'store/cache';
+
+export function UsersDataTable() {
+  const { get } = useApi();
+  const modified = useCache((state: any) => state?.users);
+  const queryResult = useFilterQuery({
+    queryKey: ['users', { modified }],
+    queryFn: (params: { [key: string]: any }) => get(`/admin/users`, params),
+  });
+
+  return (
+    <>
+      <UsersHeader />
+      <DataTable queryResult={queryResult}>{({ data }) => <UsersTable data={data} />}</DataTable>
+    </>
+  );
+}
+
+export default UsersDataTable;
diff --git a/src/app/(main)/settings/users/UsersHeader.tsx b/src/app/(main)/settings/users/UsersHeader.tsx
new file mode 100644
index 000000000..0901a6fb2
--- /dev/null
+++ b/src/app/(main)/settings/users/UsersHeader.tsx
@@ -0,0 +1,16 @@
+'use client';
+import PageHeader from 'components/layout/PageHeader';
+import useMessages from 'components/hooks/useMessages';
+import UserAddButton from './UserAddButton';
+
+export function UsersHeader({ onAdd }: { onAdd?: () => void }) {
+  const { formatMessage, labels } = useMessages();
+
+  return (
+    <PageHeader title={formatMessage(labels.users)}>
+      <UserAddButton onSave={onAdd} />
+    </PageHeader>
+  );
+}
+
+export default UsersHeader;
diff --git a/src/app/(main)/settings/users/UsersTable.tsx b/src/app/(main)/settings/users/UsersTable.tsx
new file mode 100644
index 000000000..2b840b64c
--- /dev/null
+++ b/src/app/(main)/settings/users/UsersTable.tsx
@@ -0,0 +1,54 @@
+import { Button, Text, Icon, Icons, GridTable, GridColumn, useBreakpoint } from 'react-basics';
+import { formatDistance } from 'date-fns';
+import Link from 'next/link';
+import { ROLES } from 'lib/constants';
+import useMessages from 'components/hooks/useMessages';
+import useLocale from 'components/hooks/useLocale';
+import UserDeleteButton from './UserDeleteButton';
+
+export function UsersTable({ data = [] }: { data: any[] }) {
+  const { formatMessage, labels } = useMessages();
+  const { dateLocale } = useLocale();
+  const breakpoint = useBreakpoint();
+
+  return (
+    <GridTable data={data} cardMode={['xs', 'sm', 'md'].includes(breakpoint)}>
+      <GridColumn name="username" label={formatMessage(labels.username)} style={{ minWidth: 0 }} />
+      <GridColumn name="role" label={formatMessage(labels.role)} width={'120px'}>
+        {row =>
+          formatMessage(
+            labels[Object.keys(ROLES).find(key => ROLES[key] === row.role)] || labels.unknown,
+          )
+        }
+      </GridColumn>
+      <GridColumn name="created" label={formatMessage(labels.created)} width={'100px'}>
+        {row =>
+          formatDistance(new Date(row.createdAt), new Date(), {
+            addSuffix: true,
+            locale: dateLocale,
+          })
+        }
+      </GridColumn>
+      <GridColumn name="action" label=" " alignment="end">
+        {row => {
+          const { id, username } = row;
+          return (
+            <>
+              <Link href={`/settings/users/${id}`}>
+                <Button>
+                  <Icon>
+                    <Icons.Edit />
+                  </Icon>
+                  <Text>{formatMessage(labels.edit)}</Text>
+                </Button>
+              </Link>
+              <UserDeleteButton userId={id} username={username} />
+            </>
+          );
+        }}
+      </GridColumn>
+    </GridTable>
+  );
+}
+
+export default UsersTable;
diff --git a/components/pages/settings/users/UserSettings.js b/src/app/(main)/settings/users/[id]/UserSettings.tsx
similarity index 56%
rename from components/pages/settings/users/UserSettings.js
rename to src/app/(main)/settings/users/[id]/UserSettings.tsx
index d703e9646..d9b149c33 100644
--- a/components/pages/settings/users/UserSettings.js
+++ b/src/app/(main)/settings/users/[id]/UserSettings.tsx
@@ -1,31 +1,30 @@
-import { useEffect, useState } from 'react';
-import { Breadcrumbs, Item, Tabs, useToasts } from 'react-basics';
-import Link from 'next/link';
-import UserEditForm from 'components/pages/settings/users//UserEditForm';
-import Page from 'components/layout/Page';
+'use client';
+import { Key, useEffect, useState } from 'react';
+import { Item, Loading, Tabs, useToasts } from 'react-basics';
+import UserEditForm from '../UserEditForm';
 import PageHeader from 'components/layout/PageHeader';
-import useApi from 'hooks/useApi';
-import UserWebsites from './UserWebsites';
-import useMessages from 'hooks/useMessages';
+import useApi from 'components/hooks/useApi';
+import useMessages from 'components/hooks/useMessages';
+import UserWebsites from '../UserWebsites';
 
 export function UserSettings({ userId }) {
   const { formatMessage, labels, messages } = useMessages();
   const [edit, setEdit] = useState(false);
   const [values, setValues] = useState(null);
-  const [tab, setTab] = useState('details');
+  const [tab, setTab] = useState<Key>('details');
   const { get, useQuery } = useApi();
   const { showToast } = useToasts();
-  const { data, isLoading } = useQuery(
-    ['user', userId],
-    () => {
+  const { data, isLoading } = useQuery({
+    queryKey: ['user', userId],
+    queryFn: () => {
       if (userId) {
         return get(`/users/${userId}`);
       }
     },
-    { cacheTime: 0 },
-  );
+    gcTime: 0,
+  });
 
-  const handleSave = data => {
+  const handleSave = (data: any) => {
     showToast({ message: formatMessage(messages.saved), variant: 'success' });
     if (data) {
       setValues(state => ({ ...state, ...data }));
@@ -42,25 +41,20 @@ export function UserSettings({ userId }) {
     }
   }, [data]);
 
+  if (isLoading || !values) {
+    return <Loading />;
+  }
+
   return (
-    <Page loading={isLoading || !values}>
-      <PageHeader
-        title={
-          <Breadcrumbs>
-            <Item>
-              <Link href="/settings/users">{formatMessage(labels.users)}</Link>
-            </Item>
-            <Item>{values?.username}</Item>
-          </Breadcrumbs>
-        }
-      />
+    <>
+      <PageHeader title={values?.username} />
       <Tabs selectedKey={tab} onSelect={setTab} style={{ marginBottom: 30, fontSize: 14 }}>
         <Item key="details">{formatMessage(labels.details)}</Item>
         <Item key="websites">{formatMessage(labels.websites)}</Item>
       </Tabs>
       {tab === 'details' && <UserEditForm userId={userId} data={values} onSave={handleSave} />}
       {tab === 'websites' && <UserWebsites userId={userId} />}
-    </Page>
+    </>
   );
 }
 
diff --git a/src/app/(main)/settings/users/[id]/page.tsx b/src/app/(main)/settings/users/[id]/page.tsx
new file mode 100644
index 000000000..7a6378aa4
--- /dev/null
+++ b/src/app/(main)/settings/users/[id]/page.tsx
@@ -0,0 +1,9 @@
+import UserSettings from './UserSettings';
+
+export default function ({ params }) {
+  if (process.env.cloudMode) {
+    return null;
+  }
+
+  return <UserSettings userId={params.id} />;
+}
diff --git a/src/app/(main)/settings/users/page.tsx b/src/app/(main)/settings/users/page.tsx
new file mode 100644
index 000000000..00ebe98c4
--- /dev/null
+++ b/src/app/(main)/settings/users/page.tsx
@@ -0,0 +1,9 @@
+import UsersDataTable from './UsersDataTable';
+import { Metadata } from 'next';
+
+export default function () {
+  return <UsersDataTable />;
+}
+export const metadata: Metadata = {
+  title: 'Users | umami',
+};
diff --git a/src/app/(main)/settings/websites/WebsiteAddButton.tsx b/src/app/(main)/settings/websites/WebsiteAddButton.tsx
new file mode 100644
index 000000000..7b4c92deb
--- /dev/null
+++ b/src/app/(main)/settings/websites/WebsiteAddButton.tsx
@@ -0,0 +1,31 @@
+import { Button, Icon, Icons, Modal, ModalTrigger, Text, useToasts } from 'react-basics';
+import WebsiteAddForm from './WebsiteAddForm';
+import useMessages from 'components/hooks/useMessages';
+import { setValue } from 'store/cache';
+
+export function WebsiteAddButton({ onSave }: { onSave?: () => void }) {
+  const { formatMessage, labels, messages } = useMessages();
+  const { showToast } = useToasts();
+
+  const handleSave = async () => {
+    showToast({ message: formatMessage(messages.saved), variant: 'success' });
+    setValue('websites', Date.now());
+    onSave?.();
+  };
+
+  return (
+    <ModalTrigger>
+      <Button variant="primary">
+        <Icon>
+          <Icons.Plus />
+        </Icon>
+        <Text>{formatMessage(labels.addWebsite)}</Text>
+      </Button>
+      <Modal title={formatMessage(labels.addWebsite)}>
+        {(close: () => void) => <WebsiteAddForm onSave={handleSave} onClose={close} />}
+      </Modal>
+    </ModalTrigger>
+  );
+}
+
+export default WebsiteAddButton;
diff --git a/components/pages/settings/websites/WebsiteAddForm.js b/src/app/(main)/settings/websites/WebsiteAddForm.tsx
similarity index 63%
rename from components/pages/settings/websites/WebsiteAddForm.js
rename to src/app/(main)/settings/websites/WebsiteAddForm.tsx
index 77b850b43..6d8fb8c32 100644
--- a/components/pages/settings/websites/WebsiteAddForm.js
+++ b/src/app/(main)/settings/websites/WebsiteAddForm.tsx
@@ -7,20 +7,25 @@ import {
   Button,
   SubmitButton,
 } from 'react-basics';
-import useApi from 'hooks/useApi';
+import useApi from 'components/hooks/useApi';
 import { DOMAIN_REGEX } from 'lib/constants';
-import useMessages from 'hooks/useMessages';
+import useMessages from 'components/hooks/useMessages';
+import { useContext } from 'react';
+import SettingsContext from '../SettingsContext';
 
-export function WebsiteAddForm({ onSave, onClose }) {
+export function WebsiteAddForm({ onSave, onClose }: { onSave?: () => void; onClose?: () => void }) {
   const { formatMessage, labels, messages } = useMessages();
+  const { websitesUrl } = useContext(SettingsContext);
   const { post, useMutation } = useApi();
-  const { mutate, error, isLoading } = useMutation(data => post('/websites', data));
+  const { mutate, error, isPending } = useMutation({
+    mutationFn: (data: any) => post(websitesUrl, data),
+  });
 
-  const handleSubmit = async data => {
+  const handleSubmit = async (data: any) => {
     mutate(data, {
       onSuccess: async () => {
-        onSave();
-        onClose();
+        onSave?.();
+        onClose?.();
       },
     });
   };
@@ -47,9 +52,11 @@ export function WebsiteAddForm({ onSave, onClose }) {
         <SubmitButton variant="primary" disabled={false}>
           {formatMessage(labels.save)}
         </SubmitButton>
-        <Button disabled={isLoading} onClick={onClose}>
-          {formatMessage(labels.cancel)}
-        </Button>
+        {onClose && (
+          <Button disabled={isPending} onClick={onClose}>
+            {formatMessage(labels.cancel)}
+          </Button>
+        )}
       </FormButtons>
     </Form>
   );
diff --git a/components/pages/settings/websites/WebsiteSettings.js b/src/app/(main)/settings/websites/WebsiteSettings.tsx
similarity index 51%
rename from components/pages/settings/websites/WebsiteSettings.js
rename to src/app/(main)/settings/websites/WebsiteSettings.tsx
index 5a96fa8c5..0c5ce6142 100644
--- a/components/pages/settings/websites/WebsiteSettings.js
+++ b/src/app/(main)/settings/websites/WebsiteSettings.tsx
@@ -1,43 +1,44 @@
-import { useEffect, useState } from 'react';
-import { Breadcrumbs, Item, Tabs, useToasts, Button, Text, Icon, Icons } from 'react-basics';
-import { useRouter } from 'next/router';
+'use client';
+import { useContext, useEffect, useState, Key } from 'react';
+import { Item, Tabs, useToasts, Button, Text, Icon, Icons, Loading } from 'react-basics';
+import { useRouter } from 'next/navigation';
 import Link from 'next/link';
-import Page from 'components/layout/Page';
 import PageHeader from 'components/layout/PageHeader';
-import WebsiteEditForm from 'components/pages/settings/websites/WebsiteEditForm';
-import WebsiteData from 'components/pages/settings/websites/WebsiteData';
-import TrackingCode from 'components/pages/settings/websites/TrackingCode';
-import ShareUrl from 'components/pages/settings/websites/ShareUrl';
-import useApi from 'hooks/useApi';
-import useMessages from 'hooks/useMessages';
-import useConfig from 'hooks/useConfig';
+import WebsiteEditForm from './[id]/WebsiteEditForm';
+import WebsiteData from './[id]/WebsiteData';
+import TrackingCode from './[id]/TrackingCode';
+import ShareUrl from './[id]/ShareUrl';
+import useApi from 'components/hooks/useApi';
+import useMessages from 'components/hooks/useMessages';
+import SettingsContext from '../SettingsContext';
 
-export function WebsiteSettings({ websiteId }) {
+export function WebsiteSettings({ websiteId, openExternal = false }) {
   const router = useRouter();
   const { formatMessage, labels, messages } = useMessages();
-  const { openExternal } = useConfig();
   const { get, useQuery } = useApi();
   const { showToast } = useToasts();
-  const { data, isLoading } = useQuery(
-    ['website', websiteId],
-    () => get(`/websites/${websiteId}`),
-    { enabled: !!websiteId, cacheTime: 0 },
-  );
+  const { websitesUrl, websitesPath, settingsPath } = useContext(SettingsContext);
+  const { data, isLoading } = useQuery({
+    queryKey: ['website', websiteId],
+    queryFn: () => get(`${websitesUrl}/${websiteId}`),
+    enabled: !!websiteId,
+    gcTime: 0,
+  });
   const [values, setValues] = useState(null);
-  const [tab, setTab] = useState('details');
+  const [tab, setTab] = useState<Key>('details');
 
   const showSuccess = () => {
     showToast({ message: formatMessage(messages.saved), variant: 'success' });
   };
 
-  const handleSave = data => {
+  const handleSave = (data: any) => {
     showSuccess();
-    setValues(state => ({ ...state, ...data }));
+    setValues((state: any) => ({ ...state, ...data }));
   };
 
-  const handleReset = async value => {
+  const handleReset = async (value: string) => {
     if (value === 'delete') {
-      await router.push('/settings/websites');
+      router.push(settingsPath);
     } else if (value === 'reset') {
       showSuccess();
     }
@@ -49,19 +50,14 @@ export function WebsiteSettings({ websiteId }) {
     }
   }, [data]);
 
+  if (isLoading || !values) {
+    return <Loading position="page" />;
+  }
+
   return (
-    <Page loading={isLoading || !values}>
-      <PageHeader
-        title={
-          <Breadcrumbs>
-            <Item>
-              <Link href="/settings/websites">{formatMessage(labels.websites)}</Link>
-            </Item>
-            <Item>{values?.name}</Item>
-          </Breadcrumbs>
-        }
-      >
-        <Link href={`/websites/${websiteId}`} target={openExternal ? '_blank' : null}>
+    <>
+      <PageHeader title={values?.name}>
+        <Link href={`${websitesPath}/${websiteId}`} target={openExternal ? '_blank' : null}>
           <Button variant="primary">
             <Icon>
               <Icons.External />
@@ -79,10 +75,10 @@ export function WebsiteSettings({ websiteId }) {
       {tab === 'details' && (
         <WebsiteEditForm websiteId={websiteId} data={values} onSave={handleSave} />
       )}
-      {tab === 'tracking' && <TrackingCode websiteId={websiteId} data={values} />}
+      {tab === 'tracking' && <TrackingCode websiteId={websiteId} />}
       {tab === 'share' && <ShareUrl websiteId={websiteId} data={values} onSave={handleSave} />}
       {tab === 'data' && <WebsiteData websiteId={websiteId} onSave={handleReset} />}
-    </Page>
+    </>
   );
 }
 
diff --git a/components/pages/websites/WebsiteList.module.css b/src/app/(main)/settings/websites/Websites.module.css
similarity index 100%
rename from components/pages/websites/WebsiteList.module.css
rename to src/app/(main)/settings/websites/Websites.module.css
diff --git a/src/app/(main)/settings/websites/Websites.tsx b/src/app/(main)/settings/websites/Websites.tsx
new file mode 100644
index 000000000..5f88ae337
--- /dev/null
+++ b/src/app/(main)/settings/websites/Websites.tsx
@@ -0,0 +1,15 @@
+'use client';
+import { useUser } from 'components/hooks';
+import WebsitesDataTable from './WebsitesDataTable';
+import WebsitesHeader from './WebsitesHeader';
+
+export default function Websites() {
+  const { user } = useUser();
+
+  return (
+    <>
+      <WebsitesHeader />
+      <WebsitesDataTable userId={user.id} />
+    </>
+  );
+}
diff --git a/src/app/(main)/settings/websites/WebsitesDataTable.tsx b/src/app/(main)/settings/websites/WebsitesDataTable.tsx
new file mode 100644
index 000000000..f66327861
--- /dev/null
+++ b/src/app/(main)/settings/websites/WebsitesDataTable.tsx
@@ -0,0 +1,64 @@
+'use client';
+import { ReactNode, useContext } from 'react';
+import WebsitesTable from 'app/(main)/settings/websites/WebsitesTable';
+import useApi from 'components/hooks/useApi';
+import DataTable from 'components/common/DataTable';
+import useFilterQuery from 'components/hooks/useFilterQuery';
+import useCache from 'store/cache';
+import SettingsContext from '../SettingsContext';
+
+export interface WebsitesDataTableProps {
+  userId: string;
+  allowEdit?: boolean;
+  allowView?: boolean;
+  showActions?: boolean;
+  showTeam?: boolean;
+  includeTeams?: boolean;
+  onlyTeams?: boolean;
+  children?: ReactNode;
+}
+
+export function WebsitesDataTable({
+  userId,
+  allowEdit = true,
+  allowView = true,
+  showActions = true,
+  showTeam,
+  includeTeams,
+  onlyTeams,
+  children,
+}: WebsitesDataTableProps) {
+  const { get } = useApi();
+  const modified = useCache((state: any) => state?.websites);
+  const { websitesUrl } = useContext(SettingsContext);
+
+  const queryResult = useFilterQuery({
+    queryKey: ['websites', { includeTeams, onlyTeams, modified }],
+    queryFn: (params: any) => {
+      return get(websitesUrl, {
+        includeTeams,
+        onlyTeams,
+        ...params,
+      });
+    },
+    enabled: !!userId,
+  });
+
+  return (
+    <DataTable queryResult={queryResult}>
+      {({ data }) => (
+        <WebsitesTable
+          data={data}
+          showTeam={showTeam}
+          showActions={showActions}
+          allowEdit={allowEdit}
+          allowView={allowView}
+        >
+          {children}
+        </WebsitesTable>
+      )}
+    </DataTable>
+  );
+}
+
+export default WebsitesDataTable;
diff --git a/src/app/(main)/settings/websites/WebsitesHeader.tsx b/src/app/(main)/settings/websites/WebsitesHeader.tsx
new file mode 100644
index 000000000..61bfb886d
--- /dev/null
+++ b/src/app/(main)/settings/websites/WebsitesHeader.tsx
@@ -0,0 +1,16 @@
+'use client';
+import useMessages from 'components/hooks/useMessages';
+import PageHeader from 'components/layout/PageHeader';
+import WebsiteAddButton from './WebsiteAddButton';
+
+export function WebsitesHeader({ showActions = true }) {
+  const { formatMessage, labels } = useMessages();
+
+  return (
+    <PageHeader title={formatMessage(labels.websites)}>
+      {!process.env.cloudMode && showActions && <WebsiteAddButton />}
+    </PageHeader>
+  );
+}
+
+export default WebsitesHeader;
diff --git a/components/pages/settings/websites/WebsitesTable.module.css b/src/app/(main)/settings/websites/WebsitesTable.module.css
similarity index 100%
rename from components/pages/settings/websites/WebsitesTable.module.css
rename to src/app/(main)/settings/websites/WebsitesTable.module.css
diff --git a/src/app/(main)/settings/websites/WebsitesTable.tsx b/src/app/(main)/settings/websites/WebsitesTable.tsx
new file mode 100644
index 000000000..069d0c2ff
--- /dev/null
+++ b/src/app/(main)/settings/websites/WebsitesTable.tsx
@@ -0,0 +1,84 @@
+import { ReactNode, useContext } from 'react';
+import Link from 'next/link';
+import { Button, Text, Icon, Icons, GridTable, GridColumn, useBreakpoint } from 'react-basics';
+import useMessages from 'components/hooks/useMessages';
+import useUser from 'components/hooks/useUser';
+import SettingsContext from '../SettingsContext';
+
+export interface WebsitesTableProps {
+  data: any[];
+  showTeam?: boolean;
+  showActions?: boolean;
+  allowEdit?: boolean;
+  allowView?: boolean;
+  children?: ReactNode;
+}
+
+export function WebsitesTable({
+  data = [],
+  showTeam,
+  showActions,
+  allowEdit,
+  allowView,
+  children,
+}: WebsitesTableProps) {
+  const { formatMessage, labels } = useMessages();
+  const { user } = useUser();
+  const breakpoint = useBreakpoint();
+  const { settingsPath, websitesPath } = useContext(SettingsContext);
+
+  return (
+    <GridTable data={data} cardMode={['xs', 'sm', 'md'].includes(breakpoint)}>
+      <GridColumn name="name" label={formatMessage(labels.name)} />
+      <GridColumn name="domain" label={formatMessage(labels.domain)} />
+      {showTeam && (
+        <GridColumn name="teamName" label={formatMessage(labels.teamName)}>
+          {row => row.teamWebsite[0]?.team.name}
+        </GridColumn>
+      )}
+      {showTeam && (
+        <GridColumn name="owner" label={formatMessage(labels.owner)}>
+          {row => row.user.username}
+        </GridColumn>
+      )}
+      {showActions && (
+        <GridColumn name="action" label=" " alignment="end">
+          {row => {
+            const {
+              id,
+              user: { id: ownerId },
+            } = row;
+
+            return (
+              <>
+                {allowEdit && (!showTeam || ownerId === user.id) && (
+                  <Link href={`${settingsPath}/${id}`}>
+                    <Button>
+                      <Icon>
+                        <Icons.Edit />
+                      </Icon>
+                      <Text>{formatMessage(labels.edit)}</Text>
+                    </Button>
+                  </Link>
+                )}
+                {allowView && (
+                  <Link href={`${websitesPath}/${id}`}>
+                    <Button>
+                      <Icon>
+                        <Icons.External />
+                      </Icon>
+                      <Text>{formatMessage(labels.view)}</Text>
+                    </Button>
+                  </Link>
+                )}
+              </>
+            );
+          }}
+        </GridColumn>
+      )}
+      {children}
+    </GridTable>
+  );
+}
+
+export default WebsitesTable;
diff --git a/components/pages/settings/websites/ShareUrl.js b/src/app/(main)/settings/websites/[id]/ShareUrl.tsx
similarity index 76%
rename from components/pages/settings/websites/ShareUrl.js
rename to src/app/(main)/settings/websites/[id]/ShareUrl.tsx
index 7f0b352cc..90ce6ea69 100644
--- a/components/pages/settings/websites/ShareUrl.js
+++ b/src/app/(main)/settings/websites/[id]/ShareUrl.tsx
@@ -8,33 +8,30 @@ import {
   Button,
   Toggle,
 } from 'react-basics';
-import { useEffect, useMemo, useRef, useState } from 'react';
+import { useContext, useEffect, useMemo, useRef, useState } from 'react';
 import { getRandomChars } from 'next-basics';
-import { useRouter } from 'next/router';
-import useApi from 'hooks/useApi';
-import useMessages from 'hooks/useMessages';
+import useApi from 'components/hooks/useApi';
+import useMessages from 'components/hooks/useMessages';
+import SettingsContext from '../../SettingsContext';
 
 const generateId = () => getRandomChars(16);
 
 export function ShareUrl({ websiteId, data, onSave }) {
+  const ref = useRef(null);
+  const { shareUrl, websitesUrl } = useContext(SettingsContext);
   const { formatMessage, labels, messages } = useMessages();
   const { name, shareId } = data;
   const [id, setId] = useState(shareId);
   const { post, useMutation } = useApi();
-  const { basePath } = useRouter();
-  const { mutate, error } = useMutation(({ shareId }) =>
-    post(`/websites/${websiteId}`, { shareId }),
-  );
-  const ref = useRef(null);
+  const { mutate, error } = useMutation({
+    mutationFn: (data: any) => post(`${websitesUrl}/${websiteId}`, data),
+  });
   const url = useMemo(
-    () =>
-      `${process.env.analyticsUrl || location.origin}${basePath}/share/${id}/${encodeURIComponent(
-        name,
-      )}`,
+    () => `${shareUrl}${process.env.basePath}/share/${id}/${encodeURIComponent(name)}`,
     [id, name],
   );
 
-  const handleSubmit = async data => {
+  const handleSubmit = async (data: any) => {
     mutate(data, {
       onSuccess: async () => {
         onSave(data);
@@ -52,7 +49,7 @@ export function ShareUrl({ websiteId, data, onSave }) {
     setId(id);
   };
 
-  const handleCheck = checked => {
+  const handleCheck = (checked: boolean) => {
     const data = { shareId: checked ? generateId() : null };
     mutate(data, {
       onSuccess: async () => {
diff --git a/src/app/(main)/settings/websites/[id]/TrackingCode.tsx b/src/app/(main)/settings/websites/[id]/TrackingCode.tsx
new file mode 100644
index 000000000..6d05de31d
--- /dev/null
+++ b/src/app/(main)/settings/websites/[id]/TrackingCode.tsx
@@ -0,0 +1,29 @@
+import { TextArea } from 'react-basics';
+import useMessages from 'components/hooks/useMessages';
+import useConfig from 'components/hooks/useConfig';
+import { useContext } from 'react';
+import SettingsContext from '../../SettingsContext';
+
+export function TrackingCode({ websiteId }: { websiteId: string }) {
+  const { formatMessage, messages } = useMessages();
+  const config = useConfig();
+  const { trackingCodeUrl } = useContext(SettingsContext);
+
+  const trackerScriptName =
+    config?.trackerScriptName?.split(',')?.map(n => n.trim())?.[0] || 'script.js';
+
+  const url = trackerScriptName?.startsWith('http')
+    ? trackerScriptName
+    : `${trackingCodeUrl}${process.env.basePath}/${trackerScriptName}`;
+
+  const code = `<script async src="${url}" data-website-id="${websiteId}"></script>`;
+
+  return (
+    <>
+      <p>{formatMessage(messages.trackingCode)}</p>
+      <TextArea rows={4} value={code} readOnly allowCopy />
+    </>
+  );
+}
+
+export default TrackingCode;
diff --git a/components/pages/settings/websites/WebsiteData.js b/src/app/(main)/settings/websites/[id]/WebsiteData.tsx
similarity index 78%
rename from components/pages/settings/websites/WebsiteData.js
rename to src/app/(main)/settings/websites/[id]/WebsiteData.tsx
index a2bc6bfae..0ad3b5596 100644
--- a/components/pages/settings/websites/WebsiteData.js
+++ b/src/app/(main)/settings/websites/[id]/WebsiteData.tsx
@@ -1,9 +1,15 @@
 import { Button, Modal, ModalTrigger, ActionForm } from 'react-basics';
-import WebsiteDeleteForm from 'components/pages/settings/websites/WebsiteDeleteForm';
-import WebsiteResetForm from 'components/pages/settings/websites/WebsiteResetForm';
-import useMessages from 'hooks/useMessages';
+import WebsiteDeleteForm from './WebsiteDeleteForm';
+import WebsiteResetForm from './WebsiteResetForm';
+import useMessages from 'components/hooks/useMessages';
 
-export function WebsiteData({ websiteId, onSave }) {
+export function WebsiteData({
+  websiteId,
+  onSave,
+}: {
+  websiteId: string;
+  onSave?: (value: string) => void;
+}) {
   const { formatMessage, labels, messages } = useMessages();
 
   const handleReset = async () => {
@@ -23,7 +29,7 @@ export function WebsiteData({ websiteId, onSave }) {
         <ModalTrigger>
           <Button variant="secondary">{formatMessage(labels.reset)}</Button>
           <Modal title={formatMessage(labels.resetWebsite)}>
-            {close => (
+            {(close: () => void) => (
               <WebsiteResetForm websiteId={websiteId} onSave={handleReset} onClose={close} />
             )}
           </Modal>
@@ -36,7 +42,7 @@ export function WebsiteData({ websiteId, onSave }) {
         <ModalTrigger>
           <Button variant="danger">{formatMessage(labels.delete)}</Button>
           <Modal title={formatMessage(labels.deleteWebsite)}>
-            {close => (
+            {(close: () => void) => (
               <WebsiteDeleteForm websiteId={websiteId} onSave={handleDelete} onClose={close} />
             )}
           </Modal>
diff --git a/components/pages/settings/websites/WebsiteDeleteForm.js b/src/app/(main)/settings/websites/[id]/WebsiteDeleteForm.tsx
similarity index 65%
rename from components/pages/settings/websites/WebsiteDeleteForm.js
rename to src/app/(main)/settings/websites/[id]/WebsiteDeleteForm.tsx
index c9e302fc4..e0f71041d 100644
--- a/components/pages/settings/websites/WebsiteDeleteForm.js
+++ b/src/app/(main)/settings/websites/[id]/WebsiteDeleteForm.tsx
@@ -7,17 +7,30 @@ import {
   SubmitButton,
   TextField,
 } from 'react-basics';
-import useApi from 'hooks/useApi';
-import useMessages from 'hooks/useMessages';
+import useApi from 'components/hooks/useApi';
+import useMessages from 'components/hooks/useMessages';
+import { useContext } from 'react';
+import SettingsContext from '../../SettingsContext';
 
 const CONFIRM_VALUE = 'DELETE';
 
-export function WebsiteDeleteForm({ websiteId, onSave, onClose }) {
+export function WebsiteDeleteForm({
+  websiteId,
+  onSave,
+  onClose,
+}: {
+  websiteId: string;
+  onSave?: () => void;
+  onClose?: () => void;
+}) {
   const { formatMessage, labels, messages, FormattedMessage } = useMessages();
+  const { websitesUrl } = useContext(SettingsContext);
   const { del, useMutation } = useApi();
-  const { mutate, error } = useMutation(data => del(`/websites/${websiteId}`, data));
+  const { mutate, error } = useMutation({
+    mutationFn: (data: any) => del(`${websitesUrl}/${websiteId}`, data),
+  });
 
-  const handleSubmit = async data => {
+  const handleSubmit = async (data: any) => {
     mutate(data, {
       onSuccess: async () => {
         onSave();
diff --git a/components/pages/settings/websites/WebsiteEditForm.js b/src/app/(main)/settings/websites/[id]/WebsiteEditForm.tsx
similarity index 70%
rename from components/pages/settings/websites/WebsiteEditForm.js
rename to src/app/(main)/settings/websites/[id]/WebsiteEditForm.tsx
index 89c62889d..80b36cae1 100644
--- a/components/pages/settings/websites/WebsiteEditForm.js
+++ b/src/app/(main)/settings/websites/[id]/WebsiteEditForm.tsx
@@ -1,16 +1,28 @@
 import { SubmitButton, Form, FormInput, FormRow, FormButtons, TextField } from 'react-basics';
-import { useRef } from 'react';
-import useApi from 'hooks/useApi';
+import { useContext, useRef } from 'react';
+import useApi from 'components/hooks/useApi';
 import { DOMAIN_REGEX } from 'lib/constants';
-import useMessages from 'hooks/useMessages';
+import useMessages from 'components/hooks/useMessages';
+import SettingsContext from '../../SettingsContext';
 
-export function WebsiteEditForm({ websiteId, data, onSave }) {
+export function WebsiteEditForm({
+  websiteId,
+  data,
+  onSave,
+}: {
+  websiteId: string;
+  data: any[];
+  onSave?: (data: any) => void;
+}) {
   const { formatMessage, labels, messages } = useMessages();
+  const { websitesUrl } = useContext(SettingsContext);
   const { post, useMutation } = useApi();
-  const { mutate, error } = useMutation(data => post(`/websites/${websiteId}`, data));
+  const { mutate, error } = useMutation({
+    mutationFn: (data: any) => post(`${websitesUrl}/${websiteId}`, data),
+  });
   const ref = useRef(null);
 
-  const handleSubmit = async data => {
+  const handleSubmit = async (data: any) => {
     mutate(data, {
       onSuccess: async () => {
         ref.current.reset(data);
diff --git a/components/pages/settings/websites/WebsiteResetForm.js b/src/app/(main)/settings/websites/[id]/WebsiteResetForm.tsx
similarity index 65%
rename from components/pages/settings/websites/WebsiteResetForm.js
rename to src/app/(main)/settings/websites/[id]/WebsiteResetForm.tsx
index 5fc0acf7a..0c02c77bc 100644
--- a/components/pages/settings/websites/WebsiteResetForm.js
+++ b/src/app/(main)/settings/websites/[id]/WebsiteResetForm.tsx
@@ -7,17 +7,30 @@ import {
   SubmitButton,
   TextField,
 } from 'react-basics';
-import useApi from 'hooks/useApi';
-import useMessages from 'hooks/useMessages';
+import useApi from 'components/hooks/useApi';
+import useMessages from 'components/hooks/useMessages';
+import { useContext } from 'react';
+import SettingsContext from '../../SettingsContext';
 
 const CONFIRM_VALUE = 'RESET';
 
-export function WebsiteResetForm({ websiteId, onSave, onClose }) {
+export function WebsiteResetForm({
+  websiteId,
+  onSave,
+  onClose,
+}: {
+  websiteId: string;
+  onSave?: () => void;
+  onClose?: () => void;
+}) {
   const { formatMessage, labels, messages, FormattedMessage } = useMessages();
+  const { websitesUrl } = useContext(SettingsContext);
   const { post, useMutation } = useApi();
-  const { mutate, error } = useMutation(data => post(`/websites/${websiteId}/reset`, data));
+  const { mutate, error } = useMutation({
+    mutationFn: (data: any) => post(`${websitesUrl}/${websiteId}/reset`, data),
+  });
 
-  const handleSubmit = async data => {
+  const handleSubmit = async (data: any) => {
     mutate(data, {
       onSuccess: async () => {
         onSave();
diff --git a/src/app/(main)/settings/websites/[id]/page.tsx b/src/app/(main)/settings/websites/[id]/page.tsx
new file mode 100644
index 000000000..37324659a
--- /dev/null
+++ b/src/app/(main)/settings/websites/[id]/page.tsx
@@ -0,0 +1,9 @@
+import WebsiteSettings from '../WebsiteSettings';
+
+export default async function WebsiteSettingsPage({ params: { id } }) {
+  if (process.env.cloudMode) {
+    return null;
+  }
+
+  return <WebsiteSettings websiteId={id} />;
+}
diff --git a/src/app/(main)/settings/websites/page.tsx b/src/app/(main)/settings/websites/page.tsx
new file mode 100644
index 000000000..d6d11898c
--- /dev/null
+++ b/src/app/(main)/settings/websites/page.tsx
@@ -0,0 +1,10 @@
+import { Metadata } from 'next';
+import Websites from './Websites';
+
+export default function () {
+  return <Websites />;
+}
+
+export const metadata: Metadata = {
+  title: 'Websites Settings | umami',
+};
diff --git a/src/app/(main)/websites/WebsitesBrowse.tsx b/src/app/(main)/websites/WebsitesBrowse.tsx
new file mode 100644
index 000000000..c426cc069
--- /dev/null
+++ b/src/app/(main)/websites/WebsitesBrowse.tsx
@@ -0,0 +1,37 @@
+'use client';
+import WebsitesDataTable from '../settings/websites/WebsitesDataTable';
+import { useMessages, useUser } from 'components/hooks';
+import { useState } from 'react';
+import { Item, Tabs } from 'react-basics';
+
+const TABS = {
+  myWebsites: 'my-websites',
+  teamWebsites: 'team-websites',
+};
+
+export function WebsitesBrowse() {
+  const { user } = useUser();
+  const { formatMessage, labels } = useMessages();
+  const [tab, setTab] = useState(TABS.myWebsites);
+  const allowEdit = !process.env.cloudMode;
+
+  return (
+    <>
+      <Tabs selectedKey={tab} onSelect={(tab: any) => setTab(tab)} style={{ marginBottom: 30 }}>
+        <Item key={TABS.myWebsites}>{formatMessage(labels.myWebsites)}</Item>
+        <Item key={TABS.teamWebsites}>{formatMessage(labels.teamWebsites)}</Item>
+      </Tabs>
+      {tab === TABS.myWebsites && <WebsitesDataTable userId={user.id} allowEdit={allowEdit} />}
+      {tab === TABS.teamWebsites && (
+        <WebsitesDataTable
+          userId={user.id}
+          showTeam={true}
+          onlyTeams={true}
+          allowEdit={allowEdit}
+        />
+      )}
+    </>
+  );
+}
+
+export default WebsitesBrowse;
diff --git a/components/pages/websites/WebsiteChart.module.css b/src/app/(main)/websites/[id]/WebsiteChart.module.css
similarity index 100%
rename from components/pages/websites/WebsiteChart.module.css
rename to src/app/(main)/websites/[id]/WebsiteChart.module.css
diff --git a/components/pages/websites/WebsiteChart.js b/src/app/(main)/websites/[id]/WebsiteChart.tsx
similarity index 77%
rename from components/pages/websites/WebsiteChart.js
rename to src/app/(main)/websites/[id]/WebsiteChart.tsx
index fac0fb379..eba155c11 100644
--- a/components/pages/websites/WebsiteChart.js
+++ b/src/app/(main)/websites/[id]/WebsiteChart.tsx
@@ -1,23 +1,23 @@
 import { useMemo } from 'react';
 import PageviewsChart from 'components/metrics/PageviewsChart';
-import { useApi, useDateRange, useTimezone, usePageQuery } from 'hooks';
+import { useApi, useDateRange, useTimezone, useNavigation } from 'components/hooks';
 import { getDateArray } from 'lib/date';
 
-export function WebsiteChart({ websiteId }) {
+export function WebsiteChart({ websiteId }: { websiteId: string }) {
   const [dateRange] = useDateRange(websiteId);
   const { startDate, endDate, unit, modified } = dateRange;
   const [timezone] = useTimezone();
   const {
     query: { url, referrer, os, browser, device, country, region, city, title },
-  } = usePageQuery();
+  } = useNavigation();
   const { get, useQuery } = useApi();
 
-  const { data, isLoading } = useQuery(
-    [
+  const { data, isLoading } = useQuery({
+    queryKey: [
       'websites:pageviews',
       { websiteId, modified, url, referrer, os, browser, device, country, region, city, title },
     ],
-    () =>
+    queryFn: () =>
       get(`/websites/${websiteId}/pageviews`, {
         startAt: +startDate,
         endAt: +endDate,
@@ -33,7 +33,7 @@ export function WebsiteChart({ websiteId }) {
         city,
         title,
       }),
-  );
+  });
 
   const chartData = useMemo(() => {
     if (data) {
@@ -45,7 +45,7 @@ export function WebsiteChart({ websiteId }) {
     return { pageviews: [], sessions: [] };
   }, [data, startDate, endDate, unit]);
 
-  return <PageviewsChart websiteId={websiteId} data={chartData} unit={unit} loading={isLoading} />;
+  return <PageviewsChart data={chartData} unit={unit} isLoading={isLoading} />;
 }
 
 export default WebsiteChart;
diff --git a/components/pages/websites/WebsiteChartList.js b/src/app/(main)/websites/[id]/WebsiteChartList.tsx
similarity index 74%
rename from components/pages/websites/WebsiteChartList.js
rename to src/app/(main)/websites/[id]/WebsiteChartList.tsx
index 62b05a4d9..b35b6f1f0 100644
--- a/components/pages/websites/WebsiteChartList.js
+++ b/src/app/(main)/websites/[id]/WebsiteChartList.tsx
@@ -1,16 +1,22 @@
-import { Button, Text, Icon } from 'react-basics';
+import { Button, Text, Icon, Icons } from 'react-basics';
 import { useMemo } from 'react';
 import { firstBy } from 'thenby';
 import Link from 'next/link';
-import WebsiteChart from 'components/pages/websites/WebsiteChart';
+import WebsiteChart from './WebsiteChart';
 import useDashboard from 'store/dashboard';
-import styles from './WebsiteList.module.css';
 import WebsiteHeader from './WebsiteHeader';
 import { WebsiteMetricsBar } from './WebsiteMetricsBar';
-import { useMessages, useLocale } from 'hooks';
-import Icons from 'components/icons';
+import { useMessages, useLocale } from 'components/hooks';
 
-export default function WebsiteChartList({ websites, showCharts, limit }) {
+export default function WebsiteChartList({
+  websites,
+  showCharts,
+  limit,
+}: {
+  websites: any[];
+  showCharts?: boolean;
+  limit?: number;
+}) {
   const { formatMessage, labels } = useMessages();
   const { websiteOrder } = useDashboard();
   const { dir } = useLocale();
@@ -27,7 +33,7 @@ export default function WebsiteChartList({ websites, showCharts, limit }) {
     <div>
       {ordered.map(({ id }, index) => {
         return index < limit ? (
-          <div key={id} className={styles.website}>
+          <div key={id}>
             <WebsiteHeader websiteId={id} showLinks={false}>
               <Link href={`/websites/${id}`}>
                 <Button variant="primary">
@@ -40,7 +46,7 @@ export default function WebsiteChartList({ websites, showCharts, limit }) {
                 </Button>
               </Link>
             </WebsiteHeader>
-            <WebsiteMetricsBar websiteId={id} />
+            <WebsiteMetricsBar websiteId={id} showFilter={false} />
             {showCharts && <WebsiteChart websiteId={id} />}
           </div>
         ) : null;
diff --git a/src/app/(main)/websites/[id]/WebsiteDetails.tsx b/src/app/(main)/websites/[id]/WebsiteDetails.tsx
new file mode 100644
index 000000000..b234ea0a1
--- /dev/null
+++ b/src/app/(main)/websites/[id]/WebsiteDetails.tsx
@@ -0,0 +1,42 @@
+'use client';
+import { Loading } from 'react-basics';
+import { usePathname } from 'next/navigation';
+import Page from 'components/layout/Page';
+import FilterTags from 'components/metrics/FilterTags';
+import useNavigation from 'components/hooks/useNavigation';
+import { useWebsite } from 'components/hooks';
+import WebsiteChart from './WebsiteChart';
+import WebsiteExpandedView from './WebsiteExpandedView';
+import WebsiteHeader from './WebsiteHeader';
+import WebsiteMetricsBar from './WebsiteMetricsBar';
+import WebsiteTableView from './WebsiteTableView';
+
+export default function WebsiteDetails({ websiteId }: { websiteId: string }) {
+  const { data: website, isLoading, error } = useWebsite(websiteId);
+  const pathname = usePathname();
+  const showLinks = !pathname.includes('/share/');
+
+  const {
+    query: { view, url, referrer, os, browser, device, country, region, city, title },
+  } = useNavigation();
+
+  if (isLoading || error) {
+    return <Page isLoading={isLoading} error={error} />;
+  }
+
+  return (
+    <>
+      <WebsiteHeader websiteId={websiteId} showLinks={showLinks} />
+      <FilterTags params={{ url, referrer, os, browser, device, country, region, city, title }} />
+      <WebsiteMetricsBar websiteId={websiteId} sticky={true} />
+      <WebsiteChart websiteId={websiteId} />
+      {!website && <Loading icon="dots" style={{ minHeight: 300 }} />}
+      {website && (
+        <>
+          {!view && <WebsiteTableView websiteId={websiteId} domainName={website.domain} />}
+          {view && <WebsiteExpandedView websiteId={websiteId} domainName={website.domain} />}
+        </>
+      )}
+    </>
+  );
+}
diff --git a/src/app/(main)/websites/[id]/WebsiteExpandedView.module.css b/src/app/(main)/websites/[id]/WebsiteExpandedView.module.css
new file mode 100644
index 000000000..b3dcb8d04
--- /dev/null
+++ b/src/app/(main)/websites/[id]/WebsiteExpandedView.module.css
@@ -0,0 +1,63 @@
+.layout {
+  display: grid;
+  grid-template-columns: 300px 1fr;
+  border-top: 1px solid var(--base300);
+}
+
+.menu {
+  display: flex;
+  flex-direction: column;
+  position: relative;
+  padding: 20px 20px 20px 0;
+}
+
+.back {
+  display: inline-flex;
+  align-items: center;
+  align-self: center;
+  margin-bottom: 20px;
+}
+
+.content {
+  min-height: 800px;
+  padding: 20px 0 20px 20px;
+  border-left: 1px solid var(--base300);
+}
+
+.dropdown {
+  display: none;
+}
+
+@media screen and (max-width: 992px) {
+  .layout {
+    grid-template-columns: 1fr;
+  }
+
+  .content {
+    border: 0;
+  }
+
+  .back {
+    align-self: start;
+    margin: 0;
+  }
+
+  .nav {
+    display: none;
+  }
+
+  .dropdown {
+    display: flex;
+    width: 200px;
+    align-self: end;
+  }
+
+  .menu {
+    display: flex;
+    flex-direction: row;
+    gap: 20px;
+    align-items: center;
+    justify-content: space-between;
+    padding-right: 0;
+  }
+}
diff --git a/components/pages/websites/WebsiteMenuView.js b/src/app/(main)/websites/[id]/WebsiteExpandedView.tsx
similarity index 53%
rename from components/pages/websites/WebsiteMenuView.js
rename to src/app/(main)/websites/[id]/WebsiteExpandedView.tsx
index 39adb188f..f01d93633 100644
--- a/components/pages/websites/WebsiteMenuView.js
+++ b/src/app/(main)/websites/[id]/WebsiteExpandedView.tsx
@@ -1,6 +1,4 @@
-import { Icon, Button, Flexbox, Text } from 'react-basics';
-import Link from 'next/link';
-import { GridRow, GridColumn } from 'components/layout/Grid';
+import { Icons, Icon, Text, Dropdown, Item } from 'react-basics';
 import BrowsersTable from 'components/metrics/BrowsersTable';
 import CountriesTable from 'components/metrics/CountriesTable';
 import RegionsTable from 'components/metrics/RegionsTable';
@@ -13,12 +11,11 @@ import QueryParametersTable from 'components/metrics/QueryParametersTable';
 import ReferrersTable from 'components/metrics/ReferrersTable';
 import ScreenTable from 'components/metrics/ScreenTable';
 import EventsTable from 'components/metrics/EventsTable';
-import Icons from 'components/icons';
 import SideNav from 'components/layout/SideNav';
-import usePageQuery from 'hooks/usePageQuery';
-import useMessages from 'hooks/useMessages';
-import styles from './WebsiteMenuView.module.css';
-import useLocale from 'hooks/useLocale';
+import useNavigation from 'components/hooks/useNavigation';
+import useMessages from 'components/hooks/useMessages';
+import LinkButton from 'components/common/LinkButton';
+import styles from './WebsiteExpandedView.module.css';
 
 const views = {
   url: PagesTable,
@@ -36,104 +33,124 @@ const views = {
   query: QueryParametersTable,
 };
 
-export default function WebsiteMenuView({ websiteId, websiteDomain }) {
+export default function WebsiteExpandedView({
+  websiteId,
+  domainName,
+}: {
+  websiteId: string;
+  domainName?: string;
+}) {
   const { formatMessage, labels } = useMessages();
-  const { dir } = useLocale();
   const {
-    resolveUrl,
+    router,
+    makeUrl,
+    pathname,
     query: { view },
-  } = usePageQuery();
+  } = useNavigation();
 
   const items = [
     {
       key: 'url',
       label: formatMessage(labels.pages),
-      url: resolveUrl({ view: 'url' }),
+      url: makeUrl({ view: 'url' }),
     },
     {
       key: 'referrer',
       label: formatMessage(labels.referrers),
-      url: resolveUrl({ view: 'referrer' }),
+      url: makeUrl({ view: 'referrer' }),
     },
     {
       key: 'browser',
       label: formatMessage(labels.browsers),
-      url: resolveUrl({ view: 'browser' }),
+      url: makeUrl({ view: 'browser' }),
     },
     {
       key: 'os',
       label: formatMessage(labels.os),
-      url: resolveUrl({ view: 'os' }),
+      url: makeUrl({ view: 'os' }),
     },
     {
       key: 'device',
       label: formatMessage(labels.devices),
-      url: resolveUrl({ view: 'device' }),
+      url: makeUrl({ view: 'device' }),
     },
     {
       key: 'country',
       label: formatMessage(labels.countries),
-      url: resolveUrl({ view: 'country' }),
+      url: makeUrl({ view: 'country' }),
     },
     {
       key: 'region',
       label: formatMessage(labels.regions),
-      url: resolveUrl({ view: 'region' }),
+      url: makeUrl({ view: 'region' }),
     },
     {
       key: 'city',
       label: formatMessage(labels.cities),
-      url: resolveUrl({ view: 'city' }),
+      url: makeUrl({ view: 'city' }),
     },
     {
       key: 'language',
       label: formatMessage(labels.languages),
-      url: resolveUrl({ view: 'language' }),
+      url: makeUrl({ view: 'language' }),
     },
     {
       key: 'screen',
       label: formatMessage(labels.screens),
-      url: resolveUrl({ view: 'screen' }),
+      url: makeUrl({ view: 'screen' }),
     },
     {
       key: 'event',
       label: formatMessage(labels.events),
-      url: resolveUrl({ view: 'event' }),
+      url: makeUrl({ view: 'event' }),
     },
     {
       key: 'query',
       label: formatMessage(labels.queryParameters),
-      url: resolveUrl({ view: 'query' }),
+      url: makeUrl({ view: 'query' }),
     },
   ];
 
   const DetailsComponent = views[view] || (() => null);
 
+  const handleChange = (view: any) => {
+    router.push(makeUrl({ view }));
+  };
+
+  const renderValue = (value: string) => items.find(({ key }) => key === value)?.label;
+
   return (
-    <GridRow>
-      <GridColumn xs={12} sm={12} md={12} defaultSize={3} className={styles.menu}>
-        <Link href={resolveUrl({ view: undefined })}>
-          <Flexbox justifyContent="center">
-            <Button variant="quiet">
-              <Icon rotate={dir === 'rtl' ? 0 : 180}>
-                <Icons.ArrowRight />
-              </Icon>
-              <Text>{formatMessage(labels.back)}</Text>
-            </Button>
-          </Flexbox>
-        </Link>
-        <SideNav items={items} selectedKey={view} shallow={true} />
-      </GridColumn>
-      <GridColumn xs={12} sm={12} md={12} defaultSize={9} className={styles.content}>
+    <div className={styles.layout}>
+      <div className={styles.menu}>
+        <LinkButton href={pathname} className={styles.back} variant="quiet" scroll={false}>
+          <Icon rotate={180}>
+            <Icons.ArrowRight />
+          </Icon>
+          <Text>{formatMessage(labels.back)}</Text>
+        </LinkButton>
+        <SideNav className={styles.nav} items={items} selectedKey={view} shallow={true} />
+        <Dropdown
+          className={styles.dropdown}
+          items={items}
+          value={view}
+          renderValue={renderValue}
+          onChange={handleChange}
+          alignment="end"
+        >
+          {({ key, label }) => <Item key={key}>{label}</Item>}
+        </Dropdown>
+      </div>
+      <div className={styles.content}>
         <DetailsComponent
           websiteId={websiteId}
-          websiteDomain={websiteDomain}
-          limit={false}
+          domainName={domainName}
           animate={false}
-          showFilters={true}
           virtualize={true}
+          itemCount={25}
+          allowFilter={true}
+          allowSearch={true}
         />
-      </GridColumn>
-    </GridRow>
+      </div>
+    </div>
   );
 }
diff --git a/src/app/(main)/websites/[id]/WebsiteFilterButton.tsx b/src/app/(main)/websites/[id]/WebsiteFilterButton.tsx
new file mode 100644
index 000000000..6a02cd474
--- /dev/null
+++ b/src/app/(main)/websites/[id]/WebsiteFilterButton.tsx
@@ -0,0 +1,60 @@
+import { Button, Icon, Icons, Popup, PopupTrigger, Text } from 'react-basics';
+import PopupForm from 'app/(main)/reports/[id]/PopupForm';
+import FilterSelectForm from 'app/(main)/reports/[id]/FilterSelectForm';
+import { useMessages, useNavigation } from 'components/hooks';
+
+export function WebsiteFilterButton({
+  websiteId,
+  className,
+}: {
+  websiteId: string;
+  className?: string;
+}) {
+  const { formatMessage, labels } = useMessages();
+  const { makeUrl, router } = useNavigation();
+
+  const fieldOptions = [
+    { name: 'url', type: 'string', label: formatMessage(labels.url) },
+    { name: 'referrer', type: 'string', label: formatMessage(labels.referrer) },
+    { name: 'browser', type: 'string', label: formatMessage(labels.browser) },
+    { name: 'os', type: 'string', label: formatMessage(labels.os) },
+    { name: 'device', type: 'string', label: formatMessage(labels.device) },
+    { name: 'country', type: 'string', label: formatMessage(labels.country) },
+    { name: 'region', type: 'string', label: formatMessage(labels.region) },
+    { name: 'city', type: 'string', label: formatMessage(labels.city) },
+  ];
+
+  const handleAddFilter = ({ name, value }) => {
+    router.push(makeUrl({ [name]: value }));
+  };
+
+  return (
+    <PopupTrigger>
+      <Button className={className}>
+        <Icon>
+          <Icons.Plus />
+        </Icon>
+        <Text>{formatMessage(labels.filter)}</Text>
+      </Button>
+      <Popup position="bottom" alignment="start">
+        {(close: () => void) => {
+          return (
+            <PopupForm>
+              <FilterSelectForm
+                websiteId={websiteId}
+                items={fieldOptions}
+                onSelect={value => {
+                  handleAddFilter(value);
+                  close();
+                }}
+                allowFilterSelect={false}
+              />
+            </PopupForm>
+          );
+        }}
+      </Popup>
+    </PopupTrigger>
+  );
+}
+
+export default WebsiteFilterButton;
diff --git a/components/pages/websites/WebsiteHeader.module.css b/src/app/(main)/websites/[id]/WebsiteHeader.module.css
similarity index 83%
rename from components/pages/websites/WebsiteHeader.module.css
rename to src/app/(main)/websites/[id]/WebsiteHeader.module.css
index 93e622d90..3e58c8a3e 100644
--- a/components/pages/websites/WebsiteHeader.module.css
+++ b/src/app/(main)/websites/[id]/WebsiteHeader.module.css
@@ -1,6 +1,6 @@
 .header {
-  display: flex;
-  flex-direction: row;
+  display: grid;
+  grid-template-columns: 1fr max-content;
   align-items: center;
 }
 
@@ -35,6 +35,10 @@
 }
 
 @media only screen and (max-width: 768px) {
+  .header {
+    grid-template-columns: 1fr;
+  }
+
   .links {
     justify-content: space-evenly;
     flex: 1;
@@ -49,7 +53,7 @@
 
   .icon,
   .icon svg {
-    width: 30px;
-    height: 30px;
+    width: 20px;
+    height: 20px;
   }
 }
diff --git a/components/pages/websites/WebsiteHeader.js b/src/app/(main)/websites/[id]/WebsiteHeader.tsx
similarity index 71%
rename from components/pages/websites/WebsiteHeader.js
rename to src/app/(main)/websites/[id]/WebsiteHeader.tsx
index 0790397fb..0af9e596f 100644
--- a/components/pages/websites/WebsiteHeader.js
+++ b/src/app/(main)/websites/[id]/WebsiteHeader.tsx
@@ -1,16 +1,26 @@
+'use client';
+import { ReactNode } from 'react';
 import classNames from 'classnames';
-import { Flexbox, Row, Column, Text, Button, Icon } from 'react-basics';
+import { Text, Button, Icon } from 'react-basics';
 import Link from 'next/link';
-import { useRouter } from 'next/router';
+import { usePathname } from 'next/navigation';
 import Favicon from 'components/common/Favicon';
 import ActiveUsers from 'components/metrics/ActiveUsers';
 import Icons from 'components/icons';
-import { useMessages, useWebsite } from 'hooks';
+import { useMessages, useWebsite } from 'components/hooks';
 import styles from './WebsiteHeader.module.css';
 
-export function WebsiteHeader({ websiteId, showLinks = true, children }) {
+export function WebsiteHeader({
+  websiteId,
+  showLinks = true,
+  children,
+}: {
+  websiteId: string;
+  showLinks?: boolean;
+  children?: ReactNode;
+}) {
   const { formatMessage, labels } = useMessages();
-  const { pathname } = useRouter();
+  const pathname = usePathname();
   const { data: website } = useWebsite(websiteId);
   const { name, domain } = website || {};
 
@@ -38,17 +48,19 @@ export function WebsiteHeader({ websiteId, showLinks = true, children }) {
   ];
 
   return (
-    <Row className={styles.header} justifyContent="center">
-      <Column className={styles.title} variant="two">
+    <div className={styles.header}>
+      <div className={styles.title}>
         <Favicon domain={domain} />
         <Text>{name}</Text>
         <ActiveUsers websiteId={websiteId} />
-      </Column>
-      <Column className={styles.actions} variant="two">
+      </div>
+      <div className={styles.actions}>
         {showLinks && (
           <div className={styles.links}>
             {links.map(({ label, icon, path }) => {
-              const selected = path ? pathname.endsWith(path) : pathname === '/websites/[id]';
+              const selected = path
+                ? pathname.endsWith(path)
+                : pathname.match(/^\/websites\/[\w-]+$/);
 
               return (
                 <Link key={label} href={`/websites/${websiteId}${path}`} shallow={true}>
@@ -67,8 +79,8 @@ export function WebsiteHeader({ websiteId, showLinks = true, children }) {
           </div>
         )}
         {children}
-      </Column>
-    </Row>
+      </div>
+    </div>
   );
 }
 
diff --git a/src/app/(main)/websites/[id]/WebsiteMetricsBar.module.css b/src/app/(main)/websites/[id]/WebsiteMetricsBar.module.css
new file mode 100644
index 000000000..db48bd550
--- /dev/null
+++ b/src/app/(main)/websites/[id]/WebsiteMetricsBar.module.css
@@ -0,0 +1,46 @@
+.container {
+  display: grid;
+  grid-template-columns: 1fr max-content;
+  justify-content: space-between;
+  align-items: center;
+  background: var(--base50);
+  z-index: var(--z-index-above);
+  min-height: 120px;
+  padding-bottom: 20px;
+}
+
+.actions {
+  display: flex;
+  align-items: center;
+  flex-direction: row;
+  justify-content: flex-end;
+  gap: 10px;
+}
+
+@media screen and (max-width: 1200px) {
+  .container {
+    grid-template-columns: 1fr;
+  }
+
+  .actions {
+    margin: 20px 0;
+  }
+}
+
+@media screen and (min-width: 992px) {
+  .sticky {
+    position: sticky;
+    top: -1px;
+  }
+
+  .isSticky {
+    padding: 10px 0;
+    border-bottom: 1px solid var(--base300);
+  }
+}
+
+@media screen and (max-width: 768px) {
+  .button {
+    display: none;
+  }
+}
diff --git a/src/app/(main)/websites/[id]/WebsiteMetricsBar.tsx b/src/app/(main)/websites/[id]/WebsiteMetricsBar.tsx
new file mode 100644
index 000000000..e40dd11b8
--- /dev/null
+++ b/src/app/(main)/websites/[id]/WebsiteMetricsBar.tsx
@@ -0,0 +1,120 @@
+import classNames from 'classnames';
+import { useApi, useDateRange, useMessages, useNavigation, useSticky } from 'components/hooks';
+import WebsiteDateFilter from 'components/input/WebsiteDateFilter';
+import MetricCard from 'components/metrics/MetricCard';
+import MetricsBar from 'components/metrics/MetricsBar';
+import { formatShortTime } from 'lib/format';
+import WebsiteFilterButton from './WebsiteFilterButton';
+import styles from './WebsiteMetricsBar.module.css';
+
+export function WebsiteMetricsBar({
+  websiteId,
+  showFilter = true,
+  sticky,
+}: {
+  websiteId: string;
+  showFilter?: boolean;
+  sticky?: boolean;
+}) {
+  const { formatMessage, labels } = useMessages();
+  const { get, useQuery } = useApi();
+  const [dateRange] = useDateRange(websiteId);
+  const { startDate, endDate, modified } = dateRange;
+  const { ref, isSticky } = useSticky({ enabled: sticky });
+  const {
+    query: { url, referrer, title, os, browser, device, country, region, city },
+  } = useNavigation();
+
+  const { data, error, isLoading, isFetched } = useQuery({
+    queryKey: [
+      'websites:stats',
+      { websiteId, modified, url, referrer, title, os, browser, device, country, region, city },
+    ],
+    queryFn: () =>
+      get(`/websites/${websiteId}/stats`, {
+        startAt: +startDate,
+        endAt: +endDate,
+        url,
+        referrer,
+        title,
+        os,
+        browser,
+        device,
+        country,
+        region,
+        city,
+      }),
+  });
+
+  const { pageviews, uniques, bounces, totaltime } = data || {};
+  const num = Math.min(data && uniques.value, data && bounces.value);
+  const diffs = data && {
+    pageviews: pageviews.value - pageviews.change,
+    uniques: uniques.value - uniques.change,
+    bounces: bounces.value - bounces.change,
+    totaltime: totaltime.value - totaltime.change,
+  };
+
+  return (
+    <div
+      ref={ref}
+      className={classNames(styles.container, {
+        [styles.sticky]: sticky,
+        [styles.isSticky]: isSticky,
+      })}
+    >
+      <MetricsBar isLoading={isLoading} isFetched={isFetched} error={error}>
+        {pageviews && uniques && (
+          <>
+            <MetricCard
+              label={formatMessage(labels.views)}
+              value={pageviews.value}
+              change={pageviews.change}
+            />
+            <MetricCard
+              label={formatMessage(labels.visitors)}
+              value={uniques.value}
+              change={uniques.change}
+            />
+            <MetricCard
+              className={styles.card}
+              label={formatMessage(labels.bounceRate)}
+              value={uniques.value ? (num / uniques.value) * 100 : 0}
+              change={
+                uniques.value && uniques.change
+                  ? (num / uniques.value) * 100 -
+                      (Math.min(diffs.uniques, diffs.bounces) / diffs.uniques) * 100 || 0
+                  : 0
+              }
+              format={n => Number(n).toFixed(0) + '%'}
+              reverseColors
+            />
+            <MetricCard
+              className={styles.card}
+              label={formatMessage(labels.averageVisitTime)}
+              value={
+                totaltime.value && pageviews.value
+                  ? totaltime.value / (pageviews.value - bounces.value)
+                  : 0
+              }
+              change={
+                totaltime.value && pageviews.value
+                  ? (diffs.totaltime / (diffs.pageviews - diffs.bounces) -
+                      totaltime.value / (pageviews.value - bounces.value)) *
+                      -1 || 0
+                  : 0
+              }
+              format={n => `${+n < 0 ? '-' : ''}${formatShortTime(Math.abs(~~n), ['m', 's'], ' ')}`}
+            />
+          </>
+        )}
+      </MetricsBar>
+      <div className={styles.actions}>
+        {showFilter && <WebsiteFilterButton websiteId={websiteId} className={styles.button} />}
+        <WebsiteDateFilter websiteId={websiteId} />
+      </div>
+    </div>
+  );
+}
+
+export default WebsiteMetricsBar;
diff --git a/src/app/(main)/websites/[id]/WebsiteTableView.tsx b/src/app/(main)/websites/[id]/WebsiteTableView.tsx
new file mode 100644
index 000000000..7cc415e5c
--- /dev/null
+++ b/src/app/(main)/websites/[id]/WebsiteTableView.tsx
@@ -0,0 +1,48 @@
+import { useState } from 'react';
+import { Grid, GridRow } from 'components/layout/Grid';
+import PagesTable from 'components/metrics/PagesTable';
+import ReferrersTable from 'components/metrics/ReferrersTable';
+import BrowsersTable from 'components/metrics/BrowsersTable';
+import OSTable from 'components/metrics/OSTable';
+import DevicesTable from 'components/metrics/DevicesTable';
+import WorldMap from 'components/metrics/WorldMap';
+import CountriesTable from 'components/metrics/CountriesTable';
+import EventsTable from 'components/metrics/EventsTable';
+import EventsChart from 'components/metrics/EventsChart';
+
+export default function WebsiteTableView({
+  websiteId,
+  domainName,
+}: {
+  websiteId: string;
+  domainName: string;
+}) {
+  const [countryData, setCountryData] = useState();
+  const tableProps = {
+    websiteId,
+    domainName,
+    limit: 10,
+  };
+
+  return (
+    <Grid>
+      <GridRow columns="two">
+        <PagesTable {...tableProps} />
+        <ReferrersTable {...tableProps} />
+      </GridRow>
+      <GridRow columns="three">
+        <BrowsersTable {...tableProps} />
+        <OSTable {...tableProps} />
+        <DevicesTable {...tableProps} />
+      </GridRow>
+      <GridRow columns="two-one">
+        <WorldMap data={countryData} />
+        <CountriesTable {...tableProps} onDataLoad={setCountryData} />
+      </GridRow>
+      <GridRow columns="one-two">
+        <EventsTable {...tableProps} />
+        <EventsChart websiteId={websiteId} />
+      </GridRow>
+    </Grid>
+  );
+}
diff --git a/components/pages/websites/WebsiteMetricsBar.module.css b/src/app/(main)/websites/[id]/event-data/EventDataMetricsBar.module.css
similarity index 53%
rename from components/pages/websites/WebsiteMetricsBar.module.css
rename to src/app/(main)/websites/[id]/event-data/EventDataMetricsBar.module.css
index 52decfc65..408396c37 100644
--- a/components/pages/websites/WebsiteMetricsBar.module.css
+++ b/src/app/(main)/websites/[id]/event-data/EventDataMetricsBar.module.css
@@ -1,5 +1,6 @@
 .container {
-  display: flex;
+  display: grid;
+  grid-template-columns: 1fr 1fr;
   justify-content: space-between;
   align-items: center;
   padding: 10px 0;
@@ -11,25 +12,15 @@
 
 .actions {
   display: flex;
-  align-items: center;
   flex-direction: row;
+  align-items: center;
   justify-content: flex-end;
-  gap: 10px;
+  flex: 1;
 }
 
-@media only screen and (max-width: 1200px) {
-  .actions {
-    margin-top: 40px;
-  }
-}
-
-@media only screen and (min-width: 992px) {
-  .sticky {
-    position: sticky;
-    top: -1px;
-  }
-
-  .isSticky {
-    border-bottom: 1px solid var(--base300);
+@media only screen and (max-width: 992px) {
+  .container {
+    grid-template-columns: 1fr;
+    grid-template-rows: 1fr 1fr;
   }
 }
diff --git a/src/app/(main)/websites/[id]/event-data/EventDataMetricsBar.tsx b/src/app/(main)/websites/[id]/event-data/EventDataMetricsBar.tsx
new file mode 100644
index 000000000..419472d59
--- /dev/null
+++ b/src/app/(main)/websites/[id]/event-data/EventDataMetricsBar.tsx
@@ -0,0 +1,38 @@
+import { useApi, useDateRange } from 'components/hooks';
+import MetricCard from 'components/metrics/MetricCard';
+import useMessages from 'components/hooks/useMessages';
+import WebsiteDateFilter from 'components/input/WebsiteDateFilter';
+import MetricsBar from 'components/metrics/MetricsBar';
+import styles from './EventDataMetricsBar.module.css';
+
+export function EventDataMetricsBar({ websiteId }: { websiteId: string }) {
+  const { formatMessage, labels } = useMessages();
+  const { get, useQuery } = useApi();
+  const [dateRange] = useDateRange(websiteId);
+  const { startDate, endDate, modified } = dateRange;
+
+  const { data, error, isLoading, isFetched } = useQuery({
+    queryKey: ['event-data:stats', { websiteId, startDate, endDate, modified }],
+    queryFn: () =>
+      get(`/event-data/stats`, {
+        websiteId,
+        startAt: +startDate,
+        endAt: +endDate,
+      }),
+  });
+
+  return (
+    <div className={styles.container}>
+      <MetricsBar isLoading={isLoading} isFetched={isFetched} error={error}>
+        <MetricCard label={formatMessage(labels.events)} value={data?.events} />
+        <MetricCard label={formatMessage(labels.fields)} value={data?.fields} />
+        <MetricCard label={formatMessage(labels.totalRecords)} value={data?.records} />
+      </MetricsBar>
+      <div className={styles.actions}>
+        <WebsiteDateFilter websiteId={websiteId} />
+      </div>
+    </div>
+  );
+}
+
+export default EventDataMetricsBar;
diff --git a/components/pages/event-data/EventDataTable.js b/src/app/(main)/websites/[id]/event-data/EventDataTable.tsx
similarity index 52%
rename from components/pages/event-data/EventDataTable.js
rename to src/app/(main)/websites/[id]/event-data/EventDataTable.tsx
index 8260ac35b..fb98e7e76 100644
--- a/components/pages/event-data/EventDataTable.js
+++ b/src/app/(main)/websites/[id]/event-data/EventDataTable.tsx
@@ -1,11 +1,12 @@
 import Link from 'next/link';
 import { GridTable, GridColumn } from 'react-basics';
-import { useMessages, usePageQuery } from 'hooks';
+import { useMessages, useNavigation } from 'components/hooks';
 import Empty from 'components/common/Empty';
+import { DATA_TYPES } from 'lib/constants';
 
 export function EventDataTable({ data = [] }) {
   const { formatMessage, labels } = useMessages();
-  const { resolveUrl } = usePageQuery();
+  const { makeUrl } = useNavigation();
 
   if (data.length === 0) {
     return <Empty />;
@@ -13,15 +14,18 @@ export function EventDataTable({ data = [] }) {
 
   return (
     <GridTable data={data}>
-      <GridColumn name="event" label={formatMessage(labels.event)}>
+      <GridColumn name="eventName" label={formatMessage(labels.event)}>
         {row => (
-          <Link href={resolveUrl({ event: row.event })} shallow={true}>
-            {row.event}
+          <Link href={makeUrl({ event: row.eventName })} shallow={true}>
+            {row.eventName}
           </Link>
         )}
       </GridColumn>
-      <GridColumn name="field" label={formatMessage(labels.field)}>
-        {row => row.field}
+      <GridColumn name="fieldName" label={formatMessage(labels.field)}>
+        {row => row.fieldName}
+      </GridColumn>
+      <GridColumn name="dataType" label={formatMessage(labels.type)}>
+        {row => DATA_TYPES[row.dataType]}
       </GridColumn>
       <GridColumn name="total" label={formatMessage(labels.totalRecords)}>
         {({ total }) => total.toLocaleString()}
diff --git a/components/pages/event-data/EventDataValueTable.js b/src/app/(main)/websites/[id]/event-data/EventDataValueTable.tsx
similarity index 58%
rename from components/pages/event-data/EventDataValueTable.js
rename to src/app/(main)/websites/[id]/event-data/EventDataValueTable.tsx
index 2637053ef..7976ce36f 100644
--- a/components/pages/event-data/EventDataValueTable.js
+++ b/src/app/(main)/websites/[id]/event-data/EventDataValueTable.tsx
@@ -1,18 +1,19 @@
-import { GridTable, GridColumn, Button, Icon, Text, Flexbox } from 'react-basics';
-import { useMessages, usePageQuery } from 'hooks';
+import { GridTable, GridColumn, Button, Icon, Text } from 'react-basics';
+import { useMessages, useNavigation } from 'components/hooks';
 import Link from 'next/link';
 import Icons from 'components/icons';
 import PageHeader from 'components/layout/PageHeader';
 import Empty from 'components/common/Empty';
+import { DATA_TYPES } from 'lib/constants';
 
-export function EventDataValueTable({ data = [], event }) {
+export function EventDataValueTable({ data = [], event }: { data: any[]; event: string }) {
   const { formatMessage, labels } = useMessages();
-  const { resolveUrl } = usePageQuery();
+  const { makeUrl } = useNavigation();
 
   const Title = () => {
     return (
       <>
-        <Link href={resolveUrl({ event: undefined })}>
+        <Link href={makeUrl({ event: undefined })}>
           <Button>
             <Icon rotate={180}>
               <Icons.ArrowRight />
@@ -31,8 +32,11 @@ export function EventDataValueTable({ data = [], event }) {
       {data.length <= 0 && <Empty />}
       {data.length > 0 && (
         <GridTable data={data}>
-          <GridColumn name="field" label={formatMessage(labels.field)} />
-          <GridColumn name="value" label={formatMessage(labels.value)} />
+          <GridColumn name="fieldName" label={formatMessage(labels.field)} />
+          <GridColumn name="dataType" label={formatMessage(labels.type)}>
+            {row => DATA_TYPES[row.dataType]}
+          </GridColumn>
+          <GridColumn name="fieldValue" label={formatMessage(labels.value)} />
           <GridColumn name="total" label={formatMessage(labels.totalRecords)} width="200px">
             {({ total }) => total.toLocaleString()}
           </GridColumn>
diff --git a/components/pages/websites/WebsiteEventData.module.css b/src/app/(main)/websites/[id]/event-data/WebsiteEventData.module.css
similarity index 100%
rename from components/pages/websites/WebsiteEventData.module.css
rename to src/app/(main)/websites/[id]/event-data/WebsiteEventData.module.css
diff --git a/src/app/(main)/websites/[id]/event-data/WebsiteEventData.tsx b/src/app/(main)/websites/[id]/event-data/WebsiteEventData.tsx
new file mode 100644
index 000000000..61a4dc622
--- /dev/null
+++ b/src/app/(main)/websites/[id]/event-data/WebsiteEventData.tsx
@@ -0,0 +1,42 @@
+'use client';
+import { Flexbox, Loading } from 'react-basics';
+import EventDataTable from './EventDataTable';
+import EventDataValueTable from './EventDataValueTable';
+import { EventDataMetricsBar } from './EventDataMetricsBar';
+import { useDateRange, useApi, useNavigation } from 'components/hooks';
+import styles from './WebsiteEventData.module.css';
+
+function useData(websiteId: string, event: string) {
+  const [dateRange] = useDateRange(websiteId);
+  const { startDate, endDate } = dateRange;
+  const { get, useQuery } = useApi();
+  const { data, error, isLoading } = useQuery({
+    queryKey: ['event-data:events', { websiteId, startDate, endDate, event }],
+    queryFn: () =>
+      get('/event-data/events', {
+        websiteId,
+        startAt: +startDate,
+        endAt: +endDate,
+        event,
+      }),
+    enabled: !!(websiteId && startDate && endDate),
+  });
+
+  return { data, error, isLoading };
+}
+
+export default function WebsiteEventData({ websiteId }) {
+  const {
+    query: { event },
+  } = useNavigation();
+  const { data, isLoading } = useData(websiteId, event);
+
+  return (
+    <Flexbox className={styles.container} direction="column" gap={20}>
+      <EventDataMetricsBar websiteId={websiteId} />
+      {!event && <EventDataTable data={data} />}
+      {isLoading && <Loading position="page" />}
+      {event && data && <EventDataValueTable event={event} data={data} />}
+    </Flexbox>
+  );
+}
diff --git a/src/app/(main)/websites/[id]/event-data/page.tsx b/src/app/(main)/websites/[id]/event-data/page.tsx
new file mode 100644
index 000000000..14e878c62
--- /dev/null
+++ b/src/app/(main)/websites/[id]/event-data/page.tsx
@@ -0,0 +1,15 @@
+import WebsiteHeader from '../WebsiteHeader';
+import WebsiteEventData from './WebsiteEventData';
+
+export default function WebsiteEventDataPage({ params: { id } }) {
+  if (!id) {
+    return null;
+  }
+
+  return (
+    <>
+      <WebsiteHeader websiteId={id} />
+      <WebsiteEventData websiteId={id} />
+    </>
+  );
+}
diff --git a/src/app/(main)/websites/[id]/page.tsx b/src/app/(main)/websites/[id]/page.tsx
new file mode 100644
index 000000000..4b7d6ff35
--- /dev/null
+++ b/src/app/(main)/websites/[id]/page.tsx
@@ -0,0 +1,5 @@
+import WebsiteDetails from './WebsiteDetails';
+
+export default function WebsiteReportsPage({ params: { id } }) {
+  return <WebsiteDetails websiteId={id} />;
+}
diff --git a/components/pages/realtime/RealtimePage.module.css b/src/app/(main)/websites/[id]/realtime/Realtime.module.css
similarity index 100%
rename from components/pages/realtime/RealtimePage.module.css
rename to src/app/(main)/websites/[id]/realtime/Realtime.module.css
diff --git a/src/app/(main)/websites/[id]/realtime/Realtime.tsx b/src/app/(main)/websites/[id]/realtime/Realtime.tsx
new file mode 100644
index 000000000..bd9f74bc1
--- /dev/null
+++ b/src/app/(main)/websites/[id]/realtime/Realtime.tsx
@@ -0,0 +1,115 @@
+'use client';
+import { useMemo, useState, useEffect } from 'react';
+import { subMinutes, startOfMinute } from 'date-fns';
+import thenby from 'thenby';
+import { Grid, GridRow } from 'components/layout/Grid';
+import Page from 'components/layout/Page';
+import RealtimeChart from 'components/metrics/RealtimeChart';
+import WorldMap from 'components/metrics/WorldMap';
+import useApi from 'components/hooks/useApi';
+import { useWebsite } from 'components/hooks';
+import { percentFilter } from 'lib/filters';
+import { REALTIME_RANGE, REALTIME_INTERVAL } from 'lib/constants';
+import { RealtimeData } from 'lib/types';
+import RealtimeLog from './RealtimeLog';
+import RealtimeHeader from './RealtimeHeader';
+import RealtimeUrls from './RealtimeUrls';
+import RealtimeCountries from './RealtimeCountries';
+import WebsiteHeader from '../WebsiteHeader';
+import styles from './Realtime.module.css';
+
+function mergeData(state = [], data = [], time: number) {
+  const ids = state.map(({ id }) => id);
+  return state
+    .concat(data.filter(({ id }) => !ids.includes(id)))
+    .filter(({ timestamp }) => timestamp >= time);
+}
+
+export function Realtime({ websiteId }) {
+  const [currentData, setCurrentData] = useState<RealtimeData>();
+  const { get, useQuery } = useApi();
+  const { data: website } = useWebsite(websiteId);
+  const { data, isLoading, error } = useQuery({
+    queryKey: ['realtime', websiteId],
+    queryFn: () => get(`/realtime/${websiteId}`, { startAt: currentData?.timestamp || 0 }),
+    enabled: !!(websiteId && website),
+    refetchInterval: REALTIME_INTERVAL,
+  });
+
+  useEffect(() => {
+    if (data) {
+      const date = subMinutes(startOfMinute(new Date()), REALTIME_RANGE);
+      const time = date.getTime();
+      const { pageviews, sessions, events, timestamp } = data;
+
+      setCurrentData(state => ({
+        pageviews: mergeData(state?.pageviews, pageviews, time),
+        sessions: mergeData(state?.sessions, sessions, time),
+        events: mergeData(state?.events, events, time),
+        timestamp,
+      }));
+    }
+  }, [data]);
+
+  const realtimeData: RealtimeData = useMemo(() => {
+    if (!currentData) {
+      return { pageviews: [], sessions: [], events: [], countries: [], visitors: [], timestamp: 0 };
+    }
+
+    currentData.countries = percentFilter(
+      currentData.sessions
+        .reduce((arr, data) => {
+          if (!arr.find(({ id }) => id === data.id)) {
+            return arr.concat(data);
+          }
+          return arr;
+        }, [])
+        .reduce((arr: { x: any; y: number }[], { country }: any) => {
+          if (country) {
+            const row = arr.find(({ x }) => x === country);
+
+            if (!row) {
+              arr.push({ x: country, y: 1 });
+            } else {
+              row.y += 1;
+            }
+          }
+          return arr;
+        }, [])
+        .sort(thenby.firstBy('y', -1)),
+    );
+
+    currentData.visitors = currentData.sessions.reduce((arr, val) => {
+      if (!arr.find(({ id }) => id === val.id)) {
+        return arr.concat(val);
+      }
+      return arr;
+    }, []);
+
+    return currentData;
+  }, [currentData]);
+
+  if (isLoading || error) {
+    return <Page isLoading={isLoading} error={error} />;
+  }
+
+  return (
+    <>
+      <WebsiteHeader websiteId={websiteId} />
+      <RealtimeHeader data={realtimeData} />
+      <RealtimeChart className={styles.chart} data={realtimeData} unit="minute" />
+      <Grid>
+        <GridRow columns="one-two">
+          <RealtimeUrls websiteDomain={website?.domain} data={realtimeData} />
+          <RealtimeLog websiteDomain={website?.domain} data={realtimeData} />
+        </GridRow>
+        <GridRow columns="one-two">
+          <RealtimeCountries data={realtimeData?.countries} />
+          <WorldMap data={realtimeData?.countries} />
+        </GridRow>
+      </Grid>
+    </>
+  );
+}
+
+export default Realtime;
diff --git a/components/pages/realtime/RealtimeCountries.module.css b/src/app/(main)/websites/[id]/realtime/RealtimeCountries.module.css
similarity index 100%
rename from components/pages/realtime/RealtimeCountries.module.css
rename to src/app/(main)/websites/[id]/realtime/RealtimeCountries.module.css
diff --git a/components/pages/realtime/RealtimeCountries.js b/src/app/(main)/websites/[id]/realtime/RealtimeCountries.tsx
similarity index 62%
rename from components/pages/realtime/RealtimeCountries.js
rename to src/app/(main)/websites/[id]/realtime/RealtimeCountries.tsx
index 62964eaba..6f484b091 100644
--- a/components/pages/realtime/RealtimeCountries.js
+++ b/src/app/(main)/websites/[id]/realtime/RealtimeCountries.tsx
@@ -1,9 +1,8 @@
 import { useCallback } from 'react';
-import { useRouter } from 'next/router';
-import DataTable from 'components/metrics/DataTable';
-import useLocale from 'hooks/useLocale';
-import useCountryNames from 'hooks/useCountryNames';
-import useMessages from 'hooks/useMessages';
+import ListTable from 'components/metrics/ListTable';
+import useLocale from 'components/hooks/useLocale';
+import useCountryNames from 'components/hooks/useCountryNames';
+import useMessages from 'components/hooks/useMessages';
 import classNames from 'classnames';
 import styles from './RealtimeCountries.module.css';
 
@@ -11,20 +10,22 @@ export function RealtimeCountries({ data }) {
   const { formatMessage, labels } = useMessages();
   const { locale } = useLocale();
   const countryNames = useCountryNames(locale);
-  const { basePath } = useRouter();
 
   const renderCountryName = useCallback(
     ({ x: code }) => (
       <span className={classNames(locale, styles.row)}>
-        <img src={`${basePath}/images/flags/${code?.toLowerCase() || 'xx'}.png`} alt={code} />
+        <img
+          src={`${process.env.basePath}/images/flags/${code?.toLowerCase() || 'xx'}.png`}
+          alt={code}
+        />
         {countryNames[code]}
       </span>
     ),
-    [countryNames, locale, basePath],
+    [countryNames, locale],
   );
 
   return (
-    <DataTable
+    <ListTable
       title={formatMessage(labels.countries)}
       metric={formatMessage(labels.visitors)}
       data={data}
diff --git a/components/pages/realtime/RealtimeHeader.module.css b/src/app/(main)/websites/[id]/realtime/RealtimeHeader.module.css
similarity index 100%
rename from components/pages/realtime/RealtimeHeader.module.css
rename to src/app/(main)/websites/[id]/realtime/RealtimeHeader.module.css
diff --git a/components/pages/realtime/RealtimeHeader.js b/src/app/(main)/websites/[id]/realtime/RealtimeHeader.tsx
similarity index 81%
rename from components/pages/realtime/RealtimeHeader.js
rename to src/app/(main)/websites/[id]/realtime/RealtimeHeader.tsx
index 5f5809f6a..ad03efd14 100644
--- a/components/pages/realtime/RealtimeHeader.js
+++ b/src/app/(main)/websites/[id]/realtime/RealtimeHeader.tsx
@@ -1,10 +1,11 @@
 import MetricCard from 'components/metrics/MetricCard';
-import useMessages from 'hooks/useMessages';
+import useMessages from 'components/hooks/useMessages';
+import { RealtimeData } from 'lib/types';
 import styles from './RealtimeHeader.module.css';
 
-export function RealtimeHeader({ data = {} }) {
+export function RealtimeHeader({ data }: { data: RealtimeData }) {
   const { formatMessage, labels } = useMessages();
-  const { pageviews, visitors, events, countries } = data;
+  const { pageviews, visitors, events, countries } = data || {};
 
   return (
     <div className={styles.header}>
diff --git a/components/pages/realtime/RealtimeHome.js b/src/app/(main)/websites/[id]/realtime/RealtimeHome.tsx
similarity index 74%
rename from components/pages/realtime/RealtimeHome.js
rename to src/app/(main)/websites/[id]/realtime/RealtimeHome.tsx
index 3d7987ca0..154ac707f 100644
--- a/components/pages/realtime/RealtimeHome.js
+++ b/src/app/(main)/websites/[id]/realtime/RealtimeHome.tsx
@@ -1,16 +1,19 @@
 import { useEffect } from 'react';
-import { useRouter } from 'next/router';
+import { useRouter } from 'next/navigation';
 import Page from 'components/layout/Page';
 import PageHeader from 'components/layout/PageHeader';
-import useApi from 'hooks/useApi';
+import useApi from 'components/hooks/useApi';
 import EmptyPlaceholder from 'components/common/EmptyPlaceholder';
-import useMessages from 'hooks/useMessages';
+import useMessages from 'components/hooks/useMessages';
 
 export function RealtimeHome() {
   const { formatMessage, labels, messages } = useMessages();
   const { get, useQuery } = useApi();
   const router = useRouter();
-  const { data, isLoading, error } = useQuery(['websites:me'], () => get('/me/websites'));
+  const { data, isLoading, error } = useQuery({
+    queryKey: ['websites:me'],
+    queryFn: () => get('/me/websites'),
+  });
 
   useEffect(() => {
     if (data?.length) {
diff --git a/components/pages/realtime/RealtimeLog.module.css b/src/app/(main)/websites/[id]/realtime/RealtimeLog.module.css
similarity index 76%
rename from components/pages/realtime/RealtimeLog.module.css
rename to src/app/(main)/websites/[id]/realtime/RealtimeLog.module.css
index dc78f818d..e9c0fc1b5 100644
--- a/components/pages/realtime/RealtimeLog.module.css
+++ b/src/app/(main)/websites/[id]/realtime/RealtimeLog.module.css
@@ -55,7 +55,6 @@
   text-overflow: ellipsis;
   display: -webkit-box;
   -webkit-line-clamp: 2;
-  line-clamp: 2;
   -webkit-box-orient: vertical;
 }
 
@@ -67,3 +66,25 @@
 .row .link:hover {
   color: var(--primary400);
 }
+
+.search {
+  max-width: 300px;
+}
+
+.actions {
+  display: flex;
+  gap: 20px;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 10px;
+}
+
+@media only screen and (max-width: 992px) {
+  .actions {
+    flex-direction: column;
+  }
+
+  .search {
+    max-width: 100%;
+  }
+}
diff --git a/components/pages/realtime/RealtimeLog.js b/src/app/(main)/websites/[id]/realtime/RealtimeLog.tsx
similarity index 70%
rename from components/pages/realtime/RealtimeLog.js
rename to src/app/(main)/websites/[id]/realtime/RealtimeLog.tsx
index 744bff00b..5293c1f06 100644
--- a/components/pages/realtime/RealtimeLog.js
+++ b/src/app/(main)/websites/[id]/realtime/RealtimeLog.tsx
@@ -1,18 +1,19 @@
 import { useMemo, useState } from 'react';
-import { StatusLight, Icon, Text } from 'react-basics';
+import { StatusLight, Icon, Text, SearchField } from 'react-basics';
 import { FixedSizeList } from 'react-window';
-import firstBy from 'thenby';
+import { format } from 'date-fns';
+import thenby from 'thenby';
+import { safeDecodeURI } from 'next-basics';
 import FilterButtons from 'components/common/FilterButtons';
 import Empty from 'components/common/Empty';
-import useLocale from 'hooks/useLocale';
-import useCountryNames from 'hooks/useCountryNames';
+import useLocale from 'components/hooks/useLocale';
+import useCountryNames from 'components/hooks/useCountryNames';
+import Icons from 'components/icons';
+import useMessages from 'components/hooks/useMessages';
+import useFormat from 'components//hooks/useFormat';
 import { BROWSERS } from 'lib/constants';
 import { stringToColor } from 'lib/format';
-import { dateFormat } from 'lib/date';
-import { safeDecodeURI } from 'next-basics';
-import Icons from 'components/icons';
 import styles from './RealtimeLog.module.css';
-import useMessages from 'hooks/useMessages';
 
 const TYPE_ALL = 'all';
 const TYPE_PAGEVIEW = 'pageview';
@@ -26,7 +27,9 @@ const icons = {
 };
 
 export function RealtimeLog({ data, websiteDomain }) {
+  const [search, setSearch] = useState('');
   const { formatMessage, labels, messages, FormattedMessage } = useMessages();
+  const { formatValue } = useFormat();
   const { locale } = useLocale();
   const countryNames = useCountryNames(locale);
   const [filter, setFilter] = useState(TYPE_ALL);
@@ -50,13 +53,21 @@ export function RealtimeLog({ data, websiteDomain }) {
     },
   ];
 
-  const getTime = ({ createdAt }) => dateFormat(new Date(createdAt), 'pp', locale);
+  const getTime = ({ timestamp }) => format(timestamp, 'h:mm:ss');
 
   const getColor = ({ id, sessionId }) => stringToColor(sessionId || id);
 
   const getIcon = ({ __type }) => icons[__type];
 
-  const getDetail = log => {
+  const getDetail = (log: {
+    __type: any;
+    eventName: any;
+    urlPath: any;
+    browser: any;
+    os: any;
+    country: any;
+    device: any;
+  }) => {
     const { __type, eventName, urlPath: url, browser, os, country, device } = log;
 
     if (__type === TYPE_EVENT) {
@@ -130,23 +141,43 @@ export function RealtimeLog({ data, websiteDomain }) {
     }
 
     const { pageviews, visitors, events } = data;
-    const logs = [...pageviews, ...visitors, ...events].sort(firstBy('createdAt', -1));
+    let logs = [...pageviews, ...visitors, ...events].sort(thenby.firstBy('createdAt', -1));
+
+    if (search) {
+      logs = logs.filter(({ eventName, urlPath, browser, os, country, device }) => {
+        return [
+          eventName,
+          urlPath,
+          os,
+          formatValue(browser, 'browser'),
+          formatValue(country, 'country'),
+          formatValue(device, 'device'),
+        ]
+          .filter(n => n)
+          .map(n => n.toLowerCase())
+          .join('')
+          .includes(search.toLowerCase());
+      });
+    }
 
     if (filter !== TYPE_ALL) {
       return logs.filter(({ __type }) => __type === filter);
     }
 
     return logs;
-  }, [data, filter]);
+  }, [data, filter, formatValue, search]);
 
   return (
     <div className={styles.table}>
-      <FilterButtons items={buttons} selectedKey={filter} onSelect={setFilter} />
+      <div className={styles.actions}>
+        <SearchField className={styles.search} value={search} onSearch={setSearch} />
+        <FilterButtons items={buttons} selectedKey={filter} onSelect={setFilter} />
+      </div>
       <div className={styles.header}>{formatMessage(labels.activityLog)}</div>
       <div className={styles.body}>
         {logs?.length === 0 && <Empty />}
         {logs?.length > 0 && (
-          <FixedSizeList height={500} itemCount={logs.length} itemSize={50}>
+          <FixedSizeList width="100%" height={500} itemCount={logs.length} itemSize={50}>
             {Row}
           </FixedSizeList>
         )}
diff --git a/components/pages/realtime/RealtimeUrls.js b/src/app/(main)/websites/[id]/realtime/RealtimeUrls.tsx
similarity index 80%
rename from components/pages/realtime/RealtimeUrls.js
rename to src/app/(main)/websites/[id]/realtime/RealtimeUrls.tsx
index 18d8f2f65..27a9ec5a6 100644
--- a/components/pages/realtime/RealtimeUrls.js
+++ b/src/app/(main)/websites/[id]/realtime/RealtimeUrls.tsx
@@ -1,15 +1,22 @@
-import { useMemo, useState } from 'react';
+import { Key, useMemo, useState } from 'react';
 import { ButtonGroup, Button, Flexbox } from 'react-basics';
-import firstBy from 'thenby';
+import thenby from 'thenby';
 import { percentFilter } from 'lib/filters';
-import DataTable from 'components/metrics/DataTable';
+import ListTable from 'components/metrics/ListTable';
 import { FILTER_PAGES, FILTER_REFERRERS } from 'lib/constants';
-import useMessages from 'hooks/useMessages';
+import useMessages from 'components/hooks/useMessages';
+import { RealtimeData } from 'lib/types';
 
-export function RealtimeUrls({ websiteDomain, data = {} }) {
+export function RealtimeUrls({
+  websiteDomain,
+  data,
+}: {
+  websiteDomain: string;
+  data: RealtimeData;
+}) {
   const { formatMessage, labels } = useMessages();
-  const { pageviews } = data;
-  const [filter, setFilter] = useState(FILTER_REFERRERS);
+  const { pageviews } = data || {};
+  const [filter, setFilter] = useState<Key>(FILTER_REFERRERS);
   const limit = 15;
 
   const buttons = [
@@ -48,7 +55,7 @@ export function RealtimeUrls({ websiteDomain, data = {} }) {
             }
             return arr;
           }, [])
-          .sort(firstBy('y', -1))
+          .sort(thenby.firstBy('y', -1))
           .slice(0, limit),
       );
 
@@ -64,7 +71,7 @@ export function RealtimeUrls({ websiteDomain, data = {} }) {
             }
             return arr;
           }, [])
-          .sort(firstBy('y', -1))
+          .sort(thenby.firstBy('y', -1))
           .slice(0, limit),
       );
 
@@ -82,7 +89,7 @@ export function RealtimeUrls({ websiteDomain, data = {} }) {
         </ButtonGroup>
       </Flexbox>
       {filter === FILTER_REFERRERS && (
-        <DataTable
+        <ListTable
           title={formatMessage(labels.referrers)}
           metric={formatMessage(labels.views)}
           renderLabel={renderLink}
@@ -90,7 +97,7 @@ export function RealtimeUrls({ websiteDomain, data = {} }) {
         />
       )}
       {filter === FILTER_PAGES && (
-        <DataTable
+        <ListTable
           title={formatMessage(labels.pages)}
           metric={formatMessage(labels.views)}
           renderLabel={renderLink}
diff --git a/src/app/(main)/websites/[id]/realtime/page.tsx b/src/app/(main)/websites/[id]/realtime/page.tsx
new file mode 100644
index 000000000..b2957fa03
--- /dev/null
+++ b/src/app/(main)/websites/[id]/realtime/page.tsx
@@ -0,0 +1,9 @@
+import Realtime from './Realtime';
+
+export default function WebsiteRealtimePage({ params: { id } }) {
+  if (!id) {
+    return null;
+  }
+
+  return <Realtime websiteId={id} />;
+}
diff --git a/src/app/(main)/websites/[id]/reports/WebsiteReports.tsx b/src/app/(main)/websites/[id]/reports/WebsiteReports.tsx
new file mode 100644
index 000000000..5ea6f6147
--- /dev/null
+++ b/src/app/(main)/websites/[id]/reports/WebsiteReports.tsx
@@ -0,0 +1,29 @@
+'use client';
+import Link from 'next/link';
+import { Button, Flexbox, Icon, Icons, Text } from 'react-basics';
+import { useMessages } from 'components/hooks';
+import WebsiteHeader from '../WebsiteHeader';
+import ReportsDataTable from 'app/(main)/reports/ReportsDataTable';
+
+export function WebsiteReports({ websiteId }) {
+  const { formatMessage, labels } = useMessages();
+
+  return (
+    <>
+      <WebsiteHeader websiteId={websiteId} />
+      <Flexbox alignItems="center" justifyContent="end">
+        <Link href={`/reports/create`}>
+          <Button variant="primary">
+            <Icon>
+              <Icons.Plus />
+            </Icon>
+            <Text>{formatMessage(labels.createReport)}</Text>
+          </Button>
+        </Link>
+      </Flexbox>
+      <ReportsDataTable websiteId={websiteId} />
+    </>
+  );
+}
+
+export default WebsiteReports;
diff --git a/src/app/(main)/websites/[id]/reports/page.tsx b/src/app/(main)/websites/[id]/reports/page.tsx
new file mode 100644
index 000000000..bf564025d
--- /dev/null
+++ b/src/app/(main)/websites/[id]/reports/page.tsx
@@ -0,0 +1,9 @@
+import WebsiteReports from './WebsiteReports';
+
+export default function WebsiteReportsPage({ params: { id } }) {
+  if (!id) {
+    return null;
+  }
+
+  return <WebsiteReports websiteId={id} />;
+}
diff --git a/src/app/(main)/websites/page.tsx b/src/app/(main)/websites/page.tsx
new file mode 100644
index 000000000..a15425101
--- /dev/null
+++ b/src/app/(main)/websites/page.tsx
@@ -0,0 +1,16 @@
+import WebsitesHeader from 'app/(main)/settings/websites/WebsitesHeader';
+import WebsitesBrowse from './WebsitesBrowse';
+import { Metadata } from 'next';
+
+export default function WebsitesPage() {
+  return (
+    <>
+      <WebsitesHeader showActions={false} />
+      <WebsitesBrowse />
+    </>
+  );
+}
+
+export const metadata: Metadata = {
+  title: 'Websites | umami',
+};
diff --git a/src/app/Providers.tsx b/src/app/Providers.tsx
new file mode 100644
index 000000000..f1460b055
--- /dev/null
+++ b/src/app/Providers.tsx
@@ -0,0 +1,61 @@
+'use client';
+import { useEffect, useState } from 'react';
+import { IntlProvider } from 'react-intl';
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import { ReactBasicsProvider } from 'react-basics';
+import ErrorBoundary from 'components/common/ErrorBoundary';
+import SettingsContext from 'app/(main)/settings/SettingsContext';
+import useLocale from 'components/hooks/useLocale';
+import 'chartjs-adapter-date-fns';
+
+const client = new QueryClient({
+  defaultOptions: {
+    queries: {
+      retry: false,
+      refetchOnWindowFocus: false,
+    },
+  },
+});
+
+function MessagesProvider({ children }) {
+  const { locale, messages } = useLocale();
+  return (
+    <IntlProvider locale={locale} messages={messages[locale]} onError={() => null}>
+      {children}
+    </IntlProvider>
+  );
+}
+
+function SettingsProvider({ children }) {
+  const [config, setConfig] = useState({});
+
+  useEffect(() => {
+    const hostUrl = process.env.hostUrl || window?.location.origin;
+
+    setConfig({
+      shareUrl: hostUrl,
+      trackingCodeUrl: hostUrl,
+      websitesUrl: '/websites',
+      settingsPath: '/settings/websites',
+      websitesPath: `/websites`,
+    });
+  }, []);
+
+  return <SettingsContext.Provider value={config}>{children}</SettingsContext.Provider>;
+}
+
+export function Providers({ children }) {
+  return (
+    <MessagesProvider>
+      <SettingsProvider>
+        <QueryClientProvider client={client}>
+          <ReactBasicsProvider>
+            <ErrorBoundary>{children}</ErrorBoundary>
+          </ReactBasicsProvider>
+        </QueryClientProvider>
+      </SettingsProvider>
+    </MessagesProvider>
+  );
+}
+
+export default Providers;
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
new file mode 100644
index 000000000..970c33f0b
--- /dev/null
+++ b/src/app/layout.tsx
@@ -0,0 +1,36 @@
+import { Metadata } from 'next';
+import Providers from './Providers';
+import '@fontsource/inter/400.css';
+import '@fontsource/inter/700.css';
+import '@fontsource/inter/800.css';
+import 'react-basics/dist/styles.css';
+import 'styles/locale.css';
+import 'styles/index.css';
+import 'styles/variables.css';
+
+export default function ({ children }) {
+  return (
+    <html lang="en" data-scroll="0">
+      <head>
+        <link rel="icon" href="/favicon.ico" />
+        <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
+        <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
+        <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
+        <link rel="manifest" href="/site.webmanifest" />
+        <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5" />
+        <meta name="msapplication-TileColor" content="#da532c" />
+        <meta name="theme-color" content="#fafafa" media="(prefers-color-scheme: light)" />
+        <meta name="theme-color" content="#2f2f2f" media="(prefers-color-scheme: dark)" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <meta name="robots" content="noindex,nofollow" />
+      </head>
+      <body>
+        <Providers>{children}</Providers>
+      </body>
+    </html>
+  );
+}
+
+export const metadata: Metadata = {
+  title: 'umami',
+};
diff --git a/components/pages/login/LoginForm.module.css b/src/app/login/LoginForm.module.css
similarity index 100%
rename from components/pages/login/LoginForm.module.css
rename to src/app/login/LoginForm.module.css
diff --git a/components/pages/login/LoginForm.js b/src/app/login/LoginForm.tsx
similarity index 82%
rename from components/pages/login/LoginForm.js
rename to src/app/login/LoginForm.tsx
index 67057759c..78cf3dd37 100644
--- a/components/pages/login/LoginForm.js
+++ b/src/app/login/LoginForm.tsx
@@ -1,4 +1,4 @@
-import { useMutation } from '@tanstack/react-query';
+'use client';
 import {
   Form,
   FormRow,
@@ -9,19 +9,21 @@ import {
   SubmitButton,
   Icon,
 } from 'react-basics';
-import { useRouter } from 'next/router';
-import useApi from 'hooks/useApi';
+import { useRouter } from 'next/navigation';
+import useApi from 'components/hooks/useApi';
 import { setUser } from 'store/app';
 import { setClientAuthToken } from 'lib/client';
-import useMessages from 'hooks/useMessages';
+import useMessages from 'components/hooks/useMessages';
 import Logo from 'assets/logo.svg';
 import styles from './LoginForm.module.css';
 
 export function LoginForm() {
   const { formatMessage, labels, getMessage } = useMessages();
   const router = useRouter();
-  const { post } = useApi();
-  const { mutate, error, isLoading } = useMutation(data => post('/auth/login', data));
+  const { post, useMutation } = useApi();
+  const { mutate, error, isPending } = useMutation({
+    mutationFn: (data: any) => post('/auth/login', data),
+  });
 
   const handleSubmit = async data => {
     mutate(data, {
@@ -52,7 +54,7 @@ export function LoginForm() {
           </FormInput>
         </FormRow>
         <FormButtons>
-          <SubmitButton className={styles.button} variant="primary" disabled={isLoading}>
+          <SubmitButton className={styles.button} variant="primary" disabled={isPending}>
             {formatMessage(labels.login)}
           </SubmitButton>
         </FormButtons>
diff --git a/components/pages/login/LoginLayout.module.css b/src/app/login/page.module.css
similarity index 76%
rename from components/pages/login/LoginLayout.module.css
rename to src/app/login/page.module.css
index d12306ea8..45115d5b6 100644
--- a/components/pages/login/LoginLayout.module.css
+++ b/src/app/login/page.module.css
@@ -1,6 +1,5 @@
-.layout {
+.page {
   display: flex;
-  flex-direction: column;
   align-items: center;
   justify-content: center;
   height: 100vh;
diff --git a/src/app/login/page.tsx b/src/app/login/page.tsx
new file mode 100644
index 000000000..2ac3f7244
--- /dev/null
+++ b/src/app/login/page.tsx
@@ -0,0 +1,25 @@
+import LoginForm from './LoginForm';
+import { Metadata } from 'next';
+import styles from './page.module.css';
+
+async function getDisabled() {
+  return !!process.env.LOGIN_DISABLED;
+}
+
+export default async function LoginPage() {
+  const disabled = await getDisabled();
+
+  if (disabled) {
+    return null;
+  }
+
+  return (
+    <div className={styles.page}>
+      <LoginForm />
+    </div>
+  );
+}
+
+export const metadata: Metadata = {
+  title: 'Login | umami',
+};
diff --git a/pages/logout.js b/src/app/logout/Logout.tsx
similarity index 63%
rename from pages/logout.js
rename to src/app/logout/Logout.tsx
index 675f1932d..e9da0373e 100644
--- a/pages/logout.js
+++ b/src/app/logout/Logout.tsx
@@ -1,10 +1,12 @@
+'use client';
 import { useEffect } from 'react';
-import { useRouter } from 'next/router';
-import useApi from 'hooks/useApi';
+import { useRouter } from 'next/navigation';
+import useApi from 'components/hooks/useApi';
 import { setUser } from 'store/app';
 import { removeClientAuthToken } from 'lib/client';
 
-export default function ({ disabled }) {
+export function Logout() {
+  const disabled = !!(process.env.disableLogin || process.env.cloudMode);
   const router = useRouter();
   const { post } = useApi();
 
@@ -27,10 +29,4 @@ export default function ({ disabled }) {
   return null;
 }
 
-export async function getServerSideProps() {
-  return {
-    props: {
-      disabled: !!(process.env.DISABLE_LOGIN || process.env.CLOUD_MODE),
-    },
-  };
-}
+export default Logout;
diff --git a/src/app/logout/page.tsx b/src/app/logout/page.tsx
new file mode 100644
index 000000000..89a3bce9e
--- /dev/null
+++ b/src/app/logout/page.tsx
@@ -0,0 +1,10 @@
+import Logout from './Logout';
+import { Metadata } from 'next';
+
+export default function () {
+  return <Logout />;
+}
+
+export const metadata: Metadata = {
+  title: 'Logout | umami',
+};
diff --git a/src/app/not-found.tsx b/src/app/not-found.tsx
new file mode 100644
index 000000000..16c5bbcbe
--- /dev/null
+++ b/src/app/not-found.tsx
@@ -0,0 +1,13 @@
+'use client';
+import { Flexbox } from 'react-basics';
+import useMessages from 'components/hooks/useMessages';
+
+export default function () {
+  const { formatMessage, labels } = useMessages();
+
+  return (
+    <Flexbox alignItems="center" justifyContent="center" flex={1} style={{ minHeight: 600 }}>
+      <h1>{formatMessage(labels.pageNotFound)}</h1>
+    </Flexbox>
+  );
+}
diff --git a/src/app/page.tsx b/src/app/page.tsx
new file mode 100644
index 000000000..6a146801d
--- /dev/null
+++ b/src/app/page.tsx
@@ -0,0 +1,6 @@
+'use client';
+import { redirect } from 'next/navigation';
+
+export default function RootPage() {
+  redirect('/dashboard');
+}
diff --git a/components/layout/Footer.module.css b/src/app/share/[...id]/Footer.module.css
similarity index 80%
rename from components/layout/Footer.module.css
rename to src/app/share/[...id]/Footer.module.css
index 348c92d88..5dc2d5841 100644
--- a/components/layout/Footer.module.css
+++ b/src/app/share/[...id]/Footer.module.css
@@ -1,10 +1,10 @@
 .footer {
   display: flex;
   flex-direction: row;
+  align-items: center;
   justify-content: flex-end;
   font-size: var(--font-size-sm);
-  line-height: 30px;
-  margin: 40px 0;
+  height: 100px;
 }
 
 .footer a {
diff --git a/components/layout/Footer.js b/src/app/share/[...id]/Footer.tsx
similarity index 95%
rename from components/layout/Footer.js
rename to src/app/share/[...id]/Footer.tsx
index 3a07c12a8..84d4162f7 100644
--- a/components/layout/Footer.js
+++ b/src/app/share/[...id]/Footer.tsx
@@ -1,3 +1,4 @@
+'use client';
 import { CURRENT_VERSION, HOMEPAGE_URL } from 'lib/constants';
 import styles from './Footer.module.css';
 
diff --git a/components/layout/Header.module.css b/src/app/share/[...id]/Header.module.css
similarity index 86%
rename from components/layout/Header.module.css
rename to src/app/share/[...id]/Header.module.css
index 26f305521..d353d79a1 100644
--- a/components/layout/Header.module.css
+++ b/src/app/share/[...id]/Header.module.css
@@ -2,6 +2,7 @@
   display: flex;
   flex-direction: row;
   align-items: center;
+  justify-content: space-between;
   width: 100%;
   height: 100px;
 }
@@ -38,10 +39,3 @@
     min-width: 100%;
   }
 }
-
-@media only screen and (max-width: 768px) {
-  .buttons,
-  .links {
-    display: none;
-  }
-}
diff --git a/src/app/share/[...id]/Header.tsx b/src/app/share/[...id]/Header.tsx
new file mode 100644
index 000000000..2b82908df
--- /dev/null
+++ b/src/app/share/[...id]/Header.tsx
@@ -0,0 +1,30 @@
+'use client';
+import { Icon, Text } from 'react-basics';
+import Link from 'next/link';
+import LanguageButton from 'components/input/LanguageButton';
+import ThemeButton from 'components/input/ThemeButton';
+import SettingsButton from 'components/input/SettingsButton';
+import Icons from 'components/icons';
+import styles from './Header.module.css';
+
+export function Header() {
+  return (
+    <header className={styles.header}>
+      <div>
+        <Link href="https://umami.is" target="_blank" className={styles.title}>
+          <Icon size="lg">
+            <Icons.Logo />
+          </Icon>
+          <Text>umami</Text>
+        </Link>
+      </div>
+      <div className={styles.buttons}>
+        <ThemeButton />
+        <LanguageButton />
+        <SettingsButton />
+      </div>
+    </header>
+  );
+}
+
+export default Header;
diff --git a/src/app/share/[...id]/Share.module.css b/src/app/share/[...id]/Share.module.css
new file mode 100644
index 000000000..d985435c1
--- /dev/null
+++ b/src/app/share/[...id]/Share.module.css
@@ -0,0 +1,4 @@
+.container {
+  flex: 1;
+  min-height: calc(100vh - 200px);
+}
diff --git a/src/app/share/[...id]/Share.tsx b/src/app/share/[...id]/Share.tsx
new file mode 100644
index 000000000..99ba64078
--- /dev/null
+++ b/src/app/share/[...id]/Share.tsx
@@ -0,0 +1,25 @@
+'use client';
+import WebsiteDetails from 'app/(main)/websites/[id]/WebsiteDetails';
+import useShareToken from 'components/hooks/useShareToken';
+import styles from './Share.module.css';
+import Page from 'components/layout/Page';
+import Header from './Header';
+import Footer from './Footer';
+
+export default function Share({ shareId }) {
+  const { shareToken, isLoading } = useShareToken(shareId);
+
+  if (isLoading || !shareToken) {
+    return null;
+  }
+
+  return (
+    <div className={styles.container}>
+      <Page>
+        <Header />
+        <WebsiteDetails websiteId={shareToken.websiteId} />
+        <Footer />
+      </Page>
+    </div>
+  );
+}
diff --git a/src/app/share/[...id]/page.tsx b/src/app/share/[...id]/page.tsx
new file mode 100644
index 000000000..2a69f406d
--- /dev/null
+++ b/src/app/share/[...id]/page.tsx
@@ -0,0 +1,10 @@
+import Share from './Share';
+import { Metadata } from 'next';
+
+export default function ({ params: { id } }) {
+  return <Share shareId={id[0]} />;
+}
+
+export const metadata: Metadata = {
+  title: 'umami',
+};
diff --git a/pages/sso.js b/src/app/sso/page.tsx
similarity index 55%
rename from pages/sso.js
rename to src/app/sso/page.tsx
index 6e6352061..e577767a8 100644
--- a/pages/sso.js
+++ b/src/app/sso/page.tsx
@@ -1,11 +1,14 @@
+'use client';
 import { useEffect } from 'react';
 import { Loading } from 'react-basics';
-import { useRouter } from 'next/router';
+import { useRouter, useSearchParams } from 'next/navigation';
 import { setClientAuthToken } from 'lib/client';
 
-export default function () {
+export default function SSOPage() {
   const router = useRouter();
-  const { token, url } = router.query;
+  const search = useSearchParams();
+  const url = search.get('url');
+  const token = search.get('token');
 
   useEffect(() => {
     if (url && token) {
@@ -15,5 +18,5 @@ export default function () {
     }
   }, [router, url, token]);
 
-  return <Loading size="xl" />;
+  return <Loading />;
 }
diff --git a/assets/add-user.svg b/src/assets/add-user.svg
similarity index 100%
rename from assets/add-user.svg
rename to src/assets/add-user.svg
diff --git a/assets/bar-chart.svg b/src/assets/bar-chart.svg
similarity index 100%
rename from assets/bar-chart.svg
rename to src/assets/bar-chart.svg
diff --git a/assets/bars.svg b/src/assets/bars.svg
similarity index 100%
rename from assets/bars.svg
rename to src/assets/bars.svg
diff --git a/assets/bolt.svg b/src/assets/bolt.svg
similarity index 100%
rename from assets/bolt.svg
rename to src/assets/bolt.svg
diff --git a/assets/calendar.svg b/src/assets/calendar.svg
similarity index 100%
rename from assets/calendar.svg
rename to src/assets/calendar.svg
diff --git a/assets/clock.svg b/src/assets/clock.svg
similarity index 100%
rename from assets/clock.svg
rename to src/assets/clock.svg
diff --git a/assets/dashboard.svg b/src/assets/dashboard.svg
similarity index 100%
rename from assets/dashboard.svg
rename to src/assets/dashboard.svg
diff --git a/assets/expand.svg b/src/assets/expand.svg
similarity index 100%
rename from assets/expand.svg
rename to src/assets/expand.svg
diff --git a/assets/eye.svg b/src/assets/eye.svg
similarity index 100%
rename from assets/eye.svg
rename to src/assets/eye.svg
diff --git a/assets/funnel.svg b/src/assets/funnel.svg
similarity index 100%
rename from assets/funnel.svg
rename to src/assets/funnel.svg
diff --git a/assets/gear.svg b/src/assets/gear.svg
similarity index 100%
rename from assets/gear.svg
rename to src/assets/gear.svg
diff --git a/assets/globe.svg b/src/assets/globe.svg
similarity index 100%
rename from assets/globe.svg
rename to src/assets/globe.svg
diff --git a/assets/lightbulb.svg b/src/assets/lightbulb.svg
similarity index 100%
rename from assets/lightbulb.svg
rename to src/assets/lightbulb.svg
diff --git a/assets/link.svg b/src/assets/link.svg
similarity index 100%
rename from assets/link.svg
rename to src/assets/link.svg
diff --git a/assets/lock.svg b/src/assets/lock.svg
similarity index 100%
rename from assets/lock.svg
rename to src/assets/lock.svg
diff --git a/assets/logo.svg b/src/assets/logo.svg
similarity index 100%
rename from assets/logo.svg
rename to src/assets/logo.svg
diff --git a/src/assets/magnet.svg b/src/assets/magnet.svg
new file mode 100644
index 000000000..3c64c3ee5
--- /dev/null
+++ b/src/assets/magnet.svg
@@ -0,0 +1 @@
+<svg height="512" viewBox="0 0 508.467 508.467" width="512" xmlns="http://www.w3.org/2000/svg"><g><path d="m426.815 239.006c-11.722-11.724-30.702-11.729-42.427-.001-65.928 65.929 49.291-49.292-116.718 116.718-53.811 53.809-142.478 19.197-140.68-54.511.547-22.415 9.826-43.738 26.129-60.041l116.717-116.717c11.724-11.722 11.728-30.702 0-42.427l-46.668-46.669c-11.725-11.725-30.702-11.726-42.427 0-16.642 16.643-102.078 102.078-120.112 120.112-39.05 39.05-60.582 90.97-60.629 146.195-.093 110.827 88.182 206.288 206.244 206.394 56.778 0 109.204-21.924 148.29-61.01l118.948-118.948c11.724-11.722 11.728-30.702 0-42.427zm-224.861-182.434 46.669 46.669-58.455 58.456-46.669-46.669zm131.367 369.264c-69.043 69.043-182.868 70.02-251.708.933-68.763-69.009-68.66-181.196.229-250.086l40.443-40.443 46.669 46.669-37.049 37.049c-45.115 45.112-46.916 116.85-3.395 160.371 43.279 43.279 115.221 41.756 160.372-3.394l37.049-37.049 46.669 46.669zm60.494-60.493-46.669-46.669 58.456-58.456 46.669 46.669z"/><path d="m379.357 95.099c15.199 3.839 30.418 19.07 34.336 34.192 2.089 8.058 10.303 12.828 18.283 10.758 8.02-2.078 12.836-10.264 10.758-18.283-6.651-25.662-30.176-49.223-56.03-55.753-8.032-2.027-16.188 2.838-18.217 10.869-2.029 8.032 2.837 16.189 10.87 18.217z"/><path d="m507.984 102.124c-12.016-46.375-55.215-89.504-101.745-101.256-8.032-2.027-16.188 2.838-18.217 10.869-2.029 8.032 2.838 16.188 10.87 18.217 35.882 9.063 70.769 43.871 80.051 79.695 2.088 8.058 10.304 12.828 18.283 10.758 8.02-2.078 12.836-10.263 10.758-18.283z"/></g></svg>
\ No newline at end of file
diff --git a/assets/moon.svg b/src/assets/moon.svg
similarity index 100%
rename from assets/moon.svg
rename to src/assets/moon.svg
diff --git a/assets/nodes.svg b/src/assets/nodes.svg
similarity index 100%
rename from assets/nodes.svg
rename to src/assets/nodes.svg
diff --git a/assets/overview.svg b/src/assets/overview.svg
similarity index 100%
rename from assets/overview.svg
rename to src/assets/overview.svg
diff --git a/assets/profile.svg b/src/assets/profile.svg
similarity index 100%
rename from assets/profile.svg
rename to src/assets/profile.svg
diff --git a/assets/redo.svg b/src/assets/redo.svg
similarity index 100%
rename from assets/redo.svg
rename to src/assets/redo.svg
diff --git a/assets/reports.svg b/src/assets/reports.svg
similarity index 100%
rename from assets/reports.svg
rename to src/assets/reports.svg
diff --git a/assets/sun.svg b/src/assets/sun.svg
similarity index 100%
rename from assets/sun.svg
rename to src/assets/sun.svg
diff --git a/assets/user.svg b/src/assets/user.svg
similarity index 100%
rename from assets/user.svg
rename to src/assets/user.svg
diff --git a/assets/users.svg b/src/assets/users.svg
similarity index 100%
rename from assets/users.svg
rename to src/assets/users.svg
diff --git a/assets/visitor.svg b/src/assets/visitor.svg
similarity index 100%
rename from assets/visitor.svg
rename to src/assets/visitor.svg
diff --git a/assets/website.svg b/src/assets/website.svg
similarity index 100%
rename from assets/website.svg
rename to src/assets/website.svg
diff --git a/components/common/ConfirmDeleteForm.js b/src/components/common/ConfirmDeleteForm.tsx
similarity index 66%
rename from components/common/ConfirmDeleteForm.js
rename to src/components/common/ConfirmDeleteForm.tsx
index 3496a3053..d4cbf2039 100644
--- a/components/common/ConfirmDeleteForm.js
+++ b/src/components/common/ConfirmDeleteForm.tsx
@@ -1,8 +1,14 @@
 import { useState } from 'react';
 import { Button, LoadingButton, Form, FormButtons } from 'react-basics';
-import useMessages from 'hooks/useMessages';
+import useMessages from 'components/hooks/useMessages';
 
-export function ConfirmDeleteForm({ name, onConfirm, onClose }) {
+export interface ConfirmDeleteFormProps {
+  name: string;
+  onConfirm?: () => void;
+  onClose?: () => void;
+}
+
+export function ConfirmDeleteForm({ name, onConfirm, onClose }: ConfirmDeleteFormProps) {
   const [loading, setLoading] = useState(false);
   const { formatMessage, labels, messages, FormattedMessage } = useMessages();
 
@@ -17,7 +23,7 @@ export function ConfirmDeleteForm({ name, onConfirm, onClose }) {
         <FormattedMessage {...messages.confirmDelete} values={{ target: <b>{name}</b> }} />
       </p>
       <FormButtons flex>
-        <LoadingButton loading={loading} onClick={handleConfirm} variant="danger">
+        <LoadingButton isLoading={loading} onClick={handleConfirm} variant="danger">
           {formatMessage(labels.delete)}
         </LoadingButton>
         <Button onClick={onClose}>{formatMessage(labels.cancel)}</Button>
diff --git a/src/components/common/DataTable.module.css b/src/components/common/DataTable.module.css
new file mode 100644
index 000000000..e738c8958
--- /dev/null
+++ b/src/components/common/DataTable.module.css
@@ -0,0 +1,52 @@
+.table {
+  grid-template-rows: repeat(auto-fit, max-content);
+}
+
+.table td {
+  align-items: center;
+  max-height: max-content;
+}
+
+.search {
+  max-width: 300px;
+  margin: 20px 0;
+}
+
+.action {
+  justify-content: flex-end;
+  gap: 5px;
+}
+
+.body {
+  display: flex;
+  flex-direction: column;
+  position: relative;
+  overflow-x: auto;
+}
+
+.body td {
+  display: flex;
+  gap: 10px;
+  min-height: 70px;
+  align-items: center;
+  min-width: min-content;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.body > div > div > div {
+  display: flex;
+  gap: 10px;
+}
+
+.pager {
+  margin: 20px 0;
+}
+
+.status {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  min-height: 200px;
+}
diff --git a/src/components/common/DataTable.tsx b/src/components/common/DataTable.tsx
new file mode 100644
index 000000000..00aba09c8
--- /dev/null
+++ b/src/components/common/DataTable.tsx
@@ -0,0 +1,84 @@
+import { ReactNode } from 'react';
+import classNames from 'classnames';
+import { Banner, Loading, SearchField } from 'react-basics';
+import { useMessages } from 'components/hooks';
+import Empty from 'components/common/Empty';
+import Pager from 'components/common/Pager';
+import styles from './DataTable.module.css';
+import { FilterQueryResult } from 'components/hooks/useFilterQuery';
+
+const DEFAULT_SEARCH_DELAY = 600;
+
+export interface DataTableProps {
+  queryResult: FilterQueryResult<any>;
+  searchDelay?: number;
+  allowSearch?: boolean;
+  allowPaging?: boolean;
+  children: ReactNode | ((data: any) => ReactNode);
+}
+
+export function DataTable({
+  queryResult,
+  searchDelay = 600,
+  allowSearch = true,
+  allowPaging = true,
+  children,
+}: DataTableProps) {
+  const { formatMessage, labels, messages } = useMessages();
+  const {
+    result,
+    params,
+    setParams,
+    query: { error, isLoading },
+  } = queryResult || {};
+  const { page, pageSize, count, data } = result || {};
+  const { query } = params || {};
+  const hasData = Boolean(!isLoading && data?.length);
+  const noResults = Boolean(!isLoading && query && !hasData);
+
+  const handleSearch = (query: string) => {
+    setParams({ ...params, query, page: params.page ? page : 1 });
+  };
+
+  const handlePageChange = (page: number) => {
+    setParams({ ...params, query, page });
+  };
+
+  if (error) {
+    return <Banner variant="error">{formatMessage(messages.error)}</Banner>;
+  }
+
+  return (
+    <>
+      {allowSearch && (hasData || query) && (
+        <SearchField
+          className={styles.search}
+          value={query}
+          onSearch={handleSearch}
+          delay={searchDelay || DEFAULT_SEARCH_DELAY}
+          autoFocus={true}
+          placeholder={formatMessage(labels.search)}
+        />
+      )}
+      <div
+        className={classNames(styles.body, { [styles.status]: isLoading || noResults || !hasData })}
+      >
+        {hasData ? (typeof children === 'function' ? children(result) : children) : null}
+        {isLoading && <Loading icon="dots" />}
+        {!isLoading && !hasData && !query && <Empty />}
+        {noResults && <Empty message={formatMessage(messages.noResultsFound)} />}
+      </div>
+      {allowPaging && hasData && (
+        <Pager
+          className={styles.pager}
+          page={page}
+          pageSize={pageSize}
+          count={count}
+          onPageChange={handlePageChange}
+        />
+      )}
+    </>
+  );
+}
+
+export default DataTable;
diff --git a/components/common/Empty.module.css b/src/components/common/Empty.module.css
similarity index 100%
rename from components/common/Empty.module.css
rename to src/components/common/Empty.module.css
diff --git a/components/common/Empty.js b/src/components/common/Empty.tsx
similarity index 61%
rename from components/common/Empty.js
rename to src/components/common/Empty.tsx
index 95681b167..4e2677f8f 100644
--- a/components/common/Empty.js
+++ b/src/components/common/Empty.tsx
@@ -1,8 +1,13 @@
 import classNames from 'classnames';
+import useMessages from 'components/hooks/useMessages';
 import styles from './Empty.module.css';
-import useMessages from 'hooks/useMessages';
 
-export function Empty({ message, className }) {
+export interface EmptyProps {
+  message?: string;
+  className?: string;
+}
+
+export function Empty({ message, className }: EmptyProps) {
   const { formatMessage, messages } = useMessages();
 
   return (
diff --git a/components/common/EmptyPlaceholder.js b/src/components/common/EmptyPlaceholder.tsx
similarity index 64%
rename from components/common/EmptyPlaceholder.js
rename to src/components/common/EmptyPlaceholder.tsx
index 8834a1dba..640e45d50 100644
--- a/components/common/EmptyPlaceholder.js
+++ b/src/components/common/EmptyPlaceholder.tsx
@@ -1,7 +1,13 @@
+import { ReactNode } from 'react';
 import { Icon, Text, Flexbox } from 'react-basics';
 import Logo from 'assets/logo.svg';
 
-export function EmptyPlaceholder({ message, children }) {
+export interface EmptyPlaceholderProps {
+  message?: string;
+  children?: ReactNode;
+}
+
+export function EmptyPlaceholder({ message, children }: EmptyPlaceholderProps) {
   return (
     <Flexbox direction="column" alignItems="center" justifyContent="center" gap={60} height={600}>
       <Icon size="xl">
diff --git a/components/common/ErrorBoundry.module.css b/src/components/common/ErrorBoundary.module.css
similarity index 100%
rename from components/common/ErrorBoundry.module.css
rename to src/components/common/ErrorBoundary.module.css
diff --git a/components/common/ErrorBoundary.js b/src/components/common/ErrorBoundary.tsx
similarity index 68%
rename from components/common/ErrorBoundary.js
rename to src/components/common/ErrorBoundary.tsx
index f97fd92c2..49b7e6710 100644
--- a/components/common/ErrorBoundary.js
+++ b/src/components/common/ErrorBoundary.tsx
@@ -1,14 +1,15 @@
-/* eslint-disable no-console */
+import { ErrorInfo, ReactNode } from 'react';
 import { ErrorBoundary as Boundary } from 'react-error-boundary';
 import { Button } from 'react-basics';
-import useMessages from 'hooks/useMessages';
-import styles from './ErrorBoundry.module.css';
+import useMessages from 'components/hooks/useMessages';
+import styles from './ErrorBoundary.module.css';
 
-const logError = (error, info) => {
+const logError = (error: Error, info: ErrorInfo) => {
+  // eslint-disable-next-line no-console
   console.error(error, info.componentStack);
 };
 
-export function ErrorBoundary({ children }) {
+export function ErrorBoundary({ children }: { children: ReactNode }) {
   const { formatMessage, messages } = useMessages();
 
   const fallbackRender = ({ error, resetErrorBoundary }) => {
diff --git a/components/common/ErrorMessage.module.css b/src/components/common/ErrorMessage.module.css
similarity index 100%
rename from components/common/ErrorMessage.module.css
rename to src/components/common/ErrorMessage.module.css
diff --git a/components/common/ErrorMessage.js b/src/components/common/ErrorMessage.tsx
similarity index 78%
rename from components/common/ErrorMessage.js
rename to src/components/common/ErrorMessage.tsx
index e2b227478..0deb6f928 100644
--- a/components/common/ErrorMessage.js
+++ b/src/components/common/ErrorMessage.tsx
@@ -1,13 +1,13 @@
 import { Icon, Icons, Text } from 'react-basics';
 import styles from './ErrorMessage.module.css';
-import useMessages from 'hooks/useMessages';
+import useMessages from 'components/hooks/useMessages';
 
 export function ErrorMessage() {
   const { formatMessage, messages } = useMessages();
 
   return (
     <div className={styles.error}>
-      <Icon className={styles.icon} size="large">
+      <Icon className={styles.icon} size="lg">
         <Icons.Alert />
       </Icon>
       <Text>{formatMessage(messages.error)}</Text>
diff --git a/components/common/Favicon.module.css b/src/components/common/Favicon.module.css
similarity index 100%
rename from components/common/Favicon.module.css
rename to src/components/common/Favicon.module.css
diff --git a/components/common/Favicon.js b/src/components/common/Favicon.tsx
similarity index 93%
rename from components/common/Favicon.js
rename to src/components/common/Favicon.tsx
index 55059cc0a..2bf43c771 100644
--- a/components/common/Favicon.js
+++ b/src/components/common/Favicon.tsx
@@ -1,6 +1,6 @@
 import styles from './Favicon.module.css';
 
-function getHostName(url) {
+function getHostName(url: string) {
   const match = url.match(/^(?:https?:\/\/)?(?:[^@\n]+@)?(?:www\.)?([^:/\n?=]+)/im);
   return match && match.length > 1 ? match[1] : null;
 }
diff --git a/src/components/common/FilterButtons.tsx b/src/components/common/FilterButtons.tsx
new file mode 100644
index 000000000..a64a6482a
--- /dev/null
+++ b/src/components/common/FilterButtons.tsx
@@ -0,0 +1,20 @@
+import { Key } from 'react';
+import { ButtonGroup, Button, Flexbox } from 'react-basics';
+
+export interface FilterButtonsProps {
+  items: any[];
+  selectedKey?: Key;
+  onSelect: (key: any) => void;
+}
+
+export function FilterButtons({ items, selectedKey, onSelect }: FilterButtonsProps) {
+  return (
+    <Flexbox justifyContent="center">
+      <ButtonGroup items={items} selectedKey={selectedKey as any} onSelect={onSelect}>
+        {({ key, label }) => <Button key={key}>{label}</Button>}
+      </ButtonGroup>
+    </Flexbox>
+  );
+}
+
+export default FilterButtons;
diff --git a/components/common/FilterLink.module.css b/src/components/common/FilterLink.module.css
similarity index 100%
rename from components/common/FilterLink.module.css
rename to src/components/common/FilterLink.module.css
diff --git a/components/common/FilterLink.js b/src/components/common/FilterLink.tsx
similarity index 63%
rename from components/common/FilterLink.js
rename to src/components/common/FilterLink.tsx
index 30cdc025b..bc0a4d48d 100644
--- a/components/common/FilterLink.js
+++ b/src/components/common/FilterLink.tsx
@@ -1,14 +1,31 @@
+import { ReactNode } from 'react';
 import { Icon, Icons } from 'react-basics';
 import classNames from 'classnames';
 import Link from 'next/link';
 import { safeDecodeURI } from 'next-basics';
-import usePageQuery from 'hooks/usePageQuery';
-import useMessages from 'hooks/useMessages';
+import useNavigation from 'components/hooks/useNavigation';
+import useMessages from 'components/hooks/useMessages';
 import styles from './FilterLink.module.css';
 
-export function FilterLink({ id, value, label, externalUrl, children, className }) {
+export interface FilterLinkProps {
+  id: string;
+  value: string;
+  label?: string;
+  externalUrl?: string;
+  className?: string;
+  children?: ReactNode;
+}
+
+export function FilterLink({
+  id,
+  value,
+  label,
+  externalUrl,
+  children,
+  className,
+}: FilterLinkProps) {
   const { formatMessage, labels } = useMessages();
-  const { resolveUrl, query } = usePageQuery();
+  const { makeUrl, query } = useNavigation();
   const active = query[id] !== undefined;
   const selected = query[id] === value;
 
@@ -22,7 +39,7 @@ export function FilterLink({ id, value, label, externalUrl, children, className
       {children}
       {!value && `(${label || formatMessage(labels.unknown)})`}
       {value && (
-        <Link href={resolveUrl({ [id]: value })} className={styles.label} replace>
+        <Link href={makeUrl({ [id]: value })} className={styles.label} replace>
           {safeDecodeURI(label || value)}
         </Link>
       )}
diff --git a/components/common/HamburgerButton.module.css b/src/components/common/HamburgerButton.module.css
similarity index 100%
rename from components/common/HamburgerButton.module.css
rename to src/components/common/HamburgerButton.module.css
diff --git a/src/components/common/HamburgerButton.tsx b/src/components/common/HamburgerButton.tsx
new file mode 100644
index 000000000..5a81f3a33
--- /dev/null
+++ b/src/components/common/HamburgerButton.tsx
@@ -0,0 +1,21 @@
+import { Button, Icon, Icons } from 'react-basics';
+import { useState } from 'react';
+import MobileMenu from './MobileMenu';
+
+export function HamburgerButton({ menuItems }: { menuItems: any[] }) {
+  const [active, setActive] = useState(false);
+
+  const handleClick = () => setActive(state => !state);
+  const handleClose = () => setActive(false);
+
+  return (
+    <>
+      <Button variant="quiet" onClick={handleClick}>
+        <Icon>{active ? <Icons.Close /> : <Icons.Menu />}</Icon>
+      </Button>
+      {active && <MobileMenu items={menuItems} onClose={handleClose} />}
+    </>
+  );
+}
+
+export default HamburgerButton;
diff --git a/components/common/HoverTooltip.module.css b/src/components/common/HoverTooltip.module.css
similarity index 100%
rename from components/common/HoverTooltip.module.css
rename to src/components/common/HoverTooltip.module.css
diff --git a/components/common/HoverTooltip.js b/src/components/common/HoverTooltip.tsx
similarity index 82%
rename from components/common/HoverTooltip.js
rename to src/components/common/HoverTooltip.tsx
index 614841dfe..e5e31219b 100644
--- a/components/common/HoverTooltip.js
+++ b/src/components/common/HoverTooltip.tsx
@@ -1,8 +1,8 @@
-import { useEffect, useState } from 'react';
+import { ReactNode, useEffect, useState } from 'react';
 import { Tooltip } from 'react-basics';
 import styles from './HoverTooltip.module.css';
 
-export function HoverTooltip({ children }) {
+export function HoverTooltip({ children }: { children: ReactNode }) {
   const [position, setPosition] = useState({ x: -1000, y: -1000 });
 
   useEffect(() => {
diff --git a/src/components/common/LinkButton.module.css b/src/components/common/LinkButton.module.css
new file mode 100644
index 000000000..5561f536f
--- /dev/null
+++ b/src/components/common/LinkButton.module.css
@@ -0,0 +1,107 @@
+.button {
+  display: flex;
+  align-items: center;
+  align-self: flex-start;
+  white-space: nowrap;
+  gap: var(--size200);
+  font-family: inherit;
+  color: var(--base900);
+  background: var(--base100);
+  border: 1px solid transparent;
+  border-radius: var(--border-radius);
+  min-height: var(--base-height);
+  padding: 0 var(--size600);
+  position: relative;
+  cursor: pointer;
+}
+
+.button:hover {
+  background: var(--base200);
+}
+
+.button:active {
+  background: var(--base300);
+}
+
+.button:visited {
+  color: var(--base900);
+}
+
+.button.disabled {
+  color: var(--disabled-color) !important;
+  background-color: var(--disabled-background) !important;
+  border-color: transparent !important;
+  pointer-events: none;
+}
+
+.button.primary {
+  color: var(--light50);
+  background: var(--primary400);
+}
+
+.button.primary:hover {
+  color: var(--light50);
+  background: var(--primary500);
+}
+
+.button.primary:active {
+  color: var(--light50);
+  background: var(--primary600);
+}
+
+.button.secondary {
+  border: 1px solid var(--border-color);
+  background: var(--base50);
+}
+
+.button.secondary:hover {
+  background: var(--base75);
+}
+
+.button.secondary:active {
+  background: var(--base100);
+}
+
+.button.quiet {
+  color: var(--base900);
+  background: transparent;
+}
+
+.button.quiet:hover {
+  background: var(--base100);
+}
+
+.button.quiet:active {
+  background: var(--base200);
+}
+
+.button.danger {
+  color: var(--light50);
+  background: var(--red800);
+}
+
+.button.danger:hover {
+  color: var(--light50);
+  background: var(--red900);
+}
+
+.button.danger:active {
+  color: var(--light50);
+  background: var(--red1000);
+}
+
+.button.size-sm {
+  font-size: var(--font-size-sm);
+  height: calc(var(--base-height) * 0.75);
+  padding: 0 calc(var(--size600) * 0.75);
+}
+
+.button.size-md {
+  font-size: var(--font-size-md);
+}
+
+.button.size-lg {
+  font-size: var(--font-size-lg);
+  height: calc(var(--base-height) * 1.25);
+  padding: 0 calc(var(--size600) * 1.25);
+}
diff --git a/src/components/common/LinkButton.tsx b/src/components/common/LinkButton.tsx
new file mode 100644
index 000000000..83d95151e
--- /dev/null
+++ b/src/components/common/LinkButton.tsx
@@ -0,0 +1,30 @@
+import classNames from 'classnames';
+import Link from 'next/link';
+import { useLocale } from 'components/hooks';
+import styles from './LinkButton.module.css';
+import { ReactNode } from 'react';
+
+export interface LinkButtonProps {
+  href: string;
+  className?: string;
+  variant?: string;
+  scroll?: boolean;
+  children?: ReactNode;
+}
+
+export function LinkButton({ href, className, variant, scroll = true, children }: LinkButtonProps) {
+  const { dir } = useLocale();
+
+  return (
+    <Link
+      className={classNames(styles.button, className, { [styles[variant]]: true })}
+      href={href}
+      dir={dir}
+      scroll={scroll}
+    >
+      {children}
+    </Link>
+  );
+}
+
+export default LinkButton;
diff --git a/components/common/MobileMenu.module.css b/src/components/common/MobileMenu.module.css
similarity index 100%
rename from components/common/MobileMenu.module.css
rename to src/components/common/MobileMenu.module.css
diff --git a/components/common/MobileMenu.js b/src/components/common/MobileMenu.tsx
similarity index 59%
rename from components/common/MobileMenu.js
rename to src/components/common/MobileMenu.tsx
index 2228a3e95..e14f0b837 100644
--- a/components/common/MobileMenu.js
+++ b/src/components/common/MobileMenu.tsx
@@ -1,14 +1,22 @@
+import { createPortal } from 'react-dom';
 import classNames from 'classnames';
-import { useRouter } from 'next/router';
+import { usePathname } from 'next/navigation';
 import Link from 'next/link';
 import styles from './MobileMenu.module.css';
 
-export function MobileMenu({ items = [], onClose }) {
-  const { pathname } = useRouter();
+export function MobileMenu({
+  items = [],
+  onClose,
+}: {
+  items: any[];
+  className?: string;
+  onClose: () => void;
+}): any {
+  const pathname = usePathname();
 
-  const Items = ({ items, className }) => (
+  const Items = ({ items, className }: { items: any[]; className?: string }): any => (
     <div className={classNames(styles.items, className)}>
-      {items.map(({ label, url, children }) => {
+      {items.map(({ label, url, children }: { label: string; url: string; children: any[] }) => {
         const selected = pathname.startsWith(url);
 
         return (
@@ -28,10 +36,11 @@ export function MobileMenu({ items = [], onClose }) {
     </div>
   );
 
-  return (
+  return createPortal(
     <div className={classNames(styles.menu)}>
       <Items items={items} />
-    </div>
+    </div>,
+    document.body,
   );
 }
 
diff --git a/src/components/common/Pager.module.css b/src/components/common/Pager.module.css
new file mode 100644
index 000000000..880c1b401
--- /dev/null
+++ b/src/components/common/Pager.module.css
@@ -0,0 +1,32 @@
+.pager {
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
+  align-items: center;
+}
+
+.nav {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.text {
+  font-size: var(--font-size-md);
+  margin: 0 16px;
+  justify-content: center;
+}
+
+.count {
+  color: var(--base600);
+  font-weight: 700;
+}
+
+@media only screen and (max-width: 992px) {
+  .pager {
+    grid-template-columns: repeat(2, 1fr);
+  }
+
+  .nav {
+    justify-content: end;
+  }
+}
diff --git a/src/components/common/Pager.tsx b/src/components/common/Pager.tsx
new file mode 100644
index 000000000..2fe7c6dba
--- /dev/null
+++ b/src/components/common/Pager.tsx
@@ -0,0 +1,58 @@
+import classNames from 'classnames';
+import { Button, Icon, Icons } from 'react-basics';
+import useMessages from 'components/hooks/useMessages';
+import styles from './Pager.module.css';
+
+export interface PagerProps {
+  page: number;
+  pageSize: number;
+  count: number;
+  onPageChange: (nextPage: number) => void;
+  className?: string;
+}
+
+export function Pager({ page, pageSize, count, onPageChange, className }: PagerProps) {
+  const { formatMessage, labels } = useMessages();
+  const maxPage = pageSize && count ? Math.ceil(count / pageSize) : 0;
+  const lastPage = page === maxPage;
+  const firstPage = page === 1;
+
+  if (count === 0 || !maxPage) {
+    return null;
+  }
+
+  const handlePageChange = (value: number) => {
+    const nextPage = page + value;
+    if (nextPage > 0 && nextPage <= maxPage) {
+      onPageChange(nextPage);
+    }
+  };
+
+  if (maxPage === 1) {
+    return null;
+  }
+
+  return (
+    <div className={classNames(styles.pager, className)}>
+      <div className={styles.count}>{formatMessage(labels.numberOfRecords, { x: count })}</div>
+      <div className={styles.nav}>
+        <Button onClick={() => handlePageChange(-1)} disabled={firstPage}>
+          <Icon rotate={90}>
+            <Icons.ChevronDown />
+          </Icon>
+        </Button>
+        <div className={styles.text}>
+          {formatMessage(labels.pageOf, { current: page, total: maxPage })}
+        </div>
+        <Button onClick={() => handlePageChange(1)} disabled={lastPage}>
+          <Icon rotate={270}>
+            <Icons.ChevronDown />
+          </Icon>
+        </Button>
+      </div>
+      <div></div>
+    </div>
+  );
+}
+
+export default Pager;
diff --git a/components/declarations.d.ts b/src/components/declarations.d.ts
similarity index 50%
rename from components/declarations.d.ts
rename to src/components/declarations.d.ts
index 31e44ff3e..ca55157ba 100644
--- a/components/declarations.d.ts
+++ b/src/components/declarations.d.ts
@@ -1,2 +1,4 @@
 declare module '*.css';
 declare module '*.svg';
+declare module '*.json';
+declare module 'uuid';
diff --git a/hooks/index.js b/src/components/hooks/index.js
similarity index 86%
rename from hooks/index.js
rename to src/components/hooks/index.js
index 6a9b3b353..b851eeb72 100644
--- a/hooks/index.js
+++ b/src/components/hooks/index.js
@@ -6,13 +6,14 @@ export * from './useDocumentClick';
 export * from './useEscapeKey';
 export * from './useFilters';
 export * from './useForceUpdate';
+export * from './useFormat';
 export * from './useLanguageNames';
 export * from './useLocale';
 export * from './useMessages';
-export * from './usePageQuery';
+export * from './useNavigation';
 export * from './useReport';
 export * from './useReports';
-export * from './useRequireLogin';
+export * from './useLogin';
 export * from './useShareToken';
 export * from './useSticky';
 export * from './useTheme';
diff --git a/hooks/useApi.ts b/src/components/hooks/useApi.ts
similarity index 86%
rename from hooks/useApi.ts
rename to src/components/hooks/useApi.ts
index f41547a9e..75a928d53 100644
--- a/hooks/useApi.ts
+++ b/src/components/hooks/useApi.ts
@@ -1,4 +1,3 @@
-import { useRouter } from 'next/router';
 import * as reactQuery from '@tanstack/react-query';
 import { useApi as nextUseApi } from 'next-basics';
 import { getClientAuthToken } from 'lib/client';
@@ -8,12 +7,11 @@ import useStore from 'store/app';
 const selector = state => state.shareToken;
 
 export function useApi() {
-  const { basePath } = useRouter();
   const shareToken = useStore(selector);
 
   const { get, post, put, del } = nextUseApi(
     { authorization: `Bearer ${getClientAuthToken()}`, [SHARE_TOKEN_HEADER]: shareToken?.token },
-    basePath,
+    process.env.basePath,
   );
 
   return { get, post, put, del, ...reactQuery };
diff --git a/hooks/useConfig.js b/src/components/hooks/useConfig.ts
similarity index 70%
rename from hooks/useConfig.js
rename to src/components/hooks/useConfig.ts
index 2dead15a8..5a516abc7 100644
--- a/hooks/useConfig.js
+++ b/src/components/hooks/useConfig.ts
@@ -1,21 +1,22 @@
 import { useEffect } from 'react';
 import useStore, { setConfig } from 'store/app';
-import useApi from 'hooks/useApi';
+import useApi from 'components/hooks/useApi';
 
 let loading = false;
 
 export function useConfig() {
   const { config } = useStore();
   const { get } = useApi();
+  const configUrl = process.env.configUrl;
 
   async function loadConfig() {
-    const data = await get('/config');
+    const data = await get(configUrl);
     loading = false;
     setConfig(data);
   }
 
   useEffect(() => {
-    if (!config && !loading) {
+    if (!config && !loading && configUrl) {
       loading = true;
       loadConfig();
     }
diff --git a/hooks/useCountryNames.js b/src/components/hooks/useCountryNames.ts
similarity index 71%
rename from hooks/useCountryNames.js
rename to src/components/hooks/useCountryNames.ts
index 51cabf34c..22f20666c 100644
--- a/hooks/useCountryNames.js
+++ b/src/components/hooks/useCountryNames.ts
@@ -1,5 +1,4 @@
 import { useState, useEffect } from 'react';
-import { useRouter } from 'next/router';
 import { httpGet } from 'next-basics';
 import enUS from 'public/intl/country/en-US.json';
 
@@ -7,12 +6,11 @@ const countryNames = {
   'en-US': enUS,
 };
 
-export function useCountryNames(locale) {
+export function useCountryNames(locale: string) {
   const [list, setList] = useState(countryNames[locale] || enUS);
-  const { basePath } = useRouter();
 
-  async function loadData(locale) {
-    const { data } = await httpGet(`${basePath}/intl/country/${locale}.json`);
+  async function loadData(locale: string) {
+    const { data } = await httpGet(`${process.env.basePath}/intl/country/${locale}.json`);
 
     if (data) {
       countryNames[locale] = data;
diff --git a/hooks/useDateRange.js b/src/components/hooks/useDateRange.ts
similarity index 72%
rename from hooks/useDateRange.js
rename to src/components/hooks/useDateRange.ts
index 1e1b06164..efaa717fc 100644
--- a/hooks/useDateRange.js
+++ b/src/components/hooks/useDateRange.ts
@@ -1,12 +1,13 @@
 import { getMinimumUnit, parseDateRange } from 'lib/date';
 import { setItem } from 'next-basics';
 import { DATE_RANGE_CONFIG, DEFAULT_DATE_RANGE } from 'lib/constants';
-import useLocale from './useLocale';
 import websiteStore, { setWebsiteDateRange } from 'store/websites';
 import appStore, { setDateRange } from 'store/app';
+import { DateRange } from 'lib/types';
+import useLocale from './useLocale';
 import useApi from './useApi';
 
-export function useDateRange(websiteId) {
+export function useDateRange(websiteId?: string) {
   const { get } = useApi();
   const { locale } = useLocale();
   const websiteConfig = websiteStore(state => state[websiteId]?.dateRange);
@@ -14,13 +15,13 @@ export function useDateRange(websiteId) {
   const globalConfig = appStore(state => state.dateRange);
   const dateRange = parseDateRange(websiteConfig || globalConfig || defaultConfig, locale);
 
-  const saveDateRange = async value => {
+  const saveDateRange = async (value: DateRange | string) => {
     if (websiteId) {
-      let dateRange = value;
+      let dateRange: DateRange | string = value;
 
       if (typeof value === 'string') {
         if (value === 'all') {
-          const result = await get(`/websites/${websiteId}/daterange`);
+          const result: any = await get(`/websites/${websiteId}/daterange`);
           const { mindate, maxdate } = result;
 
           const startDate = new Date(mindate);
@@ -37,14 +38,17 @@ export function useDateRange(websiteId) {
         }
       }
 
-      setWebsiteDateRange(websiteId, dateRange);
+      setWebsiteDateRange(websiteId, dateRange as DateRange);
     } else {
       setItem(DATE_RANGE_CONFIG, value);
       setDateRange(value);
     }
   };
 
-  return [dateRange, saveDateRange];
+  return [dateRange, saveDateRange] as [
+    { startDate: Date; endDate: Date; modified?: number },
+    (value: string | DateRange) => void,
+  ];
 }
 
 export default useDateRange;
diff --git a/hooks/useDocumentClick.js b/src/components/hooks/useDocumentClick.ts
similarity index 77%
rename from hooks/useDocumentClick.js
rename to src/components/hooks/useDocumentClick.ts
index be3d09bed..eefd93669 100644
--- a/hooks/useDocumentClick.js
+++ b/src/components/hooks/useDocumentClick.ts
@@ -1,6 +1,6 @@
 import { useEffect } from 'react';
 
-export function useDocumentClick(handler) {
+export function useDocumentClick(handler: (event: MouseEvent) => any) {
   useEffect(() => {
     document.addEventListener('click', handler);
 
diff --git a/src/components/hooks/useEscapeKey.ts b/src/components/hooks/useEscapeKey.ts
new file mode 100644
index 000000000..5c3350e73
--- /dev/null
+++ b/src/components/hooks/useEscapeKey.ts
@@ -0,0 +1,21 @@
+import { useEffect, useCallback, KeyboardEvent } from 'react';
+
+export function useEscapeKey(handler: (event: KeyboardEvent) => void) {
+  const escFunction = useCallback((event: KeyboardEvent) => {
+    if (event.key === 'Escape') {
+      handler(event);
+    }
+  }, []);
+
+  useEffect(() => {
+    document.addEventListener('keydown', escFunction as any, false);
+
+    return () => {
+      document.removeEventListener('keydown', escFunction as any, false);
+    };
+  }, [escFunction]);
+
+  return null;
+}
+
+export default useEscapeKey;
diff --git a/src/components/hooks/useFilterQuery.ts b/src/components/hooks/useFilterQuery.ts
new file mode 100644
index 000000000..030da27da
--- /dev/null
+++ b/src/components/hooks/useFilterQuery.ts
@@ -0,0 +1,38 @@
+import { UseQueryOptions } from '@tanstack/react-query';
+import { useState, Dispatch, SetStateAction } from 'react';
+import { useApi } from 'components/hooks/useApi';
+import { FilterResult, SearchFilter } from 'lib/types';
+
+export interface FilterQueryResult<T> {
+  result: FilterResult<T>;
+  query: any;
+  params: SearchFilter;
+  setParams: Dispatch<SetStateAction<T | SearchFilter>>;
+}
+
+export function useFilterQuery<T>({
+  queryKey,
+  queryFn,
+  ...options
+}: UseQueryOptions): FilterQueryResult<T> {
+  const [params, setParams] = useState<T | SearchFilter>({
+    query: '',
+    page: 1,
+  });
+
+  const { useQuery } = useApi();
+  const { data, ...query } = useQuery({
+    queryKey: [{ ...queryKey, ...params }],
+    queryFn: () => queryFn(params as any),
+    ...options,
+  });
+
+  return {
+    result: data as FilterResult<any>,
+    query,
+    params,
+    setParams,
+  };
+}
+
+export default useFilterQuery;
diff --git a/src/components/hooks/useFilters.ts b/src/components/hooks/useFilters.ts
new file mode 100644
index 000000000..e1a9a8858
--- /dev/null
+++ b/src/components/hooks/useFilters.ts
@@ -0,0 +1,47 @@
+import { useMessages } from './useMessages';
+import { OPERATORS } from 'lib/constants';
+
+export function useFilters() {
+  const { formatMessage, labels } = useMessages();
+
+  const filterLabels = {
+    [OPERATORS.equals]: formatMessage(labels.is),
+    [OPERATORS.notEquals]: formatMessage(labels.isNot),
+    [OPERATORS.set]: formatMessage(labels.isSet),
+    [OPERATORS.notSet]: formatMessage(labels.isNotSet),
+    [OPERATORS.contains]: formatMessage(labels.contains),
+    [OPERATORS.doesNotContain]: formatMessage(labels.doesNotContain),
+    [OPERATORS.true]: formatMessage(labels.true),
+    [OPERATORS.false]: formatMessage(labels.false),
+    [OPERATORS.greaterThan]: formatMessage(labels.greaterThan),
+    [OPERATORS.lessThan]: formatMessage(labels.lessThan),
+    [OPERATORS.greaterThanEquals]: formatMessage(labels.greaterThanEquals),
+    [OPERATORS.lessThanEquals]: formatMessage(labels.lessThanEquals),
+    [OPERATORS.before]: formatMessage(labels.before),
+    [OPERATORS.after]: formatMessage(labels.after),
+  };
+
+  const typeFilters = {
+    string: [OPERATORS.equals, OPERATORS.notEquals],
+    array: [OPERATORS.contains, OPERATORS.doesNotContain],
+    boolean: [OPERATORS.true, OPERATORS.false],
+    number: [
+      OPERATORS.equals,
+      OPERATORS.notEquals,
+      OPERATORS.greaterThan,
+      OPERATORS.lessThan,
+      OPERATORS.greaterThanEquals,
+      OPERATORS.lessThanEquals,
+    ],
+    date: [OPERATORS.before, OPERATORS.after],
+    uuid: [OPERATORS.equals],
+  };
+
+  const getFilters = type => {
+    return typeFilters[type]?.map(key => ({ type, value: key, label: filterLabels[key] })) ?? [];
+  };
+
+  return { getFilters, filterLabels, typeFilters };
+}
+
+export default useFilters;
diff --git a/hooks/useForceUpdate.js b/src/components/hooks/useForceUpdate.ts
similarity index 100%
rename from hooks/useForceUpdate.js
rename to src/components/hooks/useForceUpdate.ts
diff --git a/src/components/hooks/useFormat.ts b/src/components/hooks/useFormat.ts
new file mode 100644
index 000000000..06585e497
--- /dev/null
+++ b/src/components/hooks/useFormat.ts
@@ -0,0 +1,53 @@
+import useMessages from './useMessages';
+import { BROWSERS } from 'lib/constants';
+import useLocale from './useLocale';
+import useCountryNames from './useCountryNames';
+import regions from 'public/iso-3166-2.json';
+
+export function useFormat() {
+  const { formatMessage, labels } = useMessages();
+  const { locale } = useLocale();
+  const countryNames = useCountryNames(locale);
+
+  const formatBrowser = (value: string): string => {
+    return BROWSERS[value] || value;
+  };
+
+  const formatCountry = (value: string): string => {
+    return countryNames[value] || value;
+  };
+
+  const formatRegion = (value: string): string => {
+    const [country] = value.split('-');
+    return regions[value] ? `${regions[value]}, ${countryNames[country]}` : value;
+  };
+
+  const formatCity = (value: string, country?: string): string => {
+    return `${value}, ${countryNames[country]}`;
+  };
+
+  const formatDevice = (value: string): string => {
+    return formatMessage(labels[value] || labels.unknown);
+  };
+
+  const formatValue = (value: string, type: string, data?: { [key: string]: any }): string => {
+    switch (type) {
+      case 'browser':
+        return formatBrowser(value);
+      case 'country':
+        return formatCountry(value);
+      case 'region':
+        return formatRegion(value);
+      case 'city':
+        return formatCity(value, data?.country);
+      case 'device':
+        return formatDevice(value);
+      default:
+        return value;
+    }
+  };
+
+  return { formatBrowser, formatCountry, formatRegion, formatDevice, formatValue };
+}
+
+export default useFormat;
diff --git a/hooks/useLanguageNames.js b/src/components/hooks/useLanguageNames.ts
similarity index 80%
rename from hooks/useLanguageNames.js
rename to src/components/hooks/useLanguageNames.ts
index ff59e93dc..3823a26bd 100644
--- a/hooks/useLanguageNames.js
+++ b/src/components/hooks/useLanguageNames.ts
@@ -1,5 +1,4 @@
 import { useState, useEffect } from 'react';
-import { useRouter } from 'next/router';
 import { httpGet } from 'next-basics';
 import enUS from 'public/intl/language/en-US.json';
 
@@ -9,10 +8,9 @@ const languageNames = {
 
 export function useLanguageNames(locale) {
   const [list, setList] = useState(languageNames[locale] || enUS);
-  const { basePath } = useRouter();
 
   async function loadData(locale) {
-    const { data } = await httpGet(`${basePath}/intl/language/${locale}.json`);
+    const { data } = await httpGet(`${process.env.basePath}/intl/language/${locale}.json`);
 
     if (data) {
       languageNames[locale] = data;
diff --git a/hooks/useLocale.js b/src/components/hooks/useLocale.ts
similarity index 83%
rename from hooks/useLocale.js
rename to src/components/hooks/useLocale.ts
index 86ca99042..71574d86b 100644
--- a/hooks/useLocale.js
+++ b/src/components/hooks/useLocale.ts
@@ -1,11 +1,10 @@
 import { useEffect } from 'react';
-import { useRouter } from 'next/router';
 import { httpGet, setItem } from 'next-basics';
 import { LOCALE_CONFIG } from 'lib/constants';
 import { getDateLocale, getTextDirection } from 'lib/lang';
 import useStore, { setLocale } from 'store/app';
-import useForceUpdate from 'hooks/useForceUpdate';
-import enUS from 'public/intl/messages/en-US.json';
+import useForceUpdate from 'components/hooks/useForceUpdate';
+import enUS from 'public/intl/country/en-US.json';
 
 const messages = {
   'en-US': enUS,
@@ -15,13 +14,12 @@ const selector = state => state.locale;
 
 export function useLocale() {
   const locale = useStore(selector);
-  const { basePath } = useRouter();
   const forceUpdate = useForceUpdate();
   const dir = getTextDirection(locale);
   const dateLocale = getDateLocale(locale);
 
   async function loadMessages(locale) {
-    const { ok, data } = await httpGet(`${basePath}/intl/messages/${locale}.json`);
+    const { ok, data } = await httpGet(`${process.env.basePath}/intl/messages/${locale}.json`);
 
     if (ok) {
       messages[locale] = data;
diff --git a/src/components/hooks/useLogin.ts b/src/components/hooks/useLogin.ts
new file mode 100644
index 000000000..a4ac9d3b3
--- /dev/null
+++ b/src/components/hooks/useLogin.ts
@@ -0,0 +1,22 @@
+import useApi from 'components/hooks/useApi';
+import useUser from 'components/hooks/useUser';
+
+export function useLogin() {
+  const { get, useQuery } = useApi();
+  const { user, setUser } = useUser();
+
+  const query = useQuery({
+    queryKey: ['login'],
+    queryFn: async () => {
+      const data = await get('/auth/verify');
+
+      setUser(data);
+
+      return data;
+    },
+  });
+
+  return { user, ...query };
+}
+
+export default useLogin;
diff --git a/src/components/hooks/useMessages.ts b/src/components/hooks/useMessages.ts
new file mode 100644
index 000000000..594a3c61d
--- /dev/null
+++ b/src/components/hooks/useMessages.ts
@@ -0,0 +1,30 @@
+import { useIntl, FormattedMessage, MessageDescriptor, PrimitiveType } from 'react-intl';
+import { messages, labels } from 'components/messages';
+import { FormatXMLElementFn, Options } from 'intl-messageformat';
+
+export function useMessages(): any {
+  const intl = useIntl();
+
+  const getMessage = (id: string) => {
+    const message = Object.values(messages).find(value => value.id === id);
+
+    return message ? formatMessage(message) : id;
+  };
+
+  const formatMessage = (
+    descriptor:
+      | MessageDescriptor
+      | {
+          id: string;
+          defaultMessage: string;
+        },
+    values?: Record<string, PrimitiveType | FormatXMLElementFn<string, string>>,
+    opts?: Options,
+  ) => {
+    return descriptor ? intl.formatMessage(descriptor, values, opts) : null;
+  };
+
+  return { formatMessage, FormattedMessage, messages, labels, getMessage };
+}
+
+export default useMessages;
diff --git a/src/components/hooks/useNavigation.ts b/src/components/hooks/useNavigation.ts
new file mode 100644
index 000000000..fb9bffc58
--- /dev/null
+++ b/src/components/hooks/useNavigation.ts
@@ -0,0 +1,32 @@
+import { useMemo } from 'react';
+import { usePathname, useRouter, useSearchParams } from 'next/navigation';
+import { buildUrl } from 'next-basics';
+
+export function useNavigation(): {
+  pathname: string;
+  query: { [key: string]: string };
+  router: any;
+  makeUrl: (params: any, reset?: boolean) => string;
+} {
+  const router = useRouter();
+  const pathname = usePathname();
+  const params = useSearchParams();
+
+  const query = useMemo(() => {
+    const obj = {};
+
+    for (const [key, value] of params.entries()) {
+      obj[key] = decodeURIComponent(value);
+    }
+
+    return obj;
+  }, [params]);
+
+  function makeUrl(params: any, reset?: boolean) {
+    return reset ? pathname : buildUrl(pathname, { ...query, ...params });
+  }
+
+  return { pathname, query, router, makeUrl };
+}
+
+export default useNavigation;
diff --git a/hooks/useReport.js b/src/components/hooks/useReport.ts
similarity index 64%
rename from hooks/useReport.js
rename to src/components/hooks/useReport.ts
index e036fc3ad..7769ed6c9 100644
--- a/hooks/useReport.js
+++ b/src/components/hooks/useReport.ts
@@ -1,20 +1,24 @@
 import { produce } from 'immer';
 import { useCallback, useEffect, useState } from 'react';
+import { useTimezone } from './useTimezone';
 import useApi from './useApi';
+import useMessages from './useMessages';
 
-const baseParameters = {
-  name: 'Untitled',
-  description: '',
-  parameters: {},
-};
-
-export function useReport(reportId, defaultParameters) {
+export function useReport(reportId: string, defaultParameters: { [key: string]: any }) {
   const [report, setReport] = useState(null);
   const [isRunning, setIsRunning] = useState(false);
   const { get, post } = useApi();
+  const [timezone] = useTimezone();
+  const { formatMessage, labels } = useMessages();
 
-  const loadReport = async id => {
-    const data = await get(`/reports/${id}`);
+  const baseParameters = {
+    name: formatMessage(labels.untitled),
+    description: '',
+    parameters: {},
+  };
+
+  const loadReport = async (id: string) => {
+    const data: any = await get(`/reports/${id}`);
 
     const { dateRange } = data?.parameters || {};
     const { startDate, endDate } = dateRange || {};
@@ -28,15 +32,15 @@ export function useReport(reportId, defaultParameters) {
   };
 
   const runReport = useCallback(
-    async parameters => {
+    async (parameters: { [key: string]: any }) => {
       setIsRunning(true);
 
       const { type } = report;
 
-      const data = await post(`/reports/${type}`, parameters);
+      const data = await post(`/reports/${type}`, { ...parameters, timezone });
 
       setReport(
-        produce(state => {
+        produce((state: any) => {
           state.parameters = parameters;
           state.data = data;
 
@@ -46,13 +50,13 @@ export function useReport(reportId, defaultParameters) {
 
       setIsRunning(false);
     },
-    [report],
+    [report, timezone],
   );
 
   const updateReport = useCallback(
-    async data => {
+    async (data: { [x: string]: any; parameters: any }) => {
       setReport(
-        produce(state => {
+        produce((state: any) => {
           const { parameters, ...rest } = data;
 
           if (parameters) {
diff --git a/src/components/hooks/useReports.ts b/src/components/hooks/useReports.ts
new file mode 100644
index 000000000..d2473002d
--- /dev/null
+++ b/src/components/hooks/useReports.ts
@@ -0,0 +1,30 @@
+import { useState } from 'react';
+import useApi from './useApi';
+import useFilterQuery from 'components/hooks/useFilterQuery';
+
+export function useReports(websiteId?: string) {
+  const [modified, setModified] = useState(Date.now());
+  const { get, del, useMutation } = useApi();
+  const { mutate } = useMutation({ mutationFn: (reportId: string) => del(`/reports/${reportId}`) });
+  const queryResult = useFilterQuery({
+    queryKey: ['reports', { websiteId, modified }],
+    queryFn: (params: any) => {
+      return get(websiteId ? `/websites/${websiteId}/reports` : `/reports`, params);
+    },
+  });
+
+  const deleteReport = (id: any) => {
+    mutate(id, {
+      onSuccess: () => {
+        setModified(Date.now());
+      },
+    });
+  };
+
+  return {
+    ...queryResult,
+    deleteReport,
+  };
+}
+
+export default useReports;
diff --git a/src/components/hooks/useShareToken.ts b/src/components/hooks/useShareToken.ts
new file mode 100644
index 000000000..189657be4
--- /dev/null
+++ b/src/components/hooks/useShareToken.ts
@@ -0,0 +1,27 @@
+import useStore, { setShareToken } from 'store/app';
+import useApi from './useApi';
+
+const selector = (state: { shareToken: string }) => state.shareToken;
+
+export function useShareToken(shareId: string): {
+  shareToken: any;
+  isLoading?: boolean;
+  error?: Error;
+} {
+  const shareToken = useStore(selector);
+  const { get, useQuery } = useApi();
+  const { isLoading, error } = useQuery({
+    queryKey: ['share', shareId],
+    queryFn: async () => {
+      const data = await get(`/share/${shareId}`);
+
+      setShareToken(data);
+
+      return data;
+    },
+  });
+
+  return { shareToken, isLoading, error };
+}
+
+export default useShareToken;
diff --git a/hooks/useSticky.js b/src/components/hooks/useSticky.ts
similarity index 76%
rename from hooks/useSticky.js
rename to src/components/hooks/useSticky.ts
index be33f6ed1..459c489ad 100644
--- a/hooks/useSticky.js
+++ b/src/components/hooks/useSticky.ts
@@ -5,8 +5,9 @@ export function useSticky({ enabled = true, threshold = 1 }) {
   const ref = useRef(null);
 
   useEffect(() => {
-    let observer;
-    const handler = ([entry]) => setIsSticky(entry.intersectionRatio < threshold);
+    let observer: IntersectionObserver | undefined;
+    const handler: IntersectionObserverCallback = ([entry]) =>
+      setIsSticky(entry.intersectionRatio < threshold);
 
     if (enabled && ref.current) {
       observer = new IntersectionObserver(handler, { threshold: [threshold] });
diff --git a/hooks/useTheme.js b/src/components/hooks/useTheme.ts
similarity index 97%
rename from hooks/useTheme.js
rename to src/components/hooks/useTheme.ts
index 7e40f6015..099bf962b 100644
--- a/hooks/useTheme.js
+++ b/src/components/hooks/useTheme.ts
@@ -4,7 +4,7 @@ import { getItem, setItem } from 'next-basics';
 import { THEME_COLORS, THEME_CONFIG } from 'lib/constants';
 import { colord } from 'colord';
 
-const selector = state => state.theme;
+const selector = (state: { theme: string }) => state.theme;
 
 export function useTheme() {
   const defaultTheme =
diff --git a/hooks/useTimezone.js b/src/components/hooks/useTimezone.ts
similarity index 100%
rename from hooks/useTimezone.js
rename to src/components/hooks/useTimezone.ts
diff --git a/hooks/useUser.js b/src/components/hooks/useUser.ts
similarity index 100%
rename from hooks/useUser.js
rename to src/components/hooks/useUser.ts
diff --git a/src/components/hooks/useWebsite.ts b/src/components/hooks/useWebsite.ts
new file mode 100644
index 000000000..d18e96ba6
--- /dev/null
+++ b/src/components/hooks/useWebsite.ts
@@ -0,0 +1,12 @@
+import useApi from './useApi';
+
+export function useWebsite(websiteId: string) {
+  const { get, useQuery } = useApi();
+  return useQuery({
+    queryKey: ['websites', websiteId],
+    queryFn: () => get(`/websites/${websiteId}`),
+    enabled: !!websiteId,
+  });
+}
+
+export default useWebsite;
diff --git a/components/icons.ts b/src/components/icons.ts
similarity index 95%
rename from components/icons.ts
rename to src/components/icons.ts
index e42b15fee..01d7caf5a 100644
--- a/components/icons.ts
+++ b/src/components/icons.ts
@@ -11,6 +11,7 @@ import Gear from 'assets/gear.svg';
 import Globe from 'assets/globe.svg';
 import Lock from 'assets/lock.svg';
 import Logo from 'assets/logo.svg';
+import Magnet from 'assets/magnet.svg';
 import Moon from 'assets/moon.svg';
 import Nodes from 'assets/nodes.svg';
 import Overview from 'assets/overview.svg';
@@ -35,6 +36,7 @@ const icons = {
   Globe,
   Lock,
   Logo,
+  Magnet,
   Moon,
   Nodes,
   Overview,
diff --git a/components/input/DateFilter.js b/src/components/input/DateFilter.tsx
similarity index 70%
rename from components/input/DateFilter.js
rename to src/components/input/DateFilter.tsx
index 7fc4319de..f7739f170 100644
--- a/components/input/DateFilter.js
+++ b/src/components/input/DateFilter.tsx
@@ -2,10 +2,21 @@ import { useState } from 'react';
 import { Icon, Modal, Dropdown, Item, Text, Flexbox } from 'react-basics';
 import { endOfYear, isSameDay } from 'date-fns';
 import DatePickerForm from 'components/metrics/DatePickerForm';
-import useLocale from 'hooks/useLocale';
-import { dateFormat } from 'lib/date';
+import useLocale from 'components/hooks/useLocale';
+import useMessages from 'components/hooks/useMessages';
 import Icons from 'components/icons';
-import useMessages from 'hooks/useMessages';
+import { formatDate } from 'lib/date';
+
+export interface DateFilterProps {
+  value: string;
+  startDate: Date;
+  endDate: Date;
+  className?: string;
+  onChange?: (value: string) => void;
+  selectedUnit?: string;
+  showAllTime?: boolean;
+  alignment?: 'start' | 'center' | 'end';
+}
 
 export function DateFilter({
   value,
@@ -13,9 +24,10 @@ export function DateFilter({
   endDate,
   className,
   onChange,
+  selectedUnit,
   showAllTime = false,
   alignment = 'end',
-}) {
+}: DateFilterProps) {
   const { formatMessage, labels } = useMessages();
   const [showPicker, setShowPicker] = useState(false);
 
@@ -64,15 +76,20 @@ export function DateFilter({
     },
   ].filter(n => n);
 
-  const renderValue = value => {
+  const renderValue = (value: string) => {
     return value.startsWith('range') ? (
-      <CustomRange startDate={startDate} endDate={endDate} onClick={() => handleChange('custom')} />
+      <CustomRange
+        startDate={startDate}
+        endDate={endDate}
+        selectedUnit={selectedUnit}
+        onClick={() => handleChange('custom')}
+      />
     ) : (
       options.find(e => e.value === value).label
     );
   };
 
-  const handleChange = value => {
+  const handleChange = (value: string) => {
     if (value === 'custom') {
       setShowPicker(true);
       return;
@@ -80,7 +97,7 @@ export function DateFilter({
     onChange(value);
   };
 
-  const handlePickerChange = value => {
+  const handlePickerChange = (value: string) => {
     setShowPicker(false);
     onChange(value);
   };
@@ -96,7 +113,7 @@ export function DateFilter({
         value={value}
         alignment={alignment}
         placeholder={formatMessage(labels.selectDate)}
-        onChange={handleChange}
+        onChange={key => handleChange(key as any)}
       >
         {({ label, value, divider }) => (
           <Item key={value} divider={divider}>
@@ -120,9 +137,11 @@ export function DateFilter({
   );
 }
 
-const CustomRange = ({ startDate, endDate, onClick }) => {
+const CustomRange = ({ startDate, endDate, selectedUnit, onClick }) => {
   const { locale } = useLocale();
 
+  const monthFormat = +selectedUnit?.num === 1 && selectedUnit?.unit === 'month';
+
   function handleClick(e) {
     e.stopPropagation();
 
@@ -135,8 +154,14 @@ const CustomRange = ({ startDate, endDate, onClick }) => {
         <Icons.Calendar />
       </Icon>
       <Text>
-        {dateFormat(startDate, 'd LLL y', locale)}
-        {!isSameDay(startDate, endDate) && ` — ${dateFormat(endDate, 'd LLL y', locale)}`}
+        {monthFormat ? (
+          <>{formatDate(startDate, 'MMMM yyyy', locale)}</>
+        ) : (
+          <>
+            {formatDate(startDate, 'd LLL y', locale)}
+            {!isSameDay(startDate, endDate) && ` — ${formatDate(endDate, 'd LLL y', locale)}`}
+          </>
+        )}
       </Text>
     </Flexbox>
   );
diff --git a/components/input/LanguageButton.module.css b/src/components/input/LanguageButton.module.css
similarity index 63%
rename from components/input/LanguageButton.module.css
rename to src/components/input/LanguageButton.module.css
index 3d4c0c569..cc5d649a1 100644
--- a/components/input/LanguageButton.module.css
+++ b/src/components/input/LanguageButton.module.css
@@ -1,7 +1,6 @@
 .menu {
-  display: flex;
-  flex-flow: row wrap;
-  min-width: 640px;
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
   padding: 10px;
   background: var(--base50);
   z-index: var(--z-index-popup);
@@ -14,7 +13,7 @@
   display: flex;
   align-items: center;
   justify-content: space-between;
-  min-width: calc(100% / 3);
+  min-width: 200px;
   border-radius: 5px;
   padding: 5px 10px;
 }
@@ -32,3 +31,15 @@
 .icon {
   color: var(--primary400);
 }
+
+@media screen and (max-width: 992px) {
+  .menu {
+    grid-template-columns: repeat(2, 1fr);
+  }
+}
+
+@media screen and (max-width: 768px) {
+  .menu {
+    transform: translateX(40px);
+  }
+}
diff --git a/components/input/LanguageButton.js b/src/components/input/LanguageButton.tsx
similarity index 85%
rename from components/input/LanguageButton.js
rename to src/components/input/LanguageButton.tsx
index d4c1cbc39..1151da0be 100644
--- a/components/input/LanguageButton.js
+++ b/src/components/input/LanguageButton.tsx
@@ -1,7 +1,7 @@
 import { Icon, Button, PopupTrigger, Popup, Text } from 'react-basics';
 import classNames from 'classnames';
 import { languages } from 'lib/lang';
-import useLocale from 'hooks/useLocale';
+import useLocale from 'components/hooks/useLocale';
 import Icons from 'components/icons';
 import styles from './LanguageButton.module.css';
 
@@ -9,7 +9,7 @@ export function LanguageButton() {
   const { locale, saveLocale, dir } = useLocale();
   const items = Object.keys(languages).map(key => ({ ...languages[key], value: key }));
 
-  function handleSelect(value, close, e) {
+  function handleSelect(value: string, close: () => void, e: MouseEvent) {
     e.stopPropagation();
     saveLocale(value);
     close();
@@ -23,7 +23,7 @@ export function LanguageButton() {
         </Icon>
       </Button>
       <Popup position="bottom" alignment={dir === 'rtl' ? 'start' : 'end'}>
-        {close => {
+        {(close: () => void) => {
           return (
             <div className={styles.menu}>
               {items.map(({ value, label }) => {
@@ -31,7 +31,7 @@ export function LanguageButton() {
                   <div
                     key={value}
                     className={classNames(styles.item, { [styles.selected]: value === locale })}
-                    onClick={handleSelect.bind(null, value, close)}
+                    onClick={(e: any) => handleSelect(value, close, e)}
                   >
                     <Text>{label}</Text>
                     {value === locale && (
diff --git a/components/input/LogoutButton.js b/src/components/input/LogoutButton.tsx
similarity index 65%
rename from components/input/LogoutButton.js
rename to src/components/input/LogoutButton.tsx
index 4a15cd68b..c787f2296 100644
--- a/components/input/LogoutButton.js
+++ b/src/components/input/LogoutButton.tsx
@@ -1,11 +1,15 @@
 import { Button, Icon, Icons, TooltipPopup } from 'react-basics';
 import Link from 'next/link';
-import useMessages from 'hooks/useMessages';
+import useMessages from 'components/hooks/useMessages';
 
-export function LogoutButton({ tooltipPosition = 'top' }) {
+export function LogoutButton({
+  tooltipPosition = 'top',
+}: {
+  tooltipPosition?: 'top' | 'bottom' | 'left' | 'right';
+}) {
   const { formatMessage, labels } = useMessages();
   return (
-    <Link href="/logout">
+    <Link href="/src/app/logout/logout">
       <TooltipPopup label={formatMessage(labels.logout)} position={tooltipPosition}>
         <Button variant="quiet">
           <Icon>
diff --git a/src/components/input/MonthSelect.module.css b/src/components/input/MonthSelect.module.css
new file mode 100644
index 000000000..3b13bcc18
--- /dev/null
+++ b/src/components/input/MonthSelect.module.css
@@ -0,0 +1,22 @@
+.container {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border: 1px solid var(--base400);
+  border-radius: var(--border-radius);
+}
+
+.input {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  cursor: pointer;
+}
+
+.popup {
+  border: 1px solid var(--base400);
+  background: var(--base50);
+  border-radius: var(--border-radius);
+  padding: 20px;
+  margin-top: 5px;
+}
diff --git a/src/components/input/MonthSelect.tsx b/src/components/input/MonthSelect.tsx
new file mode 100644
index 000000000..acb17dfe6
--- /dev/null
+++ b/src/components/input/MonthSelect.tsx
@@ -0,0 +1,66 @@
+import { useRef } from 'react';
+import {
+  Text,
+  Icon,
+  CalendarMonthSelect,
+  CalendarYearSelect,
+  Button,
+  PopupTrigger,
+  Popup,
+} from 'react-basics';
+import { startOfMonth, endOfMonth } from 'date-fns';
+import Icons from 'components/icons';
+import { useLocale } from 'components/hooks';
+import { formatDate } from 'lib/date';
+import styles from './MonthSelect.module.css';
+
+export function MonthSelect({ date = new Date(), onChange }) {
+  const { locale, dateLocale } = useLocale();
+  const month = formatDate(date, 'MMMM', locale);
+  const year = date.getFullYear();
+  const ref = useRef();
+
+  const handleChange = (close: () => void, date: Date) => {
+    onChange(`range:${startOfMonth(date).getTime()}:${endOfMonth(date).getTime()}`);
+    close();
+  };
+
+  return (
+    <>
+      <div ref={ref} className={styles.container}>
+        <PopupTrigger>
+          <Button className={styles.input} variant="quiet">
+            <Text>{month}</Text>
+            <Icon size="sm">
+              <Icons.ChevronDown />
+            </Icon>
+          </Button>
+          <Popup className={styles.popup} alignment="start">
+            {close => (
+              <CalendarMonthSelect
+                date={date}
+                locale={dateLocale}
+                onSelect={handleChange.bind(null, close)}
+              />
+            )}
+          </Popup>
+        </PopupTrigger>
+        <PopupTrigger>
+          <Button className={styles.input} variant="quiet">
+            <Text>{year}</Text>
+            <Icon size="sm">
+              <Icons.ChevronDown />
+            </Icon>
+          </Button>
+          <Popup className={styles.popup} alignment="start">
+            {(close: any) => (
+              <CalendarYearSelect date={date} onSelect={handleChange.bind(null, close)} />
+            )}
+          </Popup>
+        </PopupTrigger>
+      </div>
+    </>
+  );
+}
+
+export default MonthSelect;
diff --git a/components/input/ProfileButton.module.css b/src/components/input/ProfileButton.module.css
similarity index 50%
rename from components/input/ProfileButton.module.css
rename to src/components/input/ProfileButton.module.css
index 8b1897bd5..e78433448 100644
--- a/components/input/ProfileButton.module.css
+++ b/src/components/input/ProfileButton.module.css
@@ -8,3 +8,11 @@
   gap: 12px;
   background: var(--base50);
 }
+
+.version {
+  font-family: monospace;
+  font-size: 11px;
+  color: var(--base600);
+  text-align: right;
+  margin-right: 10px;
+}
diff --git a/components/input/ProfileButton.js b/src/components/input/ProfileButton.tsx
similarity index 80%
rename from components/input/ProfileButton.js
rename to src/components/input/ProfileButton.tsx
index bbd84af5d..2c3f86294 100644
--- a/components/input/ProfileButton.js
+++ b/src/components/input/ProfileButton.tsx
@@ -1,18 +1,18 @@
 import { Icon, Button, PopupTrigger, Popup, Menu, Item, Text } from 'react-basics';
-import { useRouter } from 'next/router';
+import { useRouter } from 'next/navigation';
 import Icons from 'components/icons';
-import useMessages from 'hooks/useMessages';
-import useUser from 'hooks/useUser';
-import useConfig from 'hooks/useConfig';
+import useMessages from 'components/hooks/useMessages';
+import useUser from 'components/hooks/useUser';
+import useLocale from 'components/hooks/useLocale';
+import { CURRENT_VERSION } from 'lib/constants';
 import styles from './ProfileButton.module.css';
-import useLocale from 'hooks/useLocale';
 
 export function ProfileButton() {
   const { formatMessage, labels } = useMessages();
   const { user } = useUser();
-  const { cloudMode } = useConfig();
   const router = useRouter();
   const { dir } = useLocale();
+  const cloudMode = Boolean(process.env.cloudMode);
 
   const handleSelect = key => {
     if (key === 'profile') {
@@ -52,6 +52,7 @@ export function ProfileButton() {
               <Text>{formatMessage(labels.logout)}</Text>
             </Item>
           )}
+          <div className={styles.version}>{`v${CURRENT_VERSION}`}</div>
         </Menu>
       </Popup>
     </PopupTrigger>
diff --git a/components/input/RefreshButton.js b/src/components/input/RefreshButton.tsx
similarity index 66%
rename from components/input/RefreshButton.js
rename to src/components/input/RefreshButton.tsx
index de7ce8cfa..01e80378d 100644
--- a/components/input/RefreshButton.js
+++ b/src/components/input/RefreshButton.tsx
@@ -1,10 +1,16 @@
 import { LoadingButton, Icon, TooltipPopup } from 'react-basics';
 import { setWebsiteDateRange } from 'store/websites';
-import useDateRange from 'hooks/useDateRange';
+import useDateRange from 'components/hooks/useDateRange';
 import Icons from 'components/icons';
-import useMessages from 'hooks/useMessages';
+import useMessages from 'components/hooks/useMessages';
 
-export function RefreshButton({ websiteId, isLoading }) {
+export function RefreshButton({
+  websiteId,
+  isLoading,
+}: {
+  websiteId: string;
+  isLoading?: boolean;
+}) {
   const { formatMessage, labels } = useMessages();
   const [dateRange] = useDateRange(websiteId);
 
@@ -16,7 +22,7 @@ export function RefreshButton({ websiteId, isLoading }) {
 
   return (
     <TooltipPopup label={formatMessage(labels.refresh)}>
-      <LoadingButton loading={isLoading} onClick={handleClick}>
+      <LoadingButton isLoading={isLoading} onClick={handleClick}>
         <Icon>
           <Icons.Refresh />
         </Icon>
diff --git a/components/input/SettingsButton.module.css b/src/components/input/SettingsButton.module.css
similarity index 100%
rename from components/input/SettingsButton.module.css
rename to src/components/input/SettingsButton.module.css
diff --git a/components/input/SettingsButton.js b/src/components/input/SettingsButton.tsx
similarity index 67%
rename from components/input/SettingsButton.js
rename to src/components/input/SettingsButton.tsx
index 6f2012d47..2a076d42b 100644
--- a/components/input/SettingsButton.js
+++ b/src/components/input/SettingsButton.tsx
@@ -1,8 +1,8 @@
 import { Button, Icon, PopupTrigger, Popup, Form, FormRow } from 'react-basics';
-import TimezoneSetting from 'components/pages/settings/profile/TimezoneSetting';
-import DateRangeSetting from 'components/pages/settings/profile/DateRangeSetting';
+import TimezoneSetting from 'app/(main)/settings/profile/TimezoneSetting';
+import DateRangeSetting from 'app/(main)/settings/profile/DateRangeSetting';
 import Icons from 'components/icons';
-import useMessages from 'hooks/useMessages';
+import useMessages from 'components/hooks/useMessages';
 import styles from './SettingsButton.module.css';
 
 export function SettingsButton() {
@@ -15,12 +15,7 @@ export function SettingsButton() {
           <Icons.Gear />
         </Icon>
       </Button>
-      <Popup
-        className={styles.popup}
-        position="bottom"
-        alignment="end"
-        onClick={e => e.stopPropagation()}
-      >
+      <Popup className={styles.popup} position="bottom" alignment="end">
         <Form>
           <FormRow label={formatMessage(labels.timezone)}>
             <TimezoneSetting />
diff --git a/components/input/ThemeButton.module.css b/src/components/input/ThemeButton.module.css
similarity index 100%
rename from components/input/ThemeButton.module.css
rename to src/components/input/ThemeButton.module.css
diff --git a/components/input/ThemeButton.js b/src/components/input/ThemeButton.tsx
similarity index 90%
rename from components/input/ThemeButton.js
rename to src/components/input/ThemeButton.tsx
index 8ab0cdcd5..76d1b3708 100644
--- a/components/input/ThemeButton.js
+++ b/src/components/input/ThemeButton.tsx
@@ -1,6 +1,6 @@
-import { useTransition, animated } from 'react-spring';
+import { useTransition, animated } from '@react-spring/web';
 import { Button, Icon } from 'react-basics';
-import useTheme from 'hooks/useTheme';
+import useTheme from 'components/hooks/useTheme';
 import Icons from 'components/icons';
 import styles from './ThemeButton.module.css';
 
diff --git a/src/components/input/WebsiteDateFilter.module.css b/src/components/input/WebsiteDateFilter.module.css
new file mode 100644
index 000000000..6f2e822dc
--- /dev/null
+++ b/src/components/input/WebsiteDateFilter.module.css
@@ -0,0 +1,24 @@
+.container {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+}
+
+.dropdown {
+  min-width: 200px;
+}
+
+.buttons {
+  display: flex;
+}
+
+.buttons button:first-child {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+.buttons button:last-child {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+  border-left: 1px solid var(--base400) !important;
+}
diff --git a/src/components/input/WebsiteDateFilter.tsx b/src/components/input/WebsiteDateFilter.tsx
new file mode 100644
index 000000000..cf1beaa1d
--- /dev/null
+++ b/src/components/input/WebsiteDateFilter.tsx
@@ -0,0 +1,53 @@
+import useDateRange from 'components/hooks/useDateRange';
+import { isAfter } from 'date-fns';
+import { incrementDateRange } from 'lib/date';
+import { Button, Icon, Icons } from 'react-basics';
+import DateFilter from './DateFilter';
+import styles from './WebsiteDateFilter.module.css';
+
+export function WebsiteDateFilter({ websiteId }: { websiteId: string }) {
+  const [dateRange, setDateRange] = useDateRange(websiteId);
+  const { value, startDate, endDate, selectedUnit } = dateRange;
+  const isFutureDate =
+    value !== 'all' &&
+    selectedUnit &&
+    isAfter(incrementDateRange(dateRange, -1).startDate, new Date());
+
+  const handleChange = value => {
+    setDateRange(value);
+  };
+
+  const handleIncrement = value => {
+    setDateRange(incrementDateRange(dateRange, value));
+  };
+
+  return (
+    <div className={styles.container}>
+      {value !== 'all' && selectedUnit && (
+        <div className={styles.buttons}>
+          <Button onClick={() => handleIncrement(1)}>
+            <Icon rotate={90}>
+              <Icons.ChevronDown />
+            </Icon>
+          </Button>
+          <Button onClick={() => handleIncrement(-1)} disabled={isFutureDate}>
+            <Icon rotate={270}>
+              <Icons.ChevronDown />
+            </Icon>
+          </Button>
+        </div>
+      )}
+      <DateFilter
+        className={styles.dropdown}
+        value={value}
+        startDate={startDate}
+        endDate={endDate}
+        selectedUnit={selectedUnit}
+        onChange={handleChange}
+        showAllTime={true}
+      />
+    </div>
+  );
+}
+
+export default WebsiteDateFilter;
diff --git a/src/components/input/WebsiteSelect.module.css b/src/components/input/WebsiteSelect.module.css
new file mode 100644
index 000000000..42e2911a8
--- /dev/null
+++ b/src/components/input/WebsiteSelect.module.css
@@ -0,0 +1,4 @@
+.dropdown {
+  max-height: 400px;
+  overflow-y: auto;
+}
diff --git a/src/components/input/WebsiteSelect.tsx b/src/components/input/WebsiteSelect.tsx
new file mode 100644
index 000000000..e125e2589
--- /dev/null
+++ b/src/components/input/WebsiteSelect.tsx
@@ -0,0 +1,39 @@
+import { Dropdown, Item } from 'react-basics';
+import useApi from 'components/hooks/useApi';
+import useMessages from 'components/hooks/useMessages';
+import styles from './WebsiteSelect.module.css';
+
+export function WebsiteSelect({
+  websiteId,
+  onSelect,
+}: {
+  websiteId: string;
+  onSelect?: (key: any) => void;
+}) {
+  const { formatMessage, labels } = useMessages();
+  const { get, useQuery } = useApi();
+  const { data } = useQuery({
+    queryKey: ['websites:me'],
+    queryFn: () => get('/me/websites', { pageSize: 100 }),
+  });
+
+  const renderValue = value => {
+    return data?.data?.find(({ id }) => id === value)?.name;
+  };
+
+  return (
+    <Dropdown
+      menuProps={{ className: styles.dropdown }}
+      items={data?.data}
+      value={websiteId}
+      renderValue={renderValue}
+      onChange={onSelect}
+      alignment="end"
+      placeholder={formatMessage(labels.selectWebsite)}
+    >
+      {({ id, name }) => <Item key={id}>{name}</Item>}
+    </Dropdown>
+  );
+}
+
+export default WebsiteSelect;
diff --git a/src/components/layout/Grid.module.css b/src/components/layout/Grid.module.css
new file mode 100644
index 000000000..f72a5f126
--- /dev/null
+++ b/src/components/layout/Grid.module.css
@@ -0,0 +1,68 @@
+.grid {
+  display: grid;
+}
+
+.row {
+  display: grid;
+  grid-template-columns: repeat(6, 1fr);
+  border-top: 1px solid var(--base300);
+}
+
+.col {
+  padding: 20px;
+  min-height: 430px;
+  border-inline-start: 1px solid var(--base300);
+}
+
+.col:first-child {
+  border-inline-start: 0;
+  padding-inline-start: 0;
+}
+
+.col:last-child {
+  padding-inline-end: 0;
+}
+
+.col.two {
+  grid-column: span 3;
+}
+
+.col.three {
+  grid-column: span 2;
+}
+
+.col.two-one:first-child {
+  grid-column: span 4;
+}
+
+.col.two-one:last-child {
+  grid-column: span 2;
+}
+
+.col.one-two:first-child {
+  grid-column: span 2;
+}
+
+.col.one-two:last-child {
+  grid-column: span 4;
+}
+
+@media only screen and (max-width: 992px) {
+  .row {
+    border: 0;
+  }
+
+  .row > .col {
+    border-top: 1px solid var(--base300);
+    border-inline-start: 0;
+    border-inline-end: 0;
+    padding: 20px 0;
+  }
+
+  .col.two,
+  .col.three,
+  .col.one-two,
+  .col.two-one {
+    grid-column: span 6 !important;
+  }
+}
diff --git a/src/components/layout/Grid.tsx b/src/components/layout/Grid.tsx
new file mode 100644
index 000000000..2a34fdc4f
--- /dev/null
+++ b/src/components/layout/Grid.tsx
@@ -0,0 +1,34 @@
+import { CSSProperties } from 'react';
+import classNames from 'classnames';
+import { mapChildren } from 'react-basics';
+import styles from './Grid.module.css';
+
+export interface GridProps {
+  className?: string;
+  style?: CSSProperties;
+  children?: any;
+}
+
+export function Grid({ className, style, children }: GridProps) {
+  return (
+    <div className={classNames(styles.grid, className)} style={style}>
+      {children}
+    </div>
+  );
+}
+
+export function GridRow(props: {
+  [x: string]: any;
+  columns?: 'one' | 'two' | 'three' | 'one-two' | 'two-one';
+  className?: string;
+  children?: any;
+}) {
+  const { columns = 'two', className, children, ...otherProps } = props;
+  return (
+    <div {...otherProps} className={classNames(styles.row, className)}>
+      {mapChildren(children, child => {
+        return <div className={classNames(styles.col, { [styles[columns]]: true })}>{child}</div>;
+      })}
+    </div>
+  );
+}
diff --git a/components/layout/NavGroup.module.css b/src/components/layout/NavGroup.module.css
similarity index 100%
rename from components/layout/NavGroup.module.css
rename to src/components/layout/NavGroup.module.css
diff --git a/components/layout/NavGroup.js b/src/components/layout/NavGroup.tsx
similarity index 86%
rename from components/layout/NavGroup.js
rename to src/components/layout/NavGroup.tsx
index 94f9d8e66..e95b61faf 100644
--- a/components/layout/NavGroup.js
+++ b/src/components/layout/NavGroup.tsx
@@ -1,19 +1,27 @@
 import { useState } from 'react';
 import { Icon, Text, TooltipPopup } from 'react-basics';
 import classNames from 'classnames';
-import { useRouter } from 'next/router';
+import { usePathname } from 'next/navigation';
 import Link from 'next/link';
 import Icons from 'components/icons';
 import styles from './NavGroup.module.css';
 
+export interface NavGroupProps {
+  title: string;
+  items: any[];
+  defaultExpanded?: boolean;
+  allowExpand?: boolean;
+  minimized?: boolean;
+}
+
 export function NavGroup({
   title,
   items,
   defaultExpanded = true,
   allowExpand = true,
   minimized = false,
-}) {
-  const { pathname } = useRouter();
+}: NavGroupProps) {
+  const pathname = usePathname();
   const [expanded, setExpanded] = useState(defaultExpanded);
 
   const handleExpand = () => setExpanded(state => !state);
diff --git a/src/components/layout/Page.module.css b/src/components/layout/Page.module.css
new file mode 100644
index 000000000..52893157c
--- /dev/null
+++ b/src/components/layout/Page.module.css
@@ -0,0 +1,11 @@
+.page {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  position: relative;
+  width: 100%;
+  max-width: 1320px;
+  margin: 0 auto;
+  padding: 0 20px;
+  min-height: calc(100vh - 60px);
+}
diff --git a/components/layout/Page.js b/src/components/layout/Page.tsx
similarity index 53%
rename from components/layout/Page.js
rename to src/components/layout/Page.tsx
index 30abde508..e32a09a3a 100644
--- a/components/layout/Page.js
+++ b/src/components/layout/Page.tsx
@@ -1,17 +1,29 @@
+'use client';
+import { ReactNode } from 'react';
 import classNames from 'classnames';
 import { Banner, Loading } from 'react-basics';
-import useMessages from 'hooks/useMessages';
+import useMessages from 'components/hooks/useMessages';
 import styles from './Page.module.css';
 
-export function Page({ className, error, loading, children }) {
+export function Page({
+  className,
+  error,
+  isLoading,
+  children,
+}: {
+  className?: string;
+  error?: unknown;
+  isLoading?: boolean;
+  children?: ReactNode;
+}) {
   const { formatMessage, messages } = useMessages();
 
   if (error) {
     return <Banner variant="error">{formatMessage(messages.error)}</Banner>;
   }
 
-  if (loading) {
-    return <Loading icon="spinner" size="xl" position="page" />;
+  if (isLoading) {
+    return <Loading position="page" />;
   }
 
   return <div className={classNames(styles.page, className)}>{children}</div>;
diff --git a/components/layout/PageHeader.module.css b/src/components/layout/PageHeader.module.css
similarity index 85%
rename from components/layout/PageHeader.module.css
rename to src/components/layout/PageHeader.module.css
index b54ecfcf6..a4eeb4c6b 100644
--- a/components/layout/PageHeader.module.css
+++ b/src/components/layout/PageHeader.module.css
@@ -36,13 +36,4 @@
   .header {
     margin-bottom: 10px;
   }
-
-  .title {
-    font-size: 18px;
-  }
-
-  .actions {
-    flex-basis: 100%;
-    order: -1;
-  }
 }
diff --git a/components/layout/PageHeader.js b/src/components/layout/PageHeader.tsx
similarity index 58%
rename from components/layout/PageHeader.js
rename to src/components/layout/PageHeader.tsx
index f13631409..2261bebcb 100644
--- a/components/layout/PageHeader.js
+++ b/src/components/layout/PageHeader.tsx
@@ -1,8 +1,14 @@
 import classNames from 'classnames';
-import React from 'react';
+import React, { ReactNode } from 'react';
 import styles from './PageHeader.module.css';
 
-export function PageHeader({ title, children, className }) {
+export interface PageHeaderProps {
+  title?: ReactNode;
+  className?: string;
+  children?: ReactNode;
+}
+
+export function PageHeader({ title, className, children }: PageHeaderProps) {
   return (
     <div className={classNames(styles.header, className)}>
       {title && <div className={styles.title}>{title}</div>}
diff --git a/components/layout/SideNav.module.css b/src/components/layout/SideNav.module.css
similarity index 100%
rename from components/layout/SideNav.module.css
rename to src/components/layout/SideNav.module.css
diff --git a/src/components/layout/SideNav.tsx b/src/components/layout/SideNav.tsx
new file mode 100644
index 000000000..0b5c98562
--- /dev/null
+++ b/src/components/layout/SideNav.tsx
@@ -0,0 +1,46 @@
+import classNames from 'classnames';
+import { Menu, Item } from 'react-basics';
+import { usePathname } from 'next/navigation';
+import Link from 'next/link';
+import styles from './SideNav.module.css';
+
+export interface SideNavProps {
+  selectedKey: string;
+  items: any[];
+  shallow?: boolean;
+  scroll?: boolean;
+  className?: string;
+  onSelect?: () => void;
+}
+
+export function SideNav({
+  selectedKey,
+  items,
+  shallow = true,
+  scroll = false,
+  className,
+  onSelect = () => {},
+}: SideNavProps) {
+  const pathname = usePathname();
+  return (
+    <Menu
+      items={items}
+      selectedKey={selectedKey}
+      className={classNames(styles.menu, className)}
+      onSelect={onSelect}
+    >
+      {({ key, label, url }) => (
+        <Item
+          key={key}
+          className={classNames(styles.item, { [styles.selected]: pathname.startsWith(url) })}
+        >
+          <Link href={url} shallow={shallow} scroll={scroll}>
+            {label}
+          </Link>
+        </Item>
+      )}
+    </Menu>
+  );
+}
+
+export default SideNav;
diff --git a/components/messages.js b/src/components/messages.ts
similarity index 77%
rename from components/messages.js
rename to src/components/messages.ts
index a31e28751..04a29a4c9 100644
--- a/components/messages.js
+++ b/src/components/messages.ts
@@ -21,6 +21,8 @@ export const labels = defineMessages({
   details: { id: 'label.details', defaultMessage: 'Details' },
   website: { id: 'label.website', defaultMessage: 'Website' },
   websites: { id: 'label.websites', defaultMessage: 'Websites' },
+  myWebsites: { id: 'label.my-websites', defaultMessage: 'My websites' },
+  teamWebsites: { id: 'label.team-websites', defaultMessage: 'Team websites' },
   created: { id: 'label.created', defaultMessage: 'Created' },
   edit: { id: 'label.edit', defaultMessage: 'Edit' },
   name: { id: 'label.name', defaultMessage: 'Name' },
@@ -28,6 +30,7 @@ export const labels = defineMessages({
   accessCode: { id: 'label.access-code', defaultMessage: 'Access code' },
   teamId: { id: 'label.team-id', defaultMessage: 'Team ID' },
   team: { id: 'label.team', defaultMessage: 'Team' },
+  teamName: { id: 'label.team-name', defaultMessage: 'Team name' },
   regenerate: { id: 'label.regenerate', defaultMessage: 'Regenerate' },
   remove: { id: 'label.remove', defaultMessage: 'Remove' },
   join: { id: 'label.join', defaultMessage: 'Join' },
@@ -77,7 +80,7 @@ export const labels = defineMessages({
   referrers: { id: 'label.referrers', defaultMessage: 'Referrers' },
   screens: { id: 'label.screens', defaultMessage: 'Screens' },
   browsers: { id: 'label.browsers', defaultMessage: 'Browsers' },
-  os: { id: 'label.operating-systems', defaultMessage: 'Operating systems' },
+  os: { id: 'label.os', defaultMessage: 'OS' },
   devices: { id: 'label.devices', defaultMessage: 'Devices' },
   countries: { id: 'label.countries', defaultMessage: 'Countries' },
   languages: { id: 'label.languages', defaultMessage: 'Languages' },
@@ -126,6 +129,10 @@ export const labels = defineMessages({
   reports: { id: 'label.reports', defaultMessage: 'Reports' },
   eventData: { id: 'label.event-data', defaultMessage: 'Event data' },
   funnel: { id: 'label.funnel', defaultMessage: 'Funnel' },
+  funnelDescription: {
+    id: 'label.funnel-description',
+    defaultMessage: 'Understand the conversion and drop-off rate of users.',
+  },
   url: { id: 'label.url', defaultMessage: 'URL' },
   urls: { id: 'label.urls', defaultMessage: 'URLs' },
   add: { id: 'label.add', defaultMessage: 'Add' },
@@ -133,35 +140,63 @@ export const labels = defineMessages({
   runQuery: { id: 'label.run-query', defaultMessage: 'Run query' },
   field: { id: 'label.field', defaultMessage: 'Field' },
   fields: { id: 'label.fields', defaultMessage: 'Fields' },
-  createReport: { id: 'labels.create-report', defaultMessage: 'Create report' },
-  description: { id: 'labels.description', defaultMessage: 'Description' },
-  untitled: { id: 'labels.untitled', defaultMessage: 'Untitled' },
-  type: { id: 'labels.type', defaultMessage: 'Type' },
-  filters: { id: 'labels.filters', defaultMessage: 'Filters' },
-  breakdown: { id: 'labels.breakdown', defaultMessage: 'Breakdown' },
-  true: { id: 'labels.true', defaultMessage: 'True' },
-  false: { id: 'labels.false', defaultMessage: 'False' },
-  equals: { id: 'labels.equals', defaultMessage: 'Equals' },
-  doesNotEqual: { id: 'labels.does-not-equal', defaultMessage: 'Does not equal' },
-  greaterThan: { id: 'labels.greater-than', defaultMessage: 'Greater than' },
-  lessThan: { id: 'labels.less-than', defaultMessage: 'Less than' },
-  greaterThanEquals: { id: 'labels.greater-than-equals', defaultMessage: 'Greater than or equals' },
-  lessThanEquals: { id: 'labels.less-than-equals', defaultMessage: 'Less than or equals' },
-  contains: { id: 'labels.contains', defaultMessage: 'Contains' },
-  doesNotContain: { id: 'labels.does-not-contain', defaultMessage: 'Does not contain' },
-  before: { id: 'labels.before', defaultMessage: 'Before' },
-  after: { id: 'labels.after', defaultMessage: 'After' },
-  total: { id: 'labels.total', defaultMessage: 'Total' },
-  sum: { id: 'labels.sum', defaultMessage: 'Sum' },
-  average: { id: 'labels.average', defaultMessage: 'Average' },
-  min: { id: 'labels.min', defaultMessage: 'Min' },
-  max: { id: 'labels.max', defaultMessage: 'Max' },
-  unique: { id: 'labels.unique', defaultMessage: 'Unique' },
-  value: { id: 'labels.value', defaultMessage: 'Value' },
-  overview: { id: 'labels.overview', defaultMessage: 'Overview' },
-  totalRecords: { id: 'labels.total-records', defaultMessage: 'Total records' },
+  createReport: { id: 'label.create-report', defaultMessage: 'Create report' },
+  description: { id: 'label.description', defaultMessage: 'Description' },
+  untitled: { id: 'label.untitled', defaultMessage: 'Untitled' },
+  type: { id: 'label.type', defaultMessage: 'Type' },
+  filter: { id: 'label.filter', defaultMessage: 'Filter' },
+  filters: { id: 'label.filters', defaultMessage: 'Filters' },
+  breakdown: { id: 'label.breakdown', defaultMessage: 'Breakdown' },
+  true: { id: 'label.true', defaultMessage: 'True' },
+  false: { id: 'label.false', defaultMessage: 'False' },
+  is: { id: 'label.is', defaultMessage: 'Is' },
+  isNot: { id: 'label.is-not', defaultMessage: 'Is not' },
+  isSet: { id: 'label.is-set', defaultMessage: 'Is set' },
+  isNotSet: { id: 'label.is-not-set', defaultMessage: 'Is not set' },
+  greaterThan: { id: 'label.greater-than', defaultMessage: 'Greater than' },
+  lessThan: { id: 'label.less-than', defaultMessage: 'Less than' },
+  greaterThanEquals: { id: 'label.greater-than-equals', defaultMessage: 'Greater than or equals' },
+  lessThanEquals: { id: 'label.less-than-equals', defaultMessage: 'Less than or equals' },
+  contains: { id: 'label.contains', defaultMessage: 'Contains' },
+  doesNotContain: { id: 'label.does-not-contain', defaultMessage: 'Does not contain' },
+  before: { id: 'label.before', defaultMessage: 'Before' },
+  after: { id: 'label.after', defaultMessage: 'After' },
+  total: { id: 'label.total', defaultMessage: 'Total' },
+  sum: { id: 'label.sum', defaultMessage: 'Sum' },
+  average: { id: 'label.average', defaultMessage: 'Average' },
+  min: { id: 'label.min', defaultMessage: 'Min' },
+  max: { id: 'label.max', defaultMessage: 'Max' },
+  unique: { id: 'label.unique', defaultMessage: 'Unique' },
+  value: { id: 'label.value', defaultMessage: 'Value' },
+  overview: { id: 'label.overview', defaultMessage: 'Overview' },
+  totalRecords: { id: 'label.total-records', defaultMessage: 'Total records' },
   insights: { id: 'label.insights', defaultMessage: 'Insights' },
+  insightsDescription: {
+    id: 'label.insights-description',
+    defaultMessage: 'Dive deeper into your data by using segments and filters.',
+  },
+  retention: { id: 'label.retention', defaultMessage: 'Retention' },
+  retentionDescription: {
+    id: 'label.retention-description',
+    defaultMessage: 'Measure your website stickiness by tracking how often users return.',
+  },
   dropoff: { id: 'label.dropoff', defaultMessage: 'Dropoff' },
+  referrer: { id: 'label.referrer', defaultMessage: 'Referrer' },
+  country: { id: 'label.country', defaultMessage: 'Country' },
+  region: { id: 'label.region', defaultMessage: 'Region' },
+  city: { id: 'label.city', defaultMessage: 'City' },
+  browser: { id: 'label.browser', defaultMessage: 'Browser' },
+  device: { id: 'label.device', defaultMessage: 'Device' },
+  pageTitle: { id: 'label.pageTitle', defaultMessage: 'Page title' },
+  day: { id: 'label.day', defaultMessage: 'Day' },
+  date: { id: 'label.date', defaultMessage: 'Date' },
+  pageOf: { id: 'label.page-of', defaultMessage: 'Page {current} of {total}' },
+  create: { id: 'label.create', defaultMessage: 'Create' },
+  search: { id: 'label.search', defaultMessage: 'Search' },
+  numberOfRecords: {
+    id: 'label.number-of-records',
+    defaultMessage: '{x} {x, plural, one {record} other {records}}',
+  },
 });
 
 export const messages = defineMessages({
@@ -230,7 +265,7 @@ export const messages = defineMessages({
   },
   noResultsFound: {
     id: 'message.no-results-found',
-    defaultMessage: 'No results were found.',
+    defaultMessage: 'No results found.',
   },
   noWebsitesConfigured: {
     id: 'message.no-websites-configured',
diff --git a/components/metrics/ActiveUsers.module.css b/src/components/metrics/ActiveUsers.module.css
similarity index 100%
rename from components/metrics/ActiveUsers.module.css
rename to src/components/metrics/ActiveUsers.module.css
diff --git a/components/metrics/ActiveUsers.js b/src/components/metrics/ActiveUsers.tsx
similarity index 59%
rename from components/metrics/ActiveUsers.js
rename to src/components/metrics/ActiveUsers.tsx
index 640519462..605d9270e 100644
--- a/components/metrics/ActiveUsers.js
+++ b/src/components/metrics/ActiveUsers.tsx
@@ -1,20 +1,26 @@
 import { useMemo } from 'react';
 import { StatusLight } from 'react-basics';
-import useApi from 'hooks/useApi';
-import useMessages from 'hooks/useMessages';
+import useApi from 'components/hooks/useApi';
+import useMessages from 'components/hooks/useMessages';
 import styles from './ActiveUsers.module.css';
 
-export function ActiveUsers({ websiteId, value, refetchInterval = 60000 }) {
+export function ActiveUsers({
+  websiteId,
+  value,
+  refetchInterval = 60000,
+}: {
+  websiteId: string;
+  value?: number;
+  refetchInterval?: number;
+}) {
   const { formatMessage, messages } = useMessages();
   const { get, useQuery } = useApi();
-  const { data } = useQuery(
-    ['websites:active', websiteId],
-    () => get(`/websites/${websiteId}/active`),
-    {
-      refetchInterval,
-      enabled: !!websiteId,
-    },
-  );
+  const { data } = useQuery({
+    queryKey: ['websites:active', websiteId],
+    queryFn: () => get(`/websites/${websiteId}/active`),
+    enabled: !!websiteId,
+    refetchInterval,
+  });
 
   const count = useMemo(() => {
     if (websiteId) {
diff --git a/components/metrics/BarChart.module.css b/src/components/metrics/BarChart.module.css
similarity index 85%
rename from components/metrics/BarChart.module.css
rename to src/components/metrics/BarChart.module.css
index f2e26db1d..6af22abe6 100644
--- a/components/metrics/BarChart.module.css
+++ b/src/components/metrics/BarChart.module.css
@@ -1,3 +1,7 @@
+.container {
+  display: grid;
+}
+
 .chart {
   position: relative;
   height: 400px;
diff --git a/components/metrics/BarChart.js b/src/components/metrics/BarChart.tsx
similarity index 80%
rename from components/metrics/BarChart.js
rename to src/components/metrics/BarChart.tsx
index c086017e8..6d28dc201 100644
--- a/components/metrics/BarChart.js
+++ b/src/components/metrics/BarChart.tsx
@@ -4,18 +4,34 @@ import classNames from 'classnames';
 import Chart from 'chart.js/auto';
 import HoverTooltip from 'components/common/HoverTooltip';
 import Legend from 'components/metrics/Legend';
-import useLocale from 'hooks/useLocale';
-import useTheme from 'hooks/useTheme';
+import useLocale from 'components/hooks/useLocale';
+import useTheme from 'components/hooks/useTheme';
 import { DEFAULT_ANIMATION_DURATION } from 'lib/constants';
 import { renderNumberLabels } from 'lib/charts';
 import styles from './BarChart.module.css';
 
+export interface BarChartProps {
+  datasets?: any[];
+  unit?: string;
+  animationDuration?: number;
+  stacked?: boolean;
+  isLoading?: boolean;
+  renderXLabel?: (label: string, index: number, values: any[]) => string;
+  renderYLabel?: (label: string, index: number, values: any[]) => string;
+  XAxisType?: string;
+  YAxisType?: string;
+  renderTooltipPopup?: (setTooltipPopup: (data: any) => void, model: any) => void;
+  onCreate?: (chart: any) => void;
+  onUpdate?: (chart: any) => void;
+  className?: string;
+}
+
 export function BarChart({
-  datasets,
+  datasets = [],
   unit,
   animationDuration = DEFAULT_ANIMATION_DURATION,
   stacked = false,
-  loading = false,
+  isLoading = false,
   renderXLabel,
   renderYLabel,
   XAxisType = 'time',
@@ -24,7 +40,7 @@ export function BarChart({
   onCreate,
   onUpdate,
   className,
-}) {
+}: BarChartProps) {
   const canvas = useRef();
   const chart = useRef(null);
   const [tooltip, setTooltipPopup] = useState(null);
@@ -85,7 +101,7 @@ export function BarChart({
             color: colors.chart.line,
           },
           ticks: {
-            color: colors.text,
+            color: colors.chart.text,
             callback: renderYLabel || renderNumberLabels,
           },
         },
@@ -106,14 +122,12 @@ export function BarChart({
   const createChart = () => {
     Chart.defaults.font.family = 'Inter';
 
-    const options = getOptions();
-
     chart.current = new Chart(canvas.current, {
       type: 'bar',
       data: {
         datasets,
       },
-      options,
+      options: getOptions() as any,
     });
 
     onCreate?.(chart.current);
@@ -147,7 +161,7 @@ export function BarChart({
   return (
     <>
       <div className={classNames(styles.chart, className)}>
-        {loading && <Loading position="page" icon="dots" />}
+        {isLoading && <Loading position="page" icon="dots" />}
         <canvas ref={canvas} />
       </div>
       <Legend chart={chart.current} />
diff --git a/components/metrics/BrowsersTable.js b/src/components/metrics/BrowsersTable.tsx
similarity index 52%
rename from components/metrics/BrowsersTable.js
rename to src/components/metrics/BrowsersTable.tsx
index 2920280f6..e1c054358 100644
--- a/components/metrics/BrowsersTable.js
+++ b/src/components/metrics/BrowsersTable.tsx
@@ -1,18 +1,17 @@
 import FilterLink from 'components/common/FilterLink';
-import MetricsTable from 'components/metrics/MetricsTable';
-import { BROWSERS } from 'lib/constants';
-import useMessages from 'hooks/useMessages';
-import { useRouter } from 'next/router';
+import MetricsTable, { MetricsTableProps } from 'components/metrics/MetricsTable';
+import useMessages from 'components/hooks/useMessages';
+import useFormat from 'components/hooks/useFormat';
 
-export function BrowsersTable({ websiteId, ...props }) {
+export function BrowsersTable(props: MetricsTableProps) {
   const { formatMessage, labels } = useMessages();
-  const { basePath } = useRouter();
+  const { formatBrowser } = useFormat();
 
   function renderLink({ x: browser }) {
     return (
-      <FilterLink id="browser" value={browser} label={BROWSERS[browser] || browser}>
+      <FilterLink id="browser" value={browser} label={formatBrowser(browser)}>
         <img
-          src={`${basePath}/images/browsers/${browser || 'unknown'}.png`}
+          src={`${process.env.basePath}/images/browsers/${browser || 'unknown'}.png`}
           alt={browser}
           width={16}
           height={16}
@@ -27,7 +26,6 @@ export function BrowsersTable({ websiteId, ...props }) {
       title={formatMessage(labels.browsers)}
       type="browser"
       metric={formatMessage(labels.visitors)}
-      websiteId={websiteId}
       renderLabel={renderLink}
     />
   );
diff --git a/src/components/metrics/CitiesTable.tsx b/src/components/metrics/CitiesTable.tsx
new file mode 100644
index 000000000..067e07e93
--- /dev/null
+++ b/src/components/metrics/CitiesTable.tsx
@@ -0,0 +1,43 @@
+import MetricsTable, { MetricsTableProps } from './MetricsTable';
+import { emptyFilter } from 'lib/filters';
+import FilterLink from 'components/common/FilterLink';
+import useLocale from 'components/hooks/useLocale';
+import useMessages from 'components/hooks/useMessages';
+import useCountryNames from 'components/hooks/useCountryNames';
+
+export function CitiesTable(props: MetricsTableProps) {
+  const { locale } = useLocale();
+  const { formatMessage, labels } = useMessages();
+  const countryNames = useCountryNames(locale);
+
+  const renderLabel = (city: string, country: string) => {
+    const countryName = countryNames[country];
+    return countryName ? `${city}, ${countryName}` : city;
+  };
+
+  const renderLink = ({ x: city, country }) => {
+    return (
+      <FilterLink id="city" value={city} label={renderLabel(city, country)}>
+        {country && (
+          <img
+            src={`${process.env.basePath}/images/flags/${country?.toLowerCase() || 'xx'}.png`}
+            alt={country}
+          />
+        )}
+      </FilterLink>
+    );
+  };
+
+  return (
+    <MetricsTable
+      {...props}
+      title={formatMessage(labels.cities)}
+      type="city"
+      metric={formatMessage(labels.visitors)}
+      dataFilter={emptyFilter}
+      renderLabel={renderLink}
+    />
+  );
+}
+
+export default CitiesTable;
diff --git a/src/components/metrics/CountriesTable.tsx b/src/components/metrics/CountriesTable.tsx
new file mode 100644
index 000000000..99f9ca2fd
--- /dev/null
+++ b/src/components/metrics/CountriesTable.tsx
@@ -0,0 +1,49 @@
+import FilterLink from 'components/common/FilterLink';
+import useCountryNames from 'components/hooks/useCountryNames';
+import { useLocale, useMessages, useFormat } from 'components/hooks';
+import MetricsTable, { MetricsTableProps } from './MetricsTable';
+
+export function CountriesTable({
+  onDataLoad,
+  ...props
+}: {
+  onDataLoad: (data: any) => void;
+} & MetricsTableProps) {
+  const { locale } = useLocale();
+  const countryNames = useCountryNames(locale);
+  const { formatMessage, labels } = useMessages();
+  const { formatCountry } = useFormat();
+
+  const handleDataLoad = (data: any) => {
+    onDataLoad?.(data);
+  };
+
+  const renderLink = ({ x: code }) => {
+    return (
+      <FilterLink
+        id="country"
+        className={locale}
+        value={countryNames[code] && code}
+        label={formatCountry(code)}
+      >
+        <img
+          src={`${process.env.basePath}/images/flags/${code?.toLowerCase() || 'xx'}.png`}
+          alt={code}
+        />
+      </FilterLink>
+    );
+  };
+
+  return (
+    <MetricsTable
+      {...props}
+      title={formatMessage(labels.countries)}
+      type="country"
+      metric={formatMessage(labels.visitors)}
+      renderLabel={renderLink}
+      onDataLoad={handleDataLoad}
+    />
+  );
+}
+
+export default CountriesTable;
diff --git a/components/metrics/DatePickerForm.module.css b/src/components/metrics/DatePickerForm.module.css
similarity index 100%
rename from components/metrics/DatePickerForm.module.css
rename to src/components/metrics/DatePickerForm.module.css
diff --git a/components/metrics/DatePickerForm.js b/src/components/metrics/DatePickerForm.tsx
similarity index 78%
rename from components/metrics/DatePickerForm.js
rename to src/components/metrics/DatePickerForm.tsx
index 53f027bb6..b4f0781e4 100644
--- a/components/metrics/DatePickerForm.js
+++ b/src/components/metrics/DatePickerForm.tsx
@@ -1,10 +1,9 @@
 import { useState } from 'react';
 import { Button, ButtonGroup, Calendar } from 'react-basics';
-import { isAfter, isBefore, isSameDay } from 'date-fns';
-import useLocale from 'hooks/useLocale';
-import { getDateLocale } from 'lib/lang';
+import { isAfter, isBefore, isSameDay, startOfDay, endOfDay } from 'date-fns';
+import useLocale from 'components/hooks/useLocale';
 import { FILTER_DAY, FILTER_RANGE } from 'lib/constants';
-import useMessages from 'hooks/useMessages';
+import useMessages from 'components/hooks/useMessages';
 import styles from './DatePickerForm.module.css';
 
 export function DatePickerForm({
@@ -21,7 +20,7 @@ export function DatePickerForm({
   const [singleDate, setSingleDate] = useState(defaultStartDate);
   const [startDate, setStartDate] = useState(defaultStartDate);
   const [endDate, setEndDate] = useState(defaultEndDate);
-  const { locale } = useLocale();
+  const { dateLocale } = useLocale();
   const { formatMessage, labels } = useMessages();
 
   const disabled =
@@ -31,16 +30,16 @@ export function DatePickerForm({
 
   const handleSave = () => {
     if (selected === FILTER_DAY) {
-      onChange(`range:${singleDate.getTime()}:${singleDate.getTime()}`);
+      onChange(`range:${startOfDay(singleDate).getTime()}:${endOfDay(singleDate).getTime()}`);
     } else {
-      onChange(`range:${startDate.getTime()}:${endDate.getTime()}`);
+      onChange(`range:${startOfDay(startDate).getTime()}:${endOfDay(endDate).getTime()}`);
     }
   };
 
   return (
     <div className={styles.container}>
       <div className={styles.filter}>
-        <ButtonGroup selectedKey={selected} onSelect={setSelected}>
+        <ButtonGroup selectedKey={selected} onSelect={key => setSelected(key as any)}>
           <Button key={FILTER_DAY}>{formatMessage(labels.singleDay)}</Button>
           <Button key={FILTER_RANGE}>{formatMessage(labels.dateRange)}</Button>
         </ButtonGroup>
@@ -51,6 +50,7 @@ export function DatePickerForm({
             date={singleDate}
             minDate={minDate}
             maxDate={maxDate}
+            locale={dateLocale}
             onChange={setSingleDate}
           />
         )}
@@ -60,14 +60,14 @@ export function DatePickerForm({
               date={startDate}
               minDate={minDate}
               maxDate={endDate}
-              locale={getDateLocale(locale)}
+              locale={dateLocale}
               onChange={setStartDate}
             />
             <Calendar
               date={endDate}
               minDate={startDate}
               maxDate={maxDate}
-              locale={getDateLocale(locale)}
+              locale={dateLocale}
               onChange={setEndDate}
             />
           </>
diff --git a/components/metrics/DevicesTable.js b/src/components/metrics/DevicesTable.tsx
similarity index 51%
rename from components/metrics/DevicesTable.js
rename to src/components/metrics/DevicesTable.tsx
index 0b8d57086..4ebdac1b5 100644
--- a/components/metrics/DevicesTable.js
+++ b/src/components/metrics/DevicesTable.tsx
@@ -1,21 +1,17 @@
-import MetricsTable from './MetricsTable';
+import MetricsTable, { MetricsTableProps } from './MetricsTable';
 import FilterLink from 'components/common/FilterLink';
-import useMessages from 'hooks/useMessages';
-import { useRouter } from 'next/router';
+import useMessages from 'components/hooks/useMessages';
+import { useFormat } from 'components/hooks';
 
-export function DevicesTable({ websiteId, ...props }) {
+export function DevicesTable(props: MetricsTableProps) {
   const { formatMessage, labels } = useMessages();
-  const { basePath } = useRouter();
+  const { formatDevice } = useFormat();
 
   function renderLink({ x: device }) {
     return (
-      <FilterLink
-        id="device"
-        value={labels[device] && device}
-        label={formatMessage(labels[device] || labels.unknown)}
-      >
+      <FilterLink id="device" value={labels[device] && device} label={formatDevice(device)}>
         <img
-          src={`${basePath}/images/device/${device?.toLowerCase() || 'unknown'}.png`}
+          src={`${process.env.basePath}/images/device/${device?.toLowerCase() || 'unknown'}.png`}
           alt={device}
           width={16}
           height={16}
@@ -30,7 +26,6 @@ export function DevicesTable({ websiteId, ...props }) {
       title={formatMessage(labels.devices)}
       type="device"
       metric={formatMessage(labels.visitors)}
-      websiteId={websiteId}
       renderLabel={renderLink}
     />
   );
diff --git a/components/metrics/EventsChart.module.css b/src/components/metrics/EventsChart.module.css
similarity index 100%
rename from components/metrics/EventsChart.module.css
rename to src/components/metrics/EventsChart.module.css
diff --git a/components/metrics/EventsChart.js b/src/components/metrics/EventsChart.tsx
similarity index 71%
rename from components/metrics/EventsChart.js
rename to src/components/metrics/EventsChart.tsx
index 82b8c8f71..be6d4a0c3 100644
--- a/components/metrics/EventsChart.js
+++ b/src/components/metrics/EventsChart.tsx
@@ -3,30 +3,39 @@ import { Loading } from 'react-basics';
 import { colord } from 'colord';
 import BarChart from './BarChart';
 import { getDateArray } from 'lib/date';
-import { useApi, useLocale, useDateRange, useTimezone, usePageQuery } from 'hooks';
+import { useApi, useLocale, useDateRange, useTimezone, useNavigation } from 'components/hooks';
 import { EVENT_COLORS } from 'lib/constants';
 import { renderDateLabels, renderStatusTooltipPopup } from 'lib/charts';
 
-export function EventsChart({ websiteId, className, token }) {
+export interface EventsChartProps {
+  websiteId: string;
+  className?: string;
+  token?: string;
+}
+
+export function EventsChart({ websiteId, className, token }: EventsChartProps) {
   const { get, useQuery } = useApi();
   const [{ startDate, endDate, unit, modified }] = useDateRange(websiteId);
   const { locale } = useLocale();
   const [timezone] = useTimezone();
   const {
-    query: { url, eventName },
-  } = usePageQuery();
+    query: { url, event },
+  } = useNavigation();
 
-  const { data, isLoading } = useQuery(['events', websiteId, modified, eventName], () =>
-    get(`/websites/${websiteId}/events`, {
-      startAt: +startDate,
-      endAt: +endDate,
-      unit,
-      timezone,
-      url,
-      eventName,
-      token,
-    }),
-  );
+  const { data, isLoading } = useQuery({
+    queryKey: ['events', websiteId, modified, event],
+    queryFn: () =>
+      get(`/websites/${websiteId}/events`, {
+        startAt: +startDate,
+        endAt: +endDate,
+        unit,
+        timezone,
+        url,
+        event,
+        token,
+      }),
+    enabled: !!websiteId,
+  });
 
   const datasets = useMemo(() => {
     if (!data) return [];
@@ -68,7 +77,6 @@ export function EventsChart({ websiteId, className, token }) {
       className={className}
       datasets={datasets}
       unit={unit}
-      height={300}
       loading={isLoading}
       stacked
       renderXLabel={renderDateLabels(unit, locale)}
diff --git a/components/metrics/EventsTable.js b/src/components/metrics/EventsTable.tsx
similarity index 59%
rename from components/metrics/EventsTable.js
rename to src/components/metrics/EventsTable.tsx
index eb23a2817..26d9529b4 100644
--- a/components/metrics/EventsTable.js
+++ b/src/components/metrics/EventsTable.tsx
@@ -1,10 +1,10 @@
-import MetricsTable from './MetricsTable';
-import useMessages from 'hooks/useMessages';
+import MetricsTable, { MetricsTableProps } from './MetricsTable';
+import useMessages from 'components/hooks/useMessages';
 
-export function EventsTable({ websiteId, ...props }) {
+export function EventsTable(props: MetricsTableProps) {
   const { formatMessage, labels } = useMessages();
 
-  function handleDataLoad(data) {
+  function handleDataLoad(data: any) {
     props.onDataLoad?.(data);
   }
 
@@ -14,7 +14,6 @@ export function EventsTable({ websiteId, ...props }) {
       title={formatMessage(labels.events)}
       type="event"
       metric={formatMessage(labels.actions)}
-      websiteId={websiteId}
       onDataLoad={handleDataLoad}
     />
   );
diff --git a/components/metrics/FilterTags.module.css b/src/components/metrics/FilterTags.module.css
similarity index 57%
rename from components/metrics/FilterTags.module.css
rename to src/components/metrics/FilterTags.module.css
index 1c8458acd..32bc2f6fe 100644
--- a/components/metrics/FilterTags.module.css
+++ b/src/components/metrics/FilterTags.module.css
@@ -4,19 +4,27 @@
   gap: 10px;
 }
 
+.label {
+  font-weight: 700;
+}
+
 .tag {
   display: flex;
   flex-direction: row;
   align-items: center;
   gap: 10px;
   font-size: var(--font-size-sm);
-  border: 1px solid var(--base600);
+  border: 1px solid var(--blue400);
   border-radius: var(--border-radius);
-  line-height: 30px;
-  padding: 0 8px;
+  padding: 8px 16px;
   cursor: pointer;
+  background: var(--blue100);
 }
 
 .tag:hover {
-  background: var(--base75);
+  background: var(--blue200);
+}
+
+.tag b {
+  text-transform: lowercase;
 }
diff --git a/components/metrics/FilterTags.js b/src/components/metrics/FilterTags.tsx
similarity index 59%
rename from components/metrics/FilterTags.js
rename to src/components/metrics/FilterTags.tsx
index ad3ff60b2..1b168a283 100644
--- a/components/metrics/FilterTags.js
+++ b/src/components/metrics/FilterTags.tsx
@@ -1,31 +1,34 @@
 import { safeDecodeURI } from 'next-basics';
 import { Button, Icon, Icons, Text } from 'react-basics';
-import usePageQuery from 'hooks/usePageQuery';
+import useNavigation from 'components/hooks/useNavigation';
+import useMessages from 'components/hooks/useMessages';
+import useFormat from 'components/hooks/useFormat';
 import styles from './FilterTags.module.css';
-import useMessages from 'hooks/useMessages';
 
 export function FilterTags({ params }) {
   const { formatMessage, labels } = useMessages();
+  const { formatValue } = useFormat();
   const {
     router,
-    resolveUrl,
+    makeUrl,
     query: { view },
-  } = usePageQuery();
+  } = useNavigation();
 
   if (Object.keys(params).filter(key => params[key]).length === 0) {
     return null;
   }
 
-  function handleCloseFilter(param) {
-    if (!param) {
-      router.push(resolveUrl({ view }, true));
-    } else {
-      router.push(resolveUrl({ [param]: undefined }));
-    }
+  function handleCloseFilter(param?: string) {
+    router.push(makeUrl({ [param]: undefined }));
+  }
+
+  function handleResetFilter() {
+    router.push(makeUrl({ view }, true));
   }
 
   return (
     <div className={styles.filters}>
+      <div className={styles.label}>{formatMessage(labels.filters)}</div>
       {Object.keys(params).map(key => {
         if (!params[key]) {
           return null;
@@ -33,7 +36,7 @@ export function FilterTags({ params }) {
         return (
           <div key={key} className={styles.tag} onClick={() => handleCloseFilter(key)}>
             <Text>
-              <b>{`${key}`}</b> = {`${safeDecodeURI(params[key])}`}
+              <b>{formatMessage(labels[key])}</b> = {formatValue(safeDecodeURI(params[key]), key)}
             </Text>
             <Icon>
               <Icons.Close />
@@ -41,7 +44,7 @@ export function FilterTags({ params }) {
           </div>
         );
       })}
-      <Button size="sm" variant="quiet" onClick={() => handleCloseFilter()}>
+      <Button size="sm" variant="quiet" onClick={handleResetFilter}>
         <Icon>
           <Icons.Close />
         </Icon>
diff --git a/components/metrics/LanguagesTable.js b/src/components/metrics/LanguagesTable.tsx
similarity index 62%
rename from components/metrics/LanguagesTable.js
rename to src/components/metrics/LanguagesTable.tsx
index e90a34257..c0d2052bb 100644
--- a/components/metrics/LanguagesTable.js
+++ b/src/components/metrics/LanguagesTable.tsx
@@ -1,10 +1,13 @@
-import MetricsTable from './MetricsTable';
+import MetricsTable, { MetricsTableProps } from './MetricsTable';
 import { percentFilter } from 'lib/filters';
-import useLanguageNames from 'hooks/useLanguageNames';
-import useLocale from 'hooks/useLocale';
-import useMessages from 'hooks/useMessages';
+import useLanguageNames from 'components/hooks/useLanguageNames';
+import useLocale from 'components/hooks/useLocale';
+import useMessages from 'components/hooks/useMessages';
 
-export function LanguagesTable({ websiteId, onDataLoad, ...props }) {
+export function LanguagesTable({
+  onDataLoad,
+  ...props
+}: { onDataLoad: (data: any) => void } & MetricsTableProps) {
   const { formatMessage, labels } = useMessages();
   const { locale } = useLocale();
   const languageNames = useLanguageNames(locale);
@@ -19,7 +22,6 @@ export function LanguagesTable({ websiteId, onDataLoad, ...props }) {
       title={formatMessage(labels.languages)}
       type="language"
       metric={formatMessage(labels.visitors)}
-      websiteId={websiteId}
       onDataLoad={data => onDataLoad?.(percentFilter(data))}
       renderLabel={renderLabel}
     />
diff --git a/components/metrics/Legend.module.css b/src/components/metrics/Legend.module.css
similarity index 100%
rename from components/metrics/Legend.module.css
rename to src/components/metrics/Legend.module.css
diff --git a/components/metrics/Legend.js b/src/components/metrics/Legend.tsx
similarity index 89%
rename from components/metrics/Legend.js
rename to src/components/metrics/Legend.tsx
index 91135acb2..ce8a33817 100644
--- a/components/metrics/Legend.js
+++ b/src/components/metrics/Legend.tsx
@@ -2,8 +2,8 @@ import { useEffect } from 'react';
 import { StatusLight } from 'react-basics';
 import { colord } from 'colord';
 import classNames from 'classnames';
-import useLocale from 'hooks/useLocale';
-import useForceUpdate from 'hooks/useForceUpdate';
+import useLocale from 'components/hooks/useLocale';
+import useForceUpdate from 'components/hooks/useForceUpdate';
 import styles from './Legend.module.css';
 
 export function Legend({ chart }) {
@@ -22,7 +22,7 @@ export function Legend({ chart }) {
 
   useEffect(() => {
     forceUpdate();
-  }, [locale]);
+  }, [locale, forceUpdate]);
 
   if (!chart?.legend?.legendItems.find(({ text }) => text)) {
     return null;
diff --git a/components/metrics/DataTable.module.css b/src/components/metrics/ListTable.module.css
similarity index 97%
rename from components/metrics/DataTable.module.css
rename to src/components/metrics/ListTable.module.css
index 04e12e9be..8f2635319 100644
--- a/components/metrics/DataTable.module.css
+++ b/src/components/metrics/ListTable.module.css
@@ -28,7 +28,6 @@
   font-weight: 600;
   text-align: center;
   width: 100px;
-  cursor: pointer;
 }
 
 .row {
@@ -71,7 +70,6 @@
   text-align: end;
   margin-inline-end: 10px;
   font-weight: 600;
-  cursor: pointer;
 }
 
 .percent {
@@ -93,6 +91,10 @@
   z-index: -1;
 }
 
+.empty {
+  min-height: 200px;
+}
+
 @media only screen and (max-width: 992px) {
   .body {
     height: auto;
diff --git a/components/metrics/DataTable.js b/src/components/metrics/ListTable.tsx
similarity index 57%
rename from components/metrics/DataTable.js
rename to src/components/metrics/ListTable.tsx
index e2e9462df..7c66ff3c0 100644
--- a/components/metrics/DataTable.js
+++ b/src/components/metrics/ListTable.tsx
@@ -1,14 +1,27 @@
-import { useState } from 'react';
-import useMeasure from 'react-use-measure';
 import { FixedSizeList } from 'react-window';
-import { useSpring, animated, config } from 'react-spring';
+import { useSpring, animated, config } from '@react-spring/web';
 import classNames from 'classnames';
 import Empty from 'components/common/Empty';
-import { formatNumber, formatLongNumber } from 'lib/format';
-import useMessages from 'hooks/useMessages';
-import styles from './DataTable.module.css';
+import { formatLongNumber } from 'lib/format';
+import useMessages from 'components/hooks/useMessages';
+import styles from './ListTable.module.css';
+import { ReactNode } from 'react';
 
-export function DataTable({
+const ITEM_SIZE = 30;
+
+export interface ListTableProps {
+  data?: any[];
+  title?: string;
+  metric?: string;
+  className?: string;
+  renderLabel?: (row: any) => ReactNode;
+  animate?: boolean;
+  virtualize?: boolean;
+  showPercentage?: boolean;
+  itemCount?: number;
+}
+
+export function ListTable({
   data = [],
   title,
   metric,
@@ -17,13 +30,9 @@ export function DataTable({
   animate = true,
   virtualize = false,
   showPercentage = true,
-}) {
+  itemCount = 10,
+}: ListTableProps) {
   const { formatMessage, labels } = useMessages();
-  const [ref, bounds] = useMeasure();
-  const [format, setFormat] = useState(true);
-  const formatFunc = format ? formatLongNumber : formatNumber;
-
-  const handleSetFormat = () => setFormat(state => !state);
 
   const getRow = row => {
     const { x: label, y: value, z: percent } = row;
@@ -35,8 +44,6 @@ export function DataTable({
         value={value}
         percent={percent}
         animate={animate && !virtualize}
-        format={formatFunc}
-        onClick={handleSetFormat}
         showPercentage={showPercentage}
       />
     );
@@ -50,14 +57,16 @@ export function DataTable({
     <div className={classNames(styles.table, className)}>
       <div className={styles.header}>
         <div className={styles.title}>{title}</div>
-        <div className={styles.metric} onClick={handleSetFormat}>
-          {metric}
-        </div>
+        <div className={styles.metric}>{metric}</div>
       </div>
-      <div ref={ref} className={styles.body}>
-        {data?.length === 0 && <Empty />}
+      <div className={styles.body}>
+        {data?.length === 0 && <Empty className={styles.empty} />}
         {virtualize && data.length > 0 ? (
-          <FixedSizeList height={bounds.height} itemCount={data.length} itemSize={30}>
+          <FixedSizeList
+            height={itemCount * ITEM_SIZE}
+            itemCount={data.length}
+            itemSize={ITEM_SIZE}
+          >
             {Row}
           </FixedSizeList>
         ) : (
@@ -68,15 +77,7 @@ export function DataTable({
   );
 }
 
-const AnimatedRow = ({
-  label,
-  value = 0,
-  percent,
-  animate,
-  format,
-  onClick,
-  showPercentage = true,
-}) => {
+const AnimatedRow = ({ label, value = 0, percent, animate, showPercentage = true }) => {
   const props = useSpring({
     width: percent,
     y: value,
@@ -87,14 +88,16 @@ const AnimatedRow = ({
   return (
     <div className={styles.row}>
       <div className={styles.label}>{label}</div>
-      <div className={styles.value} onClick={onClick}>
-        <animated.div className={styles.value}>{props.y?.to(format)}</animated.div>
+      <div className={styles.value}>
+        <animated.div className={styles.value} title={props?.y as any}>
+          {props.y?.to(formatLongNumber)}
+        </animated.div>
       </div>
       {showPercentage && (
         <div className={styles.percent}>
           <animated.div className={styles.bar} style={{ width: props.width.to(n => `${n}%`) }} />
           <animated.span className={styles.percentValue}>
-            {props.width.to(n => `${n.toFixed(0)}%`)}
+            {props.width.to(n => `${n?.toFixed?.(0)}%`)}
           </animated.span>
         </div>
       )}
@@ -102,4 +105,4 @@ const AnimatedRow = ({
   );
 };
 
-export default DataTable;
+export default ListTable;
diff --git a/components/metrics/MetricCard.module.css b/src/components/metrics/MetricCard.module.css
similarity index 100%
rename from components/metrics/MetricCard.module.css
rename to src/components/metrics/MetricCard.module.css
diff --git a/components/metrics/MetricCard.js b/src/components/metrics/MetricCard.tsx
similarity index 66%
rename from components/metrics/MetricCard.js
rename to src/components/metrics/MetricCard.tsx
index 8a1806c9f..2359b0e20 100644
--- a/components/metrics/MetricCard.js
+++ b/src/components/metrics/MetricCard.tsx
@@ -1,8 +1,18 @@
 import classNames from 'classnames';
-import { useSpring, animated } from 'react-spring';
+import { useSpring, animated } from '@react-spring/web';
 import { formatNumber } from 'lib/format';
 import styles from './MetricCard.module.css';
 
+export interface MetricCardProps {
+  value: number;
+  change?: number;
+  label: string;
+  reverseColors?: boolean;
+  format?: typeof formatNumber;
+  hideComparison?: boolean;
+  className?: string;
+}
+
 export const MetricCard = ({
   value = 0,
   change = 0,
@@ -11,13 +21,15 @@ export const MetricCard = ({
   format = formatNumber,
   hideComparison = false,
   className,
-}) => {
+}: MetricCardProps) => {
   const props = useSpring({ x: Number(value) || 0, from: { x: 0 } });
   const changeProps = useSpring({ x: Number(change) || 0, from: { x: 0 } });
 
   return (
     <div className={classNames(styles.card, className)}>
-      <animated.div className={styles.value}>{props.x.to(x => format(x))}</animated.div>
+      <animated.div className={styles.value} title={props?.x as any}>
+        {props?.x?.to(x => format(x))}
+      </animated.div>
       <div className={styles.label}>
         {label}
         {~~change !== 0 && !hideComparison && (
@@ -27,8 +39,9 @@ export const MetricCard = ({
               [styles.negative]: change * (reverseColors ? -1 : 1) < 0,
               [styles.plusSign]: change > 0,
             })}
+            title={changeProps?.x as any}
           >
-            {changeProps.x.to(x => format(x))}
+            {changeProps?.x?.to(x => format(x))}
           </animated.span>
         )}
       </div>
diff --git a/src/components/metrics/MetricsBar.module.css b/src/components/metrics/MetricsBar.module.css
new file mode 100644
index 000000000..21c9e8023
--- /dev/null
+++ b/src/components/metrics/MetricsBar.module.css
@@ -0,0 +1,11 @@
+.bar {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(140px, max-content));
+  gap: 20px;
+}
+
+@media screen and (max-width: 768px) {
+  .bar {
+    grid-template-columns: 1fr 1fr;
+  }
+}
diff --git a/src/components/metrics/MetricsBar.tsx b/src/components/metrics/MetricsBar.tsx
new file mode 100644
index 000000000..60a217067
--- /dev/null
+++ b/src/components/metrics/MetricsBar.tsx
@@ -0,0 +1,31 @@
+import { ReactNode } from 'react';
+import { Loading, cloneChildren } from 'react-basics';
+import ErrorMessage from 'components/common/ErrorMessage';
+import { formatLongNumber } from 'lib/format';
+import styles from './MetricsBar.module.css';
+
+export interface MetricsBarProps {
+  isLoading?: boolean;
+  isFetched?: boolean;
+  error?: unknown;
+  children?: ReactNode;
+}
+
+export function MetricsBar({ children, isLoading, isFetched, error }: MetricsBarProps) {
+  const formatFunc = n => (n >= 0 ? formatLongNumber(n) : `-${formatLongNumber(Math.abs(n))}`);
+
+  return (
+    <div className={styles.bar}>
+      {isLoading && !isFetched && <Loading icon="dots" />}
+      {error && <ErrorMessage />}
+      {!isLoading &&
+        !error &&
+        isFetched &&
+        cloneChildren(children, child => {
+          return { format: child.props.format || formatFunc };
+        })}
+    </div>
+  );
+}
+
+export default MetricsBar;
diff --git a/components/metrics/MetricsTable.module.css b/src/components/metrics/MetricsTable.module.css
similarity index 51%
rename from components/metrics/MetricsTable.module.css
rename to src/components/metrics/MetricsTable.module.css
index fc3bc51e4..f04d9ae43 100644
--- a/components/metrics/MetricsTable.module.css
+++ b/src/components/metrics/MetricsTable.module.css
@@ -1,19 +1,38 @@
 .container {
   position: relative;
   min-height: 430px;
-  height: 100%;
   display: flex;
   flex-direction: column;
   flex: 1;
 }
 
+.actions {
+  display: flex;
+  gap: 20px;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 10px;
+}
+
 .footer {
   display: flex;
   justify-content: center;
 }
 
+.search {
+  max-width: 300px;
+}
+
 @media only screen and (max-width: 992px) {
   .container {
     min-height: auto;
   }
+
+  .actions {
+    flex-direction: column;
+  }
+
+  .search {
+    max-width: 100%;
+  }
 }
diff --git a/src/components/metrics/MetricsTable.tsx b/src/components/metrics/MetricsTable.tsx
new file mode 100644
index 000000000..6c9293e12
--- /dev/null
+++ b/src/components/metrics/MetricsTable.tsx
@@ -0,0 +1,157 @@
+import { ReactNode, useMemo, useState } from 'react';
+import { Loading, Icon, Text, SearchField } from 'react-basics';
+import classNames from 'classnames';
+import useApi from 'components/hooks/useApi';
+import { percentFilter } from 'lib/filters';
+import useDateRange from 'components/hooks/useDateRange';
+import useNavigation from 'components/hooks/useNavigation';
+import ErrorMessage from 'components/common/ErrorMessage';
+import LinkButton from 'components/common/LinkButton';
+import ListTable, { ListTableProps } from './ListTable';
+import { DEFAULT_ANIMATION_DURATION } from 'lib/constants';
+import Icons from 'components/icons';
+import useMessages from 'components/hooks/useMessages';
+import useLocale from 'components/hooks/useLocale';
+import useFormat from 'components//hooks/useFormat';
+import styles from './MetricsTable.module.css';
+
+export interface MetricsTableProps extends ListTableProps {
+  websiteId: string;
+  domainName: string;
+  type?: string;
+  className?: string;
+  dataFilter?: (data: any) => any;
+  limit?: number;
+  delay?: number;
+  onDataLoad?: (data: any) => void;
+  onSearch?: (search: string) => void;
+  allowSearch?: boolean;
+  children?: ReactNode;
+}
+
+export function MetricsTable({
+  websiteId,
+  type,
+  className,
+  dataFilter,
+  limit,
+  onDataLoad,
+  delay = null,
+  allowSearch = false,
+  children,
+  ...props
+}: MetricsTableProps) {
+  const [search, setSearch] = useState('');
+  const { formatValue } = useFormat();
+  const [{ startDate, endDate, modified }] = useDateRange(websiteId);
+  const {
+    makeUrl,
+    query: { url, referrer, title, os, browser, device, country, region, city },
+  } = useNavigation();
+  const { formatMessage, labels } = useMessages();
+  const { get, useQuery } = useApi();
+  const { dir } = useLocale();
+  const { data, isLoading, isFetched, error } = useQuery({
+    queryKey: [
+      'websites:metrics',
+      {
+        websiteId,
+        type,
+        modified,
+        url,
+        referrer,
+        os,
+        title,
+        browser,
+        device,
+        country,
+        region,
+        city,
+      },
+    ],
+    queryFn: async () => {
+      const filters = { url, title, referrer, os, browser, device, country, region, city };
+
+      filters[type] = undefined;
+
+      const data = await get(`/websites/${websiteId}/metrics`, {
+        type,
+        startAt: +startDate,
+        endAt: +endDate,
+        limit,
+        ...filters,
+      });
+
+      onDataLoad?.(data);
+
+      return data;
+    },
+    retryDelay: delay || DEFAULT_ANIMATION_DURATION,
+  });
+
+  const filteredData = useMemo(() => {
+    if (data) {
+      let items: any[] = data;
+
+      if (dataFilter) {
+        if (Array.isArray(dataFilter)) {
+          items = dataFilter.reduce((arr, filter) => {
+            return filter(arr);
+          }, items);
+        } else {
+          items = dataFilter(data);
+        }
+      }
+
+      if (search) {
+        items = items.filter(({ x, ...data }) => {
+          const value = formatValue(x, type, data);
+
+          return value.toLowerCase().includes(search.toLowerCase());
+        });
+      }
+
+      items = percentFilter(items);
+
+      if (limit) {
+        items = items.slice(0, limit - 1);
+      }
+
+      return items;
+    }
+    return [];
+  }, [data, dataFilter, search, limit, formatValue, type]);
+
+  return (
+    <div className={classNames(styles.container, className)}>
+      {error && <ErrorMessage />}
+      <div className={styles.actions}>
+        {allowSearch && (
+          <SearchField
+            className={styles.search}
+            value={search}
+            onSearch={setSearch}
+            autoFocus={true}
+          />
+        )}
+        {children}
+      </div>
+      {data && !error && (
+        <ListTable {...(props as ListTableProps)} data={filteredData} className={className} />
+      )}
+      {!data && isLoading && !isFetched && <Loading icon="dots" />}
+      <div className={styles.footer}>
+        {data && !error && limit && (
+          <LinkButton href={makeUrl({ view: type })} variant="quiet">
+            <Text>{formatMessage(labels.more)}</Text>
+            <Icon size="sm" rotate={dir === 'rtl' ? 180 : 0}>
+              <Icons.ArrowRight />
+            </Icon>
+          </LinkButton>
+        )}
+      </div>
+    </div>
+  );
+}
+
+export default MetricsTable;
diff --git a/components/metrics/OSTable.js b/src/components/metrics/OSTable.tsx
similarity index 53%
rename from components/metrics/OSTable.js
rename to src/components/metrics/OSTable.tsx
index e4bc32340..102bafd36 100644
--- a/components/metrics/OSTable.js
+++ b/src/components/metrics/OSTable.tsx
@@ -1,18 +1,22 @@
-import MetricsTable from './MetricsTable';
+import MetricsTable, { MetricsTableProps } from './MetricsTable';
 import FilterLink from 'components/common/FilterLink';
-import useMessages from 'hooks/useMessages';
-import { useRouter } from 'next/router';
+import useMessages from 'components/hooks/useMessages';
 
-export function OSTable({ websiteId, ...props }) {
+const names = {
+  'Mac OS': 'macOS',
+  'Chrome OS': 'ChromeOS',
+  'Sun OS': 'SunOS',
+};
+
+export function OSTable(props: MetricsTableProps) {
   const { formatMessage, labels } = useMessages();
-  const { basePath } = useRouter();
 
   function renderLink({ x: os }) {
     return (
-      <FilterLink id="os" value={os}>
+      <FilterLink id="os" value={names[os] || os}>
         <img
-          src={`${basePath}/images/os/${
-            os?.toLowerCase().replaceAll(/[^\w]+/g, '-') || 'unknown'
+          src={`${process.env.basePath || ''}/images/os/${
+            os?.toLowerCase().replaceAll(/\W/g, '-') || 'unknown'
           }.png`}
           alt={os}
           width={16}
@@ -25,11 +29,10 @@ export function OSTable({ websiteId, ...props }) {
   return (
     <MetricsTable
       {...props}
-      websiteId={websiteId}
+      type="os"
       title={formatMessage(labels.os)}
       metric={formatMessage(labels.visitors)}
       renderLabel={renderLink}
-      type="os"
     />
   );
 }
diff --git a/src/components/metrics/PagesTable.tsx b/src/components/metrics/PagesTable.tsx
new file mode 100644
index 000000000..042af9c06
--- /dev/null
+++ b/src/components/metrics/PagesTable.tsx
@@ -0,0 +1,61 @@
+import FilterLink from 'components/common/FilterLink';
+import FilterButtons from 'components/common/FilterButtons';
+import MetricsTable, { MetricsTableProps } from './MetricsTable';
+import useMessages from 'components/hooks/useMessages';
+import useNavigation from 'components/hooks/useNavigation';
+import { emptyFilter } from 'lib/filters';
+
+export interface PagesTableProps extends MetricsTableProps {
+  allowFilter?: boolean;
+}
+
+export function PagesTable({ allowFilter, domainName, ...props }: PagesTableProps) {
+  const {
+    router,
+    makeUrl,
+    query: { view = 'url' },
+  } = useNavigation();
+  const { formatMessage, labels } = useMessages();
+
+  const handleSelect = (key: any) => {
+    router.push(makeUrl({ view: key }), { scroll: true });
+  };
+
+  const buttons = [
+    {
+      label: 'URL',
+      key: 'url',
+    },
+    {
+      label: formatMessage(labels.title),
+      key: 'title',
+    },
+  ];
+
+  const renderLink = ({ x }) => {
+    return (
+      <FilterLink
+        id={view}
+        value={x}
+        label={!x && formatMessage(labels.none)}
+        externalUrl={`${domainName.startsWith('http') ? domainName : `https://${domainName}`}${x}`}
+      />
+    );
+  };
+
+  return (
+    <MetricsTable
+      {...props}
+      domainName={domainName}
+      title={formatMessage(labels.pages)}
+      type={view}
+      metric={formatMessage(labels.views)}
+      dataFilter={emptyFilter}
+      renderLabel={renderLink}
+    >
+      {allowFilter && <FilterButtons items={buttons} selectedKey={view} onSelect={handleSelect} />}
+    </MetricsTable>
+  );
+}
+
+export default PagesTable;
diff --git a/components/metrics/PageviewsChart.js b/src/components/metrics/PageviewsChart.tsx
similarity index 58%
rename from components/metrics/PageviewsChart.js
rename to src/components/metrics/PageviewsChart.tsx
index 1b481c481..48e2b4f1d 100644
--- a/components/metrics/PageviewsChart.js
+++ b/src/components/metrics/PageviewsChart.tsx
@@ -1,9 +1,18 @@
 import { useMemo } from 'react';
-import BarChart from './BarChart';
-import { useLocale, useTheme, useMessages } from 'hooks';
+import BarChart, { BarChartProps } from './BarChart';
+import { useLocale, useTheme, useMessages } from 'components/hooks';
 import { renderDateLabels, renderStatusTooltipPopup } from 'lib/charts';
 
-export function PageviewsChart({ websiteId, data, unit, loading, ...props }) {
+export interface PageviewsChartProps extends BarChartProps {
+  data: {
+    sessions: any[];
+    pageviews: any[];
+  };
+  unit: string;
+  isLoading?: boolean;
+}
+
+export function PageviewsChart({ data, unit, isLoading, ...props }: PageviewsChartProps) {
   const { formatMessage, labels } = useMessages();
   const { colors } = useTheme();
   const { locale } = useLocale();
@@ -13,27 +22,26 @@ export function PageviewsChart({ websiteId, data, unit, loading, ...props }) {
 
     return [
       {
-        label: formatMessage(labels.uniqueVisitors),
+        label: formatMessage(labels.visitors),
         data: data.sessions,
         borderWidth: 1,
         ...colors.chart.visitors,
       },
       {
-        label: formatMessage(labels.pageViews),
+        label: formatMessage(labels.views),
         data: data.pageviews,
         borderWidth: 1,
         ...colors.chart.views,
       },
     ];
-  }, [data, locale, colors]);
+  }, [data, colors, formatMessage, labels]);
 
   return (
     <BarChart
       {...props}
-      key={websiteId}
       datasets={datasets}
       unit={unit}
-      loading={loading}
+      isLoading={isLoading}
       renderXLabel={renderDateLabels(unit, locale)}
       renderTooltipPopup={renderStatusTooltipPopup(unit, locale)}
     />
diff --git a/components/metrics/QueryParametersTable.module.css b/src/components/metrics/QueryParametersTable.module.css
similarity index 100%
rename from components/metrics/QueryParametersTable.module.css
rename to src/components/metrics/QueryParametersTable.module.css
diff --git a/src/components/metrics/QueryParametersTable.tsx b/src/components/metrics/QueryParametersTable.tsx
new file mode 100644
index 000000000..904894603
--- /dev/null
+++ b/src/components/metrics/QueryParametersTable.tsx
@@ -0,0 +1,54 @@
+import { useState } from 'react';
+import { safeDecodeURI } from 'next-basics';
+import FilterButtons from 'components/common/FilterButtons';
+import { emptyFilter, paramFilter } from 'lib/filters';
+import { FILTER_RAW, FILTER_COMBINED } from 'lib/constants';
+import MetricsTable, { MetricsTableProps } from './MetricsTable';
+import useMessages from 'components/hooks/useMessages';
+import styles from './QueryParametersTable.module.css';
+
+const filters = {
+  [FILTER_RAW]: emptyFilter,
+  [FILTER_COMBINED]: [emptyFilter, paramFilter],
+};
+
+export function QueryParametersTable({
+  allowFilter,
+  ...props
+}: { allowFilter: boolean } & MetricsTableProps) {
+  const [filter, setFilter] = useState(FILTER_COMBINED);
+  const { formatMessage, labels } = useMessages();
+
+  const buttons = [
+    {
+      label: formatMessage(labels.filterCombined),
+      key: FILTER_COMBINED,
+    },
+    { label: formatMessage(labels.filterRaw), key: FILTER_RAW },
+  ];
+
+  return (
+    <MetricsTable
+      {...props}
+      title={formatMessage(labels.query)}
+      type="query"
+      metric={formatMessage(labels.views)}
+      dataFilter={filters[filter]}
+      renderLabel={({ x, p, v }) =>
+        filter === FILTER_RAW ? (
+          x
+        ) : (
+          <div className={styles.item}>
+            <div className={styles.param}>{safeDecodeURI(p)}</div>
+            <div className={styles.value}>{safeDecodeURI(v)}</div>
+          </div>
+        )
+      }
+      delay={0}
+    >
+      {allowFilter && <FilterButtons items={buttons} selectedKey={filter} onSelect={setFilter} />}
+    </MetricsTable>
+  );
+}
+
+export default QueryParametersTable;
diff --git a/components/metrics/RealtimeChart.js b/src/components/metrics/RealtimeChart.tsx
similarity index 79%
rename from components/metrics/RealtimeChart.js
rename to src/components/metrics/RealtimeChart.tsx
index 07d73a7f9..1ca0719a3 100644
--- a/components/metrics/RealtimeChart.js
+++ b/src/components/metrics/RealtimeChart.tsx
@@ -3,8 +3,9 @@ import { format, startOfMinute, subMinutes, isBefore } from 'date-fns';
 import PageviewsChart from './PageviewsChart';
 import { getDateArray } from 'lib/date';
 import { DEFAULT_ANIMATION_DURATION, REALTIME_RANGE } from 'lib/constants';
+import { RealtimeData } from 'lib/types';
 
-function mapData(data) {
+function mapData(data: any[]) {
   let last = 0;
   const arr = [];
 
@@ -23,7 +24,13 @@ function mapData(data) {
   return arr;
 }
 
-export function RealtimeChart({ data, unit, ...props }) {
+export interface RealtimeChartProps {
+  data: RealtimeData;
+  unit: string;
+  className?: string;
+}
+
+export function RealtimeChart({ data, unit, ...props }: RealtimeChartProps) {
   const endDate = startOfMinute(new Date());
   const startDate = subMinutes(endDate, REALTIME_RANGE);
   const prevEndDate = useRef(endDate);
@@ -46,16 +53,10 @@ export function RealtimeChart({ data, unit, ...props }) {
       return 0;
     }
     return DEFAULT_ANIMATION_DURATION;
-  }, [data, endDate]);
+  }, [endDate]);
 
   return (
-    <PageviewsChart
-      {...props}
-      height={200}
-      unit={unit}
-      data={chartData}
-      animationDuration={animationDuration}
-    />
+    <PageviewsChart {...props} unit={unit} data={chartData} animationDuration={animationDuration} />
   );
 }
 
diff --git a/components/metrics/ReferrersTable.js b/src/components/metrics/ReferrersTable.tsx
similarity index 77%
rename from components/metrics/ReferrersTable.js
rename to src/components/metrics/ReferrersTable.tsx
index 3cdcb02f5..079e6e722 100644
--- a/components/metrics/ReferrersTable.js
+++ b/src/components/metrics/ReferrersTable.tsx
@@ -1,8 +1,8 @@
-import MetricsTable from './MetricsTable';
+import MetricsTable, { MetricsTableProps } from './MetricsTable';
 import FilterLink from 'components/common/FilterLink';
-import useMessages from 'hooks/useMessages';
+import useMessages from 'components/hooks/useMessages';
 
-export function ReferrersTable({ websiteId, ...props }) {
+export function ReferrersTable(props: MetricsTableProps) {
   const { formatMessage, labels } = useMessages();
 
   const renderLink = ({ x: referrer }) => {
@@ -23,7 +23,6 @@ export function ReferrersTable({ websiteId, ...props }) {
         title={formatMessage(labels.referrers)}
         type="referrer"
         metric={formatMessage(labels.views)}
-        websiteId={websiteId}
         renderLabel={renderLink}
       />
     </>
diff --git a/components/metrics/RegionsTable.js b/src/components/metrics/RegionsTable.tsx
similarity index 50%
rename from components/metrics/RegionsTable.js
rename to src/components/metrics/RegionsTable.tsx
index d7b614f75..187e3768d 100644
--- a/components/metrics/RegionsTable.js
+++ b/src/components/metrics/RegionsTable.tsx
@@ -1,27 +1,26 @@
-import { useRouter } from 'next/router';
 import FilterLink from 'components/common/FilterLink';
 import { emptyFilter } from 'lib/filters';
-import useLocale from 'hooks/useLocale';
-import useMessages from 'hooks/useMessages';
-import useCountryNames from 'hooks/useCountryNames';
-import MetricsTable from './MetricsTable';
+import useLocale from 'components/hooks/useLocale';
+import useMessages from 'components/hooks/useMessages';
+import useCountryNames from 'components/hooks/useCountryNames';
+import MetricsTable, { MetricsTableProps } from './MetricsTable';
 import regions from 'public/iso-3166-2.json';
 
-export function RegionsTable({ websiteId, ...props }) {
+export function RegionsTable(props: MetricsTableProps) {
   const { locale } = useLocale();
   const { formatMessage, labels } = useMessages();
   const countryNames = useCountryNames(locale);
-  const { basePath } = useRouter();
 
-  const renderLabel = x => {
-    return regions[x] ? `${regions[x]}, ${countryNames[x.split('-')[0]]}` : x;
+  const renderLabel = (code: string, country: string) => {
+    const region = code.includes('-') ? code : `${country}-${code}`;
+    return regions[region] ? `${regions[region]}, ${countryNames[country]}` : region;
   };
 
-  const renderLink = ({ x: code }) => {
+  const renderLink = ({ x: code, country }) => {
     return (
-      <FilterLink id="region" className={locale} value={code} label={renderLabel(code)}>
+      <FilterLink id="region" className={locale} value={code} label={renderLabel(code, country)}>
         <img
-          src={`${basePath}/images/flags/${code?.split('-')?.[0]?.toLowerCase() || 'xx'}.png`}
+          src={`${process.env.basePath}/images/flags/${country?.toLowerCase() || 'xx'}.png`}
           alt={code}
         />
       </FilterLink>
@@ -34,7 +33,6 @@ export function RegionsTable({ websiteId, ...props }) {
       title={formatMessage(labels.regions)}
       type="region"
       metric={formatMessage(labels.visitors)}
-      websiteId={websiteId}
       dataFilter={emptyFilter}
       renderLabel={renderLink}
     />
diff --git a/components/metrics/ScreenTable.js b/src/components/metrics/ScreenTable.tsx
similarity index 58%
rename from components/metrics/ScreenTable.js
rename to src/components/metrics/ScreenTable.tsx
index f8ef5f2e6..5b856cbab 100644
--- a/components/metrics/ScreenTable.js
+++ b/src/components/metrics/ScreenTable.tsx
@@ -1,7 +1,7 @@
-import MetricsTable from './MetricsTable';
-import useMessages from 'hooks/useMessages';
+import MetricsTable, { MetricsTableProps } from './MetricsTable';
+import useMessages from 'components/hooks/useMessages';
 
-export function ScreenTable({ websiteId, ...props }) {
+export function ScreenTable(props: MetricsTableProps) {
   const { formatMessage, labels } = useMessages();
 
   return (
@@ -10,7 +10,6 @@ export function ScreenTable({ websiteId, ...props }) {
       title={formatMessage(labels.screens)}
       type="screen"
       metric={formatMessage(labels.visitors)}
-      websiteId={websiteId}
     />
   );
 }
diff --git a/components/common/WorldMap.module.css b/src/components/metrics/WorldMap.module.css
similarity index 100%
rename from components/common/WorldMap.module.css
rename to src/components/metrics/WorldMap.module.css
diff --git a/components/common/WorldMap.js b/src/components/metrics/WorldMap.tsx
similarity index 78%
rename from components/common/WorldMap.js
rename to src/components/metrics/WorldMap.tsx
index 9c91e4a47..ed3b3ac99 100644
--- a/components/common/WorldMap.js
+++ b/src/components/metrics/WorldMap.tsx
@@ -1,26 +1,27 @@
 import { useState, useMemo } from 'react';
-import { useRouter } from 'next/router';
 import { ComposableMap, Geographies, Geography, ZoomableGroup } from 'react-simple-maps';
 import classNames from 'classnames';
 import { colord } from 'colord';
 import HoverTooltip from 'components/common/HoverTooltip';
 import { ISO_COUNTRIES, MAP_FILE } from 'lib/constants';
-import useTheme from 'hooks/useTheme';
-import useCountryNames from 'hooks/useCountryNames';
-import useLocale from 'hooks/useLocale';
+import useTheme from 'components/hooks/useTheme';
+import useCountryNames from 'components/hooks/useCountryNames';
+import useLocale from 'components/hooks/useLocale';
+import useMessages from 'components/hooks/useMessages';
 import { formatLongNumber } from 'lib/format';
 import { percentFilter } from 'lib/filters';
 import styles from './WorldMap.module.css';
 
-export function WorldMap({ data, className }) {
-  const { basePath } = useRouter();
+export function WorldMap({ data = [], className }: { data?: any[]; className?: string }) {
   const [tooltip, setTooltipPopup] = useState();
   const { theme, colors } = useTheme();
   const { locale } = useLocale();
+  const { formatMessage, labels } = useMessages();
   const countryNames = useCountryNames(locale);
+  const visitorsLabel = formatMessage(labels.visitors).toLocaleLowerCase(locale);
   const metrics = useMemo(() => (data ? percentFilter(data) : []), [data]);
 
-  function getFillColor(code) {
+  function getFillColor(code: string) {
     if (code === 'AQ') return;
     const country = metrics?.find(({ x }) => x === code);
 
@@ -40,7 +41,9 @@ export function WorldMap({ data, className }) {
   function handleHover(code) {
     if (code === 'AQ') return;
     const country = metrics?.find(({ x }) => x === code);
-    setTooltipPopup(`${countryNames[code]}: ${formatLongNumber(country?.y || 0)} visitors`);
+    setTooltipPopup(
+      `${countryNames[code]}: ${formatLongNumber(country?.y || 0)} ${visitorsLabel}` as any,
+    );
   }
 
   return (
@@ -51,7 +54,7 @@ export function WorldMap({ data, className }) {
     >
       <ComposableMap projection="geoMercator">
         <ZoomableGroup zoom={0.8} minZoom={0.7} center={[0, 40]}>
-          <Geographies geography={`${basePath}${MAP_FILE}`}>
+          <Geographies geography={`${process.env.basePath}${MAP_FILE}`}>
             {({ geographies }) => {
               return geographies.map(geo => {
                 const code = ISO_COUNTRIES[geo.id];
diff --git a/src/declaration.d.ts b/src/declaration.d.ts
new file mode 100644
index 000000000..3523e9fa2
--- /dev/null
+++ b/src/declaration.d.ts
@@ -0,0 +1,2 @@
+declare module 'cors';
+declare module 'debug';
diff --git a/src/index.ts b/src/index.ts
new file mode 100644
index 000000000..7b1920547
--- /dev/null
+++ b/src/index.ts
@@ -0,0 +1,64 @@
+export * from 'components/hooks/useApi';
+export * from 'components/hooks/useConfig';
+export * from 'components/hooks/useDateRange';
+export * from 'components/hooks/useDocumentClick';
+export * from 'components/hooks/useEscapeKey';
+export * from 'components/hooks/useFilterQuery';
+export * from 'components/hooks/useFilters';
+export * from 'components/hooks/useForceUpdate';
+export * from 'components/hooks/useFormat';
+export * from 'components/hooks/useLocale';
+export * from 'components/hooks/useMessages';
+export * from 'components/hooks/useNavigation';
+export * from 'components/hooks/useLogin';
+export * from 'components/hooks/useShareToken';
+export * from 'components/hooks/useSticky';
+export * from 'components/hooks/useTheme';
+export * from 'components/hooks/useTimezone';
+export * from 'components/hooks/useUser';
+export * from 'components/hooks/useWebsite';
+
+export * from 'app/(main)/settings/teams/[id]/TeamWebsiteAddForm';
+export * from 'app/(main)/settings/teams/[id]/TeamEditForm';
+export * from 'app/(main)/settings/teams/[id]/TeamMemberRemoveButton';
+export * from 'app/(main)/settings/teams/[id]/TeamMembers';
+export * from 'app/(main)/settings/teams/[id]/TeamMembersTable';
+export * from 'app/(main)/settings/teams/[id]/TeamSettings';
+export * from 'app/(main)/settings/teams/[id]/TeamWebsiteRemoveButton';
+export * from 'app/(main)/settings/teams/[id]/TeamWebsites';
+export * from 'app/(main)/settings/teams/[id]/TeamWebsitesTable';
+export * from 'app/(main)/settings/teams/TeamAddForm';
+export * from 'app/(main)/settings/teams/TeamDeleteForm';
+export * from 'app/(main)/settings/teams/TeamsHeader';
+export * from 'app/(main)/settings/teams/TeamJoinForm';
+export * from 'app/(main)/settings/teams/TeamLeaveForm';
+export * from 'app/(main)/settings/teams/TeamsDataTable';
+export * from 'app/(main)/settings/teams/TeamsTable';
+export * from 'app/(main)/settings/teams/WebsiteTags';
+
+export * from 'app/(main)/settings/websites/[id]/ShareUrl';
+export * from 'app/(main)/settings/websites/[id]/TrackingCode';
+export * from 'app/(main)/settings/websites/[id]/WebsiteDeleteForm';
+export * from 'app/(main)/settings/websites/[id]/WebsiteEditForm';
+export * from 'app/(main)/settings/websites/[id]/WebsiteResetForm';
+
+export * from 'app/(main)/settings/websites/WebsiteAddForm';
+export * from 'app/(main)/settings/websites/WebsitesHeader';
+export * from 'app/(main)/settings/websites/WebsiteSettings';
+export * from 'app/(main)/settings/websites/WebsitesDataTable';
+export * from 'app/(main)/settings/websites/WebsitesTable';
+
+export * from 'app/(main)/settings/SettingsContext';
+
+export * from 'components/common/ConfirmDeleteForm';
+export * from 'components/common/DataTable';
+export * from 'components/common/Empty';
+export * from 'components/common/ErrorBoundary';
+export * from 'components/common/Favicon';
+export * from 'components/common/FilterButtons';
+export * from 'components/common/FilterLink';
+export * from 'components/common/HamburgerButton';
+export * from 'components/common/HoverTooltip';
+export * from 'components/common/LinkButton';
+export * from 'components/common/MobileMenu';
+export * from 'components/common/Pager';
diff --git a/lang/am-ET.json b/src/lang/am-ET.json
similarity index 78%
rename from lang/am-ET.json
rename to src/lang/am-ET.json
index 0764b1917..e79afb487 100644
--- a/lang/am-ET.json
+++ b/src/lang/am-ET.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "Add website",
   "label.admin": "Administrator",
+  "label.after": "After",
   "label.all": "All",
   "label.all-time": "All time",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Average visit time",
   "label.back": "Back",
+  "label.before": "Before",
   "label.bounce-rate": "Bounce rate",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Browsers",
   "label.cancel": "Cancel",
   "label.change-password": "Change password",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Confirm password",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Countries",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +38,21 @@
   "label.custom-range": "Custom range",
   "label.dashboard": "Dashboard",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Date range",
+  "label.day": "Day",
   "label.default-date-range": "Default date range",
   "label.delete": "Delete",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Delete website",
+  "label.description": "Description",
   "label.desktop": "Desktop",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Devices",
   "label.dismiss": "Dismiss",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Domain",
   "label.dropoff": "Dropoff",
   "label.edit": "Edit",
@@ -46,12 +61,23 @@
   "label.event": "Event",
   "label.event-data": "Event Data",
   "label.events": "Events",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
+  "label.filter": "Filter",
   "label.filter-combined": "Combined",
   "label.filter-raw": "Raw",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +87,25 @@
   "label.last-hours": "Last {x} hours",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Login",
   "label.logout": "Logout",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Mobile",
   "label.more": "More",
+  "label.my-websites": "My websites",
   "label.name": "Name",
   "label.new-password": "New password",
   "label.none": "None",
-  "label.operating-systems": "Operating systems",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Owner",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Page views",
+  "label.pageTitle": "Page title",
   "label.pages": "Pages",
   "label.password": "Password",
   "label.powered-by": "Powered by {name}",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Realtime",
+  "label.referrer": "Referrer",
   "label.referrers": "Referrers",
   "label.refresh": "Refresh",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Required",
   "label.reset": "Reset",
   "label.reset-website": "Reset statistics",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Save",
   "label.screens": "Screens",
+  "label.search": "Search",
   "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Settings",
   "label.share-url": "Share URL",
   "label.single-day": "Single day",
+  "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "This month",
@@ -114,14 +156,21 @@
   "label.title": "Title",
   "label.today": "Today",
   "label.toggle-charts": "Toggle charts",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Tracking code",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Unique visitors",
   "label.unknown": "Unknown",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Username",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "View details",
   "label.view-only": "View only",
@@ -132,33 +181,6 @@
   "label.websites": "Websites",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} current {x, plural, one {visitor} other {visitors}}",
   "message.confirm-delete": "Are you sure you want to delete {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "Incorrect username/password.",
   "message.invalid-domain": "Invalid domain. Do not include http/https.",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "No data available.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Passwords do not match.",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "You do not have any websites configured.",
   "message.page-not-found": "Page not found.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "All statistics for this website will be deleted, but your settings will remain intact.",
@@ -184,12 +210,8 @@
   "message.share-url": "This is the publicly shared URL for {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "To track stats for this website, place the following code in the <head>...</head> section of your HTML.",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Visitor from {country} using {browser} on {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "You do not have any websites configured.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Visitor from {country} using {browser} on {os} {device}"
 }
diff --git a/lang/ar-SA.json b/src/lang/ar-SA.json
similarity index 81%
rename from lang/ar-SA.json
rename to src/lang/ar-SA.json
index 933d42f59..311e54305 100644
--- a/lang/ar-SA.json
+++ b/src/lang/ar-SA.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "إضافة موقع",
   "label.admin": "مدير",
+  "label.after": "After",
   "label.all": "الكل",
   "label.all-time": "كل الوقت",
   "label.analytics": "تحليلات",
+  "label.average": "Average",
   "label.average-visit-time": "متوسط وقت الزيارة",
   "label.back": "للخلف",
+  "label.before": "Before",
   "label.bounce-rate": "معدل الارتداد",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "المتصفحات",
   "label.cancel": "إلغاء",
   "label.change-password": "تغيير كلمة المرور",
   "label.cities": "المدن",
+  "label.city": "City",
   "label.clear-all": "مسح الكل",
   "label.confirm": "تأكيد",
   "label.confirm-password": "تأكيد كلمة المرور",
+  "label.contains": "Contains",
   "label.continue": "متابعة",
   "label.countries": "الدول",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Create report",
   "label.create-team": "انشاء مجموعة",
   "label.create-user": "انشاء مستخدم",
   "label.created": "تم الانشاء",
@@ -28,16 +38,21 @@
   "label.custom-range": "فترة مخصصة",
   "label.dashboard": "الشاشة الرئيسية",
   "label.data": "البيانات",
+  "label.date": "Date",
   "label.date-range": "فترة مخصصة",
+  "label.day": "Day",
   "label.default-date-range": "الفترة المخصصة الافتراضية",
   "label.delete": "حذف",
   "label.delete-team": "حذف مجموعة",
   "label.delete-user": "جذف مستخدم",
   "label.delete-website": "حذف الموقع",
+  "label.description": "Description",
   "label.desktop": "كمبيوتر",
   "label.details": "تفاصيل",
+  "label.device": "Device",
   "label.devices": "الأجهزة",
   "label.dismiss": "اخفاء",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "النطاق",
   "label.dropoff": "Dropoff",
   "label.edit": "تعديل",
@@ -46,12 +61,23 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "الأحداث",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
+  "label.filter": "Filter",
   "label.filter-combined": "مجمعة",
   "label.filter-raw": "مفصلة",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "انضمام",
   "label.join-team": "الانضمام للمجموعة",
   "label.language": "اللغة",
@@ -61,17 +87,25 @@
   "label.last-hours": "اخر {x} ساعة/ساعات",
   "label.leave": "مغادرة",
   "label.leave-team": "مغادرة المجموعة",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "تسجيل الدخول",
   "label.logout": "تسجيل الخروج",
+  "label.max": "Max",
   "label.members": "الأعضاء",
+  "label.min": "Min",
   "label.mobile": "جوال",
   "label.more": "المزيد",
+  "label.my-websites": "My websites",
   "label.name": "الإسم",
   "label.new-password": "كلمة مرور جديدة",
   "label.none": "غير معرف",
-  "label.operating-systems": "نظام التشغيل",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "المالك",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "مشاهدات الصفحة",
+  "label.pageTitle": "Page title",
   "label.pages": "الصفحات",
   "label.password": "كلمة المرور",
   "label.powered-by": "مشغل بواسطة {name}",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "متغيرات الرابط",
   "label.realtime": "الوقت الفعلي",
+  "label.referrer": "Referrer",
   "label.referrers": "التحويلات",
   "label.refresh": "تحديث",
   "label.regenerate": "اعادة انشاء",
+  "label.region": "Region",
   "label.regions": "المناطق",
   "label.remove": "إزالة",
   "label.reports": "Reports",
   "label.required": "اجباري",
   "label.reset": "اعادة تعيين",
   "label.reset-website": "اعادة تعيين الإحصائيات",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "الصلاحية",
   "label.run-query": "Run query",
   "label.save": "حفظ",
   "label.screens": "الشاشات",
+  "label.search": "Search",
   "label.select-date": "Select date",
   "label.select-website": "اختيار موقع",
   "label.sessions": "الزيارات",
   "label.settings": "اعدادات",
   "label.share-url": "مشاركة الرابط",
   "label.single-day": "يوم واحد",
+  "label.sum": "Sum",
   "label.tablet": "تابلت",
   "label.team": "مجموعة",
   "label.team-guest": "زائر للمجموعة",
   "label.team-id": "معرف المجموعة",
   "label.team-member": "عضو المجموعة",
+  "label.team-name": "Team name",
   "label.team-owner": "مدير المجموعة",
+  "label.team-websites": "Team websites",
   "label.teams": "المجموعات",
   "label.theme": "المظهر",
   "label.this-month": "الشهر الحالي",
@@ -114,14 +156,21 @@
   "label.title": "العنوان",
   "label.today": "اليوم",
   "label.toggle-charts": "تغيير الإحصائيات",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "كود التتبع",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "زائرون فريدون",
   "label.unknown": "غير معروف",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "مستخدم",
   "label.username": "اسم المستخدم",
   "label.users": "المستخدمين",
+  "label.value": "Value",
   "label.view": "عرض",
   "label.view-details": "عرض التفاصيل",
   "label.view-only": "View only",
@@ -132,33 +181,6 @@
   "label.websites": "المواقع",
   "label.window": "Window",
   "label.yesterday": "الأمس",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} حاليا {x, plural, one {زائر واحد} other {زوار}}",
   "message.confirm-delete": "هل أنت متأكد من حذف {target}?",
   "message.confirm-leave": "هل أنت متأكد من مغادرة {target}?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "اسم المستخدم او كلمة المرور غير صحيحة.",
   "message.invalid-domain": "النطاق غير صحيح",
   "message.min-password-length": "اقل عدد مسموح به {n} حرف/أحرف",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "لا توجد بيانات متاحة.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "كلمة المرور غير متطابقة",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "هذه المجموعة ليس لديه اي موقع.",
   "message.no-teams": "لم تقم بإنشاء اي مجموعة.",
   "message.no-users": "لا يوجد مستخدمين.",
+  "message.no-websites-configured": "لم تقم بإعداد اي موقع.",
   "message.page-not-found": "الصفحة غير موجودة.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "سيتم اعادة تعيين كافة الإحصائيات لهذا الموقع، لكن لن يتم تعيير كود التتبع",
@@ -184,12 +210,8 @@
   "message.share-url": "هذا الرابط الذي تم مشاركته بشكل عام لـ {target}.",
   "message.team-already-member": "أنت عضو في المجموعة",
   "message.team-not-found": "لم يتم العثور على المجموعة",
+  "message.team-websites-info": "يمكن مشاهدة الموقع من اي عضو في المجموعة.",
   "message.tracking-code": "كود التتبع",
   "message.user-deleted": "تم حذف المستخدم.",
-  "message.visitor-log": "زائر من {country} يستخدم {browser} على {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "هذه المجموعة ليس لديه اي موقع.",
-  "message.no-websites-configured": "لم تقم بإعداد اي موقع.",
-  "message.team-websites-info": "يمكن مشاهدة الموقع من اي عضو في المجموعة.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "زائر من {country} يستخدم {browser} على {os} {device}"
 }
diff --git a/lang/be-BY.json b/src/lang/be-BY.json
similarity index 81%
rename from lang/be-BY.json
rename to src/lang/be-BY.json
index bd14d98f3..dc0be21d5 100644
--- a/lang/be-BY.json
+++ b/src/lang/be-BY.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "Дадаць сайт",
   "label.admin": "Адміністратар",
+  "label.after": "After",
   "label.all": "Усё",
   "label.all-time": "Увесь час",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Сярэдняя даўжыня наведвання",
   "label.back": "Назад",
+  "label.before": "Before",
   "label.bounce-rate": "Паказчык адмоваў",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Браўзеры",
   "label.cancel": "Адмена",
   "label.change-password": "Змяніць пароль",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Падцвердзіць пароль",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Краіны",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +38,21 @@
   "label.custom-range": "Карыстацкі дыяпазон",
   "label.dashboard": "Інфармацыйная панэль",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Дыяпазон дат",
+  "label.day": "Day",
   "label.default-date-range": "Дыяпазон дат па змаўчанню",
   "label.delete": "Выдаліць",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Выдаліць сайт",
+  "label.description": "Description",
   "label.desktop": "Настольны ПК",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Прылады",
   "label.dismiss": "Адмена",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Дамен",
   "label.dropoff": "Dropoff",
   "label.edit": "Змяніць",
@@ -46,12 +61,23 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Падзеі",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
+  "label.filter": "Filter",
   "label.filter-combined": "Камбініаваны",
   "label.filter-raw": "Сырыя",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Мова",
@@ -61,17 +87,25 @@
   "label.last-hours": "Апошнія {x} гадзіны",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Login",
   "label.logout": "Выйсці",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Мабільны",
   "label.more": "Болей",
+  "label.my-websites": "My websites",
   "label.name": "Імя",
   "label.new-password": "Новы пароль",
   "label.none": "Няма",
-  "label.operating-systems": "Аперацыонныя сістэмы",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Уласнік",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Прагляды старонкі",
+  "label.pageTitle": "Page title",
   "label.pages": "Старонкі",
   "label.password": "Пароль",
   "label.powered-by": "Зроблена {name}",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "У рэяльным часе",
+  "label.referrer": "Referrer",
   "label.referrers": "Referrers",
   "label.refresh": "Аднавіць",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Абавязкова",
   "label.reset": "Скінуць",
   "label.reset-website": "Скінуць статыстыку",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Захаваць",
   "label.screens": "Экраны",
+  "label.search": "Search",
   "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Налады",
   "label.share-url": "Падзяліцца спасылкай",
   "label.single-day": "Адзін дзень",
+  "label.sum": "Sum",
   "label.tablet": "Планшэт",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Тэма",
   "label.this-month": "Гэты месяц",
@@ -114,14 +156,21 @@
   "label.title": "Title",
   "label.today": "Сёння",
   "label.toggle-charts": "Пераключыць графікі",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Код адсочвання",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Унікальныя наведвальнікі",
   "label.unknown": "Невядома",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Імя карыстальніка",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Пабачыць дэталі",
   "label.view-only": "View only",
@@ -132,33 +181,6 @@
   "label.websites": "Сайты",
   "label.window": "Window",
   "label.yesterday": "Учора",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} тякучых {x, plural, one {наведвальнік} other {наведвальнікаў}}",
   "message.confirm-delete": "Вы дакладна хочаце выдаліць {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "Некарэктны username/password.",
   "message.invalid-domain": "Некарэктны дамен",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Няма дадзеных.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Паролі не супадаюць",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "Вы не наладзілі ніводнага сайту.",
   "message.page-not-found": "Старонка не знойдзена.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Уся статыстыка для гэтага сайту будзе выдалена, але код адсочвання будзе працягваць працаваць.",
@@ -184,12 +210,8 @@
   "message.share-url": "Гэта публічная спасылка для {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Код адсочвання",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Наведвальнік з {country} праз {browser} на {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "Вы не наладзілі ніводнага сайту.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Наведвальнік з {country} праз {browser} на {os} {device}"
 }
diff --git a/lang/bn-BD.json b/src/lang/bn-BD.json
similarity index 82%
rename from lang/bn-BD.json
rename to src/lang/bn-BD.json
index 01069f923..201157ac1 100644
--- a/lang/bn-BD.json
+++ b/src/lang/bn-BD.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "ওয়েবসাইট যুক্ত করুন",
   "label.admin": "অ্যাডমিন",
+  "label.after": "After",
   "label.all": "সবগুলো",
   "label.all-time": "সব সময়",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "গড় পরিদর্শনের সময়",
   "label.back": "পেছনে",
+  "label.before": "Before",
   "label.bounce-rate": "বহিষ্কারের হার",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "ব্রাউজার",
   "label.cancel": "বাতিল",
   "label.change-password": "পাসওয়ার্ড পরিবর্তন করুন",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "পাসওয়ার্ড নিশ্চিত করুন",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "দেশ",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +38,21 @@
   "label.custom-range": "কাস্টম রেঞ্জ",
   "label.dashboard": "ড্যাশবোর্ড",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "তারিখের পরিসীমা",
+  "label.day": "Day",
   "label.default-date-range": "ডিফল্ট তারিখের পরিসীমা",
   "label.delete": "মুছে ফেলুন",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "ওয়েবসাইট মুছুন",
+  "label.description": "Description",
   "label.desktop": "ডেস্কটপ",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "ডিভাইস গুলো",
   "label.dismiss": "বাতিল",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "ডোমেইন",
   "label.dropoff": "Dropoff",
   "label.edit": "সম্পাদনা করুন",
@@ -46,12 +61,23 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "ঘটনা",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
+  "label.filter": "Filter",
   "label.filter-combined": "সম্মিলিত",
   "label.filter-raw": "অপরিশোধিত",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "ভাষা",
@@ -61,17 +87,25 @@
   "label.last-hours": "শেষ {x} ঘন্টা",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "লগিন",
   "label.logout": "লগ আউট",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "মুঠোফোন",
   "label.more": "আরও",
+  "label.my-websites": "My websites",
   "label.name": "নাম",
   "label.new-password": "নতুন পাসওয়ার্ড",
   "label.none": "কিছুই না",
-  "label.operating-systems": "অপারেটিং সিস্টেম গুলো",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "মালিক",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "পৃষ্ঠা পরিদর্শন গুলো",
+  "label.pageTitle": "Page title",
   "label.pages": "পৃষ্ঠাগুলি",
   "label.password": "পাসওয়ার্ড",
   "label.powered-by": "{name} দ্বারা চালিত",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "সরাসরি",
+  "label.referrer": "Referrer",
   "label.referrers": "রেফারার্স",
   "label.refresh": "রিফ্রেশ",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "প্রয়োজনীয়",
   "label.reset": "রিসেট",
   "label.reset-website": "ওয়েবসাইট রিসেট করুন",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "সংরক্ষণ",
   "label.screens": "স্ক্রিনগুলি",
+  "label.search": "Search",
   "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "সেটিংস",
   "label.share-url": "ইউআরএল শেয়ার করুন",
   "label.single-day": "একদিন",
+  "label.sum": "Sum",
   "label.tablet": "ট্যাবলেট",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "থিম",
   "label.this-month": "এই মাস",
@@ -114,14 +156,21 @@
   "label.title": "Title",
   "label.today": "আজ",
   "label.toggle-charts": "চার্ট পরিবর্তন করুন",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "ট্র্যাকিং কোড",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "অনন্য ভিজিটর",
   "label.unknown": "অজানা",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "ব্যবহারকারীর নাম",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "বিস্তারিত দেখুন",
   "label.view-only": "View only",
@@ -132,33 +181,6 @@
   "label.websites": "সবগুলো ওয়েবসাইট",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} বর্তমান  {x, plural, one {visitor} other {visitors}}",
   "message.confirm-delete": "আপনি কি নিশ্চিত যে আপনি {target} মুছতে চান?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "ভুল ব্যবহারকারীর নাম/পাসওয়ার্ড।",
   "message.invalid-domain": "ভুল ডোমেন",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "কোন তথ্য নেই।",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "পাসওয়ার্ড মেলে না",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "কোনও ওয়েবসাইট কনফিগার করা নেই।",
   "message.page-not-found": "পৃষ্ঠা খুঁজে পাওয়া যায়নি।",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "এই ওয়েবসাইটের সমস্ত পরিসংখ্যান মুছে ফেলা হবে, তবে আপনার ট্র্যাকিং কোডটি অক্ষত থাকবে।",
@@ -184,12 +210,8 @@
   "message.share-url": "এটি {target} এর জন্য প্রকাশ্যে শেয়ার করার ইউআরএল।",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "ট্র্যাকিং কোড",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "{country} থেকে একজন ভিসিটর {ব্রাউজার}, ব্যবহার করছেন {os} {device} এর মধ্যে।",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "কোনও ওয়েবসাইট কনফিগার করা নেই।",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "{country} থেকে একজন ভিসিটর {ব্রাউজার}, ব্যবহার করছেন {os} {device} এর মধ্যে।"
 }
diff --git a/lang/ca-ES.json b/src/lang/ca-ES.json
similarity index 79%
rename from lang/ca-ES.json
rename to src/lang/ca-ES.json
index e5ca7ac89..e55d90da4 100644
--- a/lang/ca-ES.json
+++ b/src/lang/ca-ES.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "Afegeix lloc web",
   "label.admin": "Administrador",
+  "label.after": "After",
   "label.all": "Tots",
   "label.all-time": "Sempre",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Temps mitjà de visita",
   "label.back": "Enrere",
+  "label.before": "Before",
   "label.bounce-rate": "Percentatge de rebot",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Navegadors",
   "label.cancel": "Cancel·la",
   "label.change-password": "Canvia la contrasenya",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Confirma la contrasenya",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Països",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +38,21 @@
   "label.custom-range": "Rang personalitzat",
   "label.dashboard": "Panell",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Interval de dates",
+  "label.day": "Day",
   "label.default-date-range": "Interval de dates per defecte",
   "label.delete": "Esborra",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Esborra el lloc web",
+  "label.description": "Description",
   "label.desktop": "Escriptori",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Dispositius",
   "label.dismiss": "Descarta",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Domini",
   "label.dropoff": "Dropoff",
   "label.edit": "Edita",
@@ -46,12 +61,23 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Esdeveniments",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
+  "label.filter": "Filter",
   "label.filter-combined": "Combinat",
   "label.filter-raw": "En cru",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +87,25 @@
   "label.last-hours": "Últimes {x} hores",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Connecta't",
   "label.logout": "Desconnecta't",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Mòbil",
   "label.more": "Més",
+  "label.my-websites": "My websites",
   "label.name": "Nom",
   "label.new-password": "Contrasenya nova",
   "label.none": "None",
-  "label.operating-systems": "Sistemes operatius",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Propietari",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Pàgines vistes",
+  "label.pageTitle": "Page title",
   "label.pages": "Pàgines",
   "label.password": "Contrasenya",
   "label.powered-by": "Funciona amb {name}",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Temps real",
+  "label.referrer": "Referrer",
   "label.referrers": "Referents",
   "label.refresh": "Refresca",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Obligatori",
   "label.reset": "Restableix",
   "label.reset-website": "Restableix estadístiques",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Desa",
   "label.screens": "Screens",
+  "label.search": "Search",
   "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Configuració",
   "label.share-url": "Enllaç per compartir",
   "label.single-day": "Un sol dia",
+  "label.sum": "Sum",
   "label.tablet": "Tauleta",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "Aquest mes",
@@ -114,14 +156,21 @@
   "label.title": "Title",
   "label.today": "Avui",
   "label.toggle-charts": "Mostra/amaga gràfics",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Codi de seguiment",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Visitants únics",
   "label.unknown": "Desconegut",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Nom d'usuari",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Veure els detalls",
   "label.view-only": "View only",
@@ -132,33 +181,6 @@
   "label.websites": "Llocs web",
   "label.window": "Window",
   "label.yesterday": "Ahir",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} {x, plural, one {visitant actual} other {visitants actuals}}",
   "message.confirm-delete": "Segur que vols esborrar {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "Nom d'usuari o contrasenya incorrectes.",
   "message.invalid-domain": "Domini invàlid",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "No hi ha dades disponibles.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Les contrasenyes no coincideixen",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "No hi ha cap lloc web configurat.",
   "message.page-not-found": "No s'ha trobat la pàgina.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "S'esborraran totes les estadístiques per aquest lloc web, però el codi de seguiment es mantindrà.",
@@ -184,12 +210,8 @@
   "message.share-url": "Aquest és l'enllaç públic per compartir de {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Codi de seguiment",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Visitant de {country} usant {browser} a {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "No hi ha cap lloc web configurat.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Visitant de {country} usant {browser} a {os} {device}"
 }
diff --git a/lang/cs-CZ.json b/src/lang/cs-CZ.json
similarity index 78%
rename from lang/cs-CZ.json
rename to src/lang/cs-CZ.json
index 633004504..86f2043a8 100644
--- a/lang/cs-CZ.json
+++ b/src/lang/cs-CZ.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "Přidat web",
   "label.admin": "Administrátor",
+  "label.after": "After",
   "label.all": "Vše",
   "label.all-time": "All time",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Průměrný čas návštěvy",
   "label.back": "Zpět",
+  "label.before": "Before",
   "label.bounce-rate": "Okamžité opuštění",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Prohlížeč",
   "label.cancel": "Zrušit",
   "label.change-password": "Změnit heslo",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Potvrdit heslo",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Země",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +38,21 @@
   "label.custom-range": "Vlastní rozsah",
   "label.dashboard": "Přehled",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Období",
+  "label.day": "Day",
   "label.default-date-range": "Výchozí období",
   "label.delete": "Smazat",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Smazat web",
+  "label.description": "Description",
   "label.desktop": "Stolní počítač",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Zařízení",
   "label.dismiss": "Odejít",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Doména",
   "label.dropoff": "Dropoff",
   "label.edit": "Upravit",
@@ -46,12 +61,23 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Události",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
+  "label.filter": "Filter",
   "label.filter-combined": "Kombinace",
   "label.filter-raw": "Nezpracované",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +87,25 @@
   "label.last-hours": "Posledních {x} hodin",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Přihlásit",
   "label.logout": "Odhlásit",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Mobilní telefon",
   "label.more": "Více",
+  "label.my-websites": "My websites",
   "label.name": "Jméno",
   "label.new-password": "Nové heslo",
   "label.none": "None",
-  "label.operating-systems": "Operační systém",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Owner",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Zobrazení stránek",
+  "label.pageTitle": "Page title",
   "label.pages": "Stránky",
   "label.password": "Heslo",
   "label.powered-by": "Běží na {name}",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Aktuálně",
+  "label.referrer": "Referrer",
   "label.referrers": "Odkazy",
   "label.refresh": "Obnovit",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Vyžadováno",
   "label.reset": "Reset",
   "label.reset-website": "Reset statistics",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Uložit",
   "label.screens": "Screens",
+  "label.search": "Search",
   "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Nastavení",
   "label.share-url": "Sdílet URL",
   "label.single-day": "Jeden den",
+  "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "Tento měsíc",
@@ -114,14 +156,21 @@
   "label.title": "Title",
   "label.today": "Dnes",
   "label.toggle-charts": "Toggle charts",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Sledovací kód",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Jedinečné návštěvy",
   "label.unknown": "Neznámý",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Uživatelské jméno",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Zobrazit detaily",
   "label.view-only": "View only",
@@ -132,33 +181,6 @@
   "label.websites": "Weby",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} aktuálně {x, plural, one {návštěvník} other {návštěvníci}}",
   "message.confirm-delete": "Opravdu smazat {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "Nesprávné jméno/heslo.",
   "message.invalid-domain": "Neplatná doména",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Žádná data.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Hesla se neschodují",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "Nemáte nastavený žádný web.",
   "message.page-not-found": "Stránka nenalezena.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.",
@@ -184,12 +210,8 @@
   "message.share-url": "Toto je sdílené URL pro {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Sledovací kód",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Návštěvník z {country} s prohlížečem {browser} na {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "Nemáte nastavený žádný web.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Návštěvník z {country} s prohlížečem {browser} na {os} {device}"
 }
diff --git a/lang/da-DK.json b/src/lang/da-DK.json
similarity index 78%
rename from lang/da-DK.json
rename to src/lang/da-DK.json
index cd2a1126c..8df7dd6bf 100644
--- a/lang/da-DK.json
+++ b/src/lang/da-DK.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "Tilføj hjemmeside",
   "label.admin": "Administrator",
+  "label.after": "After",
   "label.all": "Alle",
   "label.all-time": "Altid",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Gennemsnitlig besøgstid",
   "label.back": "Tilbage",
+  "label.before": "Before",
   "label.bounce-rate": "Afvisningsprocent",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Browsere",
   "label.cancel": "Afvis",
   "label.change-password": "Skift adgangskode",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Godkendt adgangskode",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Lande",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +38,21 @@
   "label.custom-range": "Tilpasset interval",
   "label.dashboard": "Betjeningspanel",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Datointerval",
+  "label.day": "Day",
   "label.default-date-range": "Standard datointerval",
   "label.delete": "Slet",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Slet hjemmeside",
+  "label.description": "Description",
   "label.desktop": "Desktop",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Enheder",
   "label.dismiss": "Afvis",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Domæne",
   "label.dropoff": "Dropoff",
   "label.edit": "Rediger",
@@ -46,12 +61,23 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Hændelser",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
+  "label.filter": "Filter",
   "label.filter-combined": "Kombineret",
   "label.filter-raw": "Rå",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Sprog",
@@ -61,17 +87,25 @@
   "label.last-hours": "Sidste {x} timer",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Log ind",
   "label.logout": "Log ud",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Mobil",
   "label.more": "Mere",
+  "label.my-websites": "My websites",
   "label.name": "Navn",
   "label.new-password": "Ny adgangskode",
   "label.none": "None",
-  "label.operating-systems": "Operativsystemer",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Ejer",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Sidevisninger",
+  "label.pageTitle": "Page title",
   "label.pages": "Sider",
   "label.password": "Adgangskode",
   "label.powered-by": "Drevet af {name}",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Realtid",
+  "label.referrer": "Referrer",
   "label.referrers": "Henvisninger",
   "label.refresh": "Opdater",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Påkrævet",
   "label.reset": "Nulstil",
   "label.reset-website": "Nulstil statistikker",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Gem",
   "label.screens": "Screens",
+  "label.search": "Search",
   "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Indstillinger",
   "label.share-url": "Del URL",
   "label.single-day": "Enkelt dag",
+  "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Tema",
   "label.this-month": "Denne måned",
@@ -114,14 +156,21 @@
   "label.title": "Title",
   "label.today": "Idag",
   "label.toggle-charts": "Ændre graf",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Sporingskode",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Unikke besøgende",
   "label.unknown": "Ukendt",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Brugernavn",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Vis detajler",
   "label.view-only": "View only",
@@ -132,33 +181,6 @@
   "label.websites": "Hjemmesider",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} nuværende {x, plural, one {bruger} other {brugere}}",
   "message.confirm-delete": "Er du sikker på at du vil slette {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "Ugyldigt brugernavn/adgangskode.",
   "message.invalid-domain": "Ugyldigt domæne",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Ingen data tilgængelig.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Adgangskoderne matcher ikke",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "Du har ikke konfigureret nogen hjemmesider.",
   "message.page-not-found": "Side ikke fundet.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Alle statistikker for denne hjemmeside ville blive slettet, men sporingskode ville forblive intakt.",
@@ -184,12 +210,8 @@
   "message.share-url": "Dette er den offentlige delings-URL til {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Sporingskode",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Besøgende fra {country} bruger {browser} på {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "Du har ikke konfigureret nogen hjemmesider.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Besøgende fra {country} bruger {browser} på {os} {device}"
 }
diff --git a/lang/de-CH.json b/src/lang/de-CH.json
similarity index 79%
rename from lang/de-CH.json
rename to src/lang/de-CH.json
index 7ea503b0a..95ba3b6a8 100644
--- a/lang/de-CH.json
+++ b/src/lang/de-CH.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "Websiite hinzuefüege",
   "label.admin": "Administrator",
+  "label.after": "After",
   "label.all": "Alli",
   "label.all-time": "Gesamte Zitruum",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Durchschn. Bsuechsziit",
   "label.back": "Zrugg",
+  "label.before": "Before",
   "label.bounce-rate": "Absprungsrate",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Browser",
   "label.cancel": "Abbreche",
   "label.change-password": "Passwort ändere",
   "label.cities": "Städt",
+  "label.city": "City",
   "label.clear-all": "Alles lösche",
   "label.confirm": "Bestätige",
   "label.confirm-password": "Passwort widerhole",
+  "label.contains": "Contains",
   "label.continue": "Wiiter",
   "label.countries": "Länder",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Create report",
   "label.create-team": "Team erstelle",
   "label.create-user": "Benutzer erstelle",
   "label.created": "Erstellt",
@@ -28,16 +38,21 @@
   "label.custom-range": "Benutzerdefinierte Bereich",
   "label.dashboard": "Übersicht",
   "label.data": "Datä",
+  "label.date": "Date",
   "label.date-range": "Datumsbereich",
+  "label.day": "Day",
   "label.default-date-range": "Vorigstellte Datumsbereich",
   "label.delete": "Lösche",
   "label.delete-team": "Team lösche",
   "label.delete-user": "Benutzer lösche",
   "label.delete-website": "Websiite lösche",
+  "label.description": "Description",
   "label.desktop": "Desktop",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Grät",
   "label.dismiss": "Verwerfe",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Domain",
   "label.dropoff": "Dropoff",
   "label.edit": "Bearbeite",
@@ -46,12 +61,23 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Ereigniss",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
+  "label.filter": "Filter",
   "label.filter-combined": "Kombiniert",
   "label.filter-raw": "Rohdate",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Biträte",
   "label.join-team": "Team biträte",
   "label.language": "Sprach",
@@ -61,17 +87,25 @@
   "label.last-hours": "Letzti {x} Stunde",
   "label.leave": "Verlah",
   "label.leave-team": "Team verlah",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Aamelde",
   "label.logout": "Abmelde",
+  "label.max": "Max",
   "label.members": "Mitglieder",
+  "label.min": "Min",
   "label.mobile": "Handy",
   "label.more": "Meh",
+  "label.my-websites": "My websites",
   "label.name": "Name",
   "label.new-password": "Neus Passwort",
   "label.none": "Keis",
-  "label.operating-systems": "Betriibssystem",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Bsitzer",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Siitenufrüef",
+  "label.pageTitle": "Page title",
   "label.pages": "Siite",
   "label.password": "Passwort",
   "label.powered-by": "Betribe dur {name}",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "Abfragparameter",
   "label.realtime": "Echtzit",
+  "label.referrer": "Referrer",
   "label.referrers": "Referrer",
   "label.refresh": "Aktualisiere",
   "label.regenerate": "Erneuere",
+  "label.region": "Region",
   "label.regions": "Regionä",
   "label.remove": "Entferne",
   "label.reports": "Reports",
   "label.required": "Erforderlich",
   "label.reset": "Zruggsetze",
   "label.reset-website": "Statistik zruggsetze",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Rollä",
   "label.run-query": "Run query",
   "label.save": "Speichere",
   "label.screens": "Bildschirmuflösige",
+  "label.search": "Search",
   "label.select-date": "Select date",
   "label.select-website": "Websiite uuswähle",
   "label.sessions": "Sessions",
   "label.settings": "Istellige",
   "label.share-url": "Freigab-URL",
   "label.single-day": "Ein Tag",
+  "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-guest": "Team Gast",
   "label.team-id": "Team ID",
   "label.team-member": "Team Mitglied",
+  "label.team-name": "Team name",
   "label.team-owner": "Team Bsitzer",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Thema",
   "label.this-month": "De Monet",
@@ -114,14 +156,21 @@
   "label.title": "Titel",
   "label.today": "Hüt",
   "label.toggle-charts": "Schaubilder umschalte",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Tracking Code",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Eidütigi Bsuecher",
   "label.unknown": "Unbekannt",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Benutzer",
   "label.username": "Benutzername",
   "label.users": "Benutzer",
+  "label.value": "Value",
   "label.view": "Azeige",
   "label.view-details": "Details azeige",
   "label.view-only": "View only",
@@ -132,33 +181,6 @@
   "label.websites": "Websiite",
   "label.window": "Window",
   "label.yesterday": "Gester",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} {x, plural, one {aktive Bsuecher} other {aktivi Bsuecher}}",
   "message.confirm-delete": "Sind Sie sich sicher, {target} zlösche?",
   "message.confirm-leave": "Sind Sie sich sicher, {target} zverlah?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "Falschs Passwort oder Benutzername.",
   "message.invalid-domain": "Ungültigi Domain",
   "message.min-password-length": "Miminamli längi vo {n} Zeiche",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Kei Date vorhande.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Passwörter stimmed ned überi",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "Dem Team sind kei Websiite zuegordnet.",
   "message.no-teams": "Bisher sind no kei Teams erstellt worde.",
   "message.no-users": "Da gits kei Benutzer",
+  "message.no-websites-configured": "Es isch kei Websiite vorhande.",
   "message.page-not-found": "Siite ned gfunde.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Alli Date für die Websiite werdet glöscht, nur de Tracking Code blibt bestah.",
@@ -184,12 +210,8 @@
   "message.share-url": "Ihri Websiitestatistik isch under de folgende URL öffentlich zuegänglich:",
   "message.team-already-member": "Sie sind bereits es Mitglied vo dem Team.",
   "message.team-not-found": "Team nöd gfunde.",
+  "message.team-websites-info": "Websiite chönd vo jedem im Team agluegt werde",
   "message.tracking-code": "Tracking Code",
   "message.user-deleted": "Benutzer glöscht.",
-  "message.visitor-log": "Bsuecher us {country} benutzt {browser} uf {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "Dem Team sind kei Websiite zuegordnet.",
-  "message.no-websites-configured": "Es isch kei Websiite vorhande.",
-  "message.team-websites-info": "Websiite chönd vo jedem im Team agluegt werde",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Bsuecher us {country} benutzt {browser} uf {os} {device}"
 }
diff --git a/lang/de-DE.json b/src/lang/de-DE.json
similarity index 61%
rename from lang/de-DE.json
rename to src/lang/de-DE.json
index b09f47ab2..1e98b14cc 100644
--- a/lang/de-DE.json
+++ b/src/lang/de-DE.json
@@ -2,25 +2,35 @@
   "label.access-code": "Zugangscode",
   "label.actions": "Aktionen",
   "label.activity-log": "Aktivitätsverlauf",
-  "label.add": "Add",
+  "label.add": "Hinzufügen",
   "label.add-description": "Beschreibung hinzufügen",
-  "label.add-website": "Webseite hinzufügen",
+  "label.add-website": "Website hinzufügen",
   "label.admin": "Administrator",
+  "label.after": "Nach",
   "label.all": "Alle",
   "label.all-time": "Gesamter Zeitraum",
   "label.analytics": "Analytics",
+  "label.average": "Durchschnitt",
   "label.average-visit-time": "Durchschn. Besuchszeit",
   "label.back": "Zurück",
+  "label.before": "Vor",
   "label.bounce-rate": "Absprungrate",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Browser",
   "label.cancel": "Abbrechen",
   "label.change-password": "Passwort ändern",
   "label.cities": "Städte",
+  "label.city": "Stadt",
   "label.clear-all": "Alles löschen",
   "label.confirm": "Bestätigen",
   "label.confirm-password": "Passwort wiederholen",
+  "label.contains": "Enthält",
   "label.continue": "Weiter",
   "label.countries": "Länder",
+  "label.country": "Land",
+  "label.create": "Create",
+  "label.create-report": "Bericht erstellen",
   "label.create-team": "Team erstellen",
   "label.create-user": "Benutzer erstellen",
   "label.created": "Erstellt",
@@ -28,30 +38,46 @@
   "label.custom-range": "Benutzerdefinierter Bereich",
   "label.dashboard": "Übersicht",
   "label.data": "Daten",
+  "label.date": "Datum",
   "label.date-range": "Datumsbereich",
+  "label.day": "Tag",
   "label.default-date-range": "Voreingestellter Datumsbereich",
   "label.delete": "Löschen",
   "label.delete-team": "Team löschen",
   "label.delete-user": "Benutzer löschen",
-  "label.delete-website": "Webseite löschen",
+  "label.delete-website": "Website löschen",
+  "label.description": "Beschreibung",
   "label.desktop": "Desktop",
   "label.details": "Details",
+  "label.device": "Gerät",
   "label.devices": "Geräte",
   "label.dismiss": "Verwerfen",
+  "label.does-not-contain": "Enthält nicht",
   "label.domain": "Domain",
   "label.dropoff": "Dropoff",
   "label.edit": "Bearbeiten",
   "label.edit-dashboard": "Dashboard bearbeiten",
   "label.enable-share-url": "Freigabe-URL aktivieren",
   "label.event": "Event",
-  "label.event-data": "Event daten",
+  "label.event-data": "Eventdaten",
   "label.events": "Ereignisse",
-  "label.field": "Field",
-  "label.fields": "Fields",
+  "label.false": "Falsch",
+  "label.field": "Feld",
+  "label.fields": "Felder",
+  "label.filter": "Filter",
   "label.filter-combined": "Kombiniert",
   "label.filter-raw": "Rohdaten",
+  "label.filters": "Filter",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Größer als",
+  "label.greater-than-equals": "Größer oder gleich",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Ist",
+  "label.is-not": "Ist nicht",
+  "label.is-not-set": "Ist nicht gesetzt",
+  "label.is-set": "Ist gesetzt",
   "label.join": "Beitreten",
   "label.join-team": "Team beitreten",
   "label.language": "Sprache",
@@ -61,17 +87,25 @@
   "label.last-hours": "Letzte {x} Stunden",
   "label.leave": "Verlassen",
   "label.leave-team": "Team verlassen",
+  "label.less-than": "Kleiner als",
+  "label.less-than-equals": "Kleiner oder gleich",
   "label.login": "Anmelden",
   "label.logout": "Abmelden",
+  "label.max": "Max",
   "label.members": "Mitglieder",
+  "label.min": "Min",
   "label.mobile": "Handy",
   "label.more": "Mehr",
+  "label.my-websites": "Meine Websites",
   "label.name": "Name",
   "label.new-password": "Neues Passwort",
   "label.none": "Keine",
-  "label.operating-systems": "Betriebssysteme",
+  "label.os": "OS",
+  "label.overview": "Übersicht",
   "label.owner": "Besitzer",
+  "label.page-of": "Seite {current} von {total}",
   "label.page-views": "Seitenaufrufe",
+  "label.pageTitle": "Seitentitel",
   "label.pages": "Seiten",
   "label.password": "Passwort",
   "label.powered-by": "Betrieben durch {name}",
@@ -80,31 +114,39 @@
   "label.query": "Abfrage",
   "label.query-parameters": "Abfrageparameter",
   "label.realtime": "Echtzeit",
+  "label.referrer": "Referrer",
   "label.referrers": "Referrer",
   "label.refresh": "Aktualisieren",
   "label.regenerate": "Erneuern",
+  "label.region": "Region",
   "label.regions": "Regionen",
   "label.remove": "Entfernen",
-  "label.reports": "Reporte",
+  "label.reports": "Berichte",
   "label.required": "Erforderlich",
   "label.reset": "Zurücksetzen",
   "label.reset-website": "Statistik zurücksetzen",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Rolle",
   "label.run-query": "Abfrage starten",
   "label.save": "Speichern",
   "label.screens": "Bildschirmauflösungen",
+  "label.search": "Search",
   "label.select-date": "Datum auswählen",
   "label.select-website": "Website auswählen",
-  "label.sessions": "Sessions",
+  "label.sessions": "Sitzungen",
   "label.settings": "Einstellungen",
   "label.share-url": "Freigabe-URL",
   "label.single-day": "Ein Tag",
+  "label.sum": "Summe",
   "label.tablet": "Tablet",
   "label.team": "Team",
-  "label.team-guest": "Team Gast",
-  "label.team-id": "Team ID",
-  "label.team-member": "Team Mitglied",
-  "label.team-owner": "Team Eigentümer",
+  "label.team-guest": "Gast des Teams",
+  "label.team-id": "Team-ID",
+  "label.team-member": "Team-Mitglied",
+  "label.team-name": "Name des Teams",
+  "label.team-owner": "Team-Eigentümer",
+  "label.team-websites": "Team-Websites",
   "label.teams": "Teams",
   "label.theme": "Thema",
   "label.this-month": "Diesen Monat",
@@ -114,82 +156,62 @@
   "label.title": "Titel",
   "label.today": "Heute",
   "label.toggle-charts": "Schaubilder umschalten",
+  "label.total": "Gesamt",
+  "label.total-records": "Datensätze insgesamt",
   "label.tracking-code": "Tracking Code",
+  "label.true": "Wahr",
+  "label.type": "Typ",
+  "label.unique": "Eindeutig",
   "label.unique-visitors": "Eindeutige Besucher",
   "label.unknown": "Unbekannt",
+  "label.untitled": "Unbenannt",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Benutzer",
   "label.username": "Benutzername",
   "label.users": "Benutzer",
+  "label.value": "Wert",
   "label.view": "Anzeigen",
   "label.view-details": "Details anzeigen",
-  "label.view-only": "View only",
+  "label.view-only": "Nur ansehen",
   "label.views": "Aufrufe",
   "label.visitors": "Besucher",
-  "label.website": "Webseite",
-  "label.website-id": "Webseite ID",
-  "label.websites": "Webseiten",
-  "label.window": "Window",
+  "label.website": "Website",
+  "label.website-id": "Website ID",
+  "label.websites": "Websites",
+  "label.window": "Fenster",
   "label.yesterday": "Gestern",
-  "labels.after": "After",
-  "labels.average": "Durchschnitt",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Report erstellen",
-  "labels.description": "Beschreibung",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Größer als",
-  "labels.greater-than-equals": "Größer oder gleich",
-  "labels.less-than": "Kleiner als",
-  "labels.less-than-equals": "Kleiner oder gleich",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Übersicht",
-  "labels.sum": "Summe",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} {x, plural, one {aktiver Besucher} other {aktive Besucher}}",
   "message.confirm-delete": "Sind Sie sich sicher, {target} zu löschen?",
   "message.confirm-leave": "Sind Sie sicher, dass die {target} verlassen möchten?",
   "message.confirm-reset": "Sind Sie sicher, dass Sie die Statistiken von {target} zurücksetzen wollen?",
-  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
+  "message.delete-account": "Um dieses Konto zu löschen, geben Sie zur Bestätigung {confirmation} in das Feld unten ein.",
+  "message.delete-website": "Um diese Website zu löschen, geben Sie zur Bestätigung {confirmation} in das Feld unten ein.",
   "message.delete-website-warning": "Alle zugehörigen Daten werden ebenfalls gelöscht.",
   "message.error": "Es ist ein Fehler aufgetreten.",
   "message.event-log": "{event} auf {url}",
   "message.go-to-settings": "Zu den Einstellungen",
   "message.incorrect-username-password": "Falsches Passwort oder Benutzername.",
   "message.invalid-domain": "Ungültige Domain",
-  "message.min-password-length": "Minimale länge von {n} Zeichen",
+  "message.min-password-length": "Minimale Länge von {n} Zeichen",
+  "message.new-version-available": "Eine neue Version von Umami ist verfügbar: {version}",
   "message.no-data-available": "Keine Daten vorhanden.",
-  "message.no-event-data": "No event data is available.",
+  "message.no-event-data": "Es sind keine Ereignisdaten verfügbar.",
   "message.no-match-password": "Passwörter stimmen nicht überein",
-  "message.no-teams": "Bisher wurden keine Teams erstellt.",
-  "message.no-users": "Hier gibt es keine Benutzer.",
-  "message.page-not-found": "Seite nicht gefunden.",
-  "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
-  "message.reset-website-warning": "Alle Daten für diese Webseite werden gelöscht, jedoch bleibt der Tracking Code bestehen.",
-  "message.saved": "Erfolgreich gespeichert.",
-  "message.share-url": "Ihre Webseitenstatistik ist unter der folgenden URL öffentlich zugänglich:",
-  "message.team-already-member": "Sie sind bereits Mitglied des Teams.",
-  "message.team-not-found": "Team nicht gefunden.",
-  "message.tracking-code": "Tracking Code",
-  "message.user-deleted": "Benutzer gelöscht.",
-  "message.visitor-log": "Besucher aus {country} benutzt {browser} auf {os} {device}",
   "message.no-results-found": "Keine Ergebnisse gefunden.",
   "message.no-team-websites": "Diesem Team sind keine Websites zugeordnet.",
-  "message.no-websites-configured": "Es ist keine Webseite vorhanden.",
-  "message.team-websites-info": "Webseiten können von jedem im Team eingesehen werden.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.no-teams": "Bisher wurden keine Teams erstellt.",
+  "message.no-users": "Hier gibt es keine Benutzer.",
+  "message.no-websites-configured": "Es ist keine Website vorhanden.",
+  "message.page-not-found": "Seite nicht gefunden.",
+  "message.reset-website": "Um diese Website zurückzusetzen, geben Sie zur Bestätigung {confirmation} in das Feld unten ein.",
+  "message.reset-website-warning": "Alle Daten für diese Website werden gelöscht, jedoch bleibt der Tracking Code bestehen.",
+  "message.saved": "Erfolgreich gespeichert.",
+  "message.share-url": "Die Statistiken Ihrer Website sind unter folgender URL öffentlich zugänglich:",
+  "message.team-already-member": "Sie sind bereits Mitglied des Teams.",
+  "message.team-not-found": "Team nicht gefunden.",
+  "message.team-websites-info": "Websites können von jedem im Team eingesehen werden.",
+  "message.tracking-code": "Tracking Code",
+  "message.user-deleted": "Benutzer gelöscht.",
+  "message.visitor-log": "Besucher aus {country} benutzt {browser} auf {os} {device}"
 }
diff --git a/lang/el-GR.json b/src/lang/el-GR.json
similarity index 81%
rename from lang/el-GR.json
rename to src/lang/el-GR.json
index 6d7b1bb4e..f93742fdd 100644
--- a/lang/el-GR.json
+++ b/src/lang/el-GR.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "Προσθήκη ιστότοπου",
   "label.admin": "Διαχειριστής",
+  "label.after": "After",
   "label.all": "All",
   "label.all-time": "All time",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Μέσος χρόνος επίσκεψης",
   "label.back": "Πίσω",
+  "label.before": "Before",
   "label.bounce-rate": "Ποσοστό αναπήδησης",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Προγράμματα περιήγησης",
   "label.cancel": "Ακύρωση",
   "label.change-password": "Αλλαγή κωδικού",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Επιβεβαίωση κωδικού",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Χώρες",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +38,21 @@
   "label.custom-range": "Προσαρμοσμένο εύρος",
   "label.dashboard": "Πίνακας",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Εύρος ημερομηνιών",
+  "label.day": "Day",
   "label.default-date-range": "Προεπιλεγμένο εύρος ημερομηνιών",
   "label.delete": "Διαγραφή",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Διαγραφή ιστότοπου",
+  "label.description": "Description",
   "label.desktop": "Σταθερός υπολογιστής",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Συσκευές",
   "label.dismiss": "Dismiss",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Τομέας",
   "label.dropoff": "Dropoff",
   "label.edit": "Επεξεργασία",
@@ -46,12 +61,23 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Γεγονότα",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
+  "label.filter": "Filter",
   "label.filter-combined": "Σε συνδυασμό",
   "label.filter-raw": "Ακατέργαστο",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +87,25 @@
   "label.last-hours": "Τελευταίες {x} ώρες",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Είσοδος",
   "label.logout": "Αποσύνδεση",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Κινητό",
   "label.more": "Περισσότερα",
+  "label.my-websites": "My websites",
   "label.name": "Όνομα",
   "label.new-password": "Νέος κωδικός",
   "label.none": "None",
-  "label.operating-systems": "Λειτουργικά συστήματα",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Owner",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Προβολές σελίδας",
+  "label.pageTitle": "Page title",
   "label.pages": "Σελίδες",
   "label.password": "Κωδικός",
   "label.powered-by": "Με την υποστήριξη του {name}",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Realtime",
+  "label.referrer": "Referrer",
   "label.referrers": "Παραπομπές",
   "label.refresh": "Ανανέωση",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Απαιτείται",
   "label.reset": "Επαναφορά",
   "label.reset-website": "Reset statistics",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Αποθήκευση",
   "label.screens": "Screens",
+  "label.search": "Search",
   "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Ρυθμίσεις",
   "label.share-url": "Κοινοποίηση διεύθυνσης URL",
   "label.single-day": "Ημερήσια",
+  "label.sum": "Sum",
   "label.tablet": "Τάμπλετ",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "Αυτο το μήνα",
@@ -114,14 +156,21 @@
   "label.title": "Title",
   "label.today": "Σήμερα",
   "label.toggle-charts": "Toggle charts",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Κωδικός παρακολούθησης",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Μοναδικοί επισκέπτες",
   "label.unknown": "Άγνωστο",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Όνομα χρήστη",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Λεπτομέρειες",
   "label.view-only": "View only",
@@ -132,33 +181,6 @@
   "label.websites": "Ιστότοποι",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} ενεργοί {x, plural, one {επισκέπτης} other {επισκέπτες}}",
   "message.confirm-delete": "Είστε βέβαιοι ότι θέλετε να διαγράψετε το {target};",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "Εσφαλμένο όνομα χρήστη / κωδικός πρόσβασης.",
   "message.invalid-domain": "Μη έγκυρος τομέας",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Δεν υπάρχουν διαθέσιμα δεδομένα.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Οι κωδικοί πρόσβασης δεν ταιριάζουν",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "Δεν έχετε ρυθμίσει κανένα ιστότοπο.",
   "message.page-not-found": "Η σελίδα δεν βρέθηκε.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.",
@@ -184,12 +210,8 @@
   "message.share-url": "Αυτό είναι το κοινόχρηστο URL για το {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Κωδικός παρακολούθησης",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Visitor from {country} using {browser} on {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "Δεν έχετε ρυθμίσει κανένα ιστότοπο.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Visitor from {country} using {browser} on {os} {device}"
 }
diff --git a/lang/en-GB.json b/src/lang/en-GB.json
similarity index 78%
rename from lang/en-GB.json
rename to src/lang/en-GB.json
index 33a9e640e..b6cb2c9a3 100644
--- a/lang/en-GB.json
+++ b/src/lang/en-GB.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "Add website",
   "label.admin": "Administrator",
+  "label.after": "After",
   "label.all": "All",
   "label.all-time": "All time",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Average visit time",
   "label.back": "Back",
+  "label.before": "Before",
   "label.bounce-rate": "Bounce rate",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Browsers",
   "label.cancel": "Cancel",
   "label.change-password": "Change password",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Confirm password",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Countries",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +38,21 @@
   "label.custom-range": "Custom range",
   "label.dashboard": "Dashboard",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Date range",
+  "label.day": "Day",
   "label.default-date-range": "Default date range",
   "label.delete": "Delete",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Delete website",
+  "label.description": "Description",
   "label.desktop": "Desktop",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Devices",
   "label.dismiss": "Dismiss",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Domain",
   "label.dropoff": "Dropoff",
   "label.edit": "Edit",
@@ -46,12 +61,23 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Events",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
+  "label.filter": "Filter",
   "label.filter-combined": "Combined",
   "label.filter-raw": "Raw",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +87,25 @@
   "label.last-hours": "Last {x} hours",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Login",
   "label.logout": "Logout",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Mobile",
   "label.more": "More",
+  "label.my-websites": "My websites",
   "label.name": "Name",
   "label.new-password": "New password",
   "label.none": "None",
-  "label.operating-systems": "Operating systems",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Owner",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Page views",
+  "label.pageTitle": "Page title",
   "label.pages": "Pages",
   "label.password": "Password",
   "label.powered-by": "Powered by {name}",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Realtime",
+  "label.referrer": "Referrer",
   "label.referrers": "Referrers",
   "label.refresh": "Refresh",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Required",
   "label.reset": "Reset",
   "label.reset-website": "Reset statistics",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Save",
   "label.screens": "Screens",
+  "label.search": "Search",
   "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Settings",
   "label.share-url": "Share URL",
   "label.single-day": "Single day",
+  "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "This month",
@@ -114,14 +156,21 @@
   "label.title": "Title",
   "label.today": "Today",
   "label.toggle-charts": "Toggle charts",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Tracking code",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Unique visitors",
   "label.unknown": "Unknown",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Username",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "View details",
   "label.view-only": "View only",
@@ -132,33 +181,6 @@
   "label.websites": "Websites",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} current {x, plural, one {visitor} other {visitors}}",
   "message.confirm-delete": "Are you sure you want to delete {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "Incorrect username/password.",
   "message.invalid-domain": "Invalid domain",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "No data available.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Passwords don't match",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "You don't have any websites configured.",
   "message.page-not-found": "Page not found.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.",
@@ -184,12 +210,8 @@
   "message.share-url": "This is the publicly shared URL for {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Tracking code",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Visitor from {country} using {browser} on {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "You don't have any websites configured.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Visitor from {country} using {browser} on {os} {device}"
 }
diff --git a/lang/en-US.json b/src/lang/en-US.json
similarity index 77%
rename from lang/en-US.json
rename to src/lang/en-US.json
index b4daac897..e1d592303 100644
--- a/lang/en-US.json
+++ b/src/lang/en-US.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "Add website",
   "label.admin": "Administrator",
+  "label.after": "After",
   "label.all": "All",
   "label.all-time": "All time",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Average visit time",
   "label.back": "Back",
+  "label.before": "Before",
   "label.bounce-rate": "Bounce rate",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Browsers",
   "label.cancel": "Cancel",
   "label.change-password": "Change password",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Confirm password",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Countries",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +38,21 @@
   "label.custom-range": "Custom range",
   "label.dashboard": "Dashboard",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Date range",
+  "label.day": "Day",
   "label.default-date-range": "Default date range",
   "label.delete": "Delete",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Delete website",
+  "label.description": "Description",
   "label.desktop": "Desktop",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Devices",
   "label.dismiss": "Dismiss",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Domain",
   "label.dropoff": "Dropoff",
   "label.edit": "Edit",
@@ -46,12 +61,23 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Events",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
+  "label.filter": "Filter",
   "label.filter-combined": "Combined",
   "label.filter-raw": "Raw",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +87,25 @@
   "label.last-hours": "Last {x} hours",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Login",
   "label.logout": "Logout",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Mobile",
   "label.more": "More",
+  "label.my-websites": "My websites",
   "label.name": "Name",
   "label.new-password": "New password",
   "label.none": "None",
-  "label.operating-systems": "Operating systems",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Owner",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Page views",
+  "label.pageTitle": "Page title",
   "label.pages": "Pages",
   "label.password": "Password",
   "label.powered-by": "Powered by {name}",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Realtime",
+  "label.referrer": "Referrer",
   "label.referrers": "Referrers",
   "label.refresh": "Refresh",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Required",
   "label.reset": "Reset",
   "label.reset-website": "Reset website",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Save",
   "label.screens": "Screens",
+  "label.search": "Search",
   "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Settings",
   "label.share-url": "Share URL",
   "label.single-day": "Single day",
+  "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "This month",
@@ -114,14 +156,21 @@
   "label.title": "Title",
   "label.today": "Today",
   "label.toggle-charts": "Toggle charts",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Tracking code",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Unique visitors",
   "label.unknown": "Unknown",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Username",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "View details",
   "label.view-only": "View only",
@@ -132,33 +181,6 @@
   "label.websites": "Websites",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} current {x, plural, one {visitor} other {visitors}}",
   "message.confirm-delete": "Are you sure you want to delete {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "Incorrect username and/or password.",
   "message.invalid-domain": "Invalid domain. Do not include http/https.",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "No data available.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Passwords do not match.",
+  "message.no-results-found": "No results found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "You do not have any websites configured.",
   "message.page-not-found": "Page not found",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "All statistics for this website will be deleted, but your settings will remain intact.",
@@ -184,12 +210,8 @@
   "message.share-url": "Your website stats are publically available at the following URL:",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "To track stats for this website, place the following code in the <head>...</head> section of your HTML.",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Visitor from {country} using {browser} on {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "You do not have any websites configured.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Visitor from {country} using {browser} on {os} {device}"
 }
diff --git a/lang/es-ES.json b/src/lang/es-ES.json
similarity index 74%
rename from lang/es-ES.json
rename to src/lang/es-ES.json
index 55343af1d..e2827bec5 100644
--- a/lang/es-ES.json
+++ b/src/lang/es-ES.json
@@ -6,21 +6,31 @@
   "label.add-description": "Añadir descripción",
   "label.add-website": "Nuevo sitio web",
   "label.admin": "Administrador",
+  "label.after": "Después",
   "label.all": "Todos",
   "label.all-time": "Todos los tiempos",
   "label.analytics": "Analíticas",
+  "label.average": "Media",
   "label.average-visit-time": "Tiempo promedio de visita",
   "label.back": "Atrás",
+  "label.before": "Antes",
   "label.bounce-rate": "Porcentaje de rebote",
+  "label.breakdown": "Desglose",
+  "label.browser": "Navegador",
   "label.browsers": "Navegadores",
   "label.cancel": "Cancelar",
   "label.change-password": "Cambiar contraseña",
   "label.cities": "Ciudades",
+  "label.city": "Ciudad",
   "label.clear-all": "Limpiar todo",
   "label.confirm": "Confirmar",
   "label.confirm-password": "Confirmar contraseña",
+  "label.contains": "Contiene",
   "label.continue": "Continuar",
   "label.countries": "Países",
+  "label.country": "País",
+  "label.create": "Crear",
+  "label.create-report": "Crear informe",
   "label.create-team": "Crear equipo",
   "label.create-user": "Crear usuario",
   "label.created": "Creado",
@@ -28,30 +38,46 @@
   "label.custom-range": "Intervalo personalizado",
   "label.dashboard": "Panel de control",
   "label.data": "Datos",
+  "label.date": "Fecha",
   "label.date-range": "Intervalo de fechas",
+  "label.day": "Día",
   "label.default-date-range": "Intervalo por defecto",
   "label.delete": "Eliminar",
   "label.delete-team": "Eliminar equipo",
   "label.delete-user": "Eliminar usuario",
   "label.delete-website": "Eliminar sitio",
+  "label.description": "Descripción",
   "label.desktop": "Escritorio",
   "label.details": "Detalles",
+  "label.device": "Dispositivo",
   "label.devices": "Dispositivos",
-  "label.dismiss": "Ignorar",
+  "label.dismiss": "Cerrar",
+  "label.does-not-contain": "No contiene",
   "label.domain": "Dominio",
-  "label.dropoff": "Dropoff",
+  "label.dropoff": "Abandono",
   "label.edit": "Editar",
   "label.edit-dashboard": "Editar panel",
   "label.enable-share-url": "Habilitar compartir URL",
   "label.event": "Evento",
   "label.event-data": "Datos de evento",
   "label.events": "Eventos",
+  "label.false": "Falso",
   "label.field": "Campo",
   "label.fields": "Campos",
+  "label.filter": "Filtro",
   "label.filter-combined": "Combinado",
   "label.filter-raw": "En crudo",
+  "label.filters": "Filtros",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Comprender conversión y abandono de usuarios.",
+  "label.greater-than": "Mayor que",
+  "label.greater-than-equals": "Mayor que o igual a",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Es igual a",
+  "label.is-not": "No es igual a",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Está establecido",
   "label.join": "Unir",
   "label.join-team": "Unirse al equipo",
   "label.language": "Idioma",
@@ -61,50 +87,66 @@
   "label.last-hours": "Últimas {x} horas",
   "label.leave": "Abandonar",
   "label.leave-team": "Abandonar equipo",
+  "label.less-than": "Menor que",
+  "label.less-than-equals": "Menor que o igual a",
   "label.login": "Iniciar sesión",
   "label.logout": "Cerrar sesión",
+  "label.max": "Máx",
   "label.members": "Miembros",
+  "label.min": "Mín",
   "label.mobile": "Móvil",
   "label.more": "Más",
+  "label.my-websites": "Mis sitios web",
   "label.name": "Nombre",
   "label.new-password": "Nueva contraseña",
   "label.none": "Ninguno",
-  "label.operating-systems": "Sistemas operativos",
+  "label.os": "Sistema",
+  "label.overview": "Resumen",
   "label.owner": "Propietario",
+  "label.page-of": "Página {current} de {total}",
   "label.page-views": "Vistas",
+  "label.pageTitle": "Título de página",
   "label.pages": "Páginas",
   "label.password": "Contraseña",
-  "label.powered-by": "Con la ayuda de {name}",
+  "label.powered-by": "Analíticas de {name}",
   "label.profile": "Perfil",
   "label.queries": "Consultas",
-  "label.query": "Query",
+  "label.query": "Consulta",
   "label.query-parameters": "Parámetros de petición",
   "label.realtime": "Tiempo real",
+  "label.referrer": "Referido",
   "label.referrers": "Referido desde",
   "label.refresh": "Actualizar",
   "label.regenerate": "Regenerar",
+  "label.region": "Region",
   "label.regions": "Regiones",
   "label.remove": "Quitar",
-  "label.reports": "Reportes",
+  "label.reports": "Informes",
   "label.required": "Obligatorio",
   "label.reset": "Reiniciar",
-  "label.reset-website": "Reiniciar estadísticas",
+  "label.reset-website": "Reiniciar analíticas",
+  "label.retention": "Retención",
+  "label.retention-description": "Medir la frecuencia con la que los usuarios vuelven a tu sitio web.",
   "label.role": "Rol",
   "label.run-query": "Ejecutar consulta",
   "label.save": "Guardar",
   "label.screens": "Pantallas",
+  "label.search": "Buscar",
   "label.select-date": "Seleccionar fecha",
   "label.select-website": "Seleccionar sitio web",
   "label.sessions": "Sesiones",
-  "label.settings": "Configuraciones",
+  "label.settings": "Ajustes",
   "label.share-url": "Compartir URL",
   "label.single-day": "Un solo día",
+  "label.sum": "Suma",
   "label.tablet": "Tableta",
   "label.team": "Equipo",
   "label.team-guest": "Invitado al equipo",
-  "label.team-id": "ID de equipo",
+  "label.team-id": "ID del equipo",
   "label.team-member": "Miembro del equipo",
+  "label.team-name": "Nombre del equipo",
   "label.team-owner": "Admin. del equipo",
+  "label.team-websites": "Sitios web del equipo",
   "label.teams": "Equipos",
   "label.theme": "Tema",
   "label.this-month": "Este mes",
@@ -114,14 +156,21 @@
   "label.title": "Título",
   "label.today": "Hoy",
   "label.toggle-charts": "Alternar gráficas",
+  "label.total": "Total",
+  "label.total-records": "Total de registros",
   "label.tracking-code": "Código de rastreo",
+  "label.true": "Verdadero",
+  "label.type": "Tipo",
+  "label.unique": "Único",
   "label.unique-visitors": "Visitantes únicos",
   "label.unknown": "Desconocida",
+  "label.untitled": "Sin título",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Usuario",
   "label.username": "Nombre de usuario",
   "label.users": "Usuarios",
+  "label.value": "Valor",
   "label.view": "Visualizar",
   "label.view-details": "Ver detalles",
   "label.view-only": "Ver sólo",
@@ -132,33 +181,6 @@
   "label.websites": "Sitios web",
   "label.window": "Ventana",
   "label.yesterday": "Ayer",
-  "labels.after": "Después",
-  "labels.average": "Media",
-  "labels.before": "Antes",
-  "labels.breakdown": "Desglose",
-  "labels.contains": "Contiene",
-  "labels.create-report": "Crear reporte",
-  "labels.description": "Descripciones",
-  "labels.does-not-contain": "No contiene",
-  "labels.does-not-equal": "No es igual a",
-  "labels.equals": "Es igual a",
-  "labels.false": "False",
-  "labels.filters": "Filtros",
-  "labels.greater-than": "Mayor que",
-  "labels.greater-than-equals": "Mayor que o igual a",
-  "labels.less-than": "Menor que",
-  "labels.less-than-equals": "Menor que o igual a",
-  "labels.max": "Máx",
-  "labels.min": "Mín",
-  "labels.overview": "Resumen",
-  "labels.sum": "Suma",
-  "labels.total": "Total",
-  "labels.total-records": "Total de registros",
-  "labels.true": "Verdadero",
-  "labels.type": "Tipo",
-  "labels.unique": "Único",
-  "labels.untitled": "Sin título",
-  "labels.value": "Valor",
   "message.active-users": "{x} {x, plural, one {activo} other {activos}}",
   "message.confirm-delete": "¿Seguro que quieres eliminar {target}?",
   "message.confirm-leave": "¿Seguro que quieres abandonar {target}?",
@@ -172,24 +194,24 @@
   "message.incorrect-username-password": "Nombre de usuario o contraseña incorrectos.",
   "message.invalid-domain": "Dominio inválido",
   "message.min-password-length": "Longitud mínima de {n} caracteres",
+  "message.new-version-available": "Una nueva versión de Umami {version} está disponible",
   "message.no-data-available": "No hay información disponible.",
   "message.no-event-data": "No hay datos de eventos disponibles.",
   "message.no-match-password": "Las contraseñas no coinciden",
+  "message.no-results-found": "No se encontraron resultados.",
+  "message.no-team-websites": "Este equipo no tiene ningún sitio web configurado.",
   "message.no-teams": "No has creado ningún equipo.",
   "message.no-users": "No hay usuarios.",
+  "message.no-websites-configured": "No tienes ningún sitio web configurado.",
   "message.page-not-found": "Página no encontrada",
   "message.reset-website": "Para reiniciar este sitio web, escribe {confirmation} a continuación para confirmar.",
   "message.reset-website-warning": "Todas las estadísticas de esta página serán eliminadas, pero el código de rastreo permanecerá intacto.",
-  "message.saved": "Guardado.",
+  "message.saved": "Guardado",
   "message.share-url": "Esta es la URL pública para {target}.",
   "message.team-already-member": "Ya eres miembro de este equipo.",
   "message.team-not-found": "Equipo no encontrado.",
+  "message.team-websites-info": "Las analíticas de tus sitios web pueden ser vistas por cualquier miembro del equipo.",
   "message.tracking-code": "Código de rastreo",
   "message.user-deleted": "Usuario eliminado.",
-  "message.visitor-log": "Visitante desde {country} usando {browser} en {os} {device}",
-  "message.no-results-found": "No se encontraron resultados.",
-  "message.no-team-websites": "Este equipo no tiene ningún sitio web configurado.",
-  "message.no-websites-configured": "No tienes ningún sitio web configurado.",
-  "message.team-websites-info": "Las analíticas de tus sitios web pueden ser vistas por cualquier miembro del equipo.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Visitante desde {country} usando {browser} en {os} {device}"
 }
diff --git a/lang/es-MX.json b/src/lang/es-MX.json
similarity index 79%
rename from lang/es-MX.json
rename to src/lang/es-MX.json
index dd6a3cce6..d8110b404 100644
--- a/lang/es-MX.json
+++ b/src/lang/es-MX.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "Nuevo sitio web",
   "label.admin": "Administrador",
+  "label.after": "After",
   "label.all": "Todos",
   "label.all-time": "Todos los tiempos",
   "label.analytics": "Analíticas",
+  "label.average": "Average",
   "label.average-visit-time": "Tiempo promedio de visita",
   "label.back": "Atrás",
+  "label.before": "Before",
   "label.bounce-rate": "Porcentaje de rebote",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Navegadores",
   "label.cancel": "Cancelar",
   "label.change-password": "Cambiar contraseña",
   "label.cities": "Ciudades",
+  "label.city": "City",
   "label.clear-all": "Limpiar todo",
   "label.confirm": "Confirmar",
   "label.confirm-password": "Confirmar contraseña",
+  "label.contains": "Contains",
   "label.continue": "Continuar",
   "label.countries": "Países",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Create report",
   "label.create-team": "Crear equipo",
   "label.create-user": "Crear usuario",
   "label.created": "Creado",
@@ -28,16 +38,21 @@
   "label.custom-range": "Intervalo personalizado",
   "label.dashboard": "Panel de control",
   "label.data": "Datos",
+  "label.date": "Date",
   "label.date-range": "Intervalo de fechas",
+  "label.day": "Day",
   "label.default-date-range": "Intervalo por defecto",
   "label.delete": "Eliminar",
   "label.delete-team": "Eliminar team",
   "label.delete-user": "Eliminar usuario",
   "label.delete-website": "Eliminar sitio",
+  "label.description": "Description",
   "label.desktop": "Escritorio",
   "label.details": "Detalles",
+  "label.device": "Device",
   "label.devices": "Dispositivos",
   "label.dismiss": "Ignorar",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Dominio",
   "label.dropoff": "Dropoff",
   "label.edit": "Editar",
@@ -46,12 +61,23 @@
   "label.event": "Evento",
   "label.event-data": "Event data",
   "label.events": "Eventos",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
+  "label.filter": "Filter",
   "label.filter-combined": "Combinado",
   "label.filter-raw": "Personalizado",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Unir",
   "label.join-team": "Unir a equipo",
   "label.language": "Idioma",
@@ -61,17 +87,25 @@
   "label.last-hours": "Últimas {x} horas",
   "label.leave": "Abandonar",
   "label.leave-team": "Abandonar equipo",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Iniciar sesión",
   "label.logout": "Cerrar sesión",
+  "label.max": "Max",
   "label.members": "Miembros",
+  "label.min": "Min",
   "label.mobile": "Móvil",
   "label.more": "Más",
+  "label.my-websites": "My websites",
   "label.name": "Nombre",
   "label.new-password": "Nueva contraseña",
   "label.none": "Ninguno",
-  "label.operating-systems": "Sistemas operativos",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Propietario",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Vistas",
+  "label.pageTitle": "Page title",
   "label.pages": "Páginas",
   "label.password": "Contraseña",
   "label.powered-by": "Analíticas de {name}",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "Parámetros de petición",
   "label.realtime": "Tiempo real",
+  "label.referrer": "Referrer",
   "label.referrers": "Referido desde",
   "label.refresh": "Actualizar",
   "label.regenerate": "Regenerar",
+  "label.region": "Region",
   "label.regions": "Regiones",
   "label.remove": "Quitar",
   "label.reports": "Reports",
   "label.required": "Obligatorio",
   "label.reset": "Reiniciar",
   "label.reset-website": "Reiniciar estadísticas",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Rol",
   "label.run-query": "Run query",
   "label.save": "Guardar",
   "label.screens": "Pantallas",
+  "label.search": "Search",
   "label.select-date": "Select date",
   "label.select-website": "Seleccionar sitio web",
   "label.sessions": "Sesiones",
   "label.settings": "Configuraciones",
   "label.share-url": "Compartir URL",
   "label.single-day": "Día",
+  "label.sum": "Sum",
   "label.tablet": "Tableta",
   "label.team": "Equipo",
   "label.team-guest": "Invitado de equipo",
   "label.team-id": "ID de equipo",
   "label.team-member": "Miembro de equipo",
+  "label.team-name": "Team name",
   "label.team-owner": "Admin. del equipo",
+  "label.team-websites": "Team websites",
   "label.teams": "Equipos",
   "label.theme": "Tema",
   "label.this-month": "Este mes",
@@ -114,14 +156,21 @@
   "label.title": "Título",
   "label.today": "Hoy",
   "label.toggle-charts": "Alternar gráficas",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Código de rastreo",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Visitantes únicos",
   "label.unknown": "Desconocida",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Usuario",
   "label.username": "Nombre de usuario",
   "label.users": "Usuarios",
+  "label.value": "Value",
   "label.view": "Visualizar",
   "label.view-details": "Ver detalles",
   "label.view-only": "View only",
@@ -132,33 +181,6 @@
   "label.websites": "Sitios",
   "label.window": "Window",
   "label.yesterday": "Ayer",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} {x, plural, one {activo} other {activos}}",
   "message.confirm-delete": "¿Seguro que quieres eliminar {target}?",
   "message.confirm-leave": "¿Seguro que quieres abandonar {target}?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "Nombre de usuario o contraseña incorrectos.",
   "message.invalid-domain": "Dominio inválido",
   "message.min-password-length": "Longitud mínima de {n} caracteres",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "No hay información disponible.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Las contraseñas no coinciden",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "Este equipo no tiene ningún sitio web configurado.",
   "message.no-teams": "No has creado ningún equipo.",
   "message.no-users": "No hay usuarios.",
+  "message.no-websites-configured": "No tienes ningún sitio configurado.",
   "message.page-not-found": "Página no encontrada",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Todas las estadísticas de esta página serán eliminadas, pero el código de rastreo permanecerá intacto.",
@@ -184,12 +210,8 @@
   "message.share-url": "Esta es la URL compartida públicamente para {target}.",
   "message.team-already-member": "Ya eres miembro de este equipo.",
   "message.team-not-found": "Equipo no encontrado.",
+  "message.team-websites-info": "Las analíticas de tus sitios pueden verse por cualquier miembro del equipo.",
   "message.tracking-code": "Código de rastreo",
   "message.user-deleted": "Usuario eliminado.",
-  "message.visitor-log": "Visitante desde {country} usando {browser} en {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "Este equipo no tiene ningún sitio web configurado.",
-  "message.no-websites-configured": "No tienes ningún sitio configurado.",
-  "message.team-websites-info": "Las analíticas de tus sitios pueden verse por cualquier miembro del equipo.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Visitante desde {country} usando {browser} en {os} {device}"
 }
diff --git a/lang/fa-IR.json b/src/lang/fa-IR.json
similarity index 80%
rename from lang/fa-IR.json
rename to src/lang/fa-IR.json
index a81792ae0..0458e3c69 100644
--- a/lang/fa-IR.json
+++ b/src/lang/fa-IR.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "افزودن وب‌سایت",
   "label.admin": "مدیر",
+  "label.after": "After",
   "label.all": "همه",
   "label.all-time": "همه زمان",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "میانگین زمان بازدید",
   "label.back": "برگشت",
+  "label.before": "Before",
   "label.bounce-rate": "نرخ Bounce",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "مروگرها",
   "label.cancel": "انصراف",
   "label.change-password": "تغییر رمز",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "تایید رمز",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "کشورها",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +38,21 @@
   "label.custom-range": "محدوده‌ی دلخواه",
   "label.dashboard": "داشبورد",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "محدوده‌ی تاریخ",
+  "label.day": "Day",
   "label.default-date-range": "محدوده‌ی پیشفرض تاریخ",
   "label.delete": "حذف",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "حذف وب‌سایت",
+  "label.description": "Description",
   "label.desktop": "دسکتاپ",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "دستگاه‌ها",
   "label.dismiss": "رد کردن",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "دامنه",
   "label.dropoff": "Dropoff",
   "label.edit": "ویرایش",
@@ -46,12 +61,23 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "رویدادها",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
+  "label.filter": "Filter",
   "label.filter-combined": "ترکیب شده",
   "label.filter-raw": "خام",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "زبان",
@@ -61,17 +87,25 @@
   "label.last-hours": "لیست {x} ساعت گذشته",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "ورود",
   "label.logout": "خروج",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "موبایل",
   "label.more": "بیشتر",
+  "label.my-websites": "My websites",
   "label.name": "نام",
   "label.new-password": "رمز جدید",
   "label.none": "None",
-  "label.operating-systems": "سیستم‌عامل‌ها",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "ایجاد شده توسط",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "بازدید صفحه",
+  "label.pageTitle": "Page title",
   "label.pages": "صفحه‌ها",
   "label.password": "رمز",
   "label.powered-by": "قدرت گرفته توسط {name}",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "آمار زنده",
+  "label.referrer": "Referrer",
   "label.referrers": "ارجاع دهندگان",
   "label.refresh": "به‌روزرسانی",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "ضروری",
   "label.reset": "بازنشانی",
   "label.reset-website": "بازنشانی آمار",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "ذخیره",
   "label.screens": "Screens",
+  "label.search": "Search",
   "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "تنظیمات",
   "label.share-url": "به اشتراک گذاری URL",
   "label.single-day": "یک روز",
+  "label.sum": "Sum",
   "label.tablet": "تبلت",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "تم",
   "label.this-month": "این ماه",
@@ -114,14 +156,21 @@
   "label.title": "Title",
   "label.today": "امروز",
   "label.toggle-charts": "Toggle charts",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "کد رهگیری",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "بازدیدکننده‌های یکتا",
   "label.unknown": "ناشناخته",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "نام کاربری",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "مشاهده‌ی جزئیات",
   "label.view-only": "View only",
@@ -132,33 +181,6 @@
   "label.websites": "وب‌سایت‌ها",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} هم اکنون {x, plural, one {یک} other {از میان}}",
   "message.confirm-delete": "آیا مطمئن هستید می‌خواهید {target} را حذف کنید?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "نام کاربری / رمز نادرست است.",
   "message.invalid-domain": "دامنه‌ی نامعتبر",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "اطلاعاتی موجود نیست.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "رمزها یکسان نیستند",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "شما هیچ وب‌سایتی را پیکربندی نکرده‌اید.",
   "message.page-not-found": "صفحه یافت نشد.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "تمامی آمارهای این وب‌سایت حذف خواهد شد اما tracking code بدون تغییر باقی می‌ماند.",
@@ -184,12 +210,8 @@
   "message.share-url": "این URL به اشتراک گذاشته شده عمومی برای {target} است.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "کد رهگیری",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "بازدیدکننده از کشور {country} با مروگر {browser} در {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "شما هیچ وب‌سایتی را پیکربندی نکرده‌اید.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "بازدیدکننده از کشور {country} با مروگر {browser} در {os} {device}"
 }
diff --git a/lang/fi-FI.json b/src/lang/fi-FI.json
similarity index 78%
rename from lang/fi-FI.json
rename to src/lang/fi-FI.json
index 541d391ad..52d882386 100644
--- a/lang/fi-FI.json
+++ b/src/lang/fi-FI.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "Lisää verkkosivu",
   "label.admin": "Järjestelmänvalvoja",
+  "label.after": "After",
   "label.all": "Kaikki",
   "label.all-time": "Alusta lähtien",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Keskimääräinen vierailuaika",
   "label.back": "Takaisin",
+  "label.before": "Before",
   "label.bounce-rate": "Välitön poistuminen",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Selaimet",
   "label.cancel": "Peruuta",
   "label.change-password": "Vaihda salasana",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Vahvista salasana",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Maat",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +38,21 @@
   "label.custom-range": "Mukautettu ajanjakso",
   "label.dashboard": "Ohjauspaneeli",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Ajanjakso",
+  "label.day": "Day",
   "label.default-date-range": "Oletusajanjakso",
   "label.delete": "Poista",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Poista verkkosivu",
+  "label.description": "Description",
   "label.desktop": "Pöytäkone",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Laitteet",
   "label.dismiss": "Hylkää",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Verkkotunnus",
   "label.dropoff": "Dropoff",
   "label.edit": "Muokkaa",
@@ -46,12 +61,23 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Tapahtumat",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
+  "label.filter": "Filter",
   "label.filter-combined": "Yhdistetty",
   "label.filter-raw": "Käsittelemätön",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Kieli",
@@ -61,17 +87,25 @@
   "label.last-hours": "Viimeisimmät {x} tuntia",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Kirjaudu sisään",
   "label.logout": "Kirjaudu ulos",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Puhelin",
   "label.more": "Lisää",
+  "label.my-websites": "My websites",
   "label.name": "Nimi",
   "label.new-password": "Uusi salasana",
   "label.none": "None",
-  "label.operating-systems": "Käyttöjärjestelmät",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Omistaja",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Sivun näyttökerrat",
+  "label.pageTitle": "Page title",
   "label.pages": "Sivut",
   "label.password": "Salasana",
   "label.powered-by": "Voimanlähteenä {name}",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Juuri nyt",
+  "label.referrer": "Referrer",
   "label.referrers": "Viittaajat",
   "label.refresh": "Päivitä",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Vaaditaan",
   "label.reset": "Nollaa",
   "label.reset-website": "Nollaa tilastot",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Tallenna",
   "label.screens": "Screens",
+  "label.search": "Search",
   "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Asetukset",
   "label.share-url": "Jaa URL",
   "label.single-day": "Yksi päivä",
+  "label.sum": "Sum",
   "label.tablet": "Tabletti",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Teema",
   "label.this-month": "Tämä kuukausi",
@@ -114,14 +156,21 @@
   "label.title": "Title",
   "label.today": "Tänään",
   "label.toggle-charts": "Kytke kaaviot päälle/pois",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Seurantakoodi",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Yksittäiset kävijät",
   "label.unknown": "Tuntematon",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Käyttäjänimi",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Katso tiedot",
   "label.view-only": "View only",
@@ -132,33 +181,6 @@
   "label.websites": "Verkkosivut",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} {x, plural, one {vierailija} other {vierailijaa}}",
   "message.confirm-delete": "Haluatko varmasti poistaa sivuston {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "Väärä käyttäjänimi/salasana.",
   "message.invalid-domain": "Virheellinen verkkotunnus",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Tietoja ei ole käytettävissä.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Salasanat eivät täsmää",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "Sinulla ei ole määritettyjä verkkosivustoja.",
   "message.page-not-found": "Sivua ei löydetty.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Kaikki sivuston tilastot poistetaan, mutta seurantakoodi pysyy muuttumattomana.",
@@ -184,12 +210,8 @@
   "message.share-url": "Tämä on julkisesti jaettu URL sivustolle {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Seurantakoodi",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Vierailija maasta {country} selaimella {browser} laitteella {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "Sinulla ei ole määritettyjä verkkosivustoja.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Vierailija maasta {country} selaimella {browser} laitteella {os} {device}"
 }
diff --git a/lang/fo-FO.json b/src/lang/fo-FO.json
similarity index 78%
rename from lang/fo-FO.json
rename to src/lang/fo-FO.json
index e31c94d9d..ef5b0bc1b 100644
--- a/lang/fo-FO.json
+++ b/src/lang/fo-FO.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "Legg heimasíðu afturat",
   "label.admin": "Fyrisitari",
+  "label.after": "After",
   "label.all": "Alt",
   "label.all-time": "All time",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Miðal vitjurnartíð ",
   "label.back": "Aftur",
+  "label.before": "Before",
   "label.bounce-rate": "Bounce prosenttal",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Kagar",
   "label.cancel": "Strika",
   "label.change-password": "Skift loyniorð",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Vátta loyniorð",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Lond",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +38,21 @@
   "label.custom-range": "Tillaga  spenni",
   "label.dashboard": "Yvirlitsskíggi",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Vel dato",
+  "label.day": "Day",
   "label.default-date-range": "Forsett dato",
   "label.delete": "Sletta",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Sletta heimasíðu",
+  "label.description": "Description",
   "label.desktop": "Borðtelda",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Tóleindir",
   "label.dismiss": "Lat fara",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Økisnavn",
   "label.dropoff": "Dropoff",
   "label.edit": "Ger broyting",
@@ -46,12 +61,23 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Hendingar/tiltøk",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
+  "label.filter": "Filter",
   "label.filter-combined": "Samansett",
   "label.filter-raw": "Óviðgjørt",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +87,25 @@
   "label.last-hours": "Seinastu {x} tímarnar",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Rita inn",
   "label.logout": "Rita út",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Telefon",
   "label.more": "Meira",
+  "label.my-websites": "My websites",
   "label.name": "Navn",
   "label.new-password": "Nýtt loyniorð",
   "label.none": "None",
-  "label.operating-systems": "Stýrikervir",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Owner",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Opnaðar síðir",
+  "label.pageTitle": "Page title",
   "label.pages": "Síðir",
   "label.password": "Loyniorð",
   "label.powered-by": "Powered by {name}",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Beinleiðis",
+  "label.referrer": "Referrer",
   "label.referrers": "Framsendingar",
   "label.refresh": "Endurskapa",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Kravt",
   "label.reset": "Nulstilla",
   "label.reset-website": "Reset statistics",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Goym",
   "label.screens": "Screens",
+  "label.search": "Search",
   "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Stillingar",
   "label.share-url": "Deil leinku",
   "label.single-day": "Einkultur dagur",
+  "label.sum": "Sum",
   "label.tablet": "Teldil",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "Hendan mánan",
@@ -114,14 +156,21 @@
   "label.title": "Title",
   "label.today": "Í dag",
   "label.toggle-charts": "Toggle charts",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Spori kota",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Einsýna vitjanir",
   "label.unknown": "Ókent",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Brúkaranavn",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Vís frágreiðing",
   "label.view-only": "View only",
@@ -132,33 +181,6 @@
   "label.websites": "Heimasíður",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} í løtuni {x, plural, one {vitjandi} other { vitjandi }}",
   "message.confirm-delete": "Ert tú sikkur at tú ynskir at strika {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "Skeivt brúkaranavn/loyniorð.",
   "message.invalid-domain": "Ógilt økisnavn",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Einki data tøk.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Loyniorðini eru ikki eins",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "Tú hevur ongar heimasíður stillaða til.",
   "message.page-not-found": "Síðan bleiv ikki funnin.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.",
@@ -184,12 +210,8 @@
   "message.share-url": "Hettar er tann almenna leinkan av {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Spori kota",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Vitjandi frá {country} brúkar {browser} á {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "Tú hevur ongar heimasíður stillaða til.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Vitjandi frá {country} brúkar {browser} á {os} {device}"
 }
diff --git a/lang/fr-FR.json b/src/lang/fr-FR.json
similarity index 75%
rename from lang/fr-FR.json
rename to src/lang/fr-FR.json
index d1e6691a0..bb4a56a55 100644
--- a/lang/fr-FR.json
+++ b/src/lang/fr-FR.json
@@ -6,21 +6,31 @@
   "label.add-description": "Ajouter une description",
   "label.add-website": "Ajouter un site",
   "label.admin": "Administrateur",
+  "label.after": "Après",
   "label.all": "Tout",
   "label.all-time": "Toutes les données",
   "label.analytics": "Analytics",
+  "label.average": "Moyenne",
   "label.average-visit-time": "Temps de visite moyen",
   "label.back": "Retour",
+  "label.before": "Avant",
   "label.bounce-rate": "Taux de rebond",
+  "label.breakdown": "Répartition",
+  "label.browser": "Navigateur",
   "label.browsers": "Navigateurs",
   "label.cancel": "Annuler",
   "label.change-password": "Changer le mot de passe",
   "label.cities": "Villes",
+  "label.city": "Ville",
   "label.clear-all": "Réinitialiser",
   "label.confirm": "Confirmer",
   "label.confirm-password": "Confirmation du mot de passe",
+  "label.contains": "Contient",
   "label.continue": "Continuer",
   "label.countries": "Pays",
+  "label.country": "Pays",
+  "label.create": "Créer",
+  "label.create-report": "Créer un rapport",
   "label.create-team": "Créer une équipe",
   "label.create-user": "Créer un utilisateur",
   "label.created": "Créé",
@@ -28,30 +38,46 @@
   "label.custom-range": "Période personnalisée",
   "label.dashboard": "Tableau de bord",
   "label.data": "Données",
+  "label.date": "Date",
   "label.date-range": "Période",
+  "label.day": "Jour",
   "label.default-date-range": "Période par défaut",
   "label.delete": "Supprimer",
   "label.delete-team": "Supprimer l'équipe",
   "label.delete-user": "Supprimer l'utilisateur",
   "label.delete-website": "Supprimer le site",
+  "label.description": "Description",
   "label.desktop": "Ordinateur",
   "label.details": "Détails",
+  "label.device": "Appareil",
   "label.devices": "Appareils",
   "label.dismiss": "Ignorer",
+  "label.does-not-contain": "Ne contient pas",
   "label.domain": "Domaine",
-  "label.dropoff": "Dropoff",
+  "label.dropoff": "Abandons",
   "label.edit": "Modifier",
   "label.edit-dashboard": "Modifier le tableau de bord",
   "label.enable-share-url": "Activer l'URL de partage",
-  "label.event": "Event",
-  "label.event-data": "Données d'événements",
-  "label.events": "Événements",
+  "label.event": "Évènement",
+  "label.event-data": "Données d'évènements",
+  "label.events": "Évènements",
+  "label.false": "Faux",
   "label.field": "Champ",
   "label.fields": "Champs",
+  "label.filter": "Filtrer",
   "label.filter-combined": "Combiné",
   "label.filter-raw": "Brut",
+  "label.filters": "Filtres",
   "label.funnel": "Entonnoir",
+  "label.funnel-description": "Suivi des conversions et des taux d'abandons.",
+  "label.greater-than": "Supérieur à",
+  "label.greater-than-equals": "Supérieur ou égal à",
   "label.insights": "Insights",
+  "label.insights-description": "Analyse précise des données en utilisant des segments et des filtres.",
+  "label.is": "Est",
+  "label.is-not": "N'est pas",
+  "label.is-not-set": "N'est pas défini",
+  "label.is-set": "Est défini",
   "label.join": "Rejoindre",
   "label.join-team": "Rejoindre une équipe",
   "label.language": "Langue",
@@ -61,50 +87,66 @@
   "label.last-hours": "{x} dernières heures",
   "label.leave": "Quitter",
   "label.leave-team": "Quitter l'équipe",
+  "label.less-than": "Inférieur à",
+  "label.less-than-equals": "Inférieur ou égal à",
   "label.login": "Connexion",
   "label.logout": "Déconnexion",
+  "label.max": "Max",
   "label.members": "Membres",
+  "label.min": "Min",
   "label.mobile": "Téléphone",
   "label.more": "Plus",
+  "label.my-websites": "Mes sites",
   "label.name": "Nom",
   "label.new-password": "Nouveau mot de passe",
   "label.none": "Aucun·e",
-  "label.operating-systems": "Systèmes d'exploitation",
+  "label.os": "OS",
+  "label.overview": "Vue d'ensemble",
   "label.owner": "Propriétaire",
+  "label.page-of": "Page {current} sur {total}",
   "label.page-views": "Pages vues",
+  "label.pageTitle": "Titre de page",
   "label.pages": "Pages",
   "label.password": "Mot de passe",
   "label.powered-by": "Propulsé par {name}",
   "label.profile": "Profil",
   "label.queries": "Requêtes",
   "label.query": "Requête",
-  "label.query-parameters": "Paramètres d'URL",
+  "label.query-parameters": "Paramètres de requête",
   "label.realtime": "Temps réel",
+  "label.referrer": "Site référent",
   "label.referrers": "Sites référents",
   "label.refresh": "Rafraîchir",
   "label.regenerate": "Régénérer",
+  "label.region": "Région",
   "label.regions": "Régions",
   "label.remove": "Retirer",
   "label.reports": "Rapports",
   "label.required": "Requis",
   "label.reset": "Réinitialiser",
   "label.reset-website": "Réinitialiser les statistiques",
+  "label.retention": "Rétention",
+  "label.retention-description": "Mesure de l'atractivité du site en visualisant les taux d'utilisateurs qui reviennent.",
   "label.role": "Rôle",
   "label.run-query": "Éxécuter la requête",
   "label.save": "Enregistrer",
   "label.screens": "Résolutions d'écran",
+  "label.search": "Rechercher",
   "label.select-date": "Choisir une période",
   "label.select-website": "Choisir un site",
   "label.sessions": "Sessions",
   "label.settings": "Paramètres",
   "label.share-url": "URL de partage",
   "label.single-day": "Journée",
+  "label.sum": "Somme",
   "label.tablet": "Tablette",
   "label.team": "Équipe",
   "label.team-guest": "Invité dans l'équipe",
   "label.team-id": "ID d'équipe",
   "label.team-member": "Membre de l'équipe",
+  "label.team-name": "Nom de l'équipe",
   "label.team-owner": "Propriétaire de l'équipe",
+  "label.team-websites": "Sites d'équipes",
   "label.teams": "Équipes",
   "label.theme": "Thème",
   "label.this-month": "Ce mois",
@@ -114,51 +156,31 @@
   "label.title": "Titre",
   "label.today": "Aujourd'hui",
   "label.toggle-charts": "Afficher/Masquer les graphiques",
+  "label.total": "Total",
+  "label.total-records": "Nombre d'enregistrements",
   "label.tracking-code": "Code de suivi",
+  "label.true": "Vrai",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Visiteurs uniques",
   "label.unknown": "Inconnu",
+  "label.untitled": "Sans titre",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Utilisateur",
   "label.username": "Nom d'utilisateur",
   "label.users": "Utilisateurs",
+  "label.value": "Valeur",
   "label.view": "Voir",
   "label.view-details": "Voir les détails",
   "label.view-only": "Consultation",
   "label.views": "Vues",
   "label.visitors": "Visiteurs",
-  "label.website": "Website",
+  "label.website": "Site",
   "label.website-id": "ID de site",
   "label.websites": "Sites",
   "label.window": "Fenêtre",
   "label.yesterday": "Hier",
-  "labels.after": "Après",
-  "labels.average": "Moyenne",
-  "labels.before": "Avant",
-  "labels.breakdown": "Répartition",
-  "labels.contains": "Contient",
-  "labels.create-report": "Créer un rapport",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Ne contient pas",
-  "labels.does-not-equal": "N'est pas égal",
-  "labels.equals": "Est égal",
-  "labels.false": "Faux",
-  "labels.filters": "Filtres",
-  "labels.greater-than": "Supérieur à",
-  "labels.greater-than-equals": "Supérieur ou égal à",
-  "labels.less-than": "Inférieur à",
-  "labels.less-than-equals": "Inférieur ou égal à",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Vue d'ensemble",
-  "labels.sum": "Somme",
-  "labels.total": "Total",
-  "labels.total-records": "Nombre d'enregistrements",
-  "labels.true": "Vrai",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Sans titre",
-  "labels.value": "Valeur",
   "message.active-users": "{x} {x, plural, one {visiteur} other {visiteurs}} actuellement",
   "message.confirm-delete": "Êtes-vous sûr de vouloir supprimer {target} ?",
   "message.confirm-leave": "Êtes-vous sûr de vouloir quitter {target} ?",
@@ -172,24 +194,24 @@
   "message.incorrect-username-password": "Nom d'utilisateur/Mot de passe incorrect.",
   "message.invalid-domain": "Domaine invalide",
   "message.min-password-length": "Taille minimale de {n} caractères",
+  "message.new-version-available": "Une nouvelle version d'Umami {version} est disponible !",
   "message.no-data-available": "Aucune donnée disponible.",
   "message.no-event-data": "Aucune donnée d'événement disponible.",
   "message.no-match-password": "Les mots de passe ne correspondent pas",
+  "message.no-results-found": "Aucun résultat n'a été trouvé.",
+  "message.no-team-websites": "Cette équipe n'a aucun site.",
   "message.no-teams": "Vous n'avez pas créé d'équipe.",
   "message.no-users": "Aucun utilisateur.",
+  "message.no-websites-configured": "Vous n'avez pas configuré de site.",
   "message.page-not-found": "Page non trouvée.",
   "message.reset-website": "Pour réinitialiser ce site, taper {confirmation} ci-dessous pour confirmer.",
   "message.reset-website-warning": "Toutes les statistiques pour ce site seront supprimées, mais votre code de suivi restera intact.",
-  "message.saved": "Enregistré avec succès.",
+  "message.saved": "Enregistré.",
   "message.share-url": "Les statistiques de votre site sont accessibles publiquement sur cette URL :",
   "message.team-already-member": "Vous êtes déjà membre de cette équipe.",
   "message.team-not-found": "Équipe non trouvée.",
+  "message.team-websites-info": "Les sites peuvent être vus par tout utilisateur dans l'équipe.",
   "message.tracking-code": "Code de suivi",
   "message.user-deleted": "Utilisateur supprimé.",
-  "message.visitor-log": "Visiteur de {country} utilisant {browser} sur {os} {device}",
-  "message.no-results-found": "Aucun résultat n'a été trouvé.",
-  "message.no-team-websites": "Cette équipe n'a aucun site.",
-  "message.no-websites-configured": "Vous n'avez pas configuré de site.",
-  "message.team-websites-info": "Les sites peuvent être vus par tout utilisateur dans l'équipe.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Visiteur de {country} utilisant {browser} sur {os} {device}"
 }
diff --git a/lang/ga-ES.json b/src/lang/ga-ES.json
similarity index 79%
rename from lang/ga-ES.json
rename to src/lang/ga-ES.json
index dce6504cc..2a2d16c9c 100644
--- a/lang/ga-ES.json
+++ b/src/lang/ga-ES.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "Engadir sitio web",
   "label.admin": "Administradora",
+  "label.after": "After",
   "label.all": "Todo",
   "label.all-time": "Sempre",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Tempo medio de visita",
   "label.back": "Atrás",
+  "label.before": "Before",
   "label.bounce-rate": "Proporción de rebote",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Navegadores",
   "label.cancel": "Cancelar",
   "label.change-password": "Mudar contrasinal",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Confirmar contrasinal",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Países",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +38,21 @@
   "label.custom-range": "Rango personalizado",
   "label.dashboard": "Taboleiro",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Rango temporal",
+  "label.day": "Day",
   "label.default-date-range": "Rango temporal por defecto",
   "label.delete": "Eliminar",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Eliminar sitio web",
+  "label.description": "Description",
   "label.desktop": "Escritorio",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Dispositivos",
   "label.dismiss": "Desbotar",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Dominio",
   "label.dropoff": "Dropoff",
   "label.edit": "Editar",
@@ -46,12 +61,23 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Eventos",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
+  "label.filter": "Filter",
   "label.filter-combined": "Combinado",
   "label.filter-raw": "Raw",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Idioma",
@@ -61,17 +87,25 @@
   "label.last-hours": "Últimas {x} horas",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Acceder",
   "label.logout": "Pechar sesión",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Móbil",
   "label.more": "Máis",
+  "label.my-websites": "My websites",
   "label.name": "Nome",
   "label.new-password": "Novo contrasinal",
   "label.none": "None",
-  "label.operating-systems": "Sistemas operativos",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Dona",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Vistas de páxinas",
+  "label.pageTitle": "Page title",
   "label.pages": "Páxinas",
   "label.password": "Contrasinal",
   "label.powered-by": "Funciona grazas a {name}",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Agora mesmo",
+  "label.referrer": "Referrer",
   "label.referrers": "Orixes",
   "label.refresh": "Actualizar",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Requerido",
   "label.reset": "Restablecer",
   "label.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Gardar",
   "label.screens": "Screens",
+  "label.search": "Search",
   "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Axustes",
   "label.share-url": "Compartir URL",
   "label.single-day": "Un só día",
+  "label.sum": "Sum",
   "label.tablet": "Tableta",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Decorado",
   "label.this-month": "Este mes",
@@ -114,14 +156,21 @@
   "label.title": "Title",
   "label.today": "Hoxe",
   "label.toggle-charts": "Activación das gráficas",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Código de seguimento",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Visitas únicas",
   "label.unknown": "Descoñecido",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Identificador",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Ver detalles",
   "label.view-only": "View only",
@@ -132,33 +181,6 @@
   "label.websites": "Sitios web",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} actual {x, plural, one {visitante} other {visitantes}}",
   "message.confirm-delete": "Tes a certeza de querer eliminar {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "Credenciais incorrectas.",
   "message.invalid-domain": "Dominio non válido",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Sen datos dispoñibles.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Non concordan os contrasinais",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "Non tes sitios web configurados.",
   "message.page-not-found": "Páxina non atopada.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Vanse eliminar tódalas estatísticas deste sitio web, pero o código de seguimento permanecerá sen cambios.",
@@ -184,12 +210,8 @@
   "message.share-url": "Este é o URL da compartición pública de {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Código de seguimento",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Visitante desde {country} usando {browser} en {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "Non tes sitios web configurados.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Visitante desde {country} usando {browser} en {os} {device}"
 }
diff --git a/lang/he-IL.json b/src/lang/he-IL.json
similarity index 79%
rename from lang/he-IL.json
rename to src/lang/he-IL.json
index 8ed7f6c02..04912335d 100644
--- a/lang/he-IL.json
+++ b/src/lang/he-IL.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "הוספת אתר",
   "label.admin": "מנהל",
+  "label.after": "After",
   "label.all": "הכל",
   "label.all-time": "All time",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "זמן ביקור ממוצע",
   "label.back": "חזרה",
+  "label.before": "Before",
   "label.bounce-rate": "Bounce rate",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "דפדפנים",
   "label.cancel": "ביטול",
   "label.change-password": "שינוי סיסמה",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "אישור סיסמה",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "מדינות",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +38,21 @@
   "label.custom-range": "טווח מותאם",
   "label.dashboard": "דשבורד",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "טווח תאריכים",
+  "label.day": "Day",
   "label.default-date-range": "טווח תאריכים בברירת מחדל",
   "label.delete": "הסרה",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "הסרת אתר",
+  "label.description": "Description",
   "label.desktop": "דסקטופ",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "מכשירים",
   "label.dismiss": "שיחרור",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "דומיין",
   "label.dropoff": "Dropoff",
   "label.edit": "עריכה",
@@ -46,12 +61,23 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "אירועים",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
+  "label.filter": "Filter",
   "label.filter-combined": "משותף",
   "label.filter-raw": "גולמי",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +87,25 @@
   "label.last-hours": "{x} שעות אחרונות",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "התחברות",
   "label.logout": "התנתקות",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "מובייל",
   "label.more": "עוד",
+  "label.my-websites": "My websites",
   "label.name": "שם",
   "label.new-password": "סיסמה חדשה",
   "label.none": "None",
-  "label.operating-systems": "מערכות הפעלה",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Owner",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "צפיות בדפים",
+  "label.pageTitle": "Page title",
   "label.pages": "דפים",
   "label.password": "סיסמה",
   "label.powered-by": "Powered by {name}",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "זמן אמת",
+  "label.referrer": "Referrer",
   "label.referrers": "מפנים",
   "label.refresh": "רענון",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "נדרש",
   "label.reset": "איפוס",
   "label.reset-website": "Reset statistics",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "שמירה",
   "label.screens": "Screens",
+  "label.search": "Search",
   "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "הגדרות",
   "label.share-url": "שיתוף URL",
   "label.single-day": "יום בודד",
+  "label.sum": "Sum",
   "label.tablet": "טאבלט",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "החודש",
@@ -114,14 +156,21 @@
   "label.title": "Title",
   "label.today": "היום",
   "label.toggle-charts": "Toggle charts",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "קוד מעקב",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "מבקרים ייחודיים",
   "label.unknown": "לא ידוע",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "שם משתמש",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "פרטים נוספים",
   "label.view-only": "View only",
@@ -132,33 +181,6 @@
   "label.websites": "אתרים",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} נוכחיים {x, plural, one {מבקר} other {מבקרים}}",
   "message.confirm-delete": "האם באמת למחוק את {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "שם משתמש או סיסמה לא נכונים",
   "message.invalid-domain": "דומיין לא תקין",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "אין מידע זמין",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "סיסמאות לא תואמות",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "לא מוגדרים אתרים",
   "message.page-not-found": "דף לא נמצא",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.",
@@ -184,12 +210,8 @@
   "message.share-url": "זהו URL ציבורי עבור {target}",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "קוד מעקב",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "מבקר ממדינת {country} משתמבש בדפדפן {browser} ב-{os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "לא מוגדרים אתרים",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "מבקר ממדינת {country} משתמבש בדפדפן {browser} ב-{os} {device}"
 }
diff --git a/lang/hi-IN.json b/src/lang/hi-IN.json
similarity index 82%
rename from lang/hi-IN.json
rename to src/lang/hi-IN.json
index 429e6ebb0..c872fd1a9 100644
--- a/lang/hi-IN.json
+++ b/src/lang/hi-IN.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "वेबसाइट",
   "label.admin": "प्रशासक",
+  "label.after": "After",
   "label.all": "सब",
   "label.all-time": "All time",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "औसत दृश्य समय",
   "label.back": "पीछे",
+  "label.before": "Before",
   "label.bounce-rate": "उछाल दर",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "वेब ब्राउज़र",
   "label.cancel": "रद्द करें",
   "label.change-password": "पासवर्ड बदलें",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "पासवर्ड की पुष्टि कीजिये",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "देश",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +38,21 @@
   "label.custom-range": "कस्टम रेंज",
   "label.dashboard": "नियंत्रण-पट्ट",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "तिथि सीमा",
+  "label.day": "Day",
   "label.default-date-range": "डिफ़ॉल्ट तिथि सीमा",
   "label.delete": "खाता हटाएं",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "वेबसाइट हटाएं",
+  "label.description": "Description",
   "label.desktop": "डेस्कटॉप",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "उपकरण",
   "label.dismiss": "खारिज कीजिये",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "डोमेन",
   "label.dropoff": "Dropoff",
   "label.edit": "संपादित करें",
@@ -46,12 +61,23 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "स्पर्धाएँ",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
+  "label.filter": "Filter",
   "label.filter-combined": "संयुक्त",
   "label.filter-raw": "रॉ",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +87,25 @@
   "label.last-hours": "पिछले {x} घंटे",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "लॉग इन",
   "label.logout": "लॉग आउट",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "मोबाइल फोन",
   "label.more": "और",
+  "label.my-websites": "My websites",
   "label.name": "नाम",
   "label.new-password": "नया पासवर्ड",
   "label.none": "None",
-  "label.operating-systems": "ऑपरेटिंग सिस्टम",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Owner",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "पृष्ठ दृश्य",
+  "label.pageTitle": "Page title",
   "label.pages": "पृष्ठों",
   "label.password": "पासवर्ड",
   "label.powered-by": "{name} द्वारा संचालित",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "वास्तव काल",
+  "label.referrer": "Referrer",
   "label.referrers": "सन्दर्भदाता",
   "label.refresh": "रिफ्रेश",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "अपेक्षित",
   "label.reset": "रीसेट",
   "label.reset-website": "Reset statistics",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "सहेजें",
   "label.screens": "Screens",
+  "label.search": "Search",
   "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "समायोजन",
   "label.share-url": "यूआरएल साझा करें",
   "label.single-day": "एक दिन",
+  "label.sum": "Sum",
   "label.tablet": "टैबलेट",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "इस महीने",
@@ -114,14 +156,21 @@
   "label.title": "Title",
   "label.today": "आज",
   "label.toggle-charts": "Toggle charts",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "ट्रैकिंग कोड",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "अद्वितीय आगंतुकों",
   "label.unknown": "अज्ञात",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "उपयोगकर्ता नाम",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "विवरण देखें",
   "label.view-only": "View only",
@@ -132,33 +181,6 @@
   "label.websites": "वेबसाइटों",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} मौजूद {x, plural, one {आगंतुक} other {आगंतुकों}}",
   "message.confirm-delete": "क्या आप वाकई में {target} हटाना चाहते हैं?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "ग़लत उपयोगकर्ता नाम / पासवर्ड।",
   "message.invalid-domain": "अमान्य डोमेन",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "कोई डेटा उपलब्ध नहीं है।",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "पासवर्ड मेल नहीं खाते",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "आपके पास कोई वेबसाइट कॉन्फ़िगर नहीं है।",
   "message.page-not-found": "पृष्ठ नहीं मिला।",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.",
@@ -184,12 +210,8 @@
   "message.share-url": "यह {target} के लिए सार्वजनिक रूप से साझा किया गया URL है।",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "ट्रैकिंग कोड",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "{country} का आगंतुक, जो {browser} का उपयोग करता है, {os} यन्त्र पर",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "आपके पास कोई वेबसाइट कॉन्फ़िगर नहीं है।",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "{country} का आगंतुक, जो {browser} का उपयोग करता है, {os} यन्त्र पर"
 }
diff --git a/lang/hr-HR.json b/src/lang/hr-HR.json
similarity index 79%
rename from lang/hr-HR.json
rename to src/lang/hr-HR.json
index a9deb51fc..55feb48bd 100644
--- a/lang/hr-HR.json
+++ b/src/lang/hr-HR.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "Dodaj web stranicu",
   "label.admin": "Administrator",
+  "label.after": "After",
   "label.all": "Sve",
   "label.all-time": "Svo vrijeme",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Average visit time",
   "label.back": "Natrag ",
+  "label.before": "Before",
   "label.bounce-rate": "Bounce rate",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Browsers",
   "label.cancel": "Odustani",
   "label.change-password": "Promijeni lozinku",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Potvrdi lozinku",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Countries",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +38,21 @@
   "label.custom-range": "Prilagođeni raspon",
   "label.dashboard": "Nadzorna ploča",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Raspon datuma",
+  "label.day": "Day",
   "label.default-date-range": "Zadani datumski raspon",
   "label.delete": "Obriši",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Obriši web stranicu",
+  "label.description": "Description",
   "label.desktop": "Desktop",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Devices",
   "label.dismiss": "Odbaci",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Domena",
   "label.dropoff": "Dropoff",
   "label.edit": "Uredi",
@@ -46,12 +61,23 @@
   "label.event": "Event",
   "label.event-data": "Podaci događaja",
   "label.events": "Events",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
+  "label.filter": "Filter",
   "label.filter-combined": "Combined",
   "label.filter-raw": "Raw",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Jezik",
@@ -61,17 +87,25 @@
   "label.last-hours": "Zadnjih {x} sati",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Prijava",
   "label.logout": "Odjava",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Mobile",
   "label.more": "Više",
+  "label.my-websites": "My websites",
   "label.name": "Ime",
   "label.new-password": "Nova lozinka",
   "label.none": "Ništa",
-  "label.operating-systems": "Operating systems",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Vlasnik",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Page views",
+  "label.pageTitle": "Page title",
   "label.pages": "Pages",
   "label.password": "Lozinka",
   "label.powered-by": "Powered by {name}",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Stvarno vrijeme",
+  "label.referrer": "Referrer",
   "label.referrers": "Referrers",
   "label.refresh": "Osvježi",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Potrebna",
   "label.reset": "Resetirati",
   "label.reset-website": "Resetirati web stranicu",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Spremi",
   "label.screens": "Screens",
+  "label.search": "Search",
   "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Postavke",
   "label.share-url": "Podijeli poveznicu",
   "label.single-day": "Jedan dan",
+  "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Tema",
   "label.this-month": "Ovaj mjesec",
@@ -114,14 +156,21 @@
   "label.title": "Title",
   "label.today": "Danas",
   "label.toggle-charts": "Toggle charts",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Kod za praćenje",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Unique visitors",
   "label.unknown": "Nepoznato",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Korisničko ime",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Pogledaj detalje",
   "label.view-only": "View only",
@@ -132,33 +181,6 @@
   "label.websites": "Web stranice",
   "label.window": "Window",
   "label.yesterday": "Jučer",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} Trenutno {x, plural, one {posjetitelj} other {posjetitelja}}",
   "message.confirm-delete": "Jeste li sigurni da želite obrisati {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "Neispravno korisničke ime/lozinka.",
   "message.invalid-domain": "Invalid domain. Do not include http/https.",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Nema dostupnih podataka.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Passwords do not match.",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "You do not have any websites configured.",
   "message.page-not-found": "Stranica nije pronađena.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "All statistics for this website will be deleted, but your settings will remain intact.",
@@ -184,12 +210,8 @@
   "message.share-url": "Ovo je javno dijeljena poveznica za {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "To track stats for this website, place the following code in the <head>...</head> section of your HTML.",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Visitor from {country} using {browser} on {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "You do not have any websites configured.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Visitor from {country} using {browser} on {os} {device}"
 }
diff --git a/lang/hu-HU.json b/src/lang/hu-HU.json
similarity index 78%
rename from lang/hu-HU.json
rename to src/lang/hu-HU.json
index e5c8a0780..407687f2e 100644
--- a/lang/hu-HU.json
+++ b/src/lang/hu-HU.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "Weboldal hozzáadása",
   "label.admin": "Adminisztrátor",
+  "label.after": "After",
   "label.all": "Összes",
   "label.all-time": "All time",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Átlagos látogatási idő",
   "label.back": "Vissza",
+  "label.before": "Before",
   "label.bounce-rate": "Visszafordulási arány",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Böngészők",
   "label.cancel": "Mégsem",
   "label.change-password": "Jelszó módosítása",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Jelszó megerősítése",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Országok",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +38,21 @@
   "label.custom-range": "Egyedi tartomány",
   "label.dashboard": "Áttekintés",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Időintervallum",
+  "label.day": "Day",
   "label.default-date-range": "Alapértelmezett időintervallum",
   "label.delete": "Eltávolítás",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Weboldal eltávolítása",
+  "label.description": "Description",
   "label.desktop": "Asztali számítógép",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Eszközök",
   "label.dismiss": "Mellőzés",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Domain",
   "label.dropoff": "Dropoff",
   "label.edit": "Módosítás",
@@ -46,12 +61,23 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Események",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
+  "label.filter": "Filter",
   "label.filter-combined": "Összevont",
   "label.filter-raw": "Nyers",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +87,25 @@
   "label.last-hours": "Legutóbbi {x} óra",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Bejelentkezés",
   "label.logout": "Kijelentkezés",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Telefon",
   "label.more": "Bővebben",
+  "label.my-websites": "My websites",
   "label.name": "Név",
   "label.new-password": "Új jelszó",
   "label.none": "None",
-  "label.operating-systems": "Operációs rendszerek",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Owner",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Oldalmegtekintések",
+  "label.pageTitle": "Page title",
   "label.pages": "Oldalak",
   "label.password": "Jelszó",
   "label.powered-by": "Működteti az {name}",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Valós idejű",
+  "label.referrer": "Referrer",
   "label.referrers": "Hivatkozók",
   "label.refresh": "Frissítés",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Kötelező",
   "label.reset": "Visszaállítás",
   "label.reset-website": "Reset statistics",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Mentés",
   "label.screens": "Screens",
+  "label.search": "Search",
   "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Beállítások",
   "label.share-url": "URL megosztása",
   "label.single-day": "Egy nap",
+  "label.sum": "Sum",
   "label.tablet": "Táblagép",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "Ezen hónap",
@@ -114,14 +156,21 @@
   "label.title": "Title",
   "label.today": "Ma",
   "label.toggle-charts": "Toggle charts",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Követési kód",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Egyedi látogatók",
   "label.unknown": "Ismeretlen",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Felhasználónév",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Részletek",
   "label.view-only": "View only",
@@ -132,33 +181,6 @@
   "label.websites": "Weboldalak",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} {x, plural, one {látogató} other {latógató}} jelenleg",
   "message.confirm-delete": "Biztos, hogy törölni szeretnéd {target} elemet?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "Érvénytelen felhasználónév/jelszó.",
   "message.invalid-domain": "Érvénytelen domain",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Nincs rendelkezésre álló adat.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "A jelszavak nem egyeznek",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "Még nem állítottál be egyetlen weboldalt sem.",
   "message.page-not-found": "Oldal nem található.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.",
@@ -184,12 +210,8 @@
   "message.share-url": "{target} nyilvánosan megosztott URL címe.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Követési kód",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Látógató {country} területéről, {os} {device} eszközön, {browser} böngészőből.",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "Még nem állítottál be egyetlen weboldalt sem.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Látógató {country} területéről, {os} {device} eszközön, {browser} böngészőből."
 }
diff --git a/lang/id-ID.json b/src/lang/id-ID.json
similarity index 78%
rename from lang/id-ID.json
rename to src/lang/id-ID.json
index 383f405ef..64fed9e1f 100644
--- a/lang/id-ID.json
+++ b/src/lang/id-ID.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "Tambah situs web",
   "label.admin": "Pengelola",
+  "label.after": "After",
   "label.all": "Semua",
   "label.all-time": "Semua waktu",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Waktu kunjungan rata-rata",
   "label.back": "Kembali",
+  "label.before": "Before",
   "label.bounce-rate": "Rasio pentalan",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Peramban",
   "label.cancel": "Batal",
   "label.change-password": "Ganti kata sandi",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Konfirmasi kata sandi",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Negara",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +38,21 @@
   "label.custom-range": "Rentang khusus",
   "label.dashboard": "Dasbor",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Rentang tanggal",
+  "label.day": "Day",
   "label.default-date-range": "Rentang tanggal bawaan",
   "label.delete": "Hapus",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Hapus situs web",
+  "label.description": "Description",
   "label.desktop": "Desktop",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Perangkat",
   "label.dismiss": "Tutup",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Domain",
   "label.dropoff": "Dropoff",
   "label.edit": "Sunting",
@@ -46,12 +61,23 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Perihal",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
+  "label.filter": "Filter",
   "label.filter-combined": "Gabungan",
   "label.filter-raw": "Mentah",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Bahasa",
@@ -61,17 +87,25 @@
   "label.last-hours": "{x} jam terakhir",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Masuk",
   "label.logout": "Keluar",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Ponsel",
   "label.more": "Lebih banyak",
+  "label.my-websites": "My websites",
   "label.name": "Nama",
   "label.new-password": "Kata sandi baru",
   "label.none": "None",
-  "label.operating-systems": "Sistem Operasi",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Pemilik",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Tampilan halaman",
+  "label.pageTitle": "Page title",
   "label.pages": "Halaman",
   "label.password": "Kata sandi",
   "label.powered-by": "Didukung oleh {name}",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Waktu nyata",
+  "label.referrer": "Referrer",
   "label.referrers": "Perujuk",
   "label.refresh": "Segarkan",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Wajib",
   "label.reset": "Atur ulang",
   "label.reset-website": "Atur ulang statistik",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Simpan",
   "label.screens": "Layar",
+  "label.search": "Search",
   "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Pengaturan",
   "label.share-url": "Bagikan URL",
   "label.single-day": "Sehari",
+  "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Tema",
   "label.this-month": "Bulan ini",
@@ -114,14 +156,21 @@
   "label.title": "Title",
   "label.today": "Hari ini",
   "label.toggle-charts": "Buka grafik",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Kode lacak",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Pengunjung unik",
   "label.unknown": "Tidak diketahui",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Nama pengguna",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Lihat Detil",
   "label.view-only": "View only",
@@ -132,33 +181,6 @@
   "label.websites": "Situs web",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} pengunjung saat ini",
   "message.confirm-delete": "Apakah kamu yakin ingin menghapus {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "Nama pengguna/kata sandi salah.",
   "message.invalid-domain": "Domain tidak valid",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Tidak ada data.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Kata sandi tidak cocok",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "Anda tidak memiliki situs web yang dikonfigurasi.",
   "message.page-not-found": "Halaman tidak ditemukan.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Semua statistik pada website ini akan dihapus, tetapi kode lacak akan tetap terpasang",
@@ -184,12 +210,8 @@
   "message.share-url": "Ini adalah URL yang dibagikan secara publik untuk {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Kode lacak",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Pengunjung dari {country} dengan {browser} di {device} {os}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "Anda tidak memiliki situs web yang dikonfigurasi.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Pengunjung dari {country} dengan {browser} di {device} {os}"
 }
diff --git a/lang/it-IT.json b/src/lang/it-IT.json
similarity index 78%
rename from lang/it-IT.json
rename to src/lang/it-IT.json
index 854fd4528..29c664b5b 100644
--- a/lang/it-IT.json
+++ b/src/lang/it-IT.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "Aggiungi sito",
   "label.admin": "Amministratore",
+  "label.after": "After",
   "label.all": "Tutto",
   "label.all-time": "Sempre",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Tempo medio di visita",
   "label.back": "Indietro",
+  "label.before": "Before",
   "label.bounce-rate": "Frequenza di rimbalzo",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Browser",
   "label.cancel": "Annulla",
   "label.change-password": "Modifica password",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Conferma password",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Nazioni",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +38,21 @@
   "label.custom-range": "Personalizzato",
   "label.dashboard": "Pannello di Controllo",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Periodo",
+  "label.day": "Day",
   "label.default-date-range": "Periodo standard",
   "label.delete": "Elimina",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Elimina sito",
+  "label.description": "Description",
   "label.desktop": "Desktop",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Dispositivi",
   "label.dismiss": "Scarta",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Dominio",
   "label.dropoff": "Dropoff",
   "label.edit": "Modifica",
@@ -46,12 +61,23 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Eventi",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
+  "label.filter": "Filter",
   "label.filter-combined": "Aggregati",
   "label.filter-raw": "Raw",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Lingua",
@@ -61,17 +87,25 @@
   "label.last-hours": "Ultime {x} ore",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Accedi",
   "label.logout": "Esci",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Cellulare",
   "label.more": "Dettagli",
+  "label.my-websites": "My websites",
   "label.name": "Nome",
   "label.new-password": "Nuova password",
   "label.none": "None",
-  "label.operating-systems": "Sistemi operativi",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Proprietario",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Visualizzazioni di pagina",
+  "label.pageTitle": "Page title",
   "label.pages": "Pagine",
   "label.password": "Password",
   "label.powered-by": "Powered by {name}",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Tempo reale",
+  "label.referrer": "Referrer",
   "label.referrers": "Referrers",
   "label.refresh": "Ricarica",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Obbligatorio",
   "label.reset": "Reset",
   "label.reset-website": "Resetta le statistiche",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Salva",
   "label.screens": "Screens",
+  "label.search": "Search",
   "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Impostazioni",
   "label.share-url": "Condividi link",
   "label.single-day": "Singolo giorno",
+  "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Tema",
   "label.this-month": "Questo mese",
@@ -114,14 +156,21 @@
   "label.title": "Title",
   "label.today": "Oggi",
   "label.toggle-charts": "Apri/Chiudi i grafici",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Codice di tracking",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Visitatori unici",
   "label.unknown": "Sconosciuto",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Nome utente",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Vedi dettagli",
   "label.view-only": "View only",
@@ -132,33 +181,6 @@
   "label.websites": "Siti web",
   "label.window": "Window",
   "label.yesterday": "Ieri",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} {x, plural, one {visitatore} other {visitatori}} online",
   "message.confirm-delete": "Sei sicuro di voler eliminare {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "Username o password non corretti.",
   "message.invalid-domain": "Dominio non valido",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Nessun dato disponibile.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Le password non corrispondono",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "Non hai ancora configurato alcun sito.",
   "message.page-not-found": "Pagina non trovata",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Tutte le statistiche verranno cancellate per questo sito, ma il tuo codice di tracciamento rimarrà invariato.",
@@ -184,12 +210,8 @@
   "message.share-url": "Questo è l'URL di condivisione per {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Codice di tracking",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Utenti da {country} tramite {browser} su {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "Non hai ancora configurato alcun sito.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Utenti da {country} tramite {browser} su {os} {device}"
 }
diff --git a/src/lang/ja-JP.json b/src/lang/ja-JP.json
new file mode 100644
index 000000000..8e26205e4
--- /dev/null
+++ b/src/lang/ja-JP.json
@@ -0,0 +1,217 @@
+{
+  "label.access-code": "アクセスコード",
+  "label.actions": "アクション",
+  "label.activity-log": "アクティビティログ",
+  "label.add": "追加",
+  "label.add-description": "説明を追加",
+  "label.add-website": "Webサイトの追加",
+  "label.admin": "管理者",
+  "label.after": "直後",
+  "label.all": "すべて",
+  "label.all-time": "すべての時間帯",
+  "label.analytics": "アナリティクス",
+  "label.average": "平均",
+  "label.average-visit-time": "平均滞在時間",
+  "label.back": "戻る",
+  "label.before": "直前",
+  "label.bounce-rate": "直帰率",
+  "label.breakdown": "故障",
+  "label.browser": "ブラウザ",
+  "label.browsers": "ブラウザ",
+  "label.cancel": "キャンセル",
+  "label.change-password": "パスワードの変更",
+  "label.cities": "都市",
+  "label.city": "都市",
+  "label.clear-all": "すべてクリア",
+  "label.confirm": "確認",
+  "label.confirm-password": "パスワード(確認)",
+  "label.contains": "コンテンツ",
+  "label.continue": "続ける",
+  "label.countries": "国名",
+  "label.country": "国",
+  "label.create": "Create",
+  "label.create-report": "レポートの作成",
+  "label.create-team": "チームの作成",
+  "label.create-user": "ユーザーの作成",
+  "label.created": "作成されました",
+  "label.current-password": "現在のパスワード",
+  "label.custom-range": "範囲指定",
+  "label.dashboard": "ダッシュボード",
+  "label.data": "データ",
+  "label.date": "日付",
+  "label.date-range": "期間",
+  "label.day": "日",
+  "label.default-date-range": "デフォルトの期間",
+  "label.delete": "削除",
+  "label.delete-team": "チームの削除",
+  "label.delete-user": "ユーザーの削除",
+  "label.delete-website": "Webサイトの削除",
+  "label.description": "説明",
+  "label.desktop": "デスクトップ",
+  "label.details": "詳細情報",
+  "label.device": "デバイス",
+  "label.devices": "デバイス",
+  "label.dismiss": "却下",
+  "label.does-not-contain": "を含まない",
+  "label.domain": "ドメイン",
+  "label.dropoff": "切り捨て",
+  "label.edit": "編集",
+  "label.edit-dashboard": "ダッシュボードの編集",
+  "label.enable-share-url": "共有URLを有効にする",
+  "label.event": "イベント",
+  "label.event-data": "イベントデータ",
+  "label.events": "イベント",
+  "label.false": "偽",
+  "label.field": "フィールド",
+  "label.fields": "フィールド",
+  "label.filter": "Filter",
+  "label.filter-combined": "統合",
+  "label.filter-raw": "RAW",
+  "label.filters": "フィルター",
+  "label.funnel": "分析",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "超過",
+  "label.greater-than-equals": "以上",
+  "label.insights": "見通し",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "に等しい",
+  "label.is-not": "に等しくない",
+  "label.is-not-set": "未設定",
+  "label.is-set": "設定済み",
+  "label.join": "参加",
+  "label.join-team": "チームに参加",
+  "label.language": "言語",
+  "label.languages": "言語",
+  "label.laptop": "ノートPC",
+  "label.last-days": "過去{x}日間",
+  "label.last-hours": "過去{x}時間",
+  "label.leave": "離脱",
+  "label.leave-team": "チームを離脱",
+  "label.less-than": "未満",
+  "label.less-than-equals": "以下",
+  "label.login": "ログイン",
+  "label.logout": "ログアウト",
+  "label.max": "最大",
+  "label.members": "メンバー",
+  "label.min": "最小",
+  "label.mobile": "携帯電話",
+  "label.more": "もっと見る",
+  "label.my-websites": "マイWebサイト",
+  "label.name": "名前",
+  "label.new-password": "新しいパスワード",
+  "label.none": "なし",
+  "label.os": "OS",
+  "label.overview": "概要",
+  "label.owner": "所有者",
+  "label.page-of": "ページ {current}/{total}",
+  "label.page-views": "閲覧数",
+  "label.pageTitle": "ページタイトル",
+  "label.pages": "ページ",
+  "label.password": "パスワード",
+  "label.powered-by": "Powered by {name}",
+  "label.profile": "プロフィール",
+  "label.queries": "クエリ",
+  "label.query": "クエリ",
+  "label.query-parameters": "クエリパラメーター",
+  "label.realtime": "リアルタイム",
+  "label.referrer": "リファラー",
+  "label.referrers": "リファラー",
+  "label.refresh": "更新",
+  "label.regenerate": "再生成",
+  "label.region": "地域",
+  "label.regions": "地域",
+  "label.remove": "削除",
+  "label.reports": "レポート",
+  "label.required": "必須",
+  "label.reset": "リセット",
+  "label.reset-website": "Webサイトをリセットする",
+  "label.retention": "保持",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
+  "label.role": "ロール",
+  "label.run-query": "クエリ実行",
+  "label.save": "保存",
+  "label.screens": "画面サイズ",
+  "label.search": "Search",
+  "label.select-date": "日付を選択",
+  "label.select-website": "Webサイトを選択",
+  "label.sessions": "セッション",
+  "label.settings": "設定",
+  "label.share-url": "共有URL",
+  "label.single-day": "一日",
+  "label.sum": "合計",
+  "label.tablet": "タブレット",
+  "label.team": "チーム",
+  "label.team-guest": "チームゲスト",
+  "label.team-id": "チームID",
+  "label.team-member": "チームメンバー",
+  "label.team-name": "チーム名",
+  "label.team-owner": "チーム所有者",
+  "label.team-websites": "チームのWebサイト",
+  "label.teams": "チーム",
+  "label.theme": "テーマ",
+  "label.this-month": "今月",
+  "label.this-week": "今週",
+  "label.this-year": "今年",
+  "label.timezone": "タイムゾーン",
+  "label.title": "タイトル",
+  "label.today": "今日",
+  "label.toggle-charts": "グラフを切り替える",
+  "label.total": "累計",
+  "label.total-records": "総記録数",
+  "label.tracking-code": "トラッキングコード",
+  "label.true": "真",
+  "label.type": "種別",
+  "label.unique": "ユニーク",
+  "label.unique-visitors": "ユニーク訪問者数",
+  "label.unknown": "不明",
+  "label.untitled": "無題",
+  "label.url": "URL",
+  "label.urls": "URL",
+  "label.user": "ユーザー",
+  "label.username": "ユーザー名",
+  "label.users": "ユーザー",
+  "label.value": "値",
+  "label.view": "表示",
+  "label.view-details": "詳細を表示",
+  "label.view-only": "表示のみ",
+  "label.views": "表示",
+  "label.visitors": "訪問者",
+  "label.website": "Webサイト",
+  "label.website-id": "WebサイトID",
+  "label.websites": "Webサイト",
+  "label.window": "ウィンドウ",
+  "label.yesterday": "昨日",
+  "message.active-users": "{x} {x, plural, one {アクティブな訪問者} other {アクティブな訪問者}}",
+  "message.confirm-delete": "{target}を削除してもよろしいですか？",
+  "message.confirm-leave": "{target}から離脱してもよろしいですか？",
+  "message.confirm-reset": "{target}をリセットしてもよろしいですか？",
+  "message.delete-account": "このアカウントを削除するには、下のフォームに「{confirmation}」と入力してください。",
+  "message.delete-website": "このWebサイトを削除するには、下のフォームに「{confirmation}」と入力してください。",
+  "message.delete-website-warning": "Webサイトのデータがすべて削除されます。",
+  "message.error": "未知のエラーが発生しました。",
+  "message.event-log": "{url}の{event}",
+  "message.go-to-settings": "設定に移動する",
+  "message.incorrect-username-password": "ユーザー名またはパスワードが間違っています。",
+  "message.invalid-domain": "無効なドメインです。http/httpsを含めないでください。",
+  "message.min-password-length": "最小文字数は{n}文字です",
+  "message.new-version-available": "Umamiの新しいバージョン{version}が利用可能です！",
+  "message.no-data-available": "データがありません。",
+  "message.no-event-data": "イベントデータがありません。",
+  "message.no-match-password": "パスワードが一致しません。",
+  "message.no-results-found": "結果が見つかりません。",
+  "message.no-team-websites": "このチームにはWebサイトがありません。",
+  "message.no-teams": "チームを作成していません。",
+  "message.no-users": "ユーザーが存在しません。",
+  "message.no-websites-configured": "Webサイトが設定されていません。",
+  "message.page-not-found": "ページが見つかりません",
+  "message.reset-website": "このWebサイトをリセットするには、下のフォームに「{confirmation}」と入力してください。",
+  "message.reset-website-warning": "このWebサイトの統計情報はすべて削除されますが、設定はそのまま残ります。",
+  "message.saved": "保存されました。",
+  "message.share-url": "あなたのWebサイトの統計情報は次のURLで公開されています：",
+  "message.team-already-member": "あなたはすでにチームのメンバーです。",
+  "message.team-not-found": "チームが見つかりません。",
+  "message.team-websites-info": "Webサイトはチーム内の誰でも見ることができます。",
+  "message.tracking-code": "このWebサイトの統計情報を追跡するには、HTMLの<head>...</head>セクションに以下のコードを記述します。",
+  "message.user-deleted": "ユーザーが削除されました。",
+  "message.visitor-log": "{os}({device})で{browser}を使用している{country}からの訪問者"
+}
diff --git a/lang/km-KH.json b/src/lang/km-KH.json
similarity index 83%
rename from lang/km-KH.json
rename to src/lang/km-KH.json
index 208442427..2333fe6b8 100644
--- a/lang/km-KH.json
+++ b/src/lang/km-KH.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "បន្ថែមគេហទំព័រ",
   "label.admin": "អ្នកគ្រប់គ្រង",
+  "label.after": "After",
   "label.all": "ទាំងអស់",
   "label.all-time": "គ្រប់ពេល",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "មើលជាមធ្យម",
   "label.back": "ថយក្រោយ",
+  "label.before": "Before",
   "label.bounce-rate": "ចំនួនវិលត្រឡប់",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "កម្មវិធី",
   "label.cancel": "បោះបង់",
   "label.change-password": "ផ្លាស់ប្តូរពាក្យសម្ងាត់",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "បញ្ជាក់ពាក្យសម្ងាត់",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "ប្រទេស",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +38,21 @@
   "label.custom-range": "កំណត់ដោយខ្លួនឯង",
   "label.dashboard": "ផ្ទាំងគ្រប់គ្រង",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "ចន្លោះកាលបរិច្ឆេទ",
+  "label.day": "Day",
   "label.default-date-range": "ចន្លោះកាលបរិច្ឆេទស្រាប់",
   "label.delete": "លុប",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "លុបគេហទំព័រ",
+  "label.description": "Description",
   "label.desktop": "កុំព្យូទ័រលើតុ",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "ឧបករណ៍",
   "label.dismiss": "បដិសេធ",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "ឈ្មោះគេហទំព័រ",
   "label.dropoff": "Dropoff",
   "label.edit": "កែប្រែ",
@@ -46,12 +61,23 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "ព្រឹត្តិការណ៍",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
+  "label.filter": "Filter",
   "label.filter-combined": "រួមបញ្ចូលគ្នា",
   "label.filter-raw": "ដើម",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "ភាសា",
@@ -61,17 +87,25 @@
   "label.last-hours": "{x} ម៉ោងមុន",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Login",
   "label.logout": "ចេញ",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "ទូរស័ព្ទចល័ត",
   "label.more": "បន្ថែម",
+  "label.my-websites": "My websites",
   "label.name": "ឈ្មោះ",
   "label.new-password": "ពាក្យសម្ងាត់​ថ្មី",
   "label.none": "មិនមាន",
-  "label.operating-systems": "ប្រព័ន្ធប្រតិបត្តិការ",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "ម្ចាស់",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "អ្នកមើលទំព័រ",
+  "label.pageTitle": "Page title",
   "label.pages": "ទំព័រ",
   "label.password": "ពាក្យសម្ងាត់​",
   "label.powered-by": "ដំណើរការដោយ {name}",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "ប៉ារ៉ាម៉ែត្រ Query",
   "label.realtime": "ឥលូវនេះ",
+  "label.referrer": "Referrer",
   "label.referrers": "អ្នកណែនាំ",
   "label.refresh": "ផ្ទុកឡើងវិញ",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "ទាមទារ",
   "label.reset": "កំណត់ឡើងវិញ",
   "label.reset-website": "កំណត់ស្ថិតិឡើងវិញ",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "រក្សាទុក",
   "label.screens": "ប្រភេទឧបករណ៍",
+  "label.search": "Search",
   "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "ការកំណត់",
   "label.share-url": "ចែករំលែក URL",
   "label.single-day": "ថ្ងៃតែមួយ",
+  "label.sum": "Sum",
   "label.tablet": "ថេប្លេត",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "រូបរាង",
   "label.this-month": "ខែនេះ",
@@ -114,14 +156,21 @@
   "label.title": "Title",
   "label.today": "ថ្ងៃនេះ",
   "label.toggle-charts": "បិទ/បើកតារាង",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "លេខកូដតាមដាន",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "អ្នកចូលមើលម្នាក់ៗ",
   "label.unknown": "មិនស្គាល់",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "ឈ្មោះ​អ្នកប្រើប្រាស់",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "មើលព័ត៌មានលម្អិត",
   "label.view-only": "View only",
@@ -132,33 +181,6 @@
   "label.websites": "គេហទំព័រ",
   "label.window": "Window",
   "label.yesterday": "ម្សិលមិញ",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "មានអ្នកមើល {x} នាក់ ឥលូវនេះ",
   "message.confirm-delete": "តើអ្នកប្រាកដថាចង់លុប {target} ទេ?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "ឈ្មោះអ្នកប្រើ/ពាក្យសម្ងាត់មិនត្រឹមត្រូវ។",
   "message.invalid-domain": "ឈ្មោះគេហទំព័រមិន​ត្រឹមត្រូវ",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "មិនមានទិន្នន័យទេ។",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "ពាក្យសម្ងាត់មិនត្រូវគ្នាទេ",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "អ្នកមិនទាន់បានដាក់គេហទំព័រណាមួយចូលទេ។",
   "message.page-not-found": "រកមិនឃើញទំព័រ។",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "ស្ថិតិទាំងអស់សម្រាប់គេហទំព័រនេះនឹងត្រូវបានលុប ប៉ុន្តែកូដតាមដានរបស់អ្នកនឹងនៅដដែល។",
@@ -184,12 +210,8 @@
   "message.share-url": "នេះគឺជា URL ដែលបានចែករំលែកជាសាធារណៈសម្រាប់ {target}។",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "លេខកូដតាមដាន",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "អ្នកមើលពីប្រទេស {country} ប្រើប្រាស់កម្មវិធី {browser} លើឧបករណ៍ {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "អ្នកមិនទាន់បានដាក់គេហទំព័រណាមួយចូលទេ។",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "អ្នកមើលពីប្រទេស {country} ប្រើប្រាស់កម្មវិធី {browser} លើឧបករណ៍ {os} {device}"
 }
diff --git a/lang/ko-KR.json b/src/lang/ko-KR.json
similarity index 79%
rename from lang/ko-KR.json
rename to src/lang/ko-KR.json
index 2e4f0e5ac..b4b7d566b 100644
--- a/lang/ko-KR.json
+++ b/src/lang/ko-KR.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "웹사이트 추가",
   "label.admin": "관리자",
+  "label.after": "After",
   "label.all": "전체",
   "label.all-time": "All time",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "평균 방문 시간",
   "label.back": "뒤로",
+  "label.before": "Before",
   "label.bounce-rate": "이탈률",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "브라우저",
   "label.cancel": "취소",
   "label.change-password": "비밀번호 변경",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "비밀번호 확인",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "국가",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +38,21 @@
   "label.custom-range": "범위 지정",
   "label.dashboard": "대시보드",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "날짜 범위",
+  "label.day": "Day",
   "label.default-date-range": "기본 날짜 범위",
   "label.delete": "삭제",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "웹사이트 삭제",
+  "label.description": "Description",
   "label.desktop": "데스크탑",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "기기",
   "label.dismiss": "무시하기",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "도메인",
   "label.dropoff": "Dropoff",
   "label.edit": "편집",
@@ -46,12 +61,23 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "이벤트",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
+  "label.filter": "Filter",
   "label.filter-combined": "합쳐서 보기",
   "label.filter-raw": "전체 보기",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +87,25 @@
   "label.last-hours": "최근 {x} 시간",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "로그인",
   "label.logout": "로그아웃",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "모바일",
   "label.more": "더 보기",
+  "label.my-websites": "My websites",
   "label.name": "이름",
   "label.new-password": "새 비밀번호",
   "label.none": "None",
-  "label.operating-systems": "운영체제",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Owner",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "페이지 뷰(PV)",
+  "label.pageTitle": "Page title",
   "label.pages": "페이지",
   "label.password": "비밀번호",
   "label.powered-by": "이 시스템은 {name}에서 구동되고 있습니다.",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "실시간",
+  "label.referrer": "Referrer",
   "label.referrers": "리퍼러",
   "label.refresh": "새로고침",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "필수",
   "label.reset": "리셋",
   "label.reset-website": "Reset statistics",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "저장",
   "label.screens": "Screens",
+  "label.search": "Search",
   "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "설정",
   "label.share-url": "공유 URL",
   "label.single-day": "하루",
+  "label.sum": "Sum",
   "label.tablet": "태블릿",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "이번 달",
@@ -114,14 +156,21 @@
   "label.title": "Title",
   "label.today": "오늘",
   "label.toggle-charts": "Toggle charts",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "추적 코드",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "순방문자(UV)",
   "label.unknown": "알 수 없음",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "사용자명",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "상세보기",
   "label.view-only": "View only",
@@ -132,33 +181,6 @@
   "label.websites": "웹사이트",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x}명의 사용자가 보는 중입니다.",
   "message.confirm-delete": "{target}을(를) 삭제하시겠습니까?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "사용자 이름/비밀번호가 잘못되었습니다..",
   "message.invalid-domain": "잘못된 도메인",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "사용 가능한 데이터가 없습니다.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "비밀번호가 일치하지 않음",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "구성된 웹 사이트가 없습니다.",
   "message.page-not-found": "페이지를 찾을 수 없습니다.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.",
@@ -184,12 +210,8 @@
   "message.share-url": "이것은 {target}의 공개적으로 공유된 URL입니다.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "추적 코드",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "{os} {device}에서 {browser}을(를) 사용하는 {country}의 방문자",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "구성된 웹 사이트가 없습니다.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "{os} {device}에서 {browser}을(를) 사용하는 {country}의 방문자"
 }
diff --git a/lang/lt-LT.json b/src/lang/lt-LT.json
similarity index 79%
rename from lang/lt-LT.json
rename to src/lang/lt-LT.json
index e8ef150db..13f2b06b5 100644
--- a/lang/lt-LT.json
+++ b/src/lang/lt-LT.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "Pridėti svetainę",
   "label.admin": "Administratorius",
+  "label.after": "After",
   "label.all": "Visi",
   "label.all-time": "Visas laikotarpis",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Vidutinė vizito trukmė",
   "label.back": "Atgal",
+  "label.before": "Before",
   "label.bounce-rate": "Atmetimo rodiklis",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Naršyklės",
   "label.cancel": "Atšaukti",
   "label.change-password": "Pakeisti slaptažodį",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Patvirtinti slaptažodį",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Šalys",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +38,21 @@
   "label.custom-range": "Pasirinktinis intervalas",
   "label.dashboard": "Švieslentė",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Laikotarpis",
+  "label.day": "Day",
   "label.default-date-range": "Numatytasis laikotarpis",
   "label.delete": "Ištrinti",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Ištrinti svetainę",
+  "label.description": "Description",
   "label.desktop": "Desktop",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Įrenginiai",
   "label.dismiss": "Gerai",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Domenas",
   "label.dropoff": "Dropoff",
   "label.edit": "Redaguoti",
@@ -46,12 +61,23 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Įvykiai",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
+  "label.filter": "Filter",
   "label.filter-combined": "Kombinuoti",
   "label.filter-raw": "Neapdoroti",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +87,25 @@
   "label.last-hours": "{x, plural, =0 {Paskutinės # valandų} zero {Paskutinės # valandų} one {Paskutinė # valanda} other {Paskutinės # valandos}}",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Prisijungti",
   "label.logout": "Atsijungti",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Mobilusis",
   "label.more": "Daugiau",
+  "label.my-websites": "My websites",
   "label.name": "Pavadinimas",
   "label.new-password": "Naujas slaptažodis",
   "label.none": "None",
-  "label.operating-systems": "Operacinės sistemos",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Savininkas",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Puslapių peržiūros",
+  "label.pageTitle": "Page title",
   "label.pages": "Puslapiai",
   "label.password": "Slaptažodis",
   "label.powered-by": "Powered by {name}",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Realiuoju laiku",
+  "label.referrer": "Referrer",
   "label.referrers": "Referrers",
   "label.refresh": "Atnaujinti",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Reikalinga",
   "label.reset": "Atstatyti",
   "label.reset-website": "Atstatyti statistikos duomenis",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Išsaugoti",
   "label.screens": "Screens",
+  "label.search": "Search",
   "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Nustatymai",
   "label.share-url": "Pasidalinti nuoroda",
   "label.single-day": "Viena diena",
+  "label.sum": "Sum",
   "label.tablet": "Planšetė",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "Šis mėnuo",
@@ -114,14 +156,21 @@
   "label.title": "Title",
   "label.today": "Šiandien",
   "label.toggle-charts": "Rodyti / slėpti grafikus",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Sekimo kodas",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Unikalūs lankytojai",
   "label.unknown": "Nežinoma",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Vartotojo vardas",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Peržiūrėti detaliau",
   "label.view-only": "View only",
@@ -132,33 +181,6 @@
   "label.websites": "Svetainės",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x, plural, =0 {# aktyvių vartotojų} zero {# aktyvių vartotojų} one {# aktyvus vartotojas} other {# aktyvūs vartotojai}}",
   "message.confirm-delete": "Ar esate tikri, jog norite ištrinti svetainę {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "Neteisingas vartotojo vardas/slaptažodis.",
   "message.invalid-domain": "Klaidingas domenas",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Nėra jokių duomenų.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Slaptažodžiai nesutampa",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "Jūs nesate susikonfiguravę jokių svetainių.",
   "message.page-not-found": "Puslapis nerastas.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Visi šios svetainės statistikos duomenys bus ištrinti, bet sekimo kodas išliks nepaliestas.",
@@ -184,12 +210,8 @@
   "message.share-url": "Tai yra viešai prieinama {target} nuoroda (URL).",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Sekimo kodas",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Lankytojas iš {country}, naudojantis {browser} sistemoje {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "Jūs nesate susikonfiguravę jokių svetainių.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Lankytojas iš {country}, naudojantis {browser} sistemoje {os} {device}"
 }
diff --git a/lang/mn-MN.json b/src/lang/mn-MN.json
similarity index 69%
rename from lang/mn-MN.json
rename to src/lang/mn-MN.json
index 1d9d98124..100d43d8f 100644
--- a/lang/mn-MN.json
+++ b/src/lang/mn-MN.json
@@ -2,25 +2,35 @@
   "label.access-code": "Хандалтын код",
   "label.actions": "Үйлдлүүд",
   "label.activity-log": "Үйл ажиллагааны бүртгэл",
-  "label.add": "Add",
-  "label.add-description": "Add description",
+  "label.add": "Нэмэх",
+  "label.add-description": "Тайлбар нэмэх",
   "label.add-website": "Веб нэмэх",
   "label.admin": "Админ",
+  "label.after": "Хойно",
   "label.all": "Бүх",
   "label.all-time": "Бүх цаг үеийн",
   "label.analytics": "Analytics",
+  "label.average": "Дундаж",
   "label.average-visit-time": "Зочилсон дундаж хугацаа",
   "label.back": "Буцах",
+  "label.before": "Өмнө",
   "label.bounce-rate": "Нэг хуудас үзээд гарсан",
+  "label.breakdown": "Задаргаа",
+  "label.browser": "Хөтөч",
   "label.browsers": "Хөтөч",
   "label.cancel": "Цуцлах",
   "label.change-password": "Нууц үг солих",
   "label.cities": "Хотууд",
+  "label.city": "Хот",
   "label.clear-all": "Бүгдийг арилгах",
   "label.confirm": "Батлах",
   "label.confirm-password": "Шинэ нууц үгээ давтах",
+  "label.contains": "Агуулах",
   "label.continue": "Үргэлжлүүлэх",
   "label.countries": "Улс",
+  "label.country": "Улс",
+  "label.create": "Үүсгэх",
+  "label.create-report": "Тайлан үүсгэх",
   "label.create-team": "Баг үүсгэх",
   "label.create-user": "Хэрэглэгч үүсгэх",
   "label.created": "Үүсгэсэн",
@@ -28,30 +38,46 @@
   "label.custom-range": "Дурын хугацаа",
   "label.dashboard": "Хянах самбар",
   "label.data": "Өгөгдөл",
+  "label.date": "Огноо",
   "label.date-range": "Хугацааны муж",
+  "label.day": "Өдөр",
   "label.default-date-range": "Өгөгдмөл хугацааны муж",
   "label.delete": "Устгах",
   "label.delete-team": "Баг устгах",
   "label.delete-user": "Хэрэглэгч устгах",
   "label.delete-website": "Веб устгах",
+  "label.description": "Тайлбар",
   "label.desktop": "Суурин компьютер",
   "label.details": "Мэдээлэл",
+  "label.device": "Төхөөрөмж",
   "label.devices": "Төхөөрөмж",
   "label.dismiss": "Үл хэргэсэх",
+  "label.does-not-contain": "Агуулахгүй",
   "label.domain": "Домэйн",
-  "label.dropoff": "Dropoff",
+  "label.dropoff": "Уналт",
   "label.edit": "Засах",
   "label.edit-dashboard": "Хянах самбар засах",
   "label.enable-share-url": "Хуваалцах холбоос идэвхжүүлэх",
-  "label.event": "Event",
-  "label.event-data": "Event data",
+  "label.event": "Үйлдэл",
+  "label.event-data": "Үйлдлийн өгөгдөл",
   "label.events": "Үйлдэл",
-  "label.field": "Field",
-  "label.fields": "Fields",
+  "label.false": "Худал",
+  "label.field": "Талбар",
+  "label.fields": "Талбар",
+  "label.filter": "Шүүлтүүр",
   "label.filter-combined": "Нэгтгэсэн",
   "label.filter-raw": "Түүхий",
-  "label.funnel": "Funnel",
-  "label.insights": "Insights",
+  "label.filters": "Шүүлтүүр",
+  "label.funnel": "Цутгал",
+  "label.funnel-description": "Хэрэглэгчдийн шилжилт, уналтын хэмжээг шижнлэх.",
+  "label.greater-than": "Их",
+  "label.greater-than-equals": "Их буюу тэнцүү",
+  "label.insights": "Шинжлэх",
+  "label.insights-description": "Өгөгдлөө хэсэгчлэн хуваах, шүүх байдлаар задлах шинжлэх.",
+  "label.is": "Бол",
+  "label.is-not": "Биш",
+  "label.is-not-set": "Утга оноогоогүй",
+  "label.is-set": "Утга оноосон",
   "label.join": "Нэгдэх",
   "label.join-team": "Багт нэгдэх",
   "label.language": "Хэл",
@@ -61,17 +87,25 @@
   "label.last-hours": "Сүүлийн {x} цаг",
   "label.leave": "Гарах",
   "label.leave-team": "Багаас гарах",
+  "label.less-than": "Бага",
+  "label.less-than-equals": "Бага буюу тэнцүү",
   "label.login": "Нэвтрэх",
   "label.logout": "Гарах",
+  "label.max": "Max",
   "label.members": "Гишүүд",
+  "label.min": "Min",
   "label.mobile": "Утас",
   "label.more": "Цааш",
+  "label.my-websites": "Миний вебүүд",
   "label.name": "Нэр",
   "label.new-password": "Шинэ нууц үг",
   "label.none": "Байхгүй",
-  "label.operating-systems": "Үйлдлийн систем",
+  "label.os": "OS",
+  "label.overview": "Тойм",
   "label.owner": "Эзэмшигч",
+  "label.page-of": "Хуудас {total}-с {current}",
   "label.page-views": "Хуудас үзсэн",
+  "label.pageTitle": "Хуудасны гарчиг",
   "label.pages": "Хуудас",
   "label.password": "Нууц үг",
   "label.powered-by": "{name} дээр суурилсан",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "Query параметр",
   "label.realtime": "Яг одоо",
+  "label.referrer": "Чиглүүлэгч",
   "label.referrers": "Чиглүүлэгч",
   "label.refresh": "Сэргээх",
   "label.regenerate": "Дахин үүсгэх",
+  "label.region": "Бүс",
   "label.regions": "Бүсүүд",
   "label.remove": "Устгах",
-  "label.reports": "Reports",
+  "label.reports": "Тайлан",
   "label.required": "Шаардлагатай",
   "label.reset": "Дахин эхлүүлэх",
   "label.reset-website": "Тоон үзүүлэлтийг дахин эхлүүлэх",
+  "label.retention": "Барилт",
+  "label.retention-description": "Хэрэглэгчид таны веб рүү дахин хандах буюу хэрэглэгчидээ хэр тогтоож буйг хэмжих.",
   "label.role": "Эрх",
-  "label.run-query": "Run query",
+  "label.run-query": "Query ажиллуулах",
   "label.save": "Хадгалах",
   "label.screens": "Дэлгэц",
-  "label.select-date": "Select date",
+  "label.search": "Хайх",
+  "label.select-date": "Огноо сонгох",
   "label.select-website": "Веб сонгох",
   "label.sessions": "Sessions",
   "label.settings": "Тохиргоо",
   "label.share-url": "Хуваалцах холбоос",
   "label.single-day": "Нэг өдөр",
+  "label.sum": "Нийлбэр",
   "label.tablet": "Таблет",
   "label.team": "Баг",
   "label.team-guest": "Багийн зочин",
   "label.team-id": "Багийн ID",
   "label.team-member": "Багийн гишүүн",
+  "label.team-name": "Багийн нэр",
   "label.team-owner": "Багийн эзэмшигч",
+  "label.team-websites": "Багийн вебүүд",
   "label.teams": "Багууд",
   "label.theme": "Загвар",
   "label.this-month": "Энэ сар",
@@ -114,57 +156,37 @@
   "label.title": "Гарчиг",
   "label.today": "Өнөөдөр",
   "label.toggle-charts": "Графикийг харуулах/нуух",
+  "label.total": "Нийт",
+  "label.total-records": "Нийт мөриийн тоо",
   "label.tracking-code": "Мөрдөх код",
+  "label.true": "Үнэн",
+  "label.type": "Төрөл",
+  "label.unique": "Unique",
   "label.unique-visitors": "Зочин",
   "label.unknown": "Тодорхойгүй",
+  "label.untitled": "Гарчиггүй",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Хэрэглэгч",
   "label.username": "Хэрэглэгчийн нэр",
   "label.users": "Хэрэглэгчид",
+  "label.value": "Утга",
   "label.view": "Харах",
   "label.view-details": "Дэлгэрүүлж харах",
-  "label.view-only": "View only",
+  "label.view-only": "Зөвхөн үзэх",
   "label.views": "Үзсэн",
   "label.visitors": "Зочин",
-  "label.website": "Website",
+  "label.website": "Веб",
   "label.website-id": "Вебийн ID",
   "label.websites": "Вебүүд",
-  "label.window": "Window",
+  "label.window": "Цонх",
   "label.yesterday": "Өчигдөр",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "одоо {x} {x, plural, one {зочин} other {зочин}} байна",
   "message.confirm-delete": "Та {target}-г устгахдаа итгэлтэй байна уу?",
   "message.confirm-leave": "Та {target}-с гарахдаа итгэлтэй байна уу?",
   "message.confirm-reset": "Та {target}-н тоон үзүүлэлтүүдийг устгахдаа итгэлтэй байна уу?",
-  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
-  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
+  "message.delete-account": "Энэ бүртгэлийг устгахын тулд доорх хэсэгт {confirmation} гэж бичиж баталгаажуулна уу.",
+  "message.delete-website": "Энэ вебийг устгахын тулд доорх хэсэгт {confirmation} гэж бичиж баталгаажуулна уу.",
   "message.delete-website-warning": "Энэ вебтэй холбоотой бүх өгөгдөл устах болно.",
   "message.error": "Ямар нэг зүйл буруу боллоо.",
   "message.event-log": "{url}-д {event}",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "Буруу хэрэглэгчийн нэр/нууц үг.",
   "message.invalid-domain": "Буруу домэйн",
   "message.min-password-length": "Хамгийн багадаа {n} тэмдэгт",
+  "message.new-version-available": "Umami-н шинэ хувилбар {version} гарсан байна!",
   "message.no-data-available": "Өгөгдөл алга.",
-  "message.no-event-data": "No event data is available.",
+  "message.no-event-data": "Үйлдлийн өгөгдөл алга.",
   "message.no-match-password": "Нууц үг тохирохгүй байна.",
+  "message.no-results-found": "Ямар ч үр дүн олдсонгүй.",
+  "message.no-team-websites": "Энэ багт ямар ч веб алга.",
   "message.no-teams": "Та ямар ч баг үүсгээгүй байна.",
   "message.no-users": "Хэрэглэгч байхгүй байна.",
+  "message.no-websites-configured": "Та ямар нэгэн веб тохируулаагүй байна.",
   "message.page-not-found": "Хуудас олдсонгүй.",
   "message.reset-website": "Тоон үзүүлэлийг дахин эхлүүлэхийн тулд доорх хэсэгт {confirmation} гэж бичиж, баталгаажуулна уу.",
   "message.reset-website-warning": "Энэ вебийн бүх тоон үзүүлэлтүүдийг устгах болно. Гэхдээ мөрдөх код хэвэндээ үлдэнэ.",
@@ -184,12 +210,8 @@
   "message.share-url": "Таны вебийн тоон үзүүлэлтүүд доорх URL дээр нийтэд харагдах болно:",
   "message.team-already-member": "Та аль хэдийн энэ багийн гишүүн болсон байна.",
   "message.team-not-found": "Баг олдсонгүй.",
+  "message.team-websites-info": "Вебийг багийн бүх гишүүд үзэж болно.",
   "message.tracking-code": "Энэ вебийн хандалтуудыг мөрдөхийн тулд доорх кодыг HTML-нхээ <head>...</head> хэсэгт байрлуулна уу.",
   "message.user-deleted": "Хэрэглэгч устсан.",
-  "message.visitor-log": "{country} улсаас {os} {device} дээр {browser} хөтөч ашиглан орсон",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "Энэ багт ямар ч веб алга.",
-  "message.no-websites-configured": "Та ямар нэгэн веб тохируулаагүй байна.",
-  "message.team-websites-info": "Вебийг багийн бүх гишүүд үзэж болно.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "{country} улсаас {os} {device} дээр {browser} хөтөч ашиглан орсон"
 }
diff --git a/lang/ms-MY.json b/src/lang/ms-MY.json
similarity index 78%
rename from lang/ms-MY.json
rename to src/lang/ms-MY.json
index c3a9254ce..256a4d0b6 100644
--- a/lang/ms-MY.json
+++ b/src/lang/ms-MY.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "Tambah laman web",
   "label.admin": "Pentadbir",
+  "label.after": "After",
   "label.all": "Semua",
   "label.all-time": "All time",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Purata tempoh masa lawatan",
   "label.back": "Kembali",
+  "label.before": "Before",
   "label.bounce-rate": "Kadar lantunan",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Pelayar web",
   "label.cancel": "Batal",
   "label.change-password": "Tukar kata laluan",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Sahkan kata laluan",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Negara",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +38,21 @@
   "label.custom-range": "Julat khas",
   "label.dashboard": "Papan pemuka",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Julat tarikh",
+  "label.day": "Day",
   "label.default-date-range": "Julat tarikh lalai",
   "label.delete": "Padam",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Padam laman web",
+  "label.description": "Description",
   "label.desktop": "Desktop",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Peranti",
   "label.dismiss": "Ketepikan",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Domain",
   "label.dropoff": "Dropoff",
   "label.edit": "Edit",
@@ -46,12 +61,23 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Peristiwa",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
+  "label.filter": "Filter",
   "label.filter-combined": "Digabungkan",
   "label.filter-raw": "Mentah",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +87,25 @@
   "label.last-hours": "{x} jam lepas",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Log masuk",
   "label.logout": "Log keluar",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Telefon bimbit",
   "label.more": "Lebih banyak lagi",
+  "label.my-websites": "My websites",
   "label.name": "Nama",
   "label.new-password": "Kata laluan baru",
   "label.none": "None",
-  "label.operating-systems": "Sistem operasi",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Owner",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Paparan halaman",
+  "label.pageTitle": "Page title",
   "label.pages": "Halaman",
   "label.password": "Kata laluan",
   "label.powered-by": "Disediakan oleh {name}",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Siaran langsung",
+  "label.referrer": "Referrer",
   "label.referrers": "Perujuk",
   "label.refresh": "Muat semula",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Diperlukan",
   "label.reset": "Tetapkan semula",
   "label.reset-website": "Reset statistics",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Simpan",
   "label.screens": "Screens",
+  "label.search": "Search",
   "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Tetapan",
   "label.share-url": "Kongsikan URL",
   "label.single-day": "Satu hari",
+  "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "Bulan ini",
@@ -114,14 +156,21 @@
   "label.title": "Title",
   "label.today": "Hari ini",
   "label.toggle-charts": "Toggle charts",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Kod penjejakan",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Pelawat unik",
   "label.unknown": "Tidak diketahui",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Nama pengguna",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Lihat butiran",
   "label.view-only": "View only",
@@ -132,33 +181,6 @@
   "label.websites": "Laman web",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} semasa {x, plural, one {pelawat} other {pelawat}}",
   "message.confirm-delete": "Pastikah anda ingin memadam {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "Pengguna/kata laluan tidak betul.",
   "message.invalid-domain": "Domain tidak sah",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Tiada data yang boleh didapati.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Kata laluan tidak sepadan",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "Anda tidak ada sebarang laman web yang telah dikonfigurasikan.",
   "message.page-not-found": "Halaman tidak dijumpai.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.",
@@ -184,12 +210,8 @@
   "message.share-url": "Ini adalah URL berkongsi untuk {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Kod penjejakan",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Pelawat dari {country} mengguna {browser} pada {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "Anda tidak ada sebarang laman web yang telah dikonfigurasikan.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Pelawat dari {country} mengguna {browser} pada {os} {device}"
 }
diff --git a/src/lang/my-MM.json b/src/lang/my-MM.json
new file mode 100644
index 000000000..704e29496
--- /dev/null
+++ b/src/lang/my-MM.json
@@ -0,0 +1,217 @@
+{
+  "label.access-code": "ဝင်ခွင့်ကုဒ်",
+  "label.actions": "လုပ်ဆောင်ချက်များ",
+  "label.activity-log": "လုပ်ဆောင်ချက်စာရင်း",
+  "label.add": "ထပ်ထည့်မည်",
+  "label.add-description": "အကြောင်းအရာဖော်ပြချက် ထည့်မည်",
+  "label.add-website": "ဝက်ဘ်ဆိုဒ်ထည့်မည်",
+  "label.admin": "အက်ဒမင်",
+  "label.after": "ပြီးနောက်",
+  "label.all": "အားလုံး",
+  "label.all-time": "အချိန်အစမှအခုထိ",
+  "label.analytics": "အန်နလစ်တစ်",
+  "label.average": "ပျမ်းမျှ",
+  "label.average-visit-time": "ဝဘက်ဘ်ဆိုဒ်တွင် ပျမ်းမျှကုန်ဆုံးချိန်",
+  "label.back": "နောက်သို့",
+  "label.before": "မတိုင်မီ",
+  "label.bounce-rate": "Bounce နှုန်း",
+  "label.breakdown": "ခွဲခြမ်းစိတ်ဖြာမှု",
+  "label.browser": "Browser",
+  "label.browsers": "ဝက်ဘ်ဘရောင်ဇာများ",
+  "label.cancel": "မလုပ်တော့ပါ",
+  "label.change-password": "စကားဝှက် ပြောင်းမည်",
+  "label.cities": "မြို့များ",
+  "label.city": "City",
+  "label.clear-all": "အားလုံးကိုဖျက်မည်",
+  "label.confirm": "အတည်ပြုသည်",
+  "label.confirm-password": "စကားဝှက်အတည်ပြုသည်",
+  "label.contains": "ပါဝင်သည်",
+  "label.continue": "ဆက်သွားမည်",
+  "label.countries": "နိုင်ငံများ",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "ရီပို့လုပ်မည်",
+  "label.create-team": "Team ပြုလုပ်မည်",
+  "label.create-user": "အသုံးပြုသူထည့်မည်",
+  "label.created": "ပြုလုပ်ပြီးသော",
+  "label.current-password": "လက်ရှိစကားဝှက်",
+  "label.custom-range": "အချိန်အပိုင်းအခြားရွေးရန်",
+  "label.dashboard": "ဒက်ရှ်ဘုတ်",
+  "label.data": "ဒေတာ",
+  "label.date": "Date",
+  "label.date-range": "ရက်အပိုင်းအခြား",
+  "label.day": "Day",
+  "label.default-date-range": "ပုံသေ ရက်အပိုင်းအခြား",
+  "label.delete": "ဖျက်မည်",
+  "label.delete-team": "Team ကိုဖျက်မည်",
+  "label.delete-user": "အသုံးပြုသူကိုဖျက်မည်",
+  "label.delete-website": "ဝက်ဘ်ဆိုဒ်ကိုဖျက်မည်",
+  "label.description": "ရှင်းပြချက်",
+  "label.desktop": "စားပွဲတင်ကွန်ပျူတာ",
+  "label.details": "အသေးစိတ်",
+  "label.device": "Device",
+  "label.devices": "အသုံးပြုသည့် ကိရိယာများ",
+  "label.dismiss": "ပိတ်ပါ",
+  "label.does-not-contain": "မပါဝင်ပါ",
+  "label.domain": "ဒိုမိန်း",
+  "label.dropoff": "Dropoff",
+  "label.edit": "ပြုပြင်မည်",
+  "label.edit-dashboard": "ဒက်ရှ်ဘုတ်ကို ပြုပြင်မည်",
+  "label.enable-share-url": "ဝေငှခြင်းကိုလင့်ကို ဖွင့်မည်",
+  "label.event": "အဖြစ်အပျက်",
+  "label.event-data": "အဖြစ်အပျက် ဒေတာ",
+  "label.events": "အဖြစ်အပျက်များ",
+  "label.false": "မှားသည်",
+  "label.field": "Field အမည်",
+  "label.fields": "Field အမည်များ",
+  "label.filter": "Filter",
+  "label.filter-combined": "ပေါင်းစပ်ပြီး",
+  "label.filter-raw": "အရှိအတိုင်း",
+  "label.filters": "Filter များ",
+  "label.funnel": "ဖန်နယ်",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "ထက်ပို၍ကြီးသည်",
+  "label.greater-than-equals": "ထက်ပို၍ကြီးသည်သို့မဟုတ်တူသည်",
+  "label.insights": "အသေးစိတ်သိမြင်နိုင်ရန်",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
+  "label.join": "ဝင်မည်",
+  "label.join-team": "အသင်းဝင်မည်",
+  "label.language": "ဘာသာစကား",
+  "label.languages": "ဘာသာစကားများ",
+  "label.laptop": "လက်တော့ပ်",
+  "label.last-days": "လွန်ခဲ့သော {x} ရက်က",
+  "label.last-hours": "လွန်ခဲ့သော {x} နာရီက",
+  "label.leave": "ထွက်မည်",
+  "label.leave-team": "အသင်းမှထွက်မည်",
+  "label.less-than": "ထက်ပို၍ငယ်သည်",
+  "label.less-than-equals": "ထက်ပို၍ငယ်သည်သို့မဟုတ်တူသည်",
+  "label.login": "လော့ဂ်အင်",
+  "label.logout": "လော့ဂ်အောက်လုပ်မည်",
+  "label.max": "အများဆုံး",
+  "label.members": "အဖွဲ့ဝင်များ",
+  "label.min": "အနည်းဆုံး",
+  "label.mobile": "မိုဘိုင်း",
+  "label.more": "နောက်ထပ်",
+  "label.my-websites": "My websites",
+  "label.name": "အမည်",
+  "label.new-password": "စကားဝှက်အသစ်",
+  "label.none": "မရှိပါ",
+  "label.os": "ကွန်ပျူတာလည်ပတ်မှုစနစ်",
+  "label.overview": "အပေါ်ယံမြင်ကွင်း",
+  "label.owner": "ပိုင်ဆိုင်သူ",
+  "label.page-of": "Page {current} of {total}",
+  "label.page-views": "ဝင်ရောက်ကြည့်ရှုသူ",
+  "label.pageTitle": "Page title",
+  "label.pages": "စာမျက်နှာများ",
+  "label.password": "စကားဝှက်",
+  "label.powered-by": "{name} ထောက်ပံ့သည်",
+  "label.profile": "ပရိုဖိုင်း",
+  "label.queries": "Queries (ကွာရီများ)",
+  "label.query": "Query (ကွာရီ)",
+  "label.query-parameters": "Query parameters (ကွာရီပါရာမီတာများ)",
+  "label.realtime": "အချိန်နှင့်တပြေးညီ",
+  "label.referrer": "Referrer",
+  "label.referrers": "ရည်ညွှန်းမှုများ",
+  "label.refresh": "Refresh လုပ်မည်",
+  "label.regenerate": "ပြန်ထုတ်မည်",
+  "label.region": "Region",
+  "label.regions": "ဒေသများ",
+  "label.remove": "ဖျက်မည်",
+  "label.reports": "တင်ပြမှုများ",
+  "label.required": "လိုအပ်သည်",
+  "label.reset": "ပြန်စမည်",
+  "label.reset-website": "ဝက်ဘ်ဆိုဒ်ဒေတာကိုဖျက်မည်",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
+  "label.role": "အခန်းကဏ္ဍ",
+  "label.run-query": "Query ကိုလုပ်ဆောင်မည်",
+  "label.save": "သိမ်းဆည်းမည်",
+  "label.screens": "မြင်ကွင်းများ",
+  "label.search": "Search",
+  "label.select-date": "ရက်ရွေးပါ",
+  "label.select-website": "ဝဘက်ဘ်ဆိုဒ်ရွေးပါ",
+  "label.sessions": "ဆက်ရှင်များ",
+  "label.settings": "ဆက်တင်များ",
+  "label.share-url": "URL ကိုရှဲမည်",
+  "label.single-day": "တစ်ရက်အတွင်း",
+  "label.sum": "ပေါင်းလဒ်",
+  "label.tablet": "တက်ဘလက်",
+  "label.team": "အသင်း",
+  "label.team-guest": "အသင်း ဧည့်သည်",
+  "label.team-id": "အသင်း အိုင်ဒီ",
+  "label.team-member": "အသင်းဝင်",
+  "label.team-name": "Team name",
+  "label.team-owner": "အသင်းကိုပိုင်ဆိုင်သူ",
+  "label.team-websites": "Team websites",
+  "label.teams": "အသင်းများ",
+  "label.theme": "Theme (အပြင်အဆင်)",
+  "label.this-month": "ယခုလ",
+  "label.this-week": "ယခုအပတ်",
+  "label.this-year": "ယခုနှစ်",
+  "label.timezone": "အချိန်ဇုန်",
+  "label.title": "ခေါင်းစဥ်",
+  "label.today": "ယနေ့",
+  "label.toggle-charts": "ဇယားများကို အဖွင့်အပိတ်လုပ်မည်",
+  "label.total": "စုစုပေါင်း",
+  "label.total-records": "မှတ်တမ်းစုစုပေါင်း",
+  "label.tracking-code": "ထရက်လုပ်သည့် ကုဒ်",
+  "label.true": "မှန်သည်",
+  "label.type": "အမျိုးအစား",
+  "label.unique": "Unique",
+  "label.unique-visitors": "ဝင်ရောက်သူ (ထပ်ခြင်းမရှိ)",
+  "label.unknown": "မသိသော",
+  "label.untitled": "ခေါင်းစဉ်မရှိ",
+  "label.url": "URL",
+  "label.urls": "URL များ",
+  "label.user": "အသုံးပြုသူ",
+  "label.username": "အသုံးပြုသူအမည်",
+  "label.users": "အသုံးပြုသူများ",
+  "label.value": "တန်ဖိုး",
+  "label.view": "ဝင်ရောက်ကြည့်ရှုမှု",
+  "label.view-details": "အသေးစိတ်ကို ကြည့်ရှုမည်",
+  "label.view-only": "ဝင်ရောက်ကြည့်ရှုမှုများသာ",
+  "label.views": "ဝင်ရောက်ကြည့်ရှုမှုများ",
+  "label.visitors": "ဝင်ရောက်ကြည့်ရှုသူများ",
+  "label.website": "ဝက်ဘ်ဆိုဒ်",
+  "label.website-id": "ဝက်ဘ်ဆိုဒ် အိုင်ဒီ",
+  "label.websites": "ဝက်ဘ်ဆိုဒ်များ",
+  "label.window": "ဝင်းဒိုး",
+  "label.yesterday": "မနေ့က",
+  "message.active-users": "{x} လက်ရှိအသုံးပြုနေသူ {x, plural, one {ယောက်} other {ယောက်}}",
+  "message.confirm-delete": "{target} ကို ဖျက်ရန် သေချာပါသလား?",
+  "message.confirm-leave": "{target} ကို ထွက်ရန် သေချာပါသလား?",
+  "message.confirm-reset": "{target} ကို ဖျက်၍ပြန်စလုပ်ရန် သေချာပါသလား?",
+  "message.delete-account": "ဤအကောင့်ကိုဖျက်ရန် {confirmation} ကို ရိုက်ထည့်ပေးပါ.",
+  "message.delete-website": "ဤ ဝက်ဘ်ဆိုဒ်ကိုဖျက်ရန် {confirmation} ကို ရိုက်ထည့်ပေးပါ",
+  "message.delete-website-warning": "ဝက်ဘ်ဆိုဒ် ဒေတာအကုန် ဖျက်မည်",
+  "message.error": "မှားယွင်းမှုတစ်ခု ရှိသွားပါသည်",
+  "message.event-log": "{url} တွင် {event}",
+  "message.go-to-settings": "ဆက်တင်သို့ သွားရန်",
+  "message.incorrect-username-password": "အသုံးပြုသူအမည် သို့မဟုတ် စကားဝှက် မှားနေသည်",
+  "message.invalid-domain": "ဒိုမိန်း မမှန်ပါ http/https. မပါရပါ",
+  "message.min-password-length": "အနည်းဆုံး {n} character ရှိရမည်",
+  "message.new-version-available": "အူမာမီ {version} အသစ်ထွက်နေပါပြီ",
+  "message.no-data-available": "ဒေတာ မရှိပါ",
+  "message.no-event-data": "အဖြစ်အပျက်ဒေတာ မရှိပါ",
+  "message.no-match-password": "စကားဝှက် မှားနေသည်",
+  "message.no-results-found": "ရလဒ်မရှိပါ",
+  "message.no-team-websites": "ဤအသင်းတွင် ဝက်ဘ်ဆိုက်မရှိသေးပါ",
+  "message.no-teams": "အသင်း မပြုလုပ်ရသေးပါ",
+  "message.no-users": "အသုံးပြုသူ မရှိသေးပါ",
+  "message.no-websites-configured": "ဝက်ဘ်ဆိုဒ်တစ်ခုမှ မထည့်ရသေးပါ",
+  "message.page-not-found": "ဤစာမျက်နှာသည် မရှိပါ",
+  "message.reset-website": "ဤ ဝက်ဘ်ဆိုဒ်ဒေတာကိုဖျက်၍ ပြန်စလုပ်ရန် အောက်တွင် {confirmation} ကို ရိုက်ထည့်ပေးပါ",
+  "message.reset-website-warning": "ဤဝက်ဘ်ဆိုဒ်က စာရင်းအချက်အလက်များကို ဖျက်မည်၊ ဆက်တင်ဒေတာများ မပါပါ",
+  "message.saved": "မှတ်သားပြီး",
+  "message.share-url": "သင့်ဝက်ဆိုဒ်ဘ်၏ စာရင်းအချက်အလက်များကို အောက်ပါ URL တွင် ဝင်ရောက်ကြည့်ရှုနိုင်သည်",
+  "message.team-already-member": "ဤအသင်းတွင် ဝင်ပြီးသားဖြစ်နေသည်",
+  "message.team-not-found": "အသင်း မရှိပါ",
+  "message.team-websites-info": "ဤဝက်ဘ်ဆိုဒ်များကို အသင်းထဲမှ လူတိုင်းဝင်ကြည့်နိုင်သည်",
+  "message.tracking-code": "ဤဝက်ဘ်ဆိုဒ်၏ ဒေတာကိုကောက်ခံရန် အောက်ပါ code ကို သင်၏ HTML တွင်ထည့်ပါ",
+  "message.user-deleted": "အသုံးပြုသူ ဖျက်ပြီးပါပြီ",
+  "message.visitor-log": "{country} မှ {browser} ဖြင့် {os} {device} တွင် ဝင်ရောက်ကြည့်ရှုသူ"
+}
diff --git a/lang/nb-NO.json b/src/lang/nb-NO.json
similarity index 78%
rename from lang/nb-NO.json
rename to src/lang/nb-NO.json
index fcd299653..5744d211c 100644
--- a/lang/nb-NO.json
+++ b/src/lang/nb-NO.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "Legg til nettsted",
   "label.admin": "Administrator",
+  "label.after": "After",
   "label.all": "Alle",
   "label.all-time": "Noensinne",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Gjennomsnittlig besøkstid",
   "label.back": "Tilbake",
+  "label.before": "Before",
   "label.bounce-rate": "Avvisningsfrekvens",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Nettlesere",
   "label.cancel": "Avvis",
   "label.change-password": "Bytt passord",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Godkjenn passord",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Land",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +38,21 @@
   "label.custom-range": "Egendefinert utvalg",
   "label.dashboard": "Dashbord",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Datointervall",
+  "label.day": "Day",
   "label.default-date-range": "Standard datoperiode",
   "label.delete": "Slett",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Slett nettstedet",
+  "label.description": "Description",
   "label.desktop": "Stasjonær",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Enheter",
   "label.dismiss": "Avbryt",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Domene",
   "label.dropoff": "Dropoff",
   "label.edit": "Rediger",
@@ -46,12 +61,23 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Arrangementer",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
+  "label.filter": "Filter",
   "label.filter-combined": "Kombinert",
   "label.filter-raw": "Rå",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Språk",
@@ -61,17 +87,25 @@
   "label.last-hours": "Siste {x} timer",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Logg inn",
   "label.logout": "Logg ut",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Mobiltelefon",
   "label.more": "Mer",
+  "label.my-websites": "My websites",
   "label.name": "Navn",
   "label.new-password": "Nytt passord",
   "label.none": "None",
-  "label.operating-systems": "Operativsystemer",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Eier",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Sidevisninger",
+  "label.pageTitle": "Page title",
   "label.pages": "Sider",
   "label.password": "Passord",
   "label.powered-by": "Drevet av {name}",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Sanntid",
+  "label.referrer": "Referrer",
   "label.referrers": "Referanser",
   "label.refresh": "Oppdater",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Påkrevd",
   "label.reset": "Nullstill",
   "label.reset-website": "Nullstill statistikk",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Lagre",
   "label.screens": "Screens",
+  "label.search": "Search",
   "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Innstillinger",
   "label.share-url": "Del URL",
   "label.single-day": "Enkelt dag",
+  "label.sum": "Sum",
   "label.tablet": "Nettbrett",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "Denne måneden",
@@ -114,14 +156,21 @@
   "label.title": "Title",
   "label.today": "I dag",
   "label.toggle-charts": "Veksle grafer",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Sporingskode",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Unike besøkende",
   "label.unknown": "Ukjent",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Brukernavn",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Vis detaljer",
   "label.view-only": "View only",
@@ -132,33 +181,6 @@
   "label.websites": "Nettsteder",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} {x, plural, one {besøkende} other {besøkende}} nå",
   "message.confirm-delete": "Er du sikker på at du vil slette {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "Ugyldig brukernavn/passord.",
   "message.invalid-domain": "Ugyldig domene",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Ingen data tilgjengelig.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Passordene er ikke like",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "Du har ikke satt opp noen nettsteder.",
   "message.page-not-found": "Side ikke funnet.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "All statistikk for denne nettsiden vil bli slettet, men sporingskoden din vil forbli uberørt.",
@@ -184,12 +210,8 @@
   "message.share-url": "Dette er den offentlige delings-URL-en for {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Sporingskode",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Besøkende fra {country} med {browser} på {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "Du har ikke satt opp noen nettsteder.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Besøkende fra {country} med {browser} på {os} {device}"
 }
diff --git a/lang/nl-NL.json b/src/lang/nl-NL.json
similarity index 79%
rename from lang/nl-NL.json
rename to src/lang/nl-NL.json
index 90b4ea40c..9dfcbb92a 100644
--- a/lang/nl-NL.json
+++ b/src/lang/nl-NL.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "Website koppelen",
   "label.admin": "Beheerder",
+  "label.after": "After",
   "label.all": "Alles",
   "label.all-time": "Onbeperkt",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Gemiddelde bezoektijd",
   "label.back": "Terug",
+  "label.before": "Before",
   "label.bounce-rate": "Bouncepercentage",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Browsers",
   "label.cancel": "Annuleren",
   "label.change-password": "Wachtwoord wijzigen",
   "label.cities": "Steden",
+  "label.city": "City",
   "label.clear-all": "Filters wissen",
   "label.confirm": "Bevestigen",
   "label.confirm-password": "Wachtwoord bevestigen",
+  "label.contains": "Contains",
   "label.continue": "Doorgaan",
   "label.countries": "Landen",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Create report",
   "label.create-team": "Team aanmaken",
   "label.create-user": "Gebruiker maken",
   "label.created": "Gemaakt",
@@ -28,16 +38,21 @@
   "label.custom-range": "Aangepast bereik",
   "label.dashboard": "Overzicht",
   "label.data": "Gegevens",
+  "label.date": "Date",
   "label.date-range": "Datumbereik",
+  "label.day": "Day",
   "label.default-date-range": "Standaard bereik",
   "label.delete": "Verwijderen",
   "label.delete-team": "Team verwijderen",
   "label.delete-user": "Verwijder gebruiker",
   "label.delete-website": "Website verwijderen",
+  "label.description": "Description",
   "label.desktop": "Computer",
   "label.details": "Informatie",
+  "label.device": "Device",
   "label.devices": "Apparaten",
   "label.dismiss": "Negeren",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Domein",
   "label.dropoff": "Dropoff",
   "label.edit": "Bewerken",
@@ -46,12 +61,23 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Gebeurtenissen",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
+  "label.filter": "Filter",
   "label.filter-combined": "Gecombineerd",
   "label.filter-raw": "Ruw",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Lid worden",
   "label.join-team": "Word lid van een team",
   "label.language": "Taal",
@@ -61,17 +87,25 @@
   "label.last-hours": "Laatste {x} uur",
   "label.leave": "Verlaten",
   "label.leave-team": "Verlaat team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Inloggen",
   "label.logout": "Uitloggen",
+  "label.max": "Max",
   "label.members": "Gebruikers",
+  "label.min": "Min",
   "label.mobile": "Mobiel",
   "label.more": "Toon meer",
+  "label.my-websites": "My websites",
   "label.name": "Naam",
   "label.new-password": "Nieuw wachtwoord",
   "label.none": "Geen",
-  "label.operating-systems": "Besturingssystemen",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Eigenaar",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Paginaweergaven",
+  "label.pageTitle": "Page title",
   "label.pages": "Pagina's",
   "label.password": "Wachtwoord",
   "label.powered-by": "mogelijk gemaakt door {name}",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "URL-parameters",
   "label.realtime": "Actueel",
+  "label.referrer": "Referrer",
   "label.referrers": "Verwijzers",
   "label.refresh": "Vernieuwen",
   "label.regenerate": "Opnieuw genereren",
+  "label.region": "Region",
   "label.regions": "Regio's",
   "label.remove": "Verwijderen",
   "label.reports": "Reports",
   "label.required": "Verplicht",
   "label.reset": "Opnieuw instellen",
   "label.reset-website": "Statistieken opnieuw instellen",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Gebruikersrol",
   "label.run-query": "Run query",
   "label.save": "Opslaan",
   "label.screens": "Schermen",
+  "label.search": "Search",
   "label.select-date": "Select date",
   "label.select-website": "Website selecteren",
   "label.sessions": "Sessies",
   "label.settings": "Instellingen",
   "label.share-url": "URL delen",
   "label.single-day": "Enkele dag",
+  "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-guest": "Team gast",
   "label.team-id": "Team ID",
   "label.team-member": "Teamlid",
+  "label.team-name": "Team name",
   "label.team-owner": "Teameigenaar",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Thema",
   "label.this-month": "Deze maand",
@@ -114,14 +156,21 @@
   "label.title": "Titel",
   "label.today": "Vandaag",
   "label.toggle-charts": "Grafieken tonen/verbergen",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Volgcode",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Unieke bezoekers",
   "label.unknown": "Onbekend",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Gebruiker",
   "label.username": "Gebruikersnaam",
   "label.users": "Gebruikers",
+  "label.value": "Value",
   "label.view": "Weergave",
   "label.view-details": "Meer details",
   "label.view-only": "View only",
@@ -132,33 +181,6 @@
   "label.websites": "Websites",
   "label.window": "Window",
   "label.yesterday": "Gisteren",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} actieve {x, plural, one {bezoeker} other {bezoekers}}",
   "message.confirm-delete": "Weet je zeker dat je {target} wilt verwijderen?",
   "message.confirm-leave": "Weet je zeker dat je {target} wilt verlaten?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "Incorrecte gebruikersnaam/wachtwoord.",
   "message.invalid-domain": "Ongeldig domein",
   "message.min-password-length": "Minimale lengte van {n} tekens",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Geen gegevens beschikbaar.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Wachtwoorden komen niet overeen",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "Er zijn geen websites gekoppeld aan dit team.",
   "message.no-teams": "Er zijn nog geen teams aangemaakt.",
   "message.no-users": "Er zijn geen gebruikers.",
+  "message.no-websites-configured": "Je hebt geen websites ingesteld.",
   "message.page-not-found": "Pagina niet gevonden.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Alle bijhorende statistieken van deze website worden verwijderd, maar jouw volgcode blijft gelden.",
@@ -184,12 +210,8 @@
   "message.share-url": "Met deze URL kan {target} openbaar gedeeld worden.",
   "message.team-already-member": "Je bent al lid van het team.",
   "message.team-not-found": "Team niet gevonden.",
+  "message.team-websites-info": "Websites kunnen door iedereen in het team worden bekeken.",
   "message.tracking-code": "Volgcode",
   "message.user-deleted": "Gebruiker verwijderd.",
-  "message.visitor-log": "Bezoeker uit {country} met {browser} op een {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "Er zijn geen websites gekoppeld aan dit team.",
-  "message.no-websites-configured": "Je hebt geen websites ingesteld.",
-  "message.team-websites-info": "Websites kunnen door iedereen in het team worden bekeken.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Bezoeker uit {country} met {browser} op een {os} {device}"
 }
diff --git a/lang/pl-PL.json b/src/lang/pl-PL.json
similarity index 79%
rename from lang/pl-PL.json
rename to src/lang/pl-PL.json
index 79823f572..37a77b2e6 100644
--- a/lang/pl-PL.json
+++ b/src/lang/pl-PL.json
@@ -6,21 +6,31 @@
   "label.add-description": "Dodaj opis",
   "label.add-website": "Dodaj witrynę",
   "label.admin": "Administrator",
+  "label.after": "Po",
   "label.all": "Wszystkie",
   "label.all-time": "Cały czas",
   "label.analytics": "Analityka",
+  "label.average": "Średnia",
   "label.average-visit-time": "Średni czas wizyty",
   "label.back": "Powrót",
+  "label.before": "Przed",
   "label.bounce-rate": "Współczynnik odrzuceń",
+  "label.breakdown": "Rozbicie",
+  "label.browser": "Browser",
   "label.browsers": "Przeglądarki",
   "label.cancel": "Anuluj",
   "label.change-password": "Zmień hasło",
   "label.cities": "Miasta",
+  "label.city": "City",
   "label.clear-all": "Wyczyść wszystko",
   "label.confirm": "Potwierdź",
   "label.confirm-password": "Potwierdź hasło",
+  "label.contains": "Zawiera",
   "label.continue": "Kontynuuj",
   "label.countries": "Kraje",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Stwórz raport",
   "label.create-team": "Utwórz zespół",
   "label.create-user": "Utwórz użytkownika",
   "label.created": "Utworzony",
@@ -28,16 +38,21 @@
   "label.custom-range": "Zakres niestandardowy",
   "label.dashboard": "Panel",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Zakres dat",
+  "label.day": "Day",
   "label.default-date-range": "Domyślny zakres dat",
   "label.delete": "Usuń",
   "label.delete-team": "Usuń zespół",
   "label.delete-user": "Usuń użytkownika",
   "label.delete-website": "Usuń witrynę",
+  "label.description": "Opis",
   "label.desktop": "Komputer",
   "label.details": "Szczegóły",
+  "label.device": "Device",
   "label.devices": "Urządzenia",
   "label.dismiss": "Odrzuć",
+  "label.does-not-contain": "Nie zawiera",
   "label.domain": "Domena",
   "label.dropoff": "Dropoff",
   "label.edit": "Edytuj",
@@ -46,12 +61,23 @@
   "label.event": "Event",
   "label.event-data": "Dane zdarzenia",
   "label.events": "Zdarzenia",
+  "label.false": "Fałsz",
   "label.field": "Pole",
   "label.fields": "Pola",
+  "label.filter": "Filter",
   "label.filter-combined": "Połączone",
   "label.filter-raw": "Surowe dane",
+  "label.filters": "Filtry",
   "label.funnel": "Lejek",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Większe niż",
+  "label.greater-than-equals": "Większe niż lub równe",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Równe",
+  "label.is-not": "Nie jest równe",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Dołącz",
   "label.join-team": "Dołącz do zespołu",
   "label.language": "Język",
@@ -61,17 +87,25 @@
   "label.last-hours": "Ostatnie {x} godzin",
   "label.leave": "Opuść",
   "label.leave-team": "Opuść zespół",
+  "label.less-than": "Mniejsze niż",
+  "label.less-than-equals": "Mniejsze niż lub równe",
   "label.login": "Zaloguj się",
   "label.logout": "Wyloguj",
+  "label.max": "Maks",
   "label.members": "Członkowie",
+  "label.min": "Min",
   "label.mobile": "Smartfon",
   "label.more": "Więcej",
+  "label.my-websites": "My websites",
   "label.name": "Nazwa",
   "label.new-password": "Nowe hasło",
   "label.none": "Brak",
-  "label.operating-systems": "System operacyjny",
+  "label.os": "OS",
+  "label.overview": "Przegląd",
   "label.owner": "Właściciel",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Wyświetlenia strony",
+  "label.pageTitle": "Page title",
   "label.pages": "Strony",
   "label.password": "Hasło",
   "label.powered-by": "Obsługiwane przez {name}",
@@ -80,31 +114,39 @@
   "label.query": "Zapytanie",
   "label.query-parameters": "Parametry zapytania",
   "label.realtime": "Czas rzeczywisty",
+  "label.referrer": "Referrer",
   "label.referrers": "Źródła odsyłające",
   "label.refresh": "Odśwież",
   "label.regenerate": "Wygeneruj ponownie",
+  "label.region": "Region",
   "label.regions": "Regiony",
   "label.remove": "Usuń",
   "label.reports": "Raporty",
   "label.required": "Wymagany",
   "label.reset": "Zresetuj",
   "label.reset-website": "Zresetuj statystyki",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Role",
   "label.run-query": "Uruchom zapytanie",
   "label.save": "Zapisz",
   "label.screens": "Ekrany",
+  "label.search": "Search",
   "label.select-date": "Wybierz datę",
   "label.select-website": "Wybierz witrynę",
   "label.sessions": "Sesje",
   "label.settings": "Ustawienia",
   "label.share-url": "Udostępnij adres URL",
   "label.single-day": "W tym dniu",
+  "label.sum": "Suma",
   "label.tablet": "Tablet",
   "label.team": "Zespół",
   "label.team-guest": "Gość zespołu",
   "label.team-id": "ID zespołu",
   "label.team-member": "Członek zespołu",
+  "label.team-name": "Team name",
   "label.team-owner": "Właściciel zespołu",
+  "label.team-websites": "Team websites",
   "label.teams": "Zespoły",
   "label.theme": "Motyw",
   "label.this-month": "W tym miesiącu",
@@ -114,14 +156,21 @@
   "label.title": "Tytuł",
   "label.today": "Dzisiaj",
   "label.toggle-charts": "Przełącz wykresy",
+  "label.total": "W sumie",
+  "label.total-records": "Suma rekordów",
   "label.tracking-code": "Kod śledzenia",
+  "label.true": "Prawda",
+  "label.type": "Typ",
+  "label.unique": "Unikalne",
   "label.unique-visitors": "Unikalni odwiedzający",
   "label.unknown": "Nieznany",
+  "label.untitled": "Bez tytułu",
   "label.url": "Link",
   "label.urls": "Linki",
   "label.user": "Użytkownik",
   "label.username": "Nazwa użytkownika",
   "label.users": "Użytkownicy",
+  "label.value": "Wartość",
   "label.view": "Zobacz",
   "label.view-details": "Pokaż szczegóły",
   "label.view-only": "Tylko do odczytu",
@@ -132,33 +181,6 @@
   "label.websites": "Witryny",
   "label.window": "Okno",
   "label.yesterday": "Wczoraj",
-  "labels.after": "Po",
-  "labels.average": "Średnia",
-  "labels.before": "Przed",
-  "labels.breakdown": "Rozbicie",
-  "labels.contains": "Zawiera",
-  "labels.create-report": "Stwórz raport",
-  "labels.description": "Opis",
-  "labels.does-not-contain": "Nie zawiera",
-  "labels.does-not-equal": "Nie jest równe",
-  "labels.equals": "Równe",
-  "labels.false": "Fałsz",
-  "labels.filters": "Filtry",
-  "labels.greater-than": "Większe niż",
-  "labels.greater-than-equals": "Większe niż lub równe",
-  "labels.less-than": "Mniejsze niż",
-  "labels.less-than-equals": "Mniejsze niż lub równe",
-  "labels.max": "Maks",
-  "labels.min": "Min",
-  "labels.overview": "Przegląd",
-  "labels.sum": "Suma",
-  "labels.total": "W sumie",
-  "labels.total-records": "Suma rekordów",
-  "labels.true": "Prawda",
-  "labels.type": "Typ",
-  "labels.unique": "Unikalne",
-  "labels.untitled": "Bez tytułu",
-  "labels.value": "Wartość",
   "message.active-users": "{x} aktualnie {x, plural, one {odwiedzający} other {odwiedzających}}",
   "message.confirm-delete": "Czy na pewno chcesz usunąć {target}?",
   "message.confirm-leave": "Czy na pewno chcesz opuścić {target}?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "Nieprawidłowa nazwa użytkownika/hasło.",
   "message.invalid-domain": "Nieprawidłowa witryna",
   "message.min-password-length": "Minimalna długość {n} znaków",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Brak dostępnych danych.",
   "message.no-event-data": "Brak dostępnych danych o zdarzeniach.",
   "message.no-match-password": "Hasła się nie zgadzają",
+  "message.no-results-found": "Nie znaleziono wyników.",
+  "message.no-team-websites": "Ten zespół nie ma żadnych witryn internetowych.",
   "message.no-teams": "Nie stworzyłeś żadnych zespołów.",
   "message.no-users": "Nie ma żadnych użytkowników.",
+  "message.no-websites-configured": "Nie masz skonfigurowanych żadnych witryn internetowych.",
   "message.page-not-found": "Strona nie znaleziona.",
   "message.reset-website": "Aby zresetować tę witrynę, wpisz {confirmation} w polu poniżej, aby potwierdzić.",
   "message.reset-website-warning": "Wszystkie statystyki tej witryny zostaną usunięte, ale kod śledzenia pozostanie nienaruszony.",
@@ -184,12 +210,8 @@
   "message.share-url": "To jest publicznie udostępniany adres URL dla {target}.",
   "message.team-already-member": "Jesteś już członkiem zespołu.",
   "message.team-not-found": "Nie znaleziono zespołu.",
+  "message.team-websites-info": "Strony internetowe mogą być przeglądane przez każdego członka zespołu.",
   "message.tracking-code": "Kod śledzenia",
   "message.user-deleted": "Użytkownik usunięty.",
-  "message.visitor-log": "Odwiedzający z {country} używa {browser} na {os} {device}",
-  "message.no-results-found": "Nie znaleziono wyników.",
-  "message.no-team-websites": "Ten zespół nie ma żadnych witryn internetowych.",
-  "message.no-websites-configured": "Nie masz skonfigurowanych żadnych witryn internetowych.",
-  "message.team-websites-info": "Strony internetowe mogą być przeglądane przez każdego członka zespołu.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Odwiedzający z {country} używa {browser} na {os} {device}"
 }
diff --git a/lang/pt-BR.json b/src/lang/pt-BR.json
similarity index 79%
rename from lang/pt-BR.json
rename to src/lang/pt-BR.json
index dd1edf0b3..ae3459863 100644
--- a/lang/pt-BR.json
+++ b/src/lang/pt-BR.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "Adicionar site",
   "label.admin": "Administrador",
+  "label.after": "Depois",
   "label.all": "Todos",
   "label.all-time": "Todo o período",
   "label.analytics": "Estatísticas",
+  "label.average": "Average",
   "label.average-visit-time": "Tempo médio da visita",
   "label.back": "Voltar",
+  "label.before": "Antes",
   "label.bounce-rate": "Taxa de rejeição",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Navegadores",
   "label.cancel": "Cancelar",
   "label.change-password": "Alterar a senha",
   "label.cities": "Cidades",
+  "label.city": "City",
   "label.clear-all": "Limpar tudo",
   "label.confirm": "Confirmar",
   "label.confirm-password": "Confirme a nova senha",
+  "label.contains": "Contains",
   "label.continue": "Continuar",
   "label.countries": "Países",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Criar relatório",
   "label.create-team": "Criar time",
   "label.create-user": "Criar usuário",
   "label.created": "Criado",
@@ -28,16 +38,21 @@
   "label.custom-range": "Intervalo personalizado",
   "label.dashboard": "Painel",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Intervalo de datas",
+  "label.day": "Day",
   "label.default-date-range": "Intervalo de datas predefinido",
   "label.delete": "Remover",
   "label.delete-team": "Remover time",
   "label.delete-user": "Remover usuário",
   "label.delete-website": "Remover site",
+  "label.description": "Descrição",
   "label.desktop": "Computador",
   "label.details": "Detalhes",
+  "label.device": "Device",
   "label.devices": "Dispositivos",
   "label.dismiss": "Dispensar",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Domínio",
   "label.dropoff": "Dropoff",
   "label.edit": "Editar",
@@ -46,12 +61,23 @@
   "label.event": "Evento",
   "label.event-data": "Event data",
   "label.events": "Eventos",
+  "label.false": "False",
   "label.field": "Campo",
   "label.fields": "Campos",
+  "label.filter": "Filter",
   "label.filter-combined": "Combinado",
   "label.filter-raw": "Dados brutos",
+  "label.filters": "Filters",
   "label.funnel": "Funil",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Maior que",
+  "label.greater-than-equals": "Maior que ou igual",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Entrar",
   "label.join-team": "Entrar no time",
   "label.language": "Idioma",
@@ -61,17 +87,25 @@
   "label.last-hours": "Últimas {x} horas",
   "label.leave": "Sair",
   "label.leave-team": "Sair do time",
+  "label.less-than": "Menor que",
+  "label.less-than-equals": "Menor que ou igual",
   "label.login": "Iniciar sessão",
   "label.logout": "Sair",
+  "label.max": "Max",
   "label.members": "Membros",
+  "label.min": "Min",
   "label.mobile": "Celular",
   "label.more": "Mais",
+  "label.my-websites": "My websites",
   "label.name": "Nome",
   "label.new-password": "Nova senha",
   "label.none": "Nenhum",
-  "label.operating-systems": "Sistemas operacionais",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Proprietário",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Visualizações de página",
+  "label.pageTitle": "Page title",
   "label.pages": "Páginas",
   "label.password": "Senha",
   "label.powered-by": "Distribuído por {name}",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "Parâmetros de Consulta",
   "label.realtime": "Tempo real",
+  "label.referrer": "Referrer",
   "label.referrers": "Referências",
   "label.refresh": "Atualizar",
   "label.regenerate": "Regerar",
+  "label.region": "Region",
   "label.regions": "Regiões",
   "label.remove": "Remover",
   "label.reports": "Reports",
   "label.required": "Obrigatório",
   "label.reset": "Redefinir",
   "label.reset-website": "Redefinir estatísticas",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Papel",
   "label.run-query": "Executar query",
   "label.save": "Salvar",
   "label.screens": "Telas",
+  "label.search": "Search",
   "label.select-date": "Selecionar data",
   "label.select-website": "Selecionar site",
   "label.sessions": "Sessões",
   "label.settings": "Configurações",
   "label.share-url": "Link de compartilhamento",
   "label.single-day": "Dia específico",
+  "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Time",
   "label.team-guest": "Convidado",
   "label.team-id": "ID do Time",
   "label.team-member": "Membro",
+  "label.team-name": "Team name",
   "label.team-owner": "Proprietário",
+  "label.team-websites": "Team websites",
   "label.teams": "Times",
   "label.theme": "Tema",
   "label.this-month": "Este mês",
@@ -114,14 +156,21 @@
   "label.title": "Título",
   "label.today": "Hoje",
   "label.toggle-charts": "Mostrar/Esconder gráficos",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Código de rastreamento",
+  "label.true": "True",
+  "label.type": "Tipo",
+  "label.unique": "Único",
   "label.unique-visitors": "Visitantes únicos",
   "label.unknown": "Desconhecido",
+  "label.untitled": "Sem título",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Usuário",
   "label.username": "Nome de usuário",
   "label.users": "Usuários",
+  "label.value": "Valor",
   "label.view": "Ver",
   "label.view-details": "Ver detalhes",
   "label.view-only": "Somente visualização",
@@ -132,33 +181,6 @@
   "label.websites": "Sites",
   "label.window": "Janela",
   "label.yesterday": "Ontem",
-  "labels.after": "Depois",
-  "labels.average": "Average",
-  "labels.before": "Antes",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Criar relatório",
-  "labels.description": "Descrição",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Maior que",
-  "labels.greater-than-equals": "Maior que ou igual",
-  "labels.less-than": "Menor que",
-  "labels.less-than-equals": "Menor que ou igual",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Tipo",
-  "labels.unique": "Único",
-  "labels.untitled": "Sem título",
-  "labels.value": "Valor",
   "message.active-users": "{x} {x, plural, one {visitante} other {visitantes}} neste momento",
   "message.confirm-delete": "Deseja realmente remover {target}?",
   "message.confirm-leave": "Você tem certeza que deseja sair de {target}?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "O nome de usuário e/ou senha está incorreto.",
   "message.invalid-domain": "Domínio inválido",
   "message.min-password-length": "Quantidade mínima de {n} caracteres",
+  "message.new-version-available": "Uma nova versão do Umami {version} está disponível!",
   "message.no-data-available": "Sem dados disponíveis.",
   "message.no-event-data": "Nenhum dado de evento está disponível.",
   "message.no-match-password": "As senhas não correspondem",
+  "message.no-results-found": "Nenhum resultado foi encontrado.",
+  "message.no-team-websites": "Este time não possui nenhum site.",
   "message.no-teams": "Você não criou nenhum time.",
   "message.no-users": "Não há nenhum usuário.",
+  "message.no-websites-configured": "Nenhum site foi configurado ainda.",
   "message.page-not-found": "Página não encontrada.",
   "message.reset-website": "Para redefinir este site, digite {confirmation} na caixa abaixo para confirmar.",
   "message.reset-website-warning": "Todas as estatísticas deste site serão removidas, mas seu código de rastreamento permanecerá intacto.",
@@ -184,12 +210,8 @@
   "message.share-url": "Este é o link público de compartilhamento para {target}.",
   "message.team-already-member": "Você já um membro do time.",
   "message.team-not-found": "Time não encontrado.",
+  "message.team-websites-info": "Os sites podem ser visualizados por qualquer membro da equipe.",
   "message.tracking-code": "Código de rastreamento",
   "message.user-deleted": "Usuário removido.",
-  "message.visitor-log": "Visitante de {country} usando {browser} no {device} {os}",
-  "message.no-results-found": "Nenhum resultado foi encontrado.",
-  "message.no-team-websites": "Este time não possui nenhum site.",
-  "message.no-websites-configured": "Nenhum site foi configurado ainda.",
-  "message.team-websites-info": "Os sites podem ser visualizados por qualquer membro da equipe.",
-  "message.new-version-available": "Uma nova versão do Umami {version} está disponível!"
+  "message.visitor-log": "Visitante de {country} usando {browser} no {device} {os}"
 }
diff --git a/lang/pt-PT.json b/src/lang/pt-PT.json
similarity index 79%
rename from lang/pt-PT.json
rename to src/lang/pt-PT.json
index 24765e7aa..3e1df4de8 100644
--- a/lang/pt-PT.json
+++ b/src/lang/pt-PT.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "Adicionar website",
   "label.admin": "Administrador",
+  "label.after": "After",
   "label.all": "Todos",
   "label.all-time": "Todo o tempo",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Tempo médio de visita",
   "label.back": "Voltar",
+  "label.before": "Before",
   "label.bounce-rate": "Taxa de rejeição",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Navegadores",
   "label.cancel": "Cancelar",
   "label.change-password": "Alterar senha",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Confirmar senha",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Países",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +38,21 @@
   "label.custom-range": "Intervalo personalizado",
   "label.dashboard": "Painel",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Intervalo de datas",
+  "label.day": "Day",
   "label.default-date-range": "Intervalo de datas predefinido",
   "label.delete": "Eliminar",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Eliminar website",
+  "label.description": "Description",
   "label.desktop": "Desktop",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Dispositivos",
   "label.dismiss": "Ignorar",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Domínio",
   "label.dropoff": "Dropoff",
   "label.edit": "Editar",
@@ -46,12 +61,23 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Eventos",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
+  "label.filter": "Filter",
   "label.filter-combined": "Combinado",
   "label.filter-raw": "Dados brutos",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Língua",
@@ -61,17 +87,25 @@
   "label.last-hours": "Últimas {x} horas",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Iniciar sessão",
   "label.logout": "Sair",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Telemóvel",
   "label.more": "Mais",
+  "label.my-websites": "My websites",
   "label.name": "Nome",
   "label.new-password": "Nova senha",
   "label.none": "None",
-  "label.operating-systems": "Sistemas operativos",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Proprietário",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Visualizações da página",
+  "label.pageTitle": "Page title",
   "label.pages": "Páginas",
   "label.password": "Senha",
   "label.powered-by": "Distribuído por {name}",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Tempo real",
+  "label.referrer": "Referrer",
   "label.referrers": "Referenciadores",
   "label.refresh": "Atualizar",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Obrigatório",
   "label.reset": "Repor",
   "label.reset-website": "Repor estatísticas",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Guardar",
   "label.screens": "Screens",
+  "label.search": "Search",
   "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Definições",
   "label.share-url": "Partilhar link",
   "label.single-day": "Dia único",
+  "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Tema",
   "label.this-month": "Este mês",
@@ -114,14 +156,21 @@
   "label.title": "Title",
   "label.today": "Hoje",
   "label.toggle-charts": "Alternar gráficos",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Código de rastreamento",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Visitantes únicos",
   "label.unknown": "Desconhecido",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Nome de utilizador",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Ver detalhes",
   "label.view-only": "View only",
@@ -132,33 +181,6 @@
   "label.websites": "Websites",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} {x, plural, one {visitante} other {visitantes}} neste momento",
   "message.confirm-delete": "Tem a certeza que pretende eliminar {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "Nome de utilizador/senha incorretos.",
   "message.invalid-domain": "Domínio inválido",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Sem dados disponíveis.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "As senhas não coincidem",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "Não tens nenhum website configurado.",
   "message.page-not-found": "Página não encontrada.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Todas as estatísticas deste site serão eliminadas, mas o seu código de rastreamento permanecerá intacto.",
@@ -184,12 +210,8 @@
   "message.share-url": "Este é o link de partilha público para {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Código de rastreamento",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Visitante de {country} a usar {browser} no {device} {os}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "Não tens nenhum website configurado.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Visitante de {country} a usar {browser} no {device} {os}"
 }
diff --git a/lang/ro-RO.json b/src/lang/ro-RO.json
similarity index 79%
rename from lang/ro-RO.json
rename to src/lang/ro-RO.json
index fa15ce24f..d3b9d3db8 100644
--- a/lang/ro-RO.json
+++ b/src/lang/ro-RO.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "Adăugare site web",
   "label.admin": "Administrator",
+  "label.after": "After",
   "label.all": "Toate",
   "label.all-time": "All time",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Timp mediu de vizitare",
   "label.back": "Înapoi",
+  "label.before": "Before",
   "label.bounce-rate": "Rata de respingere",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Browsere",
   "label.cancel": "Anulează",
   "label.change-password": "Schimbare parolă",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Confirmare parolă",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Țări",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +38,21 @@
   "label.custom-range": "Interval personalizat",
   "label.dashboard": "Tablou de bord",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Interval de date",
+  "label.day": "Day",
   "label.default-date-range": "Interval de date implicit",
   "label.delete": "Șterge",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Ștergere site web",
+  "label.description": "Description",
   "label.desktop": "Desktop",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Dispozitive",
   "label.dismiss": "Renunță",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Domeniu",
   "label.dropoff": "Dropoff",
   "label.edit": "Editare",
@@ -46,12 +61,23 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Evenimente",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
+  "label.filter": "Filter",
   "label.filter-combined": "Combinat",
   "label.filter-raw": "Brut",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +87,25 @@
   "label.last-hours": "Ultimele {x} ore",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Autentificare",
   "label.logout": "Iesire din cont",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Mobil",
   "label.more": "Mai mult",
+  "label.my-websites": "My websites",
   "label.name": "Nume",
   "label.new-password": "Parola nouă",
   "label.none": "None",
-  "label.operating-systems": "Sisteme de operare",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Owner",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Vizualizări de pagină",
+  "label.pageTitle": "Page title",
   "label.pages": "Pagini",
   "label.password": "Parolă",
   "label.powered-by": "Cu sprijinul {name}",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Realtime",
+  "label.referrer": "Referrer",
   "label.referrers": "Site-uri de proveniență",
   "label.refresh": "Reîmprospătare",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Obligatoriu",
   "label.reset": "Resetează",
   "label.reset-website": "Resetează statisticile pentru site",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Salvează",
   "label.screens": "Screens",
+  "label.search": "Search",
   "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Setări",
   "label.share-url": "Partajare URL",
   "label.single-day": "O singură zi",
+  "label.sum": "Sum",
   "label.tablet": "Tabletă",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "Această lună",
@@ -114,14 +156,21 @@
   "label.title": "Title",
   "label.today": "Astăzi",
   "label.toggle-charts": "Schimbă graficele",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Cod de urmărire",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Vizitatori unici",
   "label.unknown": "Necunoscut",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Nume utilizator",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Vizualizare detalii",
   "label.view-only": "View only",
@@ -132,33 +181,6 @@
   "label.websites": "Site-uri web",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} {x, plural, one {vizitator activ} other {vizitatori activi}}",
   "message.confirm-delete": "Sunteți sigur că doriți să ștergeți {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "Nume utilizator / parolă incorecte.",
   "message.invalid-domain": "Domeniu nu este valid",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Nici o informație disponibilă.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Parolele nu se potrivesc",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "Nu aveți niciun site web configurat.",
   "message.page-not-found": "Pagina nu a fost găsită.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Toate statisticile pentru acest site web vor fi șterse, dar codul de urmărire va rămâne intact.",
@@ -184,12 +210,8 @@
   "message.share-url": "Aceasta este adresa URL de partajare pentru {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Cod de urmărire",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Vizitator din {country} folosind {browser} pe {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "Nu aveți niciun site web configurat.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Vizitator din {country} folosind {browser} pe {os} {device}"
 }
diff --git a/lang/ru-RU.json b/src/lang/ru-RU.json
similarity index 82%
rename from lang/ru-RU.json
rename to src/lang/ru-RU.json
index 93bc53678..3063cbfa9 100644
--- a/lang/ru-RU.json
+++ b/src/lang/ru-RU.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "Добавить сайт",
   "label.admin": "Администратор",
+  "label.after": "After",
   "label.all": "Все",
   "label.all-time": "Все время",
   "label.analytics": "Аналитика",
+  "label.average": "Average",
   "label.average-visit-time": "Среднее время посещения",
   "label.back": "Назад",
+  "label.before": "Before",
   "label.bounce-rate": "Отказы",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Браузеры",
   "label.cancel": "Отменить",
   "label.change-password": "Изменить пароль",
   "label.cities": "Города",
+  "label.city": "City",
   "label.clear-all": "Очистить все",
   "label.confirm": "Подтвердить",
   "label.confirm-password": "Подтвердить пароль",
+  "label.contains": "Contains",
   "label.continue": "Продолжить",
   "label.countries": "Страны",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Create report",
   "label.create-team": "Создать команду",
   "label.create-user": "Создать пользователя",
   "label.created": "Создано",
@@ -28,16 +38,21 @@
   "label.custom-range": "Другой период",
   "label.dashboard": "Информационная панель",
   "label.data": "Данные",
+  "label.date": "Date",
   "label.date-range": "Диапазон дат",
+  "label.day": "Day",
   "label.default-date-range": "Диапазон дат по-умолчанию",
   "label.delete": "Удалить",
   "label.delete-team": "Удалить команду",
   "label.delete-user": "Удалить пользователя",
   "label.delete-website": "Удалить сайт",
+  "label.description": "Description",
   "label.desktop": "Настольный компьютер",
   "label.details": "Подробности",
+  "label.device": "Device",
   "label.devices": "Устройства",
   "label.dismiss": "Отклонить",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Домен",
   "label.dropoff": "Dropoff",
   "label.edit": "Изменить",
@@ -46,12 +61,23 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "События",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
+  "label.filter": "Filter",
   "label.filter-combined": "Объединенные",
   "label.filter-raw": "Сырые данные",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Присоединиться",
   "label.join-team": "Присоединиться к команде",
   "label.language": "Язык",
@@ -61,17 +87,25 @@
   "label.last-hours": "Последние {x} часа",
   "label.leave": "Уйти",
   "label.leave-team": "Покинуть команду",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Войти",
   "label.logout": "Выйти",
+  "label.max": "Max",
   "label.members": "Участники",
+  "label.min": "Min",
   "label.mobile": "Смартфон",
   "label.more": "Больше",
+  "label.my-websites": "My websites",
   "label.name": "Имя",
   "label.new-password": "Новый пароль",
   "label.none": "Не указано",
-  "label.operating-systems": "Операционные системы",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Владелец",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Просмотры страниц",
+  "label.pageTitle": "Page title",
   "label.pages": "Страницы",
   "label.password": "Пароль",
   "label.powered-by": "На движке {name}",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "Параметры запроса",
   "label.realtime": "Реальное время",
+  "label.referrer": "Referrer",
   "label.referrers": "Источники",
   "label.refresh": "Обновить",
   "label.regenerate": "Обновить",
+  "label.region": "Region",
   "label.regions": "Регионы",
   "label.remove": "Удалить",
   "label.reports": "Reports",
   "label.required": "Обязательное",
   "label.reset": "Сбросить",
   "label.reset-website": "Сбросить статистику",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Роль",
   "label.run-query": "Run query",
   "label.save": "Сохранить",
   "label.screens": "Экраны",
+  "label.search": "Search",
   "label.select-date": "Select date",
   "label.select-website": "Выбрать сайт",
   "label.sessions": "Сессии",
   "label.settings": "Настройки",
   "label.share-url": "Поделиться ссылкой",
   "label.single-day": "Один день",
+  "label.sum": "Sum",
   "label.tablet": "Планшет",
   "label.team": "Команда",
   "label.team-guest": "Гость команды",
   "label.team-id": "ID команды",
   "label.team-member": "Член команды",
+  "label.team-name": "Team name",
   "label.team-owner": "Владелец команды",
+  "label.team-websites": "Team websites",
   "label.teams": "Команды",
   "label.theme": "Тема",
   "label.this-month": "Этот месяц",
@@ -114,14 +156,21 @@
   "label.title": "Заголовок",
   "label.today": "Сегодня",
   "label.toggle-charts": "Показать/скрыть графики",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Код отслеживания",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Уникальные посетители",
   "label.unknown": "Неизвестно",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Пользователь",
   "label.username": "Имя пользователя",
   "label.users": "Пользователи",
+  "label.value": "Value",
   "label.view": "Просмотреть",
   "label.view-details": "Посмотреть детали",
   "label.view-only": "View only",
@@ -132,33 +181,6 @@
   "label.websites": "Сайты",
   "label.window": "Window",
   "label.yesterday": "Вчера",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} текущих посетителей",
   "message.confirm-delete": "Вы уверены, что хотите удалить {target}?",
   "message.confirm-leave": "Вы уверены, что хотите уйти {target}?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "Неверное имя пользователя/пароль.",
   "message.invalid-domain": "Некорректный домен",
   "message.min-password-length": "Минимальная длина {n} символов",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Нет данных.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Пароли не совпадают",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "У этой команды нет ни одного сайта.",
   "message.no-teams": "Вы не создали ни одной команды.",
   "message.no-users": "Нет пользователей.",
+  "message.no-websites-configured": "У вас нет настроенных сайтов.",
   "message.page-not-found": "Страница не найдена.",
   "message.reset-website": "Для сброса введите RESET",
   "message.reset-website-warning": "Вся статистика для этого сайта будет удалена, но ваш код отслеживания останется нетронутым.",
@@ -184,12 +210,8 @@
   "message.share-url": "Это публичная ссылка для {target}.",
   "message.team-already-member": "Вы уже состоите в команде.",
   "message.team-not-found": "Команда не найдена.",
+  "message.team-websites-info": "Сайты могут просматривать все члены команды.",
   "message.tracking-code": "Код отслеживания",
   "message.user-deleted": "Пользователь удален.",
-  "message.visitor-log": "Посетитель из {country} используя {browser} на {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "У этой команды нет ни одного сайта.",
-  "message.no-websites-configured": "У вас нет настроенных сайтов.",
-  "message.team-websites-info": "Сайты могут просматривать все члены команды.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Посетитель из {country} используя {browser} на {os} {device}"
 }
diff --git a/lang/si-LK.json b/src/lang/si-LK.json
similarity index 81%
rename from lang/si-LK.json
rename to src/lang/si-LK.json
index 086c156ea..d9a61eb0a 100644
--- a/lang/si-LK.json
+++ b/src/lang/si-LK.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "වෙබ් අඩවිය එක් කරන්න",
   "label.admin": "Administrator",
+  "label.after": "After",
   "label.all": "සියල්ල",
   "label.all-time": "හැම වෙලාවෙම",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Average visit time",
   "label.back": "ආපසු",
+  "label.before": "Before",
   "label.bounce-rate": "Bounce rate",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Browsers",
   "label.cancel": "අවලංගු කරන්න",
   "label.change-password": "මුරපදය වෙනස් කරන්න",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "මුරපදය සත්‍යාපනය කරන්න",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Countries",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +38,21 @@
   "label.custom-range": "අභිරුචි පරාසය",
   "label.dashboard": "උපකරණ පුවරුව",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "දින පරාසය",
+  "label.day": "Day",
   "label.default-date-range": "පෙරනිමි දින පරාසය",
   "label.delete": "මකන්න",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "වෙබ් අඩවිය මකන්න",
+  "label.description": "Description",
   "label.desktop": "Desktop",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Devices",
   "label.dismiss": "මගහරින්න",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "වසම",
   "label.dropoff": "Dropoff",
   "label.edit": "සංස්කරණය කරන්න",
@@ -46,12 +61,23 @@
   "label.event": "Event",
   "label.event-data": "සිදුවීම් දත්ත",
   "label.events": "Events",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
+  "label.filter": "Filter",
   "label.filter-combined": "Combined",
   "label.filter-raw": "Raw",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "භාෂාව",
@@ -61,17 +87,25 @@
   "label.last-hours": "අන්තිම {x} පැය",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "ලොග් වෙන්න",
   "label.logout": "පිටවීම",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Mobile",
   "label.more": "තවත්",
+  "label.my-websites": "My websites",
   "label.name": "නම",
   "label.new-password": "අලුත් මුරපදය",
   "label.none": "කිසිවක් නැත",
-  "label.operating-systems": "Operating systems",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "හිමිකරු",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Page views",
+  "label.pageTitle": "Page title",
   "label.pages": "Pages",
   "label.password": "මුරපදය",
   "label.powered-by": "Powered by {name}",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "තත්ය කාල",
+  "label.referrer": "Referrer",
   "label.referrers": "Referrers",
   "label.refresh": "නැවුම් කරන්න",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "අවශ්‍යයි",
   "label.reset": "යළි පිහිටුවන්න",
   "label.reset-website": "සංඛ්යා ලේඛන නැවත සකසන්න",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "සුරකින්න",
   "label.screens": "Screens",
+  "label.search": "Search",
   "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "සැකසුම්",
   "label.share-url": "බෙදාගැනීමේ URL",
   "label.single-day": "තනි දවස",
+  "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "තේමාව",
   "label.this-month": "මෙ මාසය",
@@ -114,14 +156,21 @@
   "label.title": "Title",
   "label.today": "අද",
   "label.toggle-charts": "Toggle charts",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "ලුහුබැඳීමේ කේතය",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Unique visitors",
   "label.unknown": "නොදනී",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "පරිශීලක නාමය",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "තොරතුරු පෙන්වන්න",
   "label.view-only": "View only",
@@ -132,33 +181,6 @@
   "label.websites": "වෙබ් අඩවි",
   "label.window": "Window",
   "label.yesterday": "ඊයේ",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} දැන් {x, plural, one {අමුත්තා} other {අමුත්තන්}}",
   "message.confirm-delete": "{target} මකා දැමීම ගැන විශ්වාසද?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "වැරදි පරිශීලක නාමය/මුරපදය.",
   "message.invalid-domain": "Invalid domain. Do not include http/https.",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "පෙන්වීමට දත්ත නොමැත.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Passwords do not match.",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "You do not have any websites configured.",
   "message.page-not-found": "පිටුව හමු නොවීය.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "All statistics for this website will be deleted, but your settings will remain intact.",
@@ -184,12 +210,8 @@
   "message.share-url": "මේ {target} සඳහා ප්‍රසිද්ධියේ බෙදාගත් URL එකයි.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "To track stats for this website, place the following code in the <head>...</head> section of your HTML.",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Visitor from {country} using {browser} on {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "You do not have any websites configured.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Visitor from {country} using {browser} on {os} {device}"
 }
diff --git a/lang/sk-SK.json b/src/lang/sk-SK.json
similarity index 78%
rename from lang/sk-SK.json
rename to src/lang/sk-SK.json
index 884519aac..7d9073dd6 100644
--- a/lang/sk-SK.json
+++ b/src/lang/sk-SK.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "Pridať web",
   "label.admin": "Administrátor",
+  "label.after": "After",
   "label.all": "Všetko",
   "label.all-time": "All time",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Priemerný čas návštevy",
   "label.back": "Späť",
+  "label.before": "Before",
   "label.bounce-rate": "Okamžité opustenie",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Prehliadač",
   "label.cancel": "Zrušiť",
   "label.change-password": "Zmeniť heslo",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Potvrdiť heslo",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Zem",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +38,21 @@
   "label.custom-range": "Vlastný rozsah",
   "label.dashboard": "Prehlad",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Obdobie",
+  "label.day": "Day",
   "label.default-date-range": "Predvolené obdobie",
   "label.delete": "Zmazať",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Zmazať web",
+  "label.description": "Description",
   "label.desktop": "Stolný počítač",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Zariadenie",
   "label.dismiss": "Odísť",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Doména",
   "label.dropoff": "Dropoff",
   "label.edit": "Upraviť",
@@ -46,12 +61,23 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Udalosti",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
+  "label.filter": "Filter",
   "label.filter-combined": "Kombinácie",
   "label.filter-raw": "Nezpracované",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +87,25 @@
   "label.last-hours": "Posledných {x} hodín",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Prihlásiť",
   "label.logout": "Odhlásiť",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Mobilný telefon",
   "label.more": "Viac",
+  "label.my-websites": "My websites",
   "label.name": "Meno",
   "label.new-password": "Nové heslo",
   "label.none": "None",
-  "label.operating-systems": "Operačný systém",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Owner",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Zobrazenie stánok",
+  "label.pageTitle": "Page title",
   "label.pages": "Stránky",
   "label.password": "Heslo",
   "label.powered-by": "Powered by {name}",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Aktuálne",
+  "label.referrer": "Referrer",
   "label.referrers": "Odkazy",
   "label.refresh": "Obnoviť",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Povinné",
   "label.reset": "Reset",
   "label.reset-website": "Reset statistics",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Uložiť",
   "label.screens": "Screens",
+  "label.search": "Search",
   "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Nastavenia",
   "label.share-url": "Zdielanie URL",
   "label.single-day": "Jeden deň",
+  "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "Tento mesiac",
@@ -114,14 +156,21 @@
   "label.title": "Title",
   "label.today": "Dnes",
   "label.toggle-charts": "Toggle charts",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Sledovací kód",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Jedinečné návštevy",
   "label.unknown": "Neznámý",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Užívateľské meno",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Zobraziť detaily",
   "label.view-only": "View only",
@@ -132,33 +181,6 @@
   "label.websites": "Weby",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} aktuálne {x, plural, one {návštevník} other {návštěvníci}}",
   "message.confirm-delete": "Naozaj zmazať {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "Nesprávné meno/heslo.",
   "message.invalid-domain": "Neplatná doména",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Žiadne data.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Hesla se nezhodujú",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "Nemáte nastavený žiadny web.",
   "message.page-not-found": "Stránka sa nenašla.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.",
@@ -184,12 +210,8 @@
   "message.share-url": "Toto je zdielané URL pre {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Sledovací kód",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Návštevník z {country} s prehliadačom {browser} na {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "Nemáte nastavený žiadny web.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Návštevník z {country} s prehliadačom {browser} na {os} {device}"
 }
diff --git a/src/lang/sl-SI.json b/src/lang/sl-SI.json
new file mode 100644
index 000000000..66ce08e08
--- /dev/null
+++ b/src/lang/sl-SI.json
@@ -0,0 +1,217 @@
+{
+  "label.access-code": "Koda za dostop",
+  "label.actions": "Dejanja",
+  "label.activity-log": "Dnevnik dejavnosti",
+  "label.add": "Dodaj",
+  "label.add-description": "Dodaj opis",
+  "label.add-website": "Dodaj spletno mesto",
+  "label.admin": "Administrator",
+  "label.after": "Po",
+  "label.all": "Vsi",
+  "label.all-time": "Ves čas",
+  "label.analytics": "Analitika",
+  "label.average": "Povprečno",
+  "label.average-visit-time": "Povprečni čas obiska",
+  "label.back": "Nazaj",
+  "label.before": "Pred",
+  "label.bounce-rate": "Odbojna stopnja",
+  "label.breakdown": "Razčlenitev",
+  "label.browser": "Brskalnik",
+  "label.browsers": "Brskalniki",
+  "label.cancel": "Prekliči",
+  "label.change-password": "Zamenjaj geslo",
+  "label.cities": "Mesta",
+  "label.city": "Mesto",
+  "label.clear-all": "Počisti vse",
+  "label.confirm": "Potrdi",
+  "label.confirm-password": "Potrdi geslo",
+  "label.contains": "Vsebuje",
+  "label.continue": "Nadaljuj",
+  "label.countries": "Države",
+  "label.country": "Država",
+  "label.create": "Create",
+  "label.create-report": "Ustvari poročilo",
+  "label.create-team": "Ustvari ekipo",
+  "label.create-user": "Ustvari uporabnika",
+  "label.created": "Ustvarjeno",
+  "label.current-password": "Trenutno geslo",
+  "label.custom-range": "Obdobje po meri",
+  "label.dashboard": "Nadzorna plošča",
+  "label.data": "Podatki",
+  "label.date": "Datum",
+  "label.date-range": "Časovno obdobje",
+  "label.day": "Dan",
+  "label.default-date-range": "Privzeto časovno obdobje",
+  "label.delete": "Izbriši",
+  "label.delete-team": "Izbriši ekipo",
+  "label.delete-user": "Izbriši uporabnika",
+  "label.delete-website": "Izbriši spletno mesto",
+  "label.description": "Opis",
+  "label.desktop": "Namizni računalnik",
+  "label.details": "Podrobnosti",
+  "label.device": "Naprava",
+  "label.devices": "Naprave",
+  "label.dismiss": "Prezri",
+  "label.does-not-contain": "Ne vsebuje",
+  "label.domain": "Domena",
+  "label.dropoff": "Zapustitev",
+  "label.edit": "Uredi",
+  "label.edit-dashboard": "Uredi nadzorno ploščo",
+  "label.enable-share-url": "Uredi povezavo za deljenje",
+  "label.event": "Dogodek",
+  "label.event-data": "Podatki dogodka",
+  "label.events": "Dogodki",
+  "label.false": "Napačno",
+  "label.field": "Polje",
+  "label.fields": "Polja",
+  "label.filter": "Filter",
+  "label.filter-combined": "Skupaj",
+  "label.filter-raw": "Neobdelano",
+  "label.filters": "Filtri",
+  "label.funnel": "Prodajni lijak",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Večje od",
+  "label.greater-than-equals": "Večje ali enako kot",
+  "label.insights": "Vpogled",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Je",
+  "label.is-not": "Ni",
+  "label.is-not-set": "Ni nastavljeno",
+  "label.is-set": "Je nastavljeno",
+  "label.join": "Pridruži se",
+  "label.join-team": "Pridruži se ekipi",
+  "label.language": "Jezik",
+  "label.languages": "Jeziki",
+  "label.laptop": "Prenosni računalnik",
+  "label.last-days": "Zadnjih {x} dni",
+  "label.last-hours": "Zadnjih {x} ur",
+  "label.leave": "Zapusti",
+  "label.leave-team": "Zapusti ekipo",
+  "label.less-than": "Manjše kot",
+  "label.less-than-equals": "Manjše ali enako kot",
+  "label.login": "Prijava",
+  "label.logout": "Odjava",
+  "label.max": "Največ",
+  "label.members": "Člani",
+  "label.min": "Najmanj",
+  "label.mobile": "Mobilne naprave",
+  "label.more": "Več",
+  "label.my-websites": "Moja spletna mesta",
+  "label.name": "Ime",
+  "label.new-password": "Novo geslo",
+  "label.none": "Brez",
+  "label.os": "OS",
+  "label.overview": "Pregled",
+  "label.owner": "Lastnik",
+  "label.page-of": "Stran {current} od {total}",
+  "label.page-views": "Obiski strani",
+  "label.pageTitle": "Naslov strani",
+  "label.pages": "Strani",
+  "label.password": "Geslo",
+  "label.powered-by": "Poganja {name}",
+  "label.profile": "Profil",
+  "label.queries": "Poizvedbe",
+  "label.query": "Poizvedba",
+  "label.query-parameters": "Parametri poizvedbe",
+  "label.realtime": "V živo",
+  "label.referrer": "Vir",
+  "label.referrers": "Viri",
+  "label.refresh": "Osveži",
+  "label.regenerate": "Ponovno generiraj",
+  "label.region": "Regija",
+  "label.regions": "Regije",
+  "label.remove": "Odstrani",
+  "label.reports": "Poročila",
+  "label.required": "Zahtevano",
+  "label.reset": "Ponastavi",
+  "label.reset-website": "Ponastavi statistiko",
+  "label.retention": "Ohranjanje uporabnikov",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
+  "label.role": "Vloga",
+  "label.run-query": "Izvedi poizvedbo",
+  "label.save": "Shrani",
+  "label.screens": "Zasloni",
+  "label.search": "Search",
+  "label.select-date": "Izberi datum",
+  "label.select-website": "Izberi spletno mesto",
+  "label.sessions": "Seje",
+  "label.settings": "Nastavitve",
+  "label.share-url": "Deli povezavo",
+  "label.single-day": "En dan",
+  "label.sum": "Seštevek",
+  "label.tablet": "Tablični računalnik",
+  "label.team": "Ekipa",
+  "label.team-guest": "Gost ekipe",
+  "label.team-id": "ID ekipe",
+  "label.team-member": "Član ekipe",
+  "label.team-name": "Ime ekipe",
+  "label.team-owner": "Lastnik ekipe",
+  "label.team-websites": "Spletna mesta ekipe",
+  "label.teams": "Ekipe",
+  "label.theme": "Tema",
+  "label.this-month": "Ta mesec",
+  "label.this-week": "Ta teden",
+  "label.this-year": "To leto",
+  "label.timezone": "Časovni pas",
+  "label.title": "Naslov",
+  "label.today": "Danes",
+  "label.toggle-charts": "Preklopi grafe",
+  "label.total": "Skupaj",
+  "label.total-records": "Skupni zapisi",
+  "label.tracking-code": "Koda za sledenje",
+  "label.true": "Pravilno",
+  "label.type": "Vrsta",
+  "label.unique": "Unikatni",
+  "label.unique-visitors": "Unikatni obiskovalci",
+  "label.unknown": "Neznano",
+  "label.untitled": "Brez naslova",
+  "label.url": "Povezava",
+  "label.urls": "Povezave",
+  "label.user": "Uporabnik",
+  "label.username": "Uporabniško ime",
+  "label.users": "Uporabniki",
+  "label.value": "Vrednost",
+  "label.view": "Poglej",
+  "label.view-details": "Poglej podrobnosti",
+  "label.view-only": "Samo ogledovanje",
+  "label.views": "Obiski",
+  "label.visitors": "Obiskovalci",
+  "label.website": "Spletno mesto",
+  "label.website-id": "ID spletnega mesta",
+  "label.websites": "Spletnih mest",
+  "label.window": "Okno",
+  "label.yesterday": "Včeraj",
+  "message.active-users": "{x} trenutni {x, plural, one {obiskovalec} other {obiskovalcev}}",
+  "message.confirm-delete": "Ste prepričani, da želite izbrisati {target}?",
+  "message.confirm-leave": "Ste prepričani, da želite zapustiti {target}?",
+  "message.confirm-reset": "Ste prepričani, da želite ponastaviti statistiko {target}?",
+  "message.delete-account": "Za potrditev izbrisa tega računa vnesite {confirmation} v spodnje polje.",
+  "message.delete-website": "Za potrditev izbrisa tega spletnega mesta vnesite {confirmation} v spodnje polje.",
+  "message.delete-website-warning": "Izbrisani bodo tudi vsi pripadajoči podatki.",
+  "message.error": "Nekaj je šlo narobe.",
+  "message.event-log": "{event} na {url}",
+  "message.go-to-settings": "Pojdi v nastavitve",
+  "message.incorrect-username-password": "Nepravilno uporabniško ime/geslo.",
+  "message.invalid-domain": "Neveljavna domena",
+  "message.min-password-length": "Najmanjša dolžina je {n} znakov",
+  "message.new-version-available": "Na voljo je nova verzija programa Umami {version}!",
+  "message.no-data-available": "Podatki niso na voljo.",
+  "message.no-event-data": "Podatki o dogodku niso na voljo.",
+  "message.no-match-password": "Gesli se ne ujemata",
+  "message.no-results-found": "Rezultatov ni bilo mogoče najti.",
+  "message.no-team-websites": "Ta ekipa nima spletnih mest.",
+  "message.no-teams": "Niste še ustvarili nobene ekipe.",
+  "message.no-users": "Ni uporabnikov.",
+  "message.no-websites-configured": "Nimate nastavljenih nobenih spletnih mest.",
+  "message.page-not-found": "Stran ni bila najdena.",
+  "message.reset-website": "Za ponastavitev izbrisa tega spletnega mesta vnesite {confirmation} v spodnje polje.",
+  "message.reset-website-warning": "Vse statistike za to spletno mesto bodo izbrisane, koda za sledenje pa bo ostala nespremenjena.",
+  "message.saved": "Uspešno shranjeno.",
+  "message.share-url": "To je javno dostopna povezava za {target}.",
+  "message.team-already-member": "Ste že član ekipe.",
+  "message.team-not-found": "Ekipa ni bila najdena.",
+  "message.team-websites-info": "Spletne strani si lahko ogleda vsak član ekipe.",
+  "message.tracking-code": "Koda za sledenje",
+  "message.user-deleted": "Uporabnik je izbrisan.",
+  "message.visitor-log": "Obiskovalec iz {country} uporablja {browser} na {os} {device}"
+}
diff --git a/lang/sv-SE.json b/src/lang/sv-SE.json
similarity index 78%
rename from lang/sv-SE.json
rename to src/lang/sv-SE.json
index 3e1303c58..1496594f8 100644
--- a/lang/sv-SE.json
+++ b/src/lang/sv-SE.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "Lägg till webbsajt",
   "label.admin": "Administratör",
+  "label.after": "After",
   "label.all": "Alla",
   "label.all-time": "Sedan början",
   "label.analytics": "Analys",
+  "label.average": "Average",
   "label.average-visit-time": "Medelbesökstid",
   "label.back": "Tillbaka",
+  "label.before": "Before",
   "label.bounce-rate": "Avvisningfrekvens",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Webbläsare",
   "label.cancel": "Avbryt",
   "label.change-password": "Byt lösenord",
   "label.cities": "Städer",
+  "label.city": "City",
   "label.clear-all": "Rensa alla",
   "label.confirm": "Bekräfta",
   "label.confirm-password": "Bekräfta lösenord",
+  "label.contains": "Contains",
   "label.continue": "Fortsätt",
   "label.countries": "Länder",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Create report",
   "label.create-team": "Skapa team",
   "label.create-user": "Skapa användare",
   "label.created": "Skapad",
@@ -28,16 +38,21 @@
   "label.custom-range": "Anpassat urval",
   "label.dashboard": "Översikt",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Datumomfång",
+  "label.day": "Day",
   "label.default-date-range": "Standard datum-urval",
   "label.delete": "Radera",
   "label.delete-team": "Radera team",
   "label.delete-user": "Radera användare",
   "label.delete-website": "Radera webbsajt",
+  "label.description": "Description",
   "label.desktop": "Stationär",
   "label.details": "Detailjer",
+  "label.device": "Device",
   "label.devices": "Enheter",
   "label.dismiss": "Avbryt",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Domän",
   "label.dropoff": "Dropoff",
   "label.edit": "Redigera",
@@ -46,12 +61,23 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Händelser",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
+  "label.filter": "Filter",
   "label.filter-combined": "Kombinerade",
   "label.filter-raw": "Rådata",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Gå med",
   "label.join-team": "gå med i team",
   "label.language": "Språk",
@@ -61,17 +87,25 @@
   "label.last-hours": "Senaste {x} timmarna",
   "label.leave": "Lämna",
   "label.leave-team": "Lämna team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Logga in",
   "label.logout": "Logga ut",
+  "label.max": "Max",
   "label.members": "Medlemmar",
+  "label.min": "Min",
   "label.mobile": "Mobil",
   "label.more": "Mer",
+  "label.my-websites": "My websites",
   "label.name": "Namn",
   "label.new-password": "Nytt lösenord",
   "label.none": "Inga",
-  "label.operating-systems": "Operativsystem",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Ägare",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Sidvisningar",
+  "label.pageTitle": "Page title",
   "label.pages": "Sidor",
   "label.password": "Lösenord",
   "label.powered-by": "Drivs av {name}",
@@ -80,31 +114,39 @@
   "label.query": "Frågor",
   "label.query-parameters": "Fråge-parametrar",
   "label.realtime": "Realtid",
+  "label.referrer": "Referrer",
   "label.referrers": "Hänvisare",
   "label.refresh": "Uppdatera",
   "label.regenerate": "Regenerera",
+  "label.region": "Region",
   "label.regions": "Regioner",
   "label.remove": "Ta bort",
   "label.reports": "Reports",
   "label.required": "Krävs",
   "label.reset": "Återställ",
   "label.reset-website": "Återställ statistik",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Roll",
   "label.run-query": "Run query",
   "label.save": "Spara",
   "label.screens": "Upplösning",
+  "label.search": "Search",
   "label.select-date": "Select date",
   "label.select-website": "Välj webbsajt",
   "label.sessions": "Sessions",
   "label.settings": "Inställningar",
   "label.share-url": "Delnings-URL",
   "label.single-day": "En dag",
+  "label.sum": "Sum",
   "label.tablet": "Platta",
   "label.team": "Team",
   "label.team-guest": "Team-gäst",
   "label.team-id": "Team ID",
   "label.team-member": "Team-medlem",
+  "label.team-name": "Team name",
   "label.team-owner": "Team-ägare",
+  "label.team-websites": "Team websites",
   "label.teams": "Team",
   "label.theme": "Tema",
   "label.this-month": "Denna månad",
@@ -114,14 +156,21 @@
   "label.title": "Titel",
   "label.today": "Idag",
   "label.toggle-charts": "Visa/göm grafer",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Spårningskod",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Unika besökare",
   "label.unknown": "Okänd",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Användare",
   "label.username": "Användarnamn",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "Visa",
   "label.view-details": "Visa detaljer",
   "label.view-only": "View only",
@@ -132,33 +181,6 @@
   "label.websites": "Webbsajt",
   "label.window": "Window",
   "label.yesterday": "Igår",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} {x, plural, one {besökare} other {besökare}} just nu",
   "message.confirm-delete": "Är du säker på att du vill radera {target}?",
   "message.confirm-leave": "Är du säker på att du vill lämna {target}?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "Felaktigt användarnamn/lösenord.",
   "message.invalid-domain": "Ogiltig domän",
   "message.min-password-length": "Minst {n} tecken",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Ingen data tillgänglig.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Lösenorden är inte samma",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "Det här teamet har inga webbsajter.",
   "message.no-teams": "Du har inte skapat några team.",
   "message.no-users": "Det finns inga användare.",
+  "message.no-websites-configured": "Du har inga webbsajter.",
   "message.page-not-found": "Sidan kan inte hittas.",
   "message.reset-website": "För att återställa statistiken skriv {confirmation} i rutan nedan.",
   "message.reset-website-warning": "All statistik för webbsajten tas bort men spårningskoden förblir oförändrad.",
@@ -184,12 +210,8 @@
   "message.share-url": "Det här är den offentliga delnings-URL:en för {target}.",
   "message.team-already-member": "Du är redan medlem i teamet.",
   "message.team-not-found": "Team kan inte hittas.",
+  "message.team-websites-info": "Websajter kan ses av alla i teamet.",
   "message.tracking-code": "Spårningskod",
   "message.user-deleted": "Användare raderad.",
-  "message.visitor-log": "Besökare från {country} med {browser} på {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "Det här teamet har inga webbsajter.",
-  "message.no-websites-configured": "Du har inga webbsajter.",
-  "message.team-websites-info": "Websajter kan ses av alla i teamet.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Besökare från {country} med {browser} på {os} {device}"
 }
diff --git a/lang/ta-IN.json b/src/lang/ta-IN.json
similarity index 83%
rename from lang/ta-IN.json
rename to src/lang/ta-IN.json
index e52bf186f..53b7659e8 100644
--- a/lang/ta-IN.json
+++ b/src/lang/ta-IN.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "வலைத்தளத்தைச் சேர்க்க",
   "label.admin": "நிர்வாகியைச் சேர்க்க",
+  "label.after": "After",
   "label.all": "எல்லாம்",
   "label.all-time": "All time",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "சராசரி வருகை நேரம்",
   "label.back": "பின்னால்",
+  "label.before": "Before",
   "label.bounce-rate": "துள்ளல் விகிதம்",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "உலாவிகள்",
   "label.cancel": "ரத்துசெய்",
   "label.change-password": "கடவுச்சொல்லை மாற்று",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "கடவுச்சொல்லை உறுதிப்படுத்தவும்",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "நாடுகள்",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +38,21 @@
   "label.custom-range": "தனிப்பயன் வேறுபாட்டெல்லை",
   "label.dashboard": "முகப்பு",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "தேதி வரம்பு",
+  "label.day": "Day",
   "label.default-date-range": "இயல்புநிலை தேதி வரம்பு",
   "label.delete": "அழி",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "வலைத்தளத்தை நீக்கு",
+  "label.description": "Description",
   "label.desktop": "மேசை கணினி",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "சாதனங்கள்",
   "label.dismiss": "நீக்கு",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "கள முகவரி",
   "label.dropoff": "Dropoff",
   "label.edit": "திருத்துதல்",
@@ -46,12 +61,23 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "நிகழ்வுகள்",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
+  "label.filter": "Filter",
   "label.filter-combined": "ஒருங்கிணைந்த",
   "label.filter-raw": "மூல",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +87,25 @@
   "label.last-hours": "முந்தைய {x} மணி",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "உள்நுழைய",
   "label.logout": "வெளியேறு",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "கைபேசி",
   "label.more": "மேலும்",
+  "label.my-websites": "My websites",
   "label.name": "பெயர்",
   "label.new-password": "புதிய கடவுச்சொல்",
   "label.none": "None",
-  "label.operating-systems": "இயக்க முறைமைகள்",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Owner",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "பக்க காட்சிகள்",
+  "label.pageTitle": "Page title",
   "label.pages": "பக்கங்கள்",
   "label.password": "கடவுச்சொல்",
   "label.powered-by": "{name} ஆல் இயக்கப்படுகிறது",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "தற்போதைய",
+  "label.referrer": "Referrer",
   "label.referrers": "குறிப்பிடுவோர்",
   "label.refresh": "புதுப்பிப்பு",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "தேவையானவை",
   "label.reset": "மீட்டமை",
   "label.reset-website": "Reset statistics",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "சேமி",
   "label.screens": "Screens",
+  "label.search": "Search",
   "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "அமைப்புகள்",
   "label.share-url": "வலைத்தள களத்தைப் பகிரவும்",
   "label.single-day": "ஒரு நாள்",
+  "label.sum": "Sum",
   "label.tablet": "கையடக்க கணினி",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "இந்த மாதம்",
@@ -114,14 +156,21 @@
   "label.title": "Title",
   "label.today": "இன்று",
   "label.toggle-charts": "Toggle charts",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "கண்காணிப்பு குறியீடு",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "தனிப்பட்ட பார்வையாளர்கள்",
   "label.unknown": "தெரியாத",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "பயனர்பெயர்",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "விபரங்களை பார்",
   "label.view-only": "View only",
@@ -132,33 +181,6 @@
   "label.websites": "வலைத்தளங்கள்",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} தற்போதைய {x, plural, one {ஒன்று} other {மற்ற}}",
   "message.confirm-delete": "நீங்கள் நிச்சயமாக {target} நீக்க விரும்புகிறீர்களா?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "தவறான பயனர்பெயர் / கடவுச்சொல்.",
   "message.invalid-domain": "தவறான கள முகவரி",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "தரவு எதுவும் கிடைக்கவில்லை.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "இருக்கடவுச்சொல் பொருந்தவில்லை",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "உங்களிடம் எந்த வலைத்தளங்களும் கட்டமைக்கப்படவில்லை.",
   "message.page-not-found": "பக்கம் கிடைக்கவில்லை.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.",
@@ -184,12 +210,8 @@
   "message.share-url": "{target} இது பொதுவில் பகிரும் வலைத்தள முகவரி.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "கண்காணிப்பு குறியீடு",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "{country}வில் இருந்து பார்வையாளர் {browser} ஐ {os} {device}லில் பயன்படுத்துகிறார்",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "உங்களிடம் எந்த வலைத்தளங்களும் கட்டமைக்கப்படவில்லை.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "{country}வில் இருந்து பார்வையாளர் {browser} ஐ {os} {device}லில் பயன்படுத்துகிறார்"
 }
diff --git a/lang/th-TH.json b/src/lang/th-TH.json
similarity index 83%
rename from lang/th-TH.json
rename to src/lang/th-TH.json
index 7fa70298f..ee2fc19c4 100644
--- a/lang/th-TH.json
+++ b/src/lang/th-TH.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "เพิ่มเว็บไซต์",
   "label.admin": "ผู้ดูแลระบบ",
+  "label.after": "After",
   "label.all": "ทั้งหมด",
   "label.all-time": "ทุกช่วงเวลา",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "ระยะเวลาเข้าชมเฉลี่ย",
   "label.back": "ย้อนกลับ",
+  "label.before": "Before",
   "label.bounce-rate": "อัตราตีกลับ",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "เบราว์เซอร์",
   "label.cancel": "ยกเลิก",
   "label.change-password": "เปลี่ยนรหัสผ่าน",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "ยืนยันรหัสผ่าน",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "ประเทศ",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +38,21 @@
   "label.custom-range": "กำหนดช่วงเวลา",
   "label.dashboard": "แดชบอร์ด",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "ตั้งแต่วันที่",
+  "label.day": "Day",
   "label.default-date-range": "ช่วงเวลา",
   "label.delete": "ลบ",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "ลบเว็บไซต์",
+  "label.description": "Description",
   "label.desktop": "เดสก์ท็อป",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "อุปกรณ์",
   "label.dismiss": "ยกเลิก",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "โดเมน",
   "label.dropoff": "Dropoff",
   "label.edit": "แก้ไข",
@@ -46,12 +61,23 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "เหตุการณ์",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
+  "label.filter": "Filter",
   "label.filter-combined": "ข้อมูลรวม",
   "label.filter-raw": "ข้อมูลดิบ",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "ภาษา",
@@ -61,17 +87,25 @@
   "label.last-hours": "{x} ชั่วโมงที่ผ่านมา",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "เข้าสู่ระบบ",
   "label.logout": "ออกจากระบบ",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "โทรศัพท์มือถือ",
   "label.more": "เพิ่มเติม",
+  "label.my-websites": "My websites",
   "label.name": "ชื่อ",
   "label.new-password": "รหัสผ่านใหม่",
   "label.none": "ไม่ได้กำหนด",
-  "label.operating-systems": "ระบบปฏิบัติการ",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "เจ้าของ",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "การเข้าชม",
+  "label.pageTitle": "Page title",
   "label.pages": "หน้าเพจ",
   "label.password": "รหัสผ่าน",
   "label.powered-by": "ขับเคลื่อนโดย {name}",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "เรียลไทม์",
+  "label.referrer": "Referrer",
   "label.referrers": "แหล่งที่มา",
   "label.refresh": "รีเฟรช",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "ต้องการ",
   "label.reset": "รีเซต",
   "label.reset-website": "รีเซตข้อมูลสถิติ",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "บันทึก",
   "label.screens": "ขนาดหน้าจอ",
+  "label.search": "Search",
   "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "ตั้งค่า",
   "label.share-url": "แชร์ลิงก์",
   "label.single-day": "วันที่",
+  "label.sum": "Sum",
   "label.tablet": "แท็บเล็ต",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "ธีม",
   "label.this-month": "เดือนปัจจุบัน",
@@ -114,14 +156,21 @@
   "label.title": "Title",
   "label.today": "วันนี้",
   "label.toggle-charts": "เปิด/ปิดแผนภูมิ",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "โค้ดสำหรับใช้ติดตาม",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "ผู้เข้าชม",
   "label.unknown": "ไม่รู้จัก",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "ชื่อผู้ใช้",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "แสดงรายละเอียด",
   "label.view-only": "View only",
@@ -132,33 +181,6 @@
   "label.websites": "เว็บไซต์",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "มีผู้ใช้งาน {x} {x, plural, one {คนในขณะนี้} other {คนในขณะนี้}}",
   "message.confirm-delete": "คุณแน่ใจหรือไม่ว่าต้องการลบ {target} ?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "ชื่อผู้ใช้หรือรหัสผ่านไม่ถูกต้อง.",
   "message.invalid-domain": "โดเมนไม่ถูกต้อง",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "ไม่มีข้อมูล.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "รหัสผ่านไม่ตรงกัน",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "คุณยังไม่ได้ตั้งค่าเว็บไซต์ใด ๆ ไว้.",
   "message.page-not-found": "ไม่พบหน้านี้.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "สถิติทั้งหมดสำหรับเว็บไซต์นี้จะถูกลบออก แต่โค้ดสำหรับใช้ติดตามของคุณจะยังคงอยู่เหมือนเดิม.",
@@ -184,12 +210,8 @@
   "message.share-url": "นี่คือลิงก์ที่แชร์แบบสาธารณะสำหรับ {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "โค้ดสำหรับใช้ติดตาม",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "ผู้เข้าชมจาก {country} กำลังใช้งานผ่าน {browser} บน {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "คุณยังไม่ได้ตั้งค่าเว็บไซต์ใด ๆ ไว้.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "ผู้เข้าชมจาก {country} กำลังใช้งานผ่าน {browser} บน {os} {device}"
 }
diff --git a/lang/tr-TR.json b/src/lang/tr-TR.json
similarity index 78%
rename from lang/tr-TR.json
rename to src/lang/tr-TR.json
index 4f39fcb3f..6eac527b3 100644
--- a/lang/tr-TR.json
+++ b/src/lang/tr-TR.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "Web sitesi ekle",
   "label.admin": "Yönetici",
+  "label.after": "After",
   "label.all": "Tümü",
   "label.all-time": "All time",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Ortalama ziyaret süresi",
   "label.back": "Geri",
+  "label.before": "Before",
   "label.bounce-rate": "Çıkma oranı",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Tarayıcılar",
   "label.cancel": "İptal",
   "label.change-password": "Şifre değiştir",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Parolayı onayla",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Ülkeler",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +38,21 @@
   "label.custom-range": "Özelleştirilmiş aralık",
   "label.dashboard": "Kontrol Paneli",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Tarih aralığı",
+  "label.day": "Day",
   "label.default-date-range": "Varsayılan tarih aralığı",
   "label.delete": "Sil",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Web sitesini sil",
+  "label.description": "Description",
   "label.desktop": "Masaüstü",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Cihazlar",
   "label.dismiss": "Reddet",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Alan adı",
   "label.dropoff": "Dropoff",
   "label.edit": "Düzenle",
@@ -46,12 +61,23 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Olaylar",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
+  "label.filter": "Filter",
   "label.filter-combined": "Birleşik",
   "label.filter-raw": "Ham",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +87,25 @@
   "label.last-hours": "Son {x} saat",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Giriş Yap",
   "label.logout": "Çıkış Yap",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Mobil Cihaz",
   "label.more": "Detaylı göster",
+  "label.my-websites": "My websites",
   "label.name": "İsim",
   "label.new-password": "Yeni parola",
   "label.none": "None",
-  "label.operating-systems": "İşletim sistemi",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Owner",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Sayfa görünümü",
+  "label.pageTitle": "Page title",
   "label.pages": "Sayfalar",
   "label.password": "Parola",
   "label.powered-by": "Sağlayıcı: {name}",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Gerçek Zamanlı",
+  "label.referrer": "Referrer",
   "label.referrers": "Yönlendirenler",
   "label.refresh": "Yenile",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Zorunlu alan",
   "label.reset": "Sıfırla",
   "label.reset-website": "Reset statistics",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Kaydet",
   "label.screens": "Ekranlar",
+  "label.search": "Search",
   "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Ayarlar",
   "label.share-url": "Paylaşım adresi",
   "label.single-day": "Tekil gün",
+  "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "Bu ay",
@@ -114,14 +156,21 @@
   "label.title": "Title",
   "label.today": "Bugün",
   "label.toggle-charts": "Toggle charts",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "İzleme kodu",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Tekil kullanıcı",
   "label.unknown": "Bilinmeyen",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Kullanıcı adı",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Detayı incele",
   "label.view-only": "View only",
@@ -132,33 +181,6 @@
   "label.websites": "Web siteleri",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} aktif ziyaretçi",
   "message.confirm-delete": "{target} kaydını silmek istediğinizden emin misiniz?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "Hatalı kullanıcı adı ya da parola.",
   "message.invalid-domain": "Geçersiz alan adı",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Henüz hiç veri yok.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Parolalar uyuşmuyor",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "Henüz hiç web sitesi tanımlamadınız",
   "message.page-not-found": "Sayfa bulunamadı.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.",
@@ -184,12 +210,8 @@
   "message.share-url": "{target} için kullanılabilir anonim paylaşım adresidir.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "İzleme kodu",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Yeni ziyaretçi: {country}, {os}, {device}, {browser}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "Henüz hiç web sitesi tanımlamadınız",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Yeni ziyaretçi: {country}, {os}, {device}, {browser}"
 }
diff --git a/lang/uk-UA.json b/src/lang/uk-UA.json
similarity index 81%
rename from lang/uk-UA.json
rename to src/lang/uk-UA.json
index 7bdffd177..959956487 100644
--- a/lang/uk-UA.json
+++ b/src/lang/uk-UA.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "Додати сайт",
   "label.admin": "Адміністратор",
+  "label.after": "After",
   "label.all": "Всі",
   "label.all-time": "Весь час",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Середній час візиту",
   "label.back": "Назад",
+  "label.before": "Before",
   "label.bounce-rate": "Показник відмов",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Браузери",
   "label.cancel": "Відмінити",
   "label.change-password": "Змінити пароль",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Підтвердити пароль",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Країни",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +38,21 @@
   "label.custom-range": "Довільний період",
   "label.dashboard": "Інформаційна панель",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Діапазон дат",
+  "label.day": "Day",
   "label.default-date-range": "Діапазон дат за замовчуванням",
   "label.delete": "Видалити",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Видалити сайт",
+  "label.description": "Description",
   "label.desktop": "Настільний ПК",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Пристрої",
   "label.dismiss": "Відхилити",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Домен",
   "label.dropoff": "Dropoff",
   "label.edit": "Редагувати",
@@ -46,12 +61,23 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Події",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
+  "label.filter": "Filter",
   "label.filter-combined": "Об'єднані",
   "label.filter-raw": "Сирі дані",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +87,25 @@
   "label.last-hours": "Останні {x} годин",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Увійти",
   "label.logout": "Вийти",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Мобільний",
   "label.more": "Більше",
+  "label.my-websites": "My websites",
   "label.name": "Ім'я",
   "label.new-password": "Новий пароль",
   "label.none": "None",
-  "label.operating-systems": "Операційні системи",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Власник",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Перегляди сторінок",
+  "label.pageTitle": "Page title",
   "label.pages": "Сторінки",
   "label.password": "Пароль",
   "label.powered-by": "На базі {name}",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "У реальному часі",
+  "label.referrer": "Referrer",
   "label.referrers": "Джерела",
   "label.refresh": "Оновити",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Обов'язкове",
   "label.reset": "Скинути",
   "label.reset-website": "Скинути статистику сайту",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Зберегти",
   "label.screens": "Screens",
+  "label.search": "Search",
   "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Налаштування",
   "label.share-url": "Поділитися посилання",
   "label.single-day": "Один день",
+  "label.sum": "Sum",
   "label.tablet": "Планшет",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "Цього місяця",
@@ -114,14 +156,21 @@
   "label.title": "Title",
   "label.today": "Сьогодні",
   "label.toggle-charts": "Переключити графіки",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Код для відслідковування",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Унікальні відвідувачі",
   "label.unknown": "Невідомо",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Ім'я користувача",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Переглянути деталі",
   "label.view-only": "View only",
@@ -132,33 +181,6 @@
   "label.websites": "Сайти",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} поточних відвідувачів",
   "message.confirm-delete": "Ви впевнені, що бажаєте видалити {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "Невірне ім'я користувача або пароль.",
   "message.invalid-domain": "Некоректний домен",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Немає даних.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Паролі не співпадають",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "У вас немає налаштованих сайтів.",
   "message.page-not-found": "Сторінку не знайдено.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Вся статистика для цього сайту буде видалена, проте код відслідковування буде продовжувати працювати.",
@@ -184,12 +210,8 @@
   "message.share-url": "Це публічне посилання для {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Код для відслідковування",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Відвідувач з {country} використовуючи {browser} на {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "У вас немає налаштованих сайтів.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Відвідувач з {country} використовуючи {browser} на {os} {device}"
 }
diff --git a/lang/ur-PK.json b/src/lang/ur-PK.json
similarity index 80%
rename from lang/ur-PK.json
rename to src/lang/ur-PK.json
index a10594d99..5edaddd81 100644
--- a/lang/ur-PK.json
+++ b/src/lang/ur-PK.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "ویب سائٹ کا اضافہ کریں",
   "label.admin": "منتظم",
+  "label.after": "After",
   "label.all": "تمام",
   "label.all-time": "تمام وقت",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "وزٹ کا اوسط وقت",
   "label.back": "پیچھے",
+  "label.before": "Before",
   "label.bounce-rate": "اچھال کی شرح",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "براؤزرز",
   "label.cancel": "منسوخ",
   "label.change-password": "پاس ورڈ تبدیل کریں",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "پاس ورڈ کی تصدیق کریں",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "ممالک",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +38,21 @@
   "label.custom-range": "اپنی مرضی کی حد",
   "label.dashboard": "ڈیش بورڈ",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "تاریخ کی حد",
+  "label.day": "Day",
   "label.default-date-range": "پہلے سے طے شدہ تاریخ کی حد",
   "label.delete": "حذف کریں",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "ویب سائٹ مٹایں",
+  "label.description": "Description",
   "label.desktop": "ڈیسک ٹاپ",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "آلات",
   "label.dismiss": "مسترد کریں",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "ڈومین",
   "label.dropoff": "Dropoff",
   "label.edit": "ترمیم",
@@ -46,12 +61,23 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "واقعات",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
+  "label.filter": "Filter",
   "label.filter-combined": "مشترکہ",
   "label.filter-raw": "خام",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +87,25 @@
   "label.last-hours": "پچھلے {x} گھنٹے",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "لاگ ان",
   "label.logout": "لاگ آوٹ",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "موبائل",
   "label.more": "مزید",
+  "label.my-websites": "My websites",
   "label.name": "نام",
   "label.new-password": "نیا پاس ورڈ",
   "label.none": "None",
-  "label.operating-systems": "آپریٹنگ سسٹمز",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "مالک",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "صفحہ کے نظارے",
+  "label.pageTitle": "Page title",
   "label.pages": "صفحات",
   "label.password": "پاس ورڈ",
   "label.powered-by": "تقویت یافتہ بذریعہ {name}",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "براہ راست",
+  "label.referrer": "Referrer",
   "label.referrers": "بھیجنے والے",
   "label.refresh": "تازہ دم کریں",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "درکار ہے",
   "label.reset": "دوبارہ ترتیب دیں",
   "label.reset-website": "اعدادوشمار کو دوبارہ ترتیب دیں",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "محفوظ کریں",
   "label.screens": "Screens",
+  "label.search": "Search",
   "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "ترتیبات",
   "label.share-url": "URL کا اشتراک کریں",
   "label.single-day": "ایک دن",
+  "label.sum": "Sum",
   "label.tablet": "ٹیبلیٹ",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "اس مہینے",
@@ -114,14 +156,21 @@
   "label.title": "Title",
   "label.today": "آج",
   "label.toggle-charts": "چارٹ تبدیل کریں",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "ٹریکنگ کوڈ",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "منفرد زائرین",
   "label.unknown": "نامعلوم",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "صارف نام",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "تفصیلات دیکھیں",
   "label.view-only": "View only",
@@ -132,33 +181,6 @@
   "label.websites": "ویب سائٹس",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} موجودہ {x, plural, one {زائر} other {زائرین}}",
   "message.confirm-delete": "کیا آپ واقعی {target} کو حذف کرنا چاہتے ہیں؟",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "غلط صارف نام/پاس ورڈ۔",
   "message.invalid-domain": "غلط ڈومین",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "مواد موجود نہیں ہے.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "پاس ورڈز مماثل نہیں ہیں",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "آپ کے پاس کوئی ویب سائٹ کنفیگر نہیں ہے۔",
   "message.page-not-found": "صفحہ نہیں ملا.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "اس ویب سائٹ کے تمام اعدادوشمار کو حذف کر دیا جائے گا، لیکن آپ کا ٹریکنگ کوڈ برقرار رہے گا۔",
@@ -184,12 +210,8 @@
   "message.share-url": "یہ {target} کے لیے عوامی طور پر اشتراک کردہ URL ہے۔",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "ٹریکنگ کوڈ",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "{os} {device} پر {browser} کا استعمال کرتے ہوئے {country} سے آنے والا",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "آپ کے پاس کوئی ویب سائٹ کنفیگر نہیں ہے۔",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "{os} {device} پر {browser} کا استعمال کرتے ہوئے {country} سے آنے والا"
 }
diff --git a/lang/vi-VN.json b/src/lang/vi-VN.json
similarity index 79%
rename from lang/vi-VN.json
rename to src/lang/vi-VN.json
index b105cd6b2..9c629100b 100644
--- a/lang/vi-VN.json
+++ b/src/lang/vi-VN.json
@@ -6,21 +6,31 @@
   "label.add-description": "Add description",
   "label.add-website": "Thêm website",
   "label.admin": "Quản trị",
+  "label.after": "After",
   "label.all": "Tất cả",
   "label.all-time": "Toàn thời gian",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Thời gian truy cập trung bình",
   "label.back": "Quay về",
+  "label.before": "Before",
   "label.bounce-rate": "Tỷ lệ thoát trang",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Trình duyệt",
   "label.cancel": "Huỷ bỏ",
   "label.change-password": "Đổi mật khẩu",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Xác nhận mật khẩu",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Quốc gia",
+  "label.country": "Country",
+  "label.create": "Create",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +38,21 @@
   "label.custom-range": "Phạm vi ngày tuỳ chọn",
   "label.dashboard": "Bảng điều khiển",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Phạm vi ngày",
+  "label.day": "Day",
   "label.default-date-range": "Khoảng thời gian mặc định",
   "label.delete": "Xoá",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Xóa website",
+  "label.description": "Description",
   "label.desktop": "Máy bàn",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Thiết bị",
   "label.dismiss": "Loại trừ",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Tên miền",
   "label.dropoff": "Dropoff",
   "label.edit": "Chỉnh sửa",
@@ -46,12 +61,23 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Sự kiện",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
+  "label.filter": "Filter",
   "label.filter-combined": "Kết hợp",
   "label.filter-raw": "Gốc",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +87,25 @@
   "label.last-hours": "{x} giờ gần nhất",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Đăng nhập",
   "label.logout": "Đăng xuất",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Di động",
   "label.more": "Thêm",
+  "label.my-websites": "My websites",
   "label.name": "Tên",
   "label.new-password": "Mật khẩu mới",
   "label.none": "None",
-  "label.operating-systems": "Hệ điều hành",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Chủ sở hữu",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Lượt xem",
+  "label.pageTitle": "Page title",
   "label.pages": "Trang",
   "label.password": "Mật khẩu",
   "label.powered-by": "Bản quyền thuộc về {name}",
@@ -80,31 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Thời gian thực",
+  "label.referrer": "Referrer",
   "label.referrers": "Liên kết giới thiệu",
   "label.refresh": "Làm mới",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Yêu cầu",
   "label.reset": "Tái thiết lập",
   "label.reset-website": "Tái thiết lập thống kê",
+  "label.retention": "Retention",
+  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Lưu",
   "label.screens": "Screens",
+  "label.search": "Search",
   "label.select-date": "Select date",
   "label.select-website": "Select website",
   "label.sessions": "Sessions",
   "label.settings": "Cài đặt",
   "label.share-url": "Chia sẻ URL",
   "label.single-day": "Trong ngày",
+  "label.sum": "Sum",
   "label.tablet": "Máy tính bảng",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Giao diện",
   "label.this-month": "Tháng này",
@@ -114,14 +156,21 @@
   "label.title": "Title",
   "label.today": "Hôm nay",
   "label.toggle-charts": "Bật/tắt biểu đồ",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Mã theo dõi",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Khách truy cập một lần",
   "label.unknown": "Không rõ",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Tên đăng nhập",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Xem chi tiết",
   "label.view-only": "View only",
@@ -132,33 +181,6 @@
   "label.websites": "Websites",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} hiện tại {x, plural, one {một} other {trên}}",
   "message.confirm-delete": "Bạn có chắc chắn muốn xoá {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +194,15 @@
   "message.incorrect-username-password": "Sai tên đăng nhập/mật khẩu.",
   "message.invalid-domain": "Tên miền không hợp lệ",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Không có dữ liệu.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Mật khẩu không đồng nhất",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "Bạn chưa có bất cứ website nào.",
   "message.page-not-found": "Trang không tìm thấy.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Tất cả số liệu thống kê của website này sẽ bị xoá, nhưng mã theo dõi sẽ vẫn giữ nguyên.",
@@ -184,12 +210,8 @@
   "message.share-url": "Đây là đường dẫn URL cho {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Mã theo dõi",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Khách từ {country} đang dùng {browser} trên {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "Bạn chưa có bất cứ website nào.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Khách từ {country} đang dùng {browser} trên {os} {device}"
 }
diff --git a/lang/zh-CN.json b/src/lang/zh-CN.json
similarity index 68%
rename from lang/zh-CN.json
rename to src/lang/zh-CN.json
index f40dd88aa..5eda09497 100644
--- a/lang/zh-CN.json
+++ b/src/lang/zh-CN.json
@@ -6,21 +6,31 @@
   "label.add-description": "添加描述",
   "label.add-website": "添加网站",
   "label.admin": "管理员",
+  "label.after": "之后",
   "label.all": "所有",
   "label.all-time": "所有时间段",
   "label.analytics": "分析",
+  "label.average": "平均",
   "label.average-visit-time": "平均访问时间",
   "label.back": "返回",
+  "label.before": "之前",
   "label.bounce-rate": "跳出率",
+  "label.breakdown": "故障",
+  "label.browser": "浏览器",
   "label.browsers": "浏览器",
   "label.cancel": "取消",
   "label.change-password": "更新密码",
   "label.cities": "市/县",
+  "label.city": "市/县",
   "label.clear-all": "清除全部",
   "label.confirm": "确认",
   "label.confirm-password": "确认密码",
+  "label.contains": "包含",
   "label.continue": "继续",
   "label.countries": "国家/地区",
+  "label.country": "国家/地区",
+  "label.create": "创建",
+  "label.create-report": "创建报告",
   "label.create-team": "创建团队",
   "label.create-user": "创建用户",
   "label.created": "已创建",
@@ -28,30 +38,46 @@
   "label.custom-range": "自定义时间段",
   "label.dashboard": "仪表板",
   "label.data": "统计数据",
+  "label.date": "日期",
   "label.date-range": "时间段",
+  "label.day": "日",
   "label.default-date-range": "默认时间段",
   "label.delete": "删除",
   "label.delete-team": "删除团队",
   "label.delete-user": "删除用户",
   "label.delete-website": "删除网站",
+  "label.description": "描述",
   "label.desktop": "台式机",
   "label.details": "详细信息",
+  "label.device": "设备",
   "label.devices": "设备",
   "label.dismiss": "关闭",
+  "label.does-not-contain": "不包含",
   "label.domain": "域名",
-  "label.dropoff": "Dropoff",
+  "label.dropoff": "丢弃",
   "label.edit": "编辑",
   "label.edit-dashboard": "编辑仪表板",
   "label.enable-share-url": "启用共享链接",
-  "label.event": "Event",
-  "label.event-data": "Event data",
+  "label.event": "事件",
+  "label.event-data": "事件数据",
   "label.events": "行为类别",
-  "label.field": "Field",
-  "label.fields": "Fields",
+  "label.false": "否",
+  "label.field": "字段",
+  "label.fields": "字段",
+  "label.filter": "筛选器",
   "label.filter-combined": "合并",
   "label.filter-raw": "原始",
-  "label.funnel": "Funnel",
-  "label.insights": "Insights",
+  "label.filters": "筛选",
+  "label.funnel": "分析",
+  "label.funnel-description": "了解用户的转换率和退出率。",
+  "label.greater-than": "大于",
+  "label.greater-than-equals": "大于或等于",
+  "label.insights": "见解",
+  "label.insights-description": "通过使用筛选器和划分时间段来更深入地研究数据。",
+  "label.is": "等于",
+  "label.is-not": "不等于",
+  "label.is-not-set": "未设置",
+  "label.is-set": "已设置",
   "label.join": "加入",
   "label.join-team": "加入团队",
   "label.language": "语言",
@@ -61,50 +87,66 @@
   "label.last-hours": "最近 {x} 小时",
   "label.leave": "离开",
   "label.leave-team": "离开团队",
+  "label.less-than": "少于",
+  "label.less-than-equals": "少于等于",
   "label.login": "登录",
   "label.logout": "退出",
+  "label.max": "最大",
   "label.members": "成员",
+  "label.min": "最小",
   "label.mobile": "手机",
   "label.more": "更多",
+  "label.my-websites": "我的网站",
   "label.name": "名字",
   "label.new-password": "新密码",
   "label.none": "无",
-  "label.operating-systems": "操作系统",
+  "label.os": "OS",
+  "label.overview": "概览",
   "label.owner": "所有者",
+  "label.page-of": "总{total}中的第{current}页",
   "label.page-views": "页面浏览量",
+  "label.pageTitle": "标题",
   "label.pages": "网页",
   "label.password": "密码",
   "label.powered-by": "由 {name} 提供支持",
   "label.profile": "个人资料",
   "label.queries": "查询",
-  "label.query": "Query",
+  "label.query": "查询",
   "label.query-parameters": "查询参数",
   "label.realtime": "实时",
+  "label.referrer": "来源",
   "label.referrers": "来源域名",
   "label.refresh": "刷新",
   "label.regenerate": "重新生成",
+  "label.region": "州/省",
   "label.regions": "州/省",
   "label.remove": "移除",
-  "label.reports": "Reports",
+  "label.reports": "报告",
   "label.required": "必填",
   "label.reset": "重置",
   "label.reset-website": "重置统计数据",
+  "label.retention": "保留",
+  "label.retention-description": "通过跟踪用户返回的频率来衡量网站的用户粘性。",
   "label.role": "角色",
-  "label.run-query": "Run query",
+  "label.run-query": "查询",
   "label.save": "保存",
   "label.screens": "屏幕尺寸",
-  "label.select-date": "Select date",
+  "label.search": "搜索",
+  "label.select-date": "选择数据",
   "label.select-website": "选择网站",
   "label.sessions": "会话",
   "label.settings": "设置",
   "label.share-url": "共享链接",
   "label.single-day": "单日",
+  "label.sum": "总和",
   "label.tablet": "平板",
   "label.team": "团队",
   "label.team-guest": "团队访客",
   "label.team-id": "团队 ID",
   "label.team-member": "团队成员",
+  "label.team-name": "团队名称",
   "label.team-owner": "团队所有者",
+  "label.team-websites": "团队网站",
   "label.teams": "团队",
   "label.theme": "主题",
   "label.this-month": "本月",
@@ -114,51 +156,31 @@
   "label.title": "标题",
   "label.today": "今天",
   "label.toggle-charts": "切换图表",
+  "label.total": "总数",
+  "label.total-records": "总记录数",
   "label.tracking-code": "跟踪代码",
+  "label.true": "是",
+  "label.type": "类型",
+  "label.unique": "独立",
   "label.unique-visitors": "独立访客",
   "label.unknown": "未知",
-  "label.url": "URL",
-  "label.urls": "URLs",
+  "label.untitled": "未命名",
+  "label.url": "网址",
+  "label.urls": "网址",
   "label.user": "用户",
   "label.username": "用户名",
   "label.users": "用户",
+  "label.value": "值",
   "label.view": "查看",
   "label.view-details": "查看更多",
-  "label.view-only": "View only",
+  "label.view-only": "仅浏览量",
   "label.views": "浏览量",
   "label.visitors": "访客",
-  "label.website": "Website",
+  "label.website": "网站",
   "label.website-id": "网站 ID",
   "label.websites": "网站",
   "label.window": "窗口",
   "label.yesterday": "昨天",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "创建报告",
-  "labels.description": "描述",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "未命名",
-  "labels.value": "Value",
   "message.active-users": "当前在线 {x} 人",
   "message.confirm-delete": "你确定要删除 {target} 吗？",
   "message.confirm-leave": "你确定要离开 {target} 吗？",
@@ -167,29 +189,29 @@
   "message.delete-website": "确定删除该网站, 请在下面的输入框中输入 {confirmation} 进行二次确认。",
   "message.delete-website-warning": "所有相关数据将会被删除。",
   "message.error": "出现错误。",
-  "message.event-log": "{event} on {url}",
+  "message.event-log": "{url}上的{event}",
   "message.go-to-settings": "去设置",
   "message.incorrect-username-password": "用户名或密码不正确。",
   "message.invalid-domain": "无效域名",
   "message.min-password-length": "密码最短长度为 {n} 个字符",
+  "message.new-version-available": "Umami的新版本{version}已推出！",
   "message.no-data-available": "无可用数据。",
-  "message.no-event-data": "No event data is available.",
+  "message.no-event-data": "无可用事件。",
   "message.no-match-password": "密码不一致",
+  "message.no-results-found": "没有找到任何结果。",
+  "message.no-team-websites": "这个团队没有任何网站。",
   "message.no-teams": "你还没有创建任何团队。",
   "message.no-users": "没有任何用户。",
+  "message.no-websites-configured": "你还没有设置任何网站。",
   "message.page-not-found": "网页未找到。",
-  "message.reset-website": "确定重置该网站, 请在下面的输入框中输入 {confirmation} 进行二次确认。",
+  "message.reset-website": "如果确定重置该网站, 请在下面的输入框中输入 {confirmation} 进行二次确认。",
   "message.reset-website-warning": "本网站的所有统计数据将被删除，但您的跟踪代码将保持不变。",
   "message.saved": "保存成功。",
   "message.share-url": "这是 {target} 的共享链接。",
   "message.team-already-member": "你已经是该团队的成员。",
   "message.team-not-found": "未找到团队。",
-  "message.tracking-code": "跟踪代码",
-  "message.user-deleted": "User deleted.",
-  "message.visitor-log": "来自{country}的访客在搭载 {os} 的{device}上使用 {browser} 浏览器进行访问。",
-  "message.no-results-found": "没有找到任何结果。",
-  "message.no-team-websites": "这个团队没有任何网站。",
-  "message.no-websites-configured": "你还没有设置任何网站。",
   "message.team-websites-info": "团队中的任何人都可查看网站。",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.tracking-code": "跟踪代码",
+  "message.user-deleted": "用户已删除。",
+  "message.visitor-log": "来自{country}的访客在搭载 {os} 的{device}上使用 {browser} 浏览器进行访问。"
 }
diff --git a/src/lang/zh-TW.json b/src/lang/zh-TW.json
new file mode 100644
index 000000000..aed04d0cb
--- /dev/null
+++ b/src/lang/zh-TW.json
@@ -0,0 +1,217 @@
+{
+  "label.access-code": "存取碼",
+  "label.actions": "行動",
+  "label.activity-log": "活動日誌",
+  "label.add": "新增",
+  "label.add-description": "新增描述",
+  "label.add-website": "新增網站",
+  "label.admin": "管理員",
+  "label.after": "之後",
+  "label.all": "全部",
+  "label.all-time": "所有時間",
+  "label.analytics": "分析",
+  "label.average": "平均",
+  "label.average-visit-time": "平均造訪時間",
+  "label.back": "返回",
+  "label.before": "之前",
+  "label.bounce-rate": "跳出率",
+  "label.breakdown": "分解",
+  "label.browser": "瀏覽器",
+  "label.browsers": "瀏覽器",
+  "label.cancel": "取消",
+  "label.change-password": "更改密碼",
+  "label.cities": "城市",
+  "label.city": "城市",
+  "label.clear-all": "全部清除",
+  "label.confirm": "確認",
+  "label.confirm-password": "確認密碼",
+  "label.contains": "包含",
+  "label.continue": "繼續",
+  "label.countries": "國家",
+  "label.country": "國家",
+  "label.create": "建立",
+  "label.create-report": "建立報告",
+  "label.create-team": "建立團隊",
+  "label.create-user": "建立使用者",
+  "label.created": "已建立",
+  "label.current-password": "目前密碼",
+  "label.custom-range": "自訂範圍",
+  "label.dashboard": "儀表板",
+  "label.data": "資料",
+  "label.date": "日期",
+  "label.date-range": "日期範圍",
+  "label.day": "日",
+  "label.default-date-range": "預設日期範圍",
+  "label.delete": "刪除",
+  "label.delete-team": "刪除團隊",
+  "label.delete-user": "刪除使用者",
+  "label.delete-website": "刪除網站",
+  "label.description": "描述",
+  "label.desktop": "桌上型電腦",
+  "label.details": "詳細資訊",
+  "label.device": "裝置",
+  "label.devices": "裝置",
+  "label.dismiss": "關閉",
+  "label.does-not-contain": "不包含",
+  "label.domain": "網域",
+  "label.dropoff": "退出",
+  "label.edit": "編輯",
+  "label.edit-dashboard": "編輯儀表板",
+  "label.enable-share-url": "啟用分享網址",
+  "label.event": "事件",
+  "label.event-data": "事件資料",
+  "label.events": "事件",
+  "label.false": "否",
+  "label.field": "欄位",
+  "label.fields": "欄位",
+  "label.filter": "篩選器",
+  "label.filter-combined": "組合",
+  "label.filter-raw": "原始",
+  "label.filters": "篩選器",
+  "label.funnel": "漏斗",
+  "label.funnel-description": "瞭解使用者的轉換率和退出率",
+  "label.greater-than": "大於",
+  "label.greater-than-equals": "大於或等於",
+  "label.insights": "洞察",
+  "label.insights-description": "透過使用區段和篩選器來深入探索你的數據",
+  "label.is": "是",
+  "label.is-not": "不是",
+  "label.is-not-set": "未設定",
+  "label.is-set": "已設定",
+  "label.join": "加入",
+  "label.join-team": "加入團隊",
+  "label.language": "語言",
+  "label.languages": "語言",
+  "label.laptop": "筆記型電腦",
+  "label.last-days": "最近 {x} 天",
+  "label.last-hours": "最近 {x} 小時",
+  "label.leave": "離開",
+  "label.leave-team": "離開團隊",
+  "label.less-than": "小於",
+  "label.less-than-equals": "小於或等於",
+  "label.login": "登入",
+  "label.logout": "登出",
+  "label.max": "最大",
+  "label.members": "成員",
+  "label.min": "最小",
+  "label.mobile": "行動裝置",
+  "label.more": "更多",
+  "label.my-websites": "我的網站",
+  "label.name": "名稱",
+  "label.new-password": "新密碼",
+  "label.none": "無",
+  "label.os": "作業系統",
+  "label.overview": "概覽",
+  "label.owner": "擁有者",
+  "label.page-of": "頁面 {current} / {total}",
+  "label.page-views": "頁面瀏覽",
+  "label.pageTitle": "頁面標題",
+  "label.pages": "頁面",
+  "label.password": "密碼",
+  "label.powered-by": "由 {name} 提供",
+  "label.profile": "個人資料",
+  "label.queries": "查詢",
+  "label.query": "查詢",
+  "label.query-parameters": "查詢參數",
+  "label.realtime": "即時",
+  "label.referrer": "參照來源",
+  "label.referrers": "參照來源",
+  "label.refresh": "重新整理",
+  "label.regenerate": "重新產生",
+  "label.region": "區域",
+  "label.regions": "區域",
+  "label.remove": "移除",
+  "label.reports": "報告",
+  "label.required": "必填",
+  "label.reset": "重設",
+  "label.reset-website": "重設網站",
+  "label.retention": "保留",
+  "label.retention-description": "透過追蹤使用者回訪的頻率來衡量您的網站黏著度。",
+  "label.role": "角色",
+  "label.run-query": "執行查詢",
+  "label.save": "儲存",
+  "label.screens": "螢幕",
+  "label.search": "Search",
+  "label.select-date": "選擇日期",
+  "label.select-website": "選擇網站",
+  "label.sessions": "工作階段",
+  "label.settings": "設定",
+  "label.share-url": "分享網址",
+  "label.single-day": "單日",
+  "label.sum": "總和",
+  "label.tablet": "平板",
+  "label.team": "團隊",
+  "label.team-guest": "團隊訪客",
+  "label.team-id": "團隊 ID",
+  "label.team-member": "團隊成員",
+  "label.team-name": "團隊名稱",
+  "label.team-owner": "團隊擁有者",
+  "label.team-websites": "團隊網站",
+  "label.teams": "團隊",
+  "label.theme": "主題",
+  "label.this-month": "本月",
+  "label.this-week": "本週",
+  "label.this-year": "今年",
+  "label.timezone": "時區",
+  "label.title": "標題",
+  "label.today": "今天",
+  "label.toggle-charts": "切換圖表",
+  "label.total": "總計",
+  "label.total-records": "總記錄",
+  "label.tracking-code": "追蹤代碼",
+  "label.true": "是",
+  "label.type": "類型",
+  "label.unique": "獨立",
+  "label.unique-visitors": "獨立訪客",
+  "label.unknown": "未知",
+  "label.untitled": "無標題",
+  "label.url": "網址",
+  "label.urls": "網址",
+  "label.user": "使用者",
+  "label.username": "使用者名稱",
+  "label.users": "使用者",
+  "label.value": "值",
+  "label.view": "檢視",
+  "label.view-details": "檢視詳細資訊",
+  "label.view-only": "僅供檢視",
+  "label.views": "檢視",
+  "label.visitors": "訪客",
+  "label.website": "網站",
+  "label.website-id": "網站 ID",
+  "label.websites": "網站",
+  "label.window": "視窗",
+  "label.yesterday": "昨天",
+  "message.active-users": "目前有 {x} 個活躍的訪客",
+  "message.confirm-delete": "您確定要刪除 {target} 嗎？",
+  "message.confirm-leave": "您確定要離開 {target} 嗎？",
+  "message.confirm-reset": "您確定要重設 {target} 嗎？",
+  "message.delete-account": "要刪除此帳戶，請在下方的方框中輸入 {confirmation} 以確認。",
+  "message.delete-website": "要刪除此網站，請在下方的方框中輸入 {confirmation} 以確認。",
+  "message.delete-website-warning": "所有網站資料將被刪除。",
+  "message.error": "發生錯誤。",
+  "message.event-log": "{event} 在 {url}",
+  "message.go-to-settings": "前往設定",
+  "message.incorrect-username-password": "使用者名稱和/或密碼不正確。",
+  "message.invalid-domain": "無效的網域。請不要包含 http/https。",
+  "message.min-password-length": "最少需要 {n} 個字元",
+  "message.new-version-available": "Umami {version} 的新版本已經可以使用！",
+  "message.no-data-available": "沒有可用的資料。",
+  "message.no-event-data": "沒有可用的事件資料。",
+  "message.no-match-password": "密碼不一致。",
+  "message.no-results-found": "找不到結果。",
+  "message.no-team-websites": "此團隊沒有任何網站。",
+  "message.no-teams": "您尚未建立任何團隊。",
+  "message.no-users": "沒有使用者。",
+  "message.no-websites-configured": "您尚未設定任何網站。",
+  "message.page-not-found": "找不到頁面",
+  "message.reset-website": "要重設此網站，請在下方的方框中輸入 {confirmation} 以確認。",
+  "message.reset-website-warning": "此網站的所有統計將被刪除，但您的設定將保持不變。",
+  "message.saved": "已儲存。",
+  "message.share-url": "您的網站統計資料可以在以下網址公開檢視：",
+  "message.team-already-member": "您已經是團隊的成員。",
+  "message.team-not-found": "找不到團隊。",
+  "message.team-websites-info": "團隊的任何成員都可以檢視網站。",
+  "message.tracking-code": "要追蹤此網站的統計，請將以下代碼放在您的 HTML 的 <head>...</head> 區段中。",
+  "message.user-deleted": "使用者已刪除。",
+  "message.visitor-log": "來自 {country} 的訪客在 {device} 上的 {os} 使用 {browser} 瀏覽。"
+}
diff --git a/lib/auth.ts b/src/lib/auth.ts
similarity index 85%
rename from lib/auth.ts
rename to src/lib/auth.ts
index 10f7fbcac..cb3d3cc79 100644
--- a/lib/auth.ts
+++ b/src/lib/auth.ts
@@ -1,28 +1,30 @@
 import { Report } from '@prisma/client';
-import redis from '@umami/redis-client';
 import debug from 'debug';
+import redis from '@umami/redis-client';
 import { PERMISSIONS, ROLE_PERMISSIONS, SHARE_TOKEN_HEADER } from 'lib/constants';
 import { secret } from 'lib/crypto';
 import { createSecureToken, ensureArray, getRandomChars, parseToken } from 'next-basics';
-import { getTeamUser, getTeamWebsite, findTeamWebsiteByUserId } from 'queries';
+import { findTeamWebsiteByUserId, getTeamUser, getTeamWebsite } from 'queries';
 import { loadWebsite } from './load';
 import { Auth } from './types';
+import { NextApiRequest } from 'next';
 
 const log = debug('umami:auth');
+const cloudMode = process.env.CLOUD_MODE;
 
-export async function setAuthKey(user, expire = 0) {
+export async function saveAuth(data: any, expire = 0) {
   const authKey = `auth:${getRandomChars(32)}`;
 
-  await redis.set(authKey, user);
+  await redis.client.set(authKey, data);
 
   if (expire) {
-    await redis.expire(authKey, expire);
+    await redis.client.expire(authKey, expire);
   }
 
   return createSecureToken({ authKey }, secret());
 }
 
-export function getAuthToken(req) {
+export function getAuthToken(req: NextApiRequest) {
   try {
     return req.headers.authorization.split(' ')[1];
   } catch {
@@ -30,7 +32,7 @@ export function getAuthToken(req) {
   }
 }
 
-export function parseShareToken(req) {
+export function parseShareToken(req: Request) {
   try {
     return parseToken(req.headers[SHARE_TOKEN_HEADER], secret());
   } catch (e) {
@@ -57,7 +59,15 @@ export async function canViewWebsite({ user, shareToken }: Auth, websiteId: stri
   return !!(await findTeamWebsiteByUserId(websiteId, user.id));
 }
 
-export async function canCreateWebsite({ user }: Auth) {
+export async function canViewAllWebsites({ user }: Auth) {
+  return user.isAdmin;
+}
+
+export async function canCreateWebsite({ user, grant }: Auth) {
+  if (cloudMode) {
+    return !!grant?.find(a => a === PERMISSIONS.websiteCreate);
+  }
+
   if (user.isAdmin) {
     return true;
   }
@@ -109,7 +119,11 @@ export async function canDeleteReport(auth: Auth, report: Report) {
   return canUpdateReport(auth, report);
 }
 
-export async function canCreateTeam({ user }: Auth) {
+export async function canCreateTeam({ user, grant }: Auth) {
+  if (cloudMode) {
+    return !!grant?.find(a => a === PERMISSIONS.teamCreate);
+  }
+
   if (user.isAdmin) {
     return true;
   }
diff --git a/lib/cache.ts b/src/lib/cache.ts
similarity index 55%
rename from lib/cache.ts
rename to src/lib/cache.ts
index bc46c23d1..69d749d04 100644
--- a/lib/cache.ts
+++ b/src/lib/cache.ts
@@ -2,61 +2,72 @@ import { User, Website } from '@prisma/client';
 import redis from '@umami/redis-client';
 import { getSession, getUserById, getWebsiteById } from '../queries';
 
-const { fetchObject, storeObject, deleteObject } = redis;
-
 async function fetchWebsite(id): Promise<Website> {
-  return fetchObject(`website:${id}`, () => getWebsiteById(id));
+  return redis.client.getCache(`website:${id}`, () => getWebsiteById(id), 86400);
 }
 
 async function storeWebsite(data) {
   const { id } = data;
   const key = `website:${id}`;
 
-  return storeObject(key, data);
+  const obj = await redis.client.setCache(key, data);
+  await redis.client.expire(key, 86400);
+
+  return obj;
 }
 
 async function deleteWebsite(id) {
-  return deleteObject(`website:${id}`);
+  return redis.client.deleteCache(`website:${id}`);
 }
 
 async function fetchUser(id): Promise<User> {
-  return fetchObject(`user:${id}`, () => getUserById(id, { includePassword: true }));
+  return redis.client.getCache(
+    `user:${id}`,
+    () => getUserById(id, { includePassword: true }),
+    86400,
+  );
 }
 
 async function storeUser(data) {
   const { id } = data;
   const key = `user:${id}`;
 
-  return storeObject(key, data);
+  const obj = await redis.client.setCache(key, data);
+  await redis.client.expire(key, 86400);
+
+  return obj;
 }
 
 async function deleteUser(id) {
-  return deleteObject(`user:${id}`);
+  return redis.client.deleteCache(`user:${id}`);
 }
 
 async function fetchSession(id) {
-  return fetchObject(`session:${id}`, () => getSession(id));
+  return redis.client.getCache(`session:${id}`, () => getSession(id), 86400);
 }
 
 async function storeSession(data) {
   const { id } = data;
   const key = `session:${id}`;
 
-  return storeObject(key, data);
+  const obj = await redis.client.setCache(key, data);
+  await redis.client.expire(key, 86400);
+
+  return obj;
 }
 
 async function deleteSession(id) {
-  return deleteObject(`session:${id}`);
+  return redis.client.deleteCache(`session:${id}`);
 }
 
 async function fetchUserBlock(userId: string) {
   const key = `user:block:${userId}`;
-  return redis.get(key);
+  return redis.client.get(key);
 }
 
 async function incrementUserBlock(userId: string) {
   const key = `user:block:${userId}`;
-  return redis.incr(key);
+  return redis.client.incr(key);
 }
 
 export default {
@@ -71,5 +82,5 @@ export default {
   deleteSession,
   fetchUserBlock,
   incrementUserBlock,
-  enabled: redis.enabled,
+  enabled: !!redis.enabled,
 };
diff --git a/lib/charts.js b/src/lib/charts.tsx
similarity index 58%
rename from lib/charts.js
rename to src/lib/charts.tsx
index 0571a9a9e..c80bfe3f9 100644
--- a/lib/charts.js
+++ b/src/lib/charts.tsx
@@ -1,34 +1,34 @@
 import { StatusLight } from 'react-basics';
-import { dateFormat } from 'lib/date';
+import { formatDate } from 'lib/date';
 import { formatLongNumber } from 'lib/format';
 
-export function renderNumberLabels(label) {
-  return +label > 1000 ? formatLongNumber(label) : label;
+export function renderNumberLabels(label: string) {
+  return +label > 1000 ? formatLongNumber(+label) : label;
 }
 
-export function renderDateLabels(unit, locale) {
-  return (label, index, values) => {
+export function renderDateLabels(unit: string, locale: string) {
+  return (label: string, index: number, values: any[]) => {
     const d = new Date(values[index].value);
 
     switch (unit) {
       case 'minute':
-        return dateFormat(d, 'h:mm', locale);
+        return formatDate(d, 'h:mm', locale);
       case 'hour':
-        return dateFormat(d, 'p', locale);
+        return formatDate(d, 'p', locale);
       case 'day':
-        return dateFormat(d, 'MMM d', locale);
+        return formatDate(d, 'MMM d', locale);
       case 'month':
-        return dateFormat(d, 'MMM', locale);
+        return formatDate(d, 'MMM', locale);
       case 'year':
-        return dateFormat(d, 'YYY', locale);
+        return formatDate(d, 'YYY', locale);
       default:
         return label;
     }
   };
 }
 
-export function renderStatusTooltipPopup(unit, locale) {
-  return (setTooltipPopup, model) => {
+export function renderStatusTooltipPopup(unit: string, locale: string) {
+  return (setTooltipPopup: (data: any) => void, model: any) => {
     const { opacity, labelColors, dataPoints } = model.tooltip;
 
     if (!dataPoints?.length || !opacity) {
@@ -50,7 +50,7 @@ export function renderStatusTooltipPopup(unit, locale) {
 
     setTooltipPopup(
       <>
-        <div>{dateFormat(new Date(dataPoints[0].raw.x), formats[unit], locale)}</div>
+        <div>{formatDate(new Date(dataPoints[0].raw.x), formats[unit], locale)}</div>
         <div>
           <StatusLight color={labelColors?.[0]?.backgroundColor}>
             {formatLongNumber(dataPoints[0].raw.y)} {dataPoints[0].dataset.label}
diff --git a/src/lib/clickhouse.ts b/src/lib/clickhouse.ts
new file mode 100644
index 000000000..2eed340ed
--- /dev/null
+++ b/src/lib/clickhouse.ts
@@ -0,0 +1,171 @@
+import { ClickHouseClient, createClient } from '@clickhouse/client';
+import dateFormat from 'dateformat';
+import debug from 'debug';
+import { CLICKHOUSE } from 'lib/db';
+import { QueryFilters, QueryOptions } from './types';
+import { FILTER_COLUMNS, OPERATORS } from './constants';
+import { loadWebsite } from './load';
+import { maxDate } from './date';
+
+export const CLICKHOUSE_DATE_FORMATS = {
+  minute: '%Y-%m-%d %H:%M:00',
+  hour: '%Y-%m-%d %H:00:00',
+  day: '%Y-%m-%d',
+  month: '%Y-%m-01',
+  year: '%Y-01-01',
+};
+
+const log = debug('umami:clickhouse');
+
+let clickhouse: ClickHouseClient;
+const enabled = Boolean(process.env.CLICKHOUSE_URL);
+
+function getClient() {
+  const {
+    hostname,
+    port,
+    pathname,
+    protocol,
+    username = 'default',
+    password,
+  } = new URL(process.env.CLICKHOUSE_URL);
+
+  const client = createClient({
+    host: `${protocol}//${hostname}:${port}`,
+    database: pathname.replace('/', ''),
+    username: username,
+    password,
+  });
+
+  if (process.env.NODE_ENV !== 'production') {
+    global[CLICKHOUSE] = client;
+  }
+
+  log('Clickhouse initialized');
+
+  return client;
+}
+
+function getDateStringQuery(data, unit) {
+  return `formatDateTime(${data}, '${CLICKHOUSE_DATE_FORMATS[unit]}')`;
+}
+
+function getDateQuery(field, unit, timezone?) {
+  if (timezone) {
+    return `date_trunc('${unit}', ${field}, '${timezone}')`;
+  }
+  return `date_trunc('${unit}', ${field})`;
+}
+
+function getDateFormat(date) {
+  return `'${dateFormat(date, 'UTC:yyyy-mm-dd HH:MM:ss')}'`;
+}
+
+function mapFilter(column, operator, name, type = 'String') {
+  switch (operator) {
+    case OPERATORS.equals:
+      return `${column} = {${name}:${type}}`;
+    case OPERATORS.notEquals:
+      return `${column} != {${name}:${type}}`;
+    default:
+      return '';
+  }
+}
+
+function getFilterQuery(filters: QueryFilters = {}, options: QueryOptions = {}) {
+  const query = Object.keys(filters).reduce((arr, name) => {
+    const value = filters[name];
+    const operator = value?.filter ?? OPERATORS.equals;
+    const column = FILTER_COLUMNS[name] ?? options?.columns?.[name];
+
+    if (value !== undefined && column) {
+      arr.push(`and ${mapFilter(column, operator, name)}`);
+
+      if (name === 'referrer') {
+        arr.push('and referrer_domain != {websiteDomain:String}');
+      }
+    }
+
+    return arr;
+  }, []);
+
+  return query.join('\n');
+}
+
+function normalizeFilters(filters = {}) {
+  return Object.keys(filters).reduce((obj, key) => {
+    const value = filters[key];
+
+    obj[key] = value?.value ?? value;
+
+    return obj;
+  }, {});
+}
+
+async function parseFilters(websiteId: string, filters: QueryFilters = {}, options?: QueryOptions) {
+  const website = await loadWebsite(websiteId);
+
+  return {
+    filterQuery: getFilterQuery(filters, options),
+    params: {
+      ...normalizeFilters(filters),
+      websiteId,
+      startDate: maxDate(filters.startDate, new Date(website.resetAt)),
+      websiteDomain: website.domain,
+    },
+  };
+}
+
+async function rawQuery(query: string, params: Record<string, unknown> = {}): Promise<unknown> {
+  if (process.env.LOG_QUERY) {
+    log('QUERY:\n', query);
+    log('PARAMETERS:\n', params);
+  }
+
+  await connect();
+
+  const resultSet = await clickhouse.query({
+    query: query,
+    query_params: params,
+    format: 'JSONEachRow',
+  });
+
+  const data = await resultSet.json();
+
+  return data;
+}
+
+async function findUnique(data) {
+  if (data.length > 1) {
+    throw `${data.length} records found when expecting 1.`;
+  }
+
+  return findFirst(data);
+}
+
+async function findFirst(data) {
+  return data[0] ?? null;
+}
+
+async function connect() {
+  if (enabled && !clickhouse) {
+    clickhouse = process.env.CLICKHOUSE_URL && (global[CLICKHOUSE] || getClient());
+  }
+
+  return clickhouse;
+}
+
+export default {
+  enabled,
+  client: clickhouse,
+  log,
+  connect,
+  getDateStringQuery,
+  getDateQuery,
+  getDateFormat,
+  getFilterQuery,
+  parseFilters,
+  findUnique,
+  findFirst,
+  rawQuery,
+};
diff --git a/lib/client.ts b/src/lib/client.ts
similarity index 84%
rename from lib/client.ts
rename to src/lib/client.ts
index 8c69d23d8..7810c44ad 100644
--- a/lib/client.ts
+++ b/src/lib/client.ts
@@ -5,7 +5,7 @@ export function getClientAuthToken() {
   return getItem(AUTH_TOKEN);
 }
 
-export function setClientAuthToken(token) {
+export function setClientAuthToken(token: string) {
   setItem(AUTH_TOKEN, token);
 }
 
diff --git a/lib/constants.ts b/src/lib/constants.ts
similarity index 83%
rename from lib/constants.ts
rename to src/lib/constants.ts
index c275ed8d4..0c894634b 100644
--- a/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -13,12 +13,13 @@ export const REPO_URL = 'https://github.com/umami-software/umami';
 export const UPDATES_URL = 'https://api.umami.is/v1/updates';
 export const TELEMETRY_PIXEL = 'https://i.umami.is/a.png';
 
-export const DEFAULT_LOCALE = process.env.defaultLocale ?? 'en-US';
+export const DEFAULT_LOCALE = process.env.defaultLocale || 'en-US';
 export const DEFAULT_THEME = 'light';
 export const DEFAULT_ANIMATION_DURATION = 300;
 export const DEFAULT_DATE_RANGE = '24hour';
 export const DEFAULT_WEBSITE_LIMIT = 10;
 export const DEFAULT_RESET_DATE = '2000-01-01';
+export const DEFAULT_PAGE_SIZE = 10;
 
 export const REALTIME_RANGE = 30;
 export const REALTIME_INTERVAL = 5000;
@@ -29,7 +30,7 @@ export const FILTER_DAY = 'filter-day';
 export const FILTER_RANGE = 'filter-range';
 export const FILTER_REFERRERS = 'filter-referrers';
 export const FILTER_PAGES = 'filter-pages';
-
+export const UNIT_TYPES = ['year', 'month', 'hour', 'day'];
 export const EVENT_COLUMNS = ['url', 'referrer', 'title', 'query', 'event'];
 
 export const SESSION_COLUMNS = [
@@ -43,18 +44,24 @@ export const SESSION_COLUMNS = [
   'city',
 ];
 
-export const COLLECTION_TYPE = {
-  event: 'event',
-  identify: 'identify',
-};
-
 export const FILTER_COLUMNS = {
   url: 'url_path',
   referrer: 'referrer_domain',
   title: 'page_title',
   query: 'url_query',
-  event: 'event_name',
+  os: 'os',
+  browser: 'browser',
+  device: 'device',
+  country: 'country',
   region: 'subdivision1',
+  city: 'city',
+  language: 'language',
+  event: 'event_name',
+};
+
+export const COLLECTION_TYPE = {
+  event: 'event',
+  identify: 'identify',
 };
 
 export const EVENT_TYPE = {
@@ -70,6 +77,23 @@ export const DATA_TYPE = {
   array: 5,
 } as const;
 
+export const OPERATORS = {
+  equals: 'eq',
+  notEquals: 'neq',
+  set: 's',
+  notSet: 'ns',
+  contains: 'c',
+  doesNotContain: 'dnc',
+  true: 't',
+  false: 'f',
+  greaterThan: 'gt',
+  lessThan: 'lt',
+  greaterThanEquals: 'gte',
+  lessThanEquals: 'lte',
+  before: 'bf',
+  after: 'af',
+} as const;
+
 export const DATA_TYPES = {
   [DATA_TYPE.string]: 'string',
   [DATA_TYPE.number]: 'number',
@@ -78,6 +102,12 @@ export const DATA_TYPES = {
   [DATA_TYPE.array]: 'array',
 };
 
+export const REPORT_TYPES = {
+  funnel: 'funnel',
+  insights: 'insights',
+  retention: 'retention',
+} as const;
+
 export const REPORT_PARAMETERS = {
   fields: 'fields',
   filters: 'filters',
@@ -120,37 +150,6 @@ export const ROLE_PERMISSIONS = {
   [ROLES.teamMember]: [],
 } as const;
 
-export const WEBSITE_EVENT_FIELDS = {
-  eventId: { name: 'event_id', type: 'uuid', label: 'Event ID' },
-  websiteId: { name: 'website_id', type: 'uuid', label: 'Website ID' },
-  sessionId: { name: 'session_id', type: 'uuid', label: 'Session ID' },
-  createdAt: { name: 'created_at', type: 'date', label: 'Created date' },
-  urlPath: { name: 'url_path', type: 'string', label: 'URL path' },
-  urlQuery: { name: 'url_query', type: 'string', label: 'URL query' },
-  referrerPath: { name: 'referrer_path', type: 'string', label: 'Referrer path' },
-  referrerQuery: { name: 'referrer_query', type: 'string', label: 'Referrer query' },
-  referrerDomain: { name: 'referrer_domain', type: 'string', label: 'Referrer domain' },
-  pageTitle: { name: 'page_title', type: 'string', label: 'Page title' },
-  eventType: { name: 'event_type', type: 'string', label: 'Event type' },
-  eventName: { name: 'event_name', type: 'string', label: 'Event name' },
-};
-
-export const SESSION_FIELDS = {
-  sessionId: { name: 'session_id', type: 'uuid' },
-  websiteId: { name: 'website_id', type: 'uuid' },
-  hostname: { name: 'hostname', type: 'string' },
-  browser: { name: 'browser', type: 'string' },
-  os: { name: 'os', type: 'string' },
-  device: { name: 'device', type: 'string' },
-  screen: { name: 'screen', type: 'string' },
-  language: { name: 'language', type: 'string' },
-  country: { name: 'country', type: 'string' },
-  subdivision1: { name: 'subdivision1', type: 'string' },
-  subdivision2: { name: 'subdivision2', type: 'string' },
-  city: { name: 'city', type: 'string' },
-  createdAt: { name: 'created_at', type: 'date' },
-};
-
 export const THEME_COLORS = {
   light: {
     primary: '#2680eb',
@@ -199,8 +198,11 @@ export const EVENT_COLORS = [
 
 export const DOMAIN_REGEX =
   /^(localhost(:[1-9]\d{0,4})?|((?=[a-z0-9-]{1,63}\.)(xn--)?[a-z0-9-]+(-[a-z0-9-]+)*\.)+(xn--)?[a-z0-9-]{2,63})$/;
-
-export const SHARE_ID_REGEX = /^[a-zA-Z0-9]{16}$/;
+export const SHARE_ID_REGEX = /^[a-zA-Z0-9]{8,16}$/;
+export const UUID_REGEX =
+  /^[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12}$/;
+export const HOSTNAME_REGEX =
+  /^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9-]*[A-Za-z0-9])$/;
 
 export const DESKTOP_SCREEN_WIDTH = 1920;
 export const LAPTOP_SCREEN_WIDTH = 1024;
diff --git a/lib/crypto.js b/src/lib/crypto.ts
similarity index 77%
rename from lib/crypto.js
rename to src/lib/crypto.ts
index fefaf13f3..a27633525 100644
--- a/lib/crypto.js
+++ b/src/lib/crypto.ts
@@ -12,12 +12,12 @@ export function salt() {
   return hash(secret(), ROTATING_SALT);
 }
 
-export function uuid(...args) {
+export function uuid(...args: any) {
   if (!args.length) return v4();
 
-  return v5(hash(...args), v5.DNS);
+  return v5(hash(...args, salt()), v5.DNS);
 }
 
-export function isUuid(value) {
+export function isUuid(value: string) {
   return validate(value);
 }
diff --git a/lib/data.ts b/src/lib/data.ts
similarity index 94%
rename from lib/data.ts
rename to src/lib/data.ts
index c2c53de31..47023bb43 100644
--- a/lib/data.ts
+++ b/src/lib/data.ts
@@ -25,7 +25,7 @@ export function flattenJSON(
   ).keyValues;
 }
 
-export function getDynamicDataType(value: any): string {
+export function getDataType(value: any): string {
   let type: string = typeof value;
 
   if ((type === 'string' && isValid(value)) || isValid(parseISO(value))) {
@@ -36,7 +36,7 @@ export function getDynamicDataType(value: any): string {
 }
 
 function createKey(key, value, acc: { keyValues: any[]; parentKey: string }) {
-  const type = getDynamicDataType(value);
+  const type = getDataType(value);
 
   let dynamicDataType = null;
 
diff --git a/lib/date.js b/src/lib/date.ts
similarity index 61%
rename from lib/date.js
rename to src/lib/date.ts
index bf5dd90a3..81c37e699 100644
--- a/lib/date.js
+++ b/src/lib/date.ts
@@ -29,8 +29,19 @@ import {
   max,
   min,
   isDate,
+  subWeeks,
 } from 'date-fns';
 import { getDateLocale } from 'lib/lang';
+import { DateRange } from 'lib/types';
+
+export const TIME_UNIT = {
+  minute: 'minute',
+  hour: 'hour',
+  day: 'day',
+  week: 'week',
+  month: 'month',
+  year: 'year',
+};
 
 const dateFuncs = {
   minute: [differenceInMinutes, addMinutes, startOfMinute],
@@ -44,13 +55,13 @@ export function getTimezone() {
   return moment.tz.guess();
 }
 
-export function getLocalTime(t) {
+export function getLocalTime(t: string | number | Date) {
   return addMinutes(new Date(t), new Date().getTimezoneOffset());
 }
 
-export function parseDateRange(value, locale = 'en-US') {
+export function parseDateRange(value: string | object, locale = 'en-US'): DateRange {
   if (typeof value === 'object') {
-    return value;
+    return value as DateRange;
   }
 
   if (value === 'all') {
@@ -68,7 +79,9 @@ export function parseDateRange(value, locale = 'en-US') {
     const endDate = new Date(+endTime);
 
     return {
-      ...getDateRangeValues(startDate, endDate),
+      startDate,
+      endDate,
+      unit: getMinimumUnit(startDate, endDate),
       value,
     };
   }
@@ -81,6 +94,7 @@ export function parseDateRange(value, locale = 'en-US') {
   if (!match) return null;
 
   const { num, unit } = match.groups;
+  const selectedUnit = { num: +num, unit };
 
   if (+num === 1) {
     switch (unit) {
@@ -90,6 +104,7 @@ export function parseDateRange(value, locale = 'en-US') {
           endDate: endOfDay(now),
           unit: 'hour',
           value,
+          selectedUnit,
         };
       case 'week':
         return {
@@ -97,6 +112,7 @@ export function parseDateRange(value, locale = 'en-US') {
           endDate: endOfWeek(now, { locale: dateLocale }),
           unit: 'day',
           value,
+          selectedUnit,
         };
       case 'month':
         return {
@@ -104,6 +120,7 @@ export function parseDateRange(value, locale = 'en-US') {
           endDate: endOfMonth(now),
           unit: 'day',
           value,
+          selectedUnit,
         };
       case 'year':
         return {
@@ -111,6 +128,7 @@ export function parseDateRange(value, locale = 'en-US') {
           endDate: endOfYear(now),
           unit: 'month',
           value,
+          selectedUnit,
         };
     }
   }
@@ -123,6 +141,7 @@ export function parseDateRange(value, locale = 'en-US') {
           endDate: subDays(endOfDay(now), 1),
           unit: 'hour',
           value,
+          selectedUnit,
         };
       case 'week':
         return {
@@ -130,6 +149,7 @@ export function parseDateRange(value, locale = 'en-US') {
           endDate: subDays(endOfWeek(now, { locale: dateLocale }), 1),
           unit: 'day',
           value,
+          selectedUnit,
         };
       case 'month':
         return {
@@ -137,6 +157,7 @@ export function parseDateRange(value, locale = 'en-US') {
           endDate: subMonths(endOfMonth(now), 1),
           unit: 'day',
           value,
+          selectedUnit,
         };
       case 'year':
         return {
@@ -144,6 +165,7 @@ export function parseDateRange(value, locale = 'en-US') {
           endDate: subYears(endOfYear(now), 1),
           unit: 'month',
           value,
+          selectedUnit,
         };
     }
   }
@@ -151,35 +173,86 @@ export function parseDateRange(value, locale = 'en-US') {
   switch (unit) {
     case 'day':
       return {
-        startDate: subDays(startOfDay(now), num - 1),
+        startDate: subDays(startOfDay(now), +num - 1),
         endDate: endOfDay(now),
         unit,
         value,
+        selectedUnit,
       };
     case 'hour':
       return {
-        startDate: subHours(startOfHour(now), num - 1),
+        startDate: subHours(startOfHour(now), +num - 1),
         endDate: endOfHour(now),
         unit,
         value,
+        selectedUnit,
       };
   }
 }
 
-export function getAllowedUnits(startDate, endDate) {
+export function incrementDateRange(
+  value: { startDate: any; endDate: any; selectedUnit: any },
+  increment: number,
+) {
+  const { startDate, endDate, selectedUnit } = value;
+
+  const { num, unit } = selectedUnit;
+
+  const sub = Math.abs(num) * increment;
+
+  switch (unit) {
+    case 'hour':
+      return {
+        ...value,
+        startDate: subHours(startDate, sub),
+        endDate: subHours(endDate, sub),
+        value: 'range',
+      };
+    case 'day':
+      return {
+        ...value,
+        startDate: subDays(startDate, sub),
+        endDate: subDays(endDate, sub),
+        value: 'range',
+      };
+    case 'week':
+      return {
+        ...value,
+        startDate: subWeeks(startDate, sub),
+        endDate: subWeeks(endDate, sub),
+        value: 'range',
+      };
+    case 'month':
+      return {
+        ...value,
+        startDate: subMonths(startDate, sub),
+        endDate: subMonths(endDate, sub),
+        value: 'range',
+      };
+    case 'year':
+      return {
+        ...value,
+        startDate: subYears(startDate, sub),
+        endDate: subYears(endDate, sub),
+        value: 'range',
+      };
+  }
+}
+
+export function getAllowedUnits(startDate: Date, endDate: Date) {
   const units = ['minute', 'hour', 'day', 'month', 'year'];
   const minUnit = getMinimumUnit(startDate, endDate);
-  const index = units.indexOf(minUnit);
+  const index = units.indexOf(minUnit === 'year' ? 'month' : minUnit);
 
   return index >= 0 ? units.splice(index) : [];
 }
 
-export function getMinimumUnit(startDate, endDate) {
+export function getMinimumUnit(startDate: number | Date, endDate: number | Date) {
   if (differenceInMinutes(endDate, startDate) <= 60) {
     return 'minute';
   } else if (differenceInHours(endDate, startDate) <= 48) {
     return 'hour';
-  } else if (differenceInCalendarDays(endDate, startDate) <= 90) {
+  } else if (differenceInCalendarMonths(endDate, startDate) <= 12) {
     return 'day';
   } else if (differenceInCalendarMonths(endDate, startDate) <= 24) {
     return 'month';
@@ -188,33 +261,25 @@ export function getMinimumUnit(startDate, endDate) {
   return 'year';
 }
 
-export function getDateRangeValues(startDate, endDate) {
-  return {
-    startDate: startOfDay(startDate),
-    endDate: endOfDay(endDate),
-    unit: getMinimumUnit(startDate, endDate),
-  };
-}
-
-export function getDateFromString(str) {
+export function getDateFromString(str: string) {
   const [ymd, hms] = str.split(' ');
   const [year, month, day] = ymd.split('-');
 
   if (hms) {
     const [hour, min, sec] = hms.split(':');
 
-    return new Date(year, month - 1, day, hour, min, sec);
+    return new Date(+year, +month - 1, +day, +hour, +min, +sec);
   }
 
-  return new Date(year, month - 1, day);
+  return new Date(+year, +month - 1, +day);
 }
 
-export function getDateArray(data, startDate, endDate, unit) {
+export function getDateArray(data: any[], startDate: Date, endDate: Date, unit: string) {
   const arr = [];
   const [diff, add, normalize] = dateFuncs[unit];
   const n = diff(endDate, startDate) + 1;
 
-  function findData(date) {
+  function findData(date: Date) {
     const d = data.find(({ x }) => {
       return normalize(getDateFromString(x)).getTime() === date.getTime();
     });
@@ -232,12 +297,12 @@ export function getDateArray(data, startDate, endDate, unit) {
   return arr;
 }
 
-export function getDateLength(startDate, endDate, unit) {
+export function getDateLength(startDate: Date, endDate: Date, unit: string | number) {
   const [diff] = dateFuncs[unit];
   return diff(endDate, startDate) + 1;
 }
 
-export const customFormats = {
+export const CUSTOM_FORMATS = {
   'en-US': {
     p: 'ha',
     pp: 'h:mm:ss',
@@ -249,16 +314,20 @@ export const customFormats = {
   },
 };
 
-export function dateFormat(date, str, locale = 'en-US') {
-  return format(date, customFormats?.[locale]?.[str] || str, {
-    locale: getDateLocale(locale),
-  });
+export function formatDate(date: string | number | Date, str: string, locale = 'en-US') {
+  return format(
+    typeof date === 'string' ? new Date(date) : date,
+    CUSTOM_FORMATS?.[locale]?.[str] || str,
+    {
+      locale: getDateLocale(locale),
+    },
+  );
 }
 
-export function maxDate(...args) {
+export function maxDate(...args: Date[]) {
   return max(args.filter(n => isDate(n)));
 }
 
-export function minDate(...args) {
+export function minDate(...args: any[]) {
   return min(args.filter(n => isDate(n)));
 }
diff --git a/lib/db.js b/src/lib/db.ts
similarity index 84%
rename from lib/db.js
rename to src/lib/db.ts
index 750cdec07..46f73aa2f 100644
--- a/lib/db.js
+++ b/src/lib/db.ts
@@ -6,7 +6,7 @@ export const KAFKA = 'kafka';
 export const KAFKA_PRODUCER = 'kafka-producer';
 
 // Fixes issue with converting bigint values
-BigInt.prototype.toJSON = function () {
+BigInt.prototype['toJSON'] = function () {
   return Number(this);
 };
 
@@ -17,10 +17,14 @@ export function getDatabaseType(url = process.env.DATABASE_URL) {
     return POSTGRESQL;
   }
 
+  if (process.env.CLICKHOUSE_URL) {
+    return CLICKHOUSE;
+  }
+
   return type;
 }
 
-export async function runQuery(queries) {
+export async function runQuery(queries: any) {
   const db = getDatabaseType(process.env.CLICKHOUSE_URL || process.env.DATABASE_URL);
 
   if (db === POSTGRESQL || db === MYSQL) {
diff --git a/lib/detect.ts b/src/lib/detect.ts
similarity index 67%
rename from lib/detect.ts
rename to src/lib/detect.ts
index 9c1e1fa49..dab08312b 100644
--- a/lib/detect.ts
+++ b/src/lib/detect.ts
@@ -3,6 +3,7 @@ import { getClientIp } from 'request-ip';
 import { browserName, detectOS } from 'detect-browser';
 import isLocalhost from 'is-localhost-ip';
 import maxmind from 'maxmind';
+import { safeDecodeURIComponent } from 'next-basics';
 
 import {
   DESKTOP_OS,
@@ -56,6 +57,14 @@ export function getDevice(screen, os) {
   }
 }
 
+function getRegionCode(country, region) {
+  if (!country || !region) {
+    return undefined;
+  }
+
+  return region.includes('-') ? region : `${country}-${region}`;
+}
+
 export async function getLocation(ip, req) {
   // Ignore local ips
   if (await isLocalhost(ip)) {
@@ -64,21 +73,27 @@ export async function getLocation(ip, req) {
 
   // Cloudflare headers
   if (req.headers['cf-ipcountry']) {
+    const country = safeDecodeURIComponent(req.headers['cf-ipcountry']);
+    const subdivision1 = safeDecodeURIComponent(req.headers['cf-region-code']);
+    const city = safeDecodeURIComponent(req.headers['cf-ipcity']);
+
     return {
-      country: req.headers['cf-ipcountry'],
+      country,
+      subdivision1: getRegionCode(country, subdivision1),
+      city,
     };
   }
 
   // Vercel headers
   if (req.headers['x-vercel-ip-country']) {
-    const country = req.headers['x-vercel-ip-country'];
-    const region = req.headers['x-vercel-ip-country-region'];
-    const city = req.headers['x-vercel-ip-city'];
+    const country = safeDecodeURIComponent(req.headers['x-vercel-ip-country']);
+    const subdivision1 = safeDecodeURIComponent(req.headers['x-vercel-ip-country-region']);
+    const city = safeDecodeURIComponent(req.headers['x-vercel-ip-city']);
 
     return {
       country,
-      subdivision1: region,
-      city: city ? decodeURIComponent(city) : undefined,
+      subdivision1: getRegionCode(country, subdivision1),
+      city,
     };
   }
 
@@ -92,11 +107,16 @@ export async function getLocation(ip, req) {
   const result = lookup.get(ip);
 
   if (result) {
+    const country = result.country?.iso_code ?? result?.registered_country?.iso_code;
+    const subdivision1 = result.subdivisions?.[0]?.iso_code;
+    const subdivision2 = result.subdivisions?.[1]?.names?.en;
+    const city = result.city?.names?.en;
+
     return {
-      country: result.country?.iso_code ?? result?.registered_country?.iso_code,
-      subdivision1: result.subdivisions?.[0]?.iso_code,
-      subdivision2: result.subdivisions?.[1]?.names?.en,
-      city: result.city?.names?.en,
+      country,
+      subdivision1: getRegionCode(country, subdivision1),
+      subdivision2,
+      city,
     };
   }
 }
@@ -115,11 +135,3 @@ export async function getClientInfo(req: NextApiRequestCollect, { screen }) {
 
   return { userAgent, browser, os, ip, country, subdivision1, subdivision2, city, device };
 }
-
-export function getJsonBody<T>(req): T {
-  if ((req.headers['content-type'] || '').indexOf('text/plain') !== -1) {
-    return JSON.parse(req.body);
-  }
-
-  return req.body;
-}
diff --git a/lib/filters.js b/src/lib/filters.ts
similarity index 86%
rename from lib/filters.js
rename to src/lib/filters.ts
index 2b8fbcf16..1b4a5a1e2 100644
--- a/lib/filters.js
+++ b/src/lib/filters.ts
@@ -1,4 +1,4 @@
-export const urlFilter = data => {
+export const urlFilter = (data: any[]) => {
   const map = data.reduce((obj, { x, y }) => {
     if (x) {
       if (!obj[x]) {
@@ -14,7 +14,7 @@ export const urlFilter = data => {
   return Object.keys(map).map(key => ({ x: key, y: map[key] }));
 };
 
-export const refFilter = data => {
+export const refFilter = (data: any[]) => {
   const links = {};
 
   const map = data.reduce((obj, { x, y }) => {
@@ -42,16 +42,16 @@ export const refFilter = data => {
   return Object.keys(map).map(key => ({ x: key, y: map[key], w: links[key] }));
 };
 
-export const emptyFilter = data => {
+export const emptyFilter = (data: any[]) => {
   return data.map(item => (item.x ? item : null)).filter(n => n);
 };
 
-export const percentFilter = data => {
+export const percentFilter = (data: any[]) => {
   const total = data.reduce((n, { y }) => n + y, 0);
   return data.map(({ x, y, ...props }) => ({ x, y, z: total ? (y / total) * 100 : 0, ...props }));
 };
 
-export const paramFilter = data => {
+export const paramFilter = (data: any[]) => {
   const map = data.reduce((obj, { x, y }) => {
     try {
       const searchParams = new URLSearchParams(x);
diff --git a/lib/format.js b/src/lib/format.ts
similarity index 74%
rename from lib/format.js
rename to src/lib/format.ts
index e138831dc..a662a9eb4 100644
--- a/lib/format.js
+++ b/src/lib/format.ts
@@ -1,4 +1,4 @@
-export function parseTime(val) {
+export function parseTime(val: number) {
   const days = ~~(val / 86400);
   const hours = ~~(val / 3600) - days * 24;
   const minutes = ~~(val / 60) - days * 1440 - hours * 60;
@@ -14,16 +14,16 @@ export function parseTime(val) {
   };
 }
 
-export function formatTime(val) {
-  const { hour, minutes, seconds } = parseTime(val);
-  const h = hour > 0 ? `${hour}:` : '';
-  const m = hour > 0 ? minutes.toString().padStart(2, '0') : minutes;
+export function formatTime(val: number) {
+  const { hours, minutes, seconds } = parseTime(val);
+  const h = hours > 0 ? `${hours}:` : '';
+  const m = hours > 0 ? minutes.toString().padStart(2, '0') : minutes;
   const s = seconds.toString().padStart(2, '0');
 
   return `${h}${m}:${s}`;
 }
 
-export function formatShortTime(val, formats = ['m', 's'], space = '') {
+export function formatShortTime(val: number, formats = ['m', 's'], space = '') {
   const { days, hours, minutes, seconds, ms } = parseTime(val);
   let t = '';
 
@@ -40,11 +40,11 @@ export function formatShortTime(val, formats = ['m', 's'], space = '') {
   return t;
 }
 
-export function formatNumber(n) {
+export function formatNumber(n: string | number) {
   return Number(n).toFixed(0);
 }
 
-export function formatLongNumber(value) {
+export function formatLongNumber(value: number) {
   const n = Number(value);
 
   if (n >= 1000000) {
@@ -63,7 +63,7 @@ export function formatLongNumber(value) {
   return formatNumber(n);
 }
 
-export function stringToColor(str) {
+export function stringToColor(str: string) {
   if (!str) {
     return '#ffffff';
   }
@@ -73,7 +73,7 @@ export function stringToColor(str) {
   }
   let color = '#';
   for (let i = 0; i < 3; i++) {
-    let value = (hash >> (i * 8)) & 0xff;
+    const value = (hash >> (i * 8)) & 0xff;
     color += ('00' + value.toString(16)).slice(-2);
   }
   return color;
diff --git a/lib/kafka.ts b/src/lib/kafka.ts
similarity index 100%
rename from lib/kafka.ts
rename to src/lib/kafka.ts
diff --git a/lib/lang.js b/src/lib/lang.ts
similarity index 94%
rename from lib/lang.js
rename to src/lib/lang.ts
index 0b03c4495..2a448f63f 100644
--- a/lib/lang.js
+++ b/src/lib/lang.ts
@@ -74,6 +74,7 @@ export const languages = {
   'lt-LT': { label: 'Lietuvių', dateLocale: lt },
   'mn-MN': { label: 'Монгол', dateLocale: mn },
   'ms-MY': { label: 'Malay', dateLocale: ms },
+  'my-MM': { label: 'မြန်မာဘာသာ', dateLocale: enUS },
   'nl-NL': { label: 'Nederlands', dateLocale: nl },
   'nb-NO': { label: 'Norsk Bokmål', dateLocale: nb },
   'pl-PL': { label: 'Polski', dateLocale: pl },
@@ -95,10 +96,10 @@ export const languages = {
   'zh-TW': { label: '中文(繁體)', dateLocale: zhTW },
 };
 
-export function getDateLocale(locale) {
+export function getDateLocale(locale: string) {
   return languages[locale]?.dateLocale || enUS;
 }
 
-export function getTextDirection(locale) {
+export function getTextDirection(locale: string) {
   return languages[locale]?.dir || 'ltr';
 }
diff --git a/lib/load.ts b/src/lib/load.ts
similarity index 100%
rename from lib/load.ts
rename to src/lib/load.ts
diff --git a/lib/middleware.ts b/src/lib/middleware.ts
similarity index 62%
rename from lib/middleware.ts
rename to src/lib/middleware.ts
index 414cab239..91fb6c7c4 100644
--- a/lib/middleware.ts
+++ b/src/lib/middleware.ts
@@ -1,26 +1,27 @@
+import cors from 'cors';
+import debug from 'debug';
+import redis from '@umami/redis-client';
+import { getAuthToken, parseShareToken } from 'lib/auth';
+import { ROLES } from 'lib/constants';
+import { secret } from 'lib/crypto';
+import { findSession } from 'lib/session';
 import {
-  createMiddleware,
-  unauthorized,
   badRequest,
+  createMiddleware,
+  forbidden,
   parseSecureToken,
   tooManyRequest,
+  unauthorized,
 } from 'next-basics';
-import debug from 'debug';
-import cors from 'cors';
-import redis from '@umami/redis-client';
-import { findSession } from 'lib/session';
-import { getAuthToken, parseShareToken } from 'lib/auth';
-import { secret, isUuid } from 'lib/crypto';
-import { ROLES } from 'lib/constants';
-import { getUserById } from '../queries';
 import { NextApiRequestCollect } from 'pages/api/send';
+import { getUserById } from '../queries';
 
 const log = debug('umami:middleware');
 
 export const useCors = createMiddleware(
   cors({
     // Cache CORS preflight request 24 hours by default
-    maxAge: process.env.CORS_MAX_AGE || 86400,
+    maxAge: Number(process.env.CORS_MAX_AGE) || 86400,
   }),
 );
 
@@ -38,6 +39,9 @@ export const useSession = createMiddleware(async (req, res, next) => {
     if (e.message === 'Usage Limit.') {
       return tooManyRequest(res, e.message);
     }
+    if (e.message.startsWith('Website not found:')) {
+      return forbidden(res, e.message);
+    }
     return badRequest(res, e.message);
   }
 
@@ -47,19 +51,23 @@ export const useSession = createMiddleware(async (req, res, next) => {
 export const useAuth = createMiddleware(async (req, res, next) => {
   const token = getAuthToken(req);
   const payload = parseSecureToken(token, secret());
-  const shareToken = await parseShareToken(req);
+  const shareToken = await parseShareToken(req as any);
 
   let user = null;
-  const { userId, authKey } = payload || {};
+  const { userId, authKey, grant } = payload || {};
 
-  if (isUuid(userId)) {
+  if (userId) {
     user = await getUserById(userId);
   } else if (redis.enabled && authKey) {
-    user = await redis.get(authKey);
+    const key = await redis.client.get(authKey);
+
+    if (key?.userId) {
+      user = await getUserById(key.userId);
+    }
   }
 
   if (process.env.NODE_ENV === 'development') {
-    log({ token, shareToken, payload, user });
+    log('useAuth:', { token, shareToken, payload, user, grant });
   }
 
   if (!user?.id && !shareToken) {
@@ -71,7 +79,29 @@ export const useAuth = createMiddleware(async (req, res, next) => {
     user.isAdmin = user.role === ROLES.admin;
   }
 
-  (req as any).auth = { user, token, shareToken, authKey };
+  (req as any).auth = {
+    user,
+    grant,
+    token,
+    shareToken,
+    authKey,
+  };
 
   next();
 });
+
+export const useValidate = async (schema, req, res) => {
+  return createMiddleware(async (req: any, res, next) => {
+    try {
+      const rules = schema[req.method];
+
+      if (rules) {
+        rules.validateSync({ ...req.query, ...req.body });
+      }
+    } catch (e: any) {
+      return badRequest(res, e.message);
+    }
+
+    next();
+  })(req, res);
+};
diff --git a/src/lib/prisma.ts b/src/lib/prisma.ts
new file mode 100644
index 000000000..cb119bb82
--- /dev/null
+++ b/src/lib/prisma.ts
@@ -0,0 +1,233 @@
+import { Prisma } from '@prisma/client';
+import prisma from '@umami/prisma-client';
+import moment from 'moment-timezone';
+import { MYSQL, POSTGRESQL, getDatabaseType } from 'lib/db';
+import { FILTER_COLUMNS, SESSION_COLUMNS, OPERATORS, DEFAULT_PAGE_SIZE } from './constants';
+import { loadWebsite } from './load';
+import { maxDate } from './date';
+import { QueryFilters, QueryOptions, SearchFilter } from './types';
+
+const MYSQL_DATE_FORMATS = {
+  minute: '%Y-%m-%d %H:%i:00',
+  hour: '%Y-%m-%d %H:00:00',
+  day: '%Y-%m-%d',
+  month: '%Y-%m-01',
+  year: '%Y-01-01',
+};
+
+const POSTGRESQL_DATE_FORMATS = {
+  minute: 'YYYY-MM-DD HH24:MI:00',
+  hour: 'YYYY-MM-DD HH24:00:00',
+  day: 'YYYY-MM-DD',
+  month: 'YYYY-MM-01',
+  year: 'YYYY-01-01',
+};
+
+function getAddIntervalQuery(field: string, interval: string): string {
+  const db = getDatabaseType(process.env.DATABASE_URL);
+
+  if (db === POSTGRESQL) {
+    return `${field} + interval '${interval}'`;
+  }
+
+  if (db === MYSQL) {
+    return `DATE_ADD(${field}, interval ${interval})`;
+  }
+}
+
+function getDayDiffQuery(field1: string, field2: string): string {
+  const db = getDatabaseType(process.env.DATABASE_URL);
+
+  if (db === POSTGRESQL) {
+    return `${field1}::date - ${field2}::date`;
+  }
+
+  if (db === MYSQL) {
+    return `DATEDIFF(${field1}, ${field2})`;
+  }
+}
+
+function getCastColumnQuery(field: string, type: string): string {
+  const db = getDatabaseType(process.env.DATABASE_URL);
+
+  if (db === POSTGRESQL) {
+    return `${field}::${type}`;
+  }
+
+  if (db === MYSQL) {
+    return `${field}`;
+  }
+}
+
+function getDateQuery(field: string, unit: string, timezone?: string): string {
+  const db = getDatabaseType();
+
+  if (db === POSTGRESQL) {
+    if (timezone) {
+      return `to_char(date_trunc('${unit}', ${field} at time zone '${timezone}'), '${POSTGRESQL_DATE_FORMATS[unit]}')`;
+    }
+    return `to_char(date_trunc('${unit}', ${field}), '${POSTGRESQL_DATE_FORMATS[unit]}')`;
+  }
+
+  if (db === MYSQL) {
+    if (timezone) {
+      const tz = moment.tz(timezone).format('Z');
+
+      return `date_format(convert_tz(${field},'+00:00','${tz}'), '${MYSQL_DATE_FORMATS[unit]}')`;
+    }
+
+    return `date_format(${field}, '${MYSQL_DATE_FORMATS[unit]}')`;
+  }
+}
+
+function getTimestampDiffQuery(field1: string, field2: string): string {
+  const db = getDatabaseType();
+
+  if (db === POSTGRESQL) {
+    return `floor(extract(epoch from (${field2} - ${field1})))`;
+  }
+
+  if (db === MYSQL) {
+    return `timestampdiff(second, ${field1}, ${field2})`;
+  }
+}
+
+function mapFilter(column, operator, name, type = 'varchar') {
+  switch (operator) {
+    case OPERATORS.equals:
+      return `${column} = {{${name}::${type}}}`;
+    case OPERATORS.notEquals:
+      return `${column} != {{${name}::${type}}}`;
+    default:
+      return '';
+  }
+}
+
+function getFilterQuery(filters: QueryFilters = {}, options: QueryOptions = {}): string {
+  const query = Object.keys(filters).reduce((arr, name) => {
+    const value = filters[name];
+    const operator = value?.filter ?? OPERATORS.equals;
+    const column = FILTER_COLUMNS[name] ?? options?.columns?.[name];
+
+    if (value !== undefined && column) {
+      arr.push(`and ${mapFilter(column, operator, name)}`);
+
+      if (name === 'referrer') {
+        arr.push(
+          'and (website_event.referrer_domain != {{websiteDomain}} or website_event.referrer_domain is null)',
+        );
+      }
+    }
+
+    return arr;
+  }, []);
+
+  return query.join('\n');
+}
+
+function normalizeFilters(filters = {}) {
+  return Object.keys(filters).reduce((obj, key) => {
+    const value = filters[key];
+
+    obj[key] = value?.value ?? value;
+
+    return obj;
+  }, {});
+}
+
+async function parseFilters(
+  websiteId: string,
+  filters: QueryFilters = {},
+  options: QueryOptions = {},
+) {
+  const website = await loadWebsite(websiteId);
+
+  return {
+    joinSession:
+      options?.joinSession || Object.keys(filters).find(key => SESSION_COLUMNS.includes(key))
+        ? `inner join session on website_event.session_id = session.session_id`
+        : '',
+    filterQuery: getFilterQuery(filters, options),
+    params: {
+      ...normalizeFilters(filters),
+      websiteId,
+      startDate: maxDate(filters.startDate, website.resetAt),
+      websiteDomain: website.domain,
+    },
+  };
+}
+
+async function rawQuery(sql: string, data: object): Promise<any> {
+  const db = getDatabaseType();
+  const params = [];
+
+  if (db !== POSTGRESQL && db !== MYSQL) {
+    return Promise.reject(new Error('Unknown database.'));
+  }
+
+  const query = sql?.replaceAll(/\{\{\s*(\w+)(::\w+)?\s*}}/g, (...args) => {
+    const [, name, type] = args;
+    params.push(data[name]);
+
+    return db === MYSQL ? '?' : `$${params.length}${type ?? ''}`;
+  });
+
+  return prisma.rawQuery(query, params);
+}
+
+function getPageFilters(filters: SearchFilter): [
+  {
+    orderBy: {
+      [x: string]: string;
+    }[];
+    take: number;
+    skip: number;
+  },
+  {
+    pageSize: number;
+    page: number;
+    orderBy: string;
+  },
+] {
+  const { page = 1, pageSize = DEFAULT_PAGE_SIZE, orderBy, sortDescending = false } = filters || {};
+
+  return [
+    {
+      ...(pageSize > 0 && { take: +pageSize, skip: +pageSize * (page - 1) }),
+      ...(orderBy && {
+        orderBy: [
+          {
+            [orderBy]: sortDescending ? 'desc' : 'asc',
+          },
+        ],
+      }),
+    },
+    { page: +page, pageSize, orderBy },
+  ];
+}
+
+function getSearchMode(): { mode?: Prisma.QueryMode } {
+  const db = getDatabaseType();
+
+  if (db === POSTGRESQL) {
+    return {
+      mode: 'insensitive',
+    };
+  }
+
+  return {};
+}
+
+export default {
+  ...prisma,
+  getAddIntervalQuery,
+  getDayDiffQuery,
+  getCastColumnQuery,
+  getDateQuery,
+  getTimestampDiffQuery,
+  getFilterQuery,
+  parseFilters,
+  getPageFilters,
+  getSearchMode,
+  rawQuery,
+};
diff --git a/lib/query.ts b/src/lib/query.ts
similarity index 100%
rename from lib/query.ts
rename to src/lib/query.ts
diff --git a/src/lib/schema.ts b/src/lib/schema.ts
new file mode 100644
index 000000000..c09d262a1
--- /dev/null
+++ b/src/lib/schema.ts
@@ -0,0 +1,13 @@
+import * as yup from 'yup';
+
+export const dateRange = {
+  startAt: yup.number().integer().required(),
+  endAt: yup.number().integer().moreThan(yup.ref('startAt')).required(),
+};
+
+export const pageInfo = {
+  query: yup.string(),
+  page: yup.number().integer().positive(),
+  pageSize: yup.number().integer().positive().min(1).max(200),
+  orderBy: yup.string(),
+};
diff --git a/lib/session.ts b/src/lib/session.ts
similarity index 70%
rename from lib/session.ts
rename to src/lib/session.ts
index 5eb7398a9..0f388db9a 100644
--- a/lib/session.ts
+++ b/src/lib/session.ts
@@ -1,13 +1,28 @@
-import { secret, uuid, isUuid } from 'lib/crypto';
-import { getClientInfo, getJsonBody } from 'lib/detect';
+import { isUuid, secret, uuid } from 'lib/crypto';
+import { getClientInfo } from 'lib/detect';
 import { parseToken } from 'next-basics';
-import { CollectRequestBody, NextApiRequestCollect } from 'pages/api/send';
+import { NextApiRequestCollect } from 'pages/api/send';
 import { createSession } from 'queries';
 import cache from './cache';
+import clickhouse from './clickhouse';
 import { loadSession, loadWebsite } from './load';
 
-export async function findSession(req: NextApiRequestCollect) {
-  const { payload } = getJsonBody<CollectRequestBody>(req);
+export async function findSession(req: NextApiRequestCollect): Promise<{
+  id: any;
+  websiteId: string;
+  hostname: string;
+  browser: string;
+  os: any;
+  device: string;
+  screen: string;
+  language: string;
+  country: any;
+  subdivision1: any;
+  subdivision2: any;
+  city: any;
+  ownerId: string;
+}> {
+  const { payload } = req.body;
 
   if (!payload) {
     throw new Error('Invalid payload.');
@@ -53,6 +68,25 @@ export async function findSession(req: NextApiRequestCollect) {
 
   const sessionId = uuid(websiteId, hostname, ip, userAgent);
 
+  // Clickhouse does not require session lookup
+  if (clickhouse.enabled) {
+    return {
+      id: sessionId,
+      websiteId,
+      hostname,
+      browser,
+      os: os as any,
+      device,
+      screen,
+      language,
+      country,
+      subdivision1,
+      subdivision2,
+      city,
+      ownerId: website.userId,
+    };
+  }
+
   // Find session
   let session = await loadSession(sessionId);
 
diff --git a/lib/sql.ts b/src/lib/sql.ts
similarity index 100%
rename from lib/sql.ts
rename to src/lib/sql.ts
diff --git a/lib/types.ts b/src/lib/types.ts
similarity index 55%
rename from lib/types.ts
rename to src/lib/types.ts
index 7c91ec4f7..af0ea0f78 100644
--- a/lib/types.ts
+++ b/src/lib/types.ts
@@ -1,17 +1,65 @@
 import { NextApiRequest } from 'next';
-import { COLLECTION_TYPE, DATA_TYPE, EVENT_TYPE, KAFKA_TOPIC, ROLES } from './constants';
+import {
+  COLLECTION_TYPE,
+  DATA_TYPE,
+  EVENT_TYPE,
+  KAFKA_TOPIC,
+  PERMISSIONS,
+  REPORT_TYPES,
+  ROLES,
+} from './constants';
+import * as yup from 'yup';
+import { TIME_UNIT } from './date';
 
 type ObjectValues<T> = T[keyof T];
 
+export type TimeUnit = ObjectValues<typeof TIME_UNIT>;
+export type Permission = ObjectValues<typeof PERMISSIONS>;
+
 export type CollectionType = ObjectValues<typeof COLLECTION_TYPE>;
-
 export type Role = ObjectValues<typeof ROLES>;
-
 export type EventType = ObjectValues<typeof EVENT_TYPE>;
-
 export type DynamicDataType = ObjectValues<typeof DATA_TYPE>;
-
 export type KafkaTopic = ObjectValues<typeof KAFKA_TOPIC>;
+export type ReportType = ObjectValues<typeof REPORT_TYPES>;
+
+export interface WebsiteSearchFilter extends SearchFilter {
+  userId?: string;
+  teamId?: string;
+  includeTeams?: boolean;
+  onlyTeams?: boolean;
+}
+
+export interface UserSearchFilter extends SearchFilter {
+  teamId?: string;
+}
+
+export interface TeamSearchFilter extends SearchFilter {
+  userId?: string;
+}
+
+export interface ReportSearchFilter extends SearchFilter {
+  userId?: string;
+  websiteId?: string;
+  includeTeams?: boolean;
+}
+
+export interface SearchFilter {
+  query?: string;
+  page?: number;
+  pageSize?: number;
+  orderBy?: string;
+  sortDescending?: boolean;
+}
+
+export interface FilterResult<T> {
+  data: T[];
+  count: number;
+  page: number;
+  pageSize: number;
+  orderBy?: string;
+  sortDescending?: boolean;
+}
 
 export interface DynamicData {
   [key: string]: number | string | DynamicData | number[] | string[] | DynamicData[];
@@ -24,16 +72,25 @@ export interface Auth {
     role: string;
     isAdmin: boolean;
   };
+  grant?: Permission[];
   shareToken?: {
     websiteId: string;
   };
 }
 
+export interface YupRequest {
+  GET?: yup.ObjectSchema<any>;
+  POST?: yup.ObjectSchema<any>;
+  PUT?: yup.ObjectSchema<any>;
+  DELETE?: yup.ObjectSchema<any>;
+}
+
 export interface NextApiRequestQueryBody<TQuery = any, TBody = any> extends NextApiRequest {
   auth?: Auth;
   query: TQuery & { [key: string]: string | string[] };
   body: TBody;
   headers: any;
+  yup: YupRequest;
 }
 
 export interface NextApiRequestAuth extends NextApiRequest {
@@ -73,37 +130,17 @@ export interface WebsiteMetric {
   y: number;
 }
 
-export interface WebsiteMetricFilter {
-  domain?: string;
-  url?: string;
-  referrer?: string;
-  title?: string;
-  query?: string;
-  event?: string;
-  os?: string;
-  browser?: string;
-  device?: string;
-  country?: string;
-  region?: string;
-  city?: string;
-}
-
 export interface WebsiteEventMetric {
   x: string;
   t: string;
   y: number;
 }
 
-export interface WebsiteEventDataStats {
-  field: string;
-  type: number;
-  total: number;
-}
-
-export interface WebsiteEventDataFields {
-  field: string;
-  type: number;
-  value?: string;
+export interface WebsiteEventData {
+  eventName?: string;
+  fieldName: string;
+  dataType: number;
+  fieldValue?: string;
   total: number;
 }
 
@@ -141,6 +178,42 @@ export interface RealtimeUpdate {
 export interface DateRange {
   startDate: Date;
   endDate: Date;
-  unit: string;
   value: string;
+  unit?: TimeUnit;
+  selectedUnit?: { num: number; unit: TimeUnit };
+}
+
+export interface QueryFilters {
+  startDate?: Date;
+  endDate?: Date;
+  timezone?: string;
+  unit?: string;
+  eventType?: number;
+  url?: string;
+  referrer?: string;
+  title?: string;
+  query?: string;
+  os?: string;
+  browser?: string;
+  device?: string;
+  country?: string;
+  region?: string;
+  city?: string;
+  language?: string;
+  event?: string;
+}
+
+export interface QueryOptions {
+  joinSession?: boolean;
+  columns?: { [key: string]: string };
+  limit?: number;
+}
+
+export interface RealtimeData {
+  pageviews: any[];
+  sessions: any[];
+  events: any[];
+  timestamp: number;
+  countries?: any[];
+  visitors?: any[];
 }
diff --git a/src/lib/yup.ts b/src/lib/yup.ts
new file mode 100644
index 000000000..4008e44f2
--- /dev/null
+++ b/src/lib/yup.ts
@@ -0,0 +1,18 @@
+import moment from 'moment-timezone';
+import * as yup from 'yup';
+import { UNIT_TYPES } from './constants';
+
+export const TimezoneTest = yup
+  .string()
+  .default('UTC')
+  .test(
+    'timezone',
+    () => `Invalid timezone`,
+    value => moment.tz.zone(value) !== null,
+  );
+
+export const UnitTypeTest = yup.string().test(
+  'unit',
+  () => `Invalid unit`,
+  value => UNIT_TYPES.includes(value),
+);
diff --git a/src/pages/api/admin/users.ts b/src/pages/api/admin/users.ts
new file mode 100644
index 000000000..d16895b74
--- /dev/null
+++ b/src/pages/api/admin/users.ts
@@ -0,0 +1,53 @@
+import { canViewUsers } from 'lib/auth';
+import { useAuth, useValidate } from 'lib/middleware';
+import { NextApiRequestQueryBody, Role, SearchFilter, User } from 'lib/types';
+import { pageInfo } from 'lib/schema';
+import { NextApiResponse } from 'next';
+import { methodNotAllowed, ok, unauthorized } from 'next-basics';
+import { getUsers } from 'queries';
+import * as yup from 'yup';
+
+export interface UsersRequestQuery extends SearchFilter {}
+export interface UsersRequestBody {
+  username: string;
+  password: string;
+  id: string;
+  role: Role;
+}
+
+const schema = {
+  GET: yup.object().shape({
+    ...pageInfo,
+  }),
+  POST: yup.object().shape({
+    username: yup.string().max(255).required(),
+    password: yup.string().required(),
+    id: yup.string().uuid(),
+    role: yup
+      .string()
+      .matches(/admin|user|view-only/i)
+      .required(),
+  }),
+};
+
+export default async (
+  req: NextApiRequestQueryBody<UsersRequestQuery, UsersRequestBody>,
+  res: NextApiResponse<User[] | User>,
+) => {
+  await useAuth(req, res);
+  await useValidate(schema, req, res);
+
+  if (req.method === 'GET') {
+    if (!(await canViewUsers(req.auth))) {
+      return unauthorized(res);
+    }
+
+    const { page, query, pageSize } = req.query;
+
+    const users = await getUsers({ page, query, pageSize: +pageSize || undefined });
+
+    return ok(res, users);
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/src/pages/api/admin/websites.ts b/src/pages/api/admin/websites.ts
new file mode 100644
index 000000000..13c190722
--- /dev/null
+++ b/src/pages/api/admin/websites.ts
@@ -0,0 +1,66 @@
+import { canViewAllWebsites } from 'lib/auth';
+import { useAuth, useCors, useValidate } from 'lib/middleware';
+import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
+import { NextApiResponse } from 'next';
+import { methodNotAllowed, ok, unauthorized } from 'next-basics';
+import { getWebsites } from 'queries';
+import * as yup from 'yup';
+import { pageInfo } from 'lib/schema';
+
+export interface WebsitesRequestQuery extends SearchFilter {}
+
+export interface WebsitesRequestBody {
+  name: string;
+  domain: string;
+  shareId: string;
+}
+
+const schema = {
+  GET: yup.object().shape({
+    ...pageInfo,
+  }),
+  POST: yup.object().shape({
+    name: yup.string().max(100).required(),
+    domain: yup.string().max(500).required(),
+    shareId: yup.string().max(50).nullable(),
+  }),
+};
+
+export default async (
+  req: NextApiRequestQueryBody<WebsitesRequestQuery, WebsitesRequestBody>,
+  res: NextApiResponse,
+) => {
+  await useCors(req, res);
+  await useAuth(req, res);
+  await useValidate(schema, req, res);
+
+  if (req.method === 'GET') {
+    if (!(await canViewAllWebsites(req.auth))) {
+      return unauthorized(res);
+    }
+
+    const websites = await getWebsites(req.query, {
+      include: {
+        teamWebsite: {
+          include: {
+            team: {
+              select: {
+                name: true,
+              },
+            },
+          },
+        },
+        user: {
+          select: {
+            username: true,
+            id: true,
+          },
+        },
+      },
+    });
+
+    return ok(res, websites);
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/pages/api/auth/login.ts b/src/pages/api/auth/login.ts
similarity index 67%
rename from pages/api/auth/login.ts
rename to src/pages/api/auth/login.ts
index af2069387..e1007b3c4 100644
--- a/pages/api/auth/login.ts
+++ b/src/pages/api/auth/login.ts
@@ -1,18 +1,21 @@
+import redis from '@umami/redis-client';
 import debug from 'debug';
+import { saveAuth } from 'lib/auth';
+import { secret } from 'lib/crypto';
+import { useValidate } from 'lib/middleware';
+import { NextApiRequestQueryBody, User } from 'lib/types';
 import { NextApiResponse } from 'next';
 import {
-  ok,
-  unauthorized,
-  badRequest,
   checkPassword,
   createSecureToken,
+  forbidden,
   methodNotAllowed,
+  ok,
+  unauthorized,
 } from 'next-basics';
-import redis from '@umami/redis-client';
 import { getUserByUsername } from 'queries';
-import { secret } from 'lib/crypto';
-import { NextApiRequestQueryBody, User } from 'lib/types';
-import { setAuthKey } from 'lib/auth';
+import * as yup from 'yup';
+import { ROLES } from 'lib/constants';
 
 const log = debug('umami:auth');
 
@@ -26,31 +29,41 @@ export interface LoginResponse {
   user: User;
 }
 
+const schema = {
+  POST: yup.object().shape({
+    username: yup.string().required(),
+    password: yup.string().required(),
+  }),
+};
+
 export default async (
   req: NextApiRequestQueryBody<any, LoginRequestBody>,
   res: NextApiResponse<LoginResponse>,
 ) => {
+  if (process.env.DISABLE_LOGIN) {
+    return forbidden(res);
+  }
+
+  await useValidate(schema, req, res);
+
   if (req.method === 'POST') {
     const { username, password } = req.body;
 
-    if (!username || !password) {
-      return badRequest(res);
-    }
-
     const user = await getUserByUsername(username, { includePassword: true });
 
     if (user && checkPassword(password, user.password)) {
       if (redis.enabled) {
-        const token = await setAuthKey(user);
+        const token = await saveAuth({ userId: user.id });
 
         return ok(res, { token, user });
       }
 
       const token = createSecureToken({ userId: user.id }, secret());
+      const { id, username, role, createdAt } = user;
 
       return ok(res, {
         token,
-        user: { id: user.id, username: user.username, role: user.role, createdAt: user.createdAt },
+        user: { id, username, role, createdAt, isAdmin: role === ROLES.admin },
       });
     }
 
diff --git a/pages/api/auth/logout.ts b/src/pages/api/auth/logout.ts
similarity index 90%
rename from pages/api/auth/logout.ts
rename to src/pages/api/auth/logout.ts
index cbccce8d7..715fda622 100644
--- a/pages/api/auth/logout.ts
+++ b/src/pages/api/auth/logout.ts
@@ -9,7 +9,7 @@ export default async (req: NextApiRequest, res: NextApiResponse) => {
 
   if (req.method === 'POST') {
     if (redis.enabled) {
-      await redis.del(getAuthToken(req));
+      await redis.client.del(getAuthToken(req));
     }
 
     return ok(res);
diff --git a/pages/api/auth/sso.ts b/src/pages/api/auth/sso.ts
similarity index 80%
rename from pages/api/auth/sso.ts
rename to src/pages/api/auth/sso.ts
index 66cbd8e27..7b1eef60d 100644
--- a/pages/api/auth/sso.ts
+++ b/src/pages/api/auth/sso.ts
@@ -3,13 +3,13 @@ import { useAuth } from 'lib/middleware';
 import { NextApiResponse } from 'next';
 import { badRequest, ok } from 'next-basics';
 import redis from '@umami/redis-client';
-import { setAuthKey } from 'lib/auth';
+import { saveAuth } from 'lib/auth';
 
 export default async (req: NextApiRequestAuth, res: NextApiResponse) => {
   await useAuth(req, res);
 
   if (redis.enabled && req.auth.user) {
-    const token = await setAuthKey(req.auth.user, 86400);
+    const token = await saveAuth({ userId: req.auth.user.id }, 86400);
 
     return ok(res, { user: req.auth.user, token });
   }
diff --git a/pages/api/auth/verify.ts b/src/pages/api/auth/verify.ts
similarity index 89%
rename from pages/api/auth/verify.ts
rename to src/pages/api/auth/verify.ts
index 9eb9ea488..a302c69b1 100644
--- a/pages/api/auth/verify.ts
+++ b/src/pages/api/auth/verify.ts
@@ -6,5 +6,5 @@ import { ok } from 'next-basics';
 export default async (req: NextApiRequestAuth, res: NextApiResponse) => {
   await useAuth(req, res);
 
-  return ok(res, req.auth);
+  return ok(res, req.auth.user);
 };
diff --git a/pages/api/config.ts b/src/pages/api/config.ts
similarity index 81%
rename from pages/api/config.ts
rename to src/pages/api/config.ts
index bccfd0487..adba894a4 100644
--- a/pages/api/config.ts
+++ b/src/pages/api/config.ts
@@ -2,21 +2,19 @@ import { NextApiRequest, NextApiResponse } from 'next';
 import { ok, methodNotAllowed } from 'next-basics';
 
 export interface ConfigResponse {
-  basePath: string;
-  trackerScriptName: string;
-  updatesDisabled: boolean;
   telemetryDisabled: boolean;
-  cloudMode: boolean;
+  trackerScriptName: string;
+  uiDisabled: boolean;
+  updatesDisabled: boolean;
 }
 
 export default async (req: NextApiRequest, res: NextApiResponse<ConfigResponse>) => {
   if (req.method === 'GET') {
     return ok(res, {
-      basePath: process.env.BASE_PATH || '',
-      trackerScriptName: process.env.TRACKER_SCRIPT_NAME,
-      updatesDisabled: !!process.env.DISABLE_UPDATES,
       telemetryDisabled: !!process.env.DISABLE_TELEMETRY,
-      cloudMode: !!process.env.CLOUD_MODE,
+      trackerScriptName: process.env.TRACKER_SCRIPT_NAME,
+      uiDisabled: !!process.env.DISABLE_UI,
+      updatesDisabled: !!process.env.DISABLE_UPDATES,
     });
   }
 
diff --git a/src/pages/api/event-data/events.ts b/src/pages/api/event-data/events.ts
new file mode 100644
index 000000000..19f0c8f16
--- /dev/null
+++ b/src/pages/api/event-data/events.ts
@@ -0,0 +1,53 @@
+import { canViewWebsite } from 'lib/auth';
+import { useAuth, useCors, useValidate } from 'lib/middleware';
+import { NextApiRequestQueryBody } from 'lib/types';
+import { NextApiResponse } from 'next';
+import { methodNotAllowed, ok, unauthorized } from 'next-basics';
+import { getEventDataEvents } from 'queries';
+import * as yup from 'yup';
+
+export interface EventDataFieldsRequestQuery {
+  websiteId: string;
+  startAt: string;
+  endAt: string;
+  event?: string;
+}
+
+const schema = {
+  GET: yup.object().shape({
+    websiteId: yup.string().uuid().required(),
+    startAt: yup.number().integer().required(),
+    endAt: yup.number().integer().moreThan(yup.ref('startAt')).required(),
+    event: yup.string(),
+  }),
+};
+
+export default async (
+  req: NextApiRequestQueryBody<EventDataFieldsRequestQuery, any>,
+  res: NextApiResponse<any>,
+) => {
+  await useCors(req, res);
+  await useAuth(req, res);
+  await useValidate(schema, req, res);
+
+  if (req.method === 'GET') {
+    const { websiteId, startAt, endAt, event } = req.query;
+
+    if (!(await canViewWebsite(req.auth, websiteId))) {
+      return unauthorized(res);
+    }
+
+    const startDate = new Date(+startAt);
+    const endDate = new Date(+endAt);
+
+    const data = await getEventDataEvents(websiteId, {
+      startDate,
+      endDate,
+      event,
+    });
+
+    return ok(res, data);
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/src/pages/api/event-data/fields.ts b/src/pages/api/event-data/fields.ts
new file mode 100644
index 000000000..b2af75111
--- /dev/null
+++ b/src/pages/api/event-data/fields.ts
@@ -0,0 +1,49 @@
+import { canViewWebsite } from 'lib/auth';
+import { useAuth, useCors, useValidate } from 'lib/middleware';
+import { NextApiRequestQueryBody } from 'lib/types';
+import { NextApiResponse } from 'next';
+import { methodNotAllowed, ok, unauthorized } from 'next-basics';
+import { getEventDataFields } from 'queries';
+import * as yup from 'yup';
+
+export interface EventDataFieldsRequestQuery {
+  websiteId: string;
+  startAt: string;
+  endAt: string;
+  field?: string;
+}
+
+const schema = {
+  GET: yup.object().shape({
+    websiteId: yup.string().uuid().required(),
+    startAt: yup.number().integer().required(),
+    endAt: yup.number().integer().moreThan(yup.ref('startAt')).required(),
+    field: yup.string(),
+  }),
+};
+
+export default async (
+  req: NextApiRequestQueryBody<EventDataFieldsRequestQuery>,
+  res: NextApiResponse<any>,
+) => {
+  await useCors(req, res);
+  await useAuth(req, res);
+  await useValidate(schema, req, res);
+
+  if (req.method === 'GET') {
+    const { websiteId, startAt, endAt, field } = req.query;
+
+    if (!(await canViewWebsite(req.auth, websiteId))) {
+      return unauthorized(res);
+    }
+
+    const startDate = new Date(+startAt);
+    const endDate = new Date(+endAt);
+
+    const data = await getEventDataFields(websiteId, { startDate, endDate, field });
+
+    return ok(res, data);
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/src/pages/api/event-data/stats.ts b/src/pages/api/event-data/stats.ts
new file mode 100644
index 000000000..a12ad92f8
--- /dev/null
+++ b/src/pages/api/event-data/stats.ts
@@ -0,0 +1,47 @@
+import { canViewWebsite } from 'lib/auth';
+import { useAuth, useCors, useValidate } from 'lib/middleware';
+import { NextApiRequestQueryBody } from 'lib/types';
+import { NextApiResponse } from 'next';
+import { methodNotAllowed, ok, unauthorized } from 'next-basics';
+import { getEventDataStats } from 'queries/index';
+import * as yup from 'yup';
+
+export interface EventDataStatsRequestQuery {
+  websiteId: string;
+  startAt: string;
+  endAt: string;
+}
+
+const schema = {
+  GET: yup.object().shape({
+    websiteId: yup.string().uuid().required(),
+    startAt: yup.number().integer().required(),
+    endAt: yup.number().integer().moreThan(yup.ref('startAt')).required(),
+  }),
+};
+
+export default async (
+  req: NextApiRequestQueryBody<EventDataStatsRequestQuery>,
+  res: NextApiResponse<any>,
+) => {
+  await useCors(req, res);
+  await useAuth(req, res);
+  await useValidate(schema, req, res);
+
+  if (req.method === 'GET') {
+    const { websiteId, startAt, endAt } = req.query;
+
+    if (!(await canViewWebsite(req.auth, websiteId))) {
+      return unauthorized(res);
+    }
+
+    const startDate = new Date(+startAt);
+    const endDate = new Date(+endAt);
+
+    const data = await getEventDataStats(websiteId, { startDate, endDate });
+
+    return ok(res, data);
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/pages/api/heartbeat.ts b/src/pages/api/heartbeat.ts
similarity index 100%
rename from pages/api/heartbeat.ts
rename to src/pages/api/heartbeat.ts
diff --git a/pages/api/me/index.ts b/src/pages/api/me/index.ts
similarity index 100%
rename from pages/api/me/index.ts
rename to src/pages/api/me/index.ts
diff --git a/pages/api/me/password.ts b/src/pages/api/me/password.ts
similarity index 80%
rename from pages/api/me/password.ts
rename to src/pages/api/me/password.ts
index f9f60fc53..5b7a8e05e 100644
--- a/pages/api/me/password.ts
+++ b/src/pages/api/me/password.ts
@@ -1,15 +1,16 @@
+import { useAuth, useValidate } from 'lib/middleware';
 import { NextApiRequestQueryBody, User } from 'lib/types';
-import { useAuth } from 'lib/middleware';
 import { NextApiResponse } from 'next';
 import {
   badRequest,
   checkPassword,
+  forbidden,
   hashPassword,
   methodNotAllowed,
-  forbidden,
   ok,
 } from 'next-basics';
 import { getUserById, updateUser } from 'queries';
+import * as yup from 'yup';
 
 export interface UserPasswordRequestQuery {
   id: string;
@@ -20,6 +21,13 @@ export interface UserPasswordRequestBody {
   newPassword: string;
 }
 
+const schema = {
+  POST: yup.object().shape({
+    currentPassword: yup.string().required(),
+    newPassword: yup.string().min(8).required(),
+  }),
+};
+
 export default async (
   req: NextApiRequestQueryBody<UserPasswordRequestQuery, UserPasswordRequestBody>,
   res: NextApiResponse<User>,
@@ -29,6 +37,7 @@ export default async (
   }
 
   await useAuth(req, res);
+  await useValidate(schema, req, res);
 
   const { currentPassword, newPassword } = req.body;
   const { id } = req.auth.user;
diff --git a/src/pages/api/me/teams.ts b/src/pages/api/me/teams.ts
new file mode 100644
index 000000000..b0803277d
--- /dev/null
+++ b/src/pages/api/me/teams.ts
@@ -0,0 +1,33 @@
+import { useCors, useValidate } from 'lib/middleware';
+import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
+import { pageInfo } from 'lib/schema';
+import { NextApiResponse } from 'next';
+import { methodNotAllowed } from 'next-basics';
+import userTeams from 'pages/api/users/[id]/teams';
+import * as yup from 'yup';
+
+export interface MyTeamsRequestQuery extends SearchFilter {
+  id: string;
+}
+
+const schema = {
+  GET: yup.object().shape({
+    ...pageInfo,
+  }),
+};
+
+export default async (
+  req: NextApiRequestQueryBody<MyTeamsRequestQuery, any>,
+  res: NextApiResponse,
+) => {
+  await useCors(req, res);
+  await useValidate(schema, req, res);
+
+  if (req.method === 'GET') {
+    req.query.id = req.auth.user.id;
+
+    return userTeams(req, res);
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/src/pages/api/me/websites.ts b/src/pages/api/me/websites.ts
new file mode 100644
index 000000000..e5a9ad328
--- /dev/null
+++ b/src/pages/api/me/websites.ts
@@ -0,0 +1,34 @@
+import { useAuth, useCors, useValidate } from 'lib/middleware';
+import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
+import { pageInfo } from 'lib/schema';
+import { NextApiResponse } from 'next';
+import { methodNotAllowed } from 'next-basics';
+import userWebsites from 'pages/api/users/[id]/websites';
+import * as yup from 'yup';
+
+export interface MyWebsitesRequestQuery extends SearchFilter {
+  id: string;
+}
+
+const schema = {
+  GET: yup.object().shape({
+    ...pageInfo,
+  }),
+};
+
+export default async (
+  req: NextApiRequestQueryBody<MyWebsitesRequestQuery, any>,
+  res: NextApiResponse,
+) => {
+  await useCors(req, res);
+  await useAuth(req, res);
+  await useValidate(schema, req, res);
+
+  if (req.method === 'GET') {
+    req.query.id = req.auth.user.id;
+
+    return userWebsites(req, res);
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/pages/api/realtime/[id].ts b/src/pages/api/realtime/[id].ts
similarity index 66%
rename from pages/api/realtime/[id].ts
rename to src/pages/api/realtime/[id].ts
index e78599c6d..0edd589d8 100644
--- a/pages/api/realtime/[id].ts
+++ b/src/pages/api/realtime/[id].ts
@@ -1,21 +1,31 @@
-import { subMinutes } from 'date-fns';
+import { startOfMinute, subMinutes } from 'date-fns';
 import { canViewWebsite } from 'lib/auth';
-import { useAuth } from 'lib/middleware';
+import { useAuth, useValidate } from 'lib/middleware';
 import { NextApiRequestQueryBody, RealtimeInit } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { getRealtimeData } from 'queries';
+import * as yup from 'yup';
+import { REALTIME_RANGE } from 'lib/constants';
 
 export interface RealtimeRequestQuery {
   id: string;
   startAt: number;
 }
 
+const schema = {
+  GET: yup.object().shape({
+    id: yup.string().uuid().required(),
+    startAt: yup.number().integer().required(),
+  }),
+};
+
 export default async (
   req: NextApiRequestQueryBody<RealtimeRequestQuery>,
   res: NextApiResponse<RealtimeInit>,
 ) => {
   await useAuth(req, res);
+  await useValidate(schema, req, res);
 
   if (req.method === 'GET') {
     const { id: websiteId, startAt } = req.query;
@@ -24,7 +34,7 @@ export default async (
       return unauthorized(res);
     }
 
-    let startTime = subMinutes(new Date(), 30);
+    let startTime = subMinutes(startOfMinute(new Date()), REALTIME_RANGE);
 
     if (+startAt > startTime.getTime()) {
       startTime = new Date(+startAt);
diff --git a/pages/api/reports/[id].ts b/src/pages/api/reports/[id].ts
similarity index 61%
rename from pages/api/reports/[id].ts
rename to src/pages/api/reports/[id].ts
index 85bc302c8..02eb7363c 100644
--- a/pages/api/reports/[id].ts
+++ b/src/pages/api/reports/[id].ts
@@ -1,9 +1,10 @@
-import { canUpdateReport, canViewReport, canDeleteReport } from 'lib/auth';
-import { useAuth, useCors } from 'lib/middleware';
-import { NextApiRequestQueryBody } from 'lib/types';
+import { canDeleteReport, canUpdateReport, canViewReport } from 'lib/auth';
+import { useAuth, useCors, useValidate } from 'lib/middleware';
+import { NextApiRequestQueryBody, ReportType, YupRequest } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
-import { getReportById, updateReport, deleteReport } from 'queries';
+import { deleteReport, getReportById, updateReport } from 'queries';
+import * as yup from 'yup';
 
 export interface ReportRequestQuery {
   id: string;
@@ -11,18 +12,41 @@ export interface ReportRequestQuery {
 
 export interface ReportRequestBody {
   websiteId: string;
-  type: string;
+  type: ReportType;
   name: string;
   description: string;
   parameters: string;
 }
 
+const schema: YupRequest = {
+  GET: yup.object().shape({
+    id: yup.string().uuid().required(),
+  }),
+  POST: yup.object().shape({
+    id: yup.string().uuid().required(),
+    websiteId: yup.string().uuid().required(),
+    type: yup
+      .string()
+      .matches(/funnel|insights|retention/i)
+      .required(),
+    name: yup.string().max(200).required(),
+    description: yup.string().max(500),
+    parameters: yup
+      .object()
+      .test('len', 'Must not exceed 6000 characters.', val => JSON.stringify(val).length < 6000),
+  }),
+  DELETE: yup.object().shape({
+    id: yup.string().uuid().required(),
+  }),
+};
+
 export default async (
   req: NextApiRequestQueryBody<ReportRequestQuery, ReportRequestBody>,
   res: NextApiResponse,
 ) => {
   await useCors(req, res);
   await useAuth(req, res);
+  await useValidate(schema, req, res);
 
   const { id: reportId } = req.query;
   const {
diff --git a/pages/api/reports/funnel.ts b/src/pages/api/reports/funnel.ts
similarity index 66%
rename from pages/api/reports/funnel.ts
rename to src/pages/api/reports/funnel.ts
index 33882e03f..9071b9622 100644
--- a/pages/api/reports/funnel.ts
+++ b/src/pages/api/reports/funnel.ts
@@ -1,9 +1,10 @@
 import { canViewWebsite } from 'lib/auth';
-import { useCors, useAuth } from 'lib/middleware';
+import { useAuth, useCors, useValidate } from 'lib/middleware';
 import { NextApiRequestQueryBody } from 'lib/types';
 import { NextApiResponse } from 'next';
-import { ok, methodNotAllowed, unauthorized } from 'next-basics';
+import { methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { getFunnel } from 'queries';
+import * as yup from 'yup';
 
 export interface FunnelRequestBody {
   websiteId: string;
@@ -22,12 +23,28 @@ export interface FunnelResponse {
   endAt: number;
 }
 
+const schema = {
+  POST: yup.object().shape({
+    websiteId: yup.string().uuid().required(),
+    urls: yup.array().min(2).of(yup.string()).required(),
+    window: yup.number().positive().required(),
+    dateRange: yup
+      .object()
+      .shape({
+        startDate: yup.date().required(),
+        endDate: yup.date().required(),
+      })
+      .required(),
+  }),
+};
+
 export default async (
   req: NextApiRequestQueryBody<any, FunnelRequestBody>,
   res: NextApiResponse<FunnelResponse>,
 ) => {
   await useCors(req, res);
   await useAuth(req, res);
+  await useValidate(schema, req, res);
 
   if (req.method === 'POST') {
     const {
diff --git a/src/pages/api/reports/index.ts b/src/pages/api/reports/index.ts
new file mode 100644
index 000000000..82902aef4
--- /dev/null
+++ b/src/pages/api/reports/index.ts
@@ -0,0 +1,82 @@
+import { uuid } from 'lib/crypto';
+import { useAuth, useCors, useValidate } from 'lib/middleware';
+import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
+import { pageInfo } from 'lib/schema';
+import { NextApiResponse } from 'next';
+import { methodNotAllowed, ok } from 'next-basics';
+import { createReport, getReportsByUserId } from 'queries';
+import * as yup from 'yup';
+
+export interface ReportsRequestQuery extends SearchFilter {}
+
+export interface ReportRequestBody {
+  websiteId: string;
+  name: string;
+  type: string;
+  description: string;
+  parameters: {
+    [key: string]: any;
+  };
+}
+
+const schema = {
+  GET: yup.object().shape({
+    ...pageInfo,
+  }),
+  POST: yup.object().shape({
+    websiteId: yup.string().uuid().required(),
+    name: yup.string().max(200).required(),
+    type: yup
+      .string()
+      .matches(/funnel|insights|retention/i)
+      .required(),
+    description: yup.string().max(500),
+    parameters: yup
+      .object()
+      .test('len', 'Must not exceed 6000 characters.', val => JSON.stringify(val).length < 6000),
+  }),
+};
+
+export default async (
+  req: NextApiRequestQueryBody<any, ReportRequestBody>,
+  res: NextApiResponse,
+) => {
+  await useCors(req, res);
+  await useAuth(req, res);
+  await useValidate(schema, req, res);
+
+  const {
+    user: { id: userId },
+  } = req.auth;
+
+  if (req.method === 'GET') {
+    const { page, query, pageSize } = req.query;
+
+    const data = await getReportsByUserId(userId, {
+      page,
+      pageSize: +pageSize || undefined,
+      query,
+      includeTeams: true,
+    });
+
+    return ok(res, data);
+  }
+
+  if (req.method === 'POST') {
+    const { websiteId, type, name, description, parameters } = req.body;
+
+    const result = await createReport({
+      id: uuid(),
+      userId,
+      websiteId,
+      type,
+      name,
+      description,
+      parameters: JSON.stringify(parameters),
+    } as any);
+
+    return ok(res, result);
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/src/pages/api/reports/insights.ts b/src/pages/api/reports/insights.ts
new file mode 100644
index 000000000..c70d218eb
--- /dev/null
+++ b/src/pages/api/reports/insights.ts
@@ -0,0 +1,96 @@
+import { canViewWebsite } from 'lib/auth';
+import { useAuth, useCors, useValidate } from 'lib/middleware';
+import { NextApiRequestQueryBody } from 'lib/types';
+import { NextApiResponse } from 'next';
+import { methodNotAllowed, ok, unauthorized } from 'next-basics';
+import { getInsights } from 'queries';
+import * as yup from 'yup';
+
+export interface InsightsRequestBody {
+  websiteId: string;
+  dateRange: {
+    startDate: string;
+    endDate: string;
+  };
+  fields: { name: string; type: string; label: string }[];
+  filters: { name: string; type: string; filter: string; value: string }[];
+  groups: { name: string; type: string }[];
+}
+
+const schema = {
+  POST: yup.object().shape({
+    websiteId: yup.string().uuid().required(),
+    dateRange: yup
+      .object()
+      .shape({
+        startDate: yup.date().required(),
+        endDate: yup.date().required(),
+      })
+      .required(),
+    fields: yup
+      .array()
+      .of(
+        yup.object().shape({
+          name: yup.string().required(),
+          type: yup.string().required(),
+          label: yup.string().required(),
+        }),
+      )
+      .min(1)
+      .required(),
+    filters: yup.array().of(
+      yup.object().shape({
+        name: yup.string().required(),
+        type: yup.string().required(),
+        filter: yup.string().required(),
+        value: yup.string().required(),
+      }),
+    ),
+    groups: yup.array().of(
+      yup.object().shape({
+        name: yup.string().required(),
+        type: yup.string().required(),
+      }),
+    ),
+  }),
+};
+
+function convertFilters(filters: any[]) {
+  return filters.reduce((obj, { name, ...value }) => {
+    obj[name] = value;
+
+    return obj;
+  }, {});
+}
+
+export default async (
+  req: NextApiRequestQueryBody<any, InsightsRequestBody>,
+  res: NextApiResponse,
+) => {
+  await useCors(req, res);
+  await useAuth(req, res);
+  await useValidate(schema, req, res);
+
+  if (req.method === 'POST') {
+    const {
+      websiteId,
+      dateRange: { startDate, endDate },
+      fields,
+      filters,
+    } = req.body;
+
+    if (!(await canViewWebsite(req.auth, websiteId))) {
+      return unauthorized(res);
+    }
+
+    const data = await getInsights(websiteId, fields, {
+      ...convertFilters(filters),
+      startDate: new Date(startDate),
+      endDate: new Date(endDate),
+    });
+
+    return ok(res, data);
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/src/pages/api/reports/retention.ts b/src/pages/api/reports/retention.ts
new file mode 100644
index 000000000..6ff7bbe1c
--- /dev/null
+++ b/src/pages/api/reports/retention.ts
@@ -0,0 +1,57 @@
+import { canViewWebsite } from 'lib/auth';
+import { useAuth, useCors, useValidate } from 'lib/middleware';
+import { NextApiRequestQueryBody } from 'lib/types';
+import { TimezoneTest } from 'lib/yup';
+import { NextApiResponse } from 'next';
+import { methodNotAllowed, ok, unauthorized } from 'next-basics';
+import { getRetention } from 'queries';
+import * as yup from 'yup';
+
+export interface RetentionRequestBody {
+  websiteId: string;
+  dateRange: { startDate: string; endDate: string; timezone: string };
+}
+
+const schema = {
+  POST: yup.object().shape({
+    websiteId: yup.string().uuid().required(),
+    dateRange: yup
+      .object()
+      .shape({
+        startDate: yup.date().required(),
+        endDate: yup.date().required(),
+        timezone: TimezoneTest,
+      })
+      .required(),
+  }),
+};
+
+export default async (
+  req: NextApiRequestQueryBody<any, RetentionRequestBody>,
+  res: NextApiResponse,
+) => {
+  await useCors(req, res);
+  await useAuth(req, res);
+  await useValidate(schema, req, res);
+
+  if (req.method === 'POST') {
+    const {
+      websiteId,
+      dateRange: { startDate, endDate, timezone },
+    } = req.body;
+
+    if (!(await canViewWebsite(req.auth, websiteId))) {
+      return unauthorized(res);
+    }
+
+    const data = await getRetention(websiteId, {
+      startDate: new Date(startDate),
+      endDate: new Date(endDate),
+      timezone,
+    });
+
+    return ok(res, data);
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/pages/api/scripts/telemetry.js b/src/pages/api/scripts/telemetry.js
similarity index 53%
rename from pages/api/scripts/telemetry.js
rename to src/pages/api/scripts/telemetry.js
index 954d50586..6a249de0c 100644
--- a/pages/api/scripts/telemetry.js
+++ b/src/pages/api/scripts/telemetry.js
@@ -1,18 +1,23 @@
+import { ok } from 'next-basics';
 import { CURRENT_VERSION, TELEMETRY_PIXEL } from 'lib/constants';
 
 export default function handler(req, res) {
-  res.setHeader('content-type', 'text/javascript');
+  if (process.env.NODE_ENV === 'production') {
+    res.setHeader('content-type', 'text/javascript');
 
-  if (process.env.DISABLE_TELEMETRY) {
-    return res.send('/* telemetry disabled */');
-  }
+    if (process.env.DISABLE_TELEMETRY) {
+      return res.send('/* telemetry disabled */');
+    }
 
-  const script = `
+    const script = `
     (()=>{const i=document.createElement('img');
       i.setAttribute('src','${TELEMETRY_PIXEL}?v=${CURRENT_VERSION}');
       i.setAttribute('style','width:0;height:0;position:absolute;pointer-events:none;');
       document.body.appendChild(i);})();
   `;
 
-  return res.send(script.replace(/\s\s+/g, ''));
+    return res.send(script.replace(/\s\s+/g, ''));
+  }
+
+  return ok(res);
 }
diff --git a/src/pages/api/send.ts b/src/pages/api/send.ts
new file mode 100644
index 000000000..1698d858d
--- /dev/null
+++ b/src/pages/api/send.ts
@@ -0,0 +1,171 @@
+import ipaddr from 'ipaddr.js';
+import isbot from 'isbot';
+import { COLLECTION_TYPE, HOSTNAME_REGEX } from 'lib/constants';
+import { secret } from 'lib/crypto';
+import { getIpAddress } from 'lib/detect';
+import { useCors, useSession, useValidate } from 'lib/middleware';
+import { CollectionType, YupRequest } from 'lib/types';
+import { NextApiRequest, NextApiResponse } from 'next';
+import { badRequest, createToken, forbidden, methodNotAllowed, ok, send } from 'next-basics';
+import { saveEvent, saveSessionData } from 'queries';
+import * as yup from 'yup';
+
+export interface CollectRequestBody {
+  payload: {
+    data: { [key: string]: any };
+    hostname: string;
+    language: string;
+    referrer: string;
+    screen: string;
+    title: string;
+    url: string;
+    website: string;
+    name: string;
+  };
+  type: CollectionType;
+}
+
+export interface NextApiRequestCollect extends NextApiRequest {
+  body: CollectRequestBody;
+  session: {
+    id: string;
+    websiteId: string;
+    ownerId: string;
+    hostname: string;
+    browser: string;
+    os: string;
+    device: string;
+    screen: string;
+    language: string;
+    country: string;
+    subdivision1: string;
+    subdivision2: string;
+    city: string;
+  };
+  headers: { [key: string]: any };
+  yup: YupRequest;
+}
+
+const schema = {
+  POST: yup.object().shape({
+    payload: yup
+      .object()
+      .shape({
+        data: yup.object(),
+        hostname: yup.string().matches(HOSTNAME_REGEX).max(100),
+        language: yup.string().max(35),
+        referrer: yup.string().max(500),
+        screen: yup.string().max(11),
+        title: yup.string().max(500),
+        url: yup.string().max(500),
+        website: yup.string().uuid().required(),
+        name: yup.string().max(50),
+      })
+      .required(),
+    type: yup
+      .string()
+      .matches(/event|identify/i)
+      .required(),
+  }),
+};
+
+export default async (req: NextApiRequestCollect, res: NextApiResponse) => {
+  await useCors(req, res);
+
+  if (req.method === 'POST') {
+    if (!process.env.DISABLE_BOT_CHECK && isbot(req.headers['user-agent'])) {
+      return ok(res);
+    }
+
+    await useValidate(schema, req, res);
+
+    if (hasBlockedIp(req)) {
+      return forbidden(res);
+    }
+
+    const { type, payload } = req.body;
+
+    const { url, referrer, name: eventName, data: eventData, title: pageTitle } = payload;
+
+    await useSession(req, res);
+
+    const session = req.session;
+
+    if (type === COLLECTION_TYPE.event) {
+      // eslint-disable-next-line prefer-const
+      let [urlPath, urlQuery] = url?.split('?') || [];
+      let [referrerPath, referrerQuery] = referrer?.split('?') || [];
+      let referrerDomain;
+
+      if (!urlPath) {
+        urlPath = '/';
+      }
+
+      if (referrerPath?.startsWith('http')) {
+        const refUrl = new URL(referrer);
+        referrerPath = refUrl.pathname;
+        referrerQuery = refUrl.search.substring(1);
+        referrerDomain = refUrl.hostname.replace(/www\./, '');
+      }
+
+      if (process.env.REMOVE_TRAILING_SLASH) {
+        urlPath = urlPath.replace(/.+\/$/, '');
+      }
+
+      await saveEvent({
+        urlPath,
+        urlQuery,
+        referrerPath,
+        referrerQuery,
+        referrerDomain,
+        pageTitle,
+        eventName,
+        eventData,
+        ...session,
+        sessionId: session.id,
+      });
+    }
+
+    if (type === COLLECTION_TYPE.identify) {
+      if (!eventData) {
+        return badRequest(res, 'Data required.');
+      }
+
+      await saveSessionData({ ...session, sessionData: eventData, sessionId: session.id });
+    }
+
+    const token = createToken(session, secret());
+
+    return send(res, token);
+  }
+
+  return methodNotAllowed(res);
+};
+
+function hasBlockedIp(req: NextApiRequestCollect) {
+  const ignoreIps = process.env.IGNORE_IP;
+
+  if (ignoreIps) {
+    const ips = [];
+
+    if (ignoreIps) {
+      ips.push(...ignoreIps.split(',').map(n => n.trim()));
+    }
+
+    const clientIp = getIpAddress(req);
+
+    return ips.find(ip => {
+      if (ip === clientIp) return true;
+
+      // CIDR notation
+      if (ip.indexOf('/') > 0) {
+        const addr = ipaddr.parse(clientIp);
+        const range = ipaddr.parseCIDR(ip);
+
+        if (addr.kind() === range[0].kind() && addr.match(range)) return true;
+      }
+    });
+  }
+
+  return false;
+}
diff --git a/pages/api/share/[id].ts b/src/pages/api/share/[id].ts
similarity index 80%
rename from pages/api/share/[id].ts
rename to src/pages/api/share/[id].ts
index 0592d2167..876fbef52 100644
--- a/pages/api/share/[id].ts
+++ b/src/pages/api/share/[id].ts
@@ -1,8 +1,10 @@
-import { NextApiRequestQueryBody } from 'lib/types';
 import { secret } from 'lib/crypto';
+import { useValidate } from 'lib/middleware';
+import { NextApiRequestQueryBody } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { createToken, methodNotAllowed, notFound, ok } from 'next-basics';
 import { getWebsiteByShareId } from 'queries';
+import * as yup from 'yup';
 
 export interface ShareRequestQuery {
   id: string;
@@ -13,10 +15,18 @@ export interface ShareResponse {
   token: string;
 }
 
+const schema = {
+  GET: yup.object().shape({
+    id: yup.string().required(),
+  }),
+};
+
 export default async (
   req: NextApiRequestQueryBody<ShareRequestQuery>,
   res: NextApiResponse<ShareResponse>,
 ) => {
+  await useValidate(schema, req, res);
+
   const { id: shareId } = req.query;
 
   if (req.method === 'GET') {
diff --git a/pages/api/teams/[id]/index.ts b/src/pages/api/teams/[id]/index.ts
similarity index 76%
rename from pages/api/teams/[id]/index.ts
rename to src/pages/api/teams/[id]/index.ts
index 7fb664a01..a4f80abae 100644
--- a/pages/api/teams/[id]/index.ts
+++ b/src/pages/api/teams/[id]/index.ts
@@ -1,10 +1,11 @@
 import { Team } from '@prisma/client';
-import { NextApiRequestQueryBody } from 'lib/types';
 import { canDeleteTeam, canUpdateTeam, canViewTeam } from 'lib/auth';
-import { useAuth } from 'lib/middleware';
+import { useAuth, useValidate } from 'lib/middleware';
+import { NextApiRequestQueryBody } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { deleteTeam, getTeamById, updateTeam } from 'queries';
+import * as yup from 'yup';
 
 export interface TeamRequestQuery {
   id: string;
@@ -15,11 +16,26 @@ export interface TeamRequestBody {
   accessCode: string;
 }
 
+const schema = {
+  GET: yup.object().shape({
+    id: yup.string().uuid().required(),
+  }),
+  POST: yup.object().shape({
+    id: yup.string().uuid().required(),
+    name: yup.string().max(50),
+    accessCode: yup.string().max(50),
+  }),
+  DELETE: yup.object().shape({
+    id: yup.string().uuid().required(),
+  }),
+};
+
 export default async (
   req: NextApiRequestQueryBody<TeamRequestQuery, TeamRequestBody>,
   res: NextApiResponse<Team>,
 ) => {
   await useAuth(req, res);
+  await useValidate(schema, req, res);
 
   const { id: teamId } = req.query;
 
diff --git a/pages/api/teams/[id]/users/[userId].ts b/src/pages/api/teams/[id]/users/[userId].ts
similarity index 74%
rename from pages/api/teams/[id]/users/[userId].ts
rename to src/pages/api/teams/[id]/users/[userId].ts
index 1e4ca6239..3b16ac058 100644
--- a/pages/api/teams/[id]/users/[userId].ts
+++ b/src/pages/api/teams/[id]/users/[userId].ts
@@ -1,17 +1,26 @@
 import { canDeleteTeamUser } from 'lib/auth';
-import { useAuth } from 'lib/middleware';
+import { useAuth, useValidate } from 'lib/middleware';
 import { NextApiRequestQueryBody } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { deleteTeamUser } from 'queries';
+import * as yup from 'yup';
 
 export interface TeamUserRequestQuery {
   id: string;
   userId: string;
 }
 
+const schema = {
+  DELETE: yup.object().shape({
+    id: yup.string().uuid().required(),
+    userId: yup.string().uuid().required(),
+  }),
+};
+
 export default async (req: NextApiRequestQueryBody<TeamUserRequestQuery>, res: NextApiResponse) => {
   await useAuth(req, res);
+  await useValidate(schema, req, res);
 
   if (req.method === 'DELETE') {
     const { id: teamId, userId } = req.query;
diff --git a/src/pages/api/teams/[id]/users/index.ts b/src/pages/api/teams/[id]/users/index.ts
new file mode 100644
index 000000000..4915ad7fe
--- /dev/null
+++ b/src/pages/api/teams/[id]/users/index.ts
@@ -0,0 +1,47 @@
+import * as yup from 'yup';
+import { canViewTeam } from 'lib/auth';
+import { useAuth, useValidate } from 'lib/middleware';
+import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
+import { NextApiResponse } from 'next';
+import { methodNotAllowed, ok, unauthorized } from 'next-basics';
+import { getUsersByTeamId } from 'queries';
+import { pageInfo } from 'lib/schema';
+
+export interface TeamUserRequestQuery extends SearchFilter {
+  id: string;
+}
+
+const schema = {
+  GET: yup.object().shape({
+    id: yup.string().uuid().required(),
+    ...pageInfo,
+  }),
+};
+
+export default async (
+  req: NextApiRequestQueryBody<TeamUserRequestQuery, any>,
+  res: NextApiResponse,
+) => {
+  await useAuth(req, res);
+  await useValidate(schema, req, res);
+
+  const { id: teamId } = req.query;
+
+  if (req.method === 'GET') {
+    if (!(await canViewTeam(req.auth, teamId))) {
+      return unauthorized(res);
+    }
+
+    const { query, page, pageSize } = req.query;
+
+    const users = await getUsersByTeamId(teamId, {
+      query,
+      page,
+      pageSize: +pageSize || undefined,
+    });
+
+    return ok(res, users);
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/pages/api/teams/[id]/websites/[websiteId].ts b/src/pages/api/teams/[id]/websites/[websiteId].ts
similarity index 74%
rename from pages/api/teams/[id]/websites/[websiteId].ts
rename to src/pages/api/teams/[id]/websites/[websiteId].ts
index 795295d36..865ce0d2f 100644
--- a/pages/api/teams/[id]/websites/[websiteId].ts
+++ b/src/pages/api/teams/[id]/websites/[websiteId].ts
@@ -1,20 +1,29 @@
 import { canDeleteTeamWebsite } from 'lib/auth';
-import { useAuth } from 'lib/middleware';
+import { useAuth, useValidate } from 'lib/middleware';
 import { NextApiRequestQueryBody } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { deleteTeamWebsite } from 'queries/admin/teamWebsite';
+import * as yup from 'yup';
 
 export interface TeamWebsitesRequestQuery {
   id: string;
   websiteId: string;
 }
 
+const schema = {
+  DELETE: yup.object().shape({
+    id: yup.string().uuid().required(),
+    websiteId: yup.string().uuid().required(),
+  }),
+};
+
 export default async (
   req: NextApiRequestQueryBody<TeamWebsitesRequestQuery>,
   res: NextApiResponse,
 ) => {
   await useAuth(req, res);
+  await useValidate(schema, req, res);
 
   const { id: teamId, websiteId } = req.query;
 
diff --git a/pages/api/teams/[id]/websites/index.ts b/src/pages/api/teams/[id]/websites/index.ts
similarity index 51%
rename from pages/api/teams/[id]/websites/index.ts
rename to src/pages/api/teams/[id]/websites/index.ts
index 63be478b1..4e754d20b 100644
--- a/pages/api/teams/[id]/websites/index.ts
+++ b/src/pages/api/teams/[id]/websites/index.ts
@@ -1,11 +1,14 @@
+import * as yup from 'yup';
 import { canViewTeam } from 'lib/auth';
-import { useAuth } from 'lib/middleware';
-import { NextApiRequestQueryBody } from 'lib/types';
+import { useAuth, useValidate } from 'lib/middleware';
+import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
+import { pageInfo } from 'lib/schema';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
-import { createTeamWebsites, getTeamWebsites } from 'queries/admin/teamWebsite';
+import { getWebsitesByTeamId } from 'queries';
+import { createTeamWebsites } from 'queries/admin/teamWebsite';
 
-export interface TeamWebsiteRequestQuery {
+export interface TeamWebsiteRequestQuery extends SearchFilter {
   id: string;
 }
 
@@ -13,11 +16,23 @@ export interface TeamWebsiteRequestBody {
   websiteIds?: string[];
 }
 
+const schema = {
+  GET: yup.object().shape({
+    id: yup.string().uuid().required(),
+    ...pageInfo,
+  }),
+  POST: yup.object().shape({
+    id: yup.string().uuid().required(),
+    websiteIds: yup.array().of(yup.string()).min(1).required(),
+  }),
+};
+
 export default async (
   req: NextApiRequestQueryBody<TeamWebsiteRequestQuery, TeamWebsiteRequestBody>,
   res: NextApiResponse,
 ) => {
   await useAuth(req, res);
+  await useValidate(schema, req, res);
 
   const { id: teamId } = req.query;
 
@@ -26,7 +41,13 @@ export default async (
       return unauthorized(res);
     }
 
-    const websites = await getTeamWebsites(teamId);
+    const { page, query, pageSize } = req.query;
+
+    const websites = await getWebsitesByTeamId(teamId, {
+      page,
+      query,
+      pageSize: +pageSize || undefined,
+    });
 
     return ok(res, websites);
   }
diff --git a/pages/api/teams/index.ts b/src/pages/api/teams/index.ts
similarity index 52%
rename from pages/api/teams/index.ts
rename to src/pages/api/teams/index.ts
index 453f1ef3b..e89b4ee80 100644
--- a/pages/api/teams/index.ts
+++ b/src/pages/api/teams/index.ts
@@ -1,30 +1,49 @@
 import { Team } from '@prisma/client';
-import { NextApiRequestQueryBody } from 'lib/types';
 import { canCreateTeam } from 'lib/auth';
 import { uuid } from 'lib/crypto';
-import { useAuth } from 'lib/middleware';
+import { useAuth, useValidate } from 'lib/middleware';
+import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
+import { pageInfo } from 'lib/schema';
 import { NextApiResponse } from 'next';
 import { getRandomChars, methodNotAllowed, ok, unauthorized } from 'next-basics';
-import { createTeam, getUserTeams } from 'queries';
+import { createTeam, getTeamsByUserId } from 'queries';
+import * as yup from 'yup';
 
+export interface TeamsRequestQuery extends SearchFilter {}
 export interface TeamsRequestBody {
   name: string;
 }
 
+const schema = {
+  GET: yup.object().shape({
+    ...pageInfo,
+  }),
+  POST: yup.object().shape({
+    name: yup.string().max(50).required(),
+  }),
+};
+
 export default async (
-  req: NextApiRequestQueryBody<any, TeamsRequestBody>,
+  req: NextApiRequestQueryBody<TeamsRequestQuery, TeamsRequestBody>,
   res: NextApiResponse<Team[] | Team>,
 ) => {
   await useAuth(req, res);
+  await useValidate(schema, req, res);
 
   const {
     user: { id: userId },
   } = req.auth;
 
   if (req.method === 'GET') {
-    const teams = await getUserTeams(userId);
+    const { page, query, pageSize } = req.query;
 
-    return ok(res, teams);
+    const results = await getTeamsByUserId(userId, {
+      page,
+      query,
+      pageSize: +pageSize || undefined,
+    });
+
+    return ok(res, results);
   }
 
   if (req.method === 'POST') {
diff --git a/pages/api/teams/join.ts b/src/pages/api/teams/join.ts
similarity index 76%
rename from pages/api/teams/join.ts
rename to src/pages/api/teams/join.ts
index ce7367a0c..0f9d01fa8 100644
--- a/pages/api/teams/join.ts
+++ b/src/pages/api/teams/join.ts
@@ -1,20 +1,27 @@
 import { Team } from '@prisma/client';
-import { NextApiRequestQueryBody } from 'lib/types';
-import { useAuth } from 'lib/middleware';
-import { NextApiResponse } from 'next';
-import { methodNotAllowed, ok, notFound } from 'next-basics';
-import { createTeamUser, getTeamByAccessCode, getTeamUser } from 'queries';
 import { ROLES } from 'lib/constants';
-
+import { useAuth, useValidate } from 'lib/middleware';
+import { NextApiRequestQueryBody } from 'lib/types';
+import { NextApiResponse } from 'next';
+import { methodNotAllowed, notFound, ok } from 'next-basics';
+import { createTeamUser, getTeamByAccessCode, getTeamUser } from 'queries';
+import * as yup from 'yup';
 export interface TeamsJoinRequestBody {
   accessCode: string;
 }
 
+const schema = {
+  POST: yup.object().shape({
+    accessCode: yup.string().max(50).required(),
+  }),
+};
+
 export default async (
   req: NextApiRequestQueryBody<any, TeamsJoinRequestBody>,
   res: NextApiResponse<Team>,
 ) => {
   await useAuth(req, res);
+  await useValidate(schema, req, res);
 
   if (req.method === 'POST') {
     const { accessCode } = req.body;
diff --git a/pages/api/users/[id]/index.ts b/src/pages/api/users/[id]/index.ts
similarity index 83%
rename from pages/api/users/[id]/index.ts
rename to src/pages/api/users/[id]/index.ts
index e09b1b5f8..7926d34a5 100644
--- a/pages/api/users/[id]/index.ts
+++ b/src/pages/api/users/[id]/index.ts
@@ -1,9 +1,10 @@
-import { NextApiRequestQueryBody, Role, User } from 'lib/types';
 import { canDeleteUser, canUpdateUser, canViewUser } from 'lib/auth';
-import { useAuth } from 'lib/middleware';
+import { useAuth, useValidate } from 'lib/middleware';
+import { NextApiRequestQueryBody, Role, User } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { badRequest, hashPassword, methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { deleteUser, getUserById, getUserByUsername, updateUser } from 'queries';
+import * as yup from 'yup';
 
 export interface UserRequestQuery {
   id: string;
@@ -15,11 +16,24 @@ export interface UserRequestBody {
   role: Role;
 }
 
+const schema = {
+  GET: yup.object().shape({
+    id: yup.string().uuid().required(),
+  }),
+  POST: yup.object().shape({
+    id: yup.string().uuid().required(),
+    username: yup.string().max(255),
+    password: yup.string(),
+    role: yup.string().matches(/admin|user|view-only/i),
+  }),
+};
+
 export default async (
   req: NextApiRequestQueryBody<UserRequestQuery, UserRequestBody>,
   res: NextApiResponse<User>,
 ) => {
   await useAuth(req, res);
+  await useValidate(schema, req, res);
 
   const {
     user: { id: userId, isAdmin },
diff --git a/src/pages/api/users/[id]/teams.ts b/src/pages/api/users/[id]/teams.ts
new file mode 100644
index 000000000..cb5d44487
--- /dev/null
+++ b/src/pages/api/users/[id]/teams.ts
@@ -0,0 +1,54 @@
+import * as yup from 'yup';
+import { useAuth, useCors, useValidate } from 'lib/middleware';
+import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
+import { pageInfo } from 'lib/schema';
+import { NextApiResponse } from 'next';
+import { methodNotAllowed, ok, unauthorized } from 'next-basics';
+import { getTeamsByUserId } from 'queries';
+
+export interface UserTeamsRequestQuery extends SearchFilter {
+  id: string;
+}
+
+export interface UserTeamsRequestBody {
+  name: string;
+  domain: string;
+  shareId: string;
+}
+
+const schema = {
+  GET: yup.object().shape({
+    id: yup.string().uuid().required(),
+    ...pageInfo,
+  }),
+};
+
+export default async (
+  req: NextApiRequestQueryBody<any, UserTeamsRequestBody>,
+  res: NextApiResponse,
+) => {
+  await useCors(req, res);
+  await useAuth(req, res);
+  await useValidate(schema, req, res);
+
+  const { user } = req.auth;
+  const { id: userId } = req.query;
+
+  if (req.method === 'GET') {
+    if (!user.isAdmin && user.id !== userId) {
+      return unauthorized(res);
+    }
+
+    const { page, query, pageSize } = req.query;
+
+    const teams = await getTeamsByUserId(userId, {
+      query,
+      page,
+      pageSize: +pageSize || undefined,
+    });
+
+    return ok(res, teams);
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/pages/api/users/[id]/usage.ts b/src/pages/api/users/[id]/usage.ts
similarity index 84%
rename from pages/api/users/[id]/usage.ts
rename to src/pages/api/users/[id]/usage.ts
index 0118df92b..7cb40d610 100644
--- a/pages/api/users/[id]/usage.ts
+++ b/src/pages/api/users/[id]/usage.ts
@@ -1,8 +1,9 @@
-import { useAuth, useCors } from 'lib/middleware';
+import { useAuth, useCors, useValidate } from 'lib/middleware';
 import { NextApiRequestQueryBody } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { getEventDataUsage, getEventUsage, getUserWebsites } from 'queries';
+import * as yup from 'yup';
 
 export interface UserUsageRequestQuery {
   id: string;
@@ -21,12 +22,21 @@ export interface UserUsageRequestResponse {
   }[];
 }
 
+const schema = {
+  GET: yup.object().shape({
+    id: yup.string().uuid().required(),
+    startAt: yup.number().integer().required(),
+    endAt: yup.number().integer().moreThan(yup.ref('startAt')).required(),
+  }),
+};
+
 export default async (
   req: NextApiRequestQueryBody<UserUsageRequestQuery>,
   res: NextApiResponse<UserUsageRequestResponse>,
 ) => {
   await useCors(req, res);
   await useAuth(req, res);
+  await useValidate(schema, req, res);
 
   const { user } = req.auth;
 
diff --git a/src/pages/api/users/[id]/websites.ts b/src/pages/api/users/[id]/websites.ts
new file mode 100644
index 000000000..b5ca5cdb0
--- /dev/null
+++ b/src/pages/api/users/[id]/websites.ts
@@ -0,0 +1,51 @@
+import { useAuth, useCors, useValidate } from 'lib/middleware';
+import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
+import { pageInfo } from 'lib/schema';
+import { NextApiResponse } from 'next';
+import { methodNotAllowed, ok, unauthorized } from 'next-basics';
+import { getWebsitesByUserId } from 'queries';
+import * as yup from 'yup';
+
+export interface UserWebsitesRequestQuery extends SearchFilter {
+  id: string;
+  includeTeams?: boolean;
+  onlyTeams?: boolean;
+}
+
+const schema = {
+  GET: yup.object().shape({
+    id: yup.string().uuid().required(),
+    includeTeams: yup.boolean(),
+    onlyTeams: yup.boolean(),
+    ...pageInfo,
+  }),
+};
+
+export default async (
+  req: NextApiRequestQueryBody<UserWebsitesRequestQuery>,
+  res: NextApiResponse,
+) => {
+  await useCors(req, res);
+  await useAuth(req, res);
+  await useValidate(schema, req, res);
+
+  const { user } = req.auth;
+  const { id: userId, page = 1, pageSize, query = '', ...rest } = req.query;
+
+  if (req.method === 'GET') {
+    if (!user.isAdmin && user.id !== userId) {
+      return unauthorized(res);
+    }
+
+    const websites = await getWebsitesByUserId(userId, {
+      page,
+      pageSize: +pageSize || undefined,
+      query,
+      ...rest,
+    });
+
+    return ok(res, websites);
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/pages/api/users/index.ts b/src/pages/api/users/index.ts
similarity index 54%
rename from pages/api/users/index.ts
rename to src/pages/api/users/index.ts
index 6f6c205f4..7f8c91749 100644
--- a/pages/api/users/index.ts
+++ b/src/pages/api/users/index.ts
@@ -1,34 +1,43 @@
-import { canCreateUser, canViewUsers } from 'lib/auth';
+import { canCreateUser } from 'lib/auth';
 import { ROLES } from 'lib/constants';
 import { uuid } from 'lib/crypto';
-import { useAuth } from 'lib/middleware';
-import { NextApiRequestQueryBody, Role, User } from 'lib/types';
+import { useAuth, useValidate } from 'lib/middleware';
+import { NextApiRequestQueryBody, Role, SearchFilter, User } from 'lib/types';
+import { pageInfo } from 'lib/schema';
 import { NextApiResponse } from 'next';
 import { badRequest, hashPassword, methodNotAllowed, ok, unauthorized } from 'next-basics';
-import { createUser, getUserByUsername, getUsers } from 'queries';
+import { createUser, getUserByUsername } from 'queries';
+import * as yup from 'yup';
 
+export interface UsersRequestQuery extends SearchFilter {}
 export interface UsersRequestBody {
   username: string;
   password: string;
   id: string;
-  role?: Role;
+  role: Role;
 }
 
+const schema = {
+  GET: yup.object().shape({
+    ...pageInfo,
+  }),
+  POST: yup.object().shape({
+    username: yup.string().max(255).required(),
+    password: yup.string().required(),
+    id: yup.string().uuid(),
+    role: yup
+      .string()
+      .matches(/admin|user|view-only/i)
+      .required(),
+  }),
+};
+
 export default async (
-  req: NextApiRequestQueryBody<any, UsersRequestBody>,
+  req: NextApiRequestQueryBody<UsersRequestQuery, UsersRequestBody>,
   res: NextApiResponse<User[] | User>,
 ) => {
   await useAuth(req, res);
-
-  if (req.method === 'GET') {
-    if (!(await canViewUsers(req.auth))) {
-      return unauthorized(res);
-    }
-
-    const users = await getUsers();
-
-    return ok(res, users);
-  }
+  await useValidate(schema, req, res);
 
   if (req.method === 'POST') {
     if (!(await canCreateUser(req.auth))) {
diff --git a/src/pages/api/version.ts b/src/pages/api/version.ts
new file mode 100644
index 000000000..4453b56f0
--- /dev/null
+++ b/src/pages/api/version.ts
@@ -0,0 +1,17 @@
+import { NextApiRequest, NextApiResponse } from 'next';
+import { ok, methodNotAllowed } from 'next-basics';
+import { CURRENT_VERSION } from 'lib/constants';
+
+export interface VersionResponse {
+  version: string;
+}
+
+export default async (req: NextApiRequest, res: NextApiResponse<VersionResponse>) => {
+  if (req.method === 'GET') {
+    return ok(res, {
+      version: CURRENT_VERSION,
+    });
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/pages/api/websites/[id]/active.ts b/src/pages/api/websites/[id]/active.ts
similarity index 77%
rename from pages/api/websites/[id]/active.ts
rename to src/pages/api/websites/[id]/active.ts
index 99c8d9990..ef631a0e8 100644
--- a/pages/api/websites/[id]/active.ts
+++ b/src/pages/api/websites/[id]/active.ts
@@ -1,20 +1,28 @@
 import { WebsiteActive, NextApiRequestQueryBody } from 'lib/types';
 import { canViewWebsite } from 'lib/auth';
-import { useAuth, useCors } from 'lib/middleware';
+import { useAuth, useCors, useValidate } from 'lib/middleware';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { getActiveVisitors } from 'queries';
+import * as yup from 'yup';
 
 export interface WebsiteActiveRequestQuery {
   id: string;
 }
 
+const schema = {
+  GET: yup.object().shape({
+    id: yup.string().uuid().required(),
+  }),
+};
+
 export default async (
   req: NextApiRequestQueryBody<WebsiteActiveRequestQuery>,
   res: NextApiResponse<WebsiteActive>,
 ) => {
   await useCors(req, res);
   await useAuth(req, res);
+  await useValidate(schema, req, res);
 
   const { id: websiteId } = req.query;
 
diff --git a/pages/api/websites/[id]/daterange.ts b/src/pages/api/websites/[id]/daterange.ts
similarity index 78%
rename from pages/api/websites/[id]/daterange.ts
rename to src/pages/api/websites/[id]/daterange.ts
index dc0435600..5bf76a91a 100644
--- a/pages/api/websites/[id]/daterange.ts
+++ b/src/pages/api/websites/[id]/daterange.ts
@@ -1,20 +1,28 @@
 import { WebsiteActive, NextApiRequestQueryBody } from 'lib/types';
 import { canViewWebsite } from 'lib/auth';
-import { useAuth, useCors } from 'lib/middleware';
+import { useAuth, useCors, useValidate } from 'lib/middleware';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { getWebsiteDateRange } from 'queries';
+import * as yup from 'yup';
 
 export interface WebsiteDateRangeRequestQuery {
   id: string;
 }
 
+const schema = {
+  GET: yup.object().shape({
+    id: yup.string().uuid().required(),
+  }),
+};
+
 export default async (
   req: NextApiRequestQueryBody<WebsiteDateRangeRequestQuery>,
   res: NextApiResponse<WebsiteActive>,
 ) => {
   await useCors(req, res);
   await useAuth(req, res);
+  await useValidate(schema, req, res);
 
   const { id: websiteId } = req.query;
 
diff --git a/pages/api/websites/[id]/events.ts b/src/pages/api/websites/[id]/events.ts
similarity index 54%
rename from pages/api/websites/[id]/events.ts
rename to src/pages/api/websites/[id]/events.ts
index b9e3ac71c..05a651ab6 100644
--- a/pages/api/websites/[id]/events.ts
+++ b/src/pages/api/websites/[id]/events.ts
@@ -1,32 +1,42 @@
-import { WebsiteMetric, NextApiRequestQueryBody } from 'lib/types';
 import { canViewWebsite } from 'lib/auth';
-import { useAuth, useCors } from 'lib/middleware';
-import moment from 'moment-timezone';
-import { NextApiResponse } from 'next';
-import { badRequest, methodNotAllowed, ok, unauthorized } from 'next-basics';
-import { getEventMetrics } from 'queries';
+import { useAuth, useCors, useValidate } from 'lib/middleware';
 import { parseDateRangeQuery } from 'lib/query';
-
-const unitTypes = ['year', 'month', 'hour', 'day'];
+import { NextApiRequestQueryBody, WebsiteMetric } from 'lib/types';
+import { TimezoneTest, UnitTypeTest } from 'lib/yup';
+import { NextApiResponse } from 'next';
+import { methodNotAllowed, ok, unauthorized } from 'next-basics';
+import { getEventMetrics } from 'queries';
+import * as yup from 'yup';
 
 export interface WebsiteEventsRequestQuery {
   id: string;
   startAt: string;
   endAt: string;
-  unit: string;
-  timezone: string;
+  unit?: string;
+  timezone?: string;
   url: string;
-  eventName: string;
 }
 
+const schema = {
+  GET: yup.object().shape({
+    id: yup.string().uuid().required(),
+    startAt: yup.number().integer().required(),
+    endAt: yup.number().integer().moreThan(yup.ref('startAt')).required(),
+    unit: UnitTypeTest,
+    timezone: TimezoneTest,
+    url: yup.string(),
+  }),
+};
+
 export default async (
   req: NextApiRequestQueryBody<WebsiteEventsRequestQuery>,
   res: NextApiResponse<WebsiteMetric>,
 ) => {
   await useCors(req, res);
   await useAuth(req, res);
+  await useValidate(schema, req, res);
 
-  const { id: websiteId, timezone, url, eventName } = req.query;
+  const { id: websiteId, timezone, url } = req.query;
   const { startDate, endDate, unit } = await parseDateRangeQuery(req);
 
   if (req.method === 'GET') {
@@ -34,19 +44,12 @@ export default async (
       return unauthorized(res);
     }
 
-    if (!moment.tz.zone(timezone) || !unitTypes.includes(unit)) {
-      return badRequest(res);
-    }
-
     const events = await getEventMetrics(websiteId, {
       startDate,
       endDate,
       timezone,
       unit,
-      filters: {
-        url,
-        eventName,
-      },
+      url,
     });
 
     return ok(res, events);
diff --git a/pages/api/websites/[id]/index.ts b/src/pages/api/websites/[id]/index.ts
similarity index 79%
rename from pages/api/websites/[id]/index.ts
rename to src/pages/api/websites/[id]/index.ts
index 3d053d0eb..02e317868 100644
--- a/pages/api/websites/[id]/index.ts
+++ b/src/pages/api/websites/[id]/index.ts
@@ -2,7 +2,7 @@ import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, serverError, unauthorized } from 'next-basics';
 import { Website, NextApiRequestQueryBody } from 'lib/types';
 import { canViewWebsite, canUpdateWebsite, canDeleteWebsite } from 'lib/auth';
-import { useAuth, useCors } from 'lib/middleware';
+import { useAuth, useCors, useValidate } from 'lib/middleware';
 import { deleteWebsite, getWebsiteById, updateWebsite } from 'queries';
 import { SHARE_ID_REGEX } from 'lib/constants';
 
@@ -16,12 +16,27 @@ export interface WebsiteRequestBody {
   shareId: string;
 }
 
+import * as yup from 'yup';
+
+const schema = {
+  GET: yup.object().shape({
+    id: yup.string().uuid().required(),
+  }),
+  POST: yup.object().shape({
+    id: yup.string().uuid().required(),
+    name: yup.string(),
+    domain: yup.string(),
+    shareId: yup.string().matches(SHARE_ID_REGEX, { excludeEmptyString: true }).nullable(),
+  }),
+};
+
 export default async (
   req: NextApiRequestQueryBody<WebsiteRequestQuery, WebsiteRequestBody>,
   res: NextApiResponse<Website>,
 ) => {
   await useCors(req, res);
   await useAuth(req, res);
+  await useValidate(schema, req, res);
 
   const { id: websiteId } = req.query;
 
@@ -44,10 +59,6 @@ export default async (
 
     let website;
 
-    if (shareId && !shareId.match(SHARE_ID_REGEX)) {
-      return serverError(res, 'Invalid share ID.');
-    }
-
     try {
       website = await updateWebsite(websiteId, { name, domain, shareId });
     } catch (e: any) {
diff --git a/pages/api/websites/[id]/metrics.ts b/src/pages/api/websites/[id]/metrics.ts
similarity index 54%
rename from pages/api/websites/[id]/metrics.ts
rename to src/pages/api/websites/[id]/metrics.ts
index 37a046916..91cc7f7d4 100644
--- a/pages/api/websites/[id]/metrics.ts
+++ b/src/pages/api/websites/[id]/metrics.ts
@@ -2,35 +2,61 @@ import { NextApiResponse } from 'next';
 import { badRequest, methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { WebsiteMetric, NextApiRequestQueryBody } from 'lib/types';
 import { canViewWebsite } from 'lib/auth';
-import { useAuth, useCors } from 'lib/middleware';
+import { useAuth, useCors, useValidate } from 'lib/middleware';
 import { SESSION_COLUMNS, EVENT_COLUMNS, FILTER_COLUMNS } from 'lib/constants';
 import { getPageviewMetrics, getSessionMetrics } from 'queries';
 import { parseDateRangeQuery } from 'lib/query';
+import * as yup from 'yup';
 
 export interface WebsiteMetricsRequestQuery {
   id: string;
   type: string;
   startAt: number;
   endAt: number;
-  url: string;
-  referrer: string;
-  title: string;
-  query: string;
-  event: string;
-  os: string;
-  browser: string;
-  device: string;
-  country: string;
-  region: string;
-  city: string;
+  url?: string;
+  referrer?: string;
+  title?: string;
+  query?: string;
+  os?: string;
+  browser?: string;
+  device?: string;
+  country?: string;
+  region?: string;
+  city?: string;
+  language?: string;
+  event?: string;
+  limit?: number;
 }
 
+const schema = {
+  GET: yup.object().shape({
+    id: yup.string().uuid().required(),
+    type: yup.string().required(),
+    startAt: yup.number().required(),
+    endAt: yup.number().required(),
+    url: yup.string(),
+    referrer: yup.string(),
+    title: yup.string(),
+    query: yup.string(),
+    os: yup.string(),
+    browser: yup.string(),
+    device: yup.string(),
+    country: yup.string(),
+    region: yup.string(),
+    city: yup.string(),
+    language: yup.string(),
+    event: yup.string(),
+    limit: yup.number(),
+  }),
+};
+
 export default async (
   req: NextApiRequestQueryBody<WebsiteMetricsRequestQuery>,
   res: NextApiResponse<WebsiteMetric[]>,
 ) => {
   await useCors(req, res);
   await useAuth(req, res);
+  await useValidate(schema, req, res);
 
   const {
     id: websiteId,
@@ -39,13 +65,15 @@ export default async (
     referrer,
     title,
     query,
-    event,
     os,
     browser,
     device,
     country,
     region,
     city,
+    language,
+    event,
+    limit,
   } = req.query;
 
   if (req.method === 'GET') {
@@ -55,25 +83,27 @@ export default async (
 
     const { startDate, endDate } = await parseDateRangeQuery(req);
 
+    const filters = {
+      startDate,
+      endDate,
+      url,
+      referrer,
+      title,
+      query,
+      os,
+      browser,
+      device,
+      country,
+      region,
+      city,
+      language,
+      event,
+    };
+
+    const column = FILTER_COLUMNS[type] || type;
+
     if (SESSION_COLUMNS.includes(type)) {
-      const column = FILTER_COLUMNS[type] || type;
-      const filters = {
-        os,
-        browser,
-        device,
-        country,
-        region,
-        city,
-      };
-
-      filters[type] = undefined;
-
-      let data = await getSessionMetrics(websiteId, {
-        startDate,
-        endDate,
-        column,
-        filters,
-      });
+      const data = await getSessionMetrics(websiteId, column, filters, limit);
 
       if (type === 'language') {
         const combined = {};
@@ -88,36 +118,14 @@ export default async (
           }
         }
 
-        data = Object.values(combined);
+        return ok(res, Object.values(combined));
       }
 
       return ok(res, data);
     }
 
     if (EVENT_COLUMNS.includes(type)) {
-      const column = FILTER_COLUMNS[type] || type;
-      const filters = {
-        url,
-        referrer,
-        title,
-        query,
-        event,
-        os,
-        browser,
-        device,
-        country,
-        region,
-        city,
-      };
-
-      filters[type] = undefined;
-
-      const data = await getPageviewMetrics(websiteId, {
-        startDate,
-        endDate,
-        column,
-        filters,
-      });
+      const data = await getPageviewMetrics(websiteId, column, filters, limit);
 
       return ok(res, data);
     }
diff --git a/pages/api/websites/[id]/pageviews.ts b/src/pages/api/websites/[id]/pageviews.ts
similarity index 51%
rename from pages/api/websites/[id]/pageviews.ts
rename to src/pages/api/websites/[id]/pageviews.ts
index 453c6733c..7356c5042 100644
--- a/pages/api/websites/[id]/pageviews.ts
+++ b/src/pages/api/websites/[id]/pageviews.ts
@@ -1,18 +1,17 @@
-import moment from 'moment-timezone';
-import { NextApiResponse } from 'next';
-import { badRequest, methodNotAllowed, ok, unauthorized } from 'next-basics';
-import { NextApiRequestQueryBody, WebsitePageviews } from 'lib/types';
 import { canViewWebsite } from 'lib/auth';
-import { useAuth, useCors } from 'lib/middleware';
-import { getPageviewStats } from 'queries';
+import { useAuth, useCors, useValidate } from 'lib/middleware';
 import { parseDateRangeQuery } from 'lib/query';
+import { NextApiRequestQueryBody, WebsitePageviews } from 'lib/types';
+import { NextApiResponse } from 'next';
+import { methodNotAllowed, ok, unauthorized } from 'next-basics';
+import { getPageviewStats, getSessionStats } from 'queries';
 
 export interface WebsitePageviewRequestQuery {
   id: string;
   startAt: number;
   endAt: number;
-  unit: string;
-  timezone: string;
+  unit?: string;
+  timezone?: string;
   url?: string;
   referrer?: string;
   title?: string;
@@ -24,12 +23,34 @@ export interface WebsitePageviewRequestQuery {
   city?: string;
 }
 
+import { TimezoneTest, UnitTypeTest } from 'lib/yup';
+import * as yup from 'yup';
+const schema = {
+  GET: yup.object().shape({
+    id: yup.string().uuid().required(),
+    startAt: yup.number().required(),
+    endAt: yup.number().required(),
+    unit: UnitTypeTest,
+    timezone: TimezoneTest,
+    url: yup.string(),
+    referrer: yup.string(),
+    title: yup.string(),
+    os: yup.string(),
+    browser: yup.string(),
+    device: yup.string(),
+    country: yup.string(),
+    region: yup.string(),
+    city: yup.string(),
+  }),
+};
+
 export default async (
   req: NextApiRequestQueryBody<WebsitePageviewRequestQuery>,
   res: NextApiResponse<WebsitePageviews>,
 ) => {
   await useCors(req, res);
   await useAuth(req, res);
+  await useValidate(schema, req, res);
 
   const {
     id: websiteId,
@@ -52,46 +73,25 @@ export default async (
 
     const { startDate, endDate, unit } = await parseDateRangeQuery(req);
 
-    if (!moment.tz.zone(timezone)) {
-      return badRequest(res);
-    }
+    const filters = {
+      startDate,
+      endDate,
+      timezone,
+      unit,
+      url,
+      referrer,
+      title,
+      os,
+      browser,
+      device,
+      country,
+      region,
+      city,
+    };
 
     const [pageviews, sessions] = await Promise.all([
-      getPageviewStats(websiteId, {
-        startDate,
-        endDate,
-        timezone,
-        unit,
-        count: '*',
-        filters: {
-          url,
-          referrer,
-          title,
-          os,
-          browser,
-          device,
-          country,
-          region,
-          city,
-        },
-      }),
-      getPageviewStats(websiteId, {
-        startDate,
-        endDate,
-        timezone,
-        unit,
-        count: 'distinct website_event.',
-        filters: {
-          url,
-          title,
-          os,
-          browser,
-          device,
-          country,
-          region,
-          city,
-        },
-      }),
+      getPageviewStats(websiteId, filters),
+      getSessionStats(websiteId, filters),
     ]);
 
     return ok(res, { pageviews, sessions });
diff --git a/src/pages/api/websites/[id]/reports.ts b/src/pages/api/websites/[id]/reports.ts
new file mode 100644
index 000000000..18e944fe0
--- /dev/null
+++ b/src/pages/api/websites/[id]/reports.ts
@@ -0,0 +1,48 @@
+import * as yup from 'yup';
+import { canViewWebsite } from 'lib/auth';
+import { useAuth, useCors, useValidate } from 'lib/middleware';
+import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
+import { NextApiResponse } from 'next';
+import { methodNotAllowed, ok, unauthorized } from 'next-basics';
+import { getReportsByWebsiteId } from 'queries';
+import { pageInfo } from 'lib/schema';
+
+export interface ReportsRequestQuery extends SearchFilter {
+  id: string;
+}
+
+const schema = {
+  GET: yup.object().shape({
+    id: yup.string().uuid().required(),
+    ...pageInfo,
+  }),
+};
+
+export default async (
+  req: NextApiRequestQueryBody<ReportsRequestQuery, any>,
+  res: NextApiResponse,
+) => {
+  await useCors(req, res);
+  await useAuth(req, res);
+  await useValidate(schema, req, res);
+
+  const { id: websiteId } = req.query;
+
+  if (req.method === 'GET') {
+    if (!(await canViewWebsite(req.auth, websiteId))) {
+      return unauthorized(res);
+    }
+
+    const { page, query, pageSize } = req.query;
+
+    const data = await getReportsByWebsiteId(websiteId, {
+      page,
+      pageSize: +pageSize || undefined,
+      query,
+    });
+
+    return ok(res, data);
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/pages/api/websites/[id]/reset.ts b/src/pages/api/websites/[id]/reset.ts
similarity index 76%
rename from pages/api/websites/[id]/reset.ts
rename to src/pages/api/websites/[id]/reset.ts
index 23b5305db..647574111 100644
--- a/pages/api/websites/[id]/reset.ts
+++ b/src/pages/api/websites/[id]/reset.ts
@@ -1,20 +1,28 @@
 import { NextApiRequestQueryBody } from 'lib/types';
 import { canUpdateWebsite } from 'lib/auth';
-import { useAuth, useCors } from 'lib/middleware';
+import { useAuth, useCors, useValidate } from 'lib/middleware';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { resetWebsite } from 'queries';
+import * as yup from 'yup';
 
 export interface WebsiteResetRequestQuery {
   id: string;
 }
 
+const schema = {
+  POST: yup.object().shape({
+    id: yup.string().uuid().required(),
+  }),
+};
+
 export default async (
   req: NextApiRequestQueryBody<WebsiteResetRequestQuery>,
   res: NextApiResponse,
 ) => {
   await useCors(req, res);
   await useAuth(req, res);
+  await useValidate(schema, req, res);
 
   const { id: websiteId } = req.query;
 
diff --git a/pages/api/websites/[id]/stats.ts b/src/pages/api/websites/[id]/stats.ts
similarity index 60%
rename from pages/api/websites/[id]/stats.ts
rename to src/pages/api/websites/[id]/stats.ts
index 3164913d9..4e8d2a88b 100644
--- a/pages/api/websites/[id]/stats.ts
+++ b/src/pages/api/websites/[id]/stats.ts
@@ -2,7 +2,7 @@ import { subMinutes, differenceInMinutes } from 'date-fns';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { canViewWebsite } from 'lib/auth';
-import { useAuth, useCors } from 'lib/middleware';
+import { useAuth, useCors, useValidate } from 'lib/middleware';
 import { NextApiRequestQueryBody, WebsiteStats } from 'lib/types';
 import { parseDateRangeQuery } from 'lib/query';
 import { getWebsiteStats } from 'queries';
@@ -11,25 +11,46 @@ export interface WebsiteStatsRequestQuery {
   id: string;
   startAt: number;
   endAt: number;
-  url: string;
-  referrer: string;
-  title: string;
-  query: string;
-  event: string;
-  os: string;
-  browser: string;
-  device: string;
-  country: string;
-  region: string;
-  city: string;
+  url?: string;
+  referrer?: string;
+  title?: string;
+  query?: string;
+  event?: string;
+  os?: string;
+  browser?: string;
+  device?: string;
+  country?: string;
+  region?: string;
+  city?: string;
 }
 
+import * as yup from 'yup';
+const schema = {
+  GET: yup.object().shape({
+    id: yup.string().uuid().required(),
+    startAt: yup.number().required(),
+    endAt: yup.number().required(),
+    url: yup.string(),
+    referrer: yup.string(),
+    title: yup.string(),
+    query: yup.string(),
+    event: yup.string(),
+    os: yup.string(),
+    browser: yup.string(),
+    device: yup.string(),
+    country: yup.string(),
+    region: yup.string(),
+    city: yup.string(),
+  }),
+};
+
 export default async (
   req: NextApiRequestQueryBody<WebsiteStatsRequestQuery>,
   res: NextApiResponse<WebsiteStats>,
 ) => {
   await useCors(req, res);
   await useAuth(req, res);
+  await useValidate(schema, req, res);
 
   const {
     id: websiteId,
@@ -56,40 +77,26 @@ export default async (
     const prevStartDate = subMinutes(startDate, diff);
     const prevEndDate = subMinutes(endDate, diff);
 
-    const metrics = await getWebsiteStats(websiteId, {
-      startDate,
-      endDate,
-      filters: {
-        url,
-        referrer,
-        title,
-        query,
-        event,
-        os,
-        browser,
-        device,
-        country,
-        region,
-        city,
-      },
-    });
+    const filters = {
+      url,
+      referrer,
+      title,
+      query,
+      event,
+      os,
+      browser,
+      device,
+      country,
+      region,
+      city,
+    };
+
+    const metrics = await getWebsiteStats(websiteId, { ...filters, startDate, endDate });
 
     const prevPeriod = await getWebsiteStats(websiteId, {
+      ...filters,
       startDate: prevStartDate,
       endDate: prevEndDate,
-      filters: {
-        url,
-        referrer,
-        title,
-        query,
-        event,
-        os,
-        browser,
-        device,
-        country,
-        region,
-        city,
-      },
     });
 
     const stats = Object.keys(metrics[0]).reduce((obj, key) => {
diff --git a/src/pages/api/websites/[id]/values.ts b/src/pages/api/websites/[id]/values.ts
new file mode 100644
index 000000000..64fad1f27
--- /dev/null
+++ b/src/pages/api/websites/[id]/values.ts
@@ -0,0 +1,54 @@
+import { NextApiRequestQueryBody } from 'lib/types';
+import { canViewWebsite } from 'lib/auth';
+import { useAuth, useCors, useValidate } from 'lib/middleware';
+import { NextApiResponse } from 'next';
+import { badRequest, methodNotAllowed, ok, unauthorized } from 'next-basics';
+import { EVENT_COLUMNS, FILTER_COLUMNS, SESSION_COLUMNS } from 'lib/constants';
+import { getValues } from 'queries';
+import { parseDateRangeQuery } from 'lib/query';
+
+export interface ValuesRequestQuery {
+  id: string;
+  startAt: number;
+  endAt: number;
+}
+
+import * as yup from 'yup';
+const schema = {
+  GET: yup.object().shape({
+    id: yup.string().uuid().required(),
+    startAt: yup.number().required(),
+    endAt: yup.number().required(),
+  }),
+};
+
+export default async (req: NextApiRequestQueryBody<ValuesRequestQuery>, res: NextApiResponse) => {
+  await useCors(req, res);
+  await useAuth(req, res);
+  await useValidate(schema, req, res);
+
+  const { id: websiteId, type } = req.query;
+  const { startDate, endDate } = await parseDateRangeQuery(req);
+
+  if (req.method === 'GET') {
+    if (!SESSION_COLUMNS.includes(type as string) && !EVENT_COLUMNS.includes(type as string)) {
+      return badRequest(res);
+    }
+
+    if (!(await canViewWebsite(req.auth, websiteId))) {
+      return unauthorized(res);
+    }
+
+    const values = await getValues(websiteId, FILTER_COLUMNS[type as string], startDate, endDate);
+
+    return ok(
+      res,
+      values
+        .map(({ value }) => value)
+        .filter(n => n)
+        .sort(),
+    );
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/pages/api/websites/index.ts b/src/pages/api/websites/index.ts
similarity index 55%
rename from pages/api/websites/index.ts
rename to src/pages/api/websites/index.ts
index c8b5aba29..b30681cfc 100644
--- a/pages/api/websites/index.ts
+++ b/src/pages/api/websites/index.ts
@@ -1,11 +1,15 @@
 import { canCreateWebsite } from 'lib/auth';
 import { uuid } from 'lib/crypto';
-import { useAuth, useCors } from 'lib/middleware';
-import { NextApiRequestQueryBody } from 'lib/types';
+import { useAuth, useCors, useValidate } from 'lib/middleware';
+import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { createWebsite } from 'queries';
 import userWebsites from 'pages/api/users/[id]/websites';
+import * as yup from 'yup';
+import { pageInfo } from 'lib/schema';
+
+export interface WebsitesRequestQuery extends SearchFilter {}
 
 export interface WebsitesRequestBody {
   name: string;
@@ -13,21 +17,39 @@ export interface WebsitesRequestBody {
   shareId: string;
 }
 
+const schema = {
+  GET: yup.object().shape({
+    ...pageInfo,
+  }),
+  POST: yup.object().shape({
+    name: yup.string().max(100).required(),
+    domain: yup.string().max(500).required(),
+    shareId: yup.string().max(50).nullable(),
+  }),
+};
+
 export default async (
-  req: NextApiRequestQueryBody<any, WebsitesRequestBody>,
+  req: NextApiRequestQueryBody<WebsitesRequestQuery, WebsitesRequestBody>,
   res: NextApiResponse,
 ) => {
   await useCors(req, res);
   await useAuth(req, res);
+  await useValidate(schema, req, res);
 
   const {
     user: { id: userId },
   } = req.auth;
 
   if (req.method === 'GET') {
-    req.query.id = userId;
+    if (!req.query.id) {
+      req.query.id = userId;
+    }
 
-    return userWebsites(req, res);
+    if (!req.query.pageSize) {
+      req.query.pageSize = 100;
+    }
+
+    return userWebsites(req as any, res);
   }
 
   if (req.method === 'POST') {
diff --git a/src/queries/admin/report.ts b/src/queries/admin/report.ts
new file mode 100644
index 000000000..2f987681f
--- /dev/null
+++ b/src/queries/admin/report.ts
@@ -0,0 +1,156 @@
+import { Prisma, Report } from '@prisma/client';
+import prisma from 'lib/prisma';
+import { FilterResult, ReportSearchFilter } from 'lib/types';
+
+export async function createReport(data: Prisma.ReportUncheckedCreateInput): Promise<Report> {
+  return prisma.client.report.create({ data });
+}
+
+export async function getReportById(reportId: string): Promise<Report> {
+  return prisma.client.report.findUnique({
+    where: {
+      id: reportId,
+    },
+  });
+}
+
+export async function updateReport(
+  reportId: string,
+  data: Prisma.ReportUpdateInput,
+): Promise<Report> {
+  return prisma.client.report.update({ where: { id: reportId }, data });
+}
+
+export async function deleteReport(reportId: string): Promise<Report> {
+  return prisma.client.report.delete({ where: { id: reportId } });
+}
+
+export async function getReports(
+  params: ReportSearchFilter,
+  options?: { include?: Prisma.ReportInclude },
+): Promise<FilterResult<Report[]>> {
+  const { query, userId, websiteId, includeTeams } = params;
+
+  const mode = prisma.getSearchMode();
+
+  const where: Prisma.ReportWhereInput = {
+    userId,
+    websiteId,
+    AND: [
+      {
+        OR: [
+          {
+            userId,
+          },
+          {
+            ...(includeTeams && {
+              website: {
+                teamWebsite: {
+                  some: {
+                    team: {
+                      teamUser: {
+                        some: {
+                          userId,
+                        },
+                      },
+                    },
+                  },
+                },
+              },
+            }),
+          },
+        ],
+      },
+      {
+        OR: [
+          {
+            name: {
+              contains: query,
+              ...mode,
+            },
+          },
+          {
+            description: {
+              contains: query,
+              ...mode,
+            },
+          },
+          {
+            type: {
+              contains: query,
+              ...mode,
+            },
+          },
+          {
+            user: {
+              username: {
+                contains: query,
+                ...mode,
+              },
+            },
+          },
+          {
+            website: {
+              name: {
+                contains: query,
+                ...mode,
+              },
+            },
+          },
+          {
+            website: {
+              domain: {
+                contains: query,
+                ...mode,
+              },
+            },
+          },
+        ],
+      },
+    ],
+  };
+
+  const [pageFilters, pageInfo] = prisma.getPageFilters(params);
+
+  const reports = await prisma.client.report.findMany({
+    where,
+    ...pageFilters,
+    ...(options?.include && { include: options.include }),
+  });
+
+  const count = await prisma.client.report.count({
+    where,
+  });
+
+  return {
+    data: reports,
+    count,
+    ...pageInfo,
+  };
+}
+
+export async function getReportsByUserId(
+  userId: string,
+  filter?: ReportSearchFilter,
+): Promise<FilterResult<Report[]>> {
+  return getReports(
+    { userId, ...filter },
+    {
+      include: {
+        website: {
+          select: {
+            domain: true,
+            userId: true,
+          },
+        },
+      },
+    },
+  );
+}
+
+export async function getReportsByWebsiteId(
+  websiteId: string,
+  filter: ReportSearchFilter,
+): Promise<FilterResult<Report[]>> {
+  return getReports({ websiteId, ...filter });
+}
diff --git a/queries/admin/team.ts b/src/queries/admin/team.ts
similarity index 51%
rename from queries/admin/team.ts
rename to src/queries/admin/team.ts
index a8b3385ca..9947b9a3b 100644
--- a/queries/admin/team.ts
+++ b/src/queries/admin/team.ts
@@ -1,7 +1,8 @@
 import { Prisma, Team } from '@prisma/client';
-import prisma from 'lib/prisma';
 import { ROLES } from 'lib/constants';
 import { uuid } from 'lib/crypto';
+import prisma from 'lib/prisma';
+import { FilterResult, TeamSearchFilter } from 'lib/types';
 
 export interface GetTeamOptions {
   includeTeamUser?: boolean;
@@ -26,12 +27,6 @@ export function getTeamByAccessCode(accessCode: string, options: GetTeamOptions
   return getTeam({ accessCode }, options);
 }
 
-export async function getTeams(where: Prisma.TeamWhereInput): Promise<Team[]> {
-  return prisma.client.team.findMany({
-    where,
-  });
-}
-
 export async function createTeam(data: Prisma.TeamCreateInput, userId: string): Promise<Team> {
   const { id } = data;
 
@@ -85,3 +80,81 @@ export async function deleteTeam(
     }),
   ]);
 }
+
+export async function getTeams(
+  filters: TeamSearchFilter,
+  options?: { include?: Prisma.TeamInclude },
+): Promise<FilterResult<Team[]>> {
+  const { userId, query } = filters;
+  const mode = prisma.getSearchMode();
+
+  const where: Prisma.TeamWhereInput = {
+    ...(userId && {
+      teamUser: {
+        some: { userId },
+      },
+    }),
+    ...(query && {
+      AND: {
+        OR: [
+          {
+            name: { startsWith: query, ...mode },
+          },
+          {
+            teamUser: {
+              some: {
+                role: ROLES.teamOwner,
+                user: {
+                  username: {
+                    startsWith: query,
+                    ...mode,
+                  },
+                },
+              },
+            },
+          },
+        ],
+      },
+    }),
+  };
+
+  const [pageFilters, getParameters] = prisma.getPageFilters({
+    orderBy: 'name',
+    ...filters,
+  });
+
+  const teams = await prisma.client.team.findMany({
+    where: {
+      ...where,
+    },
+    ...pageFilters,
+    ...(options?.include && { include: options?.include }),
+  });
+
+  const count = await prisma.client.team.count({ where });
+
+  return { data: teams, count, ...getParameters };
+}
+
+export async function getTeamsByUserId(
+  userId: string,
+  filter?: TeamSearchFilter,
+): Promise<FilterResult<Team[]>> {
+  return getTeams(
+    { userId, ...filter },
+    {
+      include: {
+        teamUser: {
+          include: {
+            user: {
+              select: {
+                id: true,
+                username: true,
+              },
+            },
+          },
+        },
+      },
+    },
+  );
+}
diff --git a/queries/admin/teamUser.ts b/src/queries/admin/teamUser.ts
similarity index 100%
rename from queries/admin/teamUser.ts
rename to src/queries/admin/teamUser.ts
diff --git a/queries/admin/teamWebsite.ts b/src/queries/admin/teamWebsite.ts
similarity index 100%
rename from queries/admin/teamWebsite.ts
rename to src/queries/admin/teamWebsite.ts
diff --git a/queries/admin/user.ts b/src/queries/admin/user.ts
similarity index 62%
rename from queries/admin/user.ts
rename to src/queries/admin/user.ts
index f60c48010..11f1c846e 100644
--- a/queries/admin/user.ts
+++ b/src/queries/admin/user.ts
@@ -1,9 +1,9 @@
-import { Prisma, Team, TeamUser } from '@prisma/client';
-import { getRandomChars } from 'next-basics';
+import { Prisma } from '@prisma/client';
 import cache from 'lib/cache';
 import { ROLES } from 'lib/constants';
 import prisma from 'lib/prisma';
-import { Website, User, Role } from 'lib/types';
+import { FilterResult, Role, User, UserSearchFilter } from 'lib/types';
+import { getRandomChars } from 'next-basics';
 
 export interface GetUserOptions {
   includePassword?: boolean;
@@ -11,13 +11,17 @@ export interface GetUserOptions {
 }
 
 async function getUser(
-  where: Prisma.UserWhereInput | Prisma.UserWhereUniqueInput,
+  where: Prisma.UserWhereUniqueInput,
   options: GetUserOptions = {},
 ): Promise<User> {
   const { includePassword = false, showDeleted = false } = options;
 
-  return prisma.client.user.findFirst({
-    where: { ...where, ...(showDeleted ? {} : { deletedAt: null }) },
+  if (showDeleted) {
+    where.deletedAt = null;
+  }
+
+  return prisma.client.user.findUnique({
+    where,
     select: {
       id: true,
       username: true,
@@ -28,133 +32,84 @@ async function getUser(
   });
 }
 
-export async function getUserById(userId: string, options: GetUserOptions = {}) {
-  return getUser({ id: userId }, options);
+export async function getUserById(id: string, options: GetUserOptions = {}) {
+  return getUser({ id }, options);
 }
 
 export async function getUserByUsername(username: string, options: GetUserOptions = {}) {
   return getUser({ username }, options);
 }
 
-export async function getUsers(): Promise<User[]> {
-  return prisma.client.user.findMany({
-    take: 100,
-    where: {
-      deletedAt: null,
-    },
-    orderBy: [
-      {
-        username: 'asc',
-      },
-    ],
-    select: {
-      id: true,
-      username: true,
-      role: true,
-      createdAt: true,
-    },
-  });
-}
+export async function getUsers(
+  params: UserSearchFilter,
+  options?: { include?: Prisma.UserInclude },
+): Promise<FilterResult<User[]>> {
+  const { teamId, query } = params;
+  const mode = prisma.getSearchMode();
 
-export async function getUserTeams(userId: string): Promise<
-  (Team & {
-    teamUser: (TeamUser & {
-      user: { id: string; username: string };
-    })[];
-  })[]
-> {
-  return prisma.client.team.findMany({
-    where: {
+  const where: Prisma.UserWhereInput = {
+    ...(teamId && {
       teamUser: {
         some: {
-          userId,
+          teamId,
         },
       },
-    },
-    include: {
-      teamUser: {
-        include: {
-          user: {
-            select: {
-              id: true,
-              username: true,
+    }),
+    ...(query && {
+      AND: {
+        OR: [
+          {
+            username: {
+              contains: query,
+              ...mode,
             },
           },
+        ],
+      },
+    }),
+  };
+
+  const [pageFilters, getParameters] = prisma.getPageFilters({
+    orderBy: 'username',
+    ...params,
+  });
+
+  const users = await prisma.client.user
+    .findMany({
+      where: {
+        ...where,
+        deletedAt: null,
+      },
+      ...pageFilters,
+      ...(options?.include && { include: options.include }),
+    })
+    .then(a => {
+      return a.map(({ password, ...rest }) => rest);
+    });
+
+  const count = await prisma.client.user.count({
+    where: {
+      ...where,
+      deletedAt: null,
+    },
+  });
+
+  return { data: users as any, count, ...getParameters };
+}
+
+export async function getUsersByTeamId(teamId: string, filter?: UserSearchFilter) {
+  return getUsers(
+    { teamId, ...filter },
+    {
+      include: {
+        teamUser: {
+          select: {
+            role: true,
+          },
         },
       },
     },
-  });
-}
-
-export async function getUserWebsites(
-  userId: string,
-  options?: { includeTeams: boolean },
-): Promise<Website[]> {
-  const { rawQuery } = prisma;
-
-  if (options?.includeTeams) {
-    const websites = await rawQuery(
-      `
-      select
-        website_id as "id",
-        name,
-        domain,
-        share_id as "shareId",
-        reset_at as "resetAt",
-        user_id as "userId",
-        created_at as "createdAt",
-        updated_at as "updatedAt",
-        deleted_at as "deletedAt",
-        null as "teamId",
-        null as "teamName"
-      from website
-      where user_id = {{userId::uuid}}
-        and deleted_at is null
-      union
-      select           
-        w.website_id as "id",
-        w.name,
-        w.domain,
-        w.share_id as "shareId",
-        w.reset_at as "resetAt",
-        w.user_id as "userId",
-        w.created_at as "createdAt",
-        w.updated_at as "updatedAt",
-        w.deleted_at as "deletedAt",
-        t.team_id as "teamId",
-        t.name as "teamName"
-      from website w
-      inner join team_website tw
-        on tw.website_id = w.website_id
-      inner join team t
-        on t.team_id = tw.team_id
-      inner join team_user tu 
-        on tu.team_id = tw.team_id
-      where tu.user_id = {{userId::uuid}}
-        and w.deleted_at is null
-      `,
-      { userId },
-    );
-
-    return websites.reduce((arr, item) => {
-      if (!arr.find(({ id }) => id === item.id)) {
-        return arr.concat(item);
-      }
-      return arr;
-    }, []);
-  }
-
-  return prisma.client.website.findMany({
-    where: {
-      userId,
-      deletedAt: null,
-    },
-    orderBy: [
-      {
-        name: 'asc',
-      },
-    ],
-  });
+  );
 }
 
 export async function createUser(data: {
diff --git a/src/queries/admin/website.ts b/src/queries/admin/website.ts
new file mode 100644
index 000000000..524e2e141
--- /dev/null
+++ b/src/queries/admin/website.ts
@@ -0,0 +1,339 @@
+import { Prisma, Website } from '@prisma/client';
+import cache from 'lib/cache';
+import { ROLES } from 'lib/constants';
+import prisma from 'lib/prisma';
+import { FilterResult, WebsiteSearchFilter } from 'lib/types';
+
+async function getWebsite(where: Prisma.WebsiteWhereUniqueInput): Promise<Website> {
+  return prisma.client.website.findUnique({
+    where,
+  });
+}
+
+export async function getWebsiteById(id: string) {
+  return getWebsite({ id });
+}
+
+export async function getWebsiteByShareId(shareId: string) {
+  return getWebsite({ shareId });
+}
+
+export async function getWebsites(
+  filters: WebsiteSearchFilter,
+  options?: { include?: Prisma.WebsiteInclude },
+): Promise<FilterResult<Website>> {
+  const { userId, teamId, includeTeams, onlyTeams, query } = filters;
+  const mode = prisma.getSearchMode();
+
+  const where: Prisma.WebsiteWhereInput = {
+    ...(teamId && {
+      teamWebsite: {
+        some: {
+          teamId,
+        },
+      },
+    }),
+    AND: [
+      {
+        OR: [
+          {
+            ...(userId &&
+              !onlyTeams && {
+                userId,
+              }),
+          },
+          {
+            ...((includeTeams || onlyTeams) && {
+              AND: [
+                {
+                  teamWebsite: {
+                    some: {
+                      team: {
+                        teamUser: {
+                          some: {
+                            userId,
+                          },
+                        },
+                      },
+                    },
+                  },
+                },
+                {
+                  userId: {
+                    not: userId,
+                  },
+                },
+              ],
+            }),
+          },
+        ],
+      },
+      {
+        OR: query
+          ? [
+              {
+                name: { contains: query, ...mode },
+              },
+              {
+                domain: { contains: query, ...mode },
+              },
+            ]
+          : [],
+      },
+    ],
+  };
+
+  const [pageFilters, getParameters] = prisma.getPageFilters({
+    orderBy: 'name',
+    ...filters,
+  });
+
+  const websites = await prisma.client.website.findMany({
+    where: {
+      ...where,
+      deletedAt: null,
+    },
+    ...pageFilters,
+    ...(options?.include && { include: options.include }),
+  });
+
+  const count = await prisma.client.website.count({ where: { ...where, deletedAt: null } });
+
+  return { data: websites, count, ...getParameters };
+}
+
+export async function getWebsitesByUserId(
+  userId: string,
+  filters?: WebsiteSearchFilter,
+): Promise<FilterResult<Website>> {
+  return getWebsites(
+    { userId, ...filters },
+    {
+      include: {
+        teamWebsite: {
+          include: {
+            team: {
+              select: {
+                name: true,
+              },
+            },
+          },
+        },
+        user: {
+          select: {
+            username: true,
+            id: true,
+          },
+        },
+      },
+    },
+  );
+}
+
+export async function getWebsitesByTeamId(
+  teamId: string,
+  filters?: WebsiteSearchFilter,
+): Promise<FilterResult<Website>> {
+  return getWebsites(
+    {
+      teamId,
+      ...filters,
+      includeTeams: true,
+    },
+    {
+      include: {
+        teamWebsite: {
+          include: {
+            team: {
+              include: {
+                teamUser: {
+                  where: { role: ROLES.teamOwner },
+                },
+              },
+            },
+          },
+        },
+        user: {
+          select: {
+            id: true,
+            username: true,
+          },
+        },
+      },
+    },
+  );
+}
+
+export async function getUserWebsites(
+  userId: string,
+  options?: { includeTeams: boolean },
+): Promise<Website[]> {
+  const { rawQuery } = prisma;
+
+  if (options?.includeTeams) {
+    const websites = await rawQuery(
+      `
+      select
+        website_id as "id",
+        name,
+        domain,
+        share_id as "shareId",
+        reset_at as "resetAt",
+        user_id as "userId",
+        created_at as "createdAt",
+        updated_at as "updatedAt",
+        deleted_at as "deletedAt",
+        null as "teamId",
+        null as "teamName"
+      from website
+      where user_id = {{userId::uuid}}
+        and deleted_at is null
+      union
+      select           
+        w.website_id as "id",
+        w.name,
+        w.domain,
+        w.share_id as "shareId",
+        w.reset_at as "resetAt",
+        w.user_id as "userId",
+        w.created_at as "createdAt",
+        w.updated_at as "updatedAt",
+        w.deleted_at as "deletedAt",
+        t.team_id as "teamId",
+        t.name as "teamName"
+      from website w
+      inner join team_website tw
+        on tw.website_id = w.website_id
+      inner join team t
+        on t.team_id = tw.team_id
+      inner join team_user tu 
+        on tu.team_id = tw.team_id
+      where tu.user_id = {{userId::uuid}}
+        and w.deleted_at is null
+      `,
+      { userId },
+    );
+
+    return websites.reduce((arr, item) => {
+      if (!arr.find(({ id }) => id === item.id)) {
+        return arr.concat(item);
+      }
+      return arr;
+    }, []);
+  }
+
+  return prisma.client.website.findMany({
+    where: {
+      userId,
+      deletedAt: null,
+    },
+    orderBy: [
+      {
+        name: 'asc',
+      },
+    ],
+  });
+}
+
+export async function createWebsite(
+  data: Prisma.WebsiteCreateInput | Prisma.WebsiteUncheckedCreateInput,
+): Promise<Website> {
+  return prisma.client.website
+    .create({
+      data,
+    })
+    .then(async data => {
+      if (cache.enabled) {
+        await cache.storeWebsite(data);
+      }
+
+      return data;
+    });
+}
+
+export async function updateWebsite(
+  websiteId,
+  data: Prisma.WebsiteUpdateInput | Prisma.WebsiteUncheckedUpdateInput,
+): Promise<Website> {
+  return prisma.client.website.update({
+    where: {
+      id: websiteId,
+    },
+    data,
+  });
+}
+
+export async function resetWebsite(
+  websiteId,
+): Promise<[Prisma.BatchPayload, Prisma.BatchPayload, Website]> {
+  const { client, transaction } = prisma;
+
+  return transaction([
+    client.eventData.deleteMany({
+      where: { websiteId },
+    }),
+    client.websiteEvent.deleteMany({
+      where: { websiteId },
+    }),
+    client.session.deleteMany({
+      where: { websiteId },
+    }),
+    client.website.update({
+      where: { id: websiteId },
+      data: {
+        resetAt: new Date(),
+      },
+    }),
+  ]).then(async data => {
+    if (cache.enabled) {
+      await cache.storeWebsite(data[3]);
+    }
+
+    return data;
+  });
+}
+
+export async function deleteWebsite(
+  websiteId,
+): Promise<[Prisma.BatchPayload, Prisma.BatchPayload, Website]> {
+  const { client, transaction } = prisma;
+  const cloudMode = process.env.CLOUD_MODE;
+
+  return transaction([
+    client.eventData.deleteMany({
+      where: { websiteId },
+    }),
+    client.websiteEvent.deleteMany({
+      where: { websiteId },
+    }),
+    client.session.deleteMany({
+      where: { websiteId },
+    }),
+    client.teamWebsite.deleteMany({
+      where: {
+        websiteId,
+      },
+    }),
+    client.report.deleteMany({
+      where: {
+        websiteId,
+      },
+    }),
+    cloudMode
+      ? prisma.client.website.update({
+          data: {
+            deletedAt: new Date(),
+          },
+          where: { id: websiteId },
+        })
+      : client.website.delete({
+          where: { id: websiteId },
+        }),
+  ]).then(async data => {
+    if (cache.enabled) {
+      await cache.deleteWebsite(websiteId);
+    }
+
+    return data;
+  });
+}
diff --git a/src/queries/analytics/eventData/getEventDataEvents.ts b/src/queries/analytics/eventData/getEventDataEvents.ts
new file mode 100644
index 000000000..683d95583
--- /dev/null
+++ b/src/queries/analytics/eventData/getEventDataEvents.ts
@@ -0,0 +1,126 @@
+import prisma from 'lib/prisma';
+import clickhouse from 'lib/clickhouse';
+import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
+import { QueryFilters, WebsiteEventData } from 'lib/types';
+
+export async function getEventDataEvents(
+  ...args: [websiteId: string, filters: QueryFilters]
+): Promise<WebsiteEventData[]> {
+  return runQuery({
+    [PRISMA]: () => relationalQuery(...args),
+    [CLICKHOUSE]: () => clickhouseQuery(...args),
+  });
+}
+
+async function relationalQuery(websiteId: string, filters: QueryFilters) {
+  const { rawQuery, parseFilters } = prisma;
+  const { event } = filters;
+  const { params } = await parseFilters(websiteId, filters);
+
+  if (event) {
+    return rawQuery(
+      `
+      select
+        website_event.event_name as "eventName",
+        event_data.event_key as "fieldName",
+        event_data.data_type as "dataType",
+        event_data.string_value as "fieldValue",
+        count(*) as "total"
+      from event_data
+      inner join website_event
+        on website_event.event_id = event_data.website_event_id
+      where event_data.website_id = {{websiteId::uuid}}
+        and event_data.created_at between {{startDate}} and {{endDate}}
+        and website_event.event_name = {{event}}
+      group by website_event.event_name, event_data.event_key, event_data.data_type, event_data.string_value
+      order by 1 asc, 2 asc, 3 asc, 4 desc
+      `,
+      params,
+    );
+  }
+
+  return rawQuery(
+    `
+    select
+      website_event.event_name as "eventName",
+      event_data.event_key as "fieldName",
+      event_data.data_type as "dataType",
+      count(*) as "total"
+    from event_data
+    inner join website_event
+      on website_event.event_id = event_data.website_event_id
+    where event_data.website_id = {{websiteId::uuid}}
+      and event_data.created_at between {{startDate}} and {{endDate}}
+    group by website_event.event_name, event_data.event_key, event_data.data_type
+    order by 1 asc, 2 asc
+    limit 100
+    `,
+    params,
+  );
+}
+
+async function clickhouseQuery(
+  websiteId: string,
+  filters: QueryFilters,
+): Promise<{ eventName: string; fieldName: string; dataType: number; total: number }[]> {
+  const { rawQuery, parseFilters } = clickhouse;
+  const { event } = filters;
+  const { params } = await parseFilters(websiteId, filters);
+
+  if (event) {
+    return rawQuery(
+      `
+      select
+        event_name as eventName,
+        event_key as fieldName,
+        data_type as dataType,
+        string_value as fieldValue,
+        count(*) as total
+      from event_data
+      where website_id = {websiteId:UUID}
+        and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+        and event_name = {event:String}
+      group by event_key, data_type, string_value, event_name
+      order by 1 asc, 2 asc, 3 asc, 4 desc
+      limit 100
+      `,
+      params,
+    ).then(a => {
+      return Object.values(a).map(a => {
+        return {
+          eventName: a.eventName,
+          fieldName: a.fieldName,
+          dataType: Number(a.dataType),
+          fieldValue: a.fieldValue,
+          total: Number(a.total),
+        };
+      });
+    });
+  }
+
+  return rawQuery(
+    `
+    select
+      event_name as eventName,
+      event_key as fieldName,
+      data_type as dataType,
+      count(*) as total
+    from event_data
+    where website_id = {websiteId:UUID}
+      and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+    group by event_key, data_type, event_name
+    order by 1 asc, 2 asc
+    limit 100
+    `,
+    params,
+  ).then(a => {
+    return Object.values(a).map(a => {
+      return {
+        eventName: a.eventName,
+        fieldName: a.fieldName,
+        dataType: Number(a.dataType),
+        total: Number(a.total),
+      };
+    });
+  });
+}
diff --git a/src/queries/analytics/eventData/getEventDataFields.ts b/src/queries/analytics/eventData/getEventDataFields.ts
new file mode 100644
index 000000000..df5a8874f
--- /dev/null
+++ b/src/queries/analytics/eventData/getEventDataFields.ts
@@ -0,0 +1,75 @@
+import prisma from 'lib/prisma';
+import clickhouse from 'lib/clickhouse';
+import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
+import { QueryFilters, WebsiteEventData } from 'lib/types';
+
+export async function getEventDataFields(
+  ...args: [websiteId: string, filters: QueryFilters & { field?: string }]
+): Promise<WebsiteEventData[]> {
+  return runQuery({
+    [PRISMA]: () => relationalQuery(...args),
+    [CLICKHOUSE]: () => clickhouseQuery(...args),
+  });
+}
+
+async function relationalQuery(websiteId: string, filters: QueryFilters & { field?: string }) {
+  const { rawQuery, parseFilters } = prisma;
+  const { filterQuery, params } = await parseFilters(websiteId, filters, {
+    columns: { field: 'event_key' },
+  });
+
+  return rawQuery(
+    `
+    select
+      event_key as "fieldName",
+      data_type as "dataType",
+      string_value as "fieldValue",
+      count(*) as "total"
+    from event_data
+    where website_id = {{websiteId::uuid}}
+      and created_at between {{startDate}} and {{endDate}}
+    ${filterQuery}
+    group by event_key, data_type, string_value
+    order by 3 desc, 2 desc, 1 asc
+    limit 100
+    `,
+    params,
+  );
+}
+
+async function clickhouseQuery(
+  websiteId: string,
+  filters: QueryFilters & { field?: string },
+): Promise<{ fieldName: string; dataType: number; fieldValue: string; total: number }[]> {
+  const { rawQuery, parseFilters } = clickhouse;
+  const { filterQuery, params } = await parseFilters(websiteId, filters, {
+    columns: { field: 'event_key' },
+  });
+
+  return rawQuery(
+    `
+    select
+      event_key as fieldName,
+      data_type as dataType,
+      string_value as fieldValue,
+      count(*) as total
+    from event_data
+    where website_id = {websiteId:UUID}
+      and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+    ${filterQuery}
+    group by event_key, data_type, string_value
+    order by 3 desc, 2 desc, 1 asc
+    limit 100
+    `,
+    params,
+  ).then(a => {
+    return Object.values(a).map(a => {
+      return {
+        fieldName: a.fieldName,
+        dataType: Number(a.dataType),
+        fieldValue: a.fieldValue,
+        total: Number(a.total),
+      };
+    });
+  });
+}
diff --git a/src/queries/analytics/eventData/getEventDataStats.ts b/src/queries/analytics/eventData/getEventDataStats.ts
new file mode 100644
index 000000000..39afa1ae7
--- /dev/null
+++ b/src/queries/analytics/eventData/getEventDataStats.ts
@@ -0,0 +1,80 @@
+import prisma from 'lib/prisma';
+import clickhouse from 'lib/clickhouse';
+import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
+import { QueryFilters } from 'lib/types';
+
+export async function getEventDataStats(
+  ...args: [websiteId: string, filters: QueryFilters]
+): Promise<{
+  events: number;
+  fields: number;
+  records: number;
+}> {
+  return runQuery({
+    [PRISMA]: () => relationalQuery(...args),
+    [CLICKHOUSE]: () => clickhouseQuery(...args),
+  }).then(results => results[0]);
+}
+
+async function relationalQuery(websiteId: string, filters: QueryFilters) {
+  const { rawQuery, parseFilters } = prisma;
+  const { filterQuery, params } = await parseFilters(websiteId, filters);
+
+  return rawQuery(
+    `
+    select 
+      count(distinct t.website_event_id) as "events",
+      count(distinct t.event_key) as "fields",
+      sum(t.total) as "records"
+    from (
+      select
+        website_event_id,
+        event_key,
+        count(*) as "total"
+      from event_data
+      where website_id = {{websiteId::uuid}}
+        and created_at between {{startDate}} and {{endDate}}
+      ${filterQuery}
+      group by website_event_id, event_key
+      ) as t
+    `,
+    params,
+  );
+}
+
+async function clickhouseQuery(
+  websiteId: string,
+  filters: QueryFilters,
+): Promise<{ events: number; fields: number; records: number }[]> {
+  const { rawQuery, parseFilters } = clickhouse;
+  const { filterQuery, params } = await parseFilters(websiteId, filters);
+
+  return rawQuery(
+    `
+    select 
+      count(distinct t.event_id) as "events",
+      count(distinct t.event_key) as "fields",
+      sum(t.total) as "records"
+    from (
+      select
+        event_id,
+        event_key,
+        count(*) as "total"
+      from event_data
+      where website_id = {websiteId:UUID}
+        and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+      ${filterQuery}
+      group by event_id, event_key
+      ) as t
+    `,
+    params,
+  ).then(a => {
+    return Object.values(a).map(a => {
+      return {
+        events: Number(a.events),
+        fields: Number(a.fields),
+        records: Number(a.records),
+      };
+    });
+  });
+}
diff --git a/queries/analytics/eventData/getEventDataUsage.ts b/src/queries/analytics/eventData/getEventDataUsage.ts
similarity index 71%
rename from queries/analytics/eventData/getEventDataUsage.ts
rename to src/queries/analytics/eventData/getEventDataUsage.ts
index 78bf7c916..7866a6008 100644
--- a/queries/analytics/eventData/getEventDataUsage.ts
+++ b/src/queries/analytics/eventData/getEventDataUsage.ts
@@ -8,7 +8,11 @@ export function getEventDataUsage(...args: [websiteIds: string[], startDate: Dat
   });
 }
 
-function clickhouseQuery(websiteIds: string[], startDate: Date, endDate: Date) {
+function clickhouseQuery(
+  websiteIds: string[],
+  startDate: Date,
+  endDate: Date,
+): Promise<{ websiteId: string; count: number }[]> {
   const { rawQuery } = clickhouse;
 
   return rawQuery(
@@ -26,5 +30,9 @@ function clickhouseQuery(websiteIds: string[], startDate: Date, endDate: Date) {
       startDate,
       endDate,
     },
-  );
+  ).then(a => {
+    return Object.values(a).map(a => {
+      return { websiteId: a.websiteId, count: Number(a.count) };
+    });
+  });
 }
diff --git a/queries/analytics/eventData/saveEventData.ts b/src/queries/analytics/eventData/saveEventData.ts
similarity index 100%
rename from queries/analytics/eventData/saveEventData.ts
rename to src/queries/analytics/eventData/saveEventData.ts
diff --git a/src/queries/analytics/events/getEventMetrics.ts b/src/queries/analytics/events/getEventMetrics.ts
new file mode 100644
index 000000000..53638fbde
--- /dev/null
+++ b/src/queries/analytics/events/getEventMetrics.ts
@@ -0,0 +1,74 @@
+import prisma from 'lib/prisma';
+import clickhouse from 'lib/clickhouse';
+import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
+import { WebsiteEventMetric, QueryFilters } from 'lib/types';
+import { EVENT_TYPE } from 'lib/constants';
+
+export async function getEventMetrics(
+  ...args: [websiteId: string, filters: QueryFilters]
+): Promise<WebsiteEventMetric[]> {
+  return runQuery({
+    [PRISMA]: () => relationalQuery(...args),
+    [CLICKHOUSE]: () => clickhouseQuery(...args),
+  });
+}
+
+async function relationalQuery(websiteId: string, filters: QueryFilters) {
+  const { timezone = 'utc', unit = 'day' } = filters;
+  const { rawQuery, getDateQuery, parseFilters } = prisma;
+  const { filterQuery, joinSession, params } = await parseFilters(websiteId, {
+    ...filters,
+    eventType: EVENT_TYPE.customEvent,
+  });
+
+  return rawQuery(
+    `
+    select
+      event_name x,
+      ${getDateQuery('created_at', unit, timezone)} t,
+      count(*) y
+    from website_event
+    ${joinSession}
+    where website_id = {{websiteId::uuid}}
+      and created_at between {{startDate}} and {{endDate}}
+      and event_type = {{eventType}}
+      ${filterQuery}
+    group by 1, 2
+    order by 2
+    `,
+    params,
+  );
+}
+
+async function clickhouseQuery(
+  websiteId: string,
+  filters: QueryFilters,
+): Promise<{ x: string; t: string; y: number }[]> {
+  const { timezone = 'UTC', unit = 'day' } = filters;
+  const { rawQuery, getDateQuery, parseFilters } = clickhouse;
+  const { filterQuery, params } = await parseFilters(websiteId, {
+    ...filters,
+    eventType: EVENT_TYPE.customEvent,
+  });
+
+  return rawQuery(
+    `
+    select
+      event_name x,
+      ${getDateQuery('created_at', unit, timezone)} t,
+      count(*) y
+    from website_event
+    where website_id = {websiteId:UUID}
+      and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+      and event_type = {eventType:UInt32}
+      ${filterQuery}
+    group by x, t
+    order by t
+    `,
+    params,
+  ).then(a => {
+    return Object.values(a).map(a => {
+      return { x: a.x, t: a.t, y: Number(a.y) };
+    });
+  });
+}
diff --git a/queries/analytics/events/getEventUsage.ts b/src/queries/analytics/events/getEventUsage.ts
similarity index 71%
rename from queries/analytics/events/getEventUsage.ts
rename to src/queries/analytics/events/getEventUsage.ts
index e8ed975f6..8baefe06c 100644
--- a/queries/analytics/events/getEventUsage.ts
+++ b/src/queries/analytics/events/getEventUsage.ts
@@ -8,7 +8,11 @@ export function getEventUsage(...args: [websiteIds: string[], startDate: Date, e
   });
 }
 
-function clickhouseQuery(websiteIds: string[], startDate: Date, endDate: Date) {
+function clickhouseQuery(
+  websiteIds: string[],
+  startDate: Date,
+  endDate: Date,
+): Promise<{ websiteId: string; count: number }[]> {
   const { rawQuery } = clickhouse;
 
   return rawQuery(
@@ -26,5 +30,9 @@ function clickhouseQuery(websiteIds: string[], startDate: Date, endDate: Date) {
       startDate,
       endDate,
     },
-  );
+  ).then(a => {
+    return Object.values(a).map(a => {
+      return { websiteId: a.websiteId, count: Number(a.count) };
+    });
+  });
 }
diff --git a/queries/analytics/events/getEvents.ts b/src/queries/analytics/events/getEvents.ts
similarity index 90%
rename from queries/analytics/events/getEvents.ts
rename to src/queries/analytics/events/getEvents.ts
index 17528d660..9ef279734 100644
--- a/queries/analytics/events/getEvents.ts
+++ b/src/queries/analytics/events/getEvents.ts
@@ -18,6 +18,9 @@ function relationalQuery(websiteId: string, startDate: Date, eventType: number)
         gte: startDate,
       },
     },
+    orderBy: {
+      createdAt: 'asc',
+    },
   });
 }
 
@@ -37,8 +40,9 @@ function clickhouseQuery(websiteId: string, startDate: Date, eventType: number)
       event_name as eventName
     from website_event
     where website_id = {websiteId:UUID}
-      and created_at >= {startDate:DateTime}
+      and created_at >= {startDate:DateTime64}
       and event_type = {eventType:UInt32}
+    order by created_at asc
     `,
     {
       websiteId,
diff --git a/queries/analytics/events/saveEvent.ts b/src/queries/analytics/events/saveEvent.ts
similarity index 94%
rename from queries/analytics/events/saveEvent.ts
rename to src/queries/analytics/events/saveEvent.ts
index 51087a59d..a6457d7e6 100644
--- a/queries/analytics/events/saveEvent.ts
+++ b/src/queries/analytics/events/saveEvent.ts
@@ -137,10 +137,15 @@ async function clickhouseQuery(data: {
     website_id: websiteId,
     session_id: sessionId,
     event_id: uuid(),
-    country: country ? country : null,
-    subdivision1: country && subdivision1 ? `${country}-${subdivision1}` : null,
-    subdivision2: subdivision2 ? subdivision2 : null,
-    city: city ? city : null,
+    country: country,
+    subdivision1:
+      country && subdivision1
+        ? subdivision1.includes('-')
+          ? subdivision1
+          : `${country}-${subdivision1}`
+        : null,
+    subdivision2: subdivision2,
+    city: city,
     url_path: urlPath?.substring(0, URL_LENGTH),
     url_query: urlQuery?.substring(0, URL_LENGTH),
     referrer_path: referrerPath?.substring(0, URL_LENGTH),
diff --git a/queries/analytics/stats/getActiveVisitors.ts b/src/queries/analytics/getActiveVisitors.ts
similarity index 69%
rename from queries/analytics/stats/getActiveVisitors.ts
rename to src/queries/analytics/getActiveVisitors.ts
index 8dcfd7c92..962bea350 100644
--- a/queries/analytics/stats/getActiveVisitors.ts
+++ b/src/queries/analytics/getActiveVisitors.ts
@@ -17,26 +17,30 @@ async function relationalQuery(websiteId: string) {
     `
     select count(distinct session_id) x
     from website_event
-    join website 
-        on website_event.website_id = website.website_id
-    where website.website_id = {{websiteId::uuid}}
-    and website_event.created_at >= {{startAt}}
+    where website_id = {{websiteId::uuid}}
+    and created_at >= {{startAt}}
     `,
     { websiteId, startAt: subMinutes(new Date(), 5) },
   );
 }
 
-async function clickhouseQuery(websiteId: string) {
+async function clickhouseQuery(websiteId: string): Promise<{ x: number }> {
   const { rawQuery } = clickhouse;
 
-  return rawQuery(
+  const result = rawQuery(
     `
     select
       count(distinct session_id) x
     from website_event
     where website_id = {websiteId:UUID}
-      and created_at >= {startAt:DateTime}
+      and created_at >= {startAt:DateTime64}
     `,
     { websiteId, startAt: subMinutes(new Date(), 5) },
-  );
+  ).then(a => {
+    return Object.values(a).map(a => {
+      return { x: Number(a.x) };
+    });
+  });
+
+  return result[0] ?? null;
 }
diff --git a/src/queries/analytics/getRealtimeData.ts b/src/queries/analytics/getRealtimeData.ts
new file mode 100644
index 000000000..868a5c70e
--- /dev/null
+++ b/src/queries/analytics/getRealtimeData.ts
@@ -0,0 +1,43 @@
+import { getSessions, getEvents } from 'queries/index';
+import { EVENT_TYPE } from 'lib/constants';
+
+export async function getRealtimeData(websiteId: string, startDate: Date) {
+  const [pageviews, sessions, events] = await Promise.all([
+    getEvents(websiteId, startDate, EVENT_TYPE.pageView),
+    getSessions(websiteId, startDate),
+    getEvents(websiteId, startDate, EVENT_TYPE.customEvent),
+  ]);
+
+  const decorate = (type: string, data: any[]) => {
+    return data.map((values: { [key: string]: any }) => ({
+      ...values,
+      __type: type,
+      timestamp: values.timestamp ? values.timestamp * 1000 : new Date(values.createdAt).getTime(),
+    }));
+  };
+
+  const set = new Set();
+  const uniques = (type: string, data: any[]) => {
+    return data.reduce((arr, values: { [key: string]: any }) => {
+      if (!set.has(values.id)) {
+        set.add(values.id);
+
+        return arr.concat({
+          ...values,
+          __type: type,
+          timestamp: values.timestamp
+            ? values.timestamp * 1000
+            : new Date(values.createdAt).getTime(),
+        });
+      }
+      return arr;
+    }, []);
+  };
+
+  return {
+    pageviews: decorate('pageview', pageviews),
+    sessions: uniques('session', sessions),
+    events: decorate('event', events),
+    timestamp: Date.now(),
+  };
+}
diff --git a/src/queries/analytics/getValues.ts b/src/queries/analytics/getValues.ts
new file mode 100644
index 000000000..c270727e2
--- /dev/null
+++ b/src/queries/analytics/getValues.ts
@@ -0,0 +1,52 @@
+import prisma from 'lib/prisma';
+import clickhouse from 'lib/clickhouse';
+import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
+
+export async function getValues(
+  ...args: [websiteId: string, column: string, startDate: Date, endDate: Date]
+) {
+  return runQuery({
+    [PRISMA]: () => relationalQuery(...args),
+    [CLICKHOUSE]: () => clickhouseQuery(...args),
+  });
+}
+
+async function relationalQuery(websiteId: string, column: string, startDate: Date, endDate: Date) {
+  const { rawQuery } = prisma;
+
+  return rawQuery(
+    `
+    select distinct ${column} as "value"
+    from website_event
+    inner join session
+      on session.session_id = website_event.session_id
+    where website_event.website_id = {{websiteId::uuid}}
+      and website_event.created_at between {{startDate}} and {{endDate}}
+    limit 100
+    `,
+    {
+      websiteId,
+      startDate,
+      endDate,
+    },
+  );
+}
+
+async function clickhouseQuery(websiteId: string, column: string, startDate: Date, endDate: Date) {
+  const { rawQuery } = clickhouse;
+
+  return rawQuery(
+    `
+    select distinct ${column} as value
+    from website_event
+    where website_id = {websiteId:UUID}
+      and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+    limit 100
+    `,
+    {
+      websiteId,
+      startDate,
+      endDate,
+    },
+  );
+}
diff --git a/queries/analytics/stats/getWebsiteDateRange.ts b/src/queries/analytics/getWebsiteDateRange.ts
similarity index 67%
rename from queries/analytics/stats/getWebsiteDateRange.ts
rename to src/queries/analytics/getWebsiteDateRange.ts
index 45885e45c..a4daaafc7 100644
--- a/queries/analytics/stats/getWebsiteDateRange.ts
+++ b/src/queries/analytics/getWebsiteDateRange.ts
@@ -1,9 +1,7 @@
 import prisma from 'lib/prisma';
 import clickhouse from 'lib/clickhouse';
 import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
-import { loadWebsite } from 'lib/load';
 import { DEFAULT_RESET_DATE } from 'lib/constants';
-import { maxDate } from 'lib/date';
 
 export async function getWebsiteDateRange(...args: [websiteId: string]) {
   return runQuery({
@@ -13,8 +11,8 @@ export async function getWebsiteDateRange(...args: [websiteId: string]) {
 }
 
 async function relationalQuery(websiteId: string) {
-  const { rawQuery } = prisma;
-  const website = await loadWebsite(websiteId);
+  const { rawQuery, parseFilters } = prisma;
+  const { params } = await parseFilters(websiteId, { startDate: new Date(DEFAULT_RESET_DATE) });
 
   const result = await rawQuery(
     `
@@ -25,15 +23,15 @@ async function relationalQuery(websiteId: string) {
     where website_id = {{websiteId::uuid}}
       and created_at >= {{startDate}}
     `,
-    { websiteId, startDate: maxDate(new Date(DEFAULT_RESET_DATE), new Date(website.resetAt)) },
+    params,
   );
 
   return result[0] ?? null;
 }
 
 async function clickhouseQuery(websiteId: string) {
-  const { rawQuery } = clickhouse;
-  const website = await loadWebsite(websiteId);
+  const { rawQuery, parseFilters } = clickhouse;
+  const { params } = await parseFilters(websiteId, { startDate: new Date(DEFAULT_RESET_DATE) });
 
   const result = await rawQuery(
     `
@@ -42,9 +40,9 @@ async function clickhouseQuery(websiteId: string) {
       max(created_at) as maxdate
     from website_event
     where website_id = {websiteId:UUID}
-      and created_at >= {startDate:DateTime}
+      and created_at >= {startDate:DateTime64}
     `,
-    { websiteId, startDate: maxDate(new Date(DEFAULT_RESET_DATE), new Date(website.resetAt)) },
+    params,
   );
 
   return result[0] ?? null;
diff --git a/queries/analytics/stats/getWebsiteStats.ts b/src/queries/analytics/getWebsiteStats.ts
similarity index 50%
rename from queries/analytics/stats/getWebsiteStats.ts
rename to src/queries/analytics/getWebsiteStats.ts
index 4d3730ee4..4dbdb4626 100644
--- a/queries/analytics/stats/getWebsiteStats.ts
+++ b/src/queries/analytics/getWebsiteStats.ts
@@ -2,29 +2,22 @@ import prisma from 'lib/prisma';
 import clickhouse from 'lib/clickhouse';
 import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
 import { EVENT_TYPE } from 'lib/constants';
-import { loadWebsite } from 'lib/load';
-import { maxDate } from 'lib/date';
+import { QueryFilters } from 'lib/types';
 
-export async function getWebsiteStats(
-  ...args: [
-    websiteId: string,
-    data: { startDate: Date; endDate: Date; type?: string; filters: object },
-  ]
-) {
+export async function getWebsiteStats(...args: [websiteId: string, filters: QueryFilters]) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
     [CLICKHOUSE]: () => clickhouseQuery(...args),
   });
 }
 
-async function relationalQuery(
-  websiteId: string,
-  criteria: { startDate: Date; endDate: Date; filters: object },
-) {
-  const { startDate, endDate, filters = {} } = criteria;
-  const { getDateQuery, getTimestampIntervalQuery, parseFilters, rawQuery } = prisma;
-  const website = await loadWebsite(websiteId);
-  const { filterQuery, joinSession } = parseFilters(filters);
+async function relationalQuery(websiteId: string, filters: QueryFilters) {
+  const { getDateQuery, getAddIntervalQuery, getTimestampDiffQuery, parseFilters, rawQuery } =
+    prisma;
+  const { filterQuery, joinSession, params } = await parseFilters(websiteId, {
+    ...filters,
+    eventType: EVENT_TYPE.pageView,
+  });
 
   return rawQuery(
     `
@@ -32,42 +25,40 @@ async function relationalQuery(
       sum(t.c) as "pageviews",
       count(distinct t.session_id) as "uniques",
       sum(case when t.c = 1 then 1 else 0 end) as "bounces",
-      sum(t.time) as "totaltime"
+      sum(case when t.max_time < ${getAddIntervalQuery('t.min_time', '1 hour')}
+        then ${getTimestampDiffQuery('t.min_time', 't.max_time')}
+        else 0 end) as "totaltime"
     from (
       select
         website_event.session_id,
-        ${getDateQuery('website_event.created_at', 'hour')},
-        count(*) as c,
-        ${getTimestampIntervalQuery('website_event.created_at')} as "time"
+        ${getDateQuery('website_event.created_at', 'day')},
+        count(*) as "c",
+        min(website_event.created_at) as "min_time",
+        max(website_event.created_at) as "max_time"
       from website_event
       join website 
         on website_event.website_id = website.website_id
         ${joinSession}
-      where event_type = {{eventType}}
-        and website.website_id = {{websiteId::uuid}}
+      where website.website_id = {{websiteId::uuid}}
         and website_event.created_at between {{startDate}} and {{endDate}}
+        and event_type = {{eventType}}
         ${filterQuery}
       group by 1, 2
     ) as t
     `,
-    {
-      websiteId,
-      startDate: maxDate(startDate, website.resetAt),
-      endDate,
-      eventType: EVENT_TYPE.pageView,
-      ...filters,
-    },
+    params,
   );
 }
 
 async function clickhouseQuery(
   websiteId: string,
-  criteria: { startDate: Date; endDate: Date; filters: object },
-) {
-  const { startDate, endDate, filters = {} } = criteria;
+  filters: QueryFilters,
+): Promise<{ pageviews: number; uniques: number; bounces: number; totaltime: number }[]> {
   const { rawQuery, getDateQuery, parseFilters } = clickhouse;
-  const website = await loadWebsite(websiteId);
-  const { filterQuery } = parseFilters(filters);
+  const { filterQuery, params } = await parseFilters(websiteId, {
+    ...filters,
+    eventType: EVENT_TYPE.pageView,
+  });
 
   return rawQuery(
     `
@@ -85,18 +76,21 @@ async function clickhouseQuery(
         max(created_at) max_time
       from website_event
       where website_id = {websiteId:UUID}
-        and created_at between {startDate:DateTime} and {endDate:DateTime}
+        and created_at between {startDate:DateTime64} and {endDate:DateTime64}
         and event_type = {eventType:UInt32}
         ${filterQuery}
       group by session_id, time_series
     ) as t;
     `,
-    {
-      ...filters,
-      websiteId,
-      startDate: maxDate(startDate, website.resetAt),
-      endDate,
-      eventType: EVENT_TYPE.pageView,
-    },
-  );
+    params,
+  ).then(a => {
+    return Object.values(a).map(a => {
+      return {
+        pageviews: Number(a.pageviews),
+        uniques: Number(a.uniques),
+        bounces: Number(a.bounces),
+        totaltime: Number(a.totaltime),
+      };
+    });
+  });
 }
diff --git a/src/queries/analytics/pageviews/getPageviewMetrics.ts b/src/queries/analytics/pageviews/getPageviewMetrics.ts
new file mode 100644
index 000000000..b7aef81c2
--- /dev/null
+++ b/src/queries/analytics/pageviews/getPageviewMetrics.ts
@@ -0,0 +1,92 @@
+import prisma from 'lib/prisma';
+import clickhouse from 'lib/clickhouse';
+import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
+import { EVENT_TYPE, SESSION_COLUMNS } from 'lib/constants';
+import { QueryFilters } from 'lib/types';
+
+export async function getPageviewMetrics(
+  ...args: [websiteId: string, columns: string, filters: QueryFilters, limit?: number]
+) {
+  return runQuery({
+    [PRISMA]: () => relationalQuery(...args),
+    [CLICKHOUSE]: () => clickhouseQuery(...args),
+  });
+}
+
+async function relationalQuery(
+  websiteId: string,
+  column: string,
+  filters: QueryFilters,
+  limit: number = 100,
+) {
+  const { rawQuery, parseFilters } = prisma;
+  const { filterQuery, joinSession, params } = await parseFilters(
+    websiteId,
+    {
+      ...filters,
+      eventType: column === 'event_name' ? EVENT_TYPE.customEvent : EVENT_TYPE.pageView,
+    },
+    { joinSession: SESSION_COLUMNS.includes(column) },
+  );
+
+  let excludeDomain = '';
+  if (column === 'referrer_domain') {
+    excludeDomain =
+      'and (website_event.referrer_domain != {{websiteDomain}} or website_event.referrer_domain is null)';
+  }
+
+  return rawQuery(
+    `
+    select ${column} x, count(*) y
+    from website_event
+    ${joinSession}
+    where website_event.website_id = {{websiteId::uuid}}
+      and website_event.created_at between {{startDate}} and {{endDate}}
+      and event_type = {{eventType}}
+      ${excludeDomain}
+      ${filterQuery}
+    group by 1
+    order by 2 desc
+    limit ${limit}
+    `,
+    params,
+  );
+}
+
+async function clickhouseQuery(
+  websiteId: string,
+  column: string,
+  filters: QueryFilters,
+  limit: number = 100,
+): Promise<{ x: string; y: number }[]> {
+  const { rawQuery, parseFilters } = clickhouse;
+  const { filterQuery, params } = await parseFilters(websiteId, {
+    ...filters,
+    eventType: column === 'event_name' ? EVENT_TYPE.customEvent : EVENT_TYPE.pageView,
+  });
+
+  let excludeDomain = '';
+  if (column === 'referrer_domain') {
+    excludeDomain = 'and referrer_domain != {websiteDomain:String}';
+  }
+
+  return rawQuery(
+    `
+    select ${column} x, count(*) y
+    from website_event
+    where website_id = {websiteId:UUID}
+      and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+      and event_type = {eventType:UInt32}
+      ${excludeDomain}
+      ${filterQuery}
+    group by x
+    order by y desc
+    limit ${limit}
+    `,
+    params,
+  ).then(a => {
+    return Object.values(a).map(a => {
+      return { x: a.x, y: Number(a.y) };
+    });
+  });
+}
diff --git a/src/queries/analytics/pageviews/getPageviewStats.ts b/src/queries/analytics/pageviews/getPageviewStats.ts
new file mode 100644
index 000000000..b221e0104
--- /dev/null
+++ b/src/queries/analytics/pageviews/getPageviewStats.ts
@@ -0,0 +1,74 @@
+import clickhouse from 'lib/clickhouse';
+import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
+import prisma from 'lib/prisma';
+import { EVENT_TYPE } from 'lib/constants';
+import { QueryFilters } from 'lib/types';
+
+export async function getPageviewStats(...args: [websiteId: string, filters: QueryFilters]) {
+  return runQuery({
+    [PRISMA]: () => relationalQuery(...args),
+    [CLICKHOUSE]: () => clickhouseQuery(...args),
+  });
+}
+
+async function relationalQuery(websiteId: string, filters: QueryFilters) {
+  const { timezone = 'utc', unit = 'day' } = filters;
+  const { getDateQuery, parseFilters, rawQuery } = prisma;
+  const { filterQuery, joinSession, params } = await parseFilters(websiteId, {
+    ...filters,
+    eventType: EVENT_TYPE.pageView,
+  });
+
+  return rawQuery(
+    `
+    select
+      ${getDateQuery('website_event.created_at', unit, timezone)} x,
+      count(*) y
+    from website_event
+      ${joinSession}
+    where website_event.website_id = {{websiteId::uuid}}
+      and website_event.created_at between {{startDate}} and {{endDate}}
+      and event_type = {{eventType}}
+      ${filterQuery}
+    group by 1
+    `,
+    params,
+  );
+}
+
+async function clickhouseQuery(
+  websiteId: string,
+  filters: QueryFilters,
+): Promise<{ x: string; y: number }[]> {
+  const { timezone = 'UTC', unit = 'day' } = filters;
+  const { parseFilters, rawQuery, getDateStringQuery, getDateQuery } = clickhouse;
+  const { filterQuery, params } = await parseFilters(websiteId, {
+    ...filters,
+    eventType: EVENT_TYPE.pageView,
+  });
+
+  return rawQuery(
+    `
+    select
+      ${getDateStringQuery('g.t', unit)} as x, 
+      g.y as y
+    from (
+      select 
+        ${getDateQuery('created_at', unit, timezone)} as t,
+        count(*) as y
+      from website_event
+      where website_id = {websiteId:UUID}
+        and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+        and event_type = {eventType:UInt32}
+        ${filterQuery}
+      group by t
+    ) as g
+    order by t
+    `,
+    params,
+  ).then(a => {
+    return Object.values(a).map(a => {
+      return { x: a.x, y: Number(a.y) };
+    });
+  });
+}
diff --git a/queries/analytics/reports/getFunnel.ts b/src/queries/analytics/reports/getFunnel.ts
similarity index 93%
rename from queries/analytics/reports/getFunnel.ts
rename to src/queries/analytics/reports/getFunnel.ts
index 3c5c65e09..4387cf09b 100644
--- a/queries/analytics/reports/getFunnel.ts
+++ b/src/queries/analytics/reports/getFunnel.ts
@@ -35,7 +35,7 @@ async function relationalQuery(
   }[]
 > {
   const { windowMinutes, startDate, endDate, urls } = criteria;
-  const { rawQuery, getAddMinutesQuery } = prisma;
+  const { rawQuery, getAddIntervalQuery } = prisma;
   const { levelQuery, sumQuery } = getFunnelQuery(urls, windowMinutes);
 
   function getFunnelQuery(
@@ -57,12 +57,14 @@ async function relationalQuery(
             from level${i} l
             join website_event we
                 on l.session_id = we.session_id
-            where we.created_at between l.created_at 
-                and ${getAddMinutesQuery(`l.created_at `, windowMinutes)}
+            where we.website_id = {{websiteId::uuid}}
+                and we.created_at between l.created_at and ${getAddIntervalQuery(
+                  `l.created_at `,
+                  `${windowMinutes} minute`,
+                )}
                 and we.referrer_path = {{${i - 1}}}
                 and we.url_path = {{${i}}}
                 and we.created_at <= {{endDate}}
-                and we.website_id = {{websiteId::uuid}}
           )`;
         }
 
@@ -170,7 +172,7 @@ async function clickhouseQuery(
     );
   }
 
-  return rawQuery<{ level: number; count: number }[]>(
+  return rawQuery(
     `
     WITH level0 AS (
       select distinct session_id, url_path, referrer_path, created_at
@@ -199,7 +201,7 @@ async function clickhouseQuery(
   ).then(results => {
     return urls.map((a, i) => ({
       x: a,
-      y: results[i]?.count || 0,
+      y: Number(results[i]?.count) || 0,
       z: (1 - Number(results[i]?.count) / Number(results[i - 1]?.count)) * 100 || 0, // drop off
     }));
   });
diff --git a/src/queries/analytics/reports/getInsights.ts b/src/queries/analytics/reports/getInsights.ts
new file mode 100644
index 000000000..282ed7557
--- /dev/null
+++ b/src/queries/analytics/reports/getInsights.ts
@@ -0,0 +1,115 @@
+import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
+import prisma from 'lib/prisma';
+import clickhouse from 'lib/clickhouse';
+import { EVENT_TYPE, FILTER_COLUMNS, SESSION_COLUMNS } from 'lib/constants';
+import { QueryFilters } from 'lib/types';
+
+export async function getInsights(
+  ...args: [websiteId: string, fields: { name: string; type?: string }[], filters: QueryFilters]
+) {
+  return runQuery({
+    [PRISMA]: () => relationalQuery(...args),
+    [CLICKHOUSE]: () => clickhouseQuery(...args),
+  });
+}
+
+async function relationalQuery(
+  websiteId: string,
+  fields: { name: string; type?: string }[],
+  filters: QueryFilters,
+): Promise<
+  {
+    x: string;
+    y: number;
+  }[]
+> {
+  const { parseFilters, rawQuery } = prisma;
+  const { filterQuery, joinSession, params } = await parseFilters(
+    websiteId,
+    {
+      ...filters,
+      eventType: EVENT_TYPE.pageView,
+    },
+    {
+      joinSession: !!fields.find(({ name }) => SESSION_COLUMNS.includes(name)),
+    },
+  );
+
+  return rawQuery(
+    `
+    select 
+      ${parseFields(fields)}
+    from website_event
+      ${joinSession}
+    where website_event.website_id = {{websiteId::uuid}}
+      and website_event.created_at between {{startDate}} and {{endDate}}
+      and website_event.event_type = {{eventType}}
+      ${filterQuery}
+    ${parseGroupBy(fields)}
+    order by 1 desc, 2 desc
+    limit 500
+    `,
+    params,
+  );
+}
+
+async function clickhouseQuery(
+  websiteId: string,
+  fields: { name: string; type?: string }[],
+  filters: QueryFilters,
+): Promise<
+  {
+    x: string;
+    y: number;
+  }[]
+> {
+  const { parseFilters, rawQuery } = clickhouse;
+  const { filterQuery, params } = await parseFilters(websiteId, {
+    ...filters,
+    eventType: EVENT_TYPE.pageView,
+  });
+
+  return rawQuery(
+    `
+    select 
+      ${parseFields(fields)}
+    from website_event
+    where website_id = {websiteId:UUID}
+      and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+      and event_type = {eventType:UInt32}
+      ${filterQuery}
+    ${parseGroupBy(fields)}
+    order by 1 desc, 2 desc
+    limit 500
+    `,
+    params,
+  ).then(a => {
+    return Object.values(a).map(a => {
+      return {
+        ...a,
+        views: Number(a.views),
+        visitors: Number(a.visitors),
+      };
+    });
+  });
+}
+
+function parseFields(fields: any[]) {
+  const query = fields.reduce(
+    (arr, field) => {
+      const { name } = field;
+
+      return arr.concat(`${FILTER_COLUMNS[name]} as "${name}"`);
+    },
+    ['count(*) as views', 'count(distinct website_event.session_id) as visitors'],
+  );
+
+  return query.join(',\n');
+}
+
+function parseGroupBy(fields: { name: any }[]) {
+  if (!fields.length) {
+    return '';
+  }
+  return `group by ${fields.map(({ name }) => FILTER_COLUMNS[name]).join(',')}`;
+}
diff --git a/src/queries/analytics/reports/getRetention.ts b/src/queries/analytics/reports/getRetention.ts
new file mode 100644
index 000000000..fce7841d6
--- /dev/null
+++ b/src/queries/analytics/reports/getRetention.ts
@@ -0,0 +1,186 @@
+import clickhouse from 'lib/clickhouse';
+import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
+import prisma from 'lib/prisma';
+
+export async function getRetention(
+  ...args: [
+    websiteId: string,
+    filters: {
+      startDate: Date;
+      endDate: Date;
+      timezone?: string;
+    },
+  ]
+) {
+  return runQuery({
+    [PRISMA]: () => relationalQuery(...args),
+    [CLICKHOUSE]: () => clickhouseQuery(...args),
+  });
+}
+
+async function relationalQuery(
+  websiteId: string,
+  filters: {
+    startDate: Date;
+    endDate: Date;
+    timezone?: string;
+  },
+): Promise<
+  {
+    date: string;
+    day: number;
+    visitors: number;
+    returnVisitors: number;
+    percentage: number;
+  }[]
+> {
+  const { startDate, endDate, timezone = 'UTC' } = filters;
+  const { getDateQuery, getDayDiffQuery, getCastColumnQuery, rawQuery } = prisma;
+  const unit = 'day';
+
+  return rawQuery(
+    `
+    WITH cohort_items AS (
+      select session_id,
+        ${getDateQuery('created_at', unit, timezone)} as cohort_date  
+      from session 
+      where website_id = {{websiteId::uuid}}
+        and created_at between {{startDate}} and {{endDate}}
+    ),
+    user_activities AS (
+      select distinct
+        w.session_id,
+        ${getDayDiffQuery(
+          getDateQuery('created_at', unit, timezone),
+          'c.cohort_date',
+        )} as day_number
+      from website_event w
+      join cohort_items c
+      on w.session_id = c.session_id
+      where website_id = {{websiteId::uuid}}
+          and created_at between {{startDate}} and {{endDate}}
+      ),
+    cohort_size as (
+      select cohort_date,
+        count(*) as visitors
+      from cohort_items
+      group by 1
+      order by 1
+    ),
+    cohort_date as (
+      select
+        c.cohort_date,
+        a.day_number,
+        count(*) as visitors
+      from user_activities a
+      join cohort_items c
+      on a.session_id = c.session_id
+      group by 1, 2
+    )
+    select
+      c.cohort_date as date,
+      c.day_number as day,
+      s.visitors,
+      c.visitors as "returnVisitors",
+      ${getCastColumnQuery('c.visitors', 'float')} * 100 / s.visitors  as percentage
+    from cohort_date c
+    join cohort_size s
+    on c.cohort_date = s.cohort_date
+    where c.day_number <= 31
+    order by 1, 2`,
+    {
+      websiteId,
+      startDate,
+      endDate,
+    },
+  ).then(results => {
+    return results.map(i => ({ ...i, percentage: Number(i.percentage) || 0 }));
+  });
+}
+
+async function clickhouseQuery(
+  websiteId: string,
+  filters: {
+    startDate: Date;
+    endDate: Date;
+    timezone?: string;
+  },
+): Promise<
+  {
+    date: string;
+    day: number;
+    visitors: number;
+    returnVisitors: number;
+    percentage: number;
+  }[]
+> {
+  const { startDate, endDate, timezone = 'UTC' } = filters;
+  const { getDateQuery, getDateStringQuery, rawQuery } = clickhouse;
+  const unit = 'day';
+
+  return rawQuery(
+    `
+    WITH cohort_items AS (
+      select
+        min(${getDateQuery('created_at', unit, timezone)}) as cohort_date,
+        session_id
+      from website_event
+      where website_id = {websiteId:UUID}
+      and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+      group by session_id
+    ),
+    user_activities AS (
+      select distinct
+        w.session_id,
+        (${getDateQuery('created_at', unit, timezone)} - c.cohort_date) / 86400 as day_number
+      from website_event w
+      join cohort_items c
+      on w.session_id = c.session_id
+      where website_id = {websiteId:UUID}
+        and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+    ),
+    cohort_size as (
+      select cohort_date,
+        count(*) as visitors
+      from cohort_items
+      group by 1
+      order by 1
+    ),
+    cohort_date as (
+      select
+        c.cohort_date,
+        a.day_number,
+        count(*) as visitors
+      from user_activities a
+      join cohort_items c
+      on a.session_id = c.session_id
+      group by 1, 2
+    )
+    select
+      ${getDateStringQuery('c.cohort_date', unit)} as date,
+      c.day_number as day,
+      s.visitors as visitors,
+      c.visitors returnVisitors,
+      c.visitors * 100 / s.visitors as percentage
+    from cohort_date c
+    join cohort_size s
+    on c.cohort_date = s.cohort_date
+    where c.day_number <= 31
+    order by 1, 2`,
+    {
+      websiteId,
+      startDate,
+      endDate,
+    },
+  ).then(a => {
+    return Object.values(a).map(a => {
+      return {
+        date: a.date,
+        day: Number(a.day),
+        visitors: Number(a.visitors),
+        returnVisitors: Number(a.returnVisitors),
+        percentage: Number(a.percentage),
+      };
+    });
+  });
+}
diff --git a/queries/analytics/sessions/createSession.ts b/src/queries/analytics/sessions/createSession.ts
similarity index 89%
rename from queries/analytics/sessions/createSession.ts
rename to src/queries/analytics/sessions/createSession.ts
index 4fd36d2e0..65dbd7948 100644
--- a/queries/analytics/sessions/createSession.ts
+++ b/src/queries/analytics/sessions/createSession.ts
@@ -30,7 +30,7 @@ export async function createSession(data: Prisma.SessionCreateInput) {
         screen,
         language,
         country,
-        subdivision1: country && subdivision1 ? `${country}-${subdivision1}` : null,
+        subdivision1,
         subdivision2,
         city,
       },
diff --git a/queries/analytics/sessions/getSession.ts b/src/queries/analytics/sessions/getSession.ts
similarity index 100%
rename from queries/analytics/sessions/getSession.ts
rename to src/queries/analytics/sessions/getSession.ts
diff --git a/src/queries/analytics/sessions/getSessionMetrics.ts b/src/queries/analytics/sessions/getSessionMetrics.ts
new file mode 100644
index 000000000..c6877a3f1
--- /dev/null
+++ b/src/queries/analytics/sessions/getSessionMetrics.ts
@@ -0,0 +1,90 @@
+import prisma from 'lib/prisma';
+import clickhouse from 'lib/clickhouse';
+import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
+import { EVENT_TYPE, SESSION_COLUMNS } from 'lib/constants';
+import { QueryFilters } from 'lib/types';
+
+export async function getSessionMetrics(
+  ...args: [websiteId: string, column: string, filters: QueryFilters, limit?: number]
+) {
+  return runQuery({
+    [PRISMA]: () => relationalQuery(...args),
+    [CLICKHOUSE]: () => clickhouseQuery(...args),
+  });
+}
+
+async function relationalQuery(
+  websiteId: string,
+  column: string,
+  filters: QueryFilters,
+  limit: number = 100,
+) {
+  const { parseFilters, rawQuery } = prisma;
+  const { filterQuery, joinSession, params } = await parseFilters(
+    websiteId,
+    {
+      ...filters,
+      eventType: EVENT_TYPE.pageView,
+    },
+    {
+      joinSession: SESSION_COLUMNS.includes(column),
+    },
+  );
+  const includeCountry = column === 'city' || column === 'subdivision1';
+
+  return rawQuery(
+    `
+    select 
+      ${column} x,
+      count(distinct website_event.session_id) y
+      ${includeCountry ? ', country' : ''}
+    from website_event
+    ${joinSession}
+    where website_event.website_id = {{websiteId::uuid}}
+      and website_event.created_at between {{startDate}} and {{endDate}}
+      and website_event.event_type = {{eventType}}
+    ${filterQuery}
+    group by 1 
+    ${includeCountry ? ', 3' : ''}
+    order by 2 desc
+    limit ${limit}`,
+    params,
+  );
+}
+
+async function clickhouseQuery(
+  websiteId: string,
+  column: string,
+  filters: QueryFilters,
+  limit: number = 100,
+): Promise<{ x: string; y: number }[]> {
+  const { parseFilters, rawQuery } = clickhouse;
+  const { filterQuery, params } = await parseFilters(websiteId, {
+    ...filters,
+    eventType: EVENT_TYPE.pageView,
+  });
+  const includeCountry = column === 'city' || column === 'subdivision1';
+
+  return rawQuery(
+    `
+    select
+      ${column} x,
+      count(distinct session_id) y
+      ${includeCountry ? ', country' : ''}
+    from website_event
+    where website_id = {websiteId:UUID}
+      and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+      and event_type = {eventType:UInt32}
+      ${filterQuery}
+    group by x 
+    ${includeCountry ? ', country' : ''}
+    order by y desc
+    limit ${limit}
+    `,
+    params,
+  ).then(a => {
+    return Object.values(a).map(a => {
+      return { x: a.x, y: Number(a.y), country: a.country };
+    });
+  });
+}
diff --git a/src/queries/analytics/sessions/getSessionStats.ts b/src/queries/analytics/sessions/getSessionStats.ts
new file mode 100644
index 000000000..c977187df
--- /dev/null
+++ b/src/queries/analytics/sessions/getSessionStats.ts
@@ -0,0 +1,74 @@
+import clickhouse from 'lib/clickhouse';
+import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
+import prisma from 'lib/prisma';
+import { EVENT_TYPE } from 'lib/constants';
+import { QueryFilters } from 'lib/types';
+
+export async function getSessionStats(...args: [websiteId: string, filters: QueryFilters]) {
+  return runQuery({
+    [PRISMA]: () => relationalQuery(...args),
+    [CLICKHOUSE]: () => clickhouseQuery(...args),
+  });
+}
+
+async function relationalQuery(websiteId: string, filters: QueryFilters) {
+  const { timezone = 'utc', unit = 'day' } = filters;
+  const { getDateQuery, parseFilters, rawQuery } = prisma;
+  const { filterQuery, joinSession, params } = await parseFilters(websiteId, {
+    ...filters,
+    eventType: EVENT_TYPE.pageView,
+  });
+
+  return rawQuery(
+    `
+    select
+      ${getDateQuery('website_event.created_at', unit, timezone)} x,
+      count(distinct website_event.session_id) y
+    from website_event
+      ${joinSession}
+    where website_event.website_id = {{websiteId::uuid}}
+      and website_event.created_at between {{startDate}} and {{endDate}}
+      and event_type = {{eventType}}
+      ${filterQuery}
+    group by 1
+    `,
+    params,
+  );
+}
+
+async function clickhouseQuery(
+  websiteId: string,
+  filters: QueryFilters,
+): Promise<{ x: string; y: number }[]> {
+  const { timezone = 'UTC', unit = 'day' } = filters;
+  const { parseFilters, rawQuery, getDateStringQuery, getDateQuery } = clickhouse;
+  const { filterQuery, params } = await parseFilters(websiteId, {
+    ...filters,
+    eventType: EVENT_TYPE.pageView,
+  });
+
+  return rawQuery(
+    `
+    select
+      ${getDateStringQuery('g.t', unit)} as x, 
+      g.y as y
+    from (
+      select 
+        ${getDateQuery('created_at', unit, timezone)} as t,
+        count(distinct session_id) as y
+      from website_event
+      where website_id = {websiteId:UUID}
+        and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+        and event_type = {eventType:UInt32}
+        ${filterQuery}
+      group by t
+    ) as g
+    order by t
+    `,
+    params,
+  ).then(a => {
+    return Object.values(a).map(a => {
+      return { x: a.x, y: Number(a.y) };
+    });
+  });
+}
diff --git a/queries/analytics/sessions/getSessions.ts b/src/queries/analytics/sessions/getSessions.ts
similarity index 89%
rename from queries/analytics/sessions/getSessions.ts
rename to src/queries/analytics/sessions/getSessions.ts
index 6936f902e..b92e3af99 100644
--- a/queries/analytics/sessions/getSessions.ts
+++ b/src/queries/analytics/sessions/getSessions.ts
@@ -17,6 +17,9 @@ async function relationalQuery(websiteId: string, startDate: Date) {
         gte: startDate,
       },
     },
+    orderBy: {
+      createdAt: 'asc',
+    },
   });
 }
 
@@ -25,7 +28,7 @@ async function clickhouseQuery(websiteId: string, startDate: Date) {
 
   return rawQuery(
     `
-    select distinct
+    select
       session_id as id,
       website_id as websiteId,
       created_at as createdAt,
@@ -42,7 +45,8 @@ async function clickhouseQuery(websiteId: string, startDate: Date) {
       city
     from website_event
     where website_id = {websiteId:UUID}
-    and created_at >= {startDate:DateTime}
+    and created_at >= {startDate:DateTime64}
+    order by created_at asc
     `,
     {
       websiteId,
diff --git a/queries/analytics/sessions/saveSessionData.ts b/src/queries/analytics/sessions/saveSessionData.ts
similarity index 100%
rename from queries/analytics/sessions/saveSessionData.ts
rename to src/queries/analytics/sessions/saveSessionData.ts
diff --git a/queries/index.js b/src/queries/index.js
similarity index 72%
rename from queries/index.js
rename to src/queries/index.js
index f509e0392..452d85a64 100644
--- a/queries/index.js
+++ b/src/queries/index.js
@@ -9,9 +9,11 @@ export * from './analytics/events/getEventUsage';
 export * from './analytics/events/getEvents';
 export * from './analytics/eventData/getEventDataEvents';
 export * from './analytics/eventData/getEventDataFields';
+export * from './analytics/eventData/getEventDataStats';
 export * from './analytics/eventData/getEventDataUsage';
 export * from './analytics/events/saveEvent';
 export * from './analytics/reports/getFunnel';
+export * from './analytics/reports/getRetention';
 export * from './analytics/reports/getInsights';
 export * from './analytics/pageviews/getPageviewMetrics';
 export * from './analytics/pageviews/getPageviewStats';
@@ -19,8 +21,10 @@ export * from './analytics/sessions/createSession';
 export * from './analytics/sessions/getSession';
 export * from './analytics/sessions/getSessionMetrics';
 export * from './analytics/sessions/getSessions';
+export * from './analytics/sessions/getSessionStats';
 export * from './analytics/sessions/saveSessionData';
-export * from './analytics/stats/getActiveVisitors';
-export * from './analytics/stats/getRealtimeData';
-export * from './analytics/stats/getWebsiteDateRange';
-export * from './analytics/stats/getWebsiteStats';
+export * from './analytics/getActiveVisitors';
+export * from './analytics/getRealtimeData';
+export * from './analytics/getValues';
+export * from './analytics/getWebsiteDateRange';
+export * from './analytics/getWebsiteStats';
diff --git a/store/app.js b/src/store/app.ts
similarity index 100%
rename from store/app.js
rename to src/store/app.ts
diff --git a/src/store/cache.ts b/src/store/cache.ts
new file mode 100644
index 000000000..b0ef4b813
--- /dev/null
+++ b/src/store/cache.ts
@@ -0,0 +1,9 @@
+import { create } from 'zustand';
+
+const store = create(() => ({}));
+
+export function setValue(key, value) {
+  store.setState({ [key]: value });
+}
+
+export default store;
diff --git a/store/dashboard.js b/src/store/dashboard.ts
similarity index 100%
rename from store/dashboard.js
rename to src/store/dashboard.ts
diff --git a/store/version.js b/src/store/version.ts
similarity index 97%
rename from store/version.js
rename to src/store/version.ts
index c232c7fa5..3b5afaac5 100644
--- a/store/version.js
+++ b/src/store/version.ts
@@ -1,5 +1,5 @@
 import { create } from 'zustand';
-import produce from 'immer';
+import { produce } from 'immer';
 import semver from 'semver';
 import { CURRENT_VERSION, VERSION_CHECK, UPDATES_URL } from 'lib/constants';
 import { getItem } from 'next-basics';
diff --git a/store/websites.ts b/src/store/websites.ts
similarity index 77%
rename from store/websites.ts
rename to src/store/websites.ts
index 0d210af6d..a9f6b44da 100644
--- a/store/websites.ts
+++ b/src/store/websites.ts
@@ -1,13 +1,9 @@
 import { create } from 'zustand';
-import produce from 'immer';
+import { produce } from 'immer';
 import { DateRange } from 'lib/types';
 
 const store = create(() => ({}));
 
-export function getWebsiteDateRange(websiteId: string) {
-  return store.getState()?.[websiteId];
-}
-
 export function setWebsiteDateRange(websiteId: string, dateRange: DateRange) {
   store.setState(
     produce(state => {
diff --git a/styles/index.css b/src/styles/index.css
similarity index 100%
rename from styles/index.css
rename to src/styles/index.css
diff --git a/styles/locale.css b/src/styles/locale.css
similarity index 100%
rename from styles/locale.css
rename to src/styles/locale.css
diff --git a/styles/variables.css b/src/styles/variables.css
similarity index 91%
rename from styles/variables.css
rename to src/styles/variables.css
index 726195d2a..686fac849 100644
--- a/styles/variables.css
+++ b/src/styles/variables.css
@@ -1,4 +1,4 @@
-:root {
+html body {
   --primary400: var(--blue800);
   --primary500: var(--blue900);
   --primary600: var(--blue1000);
diff --git a/tracker/index.d.ts b/src/tracker/index.d.ts
similarity index 100%
rename from tracker/index.d.ts
rename to src/tracker/index.d.ts
diff --git a/tracker/index.js b/src/tracker/index.js
similarity index 97%
rename from tracker/index.js
rename to src/tracker/index.js
index 1686df429..d5278b21f 100644
--- a/tracker/index.js
+++ b/src/tracker/index.js
@@ -43,10 +43,11 @@
   };
 
   const getPath = url => {
-    if (url.substring(0, 4) === 'http') {
-      return '/' + url.split('/').splice(3).join('/');
+    try {
+      return new URL(url).pathname;
+    } catch (e) {
+      return url;
     }
-    return url;
   };
 
   const getPayload = () => ({
@@ -187,7 +188,8 @@
       headers,
     })
       .then(res => res.text())
-      .then(text => (cache = text));
+      .then(text => (cache = text))
+      .catch(() => {}); // no-op, gulp error
   };
 
   const track = (obj, data) => {
diff --git a/store/queries.js b/store/queries.js
deleted file mode 100644
index 1de2f04bb..000000000
--- a/store/queries.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { create } from 'zustand';
-
-const store = create(() => ({}));
-
-export function saveQuery(key, data) {
-  store.setState({ [key]: data });
-}
-
-export function getQuery(key) {
-  return store.getState()[key];
-}
-
-export default store;
diff --git a/tsconfig.json b/tsconfig.json
index b022d603e..390c8b138 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,12 +1,11 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "es2021",
     "outDir": "./build",
     "module": "esnext",
     "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "incremental": true,
     "lib": ["dom", "dom.iterable", "esnext"],
     "skipLibCheck": true,
     "esModuleInterop": true,
@@ -18,11 +17,27 @@
     "forceConsistentCasingInFileNames": true,
     "allowJs": true,
     "strict": true,
-    "baseUrl": ".",
     "strictNullChecks": false,
     "noEmit": true,
-    "jsx": "preserve"
+    "jsx": "preserve",
+    "incremental": false,
+    "baseUrl": "./src",
+    "paths": {
+      "react": ["./node_modules/@types/react"],
+      "assets/*": ["./assets/*"],
+      "components/*": ["./components/*"],
+      "lib/*": ["./lib/*"],
+      "pages/*": ["./pages/*"],
+      "queries/*": ["./queries/*"],
+      "store/*": ["./store/*"],
+      "styles/*": ["./styles/*"]
+    },
+    "plugins": [
+      {
+        "name": "next"
+      }
+    ]
   },
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
+  "include": ["**/*.ts", "**/*.tsx", "**/*.js", "**/*.jsx", "next-env.d.ts", ".next/types/**/*.ts"],
   "exclude": ["node_modules"]
 }
diff --git a/yarn.lock b/yarn.lock
index 275bcd631..b24830a3c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9,909 +9,879 @@
 
 "@ampproject/remapping@^2.2.0":
   version "2.2.1"
-  resolved "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630"
   integrity sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==
   dependencies:
     "@jridgewell/gen-mapping" "^0.3.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz"
-  integrity sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.22.13", "@babel/code-frame@^7.22.5":
+  version "7.22.13"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.13.tgz#e3c1c099402598483b7a8c46a721d1038803755e"
+  integrity sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==
   dependencies:
-    "@babel/highlight" "^7.22.5"
+    "@babel/highlight" "^7.22.13"
+    chalk "^2.4.2"
 
-"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.21.4", "@babel/compat-data@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.5.tgz"
-  integrity sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA==
+"@babel/compat-data@^7.22.6", "@babel/compat-data@^7.22.9", "@babel/compat-data@^7.23.2":
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.2.tgz#6a12ced93455827037bfb5ed8492820d60fc32cc"
+  integrity sha512-0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ==
 
-"@babel/core@^7.19.6", "@babel/core@^7.21.3", "@babel/core@^7.9.0":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/core/-/core-7.22.5.tgz"
-  integrity sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg==
+"@babel/core@^7.21.3", "@babel/core@^7.9.0":
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.2.tgz#ed10df0d580fff67c5f3ee70fd22e2e4c90a9f94"
+  integrity sha512-n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
-    "@babel/code-frame" "^7.22.5"
-    "@babel/generator" "^7.22.5"
-    "@babel/helper-compilation-targets" "^7.22.5"
-    "@babel/helper-module-transforms" "^7.22.5"
-    "@babel/helpers" "^7.22.5"
-    "@babel/parser" "^7.22.5"
-    "@babel/template" "^7.22.5"
-    "@babel/traverse" "^7.22.5"
-    "@babel/types" "^7.22.5"
-    convert-source-map "^1.7.0"
+    "@babel/code-frame" "^7.22.13"
+    "@babel/generator" "^7.23.0"
+    "@babel/helper-compilation-targets" "^7.22.15"
+    "@babel/helper-module-transforms" "^7.23.0"
+    "@babel/helpers" "^7.23.2"
+    "@babel/parser" "^7.23.0"
+    "@babel/template" "^7.22.15"
+    "@babel/traverse" "^7.23.2"
+    "@babel/types" "^7.23.0"
+    convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
-    json5 "^2.2.2"
-    semver "^6.3.0"
+    json5 "^2.2.3"
+    semver "^6.3.1"
 
-"@babel/generator@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.22.5.tgz"
-  integrity sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA==
+"@babel/generator@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.0.tgz#df5c386e2218be505b34837acbcb874d7a983420"
+  integrity sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/types" "^7.23.0"
     "@jridgewell/gen-mapping" "^0.3.2"
     "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
 
-"@babel/helper-annotate-as-pure@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz"
-  integrity sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.18.6":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz"
-  integrity sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==
-  dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.18.6"
-    "@babel/types" "^7.18.9"
-
-"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.21.4", "@babel/helper-compilation-targets@^7.22.5":
+"@babel/helper-annotate-as-pure@^7.22.5":
   version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.5.tgz"
-  integrity sha512-Ji+ywpHeuqxB8WDxraCiqR0xfhYjiDE/e6k7FuIaANnoOFxAHskHChz4vA1mJC9Lbm01s1PVAGhQY4FUKSkGZw==
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882"
+  integrity sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==
   dependencies:
-    "@babel/compat-data" "^7.22.5"
-    "@babel/helper-validator-option" "^7.22.5"
-    browserslist "^4.21.3"
+    "@babel/types" "^7.22.5"
+
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.22.5":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz#5426b109cf3ad47b91120f8328d8ab1be8b0b956"
+  integrity sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==
+  dependencies:
+    "@babel/types" "^7.22.15"
+
+"@babel/helper-compilation-targets@^7.22.15", "@babel/helper-compilation-targets@^7.22.5", "@babel/helper-compilation-targets@^7.22.6":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz#0698fc44551a26cf29f18d4662d5bf545a6cfc52"
+  integrity sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==
+  dependencies:
+    "@babel/compat-data" "^7.22.9"
+    "@babel/helper-validator-option" "^7.22.15"
+    browserslist "^4.21.9"
     lru-cache "^5.1.1"
-    semver "^6.3.0"
+    semver "^6.3.1"
 
-"@babel/helper-create-class-features-plugin@^7.18.6":
-  version "7.19.0"
-  resolved "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz"
-  integrity sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw==
+"@babel/helper-create-class-features-plugin@^7.22.11", "@babel/helper-create-class-features-plugin@^7.22.15", "@babel/helper-create-class-features-plugin@^7.22.5":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.15.tgz#97a61b385e57fe458496fad19f8e63b63c867de4"
+  integrity sha512-jKkwA59IXcvSaiK2UN45kKwSC9o+KuoXsBDvHvU/7BecYIp8GQ2UwrVvFgJASUT+hBnwJx6MhvMCuMzwZZ7jlg==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.19.0"
-    "@babel/helper-member-expression-to-functions" "^7.18.9"
-    "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/helper-replace-supers" "^7.18.9"
-    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/helper-member-expression-to-functions" "^7.22.15"
+    "@babel/helper-optimise-call-expression" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.9"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    semver "^6.3.1"
 
-"@babel/helper-create-class-features-plugin@^7.21.0":
-  version "7.21.4"
-  resolved "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.4.tgz"
-  integrity sha512-46QrX2CQlaFRF4TkwfTt6nJD7IHq8539cCL7SDpqWSDeJKY1xylKKY5F/33mJhLZ3mFvKv2gGrVS6NkyF6qs+Q==
+"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.22.5":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz#5ee90093914ea09639b01c711db0d6775e558be1"
+  integrity sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.21.0"
-    "@babel/helper-member-expression-to-functions" "^7.21.0"
-    "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/helper-replace-supers" "^7.20.7"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-
-"@babel/helper-create-regexp-features-plugin@^7.18.6":
-  version "7.19.0"
-  resolved "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz"
-  integrity sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    regexpu-core "^5.1.0"
-
-"@babel/helper-create-regexp-features-plugin@^7.20.5":
-  version "7.21.4"
-  resolved "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.4.tgz"
-  integrity sha512-M00OuhU+0GyZ5iBBN9czjugzWrEq2vDpf/zCYHxxf93ul/Q5rv+a5h+/+0WnI1AebHNVtl5bFV0qsJoH23DbfA==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-annotate-as-pure" "^7.22.5"
     regexpu-core "^5.3.1"
+    semver "^6.3.1"
 
-"@babel/helper-define-polyfill-provider@^0.3.3":
-  version "0.3.3"
-  resolved "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz"
-  integrity sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==
+"@babel/helper-define-polyfill-provider@^0.4.3":
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.3.tgz#a71c10f7146d809f4a256c373f462d9bba8cf6ba"
+  integrity sha512-WBrLmuPP47n7PNwsZ57pqam6G/RGo1vw/87b0Blc53tZNGZ4x7YvZ6HgQe2vo1W/FR20OgjeZuGXzudPiXHFug==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.17.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-compilation-targets" "^7.22.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
     debug "^4.1.1"
     lodash.debounce "^4.0.8"
     resolve "^1.14.2"
-    semver "^6.1.2"
 
-"@babel/helper-environment-visitor@^7.18.9", "@babel/helper-environment-visitor@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz"
-  integrity sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==
+"@babel/helper-environment-visitor@^7.22.20", "@babel/helper-environment-visitor@^7.22.5":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167"
+  integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
 
-"@babel/helper-explode-assignable-expression@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz"
-  integrity sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==
+"@babel/helper-function-name@^7.22.5", "@babel/helper-function-name@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759"
+  integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==
   dependencies:
-    "@babel/types" "^7.18.6"
+    "@babel/template" "^7.22.15"
+    "@babel/types" "^7.23.0"
 
-"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0", "@babel/helper-function-name@^7.21.0", "@babel/helper-function-name@^7.22.5":
+"@babel/helper-hoist-variables@^7.22.5":
   version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz"
-  integrity sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==
-  dependencies:
-    "@babel/template" "^7.22.5"
-    "@babel/types" "^7.22.5"
-
-"@babel/helper-hoist-variables@^7.18.6", "@babel/helper-hoist-variables@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb"
   integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-member-expression-to-functions@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz"
-  integrity sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==
+"@babel/helper-member-expression-to-functions@^7.22.15":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz#9263e88cc5e41d39ec18c9a3e0eced59a3e7d366"
+  integrity sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==
   dependencies:
-    "@babel/types" "^7.18.9"
+    "@babel/types" "^7.23.0"
 
-"@babel/helper-member-expression-to-functions@^7.20.7", "@babel/helper-member-expression-to-functions@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.0.tgz"
-  integrity sha512-Muu8cdZwNN6mRRNG6lAYErJ5X3bRevgYR2O8wN0yn7jJSnGDu6eG59RfT29JHxGUovyfrh6Pj0XzmR7drNVL3Q==
+"@babel/helper-module-imports@^7.22.15", "@babel/helper-module-imports@^7.22.5":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz#16146307acdc40cc00c3b2c647713076464bdbf0"
+  integrity sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==
   dependencies:
-    "@babel/types" "^7.21.0"
+    "@babel/types" "^7.22.15"
 
-"@babel/helper-module-imports@^7.18.6", "@babel/helper-module-imports@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz"
-  integrity sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==
+"@babel/helper-module-transforms@^7.22.5", "@babel/helper-module-transforms@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz#3ec246457f6c842c0aee62a01f60739906f7047e"
+  integrity sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw==
   dependencies:
-    "@babel/types" "^7.22.5"
-
-"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.20.11", "@babel/helper-module-transforms@^7.21.2", "@babel/helper-module-transforms@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz"
-  integrity sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.22.5"
-    "@babel/helper-module-imports" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-module-imports" "^7.22.15"
     "@babel/helper-simple-access" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.5"
-    "@babel/helper-validator-identifier" "^7.22.5"
-    "@babel/template" "^7.22.5"
-    "@babel/traverse" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/helper-validator-identifier" "^7.22.20"
+
+"@babel/helper-optimise-call-expression@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz#f21531a9ccbff644fdd156b4077c16ff0c3f609e"
+  integrity sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==
+  dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-optimise-call-expression@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz"
-  integrity sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295"
   integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==
 
-"@babel/helper-remap-async-to-generator@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz"
-  integrity sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==
+"@babel/helper-remap-async-to-generator@^7.22.20", "@babel/helper-remap-async-to-generator@^7.22.5":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz#7b68e1cb4fa964d2996fd063723fb48eca8498e0"
+  integrity sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-wrap-function" "^7.18.9"
-    "@babel/types" "^7.18.9"
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-wrap-function" "^7.22.20"
 
-"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.18.9":
-  version "7.19.1"
-  resolved "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz"
-  integrity sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==
+"@babel/helper-replace-supers@^7.22.5", "@babel/helper-replace-supers@^7.22.9":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz#e37d367123ca98fe455a9887734ed2e16eb7a793"
+  integrity sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-member-expression-to-functions" "^7.18.9"
-    "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/traverse" "^7.19.1"
-    "@babel/types" "^7.19.0"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-member-expression-to-functions" "^7.22.15"
+    "@babel/helper-optimise-call-expression" "^7.22.5"
 
-"@babel/helper-replace-supers@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz"
-  integrity sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-member-expression-to-functions" "^7.20.7"
-    "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.20.7"
-    "@babel/types" "^7.20.7"
-
-"@babel/helper-simple-access@^7.20.2", "@babel/helper-simple-access@^7.22.5":
+"@babel/helper-simple-access@^7.22.5":
   version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de"
   integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-skip-transparent-expression-wrappers@^7.20.0":
-  version "7.20.0"
-  resolved "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz"
-  integrity sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==
-  dependencies:
-    "@babel/types" "^7.20.0"
-
-"@babel/helper-split-export-declaration@^7.18.6", "@babel/helper-split-export-declaration@^7.22.5":
+"@babel/helper-skip-transparent-expression-wrappers@^7.22.5":
   version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.5.tgz"
-  integrity sha512-thqK5QFghPKWLhAV321lxF95yCg2K3Ob5yw+M3VHWfdia0IkPXUtoLH8x/6Fh486QUvzhb8YOWHChTVen2/PoQ==
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz#007f15240b5751c537c40e77abb4e89eeaaa8847"
+  integrity sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
+"@babel/helper-split-export-declaration@^7.22.6":
+  version "7.22.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
+  integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
   dependencies:
     "@babel/types" "^7.22.5"
 
 "@babel/helper-string-parser@^7.22.5":
   version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f"
   integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
 
-"@babel/helper-validator-identifier@^7.19.1", "@babel/helper-validator-identifier@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz"
-  integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==
+"@babel/helper-validator-identifier@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
+  integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
 
-"@babel/helper-validator-option@^7.18.6", "@babel/helper-validator-option@^7.21.0", "@babel/helper-validator-option@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz"
-  integrity sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==
+"@babel/helper-validator-option@^7.22.15":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz#694c30dfa1d09a6534cdfcafbe56789d36aba040"
+  integrity sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==
 
-"@babel/helper-wrap-function@^7.18.9":
-  version "7.19.0"
-  resolved "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz"
-  integrity sha512-txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg==
+"@babel/helper-wrap-function@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz#15352b0b9bfb10fc9c76f79f6342c00e3411a569"
+  integrity sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==
   dependencies:
-    "@babel/helper-function-name" "^7.19.0"
-    "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.19.0"
-    "@babel/types" "^7.19.0"
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/template" "^7.22.15"
+    "@babel/types" "^7.22.19"
 
-"@babel/helpers@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.5.tgz"
-  integrity sha512-pSXRmfE1vzcUIDFQcSGA5Mr+GxBV9oiRKDuDxXvWQQBCh8HoIjs/2DlDB7H8smac1IVrB9/xdXj2N3Wol9Cr+Q==
+"@babel/helpers@^7.23.2":
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.2.tgz#2832549a6e37d484286e15ba36a5330483cac767"
+  integrity sha512-lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ==
   dependencies:
-    "@babel/template" "^7.22.5"
-    "@babel/traverse" "^7.22.5"
-    "@babel/types" "^7.22.5"
+    "@babel/template" "^7.22.15"
+    "@babel/traverse" "^7.23.2"
+    "@babel/types" "^7.23.0"
 
-"@babel/highlight@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.5.tgz#aa6c05c5407a67ebce408162b7ede789b4d22031"
-  integrity sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==
+"@babel/highlight@^7.22.13":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.20.tgz#4ca92b71d80554b01427815e06f2df965b9c1f54"
+  integrity sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.22.5"
-    chalk "^2.0.0"
+    "@babel/helper-validator-identifier" "^7.22.20"
+    chalk "^2.4.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.16.4", "@babel/parser@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.22.5.tgz"
-  integrity sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q==
+"@babel/parser@^7.1.0", "@babel/parser@^7.20.15", "@babel/parser@^7.20.7", "@babel/parser@^7.21.3", "@babel/parser@^7.22.15", "@babel/parser@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719"
+  integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz"
-  integrity sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.22.15":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15.tgz#02dc8a03f613ed5fdc29fb2f728397c78146c962"
+  integrity sha512-FB9iYlz7rURmRJyXRKEnalYPPdn87H5no108cyuQQyMwlpJ2SJtpIUBI27kdTin956pz+LPypkPVPUTlxOmrsg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7.tgz"
-  integrity sha512-sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ==
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.22.15":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.15.tgz#2aeb91d337d4e1a1e7ce85b76a37f5301781200f"
+  integrity sha512-Hyph9LseGvAeeXzikV88bczhsrLrIZqDPxO+sSmAunMPaGrBGhfMWzCPYTtiW9t+HzSE2wtV8e5cc5P6r1xMDQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
-    "@babel/plugin-proposal-optional-chaining" "^7.20.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    "@babel/plugin-transform-optional-chaining" "^7.22.15"
 
-"@babel/plugin-proposal-async-generator-functions@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz"
-  integrity sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-remap-async-to-generator" "^7.18.9"
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
-
-"@babel/plugin-proposal-class-properties@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz"
-  integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-proposal-class-static-block@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.21.0.tgz"
-  integrity sha512-XP5G9MWNUskFuP30IfFSEFB0Z6HzLIUcjYM4bYOPHXl7eiJ9HFv8tWj6TXTN5QODiEhDZAeI4hLok2iHFFV4hw==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.21.0"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/plugin-syntax-class-static-block" "^7.14.5"
-
-"@babel/plugin-proposal-dynamic-import@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz"
-  integrity sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
-
-"@babel/plugin-proposal-export-namespace-from@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz"
-  integrity sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
-    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-
-"@babel/plugin-proposal-json-strings@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz"
-  integrity sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-json-strings" "^7.8.3"
-
-"@babel/plugin-proposal-logical-assignment-operators@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz"
-  integrity sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
-
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz"
-  integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
-
-"@babel/plugin-proposal-numeric-separator@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz"
-  integrity sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
-
-"@babel/plugin-proposal-object-rest-spread@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz"
-  integrity sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==
-  dependencies:
-    "@babel/compat-data" "^7.20.5"
-    "@babel/helper-compilation-targets" "^7.20.7"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.20.7"
-
-"@babel/plugin-proposal-optional-catch-binding@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz"
-  integrity sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
-
-"@babel/plugin-proposal-optional-chaining@^7.20.7", "@babel/plugin-proposal-optional-chaining@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz"
-  integrity sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
-
-"@babel/plugin-proposal-private-methods@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz"
-  integrity sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-proposal-private-property-in-object@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0.tgz"
-  integrity sha512-ha4zfehbJjc5MmXBlHec1igel5TJXXLDDRbuJ4+XT2TJcyD9/V1919BA8gMvsdHcNMBy4WBUBiRb3nw/EQUtBw==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-create-class-features-plugin" "^7.21.0"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
-
-"@babel/plugin-proposal-unicode-property-regex@^7.18.6", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz"
-  integrity sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
+"@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2":
+  version "7.21.0-placeholder-for-preset-env.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz#7844f9289546efa9febac2de4cfe358a050bd703"
+  integrity sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==
 
 "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
   integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-class-properties@^7.12.13":
   version "7.12.13"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
   integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
 "@babel/plugin-syntax-class-static-block@^7.14.5":
   version "7.14.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406"
   integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-syntax-dynamic-import@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
   integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-export-namespace-from@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a"
   integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-syntax-import-assertions@^7.20.0":
-  version "7.20.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz"
-  integrity sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==
+"@babel/plugin-syntax-import-assertions@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz#07d252e2aa0bc6125567f742cd58619cb14dce98"
+  integrity sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.19.0"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-syntax-import-attributes@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz#ab840248d834410b829f569f5262b9e517555ecb"
+  integrity sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-syntax-import-meta@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51"
+  integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-json-strings@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
   integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-jsx@^7.18.6", "@babel/plugin-syntax-jsx@^7.21.4":
-  version "7.21.4"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.21.4.tgz"
-  integrity sha512-5hewiLct5OKyh6PLKEYaFclcqtIgCb6bmELouxjF6up5q3Sov7rOayW4RwhbaBL0dit8rA80GNfY+UuDp2mBbQ==
+"@babel/plugin-syntax-jsx@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz#a6b68e84fb76e759fc3b93e901876ffabbe1d918"
+  integrity sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-syntax-logical-assignment-operators@^7.10.4":
   version "7.10.4"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
   integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
   integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-numeric-separator@^7.10.4":
   version "7.10.4"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
   integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-object-rest-spread@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
   integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-optional-catch-binding@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
   integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-optional-chaining@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
   integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-private-property-in-object@^7.14.5":
   version "7.14.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad"
   integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-syntax-top-level-await@^7.14.5":
   version "7.14.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
   integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-typescript@^7.20.0":
-  version "7.20.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz"
-  integrity sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==
+"@babel/plugin-syntax-typescript@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz#aac8d383b062c5072c647a31ef990c1d0af90272"
+  integrity sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.19.0"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-arrow-functions@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.20.7.tgz"
-  integrity sha512-3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-
-"@babel/plugin-transform-async-to-generator@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz"
-  integrity sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q==
-  dependencies:
-    "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-remap-async-to-generator" "^7.18.9"
-
-"@babel/plugin-transform-block-scoped-functions@^7.18.6":
+"@babel/plugin-syntax-unicode-sets-regex@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz"
-  integrity sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz#d49a3b3e6b52e5be6740022317580234a6a47357"
+  integrity sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==
   dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-block-scoping@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.21.0.tgz"
-  integrity sha512-Mdrbunoh9SxwFZapeHVrwFmri16+oYotcZysSzhNIVDwIAb1UV+kvnxULSYq9J3/q5MDG+4X6w8QVgD1zhBXNQ==
+"@babel/plugin-transform-arrow-functions@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz#e5ba566d0c58a5b2ba2a8b795450641950b71958"
+  integrity sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-classes@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.21.0.tgz"
-  integrity sha512-RZhbYTCEUAe6ntPehC4hlslPWosNHDox+vAs4On/mCLRLfoDVHf6hVEd7kuxr1RnHwJmxFfUM3cZiZRmPxJPXQ==
+"@babel/plugin-transform-async-generator-functions@^7.23.2":
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.2.tgz#054afe290d64c6f576f371ccc321772c8ea87ebb"
+  integrity sha512-BBYVGxbDVHfoeXbOwcagAkOQAm9NxoTdMGfTqghu1GrvadSaw6iW3Je6IcL5PNOw8VwjxqBECXy50/iCQSY/lQ==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-compilation-targets" "^7.20.7"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.21.0"
-    "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-replace-supers" "^7.20.7"
-    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-remap-async-to-generator" "^7.22.20"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+
+"@babel/plugin-transform-async-to-generator@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz#c7a85f44e46f8952f6d27fe57c2ed3cc084c3775"
+  integrity sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==
+  dependencies:
+    "@babel/helper-module-imports" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-remap-async-to-generator" "^7.22.5"
+
+"@babel/plugin-transform-block-scoped-functions@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz#27978075bfaeb9fa586d3cb63a3d30c1de580024"
+  integrity sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-block-scoping@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.0.tgz#8744d02c6c264d82e1a4bc5d2d501fd8aff6f022"
+  integrity sha512-cOsrbmIOXmf+5YbL99/S49Y3j46k/T16b9ml8bm9lP6N9US5iQ2yBK7gpui1pg0V/WMcXdkfKbTb7HXq9u+v4g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-class-properties@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz#97a56e31ad8c9dc06a0b3710ce7803d5a48cca77"
+  integrity sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-class-static-block@^7.22.11":
+  version "7.22.11"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.11.tgz#dc8cc6e498f55692ac6b4b89e56d87cec766c974"
+  integrity sha512-GMM8gGmqI7guS/llMFk1bJDkKfn3v3C4KHK9Yg1ey5qcHcOlKb0QvcMrgzvxo+T03/4szNh5lghY+fEC98Kq9g==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.22.11"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-class-static-block" "^7.14.5"
+
+"@babel/plugin-transform-classes@^7.22.15":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.15.tgz#aaf4753aee262a232bbc95451b4bdf9599c65a0b"
+  integrity sha512-VbbC3PGjBdE0wAWDdHM9G8Gm977pnYI0XpqMd6LrKISj8/DJXEsWqgRuTYaNE9Bv0JGhTZUzHDlMk18IpOuoqw==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-compilation-targets" "^7.22.15"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/helper-optimise-call-expression" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.9"
+    "@babel/helper-split-export-declaration" "^7.22.6"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.20.7.tgz"
-  integrity sha512-Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ==
+"@babel/plugin-transform-computed-properties@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz#cd1e994bf9f316bd1c2dafcd02063ec261bb3869"
+  integrity sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/template" "^7.20.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/template" "^7.22.5"
 
-"@babel/plugin-transform-destructuring@^7.21.3":
-  version "7.21.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.21.3.tgz"
-  integrity sha512-bp6hwMFzuiE4HqYEyoGJ/V2LeIWn+hLVKc4pnj++E5XQptwhtcGmSayM029d/j2X1bPKGTlsyPwAubuU22KhMA==
+"@babel/plugin-transform-destructuring@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.0.tgz#6447aa686be48b32eaf65a73e0e2c0bd010a266c"
+  integrity sha512-vaMdgNXFkYrB+8lbgniSYWHsgqK5gjaMNcc84bMIOMRLH0L9AqYq3hwMdvnyqj1OPqea8UtjPEuS/DCenah1wg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-dotall-regex@^7.18.6", "@babel/plugin-transform-dotall-regex@^7.4.4":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz"
-  integrity sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==
+"@babel/plugin-transform-dotall-regex@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz#dbb4f0e45766eb544e193fb00e65a1dd3b2a4165"
+  integrity sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-duplicate-keys@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz"
-  integrity sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==
+"@babel/plugin-transform-duplicate-keys@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz#b6e6428d9416f5f0bba19c70d1e6e7e0b88ab285"
+  integrity sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-exponentiation-operator@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz"
-  integrity sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==
+"@babel/plugin-transform-dynamic-import@^7.22.11":
+  version "7.22.11"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.11.tgz#2c7722d2a5c01839eaf31518c6ff96d408e447aa"
+  integrity sha512-g/21plo58sfteWjaO0ZNVb+uEOkJNjAaHhbejrnBmu011l/eNDScmkbjCC3l4FKb10ViaGU4aOkFznSu2zRHgA==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
-"@babel/plugin-transform-for-of@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.0.tgz"
-  integrity sha512-LlUYlydgDkKpIY7mcBWvyPPmMcOphEyYA27Ef4xpbh1IiDNLr0kZsos2nf92vz3IccvJI25QUwp86Eo5s6HmBQ==
+"@babel/plugin-transform-exponentiation-operator@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz#402432ad544a1f9a480da865fda26be653e48f6a"
+  integrity sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-function-name@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz"
-  integrity sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==
+"@babel/plugin-transform-export-namespace-from@^7.22.11":
+  version "7.22.11"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.11.tgz#b3c84c8f19880b6c7440108f8929caf6056db26c"
+  integrity sha512-xa7aad7q7OiT8oNZ1mU7NrISjlSkVdMbNxn9IuLZyL9AJEhs1Apba3I+u5riX1dIkdptP5EKDG5XDPByWxtehw==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.18.9"
-    "@babel/helper-function-name" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
-"@babel/plugin-transform-literals@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz"
-  integrity sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==
+"@babel/plugin-transform-for-of@^7.22.15":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.15.tgz#f64b4ccc3a4f131a996388fae7680b472b306b29"
+  integrity sha512-me6VGeHsx30+xh9fbDLLPi0J1HzmeIIyenoOQHuw2D4m2SAU3NrspX5XxJLBpqn5yrLzrlw2Iy3RA//Bx27iOA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-member-expression-literals@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz"
-  integrity sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==
+"@babel/plugin-transform-function-name@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz#935189af68b01898e0d6d99658db6b164205c143"
+  integrity sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-compilation-targets" "^7.22.5"
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-modules-amd@^7.20.11":
-  version "7.20.11"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.11.tgz"
-  integrity sha512-NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g==
+"@babel/plugin-transform-json-strings@^7.22.11":
+  version "7.22.11"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.11.tgz#689a34e1eed1928a40954e37f74509f48af67835"
+  integrity sha512-CxT5tCqpA9/jXFlme9xIBCc5RPtdDq3JpkkhgHQqtDdiTnTI0jtZ0QzXhr5DILeYifDPp2wvY2ad+7+hLMW5Pw==
   dependencies:
-    "@babel/helper-module-transforms" "^7.20.11"
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
 
-"@babel/plugin-transform-modules-commonjs@^7.21.2":
-  version "7.21.2"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.2.tgz"
-  integrity sha512-Cln+Yy04Gxua7iPdj6nOV96smLGjpElir5YwzF0LBPKoPlLDNJePNlrGGaybAJkd0zKRnOVXOgizSqPYMNYkzA==
+"@babel/plugin-transform-literals@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz#e9341f4b5a167952576e23db8d435849b1dd7920"
+  integrity sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==
   dependencies:
-    "@babel/helper-module-transforms" "^7.21.2"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-simple-access" "^7.20.2"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-modules-systemjs@^7.20.11":
-  version "7.20.11"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.20.11.tgz"
-  integrity sha512-vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw==
+"@babel/plugin-transform-logical-assignment-operators@^7.22.11":
+  version "7.22.11"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.11.tgz#24c522a61688bde045b7d9bc3c2597a4d948fc9c"
+  integrity sha512-qQwRTP4+6xFCDV5k7gZBF3C31K34ut0tbEcTKxlX/0KXxm9GLcO14p570aWxFvVzx6QAfPgq7gaeIHXJC8LswQ==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-module-transforms" "^7.20.11"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-validator-identifier" "^7.19.1"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
-"@babel/plugin-transform-modules-umd@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz"
-  integrity sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==
+"@babel/plugin-transform-member-expression-literals@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz#4fcc9050eded981a468347dd374539ed3e058def"
+  integrity sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==
   dependencies:
-    "@babel/helper-module-transforms" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.20.5":
-  version "7.20.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz"
-  integrity sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA==
+"@babel/plugin-transform-modules-amd@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.0.tgz#05b2bc43373faa6d30ca89214731f76f966f3b88"
+  integrity sha512-xWT5gefv2HGSm4QHtgc1sYPbseOyf+FFDo2JbpE25GWl5BqTGO9IMwTYJRoIdjsF85GE+VegHxSCUt5EvoYTAw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.20.5"
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-module-transforms" "^7.23.0"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-new-target@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz"
-  integrity sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==
+"@babel/plugin-transform-modules-commonjs@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.0.tgz#b3dba4757133b2762c00f4f94590cf6d52602481"
+  integrity sha512-32Xzss14/UVc7k9g775yMIvkVK8xwKE0DPdP5JTapr3+Z9w4tzeOuLNY6BXDQR6BdnzIlXnCGAzsk/ICHBLVWQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-module-transforms" "^7.23.0"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-simple-access" "^7.22.5"
 
-"@babel/plugin-transform-object-super@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz"
-  integrity sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==
+"@babel/plugin-transform-modules-systemjs@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.0.tgz#77591e126f3ff4132a40595a6cccd00a6b60d160"
+  integrity sha512-qBej6ctXZD2f+DhlOC9yO47yEYgUh5CZNz/aBoH4j/3NOlRfJXJbY7xDQCqQVf9KbrqGzIWER1f23doHGrIHFg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/helper-replace-supers" "^7.18.6"
+    "@babel/helper-hoist-variables" "^7.22.5"
+    "@babel/helper-module-transforms" "^7.23.0"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.20"
 
-"@babel/plugin-transform-parameters@^7.20.7", "@babel/plugin-transform-parameters@^7.21.3":
-  version "7.21.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.21.3.tgz"
-  integrity sha512-Wxc+TvppQG9xWFYatvCGPvZ6+SIUxQ2ZdiBP+PHYMIjnPXD+uThCshaz4NZOnODAtBjjcVQQ/3OKs9LW28purQ==
+"@babel/plugin-transform-modules-umd@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz#4694ae40a87b1745e3775b6a7fe96400315d4f98"
+  integrity sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-module-transforms" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-property-literals@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz"
-  integrity sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz#67fe18ee8ce02d57c855185e27e3dc959b2e991f"
+  integrity sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-react-constant-elements@^7.18.12", "@babel/plugin-transform-react-constant-elements@^7.21.3":
-  version "7.21.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.21.3.tgz"
-  integrity sha512-4DVcFeWe/yDYBLp0kBmOGFJ6N2UYg7coGid1gdxb4co62dy/xISDMaYBXBVXEDhfgMk7qkbcYiGtwd5Q/hwDDQ==
+"@babel/plugin-transform-new-target@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz#1b248acea54ce44ea06dfd37247ba089fcf9758d"
+  integrity sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-react-display-name@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.18.6.tgz"
-  integrity sha512-TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA==
+"@babel/plugin-transform-nullish-coalescing-operator@^7.22.11":
+  version "7.22.11"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.11.tgz#debef6c8ba795f5ac67cd861a81b744c5d38d9fc"
+  integrity sha512-YZWOw4HxXrotb5xsjMJUDlLgcDXSfO9eCmdl1bgW4+/lAGdkjaEvOnQ4p5WKKdUgSzO39dgPl0pTnfxm0OAXcg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
-"@babel/plugin-transform-react-jsx-development@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.18.6.tgz"
-  integrity sha512-SA6HEjwYFKF7WDjWcMcMGUimmw/nhNRDWxr+KaLSCrkD/LMDBvWRmHAYgE1HDeF8KUuI8OAu+RT6EOtKxSW2qA==
+"@babel/plugin-transform-numeric-separator@^7.22.11":
+  version "7.22.11"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.11.tgz#498d77dc45a6c6db74bb829c02a01c1d719cbfbd"
+  integrity sha512-3dzU4QGPsILdJbASKhF/V2TVP+gJya1PsueQCxIPCEcerqF21oEcrob4mzjsp2Py/1nLfF5m+xYNMDpmA8vffg==
   dependencies:
-    "@babel/plugin-transform-react-jsx" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-transform-react-jsx@^7.18.6":
-  version "7.19.0"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.19.0.tgz"
-  integrity sha512-UVEvX3tXie3Szm3emi1+G63jyw1w5IcMY0FSKM+CRnKRI5Mr1YbCNgsSTwoTwKphQEG9P+QqmuRFneJPZuHNhg==
+"@babel/plugin-transform-object-rest-spread@^7.22.15":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.15.tgz#21a95db166be59b91cde48775310c0df6e1da56f"
+  integrity sha512-fEB+I1+gAmfAyxZcX1+ZUwLeAuuf8VIg67CTznZE0MqVFumWkh8xWtn58I4dxdVf080wn7gzWoF8vndOViJe9Q==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.19.0"
-    "@babel/plugin-syntax-jsx" "^7.18.6"
-    "@babel/types" "^7.19.0"
+    "@babel/compat-data" "^7.22.9"
+    "@babel/helper-compilation-targets" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.22.15"
 
-"@babel/plugin-transform-react-pure-annotations@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.18.6.tgz"
-  integrity sha512-I8VfEPg9r2TRDdvnHgPepTKvuRomzA8+u+nhY7qSI1fR2hRNebasZEETLyM5mAUr0Ku56OkXJ0I7NHJnO6cJiQ==
+"@babel/plugin-transform-object-super@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz#794a8d2fcb5d0835af722173c1a9d704f44e218c"
+  integrity sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.5"
 
-"@babel/plugin-transform-regenerator@^7.20.5":
-  version "7.20.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.20.5.tgz"
-  integrity sha512-kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ==
+"@babel/plugin-transform-optional-catch-binding@^7.22.11":
+  version "7.22.11"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.11.tgz#461cc4f578a127bb055527b3e77404cad38c08e0"
+  integrity sha512-rli0WxesXUeCJnMYhzAglEjLWVDF6ahb45HuprcmQuLidBJFWjNnOzssk2kuc6e33FlLaiZhG/kUIzUMWdBKaQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    regenerator-transform "^0.15.1"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-transform-reserved-words@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz"
-  integrity sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==
+"@babel/plugin-transform-optional-chaining@^7.22.15", "@babel/plugin-transform-optional-chaining@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.0.tgz#73ff5fc1cf98f542f09f29c0631647d8ad0be158"
+  integrity sha512-sBBGXbLJjxTzLBF5rFWaikMnOGOk/BmK6vVByIdEggZ7Vn6CvWXZyRkkLFK6WE0IF8jSliyOkUN6SScFgzCM0g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-transform-shorthand-properties@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz"
-  integrity sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==
+"@babel/plugin-transform-parameters@^7.22.15":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.15.tgz#719ca82a01d177af358df64a514d64c2e3edb114"
+  integrity sha512-hjk7qKIqhyzhhUvRT683TYQOFa/4cQKwQy7ALvTpODswN40MljzNDa0YldevS6tGbxwaEKVn502JmY0dP7qEtQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-spread@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz"
-  integrity sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw==
+"@babel/plugin-transform-private-methods@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz#21c8af791f76674420a147ae62e9935d790f8722"
+  integrity sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
+    "@babel/helper-create-class-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-sticky-regex@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz"
-  integrity sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==
+"@babel/plugin-transform-private-property-in-object@^7.22.11":
+  version "7.22.11"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.11.tgz#ad45c4fc440e9cb84c718ed0906d96cf40f9a4e1"
+  integrity sha512-sSCbqZDBKHetvjSwpyWzhuHkmW5RummxJBVbYLkGkaiTOWGxml7SXt0iWa03bzxFIx7wOj3g/ILRd0RcJKBeSQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-create-class-features-plugin" "^7.22.11"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
-"@babel/plugin-transform-template-literals@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz"
-  integrity sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==
+"@babel/plugin-transform-property-literals@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz#b5ddabd73a4f7f26cd0e20f5db48290b88732766"
+  integrity sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-typeof-symbol@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz"
-  integrity sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==
+"@babel/plugin-transform-react-constant-elements@^7.21.3":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.22.5.tgz#6dfa7c1c37f7d7279e417ceddf5a04abb8bb9c29"
+  integrity sha512-BF5SXoO+nX3h5OhlN78XbbDrBOffv+AxPP2ENaJOVqjWCgBDeOY3WcaUcddutGSfoap+5NEQ/q/4I3WZIvgkXA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-typescript@^7.21.3":
-  version "7.21.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.21.3.tgz"
-  integrity sha512-RQxPz6Iqt8T0uw/WsJNReuBpWpBqs/n7mNo18sKLoTbMp+UrEekhH+pKSVC7gWz+DNjo9gryfV8YzCiT45RgMw==
+"@babel/plugin-transform-react-display-name@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.22.5.tgz#3c4326f9fce31c7968d6cb9debcaf32d9e279a2b"
+  integrity sha512-PVk3WPYudRF5z4GKMEYUrLjPl38fJSKNaEOkFuoprioowGuWN6w2RKznuFNSlJx7pzzXXStPUnNSOEO0jL5EVw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-create-class-features-plugin" "^7.21.0"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/plugin-syntax-typescript" "^7.20.0"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-unicode-escapes@^7.18.10":
-  version "7.18.10"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz"
-  integrity sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==
+"@babel/plugin-transform-react-jsx-development@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.22.5.tgz#e716b6edbef972a92165cd69d92f1255f7e73e87"
+  integrity sha512-bDhuzwWMuInwCYeDeMzyi7TaBgRQei6DqxhbyniL7/VG4RSS7HtSL2QbY4eESy1KJqlWt8g3xeEBGPuo+XqC8A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/plugin-transform-react-jsx" "^7.22.5"
 
-"@babel/plugin-transform-unicode-regex@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz"
-  integrity sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==
+"@babel/plugin-transform-react-jsx@^7.22.15", "@babel/plugin-transform-react-jsx@^7.22.5":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.22.15.tgz#7e6266d88705d7c49f11c98db8b9464531289cd6"
+  integrity sha512-oKckg2eZFa8771O/5vi7XeTvmM6+O9cxZu+kanTU7tD4sin5nO/G8jGJhq8Hvt2Z0kUoEDRayuZLaUlYl8QuGA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-module-imports" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-jsx" "^7.22.5"
+    "@babel/types" "^7.22.15"
 
-"@babel/preset-env@^7.19.4", "@babel/preset-env@^7.20.2":
-  version "7.21.4"
-  resolved "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.21.4.tgz"
-  integrity sha512-2W57zHs2yDLm6GD5ZpvNn71lZ0B/iypSdIeq25OurDKji6AdzV07qp4s3n1/x5BqtiGaTrPN3nerlSCaC5qNTw==
+"@babel/plugin-transform-react-pure-annotations@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.22.5.tgz#1f58363eef6626d6fa517b95ac66fe94685e32c0"
+  integrity sha512-gP4k85wx09q+brArVinTXhWiyzLl9UpmGva0+mWyKxk6JZequ05x3eUcIUE+FyttPKJFRRVtAvQaJ6YF9h1ZpA==
   dependencies:
-    "@babel/compat-data" "^7.21.4"
-    "@babel/helper-compilation-targets" "^7.21.4"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-validator-option" "^7.21.0"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.20.7"
-    "@babel/plugin-proposal-async-generator-functions" "^7.20.7"
-    "@babel/plugin-proposal-class-properties" "^7.18.6"
-    "@babel/plugin-proposal-class-static-block" "^7.21.0"
-    "@babel/plugin-proposal-dynamic-import" "^7.18.6"
-    "@babel/plugin-proposal-export-namespace-from" "^7.18.9"
-    "@babel/plugin-proposal-json-strings" "^7.18.6"
-    "@babel/plugin-proposal-logical-assignment-operators" "^7.20.7"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6"
-    "@babel/plugin-proposal-numeric-separator" "^7.18.6"
-    "@babel/plugin-proposal-object-rest-spread" "^7.20.7"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.18.6"
-    "@babel/plugin-proposal-optional-chaining" "^7.21.0"
-    "@babel/plugin-proposal-private-methods" "^7.18.6"
-    "@babel/plugin-proposal-private-property-in-object" "^7.21.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.18.6"
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-regenerator@^7.22.10":
+  version "7.22.10"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz#8ceef3bd7375c4db7652878b0241b2be5d0c3cca"
+  integrity sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    regenerator-transform "^0.15.2"
+
+"@babel/plugin-transform-reserved-words@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz#832cd35b81c287c4bcd09ce03e22199641f964fb"
+  integrity sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-shorthand-properties@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz#6e277654be82b5559fc4b9f58088507c24f0c624"
+  integrity sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-spread@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz#6487fd29f229c95e284ba6c98d65eafb893fea6b"
+  integrity sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+
+"@babel/plugin-transform-sticky-regex@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz#295aba1595bfc8197abd02eae5fc288c0deb26aa"
+  integrity sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-template-literals@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz#8f38cf291e5f7a8e60e9f733193f0bcc10909bff"
+  integrity sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-typeof-symbol@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz#5e2ba478da4b603af8673ff7c54f75a97b716b34"
+  integrity sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-typescript@^7.22.15":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.15.tgz#15adef906451d86349eb4b8764865c960eb54127"
+  integrity sha512-1uirS0TnijxvQLnlv5wQBwOX3E1wCFX7ITv+9pBV2wKEk4K+M5tqDaoNXnTH8tjEIYHLO98MwiTWO04Ggz4XuA==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-create-class-features-plugin" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-typescript" "^7.22.5"
+
+"@babel/plugin-transform-unicode-escapes@^7.22.10":
+  version "7.22.10"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.10.tgz#c723f380f40a2b2f57a62df24c9005834c8616d9"
+  integrity sha512-lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-unicode-property-regex@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz#098898f74d5c1e86660dc112057b2d11227f1c81"
+  integrity sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-unicode-regex@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz#ce7e7bb3ef208c4ff67e02a22816656256d7a183"
+  integrity sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-unicode-sets-regex@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz#77788060e511b708ffc7d42fdfbc5b37c3004e91"
+  integrity sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/preset-env@^7.20.2":
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.23.2.tgz#1f22be0ff0e121113260337dbc3e58fafce8d059"
+  integrity sha512-BW3gsuDD+rvHL2VO2SjAUNTBe5YrjsTiDyqamPDWY723na3/yPQ65X5oQkFVJZ0o50/2d+svm1rkPoJeR1KxVQ==
+  dependencies:
+    "@babel/compat-data" "^7.23.2"
+    "@babel/helper-compilation-targets" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-validator-option" "^7.22.15"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.22.15"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.22.15"
+    "@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
     "@babel/plugin-syntax-class-properties" "^7.12.13"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-    "@babel/plugin-syntax-import-assertions" "^7.20.0"
+    "@babel/plugin-syntax-import-assertions" "^7.22.5"
+    "@babel/plugin-syntax-import-attributes" "^7.22.5"
+    "@babel/plugin-syntax-import-meta" "^7.10.4"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
@@ -921,180 +891,178 @@
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
     "@babel/plugin-syntax-top-level-await" "^7.14.5"
-    "@babel/plugin-transform-arrow-functions" "^7.20.7"
-    "@babel/plugin-transform-async-to-generator" "^7.20.7"
-    "@babel/plugin-transform-block-scoped-functions" "^7.18.6"
-    "@babel/plugin-transform-block-scoping" "^7.21.0"
-    "@babel/plugin-transform-classes" "^7.21.0"
-    "@babel/plugin-transform-computed-properties" "^7.20.7"
-    "@babel/plugin-transform-destructuring" "^7.21.3"
-    "@babel/plugin-transform-dotall-regex" "^7.18.6"
-    "@babel/plugin-transform-duplicate-keys" "^7.18.9"
-    "@babel/plugin-transform-exponentiation-operator" "^7.18.6"
-    "@babel/plugin-transform-for-of" "^7.21.0"
-    "@babel/plugin-transform-function-name" "^7.18.9"
-    "@babel/plugin-transform-literals" "^7.18.9"
-    "@babel/plugin-transform-member-expression-literals" "^7.18.6"
-    "@babel/plugin-transform-modules-amd" "^7.20.11"
-    "@babel/plugin-transform-modules-commonjs" "^7.21.2"
-    "@babel/plugin-transform-modules-systemjs" "^7.20.11"
-    "@babel/plugin-transform-modules-umd" "^7.18.6"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.20.5"
-    "@babel/plugin-transform-new-target" "^7.18.6"
-    "@babel/plugin-transform-object-super" "^7.18.6"
-    "@babel/plugin-transform-parameters" "^7.21.3"
-    "@babel/plugin-transform-property-literals" "^7.18.6"
-    "@babel/plugin-transform-regenerator" "^7.20.5"
-    "@babel/plugin-transform-reserved-words" "^7.18.6"
-    "@babel/plugin-transform-shorthand-properties" "^7.18.6"
-    "@babel/plugin-transform-spread" "^7.20.7"
-    "@babel/plugin-transform-sticky-regex" "^7.18.6"
-    "@babel/plugin-transform-template-literals" "^7.18.9"
-    "@babel/plugin-transform-typeof-symbol" "^7.18.9"
-    "@babel/plugin-transform-unicode-escapes" "^7.18.10"
-    "@babel/plugin-transform-unicode-regex" "^7.18.6"
-    "@babel/preset-modules" "^0.1.5"
-    "@babel/types" "^7.21.4"
-    babel-plugin-polyfill-corejs2 "^0.3.3"
-    babel-plugin-polyfill-corejs3 "^0.6.0"
-    babel-plugin-polyfill-regenerator "^0.4.1"
-    core-js-compat "^3.25.1"
-    semver "^6.3.0"
+    "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6"
+    "@babel/plugin-transform-arrow-functions" "^7.22.5"
+    "@babel/plugin-transform-async-generator-functions" "^7.23.2"
+    "@babel/plugin-transform-async-to-generator" "^7.22.5"
+    "@babel/plugin-transform-block-scoped-functions" "^7.22.5"
+    "@babel/plugin-transform-block-scoping" "^7.23.0"
+    "@babel/plugin-transform-class-properties" "^7.22.5"
+    "@babel/plugin-transform-class-static-block" "^7.22.11"
+    "@babel/plugin-transform-classes" "^7.22.15"
+    "@babel/plugin-transform-computed-properties" "^7.22.5"
+    "@babel/plugin-transform-destructuring" "^7.23.0"
+    "@babel/plugin-transform-dotall-regex" "^7.22.5"
+    "@babel/plugin-transform-duplicate-keys" "^7.22.5"
+    "@babel/plugin-transform-dynamic-import" "^7.22.11"
+    "@babel/plugin-transform-exponentiation-operator" "^7.22.5"
+    "@babel/plugin-transform-export-namespace-from" "^7.22.11"
+    "@babel/plugin-transform-for-of" "^7.22.15"
+    "@babel/plugin-transform-function-name" "^7.22.5"
+    "@babel/plugin-transform-json-strings" "^7.22.11"
+    "@babel/plugin-transform-literals" "^7.22.5"
+    "@babel/plugin-transform-logical-assignment-operators" "^7.22.11"
+    "@babel/plugin-transform-member-expression-literals" "^7.22.5"
+    "@babel/plugin-transform-modules-amd" "^7.23.0"
+    "@babel/plugin-transform-modules-commonjs" "^7.23.0"
+    "@babel/plugin-transform-modules-systemjs" "^7.23.0"
+    "@babel/plugin-transform-modules-umd" "^7.22.5"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.22.5"
+    "@babel/plugin-transform-new-target" "^7.22.5"
+    "@babel/plugin-transform-nullish-coalescing-operator" "^7.22.11"
+    "@babel/plugin-transform-numeric-separator" "^7.22.11"
+    "@babel/plugin-transform-object-rest-spread" "^7.22.15"
+    "@babel/plugin-transform-object-super" "^7.22.5"
+    "@babel/plugin-transform-optional-catch-binding" "^7.22.11"
+    "@babel/plugin-transform-optional-chaining" "^7.23.0"
+    "@babel/plugin-transform-parameters" "^7.22.15"
+    "@babel/plugin-transform-private-methods" "^7.22.5"
+    "@babel/plugin-transform-private-property-in-object" "^7.22.11"
+    "@babel/plugin-transform-property-literals" "^7.22.5"
+    "@babel/plugin-transform-regenerator" "^7.22.10"
+    "@babel/plugin-transform-reserved-words" "^7.22.5"
+    "@babel/plugin-transform-shorthand-properties" "^7.22.5"
+    "@babel/plugin-transform-spread" "^7.22.5"
+    "@babel/plugin-transform-sticky-regex" "^7.22.5"
+    "@babel/plugin-transform-template-literals" "^7.22.5"
+    "@babel/plugin-transform-typeof-symbol" "^7.22.5"
+    "@babel/plugin-transform-unicode-escapes" "^7.22.10"
+    "@babel/plugin-transform-unicode-property-regex" "^7.22.5"
+    "@babel/plugin-transform-unicode-regex" "^7.22.5"
+    "@babel/plugin-transform-unicode-sets-regex" "^7.22.5"
+    "@babel/preset-modules" "0.1.6-no-external-plugins"
+    "@babel/types" "^7.23.0"
+    babel-plugin-polyfill-corejs2 "^0.4.6"
+    babel-plugin-polyfill-corejs3 "^0.8.5"
+    babel-plugin-polyfill-regenerator "^0.5.3"
+    core-js-compat "^3.31.0"
+    semver "^6.3.1"
 
-"@babel/preset-modules@^0.1.5":
-  version "0.1.5"
-  resolved "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz"
-  integrity sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==
+"@babel/preset-modules@0.1.6-no-external-plugins":
+  version "0.1.6-no-external-plugins"
+  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz#ccb88a2c49c817236861fee7826080573b8a923a"
+  integrity sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
-    "@babel/plugin-transform-dotall-regex" "^7.4.4"
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
 "@babel/preset-react@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.18.6.tgz"
-  integrity sha512-zXr6atUmyYdiWRVLOZahakYmOBHtWc2WGCkP8PYTgZi0iJXDY2CN180TdrIW4OGOAdLc7TifzDIvtx6izaRIzg==
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.22.15.tgz#9a776892b648e13cc8ca2edf5ed1264eea6b6afc"
+  integrity sha512-Csy1IJ2uEh/PecCBXXoZGAZBeCATTuePzCSB7dLYWS0vOEj6CNpjxIhW4duWwZodBNueH7QO14WbGn8YyeuN9w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/helper-validator-option" "^7.18.6"
-    "@babel/plugin-transform-react-display-name" "^7.18.6"
-    "@babel/plugin-transform-react-jsx" "^7.18.6"
-    "@babel/plugin-transform-react-jsx-development" "^7.18.6"
-    "@babel/plugin-transform-react-pure-annotations" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-validator-option" "^7.22.15"
+    "@babel/plugin-transform-react-display-name" "^7.22.5"
+    "@babel/plugin-transform-react-jsx" "^7.22.15"
+    "@babel/plugin-transform-react-jsx-development" "^7.22.5"
+    "@babel/plugin-transform-react-pure-annotations" "^7.22.5"
 
-"@babel/preset-typescript@^7.18.6", "@babel/preset-typescript@^7.21.0":
-  version "7.21.4"
-  resolved "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.21.4.tgz"
-  integrity sha512-sMLNWY37TCdRH/bJ6ZeeOH1nPuanED7Ai9Y/vH31IPqalioJ6ZNFUWONsakhv4r4n+I6gm5lmoE0olkgib/j/A==
+"@babel/preset-typescript@^7.21.0":
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.23.2.tgz#c8de488130b7081f7e1482936ad3de5b018beef4"
+  integrity sha512-u4UJc1XsS1GhIGteM8rnGiIvf9rJpiVgMEeCnwlLA7WJPC+jcXWJAGxYmeqs5hOZD8BbAfnV5ezBOxQbb4OUxA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-validator-option" "^7.21.0"
-    "@babel/plugin-syntax-jsx" "^7.21.4"
-    "@babel/plugin-transform-modules-commonjs" "^7.21.2"
-    "@babel/plugin-transform-typescript" "^7.21.3"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-validator-option" "^7.22.15"
+    "@babel/plugin-syntax-jsx" "^7.22.5"
+    "@babel/plugin-transform-modules-commonjs" "^7.23.0"
+    "@babel/plugin-transform-typescript" "^7.22.15"
 
 "@babel/regjsgen@^0.8.0":
   version "0.8.0"
-  resolved "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz"
+  resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310"
   integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
 
-"@babel/runtime-corejs3@^7.10.2":
-  version "7.20.6"
-  resolved "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.20.6.tgz"
-  integrity sha512-tqeujPiuEfcH067mx+7otTQWROVMKHXEaOQcAeNV5dDdbPWvPcFA8/W9LXw2NfjNmOetqLl03dfnG2WALPlsRQ==
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.20.7", "@babel/runtime@^7.21.0", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.2.tgz#062b0ac103261d68a966c4c7baf2ae3e62ec3885"
+  integrity sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==
   dependencies:
-    core-js-pure "^3.25.1"
-    regenerator-runtime "^0.13.11"
+    regenerator-runtime "^0.14.0"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.15.4", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
-  version "7.20.1"
-  resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.1.tgz"
-  integrity sha512-mrzLkl6U9YLF8qpqI7TB82PESyEGjm/0Ly91jG575eVxMMlb8fYfOXFZIJ8XfLrJZQbm7dlKry2bJmXBUEkdFg==
+"@babel/template@^7.22.15", "@babel/template@^7.22.5":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38"
+  integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==
   dependencies:
-    regenerator-runtime "^0.13.10"
+    "@babel/code-frame" "^7.22.13"
+    "@babel/parser" "^7.22.15"
+    "@babel/types" "^7.22.15"
 
-"@babel/runtime@^7.10.2", "@babel/runtime@^7.18.9":
-  version "7.20.6"
-  resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.6.tgz"
-  integrity sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==
+"@babel/traverse@^7.23.2":
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.2.tgz#329c7a06735e144a506bdb2cad0268b7f46f4ad8"
+  integrity sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==
   dependencies:
-    regenerator-runtime "^0.13.11"
-
-"@babel/runtime@^7.12.5":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.5.tgz"
-  integrity sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA==
-  dependencies:
-    regenerator-runtime "^0.13.11"
-
-"@babel/runtime@^7.21.0":
-  version "7.21.5"
-  resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.21.5.tgz"
-  integrity sha512-8jI69toZqqcsnqGGqwGS4Qb1VwLOEp4hz+CXPywcvjs60u3B4Pom/U/7rm4W8tMOYEB+E9wgD0mW1l3r8qlI9Q==
-  dependencies:
-    regenerator-runtime "^0.13.11"
-
-"@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz"
-  integrity sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==
-  dependencies:
-    "@babel/code-frame" "^7.22.5"
-    "@babel/parser" "^7.22.5"
-    "@babel/types" "^7.22.5"
-
-"@babel/traverse@^7.19.0", "@babel/traverse@^7.19.1", "@babel/traverse@^7.20.7", "@babel/traverse@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.5.tgz"
-  integrity sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ==
-  dependencies:
-    "@babel/code-frame" "^7.22.5"
-    "@babel/generator" "^7.22.5"
-    "@babel/helper-environment-visitor" "^7.22.5"
-    "@babel/helper-function-name" "^7.22.5"
+    "@babel/code-frame" "^7.22.13"
+    "@babel/generator" "^7.23.0"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-function-name" "^7.23.0"
     "@babel/helper-hoist-variables" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.5"
-    "@babel/parser" "^7.22.5"
-    "@babel/types" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/parser" "^7.23.0"
+    "@babel/types" "^7.23.0"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.3", "@babel/types@^7.21.4", "@babel/types@^7.22.5", "@babel/types@^7.3.0", "@babel/types@^7.4.4", "@babel/types@^7.9.5":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz"
-  integrity sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==
+"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.21.3", "@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.4.4", "@babel/types@^7.9.5":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.0.tgz#8c1f020c9df0e737e4e247c0619f58c68458aaeb"
+  integrity sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==
   dependencies:
     "@babel/helper-string-parser" "^7.22.5"
-    "@babel/helper-validator-identifier" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
+"@clickhouse/client-common@0.2.4":
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/@clickhouse/client-common/-/client-common-0.2.4.tgz#49c5fbfea01d95bc8af1bb5a322ab27cf25bcd01"
+  integrity sha512-XVmxvU0kACANTmQSfdYCIA/reDkH5353AOvfwKRXMNwag8pX2IIoO8zoJjZvtfbGPy5LoI+UKj3aoiKSl8Z8qA==
+
+"@clickhouse/client@^0.2.2":
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/@clickhouse/client/-/client-0.2.4.tgz#bd17712ab27dc5e8a161a43f6e1b5489cbb09066"
+  integrity sha512-qeKYMHoNxRG8xQ4CPEnPcAbreivhWm3QTw9v5BkovS9j/mnt9NcUzWpmdZTsL/vTl63fSTXVkiA9/QY++r3/qQ==
+  dependencies:
+    "@clickhouse/client-common" "0.2.4"
+
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"
-  resolved "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz"
+  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
   integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==
   dependencies:
     "@jridgewell/trace-mapping" "0.3.9"
 
-"@csstools/css-parser-algorithms@^2.3.0":
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.3.1.tgz#ec4fc764ba45d2bb7ee2774667e056aa95003f3a"
-  integrity sha512-xrvsmVUtefWMWQsGgFffqWSK03pZ1vfDki4IVIIUxxDKnGBzqNgv0A7SB1oXtVNEkcVO8xi1ZrTL29HhSu5kGA==
+"@csstools/css-parser-algorithms@^2.3.1":
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.3.2.tgz#1e0d581dbf4518cb3e939c3b863cb7180c8cedad"
+  integrity sha512-sLYGdAdEY2x7TSw9FtmdaTrh2wFtRJO5VMbBrA8tEqEod7GEggFmxTSK9XqExib3yMuYNcvcTdCZIP6ukdjAIA==
 
-"@csstools/css-tokenizer@^2.1.1":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@csstools/css-tokenizer/-/css-tokenizer-2.2.0.tgz#9d70e6dcbe94e44c7400a2929928db35c4de32b5"
-  integrity sha512-wErmsWCbsmig8sQKkM6pFhr/oPha1bHfvxsUY5CYSQxwyhA9Ulrs8EqCgClhg4Tgg2XapVstGqSVcz0xOYizZA==
+"@csstools/css-tokenizer@^2.2.0":
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@csstools/css-tokenizer/-/css-tokenizer-2.2.1.tgz#9dc431c9a5f61087af626e41ac2a79cce7bb253d"
+  integrity sha512-Zmsf2f/CaEPWEVgw29odOj+WEVoiJy9s9NOv5GgNY9mZ1CZ7394By6wONrONrTsnNDv6F9hR02nvFihrGVGHBg==
 
-"@csstools/media-query-list-parser@^2.1.2":
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.3.tgz#4471ebd436a22019378fe9c8ac8c0f30c4fbb796"
-  integrity sha512-ATul1u+pic4aVpstgueqxEv4MsObEbszAxfTXpx9LHaeD3LAh+wFqdCteyegWmjk0k5rkSCAvIOaJe9U3DD09w==
+"@csstools/media-query-list-parser@^2.1.4":
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.5.tgz#94bc8b3c3fd7112a40b7bf0b483e91eba0654a0f"
+  integrity sha512-IxVBdYzR8pYe89JiyXQuYk4aVVoCPhMJkz6ElRwlVysjwURTsTk/bmY/z4FfeRE+CRBMlykPwXEVUg8lThv7AQ==
 
 "@csstools/postcss-cascade-layers@^1.1.1":
   version "1.1.1"
-  resolved "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-1.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-1.1.1.tgz#8a997edf97d34071dd2e37ea6022447dd9e795ad"
   integrity sha512-+KdYrpKC5TgomQr2DlZF4lDEpHcoxnj5IGddYYfBWJAKfj1JtuHUIqMa+E1pJJ+z3kvDViWMqyqPlG4Ja7amQA==
   dependencies:
     "@csstools/selector-specificity" "^2.0.2"
@@ -1102,7 +1070,7 @@
 
 "@csstools/postcss-color-function@^1.1.1":
   version "1.1.1"
-  resolved "https://registry.npmjs.org/@csstools/postcss-color-function/-/postcss-color-function-1.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-color-function/-/postcss-color-function-1.1.1.tgz#2bd36ab34f82d0497cfacdc9b18d34b5e6f64b6b"
   integrity sha512-Bc0f62WmHdtRDjf5f3e2STwRAl89N2CLb+9iAwzrv4L2hncrbDwnQD9PCq0gtAt7pOI2leIV08HIBUd4jxD8cw==
   dependencies:
     "@csstools/postcss-progressive-custom-properties" "^1.1.0"
@@ -1110,21 +1078,21 @@
 
 "@csstools/postcss-font-format-keywords@^1.0.1":
   version "1.0.1"
-  resolved "https://registry.npmjs.org/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-1.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-1.0.1.tgz#677b34e9e88ae997a67283311657973150e8b16a"
   integrity sha512-ZgrlzuUAjXIOc2JueK0X5sZDjCtgimVp/O5CEqTcs5ShWBa6smhWYbS0x5cVc/+rycTDbjjzoP0KTDnUneZGOg==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 "@csstools/postcss-hwb-function@^1.0.2":
   version "1.0.2"
-  resolved "https://registry.npmjs.org/@csstools/postcss-hwb-function/-/postcss-hwb-function-1.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-hwb-function/-/postcss-hwb-function-1.0.2.tgz#ab54a9fce0ac102c754854769962f2422ae8aa8b"
   integrity sha512-YHdEru4o3Rsbjmu6vHy4UKOXZD+Rn2zmkAmLRfPet6+Jz4Ojw8cbWxe1n42VaXQhD3CQUXXTooIy8OkVbUcL+w==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 "@csstools/postcss-ic-unit@^1.0.1":
   version "1.0.1"
-  resolved "https://registry.npmjs.org/@csstools/postcss-ic-unit/-/postcss-ic-unit-1.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-ic-unit/-/postcss-ic-unit-1.0.1.tgz#28237d812a124d1a16a5acc5c3832b040b303e58"
   integrity sha512-Ot1rcwRAaRHNKC9tAqoqNZhjdYBzKk1POgWfhN4uCOE47ebGcLRqXjKkApVDpjifL6u2/55ekkpnFcp+s/OZUw==
   dependencies:
     "@csstools/postcss-progressive-custom-properties" "^1.1.0"
@@ -1132,7 +1100,7 @@
 
 "@csstools/postcss-is-pseudo-class@^2.0.7":
   version "2.0.7"
-  resolved "https://registry.npmjs.org/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.7.tgz"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.7.tgz#846ae6c0d5a1eaa878fce352c544f9c295509cd1"
   integrity sha512-7JPeVVZHd+jxYdULl87lvjgvWldYu+Bc62s9vD/ED6/QTGjy0jy0US/f6BG53sVMTBJ1lzKZFpYmofBN9eaRiA==
   dependencies:
     "@csstools/selector-specificity" "^2.0.0"
@@ -1140,21 +1108,21 @@
 
 "@csstools/postcss-nested-calc@^1.0.0":
   version "1.0.0"
-  resolved "https://registry.npmjs.org/@csstools/postcss-nested-calc/-/postcss-nested-calc-1.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-nested-calc/-/postcss-nested-calc-1.0.0.tgz#d7e9d1d0d3d15cf5ac891b16028af2a1044d0c26"
   integrity sha512-JCsQsw1wjYwv1bJmgjKSoZNvf7R6+wuHDAbi5f/7MbFhl2d/+v+TvBTU4BJH3G1X1H87dHl0mh6TfYogbT/dJQ==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 "@csstools/postcss-normalize-display-values@^1.0.1":
   version "1.0.1"
-  resolved "https://registry.npmjs.org/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-1.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-1.0.1.tgz#15da54a36e867b3ac5163ee12c1d7f82d4d612c3"
   integrity sha512-jcOanIbv55OFKQ3sYeFD/T0Ti7AMXc9nM1hZWu8m/2722gOTxFg7xYu4RDLJLeZmPUVQlGzo4jhzvTUq3x4ZUw==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 "@csstools/postcss-oklab-function@^1.1.1":
   version "1.1.1"
-  resolved "https://registry.npmjs.org/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.1.1.tgz#88cee0fbc8d6df27079ebd2fa016ee261eecf844"
   integrity sha512-nJpJgsdA3dA9y5pgyb/UfEzE7W5Ka7u0CX0/HIMVBNWzWemdcTH3XwANECU6anWv/ao4vVNLTMxhiPNZsTK6iA==
   dependencies:
     "@csstools/postcss-progressive-custom-properties" "^1.1.0"
@@ -1162,46 +1130,41 @@
 
 "@csstools/postcss-progressive-custom-properties@^1.1.0", "@csstools/postcss-progressive-custom-properties@^1.3.0":
   version "1.3.0"
-  resolved "https://registry.npmjs.org/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-1.3.0.tgz"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-1.3.0.tgz#542292558384361776b45c85226b9a3a34f276fa"
   integrity sha512-ASA9W1aIy5ygskZYuWams4BzafD12ULvSypmaLJT2jvQ8G0M3I8PRQhC0h7mG0Z3LI05+agZjqSR9+K9yaQQjA==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 "@csstools/postcss-stepped-value-functions@^1.0.1":
   version "1.0.1"
-  resolved "https://registry.npmjs.org/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-1.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-1.0.1.tgz#f8772c3681cc2befed695e2b0b1d68e22f08c4f4"
   integrity sha512-dz0LNoo3ijpTOQqEJLY8nyaapl6umbmDcgj4AD0lgVQ572b2eqA1iGZYTTWhrcrHztWDDRAX2DGYyw2VBjvCvQ==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 "@csstools/postcss-text-decoration-shorthand@^1.0.0":
   version "1.0.0"
-  resolved "https://registry.npmjs.org/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-1.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-1.0.0.tgz#ea96cfbc87d921eca914d3ad29340d9bcc4c953f"
   integrity sha512-c1XwKJ2eMIWrzQenN0XbcfzckOLLJiczqy+YvfGmzoVXd7pT9FfObiSEfzs84bpE/VqfpEuAZ9tCRbZkZxxbdw==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 "@csstools/postcss-trigonometric-functions@^1.0.2":
   version "1.0.2"
-  resolved "https://registry.npmjs.org/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-1.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-1.0.2.tgz#94d3e4774c36d35dcdc88ce091336cb770d32756"
   integrity sha512-woKaLO///4bb+zZC2s80l+7cm07M7268MsyG3M0ActXXEFi6SuhvriQYcb58iiKGbjwwIU7n45iRLEHypB47Og==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 "@csstools/postcss-unset-value@^1.0.2":
   version "1.0.2"
-  resolved "https://registry.npmjs.org/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.2.tgz#c99bb70e2cdc7312948d1eb41df2412330b81f77"
   integrity sha512-c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g==
 
-"@csstools/selector-specificity@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.0.0.tgz"
-  integrity sha512-rZ6vufeY/UjAgtyiJ4WvfF6XP6HizIyOfbZOg0RnecIwjrvH8Am3nN1BpKnnPZunYAkUcPPXDhwbxOtGop8cfQ==
-
-"@csstools/selector-specificity@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz"
-  integrity sha512-IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg==
+"@csstools/selector-specificity@^2.0.0", "@csstools/selector-specificity@^2.0.2":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz#2cbcf822bf3764c9658c4d2e568bd0c0cb748016"
+  integrity sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==
 
 "@csstools/selector-specificity@^3.0.0":
   version "3.0.0"
@@ -1315,25 +1278,25 @@
 
 "@esbuild/win32-x64@0.17.19":
   version "0.17.19"
-  resolved "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz#8cfaf2ff603e9aabb910e9c0558c26cf32744061"
   integrity sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==
 
-"@eslint-community/eslint-utils@^4.2.0":
+"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
   integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==
   dependencies:
     eslint-visitor-keys "^3.3.0"
 
-"@eslint-community/regexpp@^4.4.0", "@eslint-community/regexpp@^4.6.1":
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.6.2.tgz#1816b5f6948029c5eaacb0703b850ee0cb37d8f8"
-  integrity sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==
+"@eslint-community/regexpp@^4.5.1", "@eslint-community/regexpp@^4.6.1":
+  version "4.9.1"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.9.1.tgz#449dfa81a57a1d755b09aa58d826c1262e4283b4"
+  integrity sha512-Y27x+MBLjXa+0JWDhykM3+JE+il3kHKAEqabfEWq3SDhZjLYb6/BHL/JKFnH3fe207JaXkyDo685Oc2Glt6ifA==
 
-"@eslint/eslintrc@^2.1.1":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.1.tgz#18d635e24ad35f7276e8a49d135c7d3ca6a46f93"
-  integrity sha512-9t7ZA7NGGK8ckelF0PQCfcxIUzs1Md5rrO6U/c+FIQNanea5UZC0wqKXH4vHBccmu4ZJgZ2idtPeW7+Q2npOEA==
+"@eslint/eslintrc@^2.1.2":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.2.tgz#c6936b4b328c64496692f76944e755738be62396"
+  integrity sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
@@ -1345,10 +1308,10 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@^8.46.0":
-  version "8.46.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.46.0.tgz#3f7802972e8b6fe3f88ed1aabc74ec596c456db6"
-  integrity sha512-a8TLtmPi8xzPkCbp/OGFUo5yhRkHM2Ko9kOWP4znJr0WAhWyThaw3PnwX4vOTWOAMsV2uRt32PPDcEz63esSaA==
+"@eslint/js@8.51.0":
+  version "8.51.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.51.0.tgz#6d419c240cfb2b66da37df230f7e7eef801c32fa"
+  integrity sha512-HxjQ8Qn+4SI3/AFv6sOrDB+g6PpUTDwSJiQqOrnneEk8L71161srI9gjzzZvYVbzHiVg/BvcH95+cK/zfIt4pg==
 
 "@fastify/accept-negotiator@^1.1.0":
   version "1.1.0"
@@ -1357,12 +1320,12 @@
 
 "@fontsource/inter@^4.5.15":
   version "4.5.15"
-  resolved "https://registry.npmjs.org/@fontsource/inter/-/inter-4.5.15.tgz"
+  resolved "https://registry.yarnpkg.com/@fontsource/inter/-/inter-4.5.15.tgz#eed1873d68755d3b52d6fcfcfa3493118430a512"
   integrity sha512-FzleM9AxZQK2nqsTDtBiY0PMEVWvnKnuu2i09+p6DHvrHsuucoV2j0tmw+kAT3L4hvsLdAIDv6MdGehsPIdT+Q==
 
 "@formatjs/cli@^4.2.29":
   version "4.8.4"
-  resolved "https://registry.npmjs.org/@formatjs/cli/-/cli-4.8.4.tgz"
+  resolved "https://registry.yarnpkg.com/@formatjs/cli/-/cli-4.8.4.tgz#c4f4e589b8c77c950b659948dbf0e877a4d910fd"
   integrity sha512-zZI8QYVl5CHaT6j9OHjS+0mMnWzopBVH0un4n5b4IhIJRzIKnxwFTkxBp5Ifqj6FntrwzIGqP+D6v8u7MPYsmw==
   dependencies:
     "@formatjs/icu-messageformat-parser" "2.1.0"
@@ -1384,99 +1347,131 @@
 
 "@formatjs/ecma402-abstract@1.11.4":
   version "1.11.4"
-  resolved "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.11.4.tgz"
+  resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.11.4.tgz#b962dfc4ae84361f9f08fbce411b4e4340930eda"
   integrity sha512-EBikYFp2JCdIfGEb5G9dyCkTGDmC57KSHhRQOC3aYxoPWVZvfWCDjZwkGYHN7Lis/fmuWl906bnNTJifDQ3sXw==
   dependencies:
     "@formatjs/intl-localematcher" "0.2.25"
     tslib "^2.1.0"
 
+"@formatjs/ecma402-abstract@1.18.0":
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.18.0.tgz#e2120e7101020140661b58430a7ff4262705a2f2"
+  integrity sha512-PEVLoa3zBevWSCZzPIM/lvPCi8P5l4G+NXQMc/CjEiaCWgyHieUoo0nM7Bs0n/NbuQ6JpXEolivQ9pKSBHaDlA==
+  dependencies:
+    "@formatjs/intl-localematcher" "0.5.2"
+    tslib "^2.4.0"
+
 "@formatjs/ecma402-abstract@1.4.0":
   version "1.4.0"
-  resolved "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.4.0.tgz"
+  resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.4.0.tgz#ac6c17a8fffac43c6d68c849a7b732626d32654c"
   integrity sha512-Mv027hcLFjE45K8UJ8PjRpdDGfR0aManEFj1KzoN8zXNveHGEygpZGfFf/FTTMl+QEVSrPAUlyxaCApvmv47AQ==
   dependencies:
     tslib "^2.0.1"
 
 "@formatjs/ecma402-abstract@1.5.0":
   version "1.5.0"
-  resolved "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.5.0.tgz"
+  resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.5.0.tgz#759c8f11ff45e96f8fb58741e7fbdb41096d5ddd"
   integrity sha512-wXv36yo+mfWllweN0Fq7sUs7PUiNopn7I0JpLTe3hGu6ZMR4CV7LqK1llhB18pndwpKoafQKb1et2DCJAOW20Q==
   dependencies:
     tslib "^2.0.1"
 
-"@formatjs/fast-memoize@1.2.1":
-  version "1.2.1"
-  resolved "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-1.2.1.tgz"
-  integrity sha512-Rg0e76nomkz3vF9IPlKeV+Qynok0r7YZjL6syLz4/urSg0IbjPZCB/iYUMNsYA643gh4mgrX3T7KEIFIxJBQeg==
+"@formatjs/fast-memoize@2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@formatjs/fast-memoize/-/fast-memoize-2.2.0.tgz#33bd616d2e486c3e8ef4e68c99648c196887802b"
+  integrity sha512-hnk/nY8FyrL5YxwP9e4r9dqeM6cAbo8PeU9UjyXojZMNvVad2Z06FAVHyR3Ecw6fza+0GH7vdJgiKIVXTMbSBA==
   dependencies:
-    tslib "^2.1.0"
+    tslib "^2.4.0"
 
 "@formatjs/icu-messageformat-parser@2.1.0":
   version "2.1.0"
-  resolved "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.1.0.tgz#a54293dd7f098d6a6f6a084ab08b6d54a3e8c12d"
   integrity sha512-Qxv/lmCN6hKpBSss2uQ8IROVnta2r9jd3ymUEIjm2UyIkUCHVcbUVRGL/KS/wv7876edvsPe+hjHVJ4z8YuVaw==
   dependencies:
     "@formatjs/ecma402-abstract" "1.11.4"
     "@formatjs/icu-skeleton-parser" "1.3.6"
     tslib "^2.1.0"
 
+"@formatjs/icu-messageformat-parser@2.7.3":
+  version "2.7.3"
+  resolved "https://registry.yarnpkg.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.7.3.tgz#c8c95e7c9f8141bdb93bea0e92e4fcace19d3c9f"
+  integrity sha512-X/jy10V9S/vW+qlplqhMUxR8wErQ0mmIYSq4mrjpjDl9mbuGcCILcI1SUYkL5nlM4PJqpc0KOS0bFkkJNPxYRw==
+  dependencies:
+    "@formatjs/ecma402-abstract" "1.18.0"
+    "@formatjs/icu-skeleton-parser" "1.7.0"
+    tslib "^2.4.0"
+
 "@formatjs/icu-skeleton-parser@1.3.6":
   version "1.3.6"
-  resolved "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.6.tgz"
+  resolved "https://registry.yarnpkg.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.6.tgz#4ce8c0737d6f07b735288177049e97acbf2e8964"
   integrity sha512-I96mOxvml/YLrwU2Txnd4klA7V8fRhb6JG/4hm3VMNmeJo1F03IpV2L3wWt7EweqNLES59SZ4d6hVOPCSf80Bg==
   dependencies:
     "@formatjs/ecma402-abstract" "1.11.4"
     tslib "^2.1.0"
 
-"@formatjs/intl-displaynames@5.4.3":
-  version "5.4.3"
-  resolved "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-5.4.3.tgz"
-  integrity sha512-4r12A3mS5dp5hnSaQCWBuBNfi9Amgx2dzhU4lTFfhSxgb5DOAiAbMpg6+7gpWZgl4ahsj3l2r/iHIjdmdXOE2Q==
+"@formatjs/icu-skeleton-parser@1.7.0":
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.7.0.tgz#796938d6d0ba8fc75bb9edee038d1350bfee32cb"
+  integrity sha512-Cfdo/fgbZzpN/jlN/ptQVe0lRHora+8ezrEeg2RfrNjyp+YStwBy7cqDY8k5/z2LzXg6O0AdzAV91XS0zIWv+A==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.11.4"
-    "@formatjs/intl-localematcher" "0.2.25"
-    tslib "^2.1.0"
+    "@formatjs/ecma402-abstract" "1.18.0"
+    tslib "^2.4.0"
 
-"@formatjs/intl-listformat@6.5.3":
-  version "6.5.3"
-  resolved "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-6.5.3.tgz"
-  integrity sha512-ozpz515F/+3CU+HnLi5DYPsLa6JoCfBggBSSg/8nOB5LYSFW9+ZgNQJxJ8tdhKYeODT+4qVHX27EeJLoxLGLNg==
+"@formatjs/intl-displaynames@6.6.4":
+  version "6.6.4"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-displaynames/-/intl-displaynames-6.6.4.tgz#dd9ca9bb2d1f4b140cc8814667bc830802621674"
+  integrity sha512-ET8KQ+L9Q0K8x1SnJQa4DNssUcbATlMopWqYvGGR8yAvw5qwAQc1fv+DshCoZNIE9pbcue0IGC4kWNAkWqlFag==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.11.4"
-    "@formatjs/intl-localematcher" "0.2.25"
-    tslib "^2.1.0"
+    "@formatjs/ecma402-abstract" "1.18.0"
+    "@formatjs/intl-localematcher" "0.5.2"
+    tslib "^2.4.0"
+
+"@formatjs/intl-listformat@7.5.3":
+  version "7.5.3"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-listformat/-/intl-listformat-7.5.3.tgz#c6f028471839cd1014760498f783fdfe011422d5"
+  integrity sha512-l7EOr0Yh1m8KagytukB90yw81uyzrM7amKFrgxXqphz4KeSIL0KPa68lPsdtZ+JmQB73GaDQRwLOwUKFZ1VZPQ==
+  dependencies:
+    "@formatjs/ecma402-abstract" "1.18.0"
+    "@formatjs/intl-localematcher" "0.5.2"
+    tslib "^2.4.0"
 
 "@formatjs/intl-localematcher@0.2.25":
   version "0.2.25"
-  resolved "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.2.25.tgz"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-localematcher/-/intl-localematcher-0.2.25.tgz#60892fe1b271ec35ba07a2eb018a2dd7bca6ea3a"
   integrity sha512-YmLcX70BxoSopLFdLr1Ds99NdlTI2oWoLbaUW2M406lxOIPzE1KQhRz2fPUkq34xVZQaihCoU29h0KK7An3bhA==
   dependencies:
     tslib "^2.1.0"
 
+"@formatjs/intl-localematcher@0.5.2":
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-localematcher/-/intl-localematcher-0.5.2.tgz#5fcf029fd218905575e5080fa33facdcb623d532"
+  integrity sha512-txaaE2fiBMagLrR4jYhxzFO6wEdEG4TPMqrzBAcbr4HFUYzH/YC+lg6OIzKCHm8WgDdyQevxbAAV1OgcXctuGw==
+  dependencies:
+    tslib "^2.4.0"
+
 "@formatjs/intl-numberformat@^5.5.2":
   version "5.7.6"
-  resolved "https://registry.npmjs.org/@formatjs/intl-numberformat/-/intl-numberformat-5.7.6.tgz"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-numberformat/-/intl-numberformat-5.7.6.tgz#630206bb0acefd2d508ccf4f82367c6875cad611"
   integrity sha512-ZlZfYtvbVHYZY5OG3RXizoCwxKxEKOrzEe2YOw9wbzoxF3PmFn0SAgojCFGLyNXkkR6xVxlylhbuOPf1dkIVNg==
   dependencies:
     "@formatjs/ecma402-abstract" "1.4.0"
     tslib "^2.0.1"
 
-"@formatjs/intl@2.2.1":
-  version "2.2.1"
-  resolved "https://registry.npmjs.org/@formatjs/intl/-/intl-2.2.1.tgz"
-  integrity sha512-vgvyUOOrzqVaOFYzTf2d3+ToSkH2JpR7x/4U1RyoHQLmvEaTQvXJ7A2qm1Iy3brGNXC/+/7bUlc3lpH+h/LOJA==
+"@formatjs/intl@2.9.9":
+  version "2.9.9"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl/-/intl-2.9.9.tgz#866629b565e20dd7490f9e77ee41a00748913e8f"
+  integrity sha512-JI3CNgL2Zdg5lv9ncT2sYKqbAj2RGrCbdzaCckIxMPxn4QuHuOVvYUGmBAXVusBmfG/0sxLmMrnwnBioz+QKdA==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.11.4"
-    "@formatjs/fast-memoize" "1.2.1"
-    "@formatjs/icu-messageformat-parser" "2.1.0"
-    "@formatjs/intl-displaynames" "5.4.3"
-    "@formatjs/intl-listformat" "6.5.3"
-    intl-messageformat "9.13.0"
-    tslib "^2.1.0"
+    "@formatjs/ecma402-abstract" "1.18.0"
+    "@formatjs/fast-memoize" "2.2.0"
+    "@formatjs/icu-messageformat-parser" "2.7.3"
+    "@formatjs/intl-displaynames" "6.6.4"
+    "@formatjs/intl-listformat" "7.5.3"
+    intl-messageformat "10.5.8"
+    tslib "^2.4.0"
 
 "@formatjs/ts-transformer@3.9.4":
   version "3.9.4"
-  resolved "https://registry.npmjs.org/@formatjs/ts-transformer/-/ts-transformer-3.9.4.tgz"
+  resolved "https://registry.yarnpkg.com/@formatjs/ts-transformer/-/ts-transformer-3.9.4.tgz#14b43628d082cb8cd8bc15c4893197b59903ec2c"
   integrity sha512-S5q/zsTodaKtxVxNvbRQ9APenJtm5smXE76usS+5yF2vWQdZHkagmOKWfgvfIbesP4SR2B+i3koqlnlpqSIp5w==
   dependencies:
     "@formatjs/icu-messageformat-parser" "2.1.0"
@@ -1487,19 +1482,19 @@
 
 "@formatjs/ts-transformer@^2.6.0":
   version "2.13.0"
-  resolved "https://registry.npmjs.org/@formatjs/ts-transformer/-/ts-transformer-2.13.0.tgz"
+  resolved "https://registry.yarnpkg.com/@formatjs/ts-transformer/-/ts-transformer-2.13.0.tgz#df47b35cdd209269d282a411f1646e0498aa8fdc"
   integrity sha512-mu7sHXZk1NWZrQ3eUqugpSYo8x5/tXkrI4uIbFqCEC0eNgQaIcoKgVeDFgDAcgG+cEme2atAUYSFF+DFWC4org==
   dependencies:
     intl-messageformat-parser "6.1.2"
     tslib "^2.0.1"
     typescript "^4.0"
 
-"@humanwhocodes/config-array@^0.11.10":
-  version "0.11.10"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.10.tgz#5a3ffe32cc9306365fb3fd572596cd602d5e12d2"
-  integrity sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==
+"@humanwhocodes/config-array@^0.11.11":
+  version "0.11.12"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.12.tgz#549afec9bfce5232ac6325db12765f407e70e3a0"
+  integrity sha512-NlGesA1usRNn6ctHCZ21M4/dKPgW9Nn1FypRdIKKgZOKzkVV4T1FlK5mBiLhHBCDmEbdQG0idrcXlbZfksJ+RA==
   dependencies:
-    "@humanwhocodes/object-schema" "^1.2.1"
+    "@humanwhocodes/object-schema" "^2.0.0"
     debug "^4.1.1"
     minimatch "^3.0.5"
 
@@ -1508,10 +1503,10 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
   integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
 
-"@humanwhocodes/object-schema@^1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
-  integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
+"@humanwhocodes/object-schema@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.0.tgz#04ad39d82176c7da1591c81e78b993cffd8348d8"
+  integrity sha512-9S9QrXY2K0L4AGDcSgTi9vgiCcG8VcBv4Mp7/1hDPYoswIy6Z6KO5blYto82BT8M0MZNRWmCFLpCs3HlpYGGdw==
 
 "@ioredis/commands@^1.1.1":
   version "1.2.0"
@@ -1519,63 +1514,63 @@
   integrity sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==
 
 "@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2":
-  version "0.3.2"
-  resolved "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz"
-  integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098"
+  integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==
   dependencies:
     "@jridgewell/set-array" "^1.0.1"
     "@jridgewell/sourcemap-codec" "^1.4.10"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@jridgewell/resolve-uri@3.1.0", "@jridgewell/resolve-uri@^3.0.3":
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz"
-  integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
+"@jridgewell/resolve-uri@^3.0.3", "@jridgewell/resolve-uri@^3.1.0":
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721"
+  integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==
 
 "@jridgewell/set-array@^1.0.1":
   version "1.1.2"
-  resolved "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz"
+  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
   integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
 
 "@jridgewell/source-map@^0.3.3":
-  version "0.3.3"
-  resolved "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.3.tgz"
-  integrity sha512-b+fsZXeLYi9fEULmfBrhxn4IrPlINf8fiNarzTof004v3lFdntdwa9PF7vFJqm3mg7s+ScJMxXaE3Acp1irZcg==
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.5.tgz#a3bb4d5c6825aab0d281268f47f6ad5853431e91"
+  integrity sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==
   dependencies:
     "@jridgewell/gen-mapping" "^0.3.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10":
-  version "1.4.14"
-  resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz"
-  integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
-
-"@jridgewell/sourcemap-codec@^1.4.13":
+"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.4.15":
   version "1.4.15"
-  resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
   integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
 
 "@jridgewell/trace-mapping@0.3.9":
   version "0.3.9"
-  resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
   integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==
   dependencies:
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
 "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9":
-  version "0.3.17"
-  resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz"
-  integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==
+  version "0.3.20"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz#72e45707cf240fa6b081d0366f8265b0cd10197f"
+  integrity sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==
   dependencies:
-    "@jridgewell/resolve-uri" "3.1.0"
-    "@jridgewell/sourcemap-codec" "1.4.14"
+    "@jridgewell/resolve-uri" "^3.1.0"
+    "@jridgewell/sourcemap-codec" "^1.4.14"
 
 "@kurkle/color@^0.3.0":
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/@kurkle/color/-/color-0.3.2.tgz#5acd38242e8bde4f9986e7913c8fdf49d3aa199f"
   integrity sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==
 
+"@netlify/blobs@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@netlify/blobs/-/blobs-2.2.0.tgz#bf634e6f1a43df3fab2088b5093c9e8eda01b393"
+  integrity sha512-j2C0+IvWj9CLNGPoiA7ETquMFDExZTrv4CarjfE6Au0eY3zlinnnTVae7DE+VQFK+U0CDM/O0VvelNy1QbsdwQ==
+
 "@netlify/esbuild-android-64@0.14.39":
   version "0.14.39"
   resolved "https://registry.yarnpkg.com/@netlify/esbuild-android-64/-/esbuild-android-64-0.14.39.tgz#7bd30aba94a92351d2c5e25e178ceb824f3c2f99"
@@ -1709,30 +1704,44 @@
   dependencies:
     is-promise "^4.0.0"
 
-"@netlify/ipx@^1.4.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@netlify/ipx/-/ipx-1.4.1.tgz#5b0e7508e343b960e7e97d2094089dd1585c88f6"
-  integrity sha512-wOuemSttKv8h4XMC9+RNNv21tn0uIC5avvnwmuFOyPOGzI1nsip01UkxS5lHRX+KX7TdIQxwBzSqde15h/jdRA==
+"@netlify/functions@^2.1.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@netlify/functions/-/functions-2.3.0.tgz#37e2ca41c0034a10de4addbdff7fbb8ec669e8c7"
+  integrity sha512-E3kzXPWMP/r1rAWhjTaXcaOT47dhEvg/eQUJjRLhD9Zzp0WqkdynHr+bqff4rFNv6tuXrtFZrpbPJFKHH0c0zw==
   dependencies:
-    "@netlify/functions" "^1.6.0"
+    "@netlify/serverless-functions-api" "1.9.0"
+    is-promise "^4.0.0"
+
+"@netlify/ipx@^1.4.5":
+  version "1.4.5"
+  resolved "https://registry.yarnpkg.com/@netlify/ipx/-/ipx-1.4.5.tgz#c0b38628457786ca3edf365a9a0cf97cdd9d0883"
+  integrity sha512-QuPxUj8Bn8hXwjdcA1BF+HPLqFJ2e9OCNrKX/s3hoUFjjqQrNSK8lLARAtzGfOM3BRsTXyi/zGdwBE+oJKd0dw==
+  dependencies:
+    "@netlify/functions" "^2.1.0"
     etag "^1.8.1"
     fs-extra "^11.0.0"
-    ipx "^1.0.0"
+    ipx "^1.3.1"
     micromatch "^4.0.5"
-    mkdirp "^1.0.4"
+    mkdirp "^3.0.0"
     murmurhash "^2.0.0"
     node-fetch "^2.0.0"
     ufo "^1.0.0"
     unstorage "^1.0.0"
 
+"@netlify/node-cookies@^0.1.0":
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/@netlify/node-cookies/-/node-cookies-0.1.0.tgz#dda912ba618527695cf519fafa221c5e6777c612"
+  integrity sha512-OAs1xG+FfLX0LoRASpqzVntVV/RpYkgpI0VrUnw2u0Q1qiZUzcPffxRK8HF3gc4GjuhG5ahOEMJ9bswBiZPq0g==
+
 "@netlify/plugin-nextjs@^4.27.3":
-  version "4.39.1"
-  resolved "https://registry.yarnpkg.com/@netlify/plugin-nextjs/-/plugin-nextjs-4.39.1.tgz#e9d5abe281389e30d59cf5839496bb2a14a196db"
-  integrity sha512-gdpTDRYJg8g55MQBy1JMcVJ3UgHC71M/u7BccI9oqvizVtV7ESgyCdJgGFPfZJJGCgWe2ANfQCk1wgA0yosnow==
+  version "4.41.0"
+  resolved "https://registry.yarnpkg.com/@netlify/plugin-nextjs/-/plugin-nextjs-4.41.0.tgz#34c4af80b8f1575d6053d38f59e9b1e0aa1c3321"
+  integrity sha512-Yq1hw/Ip3OGhQhG9xVNIf+lyY6XIbkDzxpXV3wIFbfZDOzgXxBfHixB+AWRoztiYPDknIRC3UOQKwdlRkHyqhw==
   dependencies:
+    "@netlify/blobs" "^2.2.0"
     "@netlify/esbuild" "0.14.39"
     "@netlify/functions" "^1.6.0"
-    "@netlify/ipx" "^1.4.1"
+    "@netlify/ipx" "^1.4.5"
     "@vercel/node-bridge" "^2.1.0"
     chalk "^4.1.2"
     chokidar "^3.5.3"
@@ -1754,62 +1763,70 @@
     slash "^3.0.0"
     tiny-glob "^0.2.9"
 
-"@next/env@13.3.1":
-  version "13.3.1"
-  resolved "https://registry.yarnpkg.com/@next/env/-/env-13.3.1.tgz#589707043065f6b71d411ed9b8f1ffd057c0fd4a"
-  integrity sha512-EDtCoedIZC7JlUQ3uaQpSc4aVmyhbLHmQVALg7pFfQgOTjgSnn7mKtA0DiCMkYvvsx6aFb5octGMtWrOtGXW9A==
+"@netlify/serverless-functions-api@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@netlify/serverless-functions-api/-/serverless-functions-api-1.9.0.tgz#3e58249e57350aee2c5143c282fddb4abbae4a9d"
+  integrity sha512-Jq4uk1Mwa5vyxImupJYXPP+I5yYcp3PtguvXtJRutKdm9DPALXfZVtCQzBWMNdZiqVWCM3La9hvaBsPjSMfeug==
+  dependencies:
+    "@netlify/node-cookies" "^0.1.0"
+    urlpattern-polyfill "8.0.2"
+
+"@next/env@14.0.4":
+  version "14.0.4"
+  resolved "https://registry.yarnpkg.com/@next/env/-/env-14.0.4.tgz#d5cda0c4a862d70ae760e58c0cd96a8899a2e49a"
+  integrity sha512-irQnbMLbUNQpP1wcE5NstJtbuA/69kRfzBrpAD7Gsn8zm/CY6YQYc3HQBz8QPxwISG26tIm5afvvVbu508oBeQ==
 
 "@next/eslint-plugin-next@12.3.4":
   version "12.3.4"
-  resolved "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-12.3.4.tgz"
+  resolved "https://registry.yarnpkg.com/@next/eslint-plugin-next/-/eslint-plugin-next-12.3.4.tgz#e7dc00e2e89ed361f111d687b8534483ec15518b"
   integrity sha512-BFwj8ykJY+zc1/jWANsDprDIu2MgwPOIKxNVnrKvPs+f5TPegrVnem8uScND+1veT4B7F6VeqgaNLFW1Hzl9Og==
   dependencies:
     glob "7.1.7"
 
-"@next/swc-darwin-arm64@13.3.1":
-  version "13.3.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.3.1.tgz#2c9719dd10a9cdf63bf50a7576b05dcf78999fe8"
-  integrity sha512-UXPtriEc/pBP8luSLSCZBcbzPeVv+SSjs9cH/KygTbhmACye8/OOXRZO13Z2Wq1G0gLmEAIHQAOuF+vafPd2lw==
+"@next/swc-darwin-arm64@14.0.4":
+  version "14.0.4"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.0.4.tgz#27b1854c2cd04eb1d5e75081a1a792ad91526618"
+  integrity sha512-mF05E/5uPthWzyYDyptcwHptucf/jj09i2SXBPwNzbgBNc+XnwzrL0U6BmPjQeOL+FiB+iG1gwBeq7mlDjSRPg==
 
-"@next/swc-darwin-x64@13.3.1":
-  version "13.3.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-13.3.1.tgz#0be90342c89e53a390ccd9bece15f7f5cd480049"
-  integrity sha512-lT36yYxosCfLtplFzJWgo0hrPu6/do8+msgM7oQkPeohDNdhjtjFUgOOwdSnPublLR6Mo2Ym4P/wl5OANuD2bw==
+"@next/swc-darwin-x64@14.0.4":
+  version "14.0.4"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.0.4.tgz#9940c449e757d0ee50bb9e792d2600cc08a3eb3b"
+  integrity sha512-IZQ3C7Bx0k2rYtrZZxKKiusMTM9WWcK5ajyhOZkYYTCc8xytmwSzR1skU7qLgVT/EY9xtXDG0WhY6fyujnI3rw==
 
-"@next/swc-linux-arm64-gnu@13.3.1":
-  version "13.3.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.3.1.tgz#a7353265839f8b8569a346a444dc3ab3770d297e"
-  integrity sha512-wRb76nLWJhonH8s3kxC/1tFguEkeOPayIwe9mkaz1G/yeS3OrjeyKMJsb4+Kdg0zbTo53bNCOl59NNtDM7yyyw==
+"@next/swc-linux-arm64-gnu@14.0.4":
+  version "14.0.4"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.0.4.tgz#0eafd27c8587f68ace7b4fa80695711a8434de21"
+  integrity sha512-VwwZKrBQo/MGb1VOrxJ6LrKvbpo7UbROuyMRvQKTFKhNaXjUmKTu7wxVkIuCARAfiI8JpaWAnKR+D6tzpCcM4w==
 
-"@next/swc-linux-arm64-musl@13.3.1":
-  version "13.3.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.3.1.tgz#24552e6102c350e372f83f505a1d93c880551a50"
-  integrity sha512-qz3BzjJRZ16Iq/jrp+pjiYOc0jTjHlfmxQmZk9x/+5uhRP6/eWQSTAPVJ33BMo6oK5O5N4644OgTAbzXzorecg==
+"@next/swc-linux-arm64-musl@14.0.4":
+  version "14.0.4"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.0.4.tgz#2b0072adb213f36dada5394ea67d6e82069ae7dd"
+  integrity sha512-8QftwPEW37XxXoAwsn+nXlodKWHfpMaSvt81W43Wh8dv0gkheD+30ezWMcFGHLI71KiWmHK5PSQbTQGUiidvLQ==
 
-"@next/swc-linux-x64-gnu@13.3.1":
-  version "13.3.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.3.1.tgz#5f335a683b6eafa52307b12af97782993b6c45ff"
-  integrity sha512-6mgkLmwlyWlomQmpl21I3hxgqE5INoW4owTlcLpNsd1V4wP+J46BlI/5zV5KWWbzjfncIqzXoeGs5Eg+1GHODA==
+"@next/swc-linux-x64-gnu@14.0.4":
+  version "14.0.4"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.0.4.tgz#68c67d20ebc8e3f6ced6ff23a4ba2a679dbcec32"
+  integrity sha512-/s/Pme3VKfZAfISlYVq2hzFS8AcAIOTnoKupc/j4WlvF6GQ0VouS2Q2KEgPuO1eMBwakWPB1aYFIA4VNVh667A==
 
-"@next/swc-linux-x64-musl@13.3.1":
-  version "13.3.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.3.1.tgz#58e5aad6f97203a0788783f66324456c8f9cdb50"
-  integrity sha512-uqm5sielhQmKJM+qayIhgZv1KlS5pqTdQ99b+Z7hMWryXS96qE0DftTmMZowBcUL6x7s2vSXyH5wPtO1ON7LBg==
+"@next/swc-linux-x64-musl@14.0.4":
+  version "14.0.4"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.0.4.tgz#67cd81b42fb2caf313f7992fcf6d978af55a1247"
+  integrity sha512-m8z/6Fyal4L9Bnlxde5g2Mfa1Z7dasMQyhEhskDATpqr+Y0mjOBZcXQ7G5U+vgL22cI4T7MfvgtrM2jdopqWaw==
 
-"@next/swc-win32-arm64-msvc@13.3.1":
-  version "13.3.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.3.1.tgz#f8ed1badab57ed4503969758754e6fb0cf326753"
-  integrity sha512-WomIiTj/v3LevltlibNQKmvrOymNRYL+a0dp5R73IwPWN5FvXWwSELN/kiNALig/+T3luc4qHNTyvMCp9L6U5Q==
+"@next/swc-win32-arm64-msvc@14.0.4":
+  version "14.0.4"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.0.4.tgz#be06585906b195d755ceda28f33c633e1443f1a3"
+  integrity sha512-7Wv4PRiWIAWbm5XrGz3D8HUkCVDMMz9igffZG4NB1p4u1KoItwx9qjATHz88kwCEal/HXmbShucaslXCQXUM5w==
 
-"@next/swc-win32-ia32-msvc@13.3.1":
-  version "13.3.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.3.1.tgz#7f599c8975b09ee5527cc49b9e5a4d13be50635a"
-  integrity sha512-M+PoH+0+q658wRUbs285RIaSTYnGBSTdweH/0CdzDgA6Q4rBM0sQs4DHmO3BPP0ltCO/vViIoyG7ks66XmCA5g==
+"@next/swc-win32-ia32-msvc@14.0.4":
+  version "14.0.4"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.0.4.tgz#e76cabefa9f2d891599c3d85928475bd8d3f6600"
+  integrity sha512-zLeNEAPULsl0phfGb4kdzF/cAVIfaC7hY+kt0/d+y9mzcZHsMS3hAS829WbJ31DkSlVKQeHEjZHIdhN+Pg7Gyg==
 
-"@next/swc-win32-x64-msvc@13.3.1":
-  version "13.3.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.3.1.tgz#192d43ab44ebb98bd4f5865d0e1d7ce62703182f"
-  integrity sha512-Sl1F4Vp5Z1rNXWZYqJwMuWRRol4bqOB6+/d7KqkgQ4AcafKPN1PZmpkCoxv4UFHtFNIB7EotnuIhtXu3zScicQ==
+"@next/swc-win32-x64-msvc@14.0.4":
+  version "14.0.4"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.0.4.tgz#e74892f1a9ccf41d3bf5979ad6d3d77c07b9cba1"
+  integrity sha512-yEh2+R8qDlDCjxVpzOTEpBLQTEFAcP2A8fUFLaWNap9GitYKkKv1//y2S6XY6zsR4rCOPRpU7plYDR+az2n30A==
 
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
@@ -1832,22 +1849,119 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@prisma/client@5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.0.0.tgz#9f0cd4164f4ffddb28bb1811c27eb7fa1e01a087"
-  integrity sha512-XlO5ELNAQ7rV4cXIDJUNBEgdLwX3pjtt9Q/RHqDpGf43szpNJx2hJnggfFs7TKNx0cOFsl6KJCSfqr5duEU/bQ==
+"@parcel/watcher-android-arm64@2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.3.0.tgz#d82e74bb564ebd4d8a88791d273a3d2bd61e27ab"
+  integrity sha512-f4o9eA3dgk0XRT3XhB0UWpWpLnKgrh1IwNJKJ7UJek7eTYccQ8LR7XUWFKqw6aEq5KUNlCcGvSzKqSX/vtWVVA==
+
+"@parcel/watcher-darwin-arm64@2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.3.0.tgz#c9cd03f8f233d512fcfc873d5b4e23f1569a82ad"
+  integrity sha512-mKY+oijI4ahBMc/GygVGvEdOq0L4DxhYgwQqYAz/7yPzuGi79oXrZG52WdpGA1wLBPrYb0T8uBaGFo7I6rvSKw==
+
+"@parcel/watcher-darwin-x64@2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.3.0.tgz#83c902994a2a49b9e1ab5050dba24876fdc2c219"
+  integrity sha512-20oBj8LcEOnLE3mgpy6zuOq8AplPu9NcSSSfyVKgfOhNAc4eF4ob3ldj0xWjGGbOF7Dcy1Tvm6ytvgdjlfUeow==
+
+"@parcel/watcher-freebsd-x64@2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.3.0.tgz#7a0f4593a887e2752b706aff2dae509aef430cf6"
+  integrity sha512-7LftKlaHunueAEiojhCn+Ef2CTXWsLgTl4hq0pkhkTBFI3ssj2bJXmH2L67mKpiAD5dz66JYk4zS66qzdnIOgw==
+
+"@parcel/watcher-linux-arm-glibc@2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.3.0.tgz#3fc90c3ebe67de3648ed2f138068722f9b1d47da"
+  integrity sha512-1apPw5cD2xBv1XIHPUlq0cO6iAaEUQ3BcY0ysSyD9Kuyw4MoWm1DV+W9mneWI+1g6OeP6dhikiFE6BlU+AToTQ==
+
+"@parcel/watcher-linux-arm64-glibc@2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.3.0.tgz#f7bbbf2497d85fd11e4c9e9c26ace8f10ea9bcbc"
+  integrity sha512-mQ0gBSQEiq1k/MMkgcSB0Ic47UORZBmWoAWlMrTW6nbAGoLZP+h7AtUM7H3oDu34TBFFvjy4JCGP43JlylkTQA==
+
+"@parcel/watcher-linux-arm64-musl@2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.3.0.tgz#de131a9fcbe1fa0854e9cbf4c55bed3b35bcff43"
+  integrity sha512-LXZAExpepJew0Gp8ZkJ+xDZaTQjLHv48h0p0Vw2VMFQ8A+RKrAvpFuPVCVwKJCr5SE+zvaG+Etg56qXvTDIedw==
+
+"@parcel/watcher-linux-x64-glibc@2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.3.0.tgz#193dd1c798003cdb5a1e59470ff26300f418a943"
+  integrity sha512-P7Wo91lKSeSgMTtG7CnBS6WrA5otr1K7shhSjKHNePVmfBHDoAOHYRXgUmhiNfbcGk0uMCHVcdbfxtuiZCHVow==
+
+"@parcel/watcher-linux-x64-musl@2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.3.0.tgz#6dbdb86d96e955ab0fe4a4b60734ec0025a689dd"
+  integrity sha512-+kiRE1JIq8QdxzwoYY+wzBs9YbJ34guBweTK8nlzLKimn5EQ2b2FSC+tAOpq302BuIMjyuUGvBiUhEcLIGMQ5g==
+
+"@parcel/watcher-wasm@2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-wasm/-/watcher-wasm-2.3.0.tgz#73b66c6fbd2a3326ae86a1ec77eab7139d0dd725"
+  integrity sha512-ejBAX8H0ZGsD8lSICDNyMbSEtPMWgDL0WFCt/0z7hyf5v8Imz4rAM8xY379mBsECkq/Wdqa5WEDLqtjZ+6NxfA==
   dependencies:
-    "@prisma/engines-version" "4.17.0-26.6b0aef69b7cdfc787f822ecd7cdc76d5f1991584"
+    is-glob "^4.0.3"
+    micromatch "^4.0.5"
+    napi-wasm "^1.1.0"
 
-"@prisma/engines-version@4.17.0-26.6b0aef69b7cdfc787f822ecd7cdc76d5f1991584":
-  version "4.17.0-26.6b0aef69b7cdfc787f822ecd7cdc76d5f1991584"
-  resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-4.17.0-26.6b0aef69b7cdfc787f822ecd7cdc76d5f1991584.tgz#b36eda5620872d3fac810c302a7e46cf41daa033"
-  integrity sha512-HHiUF6NixsldsP3JROq07TYBLEjXFKr6PdH8H4gK/XAoTmIplOJBCgrIUMrsRAnEuGyRoRLXKXWUb943+PFoKQ==
+"@parcel/watcher-win32-arm64@2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.3.0.tgz#59da26a431da946e6c74fa6b0f30b120ea6650b6"
+  integrity sha512-35gXCnaz1AqIXpG42evcoP2+sNL62gZTMZne3IackM+6QlfMcJLy3DrjuL6Iks7Czpd3j4xRBzez3ADCj1l7Aw==
 
-"@prisma/engines@5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-5.0.0.tgz#5249650eabe77c458c90f2be97d8210353c2e22e"
-  integrity sha512-kyT/8fd0OpWmhAU5YnY7eP31brW1q1YrTGoblWrhQJDiN/1K+Z8S1kylcmtjqx5wsUGcP1HBWutayA/jtyt+sg==
+"@parcel/watcher-win32-ia32@2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.3.0.tgz#3ee6a18b08929cd3b788e8cc9547fd9a540c013a"
+  integrity sha512-FJS/IBQHhRpZ6PiCjFt1UAcPr0YmCLHRbTc00IBTrelEjlmmgIVLeOx4MSXzx2HFEy5Jo5YdhGpxCuqCyDJ5ow==
+
+"@parcel/watcher-win32-x64@2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.3.0.tgz#14e7246289861acc589fd608de39fe5d8b4bb0a7"
+  integrity sha512-dLx+0XRdMnVI62kU3wbXvbIRhLck4aE28bIGKbRGS7BJNt54IIj9+c/Dkqb+7DJEbHUZAX1bwaoM8PqVlHJmCA==
+
+"@parcel/watcher@^2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.3.0.tgz#803517abbc3981a1a1221791d9f59dc0590d50f9"
+  integrity sha512-pW7QaFiL11O0BphO+bq3MgqeX/INAk9jgBldVDYjlQPO4VddoZnF22TcF9onMhnLVHuNqBJeRf+Fj7eezi/+rQ==
+  dependencies:
+    detect-libc "^1.0.3"
+    is-glob "^4.0.3"
+    micromatch "^4.0.5"
+    node-addon-api "^7.0.0"
+  optionalDependencies:
+    "@parcel/watcher-android-arm64" "2.3.0"
+    "@parcel/watcher-darwin-arm64" "2.3.0"
+    "@parcel/watcher-darwin-x64" "2.3.0"
+    "@parcel/watcher-freebsd-x64" "2.3.0"
+    "@parcel/watcher-linux-arm-glibc" "2.3.0"
+    "@parcel/watcher-linux-arm64-glibc" "2.3.0"
+    "@parcel/watcher-linux-arm64-musl" "2.3.0"
+    "@parcel/watcher-linux-x64-glibc" "2.3.0"
+    "@parcel/watcher-linux-x64-musl" "2.3.0"
+    "@parcel/watcher-win32-arm64" "2.3.0"
+    "@parcel/watcher-win32-ia32" "2.3.0"
+    "@parcel/watcher-win32-x64" "2.3.0"
+
+"@prisma/client@5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.6.0.tgz#1c15932250d5658fe0127e62faf4ecd96a877259"
+  integrity sha512-mUDefQFa1wWqk4+JhKPYq8BdVoFk9NFMBXUI8jAkBfQTtgx8WPx02U2HB/XbAz3GSUJpeJOKJQtNvaAIDs6sug==
+  dependencies:
+    "@prisma/engines-version" "5.6.0-32.e95e739751f42d8ca026f6b910f5a2dc5adeaeee"
+
+"@prisma/engines-version@5.6.0-32.e95e739751f42d8ca026f6b910f5a2dc5adeaeee":
+  version "5.6.0-32.e95e739751f42d8ca026f6b910f5a2dc5adeaeee"
+  resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-5.6.0-32.e95e739751f42d8ca026f6b910f5a2dc5adeaeee.tgz#57b003ab5e1ea1523b5cdd7f06b24ebcf5c7fd8c"
+  integrity sha512-UoFgbV1awGL/3wXuUK3GDaX2SolqczeeJ5b4FVec9tzeGbSWJboPSbT0psSrmgYAKiKnkOPFSLlH6+b+IyOwAw==
+
+"@prisma/engines@5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-5.6.0.tgz#82c445aa10633bbc0388aa2d6e411a0bd94c9439"
+  integrity sha512-Mt2q+GNJpU2vFn6kif24oRSBQv1KOkYaterQsi0k2/lA+dLvhRX6Lm26gon6PYHwUM8/h8KRgXIUMU0PCLB6bw==
+
+"@prisma/extension-read-replicas@^0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@prisma/extension-read-replicas/-/extension-read-replicas-0.3.0.tgz#2842a7c928f957c1dd58a6256104797596d43426"
+  integrity sha512-F9+rSmYday6GT2qjhJtkZcBOpLO5LtpvFcMGqrBDHf+78LEdSuxfFjOxYlNuqk4B+th62yxpbhfpmB9/Mca14Q==
 
 "@react-spring/animated@~9.7.3":
   version "9.7.3"
@@ -1857,7 +1971,7 @@
     "@react-spring/shared" "~9.7.3"
     "@react-spring/types" "~9.7.3"
 
-"@react-spring/core@~9.7.1", "@react-spring/core@~9.7.3":
+"@react-spring/core@~9.7.3":
   version "9.7.3"
   resolved "https://registry.yarnpkg.com/@react-spring/core/-/core-9.7.3.tgz#60056bcb397f2c4f371c6c9a5f882db77ae90095"
   integrity sha512-IqFdPVf3ZOC1Cx7+M0cXf4odNLxDC+n7IN3MDcVCTIOSBfqEcBebSv+vlY5AhM0zw05PDbjKrNmBpzv/AqpjnQ==
@@ -1866,26 +1980,6 @@
     "@react-spring/shared" "~9.7.3"
     "@react-spring/types" "~9.7.3"
 
-"@react-spring/konva@~9.7.1", "@react-spring/konva@~9.7.3":
-  version "9.7.3"
-  resolved "https://registry.yarnpkg.com/@react-spring/konva/-/konva-9.7.3.tgz#16bd29dd4860a99e960a72987c8bcfc828b22119"
-  integrity sha512-R9sY6SiPGYqz1383P5qppg5z57YfChVknOC1UxxaGxpw+WiZa8fZ4zmZobslrw+os3/+HAXZv8O+EvU/nQpf7g==
-  dependencies:
-    "@react-spring/animated" "~9.7.3"
-    "@react-spring/core" "~9.7.3"
-    "@react-spring/shared" "~9.7.3"
-    "@react-spring/types" "~9.7.3"
-
-"@react-spring/native@~9.7.1", "@react-spring/native@~9.7.3":
-  version "9.7.3"
-  resolved "https://registry.yarnpkg.com/@react-spring/native/-/native-9.7.3.tgz#ee38d7c23482cfb4916c9b3c021de2995a4f553a"
-  integrity sha512-4mpxX3FuEBCUT6ae2fjhxcJW6bhr2FBwFf274eXB7n+U30Gdg8Wo2qYwcUnmiAA0S3dvP8vLTazx3+CYWFShnA==
-  dependencies:
-    "@react-spring/animated" "~9.7.3"
-    "@react-spring/core" "~9.7.3"
-    "@react-spring/shared" "~9.7.3"
-    "@react-spring/types" "~9.7.3"
-
 "@react-spring/shared@~9.7.3":
   version "9.7.3"
   resolved "https://registry.yarnpkg.com/@react-spring/shared/-/shared-9.7.3.tgz#4cf29797847c689912aec4e62e34c99a4d5d9e53"
@@ -1893,22 +1987,12 @@
   dependencies:
     "@react-spring/types" "~9.7.3"
 
-"@react-spring/three@~9.7.1", "@react-spring/three@~9.7.3":
-  version "9.7.3"
-  resolved "https://registry.yarnpkg.com/@react-spring/three/-/three-9.7.3.tgz#4358a0c4640efe2972c4f7d0f7cd4efe927471c1"
-  integrity sha512-Q1p512CqUlmMK8UMBF/Rj79qndhOWq4XUTayxMP9S892jiXzWQuj+xC3Xvm59DP/D4JXusXpxxqfgoH+hmOktA==
-  dependencies:
-    "@react-spring/animated" "~9.7.3"
-    "@react-spring/core" "~9.7.3"
-    "@react-spring/shared" "~9.7.3"
-    "@react-spring/types" "~9.7.3"
-
 "@react-spring/types@~9.7.3":
   version "9.7.3"
   resolved "https://registry.yarnpkg.com/@react-spring/types/-/types-9.7.3.tgz#ea78fd447cbc2612c1f5d55852e3c331e8172a0b"
   integrity sha512-Kpx/fQ/ZFX31OtlqVEFfgaD1ACzul4NksrvIgYfIFq9JpDHFwQkMVZ10tbo0FU/grje4rcL4EIrjekl3kYwgWw==
 
-"@react-spring/web@~9.7.1", "@react-spring/web@~9.7.3":
+"@react-spring/web@^9.7.3":
   version "9.7.3"
   resolved "https://registry.yarnpkg.com/@react-spring/web/-/web-9.7.3.tgz#d9f4e17fec259f1d65495a19502ada4f5b57fa3d"
   integrity sha512-BXt6BpS9aJL/QdVqEIX9YoUy8CE6TJrU0mNCqSoxdXlIeNcEBWOfIyE6B14ENNsyQKS3wOWkiJfco0tCr/9tUg==
@@ -1918,89 +2002,79 @@
     "@react-spring/shared" "~9.7.3"
     "@react-spring/types" "~9.7.3"
 
-"@react-spring/zdog@~9.7.1", "@react-spring/zdog@~9.7.3":
-  version "9.7.3"
-  resolved "https://registry.yarnpkg.com/@react-spring/zdog/-/zdog-9.7.3.tgz#8ccc7316f6d3460ed244d9e3f60de9b4c4a848ac"
-  integrity sha512-L+yK/1PvNi9n8cldiJ309k4LdxcPkeWE0W18l1zrP1IBIyd5NB5EPA8DMsGr9gtNnnIujtEzZk+4JIOjT8u/tw==
-  dependencies:
-    "@react-spring/animated" "~9.7.3"
-    "@react-spring/core" "~9.7.3"
-    "@react-spring/shared" "~9.7.3"
-    "@react-spring/types" "~9.7.3"
+"@redis/bloom@1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@redis/bloom/-/bloom-1.2.0.tgz#d3fd6d3c0af3ef92f26767b56414a370c7b63b71"
+  integrity sha512-HG2DFjYKbpNmVXsa0keLHp/3leGJz1mjh09f2RLGGLQZzSHpkmZWuwJbAvo3QcRY8p80m5+ZdXZdYOSBLlp7Cg==
 
-"@redis/bloom@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/@redis/bloom/-/bloom-1.1.0.tgz"
-  integrity sha512-9QovlxmpRtvxVbN0UBcv8WfdSMudNZZTFqCsnBszcQXqaZb/TVe30ScgGEO7u1EAIacTPAo7/oCYjYAxiHLanQ==
-
-"@redis/client@1.4.2":
-  version "1.4.2"
-  resolved "https://registry.npmjs.org/@redis/client/-/client-1.4.2.tgz"
-  integrity sha512-oUdEjE0I7JS5AyaAjkD3aOXn9NhO7XKyPyXEyrgFDu++VrVBHUPnV6dgEya9TcMuj5nIJRuCzCm8ZP+c9zCHPw==
+"@redis/client@1.5.11":
+  version "1.5.11"
+  resolved "https://registry.yarnpkg.com/@redis/client/-/client-1.5.11.tgz#5ee8620fea56c67cb427228c35d8403518efe622"
+  integrity sha512-cV7yHcOAtNQ5x/yQl7Yw1xf53kO0FNDTdDU6bFIMbW6ljB7U7ns0YRM+QIkpoqTAt6zK5k9Fq0QWlUbLcq9AvA==
   dependencies:
-    cluster-key-slot "1.1.1"
+    cluster-key-slot "1.1.2"
     generic-pool "3.9.0"
     yallist "4.0.0"
 
 "@redis/graph@1.1.0":
   version "1.1.0"
-  resolved "https://registry.npmjs.org/@redis/graph/-/graph-1.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/@redis/graph/-/graph-1.1.0.tgz#cc2b82e5141a29ada2cce7d267a6b74baa6dd519"
   integrity sha512-16yZWngxyXPd+MJxeSr0dqh2AIOi8j9yXKcKCwVaKDbH3HTuETpDVPcLujhFYVPtYrngSco31BUcSa9TH31Gqg==
 
-"@redis/json@1.0.4":
-  version "1.0.4"
-  resolved "https://registry.npmjs.org/@redis/json/-/json-1.0.4.tgz"
-  integrity sha512-LUZE2Gdrhg0Rx7AN+cZkb1e6HjoSKaeeW8rYnt89Tly13GBI5eP4CwDVr+MY8BAYfCg4/N15OUrtLoona9uSgw==
+"@redis/json@1.0.6":
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/@redis/json/-/json-1.0.6.tgz#b7a7725bbb907765d84c99d55eac3fcf772e180e"
+  integrity sha512-rcZO3bfQbm2zPRpqo82XbW8zg4G/w4W3tI7X8Mqleq9goQjAGLL7q/1n1ZX4dXEAmORVZ4s1+uKLaUOg7LrUhw==
 
-"@redis/search@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/@redis/search/-/search-1.1.0.tgz"
-  integrity sha512-NyFZEVnxIJEybpy+YskjgOJRNsfTYqaPbK/Buv6W2kmFNaRk85JiqjJZA5QkRmWvGbyQYwoO5QfDi2wHskKrQQ==
+"@redis/search@1.1.5":
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/@redis/search/-/search-1.1.5.tgz#682b68114049ff28fdf2d82c580044dfb74199fe"
+  integrity sha512-hPP8w7GfGsbtYEJdn4n7nXa6xt6hVZnnDktKW4ArMaFQ/m/aR7eFvsLQmG/mn1Upq99btPJk+F27IQ2dYpCoUg==
 
-"@redis/time-series@1.0.4":
-  version "1.0.4"
-  resolved "https://registry.npmjs.org/@redis/time-series/-/time-series-1.0.4.tgz"
-  integrity sha512-ThUIgo2U/g7cCuZavucQTQzA9g9JbDDY2f64u3AbAoz/8vE2lt2U37LamDUVChhaDA3IRT9R6VvJwqnUfTJzng==
+"@redis/time-series@1.0.5":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@redis/time-series/-/time-series-1.0.5.tgz#a6d70ef7a0e71e083ea09b967df0a0ed742bc6ad"
+  integrity sha512-IFjIgTusQym2B5IZJG3XKr5llka7ey84fw/NOYqESP5WUfQs9zz1ww/9+qoz4ka/S6KcGBodzlCeZ5UImKbscg==
 
 "@rollup/plugin-alias@^5.0.0":
-  version "5.0.0"
-  resolved "https://registry.npmjs.org/@rollup/plugin-alias/-/plugin-alias-5.0.0.tgz"
-  integrity sha512-l9hY5chSCjuFRPsnRm16twWBiSApl2uYFLsepQYwtBuAxNMQ/1dJqADld40P0Jkqm65GRTLy/AC6hnpVebtLsA==
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-alias/-/plugin-alias-5.0.1.tgz#c84a43e021f5e0ebf1cc3c5af518c8371251bb77"
+  integrity sha512-JObvbWdOHoMy9W7SU0lvGhDtWq9PllP5mjpAy+TUslZG/WzOId9u80Hsqq1vCUn9pFJ0cxpdcnAv+QzU2zFH3Q==
   dependencies:
     slash "^4.0.0"
 
-"@rollup/plugin-buble@^0.21.3":
-  version "0.21.3"
-  resolved "https://registry.npmjs.org/@rollup/plugin-buble/-/plugin-buble-0.21.3.tgz"
-  integrity sha512-Iv8cCuFPnMdqV4pcyU+OrfjOfagPArRQ1PyQjx5KgHk3dARedI+8PNTLSMpJts0lQJr8yF2pAU4GxpxCBJ9HYw==
+"@rollup/plugin-buble@^1.0.2":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-buble/-/plugin-buble-1.0.3.tgz#6ce275f062a3bac583472cf14f54aa5f0957dccf"
+  integrity sha512-QYD9BKkJoof0FdCFeSYYhF6/Y8e0Mnf+098xGgmWOFJ4UPHlWujjqOYeVwEm2hJPOmlR5k7HPUdAjqtOWhN64Q==
   dependencies:
-    "@rollup/pluginutils" "^3.0.8"
+    "@rollup/pluginutils" "^5.0.1"
     "@types/buble" "^0.19.2"
     buble "^0.20.0"
 
-"@rollup/plugin-commonjs@^24.1.0":
-  version "24.1.0"
-  resolved "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-24.1.0.tgz"
-  integrity sha512-eSL45hjhCWI0jCCXcNtLVqM5N1JlBGvlFfY0m6oOYnLCJ6N0qEXoZql4sY2MOUArzhH4SA/qBpTxvvZp2Sc+DQ==
+"@rollup/plugin-commonjs@^25.0.4":
+  version "25.0.7"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-25.0.7.tgz#145cec7589ad952171aeb6a585bbeabd0fd3b4cf"
+  integrity sha512-nEvcR+LRjEjsaSsc4x3XZfCCvZIaSMenZu/OiwOKGN2UhQpAYI7ru7czFvyWbErlpoGjnSX3D5Ch5FcMA3kRWQ==
   dependencies:
     "@rollup/pluginutils" "^5.0.1"
     commondir "^1.0.1"
     estree-walker "^2.0.2"
     glob "^8.0.3"
     is-reference "1.2.1"
-    magic-string "^0.27.0"
+    magic-string "^0.30.3"
 
 "@rollup/plugin-json@^6.0.0":
-  version "6.0.0"
-  resolved "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-6.0.0.tgz"
-  integrity sha512-i/4C5Jrdr1XUarRhVu27EEwjt4GObltD7c+MkCIpO2QIbojw8MUs+CCTqOphQi3Qtg1FLmYt+l+6YeoIf51J7w==
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-json/-/plugin-json-6.0.1.tgz#7e2efcf5ed549963f1444e010611d22f463931c0"
+  integrity sha512-RgVfl5hWMkxN1h/uZj8FVESvPuBJ/uf6ly6GTj0GONnkfoBN5KC0MSz+PN2OLDgYXMhtG0mWpTrkiOjoxAIevw==
   dependencies:
     "@rollup/pluginutils" "^5.0.1"
 
-"@rollup/plugin-node-resolve@^15.0.2":
-  version "15.1.0"
-  resolved "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.1.0.tgz"
-  integrity sha512-xeZHCgsiZ9pzYVgAo9580eCGqwh/XCEUM9q6iQfGNocjgkufHAqC3exA+45URvhiYV8sBF9RlBai650eNs7AsA==
+"@rollup/plugin-node-resolve@^15.2.0":
+  version "15.2.3"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.2.3.tgz#e5e0b059bd85ca57489492f295ce88c2d4b0daf9"
+  integrity sha512-j/lym8nf5E21LwBT4Df1VD6hRO2L2iwUeUmP7litikRsVp1H6NWx20NEp0Y7su+7XGc476GnXXc4kFeZNGmaSQ==
   dependencies:
     "@rollup/pluginutils" "^5.0.1"
     "@types/resolve" "1.20.2"
@@ -2009,214 +2083,124 @@
     is-module "^1.0.0"
     resolve "^1.22.1"
 
-"@rollup/plugin-replace@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-4.0.0.tgz"
-  integrity sha512-+rumQFiaNac9y64OHtkHGmdjm7us9bo1PlbgQfdihQtuNxzjpaB064HbRnewUOggLQxVCCyINfStkgmBeQpv1g==
+"@rollup/plugin-replace@^5.0.2":
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-5.0.4.tgz#fef548dc751d06747e8dca5b0e8e1fbf647ac7e1"
+  integrity sha512-E2hmRnlh09K8HGT0rOnnri9OTh+BILGr7NVJGB30S4E3cLRn3J0xjdiyOZ74adPs4NiAMgrjUMGAZNJDBgsdmQ==
   dependencies:
-    "@rollup/pluginutils" "^3.1.0"
-    magic-string "^0.25.7"
-
-"@rollup/pluginutils@^3.0.8", "@rollup/pluginutils@^3.1.0":
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz"
-  integrity sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==
-  dependencies:
-    "@types/estree" "0.0.39"
-    estree-walker "^1.0.1"
-    picomatch "^2.2.2"
+    "@rollup/pluginutils" "^5.0.1"
+    magic-string "^0.30.3"
 
 "@rollup/pluginutils@^5.0.1", "@rollup/pluginutils@^5.0.2":
-  version "5.0.2"
-  resolved "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.0.2.tgz"
-  integrity sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==
+  version "5.0.5"
+  resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.0.5.tgz#bbb4c175e19ebfeeb8c132c2eea0ecb89941a66c"
+  integrity sha512-6aEYR910NyP73oHiJglti74iRyOwgFU4x3meH/H8OJx6Ry0j6cOVZ5X/wTvub7G7Ao6qaHBEaNsV3GLJkSsF+Q==
   dependencies:
     "@types/estree" "^1.0.0"
     estree-walker "^2.0.2"
     picomatch "^2.3.1"
 
 "@rushstack/eslint-patch@^1.1.3":
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz"
-  integrity sha512-sXo/qW2/pAcmT43VoRKOJbDOfV3cYpq3szSVfIThQXNt+E4DfKj361vaAt3c88U5tPUxzEswam7GW48PJqtKAg==
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.5.1.tgz#5f1b518ec5fa54437c0b7c4a821546c64fed6922"
+  integrity sha512-6i/8UoL0P5y4leBIGzvkZdS85RDMG9y1ihZzmTZQ5LdHUYmZ7pKFoj8X0236s3lusPs1Fa5HTQUpwI+UfTcmeA==
 
-"@svgr/babel-plugin-add-jsx-attribute@^6.5.1":
-  version "6.5.1"
-  resolved "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-6.5.1.tgz"
-  integrity sha512-9PYGcXrAxitycIjRmZB+Q0JaN07GZIWaTBIGQzfaZv+qr1n8X1XUEJ5rZ/vx6OVD9RRYlrNnXWExQXcmZeD/BQ==
+"@svgr/babel-plugin-add-jsx-attribute@8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-8.0.0.tgz#4001f5d5dd87fa13303e36ee106e3ff3a7eb8b22"
+  integrity sha512-b9MIk7yhdS1pMCZM8VeNfUlSKVRhsHZNMl5O9SfaX0l0t5wjdgu4IDzGB8bpnGBBOjGST3rRFVsaaEtI4W6f7g==
 
-"@svgr/babel-plugin-add-jsx-attribute@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-7.0.0.tgz"
-  integrity sha512-khWbXesWIP9v8HuKCl2NU2HNAyqpSQ/vkIl36Nbn4HIwEYSRWL0H7Gs6idJdha2DkpFDWlsqMELvoCE8lfFY6Q==
+"@svgr/babel-plugin-remove-jsx-attribute@8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-8.0.0.tgz#69177f7937233caca3a1afb051906698f2f59186"
+  integrity sha512-BcCkm/STipKvbCl6b7QFrMh/vx00vIP63k2eM66MfHJzPr6O2U0jYEViXkHJWqXqQYjdeA9cuCl5KWmlwjDvbA==
 
-"@svgr/babel-plugin-remove-jsx-attribute@*", "@svgr/babel-plugin-remove-jsx-attribute@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-7.0.0.tgz"
-  integrity sha512-iiZaIvb3H/c7d3TH2HBeK91uI2rMhZNwnsIrvd7ZwGLkFw6mmunOCoVnjdYua662MqGFxlN9xTq4fv9hgR4VXQ==
+"@svgr/babel-plugin-remove-jsx-empty-expression@8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-8.0.0.tgz#c2c48104cfd7dcd557f373b70a56e9e3bdae1d44"
+  integrity sha512-5BcGCBfBxB5+XSDSWnhTThfI9jcO5f0Ai2V24gZpG+wXF14BzwxxdDb4g6trdOux0rhibGs385BeFMSmxtS3uA==
 
-"@svgr/babel-plugin-remove-jsx-empty-expression@*", "@svgr/babel-plugin-remove-jsx-empty-expression@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-7.0.0.tgz"
-  integrity sha512-sQQmyo+qegBx8DfFc04PFmIO1FP1MHI1/QEpzcIcclo5OAISsOJPW76ZIs0bDyO/DBSJEa/tDa1W26pVtt0FRw==
+"@svgr/babel-plugin-replace-jsx-attribute-value@8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-8.0.0.tgz#8fbb6b2e91fa26ac5d4aa25c6b6e4f20f9c0ae27"
+  integrity sha512-KVQ+PtIjb1BuYT3ht8M5KbzWBhdAjjUPdlMtpuw/VjT8coTrItWX6Qafl9+ji831JaJcu6PJNKCV0bp01lBNzQ==
 
-"@svgr/babel-plugin-replace-jsx-attribute-value@^6.5.1":
-  version "6.5.1"
-  resolved "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-6.5.1.tgz"
-  integrity sha512-8DPaVVE3fd5JKuIC29dqyMB54sA6mfgki2H2+swh+zNJoynC8pMPzOkidqHOSc6Wj032fhl8Z0TVn1GiPpAiJg==
+"@svgr/babel-plugin-svg-dynamic-title@8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-8.0.0.tgz#1d5ba1d281363fc0f2f29a60d6d936f9bbc657b0"
+  integrity sha512-omNiKqwjNmOQJ2v6ge4SErBbkooV2aAWwaPFs2vUY7p7GhVkzRkJ00kILXQvRhA6miHnNpXv7MRnnSjdRjK8og==
 
-"@svgr/babel-plugin-replace-jsx-attribute-value@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-7.0.0.tgz"
-  integrity sha512-i6MaAqIZXDOJeikJuzocByBf8zO+meLwfQ/qMHIjCcvpnfvWf82PFvredEZElErB5glQFJa2KVKk8N2xV6tRRA==
+"@svgr/babel-plugin-svg-em-dimensions@8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-8.0.0.tgz#35e08df300ea8b1d41cb8f62309c241b0369e501"
+  integrity sha512-mURHYnu6Iw3UBTbhGwE/vsngtCIbHE43xCRK7kCw4t01xyGqb2Pd+WXekRRoFOBIY29ZoOhUCTEweDMdrjfi9g==
 
-"@svgr/babel-plugin-svg-dynamic-title@^6.5.1":
-  version "6.5.1"
-  resolved "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-6.5.1.tgz"
-  integrity sha512-FwOEi0Il72iAzlkaHrlemVurgSQRDFbk0OC8dSvD5fSBPHltNh7JtLsxmZUhjYBZo2PpcU/RJvvi6Q0l7O7ogw==
+"@svgr/babel-plugin-transform-react-native-svg@8.1.0":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-8.1.0.tgz#90a8b63998b688b284f255c6a5248abd5b28d754"
+  integrity sha512-Tx8T58CHo+7nwJ+EhUwx3LfdNSG9R2OKfaIXXs5soiy5HtgoAEkDay9LIimLOcG8dJQH1wPZp/cnAv6S9CrR1Q==
 
-"@svgr/babel-plugin-svg-dynamic-title@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-7.0.0.tgz"
-  integrity sha512-BoVSh6ge3SLLpKC0pmmN9DFlqgFy4NxNgdZNLPNJWBUU7TQpDWeBuyVuDW88iXydb5Cv0ReC+ffa5h3VrKfk1w==
+"@svgr/babel-plugin-transform-svg-component@8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-8.0.0.tgz#013b4bfca88779711f0ed2739f3f7efcefcf4f7e"
+  integrity sha512-DFx8xa3cZXTdb/k3kfPeaixecQLgKh5NVBMwD0AQxOzcZawK4oo1Jh9LbrcACUivsCA7TLG8eeWgrDXjTMhRmw==
 
-"@svgr/babel-plugin-svg-em-dimensions@^6.5.1":
-  version "6.5.1"
-  resolved "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-6.5.1.tgz"
-  integrity sha512-gWGsiwjb4tw+ITOJ86ndY/DZZ6cuXMNE/SjcDRg+HLuCmwpcjOktwRF9WgAiycTqJD/QXqL2f8IzE2Rzh7aVXA==
-
-"@svgr/babel-plugin-svg-em-dimensions@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-7.0.0.tgz"
-  integrity sha512-tNDcBa+hYn0gO+GkP/AuNKdVtMufVhU9fdzu+vUQsR18RIJ9RWe7h/pSBY338RO08wArntwbDk5WhQBmhf2PaA==
-
-"@svgr/babel-plugin-transform-react-native-svg@^6.5.1":
-  version "6.5.1"
-  resolved "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-6.5.1.tgz"
-  integrity sha512-2jT3nTayyYP7kI6aGutkyfJ7UMGtuguD72OjeGLwVNyfPRBD8zQthlvL+fAbAKk5n9ZNcvFkp/b1lZ7VsYqVJg==
-
-"@svgr/babel-plugin-transform-react-native-svg@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-7.0.0.tgz"
-  integrity sha512-qw54u8ljCJYL2KtBOjI5z7Nzg8LnSvQOP5hPKj77H4VQL4+HdKbAT5pnkkZLmHKYwzsIHSYKXxHouD8zZamCFQ==
-
-"@svgr/babel-plugin-transform-svg-component@^6.5.1":
-  version "6.5.1"
-  resolved "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-6.5.1.tgz"
-  integrity sha512-a1p6LF5Jt33O3rZoVRBqdxL350oge54iZWHNI6LJB5tQ7EelvD/Mb1mfBiZNAan0dt4i3VArkFRjA4iObuNykQ==
-
-"@svgr/babel-plugin-transform-svg-component@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-7.0.0.tgz"
-  integrity sha512-CcFECkDj98daOg9jE3Bh3uyD9kzevCAnZ+UtzG6+BQG/jOQ2OA3jHnX6iG4G1MCJkUQFnUvEv33NvQfqrb/F3A==
-
-"@svgr/babel-preset@^6.5.1":
-  version "6.5.1"
-  resolved "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-6.5.1.tgz"
-  integrity sha512-6127fvO/FF2oi5EzSQOAjo1LE3OtNVh11R+/8FXa+mHx1ptAaS4cknIjnUA7e6j6fwGGJ17NzaTJFUwOV2zwCw==
+"@svgr/babel-preset@8.1.0":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@svgr/babel-preset/-/babel-preset-8.1.0.tgz#0e87119aecdf1c424840b9d4565b7137cabf9ece"
+  integrity sha512-7EYDbHE7MxHpv4sxvnVPngw5fuR6pw79SkcrILHJ/iMpuKySNCl5W1qcwPEpU+LgyRXOaAFgH0KhwD18wwg6ug==
   dependencies:
-    "@svgr/babel-plugin-add-jsx-attribute" "^6.5.1"
-    "@svgr/babel-plugin-remove-jsx-attribute" "*"
-    "@svgr/babel-plugin-remove-jsx-empty-expression" "*"
-    "@svgr/babel-plugin-replace-jsx-attribute-value" "^6.5.1"
-    "@svgr/babel-plugin-svg-dynamic-title" "^6.5.1"
-    "@svgr/babel-plugin-svg-em-dimensions" "^6.5.1"
-    "@svgr/babel-plugin-transform-react-native-svg" "^6.5.1"
-    "@svgr/babel-plugin-transform-svg-component" "^6.5.1"
+    "@svgr/babel-plugin-add-jsx-attribute" "8.0.0"
+    "@svgr/babel-plugin-remove-jsx-attribute" "8.0.0"
+    "@svgr/babel-plugin-remove-jsx-empty-expression" "8.0.0"
+    "@svgr/babel-plugin-replace-jsx-attribute-value" "8.0.0"
+    "@svgr/babel-plugin-svg-dynamic-title" "8.0.0"
+    "@svgr/babel-plugin-svg-em-dimensions" "8.0.0"
+    "@svgr/babel-plugin-transform-react-native-svg" "8.1.0"
+    "@svgr/babel-plugin-transform-svg-component" "8.0.0"
 
-"@svgr/babel-preset@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-7.0.0.tgz"
-  integrity sha512-EX/NHeFa30j5UjldQGVQikuuQNHUdGmbh9kEpBKofGUtF0GUPJ4T4rhoYiqDAOmBOxojyot36JIFiDUHUK1ilQ==
-  dependencies:
-    "@svgr/babel-plugin-add-jsx-attribute" "^7.0.0"
-    "@svgr/babel-plugin-remove-jsx-attribute" "^7.0.0"
-    "@svgr/babel-plugin-remove-jsx-empty-expression" "^7.0.0"
-    "@svgr/babel-plugin-replace-jsx-attribute-value" "^7.0.0"
-    "@svgr/babel-plugin-svg-dynamic-title" "^7.0.0"
-    "@svgr/babel-plugin-svg-em-dimensions" "^7.0.0"
-    "@svgr/babel-plugin-transform-react-native-svg" "^7.0.0"
-    "@svgr/babel-plugin-transform-svg-component" "^7.0.0"
-
-"@svgr/core@^6.5.1":
-  version "6.5.1"
-  resolved "https://registry.npmjs.org/@svgr/core/-/core-6.5.1.tgz"
-  integrity sha512-/xdLSWxK5QkqG524ONSjvg3V/FkNyCv538OIBdQqPNaAta3AsXj/Bd2FbvR87yMbXO2hFSWiAe/Q6IkVPDw+mw==
-  dependencies:
-    "@babel/core" "^7.19.6"
-    "@svgr/babel-preset" "^6.5.1"
-    "@svgr/plugin-jsx" "^6.5.1"
-    camelcase "^6.2.0"
-    cosmiconfig "^7.0.1"
-
-"@svgr/core@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/@svgr/core/-/core-7.0.0.tgz"
-  integrity sha512-ztAoxkaKhRVloa3XydohgQQCb0/8x9T63yXovpmHzKMkHO6pkjdsIAWKOS4bE95P/2quVh1NtjSKlMRNzSBffw==
+"@svgr/core@8.1.0":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@svgr/core/-/core-8.1.0.tgz#41146f9b40b1a10beaf5cc4f361a16a3c1885e88"
+  integrity sha512-8QqtOQT5ACVlmsvKOJNEaWmRPmcojMOzCz4Hs2BGG/toAp/K38LcsMRyLp349glq5AzJbCEeimEoxaX6v/fLrA==
   dependencies:
     "@babel/core" "^7.21.3"
-    "@svgr/babel-preset" "^7.0.0"
+    "@svgr/babel-preset" "8.1.0"
     camelcase "^6.2.0"
     cosmiconfig "^8.1.3"
+    snake-case "^3.0.4"
 
-"@svgr/hast-util-to-babel-ast@^6.5.1":
-  version "6.5.1"
-  resolved "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-6.5.1.tgz"
-  integrity sha512-1hnUxxjd83EAxbL4a0JDJoD3Dao3hmjvyvyEV8PzWmLK3B9m9NPlW7GKjFyoWE8nM7HnXzPcmmSyOW8yOddSXw==
-  dependencies:
-    "@babel/types" "^7.20.0"
-    entities "^4.4.0"
-
-"@svgr/hast-util-to-babel-ast@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-7.0.0.tgz"
-  integrity sha512-42Ej9sDDEmsJKjrfQ1PHmiDiHagh/u9AHO9QWbeNx4KmD9yS5d1XHmXUNINfUcykAU+4431Cn+k6Vn5mWBYimQ==
+"@svgr/hast-util-to-babel-ast@8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-8.0.0.tgz#6952fd9ce0f470e1aded293b792a2705faf4ffd4"
+  integrity sha512-EbDKwO9GpfWP4jN9sGdYwPBU0kdomaPIL2Eu4YwmgP+sJeXT+L7bMwJUBnhzfH8Q2qMBqZ4fJwpCyYsAN3mt2Q==
   dependencies:
     "@babel/types" "^7.21.3"
     entities "^4.4.0"
 
-"@svgr/plugin-jsx@^6.5.1":
-  version "6.5.1"
-  resolved "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-6.5.1.tgz"
-  integrity sha512-+UdQxI3jgtSjCykNSlEMuy1jSRQlGC7pqBCPvkG/2dATdWo082zHTTK3uhnAju2/6XpE6B5mZ3z4Z8Ns01S8Gw==
-  dependencies:
-    "@babel/core" "^7.19.6"
-    "@svgr/babel-preset" "^6.5.1"
-    "@svgr/hast-util-to-babel-ast" "^6.5.1"
-    svg-parser "^2.0.4"
-
-"@svgr/plugin-jsx@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-7.0.0.tgz"
-  integrity sha512-SWlTpPQmBUtLKxXWgpv8syzqIU8XgFRvyhfkam2So8b3BE0OS0HPe5UfmlJ2KIC+a7dpuuYovPR2WAQuSyMoPw==
+"@svgr/plugin-jsx@8.1.0":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@svgr/plugin-jsx/-/plugin-jsx-8.1.0.tgz#96969f04a24b58b174ee4cd974c60475acbd6928"
+  integrity sha512-0xiIyBsLlr8quN+WyuxooNW9RJ0Dpr8uOnH/xrCVO8GLUcwHISwj1AG0k+LFzteTkAA0GbX0kj9q6Dk70PTiPA==
   dependencies:
     "@babel/core" "^7.21.3"
-    "@svgr/babel-preset" "^7.0.0"
-    "@svgr/hast-util-to-babel-ast" "^7.0.0"
+    "@svgr/babel-preset" "8.1.0"
+    "@svgr/hast-util-to-babel-ast" "8.0.0"
     svg-parser "^2.0.4"
 
-"@svgr/plugin-svgo@^6.5.1":
-  version "6.5.1"
-  resolved "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-6.5.1.tgz"
-  integrity sha512-omvZKf8ixP9z6GWgwbtmP9qQMPX4ODXi+wzbVZgomNFsUIlHA1sf4fThdwTWSsZGgvGAG6yE+b/F5gWUkcZ/iQ==
-  dependencies:
-    cosmiconfig "^7.0.1"
-    deepmerge "^4.2.2"
-    svgo "^2.8.0"
-
-"@svgr/plugin-svgo@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-7.0.0.tgz"
-  integrity sha512-263znzlu3qTKj71/ot5G9l2vpL4CW+pr2IexBFIwwB+fRAXE9Xnw2rUFgE6P4+37N9siOuC4lKkgBfUCOLFRKQ==
+"@svgr/plugin-svgo@8.1.0":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@svgr/plugin-svgo/-/plugin-svgo-8.1.0.tgz#b115b7b967b564f89ac58feae89b88c3decd0f00"
+  integrity sha512-Ywtl837OGO9pTLIN/onoWLmDQ4zFUycI1g76vuKGEz6evR/ZTJlJuz3G/fIkb6OVBJ2g0o6CGJzaEjfmEo3AHA==
   dependencies:
     cosmiconfig "^8.1.3"
     deepmerge "^4.3.1"
     svgo "^3.0.2"
 
-"@svgr/rollup@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/@svgr/rollup/-/rollup-7.0.0.tgz"
-  integrity sha512-zlx0lxtxTnrXFF+ISuff+hht2XcWXa6uXEliwQbz+o0/qRIrcqyB9ShalO9ekVWB5icgxCWQ5lDaULJTt/pTlA==
+"@svgr/rollup@^8.1.0":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@svgr/rollup/-/rollup-8.1.0.tgz#2c8e09655336cda4b7843799a5d2a5860300b030"
+  integrity sha512-0XR1poYvPQoPpmfDYLEqUGu5ePAQ4pdgN3VFsZBNAeze7qubVpsIY1o1R6PZpKep/DKu33GSm2NhwpCLkMs2Cw==
   dependencies:
     "@babel/core" "^7.21.3"
     "@babel/plugin-transform-react-constant-elements" "^7.21.3"
@@ -2224,156 +2208,157 @@
     "@babel/preset-react" "^7.18.6"
     "@babel/preset-typescript" "^7.21.0"
     "@rollup/pluginutils" "^5.0.2"
-    "@svgr/core" "^7.0.0"
-    "@svgr/plugin-jsx" "^7.0.0"
-    "@svgr/plugin-svgo" "^7.0.0"
+    "@svgr/core" "8.1.0"
+    "@svgr/plugin-jsx" "8.1.0"
+    "@svgr/plugin-svgo" "8.1.0"
 
-"@svgr/webpack@^6.2.1":
-  version "6.5.1"
-  resolved "https://registry.npmjs.org/@svgr/webpack/-/webpack-6.5.1.tgz"
-  integrity sha512-cQ/AsnBkXPkEK8cLbv4Dm7JGXq2XrumKnL1dRpJD9rIO2fTIlJI9a1uCciYG1F2aUsox/hJQyNGbt3soDxSRkA==
+"@svgr/webpack@^8.1.0":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@svgr/webpack/-/webpack-8.1.0.tgz#16f1b5346f102f89fda6ec7338b96a701d8be0c2"
+  integrity sha512-LnhVjMWyMQV9ZmeEy26maJk+8HTIbd59cH4F2MJ439k9DqejRisfFNGAPvRYlKETuh9LrImlS8aKsBgKjMA8WA==
   dependencies:
-    "@babel/core" "^7.19.6"
-    "@babel/plugin-transform-react-constant-elements" "^7.18.12"
-    "@babel/preset-env" "^7.19.4"
+    "@babel/core" "^7.21.3"
+    "@babel/plugin-transform-react-constant-elements" "^7.21.3"
+    "@babel/preset-env" "^7.20.2"
     "@babel/preset-react" "^7.18.6"
-    "@babel/preset-typescript" "^7.18.6"
-    "@svgr/core" "^6.5.1"
-    "@svgr/plugin-jsx" "^6.5.1"
-    "@svgr/plugin-svgo" "^6.5.1"
+    "@babel/preset-typescript" "^7.21.0"
+    "@svgr/core" "8.1.0"
+    "@svgr/plugin-jsx" "8.1.0"
+    "@svgr/plugin-svgo" "8.1.0"
 
-"@swc/helpers@0.5.0":
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.5.0.tgz#bf1d807b60f7290d0ec763feea7ccdeda06e85f1"
-  integrity sha512-SjY/p4MmECVVEWspzSRpQEM3sjR17sP8PbGxELWrT+YZMBfiUyt1MRUNjMV23zohwlG2HYtCQOsCwsTHguXkyg==
+"@swc/helpers@0.5.2":
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.5.2.tgz#85ea0c76450b61ad7d10a37050289eded783c27d"
+  integrity sha512-E4KcWTpoLHqwPHLxidpOqQbcrZVgi0rsmmZXUle1jXmJfuIf/UWpczUJ7MZZ5tlxytgJXyp0w4PGkkeLiuIdZw==
   dependencies:
     tslib "^2.4.0"
 
-"@tanstack/query-core@4.32.0":
-  version "4.32.0"
-  resolved "https://registry.yarnpkg.com/@tanstack/query-core/-/query-core-4.32.0.tgz#e0f4a830283612430450c13badd353766423f523"
-  integrity sha512-ei4IYwL2kmlKSlCw9WgvV7PpXi0MiswVwfQRxawhJA690zWO3dU49igaQ/UMTl+Jy9jj9dK5IKAYvbX7kUvviQ==
+"@tanstack/query-core@5.12.1":
+  version "5.12.1"
+  resolved "https://registry.yarnpkg.com/@tanstack/query-core/-/query-core-5.12.1.tgz#2e04b8ab7a04b2f2cfe77c2b0c9b982477373e06"
+  integrity sha512-WbZztNmKq0t6QjdNmHzezbi/uifYo9j6e2GLJkodsYaYUlzMbAp91RDyeHkIZrm7EfO4wa6Sm5sxJZm5SPlh6w==
 
-"@tanstack/react-query@^4.16.1":
-  version "4.32.0"
-  resolved "https://registry.yarnpkg.com/@tanstack/react-query/-/react-query-4.32.0.tgz#701b45b149cfd4b54a68705f9100973db3ba5d5d"
-  integrity sha512-B8WUMcByYAH9500ENejDCATOmEZhqjtS9wsfiQ3BNa+s+yAynY8SESI8WWHhSqUmjd0pmCSFRP6BOUGSda3QXA==
+"@tanstack/react-query@^5.12.2":
+  version "5.12.2"
+  resolved "https://registry.yarnpkg.com/@tanstack/react-query/-/react-query-5.12.2.tgz#42b39a1ccc2bdf44137921c2395902ed4239d7eb"
+  integrity sha512-BeWZu8zVFH20oRc+S/K9ADPgWjEzP/XQCGBNz5IbApUwPQAdwkQYbXODVL5AyAlWiSxhx+P2xlARPBApj2Yrog==
   dependencies:
-    "@tanstack/query-core" "4.32.0"
-    use-sync-external-store "^1.2.0"
+    "@tanstack/query-core" "5.12.1"
 
 "@trysound/sax@0.2.0":
   version "0.2.0"
-  resolved "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad"
   integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==
 
 "@tsconfig/node10@^1.0.7":
   version "1.0.9"
-  resolved "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2"
   integrity sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==
 
 "@tsconfig/node12@^1.0.7":
   version "1.0.11"
-  resolved "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d"
   integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==
 
 "@tsconfig/node14@^1.0.0":
   version "1.0.3"
-  resolved "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1"
   integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==
 
 "@tsconfig/node16@^1.0.2":
-  version "1.0.3"
-  resolved "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz"
-  integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9"
+  integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==
 
 "@types/babel__core@^7.1.7":
-  version "7.1.18"
-  resolved "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.18.tgz"
-  integrity sha512-S7unDjm/C7z2A2R9NzfKCK1I+BAALDtxEmsJBwlB3EzNfb929ykjL++1CK9LO++EIp2fQrC8O+BwjKvz6UeDyQ==
+  version "7.20.3"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.3.tgz#d5625a50b6f18244425a1359a858c73d70340778"
+  integrity sha512-54fjTSeSHwfan8AyHWrKbfBWiEUrNTZsUwPTDSNaaP1QDQIZbeNUg3a59E9D+375MzUw/x1vx2/0F5LBz+AeYA==
   dependencies:
-    "@babel/parser" "^7.1.0"
-    "@babel/types" "^7.0.0"
+    "@babel/parser" "^7.20.7"
+    "@babel/types" "^7.20.7"
     "@types/babel__generator" "*"
     "@types/babel__template" "*"
     "@types/babel__traverse" "*"
 
 "@types/babel__generator@*":
-  version "7.6.4"
-  resolved "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz"
-  integrity sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==
+  version "7.6.6"
+  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.6.tgz#676f89f67dc8ddaae923f70ebc5f1fa800c031a8"
+  integrity sha512-66BXMKb/sUWbMdBNdMvajU7i/44RkrA3z/Yt1c7R5xejt8qh84iU54yUWCtm0QwGJlDcf/gg4zd/x4mpLAlb/w==
   dependencies:
     "@babel/types" "^7.0.0"
 
 "@types/babel__template@*":
-  version "7.4.1"
-  resolved "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz"
-  integrity sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.3.tgz#db9ac539a2fe05cfe9e168b24f360701bde41f5f"
+  integrity sha512-ciwyCLeuRfxboZ4isgdNZi/tkt06m8Tw6uGbBSBgWrnnZGNXiEyM27xc/PjXGQLqlZ6ylbgHMnm7ccF9tCkOeQ==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
 
 "@types/babel__traverse@*":
-  version "7.14.2"
-  resolved "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.14.2.tgz"
-  integrity sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA==
+  version "7.20.3"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.20.3.tgz#a971aa47441b28ef17884ff945d0551265a2d058"
+  integrity sha512-Lsh766rGEFbaxMIDH7Qa+Yha8cMVI3qAK6CHt3OR0YfxOIn5Z54iHiyDRycHrBqeIiqGa20Kpsv1cavfBKkRSw==
   dependencies:
-    "@babel/types" "^7.3.0"
+    "@babel/types" "^7.20.7"
 
 "@types/buble@^0.19.2":
   version "0.19.2"
-  resolved "https://registry.npmjs.org/@types/buble/-/buble-0.19.2.tgz"
+  resolved "https://registry.yarnpkg.com/@types/buble/-/buble-0.19.2.tgz#a4289d20b175b3c206aaad80caabdabe3ecdfdd1"
   integrity sha512-uUD8zIfXMKThmFkahTXDGI3CthFH1kMg2dOm3KLi4GlC5cbARA64bEcUMbbWdWdE73eoc/iBB9PiTMqH0dNS2Q==
   dependencies:
     magic-string "^0.25.0"
 
 "@types/estree@*", "@types/estree@^1.0.0":
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz"
-  integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==
-
-"@types/estree@0.0.39":
-  version "0.0.39"
-  resolved "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz"
-  integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.3.tgz#2be19e759a3dd18c79f9f436bd7363556c1a73dd"
+  integrity sha512-CS2rOaoQ/eAgAfcTfq6amKG7bsN+EMcgGY4FAFQdvSj2y1ixvOZTUA9mOtCai7E1SYu283XNw7urKK30nP3wkQ==
 
 "@types/estree@^0.0.50":
   version "0.0.50"
-  resolved "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83"
   integrity sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==
 
+"@types/fs-extra@^8.0.1":
+  version "8.1.4"
+  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.1.4.tgz#8171df1d16a80d69fc9c3aab07d7961349a5cb8b"
+  integrity sha512-OMcQKnlrkrOI0TaZ/MgVDA8LYFl7CykzFsjMj9l5x3un2nFxCY20ZFlnqrM0lcqlbs0Yro2HbnZlmopyRaoJ5w==
+  dependencies:
+    "@types/node" "*"
+
 "@types/fs-extra@^9.0.1":
   version "9.0.13"
-  resolved "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz"
+  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz#7594fbae04fe7f1918ce8b3d213f74ff44ac1f45"
   integrity sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==
   dependencies:
     "@types/node" "*"
 
 "@types/glob@^7.1.1":
   version "7.2.0"
-  resolved "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"
   integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==
   dependencies:
     "@types/minimatch" "*"
     "@types/node" "*"
 
 "@types/hoist-non-react-statics@^3.3.0", "@types/hoist-non-react-statics@^3.3.1":
-  version "3.3.1"
-  resolved "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz"
-  integrity sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.4.tgz#cc477ce0283bb9d19ea0cbfa2941fe2c8493a1be"
+  integrity sha512-ZchYkbieA+7tnxwX/SCBySx9WwvWR8TaP5tb2jRAzwvLb/rWchGw3v0w3pqUbUvj0GCwW2Xz/AVPSk6kUGctXQ==
   dependencies:
     "@types/react" "*"
     hoist-non-react-statics "^3.3.0"
 
-"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.9":
-  version "7.0.12"
-  resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz"
-  integrity sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==
+"@types/json-schema@^7.0.12", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.9":
+  version "7.0.14"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.14.tgz#74a97a5573980802f32c8e47b663530ab3b6b7d1"
+  integrity sha512-U3PUjAudAdJBeC2pgN8uTIKgxrb4nlDF3SF0++EldXQvQBGkpFZMSnwQiIoDU77tv45VgNkl/L4ouD+rEomujw==
 
 "@types/json-stable-stringify@^1.0.32":
-  version "1.0.34"
-  resolved "https://registry.npmjs.org/@types/json-stable-stringify/-/json-stable-stringify-1.0.34.tgz"
-  integrity sha512-s2cfwagOQAS8o06TcwKfr9Wx11dNGbH2E9vJz1cqV+a/LOyhWNLUNd6JSRYNzvB4d29UuJX2M0Dj9vE1T8fRXw==
+  version "1.0.35"
+  resolved "https://registry.yarnpkg.com/@types/json-stable-stringify/-/json-stable-stringify-1.0.35.tgz#9cea8628b50a093ae00a7e73de49676f2f9ade27"
+  integrity sha512-zlCWqsRBI0+ANN7dzGeDFJ4CHaVFTLqBNRS11GjR2mHCW6XxNtnMxhQzBKMzfsnjI8oI+kWq2vBwinyQpZVSsg==
 
 "@types/json5@^0.0.29":
   version "0.0.29"
@@ -2381,64 +2366,91 @@
   integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
 "@types/lodash@^4.14.175":
-  version "4.14.191"
-  resolved "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.191.tgz"
-  integrity sha512-BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ==
+  version "4.14.200"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.200.tgz#435b6035c7eba9cdf1e039af8212c9e9281e7149"
+  integrity sha512-YI/M/4HRImtNf3pJgbF+W6FrXovqj+T+/HpENLTooK9PnkacBsDpeP3IpHab40CClUfhNmdM2WTNP2sa2dni5Q==
 
 "@types/minimatch@*":
   version "5.1.2"
-  resolved "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"
   integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
 
 "@types/minimist@^1.2.0", "@types/minimist@^1.2.2":
-  version "1.2.2"
-  resolved "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz"
-  integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.4.tgz#81f886786411c45bba3f33e781ab48bd56bfca2e"
+  integrity sha512-Kfe/D3hxHTusnPNRbycJE1N77WHDsdS4AjUYIzlDzhDrS47NrwuL3YW4VITxwR7KCVpzwgy4Rbj829KSSQmwXQ==
 
 "@types/node@*":
-  version "18.15.10"
-  resolved "https://registry.npmjs.org/@types/node/-/node-18.15.10.tgz"
-  integrity sha512-9avDaQJczATcXgfmMAW3MIWArOO7A+m90vuCFLr8AotWf8igO/mRoYukrk2cqZVtv38tHs33retzHEilM7FpeQ==
+  version "20.8.7"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.8.7.tgz#ad23827850843de973096edfc5abc9e922492a25"
+  integrity sha512-21TKHHh3eUHIi2MloeptJWALuCu5H7HQTdTrWIFReA8ad+aggoX+lRes3ex7/FtpC+sVUpFMQ+QTfYr74mruiQ==
+  dependencies:
+    undici-types "~5.25.1"
 
 "@types/node@14":
-  version "14.18.20"
-  resolved "https://registry.npmjs.org/@types/node/-/node-14.18.20.tgz"
-  integrity sha512-Q8KKwm9YqEmUBRsqJ2GWJDtXltBDxTdC4m5vTdXBolu2PeQh8LX+f6BTwU+OuXPu37fLxoN6gidqBmnky36FXA==
+  version "14.18.63"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.63.tgz#1788fa8da838dbb5f9ea994b834278205db6ca2b"
+  integrity sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==
 
 "@types/node@14 || 16 || 17":
-  version "17.0.38"
-  resolved "https://registry.npmjs.org/@types/node/-/node-17.0.38.tgz"
-  integrity sha512-5jY9RhV7c0Z4Jy09G+NIDTsCZ5G0L5n+Z+p+Y7t5VJHM30bgwzSjVtlcBxqAj+6L/swIlvtOSzr8rBk/aNyV2g==
+  version "17.0.45"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.45.tgz#2c0fafd78705e7a18b7906b5201a522719dc5190"
+  integrity sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==
+
+"@types/node@^20.9.0":
+  version "20.9.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.9.0.tgz#bfcdc230583aeb891cf51e73cfdaacdd8deae298"
+  integrity sha512-nekiGu2NDb1BcVofVcEKMIwzlx4NjHlcjhoxxKBNLtz15Y1z7MYf549DFvkHSId02Ax6kGwWntIBPC3l/JZcmw==
+  dependencies:
+    undici-types "~5.26.4"
 
 "@types/normalize-package-data@^2.4.0":
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
-  integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==
-
-"@types/parse-json@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz"
-  integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.3.tgz#291c243e4b94dbfbc0c0ee26b7666f1d5c030e2c"
+  integrity sha512-ehPtgRgaULsFG8x0NeYJvmyH1hmlfsNLujHe9dQEia/7MAJYdzMSi19JtchUHjmBA6XC/75dK55mzZH+RyieSg==
 
 "@types/prop-types@*":
-  version "15.7.5"
-  resolved "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz"
-  integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==
+  version "15.7.9"
+  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.9.tgz#b6f785caa7ea1fe4414d9df42ee0ab67f23d8a6d"
+  integrity sha512-n1yyPsugYNSmHgxDFjicaI2+gCNjsBck8UX9kuofAKlc0h1bL+20oSF72KeNaW2DUlesbEVCFgyV2dPGTiY42g==
+
+"@types/react-dom@^18.2.17":
+  version "18.2.17"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.17.tgz#375c55fab4ae671bd98448dcfa153268d01d6f64"
+  integrity sha512-rvrT/M7Df5eykWFxn6MYt5Pem/Dbyc1N8Y0S9Mrkw2WFCRiqUgw9P7ul2NpwsXCSM1DVdENzdG9J5SreqfAIWg==
+  dependencies:
+    "@types/react" "*"
 
 "@types/react-redux@^7.1.20":
-  version "7.1.24"
-  resolved "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.24.tgz"
-  integrity sha512-7FkurKcS1k0FHZEtdbbgN8Oc6b+stGSfZYjQGicofJ0j4U0qIn/jaSvnP2pLwZKiai3/17xqqxkkrxTgN8UNbQ==
+  version "7.1.28"
+  resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.28.tgz#30a44303c7daceb6ede9cfb4aaf72e64f1dde4de"
+  integrity sha512-EQr7cChVzVUuqbA+J8ArWK1H0hLAHKOs21SIMrskKZ3nHNeE+LFYA+IsoZGhVOT8Ktjn3M20v4rnZKN3fLbypw==
   dependencies:
     "@types/hoist-non-react-statics" "^3.3.0"
     "@types/react" "*"
     hoist-non-react-statics "^3.3.0"
     redux "^4.0.0"
 
+"@types/react-window@^1.8.8":
+  version "1.8.8"
+  resolved "https://registry.yarnpkg.com/@types/react-window/-/react-window-1.8.8.tgz#c20645414d142364fbe735818e1c1e0a145696e3"
+  integrity sha512-8Ls660bHR1AUA2kuRvVG9D/4XpRC6wjAaPT9dil7Ckc76eP9TKWZwwmgfq8Q1LANX3QNDnoU4Zp48A3w+zK69Q==
+  dependencies:
+    "@types/react" "*"
+
 "@types/react@*", "@types/react@16 || 17 || 18":
-  version "18.0.25"
-  resolved "https://registry.npmjs.org/@types/react/-/react-18.0.25.tgz"
-  integrity sha512-xD6c0KDT4m7n9uD4ZHi02lzskaiqcBxf4zi+tXZY98a04wvc0hi/TcCPC2FOESZi51Nd7tlUeOJY8RofL799/g==
+  version "18.2.30"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.30.tgz#b84f786864fc46f18545364a54d5e1316308e59b"
+  integrity sha512-OfqdJnDsSo4UNw0bqAjFCuBpLYQM7wvZidz0hVxHRjrEkzRlvZL1pJVyOSY55HMiKvRNEo9DUBRuEl7FNlJ/Vg==
+  dependencies:
+    "@types/prop-types" "*"
+    "@types/scheduler" "*"
+    csstype "^3.0.2"
+
+"@types/react@^18.2.41":
+  version "18.2.41"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.41.tgz#9eea044246bdb10510df89ef7f8422a8b6ad8fb9"
+  integrity sha512-CwOGr/PiLiNBxEBqpJ7fO3kocP/2SSuC9fpH5K7tusrg4xPSRT/193rzolYwQnTN02We/ATXKnb6GqA5w4fRxw==
   dependencies:
     "@types/prop-types" "*"
     "@types/scheduler" "*"
@@ -2446,53 +2458,44 @@
 
 "@types/resolve@1.20.2":
   version "1.20.2"
-  resolved "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz"
+  resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.20.2.tgz#97d26e00cd4a0423b4af620abecf3e6f442b7975"
   integrity sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==
 
 "@types/scheduler@*":
-  version "0.16.2"
-  resolved "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz"
-  integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==
+  version "0.16.5"
+  resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.5.tgz#4751153abbf8d6199babb345a52e1eb4167d64af"
+  integrity sha512-s/FPdYRmZR8SjLWGMCuax7r3qCWQw9QKHzXVukAuuIJkXkDRwp+Pu5LMIVFi0Fxbav35WURicYr8u1QsoybnQw==
 
 "@types/schema-utils@^2.4.0":
   version "2.4.0"
-  resolved "https://registry.npmjs.org/@types/schema-utils/-/schema-utils-2.4.0.tgz"
+  resolved "https://registry.yarnpkg.com/@types/schema-utils/-/schema-utils-2.4.0.tgz#9983012045d541dcee053e685a27c9c87c840fcd"
   integrity sha512-454hrj5gz/FXcUE20ygfEiN4DxZ1sprUo0V1gqIqkNZ/CzoEzAZEll2uxMsuyz6BYjiQan4Aa65xbTemfzW9hQ==
   dependencies:
     schema-utils "*"
 
-"@types/semver@^7.3.12":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.0.tgz#591c1ce3a702c45ee15f47a42ade72c2fd78978a"
-  integrity sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==
+"@types/semver@^7.5.0":
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.4.tgz#0a41252ad431c473158b22f9bfb9a63df7541cff"
+  integrity sha512-MMzuxN3GdFwskAnb6fz0orFvhfqi752yjaXylr0Rp4oDg5H0Zn1IuyRhDVvYOwAXoJirx2xuS16I3WjxnAIHiQ==
 
-"@typescript-eslint/eslint-plugin@^5.50.0":
-  version "5.62.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz#aeef0328d172b9e37d9bab6dbc13b87ed88977db"
-  integrity sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==
+"@typescript-eslint/eslint-plugin@^6.7.3":
+  version "6.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.8.0.tgz#06abe4265e7c82f20ade2dcc0e3403c32d4f148b"
+  integrity sha512-GosF4238Tkes2SHPQ1i8f6rMtG6zlKwMEB0abqSJ3Npvos+doIlc/ATG+vX1G9coDF3Ex78zM3heXHLyWEwLUw==
   dependencies:
-    "@eslint-community/regexpp" "^4.4.0"
-    "@typescript-eslint/scope-manager" "5.62.0"
-    "@typescript-eslint/type-utils" "5.62.0"
-    "@typescript-eslint/utils" "5.62.0"
+    "@eslint-community/regexpp" "^4.5.1"
+    "@typescript-eslint/scope-manager" "6.8.0"
+    "@typescript-eslint/type-utils" "6.8.0"
+    "@typescript-eslint/utils" "6.8.0"
+    "@typescript-eslint/visitor-keys" "6.8.0"
     debug "^4.3.4"
     graphemer "^1.4.0"
-    ignore "^5.2.0"
-    natural-compare-lite "^1.4.0"
-    semver "^7.3.7"
-    tsutils "^3.21.0"
+    ignore "^5.2.4"
+    natural-compare "^1.4.0"
+    semver "^7.5.4"
+    ts-api-utils "^1.0.1"
 
 "@typescript-eslint/parser@^5.21.0":
-  version "5.59.11"
-  resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.11.tgz"
-  integrity sha512-s9ZF3M+Nym6CAZEkJJeO2TFHHDsKAM3ecNkLuH4i4s8/RCPnF5JRip2GyviYkeEAcwGMJxkqG9h2dAsnA1nZpA==
-  dependencies:
-    "@typescript-eslint/scope-manager" "5.59.11"
-    "@typescript-eslint/types" "5.59.11"
-    "@typescript-eslint/typescript-estree" "5.59.11"
-    debug "^4.3.4"
-
-"@typescript-eslint/parser@^5.50.0":
   version "5.62.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.62.0.tgz#1b63d082d849a2fcae8a569248fbe2ee1b8a56c7"
   integrity sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==
@@ -2502,13 +2505,16 @@
     "@typescript-eslint/typescript-estree" "5.62.0"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@5.59.11":
-  version "5.59.11"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.59.11.tgz#5d131a67a19189c42598af9fb2ea1165252001ce"
-  integrity sha512-dHFOsxoLFtrIcSj5h0QoBT/89hxQONwmn3FOQ0GOQcLOOXm+MIrS8zEAhs4tWl5MraxCY3ZJpaXQQdFMc2Tu+Q==
+"@typescript-eslint/parser@^6.7.3":
+  version "6.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.8.0.tgz#bb2a969d583db242f1ee64467542f8b05c2e28cb"
+  integrity sha512-5tNs6Bw0j6BdWuP8Fx+VH4G9fEPDxnVI7yH1IAPkQH5RUtvKwRoqdecAPdQXv4rSOADAaz1LFBZvZG7VbXivSg==
   dependencies:
-    "@typescript-eslint/types" "5.59.11"
-    "@typescript-eslint/visitor-keys" "5.59.11"
+    "@typescript-eslint/scope-manager" "6.8.0"
+    "@typescript-eslint/types" "6.8.0"
+    "@typescript-eslint/typescript-estree" "6.8.0"
+    "@typescript-eslint/visitor-keys" "6.8.0"
+    debug "^4.3.4"
 
 "@typescript-eslint/scope-manager@5.62.0":
   version "5.62.0"
@@ -2518,38 +2524,33 @@
     "@typescript-eslint/types" "5.62.0"
     "@typescript-eslint/visitor-keys" "5.62.0"
 
-"@typescript-eslint/type-utils@5.62.0":
-  version "5.62.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz#286f0389c41681376cdad96b309cedd17d70346a"
-  integrity sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==
+"@typescript-eslint/scope-manager@6.8.0":
+  version "6.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.8.0.tgz#5cac7977385cde068ab30686889dd59879811efd"
+  integrity sha512-xe0HNBVwCph7rak+ZHcFD6A+q50SMsFwcmfdjs9Kz4qDh5hWhaPhFjRs/SODEhroBI5Ruyvyz9LfwUJ624O40g==
   dependencies:
-    "@typescript-eslint/typescript-estree" "5.62.0"
-    "@typescript-eslint/utils" "5.62.0"
-    debug "^4.3.4"
-    tsutils "^3.21.0"
+    "@typescript-eslint/types" "6.8.0"
+    "@typescript-eslint/visitor-keys" "6.8.0"
 
-"@typescript-eslint/types@5.59.11":
-  version "5.59.11"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.59.11.tgz#1a9018fe3c565ba6969561f2a49f330cf1fe8db1"
-  integrity sha512-epoN6R6tkvBYSc+cllrz+c2sOFWkbisJZWkOE+y3xHtvYaOE6Wk6B8e114McRJwFRjGvYdJwLXQH5c9osME/AA==
+"@typescript-eslint/type-utils@6.8.0":
+  version "6.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.8.0.tgz#50365e44918ca0fd159844b5d6ea96789731e11f"
+  integrity sha512-RYOJdlkTJIXW7GSldUIHqc/Hkto8E+fZN96dMIFhuTJcQwdRoGN2rEWA8U6oXbLo0qufH7NPElUb+MceHtz54g==
+  dependencies:
+    "@typescript-eslint/typescript-estree" "6.8.0"
+    "@typescript-eslint/utils" "6.8.0"
+    debug "^4.3.4"
+    ts-api-utils "^1.0.1"
 
 "@typescript-eslint/types@5.62.0":
   version "5.62.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f"
   integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==
 
-"@typescript-eslint/typescript-estree@5.59.11":
-  version "5.59.11"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.11.tgz#b2caaa31725e17c33970c1197bcd54e3c5f42b9f"
-  integrity sha512-YupOpot5hJO0maupJXixi6l5ETdrITxeo5eBOeuV7RSKgYdU3G5cxO49/9WRnJq9EMrB7AuTSLH/bqOsXi7wPA==
-  dependencies:
-    "@typescript-eslint/types" "5.59.11"
-    "@typescript-eslint/visitor-keys" "5.59.11"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    semver "^7.3.7"
-    tsutils "^3.21.0"
+"@typescript-eslint/types@6.8.0":
+  version "6.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.8.0.tgz#1ab5d4fe1d613e3f65f6684026ade6b94f7e3ded"
+  integrity sha512-p5qOxSum7W3k+llc7owEStXlGmSl8FcGvhYt8Vjy7FqEnmkCVlM3P57XQEGj58oqaBWDQXbJDZxwUWMS/EAPNQ==
 
 "@typescript-eslint/typescript-estree@5.62.0":
   version "5.62.0"
@@ -2564,27 +2565,31 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/utils@5.62.0":
-  version "5.62.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.62.0.tgz#141e809c71636e4a75daa39faed2fb5f4b10df86"
-  integrity sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==
+"@typescript-eslint/typescript-estree@6.8.0":
+  version "6.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.8.0.tgz#9565f15e0cd12f55cf5aa0dfb130a6cb0d436ba1"
+  integrity sha512-ISgV0lQ8XgW+mvv5My/+iTUdRmGspducmQcDw5JxznasXNnZn3SKNrTRuMsEXv+V/O+Lw9AGcQCfVaOPCAk/Zg==
   dependencies:
-    "@eslint-community/eslint-utils" "^4.2.0"
-    "@types/json-schema" "^7.0.9"
-    "@types/semver" "^7.3.12"
-    "@typescript-eslint/scope-manager" "5.62.0"
-    "@typescript-eslint/types" "5.62.0"
-    "@typescript-eslint/typescript-estree" "5.62.0"
-    eslint-scope "^5.1.1"
-    semver "^7.3.7"
+    "@typescript-eslint/types" "6.8.0"
+    "@typescript-eslint/visitor-keys" "6.8.0"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    semver "^7.5.4"
+    ts-api-utils "^1.0.1"
 
-"@typescript-eslint/visitor-keys@5.59.11":
-  version "5.59.11"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.11.tgz#dca561ddad169dc27d62396d64f45b2d2c3ecc56"
-  integrity sha512-KGYniTGG3AMTuKF9QBD7EIrvufkB6O6uX3knP73xbKLMpH+QRPcgnCxjWXSHjMRuOxFLovljqQgQpR0c7GvjoA==
+"@typescript-eslint/utils@6.8.0":
+  version "6.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.8.0.tgz#d42939c2074c6b59844d0982ce26a51d136c4029"
+  integrity sha512-dKs1itdE2qFG4jr0dlYLQVppqTE+Itt7GmIf/vX6CSvsW+3ov8PbWauVKyyfNngokhIO9sKZeRGCUo1+N7U98Q==
   dependencies:
-    "@typescript-eslint/types" "5.59.11"
-    eslint-visitor-keys "^3.3.0"
+    "@eslint-community/eslint-utils" "^4.4.0"
+    "@types/json-schema" "^7.0.12"
+    "@types/semver" "^7.5.0"
+    "@typescript-eslint/scope-manager" "6.8.0"
+    "@typescript-eslint/types" "6.8.0"
+    "@typescript-eslint/typescript-estree" "6.8.0"
+    semver "^7.5.4"
 
 "@typescript-eslint/visitor-keys@5.62.0":
   version "5.62.0"
@@ -2594,17 +2599,26 @@
     "@typescript-eslint/types" "5.62.0"
     eslint-visitor-keys "^3.3.0"
 
-"@umami/prisma-client@^0.2.0":
-  version "0.2.0"
-  resolved "https://registry.npmjs.org/@umami/prisma-client/-/prisma-client-0.2.0.tgz"
-  integrity sha512-+27dd4DLl8SvbbIYG1mdm6pIZd+UzQI7eZGNjQ9ONeWO0jr+/wiVnPIXUzd8w4R/OoM4ChpI3mBZPqcWa5MAOw==
+"@typescript-eslint/visitor-keys@6.8.0":
+  version "6.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.8.0.tgz#cffebed56ae99c45eba901c378a6447b06be58b8"
+  integrity sha512-oqAnbA7c+pgOhW2OhGvxm0t1BULX5peQI/rLsNDpGM78EebV3C9IGbX5HNZabuZ6UQrYveCLjKo8Iy/lLlBkkg==
   dependencies:
+    "@typescript-eslint/types" "6.8.0"
+    eslint-visitor-keys "^3.4.1"
+
+"@umami/prisma-client@^0.8.0":
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/@umami/prisma-client/-/prisma-client-0.8.0.tgz#9f866c813b15b7ab0e7632506316bf1e5d2e74cc"
+  integrity sha512-ix3/75CO3eVlf1Rg0cUIjoHDFJV7nxx5sSh1NnvbjyGn8EsTpZ7fVYF874w8+ENQsaKFIMftUSGGiwvgxaZN3g==
+  dependencies:
+    chalk "^4.1.2"
     debug "^4.3.4"
 
-"@umami/redis-client@^0.5.0":
-  version "0.5.0"
-  resolved "https://registry.npmjs.org/@umami/redis-client/-/redis-client-0.5.0.tgz"
-  integrity sha512-x7wx/pMjyg3AAYzgjGOw031bNhyZ81h6tRMAl60RQQI9xlJaJEA1r0TEUrWfFi21gHAvdBLJGYCsvHzpix4LKQ==
+"@umami/redis-client@^0.18.0":
+  version "0.18.0"
+  resolved "https://registry.yarnpkg.com/@umami/redis-client/-/redis-client-0.18.0.tgz#6a2315a878f2688dae162d93e88dfc4e097fc48e"
+  integrity sha512-uDuX5w7ydlOZWrq0h6fADG3XWOhto9fAqrUVu85FUhdijWoGlv5f8adaL8FAah5jD+/Byw2VyGQaZO4VhboEZw==
   dependencies:
     debug "^4.3.4"
     redis "^4.5.1"
@@ -2614,142 +2628,124 @@
   resolved "https://registry.yarnpkg.com/@vercel/node-bridge/-/node-bridge-2.2.2.tgz#f63466ab6a2588afdc6262c2d060289bfe8baa6b"
   integrity sha512-haGBC8noyA5BfjCRXRH+VIkHCDVW5iD5UX24P2nOdilwUxI4qWsattS/co8QBGq64XsNLRAMdM5pQUE3zxkF9Q==
 
-"@vue/compiler-core@3.2.36", "@vue/compiler-core@^3.2.23":
-  version "3.2.36"
-  resolved "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.36.tgz"
-  integrity sha512-bbyZM5hvBicv0PW3KUfVi+x3ylHnfKG7DOn5wM+f2OztTzTjLEyBb/5yrarIYpmnGitVGbjZqDbODyW4iK8hqw==
+"@vue/compiler-core@3.3.4", "@vue/compiler-core@^3.2.23":
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.3.4.tgz#7fbf591c1c19e1acd28ffd284526e98b4f581128"
+  integrity sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g==
   dependencies:
-    "@babel/parser" "^7.16.4"
-    "@vue/shared" "3.2.36"
+    "@babel/parser" "^7.21.3"
+    "@vue/shared" "3.3.4"
     estree-walker "^2.0.2"
-    source-map "^0.6.1"
+    source-map-js "^1.0.2"
 
-"@vue/compiler-dom@3.2.36":
-  version "3.2.36"
-  resolved "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.36.tgz"
-  integrity sha512-tcOTAOiW4s24QLnq+ON6J+GRONXJ+A/mqKCORi0LSlIh8XQlNnlm24y8xIL8la+ZDgkdbjarQ9ZqYSvEja6gVA==
+"@vue/compiler-dom@3.3.4":
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.3.4.tgz#f56e09b5f4d7dc350f981784de9713d823341151"
+  integrity sha512-wyM+OjOVpuUukIq6p5+nwHYtj9cFroz9cwkfmP9O1nzH68BenTTv0u7/ndggT8cIQlnBeOo6sUT/gvHcIkLA5w==
   dependencies:
-    "@vue/compiler-core" "3.2.36"
-    "@vue/shared" "3.2.36"
+    "@vue/compiler-core" "3.3.4"
+    "@vue/shared" "3.3.4"
 
-"@vue/compiler-sfc@3.2.36":
-  version "3.2.36"
-  resolved "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.36.tgz"
-  integrity sha512-AvGb4bTj4W8uQ4BqaSxo7UwTEqX5utdRSMyHy58OragWlt8nEACQ9mIeQh3K4di4/SX+41+pJrLIY01lHAOFOA==
+"@vue/compiler-sfc@3.3.4":
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.3.4.tgz#b19d942c71938893535b46226d602720593001df"
+  integrity sha512-6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ==
   dependencies:
-    "@babel/parser" "^7.16.4"
-    "@vue/compiler-core" "3.2.36"
-    "@vue/compiler-dom" "3.2.36"
-    "@vue/compiler-ssr" "3.2.36"
-    "@vue/reactivity-transform" "3.2.36"
-    "@vue/shared" "3.2.36"
+    "@babel/parser" "^7.20.15"
+    "@vue/compiler-core" "3.3.4"
+    "@vue/compiler-dom" "3.3.4"
+    "@vue/compiler-ssr" "3.3.4"
+    "@vue/reactivity-transform" "3.3.4"
+    "@vue/shared" "3.3.4"
     estree-walker "^2.0.2"
-    magic-string "^0.25.7"
+    magic-string "^0.30.0"
     postcss "^8.1.10"
-    source-map "^0.6.1"
+    source-map-js "^1.0.2"
 
-"@vue/compiler-ssr@3.2.36":
-  version "3.2.36"
-  resolved "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.36.tgz"
-  integrity sha512-+KugInUFRvOxEdLkZwE+W43BqHyhBh0jpYXhmqw1xGq2dmE6J9eZ8UUSOKNhdHtQ/iNLWWeK/wPZkVLUf3YGaw==
+"@vue/compiler-ssr@3.3.4":
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.3.4.tgz#9d1379abffa4f2b0cd844174ceec4a9721138777"
+  integrity sha512-m0v6oKpup2nMSehwA6Uuu+j+wEwcy7QmwMkVNVfrV9P2qE5KshC6RwOCq8fjGS/Eak/uNb8AaWekfiXxbBB6gQ==
   dependencies:
-    "@vue/compiler-dom" "3.2.36"
-    "@vue/shared" "3.2.36"
+    "@vue/compiler-dom" "3.3.4"
+    "@vue/shared" "3.3.4"
 
-"@vue/reactivity-transform@3.2.36":
-  version "3.2.36"
-  resolved "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.36.tgz"
-  integrity sha512-Jk5o2BhpODC9XTA7o4EL8hSJ4JyrFWErLtClG3NH8wDS7ri9jBDWxI7/549T7JY9uilKsaNM+4pJASLj5dtRwA==
+"@vue/reactivity-transform@3.3.4":
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.3.4.tgz#52908476e34d6a65c6c21cd2722d41ed8ae51929"
+  integrity sha512-MXgwjako4nu5WFLAjpBnCj/ieqcjE2aJBINUNQzkZQfzIZA4xn+0fV1tIYBJvvva3N3OvKGofRLvQIwEQPpaXw==
   dependencies:
-    "@babel/parser" "^7.16.4"
-    "@vue/compiler-core" "3.2.36"
-    "@vue/shared" "3.2.36"
+    "@babel/parser" "^7.20.15"
+    "@vue/compiler-core" "3.3.4"
+    "@vue/shared" "3.3.4"
     estree-walker "^2.0.2"
-    magic-string "^0.25.7"
+    magic-string "^0.30.0"
 
-"@vue/reactivity@3.2.36":
-  version "3.2.36"
-  resolved "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.36.tgz"
-  integrity sha512-c2qvopo0crh9A4GXi2/2kfGYMxsJW4tVILrqRPydVGZHhq0fnzy6qmclWOhBFckEhmyxmpHpdJtIRYGeKcuhnA==
+"@vue/reactivity@3.3.4":
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.3.4.tgz#a27a29c6cd17faba5a0e99fbb86ee951653e2253"
+  integrity sha512-kLTDLwd0B1jG08NBF3R5rqULtv/f8x3rOFByTDz4J53ttIQEDmALqKqXY0J+XQeN0aV2FBxY8nJDf88yvOPAqQ==
   dependencies:
-    "@vue/shared" "3.2.36"
+    "@vue/shared" "3.3.4"
 
-"@vue/runtime-core@3.2.36":
-  version "3.2.36"
-  resolved "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.36.tgz"
-  integrity sha512-PTWBD+Lub+1U3/KhbCExrfxyS14hstLX+cBboxVHaz+kXoiDLNDEYAovPtxeTutbqtClIXtft+wcGdC+FUQ9qQ==
+"@vue/runtime-core@3.3.4":
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.3.4.tgz#4bb33872bbb583721b340f3088888394195967d1"
+  integrity sha512-R+bqxMN6pWO7zGI4OMlmvePOdP2c93GsHFM/siJI7O2nxFRzj55pLwkpCedEY+bTMgp5miZ8CxfIZo3S+gFqvA==
   dependencies:
-    "@vue/reactivity" "3.2.36"
-    "@vue/shared" "3.2.36"
+    "@vue/reactivity" "3.3.4"
+    "@vue/shared" "3.3.4"
 
-"@vue/runtime-dom@3.2.36":
-  version "3.2.36"
-  resolved "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.36.tgz"
-  integrity sha512-gYPYblm7QXHVuBohqNRRT7Wez0f2Mx2D40rb4fleehrJU9CnkjG0phhcGEZFfGwCmHZRqBCRgbFWE98bPULqkg==
+"@vue/runtime-dom@3.3.4":
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.3.4.tgz#992f2579d0ed6ce961f47bbe9bfe4b6791251566"
+  integrity sha512-Aj5bTJ3u5sFsUckRghsNjVTtxZQ1OyMWCr5dZRAPijF/0Vy4xEoRCwLyHXcj4D0UFbJ4lbx3gPTgg06K/GnPnQ==
   dependencies:
-    "@vue/runtime-core" "3.2.36"
-    "@vue/shared" "3.2.36"
-    csstype "^2.6.8"
+    "@vue/runtime-core" "3.3.4"
+    "@vue/shared" "3.3.4"
+    csstype "^3.1.1"
 
-"@vue/server-renderer@3.2.36":
-  version "3.2.36"
-  resolved "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.36.tgz"
-  integrity sha512-uZE0+jfye6yYXWvAQYeHZv+f50sRryvy16uiqzk3jn8hEY8zTjI+rzlmZSGoE915k+W/Ol9XSw6vxOUD8dGkUg==
+"@vue/server-renderer@3.3.4":
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.3.4.tgz#ea46594b795d1536f29bc592dd0f6655f7ea4c4c"
+  integrity sha512-Q6jDDzR23ViIb67v+vM1Dqntu+HUexQcsWKhhQa4ARVzxOY2HbC7QRW/ggkDBd5BU+uM1sV6XOAP0b216o34JQ==
   dependencies:
-    "@vue/compiler-ssr" "3.2.36"
-    "@vue/shared" "3.2.36"
+    "@vue/compiler-ssr" "3.3.4"
+    "@vue/shared" "3.3.4"
 
-"@vue/shared@3.2.36":
-  version "3.2.36"
-  resolved "https://registry.npmjs.org/@vue/shared/-/shared-3.2.36.tgz"
-  integrity sha512-JtB41wXl7Au3+Nl3gD16Cfpj7k/6aCroZ6BbOiCMFCMvrOpkg/qQUXTso2XowaNqBbnkuGHurLAqkLBxNGc1hQ==
-
-JSONStream@1.3.4:
-  version "1.3.4"
-  resolved "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.4.tgz"
-  integrity sha512-Y7vfi3I5oMOYIr+WxV8NZxDSwcbNgzdKYsTNInmycOq9bUYwGg9ryu57Wg5NLmCjqdFPNUmpMBo3kSJN9tCbXg==
-  dependencies:
-    jsonparse "^1.2.0"
-    through ">=2.2.7 <3"
+"@vue/shared@3.3.4":
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.3.4.tgz#06e83c5027f464eef861c329be81454bc8b70780"
+  integrity sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==
 
 acorn-dynamic-import@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948"
   integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==
 
 acorn-jsx@^5.2.0, acorn-jsx@^5.3.2:
   version "5.3.2"
-  resolved "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
 acorn-walk@^8.1.1:
   version "8.2.0"
-  resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
   integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
 
 acorn@^6.4.1:
   version "6.4.2"
-  resolved "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
   integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
 
-acorn@^8.4.1:
-  version "8.8.2"
-  resolved "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz"
-  integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
-
-acorn@^8.8.2:
-  version "8.9.0"
-  resolved "https://registry.npmjs.org/acorn/-/acorn-8.9.0.tgz"
-  integrity sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==
-
-acorn@^8.9.0:
+acorn@^8.10.0, acorn@^8.4.1, acorn@^8.8.2, acorn@^8.9.0:
   version "8.10.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5"
   integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==
 
 aggregate-error@^3.0.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
   integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
   dependencies:
     clean-stack "^2.0.0"
@@ -2757,26 +2753,26 @@ aggregate-error@^3.0.0:
 
 ajv-formats@^2.1.1:
   version "2.1.1"
-  resolved "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520"
   integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==
   dependencies:
     ajv "^8.0.0"
 
 ajv-keywords@^3.5.2:
   version "3.5.2"
-  resolved "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
-ajv-keywords@^5.0.0:
+ajv-keywords@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16"
   integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==
   dependencies:
     fast-deep-equal "^3.1.3"
 
-ajv@^6.12.3, ajv@^6.12.4:
+ajv@^6.12.4:
   version "6.12.6"
-  resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
   dependencies:
     fast-deep-equal "^3.1.1"
@@ -2784,17 +2780,7 @@ ajv@^6.12.3, ajv@^6.12.4:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^8.0.0, ajv@^8.8.0:
-  version "8.10.0"
-  resolved "https://registry.npmjs.org/ajv/-/ajv-8.10.0.tgz"
-  integrity sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    json-schema-traverse "^1.0.0"
-    require-from-string "^2.0.2"
-    uri-js "^4.2.2"
-
-ajv@^8.0.1:
+ajv@^8.0.0, ajv@^8.0.1, ajv@^8.9.0:
   version "8.12.0"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1"
   integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
@@ -2804,23 +2790,23 @@ ajv@^8.0.1:
     require-from-string "^2.0.2"
     uri-js "^4.2.2"
 
-ansi-colors@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz"
-  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
-
-ansi-escapes@^4.3.0:
-  version "4.3.2"
-  resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz"
-  integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
+ansi-escapes@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-5.0.0.tgz#b6a0caf0eef0c41af190e9a749e0c00ec04bb2a6"
+  integrity sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA==
   dependencies:
-    type-fest "^0.21.3"
+    type-fest "^1.0.2"
 
 ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
+ansi-regex@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
+  integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
+
 ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
@@ -2835,6 +2821,11 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   dependencies:
     color-convert "^2.0.1"
 
+ansi-styles@^6.0.0, ansi-styles@^6.1.0:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
+  integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
+
 anymatch@^3.1.3, anymatch@~3.1.2:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
@@ -2850,12 +2841,12 @@ arch@^2.2.0:
 
 arg@^4.1.0:
   version "4.1.3"
-  resolved "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
   integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
 
 argparse@^1.0.7:
   version "1.0.10"
-  resolved "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
   integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
   dependencies:
     sprintf-js "~1.0.2"
@@ -2865,13 +2856,12 @@ argparse@^2.0.1:
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
-aria-query@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz"
-  integrity sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==
+aria-query@^5.1.3:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.3.0.tgz#650c569e41ad90b51b3d7df5e5eed1c7549c103e"
+  integrity sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==
   dependencies:
-    "@babel/runtime" "^7.10.2"
-    "@babel/runtime-corejs3" "^7.10.2"
+    dequal "^2.0.3"
 
 array-buffer-byte-length@^1.0.0:
   version "1.0.0"
@@ -2883,18 +2873,18 @@ array-buffer-byte-length@^1.0.0:
 
 array-find-index@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
   integrity sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw==
 
-array-includes@^3.1.5, array-includes@^3.1.6:
-  version "3.1.6"
-  resolved "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz"
-  integrity sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==
+array-includes@^3.1.6:
+  version "3.1.7"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.7.tgz#8cd2e01b26f7a3086cbc87271593fe921c62abda"
+  integrity sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
-    get-intrinsic "^1.1.3"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    get-intrinsic "^1.2.1"
     is-string "^1.0.7"
 
 array-union@^2.1.0:
@@ -2903,55 +2893,56 @@ array-union@^2.1.0:
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
 array.prototype.findlastindex@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.2.tgz#bc229aef98f6bd0533a2bc61ff95209875526c9b"
-  integrity sha512-tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw==
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz#b37598438f97b579166940814e2c0493a4f50207"
+  integrity sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
     es-shim-unscopables "^1.0.0"
-    get-intrinsic "^1.1.3"
+    get-intrinsic "^1.2.1"
 
 array.prototype.flat@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz#ffc6576a7ca3efc2f46a143b9d1dda9b4b3cf5e2"
-  integrity sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz#1476217df8cff17d72ee8f3ba06738db5b387d18"
+  integrity sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
     es-shim-unscopables "^1.0.0"
 
 array.prototype.flatmap@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz#1aae7903c2100433cb8261cd4ed310aab5c4a183"
-  integrity sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz#c9a7c6831db8e719d6ce639190146c24bbd3e527"
+  integrity sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
     es-shim-unscopables "^1.0.0"
 
 array.prototype.tosorted@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz"
-  integrity sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.2.tgz#620eff7442503d66c799d95503f82b475745cefd"
+  integrity sha512-HuQCHOlk1Weat5jzStICBCd83NxiIMwqDg/dHEsoefabn/hJRj5pVdWcPUSpRrwhwxZOsQassMpgN/xRYFBMIg==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
     es-shim-unscopables "^1.0.0"
-    get-intrinsic "^1.1.3"
+    get-intrinsic "^1.2.1"
 
-arraybuffer.prototype.slice@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz#9b5ea3868a6eebc30273da577eb888381c0044bb"
-  integrity sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==
+arraybuffer.prototype.slice@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz#98bd561953e3e74bb34938e77647179dfe6e9f12"
+  integrity sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==
   dependencies:
     array-buffer-byte-length "^1.0.0"
     call-bind "^1.0.2"
     define-properties "^1.2.0"
+    es-abstract "^1.22.1"
     get-intrinsic "^1.2.1"
     is-array-buffer "^3.0.2"
     is-shared-array-buffer "^1.0.2"
@@ -2961,21 +2952,9 @@ arrify@^1.0.1:
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
   integrity sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==
 
-asn1@~0.2.3:
-  version "0.2.6"
-  resolved "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz"
-  integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==
-  dependencies:
-    safer-buffer "~2.1.0"
-
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
-  integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==
-
 ast-types-flow@^0.0.7:
   version "0.0.7"
-  resolved "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz"
+  resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
   integrity sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==
 
 astral-regex@^2.0.0:
@@ -2983,24 +2962,26 @@ astral-regex@^2.0.0:
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
   integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
 
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"
-  integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
+asynciterator.prototype@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/asynciterator.prototype/-/asynciterator.prototype-1.0.0.tgz#8c5df0514936cdd133604dfcc9d3fb93f09b2b62"
+  integrity sha512-wwHYEIS0Q80f5mosx3L/dfG5t5rjEa9Ft51GTaNt862EnpyGHpgz2RkZvLPp1oF5TnAiTohkEKVEu8pQPJI7Vg==
+  dependencies:
+    has-symbols "^1.0.3"
 
 at-least-node@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
   integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
 
 autoprefixer@^10.4.13:
-  version "10.4.13"
-  resolved "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz"
-  integrity sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==
+  version "10.4.16"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.16.tgz#fad1411024d8670880bdece3970aa72e3572feb8"
+  integrity sha512-7vd3UC6xKp0HLfua5IjZlcXvGAGy7cBAXTg2lyQ/8WpNhd6SiZ8Be+xm3FyBSYJx5GKcpRCzBh7RH4/0dnY+uQ==
   dependencies:
-    browserslist "^4.21.4"
-    caniuse-lite "^1.0.30001426"
-    fraction.js "^4.2.0"
+    browserslist "^4.21.10"
+    caniuse-lite "^1.0.30001538"
+    fraction.js "^4.3.6"
     normalize-range "^0.1.2"
     picocolors "^1.0.0"
     postcss-value-parser "^4.2.0"
@@ -3010,58 +2991,50 @@ available-typed-arrays@^1.0.5:
   resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
   integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
 
-aws-sign2@~0.7.0:
-  version "0.7.0"
-  resolved "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"
-  integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==
+axe-core@^4.6.2:
+  version "4.8.2"
+  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.8.2.tgz#2f6f3cde40935825cf4465e3c1c9e77b240ff6ae"
+  integrity sha512-/dlp0fxyM3R8YW7MFzaHWXrf4zzbr0vaYb23VBFCl83R7nWNPg/yaQw2Dc8jzCMmDVLhSdzH8MjrsuIUuvX+6g==
 
-aws4@^1.8.0:
-  version "1.11.0"
-  resolved "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz"
-  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
-
-axe-core@^4.4.3:
-  version "4.5.2"
-  resolved "https://registry.npmjs.org/axe-core/-/axe-core-4.5.2.tgz"
-  integrity sha512-u2MVsXfew5HBvjsczCv+xlwdNnB1oQR9HlAcsejZttNjKKSkeDNVwB1vMThIUIFI9GoT57Vtk8iQLwqOfAkboA==
-
-axobject-query@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz"
-  integrity sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==
+axobject-query@^3.1.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-3.2.1.tgz#39c378a6e3b06ca679f29138151e45b2b32da62a"
+  integrity sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==
+  dependencies:
+    dequal "^2.0.3"
 
 b4a@^1.6.4:
   version "1.6.4"
   resolved "https://registry.yarnpkg.com/b4a/-/b4a-1.6.4.tgz#ef1c1422cae5ce6535ec191baeed7567443f36c9"
   integrity sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw==
 
-babel-plugin-polyfill-corejs2@^0.3.3:
-  version "0.3.3"
-  resolved "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz"
-  integrity sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==
+babel-plugin-polyfill-corejs2@^0.4.6:
+  version "0.4.6"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.6.tgz#b2df0251d8e99f229a8e60fc4efa9a68b41c8313"
+  integrity sha512-jhHiWVZIlnPbEUKSSNb9YoWcQGdlTLq7z1GHL4AjFxaoOUMuuEVJ+Y4pAaQUGOGk93YsVCKPbqbfw3m0SM6H8Q==
   dependencies:
-    "@babel/compat-data" "^7.17.7"
-    "@babel/helper-define-polyfill-provider" "^0.3.3"
-    semver "^6.1.1"
+    "@babel/compat-data" "^7.22.6"
+    "@babel/helper-define-polyfill-provider" "^0.4.3"
+    semver "^6.3.1"
 
-babel-plugin-polyfill-corejs3@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz"
-  integrity sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==
+babel-plugin-polyfill-corejs3@^0.8.5:
+  version "0.8.5"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.5.tgz#a75fa1b0c3fc5bd6837f9ec465c0f48031b8cab1"
+  integrity sha512-Q6CdATeAvbScWPNLB8lzSO7fgUVBkQt6zLgNlfyeCr/EQaEQR+bWiBYYPYAFyE528BMjRhL+1QBMOI4jc/c5TA==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.3"
-    core-js-compat "^3.25.1"
+    "@babel/helper-define-polyfill-provider" "^0.4.3"
+    core-js-compat "^3.32.2"
 
-babel-plugin-polyfill-regenerator@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz"
-  integrity sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==
+babel-plugin-polyfill-regenerator@^0.5.3:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.3.tgz#d4c49e4b44614607c13fb769bcd85c72bb26a4a5"
+  integrity sha512-8sHeDOmXC8csczMrYEOf0UTNa4yE2SxV5JGeT/LP1n0OYVDUUFPxG9vdk2AlDlIit4t+Kf0xCtpgXPBwnn/9pw==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.3"
+    "@babel/helper-define-polyfill-provider" "^0.4.3"
 
 babel-plugin-react-intl@^7.0.0:
   version "7.9.4"
-  resolved "https://registry.npmjs.org/babel-plugin-react-intl/-/babel-plugin-react-intl-7.9.4.tgz"
+  resolved "https://registry.yarnpkg.com/babel-plugin-react-intl/-/babel-plugin-react-intl-7.9.4.tgz#1fc9ab50470d41b934df50d8f436578ee1732cb0"
   integrity sha512-cMKrHEXrw43yT4M89Wbgq8A8N8lffSquj1Piwov/HVukR7jwOw8gf9btXNsQhT27ccyqEwy+M286JQYy0jby2g==
   dependencies:
     "@babel/core" "^7.9.0"
@@ -3090,16 +3063,9 @@ base64-js@^1.3.1:
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
-bcrypt-pbkdf@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"
-  integrity sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==
-  dependencies:
-    tweetnacl "^0.14.3"
-
 bcryptjs@^2.4.3:
   version "2.4.3"
-  resolved "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz"
+  resolved "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-2.4.3.tgz#9ab5627b93e60621ff7cdac5da9733027df1d0cb"
   integrity sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ==
 
 binary-extensions@^2.0.0:
@@ -3118,7 +3084,7 @@ bl@^4.0.3:
 
 boolbase@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
   integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==
 
 brace-expansion@^1.1.7:
@@ -3131,7 +3097,7 @@ brace-expansion@^1.1.7:
 
 brace-expansion@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
   integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
   dependencies:
     balanced-match "^1.0.0"
@@ -3143,19 +3109,19 @@ braces@^3.0.2, braces@~3.0.2:
   dependencies:
     fill-range "^7.0.1"
 
-browserslist@^4.0.0, browserslist@^4.21.3, browserslist@^4.21.4, browserslist@^4.21.5:
-  version "4.21.9"
-  resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.21.9.tgz"
-  integrity sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==
+browserslist@^4.0.0, browserslist@^4.21.10, browserslist@^4.21.4, browserslist@^4.21.9, browserslist@^4.22.1:
+  version "4.22.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.1.tgz#ba91958d1a59b87dab6fed8dfbcb3da5e2e9c619"
+  integrity sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==
   dependencies:
-    caniuse-lite "^1.0.30001503"
-    electron-to-chromium "^1.4.431"
-    node-releases "^2.0.12"
-    update-browserslist-db "^1.0.11"
+    caniuse-lite "^1.0.30001541"
+    electron-to-chromium "^1.4.535"
+    node-releases "^2.0.13"
+    update-browserslist-db "^1.0.13"
 
 buble@^0.20.0:
   version "0.20.0"
-  resolved "https://registry.npmjs.org/buble/-/buble-0.20.0.tgz"
+  resolved "https://registry.yarnpkg.com/buble/-/buble-0.20.0.tgz#a143979a8d968b7f76b57f38f2e7ce7cfe938d1f"
   integrity sha512-/1gnaMQE8xvd5qsNBl+iTuyjJ9XxeaVxAMF86dQ4EyxFJOZtsgOS8Ra+7WHgZTam5IFDtt4BguN0sH0tVTKrOw==
   dependencies:
     acorn "^6.4.1"
@@ -3168,12 +3134,12 @@ buble@^0.20.0:
 
 buffer-equal-constant-time@1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
   integrity sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==
 
 buffer-from@^1.0.0:
   version "1.1.2"
-  resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
 buffer@^5.5.0:
@@ -3186,23 +3152,24 @@ buffer@^5.5.0:
 
 builtin-modules@^3.3.0:
   version "3.3.0"
-  resolved "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz#cae62812b89801e9656336e46223e030386be7b6"
   integrity sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==
 
 busboy@1.6.0:
   version "1.6.0"
-  resolved "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz"
+  resolved "https://registry.yarnpkg.com/busboy/-/busboy-1.6.0.tgz#966ea36a9502e43cdb9146962523b92f531f6893"
   integrity sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==
   dependencies:
     streamsearch "^1.1.0"
 
-call-bind@^1.0.0, call-bind@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
-  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
+call-bind@^1.0.0, call-bind@^1.0.2, call-bind@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.4.tgz#ef8386f4e78974d32b771d4a70f827c558a19408"
+  integrity sha512-e68w37XfAb5fL5M3NTxqKLcXRUkL2/kFlQjQjE/8jvPMBKmO5ZDycRkS/DrZRXjegOzwWzEwW88m+8r+D0PUUA==
   dependencies:
-    function-bind "^1.1.1"
-    get-intrinsic "^1.0.2"
+    function-bind "^1.1.2"
+    get-intrinsic "^1.2.1"
+    set-function-length "^1.1.0"
 
 callsites@^3.0.0:
   version "3.1.0"
@@ -3211,7 +3178,7 @@ callsites@^3.0.0:
 
 camelcase-keys@^6.2.2:
   version "6.2.2"
-  resolved "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz"
+  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0"
   integrity sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==
   dependencies:
     camelcase "^5.3.1"
@@ -3230,17 +3197,17 @@ camelcase-keys@^7.0.0:
 
 camelcase@^5.0.0, camelcase@^5.3.1:
   version "5.3.1"
-  resolved "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
 camelcase@^6.2.0, camelcase@^6.3.0:
   version "6.3.0"
-  resolved "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
 caniuse-api@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0"
   integrity sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==
   dependencies:
     browserslist "^4.0.0"
@@ -3248,19 +3215,24 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001406, caniuse-lite@^1.0.30001426, caniuse-lite@^1.0.30001503:
-  version "1.0.30001506"
-  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001506.tgz"
-  integrity sha512-6XNEcpygZMCKaufIcgpQNZNf00GEqc7VQON+9Rd0K1bMYo8xhMZRAo5zpbnbMNizi4YNgIDAFrdykWsvY3H4Hw==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001538, caniuse-lite@^1.0.30001541:
+  version "1.0.30001551"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001551.tgz#1f2cfa8820bd97c971a57349d7fd8f6e08664a3e"
+  integrity sha512-vtBAez47BoGMMzlbYhfXrMV1kvRF2WP/lqiMuDu1Sb4EE4LKEgjopFDSRtZfdVnslNRpOqV/woE+Xgrwj6VQlg==
 
-caseless@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"
-  integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==
+caniuse-lite@^1.0.30001406:
+  version "1.0.30001558"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001558.tgz#d2c6e21fdbfe83817f70feab902421a19b7983ee"
+  integrity sha512-/Et7DwLqpjS47JPEcz6VnxU9PwcIdVi0ciLXRWBQdj1XFye68pSQYpV0QtPTfUKWuOaEig+/Vez2l74eDc1tPQ==
 
-chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2:
+chalk@5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.3.0.tgz#67c20a7ebef70e7f3970a01f90fa210cb6860385"
+  integrity sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==
+
+chalk@^2.4.1, chalk@^2.4.2:
   version "2.4.2"
-  resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
   dependencies:
     ansi-styles "^3.2.1"
@@ -3269,22 +3241,22 @@ chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2:
 
 chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2:
   version "4.1.2"
-  resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
   dependencies:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
 chart.js@^4.2.1:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-4.3.2.tgz#904ebe0376eb368a659a92d2050df47336847e4c"
-  integrity sha512-pvQNyFOY1QmbmIr8oDORL16/FFivfxj8V26VFpFilMo4cNvkV5WXLJetDio365pd9gKUHGdirUTbqJfw8tr+Dg==
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-4.4.0.tgz#df843fdd9ec6bd88d7f07e2b95348d221bd2698c"
+  integrity sha512-vQEj6d+z0dcsKLlQvbKIMYFHd3t8W/7L2vfJIbYcfyPcRx92CsHqECpueN8qVGNlKyDcr5wBrYAYKnfu/9Q1hQ==
   dependencies:
     "@kurkle/color" "^0.3.0"
 
 chartjs-adapter-date-fns@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/chartjs-adapter-date-fns/-/chartjs-adapter-date-fns-3.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/chartjs-adapter-date-fns/-/chartjs-adapter-date-fns-3.0.0.tgz#c25f63c7f317c1f96f9a7c44bd45eeedb8a478e5"
   integrity sha512-Rs3iEB3Q5pJ973J93OBTpnP7qoGwvq3nUnoMdtxO+9aoJof7UFcRbWcIDteXuYd1fgAvct/32T9qaLyLuZVwCg==
 
 chokidar@^3.5.3:
@@ -3309,63 +3281,49 @@ chownr@^1.1.1:
 
 chownr@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
   integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
 
 ci-info@^3.2.0:
-  version "3.3.0"
-  resolved "https://registry.npmjs.org/ci-info/-/ci-info-3.3.0.tgz"
-  integrity sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw==
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4"
+  integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==
 
-citty@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/citty/-/citty-0.1.2.tgz#bae07bfd1962439735d7698c7954f76025690603"
-  integrity sha512-Me9nf0/BEmMOnuQzMOVXgpzkMUNbd0Am8lTl/13p0aRGAoLGk5T5sdet/42CrIGmWdG67BgHUhcKK1my1ujUEg==
+citty@^0.1.3, citty@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/citty/-/citty-0.1.4.tgz#91091be06ae4951dffa42fd443de7fe72245f2e0"
+  integrity sha512-Q3bK1huLxzQrvj7hImJ7Z1vKYJRPQCDnd0EjXfHMidcjecGOMuLrmuQmtWmFkuKLcMThlGh1yCKG8IEc6VeNXQ==
   dependencies:
     consola "^3.2.3"
 
 classnames@^2.3.1:
   version "2.3.2"
-  resolved "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz"
+  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.2.tgz#351d813bf0137fcc6a76a16b88208d2560a0d924"
   integrity sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==
 
 clean-stack@^2.0.0:
   version "2.2.0"
-  resolved "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
   integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
 
-cli-cursor@^3.1.0:
+cli-cursor@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-4.0.0.tgz#3cecfe3734bf4fe02a8361cbdc0f6fe28c6a57ea"
+  integrity sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==
+  dependencies:
+    restore-cursor "^4.0.0"
+
+cli-truncate@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz"
-  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
+  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-3.1.0.tgz#3f23ab12535e3d73e839bb43e73c9de487db1389"
+  integrity sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==
   dependencies:
-    restore-cursor "^3.1.0"
-
-cli-truncate@2.1.0, cli-truncate@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz"
-  integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==
-  dependencies:
-    slice-ansi "^3.0.0"
-    string-width "^4.2.0"
-
-clickhouse@^2.5.0:
-  version "2.6.0"
-  resolved "https://registry.npmjs.org/clickhouse/-/clickhouse-2.6.0.tgz"
-  integrity sha512-HC5OV99GJOup4qZsTuWWPpXlj+847Z0OeygDU2x22rNYost0V/vWapzFWYZdV/5iRbGMrhFQPOyQEzmGvoaWRQ==
-  dependencies:
-    JSONStream "1.3.4"
-    lodash "4.17.21"
-    querystring "0.2.0"
-    request "2.88.0"
-    stream2asynciter "1.0.3"
-    through "2.3.8"
-    tsv "0.2.0"
-    uuid "3.4.0"
+    slice-ansi "^5.0.0"
+    string-width "^5.0.0"
 
 client-only@0.0.1:
   version "0.0.1"
-  resolved "https://registry.npmjs.org/client-only/-/client-only-0.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/client-only/-/client-only-0.0.1.tgz#38bba5d403c41ab150bff64a95c85013cf73bca1"
   integrity sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==
 
 clipboardy@^3.0.0:
@@ -3377,12 +3335,7 @@ clipboardy@^3.0.0:
     execa "^5.1.1"
     is-wsl "^2.2.0"
 
-cluster-key-slot@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.1.tgz"
-  integrity sha512-rwHwUfXL40Chm1r08yrhU3qpUvdVlgkKNeyeGPOxnW8/SyVDvgRaed/Uz54AqWNaTCAThlj6QAs3TZcKI0xDEw==
-
-cluster-key-slot@^1.1.0:
+cluster-key-slot@1.1.2, cluster-key-slot@^1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz#88ddaa46906e303b5de30d3153b7d9fe0a0c19ac"
   integrity sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==
@@ -3429,49 +3382,47 @@ color@^4.2.3:
 
 colord@^2.9.1, colord@^2.9.2, colord@^2.9.3:
   version "2.9.3"
-  resolved "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz"
+  resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.3.tgz#4f8ce919de456f1d5c1c368c307fe20f3e59fb43"
   integrity sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==
 
-colorette@^1.4.0:
+colorette@^1.1.0:
   version "1.4.0"
-  resolved "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40"
   integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==
 
-colorette@^2.0.16:
+colorette@^2.0.20:
   version "2.0.20"
-  resolved "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
   integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
 
-combined-stream@^1.0.6, combined-stream@~1.0.6:
-  version "1.0.8"
-  resolved "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"
-  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
-  dependencies:
-    delayed-stream "~1.0.0"
+commander@11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-11.0.0.tgz#43e19c25dbedc8256203538e8d7e9346877a6f67"
+  integrity sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==
 
 commander@2, commander@^2.20.0, commander@^2.20.3:
   version "2.20.3"
-  resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
 commander@2.20.0:
   version "2.20.0"
-  resolved "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
   integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
 
-commander@8, commander@^8.2.0:
+commander@8:
   version "8.3.0"
-  resolved "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
   integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
 
 commander@^7.2.0:
   version "7.2.0"
-  resolved "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
   integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
 
 commondir@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
   integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==
 
 concat-map@0.0.1:
@@ -3481,97 +3432,66 @@ concat-map@0.0.1:
 
 concat-with-sourcemaps@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e"
   integrity sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==
   dependencies:
     source-map "^0.6.1"
 
-consola@^3.1.0, consola@^3.2.3:
+consola@^3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/consola/-/consola-3.2.3.tgz#0741857aa88cfa0d6fd53f1cff0375136e98502f"
   integrity sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==
 
-convert-source-map@^1.7.0:
-  version "1.9.0"
-  resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz"
-  integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
+convert-source-map@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
+  integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
 
 cookie-es@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/cookie-es/-/cookie-es-1.0.0.tgz#4759684af168dfc54365b2c2dda0a8d7ee1e4865"
   integrity sha512-mWYvfOLrfEc996hlKcdABeIiPHUPC6DM2QYZdGGOvhOTbA3tjm2eBwqlJpoFdjC89NI4Qt6h0Pu06Mp+1Pj5OQ==
 
-core-js-compat@^3.25.1:
-  version "3.31.0"
-  resolved "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.31.0.tgz"
-  integrity sha512-hM7YCu1cU6Opx7MXNu0NuumM0ezNeAeRKadixyiQELWY3vT3De9S4J5ZBMraWV2vZnrE1Cirl0GtFtDtMUXzPw==
+core-js-compat@^3.31.0, core-js-compat@^3.32.2:
+  version "3.33.0"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.33.0.tgz#24aa230b228406450b2277b7c8bfebae932df966"
+  integrity sha512-0w4LcLXsVEuNkIqwjjf9rjCoPhK8uqA4tMRh4Ge26vfLtUutshn+aRJU21I9LCJlh2QQHfisNToLjw1XEJLTWw==
   dependencies:
-    browserslist "^4.21.5"
-
-core-js-pure@^3.25.1:
-  version "3.26.1"
-  resolved "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.26.1.tgz"
-  integrity sha512-VVXcDpp/xJ21KdULRq/lXdLzQAtX7+37LzpyfFM973il0tWSsDEoyzG38G14AjTpK9VTfiNM9jnFauq/CpaWGQ==
-
-core-util-is@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-  integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==
+    browserslist "^4.22.1"
 
 cors@^2.8.5:
   version "2.8.5"
-  resolved "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz"
+  resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29"
   integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==
   dependencies:
     object-assign "^4"
     vary "^1"
 
-cosmiconfig@^7.0.1:
-  version "7.1.0"
-  resolved "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz"
-  integrity sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==
+cosmiconfig@^8.1.3, cosmiconfig@^8.2.0:
+  version "8.3.6"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.3.6.tgz#060a2b871d66dba6c8538ea1118ba1ac16f5fae3"
+  integrity sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==
   dependencies:
-    "@types/parse-json" "^4.0.0"
-    import-fresh "^3.2.1"
-    parse-json "^5.0.0"
-    path-type "^4.0.0"
-    yaml "^1.10.0"
-
-cosmiconfig@^8.1.3:
-  version "8.1.3"
-  resolved "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.1.3.tgz"
-  integrity sha512-/UkO2JKI18b5jVMJUp0lvKFMpa/Gye+ZgZjKD+DGEN9y7NRcf/nK1A0sp67ONmKtnDCNMS44E6jrk0Yc3bDuUw==
-  dependencies:
-    import-fresh "^3.2.1"
+    import-fresh "^3.3.0"
     js-yaml "^4.1.0"
-    parse-json "^5.0.0"
-    path-type "^4.0.0"
-
-cosmiconfig@^8.2.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.2.0.tgz#f7d17c56a590856cd1e7cee98734dca272b0d8fd"
-  integrity sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ==
-  dependencies:
-    import-fresh "^3.2.1"
-    js-yaml "^4.1.0"
-    parse-json "^5.0.0"
+    parse-json "^5.2.0"
     path-type "^4.0.0"
 
 create-require@^1.1.0:
   version "1.1.1"
-  resolved "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
   integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
 
 cross-env@^7.0.3:
   version "7.0.3"
-  resolved "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz"
+  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf"
   integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==
   dependencies:
     cross-spawn "^7.0.1"
 
 cross-spawn@^6.0.5:
   version "6.0.5"
-  resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
   integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
   dependencies:
     nice-try "^1.0.4"
@@ -3582,7 +3502,7 @@ cross-spawn@^6.0.5:
 
 cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
   version "7.0.3"
-  resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
   integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
   dependencies:
     path-key "^3.1.0"
@@ -3591,43 +3511,43 @@ cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
 
 css-blank-pseudo@^3.0.3:
   version "3.0.3"
-  resolved "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-3.0.3.tgz"
+  resolved "https://registry.yarnpkg.com/css-blank-pseudo/-/css-blank-pseudo-3.0.3.tgz#36523b01c12a25d812df343a32c322d2a2324561"
   integrity sha512-VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ==
   dependencies:
     postcss-selector-parser "^6.0.9"
 
 css-box-model@^1.2.0:
   version "1.2.1"
-  resolved "https://registry.npmjs.org/css-box-model/-/css-box-model-1.2.1.tgz"
+  resolved "https://registry.yarnpkg.com/css-box-model/-/css-box-model-1.2.1.tgz#59951d3b81fd6b2074a62d49444415b0d2b4d7c1"
   integrity sha512-a7Vr4Q/kd/aw96bnJG332W9V9LkJO69JRcaCYDUqjp6/z0w6VcZjgAcTbgFxEPfBgdnAwlh3iwu+hLopa+flJw==
   dependencies:
     tiny-invariant "^1.0.6"
 
 css-declaration-sorter@^6.3.1:
-  version "6.4.0"
-  resolved "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.0.tgz"
-  integrity sha512-jDfsatwWMWN0MODAFuHszfjphEXfNw9JUAhmY4pLu3TyTU+ohUpsbVtbU+1MZn4a47D9kqh03i4eyOm+74+zew==
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.4.1.tgz#28beac7c20bad7f1775be3a7129d7eae409a3a71"
+  integrity sha512-rtdthzxKuyq6IzqX6jEcIzQF/YqccluefyCYheovBOLhFT/drQA9zj/UbRAa9J7C0o6EG6u3E6g+vKkay7/k3g==
 
-css-functions-list@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/css-functions-list/-/css-functions-list-3.2.0.tgz#8290b7d064bf483f48d6559c10e98dc4d1ad19ee"
-  integrity sha512-d/jBMPyYybkkLVypgtGv12R+pIFw4/f/IHtCTxWpZc8ofTYOPigIgmA6vu5rMHartZC+WuXhBUHfnyNUIQSYrg==
+css-functions-list@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/css-functions-list/-/css-functions-list-3.2.1.tgz#2eb205d8ce9f9ce74c5c1d7490b66b77c45ce3ea"
+  integrity sha512-Nj5YcaGgBtuUmn1D7oHqPW0c9iui7xsTsj5lIX8ZgevdfhmjFfKB3r8moHJtNJnctnYXJyYX5I1pp90HM4TPgQ==
 
 css-has-pseudo@^3.0.4:
   version "3.0.4"
-  resolved "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-3.0.4.tgz"
+  resolved "https://registry.yarnpkg.com/css-has-pseudo/-/css-has-pseudo-3.0.4.tgz#57f6be91ca242d5c9020ee3e51bbb5b89fc7af73"
   integrity sha512-Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw==
   dependencies:
     postcss-selector-parser "^6.0.9"
 
 css-prefers-color-scheme@^6.0.3:
   version "6.0.3"
-  resolved "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz"
+  resolved "https://registry.yarnpkg.com/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz#ca8a22e5992c10a5b9d315155e7caee625903349"
   integrity sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==
 
 css-select@^4.1.3:
   version "4.3.0"
-  resolved "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.3.0.tgz#db7129b2846662fd8628cfc496abb2b59e41529b"
   integrity sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==
   dependencies:
     boolbase "^1.0.0"
@@ -3638,7 +3558,7 @@ css-select@^4.1.3:
 
 css-select@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-5.1.0.tgz#b8ebd6554c3637ccc76688804ad3f6a6fdaea8a6"
   integrity sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==
   dependencies:
     boolbase "^1.0.0"
@@ -3649,7 +3569,7 @@ css-select@^5.1.0:
 
 css-tree@^1.1.2, css-tree@^1.1.3:
   version "1.1.3"
-  resolved "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d"
   integrity sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==
   dependencies:
     mdn-data "2.0.14"
@@ -3657,7 +3577,7 @@ css-tree@^1.1.2, css-tree@^1.1.3:
 
 css-tree@^2.2.1, css-tree@^2.3.1:
   version "2.3.1"
-  resolved "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz"
+  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.3.1.tgz#10264ce1e5442e8572fc82fbe490644ff54b5c20"
   integrity sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==
   dependencies:
     mdn-data "2.0.30"
@@ -3665,7 +3585,7 @@ css-tree@^2.2.1, css-tree@^2.3.1:
 
 css-tree@~2.2.0:
   version "2.2.1"
-  resolved "https://registry.npmjs.org/css-tree/-/css-tree-2.2.1.tgz"
+  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.2.1.tgz#36115d382d60afd271e377f9c5f67d02bd48c032"
   integrity sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==
   dependencies:
     mdn-data "2.0.28"
@@ -3673,13 +3593,13 @@ css-tree@~2.2.0:
 
 css-what@^6.0.1, css-what@^6.1.0:
   version "6.1.0"
-  resolved "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4"
   integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==
 
 cssdb@^7.1.0:
-  version "7.2.1"
-  resolved "https://registry.npmjs.org/cssdb/-/cssdb-7.2.1.tgz"
-  integrity sha512-btohrCpVaLqOoMt90aumHe6HU4c06duiYA8ymwtpGfwuZAhWKDBve/c2k+E85Jeq5iojPkeonqiKV+aLeY8QlA==
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-7.8.0.tgz#ac41fa025371b74eb2ccfe3d41f5c4dbd444fbe3"
+  integrity sha512-SkeezZOQr5AHt9MgJgSFNyiuJwg1p8AwoVln6JwaQJsyxduRW9QJ+HP/gAQzbsz8SIqINtYvpJKjxTRI67zxLg==
 
 cssesc@^3.0.0:
   version "3.0.0"
@@ -3693,7 +3613,7 @@ cssfilter@0.0.10:
 
 cssnano-preset-default@^5.2.14:
   version "5.2.14"
-  resolved "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.14.tgz"
+  resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.2.14.tgz#309def4f7b7e16d71ab2438052093330d9ab45d8"
   integrity sha512-t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A==
   dependencies:
     css-declaration-sorter "^6.3.1"
@@ -3728,12 +3648,12 @@ cssnano-preset-default@^5.2.14:
 
 cssnano-utils@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-3.1.0.tgz#95684d08c91511edfc70d2636338ca37ef3a6861"
   integrity sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==
 
 cssnano@^5.0.1:
   version "5.1.15"
-  resolved "https://registry.npmjs.org/cssnano/-/cssnano-5.1.15.tgz"
+  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.15.tgz#ded66b5480d5127fcb44dac12ea5a983755136bf"
   integrity sha512-j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw==
   dependencies:
     cssnano-preset-default "^5.2.14"
@@ -3742,55 +3662,50 @@ cssnano@^5.0.1:
 
 csso@^4.2.0:
   version "4.2.0"
-  resolved "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529"
   integrity sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==
   dependencies:
     css-tree "^1.1.2"
 
 csso@^5.0.5:
   version "5.0.5"
-  resolved "https://registry.npmjs.org/csso/-/csso-5.0.5.tgz"
+  resolved "https://registry.yarnpkg.com/csso/-/csso-5.0.5.tgz#f9b7fe6cc6ac0b7d90781bb16d5e9874303e2ca6"
   integrity sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==
   dependencies:
     css-tree "~2.2.0"
 
-csstype@^2.6.8:
-  version "2.6.20"
-  resolved "https://registry.npmjs.org/csstype/-/csstype-2.6.20.tgz"
-  integrity sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA==
-
-csstype@^3.0.2:
-  version "3.1.1"
-  resolved "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz"
-  integrity sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==
+csstype@^3.0.2, csstype@^3.1.1:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.2.tgz#1d4bf9d572f11c14031f0436e1c10bc1f571f50b"
+  integrity sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==
 
 currently-unhandled@^0.4.1:
   version "0.4.1"
-  resolved "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz"
+  resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
   integrity sha512-/fITjgjGU50vjQ4FH6eUoYu+iUoUKIXws2hL15JJpIR+BbTxaXQsMuuyjtNh2WqsSBS5nsaZHFsFecyw5CCAng==
   dependencies:
     array-find-index "^1.0.1"
 
 d3-array@^2.5.0:
   version "2.12.1"
-  resolved "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz"
+  resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-2.12.1.tgz#e20b41aafcdffdf5d50928004ececf815a465e81"
   integrity sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==
   dependencies:
     internmap "^1.0.0"
 
 "d3-color@1 - 2":
   version "2.0.0"
-  resolved "https://registry.npmjs.org/d3-color/-/d3-color-2.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-2.0.0.tgz#8d625cab42ed9b8f601a1760a389f7ea9189d62e"
   integrity sha512-SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ==
 
 "d3-dispatch@1 - 2":
   version "2.0.0"
-  resolved "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-2.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-2.0.0.tgz#8a18e16f76dd3fcaef42163c97b926aa9b55e7cf"
   integrity sha512-S/m2VsXI7gAti2pBoLClFFTMOO1HTtT0j99AuXLoGFKO6deHDdnv6ZGTxSTTUTgO1zVcv82fCOtDjYK4EECmWA==
 
 d3-drag@2:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/d3-drag/-/d3-drag-2.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/d3-drag/-/d3-drag-2.0.0.tgz#9eaf046ce9ed1c25c88661911c1d5a4d8eb7ea6d"
   integrity sha512-g9y9WbMnF5uqB9qKqwIIa/921RYWzlUDv9Jl1/yONQwxbOfszAWTCm8u7HOTgJgRDXiRZN56cHT9pd24dmXs8w==
   dependencies:
     d3-dispatch "1 - 2"
@@ -3798,36 +3713,36 @@ d3-drag@2:
 
 "d3-ease@1 - 2":
   version "2.0.0"
-  resolved "https://registry.npmjs.org/d3-ease/-/d3-ease-2.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-2.0.0.tgz#fd1762bfca00dae4bacea504b1d628ff290ac563"
   integrity sha512-68/n9JWarxXkOWMshcT5IcjbB+agblQUaIsbnXmrzejn2O82n3p2A9R2zEB9HIEFWKFwPAEDDN8gR0VdSAyyAQ==
 
 d3-geo@^2.0.1:
   version "2.0.2"
-  resolved "https://registry.npmjs.org/d3-geo/-/d3-geo-2.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-2.0.2.tgz#c065c1b71fe8c5f1be657e5f43d9bdd010383c40"
   integrity sha512-8pM1WGMLGFuhq9S+FpPURxic+gKzjluCD/CHTuUF3mXMeiCo0i6R0tO1s4+GArRFde96SLcW/kOFRjoAosPsFA==
   dependencies:
     d3-array "^2.5.0"
 
 "d3-interpolate@1 - 2":
   version "2.0.1"
-  resolved "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-2.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-2.0.1.tgz#98be499cfb8a3b94d4ff616900501a64abc91163"
   integrity sha512-c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ==
   dependencies:
     d3-color "1 - 2"
 
 d3-selection@2, d3-selection@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/d3-selection/-/d3-selection-2.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-2.0.0.tgz#94a11638ea2141b7565f883780dabc7ef6a61066"
   integrity sha512-XoGGqhLUN/W14NmaqcO/bb1nqjDAw5WtSYb2X8wiuQWvSZUsUVYsOSkOybUrNvcBjaywBdYPy03eXHMXjk9nZA==
 
 "d3-timer@1 - 2":
   version "2.0.0"
-  resolved "https://registry.npmjs.org/d3-timer/-/d3-timer-2.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-2.0.0.tgz#055edb1d170cfe31ab2da8968deee940b56623e6"
   integrity sha512-TO4VLh0/420Y/9dO3+f9abDEFYeCUr2WZRlxJvbp4HPTQcSylXNiL6yZa9FIUvV1yRiFufl1bszTCLDqv9PWNA==
 
 d3-transition@2:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/d3-transition/-/d3-transition-2.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-2.0.0.tgz#366ef70c22ef88d1e34105f507516991a291c94c"
   integrity sha512-42ltAGgJesfQE3u9LuuBHNbGrI/AJjNL2OAUdclE70UE6Vy239GCBEYD38uBPoLeNsOhFStGpPI0BAOV+HMxog==
   dependencies:
     d3-color "1 - 2"
@@ -3838,7 +3753,7 @@ d3-transition@2:
 
 d3-zoom@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/d3-zoom/-/d3-zoom-2.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-2.0.0.tgz#f04d0afd05518becce879d04709c47ecd93fba54"
   integrity sha512-fFg7aoaEm9/jf+qfstak0IYpnesZLiMX6GZvXtUSdv8RH2o4E2qeelgdU09eKS6wGuiGMfcnMI0nTIqWzRHGpw==
   dependencies:
     d3-dispatch "1 - 2"
@@ -3849,16 +3764,9 @@ d3-zoom@^2.0.0:
 
 damerau-levenshtein@^1.0.8:
   version "1.0.8"
-  resolved "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz"
+  resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7"
   integrity sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==
 
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"
-  integrity sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==
-  dependencies:
-    assert-plus "^1.0.0"
-
 data-uri-to-buffer@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz#d8feb2b2881e6a4f58c2e08acfd0e2834e26222e"
@@ -3866,26 +3774,33 @@ data-uri-to-buffer@^4.0.0:
 
 date-fns-tz@^1.1.4:
   version "1.3.8"
-  resolved "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-1.3.8.tgz"
+  resolved "https://registry.yarnpkg.com/date-fns-tz/-/date-fns-tz-1.3.8.tgz#083e3a4e1f19b7857fa0c18deea6c2bc46ded7b9"
   integrity sha512-qwNXUFtMHTTU6CFSFjoJ80W8Fzzp24LntbjFFBgL/faqds4e5mo9mftoRLgr3Vi1trISsg4awSpYVsOQCRnapQ==
 
 date-fns@^2.23.0, date-fns@^2.29.3:
   version "2.30.0"
-  resolved "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.30.0.tgz#f367e644839ff57894ec6ac480de40cae4b0f4d0"
   integrity sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==
   dependencies:
     "@babel/runtime" "^7.21.0"
 
 dateformat@^5.0.3:
   version "5.0.3"
-  resolved "https://registry.npmjs.org/dateformat/-/dateformat-5.0.3.tgz"
+  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-5.0.3.tgz#fe2223eff3cc70ce716931cb3038b59a9280696e"
   integrity sha512-Kvr6HmPXUMerlLcLF+Pwq3K7apHpYmGDVqrxcDasBg86UcKeTSNWbEzU8bwdXnxnR44FtMhJAxI4Bov6Y/KUfA==
 
 debounce@^1.2.1:
   version "1.2.1"
-  resolved "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz"
+  resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5"
   integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==
 
+debug@4.3.4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  dependencies:
+    ms "2.1.2"
+
 debug@^3.2.7:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
@@ -3893,13 +3808,6 @@ debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4:
-  version "4.3.4"
-  resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
-  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
-  dependencies:
-    ms "2.1.2"
-
 decamelize-keys@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.1.tgz#04a2d523b2f18d80d0158a43b895d56dff8d19d8"
@@ -3910,7 +3818,7 @@ decamelize-keys@^1.1.0:
 
 decamelize@^1.1.0, decamelize@^1.2.0:
   version "1.2.0"
-  resolved "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
 
 decamelize@^5.0.0:
@@ -3937,14 +3845,24 @@ deep-is@^0.1.3:
 
 deepmerge@^4.2.2, deepmerge@^4.3.1:
   version "4.3.1"
-  resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
   integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
 
-define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5"
-  integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==
+define-data-property@^1.0.1, define-data-property@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.1.tgz#c35f7cd0ab09883480d12ac5cb213715587800b3"
+  integrity sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==
   dependencies:
+    get-intrinsic "^1.2.1"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.0"
+
+define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0, define-properties@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c"
+  integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==
+  dependencies:
+    define-data-property "^1.0.1"
     has-property-descriptors "^1.0.0"
     object-keys "^1.1.1"
 
@@ -3955,7 +3873,7 @@ defu@^6.1.2:
 
 del@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.npmjs.org/del/-/del-5.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/del/-/del-5.1.0.tgz#d9487c94e367410e6eff2925ee58c0c84a75b3a7"
   integrity sha512-wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA==
   dependencies:
     globby "^10.0.1"
@@ -3969,7 +3887,7 @@ del@^5.1.0:
 
 del@^6.0.0:
   version "6.1.1"
-  resolved "https://registry.npmjs.org/del/-/del-6.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/del/-/del-6.1.1.tgz#3b70314f1ec0aa325c6b14eb36b95786671edb7a"
   integrity sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==
   dependencies:
     globby "^11.0.1"
@@ -3981,36 +3899,41 @@ del@^6.0.0:
     rimraf "^3.0.2"
     slash "^3.0.0"
 
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
-  integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
-
 denque@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/denque/-/denque-2.1.0.tgz#e93e1a6569fb5e66f16a3c2a2964617d349d6ab1"
   integrity sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==
 
-destr@^1.1.1, destr@^1.2.2:
+dequal@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be"
+  integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==
+
+destr@^1.1.1:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/destr/-/destr-1.2.2.tgz#7ba9befcafb645a50e76b260449c63927b51e22f"
   integrity sha512-lrbCJwD9saUQrqUfXvl6qoM+QN3W7tLV5pAOs+OqOmopCCz/JkE05MHedJR1xfk4IAnZuJXPVuN5+7jNA2ZCiA==
 
-destr@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/destr/-/destr-2.0.0.tgz#60847d02b211de6e252fc72806f4ec39ec257e7b"
-  integrity sha512-FJ9RDpf3GicEBvzI3jxc2XhHzbqD8p4ANw/1kPsFBfTvP1b7Gn/Lg1vO7R9J4IVgoMbyUmFrFGZafJ1hPZpvlg==
+destr@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/destr/-/destr-2.0.1.tgz#2fc7bddc256fed1183e03f8d148391dde4023cb2"
+  integrity sha512-M1Ob1zPSIvlARiJUkKqvAZ3VAqQY6Jcuth/pBKQ2b1dX/Qx0OnJ8Vux6J2H5PTMQeRzWrrbTu70VxBfv/OPDJA==
 
 detect-browser@^5.2.0:
   version "5.3.0"
-  resolved "https://registry.npmjs.org/detect-browser/-/detect-browser-5.3.0.tgz"
+  resolved "https://registry.yarnpkg.com/detect-browser/-/detect-browser-5.3.0.tgz#9705ef2bddf46072d0f7265a1fe300e36fe7ceca"
   integrity sha512-53rsFbGdwMwlF7qvCt0ypLM5V5/Mbl0szB7GPN8y9NCcbknYOeVVXdrXEq+90IwAfrrzt6Hd+u2E2ntakICU8w==
 
 detect-indent@^6.0.0:
   version "6.1.0"
-  resolved "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.1.0.tgz#592485ebbbf6b3b1ab2be175c8393d04ca0d57e6"
   integrity sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==
 
+detect-libc@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+  integrity sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==
+
 detect-libc@^2.0.0, detect-libc@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.2.tgz#8ccf2ba9315350e1241b88d0ac3b0e1fbd99605d"
@@ -4018,7 +3941,7 @@ detect-libc@^2.0.0, detect-libc@^2.0.2:
 
 diff@^4.0.1:
   version "4.0.2"
-  resolved "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
   integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
 
 dir-glob@^3.0.1:
@@ -4044,7 +3967,7 @@ doctrine@^3.0.0:
 
 dom-serializer@^1.0.1:
   version "1.4.1"
-  resolved "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30"
   integrity sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==
   dependencies:
     domelementtype "^2.0.1"
@@ -4053,7 +3976,7 @@ dom-serializer@^1.0.1:
 
 dom-serializer@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53"
   integrity sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==
   dependencies:
     domelementtype "^2.3.0"
@@ -4062,26 +3985,26 @@ dom-serializer@^2.0.0:
 
 domelementtype@^2.0.1, domelementtype@^2.2.0, domelementtype@^2.3.0:
   version "2.3.0"
-  resolved "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
   integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
 
 domhandler@^4.2.0, domhandler@^4.3.1:
   version "4.3.1"
-  resolved "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c"
   integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==
   dependencies:
     domelementtype "^2.2.0"
 
-domhandler@^5.0.1, domhandler@^5.0.2:
+domhandler@^5.0.2, domhandler@^5.0.3:
   version "5.0.3"
-  resolved "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31"
   integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==
   dependencies:
     domelementtype "^2.3.0"
 
 domutils@^2.8.0:
   version "2.8.0"
-  resolved "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
   integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==
   dependencies:
     dom-serializer "^1.0.1"
@@ -4089,38 +4012,43 @@ domutils@^2.8.0:
     domhandler "^4.2.0"
 
 domutils@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/domutils/-/domutils-3.0.1.tgz"
-  integrity sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.1.0.tgz#c47f551278d3dc4b0b1ab8cbb42d751a6f0d824e"
+  integrity sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==
   dependencies:
     dom-serializer "^2.0.0"
     domelementtype "^2.3.0"
-    domhandler "^5.0.1"
+    domhandler "^5.0.3"
+
+dot-case@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751"
+  integrity sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==
+  dependencies:
+    no-case "^3.0.4"
+    tslib "^2.0.3"
 
 dotenv@^10.0.0:
   version "10.0.0"
-  resolved "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81"
   integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==
 
-ecc-jsbn@~0.1.1:
-  version "0.1.2"
-  resolved "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"
-  integrity sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==
-  dependencies:
-    jsbn "~0.1.0"
-    safer-buffer "^2.1.0"
+eastasianwidth@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
+  integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
 
 ecdsa-sig-formatter@1.0.11:
   version "1.0.11"
-  resolved "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz"
+  resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz#ae0f0fa2d85045ef14a817daa3ce9acd0489e5bf"
   integrity sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==
   dependencies:
     safe-buffer "^5.0.1"
 
-electron-to-chromium@^1.4.431:
-  version "1.4.436"
-  resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.436.tgz"
-  integrity sha512-aktOxo8fnrMC8vOIBMVS3PXbT1nrPQ+SouUuN7Y0a+Rw3pOMrvIV92Ybnax7x4tugA+ZpYA5fOHTby7ama8OQQ==
+electron-to-chromium@^1.4.535:
+  version "1.4.561"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.561.tgz#816f31d9ae01fe58abbf469fca7e125b16befd85"
+  integrity sha512-eS5t4ulWOBfVHdq9SW2dxEaFarj1lPjvJ8PaYMOjY0DecBaj/t4ARziL2IPpDr4atyWwjLFGQ2vo/VCgQFezVQ==
 
 emoji-regex@^8.0.0:
   version "8.0.0"
@@ -4129,7 +4057,7 @@ emoji-regex@^8.0.0:
 
 emoji-regex@^9.2.2:
   version "9.2.2"
-  resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
   integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
 
 end-of-stream@^1.1.0, end-of-stream@^1.4.1:
@@ -4139,28 +4067,16 @@ end-of-stream@^1.1.0, end-of-stream@^1.4.1:
   dependencies:
     once "^1.4.0"
 
-enquirer@^2.3.6:
-  version "2.3.6"
-  resolved "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz"
-  integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
-  dependencies:
-    ansi-colors "^4.1.1"
-
 entities@^2.0.0:
   version "2.2.0"
-  resolved "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
   integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
 
-entities@^4.2.0:
+entities@^4.2.0, entities@^4.4.0:
   version "4.5.0"
-  resolved "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
   integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
 
-entities@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz"
-  integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==
-
 error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
@@ -4168,18 +4084,18 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.19.0, es-abstract@^1.20.4, es-abstract@^1.21.2:
-  version "1.22.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.1.tgz#8b4e5fc5cefd7f1660f0f8e1a52900dfbc9d9ccc"
-  integrity sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==
+es-abstract@^1.22.1:
+  version "1.22.2"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.2.tgz#90f7282d91d0ad577f505e423e52d4c1d93c1b8a"
+  integrity sha512-YoxfFcDmhjOgWPWsV13+2RNjq1F6UQnfs+8TftwNqtzlmFzEXvlUwdrNrYeaizfjQzRMxkZ6ElWMOJIFKdVqwA==
   dependencies:
     array-buffer-byte-length "^1.0.0"
-    arraybuffer.prototype.slice "^1.0.1"
+    arraybuffer.prototype.slice "^1.0.2"
     available-typed-arrays "^1.0.5"
     call-bind "^1.0.2"
     es-set-tostringtag "^2.0.1"
     es-to-primitive "^1.2.1"
-    function.prototype.name "^1.1.5"
+    function.prototype.name "^1.1.6"
     get-intrinsic "^1.2.1"
     get-symbol-description "^1.0.0"
     globalthis "^1.0.3"
@@ -4195,67 +4111,48 @@ es-abstract@^1.19.0, es-abstract@^1.20.4, es-abstract@^1.21.2:
     is-regex "^1.1.4"
     is-shared-array-buffer "^1.0.2"
     is-string "^1.0.7"
-    is-typed-array "^1.1.10"
+    is-typed-array "^1.1.12"
     is-weakref "^1.0.2"
     object-inspect "^1.12.3"
     object-keys "^1.1.1"
     object.assign "^4.1.4"
-    regexp.prototype.flags "^1.5.0"
-    safe-array-concat "^1.0.0"
+    regexp.prototype.flags "^1.5.1"
+    safe-array-concat "^1.0.1"
     safe-regex-test "^1.0.0"
-    string.prototype.trim "^1.2.7"
-    string.prototype.trimend "^1.0.6"
-    string.prototype.trimstart "^1.0.6"
+    string.prototype.trim "^1.2.8"
+    string.prototype.trimend "^1.0.7"
+    string.prototype.trimstart "^1.0.7"
     typed-array-buffer "^1.0.0"
     typed-array-byte-length "^1.0.0"
     typed-array-byte-offset "^1.0.0"
     typed-array-length "^1.0.4"
     unbox-primitive "^1.0.2"
-    which-typed-array "^1.1.10"
+    which-typed-array "^1.1.11"
 
-es-abstract@^1.19.1:
-  version "1.21.1"
-  resolved "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.1.tgz"
-  integrity sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==
+es-iterator-helpers@^1.0.12:
+  version "1.0.15"
+  resolved "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.0.15.tgz#bd81d275ac766431d19305923707c3efd9f1ae40"
+  integrity sha512-GhoY8uYqd6iwUl2kgjTm4CZAf6oo5mHK7BPqx3rKgx893YSsy0LGHV6gfqqQvZt/8xM8xeOnfXBCfqclMKkJ5g==
   dependencies:
-    available-typed-arrays "^1.0.5"
+    asynciterator.prototype "^1.0.0"
     call-bind "^1.0.2"
+    define-properties "^1.2.1"
+    es-abstract "^1.22.1"
     es-set-tostringtag "^2.0.1"
-    es-to-primitive "^1.2.1"
     function-bind "^1.1.1"
-    function.prototype.name "^1.1.5"
-    get-intrinsic "^1.1.3"
-    get-symbol-description "^1.0.0"
+    get-intrinsic "^1.2.1"
     globalthis "^1.0.3"
-    gopd "^1.0.1"
-    has "^1.0.3"
     has-property-descriptors "^1.0.0"
     has-proto "^1.0.1"
     has-symbols "^1.0.3"
-    internal-slot "^1.0.4"
-    is-array-buffer "^3.0.1"
-    is-callable "^1.2.7"
-    is-negative-zero "^2.0.2"
-    is-regex "^1.1.4"
-    is-shared-array-buffer "^1.0.2"
-    is-string "^1.0.7"
-    is-typed-array "^1.1.10"
-    is-weakref "^1.0.2"
-    object-inspect "^1.12.2"
-    object-keys "^1.1.1"
-    object.assign "^4.1.4"
-    regexp.prototype.flags "^1.4.3"
-    safe-regex-test "^1.0.0"
-    string.prototype.trimend "^1.0.6"
-    string.prototype.trimstart "^1.0.6"
-    typed-array-length "^1.0.4"
-    unbox-primitive "^1.0.2"
-    which-typed-array "^1.1.9"
+    internal-slot "^1.0.5"
+    iterator.prototype "^1.1.2"
+    safe-array-concat "^1.0.1"
 
 es-module-lexer@^1.0.5:
-  version "1.2.1"
-  resolved "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.2.1.tgz"
-  integrity sha512-9978wrXM50Y4rTMmW5kXIC09ZdXQZqkE4mxhwkd8VbzsGkXGPgV4zWuqQJgCEzYngdo2dYDa0l8xhX4fkSwJSg==
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.3.1.tgz#c1b0dd5ada807a3b3155315911f364dc4e909db1"
+  integrity sha512-JUFAyicQV9mXc3YRxPnDlrfBKpqt6hUYzz9/boprUJHs4e4KVr3XwOF70doO6gwXUor6EWZJAyWAfKki84t20Q==
 
 es-set-tostringtag@^2.0.1:
   version "2.0.1"
@@ -4284,7 +4181,7 @@ es-to-primitive@^1.2.1:
 
 esbuild@^0.17.17:
   version "0.17.19"
-  resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.17.19.tgz"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.17.19.tgz#087a727e98299f0462a3d0bcdd9cd7ff100bd955"
   integrity sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==
   optionalDependencies:
     "@esbuild/android-arm" "0.17.19"
@@ -4312,7 +4209,7 @@ esbuild@^0.17.17:
 
 escalade@^3.1.1:
   version "3.1.1"
-  resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
   integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
 
 escape-string-regexp@^1.0.5:
@@ -4327,7 +4224,7 @@ escape-string-regexp@^4.0.0:
 
 eslint-config-next@^12.2.4:
   version "12.3.4"
-  resolved "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-12.3.4.tgz"
+  resolved "https://registry.yarnpkg.com/eslint-config-next/-/eslint-config-next-12.3.4.tgz#3d4d9e74b919b879c4cc79c61bdc388fb2b964ee"
   integrity sha512-WuT3gvgi7Bwz00AOmKGhOeqnyA5P29Cdyr0iVjLyfDbk+FANQKcOjFUTZIdyYfe5Tq1x4TGcmoe4CwctGvFjHQ==
   dependencies:
     "@next/eslint-plugin-next" "12.3.4"
@@ -4341,27 +4238,27 @@ eslint-config-next@^12.2.4:
     eslint-plugin-react-hooks "^4.5.0"
 
 eslint-config-prettier@^8.5.0:
-  version "8.9.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.9.0.tgz#094b6254b2804b0544f7cee535f802b6d29ee10b"
-  integrity sha512-+sbni7NfVXnOpnRadUA8S28AUlsZt9GjgFvABIRL9Hkn8KqNzOp+7Lw4QWtrwn20KzU3wqu1QoOj2m+7rKRqkA==
+  version "8.10.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz#3a06a662130807e2502fc3ff8b4143d8a0658e11"
+  integrity sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==
 
 eslint-import-resolver-alias@^1.1.2:
   version "1.1.2"
-  resolved "https://registry.npmjs.org/eslint-import-resolver-alias/-/eslint-import-resolver-alias-1.1.2.tgz"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-alias/-/eslint-import-resolver-alias-1.1.2.tgz#297062890e31e4d6651eb5eba9534e1f6e68fc97"
   integrity sha512-WdviM1Eu834zsfjHtcGHtGfcu+F30Od3V7I9Fi57uhBEwPkjDcii7/yW8jAT+gOhn4P/vOxxNAXbFAKsrrc15w==
 
 eslint-import-resolver-node@^0.3.6, eslint-import-resolver-node@^0.3.7:
-  version "0.3.7"
-  resolved "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz"
-  integrity sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==
+  version "0.3.9"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz#d4eaac52b8a2e7c3cd1903eb00f7e053356118ac"
+  integrity sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==
   dependencies:
     debug "^3.2.7"
-    is-core-module "^2.11.0"
-    resolve "^1.22.1"
+    is-core-module "^2.13.0"
+    resolve "^1.22.4"
 
 eslint-import-resolver-typescript@^2.7.1:
   version "2.7.1"
-  resolved "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-2.7.1.tgz"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-2.7.1.tgz#a90a4a1c80da8d632df25994c4c5fdcdd02b8751"
   integrity sha512-00UbgGwV8bSgUv34igBDbTOtKhqoRMy9bFjNehT40bXg6585PNIct8HhXZ0SybqB9rWtXj9crcku8ndDn/gIqQ==
   dependencies:
     debug "^4.3.4"
@@ -4378,9 +4275,9 @@ eslint-module-utils@^2.8.0:
     debug "^3.2.7"
 
 eslint-plugin-import@^2.26.0:
-  version "2.28.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.28.0.tgz#8d66d6925117b06c4018d491ae84469eb3cb1005"
-  integrity sha512-B8s/n+ZluN7sxj9eUf7/pRFERX0r5bnFA2dCaLHy2ZeaQEAz0k+ZZkFWRFHJAqxfxQDx6KLv9LeIki7cFdwW+Q==
+  version "2.28.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.28.1.tgz#63b8b5b3c409bfc75ebaf8fb206b07ab435482c4"
+  integrity sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A==
   dependencies:
     array-includes "^3.1.6"
     array.prototype.findlastindex "^1.2.2"
@@ -4391,56 +4288,59 @@ eslint-plugin-import@^2.26.0:
     eslint-import-resolver-node "^0.3.7"
     eslint-module-utils "^2.8.0"
     has "^1.0.3"
-    is-core-module "^2.12.1"
+    is-core-module "^2.13.0"
     is-glob "^4.0.3"
     minimatch "^3.1.2"
     object.fromentries "^2.0.6"
     object.groupby "^1.0.0"
     object.values "^1.1.6"
-    resolve "^1.22.3"
     semver "^6.3.1"
     tsconfig-paths "^3.14.2"
 
 eslint-plugin-jsx-a11y@^6.5.1:
-  version "6.6.1"
-  resolved "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.6.1.tgz"
-  integrity sha512-sXgFVNHiWffBq23uiS/JaP6eVR622DqwB4yTzKvGZGcPq6/yZ3WmOZfuBks/vHWo9GaFOqC2ZK4i6+C35knx7Q==
+  version "6.7.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.7.1.tgz#fca5e02d115f48c9a597a6894d5bcec2f7a76976"
+  integrity sha512-63Bog4iIethyo8smBklORknVjB0T2dwB8Mr/hIC+fBS0uyHdYYpzM/Ed+YC8VxTjlXHEWFOdmgwcDn1U2L9VCA==
   dependencies:
-    "@babel/runtime" "^7.18.9"
-    aria-query "^4.2.2"
-    array-includes "^3.1.5"
+    "@babel/runtime" "^7.20.7"
+    aria-query "^5.1.3"
+    array-includes "^3.1.6"
+    array.prototype.flatmap "^1.3.1"
     ast-types-flow "^0.0.7"
-    axe-core "^4.4.3"
-    axobject-query "^2.2.0"
+    axe-core "^4.6.2"
+    axobject-query "^3.1.1"
     damerau-levenshtein "^1.0.8"
     emoji-regex "^9.2.2"
     has "^1.0.3"
-    jsx-ast-utils "^3.3.2"
-    language-tags "^1.0.5"
+    jsx-ast-utils "^3.3.3"
+    language-tags "=1.0.5"
     minimatch "^3.1.2"
+    object.entries "^1.1.6"
+    object.fromentries "^2.0.6"
     semver "^6.3.0"
 
 eslint-plugin-prettier@^4.0.0:
   version "4.2.1"
-  resolved "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz#651cbb88b1dab98bfd42f017a12fa6b2d993f94b"
   integrity sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==
   dependencies:
     prettier-linter-helpers "^1.0.0"
 
 eslint-plugin-react-hooks@^4.5.0:
   version "4.6.0"
-  resolved "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz#4c3e697ad95b77e93f8646aaa1630c1ba607edd3"
   integrity sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==
 
 eslint-plugin-react@^7.31.7:
-  version "7.31.11"
-  resolved "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.31.11.tgz"
-  integrity sha512-TTvq5JsT5v56wPa9OYHzsrOlHzKZKjV+aLgS+55NJP/cuzdiQPC7PfYoUjMoxlffKtvijpk7vA/jmuqRb9nohw==
+  version "7.33.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.33.2.tgz#69ee09443ffc583927eafe86ffebb470ee737608"
+  integrity sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==
   dependencies:
     array-includes "^3.1.6"
     array.prototype.flatmap "^1.3.1"
     array.prototype.tosorted "^1.1.1"
     doctrine "^2.1.0"
+    es-iterator-helpers "^1.0.12"
     estraverse "^5.3.0"
     jsx-ast-utils "^2.4.1 || ^3.0.0"
     minimatch "^3.1.2"
@@ -4449,18 +4349,10 @@ eslint-plugin-react@^7.31.7:
     object.hasown "^1.1.2"
     object.values "^1.1.6"
     prop-types "^15.8.1"
-    resolve "^2.0.0-next.3"
-    semver "^6.3.0"
+    resolve "^2.0.0-next.4"
+    semver "^6.3.1"
     string.prototype.matchall "^4.0.8"
 
-eslint-scope@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
-  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
-  dependencies:
-    esrecurse "^4.3.0"
-    estraverse "^4.1.1"
-
 eslint-scope@^7.2.2:
   version "7.2.2"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
@@ -4469,21 +4361,21 @@ eslint-scope@^7.2.2:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
 
-eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.2:
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz#8c2095440eca8c933bedcadf16fefa44dbe9ba5f"
-  integrity sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
+  integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
 
 eslint@^8.33.0:
-  version "8.46.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.46.0.tgz#a06a0ff6974e53e643acc42d1dcf2e7f797b3552"
-  integrity sha512-cIO74PvbW0qU8e0mIvk5IV3ToWdCq5FYG6gWPHHkx6gNdjlbAYvtfHmlCMXxjcoVaIdwy/IAt3+mDkZkfvb2Dg==
+  version "8.51.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.51.0.tgz#4a82dae60d209ac89a5cff1604fea978ba4950f3"
+  integrity sha512-2WuxRZBrlwnXi+/vFSJyjMqrNjtJqiasMzehF0shoLaW7DzS3/9Yvrmq5JiT66+pNjiX4UBnLDiKHcWAr/OInA==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@eslint-community/regexpp" "^4.6.1"
-    "@eslint/eslintrc" "^2.1.1"
-    "@eslint/js" "^8.46.0"
-    "@humanwhocodes/config-array" "^0.11.10"
+    "@eslint/eslintrc" "^2.1.2"
+    "@eslint/js" "8.51.0"
+    "@humanwhocodes/config-array" "^0.11.11"
     "@humanwhocodes/module-importer" "^1.0.1"
     "@nodelib/fs.walk" "^1.2.8"
     ajv "^6.12.4"
@@ -4493,7 +4385,7 @@ eslint@^8.33.0:
     doctrine "^3.0.0"
     escape-string-regexp "^4.0.0"
     eslint-scope "^7.2.2"
-    eslint-visitor-keys "^3.4.2"
+    eslint-visitor-keys "^3.4.3"
     espree "^9.6.1"
     esquery "^1.4.2"
     esutils "^2.0.2"
@@ -4528,7 +4420,7 @@ espree@^9.6.0, espree@^9.6.1:
 
 esprima@^4.0.0:
   version "4.0.1"
-  resolved "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
 esquery@^1.4.2:
@@ -4545,11 +4437,6 @@ esrecurse@^4.3.0:
   dependencies:
     estraverse "^5.2.0"
 
-estraverse@^4.1.1:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
-  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
-
 estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
@@ -4557,17 +4444,12 @@ estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0:
 
 estree-walker@^0.6.1:
   version "0.6.1"
-  resolved "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362"
   integrity sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==
 
-estree-walker@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz"
-  integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==
-
 estree-walker@^2.0.2:
   version "2.0.2"
-  resolved "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac"
   integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==
 
 esutils@^2.0.2:
@@ -4582,9 +4464,29 @@ etag@^1.8.1:
 
 eventemitter3@^4.0.4:
   version "4.0.7"
-  resolved "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
   integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
 
+eventemitter3@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-5.0.1.tgz#53f5ffd0a492ac800721bb42c66b841de96423c4"
+  integrity sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==
+
+execa@7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-7.2.0.tgz#657e75ba984f42a70f38928cedc87d6f2d4fe4e9"
+  integrity sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==
+  dependencies:
+    cross-spawn "^7.0.3"
+    get-stream "^6.0.1"
+    human-signals "^4.3.0"
+    is-stream "^3.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^5.1.0"
+    onetime "^6.0.0"
+    signal-exit "^3.0.7"
+    strip-final-newline "^3.0.0"
+
 execa@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
@@ -4605,14 +4507,9 @@ expand-template@^2.0.3:
   resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c"
   integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==
 
-extend@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"
-  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
-
 extract-react-intl-messages@^4.1.1:
   version "4.1.1"
-  resolved "https://registry.npmjs.org/extract-react-intl-messages/-/extract-react-intl-messages-4.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/extract-react-intl-messages/-/extract-react-intl-messages-4.1.1.tgz#cd01d99053bb053ecc8410ccdccb9ac56daae91c"
   integrity sha512-dPogci5X7HVtV7VbUxajH/1YgfNRaW2VtEiVidZ/31Tq8314uzOtzVMNo0IrAPD2E+H1wHoPiu/j565TZsyIZg==
   dependencies:
     "@babel/core" "^7.9.0"
@@ -4631,25 +4528,15 @@ extract-react-intl-messages@^4.1.1:
     sort-keys "^4.0.0"
     write-json-file "^4.3.0"
 
-extsprintf@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"
-  integrity sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==
-
-extsprintf@^1.2.0:
-  version "1.4.1"
-  resolved "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.1.tgz"
-  integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==
-
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
 fast-diff@^1.1.2:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz"
-  integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0"
+  integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==
 
 fast-equals@^3.0.1:
   version "3.0.3"
@@ -4657,22 +4544,11 @@ fast-equals@^3.0.1:
   integrity sha512-NCe8qxnZFARSHGztGMZOO/PC1qa5MIFB5Hp66WdzbCRAz8U8US3bx1UTgLS49efBQPcUtO9gf5oVEY8o7y/7Kg==
 
 fast-fifo@^1.1.0, fast-fifo@^1.2.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.3.0.tgz#03e381bcbfb29932d7c3afde6e15e83e05ab4d8b"
-  integrity sha512-IgfweLvEpwyA4WgiQe9Nx6VV2QkML2NkvZnk1oKnIzXgXdWxuhF7zw4DvLTPZJn6PIUneiAXPF24QmoEqHTjyw==
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.3.2.tgz#286e31de96eb96d38a97899815740ba2a4f3640c"
+  integrity sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==
 
-fast-glob@^3.0.3, fast-glob@^3.2.7:
-  version "3.2.12"
-  resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz"
-  integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
-  dependencies:
-    "@nodelib/fs.stat" "^2.0.2"
-    "@nodelib/fs.walk" "^1.2.3"
-    glob-parent "^5.1.2"
-    merge2 "^1.3.0"
-    micromatch "^4.0.4"
-
-fast-glob@^3.2.9, fast-glob@^3.3.0:
+fast-glob@^3.0.3, fast-glob@^3.2.7, fast-glob@^3.2.9, fast-glob@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.1.tgz#784b4e897340f3dbbef17413b3f11acf03c874c4"
   integrity sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==
@@ -4720,6 +4596,13 @@ file-entry-cache@^6.0.1:
   dependencies:
     flat-cache "^3.0.4"
 
+file-entry-cache@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-7.0.1.tgz#c71b3509badb040f362255a53e21f15a4e74fc0f"
+  integrity sha512-uLfFktPmRetVCbHe5UPuekWrQ6hENufnA46qEGbfACkK5drjTTdQYUragRgMjHldcbYG+nslUerqMPjbBSHXjQ==
+  dependencies:
+    flat-cache "^3.1.1"
+
 fill-range@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
@@ -4729,7 +4612,7 @@ fill-range@^7.0.1:
 
 find-up@^4.1.0:
   version "4.1.0"
-  resolved "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
   integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
   dependencies:
     locate-path "^5.0.0"
@@ -4743,28 +4626,29 @@ find-up@^5.0.0:
     locate-path "^6.0.0"
     path-exists "^4.0.0"
 
-flat-cache@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
-  integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
+flat-cache@^3.0.4, flat-cache@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.1.1.tgz#a02a15fdec25a8f844ff7cc658f03dd99eb4609b"
+  integrity sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q==
   dependencies:
-    flatted "^3.1.0"
+    flatted "^3.2.9"
+    keyv "^4.5.3"
     rimraf "^3.0.2"
 
 flat@^5.0.0:
   version "5.0.2"
-  resolved "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
   integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
 
-flatted@^3.1.0:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787"
-  integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
+flatted@^3.2.9:
+  version "3.2.9"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.9.tgz#7eb4c67ca1ba34232ca9d2d93e9886e611ad7daf"
+  integrity sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==
 
 follow-redirects@^1.15.2:
-  version "1.15.2"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
-  integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
+  version "1.15.3"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.3.tgz#fe2f3ef2690afce7e82ed0b44db08165b207123a"
+  integrity sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==
 
 for-each@^0.3.3:
   version "0.3.3"
@@ -4773,20 +4657,6 @@ for-each@^0.3.3:
   dependencies:
     is-callable "^1.1.3"
 
-forever-agent@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
-  integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==
-
-form-data@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"
-  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.6"
-    mime-types "^2.1.12"
-
 formdata-polyfill@^4.0.10:
   version "4.0.10"
   resolved "https://registry.yarnpkg.com/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz#24807c31c9d402e002ab3d8c720144ceb8848423"
@@ -4794,10 +4664,10 @@ formdata-polyfill@^4.0.10:
   dependencies:
     fetch-blob "^3.1.2"
 
-fraction.js@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz"
-  integrity sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==
+fraction.js@^4.3.6:
+  version "4.3.7"
+  resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.7.tgz#06ca0085157e42fda7f9e726e79fefc4068840f7"
+  integrity sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==
 
 fs-constants@^1.0.0:
   version "1.0.0"
@@ -4806,7 +4676,7 @@ fs-constants@^1.0.0:
 
 fs-extra@10, fs-extra@^10.0.0, fs-extra@^10.0.1:
   version "10.1.0"
-  resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
   integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
   dependencies:
     graceful-fs "^4.2.0"
@@ -4822,9 +4692,18 @@ fs-extra@^11.0.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
+fs-extra@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
+  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
 fs-extra@^9.0.0:
   version "9.1.0"
-  resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
   integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
   dependencies:
     at-least-node "^1.0.0"
@@ -4834,7 +4713,7 @@ fs-extra@^9.0.0:
 
 fs-minipass@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
   integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
   dependencies:
     minipass "^3.0.0"
@@ -4845,45 +4724,45 @@ fs.realpath@^1.0.0:
   integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
 fsevents@~2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
-  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
+  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
 
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+function-bind@^1.1.1, function-bind@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
+  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
 
-function.prototype.name@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621"
-  integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==
+function.prototype.name@^1.1.5, function.prototype.name@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.6.tgz#cdf315b7d90ee77a4c6ee216c3c3362da07533fd"
+  integrity sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.0"
-    functions-have-names "^1.2.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    functions-have-names "^1.2.3"
 
-functions-have-names@^1.2.2, functions-have-names@^1.2.3:
+functions-have-names@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
 generic-names@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/generic-names/-/generic-names-4.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/generic-names/-/generic-names-4.0.0.tgz#0bd8a2fd23fe8ea16cbd0a279acd69c06933d9a3"
   integrity sha512-ySFolZQfw9FoDb3ed9d80Cm9f0+r7qj+HJkWjeD9RBfpxEVTlVhol+gvaQB/78WbwYfbnNh8nWHHBSlg072y6A==
   dependencies:
     loader-utils "^3.2.0"
 
 generic-pool@3.9.0:
   version "3.9.0"
-  resolved "https://registry.npmjs.org/generic-pool/-/generic-pool-3.9.0.tgz"
+  resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-3.9.0.tgz#36f4a678e963f4fdb8707eab050823abc4e8f5e4"
   integrity sha512-hymDOu5B53XvN4QT9dBmZxPX4CWhBPPLguTZ9MMFeFa/Kg0xWVfylOVNlJji/E7yTZWFd/q9GO5TxDLq156D7g==
 
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
-  resolved "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz"
+  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
 get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1:
@@ -4896,17 +4775,12 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@
     has-proto "^1.0.1"
     has-symbols "^1.0.3"
 
-get-own-enumerable-property-symbols@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz"
-  integrity sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==
+get-port-please@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/get-port-please/-/get-port-please-3.1.1.tgz#2556623cddb4801d823c0a6a15eec038abb483be"
+  integrity sha512-3UBAyM3u4ZBVYDsxOQfJDxEa6XTbpBDrOjp4mf7ExFRt5BKs/QywQQiJsh2B+hxcZLSapWqCRvElUe8DnKcFHA==
 
-get-port-please@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/get-port-please/-/get-port-please-3.0.1.tgz#a24953a41dc249f76869ac25e81d6623e61ab010"
-  integrity sha512-R5pcVO8Z1+pVDu8Ml3xaJCEkBiiy1VQN9za0YqH8GIi1nIqD4IzQhzY6dDzMRtdS1lyiGlucRzm8IN8wtLIXng==
-
-get-stream@^6.0.0:
+get-stream@^6.0.0, get-stream@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
   integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
@@ -4919,13 +4793,6 @@ get-symbol-description@^1.0.0:
     call-bind "^1.0.2"
     get-intrinsic "^1.1.1"
 
-getpass@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"
-  integrity sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==
-  dependencies:
-    assert-plus "^1.0.0"
-
 github-from-package@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
@@ -4945,9 +4812,14 @@ glob-parent@^6.0.2:
   dependencies:
     is-glob "^4.0.3"
 
+glob-to-regexp@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
+  integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
+
 glob@7.1.7:
   version "7.1.7"
-  resolved "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
   integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
   dependencies:
     fs.realpath "^1.0.0"
@@ -4971,7 +4843,7 @@ glob@^7.1.3, glob@^7.1.6, glob@^7.2.0:
 
 glob@^8.0.3:
   version "8.1.0"
-  resolved "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e"
   integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==
   dependencies:
     fs.realpath "^1.0.0"
@@ -4998,13 +4870,13 @@ global-prefix@^3.0.0:
 
 globals@^11.1.0:
   version "11.12.0"
-  resolved "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
 globals@^13.19.0:
-  version "13.20.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.20.0.tgz#ea276a1e508ffd4f1612888f9d1bad1e2717bf82"
-  integrity sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==
+  version "13.23.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.23.0.tgz#ef31673c926a0976e1f61dab4dca57e0c0a8af02"
+  integrity sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==
   dependencies:
     type-fest "^0.20.2"
 
@@ -5020,9 +4892,23 @@ globalyzer@0.1.0:
   resolved "https://registry.yarnpkg.com/globalyzer/-/globalyzer-0.1.0.tgz#cb76da79555669a1519d5a8edf093afaa0bf1465"
   integrity sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==
 
+globby@10.0.1:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.1.tgz#4782c34cb75dd683351335c5829cc3420e606b22"
+  integrity sha512-sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A==
+  dependencies:
+    "@types/glob" "^7.1.1"
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.0.3"
+    glob "^7.1.3"
+    ignore "^5.1.1"
+    merge2 "^1.2.3"
+    slash "^3.0.0"
+
 globby@^10.0.1:
   version "10.0.2"
-  resolved "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.2.tgz#277593e745acaa4646c3ab411289ec47a0392543"
   integrity sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==
   dependencies:
     "@types/glob" "^7.1.1"
@@ -5036,7 +4922,7 @@ globby@^10.0.1:
 
 globby@^11.0.1, globby@^11.0.4, globby@^11.1.0:
   version "11.1.0"
-  resolved "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
   integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
   dependencies:
     array-union "^2.1.0"
@@ -5063,9 +4949,9 @@ gopd@^1.0.1:
   dependencies:
     get-intrinsic "^1.1.3"
 
-graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4:
+graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.2, graceful-fs@^4.2.4:
   version "4.2.11"
-  resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
 
 graphemer@^1.4.0:
@@ -5073,31 +4959,19 @@ graphemer@^1.4.0:
   resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
   integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
 
-h3@^1.7.1:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/h3/-/h3-1.7.1.tgz#fc9328adf5da1d29cbb2d97b81ae3dd9b426463e"
-  integrity sha512-A9V2NEDNHet7v1gCg7CMwerSigLi0SRbhTy7C3lGb0N4YKIpPmLDjedTUopqp4dnn7COHfqUjjaz3zbtz4QduA==
+h3@^1.7.1, h3@^1.8.1:
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/h3/-/h3-1.8.2.tgz#69ea8ca0285c1bb268cd08b9a7017e02939f88b7"
+  integrity sha512-1Ca0orJJlCaiFY68BvzQtP2lKLk46kcLAxVM8JgYbtm2cUg6IY7pjpYgWMwUvDO9QI30N5JAukOKoT8KD3Q0PQ==
   dependencies:
     cookie-es "^1.0.0"
     defu "^6.1.2"
-    destr "^2.0.0"
-    iron-webcrypto "^0.7.0"
-    radix3 "^1.0.1"
-    ufo "^1.1.2"
+    destr "^2.0.1"
+    iron-webcrypto "^0.10.1"
+    radix3 "^1.1.0"
+    ufo "^1.3.0"
     uncrypto "^0.1.3"
-
-har-schema@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"
-  integrity sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==
-
-har-validator@~5.1.0:
-  version "5.1.5"
-  resolved "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz"
-  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
-  dependencies:
-    ajv "^6.12.3"
-    har-schema "^2.0.0"
+    unenv "^1.7.4"
 
 hard-rejection@^2.1.0:
   version "2.1.0"
@@ -5144,22 +5018,20 @@ has-tostringtag@^1.0.0:
     has-symbols "^1.0.2"
 
 has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
-  dependencies:
-    function-bind "^1.1.1"
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.4.tgz#2eb2860e000011dae4f1406a86fe80e530fb2ec6"
+  integrity sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==
 
 hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
   version "3.3.2"
-  resolved "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz"
+  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
   integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
   dependencies:
     react-is "^16.7.0"
 
 hosted-git-info@^2.1.4:
   version "2.8.9"
-  resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
   integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
 
 hosted-git-info@^4.0.1:
@@ -5179,33 +5051,29 @@ http-shutdown@^1.2.2:
   resolved "https://registry.yarnpkg.com/http-shutdown/-/http-shutdown-1.2.2.tgz#41bc78fc767637c4c95179bc492f312c0ae64c5f"
   integrity sha512-S9wWkJ/VSY9/k4qcjG318bqJNruzE4HySUhFYknwmu6LBP97KLLfwNf+n4V1BHurvFNkSKLFnK/RsuUnRTf9Vw==
 
-http-signature@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"
-  integrity sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==
-  dependencies:
-    assert-plus "^1.0.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
 human-signals@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
   integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
 
-husky@^7.0.0:
-  version "7.0.4"
-  resolved "https://registry.npmjs.org/husky/-/husky-7.0.4.tgz"
-  integrity sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ==
+human-signals@^4.3.0:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-4.3.1.tgz#ab7f811e851fca97ffbd2c1fe9a958964de321b2"
+  integrity sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==
+
+husky@^8.0.3:
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-8.0.3.tgz#4936d7212e46d1dea28fef29bb3a108872cd9184"
+  integrity sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==
 
 icss-replace-symbols@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
   integrity sha512-chIaY3Vh2mh2Q3RGXttaDIzeiPvaVXJ+C4DAh/w3c37SKZ/U6PGMmuicR2EQQp9bKG8zLMCl7I+PtIoOOPp8Gg==
 
 icss-utils@^5.0.0:
   version "5.1.0"
-  resolved "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae"
   integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==
 
 ieee754@^1.1.13:
@@ -5225,17 +5093,17 @@ image-meta@^0.1.1:
 
 immer@^9.0.12:
   version "9.0.21"
-  resolved "https://registry.npmjs.org/immer/-/immer-9.0.21.tgz"
+  resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.21.tgz#1e025ea31a40f24fb064f1fef23e931496330176"
   integrity sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==
 
 import-cwd@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/import-cwd/-/import-cwd-3.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-3.0.0.tgz#20845547718015126ea9b3676b7592fb8bd4cf92"
   integrity sha512-4pnzH16plW+hgvRECbDWpQl3cqtvSofHWh44met7ESfZ8UZOWWddm8hEyDTqREJ9RbYHY8gi8DqmaelApoOGMg==
   dependencies:
     import-from "^3.0.0"
 
-import-fresh@^3.2.1:
+import-fresh@^3.2.1, import-fresh@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
   integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
@@ -5245,7 +5113,7 @@ import-fresh@^3.2.1:
 
 import-from@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/import-from/-/import-from-3.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/import-from/-/import-from-3.0.0.tgz#055cfec38cd5a27d8057ca51376d7d3bf0891966"
   integrity sha512-CiuXOFFSzkU5x/CR0+z7T91Iht4CXgfCxVOFRhh2Zyhg5wOpWvvDLQUsWl+gcN+QscYBjez8hDCt85O7RLDttQ==
   dependencies:
     resolve-from "^5.0.0"
@@ -5262,7 +5130,7 @@ imurmurhash@^0.1.4:
 
 indent-string@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
   integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
 
 indent-string@^5.0.0:
@@ -5288,16 +5156,7 @@ ini@^1.3.5, ini@~1.3.0:
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
-internal-slot@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz"
-  integrity sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==
-  dependencies:
-    get-intrinsic "^1.1.3"
-    has "^1.0.3"
-    side-channel "^1.0.4"
-
-internal-slot@^1.0.4, internal-slot@^1.0.5:
+internal-slot@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986"
   integrity sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==
@@ -5308,12 +5167,12 @@ internal-slot@^1.0.4, internal-slot@^1.0.5:
 
 internmap@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/internmap/-/internmap-1.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/internmap/-/internmap-1.0.1.tgz#0017cc8a3b99605f0302f2b198d272e015e5df95"
   integrity sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw==
 
 intl-messageformat-parser@6.1.2:
   version "6.1.2"
-  resolved "https://registry.npmjs.org/intl-messageformat-parser/-/intl-messageformat-parser-6.1.2.tgz"
+  resolved "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-6.1.2.tgz#28c65f3689f538e66c7cf628881548d6a82ff3c2"
   integrity sha512-4GQDEPhl/ZMNDKwMsLqyw1LG2IAWjmLJXdmnRcHKeLQzpgtNYZI6lVw1279pqIkRk2MfKb9aDsVFzm565azK5A==
   dependencies:
     "@formatjs/ecma402-abstract" "1.5.0"
@@ -5321,20 +5180,20 @@ intl-messageformat-parser@6.1.2:
 
 intl-messageformat-parser@^5.3.7:
   version "5.5.1"
-  resolved "https://registry.npmjs.org/intl-messageformat-parser/-/intl-messageformat-parser-5.5.1.tgz"
+  resolved "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-5.5.1.tgz#f09a692755813e6220081e3374df3fb1698bd0c6"
   integrity sha512-TvB3LqF2VtP6yI6HXlRT5TxX98HKha6hCcrg9dwlPwNaedVNuQA9KgBdtWKgiyakyCTYHQ+KJeFEstNKfZr64w==
   dependencies:
     "@formatjs/intl-numberformat" "^5.5.2"
 
-intl-messageformat@9.13.0:
-  version "9.13.0"
-  resolved "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-9.13.0.tgz"
-  integrity sha512-7sGC7QnSQGa5LZP7bXLDhVDtQOeKGeBFGHF2Y8LVBwYZoQZCgWeKoPGTa5GMG8g/TzDgeXuYJQis7Ggiw2xTOw==
+intl-messageformat@10.5.8:
+  version "10.5.8"
+  resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-10.5.8.tgz#7184da425f360a53a5483a6194e16d666b011fc0"
+  integrity sha512-NRf0jpBWV0vd671G5b06wNofAN8tp7WWDogMZyaU8GUAsmbouyvgwmFJI7zLjfAMpm3zK+vSwRP3jzaoIcMbaA==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.11.4"
-    "@formatjs/fast-memoize" "1.2.1"
-    "@formatjs/icu-messageformat-parser" "2.1.0"
-    tslib "^2.1.0"
+    "@formatjs/ecma402-abstract" "1.18.0"
+    "@formatjs/fast-memoize" "2.2.0"
+    "@formatjs/icu-messageformat-parser" "2.7.3"
+    tslib "^2.4.0"
 
 ioredis@^5.3.2:
   version "5.3.2"
@@ -5356,28 +5215,28 @@ ipaddr.js@^2.0.1:
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.1.0.tgz#2119bc447ff8c257753b196fc5f1ce08a4cdf39f"
   integrity sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==
 
-ipx@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/ipx/-/ipx-1.2.0.tgz#23130eed071a786158b86774980deca6e5d5fa9e"
-  integrity sha512-FkEP56C08HdlqlWKm3pMhatywPtDBTlePTdzskksCR1+7xnB6fQs6pXOTXPTG5i+gGPgCOxbNMUSZEH/DQcWDA==
+ipx@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/ipx/-/ipx-1.3.1.tgz#2ff4aa9bc5be74f63cccd80d1df430fcc5e715b6"
+  integrity sha512-hWRLXdMDOz2q81T2x9lowFtAGO3E5b2HtC8xOOBTrlnxygHNaVrZqJ5c1P3T7tDkC3oCocYRRz0VBffvJKeQlw==
   dependencies:
     "@fastify/accept-negotiator" "^1.1.0"
-    consola "^3.1.0"
+    consola "^3.2.3"
     defu "^6.1.2"
-    destr "^1.2.2"
+    destr "^2.0.1"
     etag "^1.8.1"
     image-meta "^0.1.1"
-    listhen "^1.0.4"
-    node-fetch-native "^1.1.1"
+    listhen "^1.5.5"
+    node-fetch-native "^1.4.0"
     pathe "^1.1.1"
-    sharp "^0.32.1"
-    ufo "^1.1.2"
+    sharp "^0.32.6"
+    ufo "^1.3.1"
     xss "^1.0.14"
 
-iron-webcrypto@^0.7.0:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/iron-webcrypto/-/iron-webcrypto-0.7.1.tgz#7323e1f32fbc5d3e1f25a228fdbf0bcde3c276c6"
-  integrity sha512-K/UmlEhPCPXEHV5hAtH5C0tI5JnFuOrv4yO/j7ODPl3HaiiHBLbOLTde+ieUaAyfCATe4LoAnclyF+hmSCOVmQ==
+iron-webcrypto@^0.10.1:
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/iron-webcrypto/-/iron-webcrypto-0.10.1.tgz#cab8636a468685533a8521bfd7f06b19b7174809"
+  integrity sha512-QGOS8MRMnj/UiOa+aMIgfyHcvkhqNUsUxb1XzskENvbo+rEfp6TOwqd1KPuDzXC4OnGHcMSVxDGRoilqB8ViqA==
 
 is-array-buffer@^3.0.1, is-array-buffer@^3.0.2:
   version "3.0.2"
@@ -5398,6 +5257,13 @@ is-arrayish@^0.3.1:
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03"
   integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
 
+is-async-function@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-async-function/-/is-async-function-2.0.0.tgz#8e4418efd3e5d3a6ebb0164c05ef5afb69aa9646"
+  integrity sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==
+  dependencies:
+    has-tostringtag "^1.0.0"
+
 is-bigint@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
@@ -5422,7 +5288,7 @@ is-boolean-object@^1.1.0:
 
 is-builtin-module@^3.2.1:
   version "3.2.1"
-  resolved "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz"
+  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-3.2.1.tgz#f03271717d8654cfcaf07ab0463faa3571581169"
   integrity sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==
   dependencies:
     builtin-modules "^3.3.0"
@@ -5434,19 +5300,19 @@ is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7:
 
 is-ci@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867"
   integrity sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==
   dependencies:
     ci-info "^3.2.0"
 
-is-core-module@^2.11.0, is-core-module@^2.12.0, is-core-module@^2.12.1, is-core-module@^2.5.0, is-core-module@^2.9.0:
-  version "2.12.1"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.1.tgz#0c0b6885b6f80011c71541ce15c8d66cf5a4f9fd"
-  integrity sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==
+is-core-module@^2.13.0, is-core-module@^2.5.0:
+  version "2.13.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.0.tgz#bb52aa6e2cbd49a30c2ba68c42bf3435ba6072db"
+  integrity sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==
   dependencies:
     has "^1.0.3"
 
-is-date-object@^1.0.1:
+is-date-object@^1.0.1, is-date-object@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
   integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==
@@ -5460,7 +5326,7 @@ is-docker@^2.0.0:
 
 is-docker@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-3.0.0.tgz#90093aa3106277d8a77a5910dbae71747e15a200"
   integrity sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==
 
 is-extglob@^2.1.1:
@@ -5468,11 +5334,30 @@ is-extglob@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
 
+is-finalizationregistry@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz#c8749b65f17c133313e661b1289b95ad3dbd62e6"
+  integrity sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==
+  dependencies:
+    call-bind "^1.0.2"
+
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
+is-fullwidth-code-point@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz#fae3167c729e7463f8461ce512b080a49268aa88"
+  integrity sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==
+
+is-generator-function@^1.0.10:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72"
+  integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==
+  dependencies:
+    has-tostringtag "^1.0.0"
+
 is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
@@ -5482,12 +5367,17 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
 
 is-localhost-ip@^1.4.0:
   version "1.4.0"
-  resolved "https://registry.npmjs.org/is-localhost-ip/-/is-localhost-ip-1.4.0.tgz"
+  resolved "https://registry.yarnpkg.com/is-localhost-ip/-/is-localhost-ip-1.4.0.tgz#dd66aaabcbb5dbbc943e00adad5f715d2c3b3a1d"
   integrity sha512-cN7SzlY7BVxSeoJu5equjsZaKSgD4HCfXrTwu0Jgbq5BbT1BU+D7Lyi/l1KO8H0un0JTlxcQaT/GWVapu+DIDg==
 
+is-map@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127"
+  integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==
+
 is-module@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
   integrity sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==
 
 is-negative-zero@^2.0.2:
@@ -5507,19 +5397,14 @@ is-number@^7.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
-is-obj@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz"
-  integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
-
 is-path-cwd@^2.2.0:
   version "2.2.0"
-  resolved "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb"
   integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==
 
 is-path-inside@^3.0.1, is-path-inside@^3.0.2, is-path-inside@^3.0.3:
   version "3.0.3"
-  resolved "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
   integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
 
 is-plain-obj@^1.1.0:
@@ -5529,9 +5414,14 @@ is-plain-obj@^1.1.0:
 
 is-plain-obj@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
   integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
 
+is-plain-object@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-3.0.1.tgz#662d92d24c0aa4302407b0d45d21f2251c85f85b"
+  integrity sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g==
+
 is-plain-object@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
@@ -5544,7 +5434,7 @@ is-promise@^4.0.0:
 
 is-reference@1.2.1:
   version "1.2.1"
-  resolved "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz"
+  resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.2.1.tgz#8b2dac0b371f4bc994fdeaba9eb542d03002d0b7"
   integrity sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==
   dependencies:
     "@types/estree" "*"
@@ -5557,10 +5447,10 @@ is-regex@^1.1.4:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
-is-regexp@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz"
-  integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk=
+is-set@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec"
+  integrity sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==
 
 is-shared-array-buffer@^1.0.2:
   version "1.0.2"
@@ -5574,6 +5464,11 @@ is-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
   integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
 
+is-stream@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-3.0.0.tgz#e6bfd7aa6bef69f4f472ce9bb681e3e57b4319ac"
+  integrity sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==
+
 is-string@^1.0.5, is-string@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
@@ -5588,18 +5483,23 @@ is-symbol@^1.0.2, is-symbol@^1.0.3:
   dependencies:
     has-symbols "^1.0.2"
 
-is-typed-array@^1.1.10, is-typed-array@^1.1.9:
+is-typed-array@^1.1.10, is-typed-array@^1.1.12, is-typed-array@^1.1.9:
   version "1.1.12"
   resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.12.tgz#d0bab5686ef4a76f7a73097b95470ab199c57d4a"
   integrity sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==
   dependencies:
     which-typed-array "^1.1.11"
 
-is-typedarray@^1.0.0, is-typedarray@~1.0.0:
+is-typedarray@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==
 
+is-weakmap@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2"
+  integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==
+
 is-weakref@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
@@ -5607,6 +5507,14 @@ is-weakref@^1.0.2:
   dependencies:
     call-bind "^1.0.2"
 
+is-weakset@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.2.tgz#4569d67a747a1ce5a994dfd4ef6dcea76e7c0a1d"
+  integrity sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.1.1"
+
 is-wsl@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
@@ -5620,47 +5528,53 @@ isarray@^2.0.5:
   integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
 
 isbot@^3.4.5:
-  version "3.6.13"
-  resolved "https://registry.yarnpkg.com/isbot/-/isbot-3.6.13.tgz#e060f727cb53475a4dab1569321ced0f84633d63"
-  integrity sha512-uoP4uK5Dc2CrabmK+Gue1jTL+scHiCc1c9rblRpJwG8CPxjLIv8jmGyyGRGkbPOweayhkskdZsEQXG6p+QCQrg==
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/isbot/-/isbot-3.7.0.tgz#c68eb005c03e3d225a0ea559211da2bff94bb1ce"
+  integrity sha512-9BcjlI89966BqWJmYdTnRub85sit931MyCthSIPtgoOsTjoW7A2MVa09HzPpYE2+G4vyAxfDvR0AbUGV0FInQg==
 
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
-isstream@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
-  integrity sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==
+iterator.prototype@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/iterator.prototype/-/iterator.prototype-1.1.2.tgz#5e29c8924f01916cb9335f1ff80619dcff22b0c0"
+  integrity sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==
+  dependencies:
+    define-properties "^1.2.1"
+    get-intrinsic "^1.2.1"
+    has-symbols "^1.0.3"
+    reflect.getprototypeof "^1.0.4"
+    set-function-name "^2.0.1"
 
 jest-worker@^26.2.1:
   version "26.6.2"
-  resolved "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
   integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==
   dependencies:
     "@types/node" "*"
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
 
-jiti@^1.19.1:
-  version "1.19.1"
-  resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.19.1.tgz#fa99e4b76a23053e0e7cde098efe1704a14c16f1"
-  integrity sha512-oVhqoRDaBXf7sjkll95LHVS6Myyyb1zaunVwk4Z0+WPSW4gjS0pl01zYKHScTuyEhQsFxV5L4DR5r+YqSyqyyg==
+jiti@^1.20.0:
+  version "1.20.0"
+  resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.20.0.tgz#2d823b5852ee8963585c8dd8b7992ffc1ae83b42"
+  integrity sha512-3TV69ZbrvV6U5DfQimop50jE9Dl6J8O1ja1dvBbMba/sZ3YBEQqJ2VZRoQPVnhlzjNtU1vaXRZVrVjU4qtm8yA==
 
 joycon@^3.1.1:
   version "3.1.1"
-  resolved "https://registry.npmjs.org/joycon/-/joycon-3.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/joycon/-/joycon-3.1.1.tgz#bce8596d6ae808f8b68168f5fc69280996894f03"
   integrity sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==
 
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
 js-yaml@^3.13.1:
   version "3.14.1"
-  resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
   integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
   dependencies:
     argparse "^1.0.7"
@@ -5673,24 +5587,24 @@ js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"
-  integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==
-
 jsesc@^2.5.1:
   version "2.5.2"
-  resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
   integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
 jsesc@~0.5.0:
   version "0.5.0"
-  resolved "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
   integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==
 
+json-buffer@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
+  integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
+
 json-parse-better-errors@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
 json-parse-even-better-errors@^2.3.0:
@@ -5708,27 +5622,17 @@ json-schema-traverse@^1.0.0:
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
   integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
 
-json-schema@0.4.0:
-  version "0.4.0"
-  resolved "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz"
-  integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==
-
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
   integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
 
 json-stable-stringify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"
-  integrity sha512-i/J297TW6xyj7sDFa7AmBPkQvLIxWr2kKPWI26tXydnZrzVAocNqn5DMNT1Mzk0vit1V5UkRM7C1KdVNp7Lmcg==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.2.tgz#e06f23128e0bbe342dc996ed5a19e28b57b580e0"
+  integrity sha512-eunSSaEnxV12z+Z73y/j5N37/In40GK4GmsSy+tEHJMxknvqnA7/djeYtAgW0GsWHUfg+847WJjKaEylk2y09g==
   dependencies:
-    jsonify "~0.0.0"
-
-json-stringify-safe@~5.0.1:
-  version "5.0.1"
-  resolved "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
-  integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
+    jsonify "^0.0.1"
 
 json5@^1.0.2:
   version "1.0.2"
@@ -5737,21 +5641,23 @@ json5@^1.0.2:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.2:
-  version "2.2.1"
-  resolved "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz"
-  integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
-
-json5@^2.2.2:
+json5@^2.1.2, json5@^2.2.3:
   version "2.2.3"
-  resolved "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
 jsonc-parser@^3.2.0:
   version "3.2.0"
-  resolved "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76"
   integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==
 
+jsonfile@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+  integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
 jsonfile@^6.0.1:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
@@ -5761,47 +5667,40 @@ jsonfile@^6.0.1:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
-jsonify@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"
-  integrity sha512-trvBk1ki43VZptdBI5rIlG4YOzyeH/WefQt5rj1grasPn4iiZWKet8nkgc4GlsAylaztn0qZfUYOiTsASJFdNA==
-
-jsonparse@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz"
-  integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==
+jsonify@^0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.1.tgz#2aa3111dae3d34a0f151c63f3a45d995d9420978"
+  integrity sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==
 
 jsonwebtoken@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz"
-  integrity sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz#65ff91f4abef1784697d40952bb1998c504caaf3"
+  integrity sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==
   dependencies:
     jws "^3.2.2"
-    lodash "^4.17.21"
+    lodash.includes "^4.3.0"
+    lodash.isboolean "^3.0.3"
+    lodash.isinteger "^4.0.4"
+    lodash.isnumber "^3.0.3"
+    lodash.isplainobject "^4.0.6"
+    lodash.isstring "^4.0.1"
+    lodash.once "^4.0.0"
     ms "^2.1.1"
-    semver "^7.3.8"
+    semver "^7.5.4"
 
-jsprim@^1.2.2:
-  version "1.4.2"
-  resolved "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz"
-  integrity sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==
+"jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.3.3:
+  version "3.3.5"
+  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz#4766bd05a8e2a11af222becd19e15575e52a853a"
+  integrity sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==
   dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.4.0"
-    verror "1.10.0"
-
-"jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.3.2:
-  version "3.3.3"
-  resolved "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz"
-  integrity sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw==
-  dependencies:
-    array-includes "^3.1.5"
-    object.assign "^4.1.3"
+    array-includes "^3.1.6"
+    array.prototype.flat "^1.3.1"
+    object.assign "^4.1.4"
+    object.values "^1.1.6"
 
 jwa@^1.4.1:
   version "1.4.1"
-  resolved "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz"
+  resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a"
   integrity sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==
   dependencies:
     buffer-equal-constant-time "1.0.1"
@@ -5810,7 +5709,7 @@ jwa@^1.4.1:
 
 jws@^3.2.2:
   version "3.2.2"
-  resolved "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz"
+  resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304"
   integrity sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==
   dependencies:
     jwa "^1.4.1"
@@ -5818,9 +5717,16 @@ jws@^3.2.2:
 
 kafkajs@^2.1.0:
   version "2.2.4"
-  resolved "https://registry.npmjs.org/kafkajs/-/kafkajs-2.2.4.tgz"
+  resolved "https://registry.yarnpkg.com/kafkajs/-/kafkajs-2.2.4.tgz#59e6e16459d87fdf8b64be73970ed5aa42370a5b"
   integrity sha512-j/YeapB1vfPT2iOIUn/vxdyKEuhuY2PxMBvf5JWux6iSaukAccrMtXEY/Lb7OvavDhOWME589bpLrEdnVHjfjA==
 
+keyv@^4.5.3:
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
+  integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==
+  dependencies:
+    json-buffer "3.0.1"
+
 kind-of@^6.0.2, kind-of@^6.0.3:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
@@ -5828,25 +5734,30 @@ kind-of@^6.0.2, kind-of@^6.0.3:
 
 kleur@^3.0.3:
   version "3.0.3"
-  resolved "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz"
+  resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
-known-css-properties@^0.27.0:
-  version "0.27.0"
-  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.27.0.tgz#82a9358dda5fe7f7bd12b5e7142c0a205393c0c5"
-  integrity sha512-uMCj6+hZYDoffuvAJjFAPz56E9uoowFHmTkqRtRq5WyC5Q6Cu/fTZKNQpX/RbzChBYLLl3lo8CjFZBAZXq9qFg==
+known-css-properties@^0.28.0:
+  version "0.28.0"
+  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.28.0.tgz#8a8be010f368b3036fe6ab0ef4bbbed972bd6274"
+  integrity sha512-9pSL5XB4J+ifHP0e0jmmC98OGC1nL8/JjS+fi6mnTlIf//yt/MfVLtKg7S6nCtj/8KTcWX7nRlY0XywoYY1ISQ==
 
-language-subtag-registry@^0.3.20:
+known-css-properties@^0.29.0:
+  version "0.29.0"
+  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.29.0.tgz#e8ba024fb03886f23cb882e806929f32d814158f"
+  integrity sha512-Ne7wqW7/9Cz54PDt4I3tcV+hAyat8ypyOGzYRJQfdxnnjeWsTxt1cy8pjvvKeI5kfXuyvULyeeAvwvvtAX3ayQ==
+
+language-subtag-registry@~0.3.2:
   version "0.3.22"
-  resolved "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz"
+  resolved "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz#2e1500861b2e457eba7e7ae86877cbd08fa1fd1d"
   integrity sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w==
 
-language-tags@^1.0.5:
-  version "1.0.6"
-  resolved "https://registry.npmjs.org/language-tags/-/language-tags-1.0.6.tgz"
-  integrity sha512-HNkaCgM8wZgE/BZACeotAAgpL9FUjEnhgF0FVQMIgH//zqTPreLYMb3rWYkYAqPoF75Jwuycp1da7uz66cfFQg==
+language-tags@=1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/language-tags/-/language-tags-1.0.5.tgz#d321dbc4da30ba8bf3024e040fa5c14661f9193a"
+  integrity sha512-qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ==
   dependencies:
-    language-subtag-registry "^0.3.20"
+    language-subtag-registry "~0.3.2"
 
 levn@^0.4.1:
   version "0.4.1"
@@ -5856,9 +5767,9 @@ levn@^0.4.1:
     prelude-ls "^1.2.1"
     type-check "~0.4.0"
 
-lilconfig@^2.0.3, lilconfig@^2.0.5:
+lilconfig@2.1.0, lilconfig@^2.0.3, lilconfig@^2.0.5:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.1.0.tgz#78e23ac89ebb7e1bfbf25b18043de756548e7f52"
   integrity sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==
 
 lines-and-columns@^1.1.6:
@@ -5866,61 +5777,61 @@ lines-and-columns@^1.1.6:
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
   integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
 
-lint-staged@^11.0.0:
-  version "11.2.6"
-  resolved "https://registry.npmjs.org/lint-staged/-/lint-staged-11.2.6.tgz"
-  integrity sha512-Vti55pUnpvPE0J9936lKl0ngVeTdSZpEdTNhASbkaWX7J5R9OEifo1INBGQuGW4zmy6OG+TcWPJ3m5yuy5Q8Tg==
+lint-staged@^14.0.1:
+  version "14.0.1"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-14.0.1.tgz#57dfa3013a3d60762d9af5d9c83bdb51291a6232"
+  integrity sha512-Mw0cL6HXnHN1ag0mN/Dg4g6sr8uf8sn98w2Oc1ECtFto9tvRF7nkXGJRbx8gPlHyoR0pLyBr2lQHbWwmUHe1Sw==
   dependencies:
-    cli-truncate "2.1.0"
-    colorette "^1.4.0"
-    commander "^8.2.0"
-    cosmiconfig "^7.0.1"
-    debug "^4.3.2"
-    enquirer "^2.3.6"
-    execa "^5.1.1"
-    listr2 "^3.12.2"
-    micromatch "^4.0.4"
-    normalize-path "^3.0.0"
-    please-upgrade-node "^3.2.0"
-    string-argv "0.3.1"
-    stringify-object "3.3.0"
-    supports-color "8.1.1"
+    chalk "5.3.0"
+    commander "11.0.0"
+    debug "4.3.4"
+    execa "7.2.0"
+    lilconfig "2.1.0"
+    listr2 "6.6.1"
+    micromatch "4.0.5"
+    pidtree "0.6.0"
+    string-argv "0.3.2"
+    yaml "2.3.1"
 
-listhen@^1.0.4:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/listhen/-/listhen-1.1.2.tgz#c95082b0fdbd50d73abeab748893768dbefa7db8"
-  integrity sha512-rLX5V57oonazmc6zoZ2LzfbSOfGzDOLdQ/eTEh/d3f1xYMACH1yIU8nr0YGl2WiR+l31o3QCN4/VH2dUNyYvTA==
+listhen@^1.2.2, listhen@^1.5.5:
+  version "1.5.5"
+  resolved "https://registry.yarnpkg.com/listhen/-/listhen-1.5.5.tgz#58915512af70f770aa3e9fb19367adf479bb58c4"
+  integrity sha512-LXe8Xlyh3gnxdv4tSjTjscD1vpr/2PRpzq8YIaMJgyKzRG8wdISlWVWnGThJfHnlJ6hmLt2wq1yeeix0TEbuoA==
   dependencies:
-    citty "^0.1.2"
+    "@parcel/watcher" "^2.3.0"
+    "@parcel/watcher-wasm" "2.3.0"
+    citty "^0.1.4"
     clipboardy "^3.0.0"
     consola "^3.2.3"
     defu "^6.1.2"
-    get-port-please "^3.0.1"
+    get-port-please "^3.1.1"
+    h3 "^1.8.1"
     http-shutdown "^1.2.2"
-    jiti "^1.19.1"
-    mlly "^1.4.0"
+    jiti "^1.20.0"
+    mlly "^1.4.2"
     node-forge "^1.3.1"
     pathe "^1.1.1"
-    ufo "^1.1.2"
+    std-env "^3.4.3"
+    ufo "^1.3.0"
+    untun "^0.1.2"
+    uqr "^0.1.2"
 
-listr2@^3.12.2:
-  version "3.14.0"
-  resolved "https://registry.npmjs.org/listr2/-/listr2-3.14.0.tgz"
-  integrity sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==
+listr2@6.6.1:
+  version "6.6.1"
+  resolved "https://registry.yarnpkg.com/listr2/-/listr2-6.6.1.tgz#08b2329e7e8ba6298481464937099f4a2cd7f95d"
+  integrity sha512-+rAXGHh0fkEWdXBmX+L6mmfmXmXvDGEKzkjxO+8mP3+nI/r/CWznVBvsibXdxda9Zz0OW2e2ikphN3OwCT/jSg==
   dependencies:
-    cli-truncate "^2.1.0"
-    colorette "^2.0.16"
-    log-update "^4.0.0"
-    p-map "^4.0.0"
+    cli-truncate "^3.1.0"
+    colorette "^2.0.20"
+    eventemitter3 "^5.0.1"
+    log-update "^5.0.1"
     rfdc "^1.3.0"
-    rxjs "^7.5.1"
-    through "^2.3.8"
-    wrap-ansi "^7.0.0"
+    wrap-ansi "^8.1.0"
 
 load-json-file@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz"
-  integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs=
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
+  integrity sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^4.0.0"
@@ -5929,7 +5840,7 @@ load-json-file@^4.0.0:
 
 load-json-file@^6.2.0:
   version "6.2.0"
-  resolved "https://registry.npmjs.org/load-json-file/-/load-json-file-6.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-6.2.0.tgz#5c7770b42cafa97074ca2848707c61662f4251a1"
   integrity sha512-gUD/epcRms75Cw8RT1pUdHugZYM5ce64ucs2GEISABwkRsOQr0q2wm/MV2TKThycIe5e0ytRweW2RZxclogCdQ==
   dependencies:
     graceful-fs "^4.1.15"
@@ -5939,12 +5850,12 @@ load-json-file@^6.2.0:
 
 loader-utils@^3.2.0:
   version "3.2.1"
-  resolved "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-3.2.1.tgz#4fb104b599daafd82ef3e1a41fb9265f87e1f576"
   integrity sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==
 
 locate-path@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
   integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
   dependencies:
     p-locate "^4.1.0"
@@ -5958,17 +5869,17 @@ locate-path@^6.0.0:
 
 lodash-es@^4.17.21:
   version "4.17.21"
-  resolved "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz"
+  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee"
   integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==
 
 lodash.camelcase@^4.3.0:
   version "4.3.0"
-  resolved "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz"
+  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
   integrity sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==
 
 lodash.debounce@^4.0.8:
   version "4.0.8"
-  resolved "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz"
+  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
   integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
 
 lodash.defaults@^4.2.0:
@@ -5976,14 +5887,44 @@ lodash.defaults@^4.2.0:
   resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
   integrity sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==
 
+lodash.includes@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f"
+  integrity sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==
+
 lodash.isarguments@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
   integrity sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==
 
+lodash.isboolean@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6"
+  integrity sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==
+
+lodash.isinteger@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343"
+  integrity sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==
+
+lodash.isnumber@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz#3ce76810c5928d03352301ac287317f11c0b1ffc"
+  integrity sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==
+
+lodash.isplainobject@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
+  integrity sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==
+
+lodash.isstring@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
+  integrity sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==
+
 lodash.memoize@^4.1.2:
   version "4.1.2"
-  resolved "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz"
+  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
   integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==
 
 lodash.merge@^4.6.2:
@@ -5993,13 +5934,18 @@ lodash.merge@^4.6.2:
 
 lodash.mergewith@^4.6.2:
   version "4.6.2"
-  resolved "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz"
+  resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz#617121f89ac55f59047c7aec1ccd6654c6590f55"
   integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==
 
+lodash.once@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
+  integrity sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==
+
 lodash.pick@^4.4.0:
   version "4.4.0"
-  resolved "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz"
-  integrity sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=
+  resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
+  integrity sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q==
 
 lodash.truncate@^4.4.2:
   version "4.4.2"
@@ -6008,47 +5954,55 @@ lodash.truncate@^4.4.2:
 
 lodash.uniq@^4.5.0:
   version "4.5.0"
-  resolved "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz"
+  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==
 
-lodash@4.17.21, lodash@^4.17.21:
+lodash@^4.17.21:
   version "4.17.21"
-  resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
-log-update@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz"
-  integrity sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==
+log-update@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/log-update/-/log-update-5.0.1.tgz#9e928bf70cb183c1f0c9e91d9e6b7115d597ce09"
+  integrity sha512-5UtUDQ/6edw4ofyljDNcOVJQ4c7OjDro4h3y8e1GQL5iYElYclVHJ3zeWchylvMaKnDbDilC8irOVyexnA/Slw==
   dependencies:
-    ansi-escapes "^4.3.0"
-    cli-cursor "^3.1.0"
-    slice-ansi "^4.0.0"
-    wrap-ansi "^6.2.0"
+    ansi-escapes "^5.0.0"
+    cli-cursor "^4.0.0"
+    slice-ansi "^5.0.0"
+    strip-ansi "^7.0.1"
+    wrap-ansi "^8.0.1"
 
 loose-envify@^1.1.0, loose-envify@^1.4.0:
   version "1.4.0"
-  resolved "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz"
+  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
   integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
   dependencies:
     js-tokens "^3.0.0 || ^4.0.0"
 
 loud-rejection@^2.2.0:
   version "2.2.0"
-  resolved "https://registry.npmjs.org/loud-rejection/-/loud-rejection-2.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-2.2.0.tgz#4255eb6e9c74045b0edc021fa7397ab655a8517c"
   integrity sha512-S0FayMXku80toa5sZ6Ro4C+s+EtFDCsyJNG/AzFMfX3AxD5Si4dZsgzm/kKnbOxHl5Cv8jBlno8+3XYIh2pNjQ==
   dependencies:
     currently-unhandled "^0.4.1"
     signal-exit "^3.0.2"
 
+lower-case@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28"
+  integrity sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==
+  dependencies:
+    tslib "^2.0.3"
+
 lru-cache@^10.0.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.0.tgz#b9e2a6a72a129d81ab317202d93c7691df727e61"
-  integrity sha512-svTf/fzsKHffP42sujkO/Rjs37BCIsQVRCeNYIm9WN8rgT7ffoUnRtZCqU+6BqcSBdv8gwJeTz8knJpgACeQMw==
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.1.tgz#0a3be479df549cca0e5d693ac402ff19537a6b7a"
+  integrity sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==
 
 lru-cache@^5.1.1:
   version "5.1.1"
-  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
   integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
   dependencies:
     yallist "^3.0.2"
@@ -6062,35 +6016,28 @@ lru-cache@^6.0.0:
 
 magic-string@^0.25.0, magic-string@^0.25.7:
   version "0.25.9"
-  resolved "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.9.tgz#de7f9faf91ef8a1c91d02c2e5314c8277dbcdd1c"
   integrity sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==
   dependencies:
     sourcemap-codec "^1.4.8"
 
-magic-string@^0.27.0:
-  version "0.27.0"
-  resolved "https://registry.npmjs.org/magic-string/-/magic-string-0.27.0.tgz"
-  integrity sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==
+magic-string@^0.30.0, magic-string@^0.30.2, magic-string@^0.30.3:
+  version "0.30.5"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.5.tgz#1994d980bd1c8835dc6e78db7cbd4ae4f24746f9"
+  integrity sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==
   dependencies:
-    "@jridgewell/sourcemap-codec" "^1.4.13"
-
-magic-string@^0.30.0:
-  version "0.30.0"
-  resolved "https://registry.npmjs.org/magic-string/-/magic-string-0.30.0.tgz"
-  integrity sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==
-  dependencies:
-    "@jridgewell/sourcemap-codec" "^1.4.13"
+    "@jridgewell/sourcemap-codec" "^1.4.15"
 
 make-dir@^3.0.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
   integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
   dependencies:
     semver "^6.0.0"
 
 make-error@^1.1.1:
   version "1.3.6"
-  resolved "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz"
+  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
   integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
 
 map-obj@^1.0.0:
@@ -6100,7 +6047,7 @@ map-obj@^1.0.0:
 
 map-obj@^4.0.0, map-obj@^4.1.0:
   version "4.3.0"
-  resolved "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a"
   integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==
 
 mathml-tag-names@^2.1.3:
@@ -6109,21 +6056,21 @@ mathml-tag-names@^2.1.3:
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
 maxmind@^4.3.6:
-  version "4.3.11"
-  resolved "https://registry.npmjs.org/maxmind/-/maxmind-4.3.11.tgz"
-  integrity sha512-tJDrKbUzN6PSA88tWgg0L2R4Ln00XwecYQJPFI+RvlF2k1sx6VQYtuQ1SVxm8+bw5tF7GWV4xyb+3/KyzEpPUw==
+  version "4.3.16"
+  resolved "https://registry.yarnpkg.com/maxmind/-/maxmind-4.3.16.tgz#2bc0cef9e55f439933a256d14ac731fcfe1819b4"
+  integrity sha512-bfmiULzt9vO3tZ0SvQOX6cMZMqPCWtncbtNUefeSspoScf8S7n6qB66uOFQN00IWaJUr9oLjtlx3d6M8/KatuQ==
   dependencies:
     mmdb-lib "2.0.2"
-    tiny-lru "11.0.1"
+    tiny-lru "11.2.3"
 
 mdn-data@2.0.14:
   version "2.0.14"
-  resolved "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz"
+  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
   integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==
 
 mdn-data@2.0.28:
   version "2.0.28"
-  resolved "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.28.tgz"
+  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.28.tgz#5ec48e7bef120654539069e1ae4ddc81ca490eba"
   integrity sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==
 
 mdn-data@2.0.30:
@@ -6133,13 +6080,13 @@ mdn-data@2.0.30:
 
 "memoize-one@>=3.1.1 <6", memoize-one@^5.1.1:
   version "5.2.1"
-  resolved "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz"
+  resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.2.1.tgz#8337aa3c4335581839ec01c3d594090cebe8f00e"
   integrity sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==
 
 memorystream@^0.3.1:
   version "0.3.1"
-  resolved "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz"
-  integrity sha1-htcJCzDORV1j+64S3aUaR93K+bI=
+  resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
+  integrity sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==
 
 meow@^10.1.5:
   version "10.1.5"
@@ -6161,7 +6108,7 @@ meow@^10.1.5:
 
 meow@^6.1.0:
   version "6.1.1"
-  resolved "https://registry.npmjs.org/meow/-/meow-6.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/meow/-/meow-6.1.1.tgz#1ad64c4b76b2a24dfb2f635fddcadf320d251467"
   integrity sha512-3YffViIt2QWgTy6Pale5QpopX/IvU3LPL03jOTqp6pGj3VjesdO/U8CuHMKpnQr4shCNCM5fd5XFFvIIl6JBHg==
   dependencies:
     "@types/minimist" "^1.2.0"
@@ -6191,7 +6138,7 @@ micro-memoize@^4.1.2:
   resolved "https://registry.yarnpkg.com/micro-memoize/-/micro-memoize-4.1.2.tgz#ce719c1ba1e41592f1cd91c64c5f41dcbf135f36"
   integrity sha512-+HzcV2H+rbSJzApgkj0NdTakkC+bnyeiUxgT6/m7mjcz1CmM22KYFKp+EVj1sWe4UYcnriJr5uqHQD/gMHLD+g==
 
-micromatch@^4.0.4, micromatch@^4.0.5:
+micromatch@4.0.5, micromatch@^4.0.4, micromatch@^4.0.5:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
   integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
@@ -6199,23 +6146,21 @@ micromatch@^4.0.4, micromatch@^4.0.5:
     braces "^3.0.2"
     picomatch "^2.3.1"
 
-mime-db@1.52.0:
-  version "1.52.0"
-  resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz"
-  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
-
-mime-types@^2.1.12, mime-types@~2.1.19:
-  version "2.1.35"
-  resolved "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz"
-  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
-  dependencies:
-    mime-db "1.52.0"
+mime@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-3.0.0.tgz#b374550dca3a0c18443b0c950a6a58f1931cf7a7"
+  integrity sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==
 
 mimic-fn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
+mimic-fn@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-4.0.0.tgz#60a90550d5cb0b239cca65d893b1a53b29871ecc"
+  integrity sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==
+
 mimic-response@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"
@@ -6223,7 +6168,7 @@ mimic-response@^3.1.0:
 
 min-indent@^1.0.0, min-indent@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
   integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
 
 minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
@@ -6235,14 +6180,14 @@ minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
 
 minimatch@^5.0.1:
   version "5.1.6"
-  resolved "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
   integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
   dependencies:
     brace-expansion "^2.0.1"
 
 minimist-options@4.1.0, minimist-options@^4.0.2:
   version "4.1.0"
-  resolved "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
   integrity sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==
   dependencies:
     arrify "^1.0.1"
@@ -6251,24 +6196,24 @@ minimist-options@4.1.0, minimist-options@^4.0.2:
 
 minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6:
   version "1.2.8"
-  resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
 minipass@^3.0.0:
   version "3.3.6"
-  resolved "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a"
   integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==
   dependencies:
     yallist "^4.0.0"
 
 minipass@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
   integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
 
 minizlib@^2.1.1:
   version "2.1.2"
-  resolved "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
   integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
   dependencies:
     minipass "^3.0.0"
@@ -6279,24 +6224,29 @@ mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3:
   resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
   integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
 
-mkdirp@^1.0.3, mkdirp@^1.0.4:
+mkdirp@^1.0.3:
   version "1.0.4"
-  resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
-mlly@^1.2.0, mlly@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/mlly/-/mlly-1.4.0.tgz#830c10d63f1f97bd8785377b24dc2a15d972832b"
-  integrity sha512-ua8PAThnTwpprIaU47EPeZ/bPUVp2QYBbWMphUQpVdBI3Lgqzm5KZQ45Agm3YJedHXaIHl6pBGabaLSUPPSptg==
+mkdirp@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-3.0.1.tgz#e44e4c5607fb279c168241713cc6e0fea9adcb50"
+  integrity sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==
+
+mlly@^1.2.0, mlly@^1.4.2:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/mlly/-/mlly-1.4.2.tgz#7cf406aa319ff6563d25da6b36610a93f2a8007e"
+  integrity sha512-i/Ykufi2t1EZ6NaPLdfnZk2AX8cs0d+mTzVKuPfqPKPatxLApaBoxJQ9x1/uckXtrS/U5oisPMDkNs0yQTaBRg==
   dependencies:
-    acorn "^8.9.0"
+    acorn "^8.10.0"
     pathe "^1.1.1"
     pkg-types "^1.0.3"
-    ufo "^1.1.2"
+    ufo "^1.3.0"
 
 mmdb-lib@2.0.2:
   version "2.0.2"
-  resolved "https://registry.npmjs.org/mmdb-lib/-/mmdb-lib-2.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/mmdb-lib/-/mmdb-lib-2.0.2.tgz#fe60404142c0456c19607c72caa15821731ae957"
   integrity sha512-shi1I+fCPQonhTi7qyb6hr7hi87R7YS69FlfJiMFuJ12+grx0JyL56gLNzGTYXPU7EhAPkMLliGeyHer0K+AVA==
 
 moize@^6.1.0:
@@ -6309,21 +6259,21 @@ moize@^6.1.0:
 
 moment-timezone@0.5.26:
   version "0.5.26"
-  resolved "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.26.tgz"
+  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.26.tgz#c0267ca09ae84631aa3dc33f65bedbe6e8e0d772"
   integrity sha512-sFP4cgEKTCymBBKgoxZjYzlSovC20Y6J7y3nanDc5RoBIXKlZhoYwBoZGe3flwU6A372AcRwScH8KiwV6zjy1g==
   dependencies:
     moment ">= 2.9.0"
 
 moment-timezone@^0.5.35:
   version "0.5.43"
-  resolved "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.43.tgz"
+  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.43.tgz#3dd7f3d0c67f78c23cd1906b9b2137a09b3c4790"
   integrity sha512-72j3aNyuIsDxdF1i7CEgV2FfxM1r6aaqJyLB2vwb33mXYyoyLly+F1zbWqhA3/bVIoJ4szlUoMbUnVdid32NUQ==
   dependencies:
     moment "^2.29.4"
 
 "moment@>= 2.9.0", moment@^2.29.4:
   version "2.29.4"
-  resolved "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
   integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
 
 mri@^1.2.0:
@@ -6348,12 +6298,12 @@ murmurhash@^2.0.0:
 
 nanoclone@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.npmjs.org/nanoclone/-/nanoclone-0.2.1.tgz"
+  resolved "https://registry.yarnpkg.com/nanoclone/-/nanoclone-0.2.1.tgz#dd4090f8f1a110d26bb32c49ed2f5b9235209ed4"
   integrity sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA==
 
-nanoid@^3.3.4, nanoid@^3.3.6:
+nanoid@^3.3.6:
   version "3.3.6"
-  resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c"
   integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==
 
 napi-build-utils@^1.0.1:
@@ -6361,56 +6311,66 @@ napi-build-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806"
   integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==
 
-natural-compare-lite@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4"
-  integrity sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==
+napi-wasm@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/napi-wasm/-/napi-wasm-1.1.0.tgz#bbe617823765ae9c1bc12ff5942370eae7b2ba4e"
+  integrity sha512-lHwIAJbmLSjF9VDRm9GoVOy9AGp3aIvkjv+Kvz9h16QR3uSVYH78PNQUnT2U4X53mhlnV2M7wrhibQ3GHicDmg==
 
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
-next-basics@^0.35.0:
-  version "0.35.0"
-  resolved "https://registry.yarnpkg.com/next-basics/-/next-basics-0.35.0.tgz#aa68fd35a0e3fbabfdaf570cd092b6a7cf8df6f5"
-  integrity sha512-yqXZMLe109hSJ8sebI/f2m1XNnVuQowpELOhZSGOFOmLfvUyFBAEi0ULdqX1eb8xbttLgjcrumrZfMgmEwuCPw==
+next-basics@^0.39.0:
+  version "0.39.0"
+  resolved "https://registry.yarnpkg.com/next-basics/-/next-basics-0.39.0.tgz#1ec448a1c12966a82067445bfb9319b7e883dd6a"
+  integrity sha512-5HWf3u7jgx5n4auIkArFP5+EVdyz7kSvxs86o2V4y8/t3J4scdIHgI8BBE6UhzB17WMbMgVql44IfcJH1CQc/w==
   dependencies:
     bcryptjs "^2.4.3"
     jsonwebtoken "^9.0.0"
     pure-rand "^6.0.2"
 
-next@13.3.1:
-  version "13.3.1"
-  resolved "https://registry.yarnpkg.com/next/-/next-13.3.1.tgz#17625f7423db2e059d71b41bd9031756cf2b33bc"
-  integrity sha512-eByWRxPzKHs2oQz1yE41LX35umhz86ZSZ+mYyXBqn2IBi2hyUqxBA88avywdr4uyH+hCJczegGsDGWbzQA5Rqw==
+next@14.0.4:
+  version "14.0.4"
+  resolved "https://registry.yarnpkg.com/next/-/next-14.0.4.tgz#bf00b6f835b20d10a5057838fa2dfced1d0d84dc"
+  integrity sha512-qbwypnM7327SadwFtxXnQdGiKpkuhaRLE2uq62/nRul9cj9KhQ5LhHmlziTNqUidZotw/Q1I9OjirBROdUJNgA==
   dependencies:
-    "@next/env" "13.3.1"
-    "@swc/helpers" "0.5.0"
+    "@next/env" "14.0.4"
+    "@swc/helpers" "0.5.2"
     busboy "1.6.0"
     caniuse-lite "^1.0.30001406"
-    postcss "8.4.14"
+    graceful-fs "^4.2.11"
+    postcss "8.4.31"
     styled-jsx "5.1.1"
+    watchpack "2.4.0"
   optionalDependencies:
-    "@next/swc-darwin-arm64" "13.3.1"
-    "@next/swc-darwin-x64" "13.3.1"
-    "@next/swc-linux-arm64-gnu" "13.3.1"
-    "@next/swc-linux-arm64-musl" "13.3.1"
-    "@next/swc-linux-x64-gnu" "13.3.1"
-    "@next/swc-linux-x64-musl" "13.3.1"
-    "@next/swc-win32-arm64-msvc" "13.3.1"
-    "@next/swc-win32-ia32-msvc" "13.3.1"
-    "@next/swc-win32-x64-msvc" "13.3.1"
+    "@next/swc-darwin-arm64" "14.0.4"
+    "@next/swc-darwin-x64" "14.0.4"
+    "@next/swc-linux-arm64-gnu" "14.0.4"
+    "@next/swc-linux-arm64-musl" "14.0.4"
+    "@next/swc-linux-x64-gnu" "14.0.4"
+    "@next/swc-linux-x64-musl" "14.0.4"
+    "@next/swc-win32-arm64-msvc" "14.0.4"
+    "@next/swc-win32-ia32-msvc" "14.0.4"
+    "@next/swc-win32-x64-msvc" "14.0.4"
 
 nice-try@^1.0.4:
   version "1.0.5"
-  resolved "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz"
+  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
+no-case@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d"
+  integrity sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==
+  dependencies:
+    lower-case "^2.0.2"
+    tslib "^2.0.3"
+
 node-abi@^3.3.0:
-  version "3.45.0"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.45.0.tgz#f568f163a3bfca5aacfce1fbeee1fa2cc98441f5"
-  integrity sha512-iwXuFrMAcFVi/ZoZiqq8BzAdsLw9kxDfTC0HMyjXfSL/6CSDAGD5UmR7azrAgWV1zKYq7dUUMj4owusBWKLsiQ==
+  version "3.51.0"
+  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.51.0.tgz#970bf595ef5a26a271307f8a4befa02823d4e87d"
+  integrity sha512-SQkEP4hmNWjlniS5zdnfIXTk1x7Ome85RDzHlTbBtzE97Gfwz/Ipw4v/Ryk20DWIy3yCNVLVlGKApCnmvYoJbA==
   dependencies:
     semver "^7.3.5"
 
@@ -6419,20 +6379,25 @@ node-addon-api@^6.1.0:
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-6.1.0.tgz#ac8470034e58e67d0c6f1204a18ae6995d9c0d76"
   integrity sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==
 
+node-addon-api@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-7.0.0.tgz#8136add2f510997b3b94814f4af1cce0b0e3962e"
+  integrity sha512-vgbBJTS4m5/KkE16t5Ly0WW9hz46swAstv0hYYwMtbG7AznRhNyfLRe8HZAiWIpcHzoO7HxhLuBQj9rJ/Ho0ZA==
+
 node-domexception@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5"
   integrity sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==
 
-node-fetch-native@^1.1.1, node-fetch-native@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/node-fetch-native/-/node-fetch-native-1.2.0.tgz#13ec6df98f33168958dbfb6945f10aedf42e7ea8"
-  integrity sha512-5IAMBTl9p6PaAjYCnMv5FmqIF6GcZnawAVnzaCG0rX2aYZJ4CxEkZNtVPuTRug7fL7wyM5BQYTlAzcyMPi6oTQ==
+node-fetch-native@^1.2.0, node-fetch-native@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/node-fetch-native/-/node-fetch-native-1.4.0.tgz#fbe8ac033cb6aa44bd106b5e4fd2b6277ba70fa1"
+  integrity sha512-F5kfEj95kX8tkDhUCYdV8dg3/8Olx/94zB8+ZNthFs6Bz31UpUi8Xh40TN3thLwXgrwXry1pEg9lJ++tLWTcqA==
 
 node-fetch@^2.0.0, node-fetch@^2.6.6:
-  version "2.6.12"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.12.tgz#02eb8e22074018e3d5a83016649d04df0e348fba"
-  integrity sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d"
+  integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==
   dependencies:
     whatwg-url "^5.0.0"
 
@@ -6450,10 +6415,10 @@ node-forge@^1.3.1:
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
   integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==
 
-node-releases@^2.0.12:
-  version "2.0.12"
-  resolved "https://registry.npmjs.org/node-releases/-/node-releases-2.0.12.tgz"
-  integrity sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ==
+node-releases@^2.0.13:
+  version "2.0.13"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d"
+  integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==
 
 node-stream-zip@^1.15.0:
   version "1.15.0"
@@ -6462,7 +6427,7 @@ node-stream-zip@^1.15.0:
 
 normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
   version "2.5.0"
-  resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
   dependencies:
     hosted-git-info "^2.1.4"
@@ -6487,17 +6452,17 @@ normalize-path@^3.0.0, normalize-path@~3.0.0:
 
 normalize-range@^0.1.2:
   version "0.1.2"
-  resolved "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz"
+  resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
   integrity sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==
 
 normalize-url@^6.0.1:
   version "6.1.0"
-  resolved "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
   integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
 
 npm-run-all@^4.1.5:
   version "4.1.5"
-  resolved "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.5.tgz"
+  resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.5.tgz#04476202a15ee0e2e214080861bff12a51d98fba"
   integrity sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==
   dependencies:
     ansi-styles "^3.2.1"
@@ -6517,34 +6482,36 @@ npm-run-path@^4.0.1:
   dependencies:
     path-key "^3.0.0"
 
+npm-run-path@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-5.1.0.tgz#bc62f7f3f6952d9894bd08944ba011a6ee7b7e00"
+  integrity sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==
+  dependencies:
+    path-key "^4.0.0"
+
 nth-check@^2.0.1:
   version "2.1.1"
-  resolved "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d"
   integrity sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==
   dependencies:
     boolbase "^1.0.0"
 
-oauth-sign@~0.9.0:
-  version "0.9.0"
-  resolved "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"
-  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
-
 object-assign@^4, object-assign@^4.1.1:
   version "4.1.1"
-  resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"
-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
 
-object-inspect@^1.12.2, object-inspect@^1.12.3, object-inspect@^1.9.0:
-  version "1.12.3"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9"
-  integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==
+object-inspect@^1.12.3, object-inspect@^1.9.0:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2"
+  integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==
 
 object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
-object.assign@^4.1.3, object.assign@^4.1.4:
+object.assign@^4.1.4:
   version "4.1.4"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
   integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==
@@ -6555,58 +6522,58 @@ object.assign@^4.1.3, object.assign@^4.1.4:
     object-keys "^1.1.1"
 
 object.entries@^1.1.6:
-  version "1.1.6"
-  resolved "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz"
-  integrity sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
-
-object.fromentries@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz"
-  integrity sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
-
-object.groupby@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.0.tgz#cb29259cf90f37e7bac6437686c1ea8c916d12a9"
-  integrity sha512-70MWG6NfRH9GnbZOikuhPPYzpUpof9iW2J9E4dW7FXTqPNb6rllE6u39SKwwiNh8lCwX3DDb5OgcKGiEBrTTyw==
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.7.tgz#2b47760e2a2e3a752f39dd874655c61a7f03c131"
+  integrity sha512-jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.2.0"
-    es-abstract "^1.21.2"
+    es-abstract "^1.22.1"
+
+object.fromentries@^2.0.6:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.7.tgz#71e95f441e9a0ea6baf682ecaaf37fa2a8d7e616"
+  integrity sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+
+object.groupby@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.1.tgz#d41d9f3c8d6c778d9cbac86b4ee9f5af103152ee"
+  integrity sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
     get-intrinsic "^1.2.1"
 
 object.hasown@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.2.tgz"
-  integrity sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.3.tgz#6a5f2897bb4d3668b8e79364f98ccf971bda55ae"
+  integrity sha512-fFI4VcYpRHvSLXxP7yiZOMAd331cPfd2p7PFDVbgUsYOfCT3tICVqXWngbjr4m49OvsBwUBQ6O2uQoJvy3RexA==
   dependencies:
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
 
 object.values@^1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.6.tgz#4abbaa71eba47d63589d402856f908243eea9b1d"
-  integrity sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.7.tgz#617ed13272e7e1071b43973aa1655d9291b8442a"
+  integrity sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
 
 ofetch@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ofetch/-/ofetch-1.1.1.tgz#a0e5117500f4ac02e2c61ec1bb754bc54d5ba44d"
-  integrity sha512-SSMoktrp9SNLi20BWfB/BnnKcL0RDigXThD/mZBeQxkIRv1xrd9183MtLdsqRYLYSqW0eTr5t8w8MqjNhvoOQQ==
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/ofetch/-/ofetch-1.3.3.tgz#588cb806a28e5c66c2c47dd8994f9059a036d8c0"
+  integrity sha512-s1ZCMmQWXy4b5K/TW9i/DtiN8Ku+xCiHcjQ6/J/nDdssirrQNOoB165Zu8EqLMA2lln1JUth9a0aW9Ap2ctrUg==
   dependencies:
-    destr "^2.0.0"
-    node-fetch-native "^1.2.0"
-    ufo "^1.1.2"
+    destr "^2.0.1"
+    node-fetch-native "^1.4.0"
+    ufo "^1.3.0"
 
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
@@ -6617,11 +6584,18 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0:
 
 onetime@^5.1.0, onetime@^5.1.2:
   version "5.1.2"
-  resolved "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
   integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
   dependencies:
     mimic-fn "^2.1.0"
 
+onetime@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-6.0.0.tgz#7c24c18ed1fd2e9bca4bd26806a33613c77d34b4"
+  integrity sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==
+  dependencies:
+    mimic-fn "^4.0.0"
+
 optionator@^0.9.3:
   version "0.9.3"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64"
@@ -6641,12 +6615,12 @@ outdent@^0.8.0:
 
 p-finally@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
   integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==
 
 p-limit@^2.2.0:
   version "2.3.0"
-  resolved "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
   integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
   dependencies:
     p-try "^2.0.0"
@@ -6660,7 +6634,7 @@ p-limit@^3.0.2, p-limit@^3.1.0:
 
 p-locate@^4.1.0:
   version "4.1.0"
-  resolved "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
   integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
   dependencies:
     p-limit "^2.2.0"
@@ -6674,21 +6648,21 @@ p-locate@^5.0.0:
 
 p-map@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-3.0.0.tgz#d704d9af8a2ba684e2600d9a215983d4141a979d"
   integrity sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==
   dependencies:
     aggregate-error "^3.0.0"
 
 p-map@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
   integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
   dependencies:
     aggregate-error "^3.0.0"
 
 p-queue@^6.6.2:
   version "6.6.2"
-  resolved "https://registry.npmjs.org/p-queue/-/p-queue-6.6.2.tgz"
+  resolved "https://registry.yarnpkg.com/p-queue/-/p-queue-6.6.2.tgz#2068a9dcf8e67dd0ec3e7a2bcb76810faa85e426"
   integrity sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==
   dependencies:
     eventemitter3 "^4.0.4"
@@ -6696,14 +6670,14 @@ p-queue@^6.6.2:
 
 p-timeout@^3.2.0:
   version "3.2.0"
-  resolved "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-3.2.0.tgz#c7e17abc971d2a7962ef83626b35d635acf23dfe"
   integrity sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==
   dependencies:
     p-finally "^1.0.0"
 
 p-try@^2.0.0:
   version "2.2.0"
-  resolved "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
 parent-module@^1.0.0:
@@ -6715,7 +6689,7 @@ parent-module@^1.0.0:
 
 parse-json@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
   integrity sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==
   dependencies:
     error-ex "^1.3.1"
@@ -6743,7 +6717,7 @@ path-is-absolute@^1.0.0:
 
 path-key@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
   integrity sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==
 
 path-key@^3.0.0, path-key@^3.1.0:
@@ -6751,6 +6725,11 @@ path-key@^3.0.0, path-key@^3.1.0:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
+path-key@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-4.0.0.tgz#295588dc3aee64154f877adb9d780b81c554bf18"
+  integrity sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==
+
 path-parse@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
@@ -6758,7 +6737,7 @@ path-parse@^1.0.7:
 
 path-type@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
   integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
   dependencies:
     pify "^3.0.0"
@@ -6778,39 +6757,39 @@ pathe@^1.1.0, pathe@^1.1.1:
   resolved "https://registry.yarnpkg.com/pathe/-/pathe-1.1.1.tgz#1dd31d382b974ba69809adc9a7a347e65d84829a"
   integrity sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q==
 
-performance-now@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"
-  integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
-
 picocolors@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.3.1:
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
+pidtree@0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.6.0.tgz#90ad7b6d42d5841e69e0a2419ef38f8883aa057c"
+  integrity sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==
+
 pidtree@^0.3.0:
   version "0.3.1"
-  resolved "https://registry.npmjs.org/pidtree/-/pidtree-0.3.1.tgz"
+  resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.3.1.tgz#ef09ac2cc0533df1f3250ccf2c4d366b0d12114a"
   integrity sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==
 
 pify@^2.3.0:
   version "2.3.0"
-  resolved "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
-  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
+  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+  integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==
 
 pify@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"
-  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
+  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+  integrity sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==
 
 pify@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-5.0.0.tgz#1f5eca3f5e87ebec28cc6d54a0e4aaf00acc127f"
   integrity sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==
 
 pkg-types@^1.0.3:
@@ -6822,23 +6801,16 @@ pkg-types@^1.0.3:
     mlly "^1.2.0"
     pathe "^1.1.0"
 
-please-upgrade-node@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz"
-  integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==
-  dependencies:
-    semver-compare "^1.0.0"
-
 postcss-attribute-case-insensitive@^5.0.2:
   version "5.0.2"
-  resolved "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz#03d761b24afc04c09e757e92ff53716ae8ea2741"
   integrity sha512-XIidXV8fDr0kKt28vqki84fRK8VW8eTuIa4PChv2MqKuT6C9UjmSKzen6KaWhWEoYvwxFCa7n/tC1SZ3tyq4SQ==
   dependencies:
     postcss-selector-parser "^6.0.10"
 
 postcss-calc@^8.2.3:
   version "8.2.4"
-  resolved "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.2.4.tgz#77b9c29bfcbe8a07ff6693dc87050828889739a5"
   integrity sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==
   dependencies:
     postcss-selector-parser "^6.0.9"
@@ -6846,35 +6818,35 @@ postcss-calc@^8.2.3:
 
 postcss-clamp@^4.1.0:
   version "4.1.0"
-  resolved "https://registry.npmjs.org/postcss-clamp/-/postcss-clamp-4.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-clamp/-/postcss-clamp-4.1.0.tgz#7263e95abadd8c2ba1bd911b0b5a5c9c93e02363"
   integrity sha512-ry4b1Llo/9zz+PKC+030KUnPITTJAHeOwjfAyyB60eT0AorGLdzp52s31OsPRHRf8NchkgFoG2y6fCfn1IV1Ow==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 postcss-color-functional-notation@^4.2.4:
   version "4.2.4"
-  resolved "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.4.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.4.tgz#21a909e8d7454d3612d1659e471ce4696f28caec"
   integrity sha512-2yrTAUZUab9s6CpxkxC4rVgFEVaR6/2Pipvi6qcgvnYiVqZcbDHEoBDhrXzyb7Efh2CCfHQNtcqWcIruDTIUeg==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 postcss-color-hex-alpha@^8.0.4:
   version "8.0.4"
-  resolved "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.4.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.4.tgz#c66e2980f2fbc1a63f5b079663340ce8b55f25a5"
   integrity sha512-nLo2DCRC9eE4w2JmuKgVA3fGL3d01kGq752pVALF68qpGLmx2Qrk91QTKkdUqqp45T1K1XV8IhQpcu1hoAQflQ==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 postcss-color-rebeccapurple@^7.1.1:
   version "7.1.1"
-  resolved "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.1.1.tgz#63fdab91d878ebc4dd4b7c02619a0c3d6a56ced0"
   integrity sha512-pGxkuVEInwLHgkNxUc4sdg4g3py7zUeCQ9sMfwyHAT+Ezk8a4OaaVZ8lIY5+oNqA/BXXgLyXv0+5wHP68R79hg==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 postcss-colormin@^5.3.1:
   version "5.3.1"
-  resolved "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.1.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.3.1.tgz#86c27c26ed6ba00d96c79e08f3ffb418d1d1988f"
   integrity sha512-UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ==
   dependencies:
     browserslist "^4.21.4"
@@ -6884,7 +6856,7 @@ postcss-colormin@^5.3.1:
 
 postcss-convert-values@^5.1.3:
   version "5.1.3"
-  resolved "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz#04998bb9ba6b65aa31035d669a6af342c5f9d393"
   integrity sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA==
   dependencies:
     browserslist "^4.21.4"
@@ -6892,55 +6864,55 @@ postcss-convert-values@^5.1.3:
 
 postcss-custom-media@^8.0.2:
   version "8.0.2"
-  resolved "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-8.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-8.0.2.tgz#c8f9637edf45fef761b014c024cee013f80529ea"
   integrity sha512-7yi25vDAoHAkbhAzX9dHx2yc6ntS4jQvejrNcC+csQJAXjj15e7VcWfMgLqBNAbOvqi5uIa9huOVwdHbf+sKqg==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 postcss-custom-properties@^12.1.10:
   version "12.1.11"
-  resolved "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.11.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-12.1.11.tgz#d14bb9b3989ac4d40aaa0e110b43be67ac7845cf"
   integrity sha512-0IDJYhgU8xDv1KY6+VgUwuQkVtmYzRwu+dMjnmdMafXYv86SWqfxkc7qdDvWS38vsjaEtv8e0vGOUQrAiMBLpQ==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 postcss-custom-selectors@^6.0.3:
   version "6.0.3"
-  resolved "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-6.0.3.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-6.0.3.tgz#1ab4684d65f30fed175520f82d223db0337239d9"
   integrity sha512-fgVkmyiWDwmD3JbpCmB45SvvlCD6z9CG6Ie6Iere22W5aHea6oWa7EM2bpnv2Fj3I94L3VbtvX9KqwSi5aFzSg==
   dependencies:
     postcss-selector-parser "^6.0.4"
 
 postcss-dir-pseudo-class@^6.0.5:
   version "6.0.5"
-  resolved "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.5.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.5.tgz#2bf31de5de76added44e0a25ecf60ae9f7c7c26c"
   integrity sha512-eqn4m70P031PF7ZQIvSgy9RSJ5uI2171O/OO/zcRNYpJbvaeKFUlar1aJ7rmgiQtbm0FSPsRewjpdS0Oew7MPA==
   dependencies:
     postcss-selector-parser "^6.0.10"
 
 postcss-discard-comments@^5.1.2:
   version "5.1.2"
-  resolved "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz#8df5e81d2925af2780075840c1526f0660e53696"
   integrity sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==
 
 postcss-discard-duplicates@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz#9eb4fe8456706a4eebd6d3b7b777d07bad03e848"
   integrity sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==
 
 postcss-discard-empty@^5.1.1:
   version "5.1.1"
-  resolved "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz#e57762343ff7f503fe53fca553d18d7f0c369c6c"
   integrity sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==
 
 postcss-discard-overridden@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz#7e8c5b53325747e9d90131bb88635282fb4a276e"
   integrity sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==
 
 postcss-double-position-gradients@^3.1.2:
   version "3.1.2"
-  resolved "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.2.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.2.tgz#b96318fdb477be95997e86edd29c6e3557a49b91"
   integrity sha512-GX+FuE/uBR6eskOK+4vkXgT6pDkexLokPaz/AbJna9s5Kzp/yl488pKPjhy0obB475ovfT1Wv8ho7U/cHNaRgQ==
   dependencies:
     "@csstools/postcss-progressive-custom-properties" "^1.1.0"
@@ -6948,50 +6920,50 @@ postcss-double-position-gradients@^3.1.2:
 
 postcss-env-function@^4.0.6:
   version "4.0.6"
-  resolved "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-4.0.6.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-env-function/-/postcss-env-function-4.0.6.tgz#7b2d24c812f540ed6eda4c81f6090416722a8e7a"
   integrity sha512-kpA6FsLra+NqcFnL81TnsU+Z7orGtDTxcOhl6pwXeEq1yFPpRMkCDpHhrz8CFQDr/Wfm0jLiNQ1OsGGPjlqPwA==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 postcss-flexbugs-fixes@^5.0.2:
   version "5.0.2"
-  resolved "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-5.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-5.0.2.tgz#2028e145313074fc9abe276cb7ca14e5401eb49d"
   integrity sha512-18f9voByak7bTktR2QgDveglpn9DTbBWPUzSOe9g0N4WR/2eSt6Vrcbf0hmspvMI6YWGywz6B9f7jzpFNJJgnQ==
 
 postcss-focus-visible@^6.0.4:
   version "6.0.4"
-  resolved "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-6.0.4.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-focus-visible/-/postcss-focus-visible-6.0.4.tgz#50c9ea9afa0ee657fb75635fabad25e18d76bf9e"
   integrity sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw==
   dependencies:
     postcss-selector-parser "^6.0.9"
 
 postcss-focus-within@^5.0.4:
   version "5.0.4"
-  resolved "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-5.0.4.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-focus-within/-/postcss-focus-within-5.0.4.tgz#5b1d2ec603195f3344b716c0b75f61e44e8d2e20"
   integrity sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ==
   dependencies:
     postcss-selector-parser "^6.0.9"
 
 postcss-font-variant@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz#efd59b4b7ea8bb06127f2d031bfbb7f24d32fa66"
   integrity sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==
 
 postcss-gap-properties@^3.0.5:
   version "3.0.5"
-  resolved "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.5.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-gap-properties/-/postcss-gap-properties-3.0.5.tgz#f7e3cddcf73ee19e94ccf7cb77773f9560aa2fff"
   integrity sha512-IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg==
 
 postcss-image-set-function@^4.0.7:
   version "4.0.7"
-  resolved "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-4.0.7.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-image-set-function/-/postcss-image-set-function-4.0.7.tgz#08353bd756f1cbfb3b6e93182c7829879114481f"
   integrity sha512-9T2r9rsvYzm5ndsBE8WgtrMlIT7VbtTfE7b3BQnudUqnBcBo7L758oc+o+pdj/dUV0l5wjwSdjeOH2DZtfv8qw==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 postcss-import@^15.1.0:
   version "15.1.0"
-  resolved "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-15.1.0.tgz#41c64ed8cc0e23735a9698b3249ffdbf704adc70"
   integrity sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==
   dependencies:
     postcss-value-parser "^4.0.0"
@@ -7000,12 +6972,12 @@ postcss-import@^15.1.0:
 
 postcss-initial@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.npmjs.org/postcss-initial/-/postcss-initial-4.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-4.0.1.tgz#529f735f72c5724a0fb30527df6fb7ac54d7de42"
   integrity sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==
 
 postcss-lab-function@^4.2.1:
   version "4.2.1"
-  resolved "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-4.2.1.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-4.2.1.tgz#6fe4c015102ff7cd27d1bd5385582f67ebdbdc98"
   integrity sha512-xuXll4isR03CrQsmxyz92LJB2xX9n+pZJ5jE9JgcnmsCammLyKdlzrBin+25dy6wIjfhJpKBAN80gsTlCgRk2w==
   dependencies:
     "@csstools/postcss-progressive-custom-properties" "^1.1.0"
@@ -7013,7 +6985,7 @@ postcss-lab-function@^4.2.1:
 
 postcss-load-config@^3.0.0:
   version "3.1.4"
-  resolved "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.4.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.4.tgz#1ab2571faf84bb078877e1d07905eabe9ebda855"
   integrity sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==
   dependencies:
     lilconfig "^2.0.5"
@@ -7021,12 +6993,12 @@ postcss-load-config@^3.0.0:
 
 postcss-logical@^5.0.4:
   version "5.0.4"
-  resolved "https://registry.npmjs.org/postcss-logical/-/postcss-logical-5.0.4.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-logical/-/postcss-logical-5.0.4.tgz#ec75b1ee54421acc04d5921576b7d8db6b0e6f73"
   integrity sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==
 
 postcss-media-minmax@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz#7140bddec173e2d6d657edbd8554a55794e2a5b5"
   integrity sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==
 
 postcss-media-query-parser@^0.2.3:
@@ -7036,7 +7008,7 @@ postcss-media-query-parser@^0.2.3:
 
 postcss-merge-longhand@^5.1.7:
   version "5.1.7"
-  resolved "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz#24a1bdf402d9ef0e70f568f39bdc0344d568fb16"
   integrity sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==
   dependencies:
     postcss-value-parser "^4.2.0"
@@ -7044,7 +7016,7 @@ postcss-merge-longhand@^5.1.7:
 
 postcss-merge-rules@^5.1.4:
   version "5.1.4"
-  resolved "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz#2f26fa5cacb75b1402e213789f6766ae5e40313c"
   integrity sha512-0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g==
   dependencies:
     browserslist "^4.21.4"
@@ -7054,14 +7026,14 @@ postcss-merge-rules@^5.1.4:
 
 postcss-minify-font-values@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz#f1df0014a726083d260d3bd85d7385fb89d1f01b"
   integrity sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 postcss-minify-gradients@^5.1.1:
   version "5.1.1"
-  resolved "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz#f1fe1b4f498134a5068240c2f25d46fcd236ba2c"
   integrity sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==
   dependencies:
     colord "^2.9.1"
@@ -7070,7 +7042,7 @@ postcss-minify-gradients@^5.1.1:
 
 postcss-minify-params@^5.1.4:
   version "5.1.4"
-  resolved "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz#c06a6c787128b3208b38c9364cfc40c8aa5d7352"
   integrity sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw==
   dependencies:
     browserslist "^4.21.4"
@@ -7079,20 +7051,20 @@ postcss-minify-params@^5.1.4:
 
 postcss-minify-selectors@^5.2.1:
   version "5.2.1"
-  resolved "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz#d4e7e6b46147b8117ea9325a915a801d5fe656c6"
   integrity sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==
   dependencies:
     postcss-selector-parser "^6.0.5"
 
 postcss-modules-extract-imports@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d"
   integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==
 
 postcss-modules-local-by-default@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz"
-  integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz#b08eb4f083050708998ba2c6061b50c2870ca524"
+  integrity sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==
   dependencies:
     icss-utils "^5.0.0"
     postcss-selector-parser "^6.0.2"
@@ -7100,21 +7072,21 @@ postcss-modules-local-by-default@^4.0.0:
 
 postcss-modules-scope@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06"
   integrity sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==
   dependencies:
     postcss-selector-parser "^6.0.4"
 
 postcss-modules-values@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c"
   integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==
   dependencies:
     icss-utils "^5.0.0"
 
 postcss-modules@^4.0.0:
   version "4.3.1"
-  resolved "https://registry.npmjs.org/postcss-modules/-/postcss-modules-4.3.1.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-modules/-/postcss-modules-4.3.1.tgz#517c06c09eab07d133ae0effca2c510abba18048"
   integrity sha512-ItUhSUxBBdNamkT3KzIZwYNNRFKmkJrofvC2nWab3CPKhYBQ1f27XXh1PAPE27Psx58jeelPsxWB/+og+KEH0Q==
   dependencies:
     generic-names "^4.0.0"
@@ -7128,7 +7100,7 @@ postcss-modules@^4.0.0:
 
 postcss-nesting@^10.2.0:
   version "10.2.0"
-  resolved "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-10.2.0.tgz#0b12ce0db8edfd2d8ae0aaf86427370b898890be"
   integrity sha512-EwMkYchxiDiKUhlJGzWsD9b2zvq/r2SSubcRrgP+jujMXFzqvANLt16lJANC+5uZ6hjI7lpRmI6O8JIl+8l1KA==
   dependencies:
     "@csstools/selector-specificity" "^2.0.0"
@@ -7136,47 +7108,47 @@ postcss-nesting@^10.2.0:
 
 postcss-normalize-charset@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz#9302de0b29094b52c259e9b2cf8dc0879879f0ed"
   integrity sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==
 
 postcss-normalize-display-values@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz#72abbae58081960e9edd7200fcf21ab8325c3da8"
   integrity sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 postcss-normalize-positions@^5.1.1:
   version "5.1.1"
-  resolved "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz#ef97279d894087b59325b45c47f1e863daefbb92"
   integrity sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 postcss-normalize-repeat-style@^5.1.1:
   version "5.1.1"
-  resolved "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz#e9eb96805204f4766df66fd09ed2e13545420fb2"
   integrity sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 postcss-normalize-string@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz#411961169e07308c82c1f8c55f3e8a337757e228"
   integrity sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 postcss-normalize-timing-functions@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz#d5614410f8f0b2388e9f240aa6011ba6f52dafbb"
   integrity sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 postcss-normalize-unicode@^5.1.1:
   version "5.1.1"
-  resolved "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz#f67297fca3fea7f17e0d2caa40769afc487aa030"
   integrity sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA==
   dependencies:
     browserslist "^4.21.4"
@@ -7184,7 +7156,7 @@ postcss-normalize-unicode@^5.1.1:
 
 postcss-normalize-url@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz#ed9d88ca82e21abef99f743457d3729a042adcdc"
   integrity sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==
   dependencies:
     normalize-url "^6.0.1"
@@ -7192,19 +7164,19 @@ postcss-normalize-url@^5.1.0:
 
 postcss-normalize-whitespace@^5.1.1:
   version "5.1.1"
-  resolved "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz#08a1a0d1ffa17a7cc6efe1e6c9da969cc4493cfa"
   integrity sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 postcss-opacity-percentage@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.npmjs.org/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.2.tgz"
-  integrity sha512-lyUfF7miG+yewZ8EAk9XUBIlrHyUE6fijnesuz+Mj5zrIHIEw6KcIZSOk/elVMqzLvREmXB83Zi/5QpNRYd47w==
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.3.tgz#5b89b35551a556e20c5d23eb5260fbfcf5245da6"
+  integrity sha512-An6Ba4pHBiDtyVpSLymUUERMo2cU7s+Obz6BTrS+gxkbnSBNKSuD0AVUc+CpBMrpVPKKfoVz0WQCX+Tnst0i4A==
 
 postcss-ordered-values@^5.1.3:
   version "5.1.3"
-  resolved "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz#b6fd2bd10f937b23d86bc829c69e7732ce76ea38"
   integrity sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==
   dependencies:
     cssnano-utils "^3.1.0"
@@ -7212,26 +7184,26 @@ postcss-ordered-values@^5.1.3:
 
 postcss-overflow-shorthand@^3.0.4:
   version "3.0.4"
-  resolved "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.4.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.4.tgz#7ed6486fec44b76f0eab15aa4866cda5d55d893e"
   integrity sha512-otYl/ylHK8Y9bcBnPLo3foYFLL6a6Ak+3EQBPOTR7luMYCOsiVTUk1iLvNf6tVPNGXcoL9Hoz37kpfriRIFb4A==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 postcss-page-break@^3.0.4:
   version "3.0.4"
-  resolved "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-3.0.4.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-page-break/-/postcss-page-break-3.0.4.tgz#7fbf741c233621622b68d435babfb70dd8c1ee5f"
   integrity sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==
 
 postcss-place@^7.0.5:
   version "7.0.5"
-  resolved "https://registry.npmjs.org/postcss-place/-/postcss-place-7.0.5.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-place/-/postcss-place-7.0.5.tgz#95dbf85fd9656a3a6e60e832b5809914236986c4"
   integrity sha512-wR8igaZROA6Z4pv0d+bvVrvGY4GVHihBCBQieXFY3kuSuMyOmEnnfFzHl/tQuqHZkfkIVBEbDvYcFfHmpSet9g==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 postcss-preset-env@7.8.3:
   version "7.8.3"
-  resolved "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.8.3.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-7.8.3.tgz#2a50f5e612c3149cc7af75634e202a5b2ad4f1e2"
   integrity sha512-T1LgRm5uEVFSEF83vHZJV2z19lHg4yJuZ6gXZZkqVsqv63nlr6zabMH3l4Pc01FQCyfWVrh2GaUeCVy9Po+Aag==
   dependencies:
     "@csstools/postcss-cascade-layers" "^1.1.1"
@@ -7286,14 +7258,14 @@ postcss-preset-env@7.8.3:
 
 postcss-pseudo-class-any-link@^7.1.6:
   version "7.1.6"
-  resolved "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.6.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.6.tgz#2693b221902da772c278def85a4d9a64b6e617ab"
   integrity sha512-9sCtZkO6f/5ML9WcTLcIyV1yz9D1rf0tWc+ulKcvV30s0iZKS/ONyETvoWsr6vnrmW+X+KmuK3gV/w5EWnT37w==
   dependencies:
     postcss-selector-parser "^6.0.10"
 
 postcss-reduce-initial@^5.1.2:
   version "5.1.2"
-  resolved "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz#798cd77b3e033eae7105c18c9d371d989e1382d6"
   integrity sha512-dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg==
   dependencies:
     browserslist "^4.21.4"
@@ -7301,14 +7273,14 @@ postcss-reduce-initial@^5.1.2:
 
 postcss-reduce-transforms@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz#333b70e7758b802f3dd0ddfe98bb1ccfef96b6e9"
   integrity sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 postcss-replace-overflow-wrap@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz#d2df6bed10b477bf9c52fab28c568b4b29ca4319"
   integrity sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==
 
 postcss-resolve-nested-selector@^0.1.1:
@@ -7317,9 +7289,9 @@ postcss-resolve-nested-selector@^0.1.1:
   integrity sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw==
 
 postcss-rtlcss@^4.0.1:
-  version "4.0.6"
-  resolved "https://registry.npmjs.org/postcss-rtlcss/-/postcss-rtlcss-4.0.6.tgz"
-  integrity sha512-YNm6g2Y7Gngqtrpq3GC7cUkzH5Gq7aB+Lw9MSgF9s2ro1BDY7W4zqnd15g2ueatUUpSTg2/F5KDjQoTdjhbAKg==
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/postcss-rtlcss/-/postcss-rtlcss-4.0.8.tgz#d5e2923dcee7bec54e9ab0db7357b0bc3f6a8ae3"
+  integrity sha512-CR2sY889PHnX6K8rjW9FG4Qvm9UJsIekDakMtEYGH3zgFp9XADMeaKcA0hPOmkClNh0jWbkaPBm0jZ6fHmqkJQ==
   dependencies:
     rtlcss "4.1.0"
 
@@ -7330,20 +7302,12 @@ postcss-safe-parser@^6.0.0:
 
 postcss-selector-not@^6.0.1:
   version "6.0.1"
-  resolved "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-6.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-6.0.1.tgz#8f0a709bf7d4b45222793fc34409be407537556d"
   integrity sha512-1i9affjAe9xu/y9uqWH+tD4r6/hDaXJruk8xn2x1vzxC2U3J3LKO3zJW4CyxlNhA56pADJ/djpEwpH1RClI2rQ==
   dependencies:
     postcss-selector-parser "^6.0.10"
 
-postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.9:
-  version "6.0.11"
-  resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz"
-  integrity sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==
-  dependencies:
-    cssesc "^3.0.0"
-    util-deprecate "^1.0.2"
-
-postcss-selector-parser@^6.0.13:
+postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.13, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.9:
   version "6.0.13"
   resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz#d05d8d76b1e8e173257ef9d60b706a8e5e99bf1b"
   integrity sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==
@@ -7353,7 +7317,7 @@ postcss-selector-parser@^6.0.13:
 
 postcss-svgo@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.1.0.tgz#0a317400ced789f233a28826e77523f15857d80d"
   integrity sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==
   dependencies:
     postcss-value-parser "^4.2.0"
@@ -7361,38 +7325,20 @@ postcss-svgo@^5.1.0:
 
 postcss-unique-selectors@^5.1.1:
   version "5.1.1"
-  resolved "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz#a9f273d1eacd09e9aa6088f4b0507b18b1b541b6"
   integrity sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==
   dependencies:
     postcss-selector-parser "^6.0.5"
 
 postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0:
   version "4.2.0"
-  resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss@8.4.14:
-  version "8.4.14"
-  resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz"
-  integrity sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==
-  dependencies:
-    nanoid "^3.3.4"
-    picocolors "^1.0.0"
-    source-map-js "^1.0.2"
-
-postcss@^8.1.10:
-  version "8.4.24"
-  resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.24.tgz"
-  integrity sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==
-  dependencies:
-    nanoid "^3.3.6"
-    picocolors "^1.0.0"
-    source-map-js "^1.0.2"
-
-postcss@^8.4.21, postcss@^8.4.25:
-  version "8.4.27"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.27.tgz#234d7e4b72e34ba5a92c29636734349e0d9c3057"
-  integrity sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==
+postcss@8.4.31, postcss@^8.1.10, postcss@^8.4.21, postcss@^8.4.28, postcss@^8.4.31:
+  version "8.4.31"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d"
+  integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==
   dependencies:
     nanoid "^3.3.6"
     picocolors "^1.0.0"
@@ -7423,14 +7369,14 @@ prelude-ls@^1.2.1:
 
 prettier-linter-helpers@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
   integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==
   dependencies:
     fast-diff "^1.1.2"
 
 prettier@^2.6.2:
   version "2.8.8"
-  resolved "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
   integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
 
 pretty-bytes@^5.6.0:
@@ -7438,21 +7384,21 @@ pretty-bytes@^5.6.0:
   resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb"
   integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==
 
-prisma@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/prisma/-/prisma-5.0.0.tgz#f6571c46dc2478172cb7bc1bb62d74026a2c2630"
-  integrity sha512-KYWk83Fhi1FH59jSpavAYTt2eoMVW9YKgu8ci0kuUnt6Dup5Qy47pcB4/TLmiPAbhGrxxSz7gsSnJcCmkyPANA==
+prisma@5.6.0:
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/prisma/-/prisma-5.6.0.tgz#ae2c27fdfb4d53be7f7dafb50d6b8b7f55c93aa5"
+  integrity sha512-EEaccku4ZGshdr2cthYHhf7iyvCcXqwJDvnoQRAJg5ge2Tzpv0e2BaMCp+CbbDUwoVTzwgOap9Zp+d4jFa2O9A==
   dependencies:
-    "@prisma/engines" "5.0.0"
+    "@prisma/engines" "5.6.0"
 
 promise.series@^0.2.0:
   version "0.2.0"
-  resolved "https://registry.npmjs.org/promise.series/-/promise.series-0.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/promise.series/-/promise.series-0.2.0.tgz#2cc7ebe959fc3a6619c04ab4dbdc9e452d864bbd"
   integrity sha512-VWQJyU2bcDTgZw8kpfBpB/ejZASlCrzwz5f2hjb/zlujOEB4oeiAhHygAWq8ubsX2GVkD4kCU5V2dwOTaCY5EQ==
 
 prompts@2.4.2:
   version "2.4.2"
-  resolved "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz"
+  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069"
   integrity sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==
   dependencies:
     kleur "^3.0.3"
@@ -7460,7 +7406,7 @@ prompts@2.4.2:
 
 prop-types@^15.7.2, prop-types@^15.8.1:
   version "15.8.1"
-  resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
   integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
   dependencies:
     loose-envify "^1.4.0"
@@ -7468,14 +7414,9 @@ prop-types@^15.7.2, prop-types@^15.8.1:
     react-is "^16.13.1"
 
 property-expr@^2.0.4:
-  version "2.0.5"
-  resolved "https://registry.npmjs.org/property-expr/-/property-expr-2.0.5.tgz"
-  integrity sha512-IJUkICM5dP5znhCckHSv30Q4b5/JA5enCtkRHYaOVOAocnH/1BQEYTC5NMfT3AVl/iXKdr3aqQbQn9DxyWknwA==
-
-psl@^1.1.24:
-  version "1.9.0"
-  resolved "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz"
-  integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-2.0.6.tgz#f77bc00d5928a6c748414ad12882e83f24aec1e8"
+  integrity sha512-SVtmxhRE/CGkn3eZY1T6pC8Nln6Fr/lu1mKSgRud0eC73whjGfoAogbn78LkD8aFL0zz3bAFerKSnOl7NlErBA==
 
 pump@^3.0.0:
   version "3.0.0"
@@ -7485,30 +7426,15 @@ pump@^3.0.0:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
-punycode@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"
-  integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==
-
 punycode@^2.1.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f"
   integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==
 
 pure-rand@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.2.tgz"
-  integrity sha512-6Yg0ekpKICSjPswYOuC5sku/TSWaRYlA0qsXqJgM/d/4pLPHPuTxK7Nbf7jFKzAeedUhR8C7K9Uv63FBsSo8xQ==
-
-qs@~6.5.2:
-  version "6.5.3"
-  resolved "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz"
-  integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
-
-querystring@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"
-  integrity sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-6.0.4.tgz#50b737f6a925468679bff00ad20eade53f37d5c7"
+  integrity sha512-LA0Y9kxMYv47GIPJy6MI84fqTd2HmYZI83W/kM/SkKfDlajnZYfmXFTxkbY+xSBPkLJxltMa9hIkmdc29eguMA==
 
 queue-microtask@^1.2.2:
   version "1.2.3"
@@ -7522,7 +7448,7 @@ queue-tick@^1.0.1:
 
 quick-lru@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
   integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==
 
 quick-lru@^5.1.1:
@@ -7530,19 +7456,19 @@ quick-lru@^5.1.1:
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
   integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==
 
-radix3@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/radix3/-/radix3-1.0.1.tgz#de0ac16234f8a63288645854a54fc26e45a4a8eb"
-  integrity sha512-y+AcwZ3HcUIGc9zGsNVf5+BY/LxL+z+4h4J3/pp8jxSmy1STaCocPS3qrj4tA5ehUSzqtqK+0Aygvz/r/8vy4g==
+radix3@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/radix3/-/radix3-1.1.0.tgz#9745df67a49c522e94a33d0a93cf743f104b6e0d"
+  integrity sha512-pNsHDxbGORSvuSScqNJ+3Km6QAVqk8CfsCBIEoDgpqLrkD2f3QM4I7d1ozJJ172OmIcoUcerZaNWqtLkRXTV3A==
 
 raf-schd@^4.0.2:
   version "4.0.3"
-  resolved "https://registry.npmjs.org/raf-schd/-/raf-schd-4.0.3.tgz"
+  resolved "https://registry.yarnpkg.com/raf-schd/-/raf-schd-4.0.3.tgz#5d6c34ef46f8b2a0e880a8fcdb743efc5bfdbc1a"
   integrity sha512-tQkJl2GRWh83ui2DiPTJz9wEiMN20syf+5oKfB03yYP7ioZcJwsIK8FjrtLwH1m7C7e+Tt2yYBlrOpdT+dyeIQ==
 
 randombytes@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
   integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
   dependencies:
     safe-buffer "^5.1.0"
@@ -7557,20 +7483,20 @@ rc@^1.2.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-react-basics@^0.91.0:
-  version "0.91.0"
-  resolved "https://registry.yarnpkg.com/react-basics/-/react-basics-0.91.0.tgz#2970529a22a455ec73a1be884eb93a109c9dafc0"
-  integrity sha512-vP8LYWiFwA+eguMEuHvHct4Jl5R/2GUjWc1tMujDG0CsAAUGhx68tAJr0K3gBrWjmpJrTPVfX8SdBNKSDAjQsw==
+react-basics@^0.114.0:
+  version "0.114.0"
+  resolved "https://registry.yarnpkg.com/react-basics/-/react-basics-0.114.0.tgz#b8e2d55759366a30be7a53546215c6d7e0898bca"
+  integrity sha512-zdGk0Om4yb0JZotYosbvYAFw1GwU22amFAm3iLTuZA5sL6ArH++8BDg7TFQFyaCk73jBWzYFuCiY3+xcJPxiHw==
   dependencies:
+    "@react-spring/web" "^9.7.3"
     classnames "^2.3.1"
     date-fns "^2.29.3"
     react-hook-form "^7.34.2"
-    react-spring "^9.5.5"
     react-window "^1.8.6"
 
 react-beautiful-dnd@^13.1.0:
   version "13.1.1"
-  resolved "https://registry.npmjs.org/react-beautiful-dnd/-/react-beautiful-dnd-13.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/react-beautiful-dnd/-/react-beautiful-dnd-13.1.1.tgz#b0f3087a5840920abf8bb2325f1ffa46d8c4d0a2"
   integrity sha512-0Lvs4tq2VcrEjEgDXHjT98r+63drkKEgqyxdA7qD3mvKwga6a5SscbdLPO2IExotU1jW8L0Ksdl0Cj2AF67nPQ==
   dependencies:
     "@babel/runtime" "^7.9.2"
@@ -7583,53 +7509,53 @@ react-beautiful-dnd@^13.1.0:
 
 react-dom@^18.2.0:
   version "18.2.0"
-  resolved "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.2.0.tgz#22aaf38708db2674ed9ada224ca4aa708d821e3d"
   integrity sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==
   dependencies:
     loose-envify "^1.1.0"
     scheduler "^0.23.0"
 
 react-error-boundary@^4.0.4:
-  version "4.0.10"
-  resolved "https://registry.npmjs.org/react-error-boundary/-/react-error-boundary-4.0.10.tgz"
-  integrity sha512-pvVKdi77j2OoPHo+p3rorgE43OjDWiqFkaqkJz8sJKK6uf/u8xtzuaVfj5qJ2JnDLIgF1De3zY5AJDijp+LVPA==
+  version "4.0.11"
+  resolved "https://registry.yarnpkg.com/react-error-boundary/-/react-error-boundary-4.0.11.tgz#36bf44de7746714725a814630282fee83a7c9a1c"
+  integrity sha512-U13ul67aP5DOSPNSCWQ/eO0AQEYzEFkVljULQIjMV0KlffTAhxuDoBKdO0pb/JZ8mDhMKFZ9NZi0BmLGUiNphw==
   dependencies:
     "@babel/runtime" "^7.12.5"
 
 react-hook-form@^7.34.2:
-  version "7.45.0"
-  resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.45.0.tgz#df2bbc8cee598855a63ba446e0bb06f7c8120ccf"
-  integrity sha512-AbHeZ4ad+0dEIknSW9dBgIwcvRDfZ1O97sgj75WaMdOX0eg8TBiUf9wxzVkIjZbk76BBIE9lmFOzyD4PN80ZQg==
+  version "7.47.0"
+  resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.47.0.tgz#a42f07266bd297ddf1f914f08f4b5f9783262f31"
+  integrity sha512-F/TroLjTICipmHeFlMrLtNLceO2xr1jU3CyiNla5zdwsGUGu2UOxxR4UyJgLlhMwLW/Wzp4cpJ7CPfgJIeKdSg==
 
-react-intl@^5.24.7:
-  version "5.25.1"
-  resolved "https://registry.npmjs.org/react-intl/-/react-intl-5.25.1.tgz"
-  integrity sha512-pkjdQDvpJROoXLMltkP/5mZb0/XqrqLoPGKUCfbdkP8m6U9xbK40K51Wu+a4aQqTEvEK5lHBk0fWzUV72SJ3Hg==
+react-intl@^6.5.5:
+  version "6.5.5"
+  resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-6.5.5.tgz#d2de7bfd79718a7e3d8031e2599e94e0c8638377"
+  integrity sha512-cI5UKvBh4tc1zxLIziHBYGMX3dhYWDEFlvUDVN6NfT2i96zTXz/zH2AmM8+2waqgOhwkFUzd+7kK1G9q7fiC2g==
   dependencies:
-    "@formatjs/ecma402-abstract" "1.11.4"
-    "@formatjs/icu-messageformat-parser" "2.1.0"
-    "@formatjs/intl" "2.2.1"
-    "@formatjs/intl-displaynames" "5.4.3"
-    "@formatjs/intl-listformat" "6.5.3"
+    "@formatjs/ecma402-abstract" "1.18.0"
+    "@formatjs/icu-messageformat-parser" "2.7.3"
+    "@formatjs/intl" "2.9.9"
+    "@formatjs/intl-displaynames" "6.6.4"
+    "@formatjs/intl-listformat" "7.5.3"
     "@types/hoist-non-react-statics" "^3.3.1"
     "@types/react" "16 || 17 || 18"
     hoist-non-react-statics "^3.3.2"
-    intl-messageformat "9.13.0"
-    tslib "^2.1.0"
+    intl-messageformat "10.5.8"
+    tslib "^2.4.0"
 
 react-is@^16.13.1, react-is@^16.7.0:
   version "16.13.1"
-  resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
 react-is@^17.0.2:
   version "17.0.2"
-  resolved "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
   integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
 
 react-redux@^7.2.0:
   version "7.2.9"
-  resolved "https://registry.npmjs.org/react-redux/-/react-redux-7.2.9.tgz"
+  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.9.tgz#09488fbb9416a4efe3735b7235055442b042481d"
   integrity sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==
   dependencies:
     "@babel/runtime" "^7.15.4"
@@ -7641,7 +7567,7 @@ react-redux@^7.2.0:
 
 react-simple-maps@^2.3.0:
   version "2.3.0"
-  resolved "https://registry.npmjs.org/react-simple-maps/-/react-simple-maps-2.3.0.tgz"
+  resolved "https://registry.yarnpkg.com/react-simple-maps/-/react-simple-maps-2.3.0.tgz#7fdb55120335a9b1ef5bf62e0dcb669511705f3e"
   integrity sha512-IZVeiPSRZKwD6I/2NvXpQ2uENYGDGZp8DvZjkapcxuJ/LQHTfl+Byb+KNgY7s+iatRA2ad8LnZ3AgqcjziCCsw==
   dependencies:
     d3-geo "^2.0.1"
@@ -7649,40 +7575,16 @@ react-simple-maps@^2.3.0:
     d3-zoom "^2.0.0"
     topojson-client "^3.1.0"
 
-react-spring@^9.4.4:
-  version "9.7.2"
-  resolved "https://registry.yarnpkg.com/react-spring/-/react-spring-9.7.2.tgz#218360d0ca53d04d8faac984f0d8683819b967b4"
-  integrity sha512-cckALtj79yiaJiAOUNAhtZbdqjvv1bdn/FpobgkckIChc8l6vu0E53WQ+zWru60gINI3JT+oRJSIn2hUVlOvlQ==
-  dependencies:
-    "@react-spring/core" "~9.7.3"
-    "@react-spring/konva" "~9.7.3"
-    "@react-spring/native" "~9.7.3"
-    "@react-spring/three" "~9.7.3"
-    "@react-spring/web" "~9.7.3"
-    "@react-spring/zdog" "~9.7.3"
-
-react-spring@^9.5.5:
-  version "9.7.1"
-  resolved "https://registry.yarnpkg.com/react-spring/-/react-spring-9.7.1.tgz#8acfed700823490a4d9d4cf131c5fea12d1aaa93"
-  integrity sha512-o2+r2DNQDVEuefiz33ZF76DPd/gLq3kbdObJmllGF2IUfv2W6x+ZP0gR97QYCSR4QLbmOl1mPKUBbI+FJdys2Q==
-  dependencies:
-    "@react-spring/core" "~9.7.1"
-    "@react-spring/konva" "~9.7.1"
-    "@react-spring/native" "~9.7.1"
-    "@react-spring/three" "~9.7.1"
-    "@react-spring/web" "~9.7.1"
-    "@react-spring/zdog" "~9.7.1"
-
 react-use-measure@^2.0.4:
   version "2.1.1"
-  resolved "https://registry.npmjs.org/react-use-measure/-/react-use-measure-2.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/react-use-measure/-/react-use-measure-2.1.1.tgz#5824537f4ee01c9469c45d5f7a8446177c6cc4ba"
   integrity sha512-nocZhN26cproIiIduswYpV5y5lQpSQS1y/4KuvUCjSKmw7ZWIS/+g3aFnX3WdBkyuGUtTLif3UTqnLLhbDoQig==
   dependencies:
     debounce "^1.2.1"
 
 react-window@^1.8.6:
   version "1.8.9"
-  resolved "https://registry.npmjs.org/react-window/-/react-window-1.8.9.tgz"
+  resolved "https://registry.yarnpkg.com/react-window/-/react-window-1.8.9.tgz#24bc346be73d0468cdf91998aac94e32bc7fa6a8"
   integrity sha512-+Eqx/fj1Aa5WnhRfj9dJg4VYATGwIUP2ItwItiJ6zboKWA6EX3lYDAXfGF2hyNqplEprhbtjbipiADEcwQ823Q==
   dependencies:
     "@babel/runtime" "^7.0.0"
@@ -7690,14 +7592,14 @@ react-window@^1.8.6:
 
 react@^18.2.0:
   version "18.2.0"
-  resolved "https://registry.npmjs.org/react/-/react-18.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5"
   integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==
   dependencies:
     loose-envify "^1.1.0"
 
 read-babelrc-up@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/read-babelrc-up/-/read-babelrc-up-1.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/read-babelrc-up/-/read-babelrc-up-1.1.0.tgz#10fd5baaf6ca03eaba6748fa65ddae25bca61e70"
   integrity sha512-fcl0JeI85Ss3//kfC3z2rsG2VxSiHl1bJgpjQWrne2YuQEewZpAgAjb17A6q/Q3ozWeZsUSroiIBVsnjmOU8vw==
   dependencies:
     find-up "^4.1.0"
@@ -7705,14 +7607,14 @@ read-babelrc-up@^1.1.0:
 
 read-cache@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz"
-  integrity sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=
+  resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
+  integrity sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==
   dependencies:
     pify "^2.3.0"
 
 read-pkg-up@^7.0.1:
   version "7.0.1"
-  resolved "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507"
   integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==
   dependencies:
     find-up "^4.1.0"
@@ -7730,8 +7632,8 @@ read-pkg-up@^8.0.0:
 
 read-pkg@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz"
-  integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
+  integrity sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==
   dependencies:
     load-json-file "^4.0.0"
     normalize-package-data "^2.3.2"
@@ -7739,7 +7641,7 @@ read-pkg@^3.0.0:
 
 read-pkg@^5.2.0:
   version "5.2.0"
-  resolved "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
   integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==
   dependencies:
     "@types/normalize-package-data" "^2.4.0"
@@ -7775,7 +7677,7 @@ readdirp@~3.6.0:
 
 redent@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f"
   integrity sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==
   dependencies:
     indent-string "^4.0.0"
@@ -7802,52 +7704,64 @@ redis-parser@^3.0.0:
     redis-errors "^1.0.0"
 
 redis@^4.5.1:
-  version "4.5.1"
-  resolved "https://registry.npmjs.org/redis/-/redis-4.5.1.tgz"
-  integrity sha512-oxXSoIqMJCQVBTfxP6BNTCtDMyh9G6Vi5wjdPdV/sRKkufyZslDqCScSGcOr6XGR/reAWZefz7E4leM31RgdBA==
+  version "4.6.10"
+  resolved "https://registry.yarnpkg.com/redis/-/redis-4.6.10.tgz#07f6ea2b2c5455b098e76d1e8c9b3376114e9458"
+  integrity sha512-mmbyhuKgDiJ5TWUhiKhBssz+mjsuSI/lSZNPI9QvZOYzWvYGejtb+W3RlDDf8LD6Bdl5/mZeG8O1feUGhXTxEg==
   dependencies:
-    "@redis/bloom" "1.1.0"
-    "@redis/client" "1.4.2"
+    "@redis/bloom" "1.2.0"
+    "@redis/client" "1.5.11"
     "@redis/graph" "1.1.0"
-    "@redis/json" "1.0.4"
-    "@redis/search" "1.1.0"
-    "@redis/time-series" "1.0.4"
+    "@redis/json" "1.0.6"
+    "@redis/search" "1.1.5"
+    "@redis/time-series" "1.0.5"
 
 redux@^4.0.0, redux@^4.0.4:
-  version "4.2.0"
-  resolved "https://registry.npmjs.org/redux/-/redux-4.2.0.tgz"
-  integrity sha512-oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA==
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.1.tgz#c08f4306826c49b5e9dc901dee0452ea8fce6197"
+  integrity sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==
   dependencies:
     "@babel/runtime" "^7.9.2"
 
+reflect.getprototypeof@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.4.tgz#aaccbf41aca3821b87bb71d9dcbc7ad0ba50a3f3"
+  integrity sha512-ECkTw8TmJwW60lOTR+ZkODISW6RQ8+2CL3COqtiJKLd6MmB45hN51HprHFziKLGkAuTGQhBb91V8cy+KHlaCjw==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    get-intrinsic "^1.2.1"
+    globalthis "^1.0.3"
+    which-builtin-type "^1.1.3"
+
 regenerate-unicode-properties@^10.1.0:
-  version "10.1.0"
-  resolved "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz"
-  integrity sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz#6b0e05489d9076b04c436f318d9b067bba459480"
+  integrity sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==
   dependencies:
     regenerate "^1.4.2"
 
 regenerate-unicode-properties@^8.0.2:
   version "8.2.0"
-  resolved "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec"
   integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==
   dependencies:
     regenerate "^1.4.0"
 
 regenerate@^1.4.0, regenerate@^1.4.2:
   version "1.4.2"
-  resolved "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz"
+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
   integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
-regenerator-runtime@^0.13.10, regenerator-runtime@^0.13.11:
-  version "0.13.11"
-  resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz"
-  integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
+regenerator-runtime@^0.14.0:
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz#5e19d68eb12d486f797e15a3c6a918f7cec5eb45"
+  integrity sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==
 
-regenerator-transform@^0.15.1:
-  version "0.15.1"
-  resolved "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.1.tgz"
-  integrity sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==
+regenerator-transform@^0.15.2:
+  version "0.15.2"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.2.tgz#5bbae58b522098ebdf09bca2f83838929001c7a4"
+  integrity sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==
   dependencies:
     "@babel/runtime" "^7.8.4"
 
@@ -7856,18 +7770,18 @@ regexp-tree@^0.1.24:
   resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.27.tgz#2198f0ef54518ffa743fe74d983b56ffd631b6cd"
   integrity sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA==
 
-regexp.prototype.flags@^1.4.3, regexp.prototype.flags@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz#fe7ce25e7e4cca8db37b6634c8a2c7009199b9cb"
-  integrity sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==
+regexp.prototype.flags@^1.5.0, regexp.prototype.flags@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz#90ce989138db209f81492edd734183ce99f9677e"
+  integrity sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.2.0"
-    functions-have-names "^1.2.3"
+    set-function-name "^2.0.0"
 
 regexpu-core@4.5.4:
   version "4.5.4"
-  resolved "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.5.4.tgz"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.5.4.tgz#080d9d02289aa87fe1667a4f5136bc98a6aebaae"
   integrity sha512-BtizvGtFQKGPUcTy56o3nk1bGRp4SZOTYrDtGNlqCQufptV5IkkLN6Emw+yunAJjzf+C9FQFtvq7IoA3+oMYHQ==
   dependencies:
     regenerate "^1.4.0"
@@ -7877,21 +7791,9 @@ regexpu-core@4.5.4:
     unicode-match-property-ecmascript "^1.0.4"
     unicode-match-property-value-ecmascript "^1.1.0"
 
-regexpu-core@^5.1.0:
-  version "5.2.1"
-  resolved "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.1.tgz"
-  integrity sha512-HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ==
-  dependencies:
-    regenerate "^1.4.2"
-    regenerate-unicode-properties "^10.1.0"
-    regjsgen "^0.7.1"
-    regjsparser "^0.9.1"
-    unicode-match-property-ecmascript "^2.0.0"
-    unicode-match-property-value-ecmascript "^2.0.0"
-
 regexpu-core@^5.3.1:
   version "5.3.2"
-  resolved "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.3.2.tgz#11a2b06884f3527aec3e93dbbf4a3b958a95546b"
   integrity sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==
   dependencies:
     "@babel/regjsgen" "^0.8.0"
@@ -7903,59 +7805,28 @@ regexpu-core@^5.3.1:
 
 regjsgen@^0.5.0:
   version "0.5.2"
-  resolved "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733"
   integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==
 
-regjsgen@^0.7.1:
-  version "0.7.1"
-  resolved "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz"
-  integrity sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA==
-
 regjsparser@^0.6.0:
   version "0.6.9"
-  resolved "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.9.tgz"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.9.tgz#b489eef7c9a2ce43727627011429cf833a7183e6"
   integrity sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==
   dependencies:
     jsesc "~0.5.0"
 
 regjsparser@^0.9.1:
   version "0.9.1"
-  resolved "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709"
   integrity sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==
   dependencies:
     jsesc "~0.5.0"
 
 request-ip@^3.3.0:
   version "3.3.0"
-  resolved "https://registry.npmjs.org/request-ip/-/request-ip-3.3.0.tgz"
+  resolved "https://registry.yarnpkg.com/request-ip/-/request-ip-3.3.0.tgz#863451e8fec03847d44f223e30a5d63e369fa611"
   integrity sha512-cA6Xh6e0fDBBBwH77SLJaJPBmD3nWVAcF9/XAcsrIHdjhFzFiB5aNQFytdjCGPezU3ROwrR11IddKAM08vohxA==
 
-request@2.88.0:
-  version "2.88.0"
-  resolved "https://registry.npmjs.org/request/-/request-2.88.0.tgz"
-  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.8.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    har-validator "~5.1.0"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.19"
-    oauth-sign "~0.9.0"
-    performance-now "^2.1.0"
-    qs "~6.5.2"
-    safe-buffer "^5.1.2"
-    tough-cookie "~2.4.3"
-    tunnel-agent "^0.6.0"
-    uuid "^3.3.2"
-
 require-from-string@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
@@ -7971,37 +7842,28 @@ resolve-from@^5.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
   integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
 
-resolve@^1.1.7, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.22.0, resolve@^1.22.1:
-  version "1.22.2"
-  resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz"
-  integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==
+resolve@^1.1.7, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.22.0, resolve@^1.22.1, resolve@^1.22.4:
+  version "1.22.8"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
+  integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
   dependencies:
-    is-core-module "^2.11.0"
+    is-core-module "^2.13.0"
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
-resolve@^1.22.3:
-  version "1.22.3"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.3.tgz#4b4055349ffb962600972da1fdc33c46a4eb3283"
-  integrity sha512-P8ur/gp/AmbEzjr729bZnLjXK5Z+4P0zhIJgBgzqRih7hL7BOukHGtSTA3ACMY467GRFz3duQsi0bDZdR7DKdw==
+resolve@^2.0.0-next.4:
+  version "2.0.0-next.5"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.5.tgz#6b0ec3107e671e52b68cd068ef327173b90dc03c"
+  integrity sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==
   dependencies:
-    is-core-module "^2.12.0"
+    is-core-module "^2.13.0"
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
-resolve@^2.0.0-next.3:
-  version "2.0.0-next.4"
-  resolved "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz"
-  integrity sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==
-  dependencies:
-    is-core-module "^2.9.0"
-    path-parse "^1.0.7"
-    supports-preserve-symlinks-flag "^1.0.0"
-
-restore-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz"
-  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
+restore-cursor@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-4.0.0.tgz#519560a4318975096def6e609d44100edaa4ccb9"
+  integrity sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==
   dependencies:
     onetime "^5.1.0"
     signal-exit "^3.0.2"
@@ -8013,7 +7875,7 @@ reusify@^1.0.4:
 
 rfdc@^1.3.0:
   version "1.3.0"
-  resolved "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz"
+  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b"
   integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==
 
 rimraf@^3.0.0, rimraf@^3.0.2:
@@ -8023,25 +7885,36 @@ rimraf@^3.0.0, rimraf@^3.0.2:
   dependencies:
     glob "^7.1.3"
 
+rollup-plugin-copy@^3.4.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-copy/-/rollup-plugin-copy-3.5.0.tgz#7ffa2a7a8303e143876fa64fb5eed9022d304eeb"
+  integrity sha512-wI8D5dvYovRMx/YYKtUNt3Yxaw4ORC9xo6Gt9t22kveWz1enG9QrhVlagzwrxSC455xD1dHMKhIJkbsQ7d48BA==
+  dependencies:
+    "@types/fs-extra" "^8.0.1"
+    colorette "^1.1.0"
+    fs-extra "^8.1.0"
+    globby "10.0.1"
+    is-plain-object "^3.0.0"
+
 rollup-plugin-delete@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/rollup-plugin-delete/-/rollup-plugin-delete-2.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-delete/-/rollup-plugin-delete-2.0.0.tgz#262acf80660d48c3b167fb0baabd0c3ab985c153"
   integrity sha512-/VpLMtDy+8wwRlDANuYmDa9ss/knGsAgrDhM+tEwB1npHwNu4DYNmDfUL55csse/GHs9Q+SMT/rw9uiaZ3pnzA==
   dependencies:
     del "^5.1.0"
 
-rollup-plugin-dts@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.npmjs.org/rollup-plugin-dts/-/rollup-plugin-dts-5.3.0.tgz"
-  integrity sha512-8FXp0ZkyZj1iU5klkIJYLjIq/YZSwBoERu33QBDxm/1yw5UU4txrEtcmMkrq+ZiKu3Q4qvPCNqc3ovX6rjqzbQ==
+rollup-plugin-dts@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-dts/-/rollup-plugin-dts-5.3.1.tgz#c2841269a3a5cb986b7791b0328e6a178eba108f"
+  integrity sha512-gusMi+Z4gY/JaEQeXnB0RUdU82h1kF0WYzCWgVmV4p3hWXqelaKuCvcJawfeg+EKn2T1Ie+YWF2OiN1/L8bTVg==
   dependencies:
-    magic-string "^0.30.0"
+    magic-string "^0.30.2"
   optionalDependencies:
-    "@babel/code-frame" "^7.18.6"
+    "@babel/code-frame" "^7.22.5"
 
 rollup-plugin-esbuild@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.npmjs.org/rollup-plugin-esbuild/-/rollup-plugin-esbuild-5.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-esbuild/-/rollup-plugin-esbuild-5.0.0.tgz#6cce358f4abe164d65a0028e900b8501a15f72ef"
   integrity sha512-1cRIOHAPh8WQgdQQyyvFdeOdxuiyk+zB5zJ5+YOwrZP4cJ0MT3Fs48pQxrZeyZHcn+klFherytILVfE4aYrneg==
   dependencies:
     "@rollup/pluginutils" "^5.0.1"
@@ -8050,14 +7923,14 @@ rollup-plugin-esbuild@^5.0.0:
     joycon "^3.1.1"
     jsonc-parser "^3.2.0"
 
-rollup-plugin-node-externals@^5.1.2:
-  version "5.1.3"
-  resolved "https://registry.npmjs.org/rollup-plugin-node-externals/-/rollup-plugin-node-externals-5.1.3.tgz"
-  integrity sha512-Q3VMjsn39r0/mjKrX++rFlC7kwL7YZdScdyU7BEo+PrEremal3mnol/1X+wQUU++7NeqC1ZNAeRYnHGtsTu9GQ==
+rollup-plugin-node-externals@^6.1.1:
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-node-externals/-/rollup-plugin-node-externals-6.1.2.tgz#c328b86a00f3e0211a3bad2e0616e2ff1fa55b6c"
+  integrity sha512-2TWan0u0/zHcgPrKpIPgKSY8OMqwDAYD380I0hxx7iUQw8mrN34DWwG9sQUMEo5Yy4xd6/5QEAySYgiKN9fdBQ==
 
 rollup-plugin-postcss@^4.0.2:
   version "4.0.2"
-  resolved "https://registry.npmjs.org/rollup-plugin-postcss/-/rollup-plugin-postcss-4.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-postcss/-/rollup-plugin-postcss-4.0.2.tgz#15e9462f39475059b368ce0e49c800fa4b1f7050"
   integrity sha512-05EaY6zvZdmvPUDi3uCcAQoESDcYnv8ogJJQRp6V5kZ6J6P7uAVJlrTZcaaA20wTH527YTnKfkAoPxWI/jPp4w==
   dependencies:
     chalk "^4.1.0"
@@ -8076,7 +7949,7 @@ rollup-plugin-postcss@^4.0.2:
 
 rollup-plugin-terser@^7.0.2:
   version "7.0.2"
-  resolved "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz#e8fbba4869981b2dc35ae7e8a502d5c6c04d324d"
   integrity sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==
   dependencies:
     "@babel/code-frame" "^7.10.4"
@@ -8086,21 +7959,21 @@ rollup-plugin-terser@^7.0.2:
 
 rollup-pluginutils@^2.8.2:
   version "2.8.2"
-  resolved "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz"
+  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e"
   integrity sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==
   dependencies:
     estree-walker "^0.6.1"
 
-rollup@^2.70.1:
-  version "2.79.1"
-  resolved "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz"
-  integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==
+rollup@^3.28.0:
+  version "3.29.4"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.29.4.tgz#4d70c0f9834146df8705bfb69a9a19c9e1109981"
+  integrity sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==
   optionalDependencies:
     fsevents "~2.3.2"
 
 rtlcss@4.1.0:
   version "4.1.0"
-  resolved "https://registry.npmjs.org/rtlcss/-/rtlcss-4.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/rtlcss/-/rtlcss-4.1.0.tgz#f69b78d9752c970ddfe2aa590896f44353ab1c98"
   integrity sha512-W+N4hh0nVqVrrn3mRkHakxpB+c9cQ4CRT67O39kgA+1DjyhrdsqyCqIuHXyvWaXn4/835n+oX3fYJCi4+G/06A==
   dependencies:
     escalade "^3.1.1"
@@ -8115,31 +7988,24 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
-rxjs@^7.5.1:
-  version "7.5.5"
-  resolved "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz"
-  integrity sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==
-  dependencies:
-    tslib "^2.1.0"
-
-safe-array-concat@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.0.0.tgz#2064223cba3c08d2ee05148eedbc563cd6d84060"
-  integrity sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==
+safe-array-concat@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.0.1.tgz#91686a63ce3adbea14d61b14c99572a8ff84754c"
+  integrity sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==
   dependencies:
     call-bind "^1.0.2"
-    get-intrinsic "^1.2.0"
+    get-intrinsic "^1.2.1"
     has-symbols "^1.0.3"
     isarray "^2.0.5"
 
-safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
+safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0:
   version "5.2.1"
-  resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
 safe-identifier@^0.4.2:
   version "0.4.2"
-  resolved "https://registry.npmjs.org/safe-identifier/-/safe-identifier-0.4.2.tgz"
+  resolved "https://registry.yarnpkg.com/safe-identifier/-/safe-identifier-0.4.2.tgz#cf6bfca31c2897c588092d1750d30ef501d59fcb"
   integrity sha512-6pNbSMW6OhAi9j+N8V+U715yBQsaWJ7eyEUaOrawX+isg5ZxhUlV1NipNtgaKHmFGiABwt+ZF04Ii+3Xjkg+8w==
 
 safe-regex-test@^1.0.0:
@@ -8151,82 +8017,79 @@ safe-regex-test@^1.0.0:
     get-intrinsic "^1.1.3"
     is-regex "^1.1.4"
 
-safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
-  version "2.1.2"
-  resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"
-  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
-
 scheduler@^0.23.0:
   version "0.23.0"
-  resolved "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.0.tgz#ba8041afc3d30eb206a487b6b384002e4e61fdfe"
   integrity sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==
   dependencies:
     loose-envify "^1.1.0"
 
 schema-utils@*:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz"
-  integrity sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.2.0.tgz#70d7c93e153a273a805801882ebd3bff20d89c8b"
+  integrity sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==
   dependencies:
     "@types/json-schema" "^7.0.9"
-    ajv "^8.8.0"
+    ajv "^8.9.0"
     ajv-formats "^2.1.1"
-    ajv-keywords "^5.0.0"
+    ajv-keywords "^5.1.0"
 
 schema-utils@^2.6.6:
   version "2.7.1"
-  resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"
   integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==
   dependencies:
     "@types/json-schema" "^7.0.5"
     ajv "^6.12.4"
     ajv-keywords "^3.5.2"
 
-semver-compare@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz"
-  integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=
-
 "semver@2 || 3 || 4 || 5", semver@^5.5.0:
-  version "5.7.1"
-  resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+  version "5.7.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
+  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
-semver@^6.0.0, semver@^6.1.1, semver@^6.1.2:
-  version "6.3.0"
-  resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
-
-semver@^6.3.0, semver@^6.3.1:
+semver@^6.0.0, semver@^6.3.0, semver@^6.3.1:
   version "6.3.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.5.2, semver@^7.5.4:
+semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.5.4:
   version "7.5.4"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
   integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
   dependencies:
     lru-cache "^6.0.0"
 
-semver@^7.3.8:
-  version "7.5.2"
-  resolved "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz"
-  integrity sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==
-  dependencies:
-    lru-cache "^6.0.0"
-
 serialize-javascript@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
   integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==
   dependencies:
     randombytes "^2.1.0"
 
-sharp@^0.32.1:
-  version "0.32.4"
-  resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.32.4.tgz#0354653b7924f2520b2264ac9bcd10a58bf411b6"
-  integrity sha512-exUnZewqVZC6UXqXuQ8fyJJv0M968feBi04jb9GcUHrWtkRoAKnbJt8IfwT4NJs7FskArbJ14JAFGVuooszoGg==
+set-function-length@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.1.1.tgz#4bc39fafb0307224a33e106a7d35ca1218d659ed"
+  integrity sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==
+  dependencies:
+    define-data-property "^1.1.1"
+    get-intrinsic "^1.2.1"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.0"
+
+set-function-name@^2.0.0, set-function-name@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.1.tgz#12ce38b7954310b9f61faa12701620a0c882793a"
+  integrity sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==
+  dependencies:
+    define-data-property "^1.0.1"
+    functions-have-names "^1.2.3"
+    has-property-descriptors "^1.0.0"
+
+sharp@^0.32.6:
+  version "0.32.6"
+  resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.32.6.tgz#6ad30c0b7cd910df65d5f355f774aa4fce45732a"
+  integrity sha512-KyLTWwgcR9Oe4d9HwCwNM2l7+J0dUQwn/yf7S0EnTtb0eVS4RxO0eUSvxPtzT4F3SY+C4K6fqdv/DO27sJ/v/w==
   dependencies:
     color "^4.2.3"
     detect-libc "^2.0.2"
@@ -8239,7 +8102,7 @@ sharp@^0.32.1:
 
 shebang-command@^1.2.0:
   version "1.2.0"
-  resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
   integrity sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==
   dependencies:
     shebang-regex "^1.0.0"
@@ -8253,7 +8116,7 @@ shebang-command@^2.0.0:
 
 shebang-regex@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
   integrity sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==
 
 shebang-regex@^3.0.0:
@@ -8262,9 +8125,9 @@ shebang-regex@^3.0.0:
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
 shell-quote@^1.6.1:
-  version "1.7.3"
-  resolved "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.3.tgz"
-  integrity sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680"
+  integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==
 
 side-channel@^1.0.4:
   version "1.0.4"
@@ -8275,15 +8138,15 @@ side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
-signal-exit@^3.0.2, signal-exit@^3.0.3:
+signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
   version "3.0.7"
-  resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
 signal-exit@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.0.2.tgz#ff55bb1d9ff2114c13b400688fa544ac63c36967"
-  integrity sha512-MY2/qGx4enyjprQnFaZsHib3Yadh3IXyV2C321GY0pjGfVBu4un0uDJkwgdxqO+Rdx8JMT8IfJIRwbYVz3Ob3Q==
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
+  integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
 
 simple-concat@^1.0.0:
   version "1.0.1"
@@ -8308,7 +8171,7 @@ simple-swizzle@^0.2.2:
 
 sisteransi@^1.0.5:
   version "1.0.5"
-  resolved "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz"
+  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
   integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==
 
 slash@^3.0.0:
@@ -8318,18 +8181,9 @@ slash@^3.0.0:
 
 slash@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7"
   integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==
 
-slice-ansi@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz"
-  integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==
-  dependencies:
-    ansi-styles "^4.0.0"
-    astral-regex "^2.0.0"
-    is-fullwidth-code-point "^3.0.0"
-
 slice-ansi@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
@@ -8339,9 +8193,25 @@ slice-ansi@^4.0.0:
     astral-regex "^2.0.0"
     is-fullwidth-code-point "^3.0.0"
 
+slice-ansi@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-5.0.0.tgz#b73063c57aa96f9cd881654b15294d95d285c42a"
+  integrity sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==
+  dependencies:
+    ansi-styles "^6.0.0"
+    is-fullwidth-code-point "^4.0.0"
+
+snake-case@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-3.0.4.tgz#4f2bbd568e9935abdfd593f34c691dadb49c452c"
+  integrity sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==
+  dependencies:
+    dot-case "^3.0.4"
+    tslib "^2.0.3"
+
 sort-keys@^4.0.0:
   version "4.2.0"
-  resolved "https://registry.npmjs.org/sort-keys/-/sort-keys-4.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-4.2.0.tgz#6b7638cee42c506fff8c1cecde7376d21315be18"
   integrity sha512-aUYIEU/UviqPgc8mHR6IW1EGxkAXpeRETYcrzg8cLAvUPZcpAlleSXHV2mY7G12GphSH6Gzv+4MMVSSkbdteHg==
   dependencies:
     is-plain-obj "^2.0.0"
@@ -8353,7 +8223,7 @@ source-map-js@^1.0.1, source-map-js@^1.0.2:
 
 source-map-support@~0.5.20:
   version "0.5.21"
-  resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
   integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
   dependencies:
     buffer-from "^1.0.0"
@@ -8361,12 +8231,12 @@ source-map-support@~0.5.20:
 
 source-map@^0.6.0, source-map@^0.6.1:
   version "0.6.1"
-  resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
 sourcemap-codec@^1.4.8:
   version "1.4.8"
-  resolved "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz"
+  resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
   integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
 
 spdx-correct@^3.0.0:
@@ -8391,33 +8261,18 @@ spdx-expression-parse@^3.0.0:
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.13"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz#7189a474c46f8d47c7b0da4b987bb45e908bd2d5"
-  integrity sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==
+  version "3.0.16"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz#a14f64e0954f6e25cc6587bd4f392522db0d998f"
+  integrity sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw==
 
 sprintf-js@~1.0.2:
   version "1.0.3"
-  resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
-
-sshpk@^1.7.0:
-  version "1.17.0"
-  resolved "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz"
-  integrity sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==
-  dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    bcrypt-pbkdf "^1.0.0"
-    dashdash "^1.12.0"
-    ecc-jsbn "~0.1.1"
-    getpass "^0.1.1"
-    jsbn "~0.1.0"
-    safer-buffer "^2.0.2"
-    tweetnacl "~0.14.0"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
 stable@^0.1.8:
   version "0.1.8"
-  resolved "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz"
+  resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
   integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==
 
 standard-as-callback@^2.1.0:
@@ -8425,10 +8280,10 @@ standard-as-callback@^2.1.0:
   resolved "https://registry.yarnpkg.com/standard-as-callback/-/standard-as-callback-2.1.0.tgz#8953fc05359868a77b5b9739a665c5977bb7df45"
   integrity sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==
 
-stream2asynciter@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.npmjs.org/stream2asynciter/-/stream2asynciter-1.0.3.tgz"
-  integrity sha512-9/dEZW+LQjuW6ub5hmWi4n9Pn8W8qA8k7NAE1isecesA164e73xTdy1CJ3S9o9YS+O21HuiK7T+4uS7FgKDy4w==
+std-env@^3.4.3:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.4.3.tgz#326f11db518db751c83fd58574f449b7c3060910"
+  integrity sha512-f9aPhy8fYBuMN+sNfakZV18U39PbalgjXG3lLB9WkaYTxijru61wb57V9wxxNthXM5Sd88ETBWi29qLAsHO52Q==
 
 streamsearch@^1.1.0:
   version "1.1.0"
@@ -8436,81 +8291,91 @@ streamsearch@^1.1.0:
   integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==
 
 streamx@^2.15.0:
-  version "2.15.0"
-  resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.15.0.tgz#f58c92e6f726b5390dcabd6dd9094d29a854d698"
-  integrity sha512-HcxY6ncGjjklGs1xsP1aR71INYcsXFJet5CU1CHqihQ2J5nOsbd4OjgjHO42w/4QNv9gZb3BueV+Vxok5pLEXg==
+  version "2.15.1"
+  resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.15.1.tgz#396ad286d8bc3eeef8f5cea3f029e81237c024c6"
+  integrity sha512-fQMzy2O/Q47rgwErk/eGeLu/roaFWV0jVsogDmrszM9uIw8L5OA+t+V93MgYlufNptfjmYR1tOMWhei/Eh7TQA==
   dependencies:
     fast-fifo "^1.1.0"
     queue-tick "^1.0.1"
 
-string-argv@0.3.1:
-  version "0.3.1"
-  resolved "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz"
-  integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==
+string-argv@0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.2.tgz#2b6d0ef24b656274d957d54e0a4bbf6153dc02b6"
+  integrity sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==
 
 string-hash@^1.1.1:
   version "1.1.3"
-  resolved "https://registry.npmjs.org/string-hash/-/string-hash-1.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/string-hash/-/string-hash-1.1.3.tgz#e8aafc0ac1855b4666929ed7dd1275df5d6c811b"
   integrity sha512-kJUvRUFK49aub+a7T1nNE66EJbZBMnBgoC1UbCZ5n6bsZKBRga4KgBRTMn/pFkeCZSYtNeSyMxPDM0AXWELk2A==
 
-string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+string-width@^4.2.3:
   version "4.2.3"
-  resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
   dependencies:
     emoji-regex "^8.0.0"
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
+string-width@^5.0.0, string-width@^5.0.1:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
+  integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
+  dependencies:
+    eastasianwidth "^0.2.0"
+    emoji-regex "^9.2.2"
+    strip-ansi "^7.0.1"
+
 string.prototype.matchall@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz"
-  integrity sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==
+  version "4.0.10"
+  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.10.tgz#a1553eb532221d4180c51581d6072cd65d1ee100"
+  integrity sha512-rGXbGmOEosIQi6Qva94HUjgPs9vKW+dkG7Y8Q5O2OYkWL6wFaTRZO8zM4mhP94uX55wgyrXzfS2aGtGzUL7EJQ==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
-    get-intrinsic "^1.1.3"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    get-intrinsic "^1.2.1"
     has-symbols "^1.0.3"
-    internal-slot "^1.0.3"
-    regexp.prototype.flags "^1.4.3"
+    internal-slot "^1.0.5"
+    regexp.prototype.flags "^1.5.0"
+    set-function-name "^2.0.0"
     side-channel "^1.0.4"
 
 string.prototype.padend@^3.0.0:
-  version "3.1.3"
-  resolved "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.3.tgz"
-  integrity sha512-jNIIeokznm8SD/TZISQsZKYu7RJyheFNt84DUPrh482GC8RVp2MKqm2O5oBRdGxbDQoXrhhWtPIWQOiy20svUg==
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.1.5.tgz#311ef3a4e3c557dd999cdf88fbdde223f2ac0f95"
+  integrity sha512-DOB27b/2UTTD+4myKUFh+/fXWcu/UDyASIXfg+7VzoCNNGOfWvoyU/x5pvVHr++ztyt/oSYI1BcWBBG/hmlNjA==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
 
-string.prototype.trim@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz#a68352740859f6893f14ce3ef1bb3037f7a90533"
-  integrity sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==
+string.prototype.trim@^1.2.8:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz#f9ac6f8af4bd55ddfa8895e6aea92a96395393bd"
+  integrity sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
 
-string.prototype.trimend@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533"
-  integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==
+string.prototype.trimend@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz#1bb3afc5008661d73e2dc015cd4853732d6c471e"
+  integrity sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
 
-string.prototype.trimstart@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz#e90ab66aa8e4007d92ef591bbf3cd422c56bdcf4"
-  integrity sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==
+string.prototype.trimstart@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz#d4cdb44b83a4737ffbac2d406e405d43d0184298"
+  integrity sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
 
 string_decoder@^1.1.1:
   version "1.3.0"
@@ -8519,22 +8384,20 @@ string_decoder@^1.1.1:
   dependencies:
     safe-buffer "~5.2.0"
 
-stringify-object@3.3.0:
-  version "3.3.0"
-  resolved "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz"
-  integrity sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==
-  dependencies:
-    get-own-enumerable-property-symbols "^3.0.0"
-    is-obj "^1.0.1"
-    is-regexp "^1.0.0"
-
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+strip-ansi@^6.0.1:
   version "6.0.1"
-  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
   dependencies:
     ansi-regex "^5.0.1"
 
+strip-ansi@^7.0.1:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
+  integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==
+  dependencies:
+    ansi-regex "^6.0.1"
+
 strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
@@ -8542,7 +8405,7 @@ strip-bom@^3.0.0:
 
 strip-bom@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
   integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==
 
 strip-final-newline@^2.0.0:
@@ -8550,9 +8413,14 @@ strip-final-newline@^2.0.0:
   resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
   integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
+strip-final-newline@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-3.0.0.tgz#52894c313fbff318835280aed60ff71ebf12b8fd"
+  integrity sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==
+
 strip-indent@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001"
   integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==
   dependencies:
     min-indent "^1.0.0"
@@ -8576,7 +8444,7 @@ strip-json-comments@~2.0.1:
 
 style-inject@^0.3.0:
   version "0.3.0"
-  resolved "https://registry.npmjs.org/style-inject/-/style-inject-0.3.0.tgz"
+  resolved "https://registry.yarnpkg.com/style-inject/-/style-inject-0.3.0.tgz#d21c477affec91811cc82355832a700d22bf8dd3"
   integrity sha512-IezA2qp+vcdlhJaVm5SOdPPTUu0FCEqfNSli2vRuSIBbu5Nq5UvygTk/VzeCqfLz2Atj3dVII5QBKGZRZ0edzw==
 
 style-search@^0.1.0:
@@ -8586,14 +8454,14 @@ style-search@^0.1.0:
 
 styled-jsx@5.1.1:
   version "5.1.1"
-  resolved "https://registry.npmjs.org/styled-jsx/-/styled-jsx-5.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-5.1.1.tgz#839a1c3aaacc4e735fed0781b8619ea5d0009d1f"
   integrity sha512-pW7uC1l4mBZ8ugbiZrcIsiIvVx1UmTfw7UkC3Um2tmfUq9Bhk8IiyEIPl6F8agHgjzku6j0xQEZbfA5uSgSaCw==
   dependencies:
     client-only "0.0.1"
 
 stylehacks@^5.1.1:
   version "5.1.1"
-  resolved "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.1.1.tgz#7934a34eb59d7152149fa69d6e9e56f2fc34bcc9"
   integrity sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw==
   dependencies:
     browserslist "^4.21.4"
@@ -8608,42 +8476,43 @@ stylelint-config-css-modules@^4.1.0:
 
 stylelint-config-prettier@^9.0.3:
   version "9.0.5"
-  resolved "https://registry.npmjs.org/stylelint-config-prettier/-/stylelint-config-prettier-9.0.5.tgz"
+  resolved "https://registry.yarnpkg.com/stylelint-config-prettier/-/stylelint-config-prettier-9.0.5.tgz#9f78bbf31c7307ca2df2dd60f42c7014ee9da56e"
   integrity sha512-U44lELgLZhbAD/xy/vncZ2Pq8sh2TnpiPvo38Ifg9+zeioR+LAkHu0i6YORIOxFafZoVg0xqQwex6e6F25S5XA==
 
 stylelint-config-recommended@^9.0.0:
   version "9.0.0"
-  resolved "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-9.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-9.0.0.tgz#1c9e07536a8cd875405f8ecef7314916d94e7e40"
   integrity sha512-9YQSrJq4NvvRuTbzDsWX3rrFOzOlYBmZP+o513BJN/yfEmGSr0AxdvrWs0P/ilSpVV/wisamAHu5XSk8Rcf4CQ==
 
 "stylelint-scss@^5.0.0 || ^6.0.0":
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-5.0.1.tgz#b33a6580b5734eace083cfc2cc3021225e28547f"
-  integrity sha512-n87iCRZrr2J7//I/QFsDXxFLnHKw633U4qvWZ+mOW6KDAp/HLj06H+6+f9zOuTYy+MdGdTuCSDROCpQIhw5fvQ==
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-5.2.1.tgz#810299e4141fa38852bd14536a90e4942c8f387f"
+  integrity sha512-ZoTJUM85/qqpQHfEppjW/St//8s6p9Qsg8deWlYlr56F9iUgC9vXeIDQvH4odkRRJLTLFQzYMALSOFCQ3MDkgw==
   dependencies:
+    known-css-properties "^0.28.0"
     postcss-media-query-parser "^0.2.3"
     postcss-resolve-nested-selector "^0.1.1"
     postcss-selector-parser "^6.0.13"
     postcss-value-parser "^4.2.0"
 
 stylelint@^15.10.1:
-  version "15.10.2"
-  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-15.10.2.tgz#0ee5a8371d3a2e1ff27fefd48309d3ddef7c3405"
-  integrity sha512-UxqSb3hB74g4DTO45QhUHkJMjKKU//lNUAOWyvPBVPZbCknJ5HjOWWZo+UDuhHa9FLeVdHBZXxu43eXkjyIPWg==
+  version "15.11.0"
+  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-15.11.0.tgz#3ff8466f5f5c47362bc7c8c9d382741c58bc3292"
+  integrity sha512-78O4c6IswZ9TzpcIiQJIN49K3qNoXTM8zEJzhaTE/xRTCZswaovSEVIa/uwbOltZrk16X4jAxjaOhzz/hTm1Kw==
   dependencies:
-    "@csstools/css-parser-algorithms" "^2.3.0"
-    "@csstools/css-tokenizer" "^2.1.1"
-    "@csstools/media-query-list-parser" "^2.1.2"
+    "@csstools/css-parser-algorithms" "^2.3.1"
+    "@csstools/css-tokenizer" "^2.2.0"
+    "@csstools/media-query-list-parser" "^2.1.4"
     "@csstools/selector-specificity" "^3.0.0"
     balanced-match "^2.0.0"
     colord "^2.9.3"
     cosmiconfig "^8.2.0"
-    css-functions-list "^3.2.0"
+    css-functions-list "^3.2.1"
     css-tree "^2.3.1"
     debug "^4.3.4"
-    fast-glob "^3.3.0"
+    fast-glob "^3.3.1"
     fastest-levenshtein "^1.0.16"
-    file-entry-cache "^6.0.1"
+    file-entry-cache "^7.0.0"
     global-modules "^2.0.0"
     globby "^11.1.0"
     globjoin "^0.1.4"
@@ -8652,13 +8521,13 @@ stylelint@^15.10.1:
     import-lazy "^4.0.0"
     imurmurhash "^0.1.4"
     is-plain-object "^5.0.0"
-    known-css-properties "^0.27.0"
+    known-css-properties "^0.29.0"
     mathml-tag-names "^2.1.3"
     meow "^10.1.5"
     micromatch "^4.0.5"
     normalize-path "^3.0.0"
     picocolors "^1.0.0"
-    postcss "^8.4.25"
+    postcss "^8.4.28"
     postcss-resolve-nested-selector "^0.1.1"
     postcss-safe-parser "^6.0.0"
     postcss-selector-parser "^6.0.13"
@@ -8672,13 +8541,6 @@ stylelint@^15.10.1:
     table "^6.8.1"
     write-file-atomic "^5.0.1"
 
-supports-color@8.1.1:
-  version "8.1.1"
-  resolved "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz"
-  integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
-  dependencies:
-    has-flag "^4.0.0"
-
 supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
@@ -8708,7 +8570,7 @@ supports-preserve-symlinks-flag@^1.0.0:
 
 svg-parser@^2.0.4:
   version "2.0.4"
-  resolved "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.4.tgz"
+  resolved "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.4.tgz#fdc2e29e13951736140b76cb122c8ee6630eb6b5"
   integrity sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ==
 
 svg-tags@^1.0.0:
@@ -8716,9 +8578,9 @@ svg-tags@^1.0.0:
   resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764"
   integrity sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==
 
-svgo@^2.7.0, svgo@^2.8.0:
+svgo@^2.7.0:
   version "2.8.0"
-  resolved "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz"
+  resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24"
   integrity sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==
   dependencies:
     "@trysound/sax" "0.2.0"
@@ -8731,7 +8593,7 @@ svgo@^2.7.0, svgo@^2.8.0:
 
 svgo@^3.0.2:
   version "3.0.2"
-  resolved "https://registry.npmjs.org/svgo/-/svgo-3.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/svgo/-/svgo-3.0.2.tgz#5e99eeea42c68ee0dc46aa16da093838c262fe0a"
   integrity sha512-Z706C1U2pb1+JGP48fbazf3KxHrWOsLme6Rv7imFBn5EnuanDW1GPaA/P1/dvObE670JDePC3mnj0k0B7P0jjQ==
   dependencies:
     "@trysound/sax" "0.2.0"
@@ -8792,9 +8654,9 @@ tar-stream@^3.1.5:
     streamx "^2.15.0"
 
 tar@^6.1.2:
-  version "6.1.15"
-  resolved "https://registry.npmjs.org/tar/-/tar-6.1.15.tgz"
-  integrity sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A==
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.0.tgz#b14ce49a79cb1cd23bc9b016302dea5474493f73"
+  integrity sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==
   dependencies:
     chownr "^2.0.0"
     fs-minipass "^2.0.0"
@@ -8804,9 +8666,9 @@ tar@^6.1.2:
     yallist "^4.0.0"
 
 terser@^5.0.0:
-  version "5.18.1"
-  resolved "https://registry.npmjs.org/terser/-/terser-5.18.1.tgz"
-  integrity sha512-j1n0Ao919h/Ai5r43VAnfV/7azUYW43GPxK7qSATzrsERfW7+y2QW9Cp9ufnRF5CQUWbnLSo7UJokSWCqg4tsQ==
+  version "5.22.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.22.0.tgz#4f18103f84c5c9437aafb7a14918273310a8a49d"
+  integrity sha512-hHZVLgRA2z4NWcN6aS5rQDc+7Dcy58HOf2zbYwmFcQ+ua3h6eEFf5lIDKTzbWwlazPyOZsFQO8V80/IjVNExEw==
   dependencies:
     "@jridgewell/source-map" "^0.3.3"
     acorn "^8.8.2"
@@ -8820,17 +8682,12 @@ text-table@^0.2.0:
 
 thenby@^1.3.4:
   version "1.3.4"
-  resolved "https://registry.npmjs.org/thenby/-/thenby-1.3.4.tgz"
+  resolved "https://registry.yarnpkg.com/thenby/-/thenby-1.3.4.tgz#81581f6e1bb324c6dedeae9bfc28e59b1a2201cc"
   integrity sha512-89Gi5raiWA3QZ4b2ePcEwswC3me9JIg+ToSgtE0JWeCynLnLxNr/f9G+xfo9K+Oj4AFdom8YNJjibIARTJmapQ==
 
-through@2.3.8, "through@>=2.2.7 <3", through@^2.3.8:
-  version "2.3.8"
-  resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
-  integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
-
 timezone-support@^2.0.2:
   version "2.2.0"
-  resolved "https://registry.npmjs.org/timezone-support/-/timezone-support-2.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/timezone-support/-/timezone-support-2.2.0.tgz#b3146cb99bf188a92b5348591202e8e3aa013135"
   integrity sha512-4TmVraC9vxQVLMGeV5OaC12QWbYMhzFWTyAcBO64UB53kbLRIuDdQlr/ZvmatdOv8z5pWw/uK0kZ1DBm4uoUhw==
   dependencies:
     commander "2.20.0"
@@ -8846,17 +8703,17 @@ tiny-glob@^0.2.9:
 
 tiny-invariant@^1.0.6:
   version "1.3.1"
-  resolved "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.1.tgz"
+  resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.1.tgz#8560808c916ef02ecfd55e66090df23a4b7aa642"
   integrity sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==
 
-tiny-lru@11.0.1:
-  version "11.0.1"
-  resolved "https://registry.npmjs.org/tiny-lru/-/tiny-lru-11.0.1.tgz"
-  integrity sha512-iNgFugVuQgBKrqeO/mpiTTgmBsTP0WL6yeuLfLs/Ctf0pI/ixGqIRm8sDCwMcXGe9WWvt2sGXI5mNqZbValmJg==
+tiny-lru@11.2.3:
+  version "11.2.3"
+  resolved "https://registry.yarnpkg.com/tiny-lru/-/tiny-lru-11.2.3.tgz#9dc04c9bd48b1e196e999e11eee71bc249466145"
+  integrity sha512-mF9jPTrvN7UHk0bekOk3RlFdFwfyS4CJYVsGc7nInL3pVgUCYj5r9X6GpZBFQgLr0TKJo8Dp+F3oRvYzxU9xiA==
 
 to-fast-properties@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
   integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==
 
 to-regex-range@^5.0.1:
@@ -8868,24 +8725,16 @@ to-regex-range@^5.0.1:
 
 topojson-client@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/topojson-client/-/topojson-client-3.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/topojson-client/-/topojson-client-3.1.0.tgz#22e8b1ed08a2b922feeb4af6f53b6ef09a467b99"
   integrity sha512-605uxS6bcYxGXw9qi62XyrV6Q3xwbndjachmNxu8HWTtVPxZfEJN9fd/SZS1Q54Sn2y0TMyMxFj/cJINqGHrKw==
   dependencies:
     commander "2"
 
 toposort@^2.0.2:
   version "2.0.2"
-  resolved "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330"
   integrity sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg==
 
-tough-cookie@~2.4.3:
-  version "2.4.3"
-  resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz"
-  integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
-  dependencies:
-    psl "^1.1.24"
-    punycode "^1.4.1"
-
 tr46@~0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
@@ -8893,7 +8742,7 @@ tr46@~0.0.3:
 
 trim-newlines@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
   integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==
 
 trim-newlines@^4.0.2:
@@ -8901,9 +8750,14 @@ trim-newlines@^4.0.2:
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-4.1.1.tgz#28c88deb50ed10c7ba6dc2474421904a00139125"
   integrity sha512-jRKj0n0jXWo6kh62nA5TEh3+4igKDXLvzBJcPpiizP7oOolUrYIxmVBG9TOtHYFHoddUk6YvAkGeGoSVTXfQXQ==
 
+ts-api-utils@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.0.3.tgz#f12c1c781d04427313dbac808f453f050e54a331"
+  integrity sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==
+
 ts-node@^10.9.1:
   version "10.9.1"
-  resolved "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b"
   integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==
   dependencies:
     "@cspotcode/source-map-support" "^0.8.0"
@@ -8932,18 +8786,13 @@ tsconfig-paths@^3.14.1, tsconfig-paths@^3.14.2:
 
 tslib@^1.8.1:
   version "1.14.1"
-  resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.0.1, tslib@^2.1.0:
-  version "2.4.0"
-  resolved "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz"
-  integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
-
-tslib@^2.4.0:
-  version "2.5.0"
-  resolved "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz"
-  integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==
+tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.4.0:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
+  integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
 
 tsutils@^3.21.0:
   version "3.21.0"
@@ -8952,11 +8801,6 @@ tsutils@^3.21.0:
   dependencies:
     tslib "^1.8.1"
 
-tsv@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.npmjs.org/tsv/-/tsv-0.2.0.tgz"
-  integrity sha512-GG6xbOP85giXXom0dS6z9uyDsxktznjpa1AuDlPrIXDqDnbhjr9Vk6Us8iz6U1nENL4CPS2jZDvIjEdaZsmc4Q==
-
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
@@ -8964,11 +8808,6 @@ tunnel-agent@^0.6.0:
   dependencies:
     safe-buffer "^5.0.1"
 
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-  version "0.14.5"
-  resolved "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"
-  integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==
-
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
@@ -8978,7 +8817,7 @@ type-check@^0.4.0, type-check@~0.4.0:
 
 type-fest@^0.13.1:
   version "0.13.1"
-  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934"
   integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==
 
 type-fest@^0.20.2:
@@ -8986,22 +8825,17 @@ type-fest@^0.20.2:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
   integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
 
-type-fest@^0.21.3:
-  version "0.21.3"
-  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz"
-  integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
-
 type-fest@^0.6.0:
   version "0.6.0"
-  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
   integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
 
 type-fest@^0.8.1:
   version "0.8.1"
-  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
   integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
 
-type-fest@^1.0.1, type-fest@^1.2.1, type-fest@^1.2.2:
+type-fest@^1.0.1, type-fest@^1.0.2, type-fest@^1.2.1, type-fest@^1.2.2:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1"
   integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==
@@ -9047,20 +8881,25 @@ typed-array-length@^1.0.4:
 
 typedarray-to-buffer@^3.1.5:
   version "3.1.5"
-  resolved "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"
+  resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
   integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==
   dependencies:
     is-typedarray "^1.0.0"
 
-typescript@^4.0, typescript@^4.5, typescript@^4.9.5:
+typescript@^4.0, typescript@^4.5:
   version "4.9.5"
-  resolved "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
   integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
 
-ufo@^1.0.0, ufo@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.1.2.tgz#d0d9e0fa09dece0c31ffd57bd363f030a35cfe76"
-  integrity sha512-TrY6DsjTQQgyS3E3dBaOXf0TpPD8u9FVrVYmKVegJuFw51n/YB9XPt+U6ydzFG5ZIN7+DIjPbNmXoBj9esYhgQ==
+typescript@^5.1.6:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78"
+  integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==
+
+ufo@^1.0.0, ufo@^1.2.0, ufo@^1.3.0, ufo@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.3.1.tgz#e085842f4627c41d4c1b60ebea1f75cdab4ce86b"
+  integrity sha512-uY/99gMLIOlJPwATcMVYfqDSxUR9//AUcgZMzwfSTJPDKzA1S8mX4VLqa+fiAtveraQUBCz4FFcwVZBGbwBXIw==
 
 unbox-primitive@^1.0.2:
   version "1.0.2"
@@ -9077,19 +8916,40 @@ uncrypto@^0.1.3:
   resolved "https://registry.yarnpkg.com/uncrypto/-/uncrypto-0.1.3.tgz#e1288d609226f2d02d8d69ee861fa20d8348ef2b"
   integrity sha512-Ql87qFHB3s/De2ClA9e0gsnS6zXG27SkTiSJwjCc9MebbfapQfuPzumMIUMi38ezPZVNFcHI9sUIepeQfw8J8Q==
 
+undici-types@~5.25.1:
+  version "5.25.3"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.25.3.tgz#e044115914c85f0bcbb229f346ab739f064998c3"
+  integrity sha512-Ga1jfYwRn7+cP9v8auvEXN1rX3sWqlayd4HP7OKk4mZWylEmu3KzXDUGrQUN6Ol7qo1gPvB2e5gX6udnyEPgdA==
+
+undici-types@~5.26.4:
+  version "5.26.5"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
+  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
+
+unenv@^1.7.4:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/unenv/-/unenv-1.7.4.tgz#a0e5a78de2c7c3c4563c06ba9763c96c59db3333"
+  integrity sha512-fjYsXYi30It0YCQYqLOcT6fHfMXsBr2hw9XC7ycf8rTG7Xxpe3ZssiqUnD0khrjiZEmkBXWLwm42yCSCH46fMw==
+  dependencies:
+    consola "^3.2.3"
+    defu "^6.1.2"
+    mime "^3.0.0"
+    node-fetch-native "^1.4.0"
+    pathe "^1.1.1"
+
 unicode-canonical-property-names-ecmascript@^1.0.4:
   version "1.0.4"
-  resolved "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz"
+  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
   integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==
 
 unicode-canonical-property-names-ecmascript@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
   integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==
 
 unicode-match-property-ecmascript@^1.0.4:
   version "1.0.4"
-  resolved "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c"
   integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==
   dependencies:
     unicode-canonical-property-names-ecmascript "^1.0.4"
@@ -9097,7 +8957,7 @@ unicode-match-property-ecmascript@^1.0.4:
 
 unicode-match-property-ecmascript@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3"
   integrity sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==
   dependencies:
     unicode-canonical-property-names-ecmascript "^2.0.0"
@@ -9105,59 +8965,73 @@ unicode-match-property-ecmascript@^2.0.0:
 
 unicode-match-property-value-ecmascript@^1.1.0:
   version "1.2.0"
-  resolved "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531"
   integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==
 
-unicode-match-property-value-ecmascript@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz"
-  integrity sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==
-
 unicode-match-property-value-ecmascript@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz#cb5fffdcd16a05124f5a4b0bf7c3770208acbbe0"
   integrity sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==
 
 unicode-property-aliases-ecmascript@^1.0.4:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4"
   integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==
 
 unicode-property-aliases-ecmascript@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz#43d41e3be698bd493ef911077c9b131f827e8ccd"
   integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==
 
+universalify@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
+
 universalify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
   integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
 
 unstorage@^1.0.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/unstorage/-/unstorage-1.8.0.tgz#fa90a5a82c35183257acc3f0461fd982f42dfc9a"
-  integrity sha512-Wl6a0fYIIPx8yWIHAVNzsNRcIpagVnBV05UXeIFCNqPZ5tu0w0MPE+eTjpRe/yxCD60K7qX55K5Px/PeKvNntw==
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/unstorage/-/unstorage-1.9.0.tgz#0c1977f4e769a48344339ac97ec3f2feea94d43d"
+  integrity sha512-VpD8ZEYc/le8DZCrny3bnqKE4ZjioQxBRnWE+j5sGNvziPjeDlaS1NaFFHzl/kkXaO3r7UaF8MGQrs14+1B4pQ==
   dependencies:
     anymatch "^3.1.3"
     chokidar "^3.5.3"
-    destr "^2.0.0"
+    destr "^2.0.1"
     h3 "^1.7.1"
     ioredis "^5.3.2"
-    listhen "^1.0.4"
+    listhen "^1.2.2"
     lru-cache "^10.0.0"
     mri "^1.2.0"
     node-fetch-native "^1.2.0"
     ofetch "^1.1.1"
-    ufo "^1.1.2"
+    ufo "^1.2.0"
 
-update-browserslist-db@^1.0.11:
-  version "1.0.11"
-  resolved "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz"
-  integrity sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==
+untun@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/untun/-/untun-0.1.2.tgz#fa42a62ae24c1c5c6f3209692a2b0e1f573f1353"
+  integrity sha512-wLAMWvxfqyTiBODA1lg3IXHQtjggYLeTK7RnSfqtOXixWJ3bAa2kK/HHmOOg19upteqO3muLvN6O/icbyQY33Q==
+  dependencies:
+    citty "^0.1.3"
+    consola "^3.2.3"
+    pathe "^1.1.1"
+
+update-browserslist-db@^1.0.13:
+  version "1.0.13"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4"
+  integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==
   dependencies:
     escalade "^3.1.1"
     picocolors "^1.0.0"
 
+uqr@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/uqr/-/uqr-0.1.2.tgz#5c6cd5dcff9581f9bb35b982cb89e2c483a41d7d"
+  integrity sha512-MJu7ypHq6QasgF5YRTjqscSzQp/W11zoUk6kvmlH+fmWEs63Y0Eib13hYFwAzagRJcVY8WVnlV+eBDUGMJ5IbA==
+
 uri-js@^4.2.2:
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
@@ -9165,12 +9039,17 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
+urlpattern-polyfill@8.0.2:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/urlpattern-polyfill/-/urlpattern-polyfill-8.0.2.tgz#99f096e35eff8bf4b5a2aa7d58a1523d6ebc7ce5"
+  integrity sha512-Qp95D4TPJl1kC9SKigDcqgyM2VDVO4RiJc2d4qe5GrYm+zbIQCWWKAFaJNQ4BhdFeDGwBmAxqJBwWSJDb9T3BQ==
+
 use-memo-one@^1.1.1:
   version "1.1.3"
-  resolved "https://registry.npmjs.org/use-memo-one/-/use-memo-one-1.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/use-memo-one/-/use-memo-one-1.1.3.tgz#2fd2e43a2169eabc7496960ace8c79efef975e99"
   integrity sha512-g66/K7ZQGYrI6dy8GLpVcMsBp4s17xNkYJVSMvTEevGy3nDxHOfE6z8BVE22+5G5x7t3+bhzrlTDB7ObrEE0cQ==
 
-use-sync-external-store@1.2.0, use-sync-external-store@^1.2.0:
+use-sync-external-store@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a"
   integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==
@@ -9180,19 +9059,14 @@ util-deprecate@^1.0.1, util-deprecate@^1.0.2:
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
-uuid@3.4.0, uuid@^3.3.2:
-  version "3.4.0"
-  resolved "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz"
-  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
-
 uuid@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5"
-  integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30"
+  integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==
 
 v8-compile-cache-lib@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
   integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
 
 validate-npm-package-license@^3.0.1:
@@ -9205,28 +9079,27 @@ validate-npm-package-license@^3.0.1:
 
 vary@^1:
   version "1.1.2"
-  resolved "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"
-  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
-
-verror@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"
-  integrity sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==
-  dependencies:
-    assert-plus "^1.0.0"
-    core-util-is "1.0.2"
-    extsprintf "^1.2.0"
+  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
+  integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
 
 vue@^3.2.23:
-  version "3.2.36"
-  resolved "https://registry.npmjs.org/vue/-/vue-3.2.36.tgz"
-  integrity sha512-5yTXmrE6gW8IQgttzHW5bfBiFA6mx35ZXHjGLDmKYzW6MMmYvCwuKybANRepwkMYeXw2v1buGg3/lPICY5YlZw==
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-3.3.4.tgz#8ed945d3873667df1d0fcf3b2463ada028f88bd6"
+  integrity sha512-VTyEYn3yvIeY1Py0WaYGZsXnz3y5UnGi62GjVEqvEGPl6nxbOrCXbVOTQWBEJUqAyTUk2uJ5JLVnYJ6ZzGbrSw==
   dependencies:
-    "@vue/compiler-dom" "3.2.36"
-    "@vue/compiler-sfc" "3.2.36"
-    "@vue/runtime-dom" "3.2.36"
-    "@vue/server-renderer" "3.2.36"
-    "@vue/shared" "3.2.36"
+    "@vue/compiler-dom" "3.3.4"
+    "@vue/compiler-sfc" "3.3.4"
+    "@vue/runtime-dom" "3.3.4"
+    "@vue/server-renderer" "3.3.4"
+    "@vue/shared" "3.3.4"
+
+watchpack@2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"
+  integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==
+  dependencies:
+    glob-to-regexp "^0.4.1"
+    graceful-fs "^4.1.2"
 
 web-streams-polyfill@^3.0.3:
   version "3.2.1"
@@ -9257,20 +9130,48 @@ which-boxed-primitive@^1.0.2:
     is-string "^1.0.5"
     is-symbol "^1.0.3"
 
-which-typed-array@^1.1.10, which-typed-array@^1.1.11, which-typed-array@^1.1.9:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.11.tgz#99d691f23c72aab6768680805a271b69761ed61a"
-  integrity sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==
+which-builtin-type@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/which-builtin-type/-/which-builtin-type-1.1.3.tgz#b1b8443707cc58b6e9bf98d32110ff0c2cbd029b"
+  integrity sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw==
+  dependencies:
+    function.prototype.name "^1.1.5"
+    has-tostringtag "^1.0.0"
+    is-async-function "^2.0.0"
+    is-date-object "^1.0.5"
+    is-finalizationregistry "^1.0.2"
+    is-generator-function "^1.0.10"
+    is-regex "^1.1.4"
+    is-weakref "^1.0.2"
+    isarray "^2.0.5"
+    which-boxed-primitive "^1.0.2"
+    which-collection "^1.0.1"
+    which-typed-array "^1.1.9"
+
+which-collection@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.1.tgz#70eab71ebbbd2aefaf32f917082fc62cdcb70906"
+  integrity sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==
+  dependencies:
+    is-map "^2.0.1"
+    is-set "^2.0.1"
+    is-weakmap "^2.0.1"
+    is-weakset "^2.0.1"
+
+which-typed-array@^1.1.11, which-typed-array@^1.1.9:
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.12.tgz#cc8dfcc0ed769af33879012ea549b0af69d33cd3"
+  integrity sha512-H287jkk4q9wRAQTStQoqm+zGjoMqOxBKAdwnENVwav5/ngW76883g6EwLH9GUPPD7m7yj60xP7wtzQhh6//04w==
   dependencies:
     available-typed-arrays "^1.0.5"
-    call-bind "^1.0.2"
+    call-bind "^1.0.4"
     for-each "^0.3.3"
     gopd "^1.0.1"
     has-tostringtag "^1.0.0"
 
 which@^1.2.9, which@^1.3.1:
   version "1.3.1"
-  resolved "https://registry.npmjs.org/which/-/which-1.3.1.tgz"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
     isexe "^2.0.0"
@@ -9282,23 +9183,14 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
-wrap-ansi@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz"
-  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
+wrap-ansi@^8.0.1, wrap-ansi@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
+  integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==
   dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
+    ansi-styles "^6.1.0"
+    string-width "^5.0.1"
+    strip-ansi "^7.0.1"
 
 wrappy@1:
   version "1.0.2"
@@ -9307,7 +9199,7 @@ wrappy@1:
 
 write-file-atomic@^3.0.0:
   version "3.0.3"
-  resolved "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
   integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
   dependencies:
     imurmurhash "^0.1.4"
@@ -9325,7 +9217,7 @@ write-file-atomic@^5.0.1:
 
 write-json-file@^4.3.0:
   version "4.3.0"
-  resolved "https://registry.npmjs.org/write-json-file/-/write-json-file-4.3.0.tgz"
+  resolved "https://registry.yarnpkg.com/write-json-file/-/write-json-file-4.3.0.tgz#908493d6fd23225344af324016e4ca8f702dd12d"
   integrity sha512-PxiShnxf0IlnQuMYOPPhPkhExoCQuTUNPOa/2JWCYTmBquU9njyyDuwRKN26IZBlp4yn1nt+Agh2HOOBl+55HQ==
   dependencies:
     detect-indent "^6.0.0"
@@ -9345,22 +9237,27 @@ xss@^1.0.14:
 
 yallist@4.0.0, yallist@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
 yallist@^3.0.2:
   version "3.1.1"
-  resolved "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
 
-yaml@^1.10.0, yaml@^1.10.2:
+yaml@2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.1.tgz#02fe0975d23cd441242aa7204e09fc28ac2ac33b"
+  integrity sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==
+
+yaml@^1.10.2:
   version "1.10.2"
-  resolved "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
 yargs-parser@^18.1.3:
   version "18.1.3"
-  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
   integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
   dependencies:
     camelcase "^5.0.0"
@@ -9373,7 +9270,7 @@ yargs-parser@^20.2.9:
 
 yn@3.1.1:
   version "3.1.1"
-  resolved "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
   integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
 
 yocto-queue@^0.1.0:
@@ -9383,7 +9280,7 @@ yocto-queue@^0.1.0:
 
 yup@^0.32.11:
   version "0.32.11"
-  resolved "https://registry.npmjs.org/yup/-/yup-0.32.11.tgz"
+  resolved "https://registry.yarnpkg.com/yup/-/yup-0.32.11.tgz#d67fb83eefa4698607982e63f7ca4c5ed3cf18c5"
   integrity sha512-Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg==
   dependencies:
     "@babel/runtime" "^7.15.4"
@@ -9395,8 +9292,8 @@ yup@^0.32.11:
     toposort "^2.0.2"
 
 zustand@^4.3.8:
-  version "4.3.9"
-  resolved "https://registry.yarnpkg.com/zustand/-/zustand-4.3.9.tgz#a7d4332bbd75dfd25c6848180b3df1407217f2ad"
-  integrity sha512-Tat5r8jOMG1Vcsj8uldMyqYKC5IZvQif8zetmLHs9WoZlntTHmIoNM8TpLRY31ExncuUvUOXehd0kvahkuHjDw==
+  version "4.4.3"
+  resolved "https://registry.yarnpkg.com/zustand/-/zustand-4.4.3.tgz#1d54cf7fa4507ad8bf58e2f13e08ddc8a6730128"
+  integrity sha512-oRy+X3ZazZvLfmv6viIaQmtLOMeij1noakIsK/Y47PWYhT8glfXzQ4j0YcP5i0P0qI1A4rIB//SGROGyZhx91A==
   dependencies:
     use-sync-external-store "1.2.0"